wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added Navigation tech with Seaport building and Frigate unit

Browse source 
Water maps are out of beta and are now default!
This commit is contained in:
Yair Morgenstern 2018-11-12 13:05:42 +02:00
parent d5a5c400bd
commit 62ef51f38e
11 changed files with 265 additions and 221 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Credits.md
View file

@ -45,6 +45,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Cannon](https://thenounproject.com/search/?q=Cannon&i=1618747) By Orin Zuu
* [Musket](https://thenounproject.com/search/?q=Musket&i=298302) By Cezary Lopacinski for Musketman
* [Rapier](https://thenounproject.com/search/?q=musketeer&i=819822) By Hamish for Musketeer
* [Ship](https://thenounproject.com/term/ship/1293899/) By Orin Zuu for Frigate
* [Lance](https://thenounproject.com/search/?q=Lance&i=440122) By parkjisun for Lancer
### Industrial
@ -52,6 +53,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Rifle](https://thenounproject.com/search/?q=Rifle&i=604291) By Chameleon Design for Rifleman
* [Horse](https://thenounproject.com/search/?q=Horse&i=1023745) By Bakunetso Kaito for Cavalry
* [Artillery](https://thenounproject.com/search/?q=Artillery&i=1165261) By Creative Mania
* [Ship](https://thenounproject.com/term/ship/1594793/) By Aisyah for Ironclad
### Great People
@ -162,6 +164,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Opera House](https://thenounproject.com/term/opera-house/446672/) By Xinh Studio
* [Chinese traditional tower](https://thenounproject.com/term/chinese-traditional-tower/1808410/) By 1516 for Porcelain Tower
* [Bank](https://thenounproject.com/term/bank/1882194/) By projecthayat
* [Harbor](https://thenounproject.com/term/harbor/225583/) By Rflor for Seaport
### Industrial Era
@ -308,6 +311,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
* [Printing Press](https://thenounproject.com/term/printing-press/11880/) By Mike Wirth
* [Flintlock](https://thenounproject.com/term/flintlock/1122659/) By Madison Apple for Gunpowder
* [Fossil](https://thenounproject.com/term/fossil/168650/) By Raf Verbraeken for Archaeology
* [Sextant](https://thenounproject.com/term/sextant/313438/) By lastspark for Navigation
* [Architecture](https://thenounproject.com/term/architecture/795297/) By Andrew Doane
* [Money Growth](https://thenounproject.com/search/?q=economic%20model&i=136159) By DesignNex for Economics
* [Metal Block](https://thenounproject.com/term/metal-bock/1518464/) By Creaticca Creative Agency for Metallurgy

BIN
android/Images/BuildingIcons/Seaport.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
android/Images/TechIcons/Navigation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
android/Images/UnitIcons/Frigate.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.3 KiB

427
android/assets/game.atlas
View file

File diff suppressed because it is too large Load diff

BIN
android/assets/game.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 790 KiB

After

Width:  |  Height:  |  Size: 797 KiB

11
android/assets/jsons/Buildings.json
View file

@ -192,7 +192,8 @@
specialistSlots:{gold:1},
hurryCostModifier:25,
percentStatBonus:{gold:25},
uniques:["Provides 1 extra copy of each improved luxury resource near this City","+2 Gold for each source of Oil and oasis"],
uniques:["Provides 1 extra copy of each improved luxury resource near this City",
"+2 Gold for each source of Oil and oasis"],
requiredTech:"Currency"
},
{
@ -417,6 +418,14 @@
uniques:["Free Great Artist Appears"],
requiredTech:"Archaeology"
},
{
name:"Seaport",
hurryCostModifier:25,
maintenance:2,
uniques:["+1 production and gold from all sea resources worked by the city",
"Can only be built in coastal cities", "+15% production of naval units"]
requiredTech:"Navigation"
},
{
name:"Taj Mahal",
culture:1,

11
android/assets/jsons/Techs.json
View file

@ -222,7 +222,7 @@
name:"Astronomy",
row:2,
baseDescription:"Increases embarked movement +1",
prerequisites:[/*"Compass",*/"Education"]
prerequisites:["Compass","Education"]
},
{
name:"Acoustics",
@ -253,12 +253,11 @@
buildingCost:300,
wonderCost:750,
techs:[
/*{
{
name:"Navigation",
row:2,
prerequisites:["Astronomy"],
baseDescription:"Does nothing since we have no sea tiles - In theory, allows construction of Frigates and Seaports"
},*/
prerequisites:["Astronomy"]
},
{
name:"Architecture",
row:4,
@ -291,7 +290,7 @@
{
name:"Archaeology",
row:2,
prerequisites:["Astronomy"]
prerequisites:["Navigation"]
},
{
name:"Scientific Theory",

13
android/assets/jsons/Units.json
View file

@ -245,6 +245,8 @@
rangedStrength:17
cost: 100,
requiredTech:"Compass",
obsoleteTech:"Navigation",
upgradesTo:"Frigate",
uniques:["Cannot enter ocean tiles"]
hurryCostModifier:20
},
@ -304,6 +306,17 @@
requiredTech:"Gunpowder",
hurryCostModifier:20
},
{
name:"Frigate",
unitType:"WaterRanged",
movement:5,
strength:25,
rangedStrength:28,
cost: 185,
requiredResource:"Iron",
requiredTech:"Navigation",
hurryCostModifier:20
},
{
name:"Lancer",
unitType:"Mounted",

11
core/src/com/unciv/logic/map/TileInfo.kt
View file

@ -139,9 +139,14 @@ open class TileInfo {
if(resource.name=="Oil" && city!=null
&& city.getBuildingUniques().contains("+2 Gold for each source of Oil and oasis"))
stats.gold += 2
if(city!=null && isWater()
&& city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
stats.production+=1
if(city!=null && isWater()){
if(city.getBuildingUniques().contains("+1 production from all sea resources worked by the city"))
stats.production+=1
if(city.getBuildingUniques().contains("+1 production and gold from all sea resources worked by the city")){
stats.production+=1
stats.gold+=1
}
}
}
val improvement = getTileImprovement()

9
core/src/com/unciv/ui/NewGameScreen.kt
View file

@ -26,7 +26,7 @@ class NewGameScreen: PickerScreen(){
var nation="Babylon"
var mapRadius=20
var numberOfEnemies=3
var mapType=MapType.LandOnly
var mapType=MapType.WithWater
}
val newGameParameters=NewGameParameters()
@ -145,13 +145,6 @@ class NewGameScreen: PickerScreen(){
newGameOptionsTable.add(difficultySelectBox).pad(10f).row()
val checkBox = CheckBox("Add water tiles \n(EXPERIMENTAL/WIP)",skin)
checkBox.onClick {
if(checkBox.isChecked) newGameParameters.mapType = NewGameParameters.MapType.WithWater
else newGameParameters.mapType = NewGameParameters.MapType.LandOnly
}
newGameOptionsTable.add(checkBox).row()
rightSideButton.enable()
rightSideButton.setText("Start game!".tr())
rightSideButton.onClick {