Merge pull request #391 from ninjatao/submarine

Submarine, resolves #388

android/assets/game.atlas

@@ -697,20 +697,6 @@ ImprovementIcons/Quarry
   orig: 100, 100
   offset: 0, 0
   index: -1
-ImprovementIcons/Railroad
-  rotate: false
-  xy: 1734, 722
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
-OtherIcons/Railroad
-  rotate: false
-  xy: 1734, 722
-  size: 100, 100
-  orig: 100, 100
-  offset: 0, 0
-  index: -1
 ImprovementIcons/Road
   rotate: false
   xy: 347, 407
@@ -788,6 +774,20 @@ OtherIcons/Pentagon
   orig: 100, 100
   offset: 0, 0
   index: -1
+OtherIcons/Railroad
+  rotate: false
+  xy: 1734, 722
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
+ImprovementIcons/Railroad
+  rotate: false
+  xy: 1734, 722
+  size: 100, 100
+  orig: 100, 100
+  offset: 0, 0
+  index: -1
 OtherIcons/Shield
   rotate: false
   xy: 692, 622
@@ -2608,3 +2608,24 @@ UnitPromotionIcons/Volley_(Civ5)
   orig: 20, 20
   offset: 0, 0
   index: -1
+UnitPromotionIcons/Wolfpack_III_(Civ5)
+  rotate: false
+  xy: 380, 5
+  size: 20, 20
+  orig: 20, 20
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Wolfpack_II_(Civ5)
+  rotate: false
+  xy: 402, 27
+  size: 20, 20
+  orig: 20, 20
+  offset: 0, 0
+  index: -1
+UnitPromotionIcons/Wolfpack_I_(Civ5)
+  rotate: false
+  xy: 1983, 532
+  size: 20, 20
+  orig: 20, 20
+  offset: 0, 0
+  index: -1

android/assets/jsons/UnitPromotions.json

@@ -119,9 +119,9 @@
 	{
 		name:"Mobility",
 		prerequisites:["Shock II","Drill II","Targeting I",
-			"Bombardment I","Boarding Party I", "Coastal Raider I"],
+			"Bombardment I","Boarding Party I", "Coastal Raider I", "Wolfpack I"],
 		effect:"+1 Movement",
-		unitTypes:["Mounted","WaterMelee","WaterRanged","Armor"]
+		unitTypes:["Mounted","WaterMelee","WaterRanged","Armor","WaterSubmarine"]
 	}
 	
 	{
@@ -147,9 +147,9 @@
 	
 	{
 		name:"Range",
-		prerequisites:["Accuracy III","Barrage III","Targeting II","Bombardment II"],
+		prerequisites:["Accuracy III","Barrage III","Targeting II","Bombardment II", "Wolfpack II"],
 		effect:"+1 Range",
-		unitTypes:["Ranged","Siege","WaterRanged"]
+		unitTypes:["Ranged","Siege","WaterRanged","WaterSubmarine"]
 	}
 	
 	{
@@ -181,10 +181,10 @@
 	
 	{
 		name:"Logistics",
-		prerequisites:["Accuracy III","Barrage III","Targeting III",
+		prerequisites:["Accuracy III","Barrage III","Targeting III", "Wolfpack III",
 			"Bombardment III", "Coastal Raider III","Boarding Party III"],
 		effect:"1 additional attack per turn",
-		unitTypes:["Ranged","Siege","WaterMelee","WaterRanged"]
+		unitTypes:["Ranged","Siege","WaterMelee","WaterRanged","WaterSubmarine"]
 	}
 	
 	{
@@ -240,7 +240,6 @@
 		effect:"Bonus vs City 15%",
 		unitTypes:["WaterMelee"]
 	}
-	
 	{
 		name:"Targeting I",
 		effect:"Bonus vs City 15%",
@@ -258,5 +257,21 @@
 		effect:"Bonus vs water units 15%",
 		unitTypes:["WaterRanged"]
 	}
-	
+	{
+		name:"Wolfpack I",
+		effect:"Bonus as Attacker 25%",
+		unitTypes:["WaterSubmarine"]
+	}
+	{
+		name:"Wolfpack II",
+		prerequisites:["Wolfpack I"],
+		effect:"Bonus as Attacker 25%",
+		unitTypes:["WaterSubmarine"]
+	}
+	{
+		name:"Wolfpack III",
+		prerequisites:["Wolfpack II"],
+		effect:"Bonus as Attacker 25%",
+		unitTypes:["WaterSubmarine"]
+	}
 ]

android/assets/jsons/Units.json

@@ -525,7 +525,7 @@
 	},
 	{
 		name: "Submarine",
-		unitType: "WaterRanged",
+		unitType: "WaterSubmarine",
 		movement: 5,
 		strength: 35,
 		rangedStrength: 60,

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -105,7 +105,10 @@ class BattleDamage{
             for (ability in attacker.unit.getUniques()) {
                 val regexResult = Regex("""Bonus as Attacker (\d*)%""").matchEntire(ability) //to do: extend to defender, and penalyy
                 if (regexResult == null) continue
-                modifiers["Attacker Bonus"] = regexResult.groups[1]!!.value.toFloat() / 100
+                val bonus = regexResult.groups[1]!!.value.toFloat() / 100
+                if (modifiers.containsKey("Attacker Bonus"))
+                    modifiers["Attacker Bonus"] =modifiers["Attacker Bonus"]!! + bonus
+                else modifiers["Attacker Bonus"] = bonus
             }
         }
 

core/src/com/unciv/models/gamebasics/unit/UnitType.kt

@@ -11,7 +11,8 @@ enum class UnitType{
     Siege,
     WaterCivilian,
     WaterMelee,
-    WaterRanged;
+    WaterRanged,
+    WaterSubmarine;
 
     fun isMelee(): Boolean {
         return this == Melee
@@ -24,6 +25,7 @@ enum class UnitType{
         return this == Ranged
                 || this == Siege
                 || this == WaterRanged
+                || this == WaterSubmarine
     }
 
     fun isLandUnit(): Boolean {