Added Honor and Autocracy policies

android/assets/game.atlas

@@ -781,174 +781,244 @@ PolicyIcons/Democracy
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Entrepreneurship
+PolicyIcons/Dicipline
   rotate: false
   xy: 418, 2
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Free Religion
+PolicyIcons/Entrepreneurship
   rotate: false
   xy: 470, 2
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Free Speech
+PolicyIcons/Facism
   rotate: false
   xy: 1836, 1588
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Free Thought
+PolicyIcons/Free Religion
   rotate: false
   xy: 1836, 1536
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Humanism
+PolicyIcons/Free Speech
   rotate: false
   xy: 1762, 1486
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Landed Elite
+PolicyIcons/Free Thought
   rotate: false
   xy: 918, 874
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Legalism
+PolicyIcons/Humanism
   rotate: false
   xy: 1020, 976
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Mandate Of Heaven
+PolicyIcons/Landed Elite
   rotate: false
   xy: 1122, 1078
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Mercantilism
+PolicyIcons/Legalism
   rotate: false
   xy: 1224, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Meritocracy
+PolicyIcons/Mandate Of Heaven
   rotate: false
   xy: 612, 466
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Monarchy
+PolicyIcons/Mercantilism
   rotate: false
   xy: 714, 568
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Oligarchy
+PolicyIcons/Meritocracy
   rotate: false
   xy: 816, 676
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Organized Religion
+PolicyIcons/Militarism
   rotate: false
   xy: 1762, 1434
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Patronage
+PolicyIcons/Military Caste
   rotate: false
   xy: 918, 822
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Protectionism
+PolicyIcons/Military Tradition
   rotate: false
   xy: 1276, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Reformation
+PolicyIcons/Monarchy
   rotate: false
   xy: 612, 414
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Representation
+PolicyIcons/Oligarchy
   rotate: false
   xy: 816, 624
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Republic
+PolicyIcons/Organized Religion
   rotate: false
   xy: 1762, 1382
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Scientific Revolution
+PolicyIcons/Patronage
   rotate: false
   xy: 918, 770
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Secularism
+PolicyIcons/Police State
   rotate: false
   xy: 1328, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Sovereignty
+PolicyIcons/Populism
   rotate: false
   xy: 612, 362
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Theocracy
+PolicyIcons/Professional Army
   rotate: false
   xy: 1762, 1330
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Trade Unions
+PolicyIcons/Protectionism
   rotate: false
   xy: 1380, 1180
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
-PolicyIcons/Universal Suffrage
+PolicyIcons/Reformation
   rotate: false
   xy: 612, 310
   size: 50, 50
   orig: 50, 50
   offset: 0, 0
   index: -1
+PolicyIcons/Representation
+  rotate: false
+  xy: 1762, 1278
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Republic
+  rotate: false
+  xy: 1432, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Scientific Revolution
+  rotate: false
+  xy: 612, 258
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Secularism
+  rotate: false
+  xy: 1484, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Sovereignty
+  rotate: false
+  xy: 612, 206
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Theocracy
+  rotate: false
+  xy: 1536, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Total War
+  rotate: false
+  xy: 1588, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Trade Unions
+  rotate: false
+  xy: 1640, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Universal Suffrage
+  rotate: false
+  xy: 1692, 1180
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
+PolicyIcons/Warrior Code
+  rotate: false
+  xy: 970, 874
+  size: 50, 50
+  orig: 50, 50
+  offset: 0, 0
+  index: -1
 ResourceIcons/Aluminum
   rotate: false
   xy: 204, 1018
@@ -1483,91 +1553,91 @@ UnitIcons/Worker
   index: -1
 UnitPromotionIcons/Accuracy_III_(Civ5)
   rotate: false
-  xy: 1814, 1516
+  xy: 612, 184
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_II_(Civ5)
   rotate: false
-  xy: 2007, 2024
+  xy: 634, 184
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Accuracy_I_(Civ5)
   rotate: false
-  xy: 306, 1200
+  xy: 1814, 1516
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_III_(Civ5)
   rotate: false
-  xy: 390, 1488
+  xy: 2007, 2024
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_II_(Civ5)
   rotate: false
-  xy: 256, 180
+  xy: 306, 1200
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Barrage_I_(Civ5)
   rotate: false
-  xy: 1807, 1770
+  xy: 390, 1488
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Blitz_(Civ5)
   rotate: false
-  xy: 522, 32
+  xy: 256, 180
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Charge_(Civ5)
   rotate: false
-  xy: 436, 1182
+  xy: 1807, 1770
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_II_(Civ5)
   rotate: false
-  xy: 510, 162
+  xy: 522, 32
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Cover_I_(Civ5)
   rotate: false
-  xy: 568, 60
+  xy: 436, 1182
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_III_(Civ5)
   rotate: false
-  xy: 538, 1210
+  xy: 510, 162
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_II_(Civ5)
   rotate: false
-  xy: 970, 904
+  xy: 568, 60
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Drill_I_(Civ5)
   rotate: false
-  xy: 1020, 954
+  xy: 538, 1210
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
@@ -1637,21 +1707,21 @@ UnitPromotionIcons/Scouting_II_(Civ5)
   index: -1
 UnitPromotionIcons/Scouting_I_(Civ5)
   rotate: false
-  xy: 1762, 1308
+  xy: 1762, 1256
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Sentry_(Civ5)
   rotate: false
-  xy: 1432, 1210
+  xy: 970, 852
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Shock_III_(Civ5)
   rotate: false
-  xy: 612, 288
+  xy: 1020, 954
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
@@ -1665,21 +1735,21 @@ UnitPromotionIcons/Shock_II_(Civ5)
   index: -1
 UnitPromotionIcons/Shock_I_(Civ5)
   rotate: false
-  xy: 1814, 1494
+  xy: 656, 184
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Siege_(Civ5)
   rotate: false
-  xy: 1836, 1514
+  xy: 1814, 1494
   size: 20, 20
   orig: 20, 20
   offset: 0, 0
   index: -1
 UnitPromotionIcons/Volley_(Civ5)
   rotate: false
-  xy: 2007, 2002
+  xy: 1836, 1514
   size: 20, 20
   orig: 20, 20
   offset: 0, 0

android/assets/jsons/Policies.json

@@ -41,7 +41,8 @@
 				description:"+15% growth and +2 food in all cities"
 			}
 		]
-	},{
+	},
+	{
 		name:"Liberty",
 		era:"Ancient",
 		description:"+1 culture in evey city",
@@ -84,6 +85,50 @@
 				description:"Free Great Person of choice near capital"
 			}
 		]
+	},
+	{
+		name:"Honor",
+		era:"Ancient",
+		description:"+25% bonus vs Barbarians",
+		policies:[
+			{
+				name:"Warrior Code",
+				description:"+20% production when training melee units",
+				row:1,
+				column:2
+			},
+			{
+				name:"Dicipline",
+				description:"+15% combat strength for melee units which have another military unit in an adjacent tile",
+				row:1,
+				column:4
+			},
+			{
+				name:"Military Tradition",
+				description:"Military units gain 50% more Experience from combat", // todo from here
+				requires:["Warrior Code"],
+				row:2,
+				column:2
+			},
+			{
+				name:"Military Caste",
+				description:"Each city with a garrison increases happiness by 1 and culture by 2",
+				requires:["Dicipline"],
+				row:2,
+				column:4
+			},
+			{
+				name:"Professional Army",
+				description:"Gold cost of upgrading military units reduced by 50%",
+				requires:["Military Caste"],
+				row:3,
+				column:4
+			},
+			{
+				name:"Honor Complete",
+				description:"Gain gold for each unit killed" 
+			}
+		]
 	},{
 		name:"Piety",
 		era:"Classical",
@@ -256,5 +301,48 @@
 				description:"Tile yield from great improvement +100%, golden ages increase by 50%"
 			}
 		]
-	},
+	},{
+		name:"Autocracy",
+		era:"Industrial",
+		description:"-33% unit upkeep costs", // todo!
+		policies:[
+			{
+				name:"Populism",
+				description:"Wounded military units deal +25% damage", // todo - this is different than +25% strength...
+				row:1,
+				column:1
+			},
+			{
+				name:"Militarism",
+				description:"Gold cost of purchasing units -33%",
+				row:1,
+				column:5
+			},
+			{
+				name:"Facism",
+				description:"Quantity of strategic resources produced by the empire increased by 100%",
+				requires:["Populism","Militarism"],
+				row:2,
+				column:3
+			},
+			{
+				name:"Police State",
+				description:"Captured cities retain their previous borders",
+				requires:["Militarism"],
+				row:2,
+				column:5
+			},
+			{
+				name:"Total War",
+				description:"+15% production when building military units and new military units start with 15 Experience",
+				requires:["Police State","Facism"],
+				row:3,
+				column:4
+			},
+			{
+				name:"Autocracy Complete",
+				description:"+1 happiness from each Walls, Castle and Arsenal"
+			}
+		]
+	}
 ]

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 134
-        versionName "2.8.2"
+        versionCode 135
+        versionName "2.8.3"
     }
     buildTypes {
         release {