This commit is contained in:
Anuken
2020-05-22 20:00:02 -04:00
parent 76aa201a99
commit f250008db3
12 changed files with 42 additions and 56 deletions

View File

@@ -270,14 +270,15 @@ public class UnitTypes implements ContentList{
engineOffset = 6f;
hitsize = 8f;
weapons.add(new Weapon("small-heal-weapon"){{
reload = 14f;
weapons.add(new Weapon("small-basic-weapon"){{
reload = 20f;
x = -1f;
y = -1f;
shootX = 3.5f;
alternate = true;
ejectEffect = Fx.none;
bullet = Bullets.healBullet;
//TODO use different ammo
bullet = Bullets.standardCopper;
}});
}};

View File

@@ -44,8 +44,6 @@ public class Weapon{
public float x = 5f, y = 0f;
/** fraction of velocity that is random */
public float velocityRnd = 0f;
/** randomization of shot length */
public float lengthRand = 0f;
/** delay in ticks between shots */
public float shotDelay = 0;
/** The half-radius of the cone in which shooting will start. */

View File

@@ -161,6 +161,12 @@ public class ScriptConsoleFragment extends Table{
if(message.replaceAll(" ", "").isEmpty()) return;
//special case for 'clear' command
if(message.equals("clear")){
clearMessages();
return;
}
history.insert(1, message);
addMessage("[lightgray]> " + message.replace("[", "[["));

View File

@@ -4,9 +4,9 @@ import arc.util.ArcAnnotate.*;
import mindustry.gen.*;
import mindustry.world.*;
public class Reassembler extends Block{
public class Reconstructor extends Block{
public Reassembler(String name){
public Reconstructor(String name){
super(name);
}