diff --git a/android/assets/Images/FlagIcons/Dutch.png b/android/Images/FlagIcons/Dutch.png similarity index 100% rename from android/assets/Images/FlagIcons/Dutch.png rename to android/Images/FlagIcons/Dutch.png diff --git a/android/assets/Images/FlagIcons/English.png b/android/Images/FlagIcons/English.png similarity index 100% rename from android/assets/Images/FlagIcons/English.png rename to android/Images/FlagIcons/English.png diff --git a/android/assets/Images/FlagIcons/French.png b/android/Images/FlagIcons/French.png similarity index 100% rename from android/assets/Images/FlagIcons/French.png rename to android/Images/FlagIcons/French.png diff --git a/android/assets/Images/FlagIcons/German.png b/android/Images/FlagIcons/German.png similarity index 100% rename from android/assets/Images/FlagIcons/German.png rename to android/Images/FlagIcons/German.png diff --git a/android/assets/Images/FlagIcons/Italian.png b/android/Images/FlagIcons/Italian.png similarity index 100% rename from android/assets/Images/FlagIcons/Italian.png rename to android/Images/FlagIcons/Italian.png diff --git a/android/assets/Images/FlagIcons/Romanian.png b/android/Images/FlagIcons/Romanian.png similarity index 100% rename from android/assets/Images/FlagIcons/Romanian.png rename to android/Images/FlagIcons/Romanian.png diff --git a/android/assets/Images/FlagIcons/Russian.png b/android/Images/FlagIcons/Russian.png similarity index 100% rename from android/assets/Images/FlagIcons/Russian.png rename to android/Images/FlagIcons/Russian.png diff --git a/android/assets/Images/FlagIcons/Spanish.png b/android/Images/FlagIcons/Spanish.png similarity index 100% rename from android/assets/Images/FlagIcons/Spanish.png rename to android/Images/FlagIcons/Spanish.png diff --git a/android/assets/Images/ImprovementIcons/Academy_(Civ5).png b/android/Images/ImprovementIcons/Academy_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Academy_(Civ5).png rename to android/Images/ImprovementIcons/Academy_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Camp_(Civ5).png b/android/Images/ImprovementIcons/Camp_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Camp_(Civ5).png rename to android/Images/ImprovementIcons/Camp_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Customs_house_(Civ5).png b/android/Images/ImprovementIcons/Customs_house_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Customs_house_(Civ5).png rename to android/Images/ImprovementIcons/Customs_house_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Farm_(Civ5).png b/android/Images/ImprovementIcons/Farm_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Farm_(Civ5).png rename to android/Images/ImprovementIcons/Farm_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Landmark_(Civ5).png b/android/Images/ImprovementIcons/Landmark_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Landmark_(Civ5).png rename to android/Images/ImprovementIcons/Landmark_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Lumber_mill_(Civ5).png b/android/Images/ImprovementIcons/Lumber_mill_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Lumber_mill_(Civ5).png rename to android/Images/ImprovementIcons/Lumber_mill_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Manufactory_(Civ5).png b/android/Images/ImprovementIcons/Manufactory_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Manufactory_(Civ5).png rename to android/Images/ImprovementIcons/Manufactory_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Mine_(Civ5).png b/android/Images/ImprovementIcons/Mine_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Mine_(Civ5).png rename to android/Images/ImprovementIcons/Mine_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Oil_well_(Civ5).png b/android/Images/ImprovementIcons/Oil_well_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Oil_well_(Civ5).png rename to android/Images/ImprovementIcons/Oil_well_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Pasture_(Civ5).png b/android/Images/ImprovementIcons/Pasture_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Pasture_(Civ5).png rename to android/Images/ImprovementIcons/Pasture_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Plantation_(Civ5).png b/android/Images/ImprovementIcons/Plantation_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Plantation_(Civ5).png rename to android/Images/ImprovementIcons/Plantation_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Quarry_(Civ5).png b/android/Images/ImprovementIcons/Quarry_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Quarry_(Civ5).png rename to android/Images/ImprovementIcons/Quarry_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Railroad_(Civ5).png b/android/Images/ImprovementIcons/Railroad_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Railroad_(Civ5).png rename to android/Images/ImprovementIcons/Railroad_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Road_(Civ5).png b/android/Images/ImprovementIcons/Road_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Road_(Civ5).png rename to android/Images/ImprovementIcons/Road_(Civ5).png diff --git a/android/assets/Images/ImprovementIcons/Trading_post_(Civ5).png b/android/Images/ImprovementIcons/Trading_post_(Civ5).png similarity index 100% rename from android/assets/Images/ImprovementIcons/Trading_post_(Civ5).png rename to android/Images/ImprovementIcons/Trading_post_(Civ5).png diff --git a/android/assets/Images/OtherIcons/Circle.png b/android/Images/OtherIcons/Circle.png similarity index 100% rename from android/assets/Images/OtherIcons/Circle.png rename to android/Images/OtherIcons/Circle.png diff --git a/android/assets/Images/OtherIcons/City.png b/android/Images/OtherIcons/City.png similarity index 100% rename from android/assets/Images/OtherIcons/City.png rename to android/Images/OtherIcons/City.png diff --git a/android/assets/Images/OtherIcons/Crosshair.png b/android/Images/OtherIcons/Crosshair.png similarity index 100% rename from android/assets/Images/OtherIcons/Crosshair.png rename to android/Images/OtherIcons/Crosshair.png diff --git a/android/assets/Images/OtherIcons/DisbandUnit.png b/android/Images/OtherIcons/DisbandUnit.png similarity index 100% rename from android/assets/Images/OtherIcons/DisbandUnit.png rename to android/Images/OtherIcons/DisbandUnit.png diff --git a/android/assets/Images/OtherIcons/Fire.png b/android/Images/OtherIcons/Fire.png similarity index 100% rename from android/assets/Images/OtherIcons/Fire.png rename to android/Images/OtherIcons/Fire.png diff --git a/android/assets/Images/OtherIcons/MenuIcon.png b/android/Images/OtherIcons/MenuIcon.png similarity index 100% rename from android/assets/Images/OtherIcons/MenuIcon.png rename to android/Images/OtherIcons/MenuIcon.png diff --git a/android/assets/Images/OtherIcons/Railroad.png b/android/Images/OtherIcons/Railroad.png similarity index 100% rename from android/assets/Images/OtherIcons/Railroad.png rename to android/Images/OtherIcons/Railroad.png diff --git a/android/assets/Images/OtherIcons/Shield.png b/android/Images/OtherIcons/Shield.png similarity index 100% rename from android/assets/Images/OtherIcons/Shield.png rename to android/Images/OtherIcons/Shield.png diff --git a/android/assets/Images/OtherIcons/Star.png b/android/Images/OtherIcons/Star.png similarity index 100% rename from android/assets/Images/OtherIcons/Star.png rename to android/Images/OtherIcons/Star.png diff --git a/android/assets/Images/OtherIcons/Stop.png b/android/Images/OtherIcons/Stop.png similarity index 100% rename from android/assets/Images/OtherIcons/Stop.png rename to android/Images/OtherIcons/Stop.png diff --git a/android/assets/Images/OtherIcons/civTableBackground.png b/android/Images/OtherIcons/civTableBackground.png similarity index 100% rename from android/assets/Images/OtherIcons/civTableBackground.png rename to android/Images/OtherIcons/civTableBackground.png diff --git a/android/assets/Images/OtherIcons/tileTableBackground.png b/android/Images/OtherIcons/tileTableBackground.png similarity index 100% rename from android/assets/Images/OtherIcons/tileTableBackground.png rename to android/Images/OtherIcons/tileTableBackground.png diff --git a/android/assets/Images/OtherIcons/whiteDot.png b/android/Images/OtherIcons/whiteDot.png similarity index 100% rename from android/assets/Images/OtherIcons/whiteDot.png rename to android/Images/OtherIcons/whiteDot.png diff --git a/android/assets/Images/PolicyIcons/Aristocracy_(Civ5).png b/android/Images/PolicyIcons/Aristocracy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Aristocracy_(Civ5).png rename to android/Images/PolicyIcons/Aristocracy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Citizenship_(Civ5).png b/android/Images/PolicyIcons/Citizenship_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Citizenship_(Civ5).png rename to android/Images/PolicyIcons/Citizenship_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Civil_Society_(Civ5).png b/android/Images/PolicyIcons/Civil_Society_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Civil_Society_(Civ5).png rename to android/Images/PolicyIcons/Civil_Society_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Collective_Rule_(Civ5).png b/android/Images/PolicyIcons/Collective_Rule_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Collective_Rule_(Civ5).png rename to android/Images/PolicyIcons/Collective_Rule_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Constitution_(Civ5).png b/android/Images/PolicyIcons/Constitution_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Constitution_(Civ5).png rename to android/Images/PolicyIcons/Constitution_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Democracy_(Civ5).png b/android/Images/PolicyIcons/Democracy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Democracy_(Civ5).png rename to android/Images/PolicyIcons/Democracy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Entrepreneurship_(Civ5).png b/android/Images/PolicyIcons/Entrepreneurship_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Entrepreneurship_(Civ5).png rename to android/Images/PolicyIcons/Entrepreneurship_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Free_Religion_(Civ5).png b/android/Images/PolicyIcons/Free_Religion_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Free_Religion_(Civ5).png rename to android/Images/PolicyIcons/Free_Religion_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Free_Speech_(Civ5).png b/android/Images/PolicyIcons/Free_Speech_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Free_Speech_(Civ5).png rename to android/Images/PolicyIcons/Free_Speech_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Free_Thought_(Civ5).png b/android/Images/PolicyIcons/Free_Thought_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Free_Thought_(Civ5).png rename to android/Images/PolicyIcons/Free_Thought_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Humanism_(Civ5).png b/android/Images/PolicyIcons/Humanism_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Humanism_(Civ5).png rename to android/Images/PolicyIcons/Humanism_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Landed_Elite_(Civ5).png b/android/Images/PolicyIcons/Landed_Elite_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Landed_Elite_(Civ5).png rename to android/Images/PolicyIcons/Landed_Elite_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Legalism_(Civ5).png b/android/Images/PolicyIcons/Legalism_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Legalism_(Civ5).png rename to android/Images/PolicyIcons/Legalism_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png b/android/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png rename to android/Images/PolicyIcons/Mandate_Of_Heaven_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Mercantilism_(Civ5).png b/android/Images/PolicyIcons/Mercantilism_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Mercantilism_(Civ5).png rename to android/Images/PolicyIcons/Mercantilism_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Meritocracy_(Civ5).png b/android/Images/PolicyIcons/Meritocracy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Meritocracy_(Civ5).png rename to android/Images/PolicyIcons/Meritocracy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Monarchy_(Civ5).png b/android/Images/PolicyIcons/Monarchy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Monarchy_(Civ5).png rename to android/Images/PolicyIcons/Monarchy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Oligarchy_(Civ5).png b/android/Images/PolicyIcons/Oligarchy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Oligarchy_(Civ5).png rename to android/Images/PolicyIcons/Oligarchy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Organized_Religion_(Civ5).png b/android/Images/PolicyIcons/Organized_Religion_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Organized_Religion_(Civ5).png rename to android/Images/PolicyIcons/Organized_Religion_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Patronage_(Civ5).png b/android/Images/PolicyIcons/Patronage_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Patronage_(Civ5).png rename to android/Images/PolicyIcons/Patronage_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Protectionism_(Civ5).png b/android/Images/PolicyIcons/Protectionism_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Protectionism_(Civ5).png rename to android/Images/PolicyIcons/Protectionism_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Reformation_(Civ5).png b/android/Images/PolicyIcons/Reformation_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Reformation_(Civ5).png rename to android/Images/PolicyIcons/Reformation_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Representation_(Civ5).png b/android/Images/PolicyIcons/Representation_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Representation_(Civ5).png rename to android/Images/PolicyIcons/Representation_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Republic_(Civ5).png b/android/Images/PolicyIcons/Republic_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Republic_(Civ5).png rename to android/Images/PolicyIcons/Republic_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Scientific_Revolution_(Civ5).png b/android/Images/PolicyIcons/Scientific_Revolution_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Scientific_Revolution_(Civ5).png rename to android/Images/PolicyIcons/Scientific_Revolution_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Secularism_(Civ5).png b/android/Images/PolicyIcons/Secularism_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Secularism_(Civ5).png rename to android/Images/PolicyIcons/Secularism_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Sovereignty_(Civ5).png b/android/Images/PolicyIcons/Sovereignty_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Sovereignty_(Civ5).png rename to android/Images/PolicyIcons/Sovereignty_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Theocracy_(Civ5).png b/android/Images/PolicyIcons/Theocracy_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Theocracy_(Civ5).png rename to android/Images/PolicyIcons/Theocracy_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Trade_Unions_(Civ5).png b/android/Images/PolicyIcons/Trade_Unions_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Trade_Unions_(Civ5).png rename to android/Images/PolicyIcons/Trade_Unions_(Civ5).png diff --git a/android/assets/Images/PolicyIcons/Universal_Suffrage_(Civ5).png b/android/Images/PolicyIcons/Universal_Suffrage_(Civ5).png similarity index 100% rename from android/assets/Images/PolicyIcons/Universal_Suffrage_(Civ5).png rename to android/Images/PolicyIcons/Universal_Suffrage_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Aluminum_(Civ5).png b/android/Images/ResourceIcons/Aluminum_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Aluminum_(Civ5).png rename to android/Images/ResourceIcons/Aluminum_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Bananas_(Civ5).png b/android/Images/ResourceIcons/Bananas_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Bananas_(Civ5).png rename to android/Images/ResourceIcons/Bananas_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Cattle_(Civ5).png b/android/Images/ResourceIcons/Cattle_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Cattle_(Civ5).png rename to android/Images/ResourceIcons/Cattle_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Coal_(Civ5).png b/android/Images/ResourceIcons/Coal_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Coal_(Civ5).png rename to android/Images/ResourceIcons/Coal_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Cotton_(Civ5).png b/android/Images/ResourceIcons/Cotton_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Cotton_(Civ5).png rename to android/Images/ResourceIcons/Cotton_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Deer_(Civ5).png b/android/Images/ResourceIcons/Deer_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Deer_(Civ5).png rename to android/Images/ResourceIcons/Deer_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Dyes_(Civ5).png b/android/Images/ResourceIcons/Dyes_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Dyes_(Civ5).png rename to android/Images/ResourceIcons/Dyes_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Furs_(Civ5).png b/android/Images/ResourceIcons/Furs_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Furs_(Civ5).png rename to android/Images/ResourceIcons/Furs_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Gems_(Civ5).png b/android/Images/ResourceIcons/Gems_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Gems_(Civ5).png rename to android/Images/ResourceIcons/Gems_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Gold_(Civ5).png b/android/Images/ResourceIcons/Gold_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Gold_(Civ5).png rename to android/Images/ResourceIcons/Gold_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Horses_(Civ5).png b/android/Images/ResourceIcons/Horses_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Horses_(Civ5).png rename to android/Images/ResourceIcons/Horses_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Incense_(Civ5).png b/android/Images/ResourceIcons/Incense_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Incense_(Civ5).png rename to android/Images/ResourceIcons/Incense_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Iron_(Civ5).png b/android/Images/ResourceIcons/Iron_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Iron_(Civ5).png rename to android/Images/ResourceIcons/Iron_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Ivory_(Civ5).png b/android/Images/ResourceIcons/Ivory_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Ivory_(Civ5).png rename to android/Images/ResourceIcons/Ivory_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Marble_(Civ5).png b/android/Images/ResourceIcons/Marble_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Marble_(Civ5).png rename to android/Images/ResourceIcons/Marble_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Oil_(Civ5).png b/android/Images/ResourceIcons/Oil_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Oil_(Civ5).png rename to android/Images/ResourceIcons/Oil_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Sheep_(Civ5).png b/android/Images/ResourceIcons/Sheep_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Sheep_(Civ5).png rename to android/Images/ResourceIcons/Sheep_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Silk_(Civ5).png b/android/Images/ResourceIcons/Silk_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Silk_(Civ5).png rename to android/Images/ResourceIcons/Silk_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Silver_(Civ5).png b/android/Images/ResourceIcons/Silver_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Silver_(Civ5).png rename to android/Images/ResourceIcons/Silver_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Spices_(Civ5).png b/android/Images/ResourceIcons/Spices_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Spices_(Civ5).png rename to android/Images/ResourceIcons/Spices_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Stone_(Civ5).png b/android/Images/ResourceIcons/Stone_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Stone_(Civ5).png rename to android/Images/ResourceIcons/Stone_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Sugar_(Civ5).png b/android/Images/ResourceIcons/Sugar_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Sugar_(Civ5).png rename to android/Images/ResourceIcons/Sugar_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Uranium_(Civ5).png b/android/Images/ResourceIcons/Uranium_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Uranium_(Civ5).png rename to android/Images/ResourceIcons/Uranium_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Wheat_(Civ5).png b/android/Images/ResourceIcons/Wheat_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Wheat_(Civ5).png rename to android/Images/ResourceIcons/Wheat_(Civ5).png diff --git a/android/assets/Images/ResourceIcons/Wine_(Civ5).png b/android/Images/ResourceIcons/Wine_(Civ5).png similarity index 100% rename from android/assets/Images/ResourceIcons/Wine_(Civ5).png rename to android/Images/ResourceIcons/Wine_(Civ5).png diff --git a/android/assets/Images/StatIcons/20xCityConnection5.png b/android/Images/StatIcons/20xCityConnection5.png similarity index 100% rename from android/assets/Images/StatIcons/20xCityConnection5.png rename to android/Images/StatIcons/20xCityConnection5.png diff --git a/android/assets/Images/StatIcons/20xCulture5.png b/android/Images/StatIcons/20xCulture5.png similarity index 100% rename from android/assets/Images/StatIcons/20xCulture5.png rename to android/Images/StatIcons/20xCulture5.png diff --git a/android/assets/Images/StatIcons/20xFood5.png b/android/Images/StatIcons/20xFood5.png similarity index 100% rename from android/assets/Images/StatIcons/20xFood5.png rename to android/Images/StatIcons/20xFood5.png diff --git a/android/assets/Images/StatIcons/20xGold5.png b/android/Images/StatIcons/20xGold5.png similarity index 100% rename from android/assets/Images/StatIcons/20xGold5.png rename to android/Images/StatIcons/20xGold5.png diff --git a/android/Images/StatIcons/20xHappiness5.png b/android/Images/StatIcons/20xHappiness5.png new file mode 100644 index 0000000000..8b494207a2 Binary files /dev/null and b/android/Images/StatIcons/20xHappiness5.png differ diff --git a/android/assets/Images/StatIcons/20xMalcontent5.png b/android/Images/StatIcons/20xMalcontent5.png similarity index 100% rename from android/assets/Images/StatIcons/20xMalcontent5.png rename to android/Images/StatIcons/20xMalcontent5.png diff --git a/android/assets/Images/StatIcons/20xMovement5.png b/android/Images/StatIcons/20xMovement5.png similarity index 100% rename from android/assets/Images/StatIcons/20xMovement5.png rename to android/Images/StatIcons/20xMovement5.png diff --git a/android/assets/Images/StatIcons/20xPopulation5.png b/android/Images/StatIcons/20xPopulation5.png similarity index 100% rename from android/assets/Images/StatIcons/20xPopulation5.png rename to android/Images/StatIcons/20xPopulation5.png diff --git a/android/assets/Images/StatIcons/20xProduction5.png b/android/Images/StatIcons/20xProduction5.png similarity index 100% rename from android/assets/Images/StatIcons/20xProduction5.png rename to android/Images/StatIcons/20xProduction5.png diff --git a/android/assets/Images/StatIcons/20xRangedStrength5.png b/android/Images/StatIcons/20xRangedStrength5.png similarity index 100% rename from android/assets/Images/StatIcons/20xRangedStrength5.png rename to android/Images/StatIcons/20xRangedStrength5.png diff --git a/android/assets/Images/StatIcons/20xScience5.png b/android/Images/StatIcons/20xScience5.png similarity index 100% rename from android/assets/Images/StatIcons/20xScience5.png rename to android/Images/StatIcons/20xScience5.png diff --git a/android/assets/Images/StatIcons/20xStrength5.png b/android/Images/StatIcons/20xStrength5.png similarity index 100% rename from android/assets/Images/StatIcons/20xStrength5.png rename to android/Images/StatIcons/20xStrength5.png diff --git a/android/assets/Images/StatIcons/City_Center_(Civ6).png b/android/Images/StatIcons/City_Center_(Civ6).png similarity index 100% rename from android/assets/Images/StatIcons/City_Center_(Civ6).png rename to android/Images/StatIcons/City_Center_(Civ6).png diff --git a/android/assets/Images/StatIcons/populationGray.png b/android/Images/StatIcons/populationGray.png similarity index 100% rename from android/assets/Images/StatIcons/populationGray.png rename to android/Images/StatIcons/populationGray.png diff --git a/android/assets/Images/StatIcons/populationGreen.png b/android/Images/StatIcons/populationGreen.png similarity index 100% rename from android/assets/Images/StatIcons/populationGreen.png rename to android/Images/StatIcons/populationGreen.png diff --git a/android/assets/Images/TerrainIcons/Flood plains.png b/android/Images/TerrainIcons/Flood plains.png similarity index 100% rename from android/assets/Images/TerrainIcons/Flood plains.png rename to android/Images/TerrainIcons/Flood plains.png diff --git a/android/assets/Images/TerrainIcons/Fog.png b/android/Images/TerrainIcons/Fog.png similarity index 100% rename from android/assets/Images/TerrainIcons/Fog.png rename to android/Images/TerrainIcons/Fog.png diff --git a/android/assets/Images/TerrainIcons/Forest.png b/android/Images/TerrainIcons/Forest.png similarity index 100% rename from android/assets/Images/TerrainIcons/Forest.png rename to android/Images/TerrainIcons/Forest.png diff --git a/android/assets/Images/TerrainIcons/Hexagon.png b/android/Images/TerrainIcons/Hexagon.png similarity index 100% rename from android/assets/Images/TerrainIcons/Hexagon.png rename to android/Images/TerrainIcons/Hexagon.png diff --git a/android/assets/Images/TerrainIcons/Jungle.png b/android/Images/TerrainIcons/Jungle.png similarity index 100% rename from android/assets/Images/TerrainIcons/Jungle.png rename to android/Images/TerrainIcons/Jungle.png diff --git a/android/assets/Images/TerrainIcons/Marsh.png b/android/Images/TerrainIcons/Marsh.png similarity index 100% rename from android/assets/Images/TerrainIcons/Marsh.png rename to android/Images/TerrainIcons/Marsh.png diff --git a/android/assets/Images/TerrainIcons/Oasis.png b/android/Images/TerrainIcons/Oasis.png similarity index 100% rename from android/assets/Images/TerrainIcons/Oasis.png rename to android/Images/TerrainIcons/Oasis.png diff --git a/android/assets/Images/TerrainIcons/road.png b/android/Images/TerrainIcons/road.png similarity index 100% rename from android/assets/Images/TerrainIcons/road.png rename to android/Images/TerrainIcons/road.png diff --git a/android/assets/Images/UnitIcons/Archer.png b/android/Images/UnitIcons/Archer.png similarity index 100% rename from android/assets/Images/UnitIcons/Archer.png rename to android/Images/UnitIcons/Archer.png diff --git a/android/assets/Images/UnitIcons/Artillery.png b/android/Images/UnitIcons/Artillery.png similarity index 100% rename from android/assets/Images/UnitIcons/Artillery.png rename to android/Images/UnitIcons/Artillery.png diff --git a/android/assets/Images/UnitIcons/Bowman.png b/android/Images/UnitIcons/Bowman.png similarity index 100% rename from android/assets/Images/UnitIcons/Bowman.png rename to android/Images/UnitIcons/Bowman.png diff --git a/android/assets/Images/UnitIcons/Cannon.png b/android/Images/UnitIcons/Cannon.png similarity index 100% rename from android/assets/Images/UnitIcons/Cannon.png rename to android/Images/UnitIcons/Cannon.png diff --git a/android/assets/Images/UnitIcons/Catapult.png b/android/Images/UnitIcons/Catapult.png similarity index 100% rename from android/assets/Images/UnitIcons/Catapult.png rename to android/Images/UnitIcons/Catapult.png diff --git a/android/assets/Images/UnitIcons/Cavalry.png b/android/Images/UnitIcons/Cavalry.png similarity index 100% rename from android/assets/Images/UnitIcons/Cavalry.png rename to android/Images/UnitIcons/Cavalry.png diff --git a/android/assets/Images/UnitIcons/Chariot Archer.png b/android/Images/UnitIcons/Chariot Archer.png similarity index 100% rename from android/assets/Images/UnitIcons/Chariot Archer.png rename to android/Images/UnitIcons/Chariot Archer.png diff --git a/android/assets/Images/UnitIcons/Companion Cavalry.png b/android/Images/UnitIcons/Companion Cavalry.png similarity index 100% rename from android/assets/Images/UnitIcons/Companion Cavalry.png rename to android/Images/UnitIcons/Companion Cavalry.png diff --git a/android/assets/Images/UnitIcons/Crossbowman.png b/android/Images/UnitIcons/Crossbowman.png similarity index 100% rename from android/assets/Images/UnitIcons/Crossbowman.png rename to android/Images/UnitIcons/Crossbowman.png diff --git a/android/assets/Images/UnitIcons/Great Artist.png b/android/Images/UnitIcons/Great Artist.png similarity index 100% rename from android/assets/Images/UnitIcons/Great Artist.png rename to android/Images/UnitIcons/Great Artist.png diff --git a/android/assets/Images/UnitIcons/Great Engineer.png b/android/Images/UnitIcons/Great Engineer.png similarity index 100% rename from android/assets/Images/UnitIcons/Great Engineer.png rename to android/Images/UnitIcons/Great Engineer.png diff --git a/android/assets/Images/UnitIcons/Great Merchant.png b/android/Images/UnitIcons/Great Merchant.png similarity index 100% rename from android/assets/Images/UnitIcons/Great Merchant.png rename to android/Images/UnitIcons/Great Merchant.png diff --git a/android/assets/Images/UnitIcons/Great Scientist.png b/android/Images/UnitIcons/Great Scientist.png similarity index 100% rename from android/assets/Images/UnitIcons/Great Scientist.png rename to android/Images/UnitIcons/Great Scientist.png diff --git a/android/assets/Images/UnitIcons/Horseman.png b/android/Images/UnitIcons/Horseman.png similarity index 100% rename from android/assets/Images/UnitIcons/Horseman.png rename to android/Images/UnitIcons/Horseman.png diff --git a/android/assets/Images/UnitIcons/Knight.png b/android/Images/UnitIcons/Knight.png similarity index 100% rename from android/assets/Images/UnitIcons/Knight.png rename to android/Images/UnitIcons/Knight.png diff --git a/android/assets/Images/UnitIcons/Lancer.png b/android/Images/UnitIcons/Lancer.png similarity index 100% rename from android/assets/Images/UnitIcons/Lancer.png rename to android/Images/UnitIcons/Lancer.png diff --git a/android/assets/Images/UnitIcons/Longbowman.png b/android/Images/UnitIcons/Longbowman.png similarity index 100% rename from android/assets/Images/UnitIcons/Longbowman.png rename to android/Images/UnitIcons/Longbowman.png diff --git a/android/assets/Images/UnitIcons/Longswordsman.png b/android/Images/UnitIcons/Longswordsman.png similarity index 100% rename from android/assets/Images/UnitIcons/Longswordsman.png rename to android/Images/UnitIcons/Longswordsman.png diff --git a/android/assets/Images/UnitIcons/Musketman.png b/android/Images/UnitIcons/Musketman.png similarity index 100% rename from android/assets/Images/UnitIcons/Musketman.png rename to android/Images/UnitIcons/Musketman.png diff --git a/android/assets/Images/UnitIcons/Pikeman.png b/android/Images/UnitIcons/Pikeman.png similarity index 100% rename from android/assets/Images/UnitIcons/Pikeman.png rename to android/Images/UnitIcons/Pikeman.png diff --git a/android/assets/Images/UnitIcons/Rifleman.png b/android/Images/UnitIcons/Rifleman.png similarity index 100% rename from android/assets/Images/UnitIcons/Rifleman.png rename to android/Images/UnitIcons/Rifleman.png diff --git a/android/assets/Images/UnitIcons/Scout.png b/android/Images/UnitIcons/Scout.png similarity index 100% rename from android/assets/Images/UnitIcons/Scout.png rename to android/Images/UnitIcons/Scout.png diff --git a/android/assets/Images/UnitIcons/Settler.png b/android/Images/UnitIcons/Settler.png similarity index 100% rename from android/assets/Images/UnitIcons/Settler.png rename to android/Images/UnitIcons/Settler.png diff --git a/android/assets/Images/UnitIcons/Spearman.png b/android/Images/UnitIcons/Spearman.png similarity index 100% rename from android/assets/Images/UnitIcons/Spearman.png rename to android/Images/UnitIcons/Spearman.png diff --git a/android/assets/Images/UnitIcons/Swordsman.png b/android/Images/UnitIcons/Swordsman.png similarity index 100% rename from android/assets/Images/UnitIcons/Swordsman.png rename to android/Images/UnitIcons/Swordsman.png diff --git a/android/assets/Images/UnitIcons/Trebuchet.png b/android/Images/UnitIcons/Trebuchet.png similarity index 100% rename from android/assets/Images/UnitIcons/Trebuchet.png rename to android/Images/UnitIcons/Trebuchet.png diff --git a/android/assets/Images/UnitIcons/Warrior.png b/android/Images/UnitIcons/Warrior.png similarity index 100% rename from android/assets/Images/UnitIcons/Warrior.png rename to android/Images/UnitIcons/Warrior.png diff --git a/android/assets/Images/UnitIcons/Worker.png b/android/Images/UnitIcons/Worker.png similarity index 100% rename from android/assets/Images/UnitIcons/Worker.png rename to android/Images/UnitIcons/Worker.png diff --git a/android/assets/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png rename to android/Images/UnitPromotionIcons/Accuracy_III_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Accuracy_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png b/android/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Accuracy_I_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Barrage_III_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_III_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Barrage_III_(Civ5).png rename to android/Images/UnitPromotionIcons/Barrage_III_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Barrage_II_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Barrage_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Barrage_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Barrage_I_(Civ5).png b/android/Images/UnitPromotionIcons/Barrage_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Barrage_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Barrage_I_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Charge_(Civ5).png b/android/Images/UnitPromotionIcons/Charge_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Charge_(Civ5).png rename to android/Images/UnitPromotionIcons/Charge_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Cover_II_(Civ5).png b/android/Images/UnitPromotionIcons/Cover_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Cover_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Cover_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Cover_I_(Civ5).png b/android/Images/UnitPromotionIcons/Cover_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Cover_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Cover_I_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Drill_III_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_III_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Drill_III_(Civ5).png rename to android/Images/UnitPromotionIcons/Drill_III_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Drill_II_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Drill_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Drill_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Drill_I_(Civ5).png b/android/Images/UnitPromotionIcons/Drill_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Drill_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Drill_I_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/March_(Civ5).png b/android/Images/UnitPromotionIcons/March_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/March_(Civ5).png rename to android/Images/UnitPromotionIcons/March_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Scouting_III_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_III_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Scouting_III_(Civ5).png rename to android/Images/UnitPromotionIcons/Scouting_III_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Scouting_II_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Scouting_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Scouting_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Scouting_I_(Civ5).png b/android/Images/UnitPromotionIcons/Scouting_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Scouting_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Scouting_I_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Shock_III_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_III_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Shock_III_(Civ5).png rename to android/Images/UnitPromotionIcons/Shock_III_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Shock_II_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_II_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Shock_II_(Civ5).png rename to android/Images/UnitPromotionIcons/Shock_II_(Civ5).png diff --git a/android/assets/Images/UnitPromotionIcons/Shock_I_(Civ5).png b/android/Images/UnitPromotionIcons/Shock_I_(Civ5).png similarity index 100% rename from android/assets/Images/UnitPromotionIcons/Shock_I_(Civ5).png rename to android/Images/UnitPromotionIcons/Shock_I_(Civ5).png diff --git a/android/assets/Images/StatIcons/20xCulture5 - Copy.png b/android/ImagesToNotAddToGame/20xCulture5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xCulture5 - Copy.png rename to android/ImagesToNotAddToGame/20xCulture5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xFood5 - Copy.png b/android/ImagesToNotAddToGame/20xFood5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xFood5 - Copy.png rename to android/ImagesToNotAddToGame/20xFood5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xGold5 - Copy.png b/android/ImagesToNotAddToGame/20xGold5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xGold5 - Copy.png rename to android/ImagesToNotAddToGame/20xGold5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xHappiness5 - Copy.png b/android/ImagesToNotAddToGame/20xHappiness5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xHappiness5 - Copy.png rename to android/ImagesToNotAddToGame/20xHappiness5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xPopulation5 - Copy.png b/android/ImagesToNotAddToGame/20xPopulation5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xPopulation5 - Copy.png rename to android/ImagesToNotAddToGame/20xPopulation5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xProduction5 - Copy.png b/android/ImagesToNotAddToGame/20xProduction5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xProduction5 - Copy.png rename to android/ImagesToNotAddToGame/20xProduction5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xScience5 - Copy.png b/android/ImagesToNotAddToGame/20xScience5 - Copy.png similarity index 100% rename from android/assets/Images/StatIcons/20xScience5 - Copy.png rename to android/ImagesToNotAddToGame/20xScience5 - Copy.png diff --git a/android/assets/Images/StatIcons/20xHappiness5.png b/android/assets/Images/StatIcons/20xHappiness5.png deleted file mode 100644 index 6602ecaa37..0000000000 Binary files a/android/assets/Images/StatIcons/20xHappiness5.png and /dev/null differ diff --git a/android/assets/Images/game.png b/android/assets/Images/game.png deleted file mode 100644 index b7d9f83f1f..0000000000 Binary files a/android/assets/Images/game.png and /dev/null differ diff --git a/android/assets/Images/game.atlas b/android/assets/game.atlas similarity index 83% rename from android/assets/Images/game.atlas rename to android/assets/game.atlas index 62956ffecc..c399f6b77b 100644 --- a/android/assets/Images/game.atlas +++ b/android/assets/game.atlas @@ -6,1176 +6,1127 @@ filter: MipMapLinearLinear,MipMapLinearLinear repeat: none FlagIcons/Dutch rotate: false - xy: 810, 504 + xy: 1398, 1501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/English rotate: false - xy: 1012, 722 + xy: 810, 713 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/French rotate: false - xy: 1756, 1514 + xy: 1528, 1501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/German rotate: false - xy: 810, 374 + xy: 810, 583 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Italian rotate: false - xy: 1886, 1514 + xy: 1658, 1501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Romanian rotate: false - xy: 1012, 592 + xy: 1788, 1501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Russian rotate: false - xy: 406, 48 + xy: 1918, 1501 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 FlagIcons/Spanish rotate: false - xy: 536, 48 + xy: 810, 323 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 ImprovementIcons/Academy_(Civ5) rotate: false - xy: 1618, 1460 + xy: 406, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Camp_(Civ5) rotate: false - xy: 940, 588 + xy: 1012, 1059 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Customs_house_(Civ5) rotate: false - xy: 720, 1605 + xy: 810, 277 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Farm_(Civ5) rotate: false - xy: 856, 198 + xy: 1962, 1940 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Landmark_(Civ5) rotate: false - xy: 1756, 1468 + xy: 100, 50 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Lumber_mill_(Civ5) rotate: false - xy: 1142, 714 + xy: 1962, 1894 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Manufactory_(Civ5) rotate: false - xy: 940, 496 + xy: 498, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Mine_(Civ5) rotate: false - xy: 48, 63 + xy: 1150, 1105 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Oil_well_(Civ5) rotate: false - xy: 758, 132 + xy: 940, 705 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Pasture_(Civ5) rotate: false - xy: 1962, 1862 + xy: 810, 185 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Plantation_(Civ5) rotate: false - xy: 1802, 1468 + xy: 856, 231 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Quarry_(Civ5) rotate: false - xy: 1142, 668 + xy: 146, 50 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Railroad_(Civ5) rotate: false - xy: 940, 450 + xy: 1962, 1848 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Road_(Civ5) rotate: false - xy: 140, 2 + xy: 544, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ImprovementIcons/Trading_post_(Civ5) rotate: false - xy: 140, 63 + xy: 1582, 1455 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 OtherIcons/Circle rotate: false - xy: 204, 109 + xy: 2, 96 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/City rotate: false - xy: 850, 1644 + xy: 204, 1308 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Crosshair rotate: false - xy: 1456, 1644 + xy: 204, 702 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/DisbandUnit rotate: false - xy: 1658, 1644 + xy: 204, 500 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Fire rotate: false - xy: 269, 1604 + xy: 204, 298 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/MenuIcon rotate: false - xy: 810, 244 + xy: 810, 453 size: 128, 128 orig: 128, 128 offset: 0, 0 index: -1 OtherIcons/Railroad rotate: false - xy: 810, 1442 + xy: 608, 1377 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Shield rotate: false - xy: 1012, 1240 + xy: 608, 569 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/Star rotate: false - xy: 673, 1651 + xy: 673, 1638 size: 150, 141 orig: 150, 141 offset: 0, 0 index: -1 OtherIcons/Stop rotate: false - xy: 810, 836 + xy: 608, 165 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 OtherIcons/civTableBackground rotate: false - xy: 548, 1794 + xy: 548, 1781 size: 300, 50 orig: 300, 50 offset: 0, 0 index: -1 OtherIcons/tileTableBackground rotate: false - xy: 1860, 1644 + xy: 1860, 1631 size: 180, 200 orig: 180, 200 offset: 0, 0 index: -1 OtherIcons/whiteDot rotate: false - xy: 847, 1791 + xy: 847, 1778 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 PolicyIcons/Aristocracy_(Civ5) rotate: false - xy: 246, 48 + xy: 344, 67 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Citizenship_(Civ5) rotate: false - xy: 1940, 1479 + xy: 682, 130 size: 28, 33 orig: 28, 33 offset: 0, 0 index: -1 PolicyIcons/Civil_Society_(Civ5) rotate: false - xy: 696, 53 + xy: 994, 992 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Collective_Rule_(Civ5) rotate: false - xy: 216, 76 + xy: 902, 240 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Constitution_(Civ5) rotate: false - xy: 306, 80 + xy: 742, 136 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Democracy_(Civ5) rotate: false - xy: 246, 77 + xy: 314, 64 size: 28, 30 orig: 28, 30 offset: 0, 0 index: -1 PolicyIcons/Entrepreneurship_(Civ5) rotate: false - xy: 673, 1602 + xy: 1962, 1986 size: 45, 47 orig: 45, 47 offset: 0, 0 index: -1 PolicyIcons/Free_Religion_(Civ5) rotate: false - xy: 756, 55 + xy: 712, 134 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Free_Speech_(Civ5) rotate: false - xy: 902, 206 + xy: 1628, 1463 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Free_Thought_(Civ5) rotate: false - xy: 276, 48 + xy: 994, 962 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Humanism_(Civ5) rotate: false - xy: 306, 51 + xy: 1072, 1030 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Landed_Elite_(Civ5) rotate: false - xy: 1970, 1481 + xy: 1658, 1468 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Legalism_(Civ5) rotate: false - xy: 1142, 592 + xy: 902, 210 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Mandate_Of_Heaven_(Civ5) rotate: false - xy: 186, 72 + xy: 284, 59 size: 28, 35 orig: 28, 35 offset: 0, 0 index: -1 PolicyIcons/Mercantilism_(Civ5) rotate: false - xy: 2014, 2009 + xy: 2009, 1996 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Meritocracy_(Civ5) rotate: false - xy: 336, 80 + xy: 994, 933 size: 28, 27 orig: 28, 27 offset: 0, 0 index: -1 PolicyIcons/Monarchy_(Civ5) rotate: false - xy: 666, 48 + xy: 940, 575 size: 28, 36 orig: 28, 36 offset: 0, 0 index: -1 PolicyIcons/Oligarchy_(Civ5) rotate: false - xy: 940, 274 + xy: 1012, 1025 size: 28, 32 orig: 28, 32 offset: 0, 0 index: -1 PolicyIcons/Organized_Religion_(Civ5) rotate: false - xy: 278, 22 + xy: 1102, 1033 size: 28, 24 orig: 28, 24 offset: 0, 0 index: -1 PolicyIcons/Patronage_(Civ5) rotate: false - xy: 1962, 2000 + xy: 2, 48 size: 50, 46 orig: 50, 46 offset: 0, 0 index: -1 PolicyIcons/Protectionism_(Civ5) rotate: false - xy: 216, 48 + xy: 1718, 1473 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Reformation_(Civ5) rotate: false - xy: 940, 244 + xy: 1688, 1471 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Representation_(Civ5) rotate: false - xy: 726, 53 + xy: 940, 542 size: 28, 31 orig: 28, 31 offset: 0, 0 index: -1 PolicyIcons/Republic_(Civ5) rotate: false - xy: 336, 52 + xy: 940, 484 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Scientific_Revolution_(Civ5) rotate: false - xy: 366, 81 + xy: 374, 68 size: 28, 26 orig: 28, 26 offset: 0, 0 index: -1 PolicyIcons/Secularism_(Civ5) rotate: false - xy: 276, 78 + xy: 1042, 1028 size: 28, 29 orig: 28, 29 offset: 0, 0 index: -1 PolicyIcons/Sovereignty_(Civ5) rotate: false - xy: 366, 54 + xy: 772, 138 size: 28, 25 orig: 28, 25 offset: 0, 0 index: -1 PolicyIcons/Theocracy_(Civ5) rotate: false - xy: 766, 1612 + xy: 765, 1599 size: 28, 37 orig: 28, 37 offset: 0, 0 index: -1 PolicyIcons/Trade_Unions_(Civ5) rotate: false - xy: 932, 214 + xy: 940, 512 size: 28, 28 orig: 28, 28 offset: 0, 0 index: -1 PolicyIcons/Universal_Suffrage_(Civ5) rotate: false - xy: 940, 308 + xy: 902, 273 size: 28, 48 orig: 28, 48 offset: 0, 0 index: -1 ResourceIcons/Aluminum_(Civ5) rotate: false - xy: 1142, 806 + xy: 673, 1592 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Bananas_(Civ5) rotate: false - xy: 810, 198 + xy: 719, 1592 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Cattle_(Civ5) rotate: false - xy: 2, 2 + xy: 1150, 1197 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Coal_(Civ5) rotate: false - xy: 666, 132 + xy: 1398, 1455 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Cotton_(Civ5) rotate: false - xy: 1962, 1954 + xy: 940, 797 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Deer_(Civ5) rotate: false - xy: 1664, 1460 + xy: 2, 2 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Dyes_(Civ5) rotate: false - xy: 1142, 760 + xy: 54, 50 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Furs_(Civ5) rotate: false - xy: 940, 542 + xy: 452, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Gems_(Civ5) rotate: false - xy: 48, 2 + xy: 1058, 1059 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Gold_(Civ5) rotate: false - xy: 2, 63 + xy: 1150, 1151 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Horses_(Civ5) rotate: false - xy: 666, 86 + xy: 1444, 1455 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Incense_(Civ5) rotate: false - xy: 712, 132 + xy: 940, 751 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Iron_(Civ5) rotate: false - xy: 1962, 1908 + xy: 810, 231 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Ivory_(Civ5) rotate: false - xy: 1710, 1460 + xy: 856, 277 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Marble_(Civ5) rotate: false - xy: 94, 2 + xy: 1104, 1059 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Oil_(Civ5) rotate: false - xy: 712, 86 + xy: 1490, 1455 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Sheep_(Civ5) rotate: false - xy: 94, 63 + xy: 1150, 1059 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Silk_(Civ5) rotate: false - xy: 758, 86 + xy: 1536, 1455 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Silver_(Civ5) rotate: false - xy: 1848, 1468 + xy: 940, 659 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Spices_(Civ5) rotate: false - xy: 1142, 622 + xy: 856, 185 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Stone_(Civ5) rotate: false - xy: 940, 404 + xy: 192, 50 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Sugar_(Civ5) rotate: false - xy: 186, 2 + xy: 590, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Uranium_(Civ5) rotate: false - xy: 1894, 1468 + xy: 940, 613 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Wheat_(Civ5) rotate: false - xy: 940, 358 + xy: 238, 50 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 ResourceIcons/Wine_(Civ5) rotate: false - xy: 232, 2 + xy: 636, 119 size: 44, 44 orig: 44, 44 offset: 0, 0 index: -1 StatIcons/20xCityConnection5 rotate: false - xy: 825, 1772 + xy: 825, 1759 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xCulture5 rotate: false - xy: 548, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xCulture5 - Copy - rotate: false - xy: 2, 1321 + xy: 548, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xFood5 rotate: false - xy: 750, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xFood5 - Copy - rotate: false - xy: 2, 1119 + xy: 2, 1308 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xGold5 rotate: false - xy: 952, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xGold5 - Copy - rotate: false - xy: 2, 917 + xy: 750, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xHappiness5 rotate: false - xy: 1154, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xHappiness5 - Copy - rotate: false - xy: 2, 715 + xy: 2, 1106 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xMalcontent5 rotate: false - xy: 2016, 1622 + xy: 406, 97 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xMovement5 rotate: false - xy: 986, 612 + xy: 902, 188 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xPopulation5 rotate: false - xy: 1356, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xPopulation5 - Copy - rotate: false - xy: 2, 513 + xy: 952, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xProduction5 rotate: false - xy: 1558, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xProduction5 - Copy - rotate: false - xy: 2, 311 + xy: 2, 904 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xRangedStrength5 rotate: false - xy: 825, 1750 + xy: 994, 911 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/20xScience5 rotate: false - xy: 1760, 1846 - size: 200, 200 - orig: 200, 200 - offset: 0, 0 - index: -1 -StatIcons/20xScience5 - Copy - rotate: false - xy: 2, 109 + xy: 1154, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 StatIcons/20xStrength5 rotate: false - xy: 2016, 1600 + xy: 1748, 1479 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 StatIcons/City_Center_(Civ6) rotate: false - xy: 2, 1781 + xy: 2, 1768 size: 265, 265 orig: 265, 265 offset: 0, 0 index: -1 StatIcons/populationGray rotate: false - xy: 1214, 1058 + xy: 1214, 1449 size: 182, 180 orig: 182, 180 offset: 0, 0 index: -1 StatIcons/populationGreen rotate: false - xy: 1416, 1260 + xy: 810, 843 size: 182, 180 orig: 182, 180 offset: 0, 0 index: -1 TerrainIcons/Flood plains rotate: false - xy: 471, 1592 + xy: 204, 96 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Fog rotate: false - xy: 2, 1523 + xy: 2, 1510 size: 256, 256 orig: 256, 256 offset: 0, 0 index: -1 TerrainIcons/Forest rotate: false - xy: 406, 1390 + xy: 850, 1631 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Hexagon rotate: false - xy: 269, 1806 + xy: 269, 1793 size: 277, 240 orig: 277, 240 offset: 0, 0 index: -1 TerrainIcons/Jungle rotate: false - xy: 406, 178 + xy: 471, 1579 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Marsh rotate: false - xy: 608, 582 + xy: 406, 569 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/Oasis rotate: false - xy: 608, 380 + xy: 406, 367 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 TerrainIcons/road rotate: false - xy: 720, 1592 + xy: 673, 1579 size: 61, 11 orig: 61, 11 offset: 0, 0 index: -1 UnitIcons/Archer rotate: false - xy: 204, 1321 + xy: 2, 702 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Artillery rotate: false - xy: 204, 1119 + xy: 1356, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Bowman rotate: false - xy: 204, 917 + xy: 2, 500 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Cannon rotate: false - xy: 204, 715 + xy: 1558, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Catapult rotate: false - xy: 204, 513 + xy: 2, 298 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Cavalry rotate: false - xy: 204, 311 + xy: 1760, 1833 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Chariot Archer rotate: false - xy: 1618, 1506 + xy: 1012, 1105 size: 136, 136 orig: 136, 136 offset: 0, 0 index: -1 UnitIcons/Companion Cavalry rotate: false - xy: 1052, 1644 + xy: 204, 1106 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Crossbowman rotate: false - xy: 1254, 1644 + xy: 204, 904 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Artist rotate: false - xy: 406, 1188 + xy: 1052, 1631 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Engineer rotate: false - xy: 406, 986 + xy: 1254, 1631 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Merchant rotate: false - xy: 406, 784 + xy: 1456, 1631 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Great Scientist rotate: false - xy: 406, 582 + xy: 1658, 1631 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Horseman rotate: false - xy: 406, 380 + xy: 269, 1591 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Knight rotate: false - xy: 608, 1390 + xy: 406, 1377 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Lancer rotate: false - xy: 608, 1188 + xy: 406, 1175 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Longbowman rotate: false - xy: 608, 986 + xy: 406, 973 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Longswordsman rotate: false - xy: 608, 784 + xy: 406, 771 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Musketman rotate: false - xy: 1012, 852 + xy: 1012, 1243 size: 185, 184 orig: 185, 184 offset: 0, 0 index: -1 UnitIcons/Pikeman rotate: false - xy: 608, 178 + xy: 406, 165 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Rifleman rotate: false - xy: 810, 1240 + xy: 608, 1175 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Scout rotate: false - xy: 1012, 1442 + xy: 608, 973 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Settler rotate: false - xy: 810, 1038 + xy: 608, 771 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Spearman rotate: false - xy: 1214, 1442 + xy: 608, 367 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Swordsman rotate: false - xy: 1012, 1038 + xy: 810, 1429 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Trebuchet rotate: false - xy: 1214, 1240 + xy: 810, 1227 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Warrior rotate: false - xy: 1416, 1442 + xy: 1012, 1429 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitIcons/Worker rotate: false - xy: 810, 634 + xy: 810, 1025 size: 200, 200 orig: 200, 200 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_III_(Civ5) rotate: false - xy: 986, 590 + xy: 940, 462 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_II_(Civ5) rotate: false - xy: 825, 1728 + xy: 1132, 1037 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Accuracy_I_(Civ5) rotate: false - xy: 2016, 1578 + xy: 825, 1737 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_III_(Civ5) rotate: false - xy: 986, 568 + xy: 428, 97 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_II_(Civ5) rotate: false - xy: 825, 1706 + xy: 994, 889 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Barrage_I_(Civ5) rotate: false - xy: 2016, 1556 + xy: 1770, 1479 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Charge_(Civ5) rotate: false - xy: 986, 546 + xy: 940, 440 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_II_(Civ5) rotate: false - xy: 825, 1684 + xy: 1154, 1037 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Cover_I_(Civ5) rotate: false - xy: 2016, 1534 + xy: 825, 1715 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_III_(Civ5) rotate: false - xy: 986, 524 + xy: 450, 97 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_II_(Civ5) rotate: false - xy: 825, 1662 + xy: 994, 867 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Drill_I_(Civ5) rotate: false - xy: 986, 502 + xy: 1792, 1479 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/March_(Civ5) rotate: false - xy: 986, 480 + xy: 940, 418 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_III_(Civ5) rotate: false - xy: 986, 458 + xy: 825, 1693 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_II_(Civ5) rotate: false - xy: 986, 436 + xy: 472, 97 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Scouting_I_(Civ5) rotate: false - xy: 986, 414 + xy: 994, 845 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_III_(Civ5) rotate: false - xy: 986, 392 + xy: 1814, 1479 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_II_(Civ5) rotate: false - xy: 986, 370 + xy: 940, 396 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 UnitPromotionIcons/Shock_I_(Civ5) rotate: false - xy: 1214, 1036 + xy: 825, 1671 size: 20, 20 orig: 20, 20 offset: 0, 0 diff --git a/android/assets/game.png b/android/assets/game.png new file mode 100644 index 0000000000..39dd08c551 Binary files /dev/null and b/android/assets/game.png differ diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json index 1cd9e4f626..213246f5c7 100644 --- a/android/assets/jsons/Translations.json +++ b/android/assets/jsons/Translations.json @@ -3343,5 +3343,83 @@ Russian:"+15% роста и +2 еды во всех городах" } // And so on for all the policies. I can't be bothered to add them all now... + "Liberty":{} + "+1 culture in evey city":{} + "Collective Rule":{} + "Training of settlers increaed +50% in capital, recieve a new settler near capital":{} + "Citizenship":{} + "+25% construction rate of workers, recieve free worker near the capital":{} + "Republic":{} + "+1 construction in every city, +5% construction when constructing buildings":{} + "Representation":{} + "Each city founded increases culture cost of policies 33% less than normal. Starts a golden age.":{} + "Meritocracy":{} + "+1 happiness for every city connected to capital, -5% unhappiness from citizens":{} + "Liberty Complete":{} + "Free Great Person of choice near capital":{} + + // Piety branch + "Piety":{} + "Building time of culture buildings reduced by 15%":{} + "Organized Religion":{} + "+1 happiness for each monument, temple and monastery":{} + "Mandate Of Heaven":{} + "50% of excess happiness added to culture towards policies":{} + "Theocracy":{} + "Temples give +10% gold":{} + "Reformation":{} + "+33% culture in all cities with a world wonder, immediately enter a golden age":{} + "Free Religion":{} + "+1 culture for each monument, temple and monastery. Gain a free policy.":{} + "Piety Complete":{} + "Reduce culture cost of future policies by 10%":{} + + // Commerce branch + "Commerce":{} + "+25% gold in capital":{} + "Trade Unions":{} + "Maintainance on roads & railroads reduced by 33%, +2 gold from all trade routes":{} + "Mercantilism":{} + "-25% to purchasing items in cities":{} + "Entrepreneurship":{} + "Great Merchants are earned 25% faster, +1 Science from every Mint, Market, Bank and Stock Exchange.":{} + "Patronage":{} + "Cost of purchasing culture buildings reduced by 50%":{} + "Protectionism":{} + "+1 happiness from each luxury resource":{} + "Commerce Complete":{} + "+1 gold from each specialist":{} + + //Rationalism branch + "Rationalism":{} + "Production to science conversion in cities increased by 33%":{} + "Secularism":{} + "+2 science from every specialist":{} + "Humanism":{} + "+1 happiness from every university, observatory and public school":{} + "Free Thought":{} + "+1 science from every trading post, +17% science from universities":{} + "Sovereignty":{} + "+15% science while empire is happy":{} + "Scientific Revolution":{} + "Gain 2 free technologies":{} + "Rationalism Complete":{} + "+1 gold from all science buildings":{} + + // Freedom branch + "Freedom":{} + "+25% great people rate":{} + "Constitution":{} + "+2 culture from each wonder":{} + "Universal Suffrage":{} + "+1 production per 5 population":{} + "Civil Society":{} + "-50% food consumption by specialists":{} + "Free Speech":{} + "+1 culture for every 2 citizens":{} + "Democracy":{} + "Specialists produce half normal unhappiness":{} + "Freedom Complete":{} + "Tile yield from great improvement +100%, golden ages increase by 50%":{} } diff --git a/android/build.gradle b/android/build.gradle index f4c7a94cd2..3e7f8c29dd 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,8 +21,8 @@ android { applicationId "com.unciv.game" minSdkVersion 14 targetSdkVersion 26 - versionCode 118 - versionName "2.7.6" + versionCode 120 + versionName "2.7.7" } buildTypes { release { diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt index 3f1507c1ec..7beb1b439a 100644 --- a/core/src/com/unciv/UnCivGame.kt +++ b/core/src/com/unciv/UnCivGame.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.Json import com.unciv.logic.GameInfo import com.unciv.logic.GameSaver import com.unciv.models.gamebasics.GameBasics +import com.unciv.ui.utils.ImageGetter import com.unciv.ui.worldscreen.WorldScreen class UnCivGame : Game() { @@ -24,6 +25,7 @@ class UnCivGame : Game() { override fun create() { Current = this + Gdx.input.isCatchBackKey=true GameBasics.run { } // just to initialize settings = GameSaver().getGeneralSettings() if (GameSaver().getSave("Autosave").exists()) { @@ -64,6 +66,12 @@ class UnCivGame : Game() { Gdx.input.inputProcessor = worldScreen.stage } + override fun resume() { + ImageGetter.refreshAltas() + worldScreen = WorldScreen() + setWorldScreen() + } + companion object { lateinit var Current: UnCivGame diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt index 729ab81e02..b654535e9a 100644 --- a/core/src/com/unciv/logic/automation/UnitAutomation.kt +++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt @@ -69,22 +69,29 @@ class UnitAutomation{ // if both failed, then... there aren't any reachable tiles. Which is possible. } + fun rankTileForHealing(tileInfo: TileInfo, unit: MapUnit): Int { + val tileOwner = tileInfo.getOwner() + when{ + tileInfo.isCityCenter() -> return 3 + tileOwner!=null && !unit.civInfo.isAtWarWith(tileOwner)-> return 2 + tileOwner==null -> return 1 + else -> return 0 + } + } + fun healUnit(unit:MapUnit) { - val tilesInDistance = unit.getDistanceToTiles().keys + val tilesInDistance = unit.getDistanceToTiles().keys.filter { unit.canMoveTo(it) } val unitTile = unit.getTile() - // Go to friendly tile if within distance - better healing! - val friendlyTile = tilesInDistance.firstOrNull { it.getOwner()?.civName == unit.owner && unit.canMoveTo(it) } - if (unitTile.getOwner()?.civName != unit.owner && friendlyTile != null) { - unit.moveToTile(friendlyTile) - return - } - - // Or at least get out of enemy territory yaknow - val neutralTile = tilesInDistance.firstOrNull { it.getOwner() == null && unit.canMoveTo(it)} - if (unitTile.getOwner()?.civName != unit.owner && unitTile.getOwner() != null && neutralTile != null) { - unit.moveToTile(neutralTile) - return + val tilesByHealingRate = tilesInDistance.groupBy { rankTileForHealing(it,unit) } + if(tilesByHealingRate.isEmpty()) return + val bestTilesForHealing = tilesByHealingRate.maxBy { it.key }!!.value + // within the tiles with best healing rate, we'll prefer one which has defensive bonuses + val bestTileForHealing = bestTilesForHealing.maxBy { it.getDefensiveBonus() }!! + if(unitTile!=bestTileForHealing && rankTileForHealing(bestTileForHealing,unit)>rankTileForHealing(unitTile,unit)) + unit.moveToTile(bestTileForHealing) + if(unit.currentMovement>0 && !unit.hasUnique("No defensive terrain bonus") && !unit.isFortified() ){ + unit.action="Fortify 0" } } @@ -112,7 +119,6 @@ class UnitAutomation{ val tilesToAttackFrom = distanceToTiles.filter { unit.currentMovement - it.value > 0.1 } .map { it.key } .filter { unit.canMoveTo(it) || it==unit.getTile() } - for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there val tilesInAttackRange = if (unit.hasUnique("Indirect fire")) reachableTile.getTilesInDistance(rangeOfAttack) else reachableTile.getViewableTiles(rangeOfAttack) diff --git a/core/src/com/unciv/logic/city/CityConstructions.kt b/core/src/com/unciv/logic/city/CityConstructions.kt index 2688746fe2..bdeac52e5d 100644 --- a/core/src/com/unciv/logic/city/CityConstructions.kt +++ b/core/src/com/unciv/logic/city/CityConstructions.kt @@ -44,14 +44,14 @@ class CityConstructions { fun getCityProductionTextForCityButton(): String { var result = currentConstruction.tr() - if (SpecialConstruction.getSpecialConstructions().none { it.name==result }) + if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstruction }) result += "\r\n" + turnsToConstruction(currentConstruction) + " {turns}".tr() return result } fun getProductionForTileInfo(): String { var result = currentConstruction.tr() - if (SpecialConstruction.getSpecialConstructions().none { it.name==result }) + if (SpecialConstruction.getSpecialConstructions().none { it.name==currentConstruction }) result += "\r\n{in} ".tr() + turnsToConstruction(currentConstruction) + " {turns}".tr() return result } diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index 693b2a5891..a689c8503f 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -43,6 +43,9 @@ class CityExpansionManager { cityInfo.tiles.remove(tileInfo.position) cityInfo.tiles.add(tileInfo.position) + for(unit in tileInfo.getUnits()) + if(!unit.civInfo.canEnterTiles(cityInfo.civInfo)) + unit.movementAlgs().teleportToClosestMoveableTile() } fun getNewTile(): TileInfo? { diff --git a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt index 8471314e56..f3f25fcfc2 100644 --- a/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt +++ b/core/src/com/unciv/logic/map/UnitMovementAlgorithms.kt @@ -1,7 +1,6 @@ package com.unciv.logic.map import com.badlogic.gdx.math.Vector2 -import com.unciv.models.gamebasics.unit.UnitType class UnitMovementAlgorithms(val unit:MapUnit) { val tileMap = unit.getTile().tileMap @@ -185,9 +184,7 @@ class UnitMovementAlgorithms(val unit:MapUnit) { .firstOrNull{unit.canMoveTo(it)} } unit.removeFromTile() // we "teleport" them away - if(unit.getBaseUnit().unitType==UnitType.Civilian) - allowedTile.civilianUnit=unit - else allowedTile.militaryUnit=unit + unit.putInTile(allowedTile) } } \ No newline at end of file diff --git a/core/src/com/unciv/models/gamebasics/Policy.kt b/core/src/com/unciv/models/gamebasics/Policy.kt index 2130b3de06..92c722db6c 100644 --- a/core/src/com/unciv/models/gamebasics/Policy.kt +++ b/core/src/com/unciv/models/gamebasics/Policy.kt @@ -4,7 +4,7 @@ import com.unciv.models.stats.INamed open class Policy : INamed { override lateinit var name: String - var description: String? = null + lateinit var description: String var branch: String? = null var row: Int = 0 var column: Int = 0 diff --git a/core/src/com/unciv/ui/CivilopediaScreen.kt b/core/src/com/unciv/ui/CivilopediaScreen.kt index 71d1d4c194..c3e8a5772e 100644 --- a/core/src/com/unciv/ui/CivilopediaScreen.kt +++ b/core/src/com/unciv/ui/CivilopediaScreen.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.ui.List import com.badlogic.gdx.utils.Array +import com.unciv.UnCivGame import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.ICivilopedia import com.unciv.ui.utils.CameraStageBaseScreen @@ -12,6 +13,7 @@ import java.util.* class CivilopediaScreen : CameraStageBaseScreen() { init { + onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } val buttonTable = Table() buttonTable.pad(15f) val entryTable = Table() diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt index 6963621b69..ede1be2cc6 100644 --- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt +++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt @@ -16,6 +16,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){ val civInfo = UnCivGame.Current.gameInfo.getPlayerCivilization() init { + onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } val topTable = Table().apply { defaults().pad(10f) } val centerTable=Table().apply { defaults().pad(20f) } diff --git a/core/src/com/unciv/ui/cityscreen/CityScreen.kt b/core/src/com/unciv/ui/cityscreen/CityScreen.kt index f1791187df..e1e4230be3 100644 --- a/core/src/com/unciv/ui/cityscreen/CityScreen.kt +++ b/core/src/com/unciv/ui/cityscreen/CityScreen.kt @@ -6,6 +6,7 @@ import com.badlogic.gdx.scenes.scene2d.InputEvent import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener import com.badlogic.gdx.utils.Align +import com.unciv.UnCivGame import com.unciv.logic.HexMath import com.unciv.logic.city.CityInfo import com.unciv.logic.map.TileInfo @@ -25,6 +26,7 @@ class CityScreen(internal val city: CityInfo) : CameraStageBaseScreen() { private var tileGroups = ArrayList() init { + onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } addTiles() stage.addActor(tileTable) diff --git a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt index b4f6d89345..b885afce2b 100644 --- a/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/ConstructionPickerScreen.kt @@ -33,6 +33,10 @@ class ConstructionPickerScreen(val city: CityInfo) : PickerScreen() { game.screen = CityScreen(this@ConstructionPickerScreen.city) dispose() } + onBackButtonClicked { + game.screen = CityScreen(this@ConstructionPickerScreen.city) + dispose() + } rightSideButton.setText("Pick construction".tr()) rightSideButton.addClickListener { diff --git a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt index d8f742de3d..d6db3e3e83 100644 --- a/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PickerScreen.kt @@ -16,7 +16,6 @@ open class PickerScreen : CameraStageBaseScreen() { internal var splitPane: SplitPane init { - closeButton.addClickListener { game.setWorldScreen() dispose() diff --git a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt index b8e47249dc..4e476a0a19 100644 --- a/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PolicyPickerScreen.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button import com.badlogic.gdx.scenes.scene2d.ui.Table import com.badlogic.gdx.scenes.scene2d.ui.TextButton +import com.unciv.UnCivGame import com.unciv.logic.civilization.CivilizationInfo import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.Policy @@ -15,16 +16,6 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( private var pickedPolicy: Policy? = null init { - - - // Proof-of-concept for font generation -// val generator = FreeTypeFontGenerator(Gdx.files.internal("skin/Esteban-Regular.ttf")) -// val parameter = FreeTypeFontParameter() -// parameter.size = 25 -// val font12 = generator.generateFont(parameter) // font size 12 pixels -// generator.dispose() // don't forget to dispose to avoid memory leaks! -// rightSideButton.style.font = font12 - val policies = civInfo.policies displayTutorials("PolicyPickerScreen") @@ -34,6 +25,7 @@ class PolicyPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen( rightSideButton.setText("Adopt free policy") closeButton.disable() } + else onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } rightSideButton.addClickListener { civInfo.policies.adopt(pickedPolicy!!) diff --git a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt index fd0775fa78..cd900b6822 100644 --- a/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/PromotionPickerScreen.kt @@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Button import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.VerticalGroup +import com.unciv.UnCivGame import com.unciv.logic.map.MapUnit import com.unciv.models.gamebasics.GameBasics import com.unciv.models.gamebasics.unit.Promotion @@ -14,6 +15,7 @@ class PromotionPickerScreen(mapUnit: MapUnit) : PickerScreen() { init { + onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } rightSideButton.setText("Pick promotion") rightSideButton.addClickListener { mapUnit.promotions.addPromotion(selectedPromotion!!.name) diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt index c23c678d19..0a4ae045b0 100644 --- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt +++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt @@ -3,6 +3,7 @@ package com.unciv.ui.pickerscreens import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.scenes.scene2d.ui.Label import com.badlogic.gdx.scenes.scene2d.ui.TextButton +import com.unciv.UnCivGame import com.unciv.logic.civilization.CivilizationInfo import com.unciv.logic.civilization.TechManager import com.unciv.models.gamebasics.GameBasics @@ -32,6 +33,8 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo) : PickerScreen() } init { + onBackButtonClicked { UnCivGame.Current.setWorldScreen(); dispose() } + techsToResearch = ArrayList(civTech.techsToResearch) val columns = 17 diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt index ad32f2d581..6cb561e69d 100644 --- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt +++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt @@ -1,6 +1,7 @@ package com.unciv.ui.utils import com.badlogic.gdx.Gdx +import com.badlogic.gdx.Input import com.badlogic.gdx.Screen import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.GL20 @@ -9,10 +10,7 @@ import com.badlogic.gdx.graphics.g2d.Batch import com.badlogic.gdx.graphics.g2d.BitmapFont import com.badlogic.gdx.graphics.g2d.SpriteBatch import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator -import com.badlogic.gdx.scenes.scene2d.Actor -import com.badlogic.gdx.scenes.scene2d.InputEvent -import com.badlogic.gdx.scenes.scene2d.Stage -import com.badlogic.gdx.scenes.scene2d.Touchable +import com.badlogic.gdx.scenes.scene2d.* import com.badlogic.gdx.scenes.scene2d.ui.* import com.badlogic.gdx.scenes.scene2d.utils.ClickListener import com.badlogic.gdx.utils.Align @@ -114,6 +112,8 @@ open class CameraStageBaseScreen : Screen { stage.addActor(tutorialTable) } + + companion object { var skin = Skin(Gdx.files.internal("skin/flat-earth-ui.json")) .apply { @@ -126,6 +126,18 @@ open class CameraStageBaseScreen : Screen { internal var batch: Batch = SpriteBatch() } + fun onBackButtonClicked(action:()->Unit){ + stage.addListener(object : InputListener(){ + override fun keyDown(event: InputEvent?, keycode: Int): Boolean { + if(keycode == Input.Keys.BACK){ + action() + return true + } + return false + } + }) + } + } diff --git a/core/src/com/unciv/ui/utils/ImageGetter.kt b/core/src/com/unciv/ui/utils/ImageGetter.kt index d611caaa8a..8e81694186 100644 --- a/core/src/com/unciv/ui/utils/ImageGetter.kt +++ b/core/src/com/unciv/ui/utils/ImageGetter.kt @@ -3,7 +3,6 @@ package com.unciv.ui.utils import com.badlogic.gdx.graphics.Color import com.badlogic.gdx.graphics.g2d.TextureAtlas import com.badlogic.gdx.graphics.g2d.TextureRegion -import com.badlogic.gdx.scenes.scene2d.Group import com.badlogic.gdx.scenes.scene2d.ui.Image import com.badlogic.gdx.scenes.scene2d.utils.Drawable import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable @@ -16,7 +15,7 @@ object ImageGetter { // always have to switch between like 170 different textures. // So, we now use TexturePacker in the DesktopLauncher class to pack all the different images into single images, // and the atlas is what tells us what was packed where. - val atlas = TextureAtlas("Images/game.atlas") + var atlas = TextureAtlas("game.atlas") init{ } @@ -43,27 +42,12 @@ object ImageGetter { return getTextureRegion(WhiteDot) } } - class IconGroup(statName:String): Group() { - init{ - val circleSize = 20f - val statSize = 17f - setSize(circleSize ,circleSize) -// addActor(ImageGetter.getImage("OtherIcons/Circle") -// .apply { setSize(circleSize,circleSize )} ) - val iconImage = ImageGetter.getImage("StatIcons/20x" + statName + "5.png") - .apply { setSize(statSize,statSize); center(this@IconGroup)} - if(statName=="Population") iconImage.color= Color.GREEN.cpy().lerp(Color.BLACK,0.5f) - addActor(iconImage) - } - } fun getStatIcon(statName: String): Image { return ImageGetter.getImage("StatIcons/20x" + statName + "5.png") .apply { setSize(20f,20f)} -// return IconGroup(name) } - fun getUnitIcon(unitName:String):Image{ return getImage("UnitIcons/$unitName.png") } @@ -81,4 +65,8 @@ object ImageGetter { fun getBackground(color:Color): Drawable { return getDrawable(WhiteDot).tint(color) } + + fun refreshAltas() { + atlas = TextureAtlas("game.atlas") + } } diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index d0db355f9a..7bcd8606ad 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -183,6 +183,7 @@ class WorldScreen : CameraStageBaseScreen() { catch (ex:Exception){ UnCivGame.Current.settings.hasCrashedRecently=true UnCivGame.Current.settings.save() + throw ex } // If we put this BEFORE the save game, then we try to save the game... @@ -234,8 +235,5 @@ class WorldScreen : CameraStageBaseScreen() { super.render(delta) } -// override fun resume() { -// resize(Gdx.graphics.width,Gdx.graphics.height) -// } } diff --git a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java index e7152adf95..41be611e49 100644 --- a/desktop/src/com/unciv/game/desktop/DesktopLauncher.java +++ b/desktop/src/com/unciv/game/desktop/DesktopLauncher.java @@ -17,7 +17,7 @@ class DesktopLauncher { // This is so they don't look all pixelated settings.filterMag = Texture.TextureFilter.MipMapLinearLinear; settings.filterMin = Texture.TextureFilter.MipMapLinearLinear; - TexturePacker.process(settings, "images", "images", "game"); + TexturePacker.process(settings, "../images", ".", "game"); LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); new LwjglApplication(new UnCivGame(), config);