diff --git a/Credits.md b/Credits.md index b1ac2846dc..c4eb248008 100644 --- a/Credits.md +++ b/Credits.md @@ -63,6 +63,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Tank](https://thenounproject.com/term/tank/1287510/) By corpus delicti for Landship * [Warship](https://thenounproject.com/term/warship/1597474/) By zidney for Destroyer * [Battleship](https://thenounproject.com/search/?q=battleship&i=1986807) By Vitaliy Gorbachev, KZ for Battleship +* [Submarine](https://thenounproject.com/search/?q=submarine&i=589519) By Hea Poh Lin, MY ### Great People @@ -346,6 +347,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Plastic](https://thenounproject.com/term/plastic/478826/) By Yu luck * [Microphone](https://thenounproject.com/term/microphone/470266/) By Viktor Vorobyev for Mass Media * [Flight](https://thenounproject.com/term/flight/1014306/) By Genius Icons +* [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL ### Information * [Pill](https://thenounproject.com/term/pill/780458/) By Alex Arseneau for Pharmaceuticals diff --git a/android/Images/TechIcons/Refrigeration.png b/android/Images/TechIcons/Refrigeration.png new file mode 100644 index 0000000000..39313eb774 Binary files /dev/null and b/android/Images/TechIcons/Refrigeration.png differ diff --git a/android/Images/UnitIcons/Submarine.png b/android/Images/UnitIcons/Submarine.png new file mode 100644 index 0000000000..2777197082 Binary files /dev/null and b/android/Images/UnitIcons/Submarine.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 58c6793407..9fdca83fb0 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -335,189 +335,189 @@ BuildingIcons/Public School index: -1 BuildingIcons/Research Lab rotate: false - xy: 1734, 719 + xy: 1836, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 245, 404 + xy: 347, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 347, 404 + xy: 143, 373 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 143, 373 + xy: 132, 271 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 132, 271 + xy: 132, 169 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 234, 200 + xy: 234, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 590, 619 + xy: 692, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 794, 619 + xy: 896, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 896, 619 + xy: 998, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 1304, 619 + xy: 1406, 618 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 1406, 618 + xy: 1508, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 1712, 617 + xy: 1814, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 1916, 617 + xy: 449, 507 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 449, 507 + xy: 449, 405 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 551, 415 + xy: 551, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 755, 517 + xy: 653, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 551, 313 + xy: 857, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 653, 415 + xy: 653, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 857, 517 + xy: 755, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 653, 313 + xy: 959, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 755, 415 + xy: 755, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 959, 517 + xy: 857, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 857, 415 + xy: 857, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 959, 313 + xy: 1265, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1265, 517 + xy: 1163, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1265, 415 + xy: 1367, 516 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1367, 312 + xy: 1469, 413 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -692,14 +692,14 @@ ImprovementIcons/Quarry index: -1 ImprovementIcons/Road rotate: false - xy: 284, 608 + xy: 245, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 857, 313 + xy: 1163, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -783,14 +783,14 @@ ImprovementIcons/Railroad index: -1 OtherIcons/Shield rotate: false - xy: 336, 98 + xy: 386, 609 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 692, 619 + xy: 794, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -804,7 +804,7 @@ OtherIcons/Star index: -1 OtherIcons/Stop rotate: false - xy: 449, 405 + xy: 449, 303 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -853,259 +853,259 @@ PolicyIcons/Civil Society index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1469, 463 + xy: 1469, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1571, 565 + xy: 1571, 463 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 54, 13 + xy: 1673, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 1469, 411 + xy: 54, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 1623, 565 + xy: 1725, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 1469, 359 + xy: 1777, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 1675, 565 + xy: 1829, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1727, 565 + xy: 1881, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1779, 565 + xy: 1933, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1831, 565 + xy: 388, 46 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1883, 565 + xy: 1521, 361 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1935, 565 + xy: 1623, 463 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 388, 46 + xy: 1469, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1521, 463 + xy: 1521, 309 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1521, 411 + xy: 1966, 1585 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1521, 359 + xy: 1966, 1533 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1469, 307 + xy: 1966, 1481 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1521, 307 + xy: 1966, 1429 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1966, 1585 + xy: 1966, 1377 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1966, 1533 + xy: 1966, 1325 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1966, 1481 + xy: 1966, 1273 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1966, 1429 + xy: 1966, 1221 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1966, 1377 + xy: 1966, 1169 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1966, 1325 + xy: 1966, 1117 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1966, 1273 + xy: 1966, 1065 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1966, 1221 + xy: 1966, 1013 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1966, 1169 + xy: 1966, 961 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1966, 1117 + xy: 1985, 565 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1966, 1065 + xy: 106, 13 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1966, 1013 + xy: 158, 15 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1966, 961 + xy: 438, 250 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1987, 565 + xy: 438, 198 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 106, 13 + xy: 438, 146 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 158, 15 + xy: 490, 251 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 438, 250 + xy: 490, 199 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 438, 198 + xy: 490, 147 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 438, 146 + xy: 551, 261 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1238,70 +1238,70 @@ ResourceIcons/Pearls index: -1 ResourceIcons/Sheep rotate: false - xy: 336, 200 + xy: 336, 98 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 386, 609 + xy: 488, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 488, 619 + xy: 590, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 1202, 619 + xy: 1304, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 1814, 617 + xy: 1916, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 551, 517 + xy: 551, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1061, 415 + xy: 1061, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1163, 415 + xy: 1265, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1163, 313 + xy: 1265, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1265, 313 + xy: 1367, 414 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1392,7 +1392,7 @@ StatIcons/RangedStrength index: -1 StatIcons/Resistance rotate: false - xy: 1836, 719 + xy: 1938, 821 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1406,14 +1406,14 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 1100, 619 + xy: 1202, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 449, 303 + xy: 551, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1810,93 +1810,100 @@ TechIcons/Radio orig: 100, 100 offset: 0, 0 index: -1 -TechIcons/Replacable Parts +TechIcons/Refrigeration rotate: false xy: 1632, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +TechIcons/Replacable Parts + rotate: false + xy: 1734, 719 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 TechIcons/Rifling rotate: false - xy: 1938, 719 + xy: 284, 608 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 245, 506 + xy: 347, 506 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 347, 506 + xy: 245, 404 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 132, 169 + xy: 132, 67 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 132, 67 + xy: 245, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 245, 302 + xy: 347, 302 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 1508, 617 + xy: 1610, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 1610, 617 + xy: 1712, 617 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 755, 313 + xy: 1061, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1061, 517 + xy: 959, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 959, 415 + xy: 959, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1469, 515 + xy: 1571, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2218,42 +2225,49 @@ UnitIcons/Pikeman index: -1 UnitIcons/Rifleman rotate: false - xy: 1938, 821 + xy: 1938, 719 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 347, 302 + xy: 234, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 234, 98 + xy: 336, 200 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 998, 619 + xy: 1100, 619 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -UnitIcons/Swordsman +UnitIcons/Submarine rotate: false xy: 653, 517 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +UnitIcons/Swordsman + rotate: false + xy: 755, 517 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 UnitIcons/Trebuchet rotate: false - xy: 1163, 517 + xy: 1061, 415 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2267,21 +2281,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1061, 313 + xy: 1163, 313 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1367, 516 + xy: 1367, 312 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1367, 414 + xy: 1469, 515 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2358,217 +2372,217 @@ UnitPromotionIcons/Boarding_Party_I_(Civ5) index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1571, 543 + xy: 1571, 441 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 2015, 1819 + xy: 1673, 543 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1966, 939 + xy: 2015, 1819 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 2018, 697 + xy: 1966, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 210, 45 + xy: 2018, 697 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 438, 124 + xy: 210, 45 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1531, 1949 + xy: 438, 124 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1981, 1949 + xy: 603, 291 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 2003, 1971 + xy: 1531, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 336, 2 + xy: 1981, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 358, 24 + xy: 2003, 1971 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 1571, 521 + xy: 336, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1593, 543 + xy: 358, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 2015, 1797 + xy: 1571, 419 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1988, 939 + xy: 1593, 441 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 2018, 675 + xy: 1673, 521 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 210, 23 + xy: 1695, 543 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 438, 102 + xy: 2015, 1797 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 460, 124 + xy: 1988, 939 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 2003, 1949 + xy: 2018, 675 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 358, 2 + xy: 210, 23 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 380, 24 + xy: 438, 102 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1593, 521 + xy: 460, 124 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1615, 543 + xy: 625, 291 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 2015, 1775 + xy: 603, 269 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 2018, 653 + xy: 2003, 1949 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 460, 102 + xy: 358, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 380, 2 + xy: 380, 24 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 402, 24 + xy: 1593, 419 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1615, 521 + xy: 1615, 441 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1637, 543 + xy: 1695, 521 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 497429cca2..576716963c 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json index cab53ab6ce..2bd46aca7f 100644 --- a/android/assets/jsons/Techs.json +++ b/android/assets/jsons/Techs.json @@ -356,13 +356,12 @@ techCost: 4505, buildingCost:500, wonderCost:1250, - techs:[/* + techs:[ { name:"Refrigeration", - row:4, - prerequisites:["Electricity"], - baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of offshore platforms and submarines" - },*/ + row:3, + prerequisites:["Biology", "Electricity"], //to do: offshore platform should need this + }, { name:"Replacable Parts", row:4, @@ -395,7 +394,7 @@ { name:"Electronics", row:5, - prerequisites:["Radio"], + prerequisites:["Replacable Parts", "Flight"], }, { name:"Mass Media", diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json index c7a5274d09..9bd35b5b62 100644 --- a/android/assets/jsons/Units.json +++ b/android/assets/jsons/Units.json @@ -483,6 +483,17 @@ uniques:["Indirect Fire", "Bonus vs City 30%"], hurryCostModifier:20 }, + { + name: "Submarine", + unitType: "WaterRanged", + movement: 5, + strength: 35, + rangedStrength: 60, + cost: 325, + requiredTech:"Refrigeration", + uniques:["Bonus as Attacker 75%", "Invisible to others", "Can Only Attack Water"], //to do: 3 uniques + hurryCostModifier:20 + }, { name:"Great War Infantry", unitType:"Melee", diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 363f318d67..401937516c 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -88,6 +88,12 @@ class BattleDamage{ else modifiers[text] = BDM.modificationAmount } } + + for (ability in attacker.unit.getUniques()) { + val regexResult = Regex("""Bonus as Attacker (\d*)%""").matchEntire(ability) //to do: extend to defender, and penalyy + if (regexResult == null) continue + modifiers["Attacker Bonus"] = regexResult.groups[1]!!.value.toFloat() / 100 + } } if (attacker.isMelee()) {