Merge pull request #71 from CommunalHelper/room-name

vitellaryjr · web-flow · commit bb1baaf0f7c4 · 2024-09-20T18:32:00.000-07:00
more features / bugfixes for room names
diff --git a/Code/RoomNameController.cs b/Code/RoomNameController.cs
@@ -8,6 +8,7 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
+using static FrostHelper.CustomZipMover;
 
 namespace Celeste.Mod.Code.Entities
 {
@@ -18,22 +19,30 @@ public class RoomNameController : Entity
         public string Name;
         private string bgColor;
         private string textColor;
+        private string lineColor;
+        private float lineAmt;
         private float timer;
+        private float scale;
 
         public RoomNameController(EntityData data, Vector2 offset) : base(data.Position + offset)
         {
             Name = data.Attr("roomName");
             bgColor = data.Attr("backgroundColor", "000000FF");
             textColor = data.Attr("textColor", "FFFFFFFF");
+            lineColor = data.Attr("outlineColor", "000000FF");
+            lineAmt = data.Float("outlineThickness", 0f);
+            scale = data.Float("scale", 1f);
+
             timer = data.Float("disappearTimer", -1f);
         }
         public override void Awake(Scene scene)
         {
             base.Awake(scene);
             var display = RoomNameDisplay.GetDisplay(scene);
             display.SetName(Name);
-            display.SetColor(Calc.HexToColorWithAlpha(textColor), Calc.HexToColorWithAlpha(bgColor));
+            display.SetColor(textColor, bgColor, lineColor, lineAmt);
             display.SetTimer(Math.Max(timer, 0f));
+            display.scale = scale;
         }
     }
 }
diff --git a/Code/RoomNameDisplay.cs b/Code/RoomNameDisplay.cs
@@ -21,9 +21,15 @@ public class RoomNameDisplay : Entity
 
         public Color bgColor;
         public Color textColor;
+        private Color lineColor;
         private float colorLerp;
         private Color bgColorStart;
         private Color textColorStart;
+        private Color lineColorStart;
+        private float outline;
+        private float nextOutline;
+
+        public float scale;
 
         private float outTimer;
         public RoomNameDisplay() {
@@ -77,6 +83,7 @@ public override void Update()
                 if (textLerp == 0f)
                 {
                     text = nextText;
+                    outline = nextOutline;
                 }
             }
 
@@ -98,21 +105,28 @@ public override void Update()
         public override void Render()
         {
             base.Render();
-            var y = Calc.LerpClamp(1080f, 1032f, Ease.CubeOut(drawLerp));
+            var y = Calc.LerpClamp(1080f, 1080f - (48f * scale), Ease.CubeOut(drawLerp));
             Color bgC = bgColor;
             if (colorLerp < 1f)
             {
                 bgC = Color.Lerp(bgColorStart, bgColor, colorLerp);
             }
-            Draw.Rect(-2f, y, 1920f + 4f, 48f + 2f, bgC);
+            Draw.Rect(-2f, y, 1920f + 4f, (48f * scale) + 2f, bgC);
             if (text != "")
             {
                 Color textC = textColor;
                 if (colorLerp < 1f) {
                     textC = Color.Lerp(textColorStart, textColor, colorLerp);
                 }
-                var texty = Calc.LerpClamp(1080f, 1032f, Ease.CubeOut(Calc.Min(textLerp, drawLerp)));
-                ActiveFont.Draw(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(1f, 1f), textC);
+                var texty = Calc.LerpClamp(1080f, 1080f - (48f * scale), Ease.CubeOut(Calc.Min(textLerp, drawLerp)));
+                if (outline > 0f)
+                {
+                    ActiveFont.DrawOutline(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(scale, scale), textC, outline, lineColor);
+                }
+                else
+                {
+                    ActiveFont.Draw(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(scale, scale), textC);
+                }
             }
         }
 
@@ -128,17 +142,23 @@ public void SetName(string name)
             }
         }
 
-        public void SetColor(Color text, Color bg)
+        public void SetColor(string textHex, string bgHex, string lineHex, float amt)
         {
+            Color text = HexToColor(textHex);
+            Color bg = HexToColor(bgHex);
+            Color line = HexToColor(lineHex);
+
             if (colorLerp < 1f)
             {
                 bgColorStart = Color.Lerp(bgColorStart, bgColor, colorLerp);
                 textColorStart = Color.Lerp(textColorStart, textColor, colorLerp);
+                lineColorStart = Color.Lerp(lineColorStart, lineColor, colorLerp);
             }
             else
             {
                 bgColorStart = bgColor;
                 textColorStart = textColor;
+                lineColorStart = lineColor;
             }
             colorLerp = 0f;
             if (drawLerp == 0f)
@@ -147,6 +167,25 @@ public void SetColor(Color text, Color bg)
             }
             bgColor = bg;
             textColor = text;
+            lineColor = line;
+            nextOutline = amt;
+        }
+
+        // Calc.HexToColorWithAlpha does not work correctly
+        // need to do it myself
+        public Color HexToColor(string hex)
+        {
+            if (hex[0] == '#')
+            {
+                hex = hex.Substring(1);
+            }
+            Color color = Calc.HexToColor(hex);
+            if (hex.Length == 6)
+            {
+                return color;
+            }
+            float alpha = (Calc.HexToByte(hex[6]) * 16 + Calc.HexToByte(hex[7])) / 255f;
+            return color * alpha;
         }
 
         public void SetTimer(float timer)
diff --git a/Code/RoomNameTrigger.cs b/Code/RoomNameTrigger.cs
@@ -18,15 +18,22 @@ public class RoomNameTrigger : Trigger
         public string Name;
         private string bgColor;
         private string textColor;
+        private string lineColor;
+        private float lineAmt;
         private float timer;
         private bool oneUse;
         private bool instant;
+        private float scale;
 
         public RoomNameTrigger(EntityData data, Vector2 offset) : base(data, offset)
         {
             Name = data.Attr("roomName");
             bgColor = data.Attr("backgroundColor", "000000FF");
             textColor = data.Attr("textColor", "FFFFFFFF");
+            lineColor = data.Attr("outlineColor", "000000FF");
+            lineAmt = data.Float("outlineThickness", 0f);
+            scale = data.Float("scale", 1f);
+
             timer = data.Float("disappearTimer", -1f);
             oneUse = data.Bool("oneUse", false);
             instant = data.Bool("instant", false);
@@ -37,8 +44,9 @@ public override void OnEnter(Player player)
             base.OnEnter(player);
             var display = RoomNameDisplay.GetDisplay(player.Scene);
             display.SetName(Name);
-            display.SetColor(Calc.HexToColorWithAlpha(textColor), Calc.HexToColorWithAlpha(bgColor));
+            display.SetColor(textColor, bgColor, lineColor, lineAmt);
             display.SetTimer(Math.Max(timer, 0f));
+            display.scale = scale;
             if (instant)
             {
                 display.SetInstant();
diff --git a/Loenn/entities/room_name.lua b/Loenn/entities/room_name.lua
@@ -11,6 +11,9 @@ roomName.placements = {
             backgroundColor = "000000FF",
             textColor = "FFFFFFFF",
             disappearTimer = -1,
+            outlineColor = "000000FF",
+            outlineThickness = 0,
+            scale = 1,
         }
     }
 }
@@ -21,6 +24,12 @@ roomName.fieldInformation = {
     textColor = {
         fieldType = "color"
     },
+    outlineColor = {
+        fieldType = "color"
+    },
+    scale = {
+        minimumValue = 0.01,
+    },
 }
 
 roomName.texture = "ahorn_roomname"
diff --git a/Loenn/lang/en_gb.lang b/Loenn/lang/en_gb.lang
@@ -303,6 +303,9 @@ entities.vitellary/cassetteflags.attributes.description.greenFlag=The flag to en
 entities.vitellary/roomname.attributes.description.roomName=The text to appear at the bottom of the screen. Accepts dialog keys.\nTo make text disappear, leave this as blank.
 entities.vitellary/roomname.attributes.description.backgroundColor=The color of the rectangle behind the room name.
 entities.vitellary/roomname.attributes.description.textColor=The color of the room name text.
+entities.vitellary/roomname.attributes.description.outlineColor=The color of the text's outline, if it has one.
+entities.vitellary/roomname.attributes.description.outlineThickness=The size of the text's outline. 0 means it won't have one.
+entities.vitellary/roomname.attributes.description.scale=The scale multiplier of the room name.
 entities.vitellary/roomname.attributes.description.disappearTimer=The amount of time until the room name goes away. Negative values means the text won't disappear.
 
 # Remote Trigger
@@ -402,6 +405,9 @@ triggers.vitellary/bombtimer.attributes.description.resetOnDeath=Whether the pla
 triggers.vitellary/roomnametrigger.attributes.description.roomName=The text to appear at the bottom of the screen. Accepts dialog keys.\nTo make text disappear, leave this as blank.
 triggers.vitellary/roomnametrigger.attributes.description.backgroundColor=The color of the rectangle behind the room name.
 triggers.vitellary/roomnametrigger.attributes.description.textColor=The color of the room name text.
+triggers.vitellary/roomnametrigger.attributes.description.outlineColor=The color of the text's outline, if it has one.
+triggers.vitellary/roomnametrigger.attributes.description.outlineThickness=The size of the text's outline. 0 means it won't have one.
+triggers.vitellary/roomnametrigger.attributes.description.scale=The scale multiplier of the room name.
 triggers.vitellary/roomnametrigger.attributes.description.disappearTimer=The amount of time until the room name goes away. Negative values means the text won't disappear.
 triggers.vitellary/roomnametrigger.attributes.description.oneUse=Whether the trigger should only apply once.
 triggers.vitellary/roomnametrigger.attributes.description.instant=Whether the text and colors should instantly appear, rather than easing in.
diff --git a/Loenn/triggers/roomnametrigger.lua b/Loenn/triggers/roomnametrigger.lua
@@ -10,6 +10,9 @@ roomNameTrigger.placements = {
             backgroundColor = "000000FF",
             textColor = "FFFFFFFF",
             disappearTimer = -1,
+            outlineColor = "000000FF",
+            outlineThickness = 0,
+            scale = 1,
             oneUse = false,
             instant = false,
         }
@@ -22,6 +25,12 @@ roomNameTrigger.fieldInformation = {
     textColor = {
         fieldType = "color"
     },
+    outlineColor = {
+        fieldType = "color"
+    },
+    scale = {
+        minimumValue = 0.01,
+    },
 }
 
 return roomNameTrigger

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`using System.Collections.Generic;`
`9`	`9`	`using System.Collections.ObjectModel;`
`10`	`10`	`using System.Linq;`
	`11`	`+using static FrostHelper.CustomZipMover;`
`11`	`12`
`12`	`13`	`namespace Celeste.Mod.Code.Entities`
`13`	`14`	`{`
`@@ -18,22 +19,30 @@ public class RoomNameController : Entity`
`18`	`19`	`public string Name;`
`19`	`20`	`private string bgColor;`
`20`	`21`	`private string textColor;`
	`22`	`+ private string lineColor;`
	`23`	`+ private float lineAmt;`
`21`	`24`	`private float timer;`
	`25`	`+ private float scale;`
`22`	`26`
`23`	`27`	`public RoomNameController(EntityData data, Vector2 offset) : base(data.Position + offset)`
`24`	`28`	`{`
`25`	`29`	`Name = data.Attr("roomName");`
`26`	`30`	`bgColor = data.Attr("backgroundColor", "000000FF");`
`27`	`31`	`textColor = data.Attr("textColor", "FFFFFFFF");`
	`32`	`+ lineColor = data.Attr("outlineColor", "000000FF");`
	`33`	`+ lineAmt = data.Float("outlineThickness", 0f);`
	`34`	`+ scale = data.Float("scale", 1f);`
	`35`	`+`
`28`	`36`	`timer = data.Float("disappearTimer", -1f);`
`29`	`37`	`}`
`30`	`38`	`public override void Awake(Scene scene)`
`31`	`39`	`{`
`32`	`40`	`base.Awake(scene);`
`33`	`41`	`var display = RoomNameDisplay.GetDisplay(scene);`
`34`	`42`	`display.SetName(Name);`
`35`		`- display.SetColor(Calc.HexToColorWithAlpha(textColor), Calc.HexToColorWithAlpha(bgColor));`
	`43`	`+ display.SetColor(textColor, bgColor, lineColor, lineAmt);`
`36`	`44`	`display.SetTimer(Math.Max(timer, 0f));`
	`45`	`+ display.scale = scale;`
`37`	`46`	`}`
`38`	`47`	`}`
`39`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,15 @@ public class RoomNameDisplay : Entity`
`21`	`21`
`22`	`22`	`public Color bgColor;`
`23`	`23`	`public Color textColor;`
	`24`	`+ private Color lineColor;`
`24`	`25`	`private float colorLerp;`
`25`	`26`	`private Color bgColorStart;`
`26`	`27`	`private Color textColorStart;`
	`28`	`+ private Color lineColorStart;`
	`29`	`+ private float outline;`
	`30`	`+ private float nextOutline;`
	`31`	`+`
	`32`	`+ public float scale;`
`27`	`33`
`28`	`34`	`private float outTimer;`
`29`	`35`	`public RoomNameDisplay() {`
`@@ -77,6 +83,7 @@ public override void Update()`
`77`	`83`	`if (textLerp == 0f)`
`78`	`84`	`{`
`79`	`85`	`text = nextText;`
	`86`	`+ outline = nextOutline;`
`80`	`87`	`}`
`81`	`88`	`}`
`82`	`89`
`@@ -98,21 +105,28 @@ public override void Update()`
`98`	`105`	`public override void Render()`
`99`	`106`	`{`
`100`	`107`	`base.Render();`
`101`		`- var y = Calc.LerpClamp(1080f, 1032f, Ease.CubeOut(drawLerp));`
	`108`	`+ var y = Calc.LerpClamp(1080f, 1080f - (48f * scale), Ease.CubeOut(drawLerp));`
`102`	`109`	`Color bgC = bgColor;`
`103`	`110`	`if (colorLerp < 1f)`
`104`	`111`	`{`
`105`	`112`	`bgC = Color.Lerp(bgColorStart, bgColor, colorLerp);`
`106`	`113`	`}`
`107`		`- Draw.Rect(-2f, y, 1920f + 4f, 48f + 2f, bgC);`
	`114`	`+ Draw.Rect(-2f, y, 1920f + 4f, (48f * scale) + 2f, bgC);`
`108`	`115`	`if (text != "")`
`109`	`116`	`{`
`110`	`117`	`Color textC = textColor;`
`111`	`118`	`if (colorLerp < 1f) {`
`112`	`119`	`textC = Color.Lerp(textColorStart, textColor, colorLerp);`
`113`	`120`	`}`
`114`		`- var texty = Calc.LerpClamp(1080f, 1032f, Ease.CubeOut(Calc.Min(textLerp, drawLerp)));`
`115`		`- ActiveFont.Draw(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(1f, 1f), textC);`
	`121`	`+ var texty = Calc.LerpClamp(1080f, 1080f - (48f * scale), Ease.CubeOut(Calc.Min(textLerp, drawLerp)));`
	`122`	`+ if (outline > 0f)`
	`123`	`+ {`
	`124`	`+ ActiveFont.DrawOutline(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(scale, scale), textC, outline, lineColor);`
	`125`	`+ }`
	`126`	`+ else`
	`127`	`+ {`
	`128`	`+ ActiveFont.Draw(text, new Vector2(960, texty - 6f), new Vector2(0.5f, 0f), new Vector2(scale, scale), textC);`
	`129`	`+ }`
`116`	`130`	`}`
`117`	`131`	`}`
`118`	`132`
`@@ -128,17 +142,23 @@ public void SetName(string name)`
`128`	`142`	`}`
`129`	`143`	`}`
`130`	`144`
`131`		`- public void SetColor(Color text, Color bg)`
	`145`	`+ public void SetColor(string textHex, string bgHex, string lineHex, float amt)`
`132`	`146`	`{`
	`147`	`+ Color text = HexToColor(textHex);`
	`148`	`+ Color bg = HexToColor(bgHex);`
	`149`	`+ Color line = HexToColor(lineHex);`
	`150`	`+`
`133`	`151`	`if (colorLerp < 1f)`
`134`	`152`	`{`
`135`	`153`	`bgColorStart = Color.Lerp(bgColorStart, bgColor, colorLerp);`
`136`	`154`	`textColorStart = Color.Lerp(textColorStart, textColor, colorLerp);`
	`155`	`+ lineColorStart = Color.Lerp(lineColorStart, lineColor, colorLerp);`
`137`	`156`	`}`
`138`	`157`	`else`
`139`	`158`	`{`
`140`	`159`	`bgColorStart = bgColor;`
`141`	`160`	`textColorStart = textColor;`
	`161`	`+ lineColorStart = lineColor;`
`142`	`162`	`}`
`143`	`163`	`colorLerp = 0f;`
`144`	`164`	`if (drawLerp == 0f)`
`@@ -147,6 +167,25 @@ public void SetColor(Color text, Color bg)`
`147`	`167`	`}`
`148`	`168`	`bgColor = bg;`
`149`	`169`	`textColor = text;`
	`170`	`+ lineColor = line;`
	`171`	`+ nextOutline = amt;`
	`172`	`+ }`
	`173`	`+`
	`174`	`+ // Calc.HexToColorWithAlpha does not work correctly`
	`175`	`+ // need to do it myself`
	`176`	`+ public Color HexToColor(string hex)`
	`177`	`+ {`
	`178`	`+ if (hex[0] == '#')`
	`179`	`+ {`
	`180`	`+ hex = hex.Substring(1);`
	`181`	`+ }`
	`182`	`+ Color color = Calc.HexToColor(hex);`
	`183`	`+ if (hex.Length == 6)`
	`184`	`+ {`
	`185`	`+ return color;`
	`186`	`+ }`
	`187`	`+ float alpha = (Calc.HexToByte(hex[6]) * 16 + Calc.HexToByte(hex[7])) / 255f;`
	`188`	`+ return color * alpha;`
`150`	`189`	`}`
`151`	`190`
`152`	`191`	`public void SetTimer(float timer)`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,9 @@ roomName.placements = {`
`11`	`11`	`backgroundColor = "000000FF",`
`12`	`12`	`textColor = "FFFFFFFF",`
`13`	`13`	`disappearTimer = -1,`
	`14`	`+ outlineColor = "000000FF",`
	`15`	`+ outlineThickness = 0,`
	`16`	`+ scale = 1,`
`14`	`17`	`}`
`15`	`18`	`}`
`16`	`19`	`}`
`@@ -21,6 +24,12 @@ roomName.fieldInformation = {`
`21`	`24`	`textColor = {`
`22`	`25`	`fieldType = "color"`
`23`	`26`	`},`
	`27`	`+ outlineColor = {`
	`28`	`+ fieldType = "color"`
	`29`	`+ },`
	`30`	`+ scale = {`
	`31`	`+ minimumValue = 0.01,`
	`32`	`+ },`
`24`	`33`	`}`
`25`	`34`
`26`	`35`	`roomName.texture = "ahorn_roomname"`