Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Code/Entities/Containers/FlagGateContainer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public EntityContainer Container

private bool shaking;
private float shakeTimer;
private float shakeStrength;
private Vector2 shakeAmount;
private Random shakeRand;

Expand All @@ -84,6 +85,7 @@ public FlagGateContainer(EntityData data, Vector2 offset) : base(data.Position +
//resetFlags = data.Bool("resetFlags", true);
canReturn = data.Bool("canReturn", true);
shakeTime = data.Float("shakeTime", 0.5f);
shakeStrength = data.Float("shakeStrength", 1f);
moveTime = data.Float("moveTime", 2f);
//progression = data.Bool("progression");
easer = EeveeHelperModule.EaseTypes[data.Attr("easing", "CubeOut")];
Expand Down Expand Up @@ -169,7 +171,7 @@ public override void Update()
{
if (Scene.OnInterval(0.04f))
{
shakeAmount = shakeRand.ShakeVector();
shakeAmount = shakeStrength * shakeRand.ShakeVector();
}
if (shakeTimer > 0f)
{
Expand Down
1 change: 1 addition & 0 deletions Loenn/entities/entityContainers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ local flagGateContainer = {
ignoreContainerBounds = false,
moveFlag = "",
shakeTime = 0.5,
shakeStrength = 1.0,
moveTime = 2.0,
easing = "CubeOut",
icon = "objects/switchgate/icon",
Expand Down
1 change: 1 addition & 0 deletions Loenn/lang/en_gb.lang
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ entities.EeveeHelper/FlagGateContainer.attributes.description.inactiveColor=The
entities.EeveeHelper/FlagGateContainer.attributes.description.moveFlag=The flag that activates this gate. Leave empty to function like a normal switch gate.
entities.EeveeHelper/FlagGateContainer.attributes.description.moveTime=How long, in seconds, the container takes to move to the other node.
entities.EeveeHelper/FlagGateContainer.attributes.description.shakeTime=How long the container shakes before moving. If set higher than 0, the container will also briefly shake when stopping.
entities.EeveeHelper/FlagGateContainer.attributes.description.shakeStrength=How much the container moves around while shaking. 1 will give vanilla switch gate strength, 0 will make it not shake at all.
entities.EeveeHelper/FlagGateContainer.attributes.description.easing=The easing of the container's movement between nodes.
entities.EeveeHelper/FlagGateContainer.attributes.description.icon=The switch gate icon overlayed on the container. Can be dragged around to change position. (Icons are detected from "objects/MaxHelpingHand/flagSwitchGate/" and "objects/EeveeHelper/flagGateIcons/")
entities.EeveeHelper/FlagGateContainer.attributes.description.canReturn=Whether the container will return to its original position if the flag is deactivated.
Expand Down
Loading