diff --git a/android/Images/ImprovementIcons/Holy site.png b/android/Images/ImprovementIcons/Holy site.png new file mode 100644 index 0000000000..45106d46a7 Binary files /dev/null and b/android/Images/ImprovementIcons/Holy site.png differ diff --git a/android/ImagesToPackSeparately/UnitIcons/Great Prophet.png b/android/ImagesToPackSeparately/UnitIcons/Great Prophet.png new file mode 100644 index 0000000000..ff05ac3a28 Binary files /dev/null and b/android/ImagesToPackSeparately/UnitIcons/Great Prophet.png differ diff --git a/android/assets/UnitIcons.atlas b/android/assets/UnitIcons.atlas index de82a1e926..e26b81e6f9 100644 --- a/android/assets/UnitIcons.atlas +++ b/android/assets/UnitIcons.atlas @@ -263,485 +263,492 @@ Great Merchant orig: 100, 100 offset: 0, 0 index: -1 -Great Scientist +Great Prophet rotate: false xy: 112, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Great War Bomber +Great Scientist rotate: false xy: 220, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Great War Infantry +Great War Bomber rotate: false xy: 328, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Guided Missile +Great War Infantry rotate: false xy: 436, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Helicopter Gunship +Guided Missile rotate: false xy: 544, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hoplite +Helicopter Gunship rotate: false xy: 652, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Horse Archer +Hoplite rotate: false xy: 760, 766 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Horseman +Horse Archer rotate: false xy: 868, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Hwach'a +Horseman rotate: false xy: 112, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Infantry +Hwach'a rotate: false xy: 220, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Ironclad +Infantry rotate: false xy: 328, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Jaguar +Ironclad rotate: false xy: 436, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Janissary +Jaguar rotate: false xy: 544, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Jet Fighter +Janissary rotate: false xy: 652, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Keshik +Jet Fighter rotate: false xy: 760, 658 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Khan +Keshik rotate: false xy: 868, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Knight +Khan rotate: false xy: 976, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Lancer +Knight rotate: false xy: 220, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Landship +Lancer rotate: false xy: 328, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Landsknecht +Landship rotate: false xy: 436, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Legion +Landsknecht rotate: false xy: 544, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Longbowman +Legion rotate: false xy: 652, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Longswordsman +Longbowman rotate: false xy: 760, 550 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Machine Gun +Longswordsman rotate: false xy: 868, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mandekalu Cavalry +Machine Gun rotate: false xy: 976, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Maori Warrior +Mandekalu Cavalry rotate: false xy: 1084, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Marine +Maori Warrior rotate: false xy: 328, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mechanized Infantry +Marine rotate: false xy: 436, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Minuteman +Mechanized Infantry rotate: false xy: 544, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Missile Cruiser +Minuteman rotate: false xy: 652, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mobile SAM +Missile Cruiser rotate: false xy: 760, 442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Modern Armor +Mobile SAM rotate: false xy: 868, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Mohawk Warrior +Modern Armor rotate: false xy: 976, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -Musketeer +Mohawk Warrior rotate: false xy: 1084, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +Musketeer + rotate: false + xy: 1192, 868 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 Musketman rotate: false - xy: 1192, 869 + xy: 436, 5 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 Naresuan's Elephant rotate: false - xy: 436, 4 + xy: 544, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Norwegian Ski Infantry rotate: false - xy: 544, 112 + xy: 652, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Nuclear Missile rotate: false - xy: 652, 220 + xy: 760, 334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Nuclear Submarine rotate: false - xy: 760, 334 + xy: 868, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Panzer rotate: false - xy: 868, 436 + xy: 976, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Paratrooper rotate: false - xy: 976, 544 + xy: 1084, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Persian Immortal rotate: false - xy: 1084, 652 + xy: 1192, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Pikeman rotate: false - xy: 1192, 761 + xy: 1300, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Privateer rotate: false - xy: 1300, 868 + xy: 652, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Rifleman rotate: false - xy: 544, 4 + xy: 760, 226 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Rocket Artillery rotate: false - xy: 652, 112 + xy: 868, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Samurai rotate: false - xy: 760, 226 + xy: 976, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Scout rotate: false - xy: 868, 328 + xy: 1084, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Sea Beggar rotate: false - xy: 976, 436 + xy: 1192, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Settler rotate: false - xy: 1084, 544 + xy: 1300, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Ship of the Line rotate: false - xy: 1192, 653 + xy: 1408, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Sipahi rotate: false - xy: 1300, 760 + xy: 760, 118 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Slinger rotate: false - xy: 1408, 868 + xy: 868, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Spearman rotate: false - xy: 652, 4 + xy: 976, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Stealth Bomber rotate: false - xy: 760, 118 + xy: 1084, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Submarine rotate: false - xy: 868, 220 + xy: 1192, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Swordsman rotate: false - xy: 976, 328 + xy: 1300, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Tank rotate: false - xy: 1084, 436 + xy: 1408, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Tercio rotate: false - xy: 1192, 545 + xy: 1516, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Trebuchet rotate: false - xy: 1300, 652 + xy: 976, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Triplane rotate: false - xy: 1408, 760 + xy: 1084, 328 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Trireme rotate: false - xy: 1516, 867 + xy: 1192, 435 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 Turtle Ship rotate: false - xy: 760, 10 + xy: 1300, 544 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 War Chariot rotate: false - xy: 868, 112 + xy: 1408, 652 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 War Elephant rotate: false - xy: 976, 220 + xy: 1516, 760 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Warrior rotate: false - xy: 1084, 328 + xy: 1624, 868 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Work Boats rotate: false - xy: 1192, 437 + xy: 1084, 220 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Worker rotate: false - xy: 1300, 544 + xy: 1192, 327 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 Zero rotate: false - xy: 1408, 652 + xy: 1300, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 diff --git a/android/assets/UnitIcons.png b/android/assets/UnitIcons.png index e8235ffdee..38c140ce2b 100644 Binary files a/android/assets/UnitIcons.png and b/android/assets/UnitIcons.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 7a86a17de9..c30f2b8045 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -6,21 +6,21 @@ filter: MipMapLinearLinear, MipMapLinearLinear repeat: none EmojiIcons/Gold rotate: false - xy: 1932, 1604 + xy: 1166, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Production rotate: false - xy: 1581, 1136 + xy: 1701, 1310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 EmojiIcons/Turn rotate: false - xy: 1759, 1310 + xy: 1590, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -102,93 +102,100 @@ ImprovementIcons/Fort orig: 100, 100 offset: 0, 0 index: -1 +ImprovementIcons/Holy site + rotate: false + xy: 1600, 1542 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 ImprovementIcons/Landmark rotate: false - xy: 320, 940 + xy: 428, 1048 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 428, 940 + xy: 320, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 536, 940 + xy: 428, 832 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 320, 292 + xy: 536, 508 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Moai rotate: false - xy: 428, 400 + xy: 536, 400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 860, 980 + xy: 752, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Pasture rotate: false - xy: 860, 872 + xy: 752, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1184, 980 + xy: 1076, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Polder rotate: false - xy: 968, 764 + xy: 860, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1184, 872 + xy: 1076, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1400, 872 + xy: 1292, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Terrace farm rotate: false - xy: 1508, 332 + xy: 730, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1162, 224 + xy: 760, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -279,91 +286,91 @@ NationIcons/Greece index: -1 NationIcons/Inca rotate: false - xy: 717, 1088 + xy: 825, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/India rotate: false - xy: 933, 1088 + xy: 1041, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Iroquois rotate: false - xy: 1365, 1088 + xy: 1473, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Japan rotate: false - xy: 220, 71 + xy: 298, 179 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Korea rotate: false - xy: 328, 71 + xy: 320, 1048 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Mongolia rotate: false - xy: 536, 292 + xy: 406, 184 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Persia rotate: false - xy: 1076, 980 + xy: 968, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Polynesia rotate: false - xy: 860, 656 + xy: 752, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 1076, 548 + xy: 968, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 968, 440 + xy: 860, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Siam rotate: false - xy: 968, 332 + xy: 1400, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Songhai rotate: false - xy: 1076, 332 + xy: 1400, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Spain rotate: false - xy: 1400, 548 + xy: 1292, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -377,28 +384,28 @@ NationIcons/The Huns index: -1 NationIcons/The Netherlands rotate: false - xy: 730, 224 + xy: 838, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 838, 224 + xy: 946, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 1816, 1692 + xy: 1816, 1750 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 278, 13 + xy: 1816, 1634 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -482,7 +489,7 @@ OtherIcons/DisbandUnit index: -1 OtherIcons/Down rotate: false - xy: 1224, 58 + xy: 510, 18 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -503,140 +510,140 @@ OtherIcons/Hexagon index: -1 OtherIcons/Link rotate: false - xy: 1494, 216 + xy: 1932, 1778 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/Load rotate: false - xy: 320, 832 + xy: 536, 1048 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Lock rotate: false - xy: 536, 1048 + xy: 428, 940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MapEditor rotate: false - xy: 428, 832 + xy: 320, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 428, 616 + xy: 320, 400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Mods rotate: false - xy: 428, 292 + xy: 536, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Multiplayer rotate: false - xy: 514, 184 + xy: 436, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/New rotate: false - xy: 652, 76 + xy: 644, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Options rotate: false - xy: 644, 656 + xy: 968, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 644, 548 + xy: 1076, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 644, 440 + xy: 1184, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Puppet rotate: false - xy: 1292, 980 + xy: 1184, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quest rotate: false - xy: 1076, 764 + xy: 968, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Quickstart rotate: false - xy: 968, 656 + xy: 860, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Resume rotate: false - xy: 860, 440 + xy: 752, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1076, 440 + xy: 968, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1184, 440 + xy: 1076, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 1400, 446 + xy: 1292, 338 size: 100, 94 orig: 100, 94 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 1508, 764 + xy: 1508, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Swap rotate: false - xy: 1508, 548 + xy: 1508, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -650,14 +657,14 @@ OtherIcons/Triangle index: -1 OtherIcons/Up rotate: false - xy: 1755, 1136 + xy: 1648, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 1812, 1064 + xy: 1874, 1479 size: 1, 1 orig: 1, 1 offset: 0, 0 @@ -671,336 +678,336 @@ PolicyIcons/Aesthetics index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1300, 108 + xy: 1816, 1692 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 684, 18 + xy: 220, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 760, 58 + xy: 278, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 876, 58 + xy: 1474, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Communism rotate: false - xy: 934, 58 + xy: 1532, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 992, 58 + xy: 1474, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Cultural Diplomacy rotate: false - xy: 1108, 58 + xy: 394, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1166, 58 + xy: 452, 18 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Educated Elite rotate: false - xy: 1282, 50 + xy: 626, 18 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Fascism rotate: false - xy: 1932, 1778 + xy: 818, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1874, 1604 + xy: 992, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1932, 1662 + xy: 1050, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1874, 1546 + xy: 1108, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1378, 274 + xy: 1340, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1494, 274 + xy: 1874, 1778 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1552, 274 + xy: 1874, 1720 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1358, 158 + xy: 1932, 1720 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1600, 1484 + xy: 1874, 1546 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Merchant Navy rotate: false - xy: 1658, 1484 + xy: 1932, 1604 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1716, 1484 + xy: 1932, 1546 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1585, 1426 + xy: 1874, 1488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1585, 1368 + xy: 1932, 1488 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1643, 1426 + xy: 1600, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1643, 1368 + xy: 1716, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Nationalism rotate: false - xy: 1643, 1310 + xy: 1643, 1426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Naval Tradition rotate: false - xy: 1701, 1368 + xy: 1585, 1310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1643, 1252 + xy: 1643, 1368 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1701, 1310 + xy: 1701, 1426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Philantropy rotate: false - xy: 1701, 1252 + xy: 1585, 1252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Planned Economy rotate: false - xy: 1585, 1194 + xy: 1643, 1310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1643, 1194 + xy: 1701, 1368 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1701, 1194 + xy: 1643, 1252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1639, 1136 + xy: 1701, 1252 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1697, 1136 + xy: 1585, 1194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1398, 42 + xy: 1581, 1136 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1474, 100 + xy: 1697, 1136 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1456, 42 + xy: 1990, 1778 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scholasticism rotate: false - xy: 1532, 158 + xy: 1990, 1720 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1532, 100 + xy: 1990, 1662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1590, 158 + xy: 1990, 1546 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Socialism rotate: false - xy: 1990, 1778 + xy: 1759, 1426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1990, 1662 + xy: 1759, 1310 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1630, 42 + xy: 1602, 274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1759, 1426 + xy: 1602, 216 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1759, 1368 + xy: 1590, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/United Front rotate: false - xy: 1759, 1252 + xy: 1630, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1759, 1194 + xy: 1648, 158 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1616, 1020 + xy: 1616, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1084,119 +1091,119 @@ ResourceIcons/Gold Ore index: -1 ResourceIcons/Horses rotate: false - xy: 1708, 1650 + xy: 1708, 1542 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 825, 1088 + xy: 933, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1149, 1088 + xy: 1257, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1473, 1088 + xy: 220, 71 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 320, 616 + xy: 536, 832 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 644, 764 + xy: 860, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 752, 764 + xy: 644, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1184, 548 + xy: 1076, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1400, 656 + xy: 1292, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1292, 548 + xy: 1184, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1184, 332 + xy: 1400, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1508, 872 + xy: 1508, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 1508, 656 + xy: 1508, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 760, 116 + xy: 976, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 868, 116 + xy: 1084, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 976, 116 + xy: 1192, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1084, 116 + xy: 1270, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1252,7 +1259,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 1378, 216 + xy: 1456, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1266,7 +1273,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 1585, 1252 + xy: 1585, 1368 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1287,21 +1294,21 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 1416, 158 + xy: 1643, 1194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1416, 100 + xy: 1701, 1194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 968, 548 + xy: 860, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1315,14 +1322,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1292, 440 + xy: 1184, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 1990, 1604 + xy: 1759, 1252 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1581,308 +1588,308 @@ TechIcons/Gunpowder index: -1 TechIcons/Horseback Riding rotate: false - xy: 1600, 1542 + xy: 1708, 1650 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 1041, 1088 + xy: 1149, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1257, 1088 + xy: 1365, 1088 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Lasers rotate: false - xy: 428, 1048 + xy: 320, 832 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 320, 724 + xy: 536, 940 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 428, 724 + xy: 320, 508 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media rotate: false - xy: 320, 508 + xy: 536, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 536, 724 + xy: 428, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 320, 400 + xy: 536, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 536, 616 + xy: 428, 508 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 428, 508 + xy: 320, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 536, 508 + xy: 428, 400 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 536, 400 + xy: 428, 292 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 436, 76 + xy: 544, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 622, 184 + xy: 652, 76 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 644, 980 + xy: 644, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fusion rotate: false - xy: 644, 872 + xy: 752, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 752, 872 + xy: 644, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 968, 980 + xy: 860, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 968, 872 + xy: 860, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 860, 764 + xy: 752, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 752, 656 + xy: 644, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1076, 872 + xy: 968, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 752, 548 + xy: 644, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 644, 332 + xy: 1292, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 860, 548 + xy: 752, 440 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 752, 440 + xy: 1400, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 1400, 980 + xy: 1292, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 1184, 764 + xy: 1076, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 1076, 656 + xy: 968, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 752, 332 + xy: 1400, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1292, 764 + xy: 1184, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 1184, 656 + xy: 1076, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 860, 332 + xy: 1400, 764 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1400, 764 + xy: 1292, 656 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1292, 656 + xy: 1184, 548 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Stealth rotate: false - xy: 1292, 332 + xy: 1400, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1400, 338 + xy: 1508, 980 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1508, 980 + xy: 1508, 872 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Telecommunications rotate: false - xy: 1508, 440 + xy: 1508, 332 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 946, 224 + xy: 1054, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1054, 224 + xy: 1162, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1270, 224 + xy: 868, 116 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1192, 116 + xy: 1378, 224 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1901,6 +1908,20 @@ TileSets/Default/CityOverlay orig: 100, 100 offset: 0, 0 index: -1 +TileSets/Default/CrosshatchHexagon + rotate: false + xy: 4, 1151 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/CrosshatchHexagon + rotate: false + xy: 4, 1151 + size: 273, 236 + orig: 273, 236 + offset: 0, 0 + index: -1 TileSets/Default/FalloutOverlay rotate: false xy: 1261, 1412 @@ -1922,88 +1943,11 @@ TileSets/Default/ForestOverlay orig: 100, 100 offset: 0, 0 index: -1 -TileSets/Default/HillOverlay +TileSets/Default/Hexagon rotate: false - xy: 1600, 1650 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/IceOverlay - rotate: false - xy: 1708, 1542 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/JungleOverlay - rotate: false - xy: 298, 179 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/LakesOverlay - rotate: false - xy: 320, 1048 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/MarshOverlay - rotate: false - xy: 536, 832 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/MountainOverlay - rotate: false - xy: 406, 184 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/NaturalWonderOverlay - rotate: false - xy: 544, 76 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/OasisOverlay - rotate: false - xy: 752, 980 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/Default/Railroad - rotate: false - xy: 1292, 872 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -ImprovementIcons/Railroad - rotate: false - xy: 1292, 872 - size: 100, 100 - orig: 100, 100 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/CrosshatchHexagon - rotate: false - xy: 4, 1151 - size: 273, 236 - orig: 273, 236 - offset: 0, 0 - index: -1 -TileSets/Default/CrosshatchHexagon - rotate: false - xy: 4, 1151 - size: 273, 236 - orig: 273, 236 + xy: 412, 1804 + size: 277, 240 + orig: 277, 240 offset: 0, 0 index: -1 TileSets/FantasyHex/Hexagon @@ -2013,11 +1957,130 @@ TileSets/FantasyHex/Hexagon orig: 277, 240 offset: 0, 0 index: -1 -TileSets/Default/Hexagon +TileSets/Default/HillOverlay rotate: false - xy: 412, 1804 - size: 277, 240 - orig: 277, 240 + xy: 1600, 1650 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/IceOverlay + rotate: false + xy: 717, 1088 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/JungleOverlay + rotate: false + xy: 328, 71 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/LakesOverlay + rotate: false + xy: 320, 940 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/MarshOverlay + rotate: false + xy: 428, 724 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/MountainOverlay + rotate: false + xy: 514, 184 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/NaturalWonderOverlay + rotate: false + xy: 622, 184 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/OasisOverlay + rotate: false + xy: 644, 764 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Railroad + rotate: false + xy: 1184, 764 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +ImprovementIcons/Railroad + rotate: false + xy: 1184, 764 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-Bottom + rotate: false + xy: 1816, 718 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-Bottom + rotate: false + xy: 1816, 718 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomLeft + rotate: false + xy: 1816, 682 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomLeft + rotate: false + xy: 1816, 682 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/Tiles/River-BottomRight + rotate: false + xy: 1816, 646 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/Tiles/River-BottomRight + rotate: false + xy: 1816, 646 + size: 32, 28 + orig: 32, 28 + offset: 0, 0 + index: -1 +TileSets/Default/road + rotate: false + xy: 1529, 1847 + size: 61, 11 + orig: 61, 11 + offset: 0, 0 + index: -1 +TileSets/FantasyHex/road + rotate: false + xy: 1529, 1847 + size: 61, 11 + orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad @@ -2050,7 +2113,7 @@ TileSets/FantasyHex/Tiles/Aluminum index: -1 TileSets/FantasyHex/Tiles/Ancient ruins rotate: false - xy: 1732, 1100 + xy: 1616, 984 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2064,7 +2127,7 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Jungle index: -1 TileSets/FantasyHex/Tiles/Ancient ruins-Sand rotate: false - xy: 1616, 926 + xy: 1674, 1042 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2078,119 +2141,119 @@ TileSets/FantasyHex/Tiles/Ancient ruins-Snow index: -1 TileSets/FantasyHex/Tiles/Ancient ruins2 rotate: false - xy: 1674, 1042 + xy: 1732, 1100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Atoll rotate: false - xy: 1674, 970 + xy: 2009, 1901 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Bananas rotate: false - xy: 1616, 818 + xy: 1616, 840 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment rotate: false - xy: 2009, 1865 + xy: 1616, 804 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barbarian encampment-Snow rotate: false - xy: 1616, 781 + xy: 1616, 767 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Barringer Crater rotate: false - xy: 1616, 745 + xy: 1616, 731 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle rotate: false - xy: 782, 22 + xy: 742, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cattle+Pasture rotate: false - xy: 822, 18 + xy: 782, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cerro de Potosi rotate: false - xy: 902, 22 + xy: 862, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel rotate: false - xy: 1022, 15 + xy: 982, 15 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Citadel-Snow rotate: false - xy: 1062, 20 + xy: 1022, 20 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center rotate: false - xy: 1102, 15 + xy: 1062, 15 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Ancient era rotate: false - xy: 1142, 18 + xy: 1102, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Classical era rotate: false - xy: 1182, 18 + xy: 1142, 18 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Future era rotate: false - xy: 1222, 16 + xy: 1182, 16 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Industrial era rotate: false - xy: 1714, 1023 + xy: 1222, 17 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Information era rotate: false - xy: 1714, 979 + xy: 1714, 1020 size: 32, 36 orig: 32, 36 offset: 0, 0 @@ -2204,840 +2267,798 @@ TileSets/FantasyHex/Tiles/City center-Medieval era index: -1 TileSets/FantasyHex/Tiles/City center-Modern era rotate: false - xy: 1754, 982 + xy: 1656, 964 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City center-Renaissance era rotate: false - xy: 1656, 922 + xy: 1656, 924 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/City ruins rotate: false - xy: 1656, 886 + xy: 1656, 888 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coal rotate: false - xy: 1656, 814 + xy: 1656, 816 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Coast rotate: false - xy: 1656, 778 + xy: 1656, 780 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Cotton rotate: false - xy: 1656, 560 + xy: 1656, 562 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Customs house rotate: false - xy: 1656, 447 + xy: 1656, 449 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer rotate: false - xy: 1656, 411 + xy: 1656, 413 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Deer+Camp rotate: false - xy: 1656, 375 + xy: 1656, 377 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert rotate: false - xy: 1656, 339 + xy: 1656, 341 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Farm rotate: false - xy: 1616, 312 + xy: 1660, 305 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Desert+Flood plains+Farm rotate: false - xy: 1610, 276 + xy: 1660, 269 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes rotate: false - xy: 1650, 267 + xy: 1754, 988 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Dyes+Plantation rotate: false - xy: 1650, 231 + xy: 1696, 948 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/El Dorado rotate: false - xy: 1648, 194 + xy: 1696, 911 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fallout rotate: false - xy: 1648, 151 + xy: 1696, 868 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fish rotate: false - xy: 1648, 115 + xy: 1696, 832 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fishing Boats rotate: false - xy: 1262, 14 + xy: 1696, 796 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Flood plains rotate: false - xy: 1794, 1028 + xy: 1696, 760 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Forest rotate: false - xy: 1834, 1478 + xy: 1696, 684 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fort rotate: false - xy: 1817, 1437 + xy: 1696, 643 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Fountain of Youth rotate: false - xy: 1817, 1397 + xy: 1696, 603 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs rotate: false - xy: 1817, 1325 + xy: 1696, 531 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Furs+Camp rotate: false - xy: 1817, 1289 + xy: 1696, 495 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gems rotate: false - xy: 1813, 1145 + xy: 1696, 351 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Gold Ore rotate: false - xy: 1857, 1442 + xy: 1700, 315 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grand Mesa rotate: false - xy: 1857, 1402 + xy: 1700, 275 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland rotate: false - xy: 1857, 1366 + xy: 1700, 239 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Farm rotate: false - xy: 1857, 1330 + xy: 1794, 1028 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Camp rotate: false - xy: 1857, 1291 + xy: 1794, 989 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Deer+Camp rotate: false - xy: 1857, 1252 + xy: 1834, 1479 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Furs+Camp rotate: false - xy: 1857, 1213 + xy: 1817, 1440 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Forest+Lumber mill rotate: false - xy: 1857, 1174 + xy: 1817, 1401 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Farm rotate: false - xy: 1897, 1452 + xy: 1817, 1365 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Camp rotate: false - xy: 1897, 1416 + xy: 1817, 1329 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Lumber mill rotate: false - xy: 1937, 1452 + xy: 1817, 1293 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Hill+Forest+Trading post rotate: false - xy: 1897, 1380 + xy: 1817, 1257 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Grassland+Jungle+Trading post rotate: false - xy: 1937, 1412 + xy: 1817, 1217 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/GrasslandForest rotate: false - xy: 1977, 1449 + xy: 1817, 1178 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Great Barrier Reef rotate: false - xy: 1977, 1413 + xy: 1736, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Hill rotate: false - xy: 1977, 1262 + xy: 1736, 473 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillForest+Lumber mill rotate: false - xy: 1937, 1196 + xy: 1736, 437 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMarbleQuarry rotate: false - xy: 1977, 1226 + xy: 1736, 401 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillMine rotate: false - xy: 1977, 1190 + xy: 1736, 365 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/HillStoneQuarry rotate: false - xy: 1853, 1138 + xy: 1740, 329 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses rotate: false - xy: 1893, 1125 + xy: 1262, 14 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Horses+Pasture rotate: false - xy: 1933, 1120 + xy: 1302, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ice rotate: false - xy: 1853, 1102 + xy: 1857, 1443 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense rotate: false - xy: 1933, 1084 + xy: 1857, 1335 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Incense+Plantation rotate: false - xy: 1973, 1081 + xy: 1857, 1299 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Iron rotate: false - xy: 1892, 1053 + xy: 1857, 1227 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory rotate: false - xy: 1972, 1045 + xy: 1897, 1452 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ivory+Camp rotate: false - xy: 2012, 1045 + xy: 1897, 1416 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Jungle rotate: false - xy: 1874, 1013 + xy: 1937, 1412 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Krakatoa rotate: false - xy: 1302, 4 + xy: 1977, 1414 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Lakes rotate: false - xy: 1382, 6 + xy: 1937, 1340 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Landmark rotate: false - xy: 1954, 1001 + xy: 1937, 1296 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Manufactory rotate: false - xy: 1834, 947 + xy: 1977, 1223 size: 32, 39 orig: 32, 39 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marble rotate: false - xy: 1874, 941 + xy: 1977, 1187 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Marsh rotate: false - xy: 1754, 945 + xy: 1857, 1154 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mine rotate: false - xy: 1662, 6 + xy: 1937, 1116 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Moai rotate: false - xy: 1874, 904 + xy: 1813, 1102 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mount Fuji rotate: false - xy: 1754, 907 + xy: 1422, 4 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Mountain rotate: false - xy: 1696, 899 + xy: 1933, 1072 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oasis rotate: false - xy: 1696, 683 + xy: 1662, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Ocean rotate: false - xy: 1696, 647 + xy: 1702, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Offshore Platform rotate: false - xy: 1696, 611 + xy: 1973, 1079 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil rotate: false - xy: 1696, 575 + xy: 1893, 1053 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Oil well rotate: false - xy: 1696, 539 + xy: 1933, 1036 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Old Faithful rotate: false - xy: 1696, 499 + xy: 1973, 1039 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pasture rotate: false - xy: 1696, 387 + xy: 1834, 970 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Pearls rotate: false - xy: 1696, 315 + xy: 1776, 917 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains rotate: false - xy: 1914, 865 + xy: 1776, 773 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Farm rotate: false - xy: 1954, 857 + xy: 1776, 737 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Camp rotate: false - xy: 1994, 861 + xy: 1776, 697 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Forest+Lumber mill rotate: false - xy: 1736, 867 + xy: 1776, 657 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plains+Jungle+Trading post rotate: false - xy: 1736, 827 + xy: 1776, 617 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsForest rotate: false - xy: 1736, 787 + xy: 1776, 577 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/PlainsJungle rotate: false - xy: 1736, 747 + xy: 1776, 537 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation rotate: false - xy: 1736, 711 + xy: 1776, 501 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Bananas rotate: false - xy: 1736, 675 + xy: 1776, 465 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Plantation+Cotton rotate: false - xy: 1736, 639 + xy: 1776, 429 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry rotate: false - xy: 1736, 531 + xy: 1816, 898 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Marble rotate: false - xy: 1736, 495 + xy: 1816, 862 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Quarry+Stone rotate: false - xy: 1736, 459 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/River-Bottom - rotate: false - xy: 1736, 351 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/Tiles/River-Bottom - rotate: false - xy: 1736, 351 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/River-BottomLeft - rotate: false - xy: 1736, 315 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/Tiles/River-BottomLeft - rotate: false - xy: 1736, 315 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/FantasyHex/Tiles/River-BottomRight - rotate: false - xy: 1776, 848 - size: 32, 28 - orig: 32, 28 - offset: 0, 0 - index: -1 -TileSets/Default/Tiles/River-BottomRight - rotate: false - xy: 1776, 848 + xy: 1816, 826 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Rock of Gibraltar rotate: false - xy: 1776, 808 + xy: 1816, 606 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep rotate: false - xy: 1776, 591 + xy: 1816, 389 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sheep+Pasture rotate: false - xy: 1776, 551 + xy: 1874, 1006 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk rotate: false - xy: 1776, 442 + xy: 1856, 897 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silk+Plantation rotate: false - xy: 1776, 406 + xy: 1856, 861 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Silver rotate: false - xy: 1776, 370 + xy: 1856, 825 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow rotate: false - xy: 1816, 803 + xy: 1856, 753 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Snow+Farm rotate: false - xy: 1816, 767 + xy: 1856, 717 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices rotate: false - xy: 1816, 695 + xy: 1856, 645 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Spices+Plantation rotate: false - xy: 1816, 659 + xy: 1856, 609 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Stone rotate: false - xy: 1816, 623 + xy: 1856, 573 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar rotate: false - xy: 1816, 553 + xy: 1856, 503 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Sugar+Plantation rotate: false - xy: 1816, 517 + xy: 1856, 467 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Terrace farm rotate: false - xy: 1816, 373 + xy: 1914, 964 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Trading post rotate: false - xy: 1856, 832 + xy: 1896, 892 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra rotate: false - xy: 1856, 724 + xy: 1896, 784 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Farm rotate: false - xy: 1856, 688 + xy: 1896, 748 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp rotate: false - xy: 1856, 648 + xy: 1896, 708 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Camp+Furs rotate: false - xy: 1856, 608 + xy: 1896, 668 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Deer+Camp rotate: false - xy: 1856, 568 + xy: 1896, 628 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Tundra+Forest+Lumber mill rotate: false - xy: 1856, 528 + xy: 1896, 588 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/TundraForest rotate: false - xy: 1856, 488 + xy: 1896, 548 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Uranium rotate: false - xy: 1856, 416 + xy: 1896, 476 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales rotate: false - xy: 1896, 759 + xy: 1954, 930 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Whales+Fishing Boats rotate: false - xy: 1896, 723 + xy: 1936, 892 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wheat rotate: false - xy: 1896, 687 + xy: 1936, 856 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine rotate: false - xy: 1896, 651 + xy: 1936, 820 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tiles/Wine+Plantation rotate: false - xy: 1896, 615 + xy: 1936, 784 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 1816, 337 + xy: 1914, 928 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3058,119 +3079,119 @@ TileSets/FantasyHex/Units/Anti-Aircraft Gun index: -1 TileSets/FantasyHex/Units/Anti-Tank Gun rotate: false - xy: 1772, 1100 + xy: 1616, 948 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Archer rotate: false - xy: 1674, 1006 + xy: 1772, 1100 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Artillery rotate: false - xy: 1616, 890 + xy: 2009, 1937 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Atlatlist rotate: false - xy: 2009, 1937 + xy: 1616, 912 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Axe Thrower rotate: false - xy: 1616, 854 + xy: 1616, 876 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ballista rotate: false - xy: 2009, 1901 + xy: 2009, 1865 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battering Ram rotate: false - xy: 1616, 709 + xy: 1616, 695 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Battleship rotate: false - xy: 1616, 673 + xy: 1616, 659 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bazooka rotate: false - xy: 1616, 637 + xy: 1616, 623 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berber Cavalry rotate: false - xy: 1616, 601 + xy: 1616, 587 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Berserker rotate: false - xy: 1616, 565 + xy: 1616, 551 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Bowman rotate: false - xy: 1616, 529 + xy: 1616, 515 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Brute rotate: false - xy: 1616, 493 + xy: 1616, 479 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Camel Archer rotate: false - xy: 1616, 456 + xy: 1616, 442 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cannon rotate: false - xy: 1616, 420 + xy: 1616, 406 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Caravel rotate: false - xy: 1616, 384 + xy: 1616, 370 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Carolean rotate: false - xy: 1616, 348 + xy: 1616, 334 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -3191,753 +3212,739 @@ TileSets/FantasyHex/Units/Cataphract index: -1 TileSets/FantasyHex/Units/Catapult rotate: false - xy: 742, 22 + xy: 1674, 1006 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cavalry rotate: false - xy: 862, 22 + xy: 822, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chariot Archer rotate: false - xy: 942, 22 + xy: 902, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Chu-Ko-Nu rotate: false - xy: 982, 22 + xy: 942, 22 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/CivilianLandUnit rotate: false - xy: 1656, 850 + xy: 1656, 852 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Comanche Rider rotate: false - xy: 1656, 741 + xy: 1656, 743 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Companion Cavalry rotate: false - xy: 1656, 704 + xy: 1656, 706 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Composite Bowman rotate: false - xy: 1656, 668 + xy: 1656, 670 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Conquistador rotate: false - xy: 1656, 632 + xy: 1656, 634 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cossack rotate: false - xy: 1656, 596 + xy: 1656, 598 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Crossbowman rotate: false - xy: 1656, 524 + xy: 1656, 526 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Cruiser rotate: false - xy: 1656, 490 + xy: 1656, 492 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Destroyer rotate: false - xy: 1610, 240 + xy: 1660, 233 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Dromon rotate: false - xy: 1656, 303 + xy: 1714, 984 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Foreign Legion rotate: false - xy: 1794, 992 + xy: 1696, 724 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Frigate rotate: false - xy: 1817, 1361 + xy: 1696, 567 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galleass rotate: false - xy: 1817, 1253 + xy: 1696, 459 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Galley rotate: false - xy: 1817, 1217 + xy: 1696, 423 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Gatling Gun rotate: false - xy: 1817, 1181 + xy: 1696, 387 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Admiral rotate: false - xy: 1897, 1341 + xy: 1813, 1139 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Artist rotate: false - xy: 1937, 1376 + xy: 1736, 948 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Engineer rotate: false - xy: 1897, 1305 + xy: 1736, 876 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Galleass rotate: false - xy: 1937, 1340 + xy: 1736, 840 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great General rotate: false - xy: 1977, 1374 + xy: 1736, 801 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Merchant rotate: false - xy: 1897, 1269 + xy: 1736, 765 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Musician rotate: false - xy: 1937, 1304 + xy: 1736, 729 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Prophet rotate: false - xy: 1977, 1338 + xy: 1736, 693 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Scientist rotate: false - xy: 1897, 1233 + xy: 1736, 657 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great War Infantry rotate: false - xy: 1937, 1268 + xy: 1736, 621 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Great Writer rotate: false - xy: 1977, 1302 + xy: 1736, 585 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hakkapeliitta rotate: false - xy: 1897, 1197 + xy: 1736, 549 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Helicopter Gunship rotate: false - xy: 1937, 1232 + xy: 1736, 513 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hoplite rotate: false - xy: 1897, 1161 + xy: 1740, 293 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horse Archer rotate: false - xy: 1937, 1160 + xy: 1740, 257 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Horseman rotate: false - xy: 1977, 1154 + xy: 1740, 221 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hussar rotate: false - xy: 1973, 1117 + xy: 1342, 13 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Hwach'a rotate: false - xy: 1813, 1109 + xy: 1382, 14 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Immortal rotate: false - xy: 1812, 1073 + xy: 1857, 1407 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Impi rotate: false - xy: 1893, 1089 + xy: 1857, 1371 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Infantry rotate: false - xy: 1852, 1066 + xy: 1857, 1263 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ironclad rotate: false - xy: 1932, 1048 + xy: 1857, 1191 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Jaguar rotate: false - xy: 1834, 1030 + xy: 1937, 1452 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Janissary rotate: false - xy: 1834, 994 + xy: 1897, 1380 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Keshik rotate: false - xy: 1874, 977 + xy: 1977, 1452 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Khan rotate: false - xy: 1914, 1009 + xy: 1897, 1341 size: 32, 31 orig: 32, 31 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Knight rotate: false - xy: 1914, 973 + xy: 1937, 1376 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Kris Swordsman rotate: false - xy: 1342, 6 + xy: 1897, 1305 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Lancer rotate: false - xy: 1422, 6 + xy: 1977, 1378 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/LandUnit rotate: false - xy: 1462, 6 + xy: 1897, 1269 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landship rotate: false - xy: 1502, 6 + xy: 1977, 1342 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Landsknecht rotate: false - xy: 1994, 1009 + xy: 1897, 1233 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Legion rotate: false - xy: 1542, 6 + xy: 1937, 1260 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longbowman rotate: false - xy: 1582, 6 + xy: 1977, 1306 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Longswordsman rotate: false - xy: 1622, 6 + xy: 1897, 1197 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Machine Gun rotate: false - xy: 1954, 965 + xy: 1937, 1224 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mandekalu Cavalry rotate: false - xy: 1994, 973 + xy: 1977, 1270 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Maori Warrior rotate: false - xy: 1794, 956 + xy: 1937, 1188 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Marine rotate: false - xy: 1914, 937 + xy: 1897, 1161 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mechanized Infantry rotate: false - xy: 1714, 943 + xy: 1937, 1152 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mehal Sefari rotate: false - xy: 1954, 929 + xy: 1977, 1151 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Merchant Of Venice rotate: false - xy: 1994, 937 + xy: 1897, 1125 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Minuteman rotate: false - xy: 1794, 920 + xy: 1977, 1115 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Missile Cruiser rotate: false - xy: 1834, 911 + xy: 1853, 1118 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mobile SAM rotate: false - xy: 1914, 901 + xy: 1812, 1066 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Modern Armor rotate: false - xy: 1954, 893 + xy: 1853, 1082 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Mohawk Warrior rotate: false - xy: 1994, 901 + xy: 1893, 1089 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketeer rotate: false - xy: 1696, 863 + xy: 1462, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Musketman rotate: false - xy: 1696, 827 + xy: 1502, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Naresuan's Elephant rotate: false - xy: 1696, 791 + xy: 1542, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Nau rotate: false - xy: 1696, 755 + xy: 1582, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Norwegian Ski Infantry rotate: false - xy: 1696, 719 + xy: 1622, 6 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Panzer rotate: false - xy: 1696, 463 + xy: 1852, 1046 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Paratrooper rotate: false - xy: 1696, 427 + xy: 1834, 1010 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pathfinder rotate: false - xy: 1696, 351 + xy: 1794, 953 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Persian Immortal rotate: false - xy: 1794, 884 + xy: 1776, 881 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pictish Warrior rotate: false - xy: 1834, 875 + xy: 1776, 845 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pikeman rotate: false - xy: 1874, 868 + xy: 1776, 809 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Pracinha rotate: false - xy: 1736, 603 + xy: 1776, 393 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Privateer rotate: false - xy: 1736, 567 + xy: 1834, 934 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Quinquereme rotate: false - xy: 1736, 423 + xy: 1816, 790 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rifleman rotate: false - xy: 1736, 387 + xy: 1816, 754 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Rocket Artillery rotate: false - xy: 1776, 772 + xy: 1816, 570 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Samurai rotate: false - xy: 1776, 736 + xy: 1816, 534 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Scout rotate: false - xy: 1776, 700 + xy: 1816, 498 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sea Beggar rotate: false - xy: 1776, 664 + xy: 1816, 462 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Settler rotate: false - xy: 1776, 627 + xy: 1816, 425 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Ship of the Line rotate: false - xy: 1776, 514 + xy: 1874, 969 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Siege Tower rotate: false - xy: 1776, 478 + xy: 1874, 933 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Sipahi rotate: false - xy: 1776, 332 + xy: 1742, 4 size: 32, 30 orig: 32, 30 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Slinger rotate: false - xy: 1816, 839 + xy: 1856, 789 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Spearman rotate: false - xy: 1816, 731 + xy: 1856, 681 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Submarine rotate: false - xy: 1816, 589 + xy: 1856, 539 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Swordsman rotate: false - xy: 1816, 481 + xy: 1856, 431 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tank rotate: false - xy: 1816, 445 + xy: 1856, 395 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Tercio rotate: false - xy: 1816, 409 + xy: 1914, 1000 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trebuchet rotate: false - xy: 1856, 796 + xy: 1896, 856 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Trireme rotate: false - xy: 1856, 760 + xy: 1896, 820 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Turtle Ship rotate: false - xy: 1856, 452 + xy: 1896, 512 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Chariot rotate: false - xy: 1856, 380 + xy: 1896, 440 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/War Elephant rotate: false - xy: 1856, 344 + xy: 1896, 404 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Warrior rotate: false - xy: 1896, 829 + xy: 1954, 1000 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/WaterUnit rotate: false - xy: 1896, 795 + xy: 1954, 966 size: 32, 26 orig: 32, 26 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Winged Hussar rotate: false - xy: 1896, 579 + xy: 1936, 748 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Work Boats rotate: false - xy: 1896, 543 + xy: 1936, 712 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Units/Worker rotate: false - xy: 1896, 507 + xy: 1936, 676 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 -TileSets/FantasyHex/road - rotate: false - xy: 1529, 1847 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 -TileSets/Default/road - rotate: false - xy: 1529, 1847 - size: 61, 11 - orig: 61, 11 - offset: 0, 0 - index: -1 UnitPromotionIcons/Accuracy rotate: false xy: 1816, 1808 @@ -3954,252 +3961,252 @@ UnitPromotionIcons/Air Repair index: -1 UnitPromotionIcons/Air Targeting rotate: false - xy: 1816, 1750 + xy: 1486, 274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting rotate: false - xy: 1816, 1750 + xy: 1486, 274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Ambush rotate: false - xy: 1816, 1634 + xy: 1358, 166 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Amphibious rotate: false - xy: 1816, 1576 + xy: 1544, 274 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Armor Plating rotate: false - xy: 220, 13 + xy: 1416, 166 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 336, 13 + xy: 1816, 1576 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Besiege rotate: false - xy: 394, 13 + xy: 1300, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 394, 13 + xy: 1300, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz rotate: false - xy: 452, 18 + xy: 1358, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding Party rotate: false - xy: 510, 18 + xy: 1416, 108 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment rotate: false - xy: 568, 18 + xy: 1486, 216 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge rotate: false - xy: 626, 18 + xy: 1544, 216 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal Raider rotate: false - xy: 818, 58 + xy: 336, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Cover rotate: false - xy: 1050, 58 + xy: 1532, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1050, 58 + xy: 1532, 100 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Drill rotate: false - xy: 1816, 1518 + xy: 568, 18 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion rotate: false - xy: 1874, 1778 + xy: 684, 18 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Extended Range rotate: false - xy: 1874, 1720 + xy: 760, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Operational Range rotate: false - xy: 1874, 1720 + xy: 760, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Flight Deck rotate: false - xy: 1874, 1662 + xy: 876, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Formation rotate: false - xy: 1932, 1720 + xy: 934, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Great Generals rotate: false - xy: 1932, 1546 + xy: 1224, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Quick Study rotate: false - xy: 1932, 1546 + xy: 1224, 58 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Haka War Dance rotate: false - xy: 1874, 1488 + xy: 1816, 1518 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Heal Instantly rotate: false - xy: 1932, 1488 + xy: 1282, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect Fire rotate: false - xy: 1436, 280 + xy: 1398, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Interception rotate: false - xy: 1436, 222 + xy: 1514, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics rotate: false - xy: 1552, 216 + xy: 1874, 1662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/March rotate: false - xy: 1358, 100 + xy: 1874, 1604 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Medic rotate: false - xy: 1340, 42 + xy: 1932, 1662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility rotate: false - xy: 1585, 1310 + xy: 1658, 1484 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Morale rotate: false - xy: 1701, 1426 + xy: 1585, 1426 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Rejuvenation rotate: false - xy: 1474, 158 + xy: 1639, 1136 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting rotate: false - xy: 1514, 42 + xy: 1990, 1604 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry rotate: false - xy: 1514, 42 + xy: 1990, 1604 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 1590, 100 + xy: 1990, 1488 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -4213,42 +4220,42 @@ UnitPromotionIcons/Slinger Withdraw index: -1 UnitPromotionIcons/Sortie rotate: false - xy: 1990, 1720 + xy: 1759, 1368 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Supply rotate: false - xy: 1990, 1546 + xy: 1759, 1194 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Survivalism rotate: false - xy: 1990, 1488 + xy: 1755, 1136 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Volley rotate: false - xy: 1616, 1078 + xy: 1688, 42 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack rotate: false - xy: 1674, 1078 + xy: 1616, 1020 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman rotate: false - xy: 1616, 962 + xy: 1674, 1078 size: 50, 50 orig: 50, 50 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 1c6a7ac04b..53ae92b2ac 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Civ V - Vanilla/TileImprovements.json b/android/assets/jsons/Civ V - Vanilla/TileImprovements.json index f17078e56f..346c40f5d6 100644 --- a/android/assets/jsons/Civ V - Vanilla/TileImprovements.json +++ b/android/assets/jsons/Civ V - Vanilla/TileImprovements.json @@ -189,6 +189,11 @@ "gold": 4, "uniques": ["Great Improvement", "[+1 Gold] once [Economics] is discovered"] }, + { + "name": "Holy site", + "faith": 6, + "uniques": ["Great Improvement"] + }, { "name": "Citadel", "uniques": ["Gives a defensive bonus of [100]%", "Deal 30 damage to adjacent enemy units", "Great Improvement", "Can be built just outside your borders"], diff --git a/android/assets/jsons/Civ V - Vanilla/Units.json b/android/assets/jsons/Civ V - Vanilla/Units.json index 59a0dbbe10..e35a313f8f 100644 --- a/android/assets/jsons/Civ V - Vanilla/Units.json +++ b/android/assets/jsons/Civ V - Vanilla/Units.json @@ -1472,6 +1472,12 @@ "uniques": ["Can speed up construction of a wonder", "Can construct [Manufactory]", "Great Person - [Production]", "Unbuildable"], "movement": 2 }, + { + "name": "Great Prophet", + "unitType": "Civilian", + "uniques": ["Can construct [Holy site] if it hasn't spread religion yet", "Can spread religion [4] times","Great Person - [Faith]", "Unbuildable"], + "movement": 2 + }, { "name": "Great General", "unitType": "Civilian", diff --git a/android/assets/jsons/translations/Dutch.properties b/android/assets/jsons/translations/Dutch.properties index 6f8b3c9b44..b3ed24a907 100644 --- a/android/assets/jsons/translations/Dutch.properties +++ b/android/assets/jsons/translations/Dutch.properties @@ -714,6 +714,8 @@ Hurry Research = Versnel Onderzoek Conduct Trade Mission = Voer handelsmissie uit Your trade mission to [civName] has earned you [goldAmount] gold and [influenceAmount] influence! = Jouw handelsmissie naar [civName] heeft je [goldAmount] goud en [influenceAmount] invloed opgeleverd! Hurry Wonder = Versnel Wonder +Spread Religion = Verkondig Religie +Spread [religionName] = Verkondig [religionName] Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = Jouw dorpelingen zijn voor zo een lange tijd blij met jouw leiderschap dat jouw rijk de Gulden Eeuw binnen gaat. You have entered the [newEra]! = Jij bent in het/de [newEra] aangekomen! [civName] has entered the [eraName]! = [civName] is aangekomen in de [eraName]! diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 04a3ff5a96..2cfbf46d17 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -674,6 +674,8 @@ Hurry Research = Conduct Trade Mission = Your trade mission to [civName] has earned you [goldAmount] gold and [influenceAmount] influence! = Hurry Wonder = +Spread Religion = +Spread [religionName] = Your citizens have been happy with your rule for so long that the empire enters a Golden Age! = You have entered the [newEra]! = [civName] has entered the [eraName]! = diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index acbe29543c..b1829b9cf6 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -505,6 +505,7 @@ class CivilizationInfo { if (cities.isNotEmpty()) { //if no city available, addGreatPerson will throw exception val greatPerson = greatPeople.getNewGreatPerson() if (greatPerson != null && gameInfo.ruleSet.units.containsKey(greatPerson)) addUnit(greatPerson) + religionManager.startTurn() } updateViewableTiles() // adds explored tiles so that the units will be able to perform automated actions better @@ -654,16 +655,18 @@ class CivilizationInfo { notifications.add(Notification(text, arrayList, action)) } - fun addUnit(unitName: String, city: CityInfo? = null) { - if (cities.isEmpty()) return + fun addUnit(unitName: String, city: CityInfo? = null): MapUnit? { + if (cities.isEmpty()) return null val cityToAddTo = city ?: cities.random() - if (!gameInfo.ruleSet.units.containsKey(unitName)) return + if (!gameInfo.ruleSet.units.containsKey(unitName)) return null val unit = getEquivalentUnit(unitName) - // silently bail if no tile to place the unit is found val placedUnit = placeUnitNearTile(cityToAddTo.location, unit.name) - if (placedUnit != null && unit.isGreatPerson()) { + // silently bail if no tile to place the unit is found + if (placedUnit == null) return null + if (unit.isGreatPerson()) { addNotification("A [${unit.name}] has been born in [${cityToAddTo.name}]!", placedUnit.getTile().position, unit.name) } + return placedUnit } /** Tries to place the a [unitName] unit into the [TileInfo] closest to the given the [position] diff --git a/core/src/com/unciv/logic/civilization/ReligionManager.kt b/core/src/com/unciv/logic/civilization/ReligionManager.kt index 33ef4fa89e..cb4e7a66ce 100644 --- a/core/src/com/unciv/logic/civilization/ReligionManager.kt +++ b/core/src/com/unciv/logic/civilization/ReligionManager.kt @@ -1,7 +1,7 @@ package com.unciv.logic.civilization import com.unciv.models.ruleset.Belief -import com.unciv.models.ruleset.Unique +import kotlin.random.Random class ReligionManager { @Transient @@ -11,6 +11,33 @@ class ReligionManager { var pantheonBelief: String? = null + var greatProphetsEarned = 0 + + fun clone(): ReligionManager { + val clone = ReligionManager() + clone.pantheonBelief = pantheonBelief + clone.storedFaith = storedFaith + return clone + } + + fun startTurn() { + if (canGenerateProphet()) { + val prophetSpawnChange = (5f + storedFaith - faithForNextGreatProphet()) / 100f + if (Random(civInfo.gameInfo.turns).nextFloat() < prophetSpawnChange) { + val birthCity = civInfo.cities.filter { it.religion.getMajorityReligion() == pantheonBelief }.random() + val prophet = civInfo.addUnit("Great Prophet", birthCity) + if (prophet == null) return + prophet.religion = pantheonBelief + prophet.abilityUsedCount["Religion Spread"] = 0 + storedFaith -= faithForNextGreatProphet() + } + } + } + + fun endTurn(faithFromNewTurn: Int) { + storedFaith += faithFromNewTurn + } + private fun faithForPantheon() = 10 + civInfo.gameInfo.civilizations.count { it.isMajorCiv() && it.religionManager.pantheonBelief != null } * 5 fun canFoundPantheon(): Boolean { @@ -28,21 +55,24 @@ class ReligionManager { return true } - fun endTurn(faithFromNewTurn: Int) { - storedFaith += faithFromNewTurn - } - fun choosePantheonBelief(belief: Belief){ storedFaith -= faithForPantheon() pantheonBelief = belief.name // This should later be changed when religions can have multiple beliefs civInfo.getCapital().religion[belief.name] = 100 // Capital is religious, other cities are not } - - fun clone(): ReligionManager { - val clone = ReligionManager() - clone.pantheonBelief = pantheonBelief - clone.storedFaith = storedFaith - return clone + + // https://www.reddit.com/r/civ/comments/2m82wu/can_anyone_detail_the_finer_points_of_great/ + // Game files (globaldefines.xml) + fun faithForNextGreatProphet() = ((200 + 100 * greatProphetsEarned * (greatProphetsEarned + 1)/2) * civInfo.gameInfo.gameParameters.gameSpeed.modifier).toInt() + + fun canGenerateProphet(): Boolean { + if (pantheonBelief == null) return false // First get a pantheon, then we'll talk about a real religion + if (storedFaith < faithForNextGreatProphet()) return false + // In the base game, great prophets shouldn't generate anymore starting from the industrial era + // This is difficult to implement in the current codebase, probably requires an additional variable in eras.json + // Also only if you either [have founded a religion] or [the max amount of religions (players/2 + 1) has not been reached]. + // As this is yet to be implemented, this function does almost nothing + return true } } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 1f4ad14cd7..13b2a26ac8 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -13,6 +13,7 @@ import com.unciv.models.ruleset.Unique import com.unciv.models.ruleset.tile.TileImprovement import com.unciv.models.ruleset.unit.BaseUnit import com.unciv.models.ruleset.unit.UnitType +import com.unciv.models.translations.getPlaceholderParameters import java.text.DecimalFormat import kotlin.math.pow import kotlin.random.Random @@ -92,8 +93,10 @@ class MapUnit { * Name which should be displayed in UI */ fun displayName(): String { - return if (instanceName == null) name - else "$instanceName ({$name})" + val name = if (instanceName == null) name + else "$instanceName (${name})" + return if (religion != null && maxReligionSpreads() > 0) "$name ($religion)" + else name } var currentMovement: Float = 0f @@ -105,6 +108,9 @@ class MapUnit { var promotions = UnitPromotions() var due: Boolean = true var isTransported: Boolean = false + + var abilityUsedCount: HashMap = hashMapOf() + var religion: String? = null companion object { private const val ANCIENT_RUIN_MAP_REVEAL_OFFSET = 4 @@ -126,6 +132,8 @@ class MapUnit { toReturn.attacksThisTurn = attacksThisTurn toReturn.promotions = promotions.clone() toReturn.isTransported = isTransported + toReturn.abilityUsedCount.putAll(abilityUsedCount) + toReturn.religion = religion return toReturn } @@ -975,6 +983,16 @@ class MapUnit { val matchingUniques = getMatchingUniques(Constants.canBuildImprovements) return matchingUniques.any { improvement.matchesFilter(it.params[0]) || tile.matchesTerrainFilter(it.params[0]) } } - + + fun maxReligionSpreads(): Int { + return getMatchingUniques("Can spread religion [] times").sumBy { it.params[0].toInt() } + } + + fun getReligionString(): String { + val maxSpreads = maxReligionSpreads() + if (abilityUsedCount["Religion Spread"] == null) return "" // That is, either the key doesn't exist, or it does exist and the value is null. + return "${maxSpreads - abilityUsedCount["Religion Spread"]!!}/${maxSpreads}" + } + //endregion } diff --git a/core/src/com/unciv/models/UnitAction.kt b/core/src/com/unciv/models/UnitAction.kt index fe2a5a2015..369c31a3ab 100644 --- a/core/src/com/unciv/models/UnitAction.kt +++ b/core/src/com/unciv/models/UnitAction.kt @@ -30,6 +30,7 @@ enum class UnitActionType(val value: String) { ConstructRoad("Construct road"), // Create("Create"), + SpreadReligion("Spread Religion"), HurryResearch("Hurry Research"), StartGoldenAge("Start Golden Age"), HurryWonder("Hurry Wonder"), diff --git a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt index 67291e01e3..4922c08952 100644 --- a/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/CityStatsTable.kt @@ -42,6 +42,10 @@ class CityStatsTable(val cityScreen: CityScreen): Table() { addText() innerTable.addSeparator() innerTable.add(SpecialistAllocationTable(cityScreen).apply { update() }) + if (cityInfo.civInfo.gameInfo.hasReligionEnabled()) { + innerTable.addSeparator() + addReligionInfo() + } pack() } @@ -78,4 +82,11 @@ class CityStatsTable(val cityScreen: CityScreen): Table() { if (cityInfo.isInResistance()) innerTable.add("In resistance for another [${cityInfo.resistanceCounter}] turns".toLabel()).row() } + + private fun addReligionInfo() { + // This will later become large enough to be its own class, but for now it is small enough to fit inside a single function + val majorityReligion = cityInfo.religion.getMajorityReligion() + val label = majorityReligion ?: "None" + innerTable.add("Majority Religion: $label".toLabel()) + } } \ No newline at end of file diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt index 9a9f38bab8..104c9dd83a 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt @@ -63,6 +63,7 @@ object UnitActions { // addCreateWaterImprovements(unit, actionList) addGreatPersonActions(unit, actionList, tile) + addSpreadReligionActions(unit, actionList, tile) actionList += getImprovementConstructionActions(unit, tile) addDisbandAction(actionList, unit, worldScreen) @@ -423,9 +424,34 @@ object UnitActions { } } + private fun addSpreadReligionActions(unit: MapUnit, actionList: ArrayList, tile: TileInfo) { + if (!unit.hasUnique("Can spread religion [] times")) return + if (unit.religion == null) return + val maxReligionSpreads = unit.maxReligionSpreads() + if (!unit.abilityUsedCount.containsKey("Religion Spread")) return // This should be impossible anways, but just in case + if (maxReligionSpreads <= unit.abilityUsedCount["Religion Spread"]!!) return + val city = tile.getCity() + actionList += UnitAction(UnitActionType.SpreadReligion, + title = "Spread [${unit.religion!!}]", + uncivSound = UncivSound.Choir, + action = { + unit.abilityUsedCount["Religion Spread"] = unit.abilityUsedCount["Religion Spread"]!! + 1 + city!!.religion[unit.religion!!] = 100 + unit.currentMovement = 0f + if (unit.abilityUsedCount["Religion Spread"] == maxReligionSpreads) { + addGoldPerGreatPersonUsage(unit.civInfo) + unit.destroy() + } + }.takeIf { unit.currentMovement > 0 && city != null && city.civInfo == unit.civInfo } // For now you can only convert your own cities + ) + } + fun getImprovementConstructionActions(unit: MapUnit, tile: TileInfo): ArrayList { val finalActions = ArrayList() - for (unique in unit.getMatchingUniques("Can construct []")) { + var uniquesToCheck = unit.getMatchingUniques("Can construct []") + if (unit.abilityUsedCount.containsKey("Religion Spread") && unit.abilityUsedCount["Religion Spread"]!! == 0 && unit.maxReligionSpreads() > 0) + uniquesToCheck += unit.getMatchingUniques("Can construct [] if it hasn't spread religion yet") + for (unique in uniquesToCheck) { val improvementName = unique.params[0] val improvement = tile.ruleset.tileImprovements[improvementName] if (improvement == null) continue diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt index 0c938f153f..684720da6c 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitActionsTable.kt @@ -35,6 +35,10 @@ class UnitActionsTable(val worldScreen: WorldScreen) : Table() { val improvementName = unitAction.getPlaceholderParameters()[0] return UnitIconAndKey(ImageGetter.getImprovementIcon(improvementName), 'i') } + unitAction.equalsPlaceholderText("Spread []") -> { + // This should later include icons for the different religions. For now, just use the great prophet icon + return UnitIconAndKey(ImageGetter.getUnitIcon("Great Prophet"), 'g') + } unitAction.startsWith("Sleep") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Sleep"), 'f') unitAction.startsWith("Fortify") -> return UnitIconAndKey(ImageGetter.getImage("OtherIcons/Shield").apply { color = Color.BLACK }, 'f') else -> when (unitAction) { diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt index 8c75f2a7da..73a8916172 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt @@ -159,6 +159,11 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ unitDescriptionTable.add("XP") unitDescriptionTable.add(unit.promotions.XP.toString() + "/" + unit.promotions.xpForNextPromotion()) } + + if (unit.maxReligionSpreads() > 0) { + unitDescriptionTable.add(ImageGetter.getStatIcon("Faith")).size(20f) + unitDescriptionTable.add(unit.getReligionString()) + } if (unit.promotions.promotions.size != promotionsTable.children.size) // The unit has been promoted! Reload promotions! selectedUnitHasChanged = true diff --git a/docs/Credits.md b/docs/Credits.md index 16d85727f0..ee894094e9 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -128,6 +128,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Pallet](https://thenounproject.com/search/?q=Pallet&i=6862) By James Keuning for Great Artist * [Gear](https://thenounproject.com/search/?q=Gear&i=17369) By Melvin Salas for Great Engineer * [Beaker](https://thenounproject.com/search/?q=Beaker&i=621510) By Delwar Hossain for Great Scientist +* [Dove](https://thenounproject.com/search/?q=dove&i=1344088) by sandra for Great Prophet* * [General](https://thenounproject.com/search/?q=general&i=933566) By anbileru adaleru for Great General ## Resources @@ -183,6 +184,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: ### Ancient Era * [Storehouse](https://thenounproject.com/term/storehouse/966786/) By Pedro Santos for Granary +* [Shinto Gate](https://thenounproject.com/search/?q=shrine&i=253325) by Alexander Skowalsky for Shrine * [Great Wall Of China](https://thenounproject.com/term/great-wall-of-china/146039/) By Arthur Shlain for Walls * [Markadan Tower](https://thenounproject.com/search/?q=fortification&i=2107694) by Vectors Market for Walls of Babylon * [Block](https://thenounproject.com/term/block/1711553/) By Monjin Friends for Stone Works