Commit Graph

3276 Commits

Author SHA1 Message Date
Yair Morgenstern
fd207d55c6 Game can handle resources "disappearing" between versions (esp. for mods) 2021-03-06 22:30:29 +02:00
Yair Morgenstern
9cdba66fd5 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-03-06 20:52:00 +02:00
Yair Morgenstern
d8093eb282 Resolved #3653 - Settler AI no longer aims for 'really far' tiles 2021-03-06 20:51:00 +02:00
GGGuenni
d161e8393e
Fixed wrapped tiles costing way to much gold (#3648) 2021-03-06 19:49:59 +02:00
lishaoxia1985
d290ca3d33
Update translation and Android studio to 4.1.2 (#3642) 2021-03-04 18:56:05 +02:00
GGGuenni
d3ae6d600c
World Wrap Fixes (#3644)
* Citys Screen gets unwrapped now

When a city got build on the worlds edge the city screen displayed a non wrapped world

* Fixed CityBorder getting shifted

when city gets build on on the world's edge
2021-03-04 18:54:39 +02:00
GGGuenni
0bf7c2e07e
Fixed rectangular maps center point (#3646) 2021-03-04 18:50:34 +02:00
Yair Morgenstern
eb47272d09 Tech info can display more than one revealed resource 2021-03-03 23:49:57 +02:00
Yair Morgenstern
87e0dedaf4 "Obsolete with [techName]" unique works with improvements 2021-03-03 23:49:31 +02:00
Yair Morgenstern
0f109e31a0 Resolved #3639 - City states that can't be connected by land no longer assign road connection quests 2021-03-03 22:43:07 +02:00
Yair Morgenstern
9e98fb5b59 Added World Wrap as a game setting, so bleeding edge users can test it
Can now create maps as World Wrap maps and play with them :)
2021-03-03 22:30:06 +02:00
GGGuenni
25db68fa2a
World wrap Part 2 (#3609)
* Changed map generation for hex maps

* Adding WorldWrap UI

* Is now compileable again

* Changed map gen for rec maps

well that was easy

* Units can now move and see across wrap

* well this is smarter

* World wrap checkbox commented ou

should be available only after everything has been merged

* simplify WW gen conditions

* reduced indentation

* Refactoring for better readablity
2021-03-03 12:54:49 +02:00
GGGuenni
9a7e637891
World Wrap Part 1 (#3604)
* Adding fake infinite scroll functionality

* improve scroll jump

* really smooth jump now

* World wrap has functionality now

This is not compileable on its own!
Needs branches WorldWrap-v1 and WorldWrap-v2 to be mergeable

* Mirror tiles rendering

* changed to run v2-alternative code

* Use generic type

* default worldWrap to false

* forward continousScrollingX as parameter

* added unit movement button for mirror tiles

* Add clickable tile layer

* Smooth wrap jump

* code a bit better to read

* Removed unnecessary overrides and catches

* mirrorTiles are stored in one HashMap now

instead of two seperate ones
2021-03-03 12:54:21 +02:00
lishaoxia1985
f65de81c21
Fix when Trade Gold = 0 it also shows in offer. (#3637) 2021-03-02 19:32:24 +02:00
Yair Morgenstern
639be3b01d 3.13.4 2021-03-01 21:05:53 +02:00
david.howard
12e3005294
[663] Allow unit rename on promote (#3620)
* Add nullable "instanceName" field to MapUnit to capture name for individual units
* Add "displayName" property to MapUnit which takes instanceName if set, name
  otherwise
* Add dialog to PromotionPicker to allow setting instanceName of unit, if not
  already set
2021-03-01 20:52:46 +02:00
Yair Morgenstern
a390df8b36 Merged save map functionality into load map screen - now map saving is more streamlined! 2021-02-28 23:56:09 +02:00
Yair Morgenstern
29360938c6 Added color to map buttons in map loading screen 2021-02-28 23:33:55 +02:00
Yair Morgenstern
be7fd4cb01 Resolved #3626 - can rename multiplayer games now.
Also organized multiplayer screens better.
2021-02-28 23:21:12 +02:00
Yair Morgenstern
97546a7499 Resolved #3622 - Can no longer try to send air units into unexplored tiles 2021-02-28 23:03:12 +02:00
Yair Morgenstern
7eeeee5212 Strength bonus from capital is now part of the Palace bonuses to make it moddable 2021-02-28 22:40:54 +02:00
Yair Morgenstern
32ca9884ce 3.13.3-patch2
Multiplayer auto-load working again
2021-02-28 00:10:05 +02:00
Yair Morgenstern
ed8d642036 3.13.3-patch1 2021-02-27 23:47:08 +02:00
Yair Morgenstern
d6e75c7ea2 Solved crash for badly defined mods like REKmod 2021-02-25 19:25:04 +02:00
Jack Rainy
ff05fa601d
Translations update (#3618)
* Translations update

* Minor changes to the translation
2021-02-25 19:01:58 +02:00
Yair Morgenstern
e464ba5328 Map generation parameters are moddable, allowing players to create custom terrains for map generation! 2021-02-24 20:34:01 +02:00
Yair Morgenstern
53c919eef9 Custom mods with no water or grassland can now work! 2021-02-24 20:02:25 +02:00
Yair Morgenstern
c9a96358da Changed "Gold" resource to be called "Gold Ore" to not conflict with the yield type for translations - #2458 2021-02-23 20:05:00 +02:00
Yair Morgenstern
241aecb52f Maps incompatible with ruleset no longer popup errors when generating a new map 2021-02-22 23:31:18 +02:00
Yair Morgenstern
4bd40125b0 All resource stats from buildings converted to building uniques 2021-02-22 23:00:48 +02:00
Yair Morgenstern
0ef44fc4da Changed deprecated StringBuilder.appendln with .appendLine 2021-02-22 21:13:16 +02:00
Yair Morgenstern
737dcea4dc Should now be able to create tech trees with over 10 rows 2021-02-20 23:10:37 +02:00
Yair Morgenstern
a01b11484a Added mod check for 'provides free building' which does not exist 2021-02-20 23:04:06 +02:00
Yair Morgenstern
675e47868b Resolved #3601 - selected current tech no longer looks like unresearchable tech 2021-02-20 22:58:16 +02:00
Yair Morgenstern
5bac35d36d Cleaned up map editor 2021-02-20 22:23:17 +02:00
Yair Morgenstern
3d8e7fa99d tileFilter now works with resources for most uniques! 2021-02-18 16:22:15 +02:00
Yair Morgenstern
92b82b22b0 Resolved #3610 - city sorting in overview is now done by translated, not original, name 2021-02-18 13:22:36 +02:00
Yair Morgenstern
36949410a7 Resolved #3586 - Added 'Destroy' translation for capturing cities in one-city challenge 2021-02-18 13:20:49 +02:00
Yair Morgenstern
2b33bb9873 Map editor knows to remove resources that don't exist in mods 2021-02-16 20:10:36 +02:00
Yair Morgenstern
5fa08d9f2d Can now create as many tech rows as you wish in mods :) 2021-02-16 20:02:54 +02:00
Yair Morgenstern
105d9690ff Resolved #3600 - multiplayer game reloading and screen resize no longer reset map zoom and position 2021-02-16 20:00:47 +02:00
Yair Morgenstern
7c09663271 Resolved #3495 - Added scrollbars to civilopedia and picker screens
Better Civilopedia layout
2021-02-15 22:38:54 +02:00
Johannes Schreiber
1e981abe53
Display scroll position on minimap (#3593) 2021-02-14 11:48:57 +02:00
Yair Morgenstern
b7a6967fe6 Movement algorithm updated - can no longer see whether you can move to unknown tiles 2021-02-13 21:50:47 +02:00
Yair Morgenstern
e92a1dd088 Better tech descriptions for increased improvement stats 2021-02-12 14:13:11 +02:00
Yair Morgenstern
4876687e48 Solved "AI doesn't declare war" bug 2021-02-12 11:58:25 +02:00
Yair Morgenstern
fff22e66cd Mod-specific maps are go! :D
Resolves #3517
2021-02-12 11:16:54 +02:00
Yair Morgenstern
9db073ff25 getComplexRuleset now accepts list of mods and not gameParameters 2021-02-12 10:47:12 +02:00
Yair Morgenstern
c1a259ea7d Another change towards unified mod management 2021-02-12 10:45:18 +02:00
Yair Morgenstern
a9fe8c42d8 Simplified mod management, in preparation for mod information within the maps 2021-02-12 10:42:35 +02:00
Yair Morgenstern
efe36a673e Separated ModCheckboxTable from GameOptionsTable, so we can use it when creating a map 2021-02-11 22:54:01 +02:00
Yair Morgenstern
8b1778eea3 Removed Scenario Maps entirely - was not a well thought-out concept and caused more confusion than actual fun.
Case in point - 0 mods are Scenario mods.
2021-02-11 22:33:52 +02:00
Yair Morgenstern
8a9301f4d7 Catch for bug in new movement algorithm when you can't move to a unknown tile, but CAN pass through (but not move to) intermediate tiles. 2021-02-09 23:03:44 +02:00
Yair Morgenstern
9fd06638a3 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-09 22:57:24 +02:00
GGGuenni
5a4155b372
Game saves can now always be deleted (#3584) 2021-02-08 21:54:04 +02:00
Yair Morgenstern
004cc58e13 Units manually moved cancel existing move action 2021-02-08 21:48:37 +02:00
Yair Morgenstern
d7379508f0 Now get up to 100 mods in mod list (up from 30) - kudos @ravignir for noticing there were missing mods! 2021-02-07 21:04:12 +02:00
Yair Morgenstern
7d9b56e3b1 Fixed queue showing "Consumes 1" when no resource is consumed
Plus linting
2021-02-07 19:13:10 +02:00
Yair Morgenstern
71266b213e 3.12.13 2021-02-06 22:39:36 +02:00
Yair Morgenstern
4104f72729 Added "Consumes [amount] [resource]" unique to units 2021-02-06 21:27:41 +02:00
Yair Morgenstern
3d683c767a Added "Consumes [amount] [resourceName]" unique for buildings 2021-02-06 21:12:44 +02:00
Yair Morgenstern
9054480bf7 Solved concurrency problems in redownloadAllGames() 2021-02-06 20:34:02 +02:00
Yair Morgenstern
20cf0c9203 Linting 2021-02-06 20:21:41 +02:00
Yair Morgenstern
8e900a2503 Hopefully mitigated some weird crashes 2021-02-06 20:21:19 +02:00
Yair Morgenstern
ec7a898d64 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-02-06 20:14:11 +02:00
Yair Morgenstern
60fe8fc36b Game can handle mods removing tile features between versions 2021-02-06 19:42:14 +02:00
Yair Morgenstern
4d0f66e159 Solved "quantum tunneling" bug for new movement algorithm 2021-02-06 19:41:51 +02:00
Johannes Schreiber
effdf74bb6
Scroll indicators are displayed more consistently on the NewGameScreen (#3570) 2021-02-06 19:35:54 +02:00
Yair Morgenstern
b0bf18afa0 Added custom victory conditions 2021-02-05 16:06:58 +02:00
Yair Morgenstern
84c200bd32 New cityFilter for cities connected to capital 2021-02-05 15:34:20 +02:00
Yair Morgenstern
1e6c8dacff Deprecated old uniques 2021-02-05 12:22:47 +02:00
Yair Morgenstern
a27a28df67 Fixed tests 2021-02-05 10:34:42 +02:00
Yair Morgenstern
cfc337f6ef City-state allies are always considered to have open borders 2021-02-05 10:22:01 +02:00
Yair Morgenstern
95b7cd7a32 AI uses same calculation for declaring both war and peace - so it won't declare war only to immediately declare peace. 2021-02-05 10:15:49 +02:00
Yair Morgenstern
b0c9c797f6 3.12.12 2021-02-04 20:18:14 +02:00
GGGuenni
a07e3947d2
Refactoring of MultiplayerScreen (#3572)
* Refactoring

- Removed unnecessary .tr()
- changed text case sensitivity
- changed popup to YesNoPopup
- combined multiplayerGames.remove and deleteSave into removeMultiplayerGame to reduce unnecessary try catch blocks

* Update case sensitivity translations

* adding "Game settings" entry
2021-02-04 19:13:01 +02:00
GGGuenni
9d109d4e05
Avoid overflow of the construction bar (#3573) 2021-02-04 16:22:05 +02:00
SpacedOutChicken
72b917ca1f
Add "Land" as possible input to tile-related uniques (#3574)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques

* Add "Land" as possible input to tile-related uniques
2021-02-04 06:42:12 +02:00
Yair Morgenstern
c85137aaaf Added "Irremovable" unique to tile improvements 2021-02-03 21:18:38 +02:00
Yair Morgenstern
f05e0a6b25 Added Unsellable unique to buildings 2021-02-03 21:10:12 +02:00
Yair Morgenstern
9d647447bc Added improvement-constructing buildings 2021-02-03 21:09:29 +02:00
SpacedOutChicken
55b4298cec
New uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []" (#3565)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain

* New parameterized uniques for border expansion - "-[]% Gold cost of acquiring tiles []" and "-[]% Culture cost of acquiring tiles []"

* Parameterized uniques for acquiring new tiles via either culture or gold

* Parameterizing expansion unique - improved calculation method

* Improved parameterization for border expansion uniques
2021-02-03 13:06:53 +02:00
GGGuenni
aa1bd3cd7e
Adding resign function for multiplayer (#3567)
* Adding give up function for multiplayer

* Update template.properties

* Reviewed changes

- Changed "give up" to "resign"
- Removed unnecessary and harmful translations
- Using YesNoPopup now

* Add missing space

* fixed first AI turn getting skipped
2021-02-02 16:43:51 +02:00
Yair Morgenstern
35ae2c749d 3.12.11-patch1 2021-01-31 21:57:28 +02:00
Yair Morgenstern
8016a64b97 Added mutually exclusive tech paths using "Incompatible with [otherTech]" unique for techs 2021-01-30 19:59:34 +02:00
Yair Morgenstern
bc4829a424 Translation updates for new cityFilter 2021-01-30 19:46:03 +02:00
SpacedOutChicken
457588a2c9
Parameterize Civ Unique for increased XP gain (#3561)
* no message

* Revert "no message"

This reverts commit 9ece60bd58.

* Renamed Haka War Dance effect to Intimidation, to make it more applicable to non-Maori Warrior units.

* no message

* Parameterized civUnique for extra experience from combat

* Update build.gradle.kts

* Update BattleDamage.kt

* Update Policies.json

* Update Battle.kt

* Fully parameterized nationwide XP gain
2021-01-29 12:31:52 +02:00
Yair Morgenstern
1b19413736 Solved mod incompatability with Legalism issues 2021-01-29 12:30:36 +02:00
Yair Morgenstern
1a576539e0 Implemented Cultural Diplomacy policy 2021-01-29 12:06:16 +02:00
Yair Morgenstern
2f121983cf Implemented Scholasticism 2021-01-29 12:01:25 +02:00
Yair Morgenstern
4e2aaa76dc Started implementing Patronage branch. Parametrized some uniques, city-states can handle different resting points for different civs. 2021-01-29 11:54:23 +02:00
Yair Morgenstern
9c725d74ae Parametrized "Maintenance on roads & railroads reduced by []%" 2021-01-29 10:35:01 +02:00
Yair Morgenstern
8e8215b5c4 Added 'replacementTextForUniques' parameter to buildings and units for custom text 2021-01-28 22:05:38 +02:00
Yair Morgenstern
bcab751f7c Linting 2021-01-28 16:21:25 +02:00
Yair Morgenstern
f11647d5fc Add a "Unlocked at [tech/era/policy]" unique to buildings and units 2021-01-28 15:11:05 +02:00
Yair Morgenstern
68498ec7ba "Save game" errors are now correctly caught and displayed to the user 2021-01-28 14:59:16 +02:00
Yair Morgenstern
852c06ae07 Not that the destination is not always reached, changed headTowards to return the actual tile the unit reached 2021-01-28 14:50:24 +02:00
Yair Morgenstern
0cba94dbcf Added mutually exclusive policy branches :) 2021-01-28 14:36:39 +02:00
Yair Morgenstern
18f4d4e53e Added city filter, and gerenicised several uniques to work with the city filter.
Deleted some deprecated uniques
2021-01-28 14:26:42 +02:00
Yair Morgenstern
6a266a6cac moveToTile can handle destinations that cannot be reached, for instance when exploring unknown areas 2021-01-28 11:58:53 +02:00
Yair Morgenstern
2cac1622c9 Deprecation of old uniques 2021-01-28 10:23:32 +02:00
Yair Morgenstern
30e5722c24 Added experimental movment which assumes unknown tiles are impassible - hopefully will resolve #3009 2021-01-27 17:59:07 +02:00
Yair Morgenstern
894e520319 More concurrency problems avoided by creating a second cityStats to run the values on
This should also help speed things up, since we don't need to run the update() again to revert it!
2021-01-26 22:34:38 +02:00
Yair Morgenstern
3199098ae8 Solved ANRs when loading large maps in map editor 2021-01-26 22:20:36 +02:00
Yair Morgenstern
83ecc9ee42 Hopefully mitigated some concurrency related crashes 2021-01-26 22:20:03 +02:00
Yair Morgenstern
0c89986af4 Resolved #3436 - parametrized "+[]% [] in all cities" 2021-01-25 20:47:50 +02:00
Yair Morgenstern
48f68c6bd0 Smoother map panning 2021-01-25 19:23:48 +02:00
GGGuenni
3037ce4141
multiple game support for TurnChecker (#3540)
* TurnChecker now checks every multiplayer game

Not just the currently open game

* Adding game saving to turn checker

so multiplayerScreen stays up to date

* remove unused imports

* removing unused functions
2021-01-24 16:12:44 +02:00
k4zoo
26afb16b6b
Update TileInfo.kt (#3557)
My first real pull request :P. I saw ResourceType.Luxury and ResourceType.Bonus being used in MapGenerator.kt so I thought why not make them accessible as a parameter for uniques?
2021-01-23 19:12:15 +02:00
Jack Rainy
8c0be488bc
Avoid overflow of the health bar in the overkill situation (#3558) 2021-01-23 19:11:41 +02:00
Yair Morgenstern
e3187148f5 Improvements with 0 turns to build are 'placeable' improvements which can only be places by corresponding uniques 2021-01-21 20:38:02 +02:00
Duan Tao
6889a60605
Fixed : great people could not build improvement. (#3553)
* Fixed : great people could not build improvement.

* Better check for buildable.

* Revert "Better check for buildable."

This reverts commit b9fa0efbae.

* Better check for buildable.
2021-01-21 20:17:01 +02:00
Yair Morgenstern
385e5c8e68 Merge branch 'master' of https://github.com/yairm210/Unciv 2021-01-19 20:55:59 +02:00
GGGuenni
0a54e914ee
Fixed Crash (#3549)
the game crashed because the UncivShowableException thrown by GameInfo, when used mods are not installed anymore, did not get catched
2021-01-19 12:36:47 +02:00
Yair Morgenstern
3b3be47ddb Resolved #3548 - defeated civs now stack correctly in overview>diplomacy 2021-01-18 21:20:47 +02:00
Yair Morgenstern
2d1113fc5a "Create improvement" works on water improvements as well :) 2021-01-17 21:05:32 +02:00
Yair Morgenstern
1863a7d214 Code cleanup 2021-01-17 21:04:16 +02:00
Yair Morgenstern
245e7de0a1 Can handle and detect mods where the requiredBuildingInAllRuleset does not exist in the ruleset 2021-01-16 21:22:15 +02:00
Yair Morgenstern
b27c744cd2 Retrieving the construction info in a different thread now works perfectly! 2021-01-16 21:12:55 +02:00
Yair Morgenstern
7e092fdf16 Linting 2021-01-16 21:07:53 +02:00
Yair Morgenstern
942aa981ba City stats update now accepts construction - simplifies the CityConstructions.turnsToConstruction function 2021-01-16 21:05:15 +02:00
Yair Morgenstern
6f8add77e8 Resolved ANRs for slow phones when loading the construction list 2021-01-15 15:12:14 +02:00
Yair Morgenstern
3a729874c2 Constructions table reorg - each piece has a self contained update 2021-01-15 14:55:09 +02:00
Yair Morgenstern
6c66600fce Unified construction button metadata / UI split 2021-01-15 14:50:10 +02:00
Yair Morgenstern
ab262da205 Construction button creation moved to DTO for later refactoring 2021-01-15 14:38:12 +02:00
Yair Morgenstern
d91f4752e0 Hopefully made some memory errors clearer to the user 2021-01-15 14:17:30 +02:00
Yair Morgenstern
0b7f45bba0 Problems when saving game are now user-visible 2021-01-15 13:29:50 +02:00
Yair Morgenstern
0800dbba51 Resolved #3533 - Added confirmation popup when saving over existing save 2021-01-15 13:28:29 +02:00
Yair Morgenstern
13e79ac37c Fixed "Unique great person is available from Great Person picker screen" bug 2021-01-13 22:08:12 +02:00
Yair Morgenstern
a666cfa320 Resolved #3526 - stats drilldown remains when moving between city screens 2021-01-13 21:38:28 +02:00
GGGuenni
470952ea89
Improving MultiplayerScreen loading speed (#3527)
* Improve MultiplayerScreen Loading Speed

* Refactoring

- renamed multiplayerGameList to multiplayerGames because it's not a List
- changed content of map from <GameId, Filehandle> to <FileHandle, GameInfo> because GameId is an expensive Key

* i do as yairm guides
2021-01-13 19:46:29 +02:00
Yair Morgenstern
73c5811297 Buildings not displayed in civilopedia are not show to be obsoleted in tech tree either 2021-01-13 15:50:08 +02:00
Yair Morgenstern
088c716321 Game can handle ongoing constructions "disappearing" between mod versions 2021-01-12 18:10:41 +02:00
Yair Morgenstern
a8e0f270a0 Game can handle policies "disappearing" between mod versions
Added policy map to ruleset for simpler policy location
2021-01-12 17:10:38 +02:00
Yair Morgenstern
09d44bfcd2 Resolved #3520 - picker screens go back on Back button / Esc 2021-01-12 16:34:13 +02:00
Yair Morgenstern
af326100fc Resolved #3519 - Added 'exit game from back button' to main menu screen 2021-01-11 23:56:33 +02:00
Yair Morgenstern
617e7aea93 Removed placeholder science and production boost from Computers tech
New games start by default with city states
2021-01-11 20:56:31 +02:00
Yair Morgenstern
18ffc2ea02 Resolved #3503 - Civilopedia and Overview show what 'panel' you're currently on 2021-01-11 17:59:28 +02:00
Yair Morgenstern
92f203c5e3 Added color to civilopedia buttons per #3503 2021-01-11 17:14:50 +02:00
Yair Morgenstern
ca6b09bed1 Merge branch 'temp' 2021-01-08 00:23:22 +02:00
Yair Morgenstern
6bf6560286 3.12.7-patch1 2021-01-08 00:15:55 +02:00
Yair Morgenstern
c4f33f9373 Resolved #3501 - Added city-state toggle to diplomacy overview, clicking on civ names in overview opens diplomacy screen 2021-01-07 23:38:26 +02:00
Yair Morgenstern
ecfa38e4e7 Resolved #3473 - show city's happiness drilldown 2021-01-06 22:52:26 +02:00
Yair Morgenstern
78735bcfad Better 'conflicting tech' check for mods 2021-01-06 22:41:00 +02:00
Yair Morgenstern
80b470e867 Resolved #3497 - city state quests always show correctly when diplomacy screen accessed from city button
Added some scrollbars as per #3495
2021-01-03 21:37:38 +02:00
Yair Morgenstern
17333ec0d3 Fixed crash when attempting to issue a 'connect to capital' quest for a civ with no capital 2021-01-03 19:15:27 +02:00
Yair Morgenstern
ae805284a6 3.12.6 2021-01-02 22:09:08 +02:00
9kgsofrice
65cc56b5d7
= 1F instead of += 1 (#3487) 2021-01-01 13:49:48 +02:00
Yair Morgenstern
908cae1881 Solved ANRs when loading big maps in editor screen 2021-01-01 13:40:31 +02:00
Yair Morgenstern
26c817a4a1 Resolved #3483 - settlers require at least 2 population to construct, as per Civ V 2021-01-01 13:29:03 +02:00
Yair Morgenstern
8c50e70f22 Better visual aircraft indicators 2021-01-01 13:19:15 +02:00
Yair Morgenstern
e9f1c38c8b Set a max cap on unit maintenance - does not increase past the base turn limit 2021-01-01 13:01:06 +02:00
Yair Morgenstern
7ff5fe4650 Resolved #3472 - can purchase 'free' tiles in cities even with negative gold 2021-01-01 11:10:15 +02:00
Yair Morgenstern
6d4324354f Resolved #3490 - fixed formatting problem in trade popup 2021-01-01 11:03:54 +02:00
Yair Morgenstern
8f0f656f7b Resolved #3489 - City state influence is affected by declaring war and making peace with their enemies 2020-12-31 21:58:22 +02:00
Yair Morgenstern
e7fb183b85 Resolved #3475 - capturing settlers moves us to the captured units' tile 2020-12-30 21:38:36 +02:00
9kgsofrice
5b25ec0495
"happiness from garrison" effect was duplicated (#3485) 2020-12-30 21:07:24 +02:00
Yair Morgenstern
42ff90fb65 3.12.5 2020-12-29 21:23:08 +02:00
Yair Morgenstern
2ff345b6a6 Resolved #3476 - captured civilian units can no longer move on the same turn 2020-12-29 19:57:28 +02:00
Yair Morgenstern
03ddd3c410 Resolved #3331 - resources for city-state quests are taken from resources on the map, to avoid unfinishable quests 2020-12-28 22:23:20 +02:00
Yair Morgenstern
d0a59889c4 Can now choose construction to work on even when worker has no movement points, since it won't advance unless he does 2020-12-28 19:32:28 +02:00
Yair Morgenstern
98685ad7c0 Resolved #3464 - units only advance improvements when they have movement points left 2020-12-28 17:59:04 +02:00
Yair Morgenstern
100d6f9512 Fixed minor automation bug for modded terrains 2020-12-28 17:44:47 +02:00
Yair Morgenstern
ca04093321 Resolved #3470 - popups now make the rest of the screen unclickable to avoid exploits
Resolved #3468 the same way
2020-12-28 17:37:29 +02:00
Yair Morgenstern
e07fd6d0bc Resolved #3465 - picking current impeovement closes picker screen, but doesn't reset improvement constrution 2020-12-28 17:36:18 +02:00
Yair Morgenstern
7dd2438dbd Resolved #3431 - Redesigned the player picker, to scroll through civs and display them separately 2020-12-27 16:48:04 +02:00
Yair Morgenstern
78535252c2 Resolved #3424 - Added blink on event location 2020-12-27 13:29:34 +02:00
Yair Morgenstern
599a1d8a91 Game can deal gracefully wth mods removing certain units and technologies 2020-12-27 11:55:28 +02:00
Yair Morgenstern
87c6819462 "Free great person" can no longer grant great people that are unique to another civ
Unified Great Person recognition
Better Great Person AI detection for unique units
2020-12-27 11:05:11 +02:00
Yair Morgenstern
713086849a AI declares peace with civs they can't reach, solving 'endless stalemate war' problems 2020-12-26 23:11:49 +02:00
Yair Morgenstern
170e158a4e Added required building dependency check 2020-12-26 20:09:06 +02:00
Yair Morgenstern
7d7557ae4a Caught modding errors - classic. 2020-12-26 20:04:46 +02:00
Yair Morgenstern
b77fa8d67d Modded water units with worker unique can no longer build roads in water 2020-12-26 19:50:29 +02:00
9kgsofrice
099ee879cc
small bug meant that there was a 67% chance NOT to capture defeated barbarian unit (#3450) 2020-12-25 12:55:20 +02:00
Yair Morgenstern
8689fe0ffa Clarified Protectionism effect 2020-12-23 21:28:59 +02:00
Yair Morgenstern
d0cbc07870 Solved crashing bug from incorrect mods 2020-12-23 21:23:41 +02:00
Yair Morgenstern
12c9867c73 Resolved #3445 - national wonders no longer shown when already built 2020-12-23 21:01:37 +02:00
Yair Morgenstern
c7d79ad179 Replaced hardcoded Settler references with unique
Tech uniques now saved in tech object for less regex parsing per turn
2020-12-22 23:31:29 +02:00
Yair Morgenstern
12b844d917 Changed all hardcoded Great General references to unique-based 2020-12-22 23:03:41 +02:00
Yair Morgenstern
a4e93d89f1 Resolved #3384 - Civ uniques now take all researched tech uniques! 2020-12-21 22:02:40 +02:00
Yair Morgenstern
96c480af02 Resolved #3437 - reselecting improvement in progress does not reset progress
Unit improvement picker displays correct turns for improvement in progress
2020-12-21 21:14:39 +02:00
Yair Morgenstern
e653e71cc9 Resolved #3441 - fixed reverse maintenance cost unique 2020-12-21 21:03:07 +02:00
Yair Morgenstern
43d9813ce1 3.12.2-patch1 2020-12-21 20:59:47 +02:00
Yair Morgenstern
4e62d0b722 Fixed starting positions not activating on new game 2020-12-21 20:56:02 +02:00
Yair Morgenstern
213e71a97b Reversed requiredBuilding migration to unique 2020-12-21 20:35:02 +02:00
Yair Morgenstern
566a9529ef Un-hardcoded some settler checks 2020-12-20 22:55:36 +02:00
Yair Morgenstern
9b6dd71d22 Resolved #3422 - added fast switch between adjacent cities in city screen 2020-12-19 21:39:30 +02:00
Yair Morgenstern
eda8b84c2d Resolved #3428 - added a toggle for displaying yield icons 2020-12-19 21:26:18 +02:00
Yair Morgenstern
78513b87c1 Resolved #3427 - "player ready" screen appears when loading game in Hotseat multiplayer 2020-12-19 21:15:12 +02:00
9kgsofrice
2b36ad679a
genericised stats before tech unique (#3421)
* generic stats before tech/policy unique

* simplified
2020-12-19 21:06:45 +02:00
Yair Morgenstern
478ea310b4 City-states make peace with enemies when their alllies do 2020-12-19 21:01:35 +02:00
Yair Morgenstern
d56433857b Long tech descriptions are now scrollable 2020-12-19 20:53:48 +02:00
Yair Morgenstern
e3f1c33654 Building.requiredBuildingInAllCities -> "Requires a [] in all cities" unique 2020-12-17 15:46:17 +02:00
Yair Morgenstern
f40584b1ec requiredBuilding parameter migrated to "Requires a [] in this city" unique 2020-12-16 20:14:36 +02:00
Yair Morgenstern
c84e20f38b "Requires a {building}" notifications show the civ's equivalent to the building, if overridden 2020-12-16 16:27:54 +02:00
Yair Morgenstern
05880376bb Korean UA activates on buildings added from buying and on national wonders 2020-12-16 14:09:02 +02:00
Yair Morgenstern
30c12662d2 Unified science addition logic 2020-12-16 14:08:17 +02:00
Yair Morgenstern
925e092629 Solved ANR when loading large games from the load screen 2020-12-16 12:27:01 +02:00
Yair Morgenstern
f27f036e28 Resolved #3378 - AI no longer tries to heal units in dangerous tiles - by nob0dy73 2020-12-14 11:39:05 +02:00
Yair Morgenstern
24b46e8c2c AI knows not to try and heal units which would heal anyway 2020-12-14 11:31:13 +02:00
Yair Morgenstern
fad967b31a Resolved #3382 - Added tryTakeBackCapturedCity by nob0dy73 2020-12-14 11:12:05 +02:00
Yair Morgenstern
835ed003be Resolved #3380 - added tryHeadTowardsSiegedCity to unit automation, by nob0dy73 2020-12-14 11:07:11 +02:00
Yair Morgenstern
fd372d8c77 Forced disband from lack of gold now provides disband gold 2020-12-13 22:49:39 +02:00
이휘찬
d1387a04c3
Implemented missing Korean UA (#3416)
* try to implement korean ability

* Corrected typo error

Coreect camel typo errror

* updated new korean feautre translation.

* edited korean unique text to get right sentence.

* merge duplicated code into addScience(Int)
2020-12-13 12:28:05 +02:00
Yair Morgenstern
b264876b6b Deprecation of old unique formats in favor of newer, more generalized ones 2020-12-13 12:21:38 +02:00
Yair Morgenstern
7ec176ac45 Minor fixes for the tile yields 2020-12-13 09:52:15 +02:00
jnecus
0e5b2f0db0
Display tile yields (#3322)
* Show tile yields functionality (WIP)

* Toggle yields (WIP)

* Show Yields (WIP)

* Show tile yields WIP

* showTileYields (WIP)

* tidying code

* Display tile yields (WIP)

* Show tile yields (WIP)

* Update CityTileGroup.kt
2020-12-13 09:31:37 +02:00
Yair Morgenstern
963fee3552 Added much-needed "+[]% Production when constructing [] units" unique 2020-12-13 09:27:31 +02:00
Yair Morgenstern
11fb6b4b67 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-12-13 09:20:40 +02:00
Yair Morgenstern
7731211b09 All relevant unit filtering moved to baseUnit, so we can filter on constructions as well 2020-12-13 09:19:45 +02:00
9kgsofrice
86b4548d11
kept the old one for now (#3414) 2020-12-12 20:11:15 +02:00
9kgsofrice
ee5aa38129
GG bonus generation now checks for civinfo uniques (#3412)
* great general bonus isn't applied to national uniques

check added to allow this

* added uniques together :)

* added vals in line with similar checks - more efficient(?)
2020-12-12 20:10:39 +02:00
9kgsofrice
fe38249dc1
City-state resources from all sources shared with ally civ (#3411)
* merged functions for getCityResources and getResourcesFromAlly

* "city-states" origin moved to civinfotransientupdater
2020-12-12 20:09:39 +02:00
Yair Morgenstern
bbcf5ffed7 Added "All" filter for units 2020-12-11 14:28:29 +02:00
Yair Morgenstern
d0774db030 Resolved #3408 - Unit maintenance cost reduction generalized, now works for Ottomans 2020-12-11 14:24:09 +02:00
Yair Morgenstern
3ab57f1ada Resolved #3409 - American unique grants extra sight only to military land units 2020-12-11 14:11:35 +02:00
Yair Morgenstern
1f59a4ea48 Fixed crash when nuking Barbarian units 2020-12-11 14:09:19 +02:00
Yair Morgenstern
ab548dda54 Fixed ANR caused by too many saved games 2020-12-10 10:42:02 +02:00
Yair Morgenstern
4578994adf Reassign population after selling a specialist-providing building 2020-12-10 10:10:14 +02:00
9kgsofrice
d3ba68f7d3
resources can be added by tile improvement with unique "Provides [] []" (#3406)
* resources can be added by tile improvement with unique "Provides [] []"

* to minimise indentation

* to minimise indentation

* changed null check

* flip if
2020-12-09 23:02:46 +02:00
Yair Morgenstern
fb743ade31 Added nation icons to the leader names in the diplomacy screen 2020-12-09 23:01:43 +02:00
Yair Morgenstern
c1a717e4f8 Resolved #3289 - can place unbuildable improvements that can exist on tiles 2020-12-09 22:46:15 +02:00
9kgsofrice
e80dc879bb
wonder text will not be displayed & "[] enabled:" will not show if nothing visible in list (#3399) 2020-12-07 22:26:34 +02:00
Yair Morgenstern
3e6955d0d9 Selected unit stays selected when single-tap moved into a tile with another unit 2020-12-07 20:08:58 +02:00
9kgsofrice
2c35cc98de
Specialists can add happiness (#3398) 2020-12-07 08:46:39 +02:00
9kgsofrice
cc5f4fc316
Should not be displayed without [] (#3396)
* cleaned up again :)

* add val "filter"
2020-12-06 22:19:49 +02:00
Yair Morgenstern
8a5247324c 3.11.18 2020-12-06 22:16:03 +02:00
Yair Morgenstern
b50c129e2d "+[] Movement for all [] units" now respects all unit categories 2020-12-06 21:50:46 +02:00
Yair Morgenstern
378e1ddc66 Fixed broken build, also - test for the new Travis! 2020-12-06 21:23:49 +02:00
Yair Morgenstern
48d0758abf Improvements can't be built in neutral areas, as per Civ V 2020-12-06 20:39:53 +02:00
Yair Morgenstern
22b3f563f3 Crash reports contain the game version for easy filtering
Added helper function cityInfo.isWorked(tile)
2020-12-05 22:54:16 +02:00
givehub99
6a73909c67
Helicopter Gunship (#3385)
* -Helicopter Gunship Implemented
-Anti-Tank Gun upgrades to it

* unit atlas

* "All tiles cost 1 movement"
2020-12-04 14:20:24 +02:00
Yair Morgenstern
5cf3e7764a CORRECT handling for mods that changed their buildings or units 2020-12-04 14:12:47 +02:00
Yair Morgenstern
81a38be5f4 Added button to add construction items directly to the queue 2020-12-04 11:27:28 +02:00
Duan Tao
93a26f635c
Workers stop building (most) duplicate roads connecting cities. (#3391) 2020-12-04 10:16:19 +02:00
Yair Morgenstern
4a0c69741e Merge branch 'temp' 2020-12-04 00:11:48 +02:00
Yair Morgenstern
4bb6426b79 3.11.17-patch1 2020-12-04 00:11:29 +02:00
Yair Morgenstern
a9d36c073a Mods can handle removing existing buildings 2020-12-03 23:58:48 +02:00
Yair Morgenstern
c12afb4131 "have signed the peace treaty" -> "have signed a peace treaty" 2020-12-03 23:29:36 +02:00
Yair Morgenstern
af113db8d7 Don't allow AI to offer peace to cty states allied with their enemies 2020-12-03 22:17:52 +02:00
Yair Morgenstern
2a3a0b107f Fixed rare errors 2020-12-02 23:17:20 +02:00
9kgsofrice
1f5fa74cea
adds val to modoptions and check to battle.kt to adjust max xp from barbarians (#3389) 2020-12-02 23:04:00 +02:00
9kgsofrice
525cea1cc9
"Uncapturable" unique (#3388)
* WIP

* "Uncapturable" unique; civilians will be destroyed instead of captured
2020-12-02 22:45:44 +02:00
9kgsofrice
b2e40a892b
unique "[] units gain the [] promotion" affects exisiting units (#3387)
* "[] units gain the [] promotion" unique affects existing units

* removed toString() and flipped &&

* probably this is closer to what you had in mind :)
2020-12-02 19:49:13 +02:00
9kgsofrice
80688eb4a5
Hide build menu constructions requiring resources with unique (#3370)
* "Not displayed as an available construction without []"
Hides constructions that are missing resources

* combined unique check

* removed duplicate code

* clarified if clause

* simplified check and obsoleted existing unique

* previous iteration did not work due to OR instead of AND

* if we don't check to see if this is actually a resource, we get a crash
2020-12-02 19:13:15 +02:00
9kgsofrice
2aac9ea314
Nation "style" can define unit appearance (#3368)
* added "style" in Nation.kt and checks in Tilegroups
allows pixel units to be displayed as a specific style if appropriate file exists

* Preserves "specificUnitIconLocation" in tilegroups.kt
2020-12-02 19:12:05 +02:00
9kgsofrice
0e39d47dab
Changes check to remove national wonders on city ownership changes to rely on building.isNationalWonder (#3386) 2020-12-02 18:49:37 +02:00
Yair Morgenstern
0feb9bdefc First attempt at making Unciv Android-TV-compatible 2020-12-01 23:26:01 +02:00
Yair Morgenstern
07cee7e679 3.11.16-patch1
Fixed x100 combat modifier for units in rough/open terrain
2020-12-01 22:07:10 +02:00
Yair Morgenstern
d6c95ade5e Display mod incompatabilities 2020-11-30 22:13:23 +02:00