Added Infantry, Machine Gun units

Added Railroad, Ballistics techs
Added Statue of Liberty wonder
This commit is contained in:
Yair Morgenstern 2019-01-15 22:17:34 +02:00
parent ee278586e7
commit 2df64861d1
16 changed files with 404 additions and 322 deletions

View file

@ -191,6 +191,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Stadium](https://thenounproject.com/term/stadium/13872/) By Karuna Lalvani
* [Signal Tower](https://thenounproject.com/term/signal-tower/1547758/) By Nociconist for Broadcast Tower
* [Eiffel Tower](https://thenounproject.com/term/eiffel-tower/1907757/) By Felipe Alvarado
* [Statue of Liberty](https://thenounproject.com/search/?q=statue%20of%20liberty&i=1801199) By 1516
* [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor
### Information Era
@ -348,6 +349,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
* [Train](https://thenounproject.com/term/train/651644/) By Federico Panzano for Railroad
* [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL
### Information

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 833 B

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 840 KiB

After

Width:  |  Height:  |  Size: 844 KiB

View file

@ -536,6 +536,13 @@
uniques:["Provides 1 happiness per social policy"],
requiredTech:"Radio"
},
{
name:"Statue of Liberty",
culture:1,
isWonder:true,
uniques:["+1 Production from specialists"],
requiredTech:"Replacable Parts"
},
{
name:"Research Lab",
science:4,

View file

@ -377,6 +377,11 @@
row:6,
prerequisites:["Steam Power"]
}
{
name:"Railroad",
row:8,
prerequisites:["Steam Power","Dynamite"]
}
]
},
{
@ -396,10 +401,15 @@
row:5,
prerequisites:["Replacable Parts", "Flight"],
},
{
name:"Ballistics",
row:6,
prerequisites:["Flight"],
},
{
name:"Combustion",
row:8,
prerequisites:["Steam Power","Dynamite"]
prerequisites:["Railroad"]
}
]
},
@ -420,11 +430,6 @@
prerequisites:["Electronics"],
uniques:["+10% science and production in all cities"]
},
{
name:"Nuclear Fission",
row:7,
prerequisites:["Combustion"]
}
]
},
{
@ -447,7 +452,12 @@
{
name:"Rocketry",
row:6,
prerequisites:["Flight","Computers"]
prerequisites:["Ballistics","Computers"]
},
{
name:"Nuclear Fission",
row:7,
prerequisites:["Combustion"]
}
]
},

View file

@ -88,7 +88,7 @@
{
name:"Railroad",
turnsToBuild:4,
techRequired:"Combustion"
techRequired:"Railroad"
},
// Removals

View file

@ -542,8 +542,33 @@
cost: 320,
requiredTech:"Replacable Parts",
hurryCostModifier:20,
upgradesTo:"Infantry",
obsoleteTech:"Plastics"
attackSound:"shot"
},
{
name:"Infantry",
unitType:"Melee",
movement:2,
strength:70,
cost: 375,
requiredTech:"Plastics",
hurryCostModifier:20,
attackSound:"shot"
},
{
name:"Machine Gun",
unitType:"Ranged",
range:1,
movement:2,
strength:60,
rangedStrength:60,
cost: 350,
requiredTech:"Ballistics",
hurryCostModifier:20,
attackSound:"machinegun"
},
/* Great people */

View file

@ -21,7 +21,7 @@ android {
applicationId "com.unciv.app"
minSdkVersion 14
targetSdkVersion 28
versionCode 190
versionCode 191
versionName "2.12.0"
}

View file

@ -35,6 +35,7 @@ class GameStarter{
val availableCivNames = Stack<String>()
availableCivNames.addAll(GameBasics.Nations.keys.shuffled())
availableCivNames.removeAll(newGameParameters.humanNations)
availableCivNames.remove("Barbarians")
for(nation in newGameParameters.humanNations) {
val playerCiv = CivilizationInfo(nation)

View file

@ -185,6 +185,8 @@ class CityStats {
if (policies.contains("Commerce Complete")) stats.gold += 1
if (policies.contains("Secularism")) stats.science += 2
if(cityInfo.getBuildingUniques().contains("+1 Production from specialists"))
stats.production += 1
return stats
}

View file

@ -109,7 +109,7 @@ class MapUnit {
&& civInfo.getBuildingUniques().contains("All military naval units receive +1 movement and +1 sight"))
visibilityRange += 1
val tile = getTile()
if (tile.baseTerrain == "Hill") visibilityRange += 1
if (tile.baseTerrain == "Hill" && type.isLandUnit()) visibilityRange += 1
return tile.getViewableTiles(visibilityRange)
}