diff --git a/android/Images/UnitPromotionIcons/Accuracy.png b/android/Images/UnitPromotionIcons/Accuracy.png new file mode 100644 index 0000000000..e30d55898a Binary files /dev/null and b/android/Images/UnitPromotionIcons/Accuracy.png differ diff --git a/android/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png deleted file mode 100644 index d9e41e053a..0000000000 Binary files a/android/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png deleted file mode 100644 index 3566c8e143..0000000000 Binary files a/android/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png deleted file mode 100644 index 9e364c9753..0000000000 Binary files a/android/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Barrage.png b/android/Images/UnitPromotionIcons/Barrage.png new file mode 100644 index 0000000000..6935f187f4 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Barrage.png differ diff --git a/android/Images/UnitPromotionIcons/Barrage_III_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_III_(Civ5).png deleted file mode 100644 index 3e99c8961d..0000000000 Binary files a/android/Images/UnitPromotionIcons/Barrage_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Barrage_II_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_II_(Civ5).png deleted file mode 100644 index 5dcb95d4d4..0000000000 Binary files a/android/Images/UnitPromotionIcons/Barrage_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Barrage_I_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_I_(Civ5).png deleted file mode 100644 index a9159efbef..0000000000 Binary files a/android/Images/UnitPromotionIcons/Barrage_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Bombardment.png b/android/Images/UnitPromotionIcons/Bombardment.png new file mode 100644 index 0000000000..2acb0625b3 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Bombardment.png differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png deleted file mode 100644 index 52ee35343e..0000000000 Binary files a/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png deleted file mode 100644 index 101ae009b2..0000000000 Binary files a/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png deleted file mode 100644 index ee741348a8..0000000000 Binary files a/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider.png b/android/Images/UnitPromotionIcons/Coastal_Raider.png new file mode 100644 index 0000000000..de2ed4a6ad Binary files /dev/null and b/android/Images/UnitPromotionIcons/Coastal_Raider.png differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png deleted file mode 100644 index 002bf0bd64..0000000000 Binary files a/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png deleted file mode 100644 index 27bc9747be..0000000000 Binary files a/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png deleted file mode 100644 index 1aa3b3866e..0000000000 Binary files a/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Cover.png b/android/Images/UnitPromotionIcons/Cover.png new file mode 100644 index 0000000000..a1627a2592 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Cover.png differ diff --git a/android/Images/UnitPromotionIcons/Cover_II_(Civ5).png b/android/Images/UnitPromotionIcons/Cover_II_(Civ5).png deleted file mode 100644 index 673fbb3b40..0000000000 Binary files a/android/Images/UnitPromotionIcons/Cover_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Cover_I_(Civ5).png b/android/Images/UnitPromotionIcons/Cover_I_(Civ5).png deleted file mode 100644 index 5706cc01a8..0000000000 Binary files a/android/Images/UnitPromotionIcons/Cover_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Drill.png b/android/Images/UnitPromotionIcons/Drill.png new file mode 100644 index 0000000000..4709bf8d41 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Drill.png differ diff --git a/android/Images/UnitPromotionIcons/Drill_III_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_III_(Civ5).png deleted file mode 100644 index 695609b61f..0000000000 Binary files a/android/Images/UnitPromotionIcons/Drill_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Drill_II_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_II_(Civ5).png deleted file mode 100644 index bbfa6a49ce..0000000000 Binary files a/android/Images/UnitPromotionIcons/Drill_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Drill_I_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_I_(Civ5).png deleted file mode 100644 index d6a4d5f813..0000000000 Binary files a/android/Images/UnitPromotionIcons/Drill_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Formation.png b/android/Images/UnitPromotionIcons/Formation.png new file mode 100644 index 0000000000..4526025d6e Binary files /dev/null and b/android/Images/UnitPromotionIcons/Formation.png differ diff --git a/android/Images/UnitPromotionIcons/Formation_II_(Civ5).png b/android/Images/UnitPromotionIcons/Formation_II_(Civ5).png deleted file mode 100644 index c8bde11351..0000000000 Binary files a/android/Images/UnitPromotionIcons/Formation_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Formation_I_(Civ5).png b/android/Images/UnitPromotionIcons/Formation_I_(Civ5).png deleted file mode 100644 index 8397851aa8..0000000000 Binary files a/android/Images/UnitPromotionIcons/Formation_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Medic.png b/android/Images/UnitPromotionIcons/Medic.png new file mode 100644 index 0000000000..db9edea841 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Medic.png differ diff --git a/android/Images/UnitPromotionIcons/Medic_(Civ5).png b/android/Images/UnitPromotionIcons/Medic_(Civ5).png deleted file mode 100644 index f064a1e53b..0000000000 Binary files a/android/Images/UnitPromotionIcons/Medic_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Medic_II_(Civ5).png b/android/Images/UnitPromotionIcons/Medic_II_(Civ5).png deleted file mode 100644 index 88679fc150..0000000000 Binary files a/android/Images/UnitPromotionIcons/Medic_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Shock.png b/android/Images/UnitPromotionIcons/Shock.png new file mode 100644 index 0000000000..480c3d14ba Binary files /dev/null and b/android/Images/UnitPromotionIcons/Shock.png differ diff --git a/android/Images/UnitPromotionIcons/Shock_III_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_III_(Civ5).png deleted file mode 100644 index 22a79ee61b..0000000000 Binary files a/android/Images/UnitPromotionIcons/Shock_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Shock_II_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_II_(Civ5).png deleted file mode 100644 index cc5d202c5f..0000000000 Binary files a/android/Images/UnitPromotionIcons/Shock_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Shock_I_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_I_(Civ5).png deleted file mode 100644 index 951fcfb210..0000000000 Binary files a/android/Images/UnitPromotionIcons/Shock_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Siege.png b/android/Images/UnitPromotionIcons/Siege.png new file mode 100644 index 0000000000..4da98c5fd6 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Siege.png differ diff --git a/android/Images/UnitPromotionIcons/Siege_(Civ5).png b/android/Images/UnitPromotionIcons/Siege_(Civ5).png deleted file mode 100644 index 3e9b692755..0000000000 Binary files a/android/Images/UnitPromotionIcons/Siege_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Siege_III_(Civ5).png b/android/Images/UnitPromotionIcons/Siege_III_(Civ5).png deleted file mode 100644 index 1a6491bd16..0000000000 Binary files a/android/Images/UnitPromotionIcons/Siege_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Siege_II_(Civ5).png b/android/Images/UnitPromotionIcons/Siege_II_(Civ5).png deleted file mode 100644 index d28af7ae02..0000000000 Binary files a/android/Images/UnitPromotionIcons/Siege_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Siege_I_(Civ5).png b/android/Images/UnitPromotionIcons/Siege_I_(Civ5).png deleted file mode 100644 index 20641a6871..0000000000 Binary files a/android/Images/UnitPromotionIcons/Siege_I_(Civ5).png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index affa9e8c65..7a53ee53f8 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1,6 +1,6 @@ game.png -size: 2430,1840 +size: 2462,1840 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none @@ -300,329 +300,329 @@ BuildingIcons/Machu Picchu index: -1 BuildingIcons/Market rotate: false - xy: 2038, 922 + xy: 2140, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 1426, 718 + xy: 2344, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 1834, 718 + xy: 1426, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 488, 690 + xy: 1936, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 488, 588 + xy: 2038, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mughal Fort rotate: false - xy: 590, 588 + xy: 2242, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 692, 690 + xy: 2344, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 896, 690 + xy: 692, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Neuschwanstein rotate: false - xy: 1100, 690 + xy: 896, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 1202, 690 + xy: 998, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 896, 588 + xy: 1202, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1100, 588 + xy: 590, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 488, 486 + xy: 896, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 692, 486 + xy: 1100, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 794, 487 + xy: 1202, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 998, 486 + xy: 488, 487 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1304, 486 + xy: 794, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1712, 616 + xy: 894, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1814, 514 + xy: 1200, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 2222, 514 + xy: 1712, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 2324, 616 + xy: 2222, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 2324, 514 + xy: 2222, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 2324, 412 + xy: 2324, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 794, 385 + xy: 2324, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Satrap's Court rotate: false - xy: 1202, 384 + xy: 1712, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1508, 310 + xy: 2018, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 2324, 310 + xy: 1812, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 436, 106 + xy: 2016, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 436, 4 + xy: 2118, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 538, 78 + xy: 436, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 640, 180 + xy: 436, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 640, 78 + xy: 538, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 844, 282 + xy: 640, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 946, 282 + xy: 640, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 844, 78 + xy: 742, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 1150, 282 + xy: 844, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 1048, 78 + xy: 946, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 1252, 282 + xy: 946, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Terracotta Army rotate: false - xy: 1150, 78 + xy: 1048, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1252, 180 + xy: 1150, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 1252, 78 + xy: 1048, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 1354, 208 + xy: 1150, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 1354, 106 + xy: 1252, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1456, 106 + xy: 1252, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 1558, 106 + xy: 1354, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1966, 106 + xy: 1864, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 2068, 106 + xy: 2068, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -636,14 +636,14 @@ BuildingIcons/Walls of Babylon index: -1 BuildingIcons/Windmill rotate: false - xy: 1558, 4 + xy: 2068, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1966, 4 + xy: 1456, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -804,63 +804,63 @@ ImprovementIcons/Manufactory index: -1 ImprovementIcons/Mine rotate: false - xy: 1630, 718 + xy: 2344, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1304, 588 + xy: 794, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1610, 616 + xy: 690, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1916, 616 + xy: 1302, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 2018, 514 + xy: 1508, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 2018, 514 + xy: 1508, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 2018, 514 + xy: 1508, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 1712, 412 + xy: 1916, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1660, 106 + xy: 1456, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -965,42 +965,42 @@ NationIcons/Korea index: -1 NationIcons/Persia rotate: false - xy: 588, 384 + xy: 998, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Rome rotate: false - xy: 2120, 412 + xy: 2120, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/Russia rotate: false - xy: 2222, 412 + xy: 2120, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 NationIcons/The Ottomans rotate: false - xy: 1456, 208 + xy: 1150, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Aircraft rotate: false - xy: 1354, 332 + xy: 1426, 1352 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 406, 740 + xy: 384, 344 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1063,42 +1063,42 @@ TileSets/FantasyHex/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 2140, 820 + xy: 2242, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 486, 384 + xy: 896, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1508, 514 + xy: 588, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1814, 310 + xy: 2324, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 436, 208 + xy: 1914, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 946, 180 + xy: 844, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1119,294 +1119,294 @@ OtherIcons/tileTableBackground index: -1 OtherIcons/whiteDot rotate: false - xy: 277, 1543 + xy: 2459, 441 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 1426, 1352 + xy: 406, 740 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 384, 344 + xy: 640, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 2344, 1278 + xy: 2, 31 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 2374, 258 + xy: 1814, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 538, 26 + xy: 1814, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 2272, 54 + xy: 692, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 2272, 2 + xy: 1866, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 2272, 2 + xy: 1866, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 2, 31 + xy: 744, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 2344, 1226 + xy: 1918, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 2374, 206 + xy: 1918, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 590, 26 + xy: 796, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 2344, 1174 + xy: 1970, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 2374, 154 + xy: 1970, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 2344, 1122 + xy: 2022, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 694, 26 + xy: 2022, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 2344, 1070 + xy: 900, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 746, 26 + xy: 2074, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 2344, 1018 + xy: 952, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 798, 26 + xy: 2126, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 2344, 966 + xy: 2126, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 850, 26 + xy: 1004, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 2344, 914 + xy: 2178, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 2344, 862 + xy: 1056, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 954, 26 + xy: 2230, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 2344, 810 + xy: 2230, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1006, 26 + xy: 1108, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 2344, 758 + xy: 2282, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1058, 26 + xy: 2282, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1110, 26 + xy: 1160, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1266, 26 + xy: 2374, 258 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 2324, 54 + xy: 2374, 206 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 2324, 2 + xy: 2374, 154 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 65, 44 + xy: 2374, 102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 117, 44 + xy: 65, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 2376, 102 + xy: 2386, 50 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 2376, 50 + xy: 436, 333 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 436, 332 + xy: 488, 333 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 169, 8 + xy: 540, 332 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 221, 8 + xy: 169, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 273, 8 + xy: 221, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1518,91 +1518,91 @@ ResourceIcons/Ivory index: -1 ResourceIcons/Marble rotate: false - xy: 1936, 820 + xy: 2038, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1202, 588 + xy: 692, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1202, 486 + xy: 692, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1712, 310 + xy: 2222, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 2018, 310 + xy: 1506, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 2120, 310 + xy: 1608, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 640, 282 + xy: 436, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 844, 180 + xy: 742, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 946, 78 + xy: 844, 180 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 2068, 208 + xy: 1966, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1354, 4 + xy: 1864, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1456, 4 + xy: 1966, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1660, 4 + xy: 2170, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1658,7 +1658,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 642, 26 + xy: 848, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1672,7 +1672,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 902, 26 + xy: 2178, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1693,21 +1693,21 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 1162, 26 + xy: 1212, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 1214, 26 + xy: 1264, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Resistance rotate: false - xy: 1406, 412 + xy: 1712, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1721,7 +1721,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 538, 180 + xy: 2322, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2015,252 +2015,252 @@ TechIcons/Machinery index: -1 TechIcons/Masonry rotate: false - xy: 2242, 1126 + xy: 2038, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 2038, 820 + xy: 2140, 922 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 2140, 922 + xy: 2242, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 2242, 922 + xy: 2242, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 2242, 820 + xy: 2344, 1228 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 1528, 718 + xy: 2344, 1024 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 1732, 718 + xy: 2344, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mobile Tactics rotate: false - xy: 2038, 718 + xy: 1630, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 794, 589 + xy: 590, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 998, 690 + xy: 794, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1304, 690 + xy: 1100, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 590, 486 + xy: 998, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1100, 486 + xy: 590, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 690, 384 + xy: 1100, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1406, 616 + xy: 1202, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1406, 514 + xy: 1304, 486 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1610, 514 + xy: 792, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1712, 514 + xy: 996, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1814, 616 + xy: 1098, 384 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radar rotate: false - xy: 1916, 514 + xy: 1406, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 2018, 616 + xy: 1406, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 2120, 616 + xy: 1508, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 2120, 514 + xy: 1610, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 2222, 616 + xy: 1610, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 1610, 412 + xy: 1814, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 1814, 412 + xy: 1916, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 2018, 412 + xy: 2018, 514 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 896, 384 + xy: 1406, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1100, 384 + xy: 1610, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1304, 384 + xy: 1814, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 742, 180 + xy: 538, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 742, 78 + xy: 640, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1558, 208 + xy: 1252, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1660, 208 + xy: 1354, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1762, 208 + xy: 1456, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 2068, 4 + xy: 1558, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2323,21 +2323,21 @@ TileSets/Default/LakesOverlay index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 2140, 1024 + xy: 2242, 1126 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 590, 690 + xy: 2140, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 998, 588 + xy: 1304, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2358,56 +2358,56 @@ TileSets/FantasyHex/road index: -1 TileSets/FantasyHex/City rotate: false - xy: 2392, 1803 + xy: 1354, 347 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+City rotate: false - xy: 2392, 1803 + xy: 1354, 347 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+City rotate: false - xy: 2392, 1803 + xy: 1354, 347 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Coast rotate: false - xy: 406, 710 + xy: 2392, 1758 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert rotate: false - xy: 2344, 728 + xy: 406, 710 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+City rotate: false - xy: 1318, 43 + xy: 1316, 43 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Flood plains rotate: false - xy: 2376, 20 + xy: 2334, 20 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Oasis rotate: false - xy: 488, 354 + xy: 592, 354 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2428,42 +2428,42 @@ TileSets/FantasyHex/TopRightBorder index: -1 TileSets/FantasyHex/Grassland+Forest rotate: false - xy: 2396, 884 + xy: 2426, 413 size: 31, 29 orig: 31, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Jungle rotate: false - xy: 2392, 1767 + xy: 273, 24 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Marsh rotate: false - xy: 488, 323 + xy: 1354, 316 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill rotate: false - xy: 2396, 1296 + xy: 2368, 16 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+Forest rotate: false - xy: 2396, 1249 + xy: 2402, 3 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Lakes rotate: false - xy: 2396, 1219 + xy: 592, 324 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2477,63 +2477,63 @@ TileSets/FantasyHex/Mountain index: -1 TileSets/FantasyHex/Ocean rotate: false - xy: 2396, 1189 + xy: 1316, 13 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains rotate: false - xy: 2396, 1159 + xy: 2426, 688 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 2396, 1122 + xy: 2426, 651 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Forest rotate: false - xy: 2396, 1087 + xy: 2426, 616 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Jungle rotate: false - xy: 2396, 1050 + xy: 2426, 579 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2396, 1020 + xy: 2426, 549 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra rotate: false - xy: 2396, 986 + xy: 2426, 515 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+City rotate: false - xy: 2396, 949 + xy: 2426, 478 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+Forest rotate: false - xy: 2396, 915 + xy: 2426, 444 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2895,639 +2895,576 @@ UnitIcons/Machine Gun orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Maori Warrior + rotate: false + xy: 1936, 820 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 2242, 1024 + xy: 2140, 820 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 1936, 718 + xy: 1528, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 2140, 718 + xy: 1732, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mohawk Warrior rotate: false - xy: 2242, 718 + xy: 1834, 718 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 692, 588 + xy: 488, 690 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 794, 691 + xy: 488, 589 size: 100, 99 orig: 100, 99 offset: 0, 0 index: -1 UnitIcons/Panzer rotate: false - xy: 896, 486 + xy: 1304, 588 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 1508, 616 + xy: 486, 385 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 1508, 412 + xy: 1814, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 1916, 412 + xy: 2018, 616 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 998, 384 + xy: 1508, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1406, 310 + xy: 1916, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1610, 310 + xy: 2120, 412 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ship of the Line rotate: false - xy: 1916, 310 + xy: 1404, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Sipahi rotate: false - xy: 2222, 310 + xy: 1710, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 538, 282 + xy: 2220, 310 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Stealth Bomber rotate: false - xy: 742, 282 + xy: 538, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 1048, 282 + xy: 742, 78 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1048, 180 + xy: 946, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 1150, 180 + xy: 1048, 282 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1762, 106 + xy: 1558, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Triplane rotate: false - xy: 1864, 208 + xy: 1558, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trireme rotate: false - xy: 1864, 105 + xy: 1660, 207 size: 100, 101 orig: 100, 101 offset: 0, 0 index: -1 UnitIcons/Turtle Ship rotate: false - xy: 1966, 208 + xy: 1762, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Chariot rotate: false - xy: 2170, 106 + xy: 2272, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/War Elephant rotate: false - xy: 2272, 208 + xy: 1660, 105 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 2272, 106 + xy: 1762, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1762, 4 + xy: 2272, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1864, 3 + xy: 1354, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Zero rotate: false - xy: 2170, 4 + xy: 1660, 3 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitPromotionIcons/Accuracy_III_(Civ5) +UnitPromotionIcons/Accuracy rotate: false - xy: 1354, 310 - size: 20, 20 - orig: 20, 20 + xy: 2392, 1788 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Accuracy_II_(Civ5) +UnitPromotionIcons/Air_Repair_(Civ5) rotate: false xy: 1426, 1330 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Accuracy_I_(Civ5) - rotate: false - xy: 1376, 310 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Air_Repair_(Civ5) +UnitPromotionIcons/Ambush_II_(Civ5) rotate: false xy: 1448, 1330 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Ambush_II_(Civ5) - rotate: false - xy: 436, 310 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 UnitPromotionIcons/Ambush_I_(Civ5) rotate: false - xy: 458, 310 + xy: 273, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Barrage_III_(Civ5) +UnitPromotionIcons/Barrage rotate: false - xy: 1470, 1330 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Barrage_II_(Civ5) - rotate: false - xy: 281, 1766 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Barrage_I_(Civ5) - rotate: false - xy: 1474, 1716 - size: 20, 20 - orig: 20, 20 + xy: 1762, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 379, 1382 + xy: 295, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 538, 4 + xy: 1470, 1330 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 384, 322 + xy: 281, 1766 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 2, 9 + xy: 1474, 1716 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Bombardment_III_(Civ5) +UnitPromotionIcons/Bombardment rotate: false - xy: 2392, 1745 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Bombardment_II_(Civ5) - rotate: false - xy: 458, 770 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Bombardment_I_(Civ5) - rotate: false - xy: 2396, 862 - size: 20, 20 - orig: 20, 20 + xy: 1762, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 1478, 1382 + xy: 379, 1382 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 281, 1744 + xy: 384, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 379, 1360 + xy: 2, 9 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 560, 4 + xy: 458, 770 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 406, 322 + xy: 640, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 24, 9 + xy: 307, 38 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Drill_III_(Civ5) +UnitPromotionIcons/Drill rotate: false - xy: 458, 748 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Drill_II_(Civ5) - rotate: false - xy: 2396, 840 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Drill_I_(Civ5) - rotate: false - xy: 1478, 1360 - size: 20, 20 - orig: 20, 20 + xy: 1866, 2 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Evasion_(Civ5) rotate: false - xy: 281, 1722 + xy: 1478, 1382 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 379, 1338 + xy: 281, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 582, 4 + xy: 379, 1360 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Heal_Instantly_(Civ5) rotate: false - xy: 2396, 818 + xy: 406, 322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 379, 1316 + xy: 24, 9 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_III_(Civ5) rotate: false - xy: 604, 4 + xy: 458, 748 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_II_(Civ5) rotate: false - xy: 2396, 796 + xy: 662, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Interception_I_(Civ5) rotate: false - xy: 626, 4 + xy: 1478, 1360 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 2396, 774 + xy: 281, 1722 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 648, 4 + xy: 379, 1338 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Medic_(Civ5) +UnitPromotionIcons/Medic rotate: false - xy: 670, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Medic_II_(Civ5) - rotate: false - xy: 670, 4 - size: 20, 20 - orig: 20, 20 + xy: 2074, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 692, 4 + xy: 684, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Operational_Range_(Civ5) rotate: false - xy: 714, 4 + xy: 379, 1316 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 714, 4 + xy: 379, 1316 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 736, 4 + xy: 706, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 758, 4 + xy: 728, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 780, 4 + xy: 750, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 802, 4 + xy: 772, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Shock_III_(Civ5) +UnitPromotionIcons/Shock rotate: false - xy: 824, 4 - size: 20, 20 - orig: 20, 20 + xy: 117, 44 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Shock_II_(Civ5) +UnitPromotionIcons/Siege rotate: false - xy: 846, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Shock_I_(Civ5) - rotate: false - xy: 868, 4 - size: 20, 20 - orig: 20, 20 + xy: 2334, 50 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 890, 4 + xy: 794, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_I_(Civ5) rotate: false - xy: 890, 4 + xy: 794, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_III_(Civ5) rotate: false - xy: 912, 4 + xy: 816, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_II_(Civ5) rotate: false - xy: 934, 4 + xy: 838, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sortie_(Civ5) rotate: false - xy: 956, 4 + xy: 860, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 978, 4 + xy: 882, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1000, 4 + xy: 904, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1022, 4 + xy: 926, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(air)_(Civ5) rotate: false - xy: 1022, 4 + xy: 926, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1044, 4 + xy: 948, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 1066, 4 + xy: 970, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1088, 4 + xy: 992, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_I_(Civ5) rotate: false - xy: 1110, 4 + xy: 1014, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Woodsman_(Civ5) rotate: false - xy: 1132, 4 + xy: 1036, 4 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 0233874d1c..323a24fede 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index 420539755f..07b4635a45 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -114,8 +114,8 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ private fun createTradeTable(trade: Trade, otherCiv:CivilizationInfo): Table { val generalTable = Table(skin) - generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size)) - generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)) + generalTable.add(createOffersTable(currentPlayerCivInfo,trade.ourOffers, trade.theirOffers.size)).top() + generalTable.add(createOffersTable(otherCiv, trade.theirOffers, trade.ourOffers.size)).top() return generalTable } diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index 3fbff91353..499123e5c5 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -116,7 +116,34 @@ object ImageGetter { return getStatIcon(construction) } - fun getPromotionIcon(promotionName:String):Image{ + fun getPromotionIcon(promotionName:String): Actor { + var level = 0 + + when { + promotionName.endsWith(" I") -> level=1 + promotionName.endsWith(" II") -> level=2 + promotionName.endsWith(" III") -> level=3 + } + + val basePromotionName = if(level==0) promotionName + else promotionName.substring(0, promotionName.length-level-1) + + if(imageExists("UnitPromotionIcons/$basePromotionName")) { + val icon = getImage("UnitPromotionIcons/$basePromotionName") + icon.color = colorFromRGB(255,226,0) + var circle = icon.surroundWithCircle(30f) + circle.circle.color = colorFromRGB(0,12,49) +// circle = circle.surroundWithCircle(40f) +// circle.circle.color = colorFromRGB(255,226,0) + if(level!=0){ + val starTable = Table().apply { defaults().pad(2f) } + for(i in 1..level) starTable.add(getImage("OtherIcons/Star")).size(8f) + starTable.centerX(circle) + starTable.y=5f + circle.addActor(starTable) + } + return circle + } return getImage("UnitPromotionIcons/" + promotionName.replace(' ', '_') + "_(Civ5)") } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt index dd031eaa27..5e63b93c08 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt @@ -184,7 +184,7 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ if(selectedUnit!=null) { unitIconHolder.add(UnitGroup(selectedUnit!!,30f)).pad(5f) for(promotion in selectedUnit!!.promotions.promotions) - promotionsTable.add(ImageGetter.getPromotionIcon(promotion)).size(20f) + promotionsTable.add(ImageGetter.getPromotionIcon(promotion))//.size(20f) } diff --git a/docs/Credits.md b/docs/Credits.md index 514612a057..376f198942 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -440,6 +440,18 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans * [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea +## Promotions + +* [Sight](https://thenounproject.com/search/?q=sight&i=2631027) By Jejen Juliansyah Nur Agung for Accuracy +* [skill bow rain arrow](https://thenounproject.com/search/?q=rain%20of%20arrows&i=2360192) by Maxicons for Barrage +* [Bomb](https://thenounproject.com/search/?q=bombardment&i=1705276) By Angelo Troiano for Bombardment +* [Private E2](https://thenounproject.com/yeongrong.kim.5/collection/miltary-rank/?i=833152) By Yeong Rong Kim for Shock +* [Private First Class](https://thenounproject.com/yeongrong.kim.5/collection/miltary-rank/?i=833161) By Yeong Rong Kim for Drill +* [Medic](https://thenounproject.com/search/?q=medic&i=48740) By Yohann Berger for Medic +* [City](https://thenounproject.com/search/?q=city&i=2402817) By iconcheese for Siege +* [Skull and Crossbones](https://thenounproject.com/search/?q=skull%20and%20cross%20bones&i=15526) By Anton Outkine for Coastal Raider +* [Spear](https://thenounproject.com/search/?q=spear&i=1754184) By Deemak Daksina for Formation + ## Others * [Circle](https://thenounproject.com/term/circle/1841891/) By Aybige