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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
This commit is contained in:
Anuken
2021-08-28 14:17:29 -04:00
parent 9a7324ce54 d254d971a9
commit 48d568978b
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/ai/WaveSpawner.java
View File

@@ -196,6 +196,7 @@ public class WaveSpawner{
unit.apply(StatusEffects.invincible, 60f);
unit.add();
Events.fire(new UnitSpawnEvent(unit));
Call.spawnEffect(unit.x, unit.y, unit.rotation, unit.type);
}

2
core/src/mindustry/entities/Damage.java
View File

@@ -466,7 +466,7 @@ public class Damage{
for(int dy = -trad; dy <= trad; dy++){
Tile tile = world.tile(Math.round(x / tilesize) + dx, Math.round(y / tilesize) + dy);
if(tile != null && tile.build != null && (team == null ||team.isEnemy(tile.team())) && dx*dx + dy*dy <= trad){
tile.build.damage(damage);
tile.build.damage(team, damage);
}
}
}

9
core/src/mindustry/game/EventType.java
View File

@@ -428,6 +428,15 @@ public class EventType{
}
}
/** Called when a unit is spawned by wave. */
public static class UnitSpawnEvent{
public final Unit unit;
public UnitSpawnEvent(Unit unit) {
this.unit = unit;
}
}
/** Called when a unit is dumped from any payload block. */
public static class UnitUnloadEvent{
public final Unit unit;

2
core/src/mindustry/world/blocks/payloads/UnitPayload.java
View File

@@ -94,7 +94,7 @@ public class UnitPayload implements Payload{
if(solid.solid(tx, ty)) return false;
}
//cannnot dump when there's a lot of overlap going on
//cannot dump when there's a lot of overlap going on
if(!unit.type.flying && Units.count(unit.x, unit.y, unit.physicSize(), o -> o.isGrounded() && (o.type.allowLegStep == unit.type.allowLegStep)) > 0){
return false;
}

5
core/src/mindustry/world/draw/DrawRotator.java
View File

@@ -9,14 +9,15 @@ import mindustry.world.blocks.production.GenericCrafter.*;
public class DrawRotator extends DrawBlock{
public TextureRegion rotator, top;
public boolean drawSpinSprite = false;
public float spinSpeed = 2f;
@Override
public void draw(GenericCrafterBuild build){
Draw.rect(build.block.region, build.x, build.y);
if(drawSpinSprite){
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * 2f);
Drawf.spinSprite(rotator, build.x, build.y, build.totalProgress * spinSpeed);
}else{
Draw.rect(rotator, build.x, build.y, build.totalProgress * 2f);
Draw.rect(rotator, build.x, build.y, build.totalProgress * spinSpeed);
}
if(top.found()) Draw.rect(top, build.x, build.y);
}