mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-10 23:37:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,704 Commits 7 Branches 1,036 Tags 1.1 GiB
731e9f5815
Commit Graph

7704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yair Morgenstern
948b95a9dc Android gradle update - explicitly state build tools version, remove desugaring 2022-08-05 10:49:38 +03:00
Xander Lenstra
7a749fdec1
Added 'without resource' conditional (#7611) 2022-08-05 10:16:30 +03:00
Xander Lenstra
121859defb
Added a unique for destroying improvements on attack (#7605) 
* Added a unique to destroy improvements on attack

* Removed last part of unique, as we have the `in [tileFilter] tiles` conditional
 2022-08-04 20:12:42 -04:00
Yair Morgenstern
a1357414a0 4.2.2 2022-08-04 18:37:23 +03:00
Yair Morgenstern
7473213d77
Version rollout (#7601) 
* Bump version and create initial changelog entry

* Update Ukrainian translations - add missing, correct existing (#7597)

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

* Update Simplified_Chinese.properties (#7590)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

* Update Korean.properties (#7585)

* Update Catalan.properties (#7583)

* Update French.properties (#7575)

* Update Spanish.properties (#7574)

Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>

* Update Italian.properties (#7572)

* Update Dutch.properties (#7547)

* Update Dutch.properties

* Paar spellingsdingetjes eruit gehaald

* Vertalingen toegevoegd

Verwarrend: speler-ID en gebruiker-ID worden door elkaar gebruikt! vb regel 675
Mag het pull request worden geamendeerd of moet er een apart pull request gemaakt worden?

* Paar spellingsdingetjes

* Nieuwe vertalingen

* Fixed tests not working

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

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: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: TPunkiee <110175928+TPunkiee@users.noreply.github.com>
 2022-08-04 18:32:20 +03:00
MindaugasRumsa51
5cc77dad3e
Update ReligionAutomation.kt (#7581) 2022-08-04 18:29:20 +03:00
Yair Morgenstern
c4747524d4
Disabled packing base images when running from JAR (#7478) 2022-08-04 10:35:01 +03:00
Nika Kasradze
33ca2d8ef9
fix #7565: Remove duplicate "Consumes ..." lines of city screen (#7592) 
* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen

* fix #7565: Delete one "Consumes ..." lines of city screen
 2022-08-03 13:38:35 -04:00
itanasi
61d48a5c37
Add Damage numbers to Battle Notifications (#7587) 
* Initial changes

* Adding damage numbers
 2022-08-03 20:24:19 +03:00
OptimizedForDensity
67fbc07552
Add translation for XP on World Screen (#7595) 2022-08-03 20:22:46 +03:00
Xander Lenstra
01cc67cee4
Reworded a tutorial, deleted unused line (#7594) 
* Reworded a tutorial, deleted unused line

* Fixed faith symbol
 2022-08-03 20:22:29 +03:00
itanasi
0da7918a94
Minor Compile change (#7588) 2022-08-03 10:42:41 -04:00
itanasi
2671babefd
Fix Air Sweep Notification Translations (#7577) 
* Fix Air Sweep Notification Translations

* Modify all translation files

* Fix a missing space
 2022-08-03 17:34:21 +03:00
xk730
ebafe97e67
Updated the interface introduction content in the Encyclopedia of civilization (#7586) 
* Add files via upload

* Upload the World_Screen.png

This will match the latest presentation

* Upload the World_Screen.png

because it is so old

* Update Tutorials.json

The Tutorials.json add the ：
㉑: The Multiplayer Button - Here will help you easily check your current multiplayer game",
This will match the latest presentation
and
ⓗ: Here you will see what you currently have ☮Faith quantity, of course, if you don't open it ☮Faith Before starts the game, this will be ‘Off’
 2022-08-03 17:33:37 +03:00
itanasi
436917f2af
Allow Citizen Management to pick any tile owned within 3 tiles (#7533) 2022-08-03 16:08:46 +02:00
Ouaz
7f1c91ddaf
Update template.properties (#7576) 
Fix untranslatable strings (issue #6131)
 2022-08-02 22:57:10 +02:00
OptimizedForDensity
30e1dcbcdd
Fix broken translation (#7580) 2022-08-02 18:23:37 +03:00
Yair Morgenstern
a3e7d5ccb6 fastlane cleanup for bad translations 2022-08-01 23:39:03 +03:00
Yair Morgenstern
1d83d16e85 4.2.1 2022-08-01 19:50:30 +03:00
Yair Morgenstern
99cda99f41
Version rollout (#7571) 
* Bump version and create initial changelog entry

* Update Korean.properties (#7569)

* Update Korean.properties

Checking every 10~20 lines...

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Ukrainian translations (#7560)

* Update Ukrainian.properties - add missing translations

* Missing translations are added

* Trailing spaces are restored

* More translations are added

* More translations are added

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

* Hungarian translation #idk (#7558)

Another translation coming up from here ^^

* Update Polish.properties (#7556)

* Update Italian.properties (#7555)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update French.properties (#7553)

* Update Spanish.properties (#7552)

* Update Spanish.properties

Woah, I got fuzzy with so many "Interceptor" conjugations 0_o\

* Update Spanish.properties

* Improve Spread Religion tutorial

Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>

* Update Catalan.properties (#7551)

* Update Catalan.properties

* Update Catalan.properties

* Update Catalan.properties

* Update Turkish.properties (#7548)

`Domalan` is too local a translation and has other meanings. `Yermantarı"` is better.

* Update Simplified_Chinese.properties (#7546)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Indonesian.properties (#7541)

* Update Indonesian.properties

* Fixed tests

Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Yattong the Mackerel <saud2410@naver.com>
Co-authored-by: Jack Rainy <JackRainy@users.noreply.github.com>
Co-authored-by: Kostiantyn Kolesnichenko <mormat.iam@gmail.com>
Co-authored-by: JurDan | Led Cut <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: pyotr71 <pyotr.pietrzak@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: OptimizedForDensity <105244635+OptimizedForDensity@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Selim <slmyldz41@gmail.com>
Co-authored-by: xk730 <40309144+xk730@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2022-08-01 19:48:09 +03:00
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