Merge branch 'master' into multiple_room_seeded_berry

Author: maddie480

Ahorn/entities/cassetteFriendlyStrawberry.jl

@@ -0,0 +1,81 @@
+module SpringCollab2020CassetteFriendlyStrawberry
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/CassetteFriendlyStrawberry" CassetteFriendlyStrawberry(x::Integer, y::Integer, winged::Bool=false, moon::Bool=false,
+    checkpointID::Integer=-1, order::Integer=-1, nodes::Array{Tuple{Integer, Integer}, 1}=Tuple{Integer, Integer}[])
+
+const placements = Ahorn.PlacementDict(
+    "Cassette-Friendly Strawberry (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        CassetteFriendlyStrawberry
+    )
+)
+
+# winged, has pips, moon
+sprites = Dict{Tuple{Bool, Bool, Bool}, String}(
+    (false, false, false) => "collectables/strawberry/normal00",
+    (true, false, false) => "collectables/strawberry/wings01",
+    (false, true, false) => "collectables/ghostberry/idle00",
+    (true, true, false) => "collectables/ghostberry/wings01",
+
+    (false, false, true) => "collectables/moonBerry/normal00",
+    (true, false, true) => "collectables/moonBerry/ghost00",
+    (false, true, true) => "collectables/moonBerry/ghost00",
+    (true, true, true) => "collectables/moonBerry/ghost00"
+)
+
+seedSprite = "collectables/strawberry/seed00"
+
+Ahorn.nodeLimits(entity::CassetteFriendlyStrawberry) = 0, -1
+
+function Ahorn.selection(entity::CassetteFriendlyStrawberry)
+    x, y = Ahorn.position(entity)
+
+    nodes = get(entity.data, "nodes", ())
+    moon = get(entity.data, "moon", false)
+    winged = get(entity.data, "winged", false)
+    hasPips = length(nodes) > 0
+
+    sprite = sprites[(winged, hasPips, moon)]
+
+    res = Ahorn.Rectangle[Ahorn.getSpriteRectangle(sprite, 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::CassetteFriendlyStrawberry)
+    x, y = Ahorn.position(entity)
+
+    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::CassetteFriendlyStrawberry, room::Maple.Room)
+    x, y = Ahorn.position(entity)
+
+    nodes = get(entity.data, "nodes", ())
+    moon = get(entity.data, "moon", false)
+    winged = get(entity.data, "winged", false)
+    hasPips = length(nodes) > 0
+
+    sprite = sprites[(winged, hasPips, moon)]
+
+    for node in nodes
+        nx, ny = node
+
+        Ahorn.drawSprite(ctx, seedSprite, nx, ny)
+    end
+
+    Ahorn.drawSprite(ctx, sprite, x, y)
+end
+
+end

Ahorn/entities/trollStrawberry.jl

@@ -0,0 +1,57 @@
+module SpringCollab2020TrollStrawberry
+
+using ..Ahorn, Maple
+
+@mapdef Entity "SpringCollab2020/trollStrawberry" TrollStrawberry(x::Integer, y::Integer, winged::Bool=false)
+
+const placements = Ahorn.PlacementDict(
+    "Troll Strawberry (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        TrollStrawberry
+    ),
+
+    "Troll Strawberry (Winged) (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        TrollStrawberry,
+        "point",
+        Dict{String, Any}(
+            "winged" => true
+        )
+    ),
+)
+
+# name, winged
+sprites = Dict{Tuple{String, Bool}, String}(
+    ("SpringCollab2020/trollStrawberry", false) => "collectables/strawberry/normal00",
+    ("SpringCollab2020/trollStrawberry", true) => "collectables/strawberry/wings01",
+)
+
+fallback = "collectables/strawberry/normal00"
+
+Ahorn.nodeLimits(entity::TrollStrawberry) = 0, -1
+
+function Ahorn.selection(entity::TrollStrawberry)
+    x, y = Ahorn.position(entity)
+
+    winged = get(entity.data, "winged", false)
+
+    sprite = sprites[(entity.name, winged)]
+
+    res = Ahorn.Rectangle[Ahorn.getSpriteRectangle(sprite, x, y)]
+
+    return res
+end
+
+function Ahorn.renderSelectedAbs(ctx::Ahorn.Cairo.CairoContext, entity::TrollStrawberry)
+
+end
+
+function Ahorn.renderAbs(ctx::Ahorn.Cairo.CairoContext, entity::TrollStrawberry, room::Maple.Room)
+    x, y = Ahorn.position(entity)
+
+    winged = get(entity.data, "winged", false)
+
+    sprite = sprites[(entity.name, winged)]
+
+    Ahorn.drawSprite(ctx, sprite, x, y)
+end
+
+end

Ahorn/lang/en_gb.lang

@@ -20,6 +20,13 @@ placements.entities.SpringCollab2020/LightningDashSwitch.tooltips.persistent=Whe
 # Cave Wall
 placements.entities.SpringCollab2020/caveWall.tooltips.tiletype=Changes the visual appearance of the wall.
 
+# Lightning Strike Trigger
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.playerOffset=The X offset of the lightning relative to the player's position.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.seed=The seed for the randomizer which generates the lightning strike.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.delay=The delay, in seconds, between the player entering the trigger and the appearance of the lightning strike.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.rain=Upon lightning strike, rain will begin falling in the level.
+placements.triggers.SpringCollab2020/LightningStrikeTrigger.tooltips.flash=Upon lightning strike, the screen will flash white.
+
 # Variable Crumble Blocks
 placements.entities.SpringCollab2020/variableCrumbleBlock.tooltips.texture=The texture of the blocks that are crumbling.2
 placements.entities.SpringCollab2020/variableCrumbleBlock.tooltips.timer=How long the blocks will shake for before falling.
@@ -140,13 +147,22 @@ placements.entities.SpringCollab2020/CustomBirdTutorial.tooltips.controls=The co
 placements.triggers.SpringCollab2020/CustomBirdTutorialTrigger.tooltips.birdId=The ID of the bird this trigger is controlling.
 placements.triggers.SpringCollab2020/CustomBirdTutorialTrigger.tooltips.showTutorial=If checked, the trigger will make the bird show the tutorial bubble. If unchecked, the trigger will make the bird fly away.
 
+# Troll Strawberry
+placements.entities.SpringCollab2020/trollStrawberry.tooltips.winged=The strawberry attempts to vertically rise offscreen when the player dashes.
+
 # Multi-Node Moving Platform
 placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.moveTime=The time the platform takes to move between two successive positions. Default is 2 seconds.
 placements.entities.SpringCollab2020/MultiNodeMovingPlatform.tooltips.pauseTime=The time the platform stops at each position. Default is 0 seconds.
 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).
 
+# Cassette-Friendly Strawberry
+placements.entities.SpringCollab2020/CassetteFriendlyStrawberry.tooltips.winged=The strawberry attempts to vertically rise offscreen when the player dashes.
+placements.entities.SpringCollab2020/CassetteFriendlyStrawberry.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/CassetteFriendlyStrawberry.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/CassetteFriendlyStrawberry.tooltips.moon=Makes the strawberry render as a space berry.\nDoes not work with wings or nodes in the base game.
+
 # 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).

Ahorn/triggers/lightningStrikeTrigger.jl

@@ -0,0 +1,14 @@
+module SpringCollab2020LightningStrikeTrigger
+
+using ..Ahorn, Maple
+
+@mapdef Trigger "SpringCollab2020/LightningStrikeTrigger" LightningStrikeTrigger(x::Integer, y::Integer, width::Integer=Maple.defaultTriggerWidth, height::Integer=Maple.defaultTriggerHeight, playerOffset::Number=0.0, seed::Integer=0, delay::Number=0.0, rain::Bool=true, flash::Bool=true)
+
+const placements = Ahorn.PlacementDict(
+    "Lightning Strike (Spring Collab 2020)" => Ahorn.EntityPlacement(
+        LightningStrikeTrigger,
+        "rectangle",
+    ),
+)
+
+end

Entities/CassetteFriendlyStrawberry.cs

@@ -0,0 +1,24 @@
+using Celeste.Mod.Entities;
+using Microsoft.Xna.Framework;
+using System.Collections.Generic;
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    /// <summary>
+    /// Just a strawberry with cassette-friendly strawberry seeds.
+    /// </summary>
+    [CustomEntity("SpringCollab2020/CassetteFriendlyStrawberry")]
+    [RegisterStrawberry(true, false)]
+    class CassetteFriendlyStrawberry : Strawberry {
+        public CassetteFriendlyStrawberry(EntityData data, Vector2 offset, EntityID gid) : base(data, offset, gid) {
+            bool isGhostBerry = SaveData.Instance.CheckStrawberry(ID);
+
+            // we just want to create cassette-friendly strawberry seeds to replace vanilla seeds.
+            if (data.Nodes != null && data.Nodes.Length != 0) {
+                Seeds = new List<StrawberrySeed>();
+                for (int i = 0; i < data.Nodes.Length; i++) {
+                    Seeds.Add(new CassetteFriendlyStrawberrySeed(this, offset + data.Nodes[i], i, isGhostBerry));
+                }
+            }
+        }
+    }
+}

Entities/CassetteFriendlyStrawberrySeed.cs

@@ -0,0 +1,42 @@
+using Microsoft.Xna.Framework;
+using Monocle;
+using System.Linq;
+
+namespace Celeste.Mod.SpringCollab2020.Entities {
+    /// <summary>
+    /// Strawberry seeds that deal nicer with being hidden in cassette blocks.
+    /// - Their depth is adjusted to appear in front of disabled cassette blocks, but behind enabled ones.
+    /// - They are not "attached", meaning they won't disappear when the cassette block disappears.
+    /// </summary>
+    class CassetteFriendlyStrawberrySeed : StrawberrySeed {
+
+        private bool isInCassetteBlock;
+
+        public CassetteFriendlyStrawberrySeed(Strawberry strawberry, Vector2 position, int index, bool ghost)
+            : base(strawberry, position, index, ghost) { }
+
+        public override void Added(Scene scene) {
+            if (scene.Entities.OfType<CassetteBlock>().Any(block => block.Collider.Bounds.Contains(Collider.Bounds))) {
+                // our seed is entirely inside a cassette block: look for the static mover.
+                foreach (Component component in this) {
+                    if (component is StaticMover mover) {
+                        Remove(mover); // get rid of behavior like "disappear with cassette block" or "get double-size hitbox"
+                        Depth = 11; // display just below active cassette blocks
+                        isInCassetteBlock = true;
+                        break;
+                    }
+                }
+            }
+
+            base.Added(scene);
+        }
+
+        public override void Update() {
+            base.Update();
+
+            if (isInCassetteBlock && !Visible) {
+                Depth = 11; // reset depth when losing the seed
+            }
+        }
+    }
+}

Entities/MultiRoomStrawberrySeed.cs

@@ -3,8 +3,6 @@
 using Microsoft.Xna.Framework.Graphics;
 using Monocle;
 using MonoMod.Utils;
-using System;
-using System.Reflection;
 
 namespace Celeste.Mod.SpringCollab2020.Entities {
     [CustomEntity("SpringCollab2020/MultiRoomStrawberrySeed")]