mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-24 14:49:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
NaN Commits 6 Branches 1,100 Tags
20cf0c92039ccac018a3b9b53c6891c32706fa25
Commit Graph

3014 Commits

Author SHA1 Message Date
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