Commit graph

3789 commits

Author SHA1 Message Date
Yair Morgenstern
4fd869dbee Tile variants! 2020-04-18 22:46:25 +03:00
Yair Morgenstern
cb2e3a1bce More .toTextButton() changes 2020-04-18 22:35:25 +03:00
Jack Rainy
77a63ce365
Citadel improvements + improved AI for the forts (#2453)
* Allow building the citadels either next to or within friendly tiles only

* Citadel acquire the tiles around it

* AI uses the citadels to get the tiles back + improved AI for the forts
2020-04-18 21:25:48 +03:00
Jack Rainy
d4ef5cb637
Map Editor UI improvements (#2462)
* Better icons for "clear" tools

* Map editor layout is reworked
2020-04-18 21:20:50 +03:00
SomeTroglodyte
4f00639969
Fix: Modded strategic resource without tech prerequisite crashes game (#2460) 2020-04-18 21:19:52 +03:00
Yair Morgenstern
885f280747 Merge tag '3.7.5-patch1' 2020-04-18 21:15:51 +03:00
Yair Morgenstern
47e2f00816 3.7.5-patch1 2020-04-18 21:15:13 +03:00
Yair Morgenstern
1b4cd9c3b3 Fixed replacing obsolete units for new queue 2020-04-18 21:10:39 +03:00
Jack Rainy
6635ed5be9 Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 21:04:18 +03:00
SomeTroglodyte
0397cd7126
Fix city construction side effects (#2448) 2020-04-18 21:01:26 +03:00
Jack Rainy
0de947d1b9
Hotfix: city-state must get at least 1 starting technology (#2450) 2020-04-18 20:59:29 +03:00
Yair Morgenstern
75b11a0a9a Civs never start out on snow (might as well start over...) 2020-04-17 18:03:50 +03:00
Yair Morgenstern
a3843450bf Starting techs no longer hardcoded - this means that mods can have their own tech trees starting wherever 2020-04-17 17:52:45 +03:00
Yair Morgenstern
c764324e81 Unique units do not need to replace existing units 2020-04-17 17:15:21 +03:00
Yair Morgenstern
30fc110d67 More era-related fixes 2020-04-17 15:26:24 +03:00
Yair Morgenstern
eba7dc8c8c All era names changed to "... era" to fit in with what is actually translated and displayed
Removed Era enum - too restrictive to tech tree variations (atomic era, anyone?)
As a side bonus, mods can now add their own eras, that'll be interesting?
2020-04-17 15:11:45 +03:00
Yair Morgenstern
4c48cfe4f3 Can now specify a mod as a 'base ruleset', and the regular base ruleset will not be added
This means that you can 'start from scratch' and build whatever you want - example "Scenario" in unciv-mod-example repo
Obviously we'll have to change around a lot of things or this to work well, but it's a start
2020-04-17 14:42:15 +03:00
Yair Morgenstern
ffe8691df9 Disabled city-state notifications when the city state is defeated 2020-04-17 14:13:18 +03:00
Yair Morgenstern
f9e7411569 3.7.5 2020-04-17 11:58:42 +03:00
uncivbot[bot]
8ae78b9446
Translations update (#2446)
* Update Italian.properties (#2429)

You also forgot Denmark's ability

* Update Spanish.properties (#2432)

Small contribution to translation. I could finish it but I'm sleepy and I want to save the progress. It will be 100% in a couple of days.

* Update German.properties (#2440)

* Update German.properties

Meint Zeile 3434 wirklich besetzte Stadt?
bei Nations etwas weitergemacht, genderung der Sprache entfernt (versucht).
siehe git diff

* Update German.properties

added translation to a part of the tutorials

* simplified Chinese translations (#2443)

* simplified Chinese translations

* simplified Chinese translations

* simplified Chinese translations

Co-authored-by: SheepYang <332594623@qq..com>

* Update Dutch.properties (#2447)

I added some new translations, fixed some typo's and turned Tevredenheid in to Blijheid which I think is more fitting. Also n.Chr. (the Dutch version of AD) is rarely used, so it may be more fitting to just remove it after you pass v.Chr. (BC).

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: CodeBlizzard <62041843+CodeBlizzard@users.noreply.github.com>
Co-authored-by: Haeherfeder <gitDeDemos@haeherfeder.de>
Co-authored-by: SheepYang <332594623@qq.com>
Co-authored-by: SheepYang <332594623@qq..com>
Co-authored-by: SrirachaGamer87 <58479947+SrirachaGamer87@users.noreply.github.com>
2020-04-17 11:55:57 +03:00
Yair Morgenstern
de1c6872fe Resolved #2444 - buying buildings no longer crashes 2020-04-17 11:33:57 +03:00
SomeTroglodyte
cb87ae94a8
Effect of rationalism was not visible in city UI: Translations patch (#2442)
* Effect of rationalism was not visible in city UI

* Effect of rationalism was not visible in city UI - translations patch
2020-04-17 10:21:11 +03:00
SomeTroglodyte
14991c3261
Keyboard-operated unit actions didn't play their sounds (#2438) 2020-04-17 10:18:35 +03:00
SomeTroglodyte
64ec6bd26e
Bring Legion Unit closer to wiki? (#2439) 2020-04-17 10:15:41 +03:00
SomeTroglodyte
fce4b41aaa
Keyboard: Left/Right arrows work in city screen (#2445) 2020-04-17 10:14:13 +03:00
SomeTroglodyte
bc6e2c97ef
Clarify/optimize the role of the inProgressConstructions validator (#2433) 2020-04-16 20:41:05 +03:00
SomeTroglodyte
3f7d5a5cb4
Perpetual constructions display "0 turn" in the queue (#2435)
This gag or omitting the line entirely both look better
2020-04-16 20:40:27 +03:00
SomeTroglodyte
ac8648216e
Tiny optimization for isCoastalTile (#2434)
Yes benefit may be low as neighbors are already cached, but cost is negligible
2020-04-16 20:39:45 +03:00
Jack Rainy
31134d0fe5
Disable auto building of forts while a human can do that (#2436)
* Automate building forts for AI players only

* Using constants
2020-04-16 20:39:05 +03:00
Yair Morgenstern
248d7b5aa6 More policy names to effects 2020-04-16 17:06:47 +03:00
Jack Rainy
038e1cadbf
Application crash after the defeat (#2427) 2020-04-16 16:15:47 +03:00
Yair Morgenstern
25b1259ab6 Resolved #2348 - construction queue is 'cleaned' after every construction
It's much easier to validate the construction queue now as well
2020-04-16 16:12:17 +03:00
Yair Morgenstern
1d2ec21210 There is only one true source of removing constructions from the queue, to which all other functions lead 2020-04-16 15:58:46 +03:00
GGGuenni
4fc5c5de64
New screen for "Add Game" [MultiplayerScreen] (#2431)
* Adding AddGame Screen

Old button was confusing for new players

* Adding translation file entry
2020-04-16 14:44:52 +03:00
Yair Morgenstern
7d3a10b6ab All constructions are now in the queue - no more separate "current construction" and "construction queue" - #2428
That went pretty simply, compared to the magnitude of the change
2020-04-16 13:01:45 +03:00
Yair Morgenstern
3ba20dca52 Resolved #2413 - Yes, having the hotkey always be on display does look much nicer, and I think it's more user-firendly too (no more 'wait let me hover over it to see what the hotkey is') 2020-04-16 11:59:11 +03:00
Yair Morgenstern
381f61a441 More isAdopted to hasEffect conversions 2020-04-16 11:30:22 +03:00
Yair Morgenstern
d031b2855b Merge branch 'master' of https://github.com/yairm210/Unciv 2020-04-16 11:06:58 +03:00
Yair Morgenstern
c1f0084fb0 Added a check to see if a policy effect was active - this is an important step towards "different effects for the same policy name", as happens between Vanilla and G&K/BNW 2020-04-16 11:05:49 +03:00
SomeTroglodyte
048ce0d3c3
Remove "Camp" hardcoding and allow mods to do similar things (#2417) 2020-04-16 10:41:29 +03:00
Jack Rainy
2594777b52
The original capital can not be razed (#2412)
* Civ is not defeated while at least 1 settler is alive

* The original capital cannot be razed

* Revert "Civ is not defeated while at least 1 settler is alive"

Defeat condition is: no cities remained
2020-04-16 10:33:58 +03:00
Yair Morgenstern
68af30acf0 3.7.4 2020-04-15 23:58:14 +03:00
uncivbot[bot]
7cac703a83
Translations update (#2426)
* Update Italian.properties (#2402)

* Update Czech.properties (#2416)

new texts, terminology improved and synced

* Update Traditional_Chinese.properties (#2420)

Updates part of the untranslated items

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
Co-authored-by: The Bucketeer <57716526+GeneralWadaling@users.noreply.github.com>
2020-04-15 23:51:33 +03:00
Jack Rainy
1203dc7f7d
Using the correct icons for the great improvements (#2425) 2020-04-15 23:36:50 +03:00
SomeTroglodyte
5033cca9c2
Next turn button had a dead color assignment statement (#2403)
Color goes to Label instead of container
  String comparison special casing eliminated
  Clearer code structure
  Chose different colors - from standard palette but close to associated stat

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
2020-04-15 23:34:01 +03:00
Giuseppe D'Addio
71f339eb26
Update Nations.json (#2409)
Changed colors for Mogadishu
2020-04-15 23:33:45 +03:00
SomeTroglodyte
966de236f4
Options: Turning on city production autoassign affects world immediately (#2401)
* Options: Turning on city production autoassign affects world immediately

* Options: Turning on city production autoassign affects world immediately - patch
2020-04-15 23:33:12 +03:00
Jack Rainy
ba81c3e97c
The world view top panel can open the corresponding screens (#2415)
* Empire overview can open the requested pages

* Open the empire overview screen on the given page

* Open the tech and policies screens

* Turns counter opens the victory status screen
2020-04-15 23:19:09 +03:00
SomeTroglodyte
fcc14ab093
EmpireOverview: A little color on the Stats page (#2419)
* EmpireOverview: A little color on the Stats page

* EmpireOverview: Align numbers on the Stats page
2020-04-15 23:17:03 +03:00
Jack Rainy
ed9fcc3ec1
Fix application crash when city area is too small (#2421) 2020-04-15 23:14:58 +03:00