6222 Commits

Author SHA1 Message Date
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 3.17.11 2021-10-24 20:54:39 +03:00
Yair Morgenstern
8e9b7026c0
Translations update (#5543)
* Update Swedish.properties (#5541)

* Update Simplified_Chinese.properties (#5539)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update German translation (#5531)

* Update German translation

* Update German translation

* Update German translation

* Update German translation

* Update Indonesian.properties (#5529)

* Update dutch translation (#5550)

* work on dutch translation

* fix missing placeholder

* fix incomplete string translation

Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Inti Pelupessy <ipelupessy@users.noreply.github.com>
2021-10-24 20:51:13 +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
yairm210
3ae6d675cd 3.17.10 3.17.10 2021-10-20 21:20:24 +03:00
Yair Morgenstern
f343cb2c79
Translations update (#5524)
* Update Russian.properties (#5517)

* Update Thai.properties (#5514)

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update Thai.properties

* Update German translation (#5511)

* Update Indonesian.properties (#5510)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Italian.properties (#5507)

* Update Swedish.properties (#5505)

Co-authored-by: GD-alt <62538561+GD-alt@users.noreply.github.com>
Co-authored-by: Arnattha <92711795+Arnattha@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
2021-10-20 21:14:26 +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
SomeTroglodyte
6cc55dd1a9
Since TileInfo.tileResource is no lazy, a single test tile cannot change its resource around (#5522) 2021-10-20 16:38: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
ed224d257a Merge remote-tracking branch 'origin/master' 2021-10-17 23:42:17 +03:00
yairm210
d4205cb405 Typed "Unbuildable" 2021-10-17 23:42:09 +03:00
Xander Lenstra
c840ff99a6
Fixed belief increasing city-state influence resting point (#5502) 2021-10-17 23:02:45 +03:00
Xander Lenstra
1a6eee0d19
Fixed unit tests failing randomly (#5503) 2021-10-17 23:02:14 +03:00
yairm210
8b2bb8e59b Typed deprecated uniques so modders have warnings 2021-10-17 22:15:46 +03:00
yairm210
ef2f2eccde 3.17.9 3.17.9 2021-10-17 21:23:58 +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
Yair Morgenstern
d89211c6bb
Translations update (#5497)
* Update Greek.properties (#5488)

* Update Greek.properties

* Update Greek.properties

* Update Czech.properties (#5486)

* Update Czech.properties

- many new strings translated

* Update Czech.properties

- fixed string param names

* Update Swedish.properties (#5482)

* Update German translation (#5481)

* Update German translation

* Update German translation

* Update Indonesian.properties (#5480)

* Update Italian.properties (#5478)

* Update Italian.properties

* Update Italian.properties

Co-authored-by: ASLST <89976348+ASLST@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: SimonCeder <63475501+SimonCeder@users.noreply.github.com>
Co-authored-by: MartinP <77325495+Mape6@users.noreply.github.com>
Co-authored-by: kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
2021-10-17 21:02:31 +03:00