diff --git a/Credits.md b/Credits.md index 0744df9d47..adb790297f 100644 --- a/Credits.md +++ b/Credits.md @@ -187,6 +187,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc * [Forbidden City](https://thenounproject.com/term/forbidden-city/1797540/) By 1516 * [Theatre](https://thenounproject.com/term/theatre/1780401/) By b farias * [Tower of Pisa](https://thenounproject.com/search/?q=leaning%20tower%20of%20pisa&i=1002578) By Pedro Santos +* [Himeji Castle](https://thenounproject.com/search/?q=himeji&i=1125277) By Chanut is Industries * [Windmill](https://thenounproject.com/term/windmill/1705107/) By corpus delicti * [Taj Mahal](https://thenounproject.com/term/taj-mahal/1907755/) By Felipe Alvarado * [Observatory](https://thenounproject.com/term/observatory/1259/) By Nathan Driskell diff --git a/android/Images/BuildingIcons/Himeji Castle.png b/android/Images/BuildingIcons/Himeji Castle.png new file mode 100644 index 0000000000..cd4a119c90 Binary files /dev/null and b/android/Images/BuildingIcons/Himeji Castle.png differ diff --git a/android/assets/game.atlas b/android/assets/game.atlas index 2de6556e50..be085d2adc 100644 --- a/android/assets/game.atlas +++ b/android/assets/game.atlas @@ -200,387 +200,394 @@ BuildingIcons/Hermitage orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Hospital +BuildingIcons/Himeji Castle rotate: false - xy: 1456, 1152 + xy: 1456, 1356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Hubble Space Telescope +BuildingIcons/Hospital rotate: false xy: 1558, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 -BuildingIcons/Hydro Plant +BuildingIcons/Hubble Space Telescope rotate: false xy: 1558, 1152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 +BuildingIcons/Hydro Plant + rotate: false + xy: 1660, 1544 + size: 100, 100 + orig: 100, 100 + offset: 0, 0 + index: -1 BuildingIcons/Ironworks rotate: false - xy: 1762, 1436 + xy: 1864, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Kremlin rotate: false - xy: 1762, 1232 + xy: 1864, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Krepost rotate: false - xy: 1864, 1334 + xy: 1864, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Leaning Tower of Pisa rotate: false - xy: 286, 537 + xy: 336, 435 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Library rotate: false - xy: 336, 435 + xy: 336, 333 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Lighthouse rotate: false - xy: 336, 333 + xy: 336, 231 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Machu Picchu rotate: false - xy: 1660, 1034 + xy: 1762, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Market rotate: false - xy: 388, 640 + xy: 388, 538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Military Academy rotate: false - xy: 510, 1030 + xy: 408, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Mint rotate: false - xy: 714, 1030 + xy: 510, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monastery rotate: false - xy: 816, 1030 + xy: 612, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Monument rotate: false - xy: 612, 826 + xy: 714, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Museum rotate: false - xy: 918, 1030 + xy: 714, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/National College rotate: false - xy: 1020, 1030 + xy: 816, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Notre Dame rotate: false - xy: 918, 928 + xy: 1122, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Nuclear Plant rotate: false - xy: 918, 826 + xy: 1020, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Observatory rotate: false - xy: 1224, 1030 + xy: 1020, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Opera House rotate: false - xy: 1326, 1030 + xy: 1122, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Oxford University rotate: false - xy: 1224, 928 + xy: 1224, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Palace rotate: false - xy: 1224, 826 + xy: 1326, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Paper Maker rotate: false - xy: 1326, 928 + xy: 1326, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Pentagon rotate: false - xy: 1530, 948 + xy: 1428, 846 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Porcelain Tower rotate: false - xy: 1938, 824 + xy: 1428, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Public School rotate: false - xy: 1632, 729 + xy: 1734, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Research Lab rotate: false - xy: 694, 724 + xy: 592, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Booster rotate: false - xy: 1102, 724 + xy: 1000, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Cockpit rotate: false - xy: 1000, 622 + xy: 1204, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Engine rotate: false - xy: 1204, 724 + xy: 1102, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/SS Stasis Chamber rotate: false - xy: 1102, 622 + xy: 1306, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Seaport rotate: false - xy: 1612, 627 + xy: 1714, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sistine Chapel rotate: false - xy: 1612, 525 + xy: 1714, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Solar Plant rotate: false - xy: 1816, 518 + xy: 1918, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Spaceship Factory rotate: false - xy: 1918, 518 + xy: 540, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stable rotate: false - xy: 744, 520 + xy: 540, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stadium rotate: false - xy: 540, 316 + xy: 642, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Statue of Liberty rotate: false - xy: 642, 418 + xy: 846, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stock Exchange rotate: false - xy: 642, 316 + xy: 744, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stone Works rotate: false - xy: 948, 520 + xy: 540, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Stonehenge rotate: false - xy: 540, 112 + xy: 642, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Sydney Opera House rotate: false - xy: 642, 112 + xy: 744, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Taj Mahal rotate: false - xy: 744, 214 + xy: 846, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Temple rotate: false - xy: 948, 418 + xy: 1152, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Library rotate: false - xy: 1152, 520 + xy: 744, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Great Lighthouse rotate: false - xy: 744, 112 + xy: 846, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Louvre rotate: false - xy: 846, 214 + xy: 948, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Oracle rotate: false - xy: 948, 316 + xy: 1050, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/The Pyramids rotate: false - xy: 1050, 418 + xy: 1254, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Theatre rotate: false - xy: 846, 112 + xy: 948, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/University rotate: false - xy: 1050, 214 + xy: 1152, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Walls rotate: false - xy: 1254, 418 + xy: 1050, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Windmill rotate: false - xy: 1152, 112 + xy: 1254, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 BuildingIcons/Workshop rotate: false - xy: 642, 10 + xy: 744, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -706,91 +713,91 @@ ImprovementIcons/Fishing Boats index: -1 ImprovementIcons/Landmark rotate: false - xy: 1864, 1130 + xy: 286, 639 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Lumber mill rotate: false - xy: 336, 27 + xy: 1456, 1050 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Manufactory rotate: false - xy: 1762, 1028 + xy: 1864, 1028 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Mine rotate: false - xy: 612, 1030 + xy: 510, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Oil well rotate: false - xy: 1122, 928 + xy: 1326, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Plantation rotate: false - xy: 1836, 824 + xy: 1938, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Quarry rotate: false - xy: 1734, 722 + xy: 1836, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Railroad rotate: false - xy: 1938, 722 + xy: 490, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/Railroad rotate: false - xy: 1938, 722 + xy: 490, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/FantasyHex/Railroad rotate: false - xy: 1938, 722 + xy: 490, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/Railroad rotate: false - xy: 1938, 722 + xy: 490, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Road rotate: false - xy: 898, 724 + xy: 796, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ImprovementIcons/Trading post rotate: false - xy: 1050, 316 + xy: 1152, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -867,42 +874,42 @@ TileSets/ThorfMaps/Hexagon index: -1 OtherIcons/MenuIcon rotate: false - xy: 438, 28 + xy: 408, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pentagon rotate: false - xy: 1428, 846 + xy: 1530, 846 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Pillage rotate: false - xy: 1734, 824 + xy: 1836, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1918, 620 + xy: 1408, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Sleep rotate: false - xy: 1714, 518 + xy: 1816, 518 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 642, 214 + xy: 744, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -972,14 +979,14 @@ PolicyIcons/Democracy index: -1 PolicyIcons/Discipline rotate: false - xy: 846, 60 + xy: 948, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 StatIcons/Strength rotate: false - xy: 846, 60 + xy: 948, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1000,7 +1007,7 @@ PolicyIcons/Facism index: -1 PolicyIcons/Free Religion rotate: false - xy: 898, 60 + xy: 1000, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1028,7 +1035,7 @@ PolicyIcons/Humanism index: -1 PolicyIcons/Landed Elite rotate: false - xy: 950, 60 + xy: 1052, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1063,7 +1070,7 @@ PolicyIcons/Meritocracy index: -1 PolicyIcons/Militarism rotate: false - xy: 1002, 60 + xy: 1104, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1091,7 +1098,7 @@ PolicyIcons/Monarchy index: -1 PolicyIcons/Oligarchy rotate: false - xy: 1054, 60 + xy: 1156, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1126,7 +1133,7 @@ PolicyIcons/Populism index: -1 PolicyIcons/Professional Army rotate: false - xy: 1106, 60 + xy: 1208, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1154,7 +1161,7 @@ PolicyIcons/Representation index: -1 PolicyIcons/Republic rotate: false - xy: 1158, 60 + xy: 1260, 60 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1182,35 +1189,35 @@ PolicyIcons/Sovereignty index: -1 PolicyIcons/Theocracy rotate: false - xy: 1210, 60 + xy: 1460, 176 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Total War rotate: false - xy: 1460, 176 + xy: 1512, 228 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Trade Unions rotate: false - xy: 1512, 228 + xy: 1512, 176 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Universal Suffrage rotate: false - xy: 1262, 60 + xy: 948, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 index: -1 PolicyIcons/Warrior Code rotate: false - xy: 1512, 176 + xy: 1000, 8 size: 50, 50 orig: 50, 50 offset: 0, 0 @@ -1294,119 +1301,119 @@ ResourceIcons/Gold index: -1 ResourceIcons/Horses rotate: false - xy: 1558, 1356 + xy: 1456, 1152 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Incense rotate: false - xy: 1660, 1544 + xy: 1660, 1442 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Iron rotate: false - xy: 1660, 1238 + xy: 1660, 1136 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Ivory rotate: false - xy: 1864, 1538 + xy: 1762, 1334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Marble rotate: false - xy: 1864, 1028 + xy: 388, 640 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Oil rotate: false - xy: 1020, 826 + xy: 1122, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Pearls rotate: false - xy: 1428, 948 + xy: 1530, 948 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sheep rotate: false - xy: 1816, 620 + xy: 1918, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silk rotate: false - xy: 1408, 540 + xy: 1510, 540 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Silver rotate: false - xy: 1510, 540 + xy: 1612, 525 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Spices rotate: false - xy: 540, 418 + xy: 744, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Stone rotate: false - xy: 744, 418 + xy: 948, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Sugar rotate: false - xy: 846, 418 + xy: 1050, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Uranium rotate: false - xy: 1152, 316 + xy: 1254, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Whales rotate: false - xy: 1152, 214 + xy: 1254, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wheat rotate: false - xy: 1254, 316 + xy: 1152, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 ResourceIcons/Wine rotate: false - xy: 1254, 214 + xy: 1254, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1497,7 +1504,7 @@ StatIcons/RangedStrength index: -1 StatIcons/Resistance rotate: false - xy: 592, 622 + xy: 796, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1511,7 +1518,7 @@ StatIcons/Science index: -1 StatIcons/Specialist rotate: false - xy: 642, 520 + xy: 540, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -1770,266 +1777,266 @@ TechIcons/Gunpowder index: -1 TechIcons/Horseback Riding rotate: false - xy: 1558, 1458 + xy: 1456, 1254 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Industrialization rotate: false - xy: 1660, 1442 + xy: 1660, 1340 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Iron Working rotate: false - xy: 1660, 1136 + xy: 1762, 1538 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Machinery rotate: false - xy: 1558, 1050 + xy: 1660, 1034 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Masonry rotate: false - xy: 438, 436 + xy: 438, 334 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mass Media (retired) rotate: false - xy: 438, 334 + xy: 438, 232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mathematics rotate: false - xy: 438, 232 + xy: 438, 130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metal Casting rotate: false - xy: 408, 1030 + xy: 408, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Metallurgy rotate: false - xy: 408, 928 + xy: 510, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Military Science rotate: false - xy: 408, 826 + xy: 612, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Mining rotate: false - xy: 510, 928 + xy: 714, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nanotechnology rotate: false - xy: 816, 928 + xy: 1020, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Navigation rotate: false - xy: 816, 826 + xy: 918, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Nuclear Fission rotate: false - xy: 1122, 1030 + xy: 918, 826 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Optics rotate: false - xy: 1122, 826 + xy: 1224, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Particle Physics rotate: false - xy: 1326, 826 + xy: 1428, 948 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pharmaceuticals rotate: false - xy: 1530, 846 + xy: 1632, 932 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Philosophy rotate: false - xy: 1632, 932 + xy: 1734, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Physics rotate: false - xy: 1734, 926 + xy: 1836, 926 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Plastics rotate: false - xy: 1938, 926 + xy: 1938, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Pottery rotate: false - xy: 1428, 744 + xy: 1530, 744 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Printing Press rotate: false - xy: 1530, 744 + xy: 1632, 729 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Radio rotate: false - xy: 1836, 722 + xy: 1938, 722 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Railroad rotate: false - xy: 490, 724 + xy: 592, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Refrigeration rotate: false - xy: 592, 724 + xy: 490, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Replaceable Parts rotate: false - xy: 490, 622 + xy: 694, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rifling rotate: false - xy: 694, 622 + xy: 898, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Robotics rotate: false - xy: 796, 622 + xy: 1000, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Rocketry rotate: false - xy: 898, 622 + xy: 1102, 724 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Sailing rotate: false - xy: 1306, 724 + xy: 1204, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Satellites rotate: false - xy: 1306, 622 + xy: 1408, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Scientific Theory rotate: false - xy: 1408, 642 + xy: 1510, 642 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steam Power rotate: false - xy: 846, 520 + xy: 540, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Steel rotate: false - xy: 540, 214 + xy: 642, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/The Wheel rotate: false - xy: 1254, 520 + xy: 846, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Theology rotate: false - xy: 948, 214 + xy: 1050, 316 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Trapping rotate: false - xy: 1152, 418 + xy: 948, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TechIcons/Writing rotate: false - xy: 744, 10 + xy: 846, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2106,105 +2113,105 @@ TileSets/Default/HillOverlay index: -1 TileSets/Default/JungleOverlay rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/JungleOverlay rotate: false - xy: 1762, 1334 + xy: 1864, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/LakesOverlay rotate: false - xy: 1864, 1232 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/LakesOverlay rotate: false - xy: 1864, 1232 + xy: 1762, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MarshOverlay rotate: false - xy: 388, 538 + xy: 438, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/MarshOverlay rotate: false - xy: 388, 538 + xy: 438, 436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/MountainOverlay rotate: false - xy: 714, 928 + xy: 918, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/OasisOverlay rotate: false - xy: 1020, 928 + xy: 1224, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/ThorfMaps/OasisOverlay rotate: false - xy: 1020, 928 + xy: 1224, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 TileSets/Default/road rotate: false - xy: 1170, 2 + xy: 1301, 1753 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/road rotate: false - xy: 1170, 2 + xy: 1301, 1753 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/ThorfMaps/road rotate: false - xy: 1170, 2 + xy: 1301, 1753 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 TileSets/FantasyHex/City rotate: false - xy: 490, 585 + xy: 1564, 503 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland+City rotate: false - xy: 490, 585 + xy: 1564, 503 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Hill+City rotate: false - xy: 490, 585 + xy: 1564, 503 size: 32, 35 orig: 32, 35 offset: 0, 0 @@ -2218,7 +2225,7 @@ TileSets/FantasyHex/Coast index: -1 TileSets/FantasyHex/Desert rotate: false - xy: 1564, 473 + xy: 1564, 439 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2232,21 +2239,21 @@ TileSets/FantasyHex/Desert+City index: -1 TileSets/FantasyHex/Desert+Flood plains rotate: false - xy: 70, 8 + xy: 1966, 1448 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Desert+Oasis rotate: false - xy: 1966, 1538 + xy: 1564, 409 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Grassland rotate: false - xy: 1564, 443 + xy: 1966, 1418 size: 32, 28 orig: 32, 28 offset: 0, 0 @@ -2274,7 +2281,7 @@ TileSets/FantasyHex/Grassland+Marsh index: -1 TileSets/FantasyHex/Hill rotate: false - xy: 1278, 26 + xy: 1564, 469 size: 32, 32 orig: 32, 32 offset: 0, 0 @@ -2288,126 +2295,126 @@ TileSets/FantasyHex/Hill+Forest index: -1 TileSets/FantasyHex/Lakes rotate: false - xy: 1966, 1508 + xy: 1564, 379 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Mountain rotate: false - xy: 1966, 1602 + xy: 490, 584 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 TileSets/FantasyHex/Ocean rotate: false - xy: 1564, 413 + xy: 1966, 1388 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains rotate: false - xy: 1966, 1478 + xy: 1564, 349 size: 32, 28 orig: 32, 28 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+City rotate: false - xy: 1977, 1959 + xy: 1268, 23 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Forest rotate: false - xy: 1314, 77 + xy: 490, 549 size: 32, 33 orig: 32, 33 offset: 0, 0 index: -1 TileSets/FantasyHex/Plains+Jungle rotate: false - xy: 1564, 503 + xy: 1312, 75 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra rotate: false - xy: 1966, 1568 + xy: 1966, 1478 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+City rotate: false - xy: 1356, 117 + xy: 1966, 1512 size: 32, 35 orig: 32, 35 offset: 0, 0 index: -1 TileSets/FantasyHex/Tundra+Forest rotate: false - xy: 490, 551 + xy: 70, 4 size: 32, 32 orig: 32, 32 offset: 0, 0 index: -1 TileSets/ThorfMaps/Coast rotate: false - xy: 846, 14 + xy: 1052, 14 size: 52, 44 orig: 52, 44 offset: 0, 0 index: -1 TileSets/ThorfMaps/Desert rotate: false - xy: 900, 14 + xy: 1106, 14 size: 52, 44 orig: 52, 44 offset: 0, 0 index: -1 TileSets/ThorfMaps/Grassland rotate: false - xy: 954, 14 + xy: 1160, 14 size: 52, 44 orig: 52, 44 offset: 0, 0 index: -1 TileSets/ThorfMaps/Hill rotate: false - xy: 1170, 15 + xy: 1356, 109 size: 52, 43 orig: 52, 43 offset: 0, 0 index: -1 TileSets/ThorfMaps/Mountain rotate: false - xy: 1008, 14 + xy: 1214, 14 size: 52, 44 orig: 52, 44 offset: 0, 0 index: -1 TileSets/ThorfMaps/Ocean rotate: false - xy: 1224, 15 + xy: 1966, 1549 size: 52, 43 orig: 52, 43 offset: 0, 0 index: -1 TileSets/ThorfMaps/Plains rotate: false - xy: 1062, 14 + xy: 1977, 1950 size: 52, 44 orig: 52, 44 offset: 0, 0 index: -1 TileSets/ThorfMaps/Tundra rotate: false - xy: 1116, 14 + xy: 1966, 1594 size: 52, 44 orig: 52, 44 offset: 0, 0 @@ -2589,98 +2596,98 @@ UnitIcons/Great War Infantry index: -1 UnitIcons/Hoplite rotate: false - xy: 1456, 1356 + xy: 1558, 1458 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 1456, 1254 + xy: 1558, 1356 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Infantry rotate: false - xy: 1660, 1340 + xy: 1660, 1238 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Ironclad rotate: false - xy: 1762, 1538 + xy: 1762, 1436 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 1864, 1436 + xy: 1762, 1232 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 1762, 1130 + xy: 1864, 1130 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Landship rotate: false - xy: 286, 639 + xy: 286, 537 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 336, 231 + xy: 336, 129 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 336, 129 + xy: 336, 27 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Machine Gun rotate: false - xy: 1456, 1050 + xy: 1558, 1050 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Mechanized Infantry rotate: false - xy: 438, 130 + xy: 438, 28 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Minuteman rotate: false - xy: 510, 826 + xy: 612, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Modern Armor rotate: false - xy: 612, 928 + xy: 816, 1030 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Musketeer rotate: false - xy: 714, 826 + xy: 816, 928 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2694,77 +2701,77 @@ UnitIcons/Musketman index: -1 UnitIcons/Pikeman rotate: false - xy: 1836, 926 + xy: 1734, 824 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 796, 724 + xy: 694, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Rocket Artillery rotate: false - xy: 1000, 724 + xy: 898, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Samurai rotate: false - xy: 1204, 622 + xy: 1306, 622 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1510, 642 + xy: 1612, 627 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 1714, 620 + xy: 1816, 620 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 540, 520 + xy: 642, 520 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Submarine rotate: false - xy: 744, 316 + xy: 846, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1050, 520 + xy: 642, 112 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Tank rotate: false - xy: 846, 316 + xy: 948, 418 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 948, 112 + xy: 1050, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2778,21 +2785,21 @@ UnitIcons/Trireme index: -1 UnitIcons/Warrior rotate: false - xy: 1050, 112 + xy: 1152, 214 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Work Boats rotate: false - xy: 1254, 112 + xy: 540, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 540, 10 + xy: 642, 10 size: 100, 100 orig: 100, 100 offset: 0, 0 @@ -2806,294 +2813,294 @@ UnitPromotionIcons/Accuracy_III_(Civ5) index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 1301, 1744 + xy: 277, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 277, 1568 + xy: 386, 1110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 386, 1110 + xy: 299, 1568 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 1323, 1744 + xy: 386, 1088 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 299, 1568 + xy: 1364, 1744 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Blitz_(Civ5) rotate: false - xy: 386, 1088 + xy: 386, 1066 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_III_(Civ5) rotate: false - xy: 1345, 1744 + xy: 1408, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_II_(Civ5) rotate: false - xy: 1367, 1744 + xy: 1428, 1110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Boarding_Party_I_(Civ5) rotate: false - xy: 386, 1066 + xy: 460, 804 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_III_(Civ5) rotate: false - xy: 1428, 1110 + xy: 2015, 1791 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_II_(Civ5) rotate: false - xy: 460, 804 + xy: 104, 16 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Bombardment_I_(Civ5) rotate: false - xy: 1408, 154 + xy: 1966, 1366 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 2015, 1791 + xy: 1564, 327 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_III_(Civ5) rotate: false - xy: 1390, 132 + xy: 1430, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_II_(Civ5) rotate: false - xy: 104, 16 + xy: 1410, 132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Coastal_Raider_I_(Civ5) rotate: false - xy: 1564, 391 + xy: 1428, 1088 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 1966, 1456 + xy: 460, 782 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 1428, 1088 + xy: 2015, 1769 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 460, 782 + xy: 1966, 1344 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 1430, 154 + xy: 1564, 305 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 2015, 1769 + xy: 1452, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_II_(Civ5) rotate: false - xy: 1412, 132 + xy: 1410, 110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Formation_I_(Civ5) rotate: false - xy: 1564, 369 + xy: 1432, 132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Indirect_Fire_(Civ5) rotate: false - xy: 1966, 1434 + xy: 1428, 1066 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Logistics_(Civ5) rotate: false - xy: 1428, 1066 + xy: 2015, 1747 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 1452, 154 + xy: 1966, 1322 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Mobility_(Civ5) rotate: false - xy: 2015, 1747 + xy: 1564, 283 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Range_(Civ5) rotate: false - xy: 1434, 132 + xy: 1474, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 1564, 347 + xy: 1432, 110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 1966, 1412 + xy: 1454, 132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 1474, 154 + xy: 1966, 1300 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Sentry_(Civ5) rotate: false - xy: 1456, 132 + xy: 1564, 261 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 1564, 325 + xy: 1496, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 1966, 1390 + xy: 1454, 110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1496, 154 + xy: 1476, 132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Siege_(Civ5) rotate: false - xy: 1478, 132 + xy: 1966, 1278 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_III_(Civ5) rotate: false - xy: 1564, 303 + xy: 1564, 239 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_II_(Civ5) rotate: false - xy: 1966, 1368 + xy: 1518, 154 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Targeting_I_(Civ5) rotate: false - xy: 1518, 154 + xy: 1476, 110 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Volley_(Civ5) rotate: false - xy: 1500, 132 + xy: 1498, 132 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_III_(Civ5) rotate: false - xy: 1564, 281 + xy: 1966, 1256 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Wolfpack_II_(Civ5) rotate: false - xy: 1966, 1346 + xy: 1564, 217 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png index 5e57cb3727..b5d3372c75 100644 Binary files a/android/assets/game.png and b/android/assets/game.png differ diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json index 04fb301d29..544d087254 100644 --- a/android/assets/jsons/Buildings.json +++ b/android/assets/jsons/Buildings.json @@ -452,6 +452,15 @@ uniques:["Free Great Person"] requiredTech:"Printing Press" }, + { + name:"Himeji Castle", + culture:1, + isWonder:true, + greatPersonPoints:{production:2} + providesFreeBuilding:"Castle", + uniques:["+15% combat strength for units fighting in friendly territory"] // todo + requiredTech:"Gunpowder" + }, { name:"Museum", culture:5, diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index ac82e0c1d1..1720eadf2f 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -5834,8 +5834,7 @@ Spanish:"La Torre Inclinada De Pizza" German:"Schiefer Turm von Pisa" French:"Tour de Pise" - } - + } "Free Great Person":{ Italian:"Ottieni un Grande Personaggio gratuito" Romanian:"Persoană mare gratuită" @@ -5844,6 +5843,9 @@ French:"Personnage illustre gratuit" } + "Himeji Castle":{} + "+15% combat strength for units fighting in friendly territory":{} + "Taj Mahal":{ Italian:"Taj Mahal" //same in Italian Russian:"Тадж-Махал" diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt index 9705e24f34..35bec71f10 100644 --- a/core/src/com/unciv/logic/battle/BattleDamage.kt +++ b/core/src/com/unciv/logic/battle/BattleDamage.kt @@ -112,6 +112,10 @@ class BattleDamage{ modifiers["Attacker Bonus"] =modifiers["Attacker Bonus"]!! + bonus else modifiers["Attacker Bonus"] = bonus } + + if(defenderTile.getOwner()!=null && !attacker.getCivInfo().isAtWarWith(defenderTile.getOwner()!!) + && attacker.getCivInfo().getBuildingUniques().contains("+15% combat strength for units fighting in friendly territory")) + modifiers["Himeji Castle"] = 0.15f } else if (attacker is CityCombatant) { if (attacker.getCivInfo().policies.isAdopted("Oligarchy") && attacker.city.getCenterTile().militaryUnit != null) @@ -140,7 +144,7 @@ class BattleDamage{ val modifiers = getGeneralModifiers(defender, attacker) - if (!(defender.unit.hasUnique("No defensive terrain bonus"))) { + if (!defender.unit.hasUnique("No defensive terrain bonus")) { val tileDefenceBonus = defender.getTile().getDefensiveBonus() if (tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus } @@ -166,6 +170,10 @@ class BattleDamage{ } } + if(defenderTile.getOwner()!=null && !defender.getCivInfo().isAtWarWith(defenderTile.getOwner()!!) + && defender.getCivInfo().getBuildingUniques().contains("+15% combat strength for units fighting in friendly territory")) + modifiers["Himeji Castle"] = 0.15f + if (defender.unit.isFortified()) modifiers["Fortification"] = 0.2f * defender.unit.getFortificationTurns()