Merge pull request #102 from AdamKorinek/customSwitchBorder

Added custom border option for custom moving touch switches

Author: catapillie

Code/FLCC/CustomMovingTouchSwitch.cs

@@ -71,8 +71,10 @@ public CustomMovingTouchSwitch(EntityData data, Vector2 offset) : base(data.Posi
 			revisitPreviousNodes = data.Bool("revisitPreviousNodes");
 			var iconName = data.Attr("icon", "vanilla");
 			icon = new Sprite(GFX.Game, iconName == "vanilla" ? "objects/touchswitch/icon" : $"objects/{(iconName is "tall" or "triangle" or "circle" ? "CrystallineHelper/FLCC/" : "")}customMovingTouchSwitch/{iconName}/icon");
+            var borderName = data.Attr("border", "vanilla");
+            if(borderName != "vanilla") border = GFX.Game["objects/customMovingTouchSwitch/" + borderName];
 
-			Depth = 2000;
+            Depth = 2000;
 			Switch = string.IsNullOrEmpty(flag) ? (ISwitch)new BasicSwitch() : (ISwitch)new FlagSwitch(flag, inverted, allowDisable);
 			Add(Switch as Component);
 			if (persistent)

Loenn/entities/custom_touch_switch.lua

@@ -1,4 +1,5 @@
 local drawableSprite = require "structs.drawable_sprite"
+local atlases = require("atlases")
 
 local customTouchSwitch = {}
 
@@ -23,10 +24,13 @@ customTouchSwitch.placements = {
             randomOrder = false,
             pathLength = -1,
             revisitPreviousNodes = false,
+            border = "vanilla"
         }
     }
 }
 
+customTouchSwitch.fieldOrder = {"x","y","moveTime","flag","icon","border","inactiveColor","activeColor","finishColor","movingColor","easing","pathLength"}
+
 local easeTypes = {
     "Linear", "SineIn", "SineOut", "SineInOut", "QuadIn", "QuadOut", "QuadInOut", "CubeIn", "CubeOut", "CubeInOut", "QuintIn", "QuintOut", "QuintInOut", "BackIn", "BackOut", "BackInOut", "ExpoIn", "ExpoOut", "ExpoInOut", "BigBackIn", "BigBackOut", "BigBackInOut", "ElasticIn", "ElasticOut", "ElasticInOut", "BounceIn", "BounceOut", "BounceInOut"
 }
@@ -41,6 +45,9 @@ customTouchSwitch.fieldInformation = {
     pathLength = {
         fieldType = "integer",
     },
+    border = {
+        default = "vanilla"
+    },
 }
 
 function customTouchSwitch.ignoredFields(ent)
@@ -55,7 +62,11 @@ customTouchSwitch.nodeLimits = {0, -1}
 customTouchSwitch.nodeLineRenderType = "line"
 
 function customTouchSwitch.sprite(room, entity)
-    local containerSprite = drawableSprite.fromTexture("objects/touchswitch/container", entity)
+    local borderResource = "objects/touchswitch/container"
+    if (entity.border ~= nil) and (entity.border ~= "vanilla") and atlases.gameplay["objects/customMovingTouchSwitch/" .. entity.border] then
+        borderResource = "objects/customMovingTouchSwitch/" .. entity.border
+    end
+    local containerSprite = drawableSprite.fromTexture(borderResource, entity)
 
     local iconResource = "objects/touchswitch/icon00"
     if entity.icon ~= "vanilla" then

Loenn/lang/en_gb.lang

@@ -245,6 +245,7 @@ entities.vitellary/customheart.attributes.description.poemCutscene=Whether the h
 # Custom Moving Touch Switch
 entities.vitellary/customtouchswitch.attributes.description.flag=The session flag this touch switch sets. Give the same to multiple touch switches and switch gates to group them.
 entities.vitellary/customtouchswitch.attributes.description.icon=The name of the icon for the touch switch (relative to objects/customMovingTouchSwitch), or "vanilla" for the default one.
+entities.vitellary/customtouchswitch.attributes.description.border=The border of the touch switch (relative to objects/customMovingTouchSwitch), or "vanilla" for the default one.
 entities.vitellary/customtouchswitch.attributes.description.persistent=If enabled, the touch switch will stay active when the player dies or changes rooms.
 entities.vitellary/customtouchswitch.attributes.description.inactiveColor=The switch colour when not triggered yet.
 entities.vitellary/customtouchswitch.attributes.description.movingColor=The switch colour while moving to the next node.