Commit Graph

78 Commits

Author SHA1 Message Date
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
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
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
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
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
4479103ccc Deprecation of Building.xpForNewUnits, in favor of an existing unique :) 2021-07-27 03:45:49 +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
570ec1c326 Converted Specialist GPP to Counter
Changed jsons of Buildings and Specialists to Great Person names
2021-07-23 16:15:31 +03:00
Xander Lenstra
e48ae69927
Implemented temples (#4585) 2021-07-21 12:21:24 +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
Yair Morgenstern
0d328ef99a Stuffed some +/- uniques into the square brackets 2021-07-09 11:01:25 +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
95ae1cea30 3.15.7 2021-07-01 22:44:36 +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
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
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
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
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +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
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
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
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
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
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
SomeTroglodyte
b6fe55778a
Making game data a little more JSON compliant (#3780) 2021-04-12 06:23:44 +03:00
Yair Morgenstern
3bbac04303 Deprecated uniques replaced in 3.12.10 2021-03-15 22:37:07 +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
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
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
Yair Morgenstern
18f4d4e53e Added city filter, and gerenicised several uniques to work with the city filter.
Deleted some deprecated uniques
2021-01-28 14:26:42 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
213e71a97b Reversed requiredBuilding migration to unique 2020-12-21 20:35:02 +02:00
Yair Morgenstern
e3f1c33654 Building.requiredBuildingInAllCities -> "Requires a [] in all cities" unique 2020-12-17 15:46:17 +02:00
Yair Morgenstern
32a2c784fe Fixed tests 2020-12-16 20:23:31 +02:00
Yair Morgenstern
f40584b1ec requiredBuilding parameter migrated to "Requires a [] in this city" unique 2020-12-16 20:14:36 +02:00
Yair Morgenstern
963fee3552 Added much-needed "+[]% Production when constructing [] units" unique 2020-12-13 09:27:31 +02:00
Yair Morgenstern
247350d6a1
Revert "-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)" (#3301)
This reverts commit 49cdf09b44.
2020-10-27 00:22:02 +02:00
givehub99
49cdf09b44
-Terracotta Army, Alhambra, Hanse, Leaning Tower of Pisa, Neuschwanstein, and Hubble Space Telescope are no longer buildable or displayed in the pedia since they are not part of vanilla Civ 5. (#3300)
Their entries were kept in the json files so as to not break pre-existing save files.

-Units and buildings that are unbuildable are not shown in the pedia or tech picker as being unlockable by tech
2020-10-27 00:20:48 +02:00
givehub99
9ffa0bee54
Consolidated Generic Tile Bonus Uniques (including Friendly Land, Foreign Land) (#3232)
* Redid things with help from HadeanLake:

-"+[]% combat bonus in []" Unit Unique
-"+[]% combat bonus for units fighting in []" Nation Unique
-Both of these can check for terrain or Friendly Land or Foreign Land
-Function to add stacking modifiers
-Himeji Castle and Foreign Legion had uniques changed to fit this syntax
-Old way still works for now, but deprecated

* fixed comments about deprecation and the new syntax
2020-10-06 10:52:30 +03:00
Yair Morgenstern
0e327012a7 Fixed Windmill unique 2020-10-05 22:51:55 +03:00
Yair Morgenstern
c70c860437 All specialist slots in jsons converted to proper name 2020-10-04 16:23:35 +03:00