Code cleanup
Reorganised imports Removed redundant qualifiers
This commit is contained in:
@@ -1,7 +1,5 @@
|
||||
package content.global.skill.construction
|
||||
|
||||
import content.global.skill.construction.BuildHotspot
|
||||
|
||||
/**
|
||||
* Represents a hotspot.
|
||||
* @author Emperor
|
||||
|
||||
+2
-2
@@ -39,11 +39,11 @@ class ConstructionDoorPlugin : OptionHandler() {
|
||||
|
||||
override fun handle(player: Player, node: Node, option: String): Boolean {
|
||||
val `object` = node as Scenery
|
||||
val second = core.game.global.action.DoorActionHandler.getSecondDoor(`object`, player)
|
||||
val second = DoorActionHandler.getSecondDoor(`object`, player)
|
||||
when (option) {
|
||||
"pick-lock", "force" -> return false //TODO
|
||||
}
|
||||
core.game.global.action.DoorActionHandler.open(`object`, second, getReplaceId(`object`), getReplaceId(second), true, 500, false)
|
||||
DoorActionHandler.open(`object`, second, getReplaceId(`object`), getReplaceId(second), true, 500, false)
|
||||
return true
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -25,7 +25,7 @@ class WardrobeHandler : OptionHandler() {
|
||||
} else {
|
||||
player.interfaceManager.open(Component(594))
|
||||
}
|
||||
return true;
|
||||
return true
|
||||
}
|
||||
|
||||
}
|
||||
+2
-2
@@ -10,7 +10,7 @@ import core.plugin.Initializable
|
||||
* @author Ceikry
|
||||
*/
|
||||
@Initializable
|
||||
class PortalChamberDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin(player) {
|
||||
class PortalChamberDialogue(player: Player? = null) : DialoguePlugin(player) {
|
||||
var portal = "none"
|
||||
override fun handle(interfaceId: Int, buttonId: Int): Boolean {
|
||||
when(stage){
|
||||
@@ -41,7 +41,7 @@ class PortalChamberDialogue(player: Player? = null) : core.game.dialogue.Dialogu
|
||||
return true
|
||||
}
|
||||
|
||||
override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
|
||||
override fun newInstance(player: Player?): DialoguePlugin {
|
||||
return PortalChamberDialogue(player)
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -2,7 +2,7 @@ package content.global.skill.construction.decoration.questhall
|
||||
|
||||
import core.api.teleport
|
||||
import core.game.node.entity.player.Player
|
||||
import core.game.node.entity.player.link.audio.Audio;
|
||||
import core.game.node.entity.player.link.audio.Audio
|
||||
import core.game.system.task.Pulse
|
||||
import core.game.world.map.Location
|
||||
import core.game.world.update.flag.context.Animation
|
||||
@@ -53,7 +53,7 @@ class MountedGlory : InteractionListener {
|
||||
1 -> {
|
||||
player.lock(5)
|
||||
player.visualize(Animation(714), Graphics(308, 100, 50))
|
||||
player.getAudioManager().send(Audio(200), true);
|
||||
player.getAudioManager().send(Audio(200), true)
|
||||
}
|
||||
4 -> player.animator.reset().also { teleport(player, TELEPORTS[int]) }
|
||||
}
|
||||
|
||||
@@ -92,7 +92,7 @@ class LecternPlugin : OptionHandler() {
|
||||
for (item in requiredItems) {
|
||||
val staff = MagicStaff.forId(item.id)
|
||||
if (staff != null && player.equipment.containsAtLeastOneItem(staff.staves)) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
if (!player.inventory.containsItem(item)) {
|
||||
//TODO staffs
|
||||
@@ -171,7 +171,7 @@ class LecternPlugin : OptionHandler() {
|
||||
if (ttb != null && ttb.canMake(player)) {
|
||||
player.interfaceManager.close()
|
||||
var requiredItemsCountingStaves = ttb.requiredItems.filter({ item ->
|
||||
val staff = MagicStaff.forId(item.id);
|
||||
val staff = MagicStaff.forId(item.id)
|
||||
!(staff != null && player.equipment.containsAtLeastOneItem(staff.staves))
|
||||
}).toTypedArray()
|
||||
player.pulseManager.run(object : Pulse(1) {
|
||||
|
||||
+2
-2
@@ -57,8 +57,8 @@ class ArmourStand : UseWithHandler(494, 468, 496, 470, 498, 472, 500, 502, 474,
|
||||
return true
|
||||
}
|
||||
@Initializable
|
||||
class RepairDialogue(player: Player? = null) : core.game.dialogue.DialoguePlugin(player){
|
||||
override fun newInstance(player: Player?): core.game.dialogue.DialoguePlugin {
|
||||
class RepairDialogue(player: Player? = null) : DialoguePlugin(player){
|
||||
override fun newInstance(player: Player?): DialoguePlugin {
|
||||
return RepairDialogue(player)
|
||||
}
|
||||
var item: Item? = null
|
||||
|
||||
Reference in New Issue
Block a user