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

Removed all usage of drawBullet, switched to BasicBulletType

Browse Source
This commit is contained in:
Anuken
2018-05-27 15:49:01 -04:00
parent 0b28f97d8f
commit 736552f3b1
2 changed files with 35 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
View File

@@ -1,31 +1,42 @@
package io.anuke.mindustry.entities.bullet;
import com.badlogic.gdx.graphics.Color;
import io.anuke.mindustry.content.bullets.TurretBullets;
import io.anuke.mindustry.graphics.Palette;
import io.anuke.ucore.graphics.Draw;
import io.anuke.ucore.util.Angles;
import io.anuke.ucore.util.Mathf;
/**A BulletType for most ammo-based bullets shot from turrets and units.*/
public abstract class BasicBulletType extends BulletType {
public class BasicBulletType extends BulletType {
public Color backColor = Palette.bulletYellowBack, frontColor = Palette.bulletYellow;
public String bulletSprite = "bullet";
public float bulletWidth = 5f, bulletHeight = 7f;
public float bulletShrink = 0.5f;
public boolean frag;
public int fragBullets = 9;
public float fragVelocityMin = 0.2f, fragVelocityMax = 1f;
public BulletType fragBullet = TurretBullets.basicLeadFrag;
public BulletType fragBullet = null;
public BasicBulletType(float speed, float damage) {
super(speed, damage);
}
@Override
public void draw(Bullet b) {
float height = bulletHeight * ((1f - bulletShrink) + bulletShrink * b.fout());
Draw.color(backColor);
Draw.rect(bulletSprite + "-back", b.x, b.y, bulletWidth, height, b.angle() - 90);
Draw.color(frontColor);
Draw.rect(bulletSprite, b.x, b.y, bulletWidth, height, b.angle() - 90);
Draw.color();
}
@Override
public void hit(Bullet b, float x, float y) {
super.hit(b, x, y);
if(frag) {
if(fragBullet != null) {
for (int i = 0; i < fragBullets; i++) {
float len = Mathf.random(1f, 7f);
float a = Mathf.random(360f);
@@ -38,7 +49,7 @@ public abstract class BasicBulletType extends BulletType {
@Override
public void despawned(Bullet b) {
if(frag){
if(fragBullet != null){
hit(b);
}
}