Return Berry Improvements (#64)

Return Berry Improvements

Author: 0x0ade

Ahorn/entities/bubbleReturnBerry.jl

@@ -2,14 +2,25 @@
 
 using ..Ahorn, Maple
 
-@mapdef Entity "SpringCollab2020/returnBerry" ReturnBerry(x::Integer, y::Integer, order::Integer=-1, checkpointID::Integer=-1, winged::Bool=false)
+@mapdef Entity "SpringCollab2020/returnBerry" ReturnBerry(x::Integer, y::Integer, order::Integer=-1, checkpointID::Integer=-1, winged::Bool=false, nodes::Array{Tuple{Integer, Integer}, 1}=Tuple{Integer, Integer}[])
 
 const placements = Ahorn.PlacementDict(
-	"Strawberry With Return (Spring Collab 2020)" => Ahorn.EntityPlacement(
+	"Strawberry (With Return) (Spring Collab 2020)" => Ahorn.EntityPlacement(
 		ReturnBerry
+	),
+	"Strawberry (Winged, With Return) (Spring Collab 2020)" => Ahorn.EntityPlacement(
+		ReturnBerry,
+		"point",
+		Dict{String,Any}(
+			"winged" => true
+		)
 	)
 )
 
+seedSprite = "collectables/strawberry/seed00"
+
+Ahorn.nodeLimits(entity::ReturnBerry) = 0, -1
+
 function getSpriteName(entity::ReturnBerry)
 	winged = get(entity.data, "winged", false)
 
@@ -22,12 +33,37 @@ end
 
 function Ahorn.selection(entity::ReturnBerry)
 	x, y = Ahorn.position(entity)
+	nodes = get(entity.data, "nodes", ())
+
+	res = Ahorn.Rectangle[Ahorn.getSpriteRectangle(getSpriteName(entity), x, y)]
+
+	for node in nodes
+		nx, ny = node
+		push!(res, Ahorn.getSpriteRectangle(seedSprite, nx, ny))
+	end
+
+	return res
+end
+
+function Ahorn.renderSelectedAbs(ctx::Ahorn.Cairo.CairoContext, entity::ReturnBerry)
+	x, y = Ahorn.position(entity)
 
-	return Ahorn.getSpriteRectangle(getSpriteName(entity), x, y)
+	for node in get(entity.data, "nodes", ())
+		nx, ny = node
+
+		Ahorn.drawLines(ctx, Tuple{Number, Number}[(x, y), (nx, ny)], Ahorn.colors.selection_selected_fc)
+	end
 end
 
 function Ahorn.renderAbs(ctx::Ahorn.Cairo.CairoContext, entity::ReturnBerry, room::Maple.Room)
 	x, y = Ahorn.position(entity)
+	nodes = get(entity.data, "nodes", ())
+
+	for node in nodes
+		nx, ny = node
+
+		Ahorn.drawSprite(ctx, seedSprite, nx, ny)
+	end
 
 	Ahorn.drawSprite(ctx, getSpriteName(entity), x, y)
 end

Entities/BubbleReturnBerry.cs

@@ -1,22 +1,41 @@
-using Celeste;
-using Celeste.Mod.Entities;
+using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
 using Monocle;
 using System;
 using System.Collections;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
-    [CustomEntity("SpringCollab2020/returnBerry")]
     [RegisterStrawberry(true, false)]
+    [CustomEntity("SpringCollab2020/returnBerry")]
     class BubbleReturnBerry : Strawberry {
         public BubbleReturnBerry(EntityData data, Vector2 position, EntityID gid) : base(data, position, gid) {
             Add(collider = new PlayerCollider(new Action<Player>(OnPlayer)));
         }
 
+        public static void Load() {
+            On.Celeste.Player.OnSquish += ModOnSquish;
+        }
+
+        public static void Unload() {
+            On.Celeste.Player.OnSquish -= ModOnSquish;
+        }
+
         public new void OnPlayer(Player player) {
-            Add(new Coroutine(Return(player), true));
+            base.OnPlayer(player);
+
+            if (!WaitingOnSeeds) {
+                Add(new Coroutine(Return(player), true));
+                Collidable = false;
+            }
+        }
+
+        private static void ModOnSquish(On.Celeste.Player.orig_OnSquish orig, Player player, CollisionData data) {
+            // State 21 is the state where the player is located within the Cassette Bubble.
+            // They shouldn't be squished by moving blocks inside of it, so we prevent that.
+            if (player.StateMachine.State == 21)
+                return;
 
-            Collidable = false;
+            orig(player, data);
         }
 
         private IEnumerator Return(Player player) {

SpringCollab2020Module.cs

@@ -18,6 +18,7 @@ public override void Load() {
             RemoveLightSourcesTrigger.Load();
             SafeRespawnCrumble.Load();
             UpsideDownJumpThru.Load();
+            BubbleReturnBerry.Load();
             SidewaysJumpThru.Load();
         }
 
@@ -35,6 +36,7 @@ public override void Unload() {
             SafeRespawnCrumble.Unload();
             GlassBerry.Unload();
             UpsideDownJumpThru.Unload();
+            BubbleReturnBerry.Unload();
             SidewaysJumpThru.Unload();
         }
     }