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

Misc fixes

Browse Source
This commit is contained in:
Anuken
2022-09-01 08:57:43 -04:00
parent 56856c8166
commit 2d47ff893b
3 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/Blocks.java
+3 -3
View File
@@ -3656,7 +3656,7 @@ public class Blocks{
cyclone = new ItemTurret("cyclone"){{ cyclone = new ItemTurret("cyclone"){{
requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80)); requirements(Category.turret, with(Items.copper, 200, Items.titanium, 125, Items.plastanium, 80));
ammo( ammo(
Items.metaglass, new FlakBulletType(4f, 10){{ Items.metaglass, new FlakBulletType(4f, 6){{
ammoMultiplier = 2f; ammoMultiplier = 2f;
shootEffect = Fx.shootSmall; shootEffect = Fx.shootSmall;
reloadMultiplier = 0.8f; reloadMultiplier = 0.8f;
@@ -3678,7 +3678,7 @@ public class Blocks{
explodeRange = 20f; explodeRange = 20f;
collidesGround = true; collidesGround = true;
}}, }},
Items.blastCompound, new FlakBulletType(4f, 5){{ Items.blastCompound, new FlakBulletType(4f, 8){{
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
ammoMultiplier = 5f; ammoMultiplier = 5f;
splashDamage = 45f; splashDamage = 45f;
@@ -3688,7 +3688,7 @@ public class Blocks{
status = StatusEffects.blasted; status = StatusEffects.blasted;
statusDuration = 60f; statusDuration = 60f;
}}, }},
Items.plastanium, new FlakBulletType(4f, 6){{ Items.plastanium, new FlakBulletType(4f, 8){{
ammoMultiplier = 4f; ammoMultiplier = 4f;
splashDamageRadius = 40f; splashDamageRadius = 40f;
splashDamage = 37.5f; splashDamage = 37.5f;
core/src/mindustry/entities/abilities/ShieldArcAbility.java
+4 -9
View File
@@ -101,7 +101,10 @@ public class ShieldArcAbility extends Ability{
Draw.color(unit.team.color, Color.white, Mathf.clamp(alpha)); Draw.color(unit.team.color, Color.white, Mathf.clamp(alpha));
var pos = paramPos.set(x, y).rotate(unit.rotation - 90f).add(unit); var pos = paramPos.set(x, y).rotate(unit.rotation - 90f).add(unit);
if(Vars.renderer.animateShields){ if(!Vars.renderer.animateShields){
Draw.alpha(0.4f);
}
if(region != null){ if(region != null){
Vec2 rp = offsetRegion ? pos : Tmp.v1.set(unit); Vec2 rp = offsetRegion ? pos : Tmp.v1.set(unit);
Draw.yscl = widthScale; Draw.yscl = widthScale;
@@ -113,14 +116,6 @@ public class ShieldArcAbility extends Ability{
Lines.stroke(width * widthScale); Lines.stroke(width * widthScale);
Lines.arc(pos.x, pos.y, radius, angle / 360f, unit.rotation + angleOffset - angle / 2f); Lines.arc(pos.x, pos.y, radius, angle / 360f, unit.rotation + angleOffset - angle / 2f);
} }
}else{
//TODO
Lines.stroke(1.5f);
Draw.alpha(0.09f);
Fill.poly(pos.x, pos.y, 6, radius);
Draw.alpha(1f);
Lines.poly(pos.x, pos.y, 6, radius);
}
Draw.reset(); Draw.reset();
} }
} }
core/src/mindustry/type/unit/ErekirUnitType.java
+3
View File
@@ -1,7 +1,9 @@
package mindustry.type.unit; package mindustry.type.unit;
import mindustry.content.*;
import mindustry.graphics.*; import mindustry.graphics.*;
import mindustry.type.*; import mindustry.type.*;
import mindustry.type.ammo.*;
import mindustry.world.meta.*; import mindustry.world.meta.*;
/** Config class for special Erekir unit properties. */ /** Config class for special Erekir unit properties. */
@@ -11,6 +13,7 @@ public class ErekirUnitType extends UnitType{
super(name); super(name);
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
envDisabled = Env.space; envDisabled = Env.space;
ammoType = new ItemAmmoType(Items.beryllium);
researchCostMultiplier = 10f; researchCostMultiplier = 10f;
} }
} }