Commit Graph

3146 Commits

Author SHA1 Message Date
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
Yair Morgenstern
98d01f50b1 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-11-30 22:07:51 +02:00
Yair Morgenstern
61a0ccba5f Fixed minor mod bugs 2020-11-30 22:07:44 +02:00
9kgsofrice
ea11c3fdf3
getResourceModifier for resources modified by uniques (#3372)
* added function getResourceModifier to civinfo and tied into cityInfo resource checks
pared down getTileResourceAmount function

* simplified function usage
2020-11-30 21:54:54 +02:00
Yair Morgenstern
f59c9a8593 Resolved #3364 - Fixed certain battle modifiers not activating 2020-11-26 14:51:29 +02:00
Yair Morgenstern
c86d6e7b69 Fixed broken tests 2020-11-26 14:27:14 +02:00
Yair Morgenstern
fd646f6b06 Resolved #3347 - units spawned by buildings are spawned in the city the building was built in 2020-11-24 22:12:03 +02:00
Yair Morgenstern
eb0776005f Added mod checks that combat units have strength and ranged units have rangedStrength 2020-11-24 21:43:00 +02:00
Yair Morgenstern
f6f95a7c53 More framerate savers! Now only cityButtonGroups that actually contain a cityButton will be rendered, giving us another massive performance boost!
We're up to 28-29 fps on Android while zoomed!
2020-11-24 21:38:04 +02:00
Yair Morgenstern
01ee6cc768 A large part of the rendering time was dedicated to trying to run actions on TileGroup groups, most of which can never have actions to begin with!
So now their act() does nothing, greatly improving framerate!
2020-11-24 00:08:39 +02:00
Yair Morgenstern
9dd7b2abf3 More texture switch savings in the CityButton 2020-11-23 23:21:51 +02:00
Yair Morgenstern
7b0bb55045 Can now handle units upgrading to units with no required tech 2020-11-23 22:25:17 +02:00
Yair Morgenstern
114effe1ae Resolved #3360 - notify peace treaty to all commmon known civs 2020-11-23 20:01:58 +02:00
Yair Morgenstern
101fa9903e Fixed unit icons not getting deleted when unit exits tile 2020-11-23 19:20:23 +02:00
Yair Morgenstern
eb7a064019 Resolved #3335 - Removed all unecessary spaces and colons 2020-11-22 22:48:38 +02:00
Yair Morgenstern
3d1e1d7936 Removed some confusing and pointless ": " at the end of translations - #3335 2020-11-22 22:41:12 +02:00
Yair Morgenstern
6d7d698dad Prepacked flag, unit and building images in altas files, so they'll be readable from the jar files 2020-11-22 21:47:46 +02:00
9kgsofrice
038ac1e48b
Units/buildings with "Will not be displayed in Civilopedia" now will not show in tech tree (#3359)
* adds unique "Will not be displayed in Tech Tree"

* Changed "Will not be displayed in Tech Tree" to "Will not be displayed in Civilopedia", avoiding bloat
2020-11-22 20:52:50 +02:00
givehub99
072226ff9a
Added "All [] Cities get a free []" unique. (#3352)
* Added "All [] Cities get a free []" unique.

The first parameter is for city type. Currently "new" and "coastal" are supported.
"new" matches every city and "coastal" matches cities on a coastal tile.
"new" and "coastal" were added to template.properties for translation.

Upon city founding, the second parameter building is added to the city.

In civ 5 G&K, Carthage gets a free harbor for every coastal city.

* -Syntax changed to "Get a free [] []"
First paramater is the building and second is the city filter.
Supports "in every city" and "in every coastal city"

-new and coastal was removed from template.properties
-in every coastal city was added to template.properties

* Changed syntax to "Gain a free [] []"
2020-11-22 11:55:34 +02:00
Yair Morgenstern
2d2117936e Whoops wrong field 2020-11-20 13:45:45 +02:00
Yair Morgenstern
f40c0ad8b3 AI settlers can no longer settle after movement with no movement points 2020-11-20 11:52:14 +02:00
Yair Morgenstern
6158802bb3 3.11.4 2020-11-19 23:53:34 +02:00
jnecus
c338afc7f3
Hide hotkeys on devices without keyboard (#3350)
* Hide hotkeys on devices without keyboard

* Test for peripheral keyboard
2020-11-19 23:43:29 +02:00
Yair Morgenstern
378c8ab511 Separated the unit image rendering from the background rendering to avoid texture swapping when rendering unit + background 2020-11-19 23:34:03 +02:00
Yair Morgenstern
223da7f531 More framerate improvement tricks - this was more than enough to offset the harm of the building and unit images, and went the other way!
The framerate started out before the image games as ~17-18 on the tested game, dropped to ~14-15 with the image changes, and is now at ~20-21~
2020-11-19 23:04:09 +02:00
Yair Morgenstern
2e668ddeb5 Made sure that labels are rendered after each other in the city button, so save on texture switches between the font and the image textures 2020-11-19 22:29:50 +02:00
Yair Morgenstern
35554f3ec6 Resolved #3330 - Texture is back to 2048*2048, by taking flags buldings and units out of the main image.
The cost is that there are texture swaps, and so framerate is hurt.
2020-11-19 21:44:09 +02:00
Yair Morgenstern
3176cd147a We now check compatibility of newly selected mods to the existing mod ruleset 2020-11-16 21:18:17 +02:00
Yair Morgenstern
03193e4f61 Resolved #3071 - Disabled annoying camera momentum on Desktop 2020-11-16 20:42:24 +02:00
Yair Morgenstern
952e4cb958 Resolved #3341 - City-state diplomacy screen is shown properly when entering from a city button 2020-11-15 21:58:16 +02:00
Yair Morgenstern
f7a1633c33 Probably solved the Mysterious Disappearing C's this time for realz! #3327 2020-11-15 20:38:52 +02:00