mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 10:26:05 +07:00
Code Issues Packages Projects Releases Wiki Activity
7,808 Commits 6 Branches 1,040 Tags 1.2 GiB
4d025caf61
Commit Graph

5100 Commits

Author SHA1 Message Date
Yair Morgenstern
cdc8afb56d Made yields smaller so heavy yields looks better on tiles 2022-11-28 22:24:56 +02:00
Yair Morgenstern
1eb1976c4e Made yields smaller so heavy yields looks better on tiles 2022-11-28 21:45:56 +02:00
Yair Morgenstern
cfda54917f Modding: buildingName -> buildingFilter in all possible unique types 2022-11-28 19:19:40 +02:00
Yair Morgenstern
d223614067 Modding: improvement uniques can be assigned to tilefilter 2022-11-28 19:10:57 +02:00
Yair Morgenstern
d21e0d91b7 4.3.4-patch1 2022-11-28 19:00:15 +02:00
itanasi
37d808936a
Fix Repair Crash (#8065) 
* Add Hammer Icon to Repair Civilopedia Entry

* Fix crash from logic bug in getRepairTurns
 2022-11-28 16:11:26 +02:00
Yair Morgenstern
515bfcbb6f Moved updateProximity to civ transient updater 2022-11-28 11:16:10 +02:00
Yair Morgenstern
b8da124263 Added hasExplored and explore() functions to civinfo to mask exploredTiles 2022-11-28 11:12:53 +02:00
Yair Morgenstern
da5948364e Added hasExplored function to civinfo to mask exploredTiles 2022-11-28 09:22:13 +02:00
Yair Morgenstern
166b8ff2bf Simplified automated unit order 2022-11-27 23:46:52 +02:00
Yair Morgenstern
1b8c98eed3 Resolved #8050 - "Occurs at temperature between [amount] and [amount] and humidity between [amount] and [amount]" now applicable to resources 2022-11-27 20:02:05 +02:00
Yair Morgenstern
b95daa0865
Bump version and create initial changelog entry (#8056) 
Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
 2022-11-27 19:17:31 +02:00
Leonard Günther
99b6a2254d
Changes to moddable UI (#8055) 
* Replaced all occurrences of deprecated NinePatch

function calls

This makes a lot of UI elements already moddable but documentation is still missing

* Added "How to create a UI skin for Unciv" to wiki

* Added image

* Fixed two typos and updated directory image

Old image was missing a folder

* Added clear color to skin config

to support picker screen backgrounds

* Removed deprecated functions in ImageGetter

* Fixed lowercase ui element names

they should always be UpperCamelCase to be consistent

* Added UiElementDocsWriter

to modify the docs for UI elements automatically

* Added default shape to UiElementsDocsWriter.kt

* Revert unintended merge errors

* Rerun file auto generation
 2022-11-27 19:14:56 +02:00
itanasi
16a7eed4ff
Add Repair and Pillaging Roads (#8015) 
* Reapply Changes

* Logic clean up

* Adding getImprovementToPillage() and getRepairableImprovement()

* Cleaning up Unit Actions

* getImprovementToPillage() needs to check for Unpillagable

* Remove redundant logic since canBuildImprovement() returns true if currently repairing

* More redundant logic

* Prevent City Center from being Pillage status
addRepairAction will not show a Repair Action
Adding the improvement to be repaired/pillaged in button text
Utilizing getImprovementToPillage() more

* Some import cleanup
Add Irremovable to blockers
More consolidation of code

* More translation files

* When improvements/roads are built/removed, pillaged flag set to False

* Better and more consistent logic

* Fix dumb logic bug
 2022-11-27 19:12:26 +02:00
Yair Morgenstern
51985622f2 Added conditional to apply uniques only if the game starts in a specific era 2022-11-26 22:06:40 +02:00
Yair Morgenstern
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
Yair Morgenstern
8ff606acd6 Deprecated old-form city-state uniques 2022-11-24 20:57:03 +02:00
Yair Morgenstern
4fb3d4a191 Do not translate city-state uniques - there should be no arbitrary ones! 2022-11-24 11:36:21 +02:00
Yair Morgenstern
98900d9162
Version rollout (#8048) 
* Bump version and create initial changelog entry

* Update Spanish.properties (#8043)

?

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-11-24 11:33:25 +02:00
Yair Morgenstern
7a76f24770 Resolved #8047 - 'impossible' worked tiles not under your control are now cleaned up 2022-11-24 10:41:29 +02:00
Yair Morgenstern
4fff3a395e Resolved #8044 - corner case where entire path to destination is full and destination is unenterable 2022-11-24 09:53:38 +02:00
Julien Muchembled
002dcd763b
Fix policy counting in global politics (#8045) 
Counting of social policies was only correct for completed branches: 6
Incompleted branches with only 1 SP were hidden,
and those with N>1 SP displayed N-1.
 2022-11-23 22:09:55 +02:00
Yair Morgenstern
f3ce1c4dc5 Resolved #8036 - resolved map latency when city-states exist 2022-11-23 20:06:41 +02:00
Yair Morgenstern
c20ffb03a3 Resolved #8046 - city-state type in civilopedia 2022-11-23 19:39:40 +02:00
Yair Morgenstern
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00
Yair Morgenstern
ee8c190c06
Version rollout (#8042) 
* Bump version and create initial changelog entry

* Update Indonesian.properties (#8039)

* Update Greek.properties (#8038)

* Update Greek.properties

* Translating to Greek for unciv.

* Update Simplified_Chinese.properties (#8037)

* Update German.properties (#8035)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Hello200000 <98656089+Hello200000@users.noreply.github.com>
Co-authored-by: RA1DEN-cyborg <73561839+RA1DEN-cyborg@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
 2022-11-22 23:11:57 +02:00
Yair Morgenstern
19d591dd89 Fixed json tests 2022-11-22 00:17:10 +02:00
Yair Morgenstern
5ba8e05079 Fixed city state tests 2022-11-22 00:13:05 +02:00
Yair Morgenstern
e83e733104 Added validations for city-state uniques 2022-11-21 23:03:52 +02:00
Yair Morgenstern
ee2ab74715 Converted all era uniques to conditional uniques for city-states 2022-11-21 22:46:32 +02:00
Yair Morgenstern
4ab0b62a7f Removed old deprecated bits and pieces 2022-11-21 20:49:34 +02:00
Yair Morgenstern
e09b2f9637 Removed old deprecated parts 2022-11-21 20:41:41 +02:00
Yair Morgenstern
525a06e058 cityStateType no longer causes crash 2022-11-21 20:37:06 +02:00
Yair Morgenstern
2e5e221158 CityStateType overhaul!!!! 2022-11-21 20:30:52 +02:00
Yair Morgenstern
7d9db1e119 CityStateType deprecation p1 2022-11-21 20:03:05 +02:00
Yair Morgenstern
6976360da6 Added CityStateTypes into rulesets! Not in use yet 2022-11-21 19:59:55 +02:00
Yair Morgenstern
cf7966d84a Separated ruleset validation to its own file 2022-11-21 19:29:53 +02:00
Yair Morgenstern
8530de7de1 Can now use [stats] unique to add happiness globally 2022-11-21 11:33:29 +02:00
Yair Morgenstern
0cf5c33475 Can now use [stats] unique for e.g. techs, policies, etc, to add gold/faith/culture/science to the global pool 2022-11-21 11:21:42 +02:00
Yair Morgenstern
2d37f3c473
Version rollout (#8034) 
* Bump version and create initial changelog entry

* Update Simplified_Chinese.properties (#8033)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update French.properties (#8032)

* Update Catalan.properties (#8031)

* Update Catalan.properties

* ca-ES: Change some hyphens with dashes.

* Update Italian.properties (#8030)

* Update Italian.properties

* Update Italian.properties

* "Updated Brazilian Translation" (#8029)

* Update German translation (#8027)

* Update Indonesian.properties (#8025)

* Update Spanish.properties (#8024)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Joan Josep <juanjo.ng.83@gmail.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: kensvin <kensvin28@gmail.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
 2022-11-20 23:22:31 +02:00
Yair Morgenstern
76920d1307 Removed single-pixel gap in top bar 2022-11-20 23:13:51 +02:00
Yair Morgenstern
9d6e91d922 Added conditional support to 'CS gift military units' unique 2022-11-20 18:59:53 +02:00
Yair Morgenstern
c5bde45c5d Moved city state icons to separate folder 2022-11-20 18:48:28 +02:00
Yair Morgenstern
61b98120a8 Fixed tests failing due to removing "crutches" 2022-11-20 00:24:59 +02:00
Yair Morgenstern
933131084b Removed backwards compatibility for missing city-state uniques 2022-11-20 00:01:02 +02:00
Yair Morgenstern
e5fbb472b0 Moddable quest weighting for city-states 2022-11-19 23:54:16 +02:00
Yair Morgenstern
2d5536e8be
Allowed adding arbitrary global uniques to city state bonuses (#8028) 
* Allowed adding arbitrary global uniques to city state bonuses

* Added conditional support for city-state uniques
 2022-11-19 19:16:24 +02:00
Yair Morgenstern
7f5d8481d3 Fixed 'friendly territory' using correct open borders - see 4dca183 
Also added comment on openBorders so it's clearer who can enter who
 2022-11-18 12:22:32 +02:00
Yair Morgenstern
4038d75035
Version rollout (#8023) 
* Bump version and create initial changelog entry

* Update German translation (#8020)

* Update Spanish.properties (#8019)

* Update French.properties (#8018)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
 2022-11-17 22:22:33 +02:00
Yair Morgenstern
32f582d0f4 Resolved #8017 - units now recieve correct healing in friendly territory 2022-11-16 23:03:29 +02:00