Merge pull request #334 from ninjatao/add_battleship

Add Battleship. Enabled Electronics for battleship.

Credits.md

@@ -62,6 +62,8 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Helmet](https://thenounproject.com/term/helmet/25216/) By Daniel Turner for Great War Infantry
 * [Tank](https://thenounproject.com/term/tank/1287510/) By corpus delicti for Landship
 * [Warship](https://thenounproject.com/term/warship/1597474/) By zidney for Destroyer
+* [Battleship](https://thenounproject.com/search/?q=battleship&i=1986807) By Vitaliy Gorbachev, KZ for Battleship
+* [Submarine](https://thenounproject.com/search/?q=submarine&i=589519) By Hea Poh Lin, MY
 
 ### Great People
 
@@ -345,6 +347,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [Plastic](https://thenounproject.com/term/plastic/478826/) By Yu luck
 * [Microphone](https://thenounproject.com/term/microphone/470266/) By Viktor Vorobyev for Mass Media
 * [Flight](https://thenounproject.com/term/flight/1014306/) By Genius Icons
+* [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL
 
 ### Information
 * [Pill](https://thenounproject.com/term/pill/780458/) By Alex Arseneau for Pharmaceuticals
@@ -357,6 +360,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 ### Future
 * [Nanoparticles](https://thenounproject.com/term/nanoparticles/822286/) By Gyan Lakhwani for Nanotechnology
 * [Satellite](https://thenounproject.com/term/satellite/1466641/) By Ben Davis for Satellites
+* [Electronics](https://thenounproject.com/search/?q=Electronics&i=1565843) By Cuby Design
 * [Atom](https://thenounproject.com/term/atom/1586852/) By Kelsey Armstrong for Particle Physics
 * [Information Technology](https://thenounproject.com/term/information-technology/1927668/) By Vectors Markeet for Future Tech
 

android/assets/jsons/Techs.json

@@ -356,13 +356,12 @@
 		techCost: 4505,
 		buildingCost:500,
 		wonderCost:1250,
-		techs:[/*
+		techs:[
 			{
 				name:"Refrigeration",
-				row:4,
-				prerequisites:["Electricity"],
-				baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of offshore platforms and submarines"
-			},*/
+				row:3,
+				prerequisites:["Biology", "Electricity"], //to do: offshore platform should need this
+			},
 			{
 				name:"Replacable Parts",
 				row:4,
@@ -391,13 +390,12 @@
 				name:"Plastics",
 				row:3,
 				prerequisites:["Biology","Replacable Parts"]
-			},/*
+			},
 			{
 				name:"Electronics",
 				row:5,
-				prerequisites:["Radio"],
-				baseDescription:"Contributes only war-relatied things - on hold until AI is introduced - todo"
-			},*/
+				prerequisites:["Replacable Parts", "Flight"],
+			},
 			{
 				name:"Mass Media",
 				row:6,

android/assets/jsons/Units.json

@@ -368,6 +368,8 @@
 		cost: 185,
 		requiredResource:"Iron",
 		requiredTech:"Navigation",
+		obsoleteTech:"Electronics",
+		upgradesTo:"Battleship",
 		hurryCostModifier:20
 	},
 	{
@@ -465,7 +467,31 @@
 		strength:55,
 		cost: 375,
 		requiredTech:"Combustion",
-		uniques:[], // todo: add interception and bonus vs submarines once we have air and submarine units
+		uniques:["Can attack submarines"], // todo: add interception and bonus vs submarines once we have air and submarine units
+		hurryCostModifier:20
+	},
+	{
+		name: "Battleship",
+		unitType: "WaterRanged",
+		movement: 5,
+		strength: 55,
+		rangedStrength: 55,
+		range: 3,
+		cost: 375,
+		requiredResource:"Oil",
+		requiredTech:"Electronics",
+		uniques:["Indirect Fire", "Bonus vs City 30%"],
+		hurryCostModifier:20
+	},
+	{
+		name: "Submarine",
+		unitType: "WaterRanged",
+		movement: 5,
+		strength: 35,
+		rangedStrength: 60,
+		cost: 325,
+		requiredTech:"Refrigeration",
+		uniques:["Bonus as Attacker 75%", "Invisible to others", "Can Only Attack Water", "Can attack submarines"], //to do: 3 uniques
 		hurryCostModifier:20
 	},
 	{

core/src/com/unciv/logic/automation/UnitAutomation.kt

@@ -118,6 +118,12 @@ class UnitAutomation{
         if(tileCombatant==null) return false
         if(tileCombatant.getCivilization()==unit.civInfo ) return false
         if(!unit.civInfo.isAtWarWith(tileCombatant.getCivilization())) return false
+
+        //only submarine and destroyer can attack submarine
+        if (tileCombatant.isInvisible()
+                && (!unit.hasUnique("Can attack submarines") || !unit.civInfo.viewableInvisibleUnitsTiles.map { it.position }.contains(tile.position))){
+            return false
+        }
         return true
     }
 

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

@@ -88,6 +88,12 @@ class BattleDamage{
                     else modifiers[text] = BDM.modificationAmount
                 }
             }
+
+            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
+            }
         }
 
         if (attacker.isMelee()) {

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

@@ -12,6 +12,7 @@ class CityCombatant(val city: CityInfo) : ICombatant {
     override fun getTile(): TileInfo = city.getCenterTile()
     override fun getName(): String = city.name
     override fun isDefeated(): Boolean = city.health==1
+    override fun isInvisible(): Boolean = false
 
     override fun takeDamage(damage: Int) {
         city.health -= damage

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

@@ -1,6 +1,7 @@
 package com.unciv.logic.battle
 
 import com.unciv.logic.civilization.CivilizationInfo
+import com.unciv.logic.map.MapUnit
 import com.unciv.logic.map.TileInfo
 import com.unciv.models.gamebasics.unit.UnitType
 
@@ -14,6 +15,7 @@ interface ICombatant{
     fun isDefeated():Boolean
     fun getCivilization(): CivilizationInfo
     fun getTile(): TileInfo
+    fun isInvisible(): Boolean
 
     fun isMelee(): Boolean {
         return this.getUnitType().isMelee()

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

@@ -11,6 +11,7 @@ class MapUnitCombatant(val unit: MapUnit) : ICombatant {
     override fun getTile(): TileInfo = unit.getTile()
     override fun getName(): String = unit.name
     override fun isDefeated(): Boolean = unit.health <= 0
+    override fun isInvisible(): Boolean = unit.isInvisible()
 
     override fun takeDamage(damage: Int) {
         unit.health -= damage

core/src/com/unciv/logic/civilization/CivilizationInfo.kt

@@ -33,6 +33,7 @@ class CivilizationInfo {
      */
     @Transient private var units=ArrayList<MapUnit>()
     @Transient var viewableTiles = HashSet<TileInfo>()
+    @Transient var viewableInvisibleUnitsTiles = HashSet<TileInfo>()
 
     var gold = 0
     var happiness = 15
@@ -228,6 +229,9 @@ class CivilizationInfo {
         newViewableTiles.addAll(getCivUnits().flatMap { it.getViewableTiles()})
         viewableTiles = newViewableTiles // to avoid concurrent modification problems
 
+        val newViewableInvisibleTiles = HashSet<TileInfo>()
+        newViewableInvisibleTiles.addAll(getCivUnits().filter {it.hasUnique("Can attack submarines")}.flatMap {it.getViewableTiles()})
+        viewableInvisibleUnitsTiles = newViewableInvisibleTiles
         // updating the viewable tiles also affects the explored tiles, obvs
 
         val newExploredTiles = HashSet<Vector2>(exploredTiles)

core/src/com/unciv/logic/map/MapUnit.kt

@@ -178,6 +178,12 @@ class MapUnit {
         return currentTile.baseTerrain=="Ocean"||currentTile.baseTerrain=="Coast"
     }
 
+    fun isInvisible(): Boolean {
+        if(hasUnique("Invisible to others"))
+            return true
+        return false
+    }
+
     fun getEmbarkedMovement(): Int {
         var movement=2
         movement += civInfo.tech.getUniques().count { it == "Increases embarked movement +1" }

core/src/com/unciv/logic/map/TileInfo.kt

@@ -281,5 +281,14 @@ open class TileInfo {
         turnsToImprovement = improvement.getTurnsToBuild(civInfo)
     }
 
+    fun hasEnemySubmarine(): Boolean {
+        val unitsInTile = getUnits()
+        if (unitsInTile.isEmpty()) return false
+        if (!unitsInTile.first().civInfo.isPlayerCivilization() &&
+                unitsInTile.firstOrNull {it.isInvisible() == true} != null) {
+            return true
+        }
+        return false
+    }
     //endregion
 }

core/src/com/unciv/ui/cityscreen/CityTileGroup.kt

@@ -23,8 +23,10 @@ class CityTileGroup(private val city: CityInfo, tileInfo: TileInfo) : TileGroup(
     fun update() {
         val canSeeTile = UnCivGame.Current.viewEntireMapForDebug
                 || city.civInfo.viewableTiles.contains(tileInfo)
-
-        super.update(canSeeTile,true)
+        val showSubmarine = UnCivGame.Current.viewEntireMapForDebug
+                || city.civInfo.viewableInvisibleUnitsTiles.contains(tileInfo)
+                || (!tileInfo.hasEnemySubmarine())
+        super.update(canSeeTile,true, showSubmarine)
 
         updatePopulationImage()
         if (improvementImage != null) improvementImage!!.setColor(1f, 1f, 1f, 0.5f)

core/src/com/unciv/ui/tilegroups/TileGroup.kt

@@ -133,7 +133,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
     }
 
 
-    open fun update(isViewable: Boolean, showResourcesAndImprovements:Boolean) {
+    open fun update(isViewable: Boolean, showResourcesAndImprovements:Boolean, showSubmarine: Boolean) {
         hideCircle()
         if (!UnCivGame.Current.viewEntireMapForDebug
                 && !tileInfo.tileMap.gameInfo.getPlayerCivilization().exploredTiles.contains(tileInfo.position)) {
@@ -150,7 +150,7 @@ open class TileGroup(var tileInfo: TileInfo) : Group() {
 
 
         civilianUnitImage = newUnitImage(tileInfo.civilianUnit, civilianUnitImage, isViewable, -20f)
-        militaryUnitImage = newUnitImage(tileInfo.militaryUnit, militaryUnitImage, isViewable, 20f)
+        militaryUnitImage = newUnitImage(tileInfo.militaryUnit, militaryUnitImage, isViewable && showSubmarine, 20f)
 
         updateRoadImages()
         updateBorderImages()

core/src/com/unciv/ui/tilegroups/WorldTileGroup.kt

@@ -23,7 +23,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
     }
 
 
-    fun update(isViewable: Boolean) {
+    fun update(isViewable: Boolean, showSubmarine: Boolean) {
         val city = tileInfo.getCity()
 
         removePopulationIcon()
@@ -36,7 +36,7 @@ class WorldTileGroup(tileInfo: TileInfo) : TileGroup(tileInfo) {
             updateCityButton(city, isViewable || UnCivGame.Current.viewEntireMapForDebug) // needs to be before the update so the units will be above the city button
 
         super.update(isViewable || UnCivGame.Current.viewEntireMapForDebug,
-                UnCivGame.Current.settings.showResourcesAndImprovements)
+                UnCivGame.Current.settings.showResourcesAndImprovements, showSubmarine)
 
         yieldGroup.isVisible = !UnCivGame.Current.settings.showResourcesAndImprovements
         if (yieldGroup.isVisible)

core/src/com/unciv/ui/worldscreen/TileMapHolder.kt

@@ -180,6 +180,7 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
 
     internal fun updateTiles(civInfo: CivilizationInfo) {
         val playerViewableTilePositions = civInfo.viewableTiles.map { it.position }.toHashSet()
+        val playerViewableInvisibleUnitsTilePositions = civInfo.viewableInvisibleUnitsTiles.map { it.position }.toHashSet()
 
         cityButtonOverlays.forEach{it.remove()}
         cityButtonOverlays.clear()
@@ -187,9 +188,16 @@ class TileMapHolder(internal val worldScreen: WorldScreen, internal val tileMap:
         for (tileGroup in tileGroups.values){
             val canSeeTile = UnCivGame.Current.viewEntireMapForDebug
                     || playerViewableTilePositions.contains(tileGroup.tileInfo.position)
-            tileGroup.update(canSeeTile)
+
+            val showSubmarine = UnCivGame.Current.viewEntireMapForDebug
+                    || playerViewableInvisibleUnitsTilePositions.contains(tileGroup.tileInfo.position)
+                    || (!tileGroup.tileInfo.hasEnemySubmarine())
+            tileGroup.update(canSeeTile, showSubmarine)
+
             val unitsInTile = tileGroup.tileInfo.getUnits()
-            if(canSeeTile && unitsInTile.isNotEmpty() && !unitsInTile.first().civInfo.isPlayerCivilization())
+            val canSeeEnemy = unitsInTile.isNotEmpty() && !unitsInTile.first().civInfo.isPlayerCivilization()
+                    && (showSubmarine || unitsInTile.firstOrNull {!it.isInvisible()}!=null)
+            if(canSeeTile && canSeeEnemy)
                 tileGroup.showCircle(Color.RED) // Display ALL viewable enemies with a red circle so that users don't need to go "hunting" for enemy units
         }