This commit is contained in:
Anuken
2020-11-14 19:06:21 -05:00
parent 6c2541491f
commit 135c780f35
4 changed files with 13 additions and 3 deletions

Binary file not shown.

View File

@@ -1247,7 +1247,7 @@ public class UnitTypes implements ContentList{
mineTier = 3; mineTier = 3;
health = 500; health = 500;
armor = 5f; armor = 5f;
speed = 2.4f; speed = 2.5f;
accel = 0.06f; accel = 0.06f;
drag = 0.017f; drag = 0.017f;
lowAltitude = true; lowAltitude = true;
@@ -1257,7 +1257,7 @@ public class UnitTypes implements ContentList{
hitSize = 15f; hitSize = 15f;
engineSize = 3f; engineSize = 3f;
payloadCapacity = (2 * 2) * tilePayload; payloadCapacity = (2 * 2) * tilePayload;
buildSpeed = 2.5f; buildSpeed = 2.6f;
ammoType = AmmoTypes.power; ammoType = AmmoTypes.power;
@@ -1405,6 +1405,7 @@ public class UnitTypes implements ContentList{
y = -5f; y = -5f;
rotate = true; rotate = true;
ejectEffect = Fx.casing1; ejectEffect = Fx.casing1;
shootSound = Sounds.missile;
bullet = new MissileBulletType(2.7f, 12, "missile"){{ bullet = new MissileBulletType(2.7f, 12, "missile"){{
width = 8f; width = 8f;
height = 8f; height = 8f;
@@ -1451,6 +1452,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 5f; rotateSpeed = 5f;
inaccuracy = 10f; inaccuracy = 10f;
ejectEffect = Fx.casing1; ejectEffect = Fx.casing1;
shootSound = Sounds.shoot;
bullet = Bullets.flakLead; bullet = Bullets.flakLead;
}}); }});
@@ -1463,6 +1465,7 @@ public class UnitTypes implements ContentList{
rotateSpeed = 2f; rotateSpeed = 2f;
shake = 1.5f; shake = 1.5f;
ejectEffect = Fx.casing2; ejectEffect = Fx.casing2;
shootSound = Sounds.bang;
bullet = Bullets.artilleryIncendiary; bullet = Bullets.artilleryIncendiary;
}}); }});
}}; }};
@@ -1499,6 +1502,7 @@ public class UnitTypes implements ContentList{
shots = 1; shots = 1;
inaccuracy = 3f; inaccuracy = 3f;
ejectEffect = Fx.casing3; ejectEffect = Fx.casing3;
shootSound = Sounds.artillery;
bullet = new ArtilleryBulletType(3.2f, 12){{ bullet = new ArtilleryBulletType(3.2f, 12){{
trailMult = 0.8f; trailMult = 0.8f;
@@ -1537,6 +1541,7 @@ public class UnitTypes implements ContentList{
shotDelay = 3f; shotDelay = 3f;
inaccuracy = 5f; inaccuracy = 5f;
velocityRnd = 0.1f; velocityRnd = 0.1f;
shootSound = Sounds.missile;
ejectEffect = Fx.none; ejectEffect = Fx.none;
bullet = new MissileBulletType(2.7f, 12){{ bullet = new MissileBulletType(2.7f, 12){{

View File

@@ -280,6 +280,11 @@ public class Control implements ApplicationListener, Loadable{
public void playSector(@Nullable Sector origin, Sector sector){ public void playSector(@Nullable Sector origin, Sector sector){
ui.loadAnd(() -> { ui.loadAnd(() -> {
if(saves.getCurrent() != null && state.isGame()){
control.saves.getCurrent().save();
control.saves.resetSave();
}
ui.planet.hide(); ui.planet.hide();
SaveSlot slot = sector.save; SaveSlot slot = sector.save;
sector.planet.setLastSector(sector); sector.planet.setLastSector(sector);

View File

@@ -75,7 +75,7 @@ public class Weapon{
/** sound used for weapons that have a delay */ /** sound used for weapons that have a delay */
public Sound chargeSound = Sounds.none; public Sound chargeSound = Sounds.none;
/** sound played when there is nothing to shoot */ /** sound played when there is nothing to shoot */
public Sound noAmmoSound = Sounds.click; public Sound noAmmoSound = Sounds.noammo;
/** displayed region (autoloaded) */ /** displayed region (autoloaded) */
public TextureRegion region; public TextureRegion region;
/** heat region, must be same size as region (optional) */ /** heat region, must be same size as region (optional) */