mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-09 07:18:57 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 5 Branches 1,094 Tags
f7069851c79a492e8a7912b337c82d476db1301c
Commit Graph

516 Commits

Author SHA1 Message Date
yairm210
e7042d24ea City state permutations normalized to "City-State" 
#5963
 2022-01-14 12:16:16 +02:00
Yair Morgenstern
6e95a07572 More unit unique typing (#5952) 
* There are so many of these my gosh

* Fixed, good thing we have tests :)

* Fixed
 2022-01-14 10:43:13 +02:00
Xander Lenstra
7cb58eb82d Typed all policy uniques (#5955) 
* Typed all policy uniques

* Reworded golden age length
 2022-01-14 10:11:30 +02:00
AdityaMH
7a83f5091a Fix incorrect Archer obsolete (#5947) 
* Fix incorrect Archer obsolete

* Sorry, from previous

* Bring back

* Fix other "Archer" forK
 2022-01-11 17:04:19 +02:00
Xander Lenstra
d809f3a132 Made all the other constants determining the strength of cities moddable (#5940) 2022-01-10 13:55:22 -08:00
Xander Lenstra
0349e0a776 Updated the natural wonders for vanilla (#5943) 
* Updated the natural wonders for vanilla

* Might as well remove the faith ruins bonuses
 2022-01-10 13:28:05 -08:00
AdityaMH
b2870bc130 Fix missing siege unit resources needs for vanilla (#5925) 
* Fix missing siege unit resources needs for vanilla

* Fix unique siege unit who no resources needs
 2022-01-07 14:28:08 +02:00
Xander Lenstra
f06242ebe1 Allowed follower beliefs to have more uniques, merged a unique and globalized some uniques (#5882) 2021-12-31 13:47:52 +02:00
Xander Lenstra
687ecb83f1 Merged some uniques and added a new one for not allowing to build units (#5731) 
* Print stacktraces in more cases when crashing, useful for debugging

* Conditionalized no oceans before astronomy unique

* Cannot be built on tile before tech conditionalized

* Added "Cannot build unitFilter units" unique

* Fixed tests failing

* Merge branch master into some-uniques

* Fixed typo

* Apparently I made the same mistake twice

* Globalized unique
 2021-12-31 12:13:09 +02:00
Xander Lenstra
ee65adb5e4 Fixed a bug where all global unit discounts would always apply, despite only being for certain units (#5879) 2021-12-31 11:07:59 +02:00
Xander Lenstra
ecadfb53fa Typed some uniques and fixed a policy not working (#5848) 
* Typed some uniques, fixing a policy not working

* Repurposed an unused function to remove .unit in some places

* Fixed compilation errors
 2021-12-25 17:55:14 +02:00
Xander Lenstra
58cc3b517e Fixed an infinite loop where foreign legion upgraded to the unit it replaced (#5808) 
* Fixed an infinite loop where foreign legion upgraded to the unit it replaced

* Changed the wrong variable

* Maybe it is useful to also change its unlock tech

* Whoops, should only be for non-null values
 2021-12-16 17:50:10 +02:00
SimonCeder
24bd2b66b0 Regions part 3 - resource placement, resource settings (#5690) 
* placeLuxuries

* map resource settings

* strategic and bonus resources

* terrain fixes

* slight optimizations

* vanilla jsons

* fix luxury terrain distribution

* also for vanilla

* fix ruleset bug

* terrainfilter
 2021-12-07 07:25:16 +02:00
will-ca
8060b69378 Center Agriculture in Tech tree. (#5736) 
* Update Techs.json

* Update Techs.json
 2021-11-30 19:01:06 +02:00
Xander Lenstra
06dd395efb Fixed a bug where statue off Zeus would not work (#5732) 2021-11-30 14:42:19 +02:00
SpacedOutChicken
79f7319a31 Stop putting Wonders as start buildings (#5710) 
This will stop the adding of Wonders as starting buildings in the Future era
 2021-11-27 20:01:05 +02:00
yairm210
ce158d0c44 Fixed terrace farms not improving with Civil Service and Fertilizer techs 2021-11-24 18:43:19 +02:00
itanasi
b72a2c3ebb Make Guided Missile Free (and Maintenance overhaul) (#5698) 
* Add new UniqueType.NoMaintenance to support Guided Missile

* revert gradle
Add UnitMaintenanceDiscount
Rename UnitMaintenanceDiscount->UnitMaintenanceDiscountGlobal
Rework maintenance equation to account for overlapping reductions
Add maintenance variable to MapUnit

* Add square brackets in string (apparently didn't check in?)
More robust uniques check code so not assuming only one matching unique
Use toPercent()

* Proper toPercent() math

Co-authored-by: temurakami <spellman23@gmail.com>
 2021-11-22 18:21:34 +02:00
Xander Lenstra
defa25f254 Updated vanilla policies and fixed a few oversights from G&K policies (#5681) 2021-11-15 18:38:49 +02:00
Xander Lenstra
b195f0b92c Removed the religions file and favoured religions from the vanilla ruleset (#5682) 2021-11-15 15:35:45 +02:00
SimonCeder
e4f686964e Regions part 2 - City state placements, start normalization (#5663) 
* start position normalization

* assignLuxuries

* City states placement

* city state normalization

* don't consider tiny islands

* also modify the other json since they are duplicated now
 2021-11-11 12:11:48 +02:00
Xander Lenstra
003f2434c1 Differentiating Vanilla & G&K (#5654) 
* Fixed tests checking for mod correctness

* Update G&K jsons to current vanilla versions

* First pass over buildings & beliefs

* First pass over nations

* First pass over eras.json

* Fully updated tech tree

* First pass over units

* Second pass over buildings -- fixed techs

* Fixed last prerequisites and row numbers of tech

* Went through the entire tech tree and moved things to their correct spot

* Fixed tests
 2021-11-09 06:23:30 +02:00
Xander Lenstra
ac2bc3a404 Second version of G&K / vanilla split (#5647) 
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown

* Split the baseruleset from the mods list in game parameters

* Mod links are checked again when selecting a mod

* The new map editor screen now also uses the base ruleset

* Updated the ruleset change dialog in the map editor; Fixed a crash

* Refactored some code and fixed some bugs
 2021-11-08 22:57:09 +02:00
Xander Lenstra
2250d75b4c Removed a wrongly implemented BNW-only building (#5649) 2021-11-08 22:14:27 +02:00
SimonCeder
09c40002f0 Regions part 1 - subdivide generated maps into regions, and use to place civs (#5556) 
* json definitions

* create regions, define region types

* count terrains

* terrain qualities

* tilesInRectangle

* use even q coords

* major civ start locations

* move to separate file

* remove printlns

* unused imports

* strings

* strings

* reviews

* conditionalize qualities

* guess qualities of terrain types without explicit definitions

* guess qualities of terrain types without explicit definitions

* Update template.properties

* Update template.properties

* add HideInCivilopedia to technical uniques

* reviews
 2021-11-05 07:59:48 +02:00
Xander Lenstra
53a0c9b248 Reworked buying buildings & units with stats a bit (#5618) 
* Reworked buying buildings & units with stats a bit

* Reviews
 2021-10-31 17:59:13 +02:00
Xander Lenstra
045b52c935 Fixed a bug where hagia sophia could be build in non-faith games (#5617) 2021-10-31 14:00:24 +02:00
SimonCeder
bfe0b68ab8 Barbarian units (#5589) 
* barbarian unique units; barbarian blacklisted units

* credits

* barbarian units do not take resources

* ai fix
 2021-10-29 13:33:11 +03:00
Xander Lenstra
4c053ddc99 Revert "Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577)" (#5585) 
This reverts commit db6e588479.
 2021-10-28 22:01:06 +03:00
Xander Lenstra
db6e588479 Splitting of vanilla and gods & kings rulesets -- Part 1: Groundwork (#5577) 
* Copied files for Gods & Kings folder

* Added G&K and unified with mods in dropdown
 2021-10-28 18:02:30 +03:00
SimonCeder
446c3fb97a Conquistadors only settle other continents (#5566) 
* conquistadors only settle other continents

* make it a conditional
 2021-10-27 07:08:23 +03:00
Xander Lenstra
5d9c1266d7 Fixed ruins having two faith bonuses that could apply at the same time (#5545) 
* Fixed ruins having two faith bonuses that could apply at the same time

* Added turn restrictions on ruins
 2021-10-25 19:09:39 +03:00
Xander Lenstra
b66443574e Enumified all remaining resource & improvement uniques (#5523) 
* Added conditionals & enumified improvement stat uniques

* Enumified all the other uniques

* Fixed bug where improvemen stat icons didn't show up in tech tree & reviews
 2021-10-24 20:47:29 +03:00
Xander Lenstra
13859e78c1 Unified and enumified production percentage bonus uniques (#5521) 2021-10-20 16:57:55 +03:00
Xander Lenstra
c840ff99a6 Fixed belief increasing city-state influence resting point (#5502) 2021-10-17 23:02:45 +03:00
Xander Lenstra
1a6eee0d19 Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
Xander Lenstra
551e6e1d54 Implemented holy warriors follower belief (#5411) 
* Implemented holy warriors follower belief

* Minor fixes

* Likely fixed the tests

* Made someTroglodyte happy :)

* Removed stray println's

* Implemented requested changes
 2021-10-16 20:25:38 +03:00
Giuseppe D'Addio
dd8f7ed8ff Update Nations.json (#5457) 
You put one space too much
 2021-10-13 23:24:25 +03:00
SimonCeder
ff67e66348 Free buildings part 2 - works for Carthage too (#5471) 
* free buildings works for Carthage too
unify "provides a free [] []" and "gain a free [] []"

* re-check at start of turn

* reviews
 2021-10-13 19:21:27 +03:00
SimonCeder
36711f70ad Variable resource quantities (#5456) 
* implement varying resource amounts

* works on old maps

* reviews
 2021-10-12 07:38:07 +03:00
Arthur van der Staaij
f0545130e9 Fixed the base cost of the Grand Temple (#5455) 
Base cost 300->125
 2021-10-11 09:23:09 +03:00
SomeTroglodyte
7bbcb8db1a Mayas (#5408) 
* The Maya - data and calendar

* The Maya - completed

* The Maya - notifications

* The Maya - favoredReligion

* The Maya - comments in GreatPersonManager

* The Maya - clickable notifications

* The Maya - templates

* The Maya - atlas

* The Maya - patch1
 2021-10-09 20:45:59 +03:00
SimonCeder
c00ce49c86 AI rationing of strategic resources; Hydro Plant re-enabled (#5401) 
* AI evaluation of resources

* optimizations

* sell or disband when needed for space victory

* use for all constructions

* use in trade evaluations

* .requiresResource()
 2021-10-06 17:11:02 +03:00
Xander Lenstra
fc01fde163 Nations now have a favoured religion they try choose when available (#5406) 2021-10-05 20:38:58 +03:00
Xander Lenstra
e879bb2a14 Added an advanced system for choosing beliefs (#5400) 2021-10-05 15:33:27 +03:00
Xander Lenstra
c9f23b644a Updated amphitheater replacements to temple replacements (#5399) 2021-10-05 09:08:56 +03:00
SomeTroglodyte
726a1942db Sharpen unit tests for UniqueTypes (and mod checker too) (#5398) 
* Sharpen unit tests for UniqueTypes (and mod checker too)

* Sharpen unit tests for UniqueTypes - fix newly found problems
 2021-10-05 09:08:41 +03:00
Xander Lenstra
82e72ddcfa Added in [tileFilter] tiles conditional to combat uniques (#5393) 
* Some code cleaning

* Added `in [tileFilter] tiles` conditional

* Limited Visibility -> [-1] Sight

* Fix tests and rename conditional

* Actually made the conditional functional

* Renamed conditional once again
 2021-10-04 22:30:09 +03:00
SomeTroglodyte
088e35ff13 Ethiopia - Nation (#5387) 
* Ethiopia - Nation

* Ethiopia - Unit and Stele

* Ethiopia - Graphics

* Ethiopia - color
 2021-10-04 20:56:34 +03:00
Xander Lenstra
e1b4c53573 Added two more conditionals and updated movement, sight & combat to use these (#5389) 2021-10-04 08:32:10 +03:00