Mass renaming of blocks and units

This commit is contained in:
Anuken
2018-09-16 19:48:15 -04:00
parent 5e7ca0374c
commit 8946af4831
57 changed files with 1180 additions and 1113 deletions
@@ -136,11 +136,13 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
public void update(){
super.update();
updateRotation();
if(!Net.client()){
updateRotation();
wobble();
}
trail.update(x + Angles.trnsx(rotation + 180f, 6f) + Mathf.range(wobblyness),
y + Angles.trnsy(rotation + 180f, 6f) + Mathf.range(wobblyness));
wobble();
}
@Override
@@ -185,11 +187,11 @@ public abstract class FlyingUnit extends BaseUnit implements CarryTrait{
protected void wobble(){
if(Net.client()) return;
x += Mathf.sin(Timers.time() + id * 999, 25f, 0.07f)*Timers.delta();
y += Mathf.cos(Timers.time() + id * 999, 25f, 0.07f)*Timers.delta();
x += Mathf.sin(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta();
y += Mathf.cos(Timers.time() + id * 999, 25f, 0.08f)*Timers.delta();
if(velocity.len() <= 0.05f){
rotation += Mathf.sin(Timers.time() + id * 99, 10f, 5f)*Timers.delta();
rotation += Mathf.sin(Timers.time() + id * 99, 10f, 2.5f)*Timers.delta();
}
}
@@ -27,7 +27,6 @@ import io.anuke.ucore.core.Effects;
import io.anuke.ucore.core.Events;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.entities.EntityGroup;
import io.anuke.ucore.entities.EntityPhysics;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.graphics.Shapes;
import io.anuke.ucore.util.Angles;
@@ -2,6 +2,6 @@ package io.anuke.mindustry.entities.units.types;
import io.anuke.mindustry.entities.units.FlyingUnit;
public class Monsoon extends FlyingUnit{
public class Ghoul extends FlyingUnit{
}
@@ -1,5 +1,5 @@
package io.anuke.mindustry.entities.units.types;
public class Fabricator extends Drone{
public class Phantom extends Drone{
}
@@ -0,0 +1,4 @@
package io.anuke.mindustry.entities.units.types;
public class Spirit extends Drone{
}