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

Fixed lightning / Implemented delta ability and gun

Browse Source
This commit is contained in:
Anuken
2018-08-23 09:02:09 -04:00
parent 4c224d0b9c
commit 8f12c3f1a8
7 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,10 +36,9 @@ public class AmmoTypes implements ContentList{
inaccuracy = 2f;
}};
shotgunTungsten = new AmmoType(WeaponBullets.tungstenShotgun){{
shootEffect = ShootFx.shootBig;
smokeEffect = ShootFx.shootBigSmoke;
recoil = 1f;
shotgunTungsten = new AmmoType(TurretBullets.lightning){{
shootEffect = BulletFx.hitLancer;
smokeEffect = Fx.none;
}};
shellCarbide = new AmmoType(WeaponBullets.shellCarbide){{

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

@@ -4,11 +4,13 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.g2d.TextureRegion;
import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.utils.Array;
import io.anuke.mindustry.content.fx.BulletFx;
import io.anuke.mindustry.content.fx.UnitFx;
import io.anuke.mindustry.entities.Player;
import io.anuke.mindustry.entities.Unit;
import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.effect.Fire;
import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.mindustry.graphics.Shaders;
@@ -57,13 +59,17 @@ public class Mechs implements ContentList{
weapon = Weapons.shockgun;
trailColorTo = Color.valueOf("d3ddff");
maxSpeed = 5f;
altChargeAlpha = 0.05f;
altChargeAlpha = 0.03f;
}
@Override
public void updateAlt(Player player){
if(player.altHeat > 0.01f){
player.applyEffect(StatusEffects.overdrive, 0.1f);
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));
}
player.altHeat = 0f;
}
}

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

@@ -65,13 +65,12 @@ public class Weapons implements ContentList{
shockgun = new Weapon("shockgun"){{
length = 1f;
reload = 50f;
reload = 40f;
roundrobin = true;
shots = 6;
inaccuracy = 10f;
velocityRnd = 0.7f;
shake = 2f;
ejectEffect = ShootFx.shellEjectSmall;
shots = 1;
inaccuracy = 0f;
velocityRnd = 0.2f;
ejectEffect = Fx.none;
ammo = AmmoTypes.shotgunTungsten;
}};

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

@@ -35,7 +35,7 @@ public class TurretBullets extends BulletList implements ContentList{
@Override
public void load(){
healBullet = new BulletType(5.2f, 25){
healBullet = new BulletType(5.2f, 19){
float healAmount = 20f;
{