AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 15:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'test'

Browse Source 
# Conflicts:
#	android/assets/jsons/Civ V - Vanilla/Units.json
This commit is contained in:
Yair Morgenstern 2020-12-08 21:04:08 +02:00
commit 570656929d
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
android/assets/jsons/Civ V - Vanilla/Units.json
View File

@ -1235,6 +1235,21 @@
"upgradesTo": "Helicopter Gunship", "upgradesTo": "Helicopter Gunship",
"uniques": ["Bonus vs Armor 100%"] "uniques": ["Bonus vs Armor 100%"]
}, },
{
// "Hovering unit" unique gives ability to get into impassable tiles - and only that (no vision bonus or flying over ocean)
// Unit embarks like any other ground unit and has penalty for attacking over river or from embarked state
"name": "Helicopter Gunship",
"unitType": "Melee",
"movement": 6,
"strength": 60,
"cost": 425,
"requiredTech": "Computers",
"requiredResource": "Aluminum",
"uniques": ["Bonus vs Armor 100%", "No defensive terrain bonus", "Can move after attacking", "All tiles cost 1 movement",
"Can pass through impassable tiles", "Unable to capture cities"],
"attackSound": "shot"
},
{ {
"name": "Rocket Artillery", "name": "Rocket Artillery",
"unitType": "Siege", "unitType": "Siege",
@ -1268,7 +1283,7 @@
"uniques": ["Can move after attacking","No defensive terrain bonus"] "uniques": ["Can move after attacking","No defensive terrain bonus"]
}, },
/* /* // THIS STUFF IS COMMENTED OUT!!!
// Information Era // Information Era
{ {
"name": "Mobile SAM", "name": "Mobile SAM",
@ -1282,20 +1297,6 @@
"attackSound": "shot" "attackSound": "shot"
// 65 strength, 3 movement, requiredTech "Rocketry" in expansions // 65 strength, 3 movement, requiredTech "Rocketry" in expansions
}, },
{
// "Hovering unit" unique gives ability to get into impassable tiles - and only that (no vision bonus or flying over ocean)
// Unit embarks like any other ground unit and has penalty for attacking over river or from embarked state
"name": "Helicopter Gunship",
"unitType": "Melee",
"movement": 6,
"strength": 60,
"cost": 425,
"requiredTech": "Computers",
"requiredResource": "Aluminum",
"uniques": ["Bonus vs Armor 100%", "No defensive terrain bonus", "Can move after attacking", "All tiles cost 1 movement",
"Can pass through impassable tiles", "Unable to capture cities"],
"attackSound": "shot"
},
{ {
"name": "Jet Fighter", "name": "Jet Fighter",
"unitType": "Fighter", "unitType": "Fighter",

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.3.71" const val kotlinVersion = "1.3.71"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 507 const val appCodeNumber = 508
const val appVersion = "3.11.18" const val appVersion = "3.11.18-patch1"
const val gdxVersion = "1.9.12" const val gdxVersion = "1.9.12"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"