Commit Graph

3699 Commits

Author SHA1 Message Date
Xander Lenstra
c6fac03067
Added a few pantheons; religion uniques affect cities instead of civs; updated pantheon picker screen (#4296)
* Added a few simple beliefs for testing

* Moved CityReligion to its own file

* Created a picker screen for choosing pantheons

* Pantheon uniques are now calculated only for cities with the specific pantheon

* Added all the pantheon beliefs that can easily be added and commments for the ones still missing

* Games only have religion if either the user specifically asked for it, or uses a mod with religion

* Implemented requested changes
2021-07-01 22:48:18 +03:00
Xander Lenstra
dd283248c2
Fixed bug where all units could move after attacking (#4325) 2021-07-01 22:18:49 +03:00
Xander Lenstra
c350a3c923
Fix a few bugs related to nukes (#4324)
* Fixed bugs where nukes don't work due to capitilzation issues

* Renamed existing translations

* Fixed crash happening when nuking tiles without an owner

* Added notifications to attacker for civs that have declared war as a result of the nuke dropping
2021-07-01 22:18:37 +03:00
Yair Morgenstern
e80c7d2101 Resolved 'getting stuck when there are no more pickable Pantheon beliefs' 2021-07-01 21:58:52 +03:00
SomeTroglodyte
ae84d3f5c8
Relgion -> Religion (#4321) 2021-07-01 09:02:41 +03:00
Yair Morgenstern
74fd80416c Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-30 21:02:57 +03:00
Yair Morgenstern
aeceead616 Removed final vestiges of old Bonus/Penalty effects.
Friendship ended with Regex, now Unique is my best friend.
2021-06-30 21:02:53 +03:00
SomeTroglodyte
44674365fe
Translate nested placeholders for english too (#4319) 2021-06-30 20:40:41 +03:00
SomeTroglodyte
3b75f2209e
Fix mod sounds from local, Android SoundPool issues, more commenting (#4310) 2021-06-30 17:55:11 +03:00
Xander Lenstra
c1e92225c9
Research Tech Button shows progress; Small bug fix (#4303)
* "Research" button now shows progress in the selected tech

* Current tech is automtically selected as free tech when applicable

* Implemented requested changes
2021-06-30 17:35:54 +03:00
Xander Lenstra
a0cf30831c
Updated promotions - make more generalizable, update to G&K (#4292)
* Generalized the "Heal Instantly" promotion

* Extended "Indirect Fire" to WaterRanged units, conform the main game

* Generalized Extend Range, Operational Range

* Generalized "logistics"

* Typo

* Generalized the healing from "Medic"

* Implemented requested changes

* Generalized "[amount] Movement"; "[amount] Visibility Range"

* Added survavalism promotions

* Updated Boarding Party strength bonus values to G&K

* Implemented requested changes
2021-06-30 17:09:02 +03:00
Yair Morgenstern
d3f639e29c Solved crashing 'head towards sieged city' bug 2021-06-29 22:35:22 +03:00
SomeTroglodyte
4d16b3fcf8
Respect visualMods for Sound - CheckBox, formats, modchange detect (#4295)
* Respect visualMods for Sound - CheckBox, formats, modchange detect

* Respect visualMods for Sound - german patch
2021-06-29 21:31:57 +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
Xander Lenstra
4add686bcd
Fixed bug where on quick game speed, educated elite would yield a great person every turn (#4289) 2021-06-27 22:17:05 +03:00
Yair Morgenstern
20db11e73f Added a test to ensure that translations don't crash 2021-06-27 22:16:15 +03:00
SomeTroglodyte
ca58cf1694
Translation template fixes (#4287)
* Translation template fixes

* Translation template fixes - patch

* Translation template fixes - another
2021-06-27 21:22:47 +03:00
SomeTroglodyte
f7a1d0cdee
Suppress policy branch unlock notification when incompatible (#4288) 2021-06-27 21:20:29 +03:00
Arthur van der Staaij
0f0abad5ea
Added Stealth tech and Stealth Bombers (#4271)
* Changed some interception-related uniques

- "Can not be intercepted" -> "Cannot be intercepted"
  This really irked me, and the new version is also how it is written
  in the wiki.
- "Reduces damage taken from interception by 50%" ->
  "Damage taken from interception reduced by [50]%"

* Added "Cannot be carried by [unitFilter] units" unique

* Added an icon for Stealth

* Added Stealth technology and the Stealth Bomber

* Possibly fixed incorrect rounding for interception damage bonus

* Various code style changes

* Made Stealth Bomber interceptable, but with 100% damage reduction
2021-06-27 08:57:11 +03:00
SomeTroglodyte
401c10c132
Nicer distribution of policy picker branches (#4285)
* Nicer distribution of policy picker branches

* Nicer distribution of policy picker branches - patch1
2021-06-27 06:37:14 +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
SomeTroglodyte
b628c4238d
Fix "National Wonder is being built elsewhere" not displayed (#4284) 2021-06-26 23:35:23 +03:00
Yair Morgenstern
91f6b3ba2d Resolved #4283 - clear old legalismState after converting to new format 2021-06-26 23:28:22 +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
30ac1dae1c
Fixed crash when selecting worker (#4273)
When making the changes in workers in #4252, I accidentally overlooked that Constants.workerUnique doesn't have params, and this should be the right way to write it.
2021-06-26 22:44:32 +03:00
Arthur van der Staaij
8549931360
Fixed main menu crash (#4270)
Fixed a critical bug where the game would crash when any option was
picked in the main menu.

The bug was introduced by 823e6ffc2a.
2021-06-26 22:43:50 +03:00
Yair Morgenstern
823e6ffc2a Faster 'false' results for isStats, as proposed by @SomeTroglodyte in #4259 2021-06-25 18:33:45 +03:00
Xander Lenstra
e6850b857a
Generalized building of improvements (#4252)
* Generalized building of improvements

* Readded support for the deprecated unique "Can build improvements on tiles"

* Small code quality changes

* Implemented requested chagnes
2021-06-25 16:35:15 +03:00
SomeTroglodyte
06b2e7da2f
Promotion picker keeps vertical scroll pos on promote or resize (#4247)
* Promotion picker keeps vertical scroll pos on promote or resize

* Promotion picker keeps vertical scroll - without parameter
2021-06-24 21:37:50 +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
1c42e1e730
Fixes bug where in some cases building improvements would increase the base yield of the tile (#4217)
* Fixes bug where in some cases building improvements would increase the base yield of the tile

* Removed unncessary test

* Implemented requested changes

* Implemented requested changes

* Fixed build errors
2021-06-24 15:55:41 +03:00
Xander Lenstra
b43257cea8
Fixes #4232 (#4245) 2021-06-24 15:54:25 +03:00
Yair Morgenstern
208ad1aa27 Resolves #3800 in a more generic way 2021-06-23 18:20:56 +03:00
Yair Morgenstern
fc6eda364e Resolved #4200 - Cities in resistance cannot bombard 2021-06-23 10:45:49 +03:00
Yair Morgenstern
74e3b67afe 3.15.4 2021-06-23 10:29:51 +03:00
Yair Morgenstern
ba505dcfdb Deprecated 'download map' - map sharing should be done via Mods 2021-06-23 10:13:11 +03:00
Arthur van der Staaij
e10c52efc1
Fixed open terrain bonus working in rough terrain (#4219)
* Fixed open terrain bonus working in rough terrain

Fixed #4139 - The open terrain combat bonus no longer works in rough
terrain.

Deprecated "Open terrain" and "Rough terrain" uniques and undeprecated
"rough" property of terrains.

* Minor simplification

* Replaced "rough" with "Rough terrain" unique

* Empty commit to re-run the build checks
2021-06-23 09:41:55 +03:00
Arthur van der Staaij
300eb6f726
Fixed captured units not tp-ing out of liberated cities (#4239) 2021-06-23 09:40:55 +03:00
Arthur van der Staaij
cf9e00c589
Fixed naval units not tp-ing out of razed cities (#4238) 2021-06-23 09:40:32 +03:00
Xander Lenstra
7f88844d82
Created Patronage policy branch (#4186)
* Created Patronage policy branch -- draft

* Patronage branch is now functional

* Added images for the policies

* Temporarily bandaged backwards compatability, added incompatabilities

* Implemented recommended changes

* Fixed acquirement of 'patronage complete' not being saved

* Reverted change I was unhappy with

* Implemented requested changes

* Fixed build errors

* Implemented recommended changes

* City States can now give any great person, including unique ones, conform Ravignirs tests
2021-06-22 17:25:29 +03:00
SomeTroglodyte
a025660fe0
Split off all individual OverviewScreen panes (#4184)
* Spliff off all individual OverviewScreen panes

* Spliff off all individual OverviewScreen panes - remove comment

* Spliff off all individual OverviewScreen panes - consistent file endings
2021-06-21 18:54:48 +03:00
Xander Lenstra
4586e44ba6
Fixed a bug where excess food would not be converted to production for settlers (#4221) 2021-06-21 11:00:47 +03:00
Yair Morgenstern
837d78db21 3.15.3 2021-06-20 22:00:59 +03:00
Yair Morgenstern
990074e9b0 Resolved #4209 - AI city-founding no longer plays music 2021-06-20 21:51:22 +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
Xander Lenstra
bd850683e1
Fixes bug where coastal buildings cannot be built even if the city is coastal (#4197) 2021-06-19 21:46:20 +03:00
SomeTroglodyte
05e6609b25
Change improvement picker key indicators to tooltip (#4174) 2021-06-19 21:43:04 +03:00
Xander Lenstra
8f26a77b2d
Fixed an issue where mods with either the 'patronage' or 'entrepreneurschip' policy would crash upon taking it (#4192) 2021-06-19 21:41:52 +03:00
Xander Lenstra
3686366156
Fixed Great Improvement bonus not working (#4193) 2021-06-19 21:41:25 +03:00
Xander Lenstra
9eb2d1fffb
Stop AI from pillaging their own tiles. Fixes #4203 (#4204) 2021-06-19 21:40:46 +03:00
Xander Lenstra
45a7b5da9c
Fixed autocracy complete bonus not continuing after updating to 3.15.2 (#4195)
* Fixed autocracy complete bonus not continuing after updating to 3.15.2

* Forgot a line
2021-06-19 21:40:06 +03:00
Yair Morgenstern
772531a35f Translation no longer breaks on multiple uses of the same parameter in a unique 2021-06-18 16:54:09 +03:00
Yair Morgenstern
655923f4cf Great improvement bonus provided properly 2021-06-18 14:34:15 +03:00
Yair Morgenstern
6e7e05248d Fixed crash caused by #4142 2021-06-18 10:40:54 +03:00
Xander Lenstra
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
Xander Lenstra
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
SomeTroglodyte
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
Yair Morgenstern
fc7e07aa7f Resolved #4170 - updated deprecated Polynesian unique 2021-06-17 19:57:52 +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
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
SpacedOutChicken
4fc2364cb0
Allow sight bonus to specifically target land military unit (#4163) 2021-06-16 11:13:21 +03:00
Arthur van der Staaij
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
Xander Lenstra
b3f5820cb4
Fixed old worker speed improvement uniques no longer working (#4162) 2021-06-16 11:11:54 +03:00
Yair Morgenstern
11af49e6da 3.15.1 2021-06-16 10:59:15 +03:00
SomeTroglodyte
625c4c9139
Fix uninitialized lateinit access in TradeOffer (#4159) 2021-06-16 07:33:37 +03:00
SomeTroglodyte
35c08b4c18
Fix question on found city action breaking promise - no AI (#4156) 2021-06-15 22:44:50 +03:00
SomeTroglodyte
d6ec203873
Tooltips - all key indicators (#4128) 2021-06-15 19:43:43 +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
Federico Luongo
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
SomeTroglodyte
e1c6cef111
Show promises not to settle, ask on found city action (#4148) 2021-06-15 09:49:08 +03:00
Federico Luongo
5e1803c40a
FIX: unintended code slipped through (#4143) 2021-06-14 22:44:09 +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
SomeTroglodyte
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
Yair Morgenstern
d1f6c5ac0a Deprecated "Bonus vs <unitType> <amount>%" in favor of "+[amount]% Strength vs [unittype]" 2021-06-13 22:47:41 +03:00
Yair Morgenstern
60d8adce38 3.15.0 2021-06-13 22:40:12 +03:00
SomeTroglodyte
85158ab29d
TradeType Enum marginal cleanup and Gold Font symbol (#4127) 2021-06-13 22:22:44 +03:00
Federico Luongo
5f66c57de5
Proposal for New borders (#4124)
* new-borders

* New Borders
2021-06-13 21:56:47 +03:00
Federico Luongo
ea852f9fa0
Unified Menu Popups (#4113) 2021-06-13 21:56:32 +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
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
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
Federico Luongo
a99cca5b28
Display Movement Paths (#4114) 2021-06-12 23:48:22 +03:00
SomeTroglodyte
7a9f111125
Main menu key bindings (#4082) 2021-06-12 23:45:40 +03:00
SomeTroglodyte
1bf6253d87
CityScreen resize (#4117) 2021-06-12 23:20:34 +03:00
SomeTroglodyte
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
lishaoxia1985
7e284f998b
Redraw skin Images, edit skin load method (#4080) 2021-06-10 23:10:13 +03:00
Yair Morgenstern
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
lishaoxia1985
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
SomeTroglodyte
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
Aron de Jong
db1604b0bc
Fix turnsLeft return 0 if 0 < workLeft <= overflow (#4086) 2021-06-09 20:53:19 +03:00
Yair Morgenstern
68a3e09a19 Resolved #4083 - Reconquering cities you've founded leads to no resistance 2021-06-08 23:00:35 +03:00
Yair Morgenstern
8441ab9e56 Cities in resistance cannot bombard, as per Civ V - #663 2021-06-08 21:59:23 +03:00
Aron de Jong
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
Yair Morgenstern
b2691eed70 Deprecated notification color 2021-06-08 20:04:32 +03:00
Yair Morgenstern
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
SomeTroglodyte
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
Federico Luongo
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
Federico Luongo
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
SomeTroglodyte
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
Aron de Jong
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
SomeTroglodyte
7a5b88923d
Cosmetic: Convenience shortcuts, some linting (#4067) 2021-06-07 07:26:01 +03:00
Arthur van der Staaij
a7afc0718c
Unit swapping (#4049)
* Added an icon for unit swapping

* Implemented unit swapping

In the original Civ V, unit swapping is a supported mechanic.
If you try to move a unit to a tile with another of your units, and both
units have enough movement points left to reach the other's tile, they
will swap places. They will consume only the movement points needed to
reach the other's tile in this way.

This change implements unit swapping for Unciv.

To prevent all kinds of problems from arising with automatic unit
movement, unit swapping can only be done explicitly. This also means
that it can only be done if the unit-swap movement is possible in a
single turn. It is however not limited to adjacent units.

Because Unciv supports mobile devices, there is in general no separation
between a unit-selection click and a movement click. Clicking on another
unit while a unit is selected simply selects that other unit. Because we
do not want to make it more difficult to select other units in this way,
unit swapping is implemented as a separate "movement mode": to toggle
this mode on or off, the new unit action "Swap units" must be used.
Newly selected units still always start in the normal movement mode.

In the unit-swap movement mode, the possible swap tiles are highlighted
instead of the possible movement and attack tiles. Clicking on a
highlighted tile will display a swap button, similar to the movement
button, or instantly perform the swap if single-click-movement is
enabled. This new behavior overrides the selection of the unit on the
target tile: if the user wants to select the unit instead, they have to
exit the unit-swapping mode first.

The swapping code is robust, it can even handle swaps that involve a
paradrop!

An option to always swap-move when an eligible tile is clicked instead
of requiring the unit-swapping mode, similar to the existing
single-click-movement option, could perhaps be added in later.

* Added some comments to existing movement functions

* Fixed a silly mistake

Fixed a silly mistake which caused the unit-swapping eligibility
detection to sometimes remove units from the world.

* Removed some unneeded code

* Fixed movement buttons not showing with world wrap

Fixed a bug where the "move here" and "swap with" buttons would only
show on the leftmost copy of the world when world wrap was enabled.

* Made the swap action only display if usable

Made the unit swapping button only display if there is at least one
possible swap movement.
2021-06-06 22:56:25 +03:00
SomeTroglodyte
cc3eeb3c7c
Fix gold able to over- and underflow (#4065) 2021-06-06 19:29:23 +03:00
SomeTroglodyte
298dbcb3ee
More power to improvement uniques (resourceTerrainAllow-be-gone) (#4024)
* More flexibility for modding improvements (tileFilter), deprecate resourceTerrainAllow

* More tileFilter and improvement uniques - Translations

* Update template.properties

* More tileFilter and improvement uniques - Revert and/or inside unique parameter
2021-06-06 12:40:02 +03:00
SomeTroglodyte
dc8657dc02
Map editor save / load / download keys (#4056) 2021-06-06 12:36:12 +03:00
SomeTroglodyte
11cbe1c84a
TileInfoTable translation and padding (#4061) 2021-06-06 12:26:55 +03:00
SomeTroglodyte
52b7999c48
Map editor fix translations, a few keys (#4055) 2021-06-06 09:18:22 +03:00
Xander Lenstra
d7b2436bcf
Fixed a few bugs noted in #4057 (#4062) 2021-06-06 09:15:22 +03:00
SomeTroglodyte
6c203d68f7
Unified exit game popups, removed obsolete closing handler (#4048) 2021-06-06 09:09:02 +03:00
Yair Morgenstern
a1b0a90506 3.14.14 2021-06-04 14:33:22 +03:00
Yair Morgenstern
c5d81569f7 Removed some by-name references in construction automation 2021-06-03 22:44:13 +03:00
SomeTroglodyte
e22c53ca96
Key dispatcher precedence with several Popups open (#4040)
* Key dispatcher precedence with several Popups open

* Key dispatcher precedence with several Popups open - remove instrumentation
2021-06-03 22:30:42 +03:00
Yair Morgenstern
4b06a55bb5 Resolved #3967 - City-states can no longer 'gift' you your unique units 2021-06-03 22:25:27 +03:00
Yair Morgenstern
7cc440a577 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-03 19:08:39 +03:00
Yair Morgenstern
a70bb43dae Rewrote 'check unneeded tech prerequisites' that was causing ANRs and lowered time from 714ms to 1ms on my computer (!) for RekMOD check.
Also removed it from being blocking, since some important older mods (e.g. DeCiv) are unplayable because of this.
2021-06-03 19:07:34 +03:00
lishaoxia1985
a254ec0219
Fix that when WindowState's width and height = 0 the app window will disappear (#4044) 2021-06-03 17:31:49 +03:00
lishaoxia1985
e77eaf5fa5
Fix the app window changing may lead to that the app can't open in macOS (#4042) 2021-06-03 15:02:46 +03:00
Xander Lenstra
aa9dda2eea
Added the paratrooper unit (#4025)
* Added the paratrooper unit

* Reverted accidental reordering of action table

* Fixed Github build errors

* Hopefully actually fixed the build errors

* Added a Dutch translation, finally fixing the error

* Paratroopers can no longer actually paradrop on a tile they shouldn't be able to paradrop onto

* Removed double update action
2021-06-03 07:33:38 +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
Yair Morgenstern
efe369ad19 Linting and deprecation corrections 2021-06-01 23:32:23 +03:00
Yair Morgenstern
c73891cbe7 3.14.13 2021-06-01 21:19:06 +03:00
SomeTroglodyte
084adc3396
Patch ModManager exit to allow deactivating a selected tileset (#4029) 2021-06-01 20:00:50 +03:00
Yair Morgenstern
876bdf8f30 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-06-01 19:57:00 +03:00
Yair Morgenstern
bc1405cdb3 City construction queue: Subsequent units no longer displays construction progress towards first unit of its kind 2021-06-01 19:56:54 +03:00
SomeTroglodyte
9ed73d0d3f
Spruced up ModManagementScreen - phase 1 (#3983)
* Spruced up ModManagementScreen - phase 1

* Spruced up ModManagementScreen - phase 1 - patch1
2021-06-01 15:21:31 +03:00
Duan Tao
205f479ffe
Declare & Revoke protection for city-state. (#3994)
* Declare protection for city-state.

* Text templates.

* Better protector text for city-states.
2021-06-01 15:02:23 +03:00
SomeTroglodyte
ab4441ad1f
Fix two sound credits (#4020) 2021-05-30 21:05:46 +03:00
SomeTroglodyte
589ed4e423
Sound upgrade - enable BaseUnit.attackSound, a few extras (#4013) 2021-05-30 10:18:42 +03:00
Xander Lenstra
432e937474
Added the amphibious promotion and the marine unit (#3987)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue

* Added the marine unit

* Moved amphibious promotion effect to unique

* Added icons for Amphibious promotion and Marine unit

* aaah
2021-05-29 23:42:04 +03:00
SomeTroglodyte
97a36c3772
Spruced up Civilopedia - phase 2 - external links (#3981)
* Spruced up Civilopedia - phase 2 - external links

* Spruced up Civilopedia - phase 2 - patch1

* Spruced up Civilopedia - phase 2 - patch2
2021-05-28 17:41:03 +03:00
Yair Morgenstern
4df083197b City-states get all civs known by at least half of major civs, not 'by any civ' 2021-05-28 14:54:02 +03:00
Yair Morgenstern
f238cb3f3c Renamed ConstructionsTable -> CityConstructionsTable 2021-05-28 14:39:09 +03:00
Yair Morgenstern
c90a79363d Added city strength label to city button 2021-05-28 14:34:24 +03:00
Yair Morgenstern
c7334a461f Added unit action icons on map units, so it'll be immediately visible what each unit is doing 2021-05-28 14:06:30 +03:00
SomeTroglodyte
cf2be25c73
Popup gets a KeyPressDispatcher (#3973)
* Popup gets a KeyPressDispatcher

* Popup gets a KeyPressDispatcher - patch1
2021-05-27 21:49:40 +03:00
SomeTroglodyte
5f523cb548
Improved location notifications (#3992)
* Improved location notifications

* Improved location notifications - patch

* Improved location notifications - patch2

* Improved location notifications - patch3
2021-05-26 23:31:00 +03:00
Yair Morgenstern
cd6ae3dc6d 3.14.11 2021-05-26 19:37:01 +03:00
SomeTroglodyte
05c9813ac9
Make ImprovementPickerScreen "Pick Now" easier to hit (#3989) 2021-05-24 19:48:53 +03:00
SomeTroglodyte
f86a3fa47b
Spruced up Civilopedia - phase 1 - linking and category Enum (#3975) 2021-05-21 15:19:18 +03:00
Yair Morgenstern
3801a81bf4 AI much less motivated to attack city-states 2021-05-21 13:49:33 +03:00
Yair Morgenstern
e95a62126d Better peace agreement evaluations, for when there is no great power imbalance between nations 2021-05-21 13:46:44 +03:00
Yair Morgenstern
b4f588e70f Minimap slider has better values to accommodate screen sizes 2021-05-21 13:41:58 +03:00
Yair Morgenstern
7e827aebd3 Doubled ancient ruins spawn rate 2021-05-21 13:35:07 +03:00
Yair Morgenstern
502a2d57a3 Filtered out some building uniques that were activating for every city when they should have been only for the city the building was built in 2021-05-21 13:34:04 +03:00
Yair Morgenstern
eac2055b3e Better icons! 2021-05-21 12:28:56 +03:00
Yair Morgenstern
e547479c92 Added unit icons in unit overview screen 2021-05-21 12:17:22 +03:00
SomeTroglodyte
7c7d4181cc
Fix custom map sizes - saves match, size obeyed, limit UI (#3965)
* Fix custom map sizes - Revive Enum MapSize and fix tech modifier for custom maps

* Fix custom map sizes - Fix saved size not matching tileset, obey custom size

* Fix custom map sizes - limiting custom size and UI

* Fix custom map sizes - linting and reduce warnings

* Fix custom map sizes - less verbose

* Popup gets a KeyPressDispatcher - templates
2021-05-20 22:17:07 +03:00
Yair Morgenstern
f07c63c07f Unified "progress bars can't go beyond 100%" 2021-05-20 22:13:58 +03:00
SomeTroglodyte
b9aeb03e1b
Correction to deprecation Version number?... (#3968)
... in MapParameters.size: The commit adding the annotation is 9 commits below the 3.14.7 commit. Sorry I didn't include this earlier!. I *did* notice then went on for the rest of the little PR with a little nagging feeling ...
2021-05-20 12:34:05 +03:00
Duan Tao
3d062e3424
Add guided missile which acts differently from nuclear missile. (#3957)
* Add guided missile which acts differently from nuclear missile.

* Clean png.
2021-05-20 12:33:39 +03:00
Yair Morgenstern
11c8a67596 Merge branch 'temp' 2021-05-20 00:54:39 +03:00
Yair Morgenstern
984293c252 3.14.9-patch1
Apparently Float.min doesn't work on older versions of Java. Appears here: https://docs.oracle.com/javase/8/docs/api/java/lang/Float.html but not here: https://docs.oracle.com/javase/7/docs/api/java/lang/Float.html  Hate you, Java. Why do you insist on not being Kotlin.
2021-05-20 00:46:39 +03:00
SomeTroglodyte
591087ec25
KeyPressManager now manages listener (and cityscreen usage) (#3966)
* KeyPressManager now manages listener (and cityscreen usage)

* KeyPressManager now manages listener - patch 1
2021-05-20 00:25:31 +03:00
SomeTroglodyte
3e3bda42e5
Follow screen rotation even to Portrait on Android with Opt-in (#3936) 2021-05-19 23:27:23 +03:00
SomeTroglodyte
929c357663
Commenting extension functions and resolve to-do (#3932)
* Commenting extension functions and resolve to-do

* Better readability in PromotionPickerScreen enable
2021-05-18 13:14:56 +03:00
SomeTroglodyte
7b822643d9
Fix Ctrl-S going to save game screen will not stop scrolling the map (#3949)
* Fix Ctrl-S going to save game screen will not stop scrolling the map

* Just trying to force github to retry its build checks
2021-05-17 22:14:49 +03:00
SomeTroglodyte
fc7859e4e7
Options screen cleanup (#3934)
* Options popup linting and minor visual improvements

* Options popup - mod checker - missing test?
2021-05-16 16:43:57 +03:00
Xander Lenstra
7b0ea32c47
Technology and construction bars no longer extend past their maximum (#3930)
* Technology and construction bars no longer extend past their maximum

* Fixed compile errors

* actually fixed the issue
2021-05-16 15:42:19 +03:00
SomeTroglodyte
abaa678e2b
Split off stuff from CameraStageBaseScreen that isn't the class itself (#3929) 2021-05-14 11:23:33 +03:00
Yair Morgenstern
d546b2b00e Caught exception when map fails to load 2021-05-13 21:43:42 +03:00
SomeTroglodyte
d92e9a1dc7
Minimap resizeable and scroll position indicator redone (#3922) 2021-05-13 20:32:45 +03:00
SomeTroglodyte
c0fbd94bf5
Trim down custom save to export/import only (#3914) 2021-05-13 20:27:19 +03:00
SomeTroglodyte
d20b3c4e58
Fix crash when a mod allows a citadel >1 tile outside borders (#3923)
* Fix crash when a mod allows a citadel >1 tile outside borders

* Fix crash when a mod allows a citadel outside borders - no cities
2021-05-13 20:25:16 +03:00
GGGuenni
3b599d3b50
Fixed inconsistent map size (#3915)
* Fixed inconsistent map size

* removed empty lines of code

* removed print
2021-05-11 00:31:11 +03:00
Yair Morgenstern
61c8ab3a8f New line-of-sight rules, with new "Blocks line-of-sight from tiles at same elevation" unique! 2021-05-11 00:29:37 +03:00
Yair Morgenstern
1f50f3e97e Removed old todos 2021-05-11 00:28:49 +03:00
Yair Morgenstern
482f9ae9e5 Linting - Optimized imports 2021-05-10 22:45:29 +03:00
Yair Morgenstern
2f47fb77bc Linting 2021-05-10 22:34:50 +03:00
SomeTroglodyte
a2939c0e27
Accelerate Load Game Screen Info (#3902) 2021-05-10 06:50:49 +03:00
SomeTroglodyte
64119580fb
Save game UI patch (#3907)
* Unify PickerScreens not needing scroll, fix save/load screens scrolling their center column

* Map save/load exits to previous, fix load padding, fix "Current saves" header never showed
2021-05-09 21:25:23 +03:00
Yair Morgenstern
b0f3d30d79 Fixed double consumption of resources for "Comsumes [amount] [resource]" unique 2021-05-08 23:35:52 +03:00
Yair Morgenstern
619d02d2b6 Hopefully will solve the github action fails 2021-05-08 22:54:11 +03:00
Yair Morgenstern
3a22a1127e Gradle upgrade 2021-05-07 13:18:48 +03:00
Alexander Korolyov
453f5588ac
Custom map size (#2876)
* Adding custom map sizes. Initial commit

* Custom map sizes UI update

* Custom map size with rectangular shape

* Added compatibility with older Maps and Game saves

* Fixed build errors and added warning messages

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 18:39:28 +03:00
Yair Morgenstern
b8f9b99bd1 Fixed Civilopedia crash 2021-05-06 18:37:12 +03:00
Yair Morgenstern
db87c04017 Linting 2021-05-06 18:02:27 +03:00
Yair Morgenstern
dbc3bcb5a1 Fixed 'dead code' that got in on one of the PRs 2021-05-06 17:53:06 +03:00
SomeTroglodyte
7a8bf68885
Option Screen choices visible on minimap toggle buttons immediately - ugly (#3881) 2021-05-06 16:09:19 +03:00
SomeTroglodyte
7c34c5f440
Resource revealed notification can point to all reveals (#3879)
* May resolve #3862: Resource revealed notification can point to all reveals

* Resource revealed notification can point to all reveals - wording
2021-05-06 16:08:35 +03:00
SomeTroglodyte
d11cf286b4
Worldscreen key bindings (#3875)
* WorldScreen most Civ5 key bindings

* WorldScreen keys - Overview button key hint

* WorldScreen most Civ5 key bindings - v2

* WorldScreen most Civ5 key bindings - civilopedia

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-05-06 16:04:24 +03:00
SomeTroglodyte
c622a3d9fd
City overview force consistent row height (#3861)
* City overview force consistent row height

* City overview force consistent row height - simpler
2021-05-06 15:48:58 +03:00
Yair Morgenstern
7f937e9784 I think we've removed all removable references to isHill() 2021-05-06 15:31:09 +03:00
Yair Morgenstern
e8d4767b6d Height of terrains is now defined by a unique 2021-05-06 15:27:30 +03:00
Yair Morgenstern
59a419c1c9 TileInfo.hasUnique() 2021-05-06 15:13:15 +03:00
Yair Morgenstern
b7383bb959 Refixed denunciation effects - sorry Chek! 2021-05-06 14:40:08 +03:00
Yair Morgenstern
c601f7f9ec Genericized "No Maintenance costs for improvements in [] tiles" 2021-05-06 14:34:40 +03:00
Yair Morgenstern
34bed66198 Genericized hill's "extra sight for land units" to a unique 2021-05-06 14:28:54 +03:00
Yair Morgenstern
8d2629088f Hill city-strength bonus genericized 2021-05-06 14:27:12 +03:00
Yair Morgenstern
7686b1ee4a Simplified rough terrain check 2021-05-06 12:35:28 +03:00
Yair Morgenstern
09de08764e Revert "Option Screen choices visible on minimap toggle buttons immediately -… (#3858)"
This reverts commit ba9a90c680.
2021-05-05 22:02:31 +03:00
Yair Morgenstern
ec33c43c3f Show tech progress for next turn in tech button 2021-05-05 21:49:52 +03:00
Yair Morgenstern
738bc6caac Fixed tests 2021-05-05 18:45:48 +03:00
Yair Morgenstern
fb93e3f7ee Hills are converted to terrains that surround them 2021-05-05 18:00:07 +03:00
GGGuenni
b35d5d3121
changed hill to terrain Feature (#3707)
* changed hill to terrain Feature

* Update Terrains.json

* Update Terrains.json

* Snow with capital S

* Fixed tests failing

* Added check for ruleset supports hill as terrain feature
2021-05-05 17:48:47 +03:00
Yair Morgenstern
d864ed719f Added decay to diplomatic denunciation - kudos @Chek 2021-05-05 16:23:15 +03:00
Yair Morgenstern
1b801e0bba Fixed denouncement effects on third-party civs, and trade evaluation for enemy trades - kudos @Chek 2021-05-05 14:32:04 +03:00
SomeTroglodyte
d679632523
Bug: turnsLabel accumulates touchFocuses endlessly (#3874)
* Bug: turnsLabel accumulates touchFocuses endlessly

* May resolve #3862: Resource revealed notification can point to all reveals - better
2021-05-04 22:14:16 +03:00
SomeTroglodyte
a25777f380
Overview screen category decoration + key hint (#3872)
* OverviewScreen: Category buttons decorated / key indicator

* OverviewScreen: Category buttons decorated / key indicator: Images
2021-05-04 12:10:34 +03:00
SomeTroglodyte
f2a08719e2
ImprovementPicker: R key 'moves' from Road to Railroad patch (#3871) 2021-05-04 11:59:08 +03:00
SomeTroglodyte
ba9a90c680
Option Screen choices visible on minimap toggle buttons immediately -… (#3858)
* Option Screen choices visible on minimap toggle buttons immediately - using lambdas

* Option Screen choices visible on minimap toggle buttons immediately - patch1
2021-05-03 16:26:08 +03:00
SomeTroglodyte
79c6ff0e3e
Fix cancel improvement order (#3866) 2021-05-03 15:58:38 +03:00
Yair Morgenstern
d38692fad3 resolved #3869 but no one really cares 2021-05-02 22:14:56 +03:00
Yair Morgenstern
8160d76f97 Resolved #3865 - Kudos @SomeTroglodyte 2021-05-02 21:38:38 +03:00
Yair Morgenstern
f2a25b26ab Tilegroup accepts tile config also for *only the terrain part*, making all the extra "hill = grassland+hill" in the tileconfig json unnecessary!
@ravignir
2021-05-02 21:07:32 +03:00
Yair Morgenstern
204791c4b8 Great general unique no longer restricted to civilian units 2021-05-02 09:33:08 +03:00
Yair Morgenstern
ba1f647a8e Changed loading of tile set configs to work also on PC, from within a JAR file 2021-05-01 23:59:29 +03:00
Yair Morgenstern
94c0995b23 3.14.5 2021-05-01 23:05:30 +03:00
SomeTroglodyte
7eb4250335
City expansion notification points to acquired tile (#3859) 2021-05-01 22:30:23 +03:00
Yair Morgenstern
eed26a5097 deprecated old uniques 2021-04-30 15:37:12 +03:00
Yair Morgenstern
8c098a7fd4 New layering is in da house!
FantasyHex-New is now FantasyHex!
2021-04-30 15:23:24 +03:00
Yair Morgenstern
9900795e02 Specify original owner when showing option to liberate city 2021-04-30 12:44:51 +03:00
Yair Morgenstern
9847d089b3 Fixed mod management screen to the new 'wrapped scrollpanne' style of PickerScreen 2021-04-30 12:34:24 +03:00
Yair Morgenstern
e9d450eb60 Tile options in map editor screen no longer 'click' on tiles behind them
Fixed new map screen
2021-04-30 12:29:56 +03:00
Yair Morgenstern
81c1e34f0f Added "Self-destructs when attacking" unique 2021-04-30 12:11:49 +03:00
SomeTroglodyte
222e322230
A new KeyPressDispatcher supporting function keys with F1 demo (#3853) 2021-04-30 10:54:38 +03:00
SomeTroglodyte
8fc3e5bd98
Some visual improvements for the City Overview (#3844)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-04-29 20:16:13 +03:00
Yair Morgenstern
350f0c48d3 Code cleanup for construction text - moved to city constructions file and simplified 2021-04-29 17:53:44 +03:00
Yair Morgenstern
4db97dcd1a Added construction production info to city screen 2021-04-29 14:02:27 +03:00
lishaoxia1985
464d89298a
Fix screen bugs when you don't use splitpane in pickscreen (#3760) 2021-04-29 12:44:37 +03:00
SomeTroglodyte
66f07347e0
Keyboard navigation to switch panes within overview screen (#3822) 2021-04-28 21:40:15 +03:00
Yair Morgenstern
5b7170bf9f Unified stat summing in city overview table 2021-04-27 19:02:14 +03:00
SomeTroglodyte
3da02b18b6
Some visual improvements for the Mod Manager Screen (#3841) 2021-04-27 12:06:05 +03:00
Yair Morgenstern
8dc748f919 Resolved #3524 - Happiness in city overview now calculated correctly
(also simplified sorting etc. and added option for Faith)
2021-04-27 00:55:39 +03:00
Yair Morgenstern
4f802e813a Added Happiness (and Faith for Religion mods) to stats list - #3524 2021-04-27 00:37:51 +03:00
SomeTroglodyte
089a415da9
For issue 3838: Bigger target on "next city" button (#3840) 2021-04-27 00:05:59 +03:00
GGGuenni
29dfa338ba
Added fogOfWarColor and unexploredTileColor (#3833)
* Added fogOfWarColor and unexploredTileColor

* update updateConfig function
2021-04-26 21:16:18 +03:00
Yair Morgenstern
7ddbac1f07 Made datetime in modscreen parsable for Java 7 phones
And now date display is localized too which is nice
2021-04-23 15:57:39 +03:00
Yair Morgenstern
fb4a091635 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-23 15:29:01 +03:00
lishaoxia1985
adf32dcfe2
getResearchAgreementCost() don't need variable, make some method private (#3832) 2021-04-22 16:59:15 +03:00
GGGuenni
cb9507c76d
Fixed internal TileSetConfigs not getting loaded on android (#3831) 2021-04-22 11:00:35 +03:00
SomeTroglodyte
600f262cca
Fixes #3729 "Android crash on loading from custom location" (#3828) 2021-04-21 23:42:45 +03:00
Yair Morgenstern
55ef131fb2 3.14.3 2021-04-21 22:12:46 +03:00
SomeTroglodyte
722772b08e
Solves #3802 Mod translations don't appear in new game screen (#3823)
* Solves #3802 Mod translations don't appear in new game screen

* Rehomed translationActiveMods to Translations
2021-04-21 21:45:58 +03:00
Yair Morgenstern
6ffbce4ee1 Added "Updated!" next to updated mods in mod management screen 2021-04-21 21:22:55 +03:00
Yair Morgenstern
146a806b08 Added 'last updated time' to mod description 2021-04-21 20:53:14 +03:00
Yair Morgenstern
72f63b7ba1 Added "open Github page of mod" in mod management screen 2021-04-21 20:30:25 +03:00
Yair Morgenstern
0c80a31c9a Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-20 22:18:55 +03:00
Yair Morgenstern
d674be2234 Can no longer enter diplomacy screen for self, defeated and spectator civs through diplomacy overview screen 2021-04-20 22:18:11 +03:00
SomeTroglodyte
615fa78101
Modify choice of city to own the tiles acquired by a citadel - v2 (#3819) 2021-04-19 23:01:47 +03:00
SomeTroglodyte
e2c6ae450d
Make city center unpillagable using a unique (#3818) 2021-04-19 20:18:20 +03:00
Yair Morgenstern
1eb3629c09 Resolved #3817 - don't display resource requirements from uniques twice 2021-04-19 19:29:21 +03:00
SpacedOutChicken
8d4aa955b3
Parameterize civ-wide sight bonus (#3809)
* Make science a possible reward for killing units

* no message

* Revert "Make science a possible reward for killing units"

This reverts commit 296b8fab54.
2021-04-18 22:12:47 +03:00
Yair Morgenstern
e0b1cce74f Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-18 21:31:01 +03:00
Yair Morgenstern
11f5937cdf Revert "World wrap is publicly released!"
This reverts commit 55659657aa.
2021-04-18 21:29:37 +03:00
SomeTroglodyte
5c6e55d9f1
ExpanderTab had only one use outside its package - moved (#3805) 2021-04-18 18:50:02 +03:00
Yair Morgenstern
f518c1944f Added warning for world wrap for Android - I'm seeing a lot of ANRs for this, but it's not something I think I can solve 2021-04-17 23:27:29 +03:00
Yair Morgenstern
fc5c3d578d Fixed - 'Water units' now can be capitalized, as they should be. 2021-04-17 21:40:50 +03:00
Yair Morgenstern
6045e0d5a4 "[] from every []" can accomodate specialist names 2021-04-15 12:50:30 +03:00
Yair Morgenstern
172508f22e Fixed natural wonder tile location in new layering 2021-04-14 19:51:13 +03:00
Yair Morgenstern
d825352bf4 Converted all "Bonus vs unitType" effects to "+[amount]% Strength vs [unitType]"
Open terrain and rough terrain bonuses are now generic and uniques
2021-04-14 18:52:10 +03:00
Yair Morgenstern
b312d24d4a Rough terrain specified through uniques 2021-04-14 18:32:39 +03:00
Yair Morgenstern
e424ec4a91 "+[]% combat bonus in []" -> "+[]% Strength in []" 2021-04-14 18:25:37 +03:00
Yair Morgenstern
e01859f6b9 Added "Friendly Land" and "Foreign Land" as tile filter options, instead of limiting them to unit bonuses 2021-04-14 18:22:50 +03:00
Yair Morgenstern
5750476cac Added check for implicit prerequisites that are specified explicitly in mods, to remove clutter in tech trees 2021-04-14 16:33:00 +03:00
Yair Morgenstern
93f0b4ae42 Added building-maintenance-decreasing unique 2021-04-14 16:07:00 +03:00
SomeTroglodyte
83427fec85
Fix Citadel not quite buildable where it should be (#3788) 2021-04-14 11:28:13 +03:00
GGGuenni
3efbbc716e
Fixed Multiplayer bugs (#3781)
* Removed save feature from TurnChecker

* Hopefully fixed not correctly updating multiplayer games?

* Fixed "refresh list" not updating the savegame correctly

* Fixed game update when upload fails

* Revert "Fixed game update when upload fails"

This reverts commit cc9f1cf589.
2021-04-13 22:57:39 +03:00
GGGuenni
00ec000d50
Preparation for hill as terrain feature (#3784)
* ensure backwards compatibility

* Added new Hill.png

* Added temp TileSetConfig to support new hill sprite

* Added missing Ancient ruins tiles
2021-04-13 22:05:06 +03:00
Yair Morgenstern
0440a70a9c Resolved #3353 - Changed "Earn [amount]% of [param] opponent's [param2] as [stat] for kills" to "Earn [amount]% of killed [param] unit's [param2] as [stat]" 2021-04-13 22:04:00 +03:00
GGGuenni
b7d6bacc5b
Added TileSetConfigs (#3766)
* First iteration of TileSet json

* Adding json support for mods

* Renamed TilesetConfig to TileSetConfig

+ changed the config for FHex to fix the mountain natural wonder problem
2021-04-13 07:49:49 +03:00
Yair Morgenstern
881a885c14 Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings 2021-04-13 00:13:17 +03:00
Yair Morgenstern
4bc77aece0 Can handle unique capital indicators in mods 2021-04-12 23:46:34 +03:00
Yair Morgenstern
25565f189d Natural wonders are standalone tiles in new layering 2021-04-12 23:31:54 +03:00
Yair Morgenstern
888d5e973c
Translations update (#3768)
* Update French.properties  (#3767)

* Create French.properties

* Update French.properties

* Update French.properties

* Update German.properties (#3764)

* Update Czech.properties (#3763)

Translated some new lines and city-states' diplomacy

* Hungarian.properties (#3761)

* Update Spanish.properties (#3774)

There were a few 'translation!' messages, I didn't check the already completed text. If any help is needed please let me know. My discord name is john2342#8925

* Deleted unnecessary space before colon, update czech.properties (#3773)

* Deleted space before colon

In VictoryScreen.kt was one extra space, looking like "Spain : 35" instead of "Spain: 35"

* Update Czech.properties

Co-authored-by: Loubard Kevin <70336598+subversive-eu@users.noreply.github.com>
Co-authored-by: Martin Pechstein <77325495+Mape6@users.noreply.github.com>
Co-authored-by: jahodovykolac <79529669+jahodovykolac@users.noreply.github.com>
Co-authored-by: JurDan775 <80947706+JurDan775@users.noreply.github.com>
Co-authored-by: juan234248 <77988217+juan234248@users.noreply.github.com>
2021-04-10 22:59:55 +03:00
Yair Morgenstern
6d5cb00271 Revert "Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)"
This reverts commit faac24a2a5.
2021-04-07 19:26:17 +03:00
Yair Morgenstern
f4da05eb05 Added empty hexagon when none of the images exist - this fixes the default tileset for the new rendering method 2021-04-05 17:22:10 +03:00
Yair Morgenstern
39439f72a2 Manhattan project is not disabled for no-nuclear-weapon games 2021-04-05 16:21:57 +03:00
Yair Morgenstern
a2aab6f071 Added religion city counters and spread of religion between cities - none of this is yet user-visible 2021-04-05 15:54:37 +03:00
lishaoxia1985
faac24a2a5
Redraw TechPickerScreen and PickerScreen, Make map symmetrical if it's not wrapped (#3757)
* Redraw TechPickerScreen and PickerScreen

* Make map symmetrical if it's not wrapped
2021-04-05 14:13:34 +03:00
Yair Morgenstern
55659657aa World wrap is publicly released! 2021-04-04 21:03:45 +03:00
Yair Morgenstern
203695a967 3.13.13 2021-04-04 21:03:14 +03:00
Yair Morgenstern
8ff2a79e9b New fantasy hex layering works well with natural wonders 2021-04-04 19:32:16 +03:00
Yair Morgenstern
c1844fb58e Fixed water improvement unique crash for mods with non existent improvements 2021-04-04 19:31:49 +03:00
Yair Morgenstern
0233aa1bc5 Code reorg - moved all 'city moves between civs' functions to a separate class 2021-04-04 19:31:06 +03:00
Yair Morgenstern
187eea82a4 Base FantasyHex now contains all of the NewFantasyHex, for easier handoff (first 'use new layering rules' and then 'change tileset') 2021-04-02 10:02:56 +03:00
lishaoxia1985
a95406055b
Redraw CivilopediaScreen (#3747) 2021-04-01 23:39:08 +03:00
Yair Morgenstern
8b4d82167b Resolved #3753 - Fallout is no longer added multiple times 2021-04-01 23:25:46 +03:00
Yair Morgenstern
bc1c9ad921 Tileset for new layering is now in base game
New layering now supports natural wonders
2021-04-01 23:19:07 +03:00
Yair Morgenstern
0c06237570 ALL tile images now support era-specific images! But only if the base tile exists as well. 2021-04-01 22:36:27 +03:00
Yair Morgenstern
8c7c0a0f91 Added new experimental tile layering - see #3716 2021-04-01 22:08:29 +03:00
Yair Morgenstern
2da49da716 Can now handle mods with any default branch name!
Pantheon choices now scroll
2021-04-01 21:14:22 +03:00
Yair Morgenstern
a26bf30c28 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-04-01 20:44:49 +03:00
Yair Morgenstern
9cb017c8a5 Added Faith icon and display for games with Religion 2021-04-01 20:44:27 +03:00
GGGuenni
387693512c
Fixed roads not getting wrapped correctly (#3752) 2021-04-01 14:36:05 +03:00
Yair Morgenstern
50e3f62018 3.13.12-patch1 2021-04-01 13:05:49 +03:00
Yair Morgenstern
f3e0867817 Resolved #3746 - background picture recentered, but also not scaled down so that the image covers most of the screen 2021-03-31 23:12:11 +03:00
GGGuenni
bf32bd5400
Readd smooth transition for wrapped maps (#3749) 2021-03-31 18:01:56 +03:00
GGGuenni
5d6bfbfb31
Fixed can't press nextTurn in multiplayer game (#3748)
* Fixed game crashes on create multiplayer game

* Update isPlayersTurn on update()
2021-03-30 18:14:07 +03:00
Yair Morgenstern
cb50732ec4 'Years of peace' modifier reset when war is declared 2021-03-29 20:18:03 +03:00
lishaoxia1985
807444d2c5
Replace padding with leftAndRightPadding & topAndBottomPadding in TileGroupMap (#3742)
* Replace padding with leftAndRightPadding & topAndBottomPadding in class TileGroupMap, edit MainMenuScreen

* Remove TableBackground.png
2021-03-29 18:21:31 +03:00
Yair Morgenstern
bf9954a042 Un-blurred the tile images 2021-03-29 18:18:23 +03:00
Yair Morgenstern
46e845d6ff Resolved #3568 - text buttons are less grainy 2021-03-29 17:50:04 +03:00
Yair Morgenstern
bc5cc4e28d Added Bulgarian, by antonpetrov145! 2021-03-29 17:32:42 +03:00
Yair Morgenstern
29c9f3b3e4 HUGE memory savings (120MB -> 75MB) By saving atlases between ruleset resets! 2021-03-29 17:07:59 +03:00
Yair Morgenstern
12147e0a67 Merge branch 'temp' 2021-03-29 14:26:19 +03:00
Yair Morgenstern
3ed701508e 3.13.11-patch2 2021-03-29 14:25:54 +03:00
Yair Morgenstern
4647928f29 Start of work on Religion!
Added Beliefs, faith accumulation, and Pantheon founding. Still missing a Faith image though.
2021-03-29 11:07:43 +03:00
Yair Morgenstern
30c1861788 Added mod pagination - even when we exceed 100 mods, we'll be able to download them all 2021-03-29 10:02:51 +03:00