mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-10 12:49:37 +07:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Anuken 2020-07-16 14:32:38 -04:00
parent 874aa6cf4a
commit e3f40cd968
4 changed files with 50 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -870,8 +870,15 @@ public class Blocks implements ContentList{
forceProjector = new ForceProjector("force-projector"){{ forceProjector = new ForceProjector("force-projector"){{
requirements(Category.effect, with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125)); requirements(Category.effect, with(Items.lead, 100, Items.titanium, 75, Items.silicon, 125));
size = 3; size = 3;
phaseRadiusBoost = 80f;
radius = 101.7f;
breakage = 750f;
cooldownNormal = 1.5f;
cooldownLiquid = 1.2f;
cooldownBrokenBase = 0.35f;
consumes.item(Items.phasefabric).boost(); consumes.item(Items.phasefabric).boost();
consumes.power(3f); consumes.power(4f);
}}; }};
shockMine = new ShockMine("shock-mine"){{ shockMine = new ShockMine("shock-mine"){{

21
core/src/mindustry/content/Bullets.java
View File

@ -27,7 +27,7 @@ public class Bullets implements ContentList{
fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag, fragGlass, fragExplosive, fragPlastic, fragSurge, fragGlassFrag, fragPlasticFrag,
//missiles //missiles
missileExplosive, missileIncendiary, missileSurge, missileSwarm, missileExplosive, missileIncendiary, missileSurge,
//standard //standard
standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall, standardCopper, standardDense, standardThorium, standardHoming, standardIncendiary, standardMechSmall,
@ -287,25 +287,6 @@ public class Bullets implements ContentList{
lightningLength = 14; lightningLength = 14;
}}; }};
missileSwarm = new MissileBulletType(2.7f, 12, "missile"){{
width = 8f;
height = 8f;
shrinkY = 0f;
drag = -0.003f;
homingRange = 60f;
keepVelocity = false;
splashDamageRadius = 25f;
splashDamage = 10f;
lifetime = 120f;
trailColor = Color.gray;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion;
weaveScale = 8f;
weaveMag = 2f;
}};
standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{ standardCopper = new BasicBulletType(2.5f, 9, "bullet"){{
width = 7f; width = 7f;
height = 9f; height = 9f;

39
core/src/mindustry/content/UnitTypes.java
View File

@ -373,6 +373,7 @@ public class UnitTypes implements ContentList{
}}); }});
}}; }};
//TODO implement
arkyid = new UnitType("arkyid"){{ arkyid = new UnitType("arkyid"){{
drag = 0.1f; drag = 0.1f;
speed = 0.5f; speed = 0.5f;
@ -400,7 +401,24 @@ public class UnitTypes implements ContentList{
x = 4f; x = 4f;
rotate = true; rotate = true;
shake = 1f; shake = 1f;
bullet = Bullets.missileSwarm; bullet = new MissileBulletType(2.7f, 12, "missile"){{
width = 8f;
height = 8f;
shrinkY = 0f;
drag = -0.003f;
homingRange = 60f;
keepVelocity = false;
splashDamageRadius = 25f;
splashDamage = 10f;
lifetime = 120f;
trailColor = Color.gray;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion;
weaveScale = 8f;
weaveMag = 2f;
}};
}}); }});
}}; }};
@ -670,7 +688,24 @@ public class UnitTypes implements ContentList{
x = 0f; x = 0f;
rotate = true; rotate = true;
ejectEffect = Fx.shellEjectSmall; ejectEffect = Fx.shellEjectSmall;
bullet = Bullets.flakScrap; bullet = new MissileBulletType(2.7f, 12, "missile"){{
width = 8f;
height = 8f;
shrinkY = 0f;
drag = -0.003f;
homingRange = 60f;
keepVelocity = false;
splashDamageRadius = 25f;
splashDamage = 10f;
lifetime = 120f;
trailColor = Color.gray;
backColor = Pal.bulletYellowBack;
frontColor = Pal.bulletYellow;
hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion;
weaveScale = 8f;
weaveMag = 2f;
}};
}}); }});
}}; }};

5
core/src/mindustry/core/Control.java
View File

@ -417,7 +417,10 @@ public class Control implements ApplicationListener, Loadable{
//just a regular reminder //just a regular reminder
if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){ if(!OS.prop("user.name").equals("anuke") && !OS.hasEnv("iknowwhatimdoing")){
if(mobile){ if(mobile){
ui.showInfo("[scarlet]6.0 doesn't work on mobile.[] Don't play it."); Runnable[] run = {null};
run[0] = () -> {
ui.showInfo("[scarlet]6.0 doesn't work on mobile.[] Don't play it.", run[0]);
};
}else{ }else{
ui.showInfo("[scarlet]6.0 is not supposed to be played.[] Go do something else."); ui.showInfo("[scarlet]6.0 is not supposed to be played.[] Go do something else.");
} }