Drizzle update

HenryMarkle · Nov 30, 2024 · 3d4dc79 · 3d4dc79
1 parent 26707a9
commit 3d4dc79
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 11 deletions.
diff --git a/Drizzle b/Drizzle
diff --git a/Leditor.Renderer/Data b/Leditor.Renderer/Data
diff --git a/Leditor/Globals.cs b/Leditor/Globals.cs
@@ -511,7 +511,8 @@ internal static int Page
         ["Fuzzy Growers", "Leaf Growers", "Meat Growers", "Hyacinths", "Seed Grass", "Orb Plants", "Storm Plants"], // 7
         ["Coral Growers", "Horror Growers"], // 2
         ["Thunder Growers"], // 1
-        ["Ice Growers", "Grass Growers", "Fancy Growers"] // 3
+        ["Ice Growers", "Grass Growers", "Fancy Growers"], // 3
+        ["Og Grass", "Hand Growers", "Grape Roots"] // 3
     ];
 
     public static string EffectType(string name) => name switch
@@ -577,7 +578,8 @@ internal static int Page
             "Root Plants" or "Arm Growers" or "Growers" or "Mini Growers" or
             "Left Facing Kelp" or "Right Facing Kelp" or "Mixed Facing Kelp" or 
             "Bubble Grower" or "Coral Growers" or "Horror Growers" or "Thunder Growers" or
-            "Leaf Growers" or "Ice Growsers" or "Grass Growers" or "Fancy Growers" => true,
+            "Leaf Growers" or "Ice Growsers" or "Grass Growers" or "Fancy Growers" or 
+            "Hand Growers" or "Grape Roots" => true,
 
         _ => false
     };
@@ -605,6 +607,7 @@ internal static int Page
         "Nautillo Plants 2",        // 19
         "Tronsx Plants",            // 20
         "Tronsx Intrepid Plants",   // 21
+        "April Plants",             // 22
     ];
 
     // Layers 2 and 3 do not show geo features like shortcuts and entrances 

diff --git a/Leditor/Utils.cs b/Leditor/Utils.cs
@@ -948,7 +948,7 @@ public static EffectOptions[] NewEffectOptions(string name)
                 "Seed Pods" or "Grass" or "Arm Growers" or "Horse Tails" or "Circuit Plants" or 
                 "Feather Plants" or "Mini Growers" or "Left Facing Kelp" or "Right Facing Kelp" or 
                 "Club Moss" or "Moss Wall" or "Mixed Facing Kelp" or "Bubble Grower" or
-                "Storm Plants" or "Seed Grass" or "Hyacinths" or "Orb Plants" or "Dandelions" => [
+                "Storm Plants" or "Seed Grass" or "Hyacinths" or "Orb Plants" or "Dandelions" or "Og Grass" => [
                 new("Layers", ["All", "1", "2", "3", "1:st and 2:nd", "2:nd and 3:rd"], "All"),
                 new("Color", ["Color1", "Color2", "Dead"], "Color2")
             ],
@@ -1036,6 +1036,11 @@ public static EffectOptions[] NewEffectOptions(string name)
                 new("Color 1", ["EffectColor1", "EffectColor2", "None"], "EffectColor1"),
                 new("Color 2", ["EffectColor1", "EffectColor2", "None"], "EffectColor2")
             ],
+
+            "Grape Roots" or "Hand Growers" => [
+                new("Layers", ["All", "1", "2", "3", "1:st and 2:nd", "2:nd and 3:rd"], "All"),
+                new("Color", ["Color1", "Color2", "Dead"], "Color2")
+            ],
 
             _ => []
         };

diff --git a/Leditor/assets/renderer b/Leditor/assets/renderer
diff --git a/Release_Notes.txt b/Release_Notes.txt
@@ -1,6 +1,11 @@
-## Bug fixes
+## Drizzle Update
 
-### Dimensions Editor
+Upstreamed Drizzle to v0.4.52
 
-- Removed the level resize window as it's rendered redundant and obsolete.
-- Added the level width and height labels to the options window
+### New Effects
+
+- Og Grass
+- Hand Growers
+- Grape Roots
+
+by @SomethingStupid on Discord.
diff --git a/Version.txt b/Version.txt
@@ -1 +1 @@
-0.9.99-20
+0.9.99-21
+1 −1		Directory.Build.props
+29 −2		Drizzle.Lingo.Runtime/Data/LingoColor.cs
+4 −1		Drizzle.Lingo.Runtime/Data/LingoNumber.cs
+46 −15		Drizzle.Lingo.Runtime/Data/LingoPropertyList.cs
+31 −9		Drizzle.Lingo.Runtime/Data/LingoRect.cs
+10 −5		Drizzle.Lingo.Runtime/LingoGlobal.cs
+1 −1		Drizzle.Lingo.Runtime/LingoRuntime.FileSystem.cs
+10 −1		Drizzle.Lingo.Runtime/Parser/AstNode.cs
+17 −3		Drizzle.Lingo.Runtime/Parser/LingoParser.cs
+1 −0		Drizzle.Logic/Rendering/LevelRenderer.RenderCore.cs
+4 −0		Drizzle.Ported/Ported/Movie.comEditorUtils.cs
+28 −1		Drizzle.Transpiler/Program.cs
+174 −30		LingoSource/LMats.ls
+1 −29		LingoSource/LOstart.ls
+7 −30		LingoSource/LSlime.ls
+3 −3		LingoSource/TEdraw.ls
+2 −3		LingoSource/changeSize.ls
+97 −73		LingoSource/comEditorUtils.ls
+80 −21		LingoSource/effectsEditor.ls
+0 −2		LingoSource/effectsEditorStart.ls
+0 −1		LingoSource/envEditorStart.ls
+3 −3		LingoSource/exportAllBitmaps.ls
+13 −61		LingoSource/fiffigt.ls
+23 −104		LingoSource/finalize.ls
+15 −28		LingoSource/finished.ls
+2 −0		LingoSource/globals.ls
+1 −2		LingoSource/levelEditStart.ls
+0 −16		LingoSource/levelEdit_parentscript.ls
+1 −1		LingoSource/levelEditor.ls
+3 −213		LingoSource/levelOverview.ls
+80 −225		LingoSource/levelRendering.ls
+0 −1		LingoSource/lightEditorStart.ls
+109 −137		LingoSource/loadLevel.ls
+1 −3		LingoSource/loadLevelStart.ls
+1 −2		LingoSource/massRenderLoop.ls
+4 −10		LingoSource/massRenderMenu.ls
+1 −2		LingoSource/massRenderStart.ls
+4 −4		LingoSource/propEditor.ls
+3 −5		LingoSource/propEditorStart.ls
+15 −30		LingoSource/renderColors.ls
+1,871 −673		LingoSource/renderEffects.ls
+12 −30		LingoSource/renderEffectsStart.ls
+26 −101		LingoSource/renderLight.ls
+51 −137		LingoSource/renderLightStart.ls
+140 −153		LingoSource/renderProps.ls
+21 −23		LingoSource/renderPropsStart.ls
+1 −2		LingoSource/renderStart.ls
+3 −33		LingoSource/saveFile.ls
+1 −2		LingoSource/saveProject.ls
+1 −9		LingoSource/sliderBehav.ls
+49 −81		LingoSource/spelrelaterat.ls
+84 −62		LingoSource/startUp.ls
+1 −10		LingoSource/stop.ls
+20 −13		LingoSource/tileEditor.ls
+0 −1		LingoSource/tileEditorStart.ls
+10 −10		LingoSource/unify.ls
+1 −0		Tools/package_release.ps1