AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-29 06:51:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #500 from ninjatao/issue/499

Browse Source 
Barbarian units ignore strategy resources.
This commit is contained in:
Yair Morgenstern 2019-03-04 08:40:55 +02:00 committed by GitHub
commit 9c065d42f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/logic/battle/BattleDamage.kt
View File

@ -58,7 +58,8 @@ class BattleDamage{
modifiers["Discipline"] = 0.15f modifiers["Discipline"] = 0.15f
val requiredResource = combatant.unit.baseUnit.requiredResource val requiredResource = combatant.unit.baseUnit.requiredResource
if(requiredResource!=null && combatant.getCivInfo().getCivResourcesByName()[requiredResource]!!<0){ if(requiredResource!=null && combatant.getCivInfo().getCivResourcesByName()[requiredResource]!!<0
&& !combatant.getCivInfo().isBarbarianCivilization()){
modifiers["Missing resource"]=-0.25f modifiers["Missing resource"]=-0.25f
} }