Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor unit balance / Cleanup

Browse Source
This commit is contained in:
Anuken
2022-10-19 15:13:26 -04:00
parent 5337e3e171
commit d7547d2e68
8 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/content/UnitTypes.java
View File

@@ -2459,7 +2459,7 @@ public class UnitTypes{
treadPullOffset = 3; treadPullOffset = 3;
speed = 0.75f; speed = 0.75f;
rotateSpeed = 3.5f; rotateSpeed = 3.5f;
health = 800; health = 840;
armor = 5f; armor = 5f;
itemCapacity = 0; itemCapacity = 0;
treadRects = new Rect[]{new Rect(12 - 32f, 7 - 32f, 14, 51)}; treadRects = new Rect[]{new Rect(12 - 32f, 7 - 32f, 14, 51)};
@@ -3572,7 +3572,7 @@ public class UnitTypes{
shoot = new ShootSpread(2, 11f); shoot = new ShootSpread(2, 11f);
bullet = new BasicBulletType(5f, 24){{ bullet = new BasicBulletType(5f, 20){{
homingPower = 0.19f; homingPower = 0.19f;
homingDelay = 4f; homingDelay = 4f;
width = 7f; width = 7f;

2
core/src/mindustry/game/Universe.java
View File

@@ -121,7 +121,7 @@ public class Universe{
} }
public Schematic getLastLoadout(){ public Schematic getLastLoadout(){
if(lastLoadout == null) lastLoadout = state.rules.sector == null || state.rules.sector.planet.generator == null ? Loadouts.basicShard : state.rules.sector.planet.generator.getDefaultLoadout(); if(lastLoadout == null) lastLoadout = state.rules.sector == null || state.rules.sector.planet.generator == null ? Loadouts.basicShard : state.rules.sector.planet.generator.defaultLoadout;
return lastLoadout; return lastLoadout;
} }

6
core/src/mindustry/maps/generators/BasicGenerator.java
View File

@@ -26,6 +26,8 @@ public abstract class BasicGenerator implements WorldGenerator{
//for drawing //for drawing
protected @Nullable Block floor, block, ore; protected @Nullable Block floor, block, ore;
public Schematic defaultLoadout = Loadouts.basicShard;
@Override @Override
public void generate(Tiles tiles){ public void generate(Tiles tiles){
this.tiles = tiles; this.tiles = tiles;
@@ -35,10 +37,6 @@ public abstract class BasicGenerator implements WorldGenerator{
generate(); generate();
} }
public Schematic getDefaultLoadout(){
return Loadouts.basicShard;
}
protected void generate(){ protected void generate(){
} }

9
core/src/mindustry/maps/planet/AsteroidGenerator.java
View File

@@ -24,6 +24,10 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
@Nullable Rand rand; @Nullable Rand rand;
int seed; int seed;
{
defaultLoadout = Loadouts.basicNucleus;
}
void asteroid(int ax, int ay, int radius){ void asteroid(int ax, int ay, int radius){
Floor floor = ( Floor floor = (
rand.chance(iceChance) ? Blocks.ice : rand.chance(iceChance) ? Blocks.ice :
@@ -151,11 +155,6 @@ public class AsteroidGenerator extends BlankPlanetGenerator{
state.rules.spawns = Waves.generate(0.5f, rand, false, true, false); state.rules.spawns = Waves.generate(0.5f, rand, false, true, false);
} }
@Override
public Schematic getDefaultLoadout(){
return Loadouts.basicNucleus;
}
@Override @Override
public int getSectorSize(Sector sector){ public int getSectorSize(Sector sector){
return 500; return 500;

6
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -31,6 +31,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
{ {
baseSeed = 2; baseSeed = 2;
defaultLoadout = Loadouts.basicBastion;
} }
@Override @Override
@@ -61,11 +62,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
return 2000 * 1.07f * 6f / 5f; return 2000 * 1.07f * 6f / 5f;
} }
@Override
public Schematic getDefaultLoadout(){
return Loadouts.basicBastion;
}
@Override @Override
public boolean allowLanding(Sector sector){ public boolean allowLanding(Sector sector){
//TODO disallowed for now //TODO disallowed for now

18
core/src/mindustry/service/Achievement.java
View File

@@ -103,18 +103,18 @@ public enum Achievement{
joinCommunityServer, //TODO - Steam joinCommunityServer, //TODO - Steam
openConsole, //TODO - Steam openConsole, //TODO - Steam
controlTurret, //TODO - Steam controlTurret, //TODO - Steam - icon done
dropUnitsCoreZone, //TODO - Steam dropUnitsCoreZone, //TODO - Steam - icon done
destroyScatterFlare, //TODO - Steam destroyScatterFlare, //TODO - Steam - icon done
boostUnit, //TODO - Steam boostUnit, //TODO - Steam - icon done
boostBuildingFloor, //TODO - Steam boostBuildingFloor, //TODO - Steam - icon done
hoverUnitLiquid, //TODO - Steam hoverUnitLiquid, //TODO - Steam - icon done
break100Boulders(SStat.bouldersDeconstructed, 100), //TODO - Steam break100Boulders(SStat.bouldersDeconstructed, 100), //TODO - Steam - icon done
break10000Boulders(SStat.bouldersDeconstructed, 10_000), //TODO - Steam break10000Boulders(SStat.bouldersDeconstructed, 10_000), //TODO - Steam - icon done
shockwaveTowerUse, //TODO - Steam shockwaveTowerUse, //TODO - Steam - icon done
; ;

2
core/src/mindustry/service/GameService.java
View File

@@ -481,7 +481,7 @@ public class GameService{
}); });
Events.on(PayloadDropEvent.class, e -> { Events.on(PayloadDropEvent.class, e -> {
if(e.unit != null && e.carrier.team == state.rules.defaultTeam && state.rules.waveTeam.cores().contains(c -> c.within(e.unit, state.rules.enemyCoreBuildRadius))){ if(campaign() && e.unit != null && e.carrier.team == state.rules.defaultTeam && state.rules.waveTeam.cores().contains(c -> c.within(e.unit, state.rules.enemyCoreBuildRadius))){
dropUnitsCoreZone.complete(); dropUnitsCoreZone.complete();
} }
}); });

2
core/src/mindustry/world/blocks/campaign/Accelerator.java
View File

@@ -120,7 +120,7 @@ public class Accelerator extends Block{
consume(); consume();
universe.clearLoadoutInfo(); universe.clearLoadoutInfo();
universe.updateLoadout(sector.planet.generator.getDefaultLoadout().findCore(), sector.planet.generator.getDefaultLoadout()); universe.updateLoadout(sector.planet.generator.defaultLoadout.findCore(), sector.planet.generator.defaultLoadout);
}); });
Events.fire(Trigger.acceleratorUse); Events.fire(Trigger.acceleratorUse);