Puppet city in console - #15388
Open
BobbyCobby wants to merge 5 commits into
Open
Conversation
Not sure if `city.cityConstructions.removeAll()` is required here, but it's simpler if not, I think? Co-Authored-By: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
BobbyCobby
commented
Aug 13, 2026
| "add" to ConsoleAction("city add <civName>") { console, params -> | ||
| val civ = console.getCivByName(params[0]) | ||
| if (!civ.isMajorCiv() && !civ.isCityState) | ||
| if (!civ.isMajorCiv() && !civ.isCityState) |
Contributor
Author
There was a problem hiding this comment.
I suppose this is just my IDE, I didn't do that on purpose. But I think trailing whitespace is disliked so I left this.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves #15367
I have no idea if this is OK style-wise, but it works.
It adds the console command
city setpuppet <boolean>to allow modders to make scenarios using puppet cities.At the moment,
city.cityConstructions.removeAll()is not included, despite its inclusion inUnciv/core/src/com/unciv/logic/city/managers/CityConquestFunctions.kt
Lines 164 to 168 in 20e3494
I'm not familiar with Kotlin, but I guessed
private funto mean the same asdef _name()in Python, restricting the function to use inside the class (although I think there's a messy way to bypass that in Python). Thus I did not just try to call the above function.