Added Infantry, Machine Gun units
Added Railroad, Ballistics techs Added Statue of Liberty wonder
@ -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
|
* [Stadium](https://thenounproject.com/term/stadium/13872/) By Karuna Lalvani
|
||||||
* [Signal Tower](https://thenounproject.com/term/signal-tower/1547758/) By Nociconist for Broadcast Tower
|
* [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
|
* [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
|
* [Christ the redeemer](https://thenounproject.com/term/christ-the-redeemer/56112/) By Stefan Spieler for Cristo Redentor
|
||||||
|
|
||||||
### Information Era
|
### 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
|
* [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
|
||||||
|
* [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
|
* [Refridgerator](https://thenounproject.com/search/?q=refridgerator&i=1188873) By b farias, CL
|
||||||
|
|
||||||
### Information
|
### Information
|
||||||
|
BIN
android/Images/BuildingIcons/Statue of Liberty.png
Normal file
After Width: | Height: | Size: 1.5 KiB |
BIN
android/Images/TechIcons/Ballistics.png
Normal file
After Width: | Height: | Size: 1.2 KiB |
BIN
android/Images/TechIcons/Railroad.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
android/Images/UnitIcons/Infantry.png
Normal file
After Width: | Height: | Size: 1.3 KiB |
BIN
android/Images/UnitIcons/Machine Gun.png
Normal file
After Width: | Height: | Size: 833 B |
Before Width: | Height: | Size: 840 KiB After Width: | Height: | Size: 844 KiB |
@ -536,6 +536,13 @@
|
|||||||
uniques:["Provides 1 happiness per social policy"],
|
uniques:["Provides 1 happiness per social policy"],
|
||||||
requiredTech:"Radio"
|
requiredTech:"Radio"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name:"Statue of Liberty",
|
||||||
|
culture:1,
|
||||||
|
isWonder:true,
|
||||||
|
uniques:["+1 Production from specialists"],
|
||||||
|
requiredTech:"Replacable Parts"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name:"Research Lab",
|
name:"Research Lab",
|
||||||
science:4,
|
science:4,
|
||||||
|
@ -377,6 +377,11 @@
|
|||||||
row:6,
|
row:6,
|
||||||
prerequisites:["Steam Power"]
|
prerequisites:["Steam Power"]
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
name:"Railroad",
|
||||||
|
row:8,
|
||||||
|
prerequisites:["Steam Power","Dynamite"]
|
||||||
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -396,10 +401,15 @@
|
|||||||
row:5,
|
row:5,
|
||||||
prerequisites:["Replacable Parts", "Flight"],
|
prerequisites:["Replacable Parts", "Flight"],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name:"Ballistics",
|
||||||
|
row:6,
|
||||||
|
prerequisites:["Flight"],
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name:"Combustion",
|
name:"Combustion",
|
||||||
row:8,
|
row:8,
|
||||||
prerequisites:["Steam Power","Dynamite"]
|
prerequisites:["Railroad"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -420,11 +430,6 @@
|
|||||||
prerequisites:["Electronics"],
|
prerequisites:["Electronics"],
|
||||||
uniques:["+10% science and production in all cities"]
|
uniques:["+10% science and production in all cities"]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
name:"Nuclear Fission",
|
|
||||||
row:7,
|
|
||||||
prerequisites:["Combustion"]
|
|
||||||
}
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -447,7 +452,12 @@
|
|||||||
{
|
{
|
||||||
name:"Rocketry",
|
name:"Rocketry",
|
||||||
row:6,
|
row:6,
|
||||||
prerequisites:["Flight","Computers"]
|
prerequisites:["Ballistics","Computers"]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name:"Nuclear Fission",
|
||||||
|
row:7,
|
||||||
|
prerequisites:["Combustion"]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -88,7 +88,7 @@
|
|||||||
{
|
{
|
||||||
name:"Railroad",
|
name:"Railroad",
|
||||||
turnsToBuild:4,
|
turnsToBuild:4,
|
||||||
techRequired:"Combustion"
|
techRequired:"Railroad"
|
||||||
},
|
},
|
||||||
|
|
||||||
// Removals
|
// Removals
|
||||||
|
@ -542,8 +542,33 @@
|
|||||||
cost: 320,
|
cost: 320,
|
||||||
requiredTech:"Replacable Parts",
|
requiredTech:"Replacable Parts",
|
||||||
hurryCostModifier:20,
|
hurryCostModifier:20,
|
||||||
|
upgradesTo:"Infantry",
|
||||||
|
obsoleteTech:"Plastics"
|
||||||
attackSound:"shot"
|
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 */
|
/* Great people */
|
||||||
|
|
||||||
|
@ -21,7 +21,7 @@ android {
|
|||||||
applicationId "com.unciv.app"
|
applicationId "com.unciv.app"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 28
|
targetSdkVersion 28
|
||||||
versionCode 190
|
versionCode 191
|
||||||
versionName "2.12.0"
|
versionName "2.12.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ class GameStarter{
|
|||||||
val availableCivNames = Stack<String>()
|
val availableCivNames = Stack<String>()
|
||||||
availableCivNames.addAll(GameBasics.Nations.keys.shuffled())
|
availableCivNames.addAll(GameBasics.Nations.keys.shuffled())
|
||||||
availableCivNames.removeAll(newGameParameters.humanNations)
|
availableCivNames.removeAll(newGameParameters.humanNations)
|
||||||
|
availableCivNames.remove("Barbarians")
|
||||||
|
|
||||||
for(nation in newGameParameters.humanNations) {
|
for(nation in newGameParameters.humanNations) {
|
||||||
val playerCiv = CivilizationInfo(nation)
|
val playerCiv = CivilizationInfo(nation)
|
||||||
|
@ -185,6 +185,8 @@ class CityStats {
|
|||||||
|
|
||||||
if (policies.contains("Commerce Complete")) stats.gold += 1
|
if (policies.contains("Commerce Complete")) stats.gold += 1
|
||||||
if (policies.contains("Secularism")) stats.science += 2
|
if (policies.contains("Secularism")) stats.science += 2
|
||||||
|
if(cityInfo.getBuildingUniques().contains("+1 Production from specialists"))
|
||||||
|
stats.production += 1
|
||||||
return stats
|
return stats
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -109,7 +109,7 @@ class MapUnit {
|
|||||||
&& civInfo.getBuildingUniques().contains("All military naval units receive +1 movement and +1 sight"))
|
&& civInfo.getBuildingUniques().contains("All military naval units receive +1 movement and +1 sight"))
|
||||||
visibilityRange += 1
|
visibilityRange += 1
|
||||||
val tile = getTile()
|
val tile = getTile()
|
||||||
if (tile.baseTerrain == "Hill") visibilityRange += 1
|
if (tile.baseTerrain == "Hill" && type.isLandUnit()) visibilityRange += 1
|
||||||
return tile.getViewableTiles(visibilityRange)
|
return tile.getViewableTiles(visibilityRange)
|
||||||
}
|
}
|
||||||
|
|
||||||
|