diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png new file mode 100644 index 0000000000..1d39eefa1c Binary files /dev/null and b/android/Images/UnitPromotionIcons/Boarding_Party_III_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png new file mode 100644 index 0000000000..15b9ff5bcb Binary files /dev/null and b/android/Images/UnitPromotionIcons/Boarding_Party_II_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png b/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png new file mode 100644 index 0000000000..9afc15e494 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Boarding_Party_I_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png new file mode 100644 index 0000000000..52ee35343e Binary files /dev/null and b/android/Images/UnitPromotionIcons/Bombardment_III_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png new file mode 100644 index 0000000000..101ae009b2 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Bombardment_II_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png b/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png new file mode 100644 index 0000000000..ee741348a8 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Bombardment_I_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png new file mode 100644 index 0000000000..002bf0bd64 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Coastal_Raider_III_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png new file mode 100644 index 0000000000..27bc9747be Binary files /dev/null and b/android/Images/UnitPromotionIcons/Coastal_Raider_II_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png b/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png new file mode 100644 index 0000000000..1aa3b3866e Binary files /dev/null and b/android/Images/UnitPromotionIcons/Coastal_Raider_I_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png new file mode 100644 index 0000000000..dd850fdf36 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Targeting_III_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png new file mode 100644 index 0000000000..804ceb8c04 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Targeting_II_(Civ5).png differ diff --git a/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png b/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png new file mode 100644 index 0000000000..6ea68d7b28 Binary files /dev/null and b/android/Images/UnitPromotionIcons/Targeting_I_(Civ5).png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 871f05f8bc..3c4b218477 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -417,86 +417,93 @@ BuildingIcons/Stonehenge orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Taj Mahal +BuildingIcons/Sydney Opera House rotate: false xy: 1428, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Temple +BuildingIcons/Taj Mahal rotate: false xy: 1530, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Great Library +BuildingIcons/Temple rotate: false xy: 1632, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Great Lighthouse +BuildingIcons/The Great Library rotate: false xy: 1020, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Louvre +BuildingIcons/The Great Lighthouse rotate: false xy: 1122, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Oracle +BuildingIcons/The Louvre rotate: false xy: 1224, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/The Pyramids +BuildingIcons/The Oracle rotate: false xy: 1326, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/The Pyramids + rotate: false + xy: 1428, 724 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Theatre rotate: false - xy: 1530, 826 + xy: 1632, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1428, 622 + xy: 1530, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1632, 826 + xy: 1224, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1530, 622 + xy: 1632, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 1530, 520 + xy: 1632, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -678,7 +685,7 @@ ImprovementIcons/Road index: -1 ImprovementIcons/Trading post rotate: false - xy: 1122, 316 + xy: 1224, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -762,7 +769,7 @@ OtherIcons/Sleep index: -1 OtherIcons/Star rotate: false - xy: 1530, 424 + xy: 1632, 526 size: 100, 94 orig: 100, 94 offset: 0, 0 @@ -804,273 +811,273 @@ PolicyIcons/Aristocracy index: -1 PolicyIcons/Citizenship rotate: false - xy: 1632, 570 + xy: 1530, 367 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Civil Society rotate: false - xy: 1530, 372 + xy: 1632, 474 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Collective Rule rotate: false - xy: 1632, 518 + xy: 1632, 422 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Constitution rotate: false - xy: 1530, 320 + xy: 1530, 315 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Democracy rotate: false - xy: 1632, 466 + xy: 234, 48 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Discipline rotate: false - xy: 234, 48 + xy: 286, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship rotate: false - xy: 286, 53 + xy: 338, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Facism rotate: false - xy: 338, 53 + xy: 390, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Religion rotate: false - xy: 390, 53 + xy: 1582, 367 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Speech rotate: false - xy: 1684, 570 + xy: 1582, 315 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Free Thought rotate: false - xy: 1684, 518 + xy: 1684, 474 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Humanism rotate: false - xy: 1684, 466 + xy: 1684, 422 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Landed Elite rotate: false - xy: 1582, 372 + xy: 1634, 370 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Legalism rotate: false - xy: 1582, 320 + xy: 1634, 318 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mandate Of Heaven rotate: false - xy: 442, 53 + xy: 1686, 370 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Mercantilism rotate: false - xy: 1965, 1662 + xy: 1686, 318 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Meritocracy rotate: false - xy: 1734, 1102 + xy: 442, 53 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Militarism rotate: false - xy: 1734, 1050 + xy: 1965, 1662 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Caste rotate: false - xy: 1786, 1102 + xy: 1734, 1102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Military Tradition rotate: false - xy: 1734, 998 + xy: 1734, 1050 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Monarchy rotate: false - xy: 1786, 1050 + xy: 1786, 1102 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1734, 946 + xy: 1734, 998 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Organized Religion rotate: false - xy: 1786, 998 + xy: 1786, 1050 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Patronage rotate: false - xy: 1734, 894 + xy: 1734, 946 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Police State rotate: false - xy: 1786, 946 + xy: 1786, 998 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Populism rotate: false - xy: 1734, 842 + xy: 1734, 894 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Professional Army rotate: false - xy: 1786, 894 + xy: 1786, 946 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Protectionism rotate: false - xy: 1734, 790 + xy: 1734, 842 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Reformation rotate: false - xy: 1786, 842 + xy: 1786, 894 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Representation rotate: false - xy: 1734, 738 + xy: 1734, 790 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Republic rotate: false - xy: 1786, 790 + xy: 1786, 842 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Scientific Revolution rotate: false - xy: 1734, 686 + xy: 1734, 738 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Secularism rotate: false - xy: 1786, 738 + xy: 1786, 790 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Sovereignty rotate: false - xy: 1734, 634 + xy: 1734, 686 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Theocracy rotate: false - xy: 1786, 686 + xy: 1786, 738 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1786, 634 + xy: 1734, 634 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1736, 582 + xy: 1786, 686 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1736, 530 + xy: 1734, 582 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1736, 478 + xy: 1786, 634 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1245,28 +1252,28 @@ ResourceIcons/Sugar index: -1 ResourceIcons/Uranium rotate: false - xy: 1530, 724 + xy: 1632, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1326, 418 + xy: 1428, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1428, 520 + xy: 1530, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1632, 724 + xy: 1326, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1798,28 +1805,28 @@ TechIcons/Steel index: -1 TechIcons/The Wheel rotate: false - xy: 1428, 724 + xy: 1530, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 1632, 928 + xy: 1122, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1224, 418 + xy: 1326, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 1632, 622 + xy: 1428, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2036,7 +2043,7 @@ UnitIcons/Musketeer index: -1 UnitIcons/Musketman rotate: false - xy: 1428, 317 + xy: 1530, 419 size: 100, 99 orig: 100, 99 offset: 0, 0 @@ -2085,7 +2092,7 @@ UnitIcons/Swordsman index: -1 UnitIcons/Trebuchet rotate: false - xy: 1326, 520 + xy: 1428, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2099,21 +2106,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1224, 316 + xy: 1326, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1326, 316 + xy: 1428, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 1428, 418 + xy: 1530, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2167,157 +2174,241 @@ UnitPromotionIcons/Blitz_(Civ5) orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Charge_(Civ5) +UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false xy: 306, 1252 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Cover_II_(Civ5) +UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false xy: 537, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Cover_I_(Civ5) +UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false xy: 2005, 2026 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Drill_III_(Civ5) +UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false xy: 1875, 1896 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Drill_II_(Civ5) +UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false xy: 1863, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Drill_I_(Civ5) - rotate: false - xy: 1632, 444 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Formation_II_(Civ5) +UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false xy: 1965, 1640 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Formation_I_(Civ5) +UnitPromotionIcons/Charge_(Civ5) rotate: false xy: 1734, 1212 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Indirect_Fire_(Civ5) +UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false xy: 1838, 1132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Logistics_(Civ5) +UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 1788, 612 + xy: 1734, 560 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/March_(Civ5) +UnitPromotionIcons/Coastal_Raider_I_(Civ5) + rotate: false + xy: 1786, 612 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Cover_II_(Civ5) rotate: false xy: 132, 28 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Mobility_(Civ5) +UnitPromotionIcons/Cover_I_(Civ5) rotate: false xy: 226, 1546 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Range_(Civ5) +UnitPromotionIcons/Drill_III_(Civ5) rotate: false xy: 306, 1230 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_III_(Civ5) +UnitPromotionIcons/Drill_II_(Civ5) rotate: false xy: 537, 1750 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_II_(Civ5) +UnitPromotionIcons/Drill_I_(Civ5) rotate: false xy: 559, 1772 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Scouting_I_(Civ5) +UnitPromotionIcons/Formation_II_(Civ5) rotate: false xy: 2005, 2004 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Sentry_(Civ5) +UnitPromotionIcons/Formation_I_(Civ5) rotate: false xy: 1875, 1874 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Shock_III_(Civ5) +UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false xy: 1863, 1722 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Shock_II_(Civ5) +UnitPromotionIcons/Logistics_(Civ5) rotate: false xy: 1885, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Shock_I_(Civ5) - rotate: false - xy: 1654, 444 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -UnitPromotionIcons/Siege_(Civ5) +UnitPromotionIcons/March_(Civ5) rotate: false xy: 1965, 1618 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -UnitPromotionIcons/Volley_(Civ5) +UnitPromotionIcons/Mobility_(Civ5) rotate: false xy: 1987, 1640 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 +UnitPromotionIcons/Range_(Civ5) + rotate: false + xy: 1734, 1190 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_III_(Civ5) + rotate: false + xy: 1838, 1110 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_II_(Civ5) + rotate: false + xy: 1734, 538 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Scouting_I_(Civ5) + rotate: false + xy: 1756, 560 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Sentry_(Civ5) + rotate: false + xy: 1786, 590 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_III_(Civ5) + rotate: false + xy: 1808, 612 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_II_(Civ5) + rotate: false + xy: 154, 28 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Shock_I_(Civ5) + rotate: false + xy: 248, 1546 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Siege_(Civ5) + rotate: false + xy: 559, 1750 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Targeting_III_(Civ5) + rotate: false + xy: 2005, 1982 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Targeting_II_(Civ5) + rotate: false + xy: 1885, 1722 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Targeting_I_(Civ5) + rotate: false + xy: 1987, 1618 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +UnitPromotionIcons/Volley_(Civ5) + rotate: false + xy: 1734, 1168 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 diff --git a/android/assets/game.png b/android/assets/game.png index 3b3fbc893b..8d69ad8940 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/UnitPromotions.json b/android/assets/jsons/UnitPromotions.json index 8fe1925ae1..883fe65287 100644 --- a/android/assets/jsons/UnitPromotions.json +++ b/android/assets/jsons/UnitPromotions.json @@ -17,6 +17,7 @@ effect:"Bonus vs units in open terrain 15%", unitTypes:["Siege","Ranged"] } + { name:"Barrage I", effect:"Bonus vs units in rough terrain 15%", @@ -34,6 +35,7 @@ effect:"Bonus vs units in rough terrain 15%", unitTypes:["Siege","Ranged"] } + { name:"Shock I", effect:"Bonus vs units in open terrain 15%", @@ -51,6 +53,7 @@ effect:"Bonus vs units in open terrain 15%", unitTypes:["Melee","Mounted"] } + { name:"Drill I", effect:"Bonus vs units in rough terrain 15%", @@ -68,6 +71,7 @@ effect:"Bonus vs units in rough terrain 15%", unitTypes:["Melee","Mounted"] } + { name:"Scouting I", effect:"+1 Visibility Range", @@ -85,6 +89,7 @@ effect:"+1 Visibility Range", unitTypes:["Scout"] } + { name:"Cover I", effect:"+25% Defence against ranged attacks", @@ -96,42 +101,57 @@ effect:"+25% Defence against ranged attacks", unitTypes:["Melee","Ranged","Siege"] } + { name:"March", prerequisites:["Accuracy II","Barrage II","Shock III","Drill III"], effect:"Unit will heal every turn, even if it performs an action", unitTypes:["Melee","Ranged","Siege","Mounted"] } + { name:"Charge", prerequisites:["Shock II","Drill II"], effect:"Bonus vs wounded units 33%", unitTypes:["Mounted"] } + + { + name:"Mobility", + prerequisites:["Shock II","Drill II","Targeting I", + "Bombardment I","Boarding Party I", "Coastal Raider I"], + effect:"+1 Movement", + unitTypes:["Mounted","WaterMelee","WaterRanged"] + } + { name:"Siege", prerequisites:["Shock II","Drill II"], effect:"Bonus vs City 50%", unitTypes:["Melee"] } + { name:"Volley", prerequisites:["Accuracy I","Barrage I"], effect:"Bonus vs City 50%", unitTypes:["Ranged","Siege"] } + { name:"Sentry", - prerequisites:["Accuracy I","Barrage I","Shock II","Drill II"], + prerequisites:["Accuracy I","Barrage I","Shock II","Drill II","Bombardment I","Targeting I"], effect:"+1 Visibility Range", - unitTypes:["Melee","Mounted"] + unitTypes:["Melee","Mounted","WaterRanged"] } + { name:"Range", - prerequisites:["Accuracy III","Barrage III"], + prerequisites:["Accuracy III","Barrage III","Targeting II","Bombardment II"], effect:"+1 Range", - unitTypes:["Ranged","Siege"] + unitTypes:["Ranged","Siege","WaterRanged"] } + { name:"Indirect Fire", prerequisites:["Accuracy III","Barrage III"], @@ -151,23 +171,92 @@ effect:"Bonus vs Mounted 33%", unitTypes:["Melee","Mounted"] } + { name:"Blitz", prerequisites:["Shock III","Drill III"], effect:"1 additional attack per turn", unitTypes:["Melee","Mounted"] } + { name:"Logistics", - prerequisites:["Accuracy III","Barrage III"], + prerequisites:["Accuracy III","Barrage III","Targeting III", + "Bombardment III", "Coastal Raider III","Boarding Party III"], effect:"1 additional attack per turn", - unitTypes:["Ranged","Siege"] + unitTypes:["Ranged","Siege","WaterMelee","WaterRanged"] + } + + { + name:"Bombardment I", + effect:"Bonus vs land units 33%", + unitTypes:["WaterRanged"] } { - name:"Mobility", - prerequisites:["Shock III","Drill III"], - effect:"+1 Movement", - unitTypes:["Mounted"] + name:"Bombardment II", + prerequisites:["Bombardment I"], + effect:"Bonus vs land units 33%", + unitTypes:["WaterRanged"] + } + { + name:"Bombardment III", + prerequisites:["Bombardment II"], + effect:"Bonus vs land units 34%", + unitTypes:["WaterRanged"] + } + + { + name:"Boarding Party I", + effect:"Bonus vs water units 15%", + unitTypes:["WaterMelee"] + } + { + name:"Boarding Party II", + prerequisites:["Boarding Party I"], + effect:"Bonus vs water units 15%", + unitTypes:["WaterMelee"] + } + { + name:"Boarding Party III", + prerequisites:["Boarding Party II"], + effect:"Bonus vs water units 15%", + unitTypes:["WaterMelee"] + } + + { + name:"Coastal Raider I", + effect:"Bonus vs City 15%", + unitTypes:["WaterMelee"] + } + { + name:"Coastal Raider II", + prerequisites:["Coastal Raider I"], + effect:"Bonus vs City 15%", + unitTypes:["WaterMelee"] + } + { + name:"Coastal Raider III", + prerequisites:["Coastal Raider II"], + effect:"Bonus vs City 15%", + unitTypes:["WaterMelee"] + } + + { + name:"Targeting I", + effect:"Bonus vs City 15%", + unitTypes:["WaterRanged"] + } + { + name:"Targeting II", + prerequisites:["Targeting I"], + effect:"Bonus vs water units 15%", + unitTypes:["WaterRanged"] + } + { + name:"Targeting III", + prerequisites:["Targeting II"], + effect:"Bonus vs water units 15%", + unitTypes:["WaterRanged"] } ] \ No newline at end of file diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index c11bbf6f45..04eaadc65e 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -34,6 +34,8 @@ class BattleDamage{ modifiers[BDM.getText()] = BDM.modificationAmount if(BDM.vs == "wounded units" && enemy is MapUnitCombatant && enemy.getHealth()<100) modifiers[BDM.getText()] = BDM.modificationAmount + if(BDM.vs == "land units" && enemy.getUnitType().isLandUnit()) + modifiers[BDM.getText()] = BDM.modificationAmount } if (combatant.getCivilization().happiness < 0) modifiers["Unhappiness"] = 0.02f * combatant.getCivilization().happiness //https://www.carlsguides.com/strategy/civilization5/war/combatbonuses.php diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt index 1cd04dae6e..1288029bde 100644 --- a/core/src/com/unciv/logic/map/TileMap.kt +++ b/core/src/com/unciv/logic/map/TileMap.kt @@ -80,6 +80,7 @@ class TileMap { if(unitToPlaceTile!=null) { // only once we know the unit can be placed do we add it to the civ's unit list unit.putInTile(unitToPlaceTile) + unit.currentMovement = unit.getMaxMovement().toFloat() } else civInfo.units.remove(unit) // since we added it to the civ units in the previous assignOwner diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt index 4b8118e74b..1a7e9798d6 100644 --- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt +++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt @@ -77,8 +77,6 @@ class BaseUnit : INamed, IConstruction, ICivilopedia { val unit = MapUnit() unit.name = name unit.setTransients() // must be after setting name because it sets the baseUnit according to the name - unit.civInfo = civInfo // needed for the getMaxMovement function below, since movement can be affected by wonders (e.g. Great Lighthouse) - unit.currentMovement = unit.getMaxMovement().toFloat() // must be after setTransients because it relies on having the baseUnit set return unit }