AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 22:37:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Conquistadors only settle other continents (#5566)

Browse Source 
* conquistadors only settle other continents

* make it a conditional
This commit is contained in:
SimonCeder 2021-10-27 06:08:23 +02:00 committed by GitHub
parent 04196974a4
commit 446c3fb97a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -617,7 +617,7 @@
"requiredResource": "Horses", "requiredResource": "Horses",
"upgradesTo": "Cavalry", "upgradesTo": "Cavalry",
"obsoleteTech": "Military Science", "obsoleteTech": "Military Science",
"uniques": ["Can move after attacking","No defensive terrain bonus", "Founds a new city", "[+2] Sight", "Defense bonus when embarked"], "uniques": ["Can move after attacking","No defensive terrain bonus", "Founds a new city <on foreign continents>", "[+2] Sight", "Defense bonus when embarked"],
"attackSound": "horse" "attackSound": "horse"
//Conquistador should have no penalty attacking cities //Conquistador should have no penalty attacking cities
//Ability to found new cities can only be used on a foreign continent that does not contain the Spanish capital. //Ability to found new cities can only be used on a foreign continent that does not contain the Spanish capital.

3
core/src/com/unciv/models/ruleset/unique/Unique.kt
View File

@ -82,6 +82,9 @@ class Unique(val text: String, val sourceObjectType: UniqueTarget? = null, val s
val theirCities = state.theirCombatant?.getCivInfo()?.cities?.size ?: 0 val theirCities = state.theirCombatant?.getCivInfo()?.cities?.size ?: 0
yourCities < theirCities yourCities < theirCities
} }
UniqueType.ConditionalForeignContinent -> state.unit != null &&
(state.unit.civInfo.cities.isEmpty() ||
state.unit.civInfo.getCapital().getCenterTile().getContinent() != state.unit.getTile().getContinent())
UniqueType.ConditionalNeighborTiles -> UniqueType.ConditionalNeighborTiles ->
state.cityInfo != null && state.cityInfo != null &&

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -363,6 +363,7 @@ enum class UniqueType(val text:String, vararg targets: UniqueTarget) {
ConditionalAttacking("when attacking", UniqueTarget.Conditional), ConditionalAttacking("when attacking", UniqueTarget.Conditional),
ConditionalDefending("when defending", UniqueTarget.Conditional), ConditionalDefending("when defending", UniqueTarget.Conditional),
ConditionalInTiles("when fighting in [tileFilter] tiles", UniqueTarget.Conditional), ConditionalInTiles("when fighting in [tileFilter] tiles", UniqueTarget.Conditional),
ConditionalForeignContinent("on foreign continents", UniqueTarget.Conditional),
/////// tile conditionals /////// tile conditionals
ConditionalNeighborTiles("with [amount] to [amount] neighboring [tileFilter] tiles", UniqueTarget.Conditional), ConditionalNeighborTiles("with [amount] to [amount] neighboring [tileFilter] tiles", UniqueTarget.Conditional),

6
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -16,6 +16,7 @@ import com.unciv.models.UncivSound
import com.unciv.models.UnitAction import com.unciv.models.UnitAction
import com.unciv.models.UnitActionType import com.unciv.models.UnitActionType
import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Building
import com.unciv.models.ruleset.unique.StateForConditionals
import com.unciv.models.ruleset.unique.UniqueType import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats import com.unciv.models.stats.Stats
@ -161,7 +162,10 @@ object UnitActions {
* (no movement left, too close to another city). * (no movement left, too close to another city).
*/ */
fun getFoundCityAction(unit: MapUnit, tile: TileInfo): UnitAction? { fun getFoundCityAction(unit: MapUnit, tile: TileInfo): UnitAction? {
if (!unit.hasUnique(UniqueType.FoundCity) || tile.isWater || tile.isImpassible()) return null if (!(unit.hasUnique(UniqueType.FoundCity))
|| tile.isWater || tile.isImpassible()) return null
// Spain should still be able to build Conquistadors in a one city challenge - but can't settle them
if (unit.civInfo.isOneCityChallenger() && unit.civInfo.hasEverOwnedOriginalCapital == true) return null
if (unit.currentMovement <= 0 || if (unit.currentMovement <= 0 ||
!tile.canBeSettled()) !tile.canBeSettled())