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

Titan cleanup

Browse Source
This commit is contained in:
Anuken
2021-12-04 15:51:17 -05:00
parent 5103c95f2e
commit 30bfab34ee
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2840,7 +2840,7 @@ public class Blocks{
range = 180; range = 180;
shootCone = 3f; shootCone = 3f;
health = 300 * size * size; health = 300 * size * size;
rotateSpeed = 1.8f; rotateSpeed = 1.6f;
limitRange(); limitRange();
}}; }};
@@ -2947,7 +2947,7 @@ public class Blocks{
ammo( ammo(
//TODO ammo types to be defined later //TODO ammo types to be defined later
Items.fissileMatter, new ArtilleryBulletType(2f, 40, "shell"){{ Items.fissileMatter, new ArtilleryBulletType(2.5f, 40, "shell"){{
//TODO FX; smoke, shockwave, not green bomb //TODO FX; smoke, shockwave, not green bomb
hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke); hitEffect = new MultiEffect(Fx.titanExplosion, Fx.titanSmoke);
despawnEffect = Fx.none; despawnEffect = Fx.none;
@@ -2955,11 +2955,11 @@ public class Blocks{
lifetime = 140f; lifetime = 140f;
height = 16f; height = 16f;
width = 14.2f; width = 14.2f;
ammoMultiplier = 4f;
splashDamageRadius = 60f; splashDamageRadius = 60f;
splashDamage = 100f; splashDamage = 100f;
backColor = hitColor = trailColor = Pal.berylShot; backColor = hitColor = trailColor = Pal.berylShot;
frontColor = Color.valueOf("f0ffde"); frontColor = Color.valueOf("f0ffde");
ammoMultiplier = 1f;
status = StatusEffects.blasted; status = StatusEffects.blasted;

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

@@ -344,7 +344,13 @@ public class Fx{
stroke(e.fout() * 3f); stroke(e.fout() * 3f);
float circleRad = 6f + e.finpow() * 60f; float circleRad = 6f + e.finpow() * 60f;
Lines.circle(e.x, e.y, circleRad); Lines.circle(e.x, e.y, circleRad);
Lines.spikes(e.x, e.y, circleRad + 6f, 32f * e.foutpow(), 10);
rand.setSeed(e.id);
for(int i = 0; i < 16; i++){
float angle = rand.random(360f);
float lenRand = rand.random(0.5f, 1f);
Lines.lineAngle(e.x, e.y, angle, e.foutpow() * 50f * rand.random(1f, 0.6f) + 2f, e.finpow() * 70f * lenRand + 6f);
}
}), }),
titanSmoke = new Effect(300f, 300f, b -> { titanSmoke = new Effect(300f, 300f, b -> {

2
core/src/mindustry/maps/planet/ErekirPlanetGenerator.java
View File

@@ -186,7 +186,7 @@ public class ErekirPlanetGenerator extends PlanetGenerator{
if(nearAir(x, y)){ if(nearAir(x, y)){
if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.59f){ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.59f){
block = Blocks.graphiticWall; block = Blocks.graphiticWall;
}else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 37f, 1f) > 0.68f){ }else if(block != Blocks.carbonWall && noise(x + 782, y, 4, 0.8f, 36f, 1f) > 0.66f){
ore = Blocks.wallOreBeryl; ore = Blocks.wallOreBeryl;
} }
//TODO generate tungsten, or not? //TODO generate tungsten, or not?

2
gradle.properties
View File

@@ -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=f9abed08 archash=ed2c6c1e