Commit Graph

5175 Commits

Author SHA1 Message Date
ed83cc9954 AI Pillages Neutral Roads only at War (#8087)
* Only pillage neutral roads when at war.
Track road ownership based on who built the road or who last owned the tile

* Remove excessively safe checks

* Fix potential null exception

* Rework, use string

* yairm suggestions

* readability
2022-12-14 07:45:46 +02:00
6341987f79 Three Continents (#8109)
* Update Building-Locally.md

Add missing step to restart.

* Add new generated maps: Three Continents and Three Continents Fair

* Only use fair version of Three Continents. Make 3rd continent a little larger to be closer in size to the other two.
2022-12-14 07:19:32 +02:00
2145bc80b6 Two Continents Allow both Lat or Long (#8110)
* Rename generated map "Continents" to "Two Continents" and make it randomly choose latitude or longitude land division.

* Choose latitude or longitude land division based on map width and height if they are not equal.
2022-12-13 22:52:51 +02:00
a134242487 Units/Buildings can now be given optional Portraits to be displayed instead of flags. (#8107)
* Units can now be given optional Portraits to be displayed everywhere (except world map) instead of unit Flags.

* Add section to wiki for adding Unit Portraits

* Generify portrait functions

* Small nitpicks fixed

* Reverted one change

* Fix docs

* Fix docs

Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-11 22:58:11 +02:00
154c083d3f Update unit uniques when entering moving to new tiles 2022-12-11 22:48:11 +02:00
aa49e47ca0 fix: Fix build 2022-12-11 19:15:43 +02:00
66c0f269d2 Simplified temporary uniques 2022-12-11 13:57:06 +02:00
aaaa84a00f update score icon. (#8118) 2022-12-11 13:08:34 +02:00
1da08994df fix UncivServer.xyz not working (#8104)
Normally this is auto-fixed but a `/` at the end of the URL does not work. Because in API you do requests like `GET /file/:filename` and if you also put a `/` at the end of the server URL, it becomes something like this `https://example.com//files/filename`. Since the auto-fix happens only when typing a new URL from `Options` > `Multiplayer`, the default value doesn't get auto-fixed and shows errors.
I tested on a new installation and as expected it shows the `Couldn't upload game` error.
This pr fixes this.
2022-12-10 18:38:53 +02:00
32d46b24df Version rollout (#8103)
* Bump version and create initial changelog entry

* Update Italian.properties (#8100)

* Update German translations (#8097)

* Update French.properties (#8096)

* Update Spanish.properties (#8095)

* Updated Brazilian_Portuguese.properties (#8094)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
2022-12-09 12:52:38 +02:00
58c57d6626 UnitActions seprated into own atlas (#8102)
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
2022-12-09 12:46:46 +02:00
d9d0414477 Resolved #7712 - 'loading' popup between turns only appears if there's a significant delay 2022-12-09 12:46:11 +02:00
dbeb063e2f Auto-Screenshot for f-droid as well 2022-12-08 13:27:29 +02:00
309aaf99d4 xyz server as default multiplayer server 2022-12-08 13:27:29 +02:00
ccb1d769f1 added button to paste from clipboard when downloading a mod (#8101) 2022-12-07 21:14:54 +02:00
ff25014a54 Automated screenshots! :D 2022-12-07 21:01:39 +02:00
8ec2ada740 Fixes for Repair 2022-12-05 22:42:39 +02:00
b351d4a4e2 Fixed all CSs getting unique units and unique luxuries 2022-12-05 20:26:47 +02:00
0063b92e07 Version rollout (#8093)
* Bump version and create initial changelog entry

* update traditional_chinese.properties (#8092)

* Update German translation (#8089)

* Update Filipino.properties (#8082)

* Update Simplified_Chinese.properties (#8079)

* Update Simplified_Chinese.properties

* Update Simplified_Chinese.properties

* Update Brazilian_Portuguese.properties (#8078)

* Update Italian.properties (#8076)

* Update French.properties (#8075)

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: nacro711072 <nacro711072@yahoo.com.tw>
Co-authored-by: MartinP <mape6@posteo.de>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-12-05 19:20:36 +02:00
11e26c74ad Resolved #8088 - Single turn repair, repair turn inconsistencies 2022-12-05 19:03:17 +02:00
454f999948 Resolved #8090 - Replaces misunderstood 'virtual resolutions' with more intuitive 'screen size' 2022-12-05 18:56:47 +02:00
220c465a18 fix civilopedia category bug. (#8084)
* fix civilopedia category bug.

* fix negative index.
2022-12-04 18:04:16 +02:00
1d5d445c19 After-combat notification for promotable units - see #4697 2022-12-03 23:12:01 +02:00
c9ed9d5d74 modding: Double Happiness from Natural Wonders -> [stats] from every known Natural Wonder 2022-12-02 11:50:11 +02:00
dceaf832b9 Version rollout (#8074)
* Bump version and create initial changelog entry

* Updated Brazilian_Portuguese.properties (#8072)

* Update Filipino.properties (#8071)

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Filipino.properties

* Update Dutch.properties (#8067)

* Update Dutch.properties

* Update Dutch.properties

* Update Simplified_Chinese.properties (#8066)

* Update Spanish.properties (#8062)

* Update French.properties (#8060)

* Fix tests

Co-authored-by: yairm210 <yairm210@users.noreply.github.com>
Co-authored-by: Vitor Gabriel <59321138+Ranbut@users.noreply.github.com>
Co-authored-by: Shann Aurelle Ripalda <shannaurelleg@gmail.com>
Co-authored-by: MartijnCBV <49876349+MartijnCBV@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Caballero Arepa <78449553+Caballero-Arepa@users.noreply.github.com>
Co-authored-by: Ouaz <Ouaz@users.noreply.github.com>
2022-11-30 18:03:20 +02:00
cdc8afb56d Made yields smaller so heavy yields looks better on tiles 2022-11-28 22:24:56 +02:00
1eb1976c4e Made yields smaller so heavy yields looks better on tiles 2022-11-28 21:45:56 +02:00
cfda54917f Modding: buildingName -> buildingFilter in all possible unique types 2022-11-28 19:19:40 +02:00
d223614067 Modding: improvement uniques can be assigned to tilefilter 2022-11-28 19:10:57 +02:00
d21e0d91b7 4.3.4-patch1 2022-11-28 19:00:15 +02:00
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
515bfcbb6f Moved updateProximity to civ transient updater 2022-11-28 11:16:10 +02:00
b8da124263 Added hasExplored and explore() functions to civinfo to mask exploredTiles 2022-11-28 11:12:53 +02:00
da5948364e Added hasExplored function to civinfo to mask exploredTiles 2022-11-28 09:22:13 +02:00
166b8ff2bf Simplified automated unit order 2022-11-27 23:46:52 +02:00
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
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
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
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
51985622f2 Added conditional to apply uniques only if the game starts in a specific era 2022-11-26 22:06:40 +02:00
545b4afc5a Generalized "Stats per policies" unique 2022-11-26 21:39:26 +02:00
8ff606acd6 Deprecated old-form city-state uniques 2022-11-24 20:57:03 +02:00
4fb3d4a191 Do not translate city-state uniques - there should be no arbitrary ones! 2022-11-24 11:36:21 +02:00
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
7a76f24770 Resolved #8047 - 'impossible' worked tiles not under your control are now cleaned up 2022-11-24 10:41:29 +02:00
4fff3a395e Resolved #8044 - corner case where entire path to destination is full and destination is unenterable 2022-11-24 09:53:38 +02:00
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
f3ce1c4dc5 Resolved #8036 - resolved map latency when city-states exist 2022-11-23 20:06:41 +02:00
c20ffb03a3 Resolved #8046 - city-state type in civilopedia 2022-11-23 19:39:40 +02:00
551c6c562e 4.3.2 2022-11-22 23:39:07 +02:00