mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 17:59:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #931 - added Barbarian Brute as a replacement to the Warrior

Browse Source
This commit is contained in:
Yair Morgenstern
2019-07-21 22:49:04 +03:00
parent d1936cacd3
commit e73ad76227
6 changed files with 509 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Credits.md
View File

@ -20,6 +20,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
* [Flag](https://thenounproject.com/search/?q=Flag&i=50114) By Melvin Poppelaars for Settler * [Flag](https://thenounproject.com/search/?q=Flag&i=50114) By Melvin Poppelaars for Settler
* [Eagle](https://thenounproject.com/search/?q=Eagle&i=1619932) By anggun for Scout * [Eagle](https://thenounproject.com/search/?q=Eagle&i=1619932) By anggun for Scout
* [Axe](https://thenounproject.com/search/?q=Axe&i=1688143) By ehab.abdullah for Warrior * [Axe](https://thenounproject.com/search/?q=Axe&i=1688143) By ehab.abdullah for Warrior
* [Spiked Club](https://thenounproject.com/search/?q=spiked%20club&i=831793) by Hamish
* [Bow And Arrow](https://thenounproject.com/search/?q=Bow%20and%20Arrow&i=338261) By Viktor Ostrovsky for Archer * [Bow And Arrow](https://thenounproject.com/search/?q=Bow%20and%20Arrow&i=338261) By Viktor Ostrovsky for Archer
* [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain for Bowman * [Bow](https://thenounproject.com/search/?q=bow&i=101736) By Arthur Shlain for Bowman
* [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats * [Fishing Vessel](https://thenounproject.com/term/fishing-vessel/23815/) By Luis Prado for Work Boats

BIN
android/Images/UnitIcons/Brute.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

995
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: 1.0 MiB

After

Width:  |  Height:  |  Size: 1022 KiB

4
android/assets/jsons/Units.json
View File

@ -70,10 +70,11 @@
attackSound:"nonmetalhit" attackSound:"nonmetalhit"
//Polynesian unique unit. All nearby enemy Units have -10% strenght //Polynesian unique unit. All nearby enemy Units have -10% strenght
}, },
*/
{ {
name:"Brute", name:"Brute",
unitType:"Melee", unitType:"Melee",
uniqueTo:"Barbarian", uniqueTo:"Barbarians",
replaces:"Warrior", replaces:"Warrior",
movement:2, movement:2,
strength:8, strength:8,
@ -83,7 +84,6 @@
attackSound:"nonmetalhit" attackSound:"nonmetalhit"
//Barbarian unique unit //Barbarian unique unit
}, },
*/
{ {
name:"Archer", name:"Archer",
unitType:"Ranged", unitType:"Ranged",

10
core/src/com/unciv/logic/GameInfo.kt
View File

@ -147,17 +147,17 @@ class GameInfo {
for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) { for (civ in civilizations.filter { !it.isBarbarianCivilization() && !it.isDefeated() }) {
allResearchedTechs.retainAll(civ.tech.techsResearched) allResearchedTechs.retainAll(civ.tech.techsResearched)
} }
val barbarianCiv = getBarbarianCivilization()
barbarianCiv.tech.techsResearched = allResearchedTechs.toHashSet()
val unitList = GameBasics.Units.values val unitList = GameBasics.Units.values
.filter { !it.unitType.isCivilian() && it.uniqueTo == null } .filter { !it.unitType.isCivilian()}
.filter{ (it.requiredTech==null || allResearchedTechs.contains(it.requiredTech!!)) .filter { it.isBuildable(barbarianCiv) }
&& (it.obsoleteTech == null || !allResearchedTechs.contains(it.obsoleteTech!!)) }
val landUnits = unitList.filter { it.unitType.isLandUnit() } val landUnits = unitList.filter { it.unitType.isLandUnit() }
val waterUnits = unitList.filter { it.unitType.isWaterUnit() } val waterUnits = unitList.filter { it.unitType.isWaterUnit() }
val unit:String val unit:String
if (unitList.isEmpty()) unit="Warrior" if(waterUnits.isNotEmpty() && tileToPlace.neighbors.any{ it.baseTerrain==Constants.coast } && Random().nextBoolean())
else if(waterUnits.isNotEmpty() && tileToPlace.neighbors.any{ it.baseTerrain==Constants.coast } && Random().nextBoolean())
unit=waterUnits.random().name unit=waterUnits.random().name
else unit = landUnits.random().name else unit = landUnits.random().name