Merge pull request #32 from EverestAPI/berry_with_return

Berry with Return

Author: Cruor

Ahorn/entities/bubbleReturnBerry.jl

@@ -0,0 +1,35 @@
+module SpringCollab2020BubbleReturnBerry
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/returnBerry" ReturnBerry(x::Integer, y::Integer, order::Integer=-1, checkpointID::Integer=-1, winged::Bool=false)
+
+const placements = Ahorn.PlacementDict(
+	"Strawberry With Return (Spring Collab 2020)" => Ahorn.EntityPlacement(
+		ReturnBerry
+	)
+)
+
+function getSpriteName(entity::ReturnBerry)
+	winged = get(entity.data, "winged", false)
+
+	if winged
+		return "collectables/strawberry/wings01"
+	end
+
+	return "collectables/strawberry/normal00"
+end
+
+function Ahorn.selection(entity::ReturnBerry)
+	x, y = Ahorn.position(entity)
+
+	return Ahorn.getSpriteRectangle(getSpriteName(entity), x, y)
+end
+
+function Ahorn.renderAbs(ctx::Ahorn.Cairo.CairoContext, entity::ReturnBerry, room::Maple.Room)
+	x, y = Ahorn.position(entity)
+
+	Ahorn.drawSprite(ctx, getSpriteName(entity), x, y)
+end
+
+end

Entities/BubbleReturnBerry.cs

@@ -0,0 +1,35 @@
+using Celeste;
+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)]
+    class BubbleReturnBerry : Strawberry {
+        public BubbleReturnBerry(EntityData data, Vector2 position, EntityID gid) : base(data, position, gid) {
+            Add(collider = new PlayerCollider(new Action<Player>(OnPlayer)));
+        }
+
+        public new void OnPlayer(Player player) {
+            Add(new Coroutine(Return(player), true));
+
+            Collidable = false;
+        }
+
+        private IEnumerator Return(Player player) {
+            yield return 0.3f;
+
+            if (!player.Dead) {
+                Vector2 targetLocation = (Vector2) SceneAs<Level>().Session.RespawnPoint;
+
+                Audio.Play("event:/game/general/cassette_bubblereturn", SceneAs<Level>().Camera.Position + new Vector2(160f, 90f));
+                player.StartCassetteFly(targetLocation, targetLocation);
+            }
+        }
+
+        private static PlayerCollider collider;
+    }
+}