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
7c64015aed
Improve AI belief picking ( #7369 )
...
* Improve AI belief picking
* Change default gameTimeScalingPercent to 100
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com >
2022-07-08 15:49:35 +03:00
33237d5a59
feature ( #7325 )
2022-07-08 15:48:41 +03:00
3422e161ad
Removed deprecated uniques
2022-07-08 15:48:33 +03:00
87aa5bc2c0
Resolved #7379 - puppet cities generate no extra unhappiness (per Civ V)
2022-07-08 14:17:29 +03:00
e8eb66a4f6
Resolved crash when resuming before music controller initialized
2022-07-07 19:57:34 +03:00
ce5f0dd879
Increase mod search request page size ( #7377 )
2022-07-07 17:43:16 +02:00
60f7ea4322
Unstack enemy unit strength modifiers ( #7390 )
2022-07-07 17:52:16 +03:00
fc1896eaf1
Puppeted cities can no longer become capitals ( #7360 )
2022-07-07 16:28:57 +02:00
aadec7e211
fixed zoom buttons not toggling without reloading the worldscreen ( #7378 )
...
* feature
* readablity
2022-07-05 22:06:38 +03:00
f3e043cd8f
Update UnitGroup.kt ( #7375 )
...
Handle unitBaseImage and actionGroup layers of unit icons properly if unit is idle
2022-07-05 22:04:51 +03:00
99367c2212
Version rollout ( #7366 )
...
* Bump version and create initial changelog entry
* Update Persian_(Pinglish-UN).properties (#7365 )
Translate some English words
* Update Persian_(Pinglish-UN).properties (#7364 )
* Update Spanish.properties (#7362 )
Improve unique understanding, not even I could really understand xDDD
* Update French.properties (#7361 )
* Update Simplified_Chinese.properties (#7356 )
* Update Simplified_Chinese.properties
* Update android/assets/jsons/translations/Simplified_Chinese.properties
* Some buttons were just filled (Brazillian Portuguese)! (#7355 )
* Yet another section filled!
Just translated some menu options and buttons. I feel nice.
* Removed 'Requires translation' text
* new translations (#7352 )
* Update Lithuanian.properties (#7350 )
* Update German translation (#7349 )
* Update Spanish.properties (Floating Gardens) (#7346 )
In Mexico they are called "Chinampas"
* Revert "Update Persian_(Pinglish-UN).properties (#7365 )" (#7367 )
This reverts commit bb09098ce9#7364 )" (#7368 )
This reverts commit 6e337127abyairm210@users.noreply.github.com >
Co-authored-by: Herbad <108671374+Herbad@users.noreply.github.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: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Pssstr <85759927+Pssstr@users.noreply.github.com >
Co-authored-by: HasChad <58506555+HasChad@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: KESMGAMA <108433075+KESMGAMA@users.noreply.github.com >
2022-07-05 22:04:28 +03:00
8b4bb89995
Fix duplicate version in string ( #7374 )
2022-07-05 08:05:06 +03:00
33e5b6475a
Fix actionGroup Opacity ( #7370 )
...
Makes actionGroup layer of unit icon 100% opaque when selected.
2022-07-04 22:16:42 +03:00
4f97c239b4
Add civ names under their icon in diplomacy screen ( #7240 )
2022-07-04 17:26:30 +02:00
9477b319bc
Generalize production-to-stat conversion uniques ( #7342 )
...
* Generalize production to stat conversion enabling uniques
* Remove unnecessary code
* Rename class
* Update sound
2022-07-04 16:38:24 +03:00
1649b236bb
Slight optimization of getAttackableEnemies ( #7353 )
2022-07-04 16:35:49 +03:00
716d5d3214
Unit icon alpha control ( #7343 )
...
* Unit icon alpha/size control
Implemented sliders in Options -> Display to give user control over unit icon opacity and size.
* Simplified sliders and re-added idle 50% transparency
* Minor fixes from PR review
* Removed unit icon size adjustment
2022-07-04 16:35:36 +03:00
8203557633
Better AI targeting ( #7359 )
2022-07-04 16:34:33 +03:00
21f0f9255d
Version rollout ( #7348 )
...
* Bump version and create initial changelog entry
* Update in Hungarian (#7341 )
After all this time.... I'm back with a translating. Tried my best.
* More translations to Portuguese-Brazilian (#7340 )
* More translations to Brazilian Portuguese
* Adding more translations to Brazilian Portuguese
* Translations to Brazilian Portuguese
* Update Turkish.properties (#7338 )
* Update Spanish.properties (#7327 )
* Update Catalan.properties (#7324 )
* Update Filipino.properties (#7320 )
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Filipino.properties
* Update Indonesian.properties (#7319 )
* Update German translation (#7318 )
* Update German translation
* Update German translation
* Update German translation
* Update Lithuanian.properties (#7317 )
* Update Simplified_Chinese.properties (#7315 )
* Update Simplified_Chinese.properties
* Apply suggestions from code review
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
* Update French.properties (#7308 )
Co-authored-by: yairm210 <yairm210@users.noreply.github.com >
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com >
Co-authored-by: André Lucas C. da Silva <andr9310@gmail.com >
Co-authored-by: HasChad <58506555+HasChad@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: Shann Aurelle Ripalda <shannaurelleg@gmail.com >
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com >
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com >
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com >
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com >
Co-authored-by: heipizhu4 <100454479+heipizhu4@users.noreply.github.com >
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com >
2022-07-01 10:07:48 +03:00
