diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index e7dddbe233..29cbd26503 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1513,6 +1513,7 @@ public class Blocks implements ContentList{ tier = 4; updateEffect = Fx.pulverizeMedium; drillEffect = Fx.mineBig; + envEnabled |= Env.space; consumes.power(1.10f); consumes.liquid(Liquids.water, 0.08f).boost(); @@ -2418,15 +2419,6 @@ public class Blocks implements ContentList{ consumes.power(4f); }}; - //TODO - payloadLaunchPad = new PayloadLaunchPad("payload-launch-pad"){{ - requirements(Category.units, BuildVisibility.debugOnly, ItemStack.with(Items.titanium, 200, Items.silicon, 150, Items.lead, 250, Items.plastanium, 75)); - size = 5; - launchTime = 60f; - hasPower = true; - consumes.power(7f); - }}; - interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{ requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000)); researchCostMultiplier = 0.1f; diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java index 507a451dce..e5f72ef202 100644 --- a/core/src/mindustry/entities/comp/UnitComp.java +++ b/core/src/mindustry/entities/comp/UnitComp.java @@ -390,7 +390,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I } } - drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f) * dragMultiplier; + drag = type.drag * (isGrounded() ? (floorOn().dragMultiplier) : 1f) * dragMultiplier * state.rules.dragMultiplier; //apply knockback based on spawns if(team != state.rules.waveTeam && state.hasSpawns() && (!net.client() || isLocal())){ diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index af7d4eda13..f6698dc7bc 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -81,6 +81,8 @@ public class Rules{ public int winWave = 0; /** Base unit cap. Can still be increased by blocks. */ public int unitCap = 0; + /** Environment drag multiplier. */ + public float dragMultiplier = 1f; /** Environmental flags that dictate visuals & how blocks function. */ public int environment = Env.terrestrial | Env.spores | Env.groundOil | Env.groundWater | Env.oxygen; /** Attributes of the environment. */ diff --git a/core/src/mindustry/maps/planet/AsteroidGenerator.java b/core/src/mindustry/maps/planet/AsteroidGenerator.java index 9e63e755aa..43dc0c057d 100644 --- a/core/src/mindustry/maps/planet/AsteroidGenerator.java +++ b/core/src/mindustry/maps/planet/AsteroidGenerator.java @@ -138,6 +138,7 @@ public class AsteroidGenerator extends BlankPlanetGenerator{ camPos = new Vec3(1.2388899f, 1.6047299f, 2.4758825f); }}; //state.rules.backgroundTexture = "sprites/space.png"; + state.rules.dragMultiplier = 0.5f; state.rules.borderDarkness = false; state.rules.environment = Env.space; } diff --git a/core/src/mindustry/mod/ClassMap.java b/core/src/mindustry/mod/ClassMap.java index 9599378eb5..839410441d 100644 --- a/core/src/mindustry/mod/ClassMap.java +++ b/core/src/mindustry/mod/ClassMap.java @@ -163,7 +163,6 @@ public class ClassMap{ classes.put("StackConveyor", mindustry.world.blocks.distribution.StackConveyor.class); classes.put("StackConveyorBuild", mindustry.world.blocks.distribution.StackConveyor.StackConveyorBuild.class); classes.put("AirBlock", mindustry.world.blocks.environment.AirBlock.class); - classes.put("Bush", mindustry.world.blocks.environment.Bush.class); classes.put("Cliff", mindustry.world.blocks.environment.Cliff.class); classes.put("DoubleOverlayFloor", mindustry.world.blocks.environment.DoubleOverlayFloor.class); classes.put("EmptyFloor", mindustry.world.blocks.environment.EmptyFloor.class); @@ -173,12 +172,10 @@ public class ClassMap{ classes.put("Prop", mindustry.world.blocks.environment.Prop.class); classes.put("ShallowLiquid", mindustry.world.blocks.environment.ShallowLiquid.class); classes.put("SpawnBlock", mindustry.world.blocks.environment.SpawnBlock.class); - classes.put("StaticClusterWall", mindustry.world.blocks.environment.StaticClusterWall.class); classes.put("StaticTree", mindustry.world.blocks.environment.StaticTree.class); classes.put("StaticWall", mindustry.world.blocks.environment.StaticWall.class); classes.put("TreeBlock", mindustry.world.blocks.environment.TreeBlock.class); classes.put("WallOreBlock", mindustry.world.blocks.environment.WallOreBlock.class); - classes.put("WavingProp", mindustry.world.blocks.environment.WavingProp.class); classes.put("WobbleProp", mindustry.world.blocks.environment.WobbleProp.class); classes.put("BlockForge", mindustry.world.blocks.experimental.BlockForge.class); classes.put("BlockForgeBuild", mindustry.world.blocks.experimental.BlockForge.BlockForgeBuild.class);