diff --git a/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 b/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 index 7b61c3e..c0cf8a3 100644 --- a/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 +++ b/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.md5 @@ -1,3 +1,3 @@ -source_md5="47313fa4c47a9963fddd764e1ec6e4a8" -dest_md5="2ded9e7f9060e2b530aab678b135fc5b" +source_md5="c29a47d539fe5e81ffcb96db938836ed" +dest_md5="9fb4656ded15af836ae22d9098b2652f" diff --git a/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex b/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex index 3ca6461..5faf626 100644 Binary files a/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex and b/.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex differ diff --git a/Assets/Isle of the Fyre Mask.png b/Assets/Isle of the Fyre Mask.png new file mode 100644 index 0000000..ae52dd4 Binary files /dev/null and b/Assets/Isle of the Fyre Mask.png differ diff --git a/Assets/Isle of the Fyre Mask.png.import b/Assets/Isle of the Fyre Mask.png.import new file mode 100644 index 0000000..017afc0 --- /dev/null +++ b/Assets/Isle of the Fyre Mask.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Isle of the Fyre Mask.png-efedb28591fb0c1669e33a9fcd04cad3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Isle of the Fyre Mask.png" +dest_files=[ "res://.import/Isle of the Fyre Mask.png-efedb28591fb0c1669e33a9fcd04cad3.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Isle of the Fyre.png b/Assets/Isle of the Fyre.png new file mode 100644 index 0000000..f0312f5 Binary files /dev/null and b/Assets/Isle of the Fyre.png differ diff --git a/Assets/Isle of the Fyre.png.import b/Assets/Isle of the Fyre.png.import new file mode 100644 index 0000000..6441db1 --- /dev/null +++ b/Assets/Isle of the Fyre.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Isle of the Fyre.png-f577ecbddd9cca0435c9d8378798d4c8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Isle of the Fyre.png" +dest_files=[ "res://.import/Isle of the Fyre.png-f577ecbddd9cca0435c9d8378798d4c8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Novingrad Mask.png b/Assets/Novingrad Mask.png new file mode 100644 index 0000000..3cbb2f4 Binary files /dev/null and b/Assets/Novingrad Mask.png differ diff --git a/Assets/Novingrad Mask.png.import b/Assets/Novingrad Mask.png.import new file mode 100644 index 0000000..db80a87 --- /dev/null +++ b/Assets/Novingrad Mask.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Novingrad Mask.png-5aee052d4eb006bc8976abf7d09879ad.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Novingrad Mask.png" +dest_files=[ "res://.import/Novingrad Mask.png-5aee052d4eb006bc8976abf7d09879ad.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Assets/Novingrad.png b/Assets/Novingrad.png new file mode 100644 index 0000000..460a834 Binary files /dev/null and b/Assets/Novingrad.png differ diff --git a/Assets/Novingrad.png.import b/Assets/Novingrad.png.import new file mode 100644 index 0000000..cef8299 --- /dev/null +++ b/Assets/Novingrad.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Novingrad.png-d4fff769114dfee1461e2ee332432f58.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Assets/Novingrad.png" +dest_files=[ "res://.import/Novingrad.png-d4fff769114dfee1461e2ee332432f58.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=true +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/Crucible.save b/Crucible.save index ed50d29..7238b4e 100644 --- a/Crucible.save +++ b/Crucible.save @@ -1,21 +1,21 @@ -{"connections":[90,20,25,15],"name":10,"troops":1,"x":797.794006,"y":188.588013} -{"connections":[10,20,35],"name":15,"troops":1,"x":658.794006,"y":320.588013} -{"connections":[10,15,25,30],"name":20,"troops":1,"x":793.794006,"y":299.588013} -{"connections":[105,10,20,30],"name":25,"troops":1,"x":898.794006,"y":306.588013} -{"connections":[105,20,25],"name":30,"troops":1,"x":802.794006,"y":390.588013} -{"connections":[105,15,40,50,55],"name":35,"troops":4,"x":677.794006,"y":520.588013} -{"connections":[35,45,50],"name":40,"troops":2,"x":625.794006,"y":584.588013} -{"connections":[40,50],"name":45,"troops":1,"x":594.794006,"y":694.588013} -{"connections":[45,40,55,35,60],"name":50,"troops":1,"x":723.794006,"y":764.588013} -{"connections":[105,50,65,35],"name":55,"troops":4,"x":829.794006,"y":590.588013} -{"connections":[50,70,75,65],"name":60,"troops":1,"x":860.794006,"y":830.588013} -{"connections":[105,60,110,55],"name":65,"troops":1,"x":985.794006,"y":636.588013} -{"connections":[60,75,80],"name":70,"troops":1,"x":943.794006,"y":816.588013} -{"connections":[70,60,80],"name":75,"troops":1,"x":1027.793945,"y":922.588013} -{"connections":[70,75,110,85],"name":80,"troops":2,"x":1200.793945,"y":736.588013} -{"connections":[90,95,100,110,80],"name":85,"troops":1,"x":1302.793945,"y":403.588013} -{"connections":[95,10,85],"name":90,"troops":2,"x":1086.793945,"y":209.588013} -{"connections":[90,85,100],"name":95,"troops":3,"x":1059.793945,"y":290.588013} -{"connections":[95,105,85],"name":100,"troops":3,"x":1106.793945,"y":365.588013} -{"connections":[100,25,30,35,55,65,110],"name":105,"troops":1,"x":991.794006,"y":460.588013} -{"connections":[105,65,80,85],"name":110,"troops":1,"x":1126.793945,"y":559.588013} +{"connections":["ff5a5a5a","ff141414","ff191919","ff0f0f0f"],"name":"ff0a0a0a","troops":1,"x":797.794006,"y":188.588013} +{"connections":["ff0a0a0a","ff141414","ff232323"],"name":"ff0f0f0f","troops":1,"x":658.794006,"y":320.588013} +{"connections":["ff0a0a0a","ff0f0f0f","ff191919","ff1e1e1e"],"name":"ff141414","troops":2,"x":793.794006,"y":299.588013} +{"connections":["ff696969","ff0a0a0a","ff141414","ff1e1e1e"],"name":"ff191919","troops":3,"x":898.794006,"y":306.588013} +{"connections":["ff696969","ff141414","ff191919"],"name":"ff1e1e1e","troops":1,"x":802.794006,"y":390.588013} +{"connections":["ff696969","ff0f0f0f","ff282828","ff323232","ff373737"],"name":"ff232323","troops":2,"x":677.794006,"y":520.588013} +{"connections":["ff232323","ff2d2d2d","ff323232"],"name":"ff282828","troops":1,"x":625.794006,"y":584.588013} +{"connections":["ff282828","ff323232"],"name":"ff2d2d2d","troops":2,"x":594.794006,"y":694.588013} +{"connections":["ff2d2d2d","ff282828","ff373737","ff232323","ff3c3c3c"],"name":"ff323232","troops":4,"x":723.794006,"y":764.588013} +{"connections":["ff696969","ff323232","ff414141","ff232323"],"name":"ff373737","troops":1,"x":829.794006,"y":590.588013} +{"connections":["ff323232","ff464646","ff4b4b4b","ff414141"],"name":"ff3c3c3c","troops":4,"x":860.794006,"y":830.588013} +{"connections":["ff696969","ff3c3c3c","ff6e6e6e","ff373737"],"name":"ff414141","troops":1,"x":985.794006,"y":636.588013} +{"connections":["ff3c3c3c","ff4b4b4b","ff505050"],"name":"ff464646","troops":4,"x":943.794006,"y":816.588013} +{"connections":["ff464646","ff3c3c3c","ff505050"],"name":"ff4b4b4b","troops":4,"x":1027.793945,"y":922.588013} +{"connections":["ff464646","ff4b4b4b","ff6e6e6e","ff555555"],"name":"ff505050","troops":1,"x":1200.793945,"y":736.588013} +{"connections":["ff5a5a5a","ff5f5f5f","ff646464","ff6e6e6e","ff505050"],"name":"ff555555","troops":2,"x":1302.793945,"y":403.588013} +{"connections":["ff5f5f5f","ff0a0a0a","ff555555"],"name":"ff5a5a5a","troops":1,"x":1086.793945,"y":209.588013} +{"connections":["ff5a5a5a","ff555555","ff646464"],"name":"ff5f5f5f","troops":3,"x":1059.793945,"y":290.588013} +{"connections":["ff5f5f5f","ff696969","ff555555"],"name":"ff646464","troops":1,"x":1106.793945,"y":365.588013} +{"connections":["ff646464","ff191919","ff1e1e1e","ff232323","ff373737","ff414141","ff6e6e6e"],"name":"ff696969","troops":4,"x":991.794006,"y":460.588013} +{"connections":["ff696969","ff414141","ff505050","ff555555"],"name":"ff6e6e6e","troops":1,"x":1126.793945,"y":559.588013} diff --git a/Isle of the Fyre.save b/Isle of the Fyre.save new file mode 100644 index 0000000..86fb271 --- /dev/null +++ b/Isle of the Fyre.save @@ -0,0 +1,26 @@ +{"connections":["ff282828"],"name":"ff232323","troops":1,"x":1429.793945,"y":829.088013} +{"connections":["ff6969fa","ff232323","ff323232"],"name":"ff282828","troops":2,"x":1239.793945,"y":809.088013} +{"connections":["ff282828","ff373737","ff696973","ff3c3c3c"],"name":"ff323232","troops":1,"x":1074.793945,"y":853.088013} +{"connections":["ff323232","ff414141"],"name":"ff373737","troops":2,"x":1043.793945,"y":946.088013} +{"connections":["ff414141","ff696973","ff323232","ff4b4b4b","ff464646"],"name":"ff3c3c3c","troops":1,"x":792.794006,"y":741.088013} +{"connections":["ff373737","ff3c3c3c","ff464646"],"name":"ff414141","troops":1,"x":877.794006,"y":870.088013} +{"connections":["ff4b4b4b","ff3c3c3c","ff414141"],"name":"ff464646","troops":1,"x":657.794006,"y":782.088013} +{"connections":["ff3c3c3c","ff464646","ff696973","ff505050","ff555555","ff69697d"],"name":"ff4b4b4b","troops":1,"x":636.794006,"y":587.088013} +{"connections":["ff5a5a5a","ff555555","ff4b4b4b"],"name":"ff505050","troops":3,"x":582.794006,"y":464.088013} +{"connections":["ff505050","ff5a5a5a","ff4b4b4b"],"name":"ff555555","troops":1,"x":480.794006,"y":480.088013} +{"connections":["ff646464","ff5f5f5f","ff505050","ff555555"],"name":"ff5a5a5a","troops":4,"x":574.794006,"y":337.088013} +{"connections":["ff696969","ff646464","ff5a5a5a","ff696987"],"name":"ff5f5f5f","troops":4,"x":676.794006,"y":230.088013} +{"connections":["ff696969","ff5f5f5f","ff5a5a5a"],"name":"ff646464","troops":1,"x":535.794006,"y":220.088013} +{"connections":["ff646464","ff5f5f5f","ff69699b"],"name":"ff696969","troops":3,"x":626.794006,"y":136.088013} +{"connections":["ff3c3c3c","ff323232","ff4b4b4b"],"name":"ff696973","troops":2,"x":1042.793945,"y":667.088013} +{"connections":["ff4b4b4b","ff696991","ff696987","ff6969af"],"name":"ff69697d","troops":1,"x":884.794006,"y":437.088013} +{"connections":["ff5f5f5f","ff696991","ff69697d"],"name":"ff696987","troops":2,"x":789.794006,"y":344.088013} +{"connections":["ff6969af","ff6969a5","ff696987","ff69697d"],"name":"ff696991","troops":2,"x":900.794006,"y":340.088013} +{"connections":["ff696969","ff6969a5"],"name":"ff69699b","troops":2,"x":867.794006,"y":148.088013} +{"connections":["ff69699b","ff6969c3","ff6969b9","ff6969af","ff696991"],"name":"ff6969a5","troops":1,"x":985.794006,"y":215.088013} +{"connections":["ff6969a5","ff696991","ff6969b9","ff6969d2","ff69697d"],"name":"ff6969af","troops":1,"x":1043.793945,"y":357.088013} +{"connections":["ff6969c3","ff6969a5","ff6969af","ff6969c8"],"name":"ff6969b9","troops":2,"x":1159.793945,"y":239.088013} +{"connections":["ff6969a5","ff6969b9"],"name":"ff6969c3","troops":1,"x":1163.793945,"y":149.088013} +{"connections":["ff6969b9","ff6969d2","ff6969fa"],"name":"ff6969c8","troops":3,"x":1317.793945,"y":399.088013} +{"connections":["ff6969c8","ff6969af","ff6969fa"],"name":"ff6969d2","troops":3,"x":1185.793945,"y":433.088013} +{"connections":["ff6969d2","ff6969c8","ff282828"],"name":"ff6969fa","troops":1,"x":1260.793945,"y":546.088013} diff --git a/No Mans Land.save b/No Mans Land.save index 5d2da9d..e207bbd 100644 --- a/No Mans Land.save +++ b/No Mans Land.save @@ -1,35 +1,35 @@ -{"connections":[165,15],"name":10,"troops":2,"x":548,"y":182} -{"connections":[10,20,125],"name":15,"troops":2,"x":383.794006,"y":335.588013} -{"connections":[25,15,110],"name":20,"troops":2,"x":306.794006,"y":495.588013} -{"connections":[30,35,20,105],"name":25,"troops":1,"x":292.794006,"y":700.588013} -{"connections":[45,25,35],"name":30,"troops":1,"x":400.794006,"y":737.588013} -{"connections":[30,25,40],"name":35,"troops":2,"x":342.794006,"y":871.588013} -{"connections":[55,180,35],"name":40,"troops":3,"x":529.794006,"y":869.588013} -{"connections":[180,50,30],"name":45,"troops":3,"x":543.794006,"y":686.588013} -{"connections":[45,65,180],"name":50,"troops":1,"x":634.794006,"y":646.588013} -{"connections":[60,40],"name":55,"troops":1,"x":698.794006,"y":903.588013} -{"connections":[65,55],"name":60,"troops":1,"x":794.794006,"y":872.588013} -{"connections":[70,75,60,50],"name":65,"troops":1,"x":845.794006,"y":746.588013} -{"connections":[75,65],"name":70,"troops":2,"x":906.794006,"y":693.588013} -{"connections":[85,70,65,80],"name":75,"troops":1,"x":990.794006,"y":684.588013} -{"connections":[75],"name":80,"troops":1,"x":1007.794006,"y":782.588013} -{"connections":[95,90,75],"name":85,"troops":4,"x":1204.793945,"y":668.588013} -{"connections":[85],"name":90,"troops":1,"x":1213.793945,"y":786.588013} -{"connections":[110,135,100,85],"name":95,"troops":3,"x":1306.793945,"y":519.588013} -{"connections":[95,105],"name":100,"troops":2,"x":1399.793945,"y":589.588013} -{"connections":[100,25],"name":105,"troops":2,"x":1458.793945,"y":663.588013} -{"connections":[120,115,95,20],"name":110,"troops":2,"x":1447.793945,"y":401.588013} -{"connections":[120,110],"name":115,"troops":2,"x":1452.793945,"y":299.588013} -{"connections":[130,125,115,110],"name":120,"troops":2,"x":1388.793945,"y":267.588013} -{"connections":[120,15],"name":125,"troops":2,"x":1513.793945,"y":188.588013} -{"connections":[140,120],"name":130,"troops":2,"x":1279.793945,"y":210.588013} -{"connections":[140,95],"name":135,"troops":4,"x":1166.793945,"y":401.588013} -{"connections":[145,130,135],"name":140,"troops":2,"x":1138.793945,"y":254.588013} -{"connections":[155,150,140],"name":145,"troops":1,"x":933.794006,"y":333.588013} -{"connections":[145,155],"name":150,"troops":2,"x":945.794006,"y":429.588013} -{"connections":[160,145,150],"name":155,"troops":2,"x":871.794006,"y":369.588013} -{"connections":[165,155],"name":160,"troops":4,"x":819.794006,"y":261.588013} -{"connections":[10,170,175,160],"name":165,"troops":1,"x":644.794006,"y":271.588013} -{"connections":[165,175],"name":170,"troops":2,"x":673.794006,"y":362.588013} -{"connections":[165,170],"name":175,"troops":1,"x":577.794006,"y":353.588013} -{"connections":[40,45,50],"name":180,"troops":1,"x":574.794006,"y":750.588013} +{"connections":["ff282828","ff2d2d2d","ff323232"],"name":"ff000000","troops":1,"x":574.794006,"y":750.588013} +{"connections":["ffa5a5a5","ff0f0f0f"],"name":"ff0a0a0a","troops":1,"x":548,"y":182} +{"connections":["ff0a0a0a","ff141414","ff7d7d7d"],"name":"ff0f0f0f","troops":1,"x":383.794006,"y":335.588013} +{"connections":["ff191919","ff0f0f0f","ff6e6e6e"],"name":"ff141414","troops":2,"x":306.794006,"y":495.588013} +{"connections":["ff1e1e1e","ff232323","ff141414","ff696969"],"name":"ff191919","troops":1,"x":292.794006,"y":700.588013} +{"connections":["ff2d2d2d","ff191919","ff232323"],"name":"ff1e1e1e","troops":1,"x":400.794006,"y":737.588013} +{"connections":["ff1e1e1e","ff191919","ff282828"],"name":"ff232323","troops":1,"x":342.794006,"y":871.588013} +{"connections":["ff373737","ff000000","ff232323"],"name":"ff282828","troops":1,"x":529.794006,"y":869.588013} +{"connections":["ff000000","ff323232","ff1e1e1e"],"name":"ff2d2d2d","troops":2,"x":543.794006,"y":686.588013} +{"connections":["ff2d2d2d","ff414141","ff000000"],"name":"ff323232","troops":1,"x":634.794006,"y":646.588013} +{"connections":["ff3c3c3c","ff282828"],"name":"ff373737","troops":1,"x":698.794006,"y":903.588013} +{"connections":["ff414141","ff373737"],"name":"ff3c3c3c","troops":1,"x":794.794006,"y":872.588013} +{"connections":["ff464646","ff4b4b4b","ff3c3c3c","ff323232"],"name":"ff414141","troops":1,"x":845.794006,"y":746.588013} +{"connections":["ff4b4b4b","ff414141"],"name":"ff464646","troops":1,"x":906.794006,"y":693.588013} +{"connections":["ff555555","ff464646","ff414141","ff505050"],"name":"ff4b4b4b","troops":1,"x":990.794006,"y":684.588013} +{"connections":["ff4b4b4b"],"name":"ff505050","troops":2,"x":1007.794006,"y":782.588013} +{"connections":["ff5f5f5f","ff5a5a5a","ff4b4b4b"],"name":"ff555555","troops":1,"x":1204.793945,"y":668.588013} +{"connections":["ff555555"],"name":"ff5a5a5a","troops":1,"x":1213.793945,"y":786.588013} +{"connections":["ff6e6e6e","ff878787","ff646464","ff555555"],"name":"ff5f5f5f","troops":1,"x":1306.793945,"y":519.588013} +{"connections":["ff5f5f5f","ff696969"],"name":"ff646464","troops":3,"x":1399.793945,"y":589.588013} +{"connections":["ff646464","ff191919"],"name":"ff696969","troops":4,"x":1458.793945,"y":663.588013} +{"connections":["ff787878","ff737373","ff5f5f5f","ff141414"],"name":"ff6e6e6e","troops":3,"x":1447.793945,"y":401.588013} +{"connections":["ff787878","ff6e6e6e"],"name":"ff737373","troops":1,"x":1452.793945,"y":299.588013} +{"connections":["ff828282","ff7d7d7d","ff737373","ff6e6e6e"],"name":"ff787878","troops":2,"x":1388.793945,"y":267.588013} +{"connections":["ff787878","ff0f0f0f"],"name":"ff7d7d7d","troops":4,"x":1513.793945,"y":188.588013} +{"connections":["ff8c8c8c","ff787878"],"name":"ff828282","troops":1,"x":1279.793945,"y":210.588013} +{"connections":["ff8c8c8c","ff5f5f5f"],"name":"ff878787","troops":2,"x":1166.793945,"y":401.588013} +{"connections":["ff919191","ff828282","ff878787"],"name":"ff8c8c8c","troops":1,"x":1138.793945,"y":254.588013} +{"connections":["ff9b9b9b","ff969696","ff8c8c8c"],"name":"ff919191","troops":3,"x":933.794006,"y":333.588013} +{"connections":["ff919191","ff9b9b9b"],"name":"ff969696","troops":1,"x":945.794006,"y":429.588013} +{"connections":["ffa0a0a0","ff919191","ff969696"],"name":"ff9b9b9b","troops":1,"x":871.794006,"y":369.588013} +{"connections":["ffa5a5a5","ff9b9b9b"],"name":"ffa0a0a0","troops":2,"x":819.794006,"y":261.588013} +{"connections":["ff0a0a0a","ffaaaaaa","ffafafaf","ffa0a0a0"],"name":"ffa5a5a5","troops":1,"x":644.794006,"y":271.588013} +{"connections":["ffa5a5a5","ffafafaf"],"name":"ffaaaaaa","troops":2,"x":673.794006,"y":362.588013} +{"connections":["ffa5a5a5","ffaaaaaa"],"name":"ffafafaf","troops":1,"x":577.794006,"y":353.588013} diff --git a/Novingrad.save b/Novingrad.save new file mode 100644 index 0000000..7c1746a --- /dev/null +++ b/Novingrad.save @@ -0,0 +1,46 @@ +{"connections":["ff373737","ff414141"],"name":"ff323232","troops":1,"x":1037.793945,"y":198.088013} +{"connections":["ffcd6969","ff323232"],"name":"ff373737","troops":3,"x":942.794006,"y":149.088013} +{"connections":[],"name":"ff373769","troops":2,"x":809.794006,"y":488.088013} +{"connections":["ff414141","ff464646","ff69cd69","ff69c369"],"name":"ff3c3c3c","troops":2,"x":1183.793945,"y":361.088013} +{"connections":["ff323232","ff3c3c3c","ff464646","ff69cd69"],"name":"ff414141","troops":4,"x":1115.793945,"y":291.088013} +{"connections":["ff414141","ff3c3c3c","ff505050"],"name":"ff464646","troops":2,"x":1255.793945,"y":368.088013} +{"connections":["ff69b969","ff555555","ff464646"],"name":"ff505050","troops":2,"x":1284.793945,"y":509.088013} +{"connections":["ff5a5a5a","ff505050"],"name":"ff555555","troops":1,"x":1450.793945,"y":629.088013} +{"connections":["ff555555","ff5f5f5f","ff646464","ff696991"],"name":"ff5a5a5a","troops":2,"x":1432.793945,"y":735.088013} +{"connections":["ff5a5a5a","ff646464","ff696969"],"name":"ff5f5f5f","troops":2,"x":1532.793945,"y":839.088013} +{"connections":["ff5f5f5f","ff5a5a5a","ff696969"],"name":"ff646464","troops":2,"x":1398.793945,"y":816.088013} +{"connections":["ff697369","ff696969","ff694b69","ff695569","ff694169"],"name":"ff693769","troops":1,"x":858.794006,"y":578.088013} +{"connections":["ff698769","ff697369","ff694b69","ff693769","ff699169","ff699b69"],"name":"ff694169","troops":1,"x":791.794006,"y":635.088013} +{"connections":["ff693769","ff695569","ff69af69","ff699b69","ff69a569","ff694169"],"name":"ff694b69","troops":1,"x":927.794006,"y":643.088013} +{"connections":["ff696969","ff695f69","ff69c369","ff69af69","ff694b69","ff693769","ff69b969"],"name":"ff695569","troops":1,"x":938.794006,"y":544.088013} +{"connections":["ff696969","ff9b6969","ff69cd69","ff69c369","ff695569"],"name":"ff695f69","troops":1,"x":905.794006,"y":414.088013} +{"connections":["ff697369","ff695f69","ff693769","ff695569","ff5f5f5f","ff646464"],"name":"ff696969","troops":2,"x":1448.793945,"y":870.088013} +{"connections":["ff696991","ff69699b","ff69a569"],"name":"ff696973","troops":2,"x":1207.793945,"y":773.088013} +{"connections":["ff5a5a5a","ff696973","ff69af69"],"name":"ff696991","troops":1,"x":1237.793945,"y":684.088013} +{"connections":["ff696973","ff6969a5","ff6969b9"],"name":"ff69699b","troops":3,"x":1115.793945,"y":854.088013} +{"connections":["ff69699b","ff6969b9"],"name":"ff6969a5","troops":2,"x":1018.793945,"y":951.088013} +{"connections":["ff6969b9","ff6969c8","ff6969d2","ff699169"],"name":"ff6969af","troops":2,"x":804.794006,"y":820.088013} +{"connections":["ff6969a5","ff6969af","ff6969c8","ff69699b","ff699b69"],"name":"ff6969b9","troops":4,"x":946.794006,"y":825.088013} +{"connections":["ff6969af","ff6969b9","ff6969d2"],"name":"ff6969c8","troops":2,"x":831.794006,"y":939.088013} +{"connections":["ff6969af","ff6969c8","ff6969fa"],"name":"ff6969d2","troops":2,"x":649.794006,"y":910.088013} +{"connections":["ff6969d2","ff697d69"],"name":"ff6969fa","troops":2,"x":457.794006,"y":831.088013} +{"connections":["ff697d69","ff698769","ff694169","ff696969","ff693769"],"name":"ff697369","troops":1,"x":676.794006,"y":530.088013} +{"connections":["ff6969fa","ff697369","ff698769"],"name":"ff697d69","troops":1,"x":595.794006,"y":591.088013} +{"connections":["ff697d69","ff697369","ff694169","ff699169"],"name":"ff698769","troops":1,"x":692.794006,"y":634.088013} +{"connections":["ff698769","ff699b69","ff6969af","ff694169"],"name":"ff699169","troops":1,"x":819.794006,"y":716.088013} +{"connections":["ff694b69","ff699169","ff6969b9","ff69a569","ff694169"],"name":"ff699b69","troops":1,"x":958.794006,"y":716.088013} +{"connections":["ff696973","ff694b69","ff699b69","ff69af69"],"name":"ff69a569","troops":2,"x":1071.793945,"y":688.088013} +{"connections":["ff69b969","ff695569","ff696991","ff694b69","ff69a569"],"name":"ff69af69","troops":2,"x":1073.793945,"y":595.088013} +{"connections":["ff69c369","ff69af69","ff695569","ff505050"],"name":"ff69b969","troops":1,"x":1154.793945,"y":550.088013} +{"connections":["ff695f69","ff69cd69","ff3c3c3c","ff69b969","ff695569"],"name":"ff69c369","troops":1,"x":1061.793945,"y":442.088013} +{"connections":["ff695f69","ff414141","ff3c3c3c","ff69c369"],"name":"ff69cd69","troops":1,"x":967.794006,"y":346.088013} +{"connections":["ff7d6969","ff876969","ff916969","ff9b6969"],"name":"ff736969","troops":2,"x":682.794006,"y":327.088013} +{"connections":["ffb96969","ff876969","ff736969"],"name":"ff7d6969","troops":1,"x":605.794006,"y":282.088013} +{"connections":["ffb96969","ff7d6969","ffaf6969","ff916969","ff736969"],"name":"ff876969","troops":2,"x":665.794006,"y":261.088013} +{"connections":["ff876969","ff736969","ff9b6969","ffa56969","ffaf6969"],"name":"ff916969","troops":1,"x":725.794006,"y":260.088013} +{"connections":["ff736969","ff916969","ffa56969","ff695f69"],"name":"ff9b6969","troops":1,"x":796.794006,"y":267.088013} +{"connections":["ff9b6969","ff916969","ffaf6969","ffcd6969"],"name":"ffa56969","troops":2,"x":814.794006,"y":202.088013} +{"connections":["ffb96969","ffc36969","ff876969","ff916969","ffa56969","ffcd6969"],"name":"ffaf6969","troops":4,"x":701.794006,"y":201.088013} +{"connections":["ff7d6969","ff876969","ffaf6969","ffc36969"],"name":"ffb96969","troops":3,"x":608.794006,"y":182.088013} +{"connections":["ffb96969","ffaf6969","ffcd6969"],"name":"ffc36969","troops":2,"x":690.794006,"y":124.088013} +{"connections":["ffc36969","ffa56969","ffaf6969","ff373737"],"name":"ffcd6969","troops":2,"x":793.794006,"y":129.088013} diff --git a/Our World.save b/Our World.save index 470d25e..21462e0 100644 --- a/Our World.save +++ b/Our World.save @@ -1,27 +1,27 @@ -{"connections":[15,115],"name":10,"troops":1,"x":338,"y":221} -{"connections":[10,25,20,30],"name":15,"troops":3,"x":453,"y":270} -{"connections":[25,15,75],"name":20,"troops":1,"x":702,"y":175} -{"connections":[15,20,30,75],"name":25,"troops":1,"x":596,"y":328} -{"connections":[15,25,35,70,40,120],"name":30,"troops":2,"x":478,"y":387} -{"connections":[30,40],"name":35,"troops":3,"x":472,"y":482} -{"connections":[30,35,45,50],"name":40,"troops":1,"x":541,"y":597} -{"connections":[40,50,70,65],"name":45,"troops":1,"x":686,"y":629} -{"connections":[45,40,55,140],"name":50,"troops":1,"x":596,"y":814} -{"connections":[140,60,50],"name":55,"troops":1,"x":990,"y":834} -{"connections":[55,65,100],"name":60,"troops":2,"x":1015,"y":710} -{"connections":[70,45,100,60,80],"name":65,"troops":2,"x":898,"y":620} -{"connections":[30,45,65,80,75],"name":70,"troops":1,"x":810,"y":500} -{"connections":[20,25,85,70],"name":75,"troops":3,"x":792,"y":353} -{"connections":[90,100,70,85,65],"name":80,"troops":1,"x":920,"y":407} -{"connections":[75,90,80],"name":85,"troops":2,"x":922,"y":236} -{"connections":[85,80,100,110,95],"name":90,"troops":2,"x":1055,"y":299} -{"connections":[100,130,110,90,105],"name":95,"troops":1,"x":1129,"y":398} -{"connections":[95,90,80,105,65,60],"name":100,"troops":1,"x":1063,"y":537} -{"connections":[100,95,130,135],"name":105,"troops":1,"x":1214,"y":532} -{"connections":[115,95,90,125,130],"name":110,"troops":1,"x":1203,"y":255} -{"connections":[110,125,120,10],"name":115,"troops":1,"x":1411,"y":205} -{"connections":[115,125,30],"name":120,"troops":2,"x":1457,"y":381} -{"connections":[115,120,130,110],"name":125,"troops":3,"x":1313,"y":335} -{"connections":[125,95,105,135,110],"name":130,"troops":4,"x":1306,"y":485} -{"connections":[130,140,105],"name":135,"troops":1,"x":1396,"y":673} -{"connections":[135,55,50],"name":140,"troops":2,"x":1442,"y":823} +{"connections":["ff0f0f0f","ff737373"],"name":"ff0a0a0a","troops":2,"x":338,"y":221} +{"connections":["ff0a0a0a","ff191919","ff141414","ff1e1e1e"],"name":"ff0f0f0f","troops":1,"x":453,"y":270} +{"connections":["ff191919","ff0f0f0f","ff4b4b4b"],"name":"ff141414","troops":1,"x":702,"y":175} +{"connections":["ff0f0f0f","ff141414","ff1e1e1e","ff4b4b4b"],"name":"ff191919","troops":1,"x":596,"y":328} +{"connections":["ff0f0f0f","ff191919","ff232323","ff464646","ff282828","ff787878"],"name":"ff1e1e1e","troops":3,"x":478,"y":387} +{"connections":["ff1e1e1e","ff282828"],"name":"ff232323","troops":1,"x":472,"y":482} +{"connections":["ff1e1e1e","ff232323","ff2d2d2d","ff323232"],"name":"ff282828","troops":1,"x":541,"y":597} +{"connections":["ff282828","ff323232","ff464646","ff414141"],"name":"ff2d2d2d","troops":2,"x":686,"y":629} +{"connections":["ff2d2d2d","ff282828","ff373737","ff8c8c8c"],"name":"ff323232","troops":4,"x":596,"y":814} +{"connections":["ff8c8c8c","ff3c3c3c","ff323232"],"name":"ff373737","troops":1,"x":990,"y":834} +{"connections":["ff373737","ff414141","ff646464"],"name":"ff3c3c3c","troops":1,"x":1015,"y":710} +{"connections":["ff464646","ff2d2d2d","ff646464","ff3c3c3c","ff505050"],"name":"ff414141","troops":2,"x":898,"y":620} +{"connections":["ff1e1e1e","ff2d2d2d","ff414141","ff505050","ff4b4b4b"],"name":"ff464646","troops":2,"x":810,"y":500} +{"connections":["ff141414","ff191919","ff555555","ff464646"],"name":"ff4b4b4b","troops":2,"x":792,"y":353} +{"connections":["ff5a5a5a","ff646464","ff464646","ff555555","ff414141"],"name":"ff505050","troops":1,"x":920,"y":407} +{"connections":["ff4b4b4b","ff5a5a5a","ff505050"],"name":"ff555555","troops":2,"x":922,"y":236} +{"connections":["ff555555","ff505050","ff646464","ff6e6e6e","ff5f5f5f"],"name":"ff5a5a5a","troops":1,"x":1055,"y":299} +{"connections":["ff646464","ff828282","ff6e6e6e","ff5a5a5a","ff696969"],"name":"ff5f5f5f","troops":3,"x":1129,"y":398} +{"connections":["ff5f5f5f","ff5a5a5a","ff505050","ff696969","ff414141","ff3c3c3c"],"name":"ff646464","troops":1,"x":1063,"y":537} +{"connections":["ff646464","ff5f5f5f","ff828282","ff878787"],"name":"ff696969","troops":1,"x":1214,"y":532} +{"connections":["ff737373","ff5f5f5f","ff5a5a5a","ff7d7d7d","ff828282"],"name":"ff6e6e6e","troops":1,"x":1203,"y":255} +{"connections":["ff6e6e6e","ff7d7d7d","ff787878","ff0a0a0a"],"name":"ff737373","troops":2,"x":1411,"y":205} +{"connections":["ff737373","ff7d7d7d","ff1e1e1e"],"name":"ff787878","troops":4,"x":1457,"y":381} +{"connections":["ff737373","ff787878","ff828282","ff6e6e6e"],"name":"ff7d7d7d","troops":1,"x":1313,"y":335} +{"connections":["ff7d7d7d","ff5f5f5f","ff696969","ff878787","ff6e6e6e"],"name":"ff828282","troops":4,"x":1306,"y":485} +{"connections":["ff828282","ff8c8c8c","ff696969"],"name":"ff878787","troops":3,"x":1396,"y":673} +{"connections":["ff878787","ff373737","ff323232"],"name":"ff8c8c8c","troops":2,"x":1442,"y":823} diff --git a/Scenes/Levels/Level Creator.tscn b/Scenes/Levels/Level Creator.tscn index 392d07f..9e4d932 100644 --- a/Scenes/Levels/Level Creator.tscn +++ b/Scenes/Levels/Level Creator.tscn @@ -1,30 +1,9 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=3 format=2] [ext_resource path="res://Scripts/Levels/Level Creator.gd" type="Script" id=1] -[ext_resource path="res://Assets/Our World.png" type="Texture" id=2] [ext_resource path="res://Scenes/Levels/Level Components/Drag_Camera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Assets/No Mans Land.png" type="Texture" id=4] -[ext_resource path="res://Assets/Crucible.png" type="Texture" id=5] [node name="Level Creator" type="Node2D"] script = ExtResource( 1 ) [node name="Camera2D" parent="." instance=ExtResource( 3 )] - -[node name="Our World" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 2 ) -centered = false - -[node name="Crucible" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 5 ) -centered = false - -[node name="No Mans Land" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 4 ) -centered = false diff --git a/Scenes/Levels/Level Main.tscn b/Scenes/Levels/Level Main.tscn index 99546b0..243663f 100644 --- a/Scenes/Levels/Level Main.tscn +++ b/Scenes/Levels/Level Main.tscn @@ -1,10 +1,7 @@ -[gd_scene load_steps=21 format=2] +[gd_scene load_steps=18 format=2] -[ext_resource path="res://Assets/Our World.png" type="Texture" id=1] [ext_resource path="res://Scripts/Levels/Level Main.gd" type="Script" id=2] [ext_resource path="res://Scenes/Levels/Level Components/Drag_Camera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Assets/Crucible.png" type="Texture" id=4] -[ext_resource path="res://Assets/No Mans Land.png" type="Texture" id=5] [ext_resource path="res://Scenes/Levels/Level Components/Player.tscn" type="PackedScene" id=6] [ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=7] [ext_resource path="res://Assets/Fonts/Font_50.tres" type="DynamicFont" id=8] @@ -454,28 +451,10 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Our World" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 1 ) -centered = false - [node name="Camera2D" parent="." instance=ExtResource( 3 )] position = Vector2( 0, 0 ) anchor_mode = 0 -[node name="Crucible" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 4 ) -centered = false - -[node name="No Mans Land" type="Sprite" parent="."] -visible = false -scale = Vector2( 0.5, 0.5 ) -texture = ExtResource( 5 ) -centered = false - [node name="ParallaxBackground" type="ParallaxBackground" parent="."] scroll_limit_end = Vector2( 0, 1080 ) diff --git a/Scenes/UI/Level Select.tscn b/Scenes/UI/Level Select.tscn index bdddafe..de25a3a 100644 --- a/Scenes/UI/Level Select.tscn +++ b/Scenes/UI/Level Select.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=16 format=2] [ext_resource path="res://Assets/Montserrat-Regular.ttf" type="DynamicFontData" id=1] [ext_resource path="res://Assets/Fonts/Font_100.tres" type="DynamicFont" id=2] @@ -6,10 +6,14 @@ [ext_resource path="res://Assets/Our World.png" type="Texture" id=4] [ext_resource path="res://Assets/Crucible.png" type="Texture" id=5] [ext_resource path="res://Scripts/UI/Level Select.gd" type="Script" id=6] -[ext_resource path="res://Assets/Crucible_Hover.png" type="Texture" id=7] -[ext_resource path="res://Assets/Our World Hover.png" type="Texture" id=8] -[ext_resource path="res://Assets/No Mans Land Hover.png" type="Texture" id=9] +[ext_resource path="res://Assets/No Mans Land Mask.png" type="Texture" id=7] +[ext_resource path="res://Assets/Our World Mask.png" type="Texture" id=8] +[ext_resource path="res://Assets/Crucible Mask.png" type="Texture" id=9] [ext_resource path="res://Assets/back-arrow.svg" type="Texture" id=10] +[ext_resource path="res://Assets/Isle of the Fyre Mask.png" type="Texture" id=11] +[ext_resource path="res://Assets/Novingrad.png" type="Texture" id=12] +[ext_resource path="res://Assets/Isle of the Fyre.png" type="Texture" id=13] +[ext_resource path="res://Assets/Novingrad Mask.png" type="Texture" id=14] [sub_resource type="DynamicFont" id=1] size = 200 @@ -34,9 +38,9 @@ __meta__ = { [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] margin_left = 41.0 -margin_top = 151.0 +margin_top = 175.0 margin_right = 1879.0 -margin_bottom = 927.0 +margin_bottom = 1005.0 [node name="CenterContainer3" type="CenterContainer" parent="CenterContainer/VBoxContainer"] margin_right = 1838.0 @@ -66,50 +70,83 @@ __meta__ = { [node name="CenterContainer" type="CenterContainer" parent="CenterContainer/VBoxContainer"] margin_top = 376.0 margin_right = 1838.0 -margin_bottom = 776.0 +margin_bottom = 601.0 [node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer/CenterContainer"] -margin_left = 63.0 -margin_right = 1775.0 -margin_bottom = 400.0 +margin_left = 315.0 +margin_right = 1523.0 +margin_bottom = 225.0 rect_clip_content = true [node name="Crucible" type="TextureButton" parent="CenterContainer/VBoxContainer/CenterContainer/HBoxContainer"] margin_right = 400.0 -margin_bottom = 400.0 -rect_min_size = Vector2( 400, 400 ) +margin_bottom = 225.0 +rect_min_size = Vector2( 400, 225 ) texture_normal = ExtResource( 5 ) -texture_hover = ExtResource( 7 ) +texture_hover = ExtResource( 9 ) expand = true stretch_mode = 5 [node name="No Mans Land" type="TextureButton" parent="CenterContainer/VBoxContainer/CenterContainer/HBoxContainer"] margin_left = 404.0 margin_right = 804.0 -margin_bottom = 400.0 -rect_min_size = Vector2( 400, 400 ) +margin_bottom = 225.0 +rect_min_size = Vector2( 400, 225 ) texture_normal = ExtResource( 3 ) -texture_hover = ExtResource( 9 ) +texture_hover = ExtResource( 7 ) expand = true stretch_mode = 5 [node name="Our World" type="TextureButton" parent="CenterContainer/VBoxContainer/CenterContainer/HBoxContainer"] margin_left = 808.0 margin_right = 1208.0 -margin_bottom = 400.0 -rect_min_size = Vector2( 400, 400 ) +margin_bottom = 225.0 +rect_min_size = Vector2( 400, 225 ) texture_normal = ExtResource( 4 ) texture_hover = ExtResource( 8 ) expand = true stretch_mode = 5 -[node name="Random" type="Button" parent="CenterContainer/VBoxContainer/CenterContainer/HBoxContainer"] -margin_left = 1212.0 -margin_right = 1712.0 -margin_bottom = 400.0 -rect_min_size = Vector2( 400, 400 ) +[node name="CenterContainer4" type="CenterContainer" parent="CenterContainer/VBoxContainer"] +margin_top = 605.0 +margin_right = 1838.0 +margin_bottom = 830.0 + +[node name="HBoxContainer" type="HBoxContainer" parent="CenterContainer/VBoxContainer/CenterContainer4"] +margin_left = 315.0 +margin_right = 1523.0 +margin_bottom = 225.0 + +[node name="Isle of the Fyre" type="TextureButton" parent="CenterContainer/VBoxContainer/CenterContainer4/HBoxContainer"] +margin_right = 400.0 +margin_bottom = 225.0 +rect_min_size = Vector2( 400, 225 ) +texture_normal = ExtResource( 13 ) +texture_hover = ExtResource( 11 ) +expand = true +stretch_mode = 5 + +[node name="Novingrad" type="TextureButton" parent="CenterContainer/VBoxContainer/CenterContainer4/HBoxContainer"] +margin_left = 404.0 +margin_right = 804.0 +margin_bottom = 225.0 +rect_min_size = Vector2( 400, 225 ) +texture_normal = ExtResource( 12 ) +texture_hover = ExtResource( 14 ) +expand = true +stretch_mode = 5 + +[node name="Random" type="Button" parent="CenterContainer/VBoxContainer/CenterContainer4/HBoxContainer"] +margin_left = 808.0 +margin_right = 1208.0 +margin_bottom = 225.0 +grow_horizontal = 2 +grow_vertical = 2 +rect_min_size = Vector2( 400, 225 ) +size_flags_horizontal = 15 +size_flags_vertical = 15 custom_fonts/font = ExtResource( 2 ) -text = "RANDOM" +text = "RAND" [node name="TextureButton" type="TextureButton" parent="."] margin_right = 40.0 diff --git a/Scenes/UI/Local Online.tscn b/Scenes/UI/Local Online.tscn index 439c74b..1ad1a61 100644 --- a/Scenes/UI/Local Online.tscn +++ b/Scenes/UI/Local Online.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=5 format=2] [ext_resource path="res://Assets/Fonts/Font_200.tres" type="DynamicFont" id=1] [ext_resource path="res://Scripts/UI/Local Online.gd" type="Script" id=2] [ext_resource path="res://Scenes/UI/Menu Item.tscn" type="PackedScene" id=3] +[ext_resource path="res://icon.png" type="Texture" id=4] [node name="Menu1" type="Control"] anchor_right = 1.0 @@ -17,14 +18,25 @@ margin_bottom = 1080.0 [node name="VBoxContainer" type="VBoxContainer" parent="CenterContainer"] margin_left = 41.0 -margin_top = 282.0 +margin_top = 152.0 margin_right = 1879.0 -margin_bottom = 797.0 +margin_bottom = 927.0 script = ExtResource( 2 ) +[node name="CenterContainer" type="CenterContainer" parent="CenterContainer/VBoxContainer"] +margin_right = 1838.0 +margin_bottom = 256.0 + +[node name="Sprite" type="TextureRect" parent="CenterContainer/VBoxContainer/CenterContainer"] +margin_left = 791.0 +margin_right = 1047.0 +margin_bottom = 256.0 +texture = ExtResource( 4 ) + [node name="Label" type="Label" parent="CenterContainer/VBoxContainer"] +margin_top = 260.0 margin_right = 1838.0 -margin_bottom = 245.0 +margin_bottom = 505.0 custom_fonts/font = ExtResource( 1 ) text = "Deterministic Risk" @@ -32,16 +44,16 @@ text = "Deterministic Risk" anchor_left = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 249.0 +margin_top = 509.0 margin_right = 1838.0 -margin_bottom = 380.0 +margin_bottom = 640.0 item_name = "Local" [node name="Online" parent="CenterContainer/VBoxContainer" instance=ExtResource( 3 )] anchor_left = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -margin_top = 384.0 +margin_top = 644.0 margin_right = 1838.0 -margin_bottom = 515.0 +margin_bottom = 775.0 item_name = "Online" diff --git a/Scripts/Level_Funcs.gd b/Scripts/Level_Funcs.gd index 50dd484..2955dd3 100644 --- a/Scripts/Level_Funcs.gd +++ b/Scripts/Level_Funcs.gd @@ -50,8 +50,8 @@ func export_level(save_name): save_game.open("res://" + save_name + ".save", File.WRITE) # Converting each country to a json and dumping them all var arr = all_countries.values() + print(arr) arr.sort_custom(self, "country_comparator") - print(all_countries) for country in arr: save_game.store_line(to_json(country.save())) save_game.close() @@ -64,16 +64,14 @@ func select_random(array): rng.randomize() return array[rng.randi() % len(array)] -func import_level(level_node, _world_str): +func import_level(level_node, _world_str, bool_load_countries): world_str = _world_str # Instantiating countries var save_game = File.new() - # Set up the save locations and sprite references - var worlds = {"Crucible": level_node.get_node("Crucible"), \ - "Our World": level_node.get_node("Our World"), \ - "No Mans Land": level_node.get_node("No Mans Land")} + # Set up the save locations + var worlds = ["Crucible", "Our World", "No Mans Land", "Isle of the Fyre"] # Check if all the save files exist for world in worlds: @@ -83,16 +81,28 @@ func import_level(level_node, _world_str): # Pick the random world if the world_str is empty if not world_str: - world_str = select_random(worlds.keys()) - world_sprite = worlds[world_str] + world_str = select_random(worlds) - # Make visible the sprite of the selected world and get the location of the save - var save_file_location = "res://" + world_str + ".save" + # Make visible the sprite of the selected world + world_sprite = Sprite.new() + world_sprite.texture = load("res://Assets/" + world_str + ".png") world_sprite.visible = true + world_sprite.scale = Vector2(0.5,0.5) + world_sprite.centered = false + world_sprite.z_index = -5 + level_node.add_child(world_sprite) + + # Get the location of the save + var save_file_location = "res://" + world_str + ".save" + # Load up the mask world_mask = load("res://Assets/" + world_str + " Mask.png").get_data() world_mask.lock() + # Early return if asked to not load countries + if not bool_load_countries: + return true + save_game.open(save_file_location, File.READ) # Going through the json save @@ -113,8 +123,10 @@ func import_level(level_node, _world_str): # A line to visualize adjacent countries in the level creator func draw_lines_between_countries(): for country in all_countries.values(): - for neighbour in country.connected_countries: - country.draw_line_to_country(neighbour) + if country: + if country.connected_countries: + for neighbour in country.connected_countries: + country.draw_line_to_country(neighbour) func remove_lines_between_countries(): for country in all_countries.values(): @@ -130,5 +142,5 @@ func add_connections(source_country_name, destination_country_names): all_countries[source_country_name].add_connection(all_countries[destination_country_name]) func get_color_in_mask(): - return world_mask.get_pixel(get_local_mouse_position()[0]*scale_ratio, get_local_mouse_position()[1]*scale_ratio)*255 + return world_mask.get_pixel(get_local_mouse_position()[0]*scale_ratio, get_local_mouse_position()[1]*scale_ratio).to_html() diff --git a/Scripts/Levels/Level Components/Country.gd b/Scripts/Levels/Level Components/Country.gd index e58a2ac..b029687 100644 --- a/Scripts/Levels/Level Components/Country.gd +++ b/Scripts/Levels/Level Components/Country.gd @@ -76,8 +76,8 @@ func flash_attackable_neighbours(player): func draw_line_to_country(selected_country): var new_line = Line2D.new() add_child(new_line) - new_line.add_point(Vector2(0,0)) - new_line.add_point(selected_country.position - position) + new_line.add_point(Vector2(20,20)) + new_line.add_point(selected_country.position - position + Vector2(20,20)) func get_attackable_countries(): var attackable_countries = [] @@ -88,7 +88,7 @@ func get_attackable_countries(): func _input_event(viewport, event, shape_idx): if get_tree().get_current_scene().get_name() == "Level Creator": - if event.is_action_just_released(): + if event.is_pressed(): self.on_click(event) func move_to_location_with_duration(location, duration): @@ -112,8 +112,12 @@ func on_click(event): num_troops -=1 "add countries": + # Country deletion if event.button_index == BUTTON_RIGHT: - Game_Manager.all_countries.erase(self) + Game_Manager.all_countries.erase(country_name) + for country in connected_countries: + print(country.name) + country.connected_countries.erase(self) queue_free() "connect countries": @@ -122,17 +126,18 @@ func on_click(event): elif Game_Manager.selected_country != self: connected_countries.append(Game_Manager.selected_country) Game_Manager.selected_country.connected_countries.append(self) - draw_line_to_country(Game_Manager.selected_country) + if Game_Manager.lines_drawn: + draw_line_to_country(Game_Manager.selected_country) Game_Manager.selected_country = null "move countries": Game_Manager.selected_country = self "add color to country": - var color = Game_Manager.get_color_in_mask()[0] + var color = str(Game_Manager.get_color_in_mask()) for country in connected_countries: for i in len(country.connected_countries): - if country.connected_countries[i].country_name == country_name: + if str(country.connected_countries[i].country_name) == str(country_name): country.connected_countries[i].country_name = color country_name = color @@ -274,7 +279,7 @@ func create_flash_mask_sprite(): # Changing the select country to white and everything else to transparent var flash_shader = Game_Manager.flash_shader.duplicate() - flash_shader.set_shader_param("u_color_key", Color8(country_name,country_name,country_name,255)) + flash_shader.set_shader_param("u_color_key", Color(country_name)) flash_shader.set_shader_param("u_highlight_color", Color8(255,255,255,255)) flash_shader.set_shader_param("u_background_color", Color8(0,0,0,0)) flash_mask_sprite.set_material(flash_shader) diff --git a/Scripts/Levels/Level Creator.gd b/Scripts/Levels/Level Creator.gd index 5586027..5049b82 100644 --- a/Scripts/Levels/Level Creator.gd +++ b/Scripts/Levels/Level Creator.gd @@ -9,7 +9,7 @@ var add_countries_button = null var export_level_button = null var connect_countries_button = null var information_label = null -var _world_str = "No Mans Land" +var _world_str = "Novingrad" # Called when the node enters the scene tree for the first time. func _ready(): @@ -74,14 +74,16 @@ func _ready(): var save_game = File.new() #Comment out the below lines to have a brand new world - .import_level(self, _world_str) + .import_level(self, _world_str, true) func toggle_lines(): if lines_drawn: .remove_lines_between_countries() else: .draw_lines_between_countries() + print(lines_drawn) lines_drawn = not lines_drawn + print(lines_drawn) func update_labels(): match phase: @@ -109,7 +111,7 @@ func _input(event): # Dead zone for buttons if coordinate[0] < 250 and coordinate[1] < 250: return - var new_country = Country.instance().init(coordinate[0], coordinate[1], hash(OS.get_system_time_msecs()), null) + var new_country = Country.instance().init(coordinate[0]-20, coordinate[1]-20, str(hash(OS.get_system_time_msecs())), player_neutral) add_country_to_level(new_country) add_child(new_country) diff --git a/Scripts/Levels/Level Main.gd b/Scripts/Levels/Level Main.gd index 2f3005b..b27beb2 100644 --- a/Scripts/Levels/Level Main.gd +++ b/Scripts/Levels/Level Main.gd @@ -35,7 +35,7 @@ func init(world_str): func load_world(world_str): # Loading existing level - if .import_level(self, world_str): + if .import_level(self, world_str, true): print("imported") # Load the default half complete earth level else: @@ -410,11 +410,9 @@ func _input(event): input_allowed = false if not (Rect2(Vector2(0,0), world_mask.get_size()).has_point(get_local_mouse_position())): return - - # Print color of pixel under mouse cursor when clicked - print(get_color_in_mask()) - - var country_name = get_color_in_mask()[0] + + var country_name = str(get_color_in_mask()) + print(all_countries) if country_name in all_countries: all_countries[country_name].on_click(event) diff --git a/Scripts/UI/Level Select.gd b/Scripts/UI/Level Select.gd index 228aedc..a957918 100644 --- a/Scripts/UI/Level Select.gd +++ b/Scripts/UI/Level Select.gd @@ -9,6 +9,9 @@ func _ready(): container.get_node("Crucible").connect("button_down", self, "_load_scene", ["Levels/Level Main", "Crucible"]) container.get_node("No Mans Land").connect("button_down", self, "_load_scene", ["Levels/Level Main", "No Mans Land"]) container.get_node("Our World").connect("button_down", self, "_load_scene", ["Levels/Level Main", "Our World"]) + container = $CenterContainer/VBoxContainer/CenterContainer4/HBoxContainer/ + container.get_node("Isle of the Fyre").connect("button_down", self, "_load_scene", ["Levels/Level Main", "Isle of the Fyre"]) + container.get_node("Novingrad").connect("button_down", self, "_load_scene", ["Levels/Level Main", "Novingrad"]) container.get_node("Random").connect("button_down", self, "_load_scene", ["Levels/Level Main", ""]) $TextureButton.connect("button_down", self, "back") diff --git a/export_presets.cfg b/export_presets.cfg index 23e0fb7..827a5dd 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -55,7 +55,7 @@ codesign/timestamp_server_url="" codesign/digest_algorithm=1 codesign/description="" codesign/custom_options=PoolStringArray( ) -application/icon="" +application/icon="res://icon.ico" application/file_version="" application/product_version="" application/company_name="" diff --git a/icon.ico b/icon.ico new file mode 100644 index 0000000..da228a0 Binary files /dev/null and b/icon.ico differ diff --git a/icon.png b/icon.png index c98fbb6..8a27e6e 100644 Binary files a/icon.png and b/icon.png differ diff --git a/project.godot b/project.godot index 1ee1d05..26546e6 100644 --- a/project.godot +++ b/project.godot @@ -35,6 +35,7 @@ _global_script_class_icons={ config/name="Risky Nodes" run/main_scene="res://Scenes/Main.tscn" config/icon="res://icon.png" +config/windows_native_icon="res://icon.ico" [display]