Minor visual changes
This commit is contained in:
@@ -3425,7 +3425,7 @@ public class Blocks{
|
|||||||
disperse = new ItemTurret("disperse"){{
|
disperse = new ItemTurret("disperse"){{
|
||||||
requirements(Category.turret, with(Items.carbide, 50, Items.oxide, 150, Items.silicon, 200, Items.beryllium, 350));
|
requirements(Category.turret, with(Items.carbide, 50, Items.oxide, 150, Items.silicon, 200, Items.beryllium, 350));
|
||||||
|
|
||||||
ammo(Items.scrap, new BasicBulletType(){{
|
ammo(Items.tungsten, new BasicBulletType(){{
|
||||||
damage = 40;
|
damage = 40;
|
||||||
speed = 8.5f;
|
speed = 8.5f;
|
||||||
width = height = 16;
|
width = height = 16;
|
||||||
@@ -3437,8 +3437,8 @@ public class Blocks{
|
|||||||
collidesTiles = false;
|
collidesTiles = false;
|
||||||
shootEffect = Fx.shootBig2;
|
shootEffect = Fx.shootBig2;
|
||||||
smokeEffect = Fx.shootSmokeDisperse;
|
smokeEffect = Fx.shootSmokeDisperse;
|
||||||
frontColor = trailColor = Color.white;
|
frontColor = Color.white;
|
||||||
backColor = Color.valueOf("869cbe");
|
backColor = trailColor = hitColor = Color.sky;
|
||||||
trailChance = 0.44f;
|
trailChance = 0.44f;
|
||||||
|
|
||||||
lifetime = 34f;
|
lifetime = 34f;
|
||||||
@@ -3447,10 +3447,6 @@ public class Blocks{
|
|||||||
trailEffect = Fx.disperseTrail;
|
trailEffect = Fx.disperseTrail;
|
||||||
|
|
||||||
hitEffect = despawnEffect = Fx.hitBulletColor;
|
hitEffect = despawnEffect = Fx.hitBulletColor;
|
||||||
|
|
||||||
//controversial
|
|
||||||
//homingDelay = 10f;
|
|
||||||
//homingPower = 0.01f;
|
|
||||||
}});
|
}});
|
||||||
|
|
||||||
|
|
||||||
@@ -3984,7 +3980,7 @@ public class Blocks{
|
|||||||
//region logic
|
//region logic
|
||||||
|
|
||||||
message = new MessageBlock("message"){{
|
message = new MessageBlock("message"){{
|
||||||
requirements(Category.logic, with(Items.graphite, 5));
|
requirements(Category.logic, with(Items.graphite, 5, Items.copper, 5));
|
||||||
}};
|
}};
|
||||||
|
|
||||||
switchBlock = new SwitchBlock("switch"){{
|
switchBlock = new SwitchBlock("switch"){{
|
||||||
|
|||||||
@@ -2500,29 +2500,16 @@ public class UnitTypes{
|
|||||||
spread = 3.5f;
|
spread = 3.5f;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
//TODO make this look nice
|
//TODO make this look nicer
|
||||||
bullet = new RailBulletType(){{
|
bullet = new RailBulletType(){{
|
||||||
length = 140f;
|
length = 140f;
|
||||||
damage = 50f;
|
damage = 45f;
|
||||||
hitColor = Color.valueOf("feb380");
|
hitColor = Color.valueOf("feb380");
|
||||||
hitEffect = endEffect = Fx.hitBulletColor;
|
hitEffect = endEffect = Fx.hitBulletColor;
|
||||||
pierceDamageFactor = 0.8f;
|
pierceDamageFactor = 0.8f;
|
||||||
|
|
||||||
smokeEffect = Fx.colorSpark;
|
smokeEffect = Fx.colorSpark;
|
||||||
|
|
||||||
//lines - messy
|
|
||||||
if(false)
|
|
||||||
smokeEffect = new Effect(22f, e -> {
|
|
||||||
color(e.color);
|
|
||||||
stroke(e.fout() * 0.9f + 0.6f);
|
|
||||||
|
|
||||||
Fx.rand.setSeed(e.id);
|
|
||||||
for(int i = 0; i < 7; i++){
|
|
||||||
Fx.v.trns(e.rotation, Fx.rand.random(8f, length - 8f));
|
|
||||||
Lines.lineAngleCenter(e.x + Fx.v.x, e.y + Fx.v.y, e.rotation + e.finpow(), e.foutpowdown() * 20f * Fx.rand.random(0.5f, 1f) + 0.3f);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
endEffect = new Effect(14f, e-> {
|
endEffect = new Effect(14f, e-> {
|
||||||
color(e.color);
|
color(e.color);
|
||||||
Drawf.tri(e.x, e.y, e.fout() * 1.5f, 5f, e.rotation);
|
Drawf.tri(e.x, e.y, e.fout() * 1.5f, 5f, e.rotation);
|
||||||
@@ -2542,12 +2529,23 @@ public class UnitTypes{
|
|||||||
Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f);
|
Drawf.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f);
|
||||||
});
|
});
|
||||||
|
|
||||||
lineEffect = new Effect(14f, e -> {
|
lineEffect = new Effect(20f, e -> {
|
||||||
if(!(e.data instanceof Vec2 v)) return;
|
if(!(e.data instanceof Vec2 v)) return;
|
||||||
|
|
||||||
stroke(e.fout() * 1.5f);
|
|
||||||
color(e.color);
|
color(e.color);
|
||||||
Lines.line(e.x, e.y, v.x, v.y);
|
stroke(e.fout() * 0.9f + 0.6f);
|
||||||
|
|
||||||
|
Fx.rand.setSeed(e.id);
|
||||||
|
for(int i = 0; i < 7; i++){
|
||||||
|
Fx.v.trns(e.rotation, Fx.rand.random(8f, v.dst(e.x, e.y) - 8f));
|
||||||
|
Lines.lineAngleCenter(e.x + Fx.v.x, e.y + Fx.v.y, e.rotation + e.finpow(), e.foutpowdown() * 20f * Fx.rand.random(0.5f, 1f) + 0.3f);
|
||||||
|
}
|
||||||
|
|
||||||
|
e.scaled(14f, b -> {
|
||||||
|
stroke(b.fout() * 1.5f);
|
||||||
|
color(e.color);
|
||||||
|
Lines.line(e.x, e.y, v.x, v.y);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
pointEffectSpace = 8f;
|
pointEffectSpace = 8f;
|
||||||
|
|||||||
@@ -24,4 +24,4 @@ android.useAndroidX=true
|
|||||||
#used for slow jitpack builds; TODO see if this actually works
|
#used for slow jitpack builds; TODO see if this actually works
|
||||||
org.gradle.internal.http.socketTimeout=100000
|
org.gradle.internal.http.socketTimeout=100000
|
||||||
org.gradle.internal.http.connectionTimeout=100000
|
org.gradle.internal.http.connectionTimeout=100000
|
||||||
archash=157fec7f27
|
archash=63916d3b6c
|
||||||
|
|||||||
Reference in New Issue
Block a user