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

Fixed homing PR

Browse Source
This commit is contained in:
Anuken
2020-05-21 21:17:34 -04:00
parent 807d7c2084
commit c980e72f52
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Bullets.java
+3 -3
View File
@@ -86,7 +86,7 @@ public class Bullets implements ContentList{
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 25f; splashDamageRadius = 25f;
splashDamage = 33f; splashDamage = 33f;
homingPower = 2f; homingPower = 0.08f;
homingRange = 50f; homingRange = 50f;
}}; }};
@@ -230,7 +230,7 @@ public class Bullets implements ContentList{
bulletHeight = 8f; bulletHeight = 8f;
bulletShrink = 0f; bulletShrink = 0f;
drag = -0.01f; drag = -0.01f;
homingPower = 7f; homingPower = 0.08f;
splashDamageRadius = 10f; splashDamageRadius = 10f;
splashDamage = 10f; splashDamage = 10f;
lifetime = 160f; lifetime = 160f;
@@ -337,7 +337,7 @@ public class Bullets implements ContentList{
standardHoming = new BasicBulletType(3f, 9, "bullet"){{ standardHoming = new BasicBulletType(3f, 9, "bullet"){{
bulletWidth = 7f; bulletWidth = 7f;
bulletHeight = 9f; bulletHeight = 9f;
homingPower = 5f; homingPower = 0.08f;
reloadMultiplier = 1.4f; reloadMultiplier = 1.4f;
ammoMultiplier = 5; ammoMultiplier = 5;
lifetime = 60f; lifetime = 60f;
core/src/mindustry/entities/bullet/BulletType.java
-2
View File
@@ -75,8 +75,6 @@ public abstract class BulletType extends Content{
public int incendAmount = 0; public int incendAmount = 0;
public float incendSpread = 8f; public float incendSpread = 8f;
public float incendChance = 1f; public float incendChance = 1f;
//Number from 0 - 1 for how quickly it should turn
public float homingPower = 0f; public float homingPower = 0f;
public float homingRange = 50f; public float homingRange = 50f;
core/src/mindustry/entities/bullet/MissileBulletType.java
+5 -6
View File
@@ -1,11 +1,10 @@
package mindustry.entities.bullet; package mindustry.entities.bullet;
import arc.graphics.Color; import arc.graphics.*;
import arc.math.Mathf; import arc.math.*;
import arc.util.Time; import mindustry.content.*;
import mindustry.content.Fx;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.graphics.Pal; import mindustry.graphics.*;
public class MissileBulletType extends BasicBulletType{ public class MissileBulletType extends BasicBulletType{
protected Color trailColor = Pal.missileYellowBack; protected Color trailColor = Pal.missileYellowBack;
@@ -14,7 +13,7 @@ public class MissileBulletType extends BasicBulletType{
super(speed, damage, bulletSprite); super(speed, damage, bulletSprite);
backColor = Pal.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Pal.missileYellow; frontColor = Pal.missileYellow;
homingPower = 7f; homingPower = 0.08f;
hitSound = Sounds.explosion; hitSound = Sounds.explosion;
} }