Commit Graph

3447 Commits

Author SHA1 Message Date
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
6e7e05248d Fixed crash caused by #4142 2021-06-18 10:40:54 +03:00
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
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
87810b8ce8 Wake up units when enemy sighted or displaced or attacked (#4145)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-06-18 09:40:07 +03:00
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +03:00
67820e8870 Unitfilter now accepts multiple filters (see wiki/uniques for details) 2021-06-17 19:49:20 +03:00
591fd9c138 Fixed honor policy not adding bonus vs barbarians (#4160)
* Fixed honor policy not adding bonus vs barbarians

* Implemented requested changes
2021-06-16 18:49:27 +03:00
4fc2364cb0 Allow sight bonus to specifically target land military unit (#4163) 2021-06-16 11:13:21 +03:00
6a713deeea Fixed units not teleporting out of sold city tiles (#4161)
Fixed a bug where units were not immediately teleported out of the
territory of a city when the owner of the city accepted a trade to sell
it in their turn.

This bug also used to crash the game if one of the units that were not
teleported out was selected and they were able to reach a tile with a
same-type unit of their own civ that could also reach them, since the
unit swapping eligibility checking code would try to remove the unit and
then place them back on an illegal tile.
2021-06-16 11:12:52 +03:00
b3f5820cb4 Fixed old worker speed improvement uniques no longer working (#4162) 2021-06-16 11:11:54 +03:00
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
625c4c9139 Fix uninitialized lateinit access in TradeOffer (#4159) 2021-06-16 07:33:37 +03:00
35c08b4c18 Fix question on found city action breaking promise - no AI (#4156) 2021-06-15 22:44:50 +03:00
d6ec203873 Tooltips - all key indicators (#4128) 2021-06-15 19:43:43 +03:00
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
09f1deaee0 Fixed RNG: Maps reproducibility (#4112)
* The RNG for picking resources locations and rivers starting points was not seeded properly. Maps are now fully reproducible by passing the same set of MapParameters

RNG Seed in Map Editor
* Creating a new map from MapEditorMenuPopup reseeds automatically the RNG
* Added Seed on top of MapEditorMenuPopup
* Added Copy to clipboard button on top of MapEditorMenuPopup to copy the currently used RNG Seed
* UI FIX: Buttons in MapEditorMenuPopup have all the same width

Fixed RNG Seed in NewGameScreen
* When clicking on "Start new game" from VictoryScreen, a new seed is generated
* When clicking on "Start new game" from WorldScreenMenuPopup, a new seed is generated
2021-06-15 09:50:03 +03:00
e1c6cef111 Show promises not to settle, ask on found city action (#4148) 2021-06-15 09:49:08 +03:00
5e1803c40a FIX: unintended code slipped through (#4143) 2021-06-14 22:44:09 +03:00
fbebcdcd21 Updated Rationalism branch to G&K (#4136) 2021-06-14 15:10:49 +03:00
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
07a43f3f1a Fix crash caused by cascaded ruins unit gifts (#4133)
* Fix d1f6c5ac breaking builds

* Fix d1f6c5ac breaking builds - patch1

* Fix silent crash when ancient ruins cascade gifted units
2021-06-14 14:44:43 +03:00
d1f6c5ac0a Deprecated "Bonus vs <unitType> <amount>%" in favor of "+[amount]% Strength vs [unittype]" 2021-06-13 22:47:41 +03:00
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
85158ab29d TradeType Enum marginal cleanup and Gold Font symbol (#4127) 2021-06-13 22:22:44 +03:00
5f66c57de5 Proposal for New borders (#4124)
* new-borders

* New Borders
2021-06-13 21:56:47 +03:00
ea852f9fa0 Unified Menu Popups (#4113) 2021-06-13 21:56:32 +03:00
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
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
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
a99cca5b28 Display Movement Paths (#4114) 2021-06-12 23:48:22 +03:00
7a9f111125 Main menu key bindings (#4082) 2021-06-12 23:45:40 +03:00
1bf6253d87 CityScreen resize (#4117) 2021-06-12 23:20:34 +03:00
eda6dece9c Implement dormant Nation.startIntroPart1+2 (#4091)
* Implement dormant Nation.startIntroPart1+2

* Implement dormant Nation.startIntroPart1+2 - translation
2021-06-10 23:16:35 +03:00
7e284f998b Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
f71ac0deab Revert "Revert "Revert "Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)"" (#3991)"
This reverts commit 298693ab03.
2021-06-09 22:34:29 +03:00
298693ab03 Revert "Revert "Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)"" (#3991)
This reverts commit 6d5cb00271.
2021-06-09 21:38:20 +03:00
e0a8de9eb5 Trade UI - Leader portraits, keys, layout (#4073)
* Trade UI - Leader portraits, keys, layout

* Trade UI - Leader portraits, keys, layout - fix1

* Trade UI - Leader portraits, keys, layout - fix2
2021-06-09 20:56:26 +03:00
db1604b0bc Fix turnsLeft return 0 if 0 < workLeft <= overflow (#4086) 2021-06-09 20:53:19 +03:00
68a3e09a19 Resolved #4083 - Reconquering cities you've founded leads to no resistance 2021-06-08 23:00:35 +03:00
8441ab9e56 Cities in resistance cannot bombard, as per Civ V - #663 2021-06-08 21:59:23 +03:00
7cad6dcfe5 Implement production overflow (#4081)
As discussed on yairm210#4058, production (or hammer) overflow in Civ 5
is a thing and goes according to rules described on
https://forums.civfanatics.com/threads/hammer-overflow.419352/
This has been added to the game. There are no visual indicators for the
user yet. This will probably be added later.
2021-06-08 21:16:06 +03:00
b2691eed70 Deprecated notification color 2021-06-08 20:04:32 +03:00
e8bbd4bc70 Resource.building, Building.resourceBonusStats deprecated in favor of '[stats] from [resource] tiles in this city' unique 2021-06-08 20:01:49 +03:00
21aa371cc3 Re-show redundant tech prereq mod errors without impeding playability (#4046)
* Re-show redundant tech prereq mod errors without impeding playability

* Re-enable playability of mods with less severe errors - fun version
2021-06-08 06:44:25 +03:00
0b696451ce Map Generation Seedable (#4072)
* Map Generation Seedable
* Added Seed editable field in MapParametersTable
Previously, using the same set of parameters, one could not get the same map twice (i.e. negligible probability for it to happen). With this commit players can specify, alongside the usual map parameters, a long integer used to seed the RNG and get replicable results.

* Fixed Natural Wonder Spawn was not using MapGenerationRandomness hence giving not reproducible maps

* Translation strings
2021-06-08 06:42:27 +03:00
7c9b0e04b4 Map Generation Fixes and Tweaks (#4069)
* * Renamed Continents to Two Continents
* Created Four Continents map size
It spawns a vertical and a horizontal ocean to split the map in 4 major continents. Works properly on all sizes and with world wrap

* Fixed Pangea extending to boundaries in rectangular maps
* Unified Pangea for rectangular and hexagonal maps

* Fixed Default map type bias on Rectangular maps. Also removed "pangea effect" on Default: land can spawn with the same probability in the whole map.

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings

* New map type: 4 Corners
* Reverted name change Two Continents to Continents
* Renamed Four Continents to Four Corners (to reflect original name in Civ5)
* Added translation strings
2021-06-08 06:41:02 +03:00
fadd1684ac Make CivilizationInfo.gold read-only (#4074)
* Make CivilizationInfo.gold read-only

* Make CivilizationInfo.gold read-only
2021-06-08 06:40:17 +03:00
cd58f6ace8 Refund wasted production as gold (#4058)
* Refund wasted production as gold

Any wasted production, from for instance a partially completed wonder or
obsolete units, will now be refunded as gold (in a 1:1 ratio).

We update both at the start and end of the user turn. Updating at the
start to account for wonders completed after our previous turn and
updating at the end to account for obsolete buildings/units as a
consequence of our own turn.

When obsolete units get replaced by their upgraded version (as in civ 5)
this code should probably be updated.

* Implement wonder refund and obsolete unit upgrade

If a wonder is built somewhere else but the user has production in this
wonder, the production will be refunded as gold in a 1:1 ratio. A
notification will be shown to indicate this. This reflects the behaviour
in Civ 5.

If a unit becomes obsolete and an upgrade is available, the production
put into this unit will now be transferred to the upgraded version. If
the unit is queued, the queued unit will also be changed to the new
version and the user will be notified via notification.

* Shorten notification messages

* Update alerts: been obsolete -> become obsolete
2021-06-07 22:04:33 +03:00