Add an option for the seeds to ignore lighting

Author: maddie480

Ahorn/entities/multiRoomStrawberry.jl

@@ -3,7 +3,7 @@
 using ..Ahorn, Maple
 
 @mapdef Entity "SpringCollab2020/MultiRoomStrawberry" MultiRoomStrawberry(x::Integer, y::Integer,
-    name::String="multi_room_strawberry",winged::Bool=false, moon::Bool=false, checkpointID::Integer=-1, order::Integer=-1)
+    name::String="multi_room_strawberry", winged::Bool=false, moon::Bool=false, checkpointID::Integer=-1, order::Integer=-1)
 
 const placements = Ahorn.PlacementDict(
     "Multi-Room Strawberry (Spring Collab 2020)" => Ahorn.EntityPlacement(

Ahorn/entities/multiRoomStrawberrySeed.jl

@@ -3,7 +3,10 @@
 using ..Ahorn, Maple
 
 @mapdef Entity "SpringCollab2020/MultiRoomStrawberrySeed" MultiRoomStrawberrySeed(x::Integer, y::Integer,
-    strawberryName::String="multi_room_strawberry", sprite::String="strawberry/seed", ghostSprite::String="ghostberry/seed", index::Int=-1)
+    strawberryName::String="multi_room_strawberry", sprite::String="strawberry/seed", ghostSprite::String="ghostberry/seed", index::Int=-1, ignoreLighting::Bool=false)
+    
+const bundledSprites = String["strawberry/seed", "SpringCollab2020/miniberry/miniberry"]
+const bundledGhostSprites = String["ghostberry/seed", "SpringCollab2020/miniberry/ghostminiberry"]
 
 const placements = Ahorn.PlacementDict(
     "Multi-Room Strawberry Seed (Spring Collab 2020)" => Ahorn.EntityPlacement(
@@ -12,6 +15,11 @@ const placements = Ahorn.PlacementDict(
 )
 
 
+Ahorn.editingOptions(entity::MultiRoomStrawberrySeed) = Dict{String,Any}(
+    "sprite" => bundledSprites,
+    "ghostSprite" => bundledGhostSprites
+)
+
 function Ahorn.selection(entity::MultiRoomStrawberrySeed) 
     x, y = Ahorn.position(entity)
     sprite = "collectables/" * get(entity.data, "sprite", "strawberry/seed") * "00"

Ahorn/lang/en_gb.lang

@@ -146,3 +146,17 @@ placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.pauseTime=
 placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.mode=Determines the way the platform will move between its nodes. For example, with 3 nodes A, B, C:\n- Loop: A > B > C > A\n- LoopNoPause: A > A (going through B and C)\n- BackAndForth: A > B > C > B > A\n- BackAndForthNoPause: A > C > A (going through B)\n- TeleportBack: A > B > C, then the platform teleports to A upon reaching C
 placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.texture=What texture to use for the platform.
 placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.easing=Whether the platform movement should be eased (speedup/slowdown around each position).
+
+# Multi-Room Strawberry Seed
+placements.entities.SpringCollab2020/MultiRoomStrawberrySeed.tooltips.strawberryName=The name of the strawberry this seed belongs to.
+placements.entities.SpringCollab2020/MultiRoomStrawberrySeed.tooltips.sprite=The path to the sprite folder (relative to Graphics/Atlas/Gameplay/collectables).
+placements.entities.SpringCollab2020/MultiRoomStrawberrySeed.tooltips.ghostSprite=The path to the sprite folder (relative to Graphics/Atlas/Gameplay/collectables) used when the strawberry is already collected.
+placements.entities.SpringCollab2020/MultiRoomStrawberrySeed.tooltips.index=The order for this seed (determines the sound played on collection). If left to -1, Everest will auto-assign it.
+placements.entities.SpringCollab2020/MultiRoomStrawberrySeed.tooltips.ignoreLighting=If checked, the berry seed will appear bright at all times, even if the room is dark.
+
+# Multi-Room Strawberry
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.name=The strawberry name, used to pair it with its seeds.
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.winged=The strawberry attempts to vertically rise offscreen when the player dashes.
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.checkpointID=Manually determine what checkpoint section strawberries are visually grouped up in, showing up on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.order=Manually determine what order strawberries are visually placed in on the start menu during gameplay and level select. Overrides Everest's automatic berry IDs. (Default= -1)
+placements.entities.SpringCollab2020/MultiRoomStrawberry.tooltips.moon=Makes the strawberry render as a space berry.\nDoes not work with wings or nodes in the base game.

Entities/MultiRoomStrawberrySeed.cs

@@ -1,18 +1,22 @@
 using Celeste.Mod.Entities;
 using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
 using Monocle;
 using System;
 using System.Reflection;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/MultiRoomStrawberrySeed")]
+    [Tracked]
     class MultiRoomStrawberrySeed : StrawberrySeed {
         public static void Load() {
             On.Celeste.Level.LoadLevel += onLoadLevel;
+            On.Celeste.LightingRenderer.BeforeRender += onLightingBeforeRender;
         }
 
         public static void Unload() {
             On.Celeste.Level.LoadLevel -= onLoadLevel;
+            On.Celeste.LightingRenderer.BeforeRender -= onLightingBeforeRender;
         }
 
         private static void onLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level self, Player.IntroTypes playerIntro, bool isFromLoader) {
@@ -34,6 +38,20 @@ private static void onLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level self
             }
         }
 
+        private static void onLightingBeforeRender(On.Celeste.LightingRenderer.orig_BeforeRender orig, LightingRenderer self, Scene scene) {
+            orig(self, scene);
+
+            Draw.SpriteBatch.GraphicsDevice.SetRenderTarget(GameplayBuffers.Light);
+            Draw.SpriteBatch.Begin(SpriteSortMode.Deferred, BlendState.AlphaBlend, SamplerState.PointClamp, DepthStencilState.None, RasterizerState.CullNone, null, Matrix.Identity);
+            foreach (MultiRoomStrawberrySeed seed in scene.Tracker.GetEntities<MultiRoomStrawberrySeed>()) {
+                if (seed.cutoutTexture != null) {
+                    Draw.SpriteBatch.Draw(seed.cutoutTexture.Texture.Texture, seed.Position + seed.spriteObject.Position - (scene as Level).Camera.Position
+                        - new Vector2(seed.cutoutTexture.Width / 2, seed.cutoutTexture.Height / 2), Color.White);
+                }
+            }
+            Draw.SpriteBatch.End();
+        }
+
         private static FieldInfo seedFollower = typeof(StrawberrySeed).GetField("follower", BindingFlags.NonPublic | BindingFlags.Instance);
         private static FieldInfo seedCanLoseTimer = typeof(StrawberrySeed).GetField("canLoseTimer", BindingFlags.NonPublic | BindingFlags.Instance);
         private static FieldInfo seedSprite = typeof(StrawberrySeed).GetField("sprite", BindingFlags.NonPublic | BindingFlags.Instance);
@@ -48,11 +66,18 @@ private static void onLoadLevel(On.Celeste.Level.orig_LoadLevel orig, Level self
         private string sprite;
         private bool ghost;
 
-        public MultiRoomStrawberrySeed(Vector2 position, int index, bool ghost, string sprite, string ghostSprite) : base(null, position, index, ghost) {
+        private Sprite spriteObject;
+        private MTexture cutoutTexture;
+
+        public MultiRoomStrawberrySeed(Vector2 position, int index, bool ghost, string sprite, string ghostSprite, bool ignoreLighting) : base(null, position, index, ghost) {
             this.index = index;
             this.ghost = ghost;
             this.sprite = ghost ? ghostSprite : sprite;
 
+            if (ignoreLighting) {
+                cutoutTexture = GFX.Game["collectables/" + sprite + "_cutout"];
+            }
+
             foreach (Component component in this) {
                 if (component is PlayerCollider playerCollider) {
                     playerCollider.OnCollide = OnPlayer;
@@ -62,19 +87,21 @@ public MultiRoomStrawberrySeed(Vector2 position, int index, bool ghost, string s
 
         public MultiRoomStrawberrySeed(EntityData data, Vector2 offset) : this(data.Position + offset, data.Int("index"),
             SaveData.Instance.CheckStrawberry(new EntityID(data.Attr("berryLevel"), data.Int("berryID"))),
-            data.Attr("sprite", "strawberry/seed"), data.Attr("ghostSprite", "ghostberry/seed")) {
+            data.Attr("sprite", "strawberry/seed"), data.Attr("ghostSprite", "ghostberry/seed"), data.Bool("ignoreLighting")) {
 
             BerryID = new EntityID(data.Attr("berryLevel"), data.Int("berryID"));
         }
 
         private MultiRoomStrawberrySeed(Player player, Vector2 position, SpringCollab2020Session.MultiRoomStrawberrySeedInfo sessionSeedInfo)
-            : this(position, sessionSeedInfo.Index, SaveData.Instance.CheckStrawberry(sessionSeedInfo.BerryID), sessionSeedInfo.Sprite, sessionSeedInfo.Sprite) {
+            : this(position, sessionSeedInfo.Index, SaveData.Instance.CheckStrawberry(sessionSeedInfo.BerryID), sessionSeedInfo.Sprite, sessionSeedInfo.Sprite, sessionSeedInfo.IgnoreLighting) {
 
             BerryID = sessionSeedInfo.BerryID;
 
             // the seed is collected right away.
             this.player = player;
             spawnedAsFollower = true;
+
+            Add(new EffectCutout());
         }
 
         public override void Added(Scene scene) {
@@ -136,6 +163,9 @@ public override void Awake(Scene scene) {
                 Depth = -1000000;
                 AddTag(Tags.Persistent);
             }
+
+            // get a reference to the sprite. this will be used to "cut out" the lighting renderer.
+            spriteObject = (Sprite) seedSprite.GetValue(this);
         }
 
         private void OnPlayer(Player player) {
@@ -151,6 +181,7 @@ private void OnPlayer(Player player) {
             sessionSeedInfo.Index = index;
             sessionSeedInfo.BerryID = BerryID;
             sessionSeedInfo.Sprite = sprite;
+            sessionSeedInfo.IgnoreLighting = (cutoutTexture != null);
             SpringCollab2020Module.Instance.Session.CollectedMultiRoomStrawberrySeeds.Add(sessionSeedInfo);
         }
 

Graphics/Atlases/Gameplay/collectables/SpringCollab2020/miniberry/ghostminiberry_cutout.png

@@ -7,6 +7,7 @@ public class MultiRoomStrawberrySeedInfo {
             public int Index { get; set; }
             public EntityID BerryID { get; set; }
             public string Sprite { get; set; }
+            public bool IgnoreLighting { get; set; }
         }
 
         public bool IcePhysicsDisabled { get; set; } = false;