wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4254 commits 7 branches 304 tags 288 MiB
Commit graph

4254 commits

This branch
This branch
All branches
Author SHA1 Message Date
Yair Morgenstern
1ceb3548dd Resolved #3130 - "All policies adopted" shown in policy picker screen when relevant 2020-09-16 19:17:25 +03:00
Yair Morgenstern
1f4d5f5573 Multiselect applies to civilian units and from city overlays 2020-09-14 21:48:46 +03:00
Yair Morgenstern
76741b446b 3.10.9 2020-09-12 23:06:42 +03:00
uncivbot[bot]
02def47f1b
Translations update (#3132) 
* Update Indonesian.properties (#3125)

* Update Italian.properties (#3126)

* Update Italian.properties

New translations

* Update Italian.properties

* Update Spanish.properties (#3129)

Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
 2020-09-12 22:43:58 +03:00
HadeanLake
044d04ab28
implement fun isHill() = baseTerrain == Constants.hill (#3128) 
fixed isAdjacentToFreshwater - should also check for river on tile
use fitsUniqueFilter instead of checking baseTerrain, terrainFeature and some other filters separately
changes nothing but makes hill PR a lot more readable
 2020-09-12 21:34:23 +03:00
Yair Morgenstern
7a7028e3a5 Can now move multiple units to nearby tiles at the same turn 2020-09-11 17:56:23 +03:00
Yair Morgenstern
5a44d7e098 Multiple selected units are more obvious on-map 2020-09-11 17:09:50 +03:00
Yair Morgenstern
f63005ad3c Multiselect & move works! Currently very restricted and not all selected units are visible to user 2020-09-11 16:55:35 +03:00
Yair Morgenstern
c659af8762 Movement popup can handle multiple selected units, but only considers one of them 'moveable' - so far no functional change, only bricklaying 2020-09-11 16:16:25 +03:00
Yair Morgenstern
b9938eb116 Unreachable tiles for air units merged with the rest of the 'can move tile to' logic 2020-09-11 15:57:23 +03:00
Yair Morgenstern
7e36b51db5 Changes to MoveButtonDto in preparation for multiple unit movement 2020-09-11 15:40:43 +03:00
Yair Morgenstern
395292e2f3 Added backing field selectedUnits:ArrayList<MapUnit> for selectedUnit in UnitTable - will allow multi-select in the future, no functional change for now 2020-09-11 12:04:43 +03:00
Yair Morgenstern
7d32412646 Translation updates, with minor changes to ensure consistency 2020-09-11 11:16:31 +03:00
uncivbot[bot]
ea08a96482
Translations update (#3124) 
* Update Italian.properties (#3111)

* Update Ukrainian.properties (#3120)

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Update Ukrainian.properties

* Додав слово Надають

* Update Brazilian_Portuguese.properties (#3121)

* some minutes translating

pra ajudar os player br pq esse jogo é bom demais!

* Update Brazilian_Portuguese.properties

* Update Japanese.properties (#3123)

* Update Spanish.properties (#3113)

* Update Indonesian.properties (#3116)

Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com>
Co-authored-by: ISS <27261371+4urb4nm0nk@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: Yair Morgenstern <yairm210@hotmail.com>
 2020-09-11 11:07:39 +03:00
Yair Morgenstern
4844a0e005 Fixed fresh water adjacency - @HadeanLake 2020-09-11 11:02:05 +03:00
Yair Morgenstern
265e6416f9 Ottoman unique is back to how it should be in Vanilla - @lishaoxia1985 don't slip gameplay changes into a UI commit please. 2020-09-11 09:29:56 +03:00
Yair Morgenstern
cb0599b9f5 Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]" 2020-09-11 09:24:08 +03:00
Yair Morgenstern
9e7b28a6e4 Background tiles are no longer "fuzzy" 2020-09-11 09:09:29 +03:00
HadeanLake
9f48f43ad0
parameterized some uniques, fixes some minor bugs (#3122) 
Fixed Moai
Wonder overlay will remove terrain overlay in default tileset
Oasis, Marsh and Atoll now have "Rare feature" unique, rare features can be added by mods
implemented TileInfo.fitsUniqueFilter(filterText:String): Boolean
parameterized uniques:
* "Must have an owned [Mountain] within [2] tiles"
* "Must be on [River]" - not to be confused with "Must be next to [River]" - the tile city on must have river at its border, not the adjacent tile
* "Must not be on [Hill]"
* "Must not be next to []"
* "Must be on [seacoast]" - next to "Coast" tile
* "Must be on [tile adjacent to source of fresh water]"
* "Must be next to [Water]" - next to any water tile, including "Lakes"
* "Must be next to [terrainFeature]"
* "Must be next to [unique]" - e.g "Must be next to [Rare feature]" - next to terrain or terrain feature having this unique
 2020-09-11 07:56:56 +03:00
Yair Morgenstern
3eee2bff78 Resolved #3115 - AI no longer congregates great people in cities where it can't improve tiles 2020-09-10 21:00:53 +03:00
Yair Morgenstern
9ba9dd6fcf Fixed AI unit upgrading - can now 'skip' over intermediate units, the way the "promote unit" action works. #3115 2020-09-10 19:51:14 +03:00
Yair Morgenstern
10b0d498c6 Merge branch 'master' of https://github.com/yairm210/Unciv 2020-09-10 19:50:05 +03:00
Yair Morgenstern
5e8f1176f3 3.10.8-patch1 2020-09-10 19:32:45 +03:00
lishaoxia1985
9d951835d1
UI Update (#3102) 
* Add "Load game" in WorldscreenMenuPopup

* UI Update

* Fix the Ottomans uniques, edit Tech description
 2020-09-10 19:25:56 +03:00
Yair Morgenstern
f859259c2a 3.10.8 2020-09-08 19:34:25 +03:00
Yair Morgenstern
baa7044fd1 Resolved #3048 - Fixed ANRs on 'Resume' on huge save files 2020-09-08 19:30:56 +03:00
uncivbot[bot]
bf2742350d
Translations update (#3107) 
* Update Italian.properties (#3090)

* Update Indonesian.properties (#3097)

* Update Indonesian.properties

* Update Indonesian.properties

* Update Japanese.properties (#3091)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Spanish.properties (#3096)

* Update Simplified_Chinese.properties (#3098)

* Update Czech.properties (#3106)

Aztecs translation, scenario translation, egypt diplomacy and cities, various missing improvement names and rules

Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: Kensvin <63847755+Kensvin28@users.noreply.github.com>
Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: stoupa007 <60326342+stoupa007@users.noreply.github.com>
 2020-09-08 19:14:56 +03:00
Yair Morgenstern
3719b5c4f6 Added mod screen translation terms 2020-09-07 23:03:12 +03:00
Yair Morgenstern
4fa77ac20b Mod management screen scrolls lists separately 2020-09-07 22:38:05 +03:00
Yair Morgenstern
6d4c1cb347 Resolved #3059 - better city expansion rules 2020-09-06 23:18:15 +03:00
Yair Morgenstern
9034729dfd Intercept damage bonus (from promotions) treated as a unique 2020-09-06 20:19:20 +03:00
Yair Morgenstern
588aa7a177 Resolved #3081 - fixed bug in air interception 2020-09-06 20:05:36 +03:00
Bjorn Bringert
f2ddda0a6f
Show that air units can move to tiles within attack range (#3101) 
Previously, only tiles (with a city or carrier) outside the
attack range got a white circle. Now all tiles to which the
air unit can move get a white circle.
 2020-09-06 18:48:45 +03:00
CrispyXYZ
ddc7072b22
Update build.gradle.kts (#3093) 2020-09-05 20:38:33 +03:00
HadeanLake
8ac3a88cec
fixed #3066, crash in chooseMilitaryUnit and some great people actions (#3099) 
* fixed KotlinNullPointerException crash in chooseMilitaryUnit
random() is not to be used in predicate
* GodmodeCheckbox is not lockable and unchecked by default
* no great people actions if no movement points left
* unique "Can start an []-turn golden age" now has parameter and 8-turn golden ages will last 8 turns instead of 10
golden age can be started if unit is on own territory (even embarked)
* "Golden Age length increased by [50]%" - now has parameter
* tweaked changed fort and terrain defence bonuses
fort can be built on forest and jungle (vegetation will not be removed)
any open flat land gives 10%  penalty
marsh gives 15% penalty
only top terrain counts, improvement bonus will be added to that
flatland + fort = 40%
hill + fort = 75%
hill = 25%
forest/jungle on flatland = 25%
forest/jungle on hill = 25%
forest on flat + fort = 75%
forest on hill + fort = 75%
forest on hill + citadel = 125%
fixed 20% penalty for attacking over river - will be displayed if unit is standing on the other side of river
"Amphibious" unique removes this penalty
 2020-09-05 20:32:27 +03:00
Yair Morgenstern
ca36084e8b 3.10.7 2020-09-04 16:44:00 +03:00
uncivbot[bot]
4bc4138f2f
Translations update (#3089) 
* Update Japanese.properties (#3038)

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Japanese.properties

* Update Italian.properties (#3074)

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Italian.properties

* Update Spanish.properties (#3084)

* Update Simplified_Chinese.properties (#3088)

* Update Hungarian.properties (#3087)

Co-authored-by: paontv <57051667+paontv@users.noreply.github.com>
Co-authored-by: Giuseppe D'Addio <41149920+Smashfanful@users.noreply.github.com>
Co-authored-by: chriscr2 <70113017+chriscr2@users.noreply.github.com>
Co-authored-by: CrispyXYZ <64761703+CrispyXYZ@users.noreply.github.com>
Co-authored-by: Krisztian Papp <30371056+pehsa@users.noreply.github.com>
 2020-09-04 16:22:32 +03:00
Yair Morgenstern
23a57c711f Mods can handle situations where there is no military unit that is available for construction 2020-09-04 16:11:48 +03:00
Yair Morgenstern
95002bc69b Getting the mod list for download now works from Android as well 2020-09-04 13:09:01 +03:00
Yair Morgenstern
8a73e4618b
Linked Desktop downloads to itch.io, for metrics ;) 2020-09-04 00:14:32 +03:00
Yair Morgenstern
2ac552d5a5
Added itch.io badge and updated existing badges 2020-09-04 00:09:00 +03:00
Yair Morgenstern
c906f5d8cb Added screenshots to repo 2020-09-03 23:54:39 +03:00
Yair Morgenstern
0ee07dd547 Let's try and upload ALL the versions! 2020-09-03 22:07:40 +03:00
Yair Morgenstern
57cf94544f Once more, with feeling 2020-09-03 21:48:07 +03:00
Yair Morgenstern
7eaa5d7610 How about comments INSIDE the ;? 2020-09-03 21:29:24 +03:00
Yair Morgenstern
11fee62110 Okay so that prevous one worked, how about now? Does it accept comments? 2020-09-03 21:28:04 +03:00
Yair Morgenstern
eb2dce6da0 It's really unclear what Travis's problem is 2020-09-03 21:25:49 +03:00
Yair Morgenstern
3b85a1c8cf Maybe it didn't like the empty spaces? 2020-09-03 21:07:21 +03:00
Yair Morgenstern
12040c4920 Travis + Butler test 2020-09-03 20:56:41 +03:00
Yair Morgenstern
08a15a888f Fixed test 2020-09-03 17:58:24 +03:00