mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-03 21:40:31 +07:00
Code Issues Packages Projects Releases Wiki Activity
11,130 Commits 5 Branches 1,033 Tags 1.1 GiB
8d4a16dd39
Commit Graph

11130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
yairm210
debe04b81e city screen -> City Screen 
Continuation of #12323
 2024-10-21 21:59:09 +03:00
Yair Morgenstern
f4cd384462
Version rollout (#12329) 
* Bump version and create initial changelog entry

* Update French.properties (#12318)

* Update Brazilian_Portuguese.properties (#12317)

* Update Brazilian_Portuguese.properties

* Update Brazilian_Portuguese.properties

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2024-10-21 21:58:40 +03:00
itanasi
50486eab53
Add Specialists Tutorial (#12323) 
* Updating compilation documentation

* Add Specialists card to Civiliopedia Tutorials

* Revert "Updating compilation documentation"

This reverts commit 68dec7926c.
 2024-10-21 21:52:40 +03:00
itanasi
2930e5ead5
Updating documentation (#12322) 
* Updating compilation documentation

* Add Specialists card to Civiliopedia Tutorials

* Revert "Add Specialists card to Civiliopedia Tutorials"

This reverts commit 7ebf0e0045.

* Local Building is actually on Android 14 according to latest build.gradle.kts (compileSdk=34)
 2024-10-21 21:52:23 +03:00
Rob Loach
e9481d4bc1
Add <when espionage is enabled> conditional (#12326) 
* Modding: Replaced "Hidden when espionage is disabled" with "Only available <when espionage is enabled>"

* Modding: Fix unique deprecation notice

* Add ConditionalEspionageEnabled to isUnavailableBySettings list
 2024-10-21 21:51:50 +03:00
itanasi
dcfd2b7a70
Clean up the icon replacement code by adding hide option to .tr() (#12321) 2024-10-21 21:51:13 +03:00
SeventhM
879628b067
Allow purchasing wonders with gold when explicitly given a unique (#12312) 
* Allow purchasing wonders with gold when explictly given a unique

* typo

* Reorder stat check to always be checked first

* Why is contiuation indent the defualt in Idea anyways?
 2024-10-21 21:50:49 +03:00
yairm210
b0be185bf7 Update mods even if we have cached data 2024-10-21 21:50:00 +03:00
itanasi
8f45b15c49
Small fix to Modding Wiki for Ranged Strength clarification (#12328) 2024-10-21 18:17:49 +03:00
SeventhM
a7f69a6da9
Lint: Move CollectionExtensions (#12320) 
* Lint: Move CollectionExtensions

* Forgot to change package name

* Missed a spot
 2024-10-21 10:12:56 +03:00
yairm210
e0864bebf0 Resolves #12307 - Unit icon falls back to UnitTypeIcons/<unitType> successfully 2024-10-20 22:48:42 +03:00
yairm210
9497c17b8d Resolved #12311 - Cities reduce tile movement cost to 1, per Civ V 2024-10-20 15:28:12 +03:00
yairm210
9140acb432 4.13.18 2024-10-20 15:02:04 +03:00
Yair Morgenstern
c4738cff68
Version rollout (#12316) 
* Bump version and create initial changelog entry

* Update Latin translation (#12310)

* Merge a branch

* Fix translation

* Update translation

* Fix translation

* Update translation

* Update translation

---------

Co-authored-by: sls1005 <sls1005@github.com>

* Update German translation (#12309)

* Update Bangla.properties (#12306)

* Update Bangla.properties

Translated 3 sentences to Bangla

* Update Bangla.properties

* Update Portuguese.properties (#12303)

* Update Italian.properties (#12302)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: sls1005 <sls1005@github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Shinigami-alt <76843162+Shinigami-alt@users.noreply.github.com>
Co-authored-by: murilozinkkkj <78273099+murilozinkkkj@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
 2024-10-20 14:56:37 +03:00
EmperorPinguin
e60873d75a
Update AI trading logic (#12305) 
* AI behaviour changes

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Automation.kt

* Reverting some changes

* Changes

* revert changes

* revert changes

* revert changes

* revert changes

* Update CityLocationTileRanker.kt

* Citizen assignment for stat conversion

* Update CityLocationTileRanker.kt

* Reduce AI settling

* Avoid AI building units when in negative Supply

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update build.gradle.kts

* Update gradle-wrapper.properties

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update CityLocationTileRanker.kt

* AI changes for humans

* Fix puppet focus

* Update Automation.kt

* Puppet focus

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Stats.kt

* Update CityTurnManager.kt

* Remove specialist science modifier

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update CivilianUnitAutomation.kt

* Update ReligionAutomation.kt

* Worker prioritization

Workers are valuable in expand cities.

* Update ConstructionAutomation.kt

Food always important, it's rarely good to skip e.g. granary if we're on 6 pop.

* Update ConstructionAutomation.kt

Should achieve about the same with less lines of code.

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Policies.json

* Update Policies.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update Policies.json

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Rename Crop Yield to Growth

* Update worker usage

* Update UnitAutomation.kt

* Tutorials update

* Update Tutorials.json

* Fix spelling error

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* AI tech and policy choices

* Update Techs.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update UnitPromotions.json

* Update

* Update Policies.json

* Update Tutorials.json

* ReligionAutomation bugfix

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update AI city settling and science game

* Update ReligionAutomation.kt

* Maybe revert this now the belief picking has improved

* Update ReligionAutomation.kt

* Remove some if-statements

* Update Automation.kt

* Update Automation.kt

* Update ConsoleLauncher.kt

* Update

* Update Automation.kt

* Update TileImprovements.json

* Update AI trading

* Update TradeAutomation.kt
 2024-10-20 14:20:53 +03:00
SeventhM
74806e8eec
Add unique to show construction when unbuildable (#12313) 2024-10-20 14:20:44 +03:00
yairm210
2abe72df6e AI: Don't choose piety branch when religion is disabled, don't choose Patronage when few city-states remain 
Resolves #12272
 2024-10-20 14:00:22 +03:00
yairm210
63765ef73f Modding: Replaced "Hidden when religion is disabled" with "Only available <when religion is enabled>" 2024-10-20 13:55:42 +03:00
yairm210
579ea79d09 Modding: Replaced "Hidden when [victoryType] Victory is disabled" with "Only available <when [victoryType] Victory is enabled>" 2024-10-20 13:35:55 +03:00
Rob Loach
46644bcc05
Docs: Add documentation for Remaining Civilizations (#12314) 2024-10-20 12:41:36 +03:00
yairm210
31919742e5 chore: StateForConditionals accepts GameInfo, HiddenBySettings -> UnavailableBySettings for pending changes 2024-10-20 12:29:23 +03:00
yairm210
9e1d29f180 AI: Added weighted decision for policy branches 2024-10-20 12:16:49 +03:00
yairm210
e1dbd65bdd AI: Preferred victory type only affects AI policy decision if that victory type is enabled 2024-10-20 10:56:29 +03:00
yairm210
d164f7baf4 Resolved rare crash when map contains improvements not in ruleset 2024-10-20 10:05:37 +03:00
yairm210
c885e2462d Resolved #12307 - Allow fallback to "UnitTypeIcons/$unitName" if "UnitIcons/$unitName" does not exist 2024-10-18 14:55:59 +03:00
yairm210
1a63f5609b 4.13.17 2024-10-16 00:47:07 +03:00
Yair Morgenstern
a149335e83
Version rollout (#12301) 
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#12297)

* Merge a branch (#12294)

Change 'compendium' to 'breviarium' (https://latin-dictionary.net/definition/6936/breviarium-breviari-i)

Co-authored-by: sls1005 <sls1005@github.com>

* Update French.properties (#12291)

* Update Indonesian.properties (#12289)

I can only do small corrections and translation for now.

* Update Italian.properties (#12288)

* Update Portuguese.properties (#12287)

* Update German translation (#12286)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: sls1005 <sls1005@github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: X2003 <158255876+Xenia2003@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: murilozinkkkj <78273099+murilozinkkkj@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
 2024-10-16 00:42:35 +03:00
yairm210
1159c29f85 Modding: Resolved #12299 - Allow removing free policies 2024-10-16 00:36:39 +03:00
yairm210
0d19bf55e5 Resolved #12295 - crash on modded game with no capital city indicator 2024-10-16 00:32:51 +03:00
yairm210
e0f3c0acd4 AI: Improved automated worker tile selection (workable tile applies to current tile, separated to debuggable function)) 2024-10-16 00:26:46 +03:00
EmperorPinguin
086ba8c165
Don't auto-replace holy sites (#12296) 
* AI behaviour changes

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Automation.kt

* Reverting some changes

* Changes

* revert changes

* revert changes

* revert changes

* revert changes

* Update CityLocationTileRanker.kt

* Citizen assignment for stat conversion

* Update CityLocationTileRanker.kt

* Reduce AI settling

* Avoid AI building units when in negative Supply

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update build.gradle.kts

* Update gradle-wrapper.properties

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update CityLocationTileRanker.kt

* AI changes for humans

* Fix puppet focus

* Update Automation.kt

* Puppet focus

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Stats.kt

* Update CityTurnManager.kt

* Remove specialist science modifier

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update CivilianUnitAutomation.kt

* Update ReligionAutomation.kt

* Worker prioritization

Workers are valuable in expand cities.

* Update ConstructionAutomation.kt

Food always important, it's rarely good to skip e.g. granary if we're on 6 pop.

* Update ConstructionAutomation.kt

Should achieve about the same with less lines of code.

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Policies.json

* Update Policies.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update Policies.json

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Rename Crop Yield to Growth

* Update worker usage

* Update UnitAutomation.kt

* Tutorials update

* Update Tutorials.json

* Fix spelling error

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* AI tech and policy choices

* Update Techs.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update UnitPromotions.json

* Update

* Update Policies.json

* Update Tutorials.json

* ReligionAutomation bugfix

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update AI city settling and science game

* Update ReligionAutomation.kt

* Maybe revert this now the belief picking has improved

* Update ReligionAutomation.kt

* Remove some if-statements

* Update Automation.kt

* Update Automation.kt

* Update ConsoleLauncher.kt

* Update

* Update Automation.kt

* Update TileImprovements.json
 2024-10-15 21:24:21 +03:00
theofficialgman
f1f32f7296
update pi-apps shields query (#12298) 
due to https://github.com/badges/shields/issues/10594
 2024-10-15 21:00:25 +03:00
yairm210
afbc15db79 Solve ANRs due to resuming music player which is in an unplayable state 2024-10-15 14:54:02 +03:00
yairm210
d26d942f58 Allow mod search always - hack version (does not remove loader) 2024-10-14 17:11:39 +03:00
yairm210
f9d21d2767 Cache online mod list for fast load 2024-10-14 17:06:06 +03:00
yairm210
f5946bc08f translations: 'Enemy city has attacked' once again translatable 2024-10-14 12:40:42 +03:00
yairm210
755d66e085 Actually I think I had it right the first time - avoid building if all carriable units can already be carried now, NOT if carrier will have empty slots 2024-10-14 11:12:51 +03:00
yairm210
45fc67df29 4.13.16 2024-10-13 23:01:55 +03:00
Yair Morgenstern
b56c868c7c
Version rollout (#12285) 
* Bump version and create initial changelog entry

* Update Latin translation (#12284)

* Merge a branch

* Update translation

* Fix translation

* Update translation

* Fix translation

---------

Co-authored-by: sls1005 <sls1005@github.com>

* Update French.properties (#12281)

* Update Italian.properties (#12278)

* Update German translation (#12277)

* Update Brazilian_Portuguese.properties (#12275)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: sls1005 <sls1005@github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
 2024-10-13 22:58:18 +03:00
yairm210
e5b4793d58 AI: Better rules to not build unit-carrying units 2024-10-13 22:56:23 +03:00
yairm210
8d10ca881e Added "if [modFilter] is not enabled" conditional - https://github.com/yairm210/Civ-IV/pull/36 2024-10-13 22:46:59 +03:00
EmperorPinguin
899c5d48ea
Update Citizen Assignment and ConsoleLauncher.kt (#12267) 
* AI behaviour changes

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Automation.kt

* Reverting some changes

* Changes

* revert changes

* revert changes

* revert changes

* revert changes

* Update CityLocationTileRanker.kt

* Citizen assignment for stat conversion

* Update CityLocationTileRanker.kt

* Reduce AI settling

* Avoid AI building units when in negative Supply

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update build.gradle.kts

* Update gradle-wrapper.properties

* Update CityLocationTileRanker.kt

* Update CityLocationTileRanker.kt

* Update ConstructionAutomation.kt

* Update CityLocationTileRanker.kt

* AI changes for humans

* Fix puppet focus

* Update Automation.kt

* Puppet focus

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Automation.kt

* Update Stats.kt

* Update CityTurnManager.kt

* Remove specialist science modifier

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update CivilianUnitAutomation.kt

* Update ReligionAutomation.kt

* Worker prioritization

Workers are valuable in expand cities.

* Update ConstructionAutomation.kt

Food always important, it's rarely good to skip e.g. granary if we're on 6 pop.

* Update ConstructionAutomation.kt

Should achieve about the same with less lines of code.

* Update Automation.kt

* Update ConstructionAutomation.kt

* Update Policies.json

* Update Policies.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update Policies.json

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Rename Crop Yield to Growth

* Update worker usage

* Update UnitAutomation.kt

* Tutorials update

* Update Tutorials.json

* Fix spelling error

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* Update Tutorials.json

* AI tech and policy choices

* Update Techs.json

* Update Policies.json

* Update ConstructionAutomation.kt

* Update UnitPromotions.json

* Update

* Update Policies.json

* Update Tutorials.json

* ReligionAutomation bugfix

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update ReligionAutomation.kt

* Update AI city settling and science game

* Update ReligionAutomation.kt

* Maybe revert this now the belief picking has improved

* Update ReligionAutomation.kt

* Remove some if-statements

* Update Automation.kt

* Update Automation.kt

* Update ConsoleLauncher.kt

* Update

* Update Automation.kt
 2024-10-13 22:32:26 +03:00
yairm210
d25a436391 Resolved #12279 - Units that can withdraw before melee do not do so when escorting civilian units 2024-10-13 16:30:37 +03:00
yairm210
edad6d794b Resolved #12282 - Filtering uniques are also checked for in unit types 2024-10-13 16:28:58 +03:00
yairm210
f0fc40bd3e Resolved #12276 - Free tech pickable in any way you enter the tech screen 2024-10-13 16:15:50 +03:00
yairm210
e105a6ec6b Resolved #12261 - documented explicit discrepancy from Civ V regarding great warpath railroad connection 2024-10-13 13:15:10 +03:00
yairm210
8c676271be Fixed broken doc links 2024-10-11 16:43:15 +03:00
yairm210
6f0babb393 4.13.15 2024-10-10 23:18:23 +03:00
Yair Morgenstern
327e31b5e2
Version rollout (#12274) 
* Bump version and create initial changelog entry

* Update Brazilian_Portuguese.properties (#12270)

* Update Latin translation (#12269)

* Merge a branch
Change 'urbs pupuli' to 'municipium'

* Fix translation; fix typo

* Update translation

---------

Co-authored-by: sls1005 <sls1005@github.com>

* Update German translation (#12268)

* Update Italian.properties (#12266)

* Update French.properties (#12265)

---------

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: sls1005 <90055573+sls1005@users.noreply.github.com>
Co-authored-by: sls1005 <sls1005@github.com>
Co-authored-by: mape6 <mape6@posteo.de>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2024-10-10 23:14:29 +03:00
yairm210
2e51de3b22 Added "Remaining [civFilter] Civilizations" as countable value 2024-10-10 23:14:14 +03:00