Commit Graph

477 Commits

Author SHA1 Message Date
Xander Lenstra
94fa48c4b5
Fix Civil Society policy (#5164) 2021-09-09 20:12:53 +03:00
Xander Lenstra
d247cacbca
Added "in other cities" as a cityFilter (#5131) 2021-09-08 21:41:57 +03:00
Xander Lenstra
3722fab38d
From the indstrial era onwards, things change in religion (#5095)
* Improved redability

* From the industrial era onwards, religion goes into 'second phase'

* Fixed tests

* Fixed formula for buying great prophets starting from the industrial era

* Added `getMatchingUniques`, `hasUnique` to `IHasUniques`, cleaned up some code

* Fix compilation errors
2021-09-08 21:24:26 +03:00
SimonCeder
c7264556ea
City state intrusion anger (#5090)
* move functions, greece UP

* CS influence from killing barbs

* Greece healing in CS territory

* move diplomacy bonuses into CityStateFunctions.kt

* Split filter in Battle.kt, nicer code
2021-09-05 21:22:02 +03:00
SomeTroglodyte
2069f227c4
Newgame Mod incompatibility toast (#5076) 2021-09-03 12:26:38 +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
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
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
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
Xander Lenstra
5094a068fe
Fixed ambush bonus amount (#5021) 2021-08-29 20:37:59 +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
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
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
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
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
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
Arthur van der Staaij
4114296cbe
Made water oil wells require the Refrigeration tech (#4889)
* Made water oil wells require the Refrigeration tech

Oil wells can now only be created on water with the refrigeration
technology.

This is not the ideal solution: it would be preferable to support
multiple improvements for a single resource, to add offshore platforms
as a separate improvement for coastal oil that requires refrigeration
and to disable building oil wells on coast. Allowing multiple
improvements for a resource would however be a much more significant
refactor.

* Added back "terrainsCanBeBuiltOn": ["Coast"]
2021-08-18 12:19:08 +03:00
SomeTroglodyte
ecd6cd92a4
City screen purchasable constructions prettier (#4822)
* City screen purchasable constructions prettier

* City screen purchasable constructions prettier - patch1

* City screen purchasable constructions prettier - mad modder edition
2021-08-17 14:00:01 +03:00
SimonCeder
74a1da8e17
CS bonuses graded according to relationship level (#4664)
* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* city-state bonuses graded depending on friend or ally

* siam militaristic UP, cleaned up presentation

* fix strings

* move city state modifiers to json

* Restructure eras.json

* reduce indentation in DiplomacyManager.kt

* Add fallback values in cas of missing json definitions

* review edits

* fix conflicts???

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-17 13:55:02 +03:00
Arthur van der Staaij
6ad90c31ba
Removed the sight bonus from hills (#4883) 2021-08-17 09:14:49 +03:00
Arthur van der Staaij
84a62c7926
Gave anti-air units a bonus vs helicopters (#4884)
Helicopters are implemented as land units, so the anti-air units (land
anti-air and fighters) did not yet have this bonus.

Also corrected the damage bonus of triplanes and removed a redundant
"6 tiles in every direction always visible" unique.
2021-08-17 09:11:03 +03:00
Arthur van der Staaij
201648a680
Zone of Control (#4085)
* Implemented Zone of Control

* Implemented "move after attacking" ZoC exception

Units that can move after attacking are not affected by zone of control
if they move because of defeating a unit.

* Implemented all missing special ZoC cases

As described in:
https://forums.civfanatics.com/resources/understanding-the-zone-of-control-vanilla.25582/

* Slightly optimized ZoC logic

* Modified the "possible optimization" comment

Added the knowledge gained from SomeTroglodyte's tests.

* Added "Ignores Zone of Control" unique

Implemented the unique and gave it to the Helicopter Gunship.
2021-08-15 21:42:47 +03:00
Miraç
377cce3348
Make naval tradition provide a general instead of an admiral for time being (#4864) 2021-08-15 20:58:35 +03:00
Xander Lenstra
5d249ee673
Implemented religious pressure (#4863)
* Implemented religious pressure: cities now can have more than one religion in them and religions spread between nearby cities over time.

* Implemented proposed changes

* Implemented requested changes & minor changes I forgot to include last time

* All pantheons not founded by you are now removed when you gain a new city (found this somewhere in the source code of the original, don't know if it's documented anywhere online)
2021-08-15 18:53:01 +03:00
SomeTroglodyte
0d041ab1ef
Civilopedia - Difficulty (#4789)
* Civilopedia - Difficulty

* Civilopedia - Difficulty - patch2

* Civilopedia - Difficulty - patch3
2021-08-11 21:03:43 +03:00
ravignir
5d2732c656
G&K resources, resource improvement yield changes to match civ5. (#4835)
* Update Credits.md

* Add files via upload

* Add files via upload

* Update TileResources.json

* Update FantasyHex.json

* Update TileResources.json
2021-08-11 18:48:10 +03:00
Xander Lenstra
4aed0f0f80
Added founder beliefs, updates to pantheon spreading (#4827)
* Added founder beliefs, minor changes to pantheons

* Fixed the tests

* Implemented recommended chances

* Implemented requested changes
2021-08-11 09:56:36 +03:00
Xander Lenstra
6d04bf424b
Fixed crash when selecting certain buildings in the civilopedia (#4819) 2021-08-09 13:57:13 +03:00
ravignir
bf40779605
Fix (#4813) 2021-08-09 06:34:21 +03:00
Xander Lenstra
55d32e1bcb
Added follower beliefs for buying religious buildings (#4793)
* Added follower beliefs for buying religious buildings

* Implemented recommended changes
2021-08-08 22:23:22 +03:00
Xander Lenstra
92d3fa65e3
Ruins now have their own file (#4771)
* Ruins now have their own file

* Added religious rewards

* Added an option for only enabling rewards after a certain amount of turns

* You can now weigh rewards making some more likely than others

* Cleaned up some code

* Make new changes compatible with old mods

* Implemented proposed changes

* Implemented requested changes

* Implemented requested changes
2021-08-08 17:31:08 +03:00
Xander Lenstra
4d0b2405e1
Missionaries are now disabled when religion is disabled (#4791) 2021-08-08 15:22:09 +03:00
ravignir
56541a6489
Pikeman upgrades only to Lancer (#4780)
Checked this in civ5.
2021-08-07 23:47:35 +03:00
Xander Lenstra
a35f55db6f
Added missing religion icons (#4795) 2021-08-07 23:46:55 +03:00
Xander Lenstra
c56f0b3d4e
Architecture is now a prerequiste of Archaeology (#4797) 2021-08-07 23:45:05 +03:00
Xander Lenstra
9a24f04d56
Fixes bug where Russia's unique no longer works (#4803) 2021-08-07 23:43:47 +03:00
Miraç
124d614a9f
Fix banking's required techs (#4796)
will this break a hypothetical save where someone is now researching a tech and has all required techs for now but not the new to be added requirement?
2021-08-07 22:47:19 +03:00
Xander Lenstra
547f5a57e5
Added missionairy units, which can spread religion and bought with faith (#4568)
* Added missionairy units, which can spread religion and bought with faith

* Forgot an include, minor additions

* Forgot credit for the missionary image

* Large refactor, enabling buying with almost all stats, split IConstruction into IConstruction & INonPerpetualConstruction

* Does this fix the tests

* Fixed accidentally removing all trailing spaces in template.properties

* Thanks to someTroglodyte for paying more attention than I do :)

* Implemented requested changes

* Fixed large amount of question marks

* Missing space, of course

* Fixed function name change

* Fixed merge problems

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-08-06 14:40:48 +03:00
Xander Lenstra
9634f7045a
Replaced the last promotion effects with uniques (#4764) 2021-08-05 07:41:48 +03:00
ravignir
38a09096b4
MCO - Randomize Plains/Grasslands around deserts (#4746)
- Deserts are a little bit more common (but now have higher chance of being stripes)
- Slightly reduced range of Tundra.
- Slightly reduced amount of Snow.
- Grasslands can now appear next to desert tiles and huge plains areas are much less likely.
2021-08-04 14:10:23 +03:00
Xander Lenstra
2c428f8269
Bugfixes from unitTypes so promotions work again (#4744) 2021-08-04 13:55:12 +03:00
Xander Lenstra
4d3195ec5a
Added Diplomatic victory, United Nations, Globalization (#4619)
* Added globalization tech

* Added united nations and backbone for diplomatic victory

* You can now vote with the united nations every 20 * gameSpeed turns, and the results will be displayed the turn after

* You can now win with diplomacy

* AI will now vote in the united nations

* Added the amount of turns till the next diplomatic vote in the diplomacy overview

* Added translatable strings

* Implemented most of the requested changes (rest coming soon)

* Implemented further requested changes
2021-08-03 21:48:51 +03:00
Xander Lenstra
3b4b9a27bf
Split up unit types to its own JSON file (#4717)
* Split off unitTypes to its own json, only containing the domain it can travel in for now

* Updated translationFileWriter to handle this file correctly

* Updated promotions file

* Implemented requested changes

* Units without a sprite use the sprite of a first unit with the same type

* Implemented proposed changes
2021-08-03 19:06:59 +03:00
SomeTroglodyte
731aec0e65
Use stat characters in Civilopedia Unit/Building costs (#4736) 2021-08-03 09:24:31 +03:00
SomeTroglodyte
a248a1178c
Deprecate Building.cannotBeBuiltWith (Solar/Nuclear Plant exclusion now as unique, auto-displays in Civilopedia) (#4732) 2021-08-02 20:50:56 +03:00
lishaoxia1985
e993f507aa
Map size will modify policy cost, techUniques is initialized by UniqueMap(), Replace "effect" with "uniques" in UnitPromotions.json (#4507)
* Map size will modify policy cost, techUniques is initialized by UniqueMap()

* Replace "effect" with "uniques" in UnitPromotions.json
2021-08-02 19:17:26 +03:00
Xander Lenstra
912a9dbb9d
Simplified a unique of petra (#4708) 2021-08-01 15:35:36 +03:00
Miraç
e68bc128ab
Fix Hagia Sophia and CN Tower not giving civ 5 bonuses (#4682)
* Fix Hagia Sophia and CN Tower not giving civ 5 bonuses

i got the information about Hagia Sophia from @ravignir and CN Tower from civ wiki. i will also add faith to buildings that give faith in G&K but will do it as a commit, that so that it would be easily revertable if faith doesnt just get ignored when religion is disabled

* Create Buildings.json

* Delete Fix Hagia Sophia and CN Tower not giving the bonuses it gave in civ 5
2021-07-31 23:49:31 +03:00
SomeTroglodyte
130c318ae0
Civilopedia phase 8 - Nations and Promotions (#4657)
* Civilopedia phase 8 - Nations and Promotions

* Civilopedia phase 8 - Nations and Promotions - AS insubordination

* Civilopedia phase 8 - Nations and Promotions - OR template

* Civilopedia phase 8 - Nations and Promotions - proofread

* Civilopedia phase 8 - Nations and Promotions - revert OR
2021-07-30 15:55:17 +03:00
Yair Morgenstern
71df35622f Resolved #4675 - Fertility Rates -> Fertility Rites 2021-07-30 15:08:32 +03:00
ravignir
5be081276c
Map climate overhaul (#4669)
This should make the map look more like a civ5 map:
here is a spreadsheet i've created and used to make these changes: https://drive.google.com/file/d/18uacHvZlh4FoM8xEVH4J9jaAmtHomutr/view?usp=sharing
What it does:
- makes center of a map mostly Grassland with some bits of Plains
- next biome is Desert and Plains with a rare patches of Grasslands.
- next biome is again Grasslands and Plains (in about equal proportions)
- final biome is Tundra that turns into Snow towards poles.
- makes the whole map look less stripy.

It looks kind of messy, but i tried to make it as compact as i could.
2021-07-29 14:58:45 +03:00
SimonCeder
1f6f49efd7
Mercantile CS resources (#4641)
* Added Porcelain and Jewelry, assigned to Mercantile CS

* resized Jewelry.png

* moved citystateresource, added resource overview to diplo screen

* citystateresource saved as string

* Update template.properties

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-07-27 22:28:36 +03:00
SomeTroglodyte
34717008b8
Civilopedia phase7 (#4628)
* Civilopedia phase 7 - Terrain

* Civilopedia phase 7 - Terrain - tuning

* Civilopedia phase 7 - Terrain - patch1 "for"

* Civilopedia phase 7 - Terrain - patch2 for #4641
2021-07-27 10:41:25 +03:00
ravignir
8c9e7fa7da
Petra as in G&K fix (#4645)
* Petra as in G&K fix

* Update Buildings.json

* Update Buildings.json
2021-07-27 10:38:37 +03:00
Yair Morgenstern
183b94702e Better unique for defending vs units 2021-07-27 05:02:13 +03:00
Yair Morgenstern
1271c86d03 Another unique that should be deprecated :) 2021-07-27 03:47:24 +03:00
Yair Morgenstern
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +03:00
ravignir
eae17b67b4
Update Policies.json (#4646) 2021-07-26 14:31:25 +03:00
Yair Morgenstern
c5ffec9ade Replaced "Building.providesFreeBuilding" field with generic unique 2021-07-26 14:29:43 +03:00
SomeTroglodyte
966f70d0d4
Rename Railroad tech to Railroads (#4567)
* Rename Railroad tech to Railroads

* Rename Railroad tech to Railroads - force check

* Rename Railroad tech to Railroads - patch1

* Rename Railroad tech to Railroads - atlas

* Rename Railroad tech to Railroads - patch2
2021-07-25 19:04:51 +03:00
Yair Morgenstern
7a42ab3e99 Resolved #4394 - corrected misspelled city names 2021-07-23 16:34:04 +03:00
Yair Morgenstern
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
SomeTroglodyte
6791dd3340
Deprecate "Can only be built on coastal tiles" unique (#4581)
* Deprecate "Can only be built on Coastal tiles"

* Deprecate "Cannot be built on bonus resource"

* Deprecate "Can only be built on Coastal tiles" - bump 'as of'
2021-07-23 13:19:35 +03:00
SomeTroglodyte
61204db01c
Resolve #4589 (#4605) 2021-07-22 19:42:19 +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
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +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
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
Xander Lenstra
70f34f2f85
Fixed unique of Persian immortal not working (#4547)
Fixed #4546
2021-07-17 22:18:54 +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
Yair Morgenstern
df2cf711ba More deprecation 2021-07-14 23:30:47 +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
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
Xander Lenstra
f97e64e54e
Fixed bug where submarines could not attack embarked units (#4459)
* Fixed bug where submarines could not attack embarked units

* Implemented requested changes

* Fixed typo
2021-07-12 19:37:56 +03:00
Yair Morgenstern
0cc3b6f550 Resolved #4457 - spelling mistakes 2021-07-10 23:22:44 +03:00
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
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
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
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
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
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
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
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
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
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
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
Arthur van der Staaij
0f0abad5ea
Added Stealth tech and Stealth Bombers (#4271)
* Changed some interception-related uniques

- "Can not be intercepted" -> "Cannot be intercepted"
  This really irked me, and the new version is also how it is written
  in the wiki.
- "Reduces damage taken from interception by 50%" ->
  "Damage taken from interception reduced by [50]%"

* Added "Cannot be carried by [unitFilter] units" unique

* Added an icon for Stealth

* Added Stealth technology and the Stealth Bomber

* Possibly fixed incorrect rounding for interception damage bonus

* Various code style changes

* Made Stealth Bomber interceptable, but with 100% damage reduction
2021-06-27 08:57:11 +03:00
Arthur van der Staaij
784092c56c
Added Drama and Poetry tech and replaced Temples with Amphitheaters (#4254)
* Added Drama and Poetry tech

* Moved not-in-ruleset check to building replacement function

* Updated a version number
2021-06-26 23:36:39 +03:00
Xander Lenstra
1c079bcef3
Added Nuclear Submarines & Missile Cruisers, capable of transporting missiles (#4260)
* Implemented Nuclear Submarine and Missile Cruiser units

* Information Era -> Atomic Era; Future Era -> Information Era, conform G&K

* Fixed deprecated uniques still working

* Implemented requested changes
2021-06-26 22:47:27 +03:00
Xander Lenstra
e6850b857a
Generalized building of improvements (#4252)
* Generalized building of improvements

* Readded support for the deprecated unique "Can build improvements on tiles"

* Small code quality changes

* Implemented requested chagnes
2021-06-25 16:35:15 +03:00
Xander Lenstra
af0cd0c9df
Implements the Telecommunications tech (v2) (#4249)
* Added the addPopulation() and setPopulation() functions to add population to cities and automatically reassign them

* Added the Telecommunications tech

* Added the CN tower

* Implemented Bomb Shelter

* Added icons for new buildings

* Implemented requsted changes
2021-06-24 19:07:33 +03:00
Xander Lenstra
111d11b9b2
Added Advanced Ballistics Tech, Atomic Bomb Unit, Updated how nukes work (#4211)
* Improved nukes

* Fixed build error (probably)

* Implemented reocmmended changes, fixed some other stuff, the usual

* Implemented requested changes

* Fixed Tech connections

* Fixed nuclear missiles and guided missiles being interceptable

* Missiles are no longer air units. This is, as they cannot be stationed on carriers and cannot be intercepted.
2021-06-24 16:03:59 +03:00
Arthur van der Staaij
5b730fbc56
Added Nuclear Fusion tech and the Giant Death Robot (#4207)
* Reordered units

Consistently ordered units based on, in decreasing priority:
- Tech tree column
- Height in tech tree column

* Added Nuclear Fusion technology and GDR
2021-06-23 09:44:53 +03:00
Arthur van der Staaij
e10c52efc1
Fixed open terrain bonus working in rough terrain (#4219)
* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
2021-06-23 09:41:55 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
Xander Lenstra
3d1836a081
Created Order branch with G&K policies (#4158)
* Created Order branch with G&K policies

* Implemented requested changes
2021-06-20 21:39:14 +03:00
Arthur van der Staaij
450c185af8
Corrected many building production costs, tech requirements and wonder effects (#4201)
* Corrected building construction costs

Full changelog:
(Changes marked with a "!" deviate from the surrounding pattern)

Lighthouse         100 -> 75  (!)
Great Lighthouse   250 -> 185 (!)

Temple             120 -> 100
Burial Tomb        120 -> 100
Mud Pyramid Mosque 120 -> 100
Market             120 -> 100
Bazaar             120 -> 100
Mint               120 -> 100
Aqueduct           120 -> 100
The Oracle         300 -> 250
Petra              300 -> 250
Great Wall         300 -> 250

Monastery          160 -> 120
Workshop           160 -> 120
Forge              160 -> 120
Hagia Sophia       400 -> 300
Chichen Itza       400 -> 300
Machu Picchu       400 -> 300

Harbor             200 -> 120 (!)
University         200 -> 160
Wat                200 -> 160
Castle             200 -> 160
Mughal Fort        200 -> 150 (!)
Armory             200 -> 160
Angkor Wat         500 -> 400
Alhambra           500 -> 400
Notre Dame         500 -> 400

Observatory        250 -> 200
Opera House        250 -> 200
Bank               250 -> 200
Satrap's Court     250 -> 200
Hanse              250 -> 200
Theatre            250 -> 200
Sistine Chapel     625 -> 500
Forbidden Palace   625 -> 500
L. Tower of Pisa   625 -> 500
Himeji Castle      625 -> 500

Seaport            300 -> 250
Windmill           300 -> 250
Taj Mahal          750 -> 625
Porcelain Tower    750 -> 625

Museum             360 -> 300
Public School      360 -> 300
Arsenal            360 -> 300
Military Academy   360 -> 300
Louvre             920 -> 750
Big Ben            920 -> 750
Brandenburg Gate   920 -> 750

Hospital           500 -> 360
Stock Exchange     500 -> 360

Eiffel Tower       1250 -> 1060
Statue of Liberty  1250 -> 1060
Kremlin            1250 -> 625  (!)
Neuschwanstein     1250 -> 1060

Nuclear Plant      750  -> 500
Solar Plant        750  -> 500
Sydney Opera House 2000 -> 1250
Manhattan Project  2000 -> 750  (!)
Apollo Program     1500 -> 750  (!)

* Corrected Hanging Gardens

10 food -> 6 food.
Now provides a free Garden.

* Corrected Statue of Liberty

Now provides a free social policy.

* Corrected Angkor Wat

Now unlocked with Education instead of Chivalry.

* Corrected Cristo Redentor

Now unlocked with Plastics instead of Flight.

* Corrected Kremlin

No longer gives 12 city strength (this was removed in G&K).

* Corrected Manhattan Project

Now unlocked with Atomic Theory instead of Nuclear Fission".

This does buff nuclear missiles quite a bit, since you no longer need
Nuclear Fission, but that's only because the last part of the tech tree
is very incomplete, and provides nuclear missiles too early. We need to
start correcting it somewhere.

* Corrected Leaning Tower of Pisa

Now provides +25% great person generation in all cities.

* Corrected Kremlin some more

Now unlocked with Metallurgy instead of Railroad.

* Fixed Arsenal production cost correction

It is now actually 300, as was stated in the previous changelog.

* Reordered many buildings

Reordered many buildings to conform to the tech tree order.
In order of priority:
left to right, top to bottom, buildings to national wonders to wonders.

* Corrected production cost for Colossus

Colossus was wrongly ordered in the json file, so its production cost
was unknowingly changed from 300 to 250 (this was not noted in the
previous changelog), however, it should be even lower: 185. This commit
corrects this.

tl;dr 250 -> 185

* Corrected Hermitage

Now unlocked with Architecture instead of Archaeology.

* Corrected National Treasury

Now unlocked with Guilds instead of Currency.

* Reverted incorrect corrections

Kremlin:
Provides 12 city strength again.

Statue of Liberty:
No longer provides a free social policy.
2021-06-19 21:45:41 +03:00
Yair Morgenstern
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
Xander Lenstra
d1c10c6d47
Updated Autocracy branch to G&K (#4149)
* Updated Autocracy branch to G&K

* Fxied a typo

* Implemented potentially requested changes

* Implemented requested changes

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-06-18 09:46:30 +03:00
Xander Lenstra
1d18c418e7
Updated Freedom branch to G&K (#4142)
* Updated Freedom branch to G&K

* Hotfix for autocracy policy that I accidentally added already

* Implemented recommended changes (mostly)

* Implemented recommended changes

* Implemented recommended changes better
2021-06-18 09:42:48 +03:00
Yair Morgenstern
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +03:00
Yair Morgenstern
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +03:00
SpacedOutChicken
4fc2364cb0
Allow sight bonus to specifically target land military unit (#4163) 2021-06-16 11:13:21 +03:00
Xander Lenstra
434136e6cc
Updated Commerce branch to G&K (#4129)
* Updated Commerce branch to G&K

* Implemented requested changes
2021-06-15 09:52:59 +03:00
Xander Lenstra
fbebcdcd21
Updated Rationalism branch to G&K (#4136) 2021-06-14 15:10:49 +03:00
Xander Lenstra
1c21573a42
Updated the culture victory so it now requires the Utopia Project to be built (#4060)
* Added the Utopia Project for the culture victory; AI will now build it

* Forgot to credit the icon

* Fixed a few minor issues

* Improved code quality; added translatable notifications

* Fixed mistakes; improved quality

* Changed a label

* Revert a small change which is no longer necessary

* Reverted the revert of a small change which is no longer necessary

* Made requsted changes
2021-06-14 14:48:22 +03:00
Yair Morgenstern
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
Xander Lenstra
0d79326869
Updated Tradition branch to G&K (#4106)
* Updated Tradition branch to G&K

* Small performance boost for calcualting maintenance; fix crash on next turn

* Fixed a bug where maintenance-free buildings would still cost maintenance

* Simplified some code

* I am unable to read

* Fixed a few broken uniques, including #4109

* Implemented requested changes
2021-06-13 08:14:31 +03:00
Xander Lenstra
da991b5f66
Updated Honor branch to G&K (#4118)
* Updated Honor policies to G&K

* Simplified another unique

* Implemented requested changes
2021-06-13 08:11:14 +03:00
Xander Lenstra
60809db065
Updated Liberty branch to G&K (#4115)
* Updated Liberty branch to G&K, improved modularity of uniques

* Updated meritocracy to only affect non-occupied cities

* Implemented requsted changes
2021-06-13 08:06:35 +03:00
Arthur van der Staaij
583bca56b8
Obsoletion and upgrade fixes for enabled G&K units (#4121)
* Updated some unit obsoletions

* Added a missing unit upgrade

* Added some missing commas in units.json

* Replaced Military Base icon with a simpler one

The original had a bit too much detail for the size at which it is
shown.
2021-06-13 07:55:35 +03:00
Arthur van der Staaij
91154aed34
Enabled various G&K buildings and units (#4092)
* Enabled Arsenal and added a new Armory icon

The old icon for Armory was much more appropriate for Arsenal, so I
added a new icon for Armory instead.

* Enabled Military Base and added an icon for it

* Enabled Petra and added an icon for it

* Enabled Composite Bowman and added an icon for it

* Enabled Mobile SAM and added an icon for it

* Enabled Jet Fighter

* Made Machine Gun upgrade to Mechanized Infantry

* Removed "Will be added in G&K" comments

Since we are now targeting G&K, these comments are no longer required.

* Fixed Aluminum/Aluminium inconsistencies
2021-06-10 15:38:40 +03:00
SomeTroglodyte
337b9c62fd
Nations spellcheck (#4094) 2021-06-10 14:22:16 +03:00
SomeTroglodyte
298dbcb3ee
More power to improvement uniques (resourceTerrainAllow-be-gone) (#4024)
* More flexibility for modding improvements (tileFilter), deprecate resourceTerrainAllow

* More tileFilter and improvement uniques - Translations

* Update template.properties

* More tileFilter and improvement uniques - Revert and/or inside unique parameter
2021-06-06 12:40:02 +03:00
Xander Lenstra
d7b2436bcf
Fixed a few bugs noted in #4057 (#4062) 2021-06-06 09:15:22 +03:00
Xander Lenstra
aa9dda2eea
Added the paratrooper unit (#4025)
* Added the paratrooper unit

* Reverted accidental reordering of action table

* Fixed Github build errors

* Hopefully actually fixed the build errors

* Added a Dutch translation, finally fixing the error

* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto

* Removed double update action
2021-06-03 07:33:38 +03:00
Arthur van der Staaij
a765caa97c
Add global alerts for certain constructions (#4039)
* Add global alerts for certain constructions

In the original game, certain constructions alert all players upon
their completion. This commit introduces a new unique for this behavior
and adds this unique to the relevant constructions.

The code that implements the new unique is placed in
Building.postBuildEvent, so it can only be activated by buildings. If
other kinds of constructions require a global alert as well, the code
could be moved to CityConstructions.constructionComplete.

* Removed redundant line in template.properties

* Moved global alert logic to CityConstructions

Moved the implementation of "Triggers a global alert upon completion"
from Building.postBuildEvent to CityConstructions.constructionComplete,
close to the similar Wonder notification logic.
2021-06-03 07:31:39 +03:00
ravignir
4adbd81b3a
Change to Temple of Artemis bonuses to reflect civ5 behavior (#4032)
As per wikia: https://civilization.fandom.com/wiki/Temple_of_Artemis_(Civ5)
2021-06-02 12:52:44 +03:00
Yair Morgenstern
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
432e937474
Added the amphibious promotion and the marine unit (#3987)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
2021-05-29 23:42:04 +03:00
ravignir
2feefeb4af
Changes to terrain combat bonuses (#3990)
as in civ5, all base terrain have no penalty/bonuses, mountain has +25%.
2021-05-24 20:44:53 +03:00
Arthur van der Staaij
1f2dbb9a4e
Fix spaceship part production boosts (#3953)
Previously, the buildings and wonders that should boost spaceship part
production (Forge, Spaceship Factory and Hubble Space Telescope) would
not provide this boost (#3952). This commit fixes the issue.

The problem was caused by the fact that the spaceship part-boosting
uniques would only boost spaceship part UNITS while spaceship parts are
currently buildings.

The added comments serve as a reminder to change the uniques if
spaceship parts are ever changed into units.
2021-05-20 18:19:33 +03:00
Duan Tao
3d062e3424
Add guided missile which acts differently from nuclear missile. (#3957)
* Add guided missile which acts differently from nuclear missile.

* Clean png.
2021-05-20 12:33:39 +03:00
Yair Morgenstern
61c8ab3a8f New line-of-sight rules, with new "Blocks line-of-sight from tiles at same elevation" unique! 2021-05-11 00:29:37 +03:00
Yair Morgenstern
413c0b077b Fixed terrace farm's 'fresh water' bonus - kudos @1.7.4 2021-05-09 00:28:32 +03:00
Yair Morgenstern
7e7f72ed2f Tradition works again 2021-05-07 12:03:13 +03:00
Yair Morgenstern
e8d4767b6d Height of terrains is now defined by a unique 2021-05-06 15:27:30 +03:00
Yair Morgenstern
c601f7f9ec Genericized "No Maintenance costs for improvements in [] tiles" 2021-05-06 14:34:40 +03:00
Yair Morgenstern
34bed66198 Genericized hill's "extra sight for land units" to a unique 2021-05-06 14:28:54 +03:00
Yair Morgenstern
8d2629088f Hill city-strength bonus genericized 2021-05-06 14:27:12 +03:00
GGGuenni
b35d5d3121
changed hill to terrain Feature (#3707)
* changed hill to terrain Feature

* Update Terrains.json

* Update Terrains.json

* Snow with capital S

* Fixed tests failing

* Added check for ruleset supports hill as terrain feature
2021-05-05 17:48:47 +03:00
SomeTroglodyte
f2a08719e2
ImprovementPicker: R key 'moves' from Road to Railroad patch (#3871) 2021-05-04 11:59:08 +03:00
Yair Morgenstern
81c1e34f0f Added "Self-destructs when attacking" unique 2021-04-30 12:11:49 +03:00
Yair Morgenstern
bb34659d9c Resolved #3837 - Harad -> Harald in Denmark greeting 2021-04-27 00:15:47 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
6045e0d5a4 "[] from every []" can accomodate specialist names 2021-04-15 12:50:30 +03:00
Yair Morgenstern
496b27d6b5 Fixed terrain error 2021-04-14 19:35:38 +03:00
Yair Morgenstern
18e15ee1d8 Converted all "Bonus vs unitType" unit uniques to "+[amount]% Strength vs [unitType]" 2021-04-14 18:59:57 +03:00
Yair Morgenstern
d825352bf4 Converted all "Bonus vs unitType" effects to "+[amount]% Strength vs [unitType]"
Open terrain and rough terrain bonuses are now generic and uniques
2021-04-14 18:52:10 +03:00
Yair Morgenstern
b312d24d4a Rough terrain specified through uniques 2021-04-14 18:32:39 +03:00
Yair Morgenstern
e424ec4a91 "+[]% combat bonus in []" -> "+[]% Strength in []" 2021-04-14 18:25:37 +03:00
SomeTroglodyte
83427fec85
Fix Citadel not quite buildable where it should be (#3788) 2021-04-14 11:28:13 +03:00
GGGuenni
00ec000d50
Preparation for hill as terrain feature (#3784)
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
2021-04-13 22:05:06 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
6e9f868cb3 'military' -> 'Military' for e.g. [Military] units, same as other unit types which are capitalized 2021-04-13 00:08:35 +03:00
SomeTroglodyte
b6fe55778a
Making game data a little more JSON compliant (#3780) 2021-04-12 06:23:44 +03:00
Yair Morgenstern
8c7c0a0f91 Added new experimental tile layering - see #3716 2021-04-01 22:08:29 +03:00
Yair Morgenstern
eda9ceb140 Custom improvements for water resources now moddable 2021-03-25 10:46:45 +02:00
lishaoxia1985
b5c12ec17c
Carrier cannot attack, AS update to 4.1.3 (#3700) 2021-03-23 20:20:38 +02:00
Yair Morgenstern
ba51222841 Barbarians only heal by pillaging, simplified barbarian automation 2021-03-19 10:39:55 +02:00
Yair Morgenstern
87ff4c91f5 3.13.9 2021-03-18 20:59:42 +02:00
Yair Morgenstern
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +02:00
Yair Morgenstern
01877fee7c Fixed Great Barrier Reef spawn rules 2021-03-11 22:17:59 +02:00
lishaoxia1985
b3a62f4b1a
Withdraw before melee is the same as original game (#3674) 2021-03-11 21:40:44 +02:00
Martin Pechstein
daa6eec283
Update TileImprovements.json (#3679)
Fixed typo
2021-03-11 21:01:17 +02:00
Yair Morgenstern
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
Yair Morgenstern
e464ba5328 Map generation parameters are moddable, allowing players to create custom terrains for map generation! 2021-02-24 20:34:01 +02:00
Yair Morgenstern
ccae026df2 Resolved #1804 - Renamed "Siege" promotion to "Besiege". Closes #2458 2021-02-23 20:07:49 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
4bd40125b0 All resource stats from buildings converted to building uniques 2021-02-22 23:00:48 +02:00
Yair Morgenstern
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
Yair Morgenstern
84c200bd32 New cityFilter for cities connected to capital 2021-02-05 15:34:20 +02:00
Yair Morgenstern
1e6c8dacff Deprecated old uniques 2021-02-05 12:22:47 +02:00
Yair Morgenstern
45b43849bd Resolved #3578 - More readable colors for Korea civ, kudos @ravignir 2021-02-05 10:27:31 +02:00
SpacedOutChicken
55b4298cec
New uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []" (#3565)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques
2021-02-03 13:06:53 +02:00
SpacedOutChicken
457588a2c9
Parameterize Civ Unique for increased XP gain (#3561)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain
2021-01-29 12:31:52 +02:00
Yair Morgenstern
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
Yair Morgenstern
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
Yair Morgenstern
4e2aaa76dc Started implementing Patronage branch. Parametrized some uniques, city-states can handle different resting points for different civs. 2021-01-29 11:54:23 +02:00
Yair Morgenstern
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00