Skip to content

Commit 725304d

Browse files
committed
Add support for non-integer speed berry times
1 parent 51f0db9 commit 725304d

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

Ahorn/entities/speedBerry.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module CollabUtils2SpeedBerry
22

33
using ..Ahorn, Maple
44

5-
@mapdef Entity "CollabUtils2/SpeedBerry" SpeedBerry(x::Integer, y::Integer, bronzeTime::Integer=15, silverTime::Integer=10, goldTime::Integer=5)
5+
@mapdef Entity "CollabUtils2/SpeedBerry" SpeedBerry(x::Integer, y::Integer, bronzeTime::Number=15.0, silverTime::Number=10.0, goldTime::Number=5.0)
66

77
const placements = Ahorn.PlacementDict(
88
"Speed Berry (Collab Utils 2 / READ DOCS)" => Ahorn.EntityPlacement(

CollabMapDataProcessor.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ namespace Celeste.Mod.CollabUtils2 {
55
class CollabMapDataProcessor : EverestMapDataProcessor {
66
public struct SpeedBerryInfo {
77
public EntityID ID;
8-
public int Gold;
9-
public int Silver;
10-
public int Bronze;
8+
public float Gold;
9+
public float Silver;
10+
public float Bronze;
1111
}
1212

1313
public struct GymLevelInfo {
@@ -63,9 +63,9 @@ public struct GymTechInfo {
6363
"entity:CollabUtils2/SpeedBerry", speedBerry => {
6464
SpeedBerries[AreaKey.GetSID()] = new SpeedBerryInfo() {
6565
ID = new EntityID(levelName, speedBerry.AttrInt("id")),
66-
Gold = speedBerry.AttrInt("goldTime"),
67-
Silver = speedBerry.AttrInt("silverTime"),
68-
Bronze = speedBerry.AttrInt("bronzeTime")
66+
Gold = speedBerry.AttrFloat("goldTime"),
67+
Silver = speedBerry.AttrFloat("silverTime"),
68+
Bronze = speedBerry.AttrFloat("bronzeTime")
6969
};
7070
}
7171
},

Loenn/entities/speedBerry.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ speedBerry.placements = {
55
{
66
name = "default",
77
data = {
8-
bronzeTime = 15,
9-
silverTime = 10,
10-
goldTime = 5,
8+
bronzeTime = 15.0,
9+
silverTime = 10.0,
10+
goldTime = 5.0,
1111
}
1212
}
1313
}

everest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- Name: CollabUtils2
2-
Version: 1.10.3
2+
Version: 1.10.4
33
DLL: bin/Release/net452/CollabUtils2.dll
44
Dependencies:
55
- Name: Everest

0 commit comments

Comments
 (0)