diff --git a/android/assets/ImprovementIcons/Academy_(Civ5).png b/android/assets/ImprovementIcons/Academy_(Civ5).png index dd40bd8693..f081dc841d 100644 Binary files a/android/assets/ImprovementIcons/Academy_(Civ5).png and b/android/assets/ImprovementIcons/Academy_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Camp_(Civ5).png b/android/assets/ImprovementIcons/Camp_(Civ5).png index 088e53f547..a8d896978f 100644 Binary files a/android/assets/ImprovementIcons/Camp_(Civ5).png and b/android/assets/ImprovementIcons/Camp_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Customs_house_(Civ5).png b/android/assets/ImprovementIcons/Customs_house_(Civ5).png index d6fd888872..2f9297e452 100644 Binary files a/android/assets/ImprovementIcons/Customs_house_(Civ5).png and b/android/assets/ImprovementIcons/Customs_house_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Farm_(Civ5).png b/android/assets/ImprovementIcons/Farm_(Civ5).png index 35545adfc7..4dd3568c14 100644 Binary files a/android/assets/ImprovementIcons/Farm_(Civ5).png and b/android/assets/ImprovementIcons/Farm_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Landmark_(Civ5).png b/android/assets/ImprovementIcons/Landmark_(Civ5).png index 9fc3b289bb..629a242419 100644 Binary files a/android/assets/ImprovementIcons/Landmark_(Civ5).png and b/android/assets/ImprovementIcons/Landmark_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Lumber_mill_(Civ5).png b/android/assets/ImprovementIcons/Lumber_mill_(Civ5).png index 7c85a22d0c..bd5894c24e 100644 Binary files a/android/assets/ImprovementIcons/Lumber_mill_(Civ5).png and b/android/assets/ImprovementIcons/Lumber_mill_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Manufactory_(Civ5).png b/android/assets/ImprovementIcons/Manufactory_(Civ5).png index 5dda83ce19..afc3ae6352 100644 Binary files a/android/assets/ImprovementIcons/Manufactory_(Civ5).png and b/android/assets/ImprovementIcons/Manufactory_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Mine_(Civ5).png b/android/assets/ImprovementIcons/Mine_(Civ5).png index eb69ab5008..d230fd1d41 100644 Binary files a/android/assets/ImprovementIcons/Mine_(Civ5).png and b/android/assets/ImprovementIcons/Mine_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Oil_well_(Civ5).png b/android/assets/ImprovementIcons/Oil_well_(Civ5).png index edfa5fe564..3f66fca23f 100644 Binary files a/android/assets/ImprovementIcons/Oil_well_(Civ5).png and b/android/assets/ImprovementIcons/Oil_well_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Pasture_(Civ5).png b/android/assets/ImprovementIcons/Pasture_(Civ5).png index d48219383a..fe5f4c3001 100644 Binary files a/android/assets/ImprovementIcons/Pasture_(Civ5).png and b/android/assets/ImprovementIcons/Pasture_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Plantation_(Civ5).png b/android/assets/ImprovementIcons/Plantation_(Civ5).png index 63dc0e22e0..ec611c61a2 100644 Binary files a/android/assets/ImprovementIcons/Plantation_(Civ5).png and b/android/assets/ImprovementIcons/Plantation_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Quarry_(Civ5).png b/android/assets/ImprovementIcons/Quarry_(Civ5).png index 270a6d1a91..f175c8d309 100644 Binary files a/android/assets/ImprovementIcons/Quarry_(Civ5).png and b/android/assets/ImprovementIcons/Quarry_(Civ5).png differ diff --git a/android/assets/ImprovementIcons/Trading_post_(Civ5).png b/android/assets/ImprovementIcons/Trading_post_(Civ5).png index 76f511af49..cc49706a36 100644 Binary files a/android/assets/ImprovementIcons/Trading_post_(Civ5).png and b/android/assets/ImprovementIcons/Trading_post_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Aristocracy_(Civ5).png b/android/assets/PolicyIcons/Aristocracy_(Civ5).png index aaa8a89e7a..7b31313865 100644 Binary files a/android/assets/PolicyIcons/Aristocracy_(Civ5).png and b/android/assets/PolicyIcons/Aristocracy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Citizenship_(Civ5).png b/android/assets/PolicyIcons/Citizenship_(Civ5).png index 2eba6129b5..38bb6c9538 100644 Binary files a/android/assets/PolicyIcons/Citizenship_(Civ5).png and b/android/assets/PolicyIcons/Citizenship_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Civil_Society_(Civ5).png b/android/assets/PolicyIcons/Civil_Society_(Civ5).png index e22b533c8f..1bf4fa2ef7 100644 Binary files a/android/assets/PolicyIcons/Civil_Society_(Civ5).png and b/android/assets/PolicyIcons/Civil_Society_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Collective_Rule_(Civ5).png b/android/assets/PolicyIcons/Collective_Rule_(Civ5).png index 182f3a5cd4..0824064fb9 100644 Binary files a/android/assets/PolicyIcons/Collective_Rule_(Civ5).png and b/android/assets/PolicyIcons/Collective_Rule_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Constitution_(Civ5).png b/android/assets/PolicyIcons/Constitution_(Civ5).png index 72ca4d5567..1b44f780c5 100644 Binary files a/android/assets/PolicyIcons/Constitution_(Civ5).png and b/android/assets/PolicyIcons/Constitution_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Democracy_(Civ5).png b/android/assets/PolicyIcons/Democracy_(Civ5).png index 12ecdad4a0..ebb6408505 100644 Binary files a/android/assets/PolicyIcons/Democracy_(Civ5).png and b/android/assets/PolicyIcons/Democracy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Entrepreneurship_(Civ5).png b/android/assets/PolicyIcons/Entrepreneurship_(Civ5).png index 1b4822f331..e9511b7341 100644 Binary files a/android/assets/PolicyIcons/Entrepreneurship_(Civ5).png and b/android/assets/PolicyIcons/Entrepreneurship_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Free_Religion_(Civ5).png b/android/assets/PolicyIcons/Free_Religion_(Civ5).png index b6a2265dbd..9faa19418e 100644 Binary files a/android/assets/PolicyIcons/Free_Religion_(Civ5).png and b/android/assets/PolicyIcons/Free_Religion_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Free_Speech_(Civ5).png b/android/assets/PolicyIcons/Free_Speech_(Civ5).png index 86a941aba9..cd92bde58b 100644 Binary files a/android/assets/PolicyIcons/Free_Speech_(Civ5).png and b/android/assets/PolicyIcons/Free_Speech_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Free_Thought_(Civ5).png b/android/assets/PolicyIcons/Free_Thought_(Civ5).png index 879af77c3c..d944f38fc2 100644 Binary files a/android/assets/PolicyIcons/Free_Thought_(Civ5).png and b/android/assets/PolicyIcons/Free_Thought_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Landed_Elite_(Civ5).png b/android/assets/PolicyIcons/Landed_Elite_(Civ5).png index 3d753b0647..92ce758903 100644 Binary files a/android/assets/PolicyIcons/Landed_Elite_(Civ5).png and b/android/assets/PolicyIcons/Landed_Elite_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Legalism_(Civ5).png b/android/assets/PolicyIcons/Legalism_(Civ5).png index 4dc881e7dd..df5377d849 100644 Binary files a/android/assets/PolicyIcons/Legalism_(Civ5).png and b/android/assets/PolicyIcons/Legalism_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Mercantilism_(Civ5).png b/android/assets/PolicyIcons/Mercantilism_(Civ5).png index 7f81e452f7..4dd30cc14e 100644 Binary files a/android/assets/PolicyIcons/Mercantilism_(Civ5).png and b/android/assets/PolicyIcons/Mercantilism_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Meritocracy_(Civ5).png b/android/assets/PolicyIcons/Meritocracy_(Civ5).png index 90c1f7d7a9..8fb1be3e86 100644 Binary files a/android/assets/PolicyIcons/Meritocracy_(Civ5).png and b/android/assets/PolicyIcons/Meritocracy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Monarchy_(Civ5).png b/android/assets/PolicyIcons/Monarchy_(Civ5).png index 1ff45da772..5a4cb007ef 100644 Binary files a/android/assets/PolicyIcons/Monarchy_(Civ5).png and b/android/assets/PolicyIcons/Monarchy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Oligarchy_(Civ5).png b/android/assets/PolicyIcons/Oligarchy_(Civ5).png index 0187bf6e7a..6a540ef423 100644 Binary files a/android/assets/PolicyIcons/Oligarchy_(Civ5).png and b/android/assets/PolicyIcons/Oligarchy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Organized_Religion_(Civ5).png b/android/assets/PolicyIcons/Organized_Religion_(Civ5).png index 8241704542..540a779cb7 100644 Binary files a/android/assets/PolicyIcons/Organized_Religion_(Civ5).png and b/android/assets/PolicyIcons/Organized_Religion_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Patronage_(Civ5).png b/android/assets/PolicyIcons/Patronage_(Civ5).png index a9622146c5..5863bd2a98 100644 Binary files a/android/assets/PolicyIcons/Patronage_(Civ5).png and b/android/assets/PolicyIcons/Patronage_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Protectionism_(Civ5).png b/android/assets/PolicyIcons/Protectionism_(Civ5).png index a9c449ad40..60007c8ac9 100644 Binary files a/android/assets/PolicyIcons/Protectionism_(Civ5).png and b/android/assets/PolicyIcons/Protectionism_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Reformation_(Civ5).png b/android/assets/PolicyIcons/Reformation_(Civ5).png index b3cdba6488..0519afb53e 100644 Binary files a/android/assets/PolicyIcons/Reformation_(Civ5).png and b/android/assets/PolicyIcons/Reformation_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Representation_(Civ5).png b/android/assets/PolicyIcons/Representation_(Civ5).png index 275628bf92..80f6fa8c0f 100644 Binary files a/android/assets/PolicyIcons/Representation_(Civ5).png and b/android/assets/PolicyIcons/Representation_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Republic_(Civ5).png b/android/assets/PolicyIcons/Republic_(Civ5).png index e1f52b133d..7781357d95 100644 Binary files a/android/assets/PolicyIcons/Republic_(Civ5).png and b/android/assets/PolicyIcons/Republic_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Scientific_Revolution_(Civ5).png b/android/assets/PolicyIcons/Scientific_Revolution_(Civ5).png index b803eecf96..8776fc132b 100644 Binary files a/android/assets/PolicyIcons/Scientific_Revolution_(Civ5).png and b/android/assets/PolicyIcons/Scientific_Revolution_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Secularism_(Civ5).png b/android/assets/PolicyIcons/Secularism_(Civ5).png index 4873b18456..916e5be6b1 100644 Binary files a/android/assets/PolicyIcons/Secularism_(Civ5).png and b/android/assets/PolicyIcons/Secularism_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Sovereignty_(Civ5).png b/android/assets/PolicyIcons/Sovereignty_(Civ5).png index 1c741d1b30..76d9a342ae 100644 Binary files a/android/assets/PolicyIcons/Sovereignty_(Civ5).png and b/android/assets/PolicyIcons/Sovereignty_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Theocracy_(Civ5).png b/android/assets/PolicyIcons/Theocracy_(Civ5).png index babef084e8..1829d6fb4d 100644 Binary files a/android/assets/PolicyIcons/Theocracy_(Civ5).png and b/android/assets/PolicyIcons/Theocracy_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Trade_Unions_(Civ5).png b/android/assets/PolicyIcons/Trade_Unions_(Civ5).png index cd6a3ee6b2..eec06e7c66 100644 Binary files a/android/assets/PolicyIcons/Trade_Unions_(Civ5).png and b/android/assets/PolicyIcons/Trade_Unions_(Civ5).png differ diff --git a/android/assets/PolicyIcons/Universal_Suffrage_(Civ5).png b/android/assets/PolicyIcons/Universal_Suffrage_(Civ5).png index b5d739dbb3..d64a45922c 100644 Binary files a/android/assets/PolicyIcons/Universal_Suffrage_(Civ5).png and b/android/assets/PolicyIcons/Universal_Suffrage_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Aluminum_(Civ5).png b/android/assets/ResourceIcons/Aluminum_(Civ5).png index 1bcc0c5c8d..a812326d30 100644 Binary files a/android/assets/ResourceIcons/Aluminum_(Civ5).png and b/android/assets/ResourceIcons/Aluminum_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Bananas_(Civ5).png b/android/assets/ResourceIcons/Bananas_(Civ5).png index b36d691689..e4f329df0f 100644 Binary files a/android/assets/ResourceIcons/Bananas_(Civ5).png and b/android/assets/ResourceIcons/Bananas_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Cattle_(Civ5).png b/android/assets/ResourceIcons/Cattle_(Civ5).png index dd5a5eaeeb..670b0736ad 100644 Binary files a/android/assets/ResourceIcons/Cattle_(Civ5).png and b/android/assets/ResourceIcons/Cattle_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Coal_(Civ5).png b/android/assets/ResourceIcons/Coal_(Civ5).png index ef6ea94ef6..3f480e99c2 100644 Binary files a/android/assets/ResourceIcons/Coal_(Civ5).png and b/android/assets/ResourceIcons/Coal_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Cotton_(Civ5).png b/android/assets/ResourceIcons/Cotton_(Civ5).png index d75dea4a6c..766a52a8b9 100644 Binary files a/android/assets/ResourceIcons/Cotton_(Civ5).png and b/android/assets/ResourceIcons/Cotton_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Deer_(Civ5).png b/android/assets/ResourceIcons/Deer_(Civ5).png index 8945d293fa..e8a74f50cd 100644 Binary files a/android/assets/ResourceIcons/Deer_(Civ5).png and b/android/assets/ResourceIcons/Deer_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Dyes_(Civ5).png b/android/assets/ResourceIcons/Dyes_(Civ5).png index a9d552794e..f626d68122 100644 Binary files a/android/assets/ResourceIcons/Dyes_(Civ5).png and b/android/assets/ResourceIcons/Dyes_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Furs_(Civ5).png b/android/assets/ResourceIcons/Furs_(Civ5).png index 2a2d227be2..531b0de8b8 100644 Binary files a/android/assets/ResourceIcons/Furs_(Civ5).png and b/android/assets/ResourceIcons/Furs_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Gems_(Civ5).png b/android/assets/ResourceIcons/Gems_(Civ5).png index 0451c45376..33fef35d39 100644 Binary files a/android/assets/ResourceIcons/Gems_(Civ5).png and b/android/assets/ResourceIcons/Gems_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Gold_(Civ5).png b/android/assets/ResourceIcons/Gold_(Civ5).png index f76fabcf21..fd0ed618d7 100644 Binary files a/android/assets/ResourceIcons/Gold_(Civ5).png and b/android/assets/ResourceIcons/Gold_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Horses_(Civ5).png b/android/assets/ResourceIcons/Horses_(Civ5).png index 7eacf98925..fdd4226cb4 100644 Binary files a/android/assets/ResourceIcons/Horses_(Civ5).png and b/android/assets/ResourceIcons/Horses_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Incense_(Civ5).png b/android/assets/ResourceIcons/Incense_(Civ5).png index a34db11196..baf097ea7a 100644 Binary files a/android/assets/ResourceIcons/Incense_(Civ5).png and b/android/assets/ResourceIcons/Incense_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Iron_(Civ5).png b/android/assets/ResourceIcons/Iron_(Civ5).png index 34d37eb36c..0bee70ab73 100644 Binary files a/android/assets/ResourceIcons/Iron_(Civ5).png and b/android/assets/ResourceIcons/Iron_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Ivory_(Civ5).png b/android/assets/ResourceIcons/Ivory_(Civ5).png index 63c186d52e..a304f360c3 100644 Binary files a/android/assets/ResourceIcons/Ivory_(Civ5).png and b/android/assets/ResourceIcons/Ivory_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Marble_(Civ5).png b/android/assets/ResourceIcons/Marble_(Civ5).png index 85b90b91ce..c9b08996a8 100644 Binary files a/android/assets/ResourceIcons/Marble_(Civ5).png and b/android/assets/ResourceIcons/Marble_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Oil_(Civ5).png b/android/assets/ResourceIcons/Oil_(Civ5).png index 2ffbc9ff0c..3ae009333a 100644 Binary files a/android/assets/ResourceIcons/Oil_(Civ5).png and b/android/assets/ResourceIcons/Oil_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Sheep_(Civ5).png b/android/assets/ResourceIcons/Sheep_(Civ5).png index ded1085252..eb81917619 100644 Binary files a/android/assets/ResourceIcons/Sheep_(Civ5).png and b/android/assets/ResourceIcons/Sheep_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Silk_(Civ5).png b/android/assets/ResourceIcons/Silk_(Civ5).png index c0d5de9e5e..61e32c5be9 100644 Binary files a/android/assets/ResourceIcons/Silk_(Civ5).png and b/android/assets/ResourceIcons/Silk_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Silver_(Civ5).png b/android/assets/ResourceIcons/Silver_(Civ5).png index 34add5bb17..9f842ae7a2 100644 Binary files a/android/assets/ResourceIcons/Silver_(Civ5).png and b/android/assets/ResourceIcons/Silver_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Spices_(Civ5).png b/android/assets/ResourceIcons/Spices_(Civ5).png index f4455e950b..88b40b3d09 100644 Binary files a/android/assets/ResourceIcons/Spices_(Civ5).png and b/android/assets/ResourceIcons/Spices_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Stone_(Civ5).png b/android/assets/ResourceIcons/Stone_(Civ5).png index db9af5c729..6ade1d8e09 100644 Binary files a/android/assets/ResourceIcons/Stone_(Civ5).png and b/android/assets/ResourceIcons/Stone_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Sugar_(Civ5).png b/android/assets/ResourceIcons/Sugar_(Civ5).png index 3b67ed2fbe..8f4c84ab7b 100644 Binary files a/android/assets/ResourceIcons/Sugar_(Civ5).png and b/android/assets/ResourceIcons/Sugar_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Uranium_(Civ5).png b/android/assets/ResourceIcons/Uranium_(Civ5).png index 7e056723b8..eec574e7da 100644 Binary files a/android/assets/ResourceIcons/Uranium_(Civ5).png and b/android/assets/ResourceIcons/Uranium_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Wheat_(Civ5).png b/android/assets/ResourceIcons/Wheat_(Civ5).png index 1450b43a5f..a77354b839 100644 Binary files a/android/assets/ResourceIcons/Wheat_(Civ5).png and b/android/assets/ResourceIcons/Wheat_(Civ5).png differ diff --git a/android/assets/ResourceIcons/Wine_(Civ5).png b/android/assets/ResourceIcons/Wine_(Civ5).png index 8b848a630c..451d44fc9d 100644 Binary files a/android/assets/ResourceIcons/Wine_(Civ5).png and b/android/assets/ResourceIcons/Wine_(Civ5).png differ diff --git a/android/assets/StatIcons/20xMalcontent5.png b/android/assets/StatIcons/20xMalcontent5.png index 1d869e2919..6756fad8ef 100644 Binary files a/android/assets/StatIcons/20xMalcontent5.png and b/android/assets/StatIcons/20xMalcontent5.png differ diff --git a/android/assets/StatIcons/20xRangedStrength5.png b/android/assets/StatIcons/20xRangedStrength5.png index 551c5a7c2f..1ce60f66b8 100644 Binary files a/android/assets/StatIcons/20xRangedStrength5.png and b/android/assets/StatIcons/20xRangedStrength5.png differ diff --git a/android/assets/StatIcons/20xStrength5.png b/android/assets/StatIcons/20xStrength5.png index d1f19bba5e..bbcdc5af42 100644 Binary files a/android/assets/StatIcons/20xStrength5.png and b/android/assets/StatIcons/20xStrength5.png differ diff --git a/android/assets/StatIcons/City_Center_(Civ6).png b/android/assets/StatIcons/City_Center_(Civ6).png index cef3c3c047..08353bcad6 100644 Binary files a/android/assets/StatIcons/City_Center_(Civ6).png and b/android/assets/StatIcons/City_Center_(Civ6).png differ diff --git a/android/assets/StatIcons/populationGray.png b/android/assets/StatIcons/populationGray.png index a843e3cec6..bc6eb6eede 100644 Binary files a/android/assets/StatIcons/populationGray.png and b/android/assets/StatIcons/populationGray.png differ diff --git a/android/assets/TerrainIcons/Flood plains.png b/android/assets/TerrainIcons/Flood plains.png index 59680f4325..0b38bbc5be 100644 Binary files a/android/assets/TerrainIcons/Flood plains.png and b/android/assets/TerrainIcons/Flood plains.png differ diff --git a/android/assets/TerrainIcons/Forest.png b/android/assets/TerrainIcons/Forest.png index 1b549eccfe..070c2fe800 100644 Binary files a/android/assets/TerrainIcons/Forest.png and b/android/assets/TerrainIcons/Forest.png differ diff --git a/android/assets/TerrainIcons/Hexagon.png b/android/assets/TerrainIcons/Hexagon.png index 3edbaf887e..888babbc07 100644 Binary files a/android/assets/TerrainIcons/Hexagon.png and b/android/assets/TerrainIcons/Hexagon.png differ diff --git a/android/assets/TerrainIcons/Jungle.png b/android/assets/TerrainIcons/Jungle.png index a0e4443215..f32c350779 100644 Binary files a/android/assets/TerrainIcons/Jungle.png and b/android/assets/TerrainIcons/Jungle.png differ diff --git a/android/assets/TerrainIcons/Marsh.png b/android/assets/TerrainIcons/Marsh.png index 4fd3b59225..d1ab5a2c73 100644 Binary files a/android/assets/TerrainIcons/Marsh.png and b/android/assets/TerrainIcons/Marsh.png differ diff --git a/android/assets/TerrainIcons/Oasis.png b/android/assets/TerrainIcons/Oasis.png index 8101291e7d..0cc9760513 100644 Binary files a/android/assets/TerrainIcons/Oasis.png and b/android/assets/TerrainIcons/Oasis.png differ diff --git a/android/assets/TerrainIcons/road.png b/android/assets/TerrainIcons/road.png index caed4bfb99..7c413bd8b3 100644 Binary files a/android/assets/TerrainIcons/road.png and b/android/assets/TerrainIcons/road.png differ diff --git a/android/assets/UnitIcons/Archer.png b/android/assets/UnitIcons/Archer.png index ff37d84409..6a9f490797 100644 Binary files a/android/assets/UnitIcons/Archer.png and b/android/assets/UnitIcons/Archer.png differ diff --git a/android/assets/UnitIcons/Cannon.png b/android/assets/UnitIcons/Cannon.png index 7401b30f1c..6f66a0b7ac 100644 Binary files a/android/assets/UnitIcons/Cannon.png and b/android/assets/UnitIcons/Cannon.png differ diff --git a/android/assets/UnitIcons/Catapult.png b/android/assets/UnitIcons/Catapult.png index 25b9abe6d2..98dcef74cb 100644 Binary files a/android/assets/UnitIcons/Catapult.png and b/android/assets/UnitIcons/Catapult.png differ diff --git a/android/assets/UnitIcons/Chariot Archer.png b/android/assets/UnitIcons/Chariot Archer.png index d929233750..fe26df8c5e 100644 Binary files a/android/assets/UnitIcons/Chariot Archer.png and b/android/assets/UnitIcons/Chariot Archer.png differ diff --git a/android/assets/UnitIcons/Circle.png b/android/assets/UnitIcons/Circle.png index f1de1e08a7..ccc3e10544 100644 Binary files a/android/assets/UnitIcons/Circle.png and b/android/assets/UnitIcons/Circle.png differ diff --git a/android/assets/UnitIcons/Crossbowman.png b/android/assets/UnitIcons/Crossbowman.png index c7af94a77f..87aa611d90 100644 Binary files a/android/assets/UnitIcons/Crossbowman.png and b/android/assets/UnitIcons/Crossbowman.png differ diff --git a/android/assets/UnitIcons/Great Artist.png b/android/assets/UnitIcons/Great Artist.png index 1d6efdeb7b..8c3d7840d3 100644 Binary files a/android/assets/UnitIcons/Great Artist.png and b/android/assets/UnitIcons/Great Artist.png differ diff --git a/android/assets/UnitIcons/Great Engineer.png b/android/assets/UnitIcons/Great Engineer.png index 4506cb2899..a38866302f 100644 Binary files a/android/assets/UnitIcons/Great Engineer.png and b/android/assets/UnitIcons/Great Engineer.png differ diff --git a/android/assets/UnitIcons/Great Merchant.png b/android/assets/UnitIcons/Great Merchant.png index 8841a7a8f7..d4d37df617 100644 Binary files a/android/assets/UnitIcons/Great Merchant.png and b/android/assets/UnitIcons/Great Merchant.png differ diff --git a/android/assets/UnitIcons/Great Scientist.png b/android/assets/UnitIcons/Great Scientist.png index 6d5f8c98b7..7951d3b25b 100644 Binary files a/android/assets/UnitIcons/Great Scientist.png and b/android/assets/UnitIcons/Great Scientist.png differ diff --git a/android/assets/UnitIcons/Horseman.png b/android/assets/UnitIcons/Horseman.png index 08a786204f..bded87929b 100644 Binary files a/android/assets/UnitIcons/Horseman.png and b/android/assets/UnitIcons/Horseman.png differ diff --git a/android/assets/UnitIcons/Knight.png b/android/assets/UnitIcons/Knight.png index f1e70a558b..237d220aee 100644 Binary files a/android/assets/UnitIcons/Knight.png and b/android/assets/UnitIcons/Knight.png differ diff --git a/android/assets/UnitIcons/Lancer.png b/android/assets/UnitIcons/Lancer.png index aeb3973ff0..fac2b08d7f 100644 Binary files a/android/assets/UnitIcons/Lancer.png and b/android/assets/UnitIcons/Lancer.png differ diff --git a/android/assets/UnitIcons/Longswordsman.png b/android/assets/UnitIcons/Longswordsman.png index 33293041d7..0a765d3243 100644 Binary files a/android/assets/UnitIcons/Longswordsman.png and b/android/assets/UnitIcons/Longswordsman.png differ diff --git a/android/assets/UnitIcons/Musketman.png b/android/assets/UnitIcons/Musketman.png index 44afec9a48..995fc71e5f 100644 Binary files a/android/assets/UnitIcons/Musketman.png and b/android/assets/UnitIcons/Musketman.png differ diff --git a/android/assets/UnitIcons/Pikeman.png b/android/assets/UnitIcons/Pikeman.png index 9ceda8b8e0..8ae347f130 100644 Binary files a/android/assets/UnitIcons/Pikeman.png and b/android/assets/UnitIcons/Pikeman.png differ diff --git a/android/assets/UnitIcons/Scout.png b/android/assets/UnitIcons/Scout.png index c6bb769f29..f124da6498 100644 Binary files a/android/assets/UnitIcons/Scout.png and b/android/assets/UnitIcons/Scout.png differ diff --git a/android/assets/UnitIcons/Settler.png b/android/assets/UnitIcons/Settler.png index 84e5962e9e..625fb6ca3b 100644 Binary files a/android/assets/UnitIcons/Settler.png and b/android/assets/UnitIcons/Settler.png differ diff --git a/android/assets/UnitIcons/Spearman.png b/android/assets/UnitIcons/Spearman.png index defd986c3a..5ec1aa9e8b 100644 Binary files a/android/assets/UnitIcons/Spearman.png and b/android/assets/UnitIcons/Spearman.png differ diff --git a/android/assets/UnitIcons/Swordsman.png b/android/assets/UnitIcons/Swordsman.png index 5a389fa966..408132eb57 100644 Binary files a/android/assets/UnitIcons/Swordsman.png and b/android/assets/UnitIcons/Swordsman.png differ diff --git a/android/assets/UnitIcons/Trebuchet.png b/android/assets/UnitIcons/Trebuchet.png index defa915453..96a01ec44d 100644 Binary files a/android/assets/UnitIcons/Trebuchet.png and b/android/assets/UnitIcons/Trebuchet.png differ diff --git a/android/assets/UnitIcons/Warrior.png b/android/assets/UnitIcons/Warrior.png index ec8b8cd745..2c6500ece3 100644 Binary files a/android/assets/UnitIcons/Warrior.png and b/android/assets/UnitIcons/Warrior.png differ diff --git a/android/assets/UnitIcons/Worker.png b/android/assets/UnitIcons/Worker.png index 46b67223aa..16f9c9ea3f 100644 Binary files a/android/assets/UnitIcons/Worker.png and b/android/assets/UnitIcons/Worker.png differ diff --git a/android/assets/skin/background.png b/android/assets/skin/background.png deleted file mode 100644 index d9eb82e6d8..0000000000 Binary files a/android/assets/skin/background.png and /dev/null differ diff --git a/android/assets/skin/civTableBackground.png b/android/assets/skin/civTableBackground.png index b2cf3b955b..374213bb8d 100644 Binary files a/android/assets/skin/civTableBackground.png and b/android/assets/skin/civTableBackground.png differ diff --git a/android/pngcrush-dir.cmd b/android/pngcrush-dir.cmd new file mode 100644 index 0000000000..2a0ba6c950 --- /dev/null +++ b/android/pngcrush-dir.cmd @@ -0,0 +1,20 @@ +@ECHO OFF +ECHO ############################################################## +ECHO # Crush all PNG from Images/* and store them in Optimized/* # +ECHO ############################################################## +ECHO Files to crush: + +for /D %%d in (.\*) do ( for /F "tokens=*" %%x IN ('DIR %%d\*.png /B') DO ECHO - %%x ) + +PAUSE + +for /D %%d in (.\*) do ( + for /F "tokens=*" %%x IN ('DIR %%d\*.png /B') DO ( + ECHO Crushing: %%d\%%x + pngcrush -brute "%%d\%%x" temp.png + if not exist "Optimized\%%d" mkdir "Optimized\%%d" + MOVE /Y temp.png "Optimized\%%d\%%x" + ) +) + +PAUSE diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index ce3336608a..f146ee1332 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -32,6 +32,8 @@ class Battle(val gameInfo:GameInfo) { } } } + if(enemy.getCivilization() == enemy.getCivilization().gameInfo.getBarbarianCivilization()) + modifiers["vs Barbarians"] = 0.33f return modifiers } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 38990084b0..daa193909f 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -14,7 +14,7 @@ class WorldScreen : CameraStageBaseScreen() { val gameInfo = game.gameInfo internal val civInfo: CivilizationInfo = gameInfo.getPlayerCivilization() - val tileMapHolder: TileMapHolder + val tileMapHolder: TileMapHolder = TileMapHolder(this, gameInfo.tileMap, civInfo) internal var buttonScale = game.settings.buttonScale private val topBar = WorldScreenTopBar(this) @@ -27,8 +27,6 @@ class WorldScreen : CameraStageBaseScreen() { private val notificationsScroll: NotificationsScroll init { - tileMapHolder = TileMapHolder(this, gameInfo.tileMap, civInfo) - topBar.setPosition(0f, stage.height - topBar.height) topBar.width = stage.width diff --git a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt index a404433ad3..c64cbeb699 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/IdleUnitButton.kt @@ -6,25 +6,30 @@ import com.unciv.ui.cityscreen.addClickListener import com.unciv.ui.utils.CameraStageBaseScreen import com.unciv.ui.utils.disable import com.unciv.ui.utils.enable -import com.unciv.ui.worldscreen.WorldScreen +import com.unciv.ui.worldscreen.TileMapHolder -class IdleUnitButton internal constructor(internal val worldScreen: WorldScreen) : TextButton("Select next idle unit", CameraStageBaseScreen.skin) { +class IdleUnitButton internal constructor(internal val unitTable: UnitTable, + val tileMapHolder: TileMapHolder, val previous:Boolean) + : TextButton(if(previous)"<" else ">", CameraStageBaseScreen.skin) { - fun getTilesWithIdleUnits() = worldScreen.civInfo.gameInfo.tileMap.values.filter { it.hasIdleUnit() && it.unit!!.owner == worldScreen.civInfo.civName } + fun getTilesWithIdleUnits() = tileMapHolder.tileMap.values + .filter { it.hasIdleUnit() && it.unit!!.owner == unitTable.worldScreen.civInfo.civName } init { addClickListener { val tilesWithIdleUnits = getTilesWithIdleUnits() val tileToSelect: TileInfo - if (!tilesWithIdleUnits.contains(worldScreen.tileMapHolder.selectedTile)) + if (unitTable.selectedUnit==null || !tilesWithIdleUnits.contains(unitTable.selectedUnit!!.getTile())) tileToSelect = tilesWithIdleUnits[0] else { - var index = tilesWithIdleUnits.indexOf(worldScreen.tileMapHolder.selectedTile) + 1 - if (tilesWithIdleUnits.size == index) index = 0 + var index = tilesWithIdleUnits.indexOf(unitTable.selectedUnit!!.getTile()) + if(previous) index-- else index++ + index += tilesWithIdleUnits.size + index %= tilesWithIdleUnits.size // for looping tileToSelect = tilesWithIdleUnits[index] } - worldScreen.tileMapHolder.setCenterPosition(tileToSelect.position) - worldScreen.update() + tileMapHolder.setCenterPosition(tileToSelect.position) + unitTable.worldScreen.update() } } diff --git a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt index f9cdc2abc1..9c11dd94ca 100644 --- a/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt +++ b/core/src/com/unciv/ui/worldscreen/unit/UnitTable.kt @@ -1,18 +1,18 @@ package com.unciv.ui.worldscreen.unit -import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.Table import com.unciv.logic.map.MapUnit import com.unciv.logic.map.TileInfo import com.unciv.logic.map.UnitType import com.unciv.ui.utils.CameraStageBaseScreen -import com.unciv.ui.utils.ImageGetter import com.unciv.ui.worldscreen.WorldScreen class UnitTable(val worldScreen: WorldScreen) : Table(){ - private val idleUnitButton = IdleUnitButton(worldScreen) - private val unitLabel = Label("",CameraStageBaseScreen.skin) + private val prevIdleUnitButton = IdleUnitButton(this,worldScreen.tileMapHolder,true) + private val nextIdleUnitButton = IdleUnitButton(this,worldScreen.tileMapHolder,false) + private val unitNameLabel = Label("",CameraStageBaseScreen.skin) + private val unitDescriptionLabel = Label("",CameraStageBaseScreen.skin) var selectedUnit : MapUnit? = null var currentlyExecutingAction : String? = null @@ -22,14 +22,20 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ pad(20f) //background = tileTableBackground - add(unitLabel).pad(10f) - add(unitActionsTable) + + add(Table().apply { + add(prevIdleUnitButton) + add(unitNameLabel).pad(10f) + add(nextIdleUnitButton) + }).colspan(2) row() - add(idleUnitButton).colspan(2) + add(unitDescriptionLabel) + add(unitActionsTable) } fun update() { - idleUnitButton.update() + prevIdleUnitButton.update() + nextIdleUnitButton.update() unitActionsTable.clear() if(selectedUnit!=null) { @@ -39,8 +45,9 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ if(selectedUnit!=null) { val unit = selectedUnit!! - var unitLabelText = unit.name + - "\r\nMovement: " + unit.getMovementString() + unitNameLabel.setText(unit.name) + + var unitLabelText = "Movement: " + unit.getMovementString() if (unit.getBaseUnit().unitType != UnitType.Civilian) { unitLabelText += "\r\nHealth: " + unit.health + "\r\nStrength: " + unit.getBaseUnit().strength @@ -48,13 +55,16 @@ class UnitTable(val worldScreen: WorldScreen) : Table(){ if (unit.getBaseUnit().rangedStrength!=0) unitLabelText += "\r\nRanged strength: "+unit.getBaseUnit().rangedStrength - unitLabel.setText(unitLabelText) + unitDescriptionLabel.setText(unitLabelText) for (button in UnitActions().getUnitActionButtons(selectedUnit!!, worldScreen)) unitActionsTable.add(button).colspan(2).pad(5f) .size(button.width * worldScreen.buttonScale, button.height * worldScreen.buttonScale).row() } - else unitLabel.setText("") + else { + unitNameLabel.setText("") + unitDescriptionLabel.setText("") + } unitActionsTable.pack() pack()