mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-01-10 23:28:52 +07:00
Removed cliffs / Nerfed explosion bombing
This commit is contained in:
parent
bab43859f5
commit
27e9b5aeb9
Binary file not shown.
Before Width: | Height: | Size: 298 B |
@ -1,6 +1,7 @@
|
||||
package mindustry.ai;
|
||||
|
||||
import arc.*;
|
||||
import arc.math.*;
|
||||
import arc.struct.*;
|
||||
import arc.util.ArcAnnotate.*;
|
||||
import arc.util.*;
|
||||
@ -68,7 +69,7 @@ public class BaseRegistry{
|
||||
}
|
||||
schem.tiles.removeAll(s -> s.block.buildVisibility == BuildVisibility.sandboxOnly);
|
||||
|
||||
part.tier = schem.tiles.sumf(s -> s.block.buildCost / s.block.buildCostMultiplier);
|
||||
part.tier = schem.tiles.sumf(s -> Mathf.pow(s.block.buildCost / s.block.buildCostMultiplier, 1.2f));
|
||||
|
||||
if(part.core != null){
|
||||
cores.add(part);
|
||||
|
@ -292,11 +292,6 @@ public class Blocks implements ContentList{
|
||||
attributes.set(Attribute.water, 0.3f);
|
||||
}};
|
||||
|
||||
cliffs = new StaticWall("cliffs"){{
|
||||
variants = 1;
|
||||
fillsTile = false;
|
||||
}};
|
||||
|
||||
stoneWall = new StaticWall("stone-wall"){{
|
||||
variants = 2;
|
||||
}};
|
||||
@ -1493,7 +1488,7 @@ public class Blocks implements ContentList{
|
||||
reloadTime = 35f;
|
||||
shootCone = 40f;
|
||||
rotatespeed = 8f;
|
||||
powerUse = 4f;
|
||||
powerUse = 4.5f;
|
||||
targetAir = false;
|
||||
range = 90f;
|
||||
shootEffect = Fx.lightningShoot;
|
||||
|
@ -327,8 +327,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
|
||||
|
||||
/** Actually destroys the unit, removing it and creating explosions. **/
|
||||
public void destroy(){
|
||||
float explosiveness = 2f + item().explosiveness * stack().amount;
|
||||
float flammability = item().flammability * stack().amount;
|
||||
float explosiveness = 2f + item().explosiveness * stack().amount / 2f;
|
||||
float flammability = item().flammability * stack().amount / 2f;
|
||||
Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, bounds() / 2f, Pal.darkFlame, state.rules.damageExplosions);
|
||||
|
||||
float shake = hitSize / 3f;
|
||||
|
@ -48,7 +48,8 @@ public abstract class SaveFileReader{
|
||||
"holostone", "dacite",
|
||||
"holostone-wall", "dacite-wall",
|
||||
"rock", "boulder",
|
||||
"snowrock", "snow-boulder"
|
||||
"snowrock", "snow-boulder",
|
||||
"cliffs", "stone-wall"
|
||||
);
|
||||
|
||||
protected final ReusableByteOutStream byteOutput = new ReusableByteOutStream();
|
||||
|
@ -69,7 +69,7 @@ public class LogicBlock extends Block{
|
||||
if(name.contains("-")){
|
||||
String[] split = name.split("-");
|
||||
//filter out 'large' at the end of block names
|
||||
if(split.length >= 2 && split[split.length - 1].equals("large")){
|
||||
if(split.length >= 2 && (split[split.length - 1].equals("large") || Strings.canParseFloat(split[split.length - 1]))){
|
||||
name = split[split.length - 2];
|
||||
}else{
|
||||
name = split[split.length - 1];
|
||||
|
Loading…
Reference in New Issue
Block a user