Merge branch 'master' into jesusalva/redesign

2 files changed, 7 insertions, 69 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index 3b3b40f7..bb3e760a 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -908,7 +908,7 @@ mob_db: (
     SpriteName: "Dummy"
     Name: "Dummy"
     Lv: 1
-    Hp: 25
+    Hp: 20
     Sp: 0
     Exp: 1
     JExp: 0
@@ -3091,15 +3091,15 @@ mob_db: (
 },
 {
     Id: 1107
-    SpriteName: "Dummy2"
-    Name: "Dummy"
+    SpriteName: "FireDummy"
+    Name: "Burning Dummy"
     Lv: 1
-    Hp: 25
-    Sp: 0
+    Hp: 20
+    Sp: 1000
     Exp: 1
     JExp: 0
     AttackRange: 1
-    Attack: [1, 1]
+    Attack: [100, 100]
     Def: 100
     Mdef: 1
     Stats: {
@@ -3117,70 +3117,8 @@ mob_db: (
     Element: (2, 1)
     Mode: {
         Plant: true
-    }
-    MoveSpeed: 1000
-    AttackDelay: 800
-    AttackMotion: 672
-    DamageMotion: 480
-    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
diff --git a/npc/001-2-36/hector.txt b/npc/001-2-36/hector.txt
index f4c7176f..d25ca9e3 100644
--- a/npc/001-2-36/hector.txt
+++ b/npc/001-2-36/hector.txt
@@ -451,7 +451,7 @@ OnInit:
 
     // here input some sentences "hello noob" like, the npc pick randomly a sentence
     setarray .mockingGreeting$[0], "Hey noob!", "Hey somethingwholooklikeawarrior...", "Sup' chibi.";
-    setarray .mobID[0],0, Dummy, FireDummy, Dummy2; // an array of dummies, one for each training
+    setarray .mobID[0],0, Dummy, FireDummy, Dummy; // an array of dummies, one for each training
     setarray .mobCoordinate[0], 24, 34, 31, 41; // this represent the square of "ring" training
 
     end;