Fixed turrets hitting friendly players / Fixed android compile error
This commit is contained in:
@@ -13,13 +13,6 @@ public class Liquids {
|
||||
heatCapacity = 0.4f;
|
||||
}
|
||||
},
|
||||
plasma = new Liquid("plasma", Color.CORAL) {
|
||||
{
|
||||
flammability = 0.4f;
|
||||
viscosity = 0.1f;
|
||||
heatCapacity = 0.2f;
|
||||
}
|
||||
},
|
||||
lava = new Liquid("lava", Color.valueOf("e37341")) {
|
||||
{
|
||||
temperature = 0.7f;
|
||||
@@ -38,12 +31,5 @@ public class Liquids {
|
||||
heatCapacity = 0.75f;
|
||||
temperature = 0.5f;
|
||||
}
|
||||
},
|
||||
sulfuricAcid = new Liquid("sulfuricAcid", Color.YELLOW) {
|
||||
{
|
||||
flammability = 0.4f;
|
||||
explosiveness = 0.4f;
|
||||
heatCapacity = 0.4f;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -131,17 +131,18 @@ public class WeaponBlocks{
|
||||
};
|
||||
}},
|
||||
|
||||
chainturret = new Turret("chainturret"){
|
||||
chainturret = new Turret("chainturret"){{
|
||||
|
||||
},
|
||||
}},
|
||||
|
||||
titanturret = new Turret("titancannon"){
|
||||
titanturret = new Turret("titancannon"){{
|
||||
|
||||
},
|
||||
}},
|
||||
|
||||
fornaxcannon = new PowerTurret("fornaxcannon") {
|
||||
|
||||
},
|
||||
|
||||
missileturret = new PowerTurret("missileturret") {
|
||||
|
||||
};
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.anuke.mindustry.content.fx.Fx;
|
||||
import io.anuke.mindustry.entities.Bullet;
|
||||
import io.anuke.mindustry.entities.BulletType;
|
||||
import io.anuke.mindustry.entities.effect.DamageArea;
|
||||
import io.anuke.mindustry.entities.effect.Lightning;
|
||||
import io.anuke.mindustry.graphics.Palette;
|
||||
import io.anuke.mindustry.resource.Liquid;
|
||||
import io.anuke.ucore.core.Effects;
|
||||
@@ -168,6 +169,21 @@ public class TurretBullets {
|
||||
status = StatusEffects.oiled;
|
||||
statusIntensity = 0.5f;
|
||||
}
|
||||
},
|
||||
lightning = new BulletType(0.001f, 5) {
|
||||
{
|
||||
lifetime = 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void draw(Bullet b) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void init(Bullet b) {
|
||||
new Lightning(b.team, b, b.x, b.y, b.angle(), 30);
|
||||
}
|
||||
};
|
||||
|
||||
private static void drawBullet(Color first, Color second, String name, float x, float y, float w, float h, float rot){
|
||||
|
||||
Reference in New Issue
Block a user