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

Update tutorials #12192

Merged
merged 123 commits into from
Sep 15, 2024
Merged
Changes from 1 commit
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
7ed4c0d
AI behaviour changes
EmperorPinguin Jun 23, 2024
47184b0
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jun 23, 2024
e856a76
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jun 23, 2024
b571e76
Update Automation.kt
EmperorPinguin Jun 23, 2024
cee0287
Update Automation.kt
EmperorPinguin Jun 23, 2024
16ae6d9
Update Automation.kt
EmperorPinguin Jun 23, 2024
a769a52
Update Automation.kt
EmperorPinguin Jun 23, 2024
9c8f2e2
Update Automation.kt
EmperorPinguin Jun 23, 2024
777b828
Update ConstructionAutomation.kt
EmperorPinguin Jun 23, 2024
2a4f9b0
Update Automation.kt
EmperorPinguin Jun 23, 2024
33b9fc7
Reverting some changes
EmperorPinguin Jun 23, 2024
e311e17
Changes
EmperorPinguin Jun 24, 2024
cade007
revert changes
EmperorPinguin Jun 24, 2024
318c396
revert changes
EmperorPinguin Jun 24, 2024
012afb5
revert changes
EmperorPinguin Jun 24, 2024
f4d02c8
revert changes
EmperorPinguin Jun 24, 2024
cae12b6
Update CityLocationTileRanker.kt
EmperorPinguin Jun 24, 2024
9040bab
Citizen assignment for stat conversion
EmperorPinguin Jun 24, 2024
a33d7f4
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 25, 2024
e53f887
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 25, 2024
3f540a8
Update CityLocationTileRanker.kt
EmperorPinguin Jun 25, 2024
0e5db36
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 26, 2024
43cf8a3
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 26, 2024
85743fb
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 27, 2024
a1f5905
Reduce AI settling
EmperorPinguin Jun 27, 2024
d061b67
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 27, 2024
4257a0f
Avoid AI building units when in negative Supply
EmperorPinguin Jun 27, 2024
44c8a90
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 27, 2024
5f42454
Update CityLocationTileRanker.kt
EmperorPinguin Jun 27, 2024
6b49cdc
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jun 27, 2024
383a083
Update CityLocationTileRanker.kt
EmperorPinguin Jun 27, 2024
31e3c44
Update CityLocationTileRanker.kt
EmperorPinguin Jun 27, 2024
cd7c911
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 28, 2024
958b646
Update ConstructionAutomation.kt
EmperorPinguin Jun 28, 2024
5f91c79
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 28, 2024
809b0fc
Update build.gradle.kts
EmperorPinguin Jun 28, 2024
f2573d8
Update gradle-wrapper.properties
EmperorPinguin Jun 28, 2024
9bef165
Update CityLocationTileRanker.kt
EmperorPinguin Jun 28, 2024
3239649
Update CityLocationTileRanker.kt
EmperorPinguin Jun 28, 2024
6f7c7c8
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 28, 2024
301ab4e
Update ConstructionAutomation.kt
EmperorPinguin Jun 28, 2024
f8f364e
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jun 28, 2024
df80b10
Update CityLocationTileRanker.kt
EmperorPinguin Jun 28, 2024
ef4f189
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jun 30, 2024
0fda42b
Merge branch 'yairm210:master' into master
EmperorPinguin Jun 30, 2024
55e1f7c
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 2, 2024
bc6172b
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 2, 2024
213c896
AI changes for humans
EmperorPinguin Jul 2, 2024
5f4e093
Fix puppet focus
EmperorPinguin Jul 3, 2024
61d8299
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 4, 2024
7ff9018
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 6, 2024
428193b
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 15, 2024
001269a
Update Automation.kt
EmperorPinguin Jul 17, 2024
344dd81
Puppet focus
EmperorPinguin Jul 17, 2024
bf0a8e7
Update Automation.kt
EmperorPinguin Jul 17, 2024
545f8c2
Update Automation.kt
EmperorPinguin Jul 17, 2024
395ac8f
Update Automation.kt
EmperorPinguin Jul 18, 2024
96acd16
Update Automation.kt
EmperorPinguin Jul 18, 2024
9e73243
Update Automation.kt
EmperorPinguin Jul 18, 2024
5de758d
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 18, 2024
6fc1b0c
Update Automation.kt
EmperorPinguin Jul 18, 2024
53057d9
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jul 18, 2024
d5e270b
Update Automation.kt
EmperorPinguin Jul 19, 2024
c34b62b
Update Automation.kt
EmperorPinguin Jul 19, 2024
611378b
Update Automation.kt
EmperorPinguin Jul 19, 2024
1e4d88b
Update Stats.kt
EmperorPinguin Jul 23, 2024
5863788
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 24, 2024
c896436
Update CityTurnManager.kt
EmperorPinguin Jul 24, 2024
8bb6b37
Remove specialist science modifier
EmperorPinguin Jul 25, 2024
0d3d37b
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 25, 2024
a73bf52
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jul 25, 2024
0a75ccb
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jul 28, 2024
a730dce
Update ReligionAutomation.kt
EmperorPinguin Jul 30, 2024
b0fb0f2
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 30, 2024
2797b0d
Update ReligionAutomation.kt
EmperorPinguin Jul 30, 2024
c7e4323
Update ReligionAutomation.kt
EmperorPinguin Jul 30, 2024
1660de3
Update CivilianUnitAutomation.kt
EmperorPinguin Jul 30, 2024
c2e6324
Merge branch 'yairm210:master' into master
EmperorPinguin Jul 31, 2024
21c5a30
Update ReligionAutomation.kt
EmperorPinguin Jul 31, 2024
4251043
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Jul 31, 2024
82a6221
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 4, 2024
c431226
Worker prioritization
EmperorPinguin Aug 4, 2024
1871dbd
Update ConstructionAutomation.kt
EmperorPinguin Aug 4, 2024
0c8768e
Update ConstructionAutomation.kt
EmperorPinguin Aug 4, 2024
ee23862
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 13, 2024
143a247
Update Automation.kt
EmperorPinguin Aug 13, 2024
31055c5
Update ConstructionAutomation.kt
EmperorPinguin Aug 13, 2024
db855b2
Update Policies.json
EmperorPinguin Aug 13, 2024
8a1c8b5
Update Policies.json
EmperorPinguin Aug 13, 2024
6b75cdb
Update Policies.json
EmperorPinguin Aug 13, 2024
16278a4
Update ConstructionAutomation.kt
EmperorPinguin Aug 13, 2024
f1dcea1
Update Policies.json
EmperorPinguin Aug 13, 2024
3cc9bf9
Update ReligionAutomation.kt
EmperorPinguin Aug 14, 2024
6fc896b
Update ReligionAutomation.kt
EmperorPinguin Aug 14, 2024
2f171a8
Update ReligionAutomation.kt
EmperorPinguin Aug 14, 2024
f90a4f8
Update ReligionAutomation.kt
EmperorPinguin Aug 14, 2024
90075e7
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 16, 2024
9c2ba52
Rename Crop Yield to Growth
EmperorPinguin Aug 16, 2024
06f730c
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 17, 2024
1f36661
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 21, 2024
443074a
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 22, 2024
1ee9432
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 24, 2024
e8d2e81
Update worker usage
EmperorPinguin Aug 24, 2024
5c228b0
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 28, 2024
44062df
Update UnitAutomation.kt
EmperorPinguin Aug 29, 2024
089919e
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 29, 2024
b45d857
Merge branch 'yairm210:master' into master
EmperorPinguin Aug 31, 2024
9163062
Merge branch 'yairm210:master' into master
EmperorPinguin Sep 6, 2024
c8dbff7
Merge branch 'yairm210:master' into master
EmperorPinguin Sep 8, 2024
8b2d813
Tutorials update
EmperorPinguin Sep 8, 2024
8da7927
Update Tutorials.json
EmperorPinguin Sep 8, 2024
d8b06ff
Merge branch 'yairm210:master' into master
EmperorPinguin Sep 8, 2024
0e8b1d1
Fix spelling error
EmperorPinguin Sep 8, 2024
2e415e0
Merge branch 'master' of https://github.com/EmperorPinguin/Unciv
EmperorPinguin Sep 8, 2024
aa2712c
Update Tutorials.json
EmperorPinguin Sep 8, 2024
a339192
Update Tutorials.json
EmperorPinguin Sep 8, 2024
195390d
Update Tutorials.json
EmperorPinguin Sep 8, 2024
777fb8f
Update Tutorials.json
EmperorPinguin Sep 8, 2024
4556892
Update Tutorials.json
EmperorPinguin Sep 8, 2024
2c1523a
Update Tutorials.json
EmperorPinguin Sep 8, 2024
04e49f2
Update Tutorials.json
EmperorPinguin Sep 9, 2024
344cd13
Update Tutorials.json
EmperorPinguin Sep 14, 2024
d25f898
Merge branch 'yairm210:master' into master
EmperorPinguin Sep 14, 2024
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 Automation.kt
EmperorPinguin committed Jul 19, 2024
commit 611378b1eaf22218f7fa37949496504ffec6c909
5 changes: 0 additions & 5 deletions core/src/com/unciv/logic/automation/Automation.kt
Original file line number Diff line number Diff line change
@@ -109,11 +109,6 @@ object Automation {
yieldStats.happiness *= 2
}

if (city.isPuppet) {
// Puppets need to produce gold, but no great merchants
yieldStats.gold *= 2
}

if (allTechsAreResearched) {
// Science is useless at this point
yieldStats.science *= 0