Merge pull request #45 from GamationOnGithub/dev

Add Shake Strength to Flag Gate Container

Author: bigkahuna443

Code/Entities/Containers/FlagGateContainer.cs

@@ -60,6 +60,7 @@ public EntityContainer Container
 
 	private bool shaking;
 	private float shakeTimer;
+	private float shakeStrength;
 	private Vector2 shakeAmount;
 	private Random shakeRand;
 
@@ -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")];
@@ -169,7 +171,7 @@ public override void Update()
 		{
 			if (Scene.OnInterval(0.04f))
 			{
-				shakeAmount = shakeRand.ShakeVector();
+				shakeAmount = shakeStrength * shakeRand.ShakeVector();
 			}
 			if (shakeTimer > 0f)
 			{

Loenn/entities/entityContainers.lua

@@ -233,6 +233,7 @@ local flagGateContainer = {
                 ignoreContainerBounds = false,
                 moveFlag = "",
                 shakeTime = 0.5,
+		shakeStrength = 1.0,
                 moveTime = 2.0,
                 easing = "CubeOut",
                 icon = "objects/switchgate/icon",

Loenn/lang/en_gb.lang

@@ -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.