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

Thermal generator effect tweaks

Browse Source
This commit is contained in:
Anuken
2021-07-21 09:02:08 -04:00
parent db13bffad6
commit fcb9ebb8c3
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/assets/bundles/bundle.properties
View File

@@ -1587,7 +1587,7 @@ unit.retusa.description = Places proximity mines. Repairs allied units.
unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret. unit.oxynoe.description = Fires structure-repairing streams of flame at nearby enemies. Targets nearby enemy projectiles with a point defense turret.
unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units. unit.cyerce.description = Fires seeking cluster-missiles at enemies. Repairs allied units.
unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies. unit.aegires.description = Shocks all enemy units and structures that enter its energy field. Repairs all allies.
unit.navanax.description = Fires massive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets. unit.navanax.description = Fires explosive EMP projectiles, dealing significant damage to enemy power networks and repairing allied structures. Melts nearby enemies with 4 autonomous laser turrets.
lst.read = Read a number from a linked memory cell. lst.read = Read a number from a linked memory cell.
lst.write = Write a number to a linked memory cell. lst.write = Write a number to a linked memory cell.

2
core/src/mindustry/content/Blocks.java
View File

@@ -1161,7 +1161,7 @@ public class Blocks implements ContentList{
requirements(Category.power, with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40)); requirements(Category.power, with(Items.copper, 40, Items.graphite, 35, Items.lead, 50, Items.silicon, 35, Items.metaglass, 40));
powerProduction = 1.8f; powerProduction = 1.8f;
generateEffect = Fx.redgeneratespark; generateEffect = Fx.redgeneratespark;
effectChance = 0.013f; effectChance = 0.011f;
size = 2; size = 2;
floating = true; floating = true;
ambientSound = Sounds.hum; ambientSound = Sounds.hum;

16
core/src/mindustry/content/Fx.java
View File

@@ -1526,12 +1526,16 @@ public class Fx{
}); });
}), }),
redgeneratespark = new Effect(80, e -> { redgeneratespark = new Effect(90, e -> {
color(Pal.redSpark, Color.gray, e.fin()); color(Pal.redSpark);
randLenVectors(e.id, 2, e.finpow() * 9f, (x, y) -> { alpha(e.fslope());
Fill.circle(e.x + x, e.y + y, e.fslope() * 1.8f);
}); rand.setSeed(e.id);
}), for(int i = 0; i < 2; i++){
v.set(e.finpow() * 9f * rand.nextFloat(), 0).rotate(rand.random(360f)).add(e.x, e.y);
Fill.circle(v.x, v.y, rand.random(1.4f, 2.4f));
}
}).layer(Layer.bullet - 1f),
generatespark = new Effect(18, e -> { generatespark = new Effect(18, e -> {
randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {

2
core/src/mindustry/world/draw/DrawArcSmelter.java
View File

@@ -22,8 +22,6 @@ public class DrawArcSmelter extends DrawBlock{
Draw.rect(bottom, build.x, build.y); Draw.rect(bottom, build.x, build.y);
if(build.warmup > 0f && flameColor.a > 0.001f){ if(build.warmup > 0f && flameColor.a > 0.001f){
Lines.stroke(circleStroke * build.warmup); Lines.stroke(circleStroke * build.warmup);
float si = Mathf.absin(flameRadiusScl, flameRadiusMag); float si = Mathf.absin(flameRadiusScl, flameRadiusMag);

2
gradle.properties
View File

@@ -10,4 +10,4 @@ kapt.include.compile.classpath=false
kotlin.stdlib.default.dependency=false kotlin.stdlib.default.dependency=false
#needed for android compilation #needed for android compilation
android.useAndroidX=true android.useAndroidX=true
archash=cc2e0588e1a87c732d0d155fe24932ae43d641bf archash=0242770e4a63299dbaed350f974f4fee1de81cf1