This commit is contained in:
Anuken
2020-09-30 18:56:37 -04:00
parent 7eb0da82de
commit a0394e4382
3 changed files with 5 additions and 3 deletions
+4
View File
@@ -480,6 +480,7 @@ public class Bullets implements ContentList{
puddleSize = 8f; puddleSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f;
}}; }};
heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{ heavyCryoShot = new LiquidBulletType(Liquids.cryofluid){{
@@ -489,6 +490,7 @@ public class Bullets implements ContentList{
puddleSize = 8f; puddleSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f;
}}; }};
heavySlagShot = new LiquidBulletType(Liquids.slag){{ heavySlagShot = new LiquidBulletType(Liquids.slag){{
@@ -499,6 +501,7 @@ public class Bullets implements ContentList{
damage = 6f; damage = 6f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f;
}}; }};
heavyOilShot = new LiquidBulletType(Liquids.oil){{ heavyOilShot = new LiquidBulletType(Liquids.oil){{
@@ -508,6 +511,7 @@ public class Bullets implements ContentList{
puddleSize = 8f; puddleSize = 8f;
drag = 0.001f; drag = 0.001f;
ammoMultiplier = 2f; ammoMultiplier = 2f;
statusDuration = 60f * 4f;
}}; }};
driverBolt = new MassDriverBolt(); driverBolt = new MassDriverBolt();
@@ -25,7 +25,7 @@ public class LiquidBulletType extends BulletType{
} }
ammoMultiplier = 1f; ammoMultiplier = 1f;
lifetime = 74f; lifetime = 34f;
statusDuration = 60f * 2f; statusDuration = 60f * 2f;
despawnEffect = Fx.none; despawnEffect = Fx.none;
hitEffect = Fx.hitLiquid; hitEffect = Fx.hitLiquid;
@@ -186,8 +186,6 @@ public class CustomRulesDialog extends BaseDialog{
}, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row(); }, () -> ui.picker.show(rules.ambientLight, rules.ambientLight::set)).left().width(250f).row();
main.button("@rules.weather", this::weatherDialog).width(250f).left().row(); main.button("@rules.weather", this::weatherDialog).width(250f).left().row();
//TODO add weather patterns
} }
void number(String text, Floatc cons, Floatp prov){ void number(String text, Floatc cons, Floatp prov){