Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Buffed all weapons and their prices, bugfixes

Browse Source
This commit is contained in:
Anuken
2018-02-02 16:24:53 -05:00
parent 9818f7e4ac
commit b320fad698
11 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/io/anuke/mindustry/entities/BulletType.java
View File

@@ -330,7 +330,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
Draw.reset();
}
},
spread = new BulletType(2.4f, 8) {
spread = new BulletType(2.4f, 9) {
{
lifetime = 70;
}
@@ -344,10 +344,10 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
Draw.reset();
}
},
cluster = new BulletType(4.4f, 13){
cluster = new BulletType(4.5f, 12){
{
lifetime = 60;
drag = 0.06f;
drag = 0.05f;
}
public void draw(Bullet b){
@@ -370,10 +370,10 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
Effects.effect(Fx.clusterbomb, b);
DamageArea.damage(!(b.owner instanceof Enemy), b.x, b.y, 22f, damage);
DamageArea.damage(!(b.owner instanceof Enemy), b.x, b.y, 35f, damage);
}
},
vulcan = new BulletType(4.5f, 11) {
vulcan = new BulletType(4.5f, 12) {
{
lifetime = 50;
}
@@ -395,7 +395,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
}
}
},
shockshell = new BulletType(5.4f, 10) {
shockshell = new BulletType(5.5f, 11) {
{
drag = 0.03f;
@@ -441,7 +441,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
Draw.reset();
}
},
beamlaser = new BulletType(0.001f, 35) {
beamlaser = new BulletType(0.001f, 38) {
float length = 230f;
{
drawSize = length*2f+20f;

5
core/src/io/anuke/mindustry/entities/Player.java
View File

@@ -151,8 +151,9 @@ public class Player extends SyncEntity{
stucktime = 0f;
}
if(stucktime > 10f){
if(stucktime > 20f){
damage(health+1); //die instantly
stucktime = 0f;
}
if(ui.chatfrag.chatOpen()) return;
@@ -281,7 +282,7 @@ public class Player extends SyncEntity{
Effects.effect(Fx.dashsmoke, x + Angles.x(), y + Angles.y());
}
if(dashing && Timers.get(this, "dashfx", 3)){
if(dashing && !dead && Timers.get(this, "dashfx", 3)){
Angles.translation(angle + 180, 3f);
Effects.effect(Fx.dashsmoke, x + Angles.x(), y + Angles.y());
}