Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands #12725

Emandac · 2024-12-30T22:52:21Z

Before the city state Ai, didn't care if you steal their lands.
But now with this update to the code, they will hate you now.
Except if you are friends with them.

Also modified other files, to have the popup when you steal their lands.

…of running away Settler unit will now settle on best tile in dangerous Tiles without escort instead of running away.

yairm210 · 2024-12-31T09:47:34Z

core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt

+
+            // If citystate gets tile stolen from another civ, then the civ gets a diplomacy Influence debuffer.
+            if (diplomacy.hasModifier(DiplomaticModifiers.StealingTerritory) && diplomacy.isRelationshipLevelLT(RelationshipLevel.Friend)) {
+                diplomacy.addInfluence(-25f)


This should be in UniqueTriggerActivation:1107 (UniqueType.OneTimeTakeOverTilesInRadius)
This should happen when the tile is being stolen
Also, even if you have a good relationship with a CS, stealing tiles is a Bad Action, and should have consequences
I think 15 influence per tile stolen sounds around right

yairm210 · 2024-12-31T09:49:04Z

core/src/com/unciv/logic/civilization/diplomacy/CityStateFunctions.kt

+                    otherCiv.popupAlerts.add(PopupAlert(AlertType.BorderOccupation, civInfo.civName))
+
+                    // to only show popup once.
+                    diplomacy.setFlag(DiplomacyFlags.BorderOccupation, -1)


Flag name is not indicative of what it's actually remembering - should be "TilesStolen" or similar, this sounds like you have units on tiles on their borders

Emandac · 2024-12-31T11:10:19Z

I have changed the BorderOccupation name to TilesStolen.
And also now you get a -15 for each tile stolen.
like you said.

yairm210 · 2024-12-31T12:30:58Z

core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt

+                        // check if civ has steal a tile from a citystate 
+                        if (otherCiv != null && otherCiv.isCityState) {
+                            // create this varibale diplomacyCityState for more readability
+                            val diplomacyCityState = otherCiv.getDiplomacyManager(civInfo)!!


How about getDiplomacyManagerOrMeet, that way we don't run into weird problems if we manage to steal tiles from a civ we haven't met yet

yairm210 · 2024-12-31T12:34:38Z

core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt

+        addGoodSizedLabel("You stole some of our territory!")
+        addCloseButton("Yes.", KeyboardBinding.Confirm)
+        addCloseButton("No.", KeyboardBinding.Cancel)


What is this about? Let the player know this was unacceptable, but there's no choice here,
Something like "Those lands were not yours to take. This has not gone unnoticed."
And then just addCloseButton()

Also, this text needs to go in template.properties so it's translatable

Emandac · 2024-12-31T13:14:50Z

Done

yairm210 · 2024-12-31T13:21:19Z

core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt

-        addGoodSizedLabel("You stole some of our territory!")
-        addCloseButton("Yes.", KeyboardBinding.Confirm)
-        addCloseButton("No.", KeyboardBinding.Cancel)
+        addGoodSizedLabel("Those lands were not yours to take. This has not gone unnoticed")


With a period on the end :)
Also in the properties file

yairm210 · 2025-01-01T12:51:42Z

core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt

+                            val diplomacyCityState = otherCiv.getDiplomacyManagerOrMeet(civInfo)
+                            diplomacyCityState.addInfluence(-15f)
+
+                            if (!diplomacyCityState.hasFlag(DiplomacyFlags.TilesStolen)) {


And you need to add the flag, because currently it will pop up every time
I'm not sure this is a bad thing tbh 🤔 Maybe we want to pop up every time?Currently this line just will never be true

You are right, I am going to update it to add the flag.
And that explained why I was getting 1 popup per Tile stolen, Now after adding the flag i only get one popup 😅

Emandac · 2025-01-02T22:35:16Z

core/src/com/unciv/ui/screens/worldscreen/AlertPopup.kt

Make so that you don't get declare war option, when you are already at war with that civ

SomeTroglodyte · 2025-01-16T03:35:13Z

Small side note "after the fact": Nudge nudge white-space. This PR introduced several lines consisting only of blanks, and there's a block of 3 empty lines in the middle of a function. Some recent @SeventhM PR's too. White-space changes are still changes to git, so inconsistent handling can lead to unnecessarily increased merge troubles. I thought the policy was no trailing white-space except where needed (templates) - "Do as you wont but never change another's insignificant white-space" could work too, but it needs consensus.

SeventhM · 2025-01-22T01:12:57Z

Small side note "after the fact": Nudge nudge white-space. This PR introduced several lines consisting only of blanks, and there's a block of 3 empty lines in the middle of a function. Some recent @SeventhM PR's too. White-space changes are still changes to git, so inconsistent handling can lead to unnecessarily increased merge troubles. I thought the policy was no trailing white-space except where needed (templates) - "Do as you wont but never change another's insignificant white-space" could work too, but it needs consensus.

I'm not entirely sure what you're trying to say here. My general rule of thumb has been:

Avoid trailing whitespace at the end of lines (usually for newlines that Studio hasn't cleaned up automatically)
Delete trailing whitespace at the end of lines if it's code I'm already touching for other reasons (which imo should usually be consistent with point 1)
Keep all/most other whitespace the same, including lines between statements. Most of the lines between statements is intentional to help separate obvious code blocks. And, like, in another PR I did, I was explicitly requested to add in such a line

The only time I delete lines between statements/functions is if there's two lines instead of one accidentally

SomeTroglodyte · 2025-01-22T16:54:17Z

trying to say here

Uh, sorry, this here is not the diff I had in mind with that comment¹... Curious - now which one did I mean?

That was #12817, so not even the same author, and most are by now fixed. PrevIdleButton still has one blank less than NextIdleButton.

Waving hand to side: "These are not the lines you're looking for" ↩

Emandac added 12 commits October 22, 2024 21:27

Settler settle best tile when not escort and dangerous Tiles instead …

9dd38f5

…of running away Settler unit will now settle on best tile in dangerous Tiles without escort instead of running away.

Merge branch 'master' of https://github.com/Emandac/Unciv

ab36bac

Merge branch 'yairm210:master' into master

3a67ef7

Update WorkerAutomation.kt

919a082

Update SpecificUnitAutomation.kt

ed21943

Update WorkerAutomation.kt

b9a832a

Update SpecificUnitAutomation.kt

5edf4b7

Merge branch 'yairm210:master' into master

545572f

Merge branch 'yairm210:master' into master

904e5a8

Merge branch 'yairm210:master' into master

938091f

Merge branch 'master' of https://github.com/Emandac/Unciv

6faa088

Now city states get mad when you steal their Lands

aaabab0

yairm210 reviewed Dec 31, 2024

View reviewed changes

new version

cb96cff

yairm210 reviewed Dec 31, 2024

View reviewed changes

Emandac added 3 commits December 31, 2024 13:41

change to getDiplomacyManagerOrMeet

e400964

added text to template.properties and changed AlertPopup.kt

61f90fa

Update template.properties

ff67bb7

yairm210 reviewed Dec 31, 2024

View reviewed changes

with period at the end :b

467e725

yairm210 reviewed Jan 1, 2025

View reviewed changes

Emandac added 2 commits January 1, 2025 14:28

add flag now

aa532e9

Merge branch 'yairm210:master' into master

5ee629f

yairm210 approved these changes Jan 1, 2025

View reviewed changes

Emandac added 2 commits January 2, 2025 23:25

Made Option to declare war when a city state is bullied unavailable

b300c51

Merge branch 'yairm210:master' into master

342d56a

Emandac commented Jan 2, 2025

View reviewed changes

yairm210 merged commit a4a403b into yairm210:master Jan 4, 2025
4 checks passed

SomeTroglodyte mentioned this pull request Jan 16, 2025

Small update Dutch #12821

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands #12725

Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands #12725

Emandac commented Dec 30, 2024 •

edited

Loading

yairm210 Dec 31, 2024

yairm210 Dec 31, 2024

Emandac commented Dec 31, 2024

yairm210 Dec 31, 2024

yairm210 Dec 31, 2024

Emandac commented Dec 31, 2024

yairm210 Dec 31, 2024

Emandac Dec 31, 2024

yairm210 Jan 1, 2025

Emandac Jan 1, 2025 •

edited

Loading

Emandac Jan 2, 2025

SomeTroglodyte commented Jan 16, 2025

SeventhM commented Jan 22, 2025

SomeTroglodyte commented Jan 22, 2025 •

edited

Loading

Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands #12725

Updated CityStateFunction.tk so that city states, will get angry at you, if you steal their lands #12725

Conversation

Emandac commented Dec 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emandac commented Dec 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emandac commented Dec 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Emandac Jan 1, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SomeTroglodyte commented Jan 16, 2025

SeventhM commented Jan 22, 2025

SomeTroglodyte commented Jan 22, 2025 • edited Loading

Footnotes

Emandac commented Dec 30, 2024 •

edited

Loading

Emandac Jan 1, 2025 •

edited

Loading

SomeTroglodyte commented Jan 22, 2025 •

edited

Loading