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-04-12 10:26:18 -04:00
parent f163601262
commit 603d8b16d0
23 changed files with 816 additions and 799 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
annotations/src/main/resources/revisions/BuilderUnitEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/BulletEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:damage,type:float,size:4},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:time,type:float,size:4},{name:type,type:mindustry.entities.bullet.BulletType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/DecalEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:lifetime,type:float,size:4},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/FireEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:baseFlammability,type:float,size:4},{name:block,type:mindustry.world.Block,size:-1},{name:lifetime,type:float,size:4},{name:puddleFlammability,type:float,size:4},{name:tile,type:mindustry.world.Tile,size:-1},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/GroundEffectEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/LegsUnitEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:baseRotation,type:float,size:4},{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/MinerUnitEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:mineTile,type:mindustry.world.Tile,size:-1},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/PlayerEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:admin,type:boolean,size:1},{name:color,type:arc.graphics.Color,size:-1},{name:lastText,type:java.lang.String,size:-1},{name:mouseX,type:float,size:4},{name:mouseY,type:float,size:4},{name:name,type:java.lang.String,size:-1},{name:team,type:mindustry.game.Team,size:-1},{name:textFadeTime,type:float,size:4},{name:typing,type:boolean,size:1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/PuddleEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:accepting,type:float,size:4},{name:amount,type:float,size:4},{name:generation,type:int,size:4},{name:lastRipple,type:float,size:4},{name:liquid,type:mindustry.type.Liquid,size:-1},{name:tile,type:mindustry.world.Tile,size:-1},{name:updateTime,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/StandardEffectEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:color,type:arc.graphics.Color,size:-1},{name:data,type:java.lang.Object,size:-1},{name:lifetime,type:float,size:4},{name:offsetX,type:float,size:4},{name:offsetY,type:float,size:4},{name:rotation,type:float,size:4},{name:time,type:float,size:4},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/TileEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:health,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/UnitEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/UnitWaterMoveEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:drownTime,type:float,size:4},{name:elevation,type:float,size:4},{name:health,type:float,size:4},{name:rotation,type:float,size:4},{name:team,type:mindustry.game.Team,size:-1},{name:type,type:mindustry.type.UnitType,size:-1},{name:x,type:float,size:4},{name:y,type:float,size:4}]}

1
annotations/src/main/resources/revisions/WeatherEntity/0.json Normal file
View File

@@ -0,0 +1 @@
{fields:[{name:x,type:float,size:4},{name:y,type:float,size:4}]}

BIN
core/assets-raw/sprites/units/reaper.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 127 KiB

1586
core/assets/sprites/sprites.atlas
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/sprites/sprites.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 727 KiB

After

Width:  |  Height:  |  Size: 768 KiB

BIN
core/assets/sprites/sprites2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 125 KiB

6
core/src/mindustry/content/Fx.java
View File

@@ -44,8 +44,10 @@ public class Fx{
mixcol(Pal.accent, 1f); mixcol(Pal.accent, 1f);
alpha(e.fout()); alpha(e.fout());
rect(select.type().icon(Cicon.full), select.x(), select.y(), select.rotation() - 90f); rect(select.type().icon(Cicon.full), select.x(), select.y(), select.rotation() - 90f);
Lines.square(select.x(), select.y(), e.fout() * select.hitSize() * 2f, 45f); alpha(1f);
Lines.stroke(e.fin() * 2f); Lines.stroke(e.fslope() * 1f);
Lines.square(select.x(), select.y(), e.fout() * select.hitSize() * 2f, 45);
Lines.stroke(e.fslope() * 2f);
Lines.square(select.x(), select.y(), e.fout() * select.hitSize() * 3f, 45f); Lines.square(select.x(), select.y(), e.fout() * select.hitSize() * 3f, 45f);
reset(); reset();
}), }),

2
core/src/mindustry/graphics/OverlayRenderer.java
View File

@@ -80,8 +80,6 @@ public class OverlayRenderer{
Draw.reset(); Draw.reset();
} }
//draw config selected block //draw config selected block
if(input.frag.config.isShown()){ if(input.frag.config.isShown()){
Tilec tile = input.frag.config.getSelectedTile(); Tilec tile = input.frag.config.getSelectedTile();

2
core/src/mindustry/input/Binding.java
View File

@@ -11,7 +11,7 @@ public enum Binding implements KeyBind{
move_y(new Axis(KeyCode.S, KeyCode.W)), move_y(new Axis(KeyCode.S, KeyCode.W)),
mouse_move(KeyCode.MOUSE_BACK), mouse_move(KeyCode.MOUSE_BACK),
dash(KeyCode.SHIFT_LEFT), dash(KeyCode.SHIFT_LEFT),
control(KeyCode.ALT_LEFT), control(KeyCode.SHIFT_LEFT),
select(KeyCode.MOUSE_LEFT), select(KeyCode.MOUSE_LEFT),
deselect(KeyCode.MOUSE_RIGHT), deselect(KeyCode.MOUSE_RIGHT),
break_block(KeyCode.MOUSE_RIGHT), break_block(KeyCode.MOUSE_RIGHT),

1
core/src/mindustry/input/DesktopInput.java
View File

@@ -181,6 +181,7 @@ public class DesktopInput extends InputHandler{
} }
} }
//TODO this is for debugging, remove later
if(Core.input.keyTap(KeyCode.Q) && !player.dead()){ if(Core.input.keyTap(KeyCode.Q) && !player.dead()){
Fx.commandSend.at(player); Fx.commandSend.at(player);
Units.nearby(player.team(), player.x(), player.y(), 200f, u -> { Units.nearby(player.team(), player.x(), player.y(), 200f, u -> {

4
core/src/mindustry/input/InputHandler.java
View File

@@ -174,7 +174,9 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
player.clearUnit(); player.clearUnit();
//make sure it's AI controlled, so players can't overwrite each other //make sure it's AI controlled, so players can't overwrite each other
}else if(unit.isAI() && unit.team() == player.team()){ }else if(unit.isAI() && unit.team() == player.team()){
player.unit(unit); Time.runTask(Fx.unitSpirit.lifetime * 0.87f, () -> {
player.unit(unit);
});
Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x(), unit.y(), 0f, unit)); Time.run(Fx.unitSpirit.lifetime, () -> Fx.unitControl.at(unit.x(), unit.y(), 0f, unit));
if(!player.dead()){ if(!player.dead()){
Fx.unitSpirit.at(player.x(), player.y(), 0f, unit); Fx.unitSpirit.at(player.x(), player.y(), 0f, unit);