Fixed crash caused by trebuchet listing "cannon" as upgrade, but the cannon doesn't exist yet 0_0

This commit is contained in:
Yair Morgenstern 2018-05-28 22:03:56 +03:00
parent 75627928b3
commit 14a1bc5626
4 changed files with 7 additions and 6 deletions

View File

@ -15,7 +15,7 @@
}, },
{ {
name:"Archery", name:"Archery",
row:5 row:7
}, },
{ {
name:"Mining", name:"Mining",

View File

@ -130,8 +130,8 @@
rangedStrength:14, rangedStrength:14,
cost: 120, cost: 120,
requiredTech:"Physics", requiredTech:"Physics",
obsoleteTech:"Chemistry", /*obsoleteTech:"Chemistry",
upgradesTo:"Cannon", upgradesTo:"Cannon",*/
uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"], uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack","Limited Visibility"],
hurryCostModifier:20 hurryCostModifier:20
}, },

View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 65 versionCode 67
versionName "2.2.5" versionName "2.2.7"
} }
buildTypes { buildTypes {
release { release {

View File

@ -4,12 +4,13 @@ import android.os.Bundle;
import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplication;
import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration;
import com.unciv.UnCivGame;
public class AndroidLauncher extends AndroidApplication { public class AndroidLauncher extends AndroidApplication {
@Override @Override
protected void onCreate (Bundle savedInstanceState) { protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
initialize(new com.unciv.UnCivGame(), config); initialize(new UnCivGame(), config);
} }
} }