Commit Graph

3540 Commits

Author SHA1 Message Date
16a7eed4ff Add Repair and Pillaging Roads (#8015)
* Reapply Changes

* Logic clean up

* Adding getImprovementToPillage() and getRepairableImprovement()

* Cleaning up Unit Actions

* getImprovementToPillage() needs to check for Unpillagable

* Remove redundant logic since canBuildImprovement() returns true if currently repairing

* More redundant logic

* Prevent City Center from being Pillage status
addRepairAction will not show a Repair Action
Adding the improvement to be repaired/pillaged in button text
Utilizing getImprovementToPillage() more

* Some import cleanup
Add Irremovable to blockers
More consolidation of code

* More translation files

* When improvements/roads are built/removed, pillaged flag set to False

* Better and more consistent logic

* Fix dumb logic bug
2022-11-27 19:12:26 +02:00
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
683c3483b4 AbsoluteUnits - Unique Elephants (#8053) 2022-11-26 20:33:48 +02:00
10e8f3169d HexaRealm units are here, finally! (#8052)
* Initial upload of HexaRealm units

(Just to get folder created

* Add files via upload

* Add files via upload
2022-11-26 18:46:45 +02:00
59c2f4bb09 4.3.3 2022-11-24 11:43:28 +02:00
98900d9162 Version rollout (#8048)
* Bump version and create initial changelog entry

* Update Spanish.properties (#8043)

?

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-24 11:33:25 +02:00
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00
ee8c190c06 Version rollout (#8042)
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8039)

* Update Greek.properties (#8038)

* Update Greek.properties

* Translating to Greek for unciv.

* Update Simplified_Chinese.properties (#8037)

* Update German.properties (#8035)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: RA1DEN-cyborg <73561839+RA1DEN-cyborg@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
2022-11-22 23:11:57 +02:00
19d591dd89 Fixed json tests 2022-11-22 00:17:10 +02:00
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02:00
ee2ab74715 Converted all era uniques to conditional uniques for city-states 2022-11-21 22:46:32 +02:00
2e5e221158 CityStateType overhaul!!!! 2022-11-21 20:30:52 +02:00
6976360da6 Added CityStateTypes into rulesets! Not in use yet 2022-11-21 19:59:55 +02:00
3dfdcd1cbf 4.3.1 2022-11-20 23:27:02 +02:00
2d37f3c473 Version rollout (#8034)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8033)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update French.properties (#8032)

* Update Catalan.properties (#8031)

* Update Catalan.properties

* ca-ES: Change some hyphens with dashes.

* Update Italian.properties (#8030)

* Update Italian.properties

* Update Italian.properties

* "Updated Brazilian Translation" (#8029)

* Update German translation (#8027)

* Update Indonesian.properties (#8025)

* Update Spanish.properties (#8024)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
2022-11-20 23:22:31 +02:00
c5bde45c5d Moved city state icons to separate folder 2022-11-20 18:48:28 +02:00
e5fbb472b0 Moddable quest weighting for city-states 2022-11-19 23:54:16 +02:00
694e0d33fc AbsoluteUnits - Unique Spearmen (#8026) 2022-11-19 18:01:13 +02:00
ac614c3a44 4.3.0 2022-11-17 22:28:25 +02:00
4038d75035 Version rollout (#8023)
* Bump version and create initial changelog entry

* Update German translation (#8020)

* Update Spanish.properties (#8019)

* Update French.properties (#8018)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-11-17 22:22:33 +02:00
0b864cd2d2 Resolved #8016 - fixed civilopedia text that says city-states don't conquer other cities 2022-11-16 17:53:00 +02:00
0a13e58bde 4.2.20 2022-11-15 19:02:22 +02:00
bf4172dba0 Version rollout (#8014)
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8013)

* Update Filipino.properties (#8012)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Italian.properties (#8009)

* Update German translation (#8008)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
2022-11-15 18:58:13 +02:00
5dc46c3ad5 New "Unitset" option translatable (#8006)
Makes "Unitset" translatable (related to #7980)
2022-11-13 07:26:58 +02:00
67f33c8ac6 Renamed AbsoluteUnits unitset @letstalkaboutdune - see #7980 2022-11-13 00:34:51 +02:00
705cbb79b5 4.2.19 2022-11-12 21:26:24 +02:00
76f25e5fde Version rollout (#8004)
* Bump version and create initial changelog entry

* Update Catalan.properties (#8002)

* update (#7999)

* Update Spanish.properties (#7998)

* Update French.properties (#7997)

* Update Italian.properties (#7996)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-11-12 21:22:45 +02:00
d1ccdfdba5 AbsoluteUnits - Unique Archers (#8000)
* AbsoluteUnits - Unique Archers

Also fixes bug with Spanish unique embarked sprite.

* Unique Archers - Tilesets.atlas/png update
2022-11-10 08:54:05 +02:00
f3d7524dcd 4.2.18 2022-11-09 14:06:41 +02:00
83f2c7825f Version rollout (#7995)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7993)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
2022-11-09 14:01:01 +02:00
c98a36c10f Added before/after X turns conditionals - see #3242 2022-11-07 22:56:58 +02:00
3e05b875bd Added before/after Pantheon conditionals - see #3242 2022-11-07 22:39:55 +02:00
b0c84f5eea 4.2.17 2022-11-07 18:20:19 +02:00
01d95652c0 Version rollout (#7992)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7983)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Catalan.properties (#7979)

* little amend

* Update Catalan.properties

* Translate vietnamese (#7978)

* update vietnam

* update Vietnamese.properties

* Update Bulgarian.properties (#7974)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Dob <100198047+dobval@users.noreply.github.com>
2022-11-07 18:15:36 +02:00
803062781c Resolves #7985 - Added layout for promotions (#7991)
* Converted existing promotions to table layout

* Added col/row to G&K promotions

* Added ruleset error tests for promotion locations
2022-11-07 17:53:42 +02:00
0858f8c038 Added AbsoluteUnits as default units for Hexarealm tileset :D 2022-11-02 23:10:40 +02:00
039d0b3540 4.2.16 2022-10-29 22:27:13 +03:00
4a3da8fcfd Version rollout (#7973)
* Bump version and create initial changelog entry

* Update German translation (#7961)

* Update Filipino.properties (#7960)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Provide some of the missing Ukrainian translations (#7958)

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

* Update French.properties (#7955)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-10-29 22:16:01 +03:00
731e9f5815 4.2.15 2022-10-24 20:54:04 +03:00
2f693547b4 Fixed spearman not being to be able to upgrade to anything after Gunpowder and before Metallurgy 2022-10-24 20:51:52 +03:00
3246b82531 Version rollout (#7954)
* Bump version and create initial changelog entry

* Update Filipino.properties (#7950)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Improve Ukrainian translations a tad (#7949)

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

* Update Brazilian_Portuguese.properties (#7948)

* Update Polish.properties (#7945)

* Update Spanish.properties (#7943)

* Update Indonesian.properties (#7942)

* Update Italian.properties (#7941)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: Kostiantyn Kolesnichenko <test9@mormat.name>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: pyotr_p <pyotr.pietrzak@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2022-10-24 20:16:17 +03:00
55908cb115 Unit era variants added to FantasyHex tileset (#7944)
* Add files via upload

* Add files via upload
2022-10-23 19:57:43 +03:00
a450ddbb2c 4.2.14 2022-10-22 20:32:30 +03:00
7c6df3db7e Version rollout (#7940)
* Bump version and create initial changelog entry

* Update Vietnamese.properties (#7932)

* One hungarian update (#7928)

I'm back, tried my best with this one.

* Update German translation (#7927)

* Update Spanish.properties (#7924)

* Update Japanese.properties (#7923)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* update Vietnamese (#7922)

* Update Traditional_Chinese.properties (#7921)

* Update Traditional_Chinese.properties

* Update Traditional_Chinese.properties

* Update French.properties (#7919)

* Update Filipino.properties (#7918)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Russian.properties (#7917)

* Update Russian.properties

* Update Russian.properties

* Update Traditional_Chinese.properties (#7916)

* Update Brazilian_Portuguese.properties (#7915)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Thienanbad <89069988+Thienanbad@users.noreply.github.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: K0baU <63403741+K0baU@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-10-22 20:24:46 +03:00
55e6541ee0 Add Temperature Offset Slider (#7891)
* Add slider
Align spawnIce latitude and offset code to applyHumidityAndTemperature

* A bunch of debug code
Make default Water Level -0.05 for Default

* Remove debug println
Fix Desert at 0.9-1.0 temp and <0.2 humidity

* Disable reseed for debug comparison
Reset Plains/Grassland for high temp. Adjust max humidity for safety of Grasslands
Humidity debugger
Better slider

* Remove all debug code

* Undo Desert temp setting
2022-10-22 20:12:57 +03:00
c39aca7a31 Change Default Map Generation to Perlin (#7856)
* Changes

* Slight adjustment to MainMenuScreen

* Make default waterThreshold for Default to be -0.05

* blip

* blip

* Rename cellular automata to Smoothed Random
2022-10-22 20:11:55 +03:00
984e91a73e Resolved #7934 - Fixed Temple of Artemis production bonuses 2022-10-21 16:14:43 +03:00
4526b0f17d 4.2.13 2022-10-13 20:10:19 +03:00
fdd5d0c796 Version rollout (#7914)
* Bump version and create initial changelog entry

* Update Traditional_Chinese.properties (#7913)

* Update Brazilian_Portuguese.properties (#7911)

fixing brazilian portuguese wrong translation

* Update Lithuanian.properties (#7909)

* Update Catalan.properties (#7908)

* Update Indonesian.properties (#7907)

* Update Italian.properties (#7906)

* Update Ukrainian.properties (#7905)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

smol fix

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update French.properties (#7903)

* update (#7902)

* Update Filipino.properties (#7900)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update German translation (#7899)

* Update Brazilian_Portuguese.properties (#7897)

* Update Spanish.properties (#7896)

* Update Russian.properties (#7895)

* Update Russian.properties

* Update Russian.properties

* tests fixed by removing bad translation

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: 羅少希 <83118946+Tab-Etuc@users.noreply.github.com>
Co-authored-by: David Wesley <david.moura12@hotmail.com>
Co-authored-by: MindaugasRumsa51 <107413099+MindaugasRumsa51@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Marerjh <40261003+Marerjh@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: vvinam <vvinam@gmail.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
2022-10-13 20:06:49 +03:00
ad72c42911 fix untranslated string about politics (#7901)
* fix untranslated string about politics

* update shortcut about textbutton

* check all usage of template "[numberOfTurns] Truns Left"

* revert textbotton and add click event by chain.
2022-10-07 12:36:00 +03:00