Misc minor fixes
This commit is contained in:
@@ -1721,6 +1721,8 @@ hint.presetLaunch = Gray [accent]landing zone sectors[], such as [accent]Frozen
|
|||||||
hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
|
hint.presetDifficulty = This sector has a [scarlet]high enemy threat level[].\nLaunching to such sectors is [accent]not recommended[] without proper technology and preparation.
|
||||||
hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
|
hint.coreIncinerate = After the core is filled to capacity with an item, any extra items of that type it receives will be [accent]incinerated[].
|
||||||
hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
|
hint.coopCampaign = When playing the [accent]co-op campaign[], items that are produced in the current map will also be sent [accent]to your local sectors[].\n\nAny new research done by the host also carries over.
|
||||||
|
hint.factoryControl = To set a unit factory's [accent]output destination[], click a factory block while in command mode, then right-click a location.\nUnits produced by it will automatically move there.
|
||||||
|
hint.factoryControl.mobile = To set a unit factory's [accent]output destination[], tap a factory block while in command mode, then tap a location.\nUnits produced by it will automatically move there.
|
||||||
|
|
||||||
item.copper.description = Used in all types of construction and ammunition.
|
item.copper.description = Used in all types of construction and ammunition.
|
||||||
item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
|
item.copper.details = Copper. Abnormally abundant metal on Serpulo. Structurally weak unless reinforced.
|
||||||
|
|||||||
@@ -446,7 +446,6 @@ public class Blocks{
|
|||||||
}};
|
}};
|
||||||
|
|
||||||
redIce = new Floor("red-ice"){{
|
redIce = new Floor("red-ice"){{
|
||||||
//TODO red ice boulder
|
|
||||||
dragMultiplier = 0.4f;
|
dragMultiplier = 0.4f;
|
||||||
speedMultiplier = 0.9f;
|
speedMultiplier = 0.9f;
|
||||||
attributes.set(Attribute.water, 0.4f);
|
attributes.set(Attribute.water, 0.4f);
|
||||||
@@ -458,9 +457,9 @@ public class Blocks{
|
|||||||
liquidDrop = Liquids.arkycite;
|
liquidDrop = Liquids.arkycite;
|
||||||
liquidMultiplier = 1.5f;
|
liquidMultiplier = 1.5f;
|
||||||
isLiquid = true;
|
isLiquid = true;
|
||||||
//TODO status, cache layer for this crap
|
//TODO no status for now
|
||||||
status = StatusEffects.wet;
|
//status = StatusEffects.slow;
|
||||||
statusDuration = 120f;
|
//statusDuration = 120f;
|
||||||
drownTime = 200f;
|
drownTime = 200f;
|
||||||
cacheLayer = CacheLayer.arkycite;
|
cacheLayer = CacheLayer.arkycite;
|
||||||
albedo = 0.9f;
|
albedo = 0.9f;
|
||||||
@@ -470,7 +469,6 @@ public class Blocks{
|
|||||||
variants = 3;
|
variants = 3;
|
||||||
}};
|
}};
|
||||||
|
|
||||||
//TODO different vent colors
|
|
||||||
rhyoliteVent = new SteamVent("rhyolite-vent"){{
|
rhyoliteVent = new SteamVent("rhyolite-vent"){{
|
||||||
parent = blendGroup = rhyolite;
|
parent = blendGroup = rhyolite;
|
||||||
attributes.set(Attribute.steam, 1f);
|
attributes.set(Attribute.steam, 1f);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
package mindustry.game;
|
package mindustry.game;
|
||||||
|
|
||||||
|
import arc.math.geom.*;
|
||||||
import arc.util.*;
|
import arc.util.*;
|
||||||
import mindustry.core.GameState.*;
|
import mindustry.core.GameState.*;
|
||||||
import mindustry.ctype.*;
|
import mindustry.ctype.*;
|
||||||
@@ -267,6 +268,18 @@ public class EventType{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class BuildingCommandEvent{
|
||||||
|
public final Player player;
|
||||||
|
public final Building building;
|
||||||
|
public final Vec2 position;
|
||||||
|
|
||||||
|
public BuildingCommandEvent(Player player, Building building, Vec2 position){
|
||||||
|
this.player = player;
|
||||||
|
this.building = building;
|
||||||
|
this.position = position;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static class GameOverEvent{
|
public static class GameOverEvent{
|
||||||
public final Team winner;
|
public final Team winner;
|
||||||
|
|
||||||
|
|||||||
@@ -260,6 +260,8 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
|
|||||||
if(!state.isPaused() && player == Vars.player){
|
if(!state.isPaused() && player == Vars.player){
|
||||||
Fx.moveCommand.at(target);
|
Fx.moveCommand.at(target);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Events.fire(new BuildingCommandEvent(player, build, target));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Remote(called = Loc.server, targets = Loc.both, forward = true)
|
@Remote(called = Loc.server, targets = Loc.both, forward = true)
|
||||||
|
|||||||
@@ -168,10 +168,10 @@ public class RepairBeamWeapon extends Weapon{
|
|||||||
wx = unit.x + Angles.trnsx(weaponRotation, x, y),
|
wx = unit.x + Angles.trnsx(weaponRotation, x, y),
|
||||||
wy = unit.y + Angles.trnsy(weaponRotation, x, y);
|
wy = unit.y + Angles.trnsy(weaponRotation, x, y);
|
||||||
|
|
||||||
float z = Draw.z();
|
float z = Draw.z();
|
||||||
RepairTurret.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength,
|
RepairTurret.drawBeam(wx, wy, unit.rotation + mount.rotation, shootY, unit.id, mount.target == null || controllable ? null : (Sized)mount.target, unit.team, heal.strength,
|
||||||
pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor,
|
pulseStroke, pulseRadius, beamWidth + Mathf.absin(widthSinScl, widthSinMag), heal.lastEnd, heal.offset, laserColor, laserTopColor,
|
||||||
laser, laserEnd, laserTop, laserTopEnd);
|
laser, laserEnd, laserTop, laserTopEnd);
|
||||||
Draw.z(z);
|
Draw.z(z);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,12 +12,13 @@ import arc.struct.*;
|
|||||||
import arc.util.*;
|
import arc.util.*;
|
||||||
import mindustry.*;
|
import mindustry.*;
|
||||||
import mindustry.content.*;
|
import mindustry.content.*;
|
||||||
import mindustry.game.*;
|
|
||||||
import mindustry.game.EventType.*;
|
import mindustry.game.EventType.*;
|
||||||
|
import mindustry.game.*;
|
||||||
import mindustry.gen.*;
|
import mindustry.gen.*;
|
||||||
import mindustry.input.*;
|
import mindustry.input.*;
|
||||||
import mindustry.ui.*;
|
import mindustry.ui.*;
|
||||||
import mindustry.world.*;
|
import mindustry.world.*;
|
||||||
|
import mindustry.world.blocks.payloads.PayloadBlock.*;
|
||||||
import mindustry.world.meta.*;
|
import mindustry.world.meta.*;
|
||||||
|
|
||||||
import static mindustry.Vars.*;
|
import static mindustry.Vars.*;
|
||||||
@@ -38,7 +39,7 @@ public class HintsFragment{
|
|||||||
public void build(Group parent){
|
public void build(Group parent){
|
||||||
group.setFillParent(true);
|
group.setFillParent(true);
|
||||||
group.touchable = Touchable.childrenOnly;
|
group.touchable = Touchable.childrenOnly;
|
||||||
//TODO hints off for now.
|
//TODO hints off for now - figure out tutorial system.
|
||||||
group.visibility = () -> !state.isCampaign() && Core.settings.getBool("hints", true) && ui.hudfrag.shown;
|
group.visibility = () -> !state.isCampaign() && Core.settings.getBool("hints", true) && ui.hudfrag.shown;
|
||||||
group.update(() -> {
|
group.update(() -> {
|
||||||
if(current != null){
|
if(current != null){
|
||||||
@@ -83,6 +84,11 @@ public class HintsFragment{
|
|||||||
events.clear();
|
events.clear();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Events.on(BuildingCommandEvent.class, e -> {
|
||||||
|
if(e.building instanceof PayloadBlockBuild<?>){
|
||||||
|
events.add("factorycontrol");
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
void checkNext(){
|
void checkNext(){
|
||||||
@@ -170,6 +176,8 @@ public class HintsFragment{
|
|||||||
waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getFlagged(state.rules.defaultTeam, BlockFlag.extinguisher).size > 0),
|
waveFire(() -> Groups.fire.size() > 0 && Blocks.wave.unlockedNow(), () -> indexer.getFlagged(state.rules.defaultTeam, BlockFlag.extinguisher).size > 0),
|
||||||
generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)),
|
generator(() -> control.input.block == Blocks.combustionGenerator, () -> ui.hints.placedBlocks.contains(Blocks.combustionGenerator)),
|
||||||
guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null),
|
guardian(() -> state.boss() != null && state.boss().armor >= 4, () -> state.boss() == null),
|
||||||
|
factoryControl(() -> !(state.isCampaign() && state.rules.sector.preset == SectorPresets.onset) &&
|
||||||
|
state.rules.defaultTeam.data().getBuildings(Blocks.tankFabricator).size + state.rules.defaultTeam.data().getBuildings(Blocks.groundFactory).size > 0, () -> ui.hints.events.contains("factorycontrol")),
|
||||||
coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked()
|
coreUpgrade(() -> state.isCampaign() && Blocks.coreFoundation.unlocked()
|
||||||
&& state.rules.defaultTeam.core() != null
|
&& state.rules.defaultTeam.core() != null
|
||||||
&& state.rules.defaultTeam.core().block == Blocks.coreShard
|
&& state.rules.defaultTeam.core().block == Blocks.coreShard
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ public class LiquidVoid extends Block{
|
|||||||
update = true;
|
update = true;
|
||||||
group = BlockGroup.liquids;
|
group = BlockGroup.liquids;
|
||||||
envEnabled = Env.any;
|
envEnabled = Env.any;
|
||||||
|
liquidCapacity = 10000f;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user