Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added an UniqueType to Found puppet city. #12834

Merged
merged 29 commits into from
Jan 22, 2025
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9dd38f5
Settler settle best tile when not escort and dangerous Tiles instead …
Emandac Oct 22, 2024
ab36bac
Merge branch 'master' of https://github.com/Emandac/Unciv
Emandac Oct 24, 2024
3a67ef7
Merge branch 'yairm210:master' into master
Emandac Oct 27, 2024
919a082
Update WorkerAutomation.kt
Emandac Oct 30, 2024
ed21943
Update SpecificUnitAutomation.kt
Emandac Oct 30, 2024
b9a832a
Update WorkerAutomation.kt
Emandac Oct 30, 2024
5edf4b7
Update SpecificUnitAutomation.kt
Emandac Oct 30, 2024
545572f
Merge branch 'yairm210:master' into master
Emandac Nov 10, 2024
904e5a8
Merge branch 'yairm210:master' into master
Emandac Nov 15, 2024
938091f
Merge branch 'yairm210:master' into master
Emandac Dec 14, 2024
6faa088
Merge branch 'master' of https://github.com/Emandac/Unciv
Emandac Dec 30, 2024
aaabab0
Now city states get mad when you steal their Lands
Emandac Dec 30, 2024
cb96cff
new version
Emandac Dec 31, 2024
e400964
change to getDiplomacyManagerOrMeet
Emandac Dec 31, 2024
61f90fa
added text to template.properties and changed AlertPopup.kt
Emandac Dec 31, 2024
ff67bb7
Update template.properties
Emandac Dec 31, 2024
467e725
with period at the end :b
Emandac Dec 31, 2024
aa532e9
add flag now
Emandac Jan 1, 2025
5ee629f
Merge branch 'yairm210:master' into master
Emandac Jan 1, 2025
b300c51
Made Option to declare war when a city state is bullied unavailable
Emandac Jan 2, 2025
342d56a
Merge branch 'yairm210:master' into master
Emandac Jan 2, 2025
04f6be5
Merge branch 'yairm210:master' into master
Emandac Jan 10, 2025
1623290
added option to change the Maximum Autosave turns stored
Emandac Jan 11, 2025
4edcd24
remove print
Emandac Jan 11, 2025
0d5295e
change letter
Emandac Jan 11, 2025
1599dd2
should fix issue with building test
Emandac Jan 11, 2025
eab98f2
update with changes
Emandac Jan 11, 2025
bd60cc4
Merge branch 'yairm210:master' into master
Emandac Jan 19, 2025
4fadce6
Added UniqueType.FoundPuppetCity
Emandac Jan 19, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update SpecificUnitAutomation.kt
Emandac committed Oct 30, 2024

Verified

This commit was signed with the committer’s verified signature. The key has expired.
suzuki-shunsuke Shunsuke Suzuki
commit ed21943b2c9285b415164529d309ad87c5274793
10 changes: 0 additions & 10 deletions core/src/com/unciv/logic/automation/unit/SpecificUnitAutomation.kt
Original file line number Diff line number Diff line change
@@ -190,18 +190,8 @@ object SpecificUnitAutomation {
throw Exception("City within distance")
return
}

unit.movement.headTowards(bestCityLocation)

// This if setement is to check if settler is on the bast tile and has no escort unit and its in a dangerous Tiles and can still move.
// then settle there
if (bestTilesInfo.tileRankMap.containsKey(unit.getTile()) && unit.getOtherEscortUnit() == null && dangerousTiles.contains(unit.getTile())
&& unit.hasMovement()) {
foundCityAction.action.invoke()
return
}


if (unit.getTile() == bestCityLocation && unit.hasMovement())
foundCityAction.action.invoke()
}