Skip to content

Commit f3cb08a

Browse files
committed
Moved Stand On Cloud to PreGolem.
1 parent 888bad3 commit f3cb08a

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

Code/Effects/Challenges/StandOnBlockChallenge.cs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ private static readonly (ushort tileId, short itemId)[] PreEyeTiles =
2424

2525
private static readonly (ushort tileId, short itemId)[] PreSkeletronTiles =
2626
{
27-
(TileID.SnowBlock, ItemID.SnowBlock), (TileID.IceBlock, ItemID.IceBlock), (TileID.Cloud, ItemID.Cloud),
27+
(TileID.SnowBlock, ItemID.SnowBlock), (TileID.IceBlock, ItemID.IceBlock),
2828
(TileID.RichMahogany, ItemID.RichMahogany), (TileID.BorealWood, ItemID.BorealWood), (TileID.Campfire, ItemID.Campfire)
2929
};
3030

@@ -40,7 +40,7 @@ private static readonly (ushort tileId, short itemId)[] PreMechTiles =
4040

4141
private static readonly (ushort tileId, short itemId)[] PreGolemTiles =
4242
{
43-
(TileID.SnowBrick, ItemID.SnowBrick), (TileID.IceBrick, ItemID.IceBrick)
43+
(TileID.SnowBrick, ItemID.SnowBrick), (TileID.IceBrick, ItemID.IceBrick), (TileID.Cloud, ItemID.Cloud)
4444
};
4545

4646
private static readonly (ushort tileId, short itemId)[] PreLunarTiles =
@@ -118,7 +118,7 @@ protected override void OnChallengeStop()
118118

119119
protected override void OnUpdate(float delta)
120120
{
121-
if (_chosen != null && (GetLocalPlayer().Player.IsStandingOn(_chosen.Value.tileId) || CheckWood()))
121+
if (_chosen != null && (GetLocalPlayer().Player.IsStandingOn(_chosen.Value.tileId) || CheckWood() || CheckCloud()))
122122
{
123123
SetChallengeCompleted();
124124
}
@@ -135,5 +135,10 @@ private bool CheckWood()
135135
return _chosen!.Value.itemId == ItemID.Wood && GetLocalPlayer().Player.IsStandingOn(t => _woodTileIds.Contains(Main.tile[t.x, t.y].TileType));
136136
}
137137

138+
private bool CheckCloud()
139+
{
140+
return _chosen!.Value.itemId == ItemID.Cloud && (GetLocalPlayer().Player.IsStandingOn(TileID.RainCloud) || GetLocalPlayer().Player.IsStandingOn(TileID.SnowCloud));
141+
}
142+
138143
#endregion
139144
}

0 commit comments

Comments
 (0)