This commit is contained in:
Anuken
2022-04-09 14:03:17 -04:00
parent 8884491e46
commit 3e3c88bd26
5 changed files with 14 additions and 4 deletions
+1
View File
@@ -113,6 +113,7 @@ public class Planets{
new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f) new HexSkyMesh(this, 1, 0.6f, 0.16f, 5, Color.white.cpy().lerp(Pal.spore, 0.55f).a(0.75f), 2, 0.45f, 1f, 0.41f)
); );
allowWaves = true;
allowWaveSimulation = true; allowWaveSimulation = true;
allowSectorInvasion = true; allowSectorInvasion = true;
allowLaunchSchematics = true; allowLaunchSchematics = true;
@@ -2456,6 +2456,7 @@ public class UnitTypes{
rotateSpeed = 3.5f; rotateSpeed = 3.5f;
health = 800; health = 800;
armor = 5f; armor = 5f;
itemCapacity = 0;
treadRects = new Rect[]{new Rect(12, 7, 14, 51)}; treadRects = new Rect[]{new Rect(12, 7, 14, 51)};
researchCostMultiplier = 0f; researchCostMultiplier = 0f;
@@ -2496,6 +2497,7 @@ public class UnitTypes{
rotateSpeed = 2.6f; rotateSpeed = 2.6f;
health = 2000; health = 2000;
armor = 8f; armor = 8f;
itemCapacity = 0;
treadRects = new Rect[]{new Rect(17, 10, 19, 76)}; treadRects = new Rect[]{new Rect(17, 10, 19, 76)};
researchCostMultiplier = 0f; researchCostMultiplier = 0f;
@@ -2582,6 +2584,7 @@ public class UnitTypes{
speed = 0.63f; speed = 0.63f;
health = 9000; health = 9000;
armor = 20f; armor = 20f;
itemCapacity = 0;
crushDamage = 13f / 5f; crushDamage = 13f / 5f;
treadRects = new Rect[]{new Rect(22, 16, 28, 130)}; treadRects = new Rect[]{new Rect(22, 16, 28, 130)};
+6 -4
View File
@@ -382,11 +382,13 @@ public class Control implements ApplicationListener, Loadable{
state.wavetime = state.rules.initialWaveSpacing <= 0f ? (state.rules.waveSpacing * (sector.preset == null ? 2f : sector.preset.startWaveTimeMultiplier)) : state.rules.initialWaveSpacing; state.wavetime = state.rules.initialWaveSpacing <= 0f ? (state.rules.waveSpacing * (sector.preset == null ? 2f : sector.preset.startWaveTimeMultiplier)) : state.rules.initialWaveSpacing;
//reset captured state //reset captured state
sector.info.wasCaptured = false; sector.info.wasCaptured = false;
//re-enable waves
state.rules.waves = true;
//reset win wave?? if(state.rules.sector.planet.allowWaves){
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 30; //re-enable waves
state.rules.waves = true;
//reset win wave??
state.rules.winWave = state.rules.attackMode ? -1 : sector.preset != null && sector.preset.captureWave > 0 ? sector.preset.captureWave : state.rules.winWave > state.wave ? state.rules.winWave : 30;
}
//if there's still an enemy base left, fix it //if there's still an enemy base left, fix it
if(state.rules.attackMode){ if(state.rules.attackMode){
@@ -751,6 +751,8 @@ public class DesktopInput extends InputHandler{
@Override @Override
public boolean touchDown(float x, float y, int pointer, KeyCode button){ public boolean touchDown(float x, float y, int pointer, KeyCode button){
if(scene.hasMouse() || !commandMode) return false;
if(button == KeyCode.mouseRight){ if(button == KeyCode.mouseRight){
//right click: move to position //right click: move to position
+2
View File
@@ -93,6 +93,8 @@ public class Planet extends UnlockableContent{
public boolean allowSectorInvasion = false; public boolean allowSectorInvasion = false;
/** If true, sectors saves are cleared when lost. */ /** If true, sectors saves are cleared when lost. */
public boolean clearSectorOnLose = false; public boolean clearSectorOnLose = false;
/** If true, waves are created on sector loss. TODO remove. */
public boolean allowWaves = false;
/** Sets up rules on game load for any sector on this planet. */ /** Sets up rules on game load for any sector on this planet. */
public Cons<Rules> ruleSetter = r -> {}; public Cons<Rules> ruleSetter = r -> {};
/** Parent body that this planet orbits around. If null, this planet is considered to be in the middle of the solar system.*/ /** Parent body that this planet orbits around. If null, this planet is considered to be in the middle of the solar system.*/