Commit Graph

5557 Commits

Author SHA1 Message Date
SomeTroglodyte
61204db01c
Resolve #4589 (#4605) 2021-07-22 19:42:19 +03:00
Xander Lenstra
41f9fbfed2
Fixed comodification errors under certain circumstances (#4599) 2021-07-22 19:42:08 +03:00
Xander Lenstra
54df4ba0c0
Fixed a crash in badly defined mods (#4598) 2021-07-22 00:37:54 +03:00
SimonCeder
2971e6bba3
Map generation and start locations (#4588)
* cellular automata for mountains and hills

* cellular automata for mountains and hills

* tweaks

* spawn location algorithm

* consolation prizes

* improve city state spawns

* AI settle in place if possible

* make heightmap generation mod agnostic
2021-07-21 14:41:48 +03:00
SomeTroglodyte
08954c1bd1
Spruced up Civilopedia - phase 6 - uniques (#4587) 2021-07-21 14:40:17 +03:00
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +03:00
Xander Lenstra
85f4840e35
Hide lesser used action buttons to free up space (#4580)
* You can now use 'h' to fortify/sleep until healed

* Hide lesser used unit actions by default

* Refactored worker actions into automate & build improvements

* Added missing translation lines

* Fixed translations
2021-07-21 10:43:55 +03:00
Xander Lenstra
605581c78b
Fixed bug where 'remove road' would also remove other improvements under specific circumstances (#4583) 2021-07-21 10:42:32 +03:00
SomeTroglodyte
70a18de7cc
City construction Civilopedia-linked (#4573)
* City construction Civilopedia-linked

* City construction Civilopedia-linked - EOF
2021-07-21 10:34:00 +03:00
Xander Lenstra
92c4e4e083
Fixed units not being removed from open borders area after declaring war (#4584) 2021-07-21 10:31:13 +03:00
Xander Lenstra
167d9705f7
Fixed bug where all great people suddenly were scientists (#4582) 2021-07-21 10:28:48 +03:00
Xander Lenstra
3d13680602
Update translationFileWriter to include missing strings (#4578)
* Update translationFileWriter to include strings from new json files

* Fix promotions with multiple uniques not getting translated

* Add missing translatable strings (thanks to DuffLagerleff for finding these)
2021-07-20 17:07:15 +03:00
SimonCeder
239a406bc4
Added Sweden Civ (#4566)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* Add Sweden

* add translations

* translations

* implement first part of UP

* add icons to atlas

* implement second part of swedens up

* implement first hakkapeliitta unique

* implement second hakkapeliitta unique

* gifted GPs are removed

* update sweden symbol

* translations

* review Hakkapeliitta unique

* removed unneccesary parameters

* hakka UP review

* Hakka UP part 2

* yairm's reviews

* translations for fixes

* removed [great person generation] parameter as it's hardcoded anyway

* Moved check for stacking unit bonus outside great general logic
2021-07-20 17:06:15 +03:00
Xander Lenstra
2db2dc0db7
Fix autocracy bonus accidentally being disabled (#4572) 2021-07-20 09:26:46 +03:00
SomeTroglodyte
1b397f0583
Unify all those (isWonder || isNationalWonder) cases (#4574) 2021-07-20 09:26:06 +03:00
Yair Morgenstern
05adc04a71 Added translations 2021-07-20 00:48:35 +03:00
Yair Morgenstern
1070584180 Mass deprecation 2021-07-19 23:27:34 +03:00
Yair Morgenstern
7039b6a287 More sequencing for faster unique filtering 2021-07-19 23:13:36 +03:00
Yair Morgenstern
f85bedeb2f Faster filtering to avoid some ANRs 2021-07-19 23:00:05 +03:00
Yair Morgenstern
bdf46ea66c 3.15.13 2021-07-19 22:31:55 +03:00
Yair Morgenstern
9a7a0f3c7d
Translations update (#4559)
* Update Ukrainian.properties (#4550)

* Update Korean.properties (#4544)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Simplified_Chinese.properties (#4543)

* Update Czech.properties (#4540)

* Update Czech.properties

new strings, some old tweaked for better gramar

* Update Czech.properties

tweaked word form to beter fit to usage

* Updated Swedish Translation (#4539)

* Updated Swedish Translation

Translated the last lines that needed to be translated for the Swedish translation to be complete.

* Updated 2 lines with advice from SimonCeder

* Refactor New game screen (#4538)

* Update Russian.properties (#4537)

* Update Russian.properties

* Update Russian.properties

* Update German translation (#4536)

* Refactor Diplomacy,Trade,Nations (#4535)

* Refactor Nation Picker (#4534)

* Update Indonesian.properties (#4562)

* Unit gifting (#4557)

* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object

* Update Indonesian.properties

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>

Co-authored-by: DuffKI <51823715+DuffLagerleff@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: HoleHolo <80876542+HoleHolo@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: Alex25820 <50142558+Alex25820@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: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-07-19 22:10:37 +03:00
SomeTroglodyte
fce7d39d4a
Fix for missing Farms (all mod TileSetConfigs were always active) (#4553)
* Fix for missing Farms (all mod TileSetConfigs were always active)

* Fix for missing Farms v2

* Fix for missing Farms patch1
2021-07-19 22:05:48 +03:00
SomeTroglodyte
973a8fb0ac
Small fixes (#4548)
* Raze city button should be disabled for original capitals

* Halicarnassus trigger checks Great Person

* New water improvements should recalculate resource stuff

* Should't be able to create water improvements outside borders
2021-07-19 21:53:15 +03:00
SomeTroglodyte
46da6bd56e
Sort Civilopedia entries using locale (#4560) 2021-07-19 21:52:26 +03:00
Xander Lenstra
c81c1b6a1b
Implemented Follower beliefs for religions (#4530)
* Minor things

* Added a few follower beliefs

* Implemented follower beliefs when founding a religion

* Added missing follower beliefs as much as possible

* Religion screen now scrolls correctly

* Buttons for chosen religions are now disabled  instead of removed, idea couresty to someTroglodyte

* Implemented requested changes
2021-07-19 21:51:34 +03:00
SomeTroglodyte
50cec97354
Spruced up Civilopedia - phase 5 - buildings (#4391)
* Spruced up Civilopedia - phase 5 - buildings

* Finish merging master into Civilopedia-Buildings

* Spruced up Civilopedia - phase 5 - buildings - patch

* Spruced up Civilopedia - phase 5 - buildings - patch2

* Spruced up Civilopedia - phase 5 - buildings - patch3

* Spruced up Civilopedia - phase 5 - buildings - patch4

* Spruced up Civilopedia - phase 5 - buildings - patch5
2021-07-19 21:48:51 +03:00
SimonCeder
118c1fc888
Unit gifting (#4557)
* wonder splash screens

* wonder splash screens atlas

* reset to master

* add basic gifting to city states and major civs

* actual gifting of the unit

* add gift icon to atlas

* adjust relationship decay

* add strings to jsons

* AI and player return same object
2021-07-19 00:30:10 +03:00
SomeTroglodyte
f5a95fad18
TileGroup linting and 0.001% optimization (#4531) 2021-07-18 23:30:28 +03:00
SomeTroglodyte
8c35e54b71
Rewritten Tooltip class (#4552) 2021-07-17 22:44:09 +03:00
SomeTroglodyte
3a7da738c4
Keyboard mapping by keyCode (#4542)
* Keyboard mapping by keyCode

* Keyboard mapping by keyCode - v2
2021-07-17 22:26:20 +03:00
Xander Lenstra
70f34f2f85
Fixed unique of Persian immortal not working (#4547)
Fixed #4546
2021-07-17 22:18:54 +03:00
Yair Morgenstern
2c5934d481
Don't post patch releases on Discord 2021-07-16 10:03:57 +03:00
Yair Morgenstern
de582cf66a Resolved #4528 - added Polder image 2021-07-16 09:30:04 +03:00
Yair Morgenstern
60bcc8f1cf 3.15.12-patch1 2021-07-16 09:23:49 +03:00
Yair Morgenstern
357b22cec5
Translations update (#4533)
* Update Swedish.properties (#4529)

* Refactor German translation of Trades (#4527)

* Refactor Trades

* Refactor Trades

* Update German translation (#4526)

* Update Russian.properties (#4525)

* Update Russian.properties

* Update Russian.properties

* Update Korean.properties (#4524)

* Update Indonesian.properties (#4523)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Indonesian.properties

* Missing translation templates from BattleDamage modifiers (#4521)

* Update Italian.properties (#4517)

* Update Spanish.properties (#4516)

Soory for being late

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

* Refactor German translation of City-States (#4512)

* Refactor City-States

* Refactor City-States

* Refactor City-States

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: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@users.noreply.github.com>
2021-07-16 09:05:31 +03:00
Giuseppe D'Addio
d87db92171
Update Nations.json (#4520)
You guys misses Attila and Williem's defeated lines
2021-07-15 10:39:32 +03:00
Xander Lenstra
9efcc4f423
Fixed bug where great prophets could be chosen as free great persons when religion was disabled (#4518) 2021-07-15 10:38:26 +03:00
Xander Lenstra
482a1260ca
Fixed bug which leads to crashes for almost all users (#4519) 2021-07-15 10:36:59 +03:00
Yair Morgenstern
df2cf711ba More deprecation 2021-07-14 23:30:47 +03:00
Yair Morgenstern
e3e08732db Deprecations 2021-07-14 22:51:33 +03:00
Yair Morgenstern
6b73a3e9d7 3.15.12 2021-07-14 22:34:11 +03:00
Yair Morgenstern
8cc407ab44
Translations update (#4515)
* Refactor Diplomatic modifiers (#4500)

* Update German translation (#4499)

* Update Russian.properties (#4497)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

a little experiment

* Update Korean.properties (#4495)

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Korean.properties

* Update Portuguese.properties (#4494)

* Update Spanish.properties (#4493)

* Update Spanish.properties

* Update Spanish.properties

* Update Swedish.properties (#4492)

* Update Italian.properties (#4491)

Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: sockybob <44141246+sockybob@users.noreply.github.com>
Co-authored-by: Samsaek the Calico <saud2410@naver.com>
Co-authored-by: batatasmor <75855494+batatasmor@users.noreply.github.com>
Co-authored-by: ArchDuque-Pancake <78449553+ArchDuque-Pancake@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>
2021-07-14 22:22:11 +03:00
Xander Lenstra
2752c713b9
Founding Religions (#4505)
* Fixed crashes on loading save games with religion

* Added missing credit

* Religious cities now show religion icons in the city button

* Add icons for religions

* You can now found beliefs, with snazzy icons!

* Fixed bug which made prophets impossible to generate

* Added missing translatable strings

* Fixed translation tests properly

* Implemented requested changes

* Implemented part of the requested changes

* Removed SplitPane in favor of Table

* Removed unused code

* Capped the amount of foundable religions to the amount of religions
2021-07-14 22:09:51 +03:00
Xander Lenstra
477051c616
Updated the tile choosing algorithm for city expansion (#4510)
* Updated the tile choosing algorithm for city expansion to the one used in the base game

* Implemented requested changes
2021-07-14 19:32:50 +03:00
SimonCeder
314a2a48bb
Wonder build screens redux (#4509)
* wonder splash screens

* wonder splash screens atlas

* removed pyramids file, add portrait code

* restore atlas
2021-07-13 23:42:40 +03:00
SomeTroglodyte
c9010c5fdc
Tweaked Slider, use in MapParametersTable (#4506) 2021-07-13 20:55:22 +03:00
Xander Lenstra
6c0237fcc3
Disabled city state diplomacy buttons when it is not your turn (#4503) 2021-07-13 17:41:31 +03:00
Xander Lenstra
68b40cf860
Fixed bug where great prophets could be given when religion was disabled (#4502) 2021-07-13 17:40:54 +03:00
SomeTroglodyte
f54c76ec42
'Swap units' sound replaced (#4501) 2021-07-13 17:38:38 +03:00
Xander Lenstra
07e3a2228e
Fixed bug where effects of all aquaducts nationwide stacked in each city (#4487)
* Fixed bug where effects of all aquaducts nationwide stacked in each city

* Implemented requested changes

* Implemented requested changes better
2021-07-13 06:26:37 +03:00