mirror of
https://github.com/yairm210/Unciv.git
synced 2025-09-28 06:16:37 -04:00
Added Galleass, first ranged water unit!
This commit is contained in:
parent
ac6adefdbd
commit
abc3bfcae8
@ -31,6 +31,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
|
|||||||
|
|
||||||
### Medieval Era
|
### Medieval Era
|
||||||
|
|
||||||
|
* [Ship](https://thenounproject.com/term/ship/1998589/) By Vanisha for Galleass
|
||||||
* [Crossbow](https://thenounproject.com/term/crossbow/965389/) By Creaticca Creative Agency for Crossbowman
|
* [Crossbow](https://thenounproject.com/term/crossbow/965389/) By Creaticca Creative Agency for Crossbowman
|
||||||
* [Longbow](https://thenounproject.com/search/?q=longbow&i=815991) By Hamish for Longbowman
|
* [Longbow](https://thenounproject.com/search/?q=longbow&i=815991) By Hamish for Longbowman
|
||||||
* [Trebuchet](https://thenounproject.com/search/?q=Trebuchet&i=827987) By Ben Davis
|
* [Trebuchet](https://thenounproject.com/search/?q=Trebuchet&i=827987) By Ben Davis
|
||||||
|
BIN
android/Images/UnitIcons/Caravel.png
Normal file
BIN
android/Images/UnitIcons/Caravel.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.1 KiB |
BIN
android/Images/UnitIcons/Galleass.png
Normal file
BIN
android/Images/UnitIcons/Galleass.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.9 KiB |
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Before Width: | Height: | Size: 903 KiB After Width: | Height: | Size: 908 KiB |
@ -235,6 +235,17 @@
|
|||||||
obsoleteTech:"Gunpowder",
|
obsoleteTech:"Gunpowder",
|
||||||
hurryCostModifier:20
|
hurryCostModifier:20
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name:"Galleass",
|
||||||
|
unitType:"WaterRanged",
|
||||||
|
movement:3,
|
||||||
|
strength:16,
|
||||||
|
rangedStrength:17
|
||||||
|
cost: 100,
|
||||||
|
requiredTech:"Compass",
|
||||||
|
uniques:["Cannot enter ocean tiles"]
|
||||||
|
hurryCostModifier:20
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name:"Knight",
|
name:"Knight",
|
||||||
unitType:"Mounted",
|
unitType:"Mounted",
|
||||||
|
@ -21,7 +21,7 @@ android {
|
|||||||
applicationId "com.unciv.game"
|
applicationId "com.unciv.game"
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 26
|
targetSdkVersion 26
|
||||||
versionCode 153
|
versionCode 154
|
||||||
versionName "2.9.7"
|
versionName "2.9.7"
|
||||||
}
|
}
|
||||||
buildTypes {
|
buildTypes {
|
||||||
|
@ -101,7 +101,7 @@ class GameInfo {
|
|||||||
// we have to remove hydro plants from all cities BEFORE we update a single one,
|
// we have to remove hydro plants from all cities BEFORE we update a single one,
|
||||||
// because updating leads to getting the building uniques from the civ info,
|
// because updating leads to getting the building uniques from the civ info,
|
||||||
// which in turn leads to us trying to get info on all the building in all the cities...
|
// which in turn leads to us trying to get info on all the building in all the cities...
|
||||||
// which can ail i there's an "unregistered" building anywhere
|
// which can fail i there's an "unregistered" building anywhere
|
||||||
for (cityInfo in civInfo.cities) {
|
for (cityInfo in civInfo.cities) {
|
||||||
val cityConstructions = cityInfo.cityConstructions
|
val cityConstructions = cityInfo.cityConstructions
|
||||||
// As of 2.9.6, removed hydro plant, since it requires rivers, which we do not yet have
|
// As of 2.9.6, removed hydro plant, since it requires rivers, which we do not yet have
|
||||||
|
@ -7,19 +7,21 @@ enum class UnitType{
|
|||||||
Ranged,
|
Ranged,
|
||||||
Scout,
|
Scout,
|
||||||
Mounted,
|
Mounted,
|
||||||
|
Siege,
|
||||||
WaterCivilian,
|
WaterCivilian,
|
||||||
WaterMelee,
|
WaterMelee,
|
||||||
Siege;
|
WaterRanged;
|
||||||
|
|
||||||
fun isMelee(): Boolean {
|
fun isMelee(): Boolean {
|
||||||
return this == Melee
|
return this == Melee
|
||||||
|| this == Mounted
|
|| this == Mounted
|
||||||
|| this == Scout
|
|| this == Scout
|
||||||
|| this==WaterMelee
|
|| this == WaterMelee
|
||||||
}
|
}
|
||||||
fun isRanged(): Boolean {
|
fun isRanged(): Boolean {
|
||||||
return this == Ranged
|
return this == Ranged
|
||||||
|| this == Siege
|
|| this == Siege
|
||||||
|
|| this == WaterRanged
|
||||||
}
|
}
|
||||||
|
|
||||||
fun isLandUnit(): Boolean {
|
fun isLandUnit(): Boolean {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user