Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
GregHib committed Jan 23, 2025
1 parent b2f6fc6 commit 75833cd
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ var Player.headIcon: Int
headIcon = value
}

fun Player.setRenderEmote(id: String) = flag {
fun Player.renderEmote(id: String) = flag {
val definition = get<RenderEmoteDefinitions>().get(id)
appearance.emote = definition.id
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import world.gregs.voidps.engine.entity.character.face
import world.gregs.voidps.engine.entity.character.move.tele
import world.gregs.voidps.engine.entity.character.move.walkTo
import world.gregs.voidps.engine.entity.character.player.clearRenderEmote
import world.gregs.voidps.engine.entity.character.player.setRenderEmote
import world.gregs.voidps.engine.entity.character.player.renderEmote
import world.gregs.voidps.engine.entity.character.player.skill.Skill
import world.gregs.voidps.engine.entity.character.player.skill.exp.exp
import world.gregs.voidps.engine.entity.character.player.skill.level.Level.has
Expand Down Expand Up @@ -66,7 +66,7 @@ objectOperate("Cross", "barbarian_outpost_balance_beam") {
player.setAnimation("circus_cartwheel")
delay()
player.exactMove(Tile(2536, 3553, 3), 45, Direction.EAST)
player.setRenderEmote("beam_balance")
player.renderEmote("beam_balance")
delay()
player.exp(Skill.Agility, 15.0)
player.agilityStage(6)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import world.gregs.voidps.engine.entity.character.move.walkOver
import world.gregs.voidps.engine.entity.character.move.walkTo
import world.gregs.voidps.engine.entity.character.player.chat.ChatType
import world.gregs.voidps.engine.entity.character.player.clearRenderEmote
import world.gregs.voidps.engine.entity.character.player.setRenderEmote
import world.gregs.voidps.engine.entity.character.player.renderEmote
import world.gregs.voidps.engine.entity.character.player.skill.Skill
import world.gregs.voidps.engine.entity.character.player.skill.exp.exp
import world.gregs.voidps.engine.entity.character.player.skill.level.Level
Expand Down Expand Up @@ -74,7 +74,7 @@ objectOperate("Walk-across", "barbarian_outpost_log_balance") {
val disable = Settings["agility.disableCourseFailure", false]
val success = disable || Level.success(player.levels.get(Skill.Agility), 93) // 62.1% success rate at 35
player.message("You walk carefully across the slippery log...", ChatType.Filter)
player.setRenderEmote("rope_balance")
player.renderEmote("rope_balance")
if (success) {
player.walkOver(Tile(2541, 3546))
player.clearRenderEmote()
Expand All @@ -88,7 +88,7 @@ objectOperate("Walk-across", "barbarian_outpost_log_balance") {
delay()
player.message("... but you lose your footing and fall into the water.", ChatType.Filter)
player.tele(2545, 3545)
player.setRenderEmote("tread_water")
player.renderEmote("tread_water")
delay()
player.walkOver(Tile(2545, 3543))
player.message("Something in the water bites you.", ChatType.Filter)
Expand All @@ -114,7 +114,7 @@ objectOperate("Walk-across", "barbarian_outpost_balancing_ledge") {
val disable = Settings["agility.disableCourseFailure", false]
val success = disable || Level.success(player.levels.get(Skill.Agility), 93) // 62.1% success rate
delay()
player.setRenderEmote("ledge_balance")
player.renderEmote("ledge_balance")
player.message("You put your foot on the ledge and try to edge across...", ChatType.Filter)
if (success) {
player.walkOver(Tile(2532, 3547, 1))
Expand All @@ -131,7 +131,7 @@ objectOperate("Walk-across", "barbarian_outpost_balancing_ledge") {
delay()
player.tele(2534, 3546, 1)
player.face(Direction.SOUTH)
player.setRenderEmote("falling")
player.renderEmote("falling")
delay()
player.tele(2534, 3546, 0)
player.clearRenderEmote()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import world.gregs.voidps.engine.entity.character.move.walkOver
import world.gregs.voidps.engine.entity.character.npc.NPCs
import world.gregs.voidps.engine.entity.character.player.chat.ChatType
import world.gregs.voidps.engine.entity.character.player.clearRenderEmote
import world.gregs.voidps.engine.entity.character.player.setRenderEmote
import world.gregs.voidps.engine.entity.character.player.renderEmote
import world.gregs.voidps.engine.entity.character.player.skill.Skill
import world.gregs.voidps.engine.entity.character.player.skill.exp.exp
import world.gregs.voidps.engine.entity.character.setAnimation
Expand All @@ -23,7 +23,7 @@ val npcs: NPCs by inject()
objectOperate("Walk-across", "gnome_log_balance") {
player.agilityCourse("gnome")
npcs.gnomeTrainer("Okay get over that log, quick quick!", listOf(Zone(878901), Zone(878900), Zone(876852)))
player.setRenderEmote("rope_balance")
player.renderEmote("rope_balance")
player.message("You walk carefully across the slippery log...", ChatType.Filter)
player.walkOver(Tile(2474, 3429))
player.clearRenderEmote()
Expand Down Expand Up @@ -57,7 +57,7 @@ objectOperate("Climb", "gnome_tree_branch_up") {

objectOperate("Walk-on", "gnome_balancing_rope") {
npcs.gnomeTrainer("Come on scaredy cat, get across that rope!", Zone(9263413))
player.setRenderEmote("rope_balance")
player.renderEmote("rope_balance")
player.walkOver(Tile(2483, 3420, 2))
player.agilityStage(4)
player.clearRenderEmote()
Expand All @@ -66,7 +66,7 @@ objectOperate("Walk-on", "gnome_balancing_rope") {
}

objectOperate("Walk-on", "gnome_balancing_rope_end") {
player.setRenderEmote("rope_balance")
player.renderEmote("rope_balance")
player.walkOver(Tile(2477, 3420, 2))
player.clearRenderEmote()
player.exp(Skill.Agility, 7.5)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import world.gregs.voidps.engine.entity.character.move.walkTo
import world.gregs.voidps.engine.entity.character.player.Player
import world.gregs.voidps.engine.entity.character.player.chat.ChatType
import world.gregs.voidps.engine.entity.character.player.clearRenderEmote
import world.gregs.voidps.engine.entity.character.player.setRenderEmote
import world.gregs.voidps.engine.entity.character.player.renderEmote
import world.gregs.voidps.engine.entity.character.player.skill.Skill
import world.gregs.voidps.engine.entity.character.player.skill.exp.exp
import world.gregs.voidps.engine.entity.character.player.skill.level.Level
Expand Down Expand Up @@ -44,7 +44,7 @@ objectOperate("Open", "wilderness_agility_door_closed") {
val success = true//disable || Level.success(player.levels.get(Skill.Agility), 200..250)
player.message("You go through the gate and try to edge over the ridge...", ChatType.Filter)
enterDoor(target, delay = 1)
player.setRenderEmote("beam_balance")
player.renderEmote("beam_balance")
// if (!success) {
// fallIntoPit()
// return@strongQueue
Expand Down Expand Up @@ -74,7 +74,7 @@ objectOperate("Open", "wilderness_agility_gate_east_closed", "wilderness_agility
player.message("You go through the gate and try to edge over the ridge...", ChatType.Filter)
player.walkTo(player.tile.copy(x = player.tile.x.coerceIn(2997, 2998)))
enterDoor(target)
player.setRenderEmote("beam_balance")
player.renderEmote("beam_balance")
if (!success) {
fallIntoPit()
return@objectOperate
Expand Down Expand Up @@ -176,7 +176,7 @@ objectOperate("Walk-across", "wilderness_log_balance") {
val success = disable || Level.success(player.levels.get(Skill.Agility), 200..250)
if (success) {
player.walkOver(target.tile)
player.setRenderEmote("beam_balance")
player.renderEmote("beam_balance")
player.walkOver(Tile(2994, 3945))
player.message("You skillfully edge across the gap.", type = ChatType.Filter)
player.clearRenderEmote()
Expand All @@ -185,7 +185,7 @@ objectOperate("Walk-across", "wilderness_log_balance") {
player.agilityStage(4)
} else {
player.walkOver(target.tile)
player.setRenderEmote("beam_balance")
player.renderEmote("beam_balance")
player.walkOver(Tile(2998, 3945))
player.message("You slip and fall onto the spikes below.", type = ChatType.Filter)
player.setAnimation("rope_walk_fall_down")
Expand All @@ -206,7 +206,7 @@ objectOperate("Walk-across", "wilderness_log_balance") {

objectOperate("Climb", "wilderness_agility_rocks") {
player.message("You walk carefully across the slippery log...", ChatType.Filter)
player.setRenderEmote("climbing")
player.renderEmote("climbing")
player.walkOver(player.tile.copy(y = 3933))
player.clearRenderEmote()
player.message("You reach the top.", type = ChatType.Filter)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ adminCommand("anim (anim-id)", "perform animation by int or string id (-1 to cle

adminCommand("emote (emote-id)", "perform render emote by int or string id (-1 to clear)") {
when (content) {
"-1", "" -> player.setRenderEmote("human_stand")
else -> player.setRenderEmote(content)
"-1", "" -> player.renderEmote("human_stand")
else -> player.renderEmote(content)
}
}

Expand Down

0 comments on commit 75833cd

Please sign in to comment.