mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-08 01:54:02 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,494 Commits 6 Branches 1,050 Tags 1.1 GiB
b650b95356
Commit Graph

2102 Commits

Author SHA1 Message Date
Xander Lenstra
b650b95356
Add missing pantheons, fix minor bugs (#4419) 
* Added all remaining pantheons

* AI now choose pantheons, AI no longer tries to get mutually exclusive policies

* I don't know why this was changed

* Implemented requested changes
 2021-07-10 22:50:50 +03:00
Xander Lenstra
253e62de72
City states give gold when met; updates to city state gold gifts (#4435) 
* City States now give gold when met

* City States can now receive different amounts of gold, and the amount of influence gained from gifts follows the base game

* Implemented requested changes

* Fixed tests
 2021-07-10 21:51:11 +03:00
Yair Morgenstern
d262c1a6ea Automated atomic bombs no longer cause crashes 2021-07-09 13:51:18 +03:00
Xander Lenstra
c327b54b1b
City Centers can no longer be removed by nukes (#4423) 
* City Centers can no longer be removed by nukes

* Implemented requested changes

* Implemented more requested changes
 2021-07-09 12:13:45 +03:00
Yair Morgenstern
df7bba02a1 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-07-09 11:01:40 +03:00
Yair Morgenstern
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +03:00
Xander Lenstra
5376e488a0
Added a simplified version of great prophets, implemented a basic city religion UI (#4356) 
* Add a very simple display for the religion in a city

* Added missing credits for shrine

* Added Great Prophet unit

* Great prophets can now be generated using faith

* Great Prophets can now construct holy sites

* Great Prophets can now spread their religion to friendly cities

* Holy site can only be constructed if the great prophet hasn't spread religion yet

* Added missing translation string

* Fixed more translation problems

* Implemented requested changes
 2021-07-09 10:48:33 +03:00
Yair Morgenstern
abd877dd1b Resolved #4427 2021-07-09 10:19:21 +03:00
Yair Morgenstern
cc3146f92b Actual translations 2021-07-09 10:17:22 +03:00
Yair Morgenstern
37942a1af6
Translations update (#4433) 
* Update Ukrainian.properties (#4429)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Added Civilopedia Texts

* Add most of religion-related stuff and made some other edits

Also I haven't understood how to translate Goddess of Festivals and Religious Idols uniques

* Update Russian.properties (#4424)

* Update Russian.properties

Translated some of new strings

* Update Russian.properties

* Update Russian.properties

Some more translation and improvements

* Update Indonesian.properties (#4421)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Korean.properties (#4420)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update German translation (#4413)

* Update German translation

* Update German translation Iroquois

* Update German translation

* Update German translation

* Translation of The Netherlands

* Update Swedish.properties (#4414)

* Update Swedish.properties

* Update Swedish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
 2021-07-09 09:19:02 +03:00
Xander Lenstra
21eadb39ff
Updated TranslationFileWriter to include the new values that filters can have (#4402) 
* Updated TranslationFileWriter to include the new values that filters can have

* Implemented requested changes
 2021-07-09 09:14:24 +03:00
SomeTroglodyte
5e01ce82b2
Quick salvage of some lost translations (#4415) 2021-07-07 23:08:20 +03:00
Xander Lenstra
fbd64b9520
Refactored the way cities determine what uniques should apply when (#4393) 
* I'm so sorry for the size of this PR

* Uniques are better generalized

* Code now compiles

* Missed a line

* Some more cleaning up
 2021-07-07 22:01:14 +03:00
Yair Morgenstern
ecd5ae5128 3.15.9 2021-07-07 20:54:19 +03:00
ArchDuque-Pancake
9b2460f166
Update Spanish Properties - ¡read my description! (#4404) 
In the tutorials part, I am not sure if all those emojis are different or not, I can not tell. So please, check that and if you can correct it if you can.
 2021-07-07 20:01:28 +03:00
SomeTroglodyte
373b42bfcf
Update "World screen" tutorial text and Home key improved (#4403) 2021-07-07 20:00:12 +03:00
Yair Morgenstern
8eb97b2ea0
Translations update (#4400) 
* Update Ukrainian.properties (#4398)

* Update Simplified_Chinese.properties (#4397)

* Update Russian.properties (#4384)

* Update Russian.properties

Translated new strings

* Update Russian.properties

* Update Swedish.properties (#4383)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Indonesian.properties (#4382)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Update German translation (#4380)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update German translation for railroad things

* Update Korean.properties (#4376)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Zkdc <Zkdc2345@qq.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@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: Samsaek the Calico <saud2410@naver.com>
 2021-07-07 19:59:14 +03:00
SomeTroglodyte
7875ec4896
Better mod download and error display (#4396) 
* Better mod download and error display

* Fix Android Studio Insubordinations
 2021-07-06 19:33:05 +03:00
Xander Lenstra
7d8f8b981d
Fixed bug where logistics _still_ did not work (#4388) 2021-07-05 21:09:10 +03:00
Yair Morgenstern
c1ff2e4ba7 Fixed Denmark's unique including also embarking instead of just disembarking 2021-07-05 21:06:54 +03:00
SomeTroglodyte
c42561c545
Spruced up Civilopedia - phase 4 - Visual candy, Units (#4350) 
* Spruced up Civilopedia - phase 4 - Visual candy, Units

* Unified separators, CheckBox helper - patch2

* Unified separators, CheckBox helper - atlas merge

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - rebuild atlas

* Spruced up Civilopedia - phase 4 - do separator to-do
 2021-07-05 16:35:41 +03:00
SomeTroglodyte
d909143a34
'Swap units' sound and more attack sounds (#4379) 2021-07-05 11:31:13 +03:00
Xander Lenstra
624fe33be1
Updated template.properties (#4377) 
* Updated translation file

* Made tests happy

* Removed unused, athematic unit filter

* Added submarine unit translation
 2021-07-05 11:20:12 +03:00
Xander Lenstra
957c8697ac
Added the nation of the Netherlands (#4372) 
* Added the nation of the Netherlands

* Added Sea Beggar, Dutch unique unit

* Added polder improvement, Dutch unique improvement

* Added national ability
 2021-07-05 09:35:04 +03:00
Yair Morgenstern
b748f92bb5 3.15.8 2021-07-04 21:09:17 +03:00
Yair Morgenstern
8a139e57b8
Translations update (#4371) 
* Update Indonesian.properties (#4369)

* Update Korean.properties (#4364)

* Update German translation (#4363)

* Update German.properties

* Update German translation

* Update German translation

Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
 2021-07-04 19:19:35 +03:00
Xander Lenstra
0d26c69710
More bug fixes (#4370) 
* Fixed Air Targetting not having icon

* Fixed the huns not having battering ram unique unit

* Plundering with multiple levels of coastal raider no longer creates multiple notifications

* Implemented requested changes
 2021-07-04 19:18:15 +03:00
Xander Lenstra
2a4ca74e7b
Fixed more bugs I introduced myself (#4368) 
* Fix bug where mobility doesn't work

* Fixed supply _still_ not working
 2021-07-04 17:34:27 +03:00
Xander Lenstra
be5345477a
Fixed bug where heal instantly would not heal (#4367) 2021-07-04 17:32:50 +03:00
Yair Morgenstern
c91e94ae03 Translations update 2021-07-03 23:02:41 +03:00
Yair Morgenstern
8ca6fc0a08
Translations update (#4359) 
* Update Korean.properties (#4346)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4342)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Swedish.properties (#4339)

* Update German.properties (#4338)

* Update German.properties

* Update German.properties

* Russian Translation (#4337)

Translated new strings and made slight improvements

* Update Italian.properties (#4333)

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-07-03 22:57:58 +03:00
Xander Lenstra
6c221cd56b
Fix multiple bugs resulting from updating promotions and implementing missile cruisers (#4355) 
* Fixed carriers in mods no longer working

* Fixed scouting prerequisites

* Fixed surivialism not having icon or prerequisites

* Fix logistics in mods not working

* Added image for supply promotion
 2021-07-03 22:26:03 +03:00
SomeTroglodyte
8fdb4f413e
Spruced up Civilopedia - phase 3 - Interface, flavour text, new Tutorial (#4334) 2021-07-02 19:22:38 +03:00
Xander Lenstra
b8d79dc23d
Split off properties of era's to another JSON file (#4336) 
* Added Era.json and imported the data to the ruleset

* Units at start are now also determined by eras.json

* Research agreement costs now determined by json file

* Gold and Culture provided at the start are now awarded

* Can no longer build wonders that are more than two eras older than the starting era

* Default population and buildings for settlers can now be added

* Added checks for validity of eras.json file in mods

* Colors for the icons of technologies are no also saved in eras.json

* Removed constants for all era's as they have been generalized away by this PR

* Removed spurios println's

* Added compatibility for mods

* Updated the military unit you get from ruines to be the military unit you received at the start of the game
 2021-07-02 15:45:18 +03:00
Xander Lenstra
d94a1d1432
Updated and generalized more promotions (#4331) 
* Generalized "[1] extra interceptions may be made per turn"

* Generalized and rephrased Cover promotion (requires #4311 to work)

* Generalized Logistics

* According to the civilopedia the defence value of cover has also risen, apparently

* Updated Ambush strength values

* Split up Targeting and Air Targeting (different strength bonus)

* Generalized Haka War Dance

* Added Supply promotion

* Renamed a unique so it matches other uniques

* Implemented May heal outside of friendly territory better

* Implemented requested changes
 2021-07-02 14:02:20 +03:00
Xander Lenstra
70882b4e8b
Added Privateer unit; updated Coastal Raider promotion (#4301) 
* Added privateer unit

* Privateers can now capture other naval units

* Updated Coastal Raider promotion to include the gold gained from damaging cities

* Added missing translatable notification

* Implemented requested changes

* Implemented requested changes _but better_

* Forgot to update a variable name
 2021-07-02 10:38:45 +03:00
Xander Lenstra
afdc2ffbd5
Adds the nation of The Huns (#4311) 
* Added the nation of The Huns

* Added unique units of The Huns

* Removed MountedRanged unitType

* Implemented requested changes

* Fixed some typo's, split up a very long function for redability

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2021-07-01 22:53:00 +03:00
Xander Lenstra
c6fac03067
Added a few pantheons; religion uniques affect cities instead of civs; updated pantheon picker screen (#4296) 
* Added a few simple beliefs for testing

* Moved CityReligion to its own file

* Created a picker screen for choosing pantheons

* Pantheon uniques are now calculated only for cities with the specific pantheon

* Added all the pantheon beliefs that can easily be added and commments for the ones still missing

* Games only have religion if either the user specifically asked for it, or uses a mod with religion

* Implemented requested changes
 2021-07-01 22:48:18 +03:00
Yair Morgenstern
95ae1cea30 3.15.7 2021-07-01 22:44:36 +03:00
Yair Morgenstern
19314bf197
Translations update (#4332) 
* Update Swedish.properties (#4328)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Korean.properties (#4322)

* Update German Translation (#4320)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Russian Translation (#4314)

* Russian Translation

Translated new strings

* Update Russian.properties

* Update Russian.properties

Made some improvements

* Update Spanish.properties (#4312)

* Update Italian.properties (#4308)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-07-01 22:34:55 +03:00
Xander Lenstra
c350a3c923
Fix a few bugs related to nukes (#4324) 
* Fixed bugs where nukes don't work due to capitilzation issues

* Renamed existing translations

* Fixed crash happening when nuking tiles without an owner

* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
 2021-07-01 22:18:37 +03:00
Yair Morgenstern
74fd80416c Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-30 21:02:57 +03:00
Yair Morgenstern
aeceead616 Removed final vestiges of old Bonus/Penalty effects. 
Friendship ended with Regex, now Unique is my best friend.
 2021-06-30 21:02:53 +03:00
SomeTroglodyte
a69776cafa
The GDR needs an impressive attack sound. (#4317) 
* The GDR needs an impressive attack sound.

* The GDR needs an impressive attack sound - alt

* The GDR needs an impressive attack sound - alt2
 2021-06-30 20:41:43 +03:00
Xander Lenstra
a0cf30831c
Updated promotions - make more generalizable, update to G&K (#4292) 
* Generalized the "Heal Instantly" promotion

* Extended "Indirect Fire" to WaterRanged units, conform the main game

* Generalized Extend Range, Operational Range

* Generalized "logistics"

* Typo

* Generalized the healing from "Medic"

* Implemented requested changes

* Generalized "[amount] Movement"; "[amount] Visibility Range"

* Added survavalism promotions

* Updated Boarding Party strength bonus values to G&K

* Implemented requested changes
 2021-06-30 17:09:02 +03:00
SomeTroglodyte
8b7804b19a
Quickfix unit tests failing (#4309) 2021-06-30 15:13:18 +03:00
Yair Morgenstern
0b6510a39c 3.15.6 2021-06-29 23:15:57 +03:00
Yair Morgenstern
c380d6e7b7
Translations update (#4306) 
* Update Korean.properties (#4305)

* Missing single quotation mark in quote (#4297)

* Missing single quotation mark in quote

Inserted ' in quote of Advanced Ballistics

* Changed quote in all language files

* Update Swedish.properties (#4282)

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

* Update Swedish.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Russian.properties (#4269)

* Update Russian.properties

Translated new strings

* Update Russian.properties

Some fixes and improvements

* Update Russian.properties

Made some improvements

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update Italian.properties (#4267)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

* Update German.properties (#4281)

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

* Update German.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2021-06-29 22:35:42 +03:00
SomeTroglodyte
4d16b3fcf8
Respect visualMods for Sound - CheckBox, formats, modchange detect (#4295) 
* Respect visualMods for Sound - CheckBox, formats, modchange detect

* Respect visualMods for Sound - german patch
 2021-06-29 21:31:57 +03:00
Xander Lenstra
168f984a65
Added Shrine, option for enabling religion (#4291) 
* Added option in-game to enable faith (highly discouraged)

* Added shrine for generating Faith

* Made Shrine hidden in games without religion
 2021-06-28 14:25:34 +03:00