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

Various tweaks

Browse Source
This commit is contained in:
Anuken
2020-10-16 20:09:48 -04:00
parent e00daffe6d
commit fc1b03f322
8 changed files with 42 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,7 +872,6 @@ public class UnitTypes implements ContentList{
drag = 0.01f; drag = 0.01f;
flying = true; flying = true;
health = 75; health = 75;
faceTarget = false;
engineOffset = 5.5f; engineOffset = 5.5f;
range = 140f; range = 140f;
@@ -1449,13 +1448,13 @@ public class UnitTypes implements ContentList{
trailMult = 0.8f; trailMult = 0.8f;
hitEffect = Fx.massiveExplosion; hitEffect = Fx.massiveExplosion;
knockback = 1.5f; knockback = 1.5f;
lifetime = 140f; lifetime = 100f;
height = 15.5f; height = 15.5f;
width = 15f; width = 15f;
collidesTiles = false; collidesTiles = false;
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamageRadius = 60f; splashDamageRadius = 60f;
splashDamage = 85f; splashDamage = 80f;
backColor = Pal.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow; frontColor = Pal.missileYellow;
trailEffect = Fx.artilleryTrail; trailEffect = Fx.artilleryTrail;

10
core/src/mindustry/core/Logic.java
View File

@@ -96,6 +96,11 @@ public class Logic implements ApplicationListener{
Events.on(WorldLoadEvent.class, e -> { Events.on(WorldLoadEvent.class, e -> {
//enable infinite ammo for wave team by default //enable infinite ammo for wave team by default
state.rules.waveTeam.rules().infiniteAmmo = true; state.rules.waveTeam.rules().infiniteAmmo = true;
if(state.isCampaign()){
//enable building AI
state.rules.waveTeam.rules().ai = true;
state.rules.waveTeam.rules().infiniteResources = true;
}
//save settings //save settings
Core.settings.manualSave(); Core.settings.manualSave();
@@ -174,9 +179,12 @@ public class Logic implements ApplicationListener{
} }
//if there's a "win" wave and no enemies are present, win automatically //if there's a "win" wave and no enemies are present, win automatically
if(state.rules.waves && state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning()){ if(state.rules.waves && (state.enemies == 0 && state.rules.winWave > 0 && state.wave >= state.rules.winWave && !spawner.isSpawning()) ||
(state.rules.attackMode && state.rules.waveTeam.cores().isEmpty())){
//the sector has been conquered - waves get disabled //the sector has been conquered - waves get disabled
state.rules.waves = false; state.rules.waves = false;
//disable attack mode
state.rules.attackMode = false;
//fire capture event //fire capture event
Events.fire(new SectorCaptureEvent(state.rules.sector)); Events.fire(new SectorCaptureEvent(state.rules.sector));

8
core/src/mindustry/game/DefaultWaves.java
View File

@@ -81,7 +81,7 @@ public class DefaultWaves{
effect = StatusEffects.overdrive; effect = StatusEffects.overdrive;
}}, }},
new SpawnGroup(mace){{ new SpawnGroup(pulsar){{
begin = 120; begin = 120;
spacing = 2; spacing = 2;
unitScaling = 3; unitScaling = 3;
@@ -122,7 +122,7 @@ public class DefaultWaves{
shieldScaling = 30; shieldScaling = 30;
}}, }},
new SpawnGroup(dagger){{ new SpawnGroup(nova){{
begin = 35; begin = 35;
spacing = 3; spacing = 3;
unitAmount = 4; unitAmount = 4;
@@ -233,7 +233,7 @@ public class DefaultWaves{
shieldScaling = 20f; shieldScaling = 20f;
}}, }},
new SpawnGroup(atrax){{ new SpawnGroup(toxopid){{
begin = 210; begin = 210;
unitAmount = 1; unitAmount = 1;
unitScaling = 1; unitScaling = 1;
@@ -258,7 +258,7 @@ public class DefaultWaves{
{nova, pulsar, quasar, vela, corvus}, {nova, pulsar, quasar, vela, corvus},
{crawler, atrax, spiroct, arkyid, toxopid}, {crawler, atrax, spiroct, arkyid, toxopid},
//{risso, minke, bryde, sei, omura}, //questionable choices //{risso, minke, bryde, sei, omura}, //questionable choices
//{mono, poly, mega, quad, oct}, //do not attack {poly, poly, mega, quad, quad},
{flare, horizon, zenith, antumbra, eclipse} {flare, horizon, zenith, antumbra, eclipse}
}; };

4
core/src/mindustry/game/SectorInfo.java
View File

@@ -41,6 +41,8 @@ public class SectorInfo{
public Seq<UnlockableContent> resources = new Seq<>(); public Seq<UnlockableContent> resources = new Seq<>();
/** Whether waves are enabled here. */ /** Whether waves are enabled here. */
public boolean waves = true; public boolean waves = true;
/** Whether attack mode is enabled here. */
public boolean attack = false;
/** Wave # from state */ /** Wave # from state */
public int wave = 1, winWave = -1; public int wave = 1, winWave = -1;
/** Time between waves. */ /** Time between waves. */
@@ -103,6 +105,7 @@ public class SectorInfo{
state.rules.waves = waves; state.rules.waves = waves;
state.rules.waveSpacing = waveSpacing; state.rules.waveSpacing = waveSpacing;
state.rules.winWave = winWave; state.rules.winWave = winWave;
state.rules.attackMode = attack;
CoreBuild entity = state.rules.defaultTeam.core(); CoreBuild entity = state.rules.defaultTeam.core();
if(entity != null){ if(entity != null){
@@ -135,6 +138,7 @@ public class SectorInfo{
wave = state.wave; wave = state.wave;
winWave = state.rules.winWave; winWave = state.rules.winWave;
waves = state.rules.waves; waves = state.rules.waves;
attack = state.rules.attackMode;
hasCore = entity != null; hasCore = entity != null;
bestCoreType = !hasCore ? Blocks.air : state.rules.defaultTeam.cores().max(e -> e.block.size).block; bestCoreType = !hasCore ? Blocks.air : state.rules.defaultTeam.cores().max(e -> e.block.size).block;
storageCapacity = entity != null ? entity.storageCapacity : 0; storageCapacity = entity != null ? entity.storageCapacity : 0;

21
core/src/mindustry/graphics/BlockRenderer.java
View File

@@ -38,7 +38,7 @@ public class BlockRenderer implements Disposable{
private FrameBuffer dark = new FrameBuffer(); private FrameBuffer dark = new FrameBuffer();
private Seq<Building> outArray2 = new Seq<>(); private Seq<Building> outArray2 = new Seq<>();
private Seq<Tile> shadowEvents = new Seq<>(); private Seq<Tile> shadowEvents = new Seq<>();
private IntSet processedEntities = new IntSet(), processedLinks = new IntSet(); private IntSet procEntities = new IntSet(), procLinks = new IntSet(), procLights = new IntSet();
private boolean displayStatus = false; private boolean displayStatus = false;
public BlockRenderer(){ public BlockRenderer(){
@@ -191,8 +191,9 @@ public class BlockRenderer implements Disposable{
tileview.clear(); tileview.clear();
lightview.clear(); lightview.clear();
processedEntities.clear(); procEntities.clear();
processedLinks.clear(); procLinks.clear();
procLights.clear();
int minx = Math.max(avgx - rangex - expandr, 0); int minx = Math.max(avgx - rangex - expandr, 0);
int miny = Math.max(avgy - rangey - expandr, 0); int miny = Math.max(avgy - rangey - expandr, 0);
@@ -209,25 +210,25 @@ public class BlockRenderer implements Disposable{
tile = tile.build.tile; tile = tile.build.tile;
} }
if(block != Blocks.air && block.cacheLayer == CacheLayer.normal && (tile.build == null || !processedEntities.contains(tile.build.id))){ if(block != Blocks.air && block.cacheLayer == CacheLayer.normal && (tile.build == null || !procEntities.contains(tile.build.id))){
if(block.expanded || !expanded){ if(block.expanded || !expanded){
if(tile.build == null || processedLinks.add(tile.build.id)){ if(tile.build == null || procLinks.add(tile.build.id)){
tileview.add(tile); tileview.add(tile);
if(tile.build != null){ if(tile.build != null){
processedEntities.add(tile.build.id); procEntities.add(tile.build.id);
processedLinks.add(tile.build.id); procLinks.add(tile.build.id);
} }
} }
} }
//lights are drawn even in the expanded range //lights are drawn even in the expanded range
if(tile.build != null || tile.block().emitLight){ if(((tile.build != null && procLights.add(tile.build.pos())) || tile.block().emitLight)){
lightview.add(tile); lightview.add(tile);
} }
if(tile.build != null && tile.build.power != null && tile.build.power.links.size > 0){ if(tile.build != null && tile.build.power != null && tile.build.power.links.size > 0){
for(Building other : tile.build.getPowerConnections(outArray2)){ for(Building other : tile.build.getPowerConnections(outArray2)){
if(other.block instanceof PowerNode && processedLinks.add(other.id)){ //TODO need a generic way to render connections! if(other.block instanceof PowerNode && procLinks.add(other.id)){ //TODO need a generic way to render connections!
tileview.add(other.tile); tileview.add(other.tile);
} }
} }
@@ -235,7 +236,7 @@ public class BlockRenderer implements Disposable{
} }
//special case for floors //special case for floors
if(block == Blocks.air && tile.floor().emitLight){ if((block == Blocks.air && tile.floor().emitLight) && procLights.add(tile.pos())){
lightview.add(tile); lightview.add(tile);
} }
} }

1
core/src/mindustry/graphics/LightRenderer.java
View File

@@ -100,7 +100,6 @@ public class LightRenderer{
Draw.vert(ledge.texture, vertices, 0, vertices.length); Draw.vert(ledge.texture, vertices, 0, vertices.length);
Vec2 v3 = Tmp.v2.trnsExact(rot, stroke); Vec2 v3 = Tmp.v2.trnsExact(rot, stroke);
u = ledge.u; u = ledge.u;

15
core/src/mindustry/maps/SectorDamage.java
View File

@@ -11,6 +11,7 @@ import mindustry.entities.abilities.*;
import mindustry.game.*; import mindustry.game.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.logic.*; import mindustry.logic.*;
import mindustry.type.*;
import mindustry.world.*; import mindustry.world.*;
import mindustry.world.blocks.defense.*; import mindustry.world.blocks.defense.*;
import mindustry.world.blocks.defense.turrets.*; import mindustry.world.blocks.defense.turrets.*;
@@ -252,7 +253,10 @@ public class SectorDamage{
if(unit.isPlayer()) continue; if(unit.isPlayer()) continue;
if(unit.team == state.rules.defaultTeam){ if(unit.team == state.rules.defaultTeam){
sumHealth += unit.health + unit.shield; //scale health based on armor - yes, this is inaccurate, but better than nothing
float healthMult = 1f + Mathf.clamp(unit.armor / 20f);
sumHealth += unit.health*healthMult + unit.shield;
sumDps += unit.type().dpsEstimate; sumDps += unit.type().dpsEstimate;
if(unit.abilities.find(a -> a instanceof HealFieldAbility) instanceof HealFieldAbility h){ if(unit.abilities.find(a -> a instanceof HealFieldAbility) instanceof HealFieldAbility h){
sumRps += h.amount / h.reload * 60f; sumRps += h.amount / h.reload * 60f;
@@ -277,10 +281,12 @@ public class SectorDamage{
} }
for(SpawnGroup group : state.rules.spawns){ for(SpawnGroup group : state.rules.spawns){
float healthMult = 1f + Mathf.clamp(group.type.armor / 20f);
StatusEffect effect = (group.effect == null ? StatusEffects.none : group.effect);
int spawned = group.getSpawned(wave); int spawned = group.getSpawned(wave);
if(spawned <= 0) continue; if(spawned <= 0) continue;
sumWaveHealth += spawned * (group.getShield(wave) + group.type.health); sumWaveHealth += spawned * (group.getShield(wave) + group.type.health * effect.healthMultiplier * healthMult);
sumWaveDps += spawned * group.type.dpsEstimate; sumWaveDps += spawned * group.type.dpsEstimate * effect.damageMultiplier;
} }
waveDps.add(new Vec2(wave, sumWaveDps)); waveDps.add(new Vec2(wave, sumWaveDps));
waveHealth.add(new Vec2(wave, sumWaveHealth)); waveHealth.add(new Vec2(wave, sumWaveHealth));
@@ -295,7 +301,8 @@ public class SectorDamage{
info.waveDpsBase = reg.intercept; info.waveDpsBase = reg.intercept;
info.waveDpsSlope = reg.slope; info.waveDpsSlope = reg.slope;
info.sumHealth = sumHealth; //enemy units like to aim for a lot of non-essential things, so increase resulting health slightly
info.sumHealth = sumHealth * 1.2f;
info.sumDps = sumDps; info.sumDps = sumDps;
info.sumRps = sumRps; info.sumRps = sumRps;

2
core/src/mindustry/world/blocks/storage/StorageBlock.java
View File

@@ -26,7 +26,7 @@ public class StorageBlock extends Block{
} }
public static void incinerateEffect(Building self, Building source){ public static void incinerateEffect(Building self, Building source){
if(Mathf.chance(0.1)){ if(Mathf.chance(0.3)){
Tile edge = Edges.getFacingEdge(source, self); Tile edge = Edges.getFacingEdge(source, self);
Tile edge2 = Edges.getFacingEdge(self, source); Tile edge2 = Edges.getFacingEdge(self, source);
if(edge != null && edge2 != null){ if(edge != null && edge2 != null){