mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-03 04:45:34 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,881 Commits 6 Branches 1,047 Tags 1.1 GiB
a20baca7c2
Commit Graph

2495 Commits

Author SHA1 Message Date
Xander Lenstra
a20baca7c2
You can now input distinct numbers when trading gold (#5072) 
* Type amount of gold in trade requests

* Remove extraneous spaces in template.properties

* Implemented proposed changes

* Fixed tests
 2021-09-05 12:10:57 +03:00
SomeTroglodyte
6bc58ab5a3
Tabbed options (#5081) 
* Tabbed Options Screen

* Tabbed Options Screen - atlas
 2021-09-04 21:30:39 +03:00
SomeTroglodyte
60500d17a6
A flag for Traditional_Chinese (#5083) 2021-09-04 21:29:28 +03:00
SomeTroglodyte
2069f227c4
Newgame Mod incompatibility toast (#5076) 2021-09-03 12:26:38 +03:00
SomeTroglodyte
5e8ecff397
Remove nonsignificant whitespace from templates (#5073) 2021-09-03 09:35:03 +03:00
SimonCeder
8cb464c9f7
Correct year shown when starting in later eras (#5070) 
* json, getEquivalentTurn

* WorldScreenTopBar.kt

* affects shown year only
 2021-09-03 00:13:58 +03:00
Xander Lenstra
2993ffb272
Fixed holy site sprite not showing up (#5067) 2021-09-03 00:12:54 +03:00
yairm210
7c3f8ce661 3.16.11 2021-09-02 21:03:18 +03:00
Yair Morgenstern
4dae73bbfe
Translations update (#5065) 
* Update Czech.properties (#5064)

- new strings

* Update Spanish.properties (#5059)

* Update Indonesian.properties (#5056)

* Update French.properties (#5054)

* Update Italian.properties (#5035)

* Update Italian.properties

* Update Italian.properties

* Update Swedish.properties (#5034)

* Update Swedish.properties

* Update Swedish.properties

* German language updated (#5027)

* German language updated

* Anmerkungen korrigiert.

Habe alle berechtigten Anmerkungen korrigiert. Manchmal sieht man den Wald vor Bäumen nicht mehr... :D

* Update Japanese translation (#5005)

* update

* main-policies

* fix

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

Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Fireboss_05 <47520445+Fireboss05@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Lordsem <62795018+Lordsem@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Xander Lenstra <71121390+xlenstra@users.noreply.github.com>
 2021-09-02 20:54:22 +03:00
Xander Lenstra
df853504ae
Great Prophets now always have your religion as their religion (#5052) 
* Great Prophets now always have your religion as their religion

* Reworded unique for clarity
 2021-09-02 20:52:24 +03:00
Xander Lenstra
9575b5bf66
Implemented renaming of religions (#5057) 
* Implemented renaming of religions

* Made AskForText display error on invalid input, implemented recommended changes

* Almost forgot the translatable strings in the new popup
 2021-09-02 17:40:10 +03:00
Xander Lenstra
fcc335b78a
Refactor more code, hopefully increasing maintainability (#5062) 
* Fixed great person gift formula, confusing boolean, "great person" filter

* Refactored getRejectionReason to return a hashSet of reasons instead of a random one
 2021-09-02 16:37:40 +03:00
Xander Lenstra
186d06faf0
When spreading a religion with a great prophet, other religions are now removed (#5055) 2021-09-01 19:21:09 +03:00
Xander Lenstra
b347366d50
Refactored some code and uniques (#5051) 
* Refactored some code and uniques

* Fixed compilation errors, tests and crashes

* Moved influence bounds check from add to set
 2021-09-01 19:20:04 +03:00
Xander Lenstra
cffe8e441e
Finishing the later five policy trees now allows you to buy great people with faith (#5038) 2021-09-01 09:46:27 +03:00
Xander Lenstra
634f4a3533
Added Religious wonders (#5041) 
* Added Grand Temple and Great Mosque of Djenne buildings

* Added uniques for Grand Temple

* Added uniques for Mosque of Djenne, refactored ability uses system to count down isntead of up
 2021-08-31 22:23:02 +03:00
Xander Lenstra
9450fac423
Added UI to show what cities are holy cities to the player (#5039) 2021-08-31 16:55:29 +03:00
yairm210
a77e8015e1 3.16.10 2021-08-30 23:30:09 +03:00
Yair Morgenstern
75efe74226
Translations update (#5033) 
* work on dutch.properties (#5025)

* additions to dutch translation, some minor corrections

* fixes for dutch translation

* Update Swedish.properties (#5024)

* Update Swedish.properties

Translated the newly added lines.

* Improved translation

Improved translation

* Update Indonesian.properties (#5023)

* Update German translation (#5020)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Italian.properties (#5015)

Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-30 23:24:35 +03:00
SimonCeder
a7c4895985
Add Austrian civ (#5026) 
* Json definition for nation, images

* Jsons, Hussar and Coffee House

* Diplomatic Marriage Button

* Implement Marriage

* AI Marriage

* template.properties

* Popups etc

* Strings

* reviews

* reviews pt 2
 2021-08-30 23:21:02 +03:00
SimonCeder
a01a6270fc
Demanding tribute from city states (#4976) 
* tribute willingness calculations

* implement demanding gold and workers

* Revisions

* unit power calculation

* show modifiers in the diplo screen

* template.properties

* G&K modifiers

* promotions start at 0

* notiifications, AI

* conflict

* conflict?

* template and translation, failing test?

* another missing string

* missing space

* afraid relationship status

* missing space 2

* Slight optimization

* optimization pt 2

* reviews
 2021-08-30 14:17:20 +03:00
SomeTroglodyte
9c3e621b15
Atlas reorg - packer to loader via json (#5014) 2021-08-29 23:29:24 +03:00
Xander Lenstra
5094a068fe
Fixed ambush bonus amount (#5021) 2021-08-29 20:37:59 +03:00
SomeTroglodyte
5403f28c77
Remove inactive server code and music (#5017) 2021-08-29 11:33:46 +03:00
SomeTroglodyte
5a6a9c9759
Anti-Armor, negative tile yield, LoadScreen (#5018) 
* Harden against negative yields, Anti-Armor

* Anti-Armor bad unitType, LoadScreen
 2021-08-29 11:33:20 +03:00
yairm210
6a3fddc757 3.16.9 2021-08-29 01:43:22 +03:00
Yair Morgenstern
342eae4060
Translations update (#5013) 
* Update Dutch.properties (#5008)

* work on dutch translation: new translations and some corrections

* fixes for dutch translation

* Update Italian.properties (#5006)

* Update Indonesian.properties (#5004)

* Update German translation (#4999)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Swedish.properties (#4997)

* Update Swedish.properties

Translated the newly added lines.

* Fixed misplaced space

* Update Spanish.properties (#4992)

* Update Spanish.properties

* Update Spanish.properties

Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
 2021-08-29 01:37:59 +03:00
Xander Lenstra
1cc90a3953
Implemented the enhancing of religions (#4965) 
* Generalize the concept of founding religions in preparation of enhancing

* Implemented enhancing religions

* Added all enhancer beliefs (mostly correctly, mostly tested)

* You can now found a religion without a pantheon, requiring you to choose a pantheon as well

* Parameterized 'enhance religion' action, fixed tests

* Implemented requested changes & simplified beliefContainer a lot

* Fixed rename

* Updated code to include features added in the meantime

* Merge branch 'master' into enhanceReligions

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-08-28 22:36:11 +03:00
Xander Lenstra
85e4a68ea1
Submarines are now visible to adjacent units, and once turned visible, can be attacked by all enemy units (#5001) 
* Submarines are now visible to adjacent units, and once turned visible, can attack be all enemy units

* Deprecation & translation of unique saving
 2021-08-27 17:00:12 +03:00
SomeTroglodyte
bf2ee91b67
Civilopedia Phase X (#5003) 
* Civilopedia Phase X - Show Policies

* Civilopedia Phase X - Show City States

* Civilopedia - Loop-driven init and Cleanup

* Civilopedia - City States

* Civilopedia Phase X - Remove spurious comments
 2021-08-27 16:24:23 +03:00
yairm210
30e5ac3665 3.16.8 2021-08-26 17:45:17 +03:00
SomeTroglodyte
448b04fab8
Civilopedia - Tweaks (#4990) 
- Icon for BeliefType.Founder
- Religion icons inverted in Civilopedia
- Terrain icons in links and entry header centered
 2021-08-26 17:29:55 +03:00
Yair Morgenstern
e442c4dcf1
Translations update (#4996) 
* Update Simplified_Chinese.properties (#4991)

* Update Russian.properties (#4989)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

Mostly corrected mistakes of the previous translator and translated some of the new strings

* Update Swedish.properties (#4988)

* Update Italian.properties (#4979)

* Update German translation (#4974)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Portuguese.properties (#4957)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@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>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
 2021-08-26 17:10:18 +03:00
Xander Lenstra
86d1f143d9
Conquering a city destroys buildings inside the city (#4995) 
* When conquering a city, some buildings are now destroyed

* Added missing translation for uniques
 2021-08-26 17:09:55 +03:00
SomeTroglodyte
cdc63f71e8
Multi-Atlas / Image packer redo (#4959) 
* Atlas reorg

* Atlas reorg - resulting atlases 1

* Atlas reorg - resulting atlases 2

* Atlas reorg - merge
 2021-08-24 07:31:21 +03:00
SomeTroglodyte
b93f93ea9b
Stat Icons Redone (#4961) 
* Stat Icons Redone

* Stat Icons Redone - Sources

* Stat Icons Redone - Rebuild atlas
 2021-08-23 23:15:17 +03:00
yairm210
e62fdc2218 3.16.7 2021-08-23 21:11:21 +03:00
Yair Morgenstern
599a373b6d
Translations update (#4972) 
* Update Indonesian.properties (#4962)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Swedish.properties (#4950)

Translated the newly added lines.

* Update Simplified_Chinese.properties (#4946)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#4944)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Adding to the Polish translation. (#4942)

* Added some new translations and fixed two typos

* Reworded one bit

* New translations

* New translations, focusing mainly on system stuff

* Fixed the [stat]

* Update Japanese.properties (#4938)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#4937)

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: Jerry1962325 <60921621+Jerry1962325@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: Marcel Zelent <79370135+MarcelZelent@users.noreply.github.com>
Co-authored-by: yuracla <89312848+yuracla@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-08-23 20:41:31 +03:00
Xander Lenstra
89ea30af95
Implemented Inquisitors (#4909) 
* Added inquisitor unit including image

* Inquisitor now blocks spreading of religions

* Added 'remove heresy' action

* Fixed tests

* Reworded remove heresy unique, updated sprites

* Fix Crash

* Implemented requested changes & fixed a few minor bugs

* Implemented requested changes
 2021-08-23 20:26:37 +03:00
Xander Lenstra
15c4b67781
Implemented a cap for the production boost of great engineers (#4966) 
* Implemented a cap for the production boost of great engineers

* Added a hybrid solution

* Adding production now shows the amount of production added
 2021-08-23 20:21:28 +03:00
Xander Lenstra
0868e31adb
Scouts still ignore terrain costs after upgrades (#4954) 
* Scouts still ignore terrain costs after upgrades

* Added an icon for the new promotion
 2021-08-22 23:27:33 +03:00
Xander Lenstra
40e35b2167
Fixed interpunction & typos in the tutorial (#4941) 
* Fixed interpunction & typos in the tutorial

* Fixed old translations not being removed (unless words were changed)
 2021-08-22 14:08:42 +03:00
yairm210
7228b2d4ae 3.16.6 2021-08-21 21:22:24 +03:00
Yair Morgenstern
0118eb6425
Translations update (#4936) 
* Update Swedish.properties (#4932)

Translated the newly added lines.

* Update Portuguese.properties (#4926)

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Portuguese.properties

* Update Indonesian.properties (#4915)

* Update Spanish.properties (#4914)

* Update Spanish.properties

* Update Spanish.properties

* Update German translation (#4911)

Co-authored-by: Alex25820 <50142558+Alex25820@users.noreply.github.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2021-08-21 21:06:00 +03:00
SomeTroglodyte
13365e5ad6
Ancient Ruins, Civilopedia and Translations (#4907) 
* Ancient Ruins, Civilopedia and Translations
- TranslationFileWriter can process Ruins.json
- Hide Religion / Civilopedia uniques hardcoded String moved to Constants
- Civilopedia display of Ruins pulls actual json rewards in code
- Manually curated rewards description removed

* Ancient Ruins, Civilopedia and Translations
- Old rewards descriptions moved to names, color
- Code now recreates old output closely
- civilopediaText allowed additionally
- TranslationFileWriter tweaked accordingly

* Ancient Ruins, Civilopedia and Translations - fix stargazers
 2021-08-21 20:57:39 +03:00
Miraç
3b980a24bd
Made great people and boats uncapturable (#4930) 
* Made great people and boats uncapturable

minus Great Prophet obviously.
Marks up one element in #4697

* included in khans as well
 2021-08-21 20:55:16 +03:00
yairm210
58a45a5a4d Added caching to the gradle properties 
Also added android:exported tags so that android:processDebugMainManifest doesn't fail the gradle check.
I think this is only failing locally because I bumped the compileSdkVersion to 31, but that means it'll need to go in soon anyway.
 2021-08-20 14:30:45 +03:00
Xander Lenstra
b2e6612c0e
Added a UI for viewing the religions inside a city (#4904) 
* Added a UI for viewing the religions inside a city

* Rewrote large parts of the UI, implementing @SomeTroglodyte's great advice
 2021-08-20 08:59:13 +03:00
Xander Lenstra
d856efac06
Implemented almost all missing founder & follower beliefs (#4890) 
* Implemented almost all missing founder & follower beliefs

* Added missing negator

* Implemented requested changes
 2021-08-20 01:24:28 +03:00
yairm210
eb8e76ba08 3.16.5 2021-08-19 20:49:08 +03:00