diff --git a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt index d2a6ef385..39df15522 100644 --- a/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt +++ b/Server/src/main/content/region/kandarin/seers/quest/elementalworkshop2/EW2Listeners.kt @@ -79,6 +79,9 @@ class EW2Listeners : InteractionListener { // interface const val LEVER_SCHEM = 466 + // scenery + const val EXTRACTOR_WRAPPER = 18725 + // graphics const val EXTRACTOR_GOOD_GFX = Graphics.EXTRACTOR_HAT_CHAIR_807 const val EXTRACTOR_BAD_GFX = Graphics.IMPROPERLY_EXTRACTOR_HAT_CHAIR_808 @@ -1341,7 +1344,7 @@ class EW2Listeners : InteractionListener { * ------------------------- */ // use bar with extractor gun - onUseWith(IntType.SCENERY, Items.PRIMED_BAR_9727, Scenery.EXTRACTOR_GUN_18693) { player, used, _ -> + onUseWith(IntType.SCENERY, Items.PRIMED_BAR_9727, EXTRACTOR_WRAPPER, Scenery.EXTRACTOR_GUN_18693) { player, used, _ -> if (removeItem(player, used as Item)) { setVarbit(player, EW2ExtractorGun, 1, true) sendItemDialogue(player, Items.PRIMED_BAR_9727, "You place the primed bar under the device.") @@ -1354,7 +1357,7 @@ class EW2Listeners : InteractionListener { } // take primed bar from the extractor gun - on(Scenery.EXTRACTOR_GUN_18694, IntType.SCENERY, "take-from") { player, _ -> + on(intArrayOf(EXTRACTOR_WRAPPER, Scenery.EXTRACTOR_GUN_18694), IntType.SCENERY, "take-from") { player, _ -> addItemOrDrop(player, Items.PRIMED_BAR_9727) setVarbit(player, EW2ExtractorGun, 0, true) sendItemDialogue(player, Items.PRIMED_BAR_9727, "You take the primed bar.") @@ -1362,7 +1365,7 @@ class EW2Listeners : InteractionListener { } // take mind bar from the extractor gun - on(Scenery.EXTRACTOR_GUN_18695, IntType.SCENERY, "take-from") { player, _ -> + on(intArrayOf(EXTRACTOR_WRAPPER, Scenery.EXTRACTOR_GUN_18695), IntType.SCENERY, "take-from") { player, _ -> addItemOrDrop(player, Items.ELEMENTAL_MIND_BAR_9728) setVarbit(player, EW2ExtractorGun, 0, true) sendItemDialogue(player, Items.ELEMENTAL_MIND_BAR_9728, "You take the elemental mind bar.")