Commit Graph

6360 Commits

Author SHA1 Message Date
7f07bcb9e5 Recycling center (#5738)
* Add support to UniqueType.MaxNumberBuilding (including rejectionReasons)
Add Recycling Center entry to JSON
Need Graphical Icon

* Fix typo
Add TODO

* adding Recycling Center icon

* Credit update for icon
Rephrase Rejection text
Updated .atlas and .png
Add code to block showing Recycling Center

* Fix using placeholderText
Set shouldShow to True so iot still appears while under construction but not completed

* Rejection Text now working
Remove debug prints

* Remove odd extra lines

* extra lines

* Remove excessive if statement in shouldBeDisplayed
Reword text. Unique can apply to Buildings and Units
Refactor Signature since not just Buildings

* Adding code to remove building in transferred city

Co-authored-by: temurakami <spellman23@gmail.com>
2021-12-03 10:15:51 +02:00
8060b69378 Center Agriculture in Tech tree. (#5736)
* Update Techs.json

* Update Techs.json
2021-11-30 19:01:06 +02:00
06dd395efb Fixed a bug where statue off Zeus would not work (#5732) 2021-11-30 14:42:19 +02:00
57f3bf2bb2 Resolved #5713 - AI doesn't try attacking with non-attack units 2021-11-29 22:45:54 +02:00
b9d2078442 Fixed niche bug that let you try and capture civilians in territory you can't enter 2021-11-29 22:41:55 +02:00
e43e23b9a8 Disabled buggy counteroffer mechanic to release a stable version 3.18.5-patch1 2021-11-29 19:47:42 +02:00
f86b765d38 Show which cities are missing required buildings for National Wonders. (#5718) 2021-11-29 15:57:36 +02:00
6296f6917f Autogenerated docs wraps conditionals and doesn't give examples for non-parameter-containing uniques 2021-11-28 08:30:31 +02:00
0cef056c4d Typing for unit uniques 2021-11-28 08:28:55 +02:00
05742e02f3 Added documentation for Mac parameters as per #5679 and future-proofing build.gradle for eventual mac releases 2021-11-27 21:05:11 +02:00
84e600786c 3.18.5 3.18.5 2021-11-27 20:08:47 +02:00
7ca1222678 Translations update (#5711)
* Update Russian.properties (#5708)

* Update Russian.properties

* Update Russian.properties

* Update Russian.properties

* Update German translation (#5706)

Co-authored-by: deqtodo <94169613+deqtodo@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
2021-11-27 20:03:31 +02:00
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
10686d1d8f We Love The King Day (#5705)
* we love the king day

* AI improvements

* Don't break old saves

* unused import

* tutorial

* proper growth when unhappy

* reviews
2021-11-27 19:59:19 +02:00
4107ff3386 Added health conditionals (#5707)
* Added health conditionals

* Whenefied conditional
2021-11-27 19:52:54 +02:00
ce158d0c44 Fixed terrace farms not improving with Civil Service and Fertilizer techs 2021-11-24 18:43:19 +02:00
15cbf8359f Resolved edge case crash when conquering the capital of a civ that has a unique capital city indicator 2021-11-24 18:33:51 +02:00
5d160508d3 Fixed bug when attempting to load a game that uses mods you don't have 2021-11-24 18:33:44 +02:00
2dd4415977 Counteroffer mechanic, updated trade valuations (#5702)
* counteroffer mechanic

* string template

* string template

* AI always counteroffers if able
2021-11-23 13:00:30 +02:00
694e862944 Small improvement 2021-11-22 22:01:17 +02:00
1b0eaa8a71 Unique autodocs ++ 2021-11-22 21:59:35 +02:00
92fd72d895 Better autogenerated unique docs 2021-11-22 21:10:21 +02:00
4113b810ff Simplified civ info stats happiness breakdown 2021-11-22 20:53:08 +02:00
4617bc21a7 Added unique documentation generation when running from Android Studio :) 2021-11-22 20:49:31 +02:00
532f42365c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/com/unciv/models/ruleset/unique/UniqueType.kt
2021-11-22 20:27:11 +02:00
63c5ed2156 Unique deprecation work 2021-11-22 20:24:43 +02:00
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
14c4f2d570 Step 3 - new uniqueTypes, and removed old getStatsFromUniques entirely!
And we can FINALLY remove that ugly double statsPerPopulation check, since we take ALL uniques and filter them by building/wonder type instead of local/nonlocal!
@xlenstra perhaps the lower two new unique types can be replaced with conditionals?
2021-11-21 22:43:51 +02:00
213fc67c87 Step 2 - existing uniquetypes 2021-11-21 22:00:40 +02:00
846388f032 Stats from uniques simplification, step 1 - setting up the base functions, with just one unique 2021-11-21 21:52:17 +02:00
29dfb3b20d 3.18.4 3.18.4 2021-11-21 21:14:42 +02:00
62bcc33250 Update Russian.properties (#5699)
* Update Russian.properties

* Update Russian.properties
2021-11-21 21:10:31 +02:00
0afb5358a3 Update Italian.properties (#5693) 2021-11-21 21:10:18 +02:00
b23ba40cd0 More Unique types, with some deprecations 2021-11-21 21:08:15 +02:00
59c5d2b10c Unique types for building filters 2021-11-21 21:02:45 +02:00
4b5a709ee0 Resolved #4595 - policy screen keeps scroll position when adding new policy 2021-11-20 23:31:37 +02:00
1a7f562bc0 Resolved #5265 - cannot add 2 of the same buildings to the queue visually 2021-11-20 23:27:31 +02:00
73f275f4cd Resolved #5642 - viewable tiles update after capturing city 2021-11-20 21:10:41 +02:00
fa5ac83f88 Resolved #5662 - AI won't declare war at the very beginning of games for little reason 2021-11-20 21:00:40 +02:00
d477029232 Cleanup renaming "CameraStageBaseScreen" in KDocs. (#5695) 2021-11-20 19:56:53 +02:00
ea0738f6e5 Recreate map editor screen when changing ruleset to update all the editing tools 2021-11-19 15:20:28 +02:00
ea29458038 Resolved #5668 - Changing base ruleset in map editor removes all terrain references that are no longer viable, including starting locations for nations not in new ruleset 2021-11-19 15:09:01 +02:00
bdeccb87e8 Resolved #5692 - exiting Civilopedia always brings you o the previous screen 2021-11-19 14:15:48 +02:00
ff3cd7511c Somehow not all got added? 2021-11-19 12:27:48 +02:00
200a62670c Rename: Changed CameraStageBaseScreen to BaseScreen 2021-11-19 12:26:57 +02:00
8ddbe3b2b7 3.18.3 3.18.3 2021-11-19 12:13:23 +02:00
891ef5b0f1 Update Swedish.properties (#5684) 2021-11-19 12:02:35 +02:00
db191acd73 Update Russian.properties (#5687)
* Update Russian.properties

* Update Russian.properties

* Update Russian.properties
2021-11-19 12:02:20 +02:00
422bb58814 Caught out of memory errors on autosave 2021-11-15 21:36:06 +02:00
defa25f254 Updated vanilla policies and fixed a few oversights from G&K policies (#5681) 2021-11-15 18:38:49 +02:00