instance for training room, training npc, new quest id

change warp system for avoid spam creation instance

add dummy for skill wave to mob_db, and stupid change in script

add few basic control, info about training, access by menu

change bow wave, and add dummy for bow wave

change collison wall to water wall

etc.

5 files changed, 126 insertions, 26 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 9d87df84..5f0b27ab 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -162,6 +162,10 @@ quest_db: (
     Name: "Artis_Legion_Progress"
 },
 {
+    Id: 34
+    Name: "ArtisQuests_TrainingLegion"
+ },
+{
     Id: 36
     Name: "HurnscaldQuests_Hinnak"
 },
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 726da734..141196ff 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -4147,7 +4147,7 @@ item_db: (
     WeaponLv: 1
     EquipLv: 5
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
     Delay: 0
     Sprite: 0
@@ -4169,7 +4169,7 @@ item_db: (
     WeaponLv: 1
     EquipLv: 5
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
     Delay: 0
     Sprite: 0
@@ -4191,7 +4191,7 @@ item_db: (
     WeaponLv: 1
     EquipLv: 15
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_1HSWORD"
     BindOnEquip: false
     Delay: 0
     Sprite: 0
@@ -4363,7 +4363,7 @@ item_db: (
     WeaponLv: 1
     EquipLv: 10
     Refine: false
-    Subtype: "W_DAGGER"
+    Subtype: "W_STAFF"
     BindOnEquip: false
     OnEquipScript: <"
         doevent "#SpotlightMaster::OnTouch";
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index e6d6b56a..12709953 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -927,7 +927,7 @@ mob_db: (
     SpriteName: "Dummy"
     Name: "Dummy"
     Lv: 1
-    Hp: 80
+    Hp: 25
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2977,4 +2977,106 @@ mob_db: (
         Moss: 400
     }
 },
+{
+    Id: 1107
+    SpriteName: "Dummy2"
+    Name: "Dummy"
+    Lv: 1
+    Hp: 25
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [1, 1]
+    Def: 100
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1000
+    AttackDelay: 800
+    AttackMotion: 672
+    DamageMotion: 480
+    MvpExp: 0
+    SkillAttacks: {
+        SM_BASH: 0
+    }
+    WeaponAttacks: {
+            NoWeapon: 0
+            Daggers: 0
+            1HSwords: 0
+            2HSwords: 0
+            1HSpears: 0
+            2HSpears: 0
+            1HAxes: 0
+            2HAxes: 0
+            Maces: 0
+            2HMaces: 0
+            Staves: 0
+            Bows: 10000
+            Knuckles: 0
+            Instruments: 0
+            Whips: 0
+            Katars: 0
+            Revolvers: 0
+            Rifles: 0
+            GatlingGuns: 0
+            Shotguns: 0
+            GrenadeLaunchers: 0
+            FuumaShurikens: 0
+    }
+},
+{
+    Id: 1108
+    SpriteName: "FireDummy"
+    Name: "Burning Dummy"
+    Lv: 1
+    Hp: 25
+    Sp: 1000
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [100, 100]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 100
+        Vit: 1
+        Int: 100
+        Dex: 100
+        Luk: 100
+    }
+    ViewRange: 1
+    ChaseRange: 12
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        CanMove: false
+        Aggressive: true
+        CanAttack: true
+        NoKnockback: true
+    }
+    MoveSpeed: 1000
+    AttackDelay: 800
+    AttackMotion: 672
+    DamageMotion: 480
+    MvpExp: 0
+    Drops: {
+    }
+},
 )
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 12c0cc33..8a3421fc 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -315,6 +315,21 @@ mob_skill_db:(
 			ConditionData: 7
 		}
 	}
+
+	/**********************************************************************/
+	FireDummy: {
+		MG_FIREWALL: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 9000
+			CastTime: 1800
+			Delay: 120000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 2
+		}
+	}
 }
 )
 
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index 95adf795..6c190ed2 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -341,27 +341,6 @@ skill_db: (
         }
         WeaponTypes: {
             NoWeapon: true
-            Daggers: true
-            1HSwords: true
-            2HSwords: true
-            1HSpears: true
-            2HSpears: true
-            1HAxes: true
-            2HAxes: true
-            Maces: true
-            2HMaces: true
-            Staves: true
-            Knuckles: true
-            Instruments: true
-            Whips: true
-            Books: true
-            Katars: true
-            Revolvers: true
-            Rifles: true
-            GatlingGuns: true
-            Shotguns: true
-            GrenadeLaunchers: true
-            FuumaShurikens: true
         }
     }
 },