Add submarine and refrigeration. Submarine is not invisible yet.

This commit is contained in:
Duan Tao 2018-12-12 13:21:34 +08:00
parent 2cfdf13fc8
commit 209eb4c73b
8 changed files with 173 additions and 141 deletions

View File

@ -63,6 +63,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Tank](https://thenounproject.com/term/tank/1287510/) By corpus delicti for Landship * [Tank](https://thenounproject.com/term/tank/1287510/) By corpus delicti for Landship
* [Warship](https://thenounproject.com/term/warship/1597474/) By zidney for Destroyer * [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 * [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 ### Great People
@ -346,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 * [Plastic](https://thenounproject.com/term/plastic/478826/) By Yu luck
* [Microphone](https://thenounproject.com/term/microphone/470266/) By Viktor Vorobyev for Mass Media * [Microphone](https://thenounproject.com/term/microphone/470266/) By Viktor Vorobyev for Mass Media
* [Flight](https://thenounproject.com/term/flight/1014306/) By Genius Icons * [Flight](https://thenounproject.com/term/flight/1014306/) By Genius Icons
* [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL
### Information ### Information
* [Pill](https://thenounproject.com/term/pill/780458/) By Alex Arseneau for Pharmaceuticals * [Pill](https://thenounproject.com/term/pill/780458/) By Alex Arseneau for Pharmaceuticals

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 968 B

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 KiB

After

Width:  |  Height:  |  Size: 825 KiB

View File

@ -356,13 +356,12 @@
techCost: 4505, techCost: 4505,
buildingCost:500, buildingCost:500,
wonderCost:1250, wonderCost:1250,
techs:[/* techs:[
{ {
name:"Refrigeration", name:"Refrigeration",
row:4, row:3,
prerequisites:["Electricity"], prerequisites:["Biology", "Electricity"], //to do: offshore platform should need this
baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of offshore platforms and submarines" },
},*/
{ {
name:"Replacable Parts", name:"Replacable Parts",
row:4, row:4,
@ -395,7 +394,7 @@
{ {
name:"Electronics", name:"Electronics",
row:5, row:5,
prerequisites:["Radio"], prerequisites:["Replacable Parts", "Flight"],
}, },
{ {
name:"Mass Media", name:"Mass Media",

View File

@ -483,6 +483,17 @@
uniques:["Indirect Fire", "Bonus vs City 30%"], uniques:["Indirect Fire", "Bonus vs City 30%"],
hurryCostModifier:20 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"], //to do: 3 uniques
hurryCostModifier:20
},
{ {
name:"Great War Infantry", name:"Great War Infantry",
unitType:"Melee", unitType:"Melee",

View File

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