Skip to content

Commit 27a5831

Browse files
committed
Fix timer messages
1 parent 91a6b58 commit 27a5831

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

game/src/main/kotlin/content/skill/summoning/SummoningTimers.kt

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ class SummoningTimers : Script {
2323
if (seconds == 0) {
2424
dec("familiar_details_minutes_remaining")
2525
}
26-
seconds++
27-
set("familiar_details_seconds_remaining", seconds % 2)
26+
seconds = (seconds + 1) % 2
27+
set("familiar_details_seconds_remaining", seconds)
2828
val minutes = get("familiar_details_minutes_remaining", 0)
29-
if (minutes == 1) {
30-
if (seconds == 0) {
31-
message("You have 1 minute before your familiar vanishes.")
32-
} else {
33-
message("You have 30 seconds before your familiar vanishes.")
34-
}
29+
if (minutes == 1 && seconds == 0) {
30+
message("You have 1 minute before your familiar vanishes.")
31+
} else if (minutes == 0 && seconds == 1) {
32+
message("You have 30 seconds before your familiar vanishes.")
3533
}
3634
if (seconds <= 0 && minutes <= 0) {
3735
return@timerTick Timer.CANCEL

game/src/main/kotlin/content/skill/summoning/familiar/SpiritWolf.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,4 @@ class SpiritWolf : Script {
4242
}
4343
}
4444
}
45-
}
45+
}

0 commit comments

Comments
 (0)