Skip to content

Commit 3313d00

Browse files
committed
Usual post-commit polish pass
1 parent dad0279 commit 3313d00

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

Ahorn/entities/cassetteFriendlyStrawberry.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ sprites = Dict{Tuple{Bool, Bool, Bool}, String}(
2626

2727
seedSprite = "collectables/strawberry/seed00"
2828

29-
fallback = "collectables/strawberry/normal00"
30-
3129
Ahorn.nodeLimits(entity::CassetteFriendlyStrawberry) = 0, -1
3230

3331
function Ahorn.selection(entity::CassetteFriendlyStrawberry)

Entities/CassetteFriendlyStrawberrySeed.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
using Microsoft.Xna.Framework;
22
using Monocle;
3-
using System;
43
using System.Linq;
5-
using System.Reflection;
64

75
namespace Celeste.Mod.SpringCollab2020.Entities {
86
/// <summary>
97
/// Strawberry seeds that deal nicer with being hidden in cassette blocks.
10-
/// They appear when the cassette block disappears, and keep a normal hitbox.
8+
/// - Their depth is adjusted to appear in front of disabled cassette blocks, but behind enabled ones.
9+
/// - They are not "attached", meaning they won't disappear when the cassette block disappears.
1110
/// </summary>
1211
class CassetteFriendlyStrawberrySeed : StrawberrySeed {
1312

14-
bool isInCassetteBlock;
13+
private bool isInCassetteBlock;
1514

1615
public CassetteFriendlyStrawberrySeed(Strawberry strawberry, Vector2 position, int index, bool ghost)
1716
: base(strawberry, position, index, ghost) { }
@@ -21,8 +20,8 @@ public override void Added(Scene scene) {
2120
// our seed is entirely inside a cassette block: look for the static mover.
2221
foreach (Component component in this) {
2322
if (component is StaticMover mover) {
24-
Remove(mover);
25-
Depth = 11; // just below active cassette blocks
23+
Remove(mover); // get rid of behavior like "disappear with cassette block" or "get double-size hitbox"
24+
Depth = 11; // display just below active cassette blocks
2625
isInCassetteBlock = true;
2726
break;
2827
}

0 commit comments

Comments
 (0)