64e6fd086d
Update CityStateFunctions.kt
2022-07-22 20:16:30 +02:00
5846da6f8a
cover more cases
2022-07-22 20:14:08 +02:00
9f251787fa
Fix games not being loadable ( #7508 )
...
* Fix wrong caching key
* Refactor: Change caching keys to unique name
2022-07-22 16:04:30 +03:00
772e7faf54
Construction automation optimization ( #7504 )
2022-07-22 14:48:21 +02:00
73ad76b59c
avoid potential marriage bug
2022-07-22 14:06:29 +02:00
acd71617cc
Quick win for #7491 - check religion spread range for cities only after checking it's with a majority major religion
2022-07-22 10:29:25 +03:00
858c7bc256
Quick win for #7491 - only update resources after trade/unit if resources are relevant
2022-07-22 09:26:40 +03:00
ae187f4f85
Quick win for #7491 - when creating a unit, only update civ resources if the unit has resource requirements
2022-07-21 22:57:30 +03:00
77b0b582ae
Disabled autosave when resizing worldScreen
2022-07-21 22:31:44 +03:00
96c9d105f3
Resolved #7497 - Fixed Civilopedia crash on terrains
2022-07-21 18:26:41 +03:00
5b50106ea5
Version rollout ( #7496 )
...
* Bump version and create initial changelog entry
* Update Russian.properties (#7493 )
* Update Filipino.properties (#7487 )
* Update Simplified_Chinese.properties (#7480 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
2022-07-21 09:19:22 +03:00
986346a127
Added a unique limiting what units can be intercepted ( #7488 )
...
* Added a unique limiting what units can be intercepted
* Cleaned up implementation and added stateForConditionals
2022-07-21 09:16:33 +03:00
06096eaa8e
Mod categories ( #7298 )
...
* feature
* more categories
* added categories
* filter installed part1
* display vanilla rulesets in rulesets category + fix download from URL not showing
* filter installed mods
* removed isVanilla variable
* only look at second topic
* same but for online mdos as well
* replaced tilesets with graphics
* translations
* code duplication
* removed vanilla content from rulesets
* combined the function into one
* revert amountPerPage even tough its already on master
* Filter class
* 1
* mutableListOf<>()
* mutableListOf<>() again
* getFilterText removed
* !categoryFilter(filter)
* matchesCategory
* if (modTopic.size < 2) return false
2022-07-21 09:15:26 +03:00
42df3f06f0
Simplified and optimized image attempter use ( #7494 )
...
* Simplified and optimized image attempter use
Image fallback logic was in a bad place - confusing, semi-optimized, and spread out over several places
This brings everything into one place, simplifies the logic, adds comments, optimizes string concats to bring down RAM usage, and adds caching so we don't need to conduct the same searches over and over
* Minor reorder
There is still more that can be cleaned up but not now
2022-07-21 07:52:26 +03:00
448efc813d
40% performance save on tileInfo.getImprovementStats() by caching citywide uniques ( #7492 )
2022-07-20 19:53:30 +03:00
8574ad4624
Save all tile terrains and terrain uniques in transients, for better performance ( #7490 )
...
* Save all tile terrains and terrain uniques in transients, for better performance
Also minor changes in other places for performance reasons
* CR changes + test fix
2022-07-20 16:38:42 +03:00
e2d04b37f7
HexaRealm as default tileset ( #7477 )
2022-07-20 11:57:50 +03:00
ee6082c394
Replace "moveTo" in unit overview with "Moving" ( #7457 )
2022-07-19 14:01:42 +02:00
d95cf13a41
Version rollout ( #7481 )
...
* Bump version and create initial changelog entry
* Update Turkish.properties (#7473 )
* Ukrainian translations (#7472 )
* Update Spanish.properties (#7471 )
* Update Catalan.properties (#7467 )
* Update French.properties (#7466 )
* Update Italian.properties (#7464 )
* Update German translation (#7463 )
* Update German translation
* Update German translation
* Update Lithuanian.properties (#7462 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: HasChad <58506555+HasChad@users.noreply.github.com >
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com >
2022-07-18 19:17:36 +03:00
f1a72e9611
Resolve #7438 -Can no longer receive negative gold offers from AI ( #7451 )
...
* Can no longer receive negative gold offers from AI
* Function over field
* Correct checking for tradable offers in AI counteroffer
2022-07-18 17:57:36 +03:00
0ba7a457c4
Gray out city state friend bonus when allied ( #7475 )
2022-07-17 21:50:04 +03:00
59d7a81b26
Keep progress in notification scroll when updating ( #7447 )
...
* Keep progress in notification scroll when resizing
* Don't use layout directly, as per docs
2022-07-17 01:04:42 +03:00
c2ae9e3145
Stop transported units from being able to pillage tiles ( #7468 )
2022-07-17 01:04:11 +03:00
9f25ce66c2
Fix getting settlers from ancient ruins on one-city challenge ( #7459 )
...
* Update UniqueTriggerActivation.kt
* Update UniqueTriggerActivation.kt
* Update UniqueTriggerActivation.kt
* Update UniqueTriggerActivation.kt
* Update UniqueTriggerActivation.kt
* Update UniqueTriggerActivation.kt
2022-07-15 14:50:28 -04:00
0716350a3e
Stat colors unified - for use in notifications, improvements, yield icons, etc
2022-07-15 12:36:39 +03:00
9d20f991d0
Version rollout ( #7460 )
...
* Bump version and create initial changelog entry
* Update Catalan.properties (#7446 )
* Update Spanish.properties (#7445 )
* Ukrainian translations (#7439 )
* Update German translation (#7435 )
* Update French.properties (#7431 )
* Update Traditional_Chinese.properties (#7430 )
* Update Filipino.properties (#7428 )
* Update Filipino.properties
* Update Filipino.properties
* Update Indonesian.properties (#7425 )
* Update Italian.properties (#7424 )
* Update Italian.properties
* Update Italian.properties
* Update Lithuanian.properties (#7423 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com >
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com >
2022-07-15 12:01:15 +03:00
8138fa5d54
Interception always takes an attack ( #7455 )
2022-07-15 11:56:35 +03:00
7d7a36acc9
Add more music triggers ( #7407 )
...
* Add noted unimplemented music triggers
* Prototype try-civ-specific-then-try-general music function
* Undo previous commit and rename Built to Wonder
* Move music triggers to alert popup
2022-07-15 11:56:26 +03:00
28ff3da9cf
Fix potential race condition in multiplayer game update ( #7444 )
2022-07-15 10:52:35 +03:00
2a2b4bc531
Better era-specific tile image support ( #7453 )
...
* Better era specific tile images
* Use ImageAttempter to reuse code
* Redundant code
* Unify era-specific image loading
* Revert change
* I guess I'll commit these
2022-07-15 10:51:46 +03:00
ecf9de6cfb
Move border below icons ( #7452 )
2022-07-15 01:27:26 +02:00
cb6160c4a8
Significantly reduce AI turn time ( #7441 )
...
* Significantly speed up AI pathfinding
* Undo caching and improve AI
* Undo comment change
* Improvement
* Reorder and comment
2022-07-14 16:49:39 +03:00
160b51d578
Added more unit tests ( #7448 )
2022-07-14 10:27:06 +03:00
850899cbc3
sorted eras by eraNumber ( #7443 )
2022-07-13 21:43:37 +02:00
e71616d433
Fix game crashing when a multiplayer game can not be read ( #7440 )
...
* Fix game crashing when a multiplayer game can not be read
* Refactor: fix typo
2022-07-13 21:59:07 +03:00
552a6ee787
Unique deprecation ( #7433 )
2022-07-12 06:50:49 +03:00
48744f658c
City health updates when finishing health-increasing buildings ( #7310 )
...
* Set full health if city builds health increasing building while at full health
* Proportional health addition
* Move function to postBuildEvent function
2022-07-11 19:08:19 +03:00
5c1ca900b7
Version rollout ( #7422 )
...
* Bump version and create initial changelog entry
* Update Simplified_Chinese.properties (#7415 )
* Update Traditional_Chinese.properties (#7413 )
* Update French.properties (#7406 )
* Update French.properties
* Update French.properties
Revert bad (idea) changes
* Update German translation (#7405 )
* Update Spanish.properties (#7401 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
2022-07-11 10:35:56 +03:00
0a6110555e
Fix some graphics issues related to combat ( #7421 )
...
* Fix some issues related to units flashing red
* Slight change to variable name and string definition
2022-07-11 10:34:52 +03:00
ae5a0221ed
Refactorings & three more unit tests for uniques ( #7412 )
2022-07-10 23:19:45 +02:00
e65e1dc9ce
Fix any civ being able to capture barbarians ( #7418 )
2022-07-10 19:15:17 +03:00
0f5e0b546e
Remove double XP gain from Intercept ( #7414 )
2022-07-10 11:53:38 +03:00
f2365568d4
Fix multiple capture uniques resulting in double-capture ( #7403 )
2022-07-10 01:12:59 +02:00
0511372fe8
Stop automate production setting from automating other players' production in MP ( #7351 )
...
* Fix automate production option in multiplayer
* More explicit condition
2022-07-09 22:50:53 +03:00
aab49e7295
Fix policy uniques not being applied ( #7404 )
2022-07-09 22:50:30 +03:00
43da7ee3cd
Sort game speeds in Civilopedia by game speed modifier ( #7408 )
2022-07-09 22:49:37 +03:00
b21f616120
Fix Desktop multiplayer options showing a double separator ( #7410 )
2022-07-09 22:49:16 +03:00
6c533d63fb
Hopefully resolved ANRs caused by available fonts taking too long to load
2022-07-08 16:54:21 +03:00
f08dedea31
Version rollout ( #7400 )
...
* Bump version and create initial changelog entry
* Update Indonesian.properties (#7398 )
* Update Simplified_Chinese.properties (#7397 )
* Herbad patch 1 (#7395 )
* Update Persian_(Pinglish-UN).properties
* Update Persian_(Pinglish-UN).properties
Edit the problem
* Update German translation (#7391 )
* Update Catalan.properties (#7389 )
* Update Lithuanian.properties (#7385 )
* Update Filipino.properties (#7384 )
* Update French.properties (#7383 )
* Update Spanish.properties (#7381 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com >
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com >
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com >
2022-07-08 16:00:38 +03:00
58e65978dc
Prevent theme music tracks from randomly playing ( #7396 )
...
* Don't play theme music tracks randomly
* Tweak
* Remove redundant code
* Ambient string to variable
2022-07-08 15:49:55 +03:00
