Commit Graph

7684 Commits

Author SHA1 Message Date
Yair Morgenstern
e510bf4929 Resolved error where missionary cost was determined by Capital, and not by cities it could actually be constructed in 2022-08-01 19:42:59 +03:00
oynqr
6054b32f92
Fix erroneous relationship decay notification (#7564)
Whenever your relationship resting point as well as the relationship
score for city states is at the exact value of 30 or 60, a notification
is shown that the relationship is about to degrade, even though it can
and will not.
This fixes said issue by changing the comparison operators of the
current influence and the resting point in
getCityStateInfluenceDegrade() and getCityStateInfluenceRecovery() to
the correct ones, respectively <= and >=.
2022-08-01 17:57:58 +03:00
Joan Josep
6a943bb46f
Rename "Show minimap" to "Minimap size" (#7567) 2022-07-31 15:56:45 -04:00
SimonCeder
605956c4d5
Merge pull request #7566 from SimonCeder/globalquestscheck
Invalid players removed from global quests
2022-07-31 17:59:30 +02:00
SimonCeder
c760510f5b Invalid players removed from global quests 2022-07-31 14:24:07 +02:00
SimonCeder
bbf0f5a6f4
Merge pull request #7559 from SimonCeder/naturalwonders
Fix Natural Wonder placement
2022-07-31 00:33:38 +02:00
OptimizedForDensity
53d18095ee
Add unit test for unique translation template keys (#7557) 2022-07-30 10:32:40 +03:00
SimonCeder
a6e61c120b Fix NW placement 2022-07-30 00:07:48 +02:00
OptimizedForDensity
64e79ffa0d
Allow passable natural wonders (#7550) 2022-07-28 23:00:31 +03:00
Xander Lenstra
8331b87f64
Removed duplicate placeholders (#7544) 2022-07-28 16:18:01 +03:00
Yair Morgenstern
c738da892c 4.2.0 2022-07-28 09:12:57 +03:00
Yair Morgenstern
a6b55ca14a
Version rollout (#7538)
* Bump version and create initial changelog entry

* Translate a few missing lines to Ukrainian (#7537)

Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>

* Update Finnish.properties (#7535)

* Update Finnish.properties

* Update Finnish.properties

* Update Korean.properties (#7531)

* Update Traditional_Chinese.properties (#7527)

* Update Polish.properties (#7525)

* Update Catalan.properties (#7524)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Russian.properties (#7520)

* Update Lithuanian.properties (#7518)

* Update Traditional_Chinese.properties (#7516)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update German translation (#7511)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Simplified_Chinese.properties (#7509)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7506)

* Update Filipino.properties (#7505)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Spanish.properties (#7503)

* Update French.properties (#7501)

* Update Swedish.properties (#7500)

* Update Italian.properties (#7498)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Securetux <110048962+Securetux@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Chia-Hung Ni <jameseses@gmail.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-07-28 09:06:46 +03:00
Xander Lenstra
4eb0038d10
Allows inquisitors to block holy cities (#7521)
* Inquisitors can disable holy cities

* Templates and notifications

* Combined with changes of previous religious PR

* Reviews
2022-07-27 22:18:04 +03:00
itanasi
af6ab8e4e5
Add Air Sweep (#7484)
* Add Air Sweep Unique
Enable Dogfighting Promotion
Add Air Sweep mode button and crosshair overlay

* Adding Air Sweep Battle Table

* Add airSweep to Battle
Remove double XP
While in AirSweep can't select other units on tile

* initial airsweep code

* Implement airSweep

* BattleTable indicates tile you're AirSweeping

* some notifications

* Clean up notifications.
Add icons

* Revert game.atlas and game.png

* Fix selection properly

* Update Vanilla UnitPromotions.json

* Better handling of movement use
comment cleanup

* missing credit

* Proper code so that Seas units also deal no damage
Adding Tutorials!

* Remove Intercept Bonus Damage/Protection

* Remove chance of Interceptor missing

* Battle Table a bit more consistent

* Defender also gets Air Sweep Modifiers

* Defender doesn't get bonus

* Remove unused getInterceptBonus
Combine logic

* Show damage in notifications for Air Sweep

* Randomize intercepting Civ and prioritize Air Units

* Remove debug code

* Updated atlas

* Clean up Uniques

* Object-ify DamageDealt for ease of reference

* code clean up

Co-authored-by: itanasi <spellman23@gmail.com>
2022-07-27 22:16:53 +03:00
SimonCeder
026ba380cc
Merge pull request #7513 from SimonCeder/automated-ruins
workers will replace city ruins
2022-07-25 22:23:27 +02:00
SimonCeder
a61c958d03 Merge branch 'automated-ruins' 2022-07-25 22:06:18 +02:00
rhtnejr
bdb13b77ea
Update Mods.md (#7528)
Fixed a typo on line 22: 'I addition' --> 'In addition'
2022-07-25 14:28:18 +03:00
Xander Lenstra
52d0814e7b
Update religious AI; buying faith buildings, inquisitor AI updates (#7454)
* Update AI for buying with Faith, allowing it to buy Faith buildings

* Minor bug fixes

* Revamped inquisitor AI, minor changes to missionary AI

* Reviews

* Reviews

* Reviews

* Removed magic number
2022-07-23 13:06:48 -04:00
SimonCeder
2f52b6bf1a
Merge pull request #7507 from SimonCeder/marriagebug
avoid potential marriage bug
2022-07-23 09:04:10 +02:00
SimonCeder
9fa00a9fa9 change wording 2022-07-22 23:12:55 +02:00
SimonCeder
0e00ec22c6 workers will replace city ruins 2022-07-22 20:53:01 +02:00
SimonCeder
64e6fd086d
Update CityStateFunctions.kt 2022-07-22 20:16:30 +02:00
SimonCeder
5846da6f8a
cover more cases 2022-07-22 20:14:08 +02:00
Yair Morgenstern
19997665de 4.1.21-patch2 2022-07-22 16:47:42 +03:00
Timo T
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
OptimizedForDensity
772e7faf54
Construction automation optimization (#7504) 2022-07-22 14:48:21 +02:00
Caballero Arepa
0e0e245365
Allow HexaRealm to render jungles on hills (#7502) 2022-07-22 14:30:58 +02:00
SimonCeder
73ad76b59c avoid potential marriage bug 2022-07-22 14:06:29 +02:00
Yair Morgenstern
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
Yair Morgenstern
858c7bc256 Quick win for #7491 - only update resources after trade/unit if resources are relevant 2022-07-22 09:26:40 +03:00
Yair Morgenstern
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
Yair Morgenstern
77b0b582ae Disabled autosave when resizing worldScreen 2022-07-21 22:31:44 +03:00
Yair Morgenstern
96c9d105f3 Resolved #7497 - Fixed Civilopedia crash on terrains 2022-07-21 18:26:41 +03:00
Yair Morgenstern
2f8acff08c 4.1.21 2022-07-21 09:33:35 +03:00
Yair Morgenstern
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
Xander Lenstra
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
alexban011
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
Yair Morgenstern
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
Yair Morgenstern
448efc813d
40% performance save on tileInfo.getImprovementStats() by caching citywide uniques (#7492) 2022-07-20 19:53:30 +03:00
Yair Morgenstern
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
Yair Morgenstern
e2d04b37f7
HexaRealm as default tileset (#7477) 2022-07-20 11:57:50 +03:00
itanasi
ee6082c394
Replace "moveTo" in unit overview with "Moving" (#7457) 2022-07-19 14:01:42 +02:00
Yair Morgenstern
aa8cbb49a3 4.1.20 2022-07-18 19:19:39 +03:00
Yair Morgenstern
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
Yair Morgenstern
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
Timo T
0ba7a457c4
Gray out city state friend bonus when allied (#7475) 2022-07-17 21:50:04 +03:00
OptimizedForDensity
1287eb2c05
Minor reweight of AI policy selection (#7252)
* Reweight AI policy selection

* Vanilla ideological weights updated

* Update science victory weights
2022-07-17 11:21:12 +03:00
Yair Morgenstern
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
OptimizedForDensity
c2ae9e3145
Stop transported units from being able to pillage tiles (#7468) 2022-07-17 01:04:11 +03:00
MindaugasRumsa51
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