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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source
This commit is contained in:
Anuken
2022-03-09 11:42:18 -05:00
parent 775c7722b2 2759aa2793
commit 9242ae1ecb
9 changed files with 44 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/entities/comp/PayloadComp.java
View File

@@ -165,6 +165,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
if(!u.isAdded()) u.team.data().updateCount(u.type, -1);
u.add();
u.unloaded();
Events.fire(new PayloadDropEvent(self(), u));
return true;
}
@@ -177,6 +178,7 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
if(on != null && Build.validPlace(tile.block, tile.team, tx, ty, tile.rotation, false)){
int rot = (int)((rotation + 45f) / 90f) % 4;
payload.place(on, rot);
Events.fire(new PayloadDropEvent(self(), tile));
if(getControllerName() != null){
payload.build.lastAccessed = getControllerName();

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

@@ -238,6 +238,24 @@ public class EventType{
}
}
public static class PayloadDropEvent{
public final Unit carrier;
public final @Nullable Unit unit;
public final @Nullable Building build;
public PayloadDropEvent(Unit carrier, Unit unit){
this.carrier = carrier;
this.unit = unit;
this.build = null;
}
public PayloadDropEvent(Unit carrier, Building build){
this.carrier = carrier;
this.build = build;
this.unit = null;
}
}
public static class UnitControlEvent{
public final Player player;
public final @Nullable Unit unit;

3
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -762,9 +762,6 @@ public class SettingsMenuDialog extends BaseDialog{
}
public static class AreaTextSetting extends TextSetting{
String def;
Cons<String> changed;
public AreaTextSetting(String name, String def, Cons<String> changed){
super(name, def, changed);
}

2
core/src/mindustry/world/blocks/defense/turrets/PointDefenseTurret.java
View File

@@ -18,7 +18,7 @@ public class PointDefenseTurret extends ReloadTurret{
public final int timerTarget = timers++;
public float retargetTime = 5f;
public @Load("block-@size") TextureRegion baseRegion;
public @Load(value = "@-base", fallback = "block-@size") TextureRegion baseRegion;
public Color color = Color.white;
public Effect beamEffect = Fx.pointBeam;