From 04e658710ebc8a37150ef61a8fcb8ef561fc4a43 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 21 Sep 2022 17:53:54 -0400 Subject: [PATCH 1/3] Add killMonster() methods --- .../scripting/reactor/ReactorActionManager.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/main/java/scripting/reactor/ReactorActionManager.java b/src/main/java/scripting/reactor/ReactorActionManager.java index 528ba6c31e..3d88ac5735 100644 --- a/src/main/java/scripting/reactor/ReactorActionManager.java +++ b/src/main/java/scripting/reactor/ReactorActionManager.java @@ -267,6 +267,20 @@ public class ReactorActionManager extends AbstractPlayerInteraction { } } + public void killMonster(int id) { + killMonster(id, false); + } + + public void killMonster(int id, boolean withDrops) { + MapleMap map = getMap(); + if (withDrops) { + map.killMonsterWithDrops(id); + } + else { + map.killMonster(id); + } + } + public Point getPosition() { Point pos = reactor.getPosition(); pos.y -= 10; From 79f19331f412b700ab1b26348d3ebab532877ff6 Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 21 Sep 2022 17:56:56 -0400 Subject: [PATCH 2/3] Add reactor script for Land of Wild Boar's ritual stones --- scripts/reactor/1029000.js | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 scripts/reactor/1029000.js diff --git a/scripts/reactor/1029000.js b/scripts/reactor/1029000.js new file mode 100644 index 0000000000..fabf7f8a4f --- /dev/null +++ b/scripts/reactor/1029000.js @@ -0,0 +1,5 @@ +function act() { + rm.killMonster(3230300); + rm.killMonster(3230301); + rm.message("The Jr. Boogies have been scared away."); +} \ No newline at end of file From a03bdbf6953a21661bf0ac1036d9450db85ebc7a Mon Sep 17 00:00:00 2001 From: Charlie Unfricht Date: Wed, 21 Sep 2022 18:17:24 -0400 Subject: [PATCH 3/3] Replace MapleMap var with getMap() --- src/main/java/scripting/reactor/ReactorActionManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/scripting/reactor/ReactorActionManager.java b/src/main/java/scripting/reactor/ReactorActionManager.java index 3d88ac5735..b7f7c4e6a7 100644 --- a/src/main/java/scripting/reactor/ReactorActionManager.java +++ b/src/main/java/scripting/reactor/ReactorActionManager.java @@ -272,12 +272,11 @@ public class ReactorActionManager extends AbstractPlayerInteraction { } public void killMonster(int id, boolean withDrops) { - MapleMap map = getMap(); if (withDrops) { - map.killMonsterWithDrops(id); + getMap().killMonsterWithDrops(id); } else { - map.killMonster(id); + getMap().killMonster(id); } }