diff --git a/android/Images/UnitPromotionIcons/Accuracy.png b/android/Images/UnitPromotionIcons/Accuracy.png index e30d5589..2c05ef0e 100644 Binary files a/android/Images/UnitPromotionIcons/Accuracy.png and b/android/Images/UnitPromotionIcons/Accuracy.png differ diff --git a/android/Images/UnitPromotionIcons/Air Repair.png b/android/Images/UnitPromotionIcons/Air Repair.png new file mode 100644 index 00000000..20b19ea7 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Air Repair.png differ diff --git a/android/Images/UnitPromotionIcons/Air_Repair_(Civ5).png b/android/Images/UnitPromotionIcons/Air_Repair_(Civ5).png deleted file mode 100644 index 583af556..00000000 Binary files a/android/Images/UnitPromotionIcons/Air_Repair_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Ambush.png b/android/Images/UnitPromotionIcons/Ambush.png new file mode 100644 index 00000000..e9e79f65 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Ambush.png differ diff --git a/android/Images/UnitPromotionIcons/Ambush_II_(Civ5).png b/android/Images/UnitPromotionIcons/Ambush_II_(Civ5).png deleted file mode 100644 index 503af86b..00000000 Binary files a/android/Images/UnitPromotionIcons/Ambush_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Ambush_I_(Civ5).png b/android/Images/UnitPromotionIcons/Ambush_I_(Civ5).png deleted file mode 100644 index 19a854dd..00000000 Binary files a/android/Images/UnitPromotionIcons/Ambush_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Blitz_(Civ5).png b/android/Images/UnitPromotionIcons/Blitz_(Civ5).png deleted file mode 100644 index 633940b7..00000000 Binary files a/android/Images/UnitPromotionIcons/Blitz_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Boarding Party.png b/android/Images/UnitPromotionIcons/Boarding Party.png new file mode 100644 index 00000000..b2b04e13 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Boarding Party.png differ diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png deleted file mode 100644 index 1d39eefa..00000000 Binary files a/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png deleted file mode 100644 index 15b9ff5b..00000000 Binary files a/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png deleted file mode 100644 index 9afc15e4..00000000 Binary files a/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Charge.png b/android/Images/UnitPromotionIcons/Charge.png new file mode 100644 index 00000000..ef0e7a8a Binary files /dev/null and b/android/Images/UnitPromotionIcons/Charge.png differ diff --git a/android/Images/UnitPromotionIcons/Charge_(Civ5).png b/android/Images/UnitPromotionIcons/Charge_(Civ5).png deleted file mode 100644 index bdb259bd..00000000 Binary files a/android/Images/UnitPromotionIcons/Charge_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Evasion.png b/android/Images/UnitPromotionIcons/Evasion.png new file mode 100644 index 00000000..2e025c49 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Evasion.png differ diff --git a/android/Images/UnitPromotionIcons/Evasion_(Civ5).png b/android/Images/UnitPromotionIcons/Evasion_(Civ5).png deleted file mode 100644 index 5e786b07..00000000 Binary files a/android/Images/UnitPromotionIcons/Evasion_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Heal Instantly.png b/android/Images/UnitPromotionIcons/Heal Instantly.png new file mode 100644 index 00000000..7dc2366c Binary files /dev/null and b/android/Images/UnitPromotionIcons/Heal Instantly.png differ diff --git a/android/Images/UnitPromotionIcons/Heal_Instantly_(Civ5).png b/android/Images/UnitPromotionIcons/Heal_Instantly_(Civ5).png deleted file mode 100644 index c9926957..00000000 Binary files a/android/Images/UnitPromotionIcons/Heal_Instantly_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Indirect Fire.png b/android/Images/UnitPromotionIcons/Indirect Fire.png new file mode 100644 index 00000000..7d710786 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Indirect Fire.png differ diff --git a/android/Images/UnitPromotionIcons/Indirect_Fire_(Civ5).png b/android/Images/UnitPromotionIcons/Indirect_Fire_(Civ5).png deleted file mode 100644 index 28f18387..00000000 Binary files a/android/Images/UnitPromotionIcons/Indirect_Fire_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Interception.png b/android/Images/UnitPromotionIcons/Interception.png new file mode 100644 index 00000000..52db6996 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Interception.png differ diff --git a/android/Images/UnitPromotionIcons/Interception_III_(Civ5).png b/android/Images/UnitPromotionIcons/Interception_III_(Civ5).png deleted file mode 100644 index 1b5121ed..00000000 Binary files a/android/Images/UnitPromotionIcons/Interception_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Interception_II_(Civ5).png b/android/Images/UnitPromotionIcons/Interception_II_(Civ5).png deleted file mode 100644 index 9e6163ce..00000000 Binary files a/android/Images/UnitPromotionIcons/Interception_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Interception_I_(Civ5).png b/android/Images/UnitPromotionIcons/Interception_I_(Civ5).png deleted file mode 100644 index c134c0f3..00000000 Binary files a/android/Images/UnitPromotionIcons/Interception_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Logistics.png b/android/Images/UnitPromotionIcons/Logistics.png new file mode 100644 index 00000000..52a5707f Binary files /dev/null and b/android/Images/UnitPromotionIcons/Logistics.png differ diff --git a/android/Images/UnitPromotionIcons/Logistics_(Civ5).png b/android/Images/UnitPromotionIcons/Logistics_(Civ5).png deleted file mode 100644 index a2ab252d..00000000 Binary files a/android/Images/UnitPromotionIcons/Logistics_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Mobility.png b/android/Images/UnitPromotionIcons/Mobility.png index 9c364a9c..8f0e388e 100644 Binary files a/android/Images/UnitPromotionIcons/Mobility.png and b/android/Images/UnitPromotionIcons/Mobility.png differ diff --git a/android/Images/UnitPromotionIcons/Operational Range.png b/android/Images/UnitPromotionIcons/Operational Range.png new file mode 100644 index 00000000..e8a5e396 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Operational Range.png differ diff --git a/android/Images/UnitPromotionIcons/Operational_Range_(Civ5).png b/android/Images/UnitPromotionIcons/Operational_Range_(Civ5).png deleted file mode 100644 index e6c26e7a..00000000 Binary files a/android/Images/UnitPromotionIcons/Operational_Range_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Range.png b/android/Images/UnitPromotionIcons/Range.png new file mode 100644 index 00000000..e8a5e396 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Range.png differ diff --git a/android/Images/UnitPromotionIcons/Range_(Civ5).png b/android/Images/UnitPromotionIcons/Range_(Civ5).png deleted file mode 100644 index e6c26e7a..00000000 Binary files a/android/Images/UnitPromotionIcons/Range_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Scouting.png b/android/Images/UnitPromotionIcons/Scouting.png new file mode 100644 index 00000000..e30d5589 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Scouting.png differ diff --git a/android/Images/UnitPromotionIcons/Scouting_III_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_III_(Civ5).png deleted file mode 100644 index c5dd831a..00000000 Binary files a/android/Images/UnitPromotionIcons/Scouting_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Scouting_II_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_II_(Civ5).png deleted file mode 100644 index ecc5be40..00000000 Binary files a/android/Images/UnitPromotionIcons/Scouting_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Scouting_I_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_I_(Civ5).png deleted file mode 100644 index 160d414b..00000000 Binary files a/android/Images/UnitPromotionIcons/Scouting_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Sentry.png b/android/Images/UnitPromotionIcons/Sentry.png new file mode 100644 index 00000000..e30d5589 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Sentry.png differ diff --git a/android/Images/UnitPromotionIcons/Sentry_(Civ5).png b/android/Images/UnitPromotionIcons/Sentry_(Civ5).png deleted file mode 100644 index 824afa92..00000000 Binary files a/android/Images/UnitPromotionIcons/Sentry_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Sortie.png b/android/Images/UnitPromotionIcons/Sortie.png new file mode 100644 index 00000000..99aea5ac Binary files /dev/null and b/android/Images/UnitPromotionIcons/Sortie.png differ diff --git a/android/Images/UnitPromotionIcons/Sortie_(Civ5).png b/android/Images/UnitPromotionIcons/Sortie_(Civ5).png deleted file mode 100644 index e4eed1c3..00000000 Binary files a/android/Images/UnitPromotionIcons/Sortie_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Targeting I (air).png b/android/Images/UnitPromotionIcons/Targeting I (air).png new file mode 100644 index 00000000..a3128328 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Targeting I (air).png differ diff --git a/android/Images/UnitPromotionIcons/Targeting.png b/android/Images/UnitPromotionIcons/Targeting.png new file mode 100644 index 00000000..a3128328 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Targeting.png differ diff --git a/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png deleted file mode 100644 index dd850fdf..00000000 Binary files a/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png deleted file mode 100644 index 804ceb8c..00000000 Binary files a/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png deleted file mode 100644 index 6ea68d7b..00000000 Binary files a/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Targeting_I_(air)_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_I_(air)_(Civ5).png deleted file mode 100644 index 6ea68d7b..00000000 Binary files a/android/Images/UnitPromotionIcons/Targeting_I_(air)_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Volley.png b/android/Images/UnitPromotionIcons/Volley.png index 3261ad24..a88a023d 100644 Binary files a/android/Images/UnitPromotionIcons/Volley.png and b/android/Images/UnitPromotionIcons/Volley.png differ diff --git a/android/Images/UnitPromotionIcons/Wolfpack.png b/android/Images/UnitPromotionIcons/Wolfpack.png new file mode 100644 index 00000000..20b63bab Binary files /dev/null and b/android/Images/UnitPromotionIcons/Wolfpack.png differ diff --git a/android/Images/UnitPromotionIcons/Wolfpack_III_(Civ5).png b/android/Images/UnitPromotionIcons/Wolfpack_III_(Civ5).png deleted file mode 100644 index ae97d995..00000000 Binary files a/android/Images/UnitPromotionIcons/Wolfpack_III_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Wolfpack_II_(Civ5).png b/android/Images/UnitPromotionIcons/Wolfpack_II_(Civ5).png deleted file mode 100644 index c1a19fff..00000000 Binary files a/android/Images/UnitPromotionIcons/Wolfpack_II_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Wolfpack_I_(Civ5).png b/android/Images/UnitPromotionIcons/Wolfpack_I_(Civ5).png deleted file mode 100644 index 7af68831..00000000 Binary files a/android/Images/UnitPromotionIcons/Wolfpack_I_(Civ5).png and /dev/null differ diff --git a/android/Images/UnitPromotionIcons/Woodsman.png b/android/Images/UnitPromotionIcons/Woodsman.png new file mode 100644 index 00000000..27eea8a9 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Woodsman.png differ diff --git a/android/Images/UnitPromotionIcons/Woodsman_(Civ5).png b/android/Images/UnitPromotionIcons/Woodsman_(Civ5).png deleted file mode 100644 index 72c732cc..00000000 Binary files a/android/Images/UnitPromotionIcons/Woodsman_(Civ5).png and /dev/null differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 0e9422a1..8a7daacd 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -1,6 +1,6 @@ game.png -size: 2460,1840 +size: 2481,1840 format: RGBA8888 filter: MipMapLinearLinear,MipMapLinearLinear repeat: none @@ -643,7 +643,7 @@ BuildingIcons/Windmill index: -1 BuildingIcons/Workshop rotate: false - xy: 1354, 4 + xy: 2374, 208 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -993,14 +993,14 @@ NationIcons/The Ottomans index: -1 OtherIcons/Aircraft rotate: false - xy: 1426, 1352 + xy: 406, 740 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 OtherIcons/BackArrow rotate: false - xy: 384, 344 + xy: 1456, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1119,280 +1119,280 @@ OtherIcons/tileTableBackground index: -1 OtherIcons/whiteDot rotate: false - xy: 277, 1543 + xy: 2478, 1837 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy rotate: false - xy: 406, 740 + xy: 640, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Citizenship rotate: false - xy: 640, 26 + xy: 848, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 2, 31 + xy: 900, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1712, 2 + xy: 1004, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 692, 26 + xy: 1056, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1764, 2 + xy: 1160, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1816, 54 + xy: 1264, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1816, 2 + xy: 2426, 614 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1868, 54 + xy: 2426, 510 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1868, 2 + xy: 2426, 458 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 848, 26 + xy: 2426, 406 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1920, 54 + xy: 65, 44 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 900, 26 + xy: 1560, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1972, 54 + xy: 1612, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 1972, 2 + xy: 1664, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 2024, 54 + xy: 1768, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 2024, 2 + xy: 1768, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1004, 26 + xy: 1820, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 2076, 54 + xy: 1820, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 2076, 2 + xy: 1872, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1056, 26 + xy: 1924, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 2128, 2 + xy: 1976, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1108, 26 + xy: 2028, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 2180, 54 + xy: 2028, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 2180, 2 + xy: 2080, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1160, 26 + xy: 2080, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 2232, 54 + xy: 2132, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 2232, 2 + xy: 2132, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 2284, 2 + xy: 2236, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1264, 26 + xy: 2236, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 2374, 258 + xy: 2288, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 2374, 206 + xy: 2288, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 2374, 154 + xy: 2340, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 2388, 50 + xy: 488, 333 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 65, 44 + xy: 169, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 117, 44 + xy: 221, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 436, 333 + xy: 273, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 488, 333 + xy: 2423, 1736 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 540, 332 + xy: 2423, 1632 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1644,7 +1644,7 @@ StatIcons/Happiness index: -1 StatIcons/InterceptRange rotate: false - xy: 1920, 2 + xy: 2419, 1380 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1658,7 +1658,7 @@ StatIcons/Malcontent index: -1 StatIcons/Movement rotate: false - xy: 2128, 54 + xy: 1924, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1679,14 +1679,14 @@ StatIcons/Production index: -1 StatIcons/Range rotate: false - xy: 1212, 26 + xy: 2184, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/RangedStrength rotate: false - xy: 2284, 54 + xy: 2184, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -2246,7 +2246,7 @@ TechIcons/Trapping index: -1 TechIcons/Writing rotate: false - xy: 1456, 4 + xy: 2374, 106 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2365,35 +2365,35 @@ TileSets/FantasyHex/Hill+City index: -1 TileSets/FantasyHex/Coast rotate: false - xy: 2392, 1758 + xy: 406, 710 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert rotate: false - xy: 406, 710 + xy: 1316, 48 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+City rotate: false - xy: 1316, 43 + xy: 2424, 319 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Flood plains rotate: false - xy: 2336, 20 + xy: 2419, 1350 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Oasis rotate: false - xy: 169, 66 + xy: 1508, 23 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2414,42 +2414,42 @@ TileSets/FantasyHex/TopRightBorder index: -1 TileSets/FantasyHex/Grassland+Forest rotate: false - xy: 169, 35 + xy: 88, 13 size: 31, 29 orig: 31, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Jungle rotate: false - xy: 1354, 311 + xy: 169, 60 size: 32, 34 orig: 32, 34 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+Marsh rotate: false - xy: 2370, 19 + xy: 2444, 1809 size: 32, 29 orig: 32, 29 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill rotate: false - xy: 2404, 16 + xy: 2423, 1494 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+Forest rotate: false - xy: 2426, 671 + xy: 2423, 1447 size: 32, 45 orig: 32, 45 offset: 0, 0 index: -1 TileSets/FantasyHex/Lakes rotate: false - xy: 2426, 641 + xy: 1354, 317 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2463,63 +2463,63 @@ TileSets/FantasyHex/Mountain index: -1 TileSets/FantasyHex/Ocean rotate: false - xy: 2426, 611 + xy: 1542, 23 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains rotate: false - xy: 2426, 581 + xy: 1576, 23 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 2426, 544 + xy: 2444, 69 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Forest rotate: false - xy: 2426, 509 + xy: 2444, 34 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Jungle rotate: false - xy: 2426, 472 + xy: 1610, 16 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/TopBorder rotate: false - xy: 2426, 442 + xy: 2444, 4 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra rotate: false - xy: 2426, 408 + xy: 1316, 14 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+City rotate: false - xy: 2424, 371 + xy: 592, 317 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+Forest rotate: false - xy: 2424, 337 + xy: 54, 10 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -3086,7 +3086,7 @@ UnitIcons/Worker index: -1 UnitIcons/Zero rotate: false - xy: 1558, 3 + xy: 1354, 4 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -3098,311 +3098,234 @@ UnitPromotionIcons/Accuracy orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Air_Repair_(Civ5) +UnitPromotionIcons/Air Repair rotate: false - xy: 1426, 1330 - size: 20, 20 - orig: 20, 20 + xy: 1426, 1352 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Ambush_II_(Civ5) +UnitPromotionIcons/Ambush rotate: false - xy: 1448, 1330 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Ambush_I_(Civ5) - rotate: false - xy: 1470, 1330 - size: 20, 20 - orig: 20, 20 + xy: 384, 344 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage rotate: false - xy: 1660, 54 + xy: 1456, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Blitz_(Civ5) +UnitPromotionIcons/Blitz rotate: false - xy: 281, 1766 - size: 20, 20 - orig: 20, 20 + xy: 2, 31 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Boarding_Party_III_(Civ5) +UnitPromotionIcons/Boarding Party rotate: false - xy: 1474, 1716 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Boarding_Party_II_(Civ5) - rotate: false - xy: 379, 1382 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Boarding_Party_I_(Civ5) - rotate: false - xy: 640, 4 - size: 20, 20 - orig: 20, 20 + xy: 692, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment - rotate: false - xy: 1660, 2 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Charge_(Civ5) - rotate: false - xy: 2, 9 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Coastal_Raider - rotate: false - xy: 1712, 54 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Cover - rotate: false - xy: 1764, 54 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -PolicyIcons/Discipline - rotate: false - xy: 1764, 54 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -StatIcons/Strength - rotate: false - xy: 1764, 54 - size: 50, 50 - orig: 50, 50 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Drill rotate: false xy: 744, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Evasion_(Civ5) - rotate: false - xy: 384, 322 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Formation +UnitPromotionIcons/Charge rotate: false xy: 796, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Heal_Instantly_(Civ5) - rotate: false - xy: 592, 332 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Indirect_Fire_(Civ5) - rotate: false - xy: 458, 770 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Interception_III_(Civ5) - rotate: false - xy: 2424, 315 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Interception_II_(Civ5) - rotate: false - xy: 1478, 1382 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Interception_I_(Civ5) - rotate: false - xy: 281, 1744 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Logistics_(Civ5) - rotate: false - xy: 379, 1360 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/March_(Civ5) - rotate: false - xy: 662, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Medic +UnitPromotionIcons/Coastal_Raider rotate: false xy: 952, 26 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Mobility_(Civ5) +UnitPromotionIcons/Cover rotate: false - xy: 24, 9 - size: 20, 20 - orig: 20, 20 + xy: 1108, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Operational_Range_(Civ5) +PolicyIcons/Discipline rotate: false - xy: 406, 322 - size: 20, 20 - orig: 20, 20 + xy: 1108, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Range_(Civ5) +StatIcons/Strength rotate: false - xy: 406, 322 - size: 20, 20 - orig: 20, 20 + xy: 1108, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_III_(Civ5) +UnitPromotionIcons/Drill rotate: false - xy: 458, 748 - size: 20, 20 - orig: 20, 20 + xy: 1212, 26 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_II_(Civ5) +UnitPromotionIcons/Evasion rotate: false - xy: 1478, 1360 - size: 20, 20 - orig: 20, 20 + xy: 2426, 666 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_I_(Civ5) +UnitPromotionIcons/Formation rotate: false - xy: 281, 1722 - size: 20, 20 - orig: 20, 20 + xy: 2426, 562 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Sentry_(Civ5) +UnitPromotionIcons/Heal Instantly rotate: false - xy: 379, 1338 - size: 20, 20 - orig: 20, 20 + xy: 2424, 354 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Indirect Fire + rotate: false + xy: 117, 44 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Interception + rotate: false + xy: 1508, 53 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Logistics + rotate: false + xy: 1664, 54 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/March + rotate: false + xy: 1716, 54 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Medic + rotate: false + xy: 1716, 2 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Mobility + rotate: false + xy: 1872, 2 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Operational Range + rotate: false + xy: 1976, 2 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Range + rotate: false + xy: 1976, 2 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting + rotate: false + xy: 2340, 54 + size: 50, 50 + orig: 50, 50 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Sentry + rotate: false + xy: 2340, 54 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Shock rotate: false - xy: 2374, 102 + xy: 2392, 54 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 UnitPromotionIcons/Siege rotate: false - xy: 2336, 50 + xy: 2392, 2 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Sortie_(Civ5) +UnitPromotionIcons/Sortie rotate: false - xy: 684, 4 - size: 20, 20 - orig: 20, 20 + xy: 436, 333 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Targeting_III_(Civ5) +UnitPromotionIcons/Targeting rotate: false - xy: 379, 1316 - size: 20, 20 - orig: 20, 20 + xy: 540, 332 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Targeting_II_(Civ5) +UnitPromotionIcons/Targeting I (air) rotate: false - xy: 706, 4 - size: 20, 20 - orig: 20, 20 + xy: 540, 332 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Targeting_I_(Civ5) +UnitPromotionIcons/Volley rotate: false - xy: 728, 4 - size: 20, 20 - orig: 20, 20 + xy: 2423, 1684 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Targeting_I_(air)_(Civ5) +UnitPromotionIcons/Wolfpack rotate: false - xy: 728, 4 - size: 20, 20 - orig: 20, 20 + xy: 2423, 1580 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 -UnitPromotionIcons/Volley_(Civ5) +UnitPromotionIcons/Woodsman rotate: false - xy: 750, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Wolfpack_III_(Civ5) - rotate: false - xy: 772, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Wolfpack_II_(Civ5) - rotate: false - xy: 794, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Wolfpack_I_(Civ5) - rotate: false - xy: 816, 4 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Woodsman_(Civ5) - rotate: false - xy: 838, 4 - size: 20, 20 - orig: 20, 20 + xy: 2423, 1528 + size: 50, 50 + orig: 50, 50 offset: 0, 0 index: -1 diff --git a/android/assets/game.png b/android/assets/game.png index 725302ce..15556e1a 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/docs/Credits.md b/docs/Credits.md index d2120c99..2cd4a2b2 100644 --- a/docs/Credits.md +++ b/docs/Credits.md @@ -445,7 +445,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https: ## Promotions -* [Sight](https://thenounproject.com/search/?q=sight&i=2631027) By Jejen Juliansyah Nur Agung for Accuracy +* [Sight](https://thenounproject.com/search/?q=sight&i=2631027) By Jejen Juliansyah Nur Agung for Scouting * [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 @@ -457,6 +457,18 @@ Unless otherwise specified, all the following are from [the Noun Project](https: * [Wall](https://thenounproject.com/search/?q=wall&i=1305174) By Graphic Tigers for Volley * [Lightning](https://thenounproject.com/search/?q=lightning&i=1187991) By Mooms for Blitz * [Move](https://thenounproject.com/search/?q=move&i=790952) By Sandra for Mobility +* [accuracy](https://thenounproject.com/search/?q=accuracy&i=2017348) By vigtographics for Targeting +* [location](https://thenounproject.com/search/?q=location&i=2858979) by Humantech for Accuracy +* [Plane](https://thenounproject.com/search/?q=plane&i=1875398) By Tran Minh Villageois for Interception +* [Hammer](https://thenounproject.com/search/?q=hammer&i=854936) by Thengakola for Air Repair +* [Hook](https://thenounproject.com/search/?q=hook&i=738678) By Yeong Rong Kim for Boarding Party +* [Leaf](https://thenounproject.com/search/?q=Leaf&i=1627477) By Paul Verhulst for Indirect Fire +* [Move](https://thenounproject.com/search/?q=move&i=344603) By Muneer A.Safiah for Logistics +* [Evasion](https://thenounproject.com/search/?q=evasion&i=2013749) By Anna Sophie for Evasion +* [Interrupt](https://thenounproject.com/search/?q=interrupt&i=366680) by Stephen Plaster for Ambush +* [Submarine](https://thenounproject.com/search/?q=submarines&i=96833) by Lloyd Humphreys for Wolfpack +* [Axe](https://thenounproject.com/search/?q=axe&i=14290) by Brian Oppenlander for Woodsman +* [Competition](https://thenounproject.com/search/?q=move%20fast&i=1743826) by luca fruzza ## Others