mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-22 13:49:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 6 Branches 1,098 Tags
408bea9fe82b8d26ae3e8a33eb0f1e5cc9577951
Commit Graph

4111 Commits

Author SHA1 Message Date
itanasi
4fe7315478 Sort Maintenace Using Fixed Point (#5764) 
* 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

* Use fixed point Long to help in sorting to avoid float bug?

* Use fixed point Long to help in sorting to avoid float bug?

Co-authored-by: temurakami <spellman23@gmail.com>
 2021-12-15 22:59:10 +02:00
yairm210
c655d69c78 Order unique docs by target type so we don't get reorderings all the time 2021-12-14 19:02:58 +02:00
GGGuenni
28d3c12142 Improvements to TurnChecker data usage (#5789) 
* Added necessary utils

Added the FileNotFoundException which is also part of #5593

* Added preview download to MultiplayerScreen

* Added preview download to TurnChecker

* Fixed uncomplete commit

* Removed debug print in MultiplayerScreen
 2021-12-13 21:14:30 +02:00
Interdice
3f6fe234b3 AI for Inquisitor and Missionary (#5590) 
* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* First pull request to add missionaries and inquisitors

* Ai choice

* some fixes

* some fixes

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* adding a system for the ai to buy with faith

* finally done

* finally done

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes

* some fixes
 2021-12-12 12:27:09 +02:00
yairm210
0c1509bfe8 Resolved problem in new uniques with multiple parameters of the same name 
Relevant to #5783 and #5781
 2021-12-11 20:23:31 +02:00
yairm210
b537f9e386 Resolved #5779 - uniques and conditionals for translating are taken directly from the uniquetypes 2021-12-10 15:34:17 +02:00
yairm210
23bad8d961 Resolved #4921 - can gift improvements to city states also on water tiles and when other improvements have been built on top of the resource 2021-12-09 21:58:57 +02:00
yairm210
ed3a4accdd Resolved #5775 - don't try and set resource amounts for "image" tiles, like in map editor or civilopedia 2021-12-09 20:43:19 +02:00
yairm210
f3378f4ced 3.18.8-patch1 
Resolved #5774 - removed demanded resource from city when resource is not in ruleset
 2021-12-09 20:37:37 +02:00
Xander Lenstra
22b3997c28 Band-aided a bug where players in multiplayer games were waiting for themselves. (#5768) 2021-12-07 21:38:45 +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
yairm210
4bc8c83555 Merge remote-tracking branch 'origin/master' 2021-12-06 19:20:28 +02:00
yairm210
0088ddd18b Solved bug that made civilian units uncapturable 2021-12-06 19:19:37 +02:00
Xander Lenstra
2fa3228148 Fixed a crash that occasionally happened when liberating a city to a dead civ (#5762) 
* Fixed a crash that occasionally happened when liberating a city to a dead civ

* Added descriptive comment
 2021-12-06 11:54:10 +02:00
Xander Lenstra
40cb651433 Fixed the unique for giving sight to units no longer working (#5760) 2021-12-06 07:10:52 +02:00
Xander Lenstra
a46f638ef1 Fixed a bug where protected city states would have a red line to their protector in the diplomacy overview screen (#5761) 2021-12-06 07:10:05 +02:00
yairm210
31639aac9f Resolved #5752 - don't show 'fortify until healed' if the unit won't actually heal in this tile 2021-12-05 21:38:27 +02:00
yairm210
144d2738a4 Trying to find the cause of #5729 2021-12-05 21:33:04 +02:00
Xander Lenstra
ba36956990 Replaced a != sign by a == sign (#5753) 2021-12-05 12:58:32 +02:00
Xander Lenstra
b6ce8b2aac Fixed a bug where 'requires a [buildingName] in this city' would not work (#5754) 2021-12-05 12:55:46 +02:00
SimonCeder
936a32300b counteroffer fixes (#5749) 2021-12-04 23:25:43 +02:00
yairm210
623420039b Resolved #5727 - on multiplayer, game info is updated as each intermediate player finishes their turn 2021-12-04 23:24:34 +02:00
yairm210
9950e963bc Resolved #5742 - removed extraneous empty lines from translation files 2021-12-04 23:13:43 +02:00
Xander Lenstra
d1224a36cf Fixed a bug where WLTKD would continue after conquering/trading a city (#5748) 2021-12-04 18:33:19 +02:00
yairm210
5697a6f912 Solved crash of #5728 - AIs ignore trade requests that have become invalid mid-turn 
They also no longer spam each other with requests
 2021-12-03 13:57:00 +02:00
yairm210
234b1b1741 Removed many "proxy functions" from civInfo to cityStateFunctions 2021-12-03 11:28:24 +02:00
yairm210
7169458943 More informative exceptions, to try and catch the "invalid city ID on trade" crash 2021-12-03 11:12:48 +02:00
yairm210
69db686101 Moved all fully deprecated uniques to their own region down below 
Slight steps towards stat percent bonus calculation efficiency in CityStats
 2021-12-03 11:01:55 +02:00
yairm210
0def261012 Added unique types, added regions for easier location 2021-12-03 10:48:39 +02:00
itanasi
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
Xander Lenstra
06dd395efb Fixed a bug where statue off Zeus would not work (#5732) 2021-11-30 14:42:19 +02:00
yairm210
57f3bf2bb2 Resolved #5713 - AI doesn't try attacking with non-attack units 2021-11-29 22:45:54 +02:00
yairm210
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
yairm210
e43e23b9a8 Disabled buggy counteroffer mechanic to release a stable version 2021-11-29 19:47:42 +02:00
will-ca
f86b765d38 Show which cities are missing required buildings for National Wonders. (#5718) 2021-11-29 15:57:36 +02:00
yairm210
0cef056c4d Typing for unit uniques 2021-11-28 08:28:55 +02:00
SimonCeder
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
Xander Lenstra
4107ff3386 Added health conditionals (#5707) 
* Added health conditionals

* Whenefied conditional
 2021-11-27 19:52:54 +02:00
yairm210
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
yairm210
5d160508d3 Fixed bug when attempting to load a game that uses mods you don't have 2021-11-24 18:33:44 +02:00
SimonCeder
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
yairm210
4113b810ff Simplified civ info stats happiness breakdown 2021-11-22 20:53:08 +02:00
yairm210
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
yairm210
63c5ed2156 Unique deprecation work 2021-11-22 20:24:43 +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
yairm210
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
yairm210
213fc67c87 Step 2 - existing uniquetypes 2021-11-21 22:00:40 +02:00
yairm210
846388f032 Stats from uniques simplification, step 1 - setting up the base functions, with just one unique 2021-11-21 21:52:17 +02:00
yairm210
b23ba40cd0 More Unique types, with some deprecations 2021-11-21 21:08:15 +02:00
yairm210
59c5d2b10c Unique types for building filters 2021-11-21 21:02:45 +02:00