Commit Graph

4094 Commits

Author SHA1 Message Date
Yair Morgenstern
860e788fb5
Separate unit automation (#5592)
* Should resolve #5534 and the long-standing request of "move after automate" by separating the automated movement from the actual end of turn

* Added translation

* Automated units move in a separate thread to avoid UI freezing
2021-10-30 19:02:43 +03: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
SomeTroglodyte
6172a893b8
Fix PercentProductionBuildings and PercentProductionWonders (#5588) 2021-10-29 11:29:03 +03:00
SimonCeder
03cebbdd42
Fix for broken saves in #5573 (#5587)
* no new camps in 4 tiles for 15 turns after cleared

* can't spawn land units on water or vice versa, unit choice

* UniqueType.MustSetUp

* sometroglodyte's fixes
2021-10-28 22:31:20 +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
SomeTroglodyte
8c781bc0d2
Minor hardening of music against OpenAL quirks (#5586) 2021-10-28 22:00:14 +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
GGGuenni
defc9262c2
GameInfoPreview upload as Metadata (#5584)
* Added Upload and Download functionality

* Add preview upload where gameInfo is uploaded
2021-10-28 18:00:07 +03:00
SimonCeder
d8bb60f06c
Barbarian fixes (#5573)
* no new camps in 4 tiles for 15 turns after cleared

* can't spawn land units on water or vice versa, unit choice

* UniqueType.MustSetUp
2021-10-28 17:59:27 +03:00
SomeTroglodyte
21d2f7b714
Clarify relation Oil well / Refrigeration a little (#5570) 2021-10-27 20:08:04 +03:00
GGGuenni
ca1d070c81
Improved MultiplayerScreen performance (#5527)
* Added MultiplayerGameInfo

* Added usage of MultiplayerGameInfo

* Integrate MultiplayerGamInfo into GameInfoPreview

* Replaced MultiplayerGameInfo with GameInfoPreview

* Correction in function docs

* PR cleanup

* Added currentTurnStartTime from merge

* Fixed resign not propagating to preview
2021-10-27 16:30:25 +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
SimonCeder
04196974a4
Improve AI performance vs barbarians; AI settlers (#5562)
* AI more effective against barbarians

* Discourage settler death marches

* game speed

* optimization
2021-10-27 07:07:09 +03:00
SomeTroglodyte
eaa765a619
doCitadelDamage minor optimization (#5565) 2021-10-26 12:16:06 +03:00
Xander Lenstra
693cf97849
Made some improvements to the religion UI (#5561)
* Made some improvements to the religion UI

* Added translatable strings

* Added some pretty colors - code based on code provided by SomeTroglodyte way back

* I hate spaces

* Moar colourz
2021-10-26 09:01:00 +03:00
Xander Lenstra
b2557de5d0
Fixed a bug where every improvement pretended to be a citadel (#5563) 2021-10-26 08:31:39 +03:00
Xander Lenstra
cbfbec166b
Fixed a bug where great prophets gained through non-conventional means did not receive bonus spreads provided by wonders (#5558)
* Fixed a bug where great prophets gained through non-conventional means did not receive bonus spreads provided by wonders

* Fixed overextended indentation
2021-10-25 23:56:48 +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
Colin Vanden Heuvel
4c19347a89
Provide more information to waiting players in multiplayer (#5508)
* Add some very small Quality-of-Life improvements for multiplayer games

- GameInfo.kt
 - Add timestamp for the start of the last turn to save info, hopefully
   this will enable a multiplayer turn timer in the near future

- MultiplayerScreen.kt
 - Current turn indicator for multiplayer games now shows for how long it
   has been the current player's turn.

- WorldScreen.kt
 - Next Turn Action will display which player we are waiting for rather
   than the generic "Waiting for other players..."

* Update text for translations and add better elapsed times

template.properties
- Add translation templates for waiting turn information

German.properties
- Provide German translation for waiting turn info

Japanese.properties
- Provide Japanese translation for waiting turn info

MultiplayerScreen.kt
- Add translation brackets for waiting turn info
- Add a function which determines whether to represent
  elapsed time in Minutes, Hours, or Days (and does so)

WorldScreen.kt
- Add translation brackets for waiting turn info

* Fix line translated endings as per request

MultiplayerScreen.kt
- Translation for the "Last refresh:/Current Turn:" display no longer
  includes line endings
- "Last refresh:/Current Turn:" display now uses LF line endings only

* Show generic "Waiting for" message in single player

WorldScreen.kt
- Place an additional condition for getNextTurnAction which selects the
  generic "Waiting for" message in single player and the civ-specific
  one in multiplayer

Co-authored-by: Colin S. Vanden Heuvel <colin.vandenheuvel@wisc.edu>
2021-10-25 19:09:03 +03:00
SimonCeder
6fdbc8a8da
fix bug with contest quests (#5554) 2021-10-25 19:08:43 +03:00
yairm210
741f2522b9 3.17.11 2021-10-24 20:54:39 +03:00
Xander Lenstra
3681b45592
Fixed Siam's unique applying multiple times (#5547) 2021-10-24 20:48:14 +03:00
Xander Lenstra
f474cf1516
Added missing unit type filter (#5548) 2021-10-24 20:47:47 +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
e9d36ea0ce
Fixed a bug where AI would not found religions (#5544) 2021-10-24 20:44:54 +03:00
Xander Lenstra
074676c342
Fixed a bug where buying units with faith would not increase in cost (#5546) 2021-10-24 20:44:03 +03:00
Yair Morgenstern
6ac3547b8e
City construction speedup with caching stats from tiles (#5536)
* City construction speedup with caching stats from tiles

* Reduced cityStats.update to only one cityConstructions.getStats() call, improving performance by another 30% approx
2021-10-24 09:05:05 +03:00
yairm210
9a7ea263d6 Resolved #5530 - fixed "[stats] from all [stat] buildings" check for stat relatedness 2021-10-22 00:02:14 +03:00
SimonCeder
9b798b3588
Inner Sea map type (#5535)
* Inner Sea map type

* space in templates
2021-10-21 23:51:24 +03:00
yairm210
cb4aef7b35 Fixed tests 2 2021-10-20 23:26:01 +03:00
yairm210
24f3e784fa Fixed tests 2021-10-20 23:18:03 +03:00
yairm210
60f0724b42 Hardcore typing for uniques in how to improve city UI performance 2021-10-20 22:11:31 +03:00
yairm210
dda2f6a37c Deprecation of old uniques 2021-10-20 21:35:13 +03:00
yairm210
50225101ea Resolved #5494 using new overloads 2021-10-20 21:28:02 +03:00
Xander Lenstra
13859e78c1
Unified and enumified production percentage bonus uniques (#5521) 2021-10-20 16:57:55 +03:00
SimonCeder
ae8c72adbc
Improvements fog of war (#5504)
* fog of war for improvements

* fix spectator mode

* unnecessary imports

* getShownImprovement
2021-10-20 16:42:15 +03:00
yairm210
61085a515a Resolved #5473 - global uniques from buildings register correctly for units 2021-10-19 23:38:37 +03:00
yairm210
960b2c2f1e WELP 2021-10-19 23:06:44 +03:00
yairm210
b0b9ef04fd Resolved #5495 - Removed "matches" function with runtime-compliance checks entirely
All unique checks should be on load
2021-10-19 22:59:53 +03:00
yairm210
96c69cf1e9 Made resource object lazy - this should speed up all sorts, especially tile stats checking 2021-10-19 22:08:35 +03:00
yairm210
21925b920b Merge remote-tracking branch 'origin/master' 2021-10-19 21:25:57 +03:00
yairm210
c708ebd7f0 Solved edge case where automated prophet couldn't head towards the city 2021-10-19 21:25:43 +03:00
yairm210
0309e51afd Solved movement bug where extra tiles you could move through, but not *to*, would end up *adding* movememnt.
Movement bugs are hard. So hard, in fact, that most of this commit is just adding the "amount of movement left after attacking" so I could ensure that there wasn't a problem in the "calculating attackable tiles" part. The actual fix is in UnitMovementAlgorithms.
2021-10-19 21:16:16 +03:00
yairm210
55bed3bf30 Merge remote-tracking branch 'origin/master' 2021-10-19 20:26:54 +03:00
yairm210
61b6e40cdc Resolved #5520 - no tech icon errors from techs with era errors 2021-10-19 20:26:45 +03:00
Pavel Bystritsky
8cd89deb71
Added information about technology required for improving resource to tile info. (#5509)
* Added information about technology required for improving resource to tile info.

* Tile improvement required tech info updated.
2021-10-19 19:47:35 +03:00
Xander Lenstra
086867731d
Enumified all terrain uniques in terrains.json (#5513)
* Enumified all terrain uniques in the json

* it

* Fixed unit tests
2021-10-19 08:27:46 +03:00
Xander Lenstra
524dfa5364
Band-aided a bug with building unique application (#5512)
Building uniques applying to all cities, such as Temple of Artemis and Sistene Chapel would apply their bonus twice to the city they were build in.
This was a result of it both being found as a non-local unique due to it having an effect outside the city and thus being classified as wonder,
and as a building, as it was built in the city and had an effect on it.
This patch is _untested_ and only a band-aid.
The real solution would be to start using the sources of uniques saved in the uniques themselves to classify were uniques are received from.
Implementing this is somewhere on my todo-list, but due to uni won't happen anytime soon.
2021-10-18 16:37:18 +03:00
SimonCeder
1b1a910eef
Can now raze cities Austria has married (#5506) 2021-10-18 00:05:17 +03:00
yairm210
4efc8b3195 Unbuildable works for units as well, as Deciv was quick to remind me 2021-10-17 23:55:47 +03:00
yairm210
ca706db753 More typings for building specific uniques 2021-10-17 23:50:42 +03:00
yairm210
d4205cb405 Typed "Unbuildable" 2021-10-17 23:42:09 +03:00
yairm210
8b2bb8e59b Typed deprecated uniques so modders have warnings 2021-10-17 22:15:46 +03:00
yairm210
1a1194236b Added overload to MapUnit.getMatchingUniques to get uniques from civ as well - see #5494 2021-10-17 21:16:14 +03:00
Xander Lenstra
5c80e8ee9b
Fixed bug where denmark's pillaging unique doesn't work (#5500) 2021-10-17 08:39:44 +03:00
SimonCeder
ac422d25cb
City State Barbarian Invasion and War with Major pseudo-quests (#5454)
* barbarian invasion event

* war with major pseudo-quest

* include latecomers

* diplomacy screen

* more notifications

* fixes

* reviews
2021-10-16 20:34:47 +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
SomeTroglodyte
de0c1161f6
Music pause on "leave game" question, not world screen menu (#5491)
* Music pause on leave game question, not worldscreen menu

* Music pause on leave game question, not worldscreen menu - log back off
2021-10-16 20:06:25 +03:00
Xander Lenstra
3c71fe41dc
Fixes bug where culture gain from killing units no longer works (#5489) 2021-10-16 20:05:30 +03:00
Xander Lenstra
24545a92dd
Choose a better visible color for the religious symbol on the city button (#5485) 2021-10-14 23:38:35 +03:00
yairm210
f1f2c1e932 3.17.8 2021-10-13 23:27:39 +03:00
Xander Lenstra
67650fec00
Fixed a bug where "[+amount] population [in this city]" did not work (#5476) 2021-10-13 23:16:38 +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
Xander Lenstra
734fba8f30
Fixed bugs with diplomatic victory (#5474) 2021-10-13 12:03:34 +03:00
yairm210
56222a0ea7 Resolved #5453 - strength bonuses apply from civ bonuses as well 2021-10-12 19:49:12 +03:00
yairm210
038c501ac8 Construction automation constructs attacking units even if they provide unneeded slots 2021-10-12 19:45:21 +03:00
Xander Lenstra
9abc3ddb6e
Fixes a problem with free buildings provided in other cities not being free (#5470) 2021-10-12 17:21:04 +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
SimonCeder
1a92f9c084
Free buildings are free (#5466)
* free buildings are free

* ai shouldn't sell free buildings either
2021-10-12 07:34:23 +03:00
SimonCeder
e375fb9896
Disable religious quest with religion disabled; enumify "Hidden when religion is disabled" (#5465)
* enumify hidden with religion disabled

* prevent religious quests in no-religion games
2021-10-12 07:31:22 +03:00
Xander Lenstra
d44bfce665
Fixed crashes from era (#5467) 2021-10-12 07:30:20 +03:00
Arthur van der Staaij
df39dfd2a8
Fixed the visual gaps in territory borders (#5446)
* Implemented left/right-concave border segments

* Fixed ConvexConcave border image

It was flipped horizontally.

* Implemented border left/right-concave detection

* Moved border images into their own directory

They're not really icons, after all.

* Cleaned up code a bit and added some more comments

* Applied requested change and consistified some function names

* Removed the old border images

I was sure I already did this, but apparently not.
2021-10-11 09:23:28 +03:00
Xander Lenstra
a73b7b008f
Likely fixed a bug where AI nukes could hit nations they had a peace treaty with (#5449)
* Likely fixed a bug where AI nukes could hit players they had a peace treaty with

* Typefied blast radius unique
2021-10-10 22:26:54 +03:00
Xander Lenstra
9fab1f6ee7
Researching all of the techs in the previous era now also puts you in the next era (#5451) 2021-10-10 17:14:30 +03:00
Xander Lenstra
2bd8132b8d
Made it impossible to cut short peace treaties (#5450) 2021-10-10 17:11:14 +03:00
Xander Lenstra
24d7a57c1f
Fixed a bug where religious units would be expelled when an open borders agreement ended (#5448) 2021-10-10 17:10:36 +03:00
Xander Lenstra
0ddeb6eb64
Fixed bug with byzantine unique (#5445) 2021-10-10 06:24:44 +03:00
logic
3b49cc18a2
Civ icon redirects to civilopedia (#5414)
* update for no reason

* bruuhhhhhhhhh

* update for no reason

* bruuhhhhhhhhh

* remove comments

* delete atlas

* Create game.atlas
2021-10-09 22:32:47 +03:00
Yair Morgenstern
1132042949
When choosing military units, 'carrying' units are only chosen if they provide needed 'slots' for carrying units. (#5436) 2021-10-09 20:59:58 +03:00
Xander Lenstra
1df454368a
Solves bugs with unit movement through fog of war (#5382) 2021-10-09 20:46:35 +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
69e1792fa9
Return Civilians captured by Barbarians to original owner; Capture stacked civilians (#5437)
* return captured civilians

* stacked civilian capture bug

* works on old saves

* diplomacy bonus expires on war declared

* vector bug
2021-10-09 20:44:03 +03:00
yairm210
fd3bfbade4 Resolved #5435 - all civ + unit uniques are accounted for in both ways 2021-10-09 20:22:29 +03:00
SimonCeder
185050bd9f
cs units wander (#5441) 2021-10-09 20:11:52 +03:00
yairm210
0b3f8d11d3 Tile height set by lazy.
This is good enough to give a 10% performance boost for regular players when there are a lot of units.
If mods add elevation somehow WITHIN a turn, this will be lost, but will recalc next turn correctly.
2021-10-08 15:54:24 +03:00
yairm210
c70d315fae Resolved #5435 - optimized units seeing invisible tiles.
@SomeTroglodyte @xlenstra - the problem was with MapUnit.matchesFilter calling hasUnique, which called civInfo.getUniques, which is patently ridiculous.
I checked ALL usages of getUniques, and only found ONE unique which conceivably could be applied both globally and individually, and separated the check there.

Current analysis shows that updating viewable tiles still takes much longer than I'd like it to, but not, like, 70% of "next turn" runtime.

Next target - tileInfo.getHeight, which clocks in at around 10% (!!!) of next turn!
Apparently the annual "we added too many new features and need to optimize" time has come again...
2021-10-08 15:40:19 +03:00
yairm210
36250dfc70 Resolved #5425 - unit maintenance discount corrected 2021-10-08 14:22:26 +03:00
yairm210
39114ff8f4 Added unique types for air unit transportation 2021-10-08 13:19:41 +03:00
Xander Lenstra
10a00eed3a
Fixed crash when AI is picking religions (#5421) 2021-10-07 21:24:17 +03:00
SomeTroglodyte
d25adacec7
Minimum city distance across continents (#5404) 2021-10-06 22:51:52 +03:00
SimonCeder
22ebe2b9af
Fix Educated Elite (#5416)
* fix educated elite

* unique-ify prophet uniques
2021-10-06 22:49:02 +03:00
yairm210
44fd987160 Fixed conditionals display when locating mod errors, which ws broken due to translation reordering all conditional-like text 2021-10-06 20:47:06 +03:00
yairm210
5e8e23fb43 Fixed broken translations 2021-10-06 19:06:53 +03:00
yairm210
6ec61128c4 More unique typing 2021-10-06 17:44:20 +03:00
SimonCeder
b41d234db6
Barbarians capture civilians and take gold from cities (#5410)
* ransom cities

* capture civilians

* fix bug
2021-10-06 17:12:13 +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
SimonCeder
e4ff3d43d6
prevent city states from taunting you (#5409) 2021-10-06 17:09:20 +03:00
Xander Lenstra
7752e1834d
Added a label displaying religion is off when it is off (#5412) 2021-10-06 17:06:49 +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
86f80e7540
Fixed Byzantine not applying (#5405) 2021-10-05 20:38:25 +03:00
Xander Lenstra
e879bb2a14
Added an advanced system for choosing beliefs (#5400) 2021-10-05 15:33:27 +03:00
SomeTroglodyte
4c6f1ecfb8
Solve continentSizes serialization by removing it (#5403) 2021-10-05 15:30:32 +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
2884cbb469
UniqueType-i-fying UniqueTriggerActivation (#5397)
* UniqueType-i-fying UniqueTriggerActivation

* UniqueType-i-fying UniqueTriggerActivation - fix missing param types

* UniqueType-i-fying UniqueTriggerActivation - alternate and all params
2021-10-04 21:47:03 +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
ec036dc3dd
Fixed a crash when killing a barbarian invading an unmet city-state (#5396) 2021-10-04 17:18:06 +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
Xander Lenstra
07822de375
Simplified combat uniques further (#5361)
* Simplified combat uniques further

* Reviews & translations

* UniqueType > placeHolderText

* I can't math
2021-10-04 00:29:46 +03:00
SomeTroglodyte
edfc66aa2f
Sort City States, replace+deprecate Dublin and Edinburgh (#5386) 2021-10-03 19:03:54 +03:00
SomeTroglodyte
462888fd46
New map for map editor shares settings storage (#5385) 2021-10-03 14:32:24 +03:00
yairm210
db30db42da Typed City-state related uniques 2021-10-03 12:46:27 +03:00
Xander Lenstra
97da979a04
Fixed bugs with fallout (#5379)
* Fixed bugs with fallout

* Reordered uniques

* Reviews

* Added missing unique targets
2021-10-03 12:04:15 +03:00
SomeTroglodyte
71405b93aa
The Celtic People Reboot (#5367)
* The Celtic People Reboot

* Redid the Shamrock sword of the Pictish Warrior

* The Celtic People Reboot - one comment

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-10-03 12:02:58 +03:00
SomeTroglodyte
a0f6596ee8
MusicController tweaks and hooks for mood - War and Peace (#5364)
* MusicController tweaks and hooks for mood - War and Peace

* MusicController tweaks and hooks for mood - patch1

* MusicController tweaks and hooks for mood - const object

* MusicController tweaks and hooks for mood - patch2

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-10-03 11:56:27 +03:00
Aron de Jong
c3242f37f2
Add looping minimap viewport if worldwrap enabled (#5349)
The viewport now also appears on the other side of the minimap when
viewing the border of the world with worldwrap enabled.
2021-10-03 11:50:50 +03:00
Xander Lenstra
88bcf5d514
Fixed bug where 'mandate of heaven' policy wouldn't work (#5380) 2021-10-03 11:50:03 +03:00
Xander Lenstra
238cbb782a
Added icons to resource trades & war declarations (#5376) 2021-10-03 11:46:27 +03:00
Xander Lenstra
091622612c
Added default values for supply to fix almost all mods being broken (#5373) 2021-10-03 11:46:04 +03:00
SomeTroglodyte
057f9b3f7b
Reduce Mod checker messages for a set of deprecated UniqueTypes (#5370) 2021-10-03 11:45:50 +03:00
SimonCeder
9016385f30
Barbarian spawning and camp placements (#5354)
* barbarian camp placement, spawn countdowns

* separate file

* raging barbarians

* faster spawn when attacked

* Barbarian AI

* works on old saves

* template.properties

* fix percent

* no improvements unique

* fix test fail

* reviews

* reviews pt 2
2021-10-03 11:45:02 +03:00
SimonCeder
344c96319b
Fix Fountain of Youth (#5355)
* fix fountain of youth

* fix test fail

* reviews

* reviews
2021-10-01 15:51:30 +03:00
SomeTroglodyte
03f374b058
Currently playing music track displayed under Options-Sound (#5357) 2021-09-30 06:35:20 +03:00
SomeTroglodyte
6cfc0a82d8
Deprecation message options only (#5352)
* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen

* Do not show RulesetErrorSeverity.WarningOptionsOnly on new game screen - fresh atlas
2021-09-29 21:25:44 +03:00
SomeTroglodyte
fb30a76e85
Civilopedia category icons and keyboard navigation (#5341)
* Civilopedia category icons and keyboard navigation

* Civilopedia category icons - white alternative
2021-09-29 17:39:02 +03:00
SomeTroglodyte
4c87d98aaa
Fix Mod unpack folder move (#5346)
* Fix Mod unpack folder move

* Fix Mod unpack folder move - comment
2021-09-29 12:34:58 +03:00
Xander Lenstra
bb5825a325
First step into unifying strength bonuses using conditionals (#5345) 2021-09-29 08:35:37 +03:00
SomeTroglodyte
8ee36d43d7
Allow Deciv Redux start with >0 City States (#5348) 2021-09-29 06:19:49 +03:00
SomeTroglodyte
070c41592f
Fix era of Wonders without tech in Wonder overview (#5347) 2021-09-29 06:19:28 +03:00
SomeTroglodyte
d3868dae62
Rework game start again (continents) (#5335)
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2021-09-28 23:48:06 +03:00
SimonCeder
8e3d2a1b87
Fix Polynesian vision when embarked (#5325)
* fix polynesia unique

* fix polynesia unique

* Update MapUnit.kt
2021-09-28 22:44:54 +03:00
Xander Lenstra
861a42e881
Moved the check for conditionals applying to getMatchingUniques functions; rewrote civInfo.getMatchingUniques (#5342)
* Moved the check for conditionals applying to `getMatchingUniques` functions. Rewrote `civInfo.getMatchingUniques`.

* Clarified comment
2021-09-28 22:42:18 +03:00
SomeTroglodyte
0aea74d3a9
Fix right side of player nation picker no longer entirely clickable (#5338) 2021-09-27 17:29:47 +03:00
SomeTroglodyte
a487c2c373
Fix new game Mod nation icons on first open (#5334) 2021-09-27 17:28:26 +03:00
SimonCeder
e0e701058d
Proper great general points (#5329) 2021-09-27 13:38:42 +03:00
SomeTroglodyte
2e72fd52c8
Double movement unique parameterized (#5319)
* Double movement unique parameterized

* Double movement unique - all filters
2021-09-27 12:35:38 +03:00
yairm210
96511e16ef Merge remote-tracking branch 'origin/master' 2021-09-26 17:17:04 +03:00
yairm210
bb8c9d3175 More unique typing 2021-09-26 17:16:50 +03:00
Xander Lenstra
d07eed31b8
Added the Byzantine empire (#5299)
* Added Byzantine Empire as a nation

* Added unique units

* Implemented unique ability

* Refactored out the beliefContainer

* Implemented reviews

* Credits

* Enumified the uniques & added missing translatable strings
2021-09-26 16:58:24 +03:00
SomeTroglodyte
e1b2814b5d
Mini-UI to see Religion info on foreign cities (#5321) 2021-09-26 11:04:33 +03:00
SomeTroglodyte
3a858a7051
Oversight - "base hurry cost" in pedia should be multiple of 10 (#5320) 2021-09-26 10:54:38 +03:00
SomeTroglodyte
8d33dacc3c
Softcode Fountain of Youth (#5308)
* Softcode Rejuvenation

* Softcode Rejuvenation - comments
2021-09-25 22:15:03 +03:00
SomeTroglodyte
a4c38174b6
Extra embarrassing fix - Textures missing on Android (#5313) 2021-09-25 22:08:37 +03:00
Yair Morgenstern
8d631254aa
Unified many implementations of common interfaces into abstract classes (#5312)
* Unified many implementations of common interfaces into abstract classes

* RulesetObject interface
2021-09-24 17:48:06 +03:00
yairm210
ed47f16c6e Added modder warning for deprecated fields 2021-09-24 16:35:22 +03:00
SomeTroglodyte
c05bf0a2a6
Fix a Nation Picker crash (#5311) 2021-09-24 15:49:56 +03:00
Yair Morgenstern
12302deef6
Precursor to mod target check - (#5303)
* Precursor to mod target check -
Define acceptable targets for each unique holder

* Warn for bad unique targets, and divide between different types of beliefs

* Moved the belief type logic into the class, rather than being external

* Added comment that getUniqueTarget is currently unneeded, but planned for future use
2021-09-24 15:02:41 +03:00
SimonCeder
fa813f8f5e
Quests fixes and additions (#5301)
* enable all quests

* implement more quests

* weighting for quests

* global quests

* fixes

* fixes

* Update template.properties

* general string

* reviews
2021-09-24 10:05:30 +03:00
SomeTroglodyte
e9e0f2c55f
World and Natural Wonders Overview (#5297)
* World and Natural Wonders Overview

* World and Natural Wonders Overview - icon

* World and Natural Wonders Overview - groups and tuning

* World and Natural Wonders Overview - atlas

* World and Natural Wonders Overview - lint
2021-09-24 10:04:30 +03:00
SomeTroglodyte
8ef84d785e
Music controller - Fix pause (#5307) 2021-09-24 10:00:46 +03:00