Mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-20 19:56:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

All images &c are done - we have the skeleton of the mod in place!

Browse Source
This commit is contained in:
Yair Morgenstern 2022-02-08 17:10:26 +02:00
parent 15b817c96b
commit 61553c174d
5 changed files with 253 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

488
android/assets/game.atlas
View File

@ -1775,90 +1775,6 @@ TileSets/FantasyHex/Arrows/UnitHasAttacked
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/Generic
rotate: false
xy: 190, 1162
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/Generic
rotate: false
xy: 190, 1162
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitAttacked
rotate: false
xy: 112, 4
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitAttacked
rotate: false
xy: 112, 4
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoved
rotate: false
xy: 220, 14
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoved
rotate: false
xy: 220, 14
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoving
rotate: false
xy: 1084, 1226
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoving
rotate: false
xy: 1084, 1226
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitTeleported
rotate: false
xy: 436, 470
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitTeleported
rotate: false
xy: 436, 470
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitWithdrew
rotate: false
xy: 544, 578
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitWithdrew
rotate: false
xy: 544, 578
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/AtollOverlay
rotate: false
xy: 4, 720
@ -1866,118 +1782,6 @@ TileSets/Default/AtollOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1409
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1409
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexOuter
rotate: false
xy: 436, 447
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexOuter
rotate: false
xy: 436, 447
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveInner
rotate: false
xy: 544, 555
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveInner
rotate: false
xy: 544, 555
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveOuter
rotate: false
xy: 652, 629
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveOuter
rotate: false
xy: 652, 629
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveInner
rotate: false
xy: 760, 731
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveInner
rotate: false
xy: 760, 731
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveOuter
rotate: false
xy: 868, 839
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveOuter
rotate: false
xy: 868, 839
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexInner
rotate: false
xy: 976, 947
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexInner
rotate: false
xy: 976, 947
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexOuter
rotate: false
xy: 1084, 1095
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexOuter
rotate: false
xy: 1084, 1095
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/CityOverlay
rotate: false
xy: 914, 1834
@ -1985,34 +1789,6 @@ TileSets/Default/CityOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Crosshair
rotate: false
xy: 482, 1942
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/FantasyHex/Crosshair
rotate: false
xy: 482, 1942
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/Default/CrosshatchHexagon
rotate: false
xy: 4, 1338
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/FantasyHex/CrosshatchHexagon
rotate: false
xy: 4, 1338
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/Default/FalloutOverlay
rotate: false
xy: 397, 1648
@ -2034,20 +1810,6 @@ TileSets/Default/ForestOverlay
orig: 100, 100
offset: 0, 0
index: -1
TileSets/Default/Highlight
rotate: false
xy: 4, 1830
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/FantasyHex/Highlight
rotate: false
xy: 4, 1830
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/Default/HillOverlay
rotate: false
xy: 1369, 1726
@ -2113,25 +1875,263 @@ TileSets/Default/Road
index: -1
TileSets/Default/Tiles/River-Bottom
rotate: false
xy: 1924, 936
xy: 1404, 899
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/Default/Tiles/River-BottomLeft
rotate: false
xy: 1444, 898
xy: 1484, 900
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/Default/Tiles/River-BottomRight
rotate: false
xy: 1524, 904
xy: 1564, 902
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/Generic
rotate: false
xy: 190, 1162
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/Generic
rotate: false
xy: 190, 1162
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitAttacked
rotate: false
xy: 112, 4
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitAttacked
rotate: false
xy: 112, 4
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoved
rotate: false
xy: 220, 14
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoved
rotate: false
xy: 220, 14
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitMoving
rotate: false
xy: 1084, 1226
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitMoving
rotate: false
xy: 1084, 1226
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitTeleported
rotate: false
xy: 436, 470
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitTeleported
rotate: false
xy: 436, 470
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Arrows/UnitWithdrew
rotate: false
xy: 544, 578
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/Default/Arrows/UnitWithdrew
rotate: false
xy: 544, 578
size: 100, 60
orig: 100, 60
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1409
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexInner
rotate: false
xy: 406, 1409
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveConvexOuter
rotate: false
xy: 436, 447
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveConvexOuter
rotate: false
xy: 436, 447
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveInner
rotate: false
xy: 544, 555
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveInner
rotate: false
xy: 544, 555
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConcaveOuter
rotate: false
xy: 652, 629
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConcaveOuter
rotate: false
xy: 652, 629
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveInner
rotate: false
xy: 760, 731
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveInner
rotate: false
xy: 760, 731
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexConcaveOuter
rotate: false
xy: 868, 839
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexConcaveOuter
rotate: false
xy: 868, 839
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexInner
rotate: false
xy: 976, 947
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexInner
rotate: false
xy: 976, 947
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Borders/ConvexOuter
rotate: false
xy: 1084, 1095
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/Default/Borders/ConvexOuter
rotate: false
xy: 1084, 1095
size: 81, 15
orig: 81, 15
offset: 0, 0
index: -1
TileSets/FantasyHex/Crosshair
rotate: false
xy: 482, 1942
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/Default/Crosshair
rotate: false
xy: 482, 1942
size: 116, 100
orig: 116, 100
offset: 0, 0
index: -1
TileSets/FantasyHex/CrosshatchHexagon
rotate: false
xy: 4, 1338
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/Default/CrosshatchHexagon
rotate: false
xy: 4, 1338
size: 273, 236
orig: 273, 236
offset: 0, 0
index: -1
TileSets/FantasyHex/Highlight
rotate: false
xy: 4, 1830
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/Default/Highlight
rotate: false
xy: 4, 1830
size: 284, 212
orig: 284, 212
offset: 0, 0
index: -1
TileSets/FantasyHex/Railroad
rotate: false
xy: 1192, 1146
@ -3016,21 +3016,21 @@ TileSets/FantasyHex/Tiles/Quarry+Stone
index: -1
TileSets/FantasyHex/Tiles/River-Bottom
rotate: false
xy: 1404, 899
xy: 1924, 936
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomLeft
rotate: false
xy: 1484, 900
xy: 1444, 898
size: 32, 28
orig: 32, 28
offset: 0, 0
index: -1
TileSets/FantasyHex/Tiles/River-BottomRight
rotate: false
xy: 1564, 902
xy: 1524, 904
size: 32, 28
orig: 32, 28
offset: 0, 0

BIN
android/assets/game.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 MiB

After

Width:  |  Height:  |  Size: 1.0 MiB

5
android/assets/jsons/Civ V - Gods & Kings/Units.json
View File

@ -1308,10 +1308,11 @@
"unitType": "Gunpowder",
"movement": 2,
"strength": 65,
"cost": 400,
"cost": 160,
"requiredTech": "Pharmaceuticals",
"promotions": ["Amphibious"],
"uniques": ["Normal vision when embarked", "Defense bonus when embarked"],
"uniques": ["Normal vision when embarked",
"[+50]% Strength <vs [Artillery] units>", "[+50]% Strength <vs [Machine Gun] units>"],
"attackSound": "shot"
},
{

1
core/src/com/unciv/models/ruleset/unique/UniqueType.kt
View File

@ -560,6 +560,7 @@ enum class UniqueType(val text: String, vararg targets: UniqueTarget, val flags:
/////// city conditionals
ConditionalSpecialistCount("if this city has at least [amount] specialists", UniqueTarget.Conditional),
ConditionalBuildingBuilt("if [buildingName] is built", UniqueTarget.Conditional),
ConditionalFollowerCount("in cities where this religion has at least [amount] followers", UniqueTarget.Conditional),
ConditionalWhenGarrisoned("with a garrison", UniqueTarget.Conditional),

5
docs/uniques.md
View File

@ -1353,6 +1353,11 @@ Example: "<if this city has at least [20] specialists>"
Applicable to: Conditional
#### <if [buildingName] is built>
Example: "<if [Library] is built>"
Applicable to: Conditional
#### <in cities where this religion has at least [amount] followers>
Example: "<in cities where this religion has at least [20] followers>"