Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Overload fixes and revisions #533

Merged
merged 11 commits into from
May 18, 2024
Merged

Overload fixes and revisions #533

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d8499c
* Revise the overload boost by applying it before the player takes da…
Syntax2022 May 5, 2024
bf77b4e
* Change name of an area from `main_wilderness_multi_area` to `wilder…
Syntax2022 May 8, 2024
cfd7e2b
Merge branch 'GregHib:main' into overload
Syntax2022 May 8, 2024
b649831
* Add `exitArea` so if a player were to enter the wilderness with the…
Syntax2022 May 8, 2024
a211ea8
Merge branch 'main' into overload
Syntax2022 May 13, 2024
58398dc
Merge branch 'main' into overload
Syntax2022 May 15, 2024
9e92287
Reapply boost every interval
GregHib May 18, 2024
2e97eb5
Tidy
GregHib May 18, 2024
8d472d4
Removing boost when entering wilderness doesn't restore hp and only r…
GregHib May 18, 2024
04c1f45
Don't remove overload stats on logout
GregHib May 18, 2024
0d9b355
Tidy
GregHib May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 24 additions & 11 deletions .../kotlin/world/gregs/voidps/world/interact/entity/player/combat/consume/drink/Overload.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ import world.gregs.voidps.engine.timer.timerStart
import world.gregs.voidps.engine.timer.timerStop
import world.gregs.voidps.engine.timer.timerTick
import world.gregs.voidps.world.interact.entity.combat.hit.directHit
import world.gregs.voidps.world.interact.entity.combat.inWilderness
import world.gregs.voidps.world.interact.entity.player.combat.consume.canConsume

fun inWilderness() = false

canConsume("overload*") { player ->
if (player.timers.contains("overload")) {
player.message("You may only use this potion every five minutes.")
Expand All @@ -36,6 +35,7 @@ timerStart("overload") { player ->
if (restart) {
return@timerStart
}
applyBoost(player)
player.queue(name = "overload_hits") {
repeat(5) {
player.directHit(100)
Expand All @@ -49,9 +49,17 @@ timerStart("overload") { player ->
timerTick("overload") { player ->
if (player.dec("overload_refreshes_remaining") <= 0) {
cancel()
removeBoost(player)
GregHib marked this conversation as resolved.
Show resolved Hide resolved
return@timerTick
}
if (inWilderness()) {
}

timerStop("overload") { player ->
player.message("<dark_red>The effects of overload have worn off and you feel normal again.")
}

fun applyBoost(player: Player) {
if (player.inWilderness) {
player.levels.boost(Skill.Attack, 5, 0.15)
player.levels.boost(Skill.Strength, 5, 0.15)
player.levels.boost(Skill.Defence, 5, 0.15)
Expand All @@ -66,15 +74,20 @@ timerTick("overload") { player ->
}
}

timerStop("overload") { player ->
reset(player, Skill.Attack)
reset(player, Skill.Strength)
reset(player, Skill.Defence)
reset(player, Skill.Magic)
reset(player, Skill.Ranged)
fun removeBoost(player: Player) {
GregHib marked this conversation as resolved.
Show resolved Hide resolved
val skillsToReset = listOf(
Skill.Attack,
Skill.Strength,
Skill.Defence,
Skill.Magic,
Skill.Ranged
)

for (skill in skillsToReset) {
reset(player, skill)
}

player.levels.restore(Skill.Constitution, 500)
player.message("<dark_red>The effects of overload have worn off and you feel normal again.")
player["overload_refreshes_remaining"] = 0
}

fun reset(player: Player, skill: Skill) {
Expand Down
Loading