diff --git a/TODO.txt b/TODO.txt index b788dea54..19b1820ed 100644 --- a/TODO.txt +++ b/TODO.txt @@ -161,8 +161,8 @@ * disable select on mobile DONE 10/6/2024 * disable double tap on mobile DONE 10/6/2024 * donate troops button DONE 10/7/2024 -* rewrite mobile input handling * Make fake humans spawn by their country +* rewrite mobile input handling * fake humans target enemies * create private lobby menu * block user inputs if too far behind server diff --git a/resources/WorldMapCountries.txt b/resources/WorldMapCountries.txt new file mode 100644 index 000000000..81326a3ba --- /dev/null +++ b/resources/WorldMapCountries.txt @@ -0,0 +1,45 @@ +clicked cell Cell[375,272] USA +clicked cell Cell[372,136] Canada +clicked cell Cell[375,374] Mexico +clicked cell Cell[500,378] Cuba +clicked cell Cell[524,474] Columbia +clicked cell Cell[593,473] Venezuala +clicked cell Cell[596,705] Argentina +clicked cell Cell[637,567] Brazil +clicked cell Cell[1280,975] Antartica +clicked cell Cell[709,57] Greenland +clicked cell Cell[831,112] Iceland +clicked cell Cell[925,186] England +clicked cell Cell[887,183] Ireland +clicked cell Cell[908,264] Spain +clicked cell Cell[1004,250] Italy +clicked cell Cell[958,220] France +clicked cell Cell[997,205] Germany +clicked cell Cell[1064,101] Sweden +clicked cell Cell[1046,193] Poland +clicked cell Cell[1061,188] Belarus +clicked cell Cell[1073,243] Romania +clicked cell Cell[1161,274] Turkiye +clicked cell Cell[969,133] Norway +clicked cell Cell[1062,133] Finland +clicked cell Cell[1099,211] Ukraine +clicked cell Cell[1344,136] Russia +clicked cell Cell[1537,186] Mongolia +clicked cell Cell[1524,328] China +clicked cell Cell[1368,373] India +clicked cell Cell[1276,239] Kazakhstan +clicked cell Cell[1238,309] Iran +clicked cell Cell[1178,351] Saudi Arabia +clicked cell Cell[1679,657] Australia +clicked cell Cell[1890,775] New Zealand +clicked cell Cell[1569,502] Belgium +clicked cell Cell[918,342] Algeria +clicked cell Cell[1030,332] Libia +clicked cell Cell[1092,335] Egypt +clicked cell Cell[963,410] Niger +clicked cell Cell[1112,406] Sudan +clicked cell Cell[1074,508] DRC +clicked cell Cell[1154,443] Ethiopia +clicked cell Cell[1075,707] South Africa +clicked cell Cell[1194,627] Madagascar +clicked cell Cell[1052,420] Chad \ No newline at end of file diff --git a/resources/countries.txt b/resources/countries.txt deleted file mode 100644 index 05add4056..000000000 --- a/resources/countries.txt +++ /dev/null @@ -1,4 +0,0 @@ -clicked cell Cell[375,272] USA -clicked cell Cell[372,136] Canada -clicked cell Cell[375,374] Mexico -clicked cell Cell[500,378] Cuba diff --git a/resources/maps/Europe.png b/resources/maps/Europe.png deleted file mode 100644 index 415ab1bea..000000000 Binary files a/resources/maps/Europe.png and /dev/null differ diff --git a/resources/maps/World.png b/resources/maps/World.png deleted file mode 100644 index 921044c21..000000000 Binary files a/resources/maps/World.png and /dev/null differ diff --git a/resources/TopoWorldMap.bin b/resources/maps/WorldMap.bin similarity index 100% rename from resources/TopoWorldMap.bin rename to resources/maps/WorldMap.bin diff --git a/resources/maps/WorldMap.json b/resources/maps/WorldMap.json new file mode 100644 index 000000000..f2117e0bb --- /dev/null +++ b/resources/maps/WorldMap.json @@ -0,0 +1,367 @@ +{ + "name": "World", + "width": 2000, + "height": 1000, + "countries": [ + { + "coordinates": [ + 375, + 272 + ], + "name": "USA", + "strength": 1 + }, + { + "coordinates": [ + 372, + 136 + ], + "name": "Canada", + "strength": 1 + }, + { + "coordinates": [ + 375, + 374 + ], + "name": "Mexico", + "strength": 1 + }, + { + "coordinates": [ + 500, + 378 + ], + "name": "Cuba", + "strength": 1 + }, + { + "coordinates": [ + 524, + 474 + ], + "name": "Columbia", + "strength": 1 + }, + { + "coordinates": [ + 593, + 473 + ], + "name": "Venezuala", + "strength": 1 + }, + { + "coordinates": [ + 596, + 705 + ], + "name": "Argentina", + "strength": 1 + }, + { + "coordinates": [ + 637, + 567 + ], + "name": "Brazil", + "strength": 1 + }, + { + "coordinates": [ + 1280, + 975 + ], + "name": "Antartica", + "strength": 1 + }, + { + "coordinates": [ + 709, + 57 + ], + "name": "Greenland", + "strength": 1 + }, + { + "coordinates": [ + 831, + 112 + ], + "name": "Iceland", + "strength": 1 + }, + { + "coordinates": [ + 925, + 186 + ], + "name": "England", + "strength": 1 + }, + { + "coordinates": [ + 887, + 183 + ], + "name": "Ireland", + "strength": 1 + }, + { + "coordinates": [ + 908, + 264 + ], + "name": "Spain", + "strength": 1 + }, + { + "coordinates": [ + 1004, + 250 + ], + "name": "Italy", + "strength": 1 + }, + { + "coordinates": [ + 958, + 220 + ], + "name": "France", + "strength": 1 + }, + { + "coordinates": [ + 997, + 205 + ], + "name": "Germany", + "strength": 1 + }, + { + "coordinates": [ + 1064, + 101 + ], + "name": "Sweden", + "strength": 1 + }, + { + "coordinates": [ + 1046, + 193 + ], + "name": "Poland", + "strength": 1 + }, + { + "coordinates": [ + 1061, + 188 + ], + "name": "Belarus", + "strength": 1 + }, + { + "coordinates": [ + 1073, + 243 + ], + "name": "Romania", + "strength": 1 + }, + { + "coordinates": [ + 1161, + 274 + ], + "name": "Turkiye", + "strength": 1 + }, + { + "coordinates": [ + 969, + 133 + ], + "name": "Norway", + "strength": 1 + }, + { + "coordinates": [ + 1062, + 133 + ], + "name": "Finland", + "strength": 1 + }, + { + "coordinates": [ + 1099, + 211 + ], + "name": "Ukraine", + "strength": 1 + }, + { + "coordinates": [ + 1344, + 136 + ], + "name": "Russia", + "strength": 1 + }, + { + "coordinates": [ + 1537, + 186 + ], + "name": "Mongolia", + "strength": 1 + }, + { + "coordinates": [ + 1524, + 328 + ], + "name": "China", + "strength": 1 + }, + { + "coordinates": [ + 1368, + 373 + ], + "name": "India", + "strength": 1 + }, + { + "coordinates": [ + 1276, + 239 + ], + "name": "Kazakhstan", + "strength": 1 + }, + { + "coordinates": [ + 1238, + 309 + ], + "name": "Iran", + "strength": 1 + }, + { + "coordinates": [ + 1178, + 351 + ], + "name": "Saudi Arabia", + "strength": 1 + }, + { + "coordinates": [ + 1679, + 657 + ], + "name": "Australia", + "strength": 1 + }, + { + "coordinates": [ + 1890, + 775 + ], + "name": "New Zealand", + "strength": 1 + }, + { + "coordinates": [ + 1569, + 502 + ], + "name": "Belgium", + "strength": 1 + }, + { + "coordinates": [ + 918, + 342 + ], + "name": "Algeria", + "strength": 1 + }, + { + "coordinates": [ + 1030, + 332 + ], + "name": "Libia", + "strength": 1 + }, + { + "coordinates": [ + 1092, + 335 + ], + "name": "Egypt", + "strength": 1 + }, + { + "coordinates": [ + 963, + 410 + ], + "name": "Niger", + "strength": 1 + }, + { + "coordinates": [ + 1112, + 406 + ], + "name": "Sudan", + "strength": 1 + }, + { + "coordinates": [ + 1074, + 508 + ], + "name": "DRC", + "strength": 1 + }, + { + "coordinates": [ + 1154, + 443 + ], + "name": "Ethiopia", + "strength": 1 + }, + { + "coordinates": [ + 1075, + 707 + ], + "name": "South Africa", + "strength": 1 + }, + { + "coordinates": [ + 1194, + 627 + ], + "name": "Madagascar", + "strength": 1 + }, + { + "coordinates": [ + 1052, + 420 + ], + "name": "Chad", + "strength": 1 + } + ] +} \ No newline at end of file diff --git a/resources/maps/TopoWorldMap.png b/resources/maps/WorldMap.png similarity index 100% rename from resources/maps/TopoWorldMap.png rename to resources/maps/WorldMap.png diff --git a/resources/maps/WorldOriginal.png b/resources/maps/WorldOriginal.png deleted file mode 100644 index d2c590718..000000000 Binary files a/resources/maps/WorldOriginal.png and /dev/null differ diff --git a/resources/maps/WorldSmall.png b/resources/maps/WorldSmall.png deleted file mode 100644 index 66031778e..000000000 Binary files a/resources/maps/WorldSmall.png and /dev/null differ