Text field dialog cleanup

This commit is contained in:
Anuken
2020-07-15 10:01:01 -04:00
parent 7f6026bd52
commit fd89911dd4
11 changed files with 54 additions and 150 deletions

View File

@@ -1369,8 +1369,8 @@ public class Blocks implements ContentList{
Items.pyratite, Bullets.pyraFlame
);
recoilAmount = 0f;
reloadTime = 5f;
coolantMultiplier = 2f;
reloadTime = 6f;
coolantMultiplier = 1.5f;
range = 60f;
shootCone = 50f;
targetAir = false;

View File

@@ -452,7 +452,7 @@ public class Bullets implements ContentList{
}
};
basicFlame = new BulletType(3f, 30f){
basicFlame = new BulletType(3f, 15f){
{
ammoMultiplier = 3f;
hitSize = 7f;
@@ -472,31 +472,21 @@ public class Bullets implements ContentList{
public float range(){
return 50f;
}
@Override
public void draw(Bullet b){
}
};
pyraFlame = new BulletType(3.3f, 45f){
{
ammoMultiplier = 4f;
hitSize = 7f;
lifetime = 42f;
pierce = true;
drag = 0.05f;
statusDuration = 60f * 6;
shootEffect = Fx.shootPyraFlame;
hitEffect = Fx.hitFlameSmall;
despawnEffect = Fx.none;
status = StatusEffects.burning;
hittable = false;
}
@Override
public void draw(Bullet b){
}
};
pyraFlame = new BulletType(3.3f, 22f){{
ammoMultiplier = 4f;
hitSize = 7f;
lifetime = 42f;
pierce = true;
drag = 0.05f;
statusDuration = 60f * 6;
shootEffect = Fx.shootPyraFlame;
hitEffect = Fx.hitFlameSmall;
despawnEffect = Fx.none;
status = StatusEffects.burning;
hittable = false;
}};
waterShot = new LiquidBulletType(Liquids.water){{
knockback = 0.7f;

View File

@@ -84,7 +84,20 @@ public class UnitTypes implements ContentList{
reload = 14f;
recoil = 1f;
ejectEffect = Fx.none;
bullet = Bullets.basicFlame;
bullet = new BulletType(3f, 30f){{
ammoMultiplier = 3f;
hitSize = 7f;
lifetime = 42f;
pierce = true;
drag = 0.05f;
statusDuration = 60f * 4;
shootEffect = Fx.shootSmallFlame;
hitEffect = Fx.hitFlameSmall;
despawnEffect = Fx.none;
status = StatusEffects.burning;
keepVelocity = false;
hittable = false;
}};
}});
}};
@@ -640,16 +653,25 @@ public class UnitTypes implements ContentList{
risse = new UnitType("risse"){{
speed = 1.3f;
drag = 0.1f;
hitsize = 8f;
hitsize = 10f;
health = 130;
immunities = ObjectSet.with(StatusEffects.wet);
weapons.add(new Weapon("mount-weapon"){{
reload = 10f;
x = 1.25f;
x = 4f;
rotate = true;
ejectEffect = Fx.shellEjectSmall;
bullet = Bullets.standardCopper;
}});
weapons.add(new Weapon("missiles-mount"){{
mirror = false;
reload = 20f;
x = 0f;
rotate = true;
ejectEffect = Fx.shellEjectSmall;
bullet = Bullets.flakScrap;
}});
}};
minke = new UnitType("minke"){{