Custom Winged Strawberry (#27)

Custom Winged Strawberry

Co-authored-by: Maik Macho <[email protected]>

Author: 0x0ade

Ahorn/Entities/DiagonalWingedStrawberry.jl

@@ -0,0 +1,23 @@
+module SpringCollab2020DiagonalWingedStrawberry
+using ..Ahorn, Maple
+@mapdef Entity "SpringCollab2020/diagonalWingedStrawberry" DiagonalWingedStrawberry(x::Integer, y::Integer, order::Integer=-1, checkpointID::Integer=-1)
+
+const placements = Ahorn.PlacementDict(
+	"Diagonal Winged Strawberry (Spring Collab 2020)" => Ahorn.EntityPlacement(
+		DiagonalWingedStrawberry
+	)
+)
+
+function Ahorn.selection(entity::DiagonalWingedStrawberry)
+	x, y = Ahorn.position(entity)
+
+	return Ahorn.getSpriteRectangle("collectables/strawberry/wings01", x, y)
+end
+
+function Ahorn.renderAbs(ctx::Ahorn.Cairo.CairoContext, entity::DiagonalWingedStrawberry, room::Maple.Room)
+	x, y = Ahorn.position(entity)
+
+	Ahorn.drawSprite(ctx, "collectables/strawberry/wings01", x, y)
+end
+
+end

Ahorn/lang/en_gb.lang

@@ -1,3 +1,8 @@
+# Diagonal Winged Strawberry
+
+placements.entities.SpringCollab2020/diagonalWingedStrawberry.tooltips.order=The order within a checkpoint. When -1, Everest automatically sets it.
+placements.entities.SpringCollab2020/diagonalWingedStrawberry.tooltips.checkpointID=The checkpoint the berry is located within. When -1, Everest automatically sets it.
+
 # Cave Wall
 placements.entities.SpringCollab2020/caveWall.tooltips.tiletype=Changes the visual appearance of the wall.
 
@@ -23,4 +28,4 @@ placements.triggers.SpringCollab2020/SmoothCameraOffsetTrigger.tooltips.position
 placements.triggers.SpringCollab2020/SmoothCameraOffsetTrigger.tooltips.onlyOnce=If checked, the trigger will be disabled when the player first leaves it.
 
 # Dash Spring
-placements.entities.SpringCollab2020/dashSpring.tooltips.playerCanUse=Determines whether the player is able to interact with the spring.
+placements.entities.SpringCollab2020/dashSpring.tooltips.playerCanUse=Determines whether the player is able to interact with the spring.

Entities/DiagonalWingedStrawberry.cs

@@ -0,0 +1,55 @@
+using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+using Monocle;
+using MonoMod.Cil;
+using MonoMod.RuntimeDetour;
+using System;
+using System.Reflection;
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    [CustomEntity("SpringCollab2020/diagonalWingedStrawberry")]
+    [RegisterStrawberry(true, false)]
+    class DiagonalWingedStrawberry : Strawberry {
+        public DiagonalWingedStrawberry(EntityData data, Vector2 offset, EntityID gid) : base(FixData(data), offset, gid) {
+            OriginalOnDash = typeof(Strawberry).GetMethod("OnDash", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.InvokeMethod);
+
+            // Components.ToArray() is used because the map fails to load when using merely "Components" for some reason.
+            foreach (Component comp in Components.ToArray()) {
+                if (comp is DashListener)
+                    Components.Remove(comp);
+            }
+            
+            Add(new DashListener {
+                OnDash = new Action<Vector2>(OnDiagDash)
+            });
+        }
+
+        private void OnDiagDash(Vector2 dir) {
+            if (CheckDirection(dir))
+                OriginalOnDash.Invoke(this, new object[] { dir });
+        }
+
+        private bool CheckDirection(Vector2 dir) {
+            bool xOk = false;
+            bool yOk = false;
+
+            if (Math.Abs(dir.X) - .707 <= .01)
+                xOk = true;
+
+            if (Math.Abs(dir.Y) - .707 <= .01 && dir.Y < 0)
+                yOk = true;
+
+            if (xOk && yOk)
+                return true;
+
+            return false;
+        }
+
+        private static EntityData FixData(EntityData data) {
+            data.Values["winged"] = true;
+            return data;
+        }
+
+        private MethodInfo OriginalOnDash;
+    }
+}

SpringCollab2020.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net452</TargetFrameworks>
@@ -45,4 +45,4 @@
     </Otherwise>
   </Choose>
 
-</Project>
+</Project>

SpringCollab2020Module.cs

@@ -1,4 +1,4 @@
-using Celeste.Mod.SpringCollab2020.Entities;
+using Celeste.Mod.SpringCollab2020.Entities;
 using Celeste.Mod.SpringCollab2020.Triggers;
 
 namespace Celeste.Mod.SpringCollab2020 {
@@ -11,13 +11,13 @@ public SpringCollab2020Module() {
         }
 
         public override void Load() {
-            NoRefillField.Load();
+            NoRefillField.Load();
             FloatierSpaceBlock.Load();
         }
 
         public override void Unload() {
-            NoRefillField.Unload();
+            NoRefillField.Unload();
             FloatierSpaceBlock.Unload();
-        }
+        }
     }
-}
+}

everest.yaml

@@ -3,4 +3,4 @@
   DLL: bin/Debug/net452/SpringCollab2020.dll
   Dependencies:
     - Name: Everest
-      Version: 1.1311.0
+      Version: 1.1336.0