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

Flux speed buff / Server drowning / Delta buff

Browse Source
This commit is contained in:
Anuken
2018-09-04 19:02:40 -04:00
parent 7b90544d91
commit baa7cb3a10
10 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/content/AmmoTypes.java
View File

@@ -11,7 +11,7 @@ import io.anuke.mindustry.type.ContentList;
public class AmmoTypes implements ContentList{
public static AmmoType bulletCopper, bulletDense, bulletThorium, bulletSilicon, bulletPyratite,
shotgunTungsten, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech,
shock, bombExplosive, bombIncendiary, bombOil, shellCarbide, flamerThermite, weaponMissile, weaponMissileSwarm, bulletMech,
healBlaster, bulletGlaive,
flakExplosive, flakPlastic, flakSurge,
missileExplosive, missileIncindiary, missileSurge,
@@ -43,7 +43,7 @@ public class AmmoTypes implements ContentList{
inaccuracy = 2f;
}};
shotgunTungsten = new AmmoType(TurretBullets.lightning){{
shock = new AmmoType(TurretBullets.lightning){{
shootEffect = BulletFx.hitLancer;
smokeEffect = Fx.none;
}};

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

@@ -107,7 +107,7 @@ public class Mechs implements ContentList{
if(player.altHeat >= 0.91f){
Effects.shake(3f, 3f, player);
for(int i = 0; i < 8; i++){
Timers.run(Mathf.random(5f), () -> Lightning.create(player.getTeam(), BulletFx.hitLancer, player.getTeam().color, 10f, player.x, player.y, Mathf.random(360f), 20));
Timers.run(Mathf.random(5f), () -> Lightning.create(player.getTeam(), BulletFx.hitLancer, player.getTeam().color, 15f, player.x, player.y, Mathf.random(360f), 20));
}
player.altHeat = 0f;
}

2
core/src/io/anuke/mindustry/content/Weapons.java
View File

@@ -96,7 +96,7 @@ public class Weapons implements ContentList{
inaccuracy = 0f;
velocityRnd = 0.2f;
ejectEffect = Fx.none;
ammo = AmmoTypes.shotgunTungsten;
ammo = AmmoTypes.shock;
}};
flakgun = new Weapon("flakgun"){{

2
core/src/io/anuke/mindustry/content/bullets/TurretBullets.java
View File

@@ -229,7 +229,7 @@ public class TurretBullets extends BulletList implements ContentList{
statusIntensity = 0.5f;
}
};
lightning = new BulletType(0.001f, 10){
lightning = new BulletType(0.001f, 14){
{
lifetime = 1;
despawneffect = Fx.none;