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

Bugfixes / Balance of fuse

Browse Source
This commit is contained in:
Anuken
2019-05-30 23:05:15 -04:00
parent e7e4985761
commit 72cad1409f
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -1302,8 +1302,8 @@ public class Blocks implements ContentList{
Items.scrap, Bullets.flakScrap, Items.scrap, Bullets.flakScrap,
Items.lead, Bullets.flakLead Items.lead, Bullets.flakLead
); );
reload = 15f; reload = 16f;
range = 180f; range = 175f;
size = 2; size = 2;
burstSpacing = 5f; burstSpacing = 5f;
shots = 2; shots = 2;
@@ -1502,7 +1502,7 @@ public class Blocks implements ContentList{
ammo(Items.graphite, Bullets.fuseShot); ammo(Items.graphite, Bullets.fuseShot);
reload = 40f; reload = 40f;
shootShake = 4f; shootShake = 4f;
range = 80f; range = 110f;
recoil = 5f; recoil = 5f;
restitution = 0.1f; restitution = 0.1f;
size = 3; size = 3;

10
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -579,11 +579,12 @@ public class Bullets implements ContentList{
fuseShot = new BulletType(0.01f, 70){ fuseShot = new BulletType(0.01f, 70){
int rays = 3; int rays = 3;
float rayLength = 80f; float rayLength = 120f;
{ {
hitEffect = Fx.hitFuse; hitEffect = Fx.hitFuse;
lifetime = 13f; shootEffect = smokeEffect = Fx.none;
lifetime = 10f;
despawnEffect = Fx.none; despawnEffect = Fx.none;
pierce = true; pierce = true;
} }
@@ -599,14 +600,15 @@ public class Bullets implements ContentList{
public void draw(Bullet b){ public void draw(Bullet b){
super.draw(b); super.draw(b);
Draw.color(Color.WHITE, Pal.surge, b.fin()); Draw.color(Color.WHITE, Pal.surge, b.fin());
//Draw.alpha(b.fout());
for(int i = 0; i < 7; i++){ for(int i = 0; i < 7; i++){
Tmp.v1.trns(b.rot(), i * 8f); Tmp.v1.trns(b.rot(), i * 8f);
float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10); float sl = Mathf.clamp(b.fout() - 0.5f) * (80f - i * 10);
Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() + 90);
Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90); Shapes.tri(b.x + Tmp.v1.x, b.y + Tmp.v1.y, 4f, sl, b.rot() - 90);
} }
Shapes.tri(b.x, b.y, 13f, (rayLength + 50) * b.fout(), b.rot()); Shapes.tri(b.x, b.y, 20f * b.fout(), (rayLength + 50), b.rot());
Shapes.tri(b.x, b.y, 13f, 10f * b.fout(), b.rot() + 180f); Shapes.tri(b.x, b.y, 20f * b.fout(), 10f, b.rot() + 180f);
Draw.reset(); Draw.reset();
} }
}; };

9
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -51,10 +51,6 @@ public class Mechs implements ContentList{
player.healBy(Time.delta() * 0.09f); player.healBy(Time.delta() * 0.09f);
} }
@Override
public boolean alwaysUnlocked(){
return true;
}
}; };
delta = new Mech("delta-mech", false){ delta = new Mech("delta-mech", false){
@@ -240,6 +236,11 @@ public class Mechs implements ContentList{
bullet = Bullets.standardCopper; bullet = Bullets.standardCopper;
}}; }};
} }
@Override
public boolean alwaysUnlocked(){
return true;
}
}; };
javelin = new Mech("javelin-ship", true){ javelin = new Mech("javelin-ship", true){

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

@@ -559,7 +559,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
updateShooting(); //server simulates player shooting updateShooting(); //server simulates player shooting
} }
return; return;
}else{ }else if(world.isZone()){
//unlock mech when used //unlock mech when used
data.unlockContent(mech); data.unlockContent(mech);
} }