Merge pull request #31 from earthwise01/more-custom-snow-options

particle count + alpha options for custom snow

Author: maddie480

Ahorn/effects/maxHelpingHandSnowCustomColors.jl

@@ -2,7 +2,7 @@
 
 using ..Ahorn, Maple
 
-@mapdef Effect "MaxHelpingHand/SnowCustomColors" SnowCustomColors(only::String="*", exclude::String="", colors::String="FF0000,00FF00,0000FF", speedMin::Number=40.0, speedMax::Number=100.0)
+@mapdef Effect "MaxHelpingHand/SnowCustomColors" SnowCustomColors(only::String="*", exclude::String="", colors::String="FF0000,00FF00,0000FF", speedMin::Number=40.0, speedMax::Number=100.0, alpha::Number=1.0, particleCount::Integer=60)
 
 placements = SnowCustomColors
 

Ahorn/lang/en_gb.lang

@@ -502,9 +502,11 @@ placements.entities.MaxHelpingHand/KevinBarrier.tooltips.flashOnHit=Determines w
 placements.entities.MaxHelpingHand/KevinBarrier.tooltips.invisible=If checked, the Kevin barrier will be invisible (doesn't apply to the flashing).
 
 # Snow with Custom Colors
-placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.colors=Comma-separated list of all colors the particles can take from.
+placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.colors=Comma-separated list of all colors the particles can take from.\nVanilla uses 333333,19337F for background snow, FFFFFF,6495ED for foreground snow.
 placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.speedMin=The minimum speed a snowflake can have. Vanilla uses 40 for background snow, 120 for foreground snow.
 placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.speedMax=The maximum speed a snowflake can have. Vanilla uses 100 for background snow, 300 for foreground snow.
+placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.alpha=The alpha of the snow particles.
+placements.effects.MaxHelpingHand/SnowCustomColors.tooltips.particleCount=The number of snow particles to render. Vanilla uses 60.
 
 # Customizable Glass Block
 placements.entities.MaxHelpingHand/CustomizableGlassBlock.tooltips.behindFgTiles=Whether the glass block outline should appear behind foreground tiles.

Effects/SnowCustomColors.cs

@@ -5,19 +5,24 @@
 
 namespace Celeste.Mod.MaxHelpingHand.Effects {
     public class SnowCustomColors : Snow {
-        private static MethodInfo particleInit = typeof(Snow).GetNestedType("Particle", BindingFlags.NonPublic).GetMethod("Init");
+        private static readonly Type particleType = typeof(Snow).GetNestedType("Particle", BindingFlags.NonPublic);
+        private static readonly MethodInfo particleInit = particleType.GetMethod("Init");
 
-        public SnowCustomColors(Color[] colors, float speedMin, float speedMax) : base(false) {
-            DynData<Snow> selfData = new DynData<Snow>(this);
+        public SnowCustomColors(Color[] colors, float speedMin, float speedMax, int particleCount) : base(false) {
+            var selfData = new DynData<Snow>(this);
 
             // redo the same operations as the vanilla constructor, but with our custom set of colors.
             selfData["colors"] = colors;
             selfData["blendedColors"] = new Color[colors.Length];
-            Array particles = selfData.Get<Array>("particles");
+
+            // recreate the particles array with the correct length
+            var particles = Array.CreateInstance(particleType, particleCount);
+            selfData["particles"] = particles;
+
             for (int i = 0; i < particles.Length; i++) {
                 // Particle is a private struct, so getting it gets a copy that we should set back afterwards.
-                object particle = particles.GetValue(i);
-                particleInit.Invoke(particle, new object[] { colors.Length, speedMin, speedMax });
+                var particle = particles.GetValue(i);
+                particleInit.Invoke(particle, [colors.Length, speedMin, speedMax]);
                 particles.SetValue(particle, i);
             }
         }

Loenn/effects/snowCustomColors.lua

@@ -7,7 +7,29 @@ effect.canForeground = true
 effect.defaultData = {
     colors = "FF0000,00FF00,0000FF",
     speedMin = 40.0,
-    speedMax = 100.0
+    speedMax = 100.0,
+    alpha = 1.0,
+    particleCount = 60
+}
+
+effect.fieldInformation = {
+    colors = {
+        fieldType = "list",
+        minimumElements = 1,
+        elementDefault = "ffffff",
+        elementOptions = {
+            fieldType = "color",
+            allowXNAColors = false
+        }
+    },
+    alpha = {
+        maximumValue = 1.0,
+        minimumValue = 0.0
+    },
+    particleCount = {
+        fieldType = "integer",
+        minimumValue = 1
+    }
 }
 
 return effect

Loenn/lang/en_gb.lang

@@ -1308,9 +1308,11 @@ style.effects.MaxHelpingHand/NorthernLightsCustomColors.description.strandCount=
 
 # Snow with Custom Colors
 style.effects.MaxHelpingHand/SnowCustomColors.name=Snow (Custom)
-style.effects.MaxHelpingHand/SnowCustomColors.description.colors=Comma-separated list of all colors the particles can take from.
+style.effects.MaxHelpingHand/SnowCustomColors.description.colors=Comma-separated list of all colors the particles can take from.\nVanilla uses 333333,19337F for background snow, FFFFFF,6495ED for foreground snow.
 style.effects.MaxHelpingHand/SnowCustomColors.description.speedMin=The minimum speed a snowflake can have. Vanilla uses 40 for background snow, 120 for foreground snow.
 style.effects.MaxHelpingHand/SnowCustomColors.description.speedMax=The maximum speed a snowflake can have. Vanilla uses 100 for background snow, 300 for foreground snow.
+style.effects.MaxHelpingHand/SnowCustomColors.description.alpha=The alpha of the snow particles.
+style.effects.MaxHelpingHand/SnowCustomColors.description.particleCount=The number of snow particles to render. Vanilla uses 60.
 
 # Custom Bird Tutorial: extra "Show Hints" placement
 entities.everest/customBirdTutorial.placements.name.maxhelpinghand_showhints=Custom Bird Tutorial (Show Hints)

Module/MaxHelpingHandModule.cs

@@ -417,13 +417,14 @@ private Backdrop onLoadBackdrop(MapData map, BinaryPacker.Element child, BinaryP
                 return new CustomStarfield(paths, colors, alphas, child.AttrBool("shuffle", true), child.AttrFloat("speed", 1f));
             }
             if (child.Name.Equals("MaxHelpingHand/SnowCustomColors", StringComparison.OrdinalIgnoreCase)) {
+                float alpha = child.AttrFloat("alpha", 1f);
                 string[] colorsAsStrings = child.Attr("colors").Split(',');
                 Color[] colors = new Color[colorsAsStrings.Length];
                 for (int i = 0; i < colors.Length; i++) {
-                    colors[i] = Calc.HexToColor(colorsAsStrings[i]);
+                    colors[i] = Calc.HexToColor(colorsAsStrings[i]) * alpha;
                 }
 
-                return new SnowCustomColors(colors, child.AttrFloat("speedMin", 40f), child.AttrFloat("speedMax", 100f));
+                return new SnowCustomColors(colors, child.AttrFloat("speedMin", 40f), child.AttrFloat("speedMax", 100f), child.AttrInt("particleCount", 60));
             }
             if (child.Name.Equals("MaxHelpingHand/NorthernLightsCustomColors", StringComparison.OrdinalIgnoreCase)) {
                 string[] colorsAsStrings = child.Attr("colors").Split(',');