From 394988fbb0b7648575b93fdbfcbe7cdd97ce2a1b Mon Sep 17 00:00:00 2001
From: NotAdam <adam@notadam.me>
Date: Sun, 22 Jul 2018 17:02:09 +1000
Subject: [PATCH] scripts cleanup, npc repair script and hunt board

---
 .../Scripts/common/CmnDefCutSceneReplay.cpp   |  2 +-
 .../Scripts/common/CmnDefHousingSignboard.cpp |  2 +-
 src/servers/Scripts/common/CmnDefInnBed.cpp   |  2 +-
 .../common/CmnDefMarketBoardGridania.cpp      |  2 +-
 .../Scripts/common/CmnDefNpcRepair.cpp        | 19 +++++++++++++++++++
 .../Scripts/common/ComDefMobHuntBoard.cpp     | 19 +++++++++++++++++++
 .../Scripts/common/HouFurOrchestrion.cpp      |  2 +-
 7 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 src/servers/Scripts/common/CmnDefNpcRepair.cpp
 create mode 100644 src/servers/Scripts/common/ComDefMobHuntBoard.cpp

diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
index fdd742e1..137c5a02 100644
--- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -17,7 +17,7 @@ public:
          }
       };
 
-      player.playScene( getId(), 0, 0x2000, 0, 1, callback );
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1, callback );
    }
 
    void Scene00001( Entity::Player& player, uint16_t returnScene )
diff --git a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
index bb922cbd..cced1ec6 100644
--- a/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
+++ b/src/servers/Scripts/common/CmnDefHousingSignboard.cpp
@@ -9,7 +9,7 @@ public:
 
    void Scene00000( Entity::Player& player )
    {
-      player.playScene( getId(), 0, 0x2000, 0, 1 );
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
    }
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
index 2b524502..8c09c3c3 100644
--- a/src/servers/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/Scripts/common/CmnDefInnBed.cpp
@@ -16,7 +16,7 @@ public:
             Scene00001( player, result.param2 );
       };
 
-      player.playScene( getId(), 0, 0x2000, 0, 1, callback );
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1, callback );
    }
 
    // lay down
diff --git a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
index 3f0eec55..292bdaa9 100644
--- a/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
+++ b/src/servers/Scripts/common/CmnDefMarketBoardGridania.cpp
@@ -9,7 +9,7 @@ public:
 
    void Scene00000( Entity::Player& player )
    {
-      player.playScene( getId(), 0, 0x2000, 0, 1 );
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
    }
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
diff --git a/src/servers/Scripts/common/CmnDefNpcRepair.cpp b/src/servers/Scripts/common/CmnDefNpcRepair.cpp
new file mode 100644
index 00000000..18be6f72
--- /dev/null
+++ b/src/servers/Scripts/common/CmnDefNpcRepair.cpp
@@ -0,0 +1,19 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+class CmnDefNpcRepair : public EventScript
+{
+public:
+   CmnDefNpcRepair() : EventScript( 0xB0013 )
+   {}
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
+   }
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      Scene00000( player );
+   }
+};
\ No newline at end of file
diff --git a/src/servers/Scripts/common/ComDefMobHuntBoard.cpp b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp
new file mode 100644
index 00000000..1c0281a5
--- /dev/null
+++ b/src/servers/Scripts/common/ComDefMobHuntBoard.cpp
@@ -0,0 +1,19 @@
+#include <ScriptObject.h>
+#include <Actor/Player.h>
+
+class ComDefMobHuntBoard : public EventScript
+{
+public:
+   ComDefMobHuntBoard() : EventScript( 0xB00CA )
+   {}
+
+   void Scene00000( Entity::Player& player )
+   {
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
+   }
+
+   void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override
+   {
+      Scene00000( player );
+   }
+};
\ No newline at end of file
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
index 7ceeea71..514f86a9 100644
--- a/src/servers/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp
@@ -9,7 +9,7 @@ public:
 
    void Scene00000( Entity::Player& player )
    {
-      player.playScene( getId(), 0, 0x2000, 0, 1 );
+      player.playScene( getId(), 0, HIDE_HOTBAR, 0, 1 );
    }
 
    void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) override