Add all the gem veins, add beehive

15 files changed, 344 insertions, 10 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index e747fd85..1d43ef6d 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -1904,7 +1904,7 @@ mob_db: (
     SpriteName: "DiamondVein"
     Name: "Diamond Vein"
     Lv: 1
-    Hp: 1
+    Hp: 20
     Sp: 0
     Exp: 1
     JExp: 0
@@ -1979,7 +1979,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        GoldNuggets: 500
+        GoldNuggets: 1000
     }
     WeaponAttacks: {
         All: 0
@@ -1991,7 +1991,7 @@ mob_db: (
     SpriteName: "IronVein"
     Name: "Iron Vein"
     Lv: 1
-    Hp: 15
+    Hp: 10
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2022,7 +2022,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        IronOre: 1500
+        IronOre: 2500
     }
     WeaponAttacks: {
         All: 0
@@ -2034,7 +2034,7 @@ mob_db: (
     SpriteName: "CoalVein"
     Name: "Coal Vein"
     Lv: 1
-    Hp: 15
+    Hp: 7
     Sp: 0
     Exp: 1
     JExp: 0
@@ -2065,7 +2065,7 @@ mob_db: (
     SpawnCollisionSize: 0
     SpawnCollisionMask: "CELLS_NOPLAYER"
     Drops: {
-        Coal: 2000
+        Coal: 5000
     }
     WeaponAttacks: {
         All: 0
@@ -2156,6 +2156,253 @@ mob_db: (
     }
 },
 {
+    Id: 1051
+    SpriteName: "RubyVein"
+    Name: "Ruby Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        RubyShard: 500
+        CrudeRuby: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1052
+    SpriteName: "EmeraldVein"
+    Name: "Emerald Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        EmeraldShard: 500
+        CrudeEmerald: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1053
+    SpriteName: "SapphireVein"
+    Name: "Sapphire Vein"
+    Lv: 1
+    Hp: 25
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        SapphireShard: 450
+        CrudeSapphire: 95
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1054
+    SpriteName: "TopazVein"
+    Name: "Topaz Vein"
+    Lv: 1
+    Hp: 20
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        TopazShard: 500
+        CrudeTopaz: 100
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1055
+    SpriteName: "AmethystVein"
+    Name: "Amethyst Vein"
+    Lv: 1
+    Hp: 22
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 0
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 1
+    ChaseRange: 1
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        AmethystShard: 475
+        CrudeAmethyst: 98
+    }
+    WeaponAttacks: {
+        All: 0
+        2HMaces: 10000
+    }
+},
+{
+    Id: 1056
+    SpriteName: "Beehive"
+    Name: "Beehive"
+    Lv: 1
+    Hp: 10
+    Sp: 0
+    Exp: 1
+    JExp: 0
+    AttackRange: 1
+    Attack: [0, 0]
+    Def: 1
+    Mdef: 1
+    Stats: {
+        Str: 1
+        Agi: 1
+        Vit: 1
+        Int: 1
+        Dex: 1
+        Luk: 1
+    }
+    ViewRange: 5
+    ChaseRange: 15
+    Size: 1
+    Race: 3
+    Element: (2, 1)
+    Mode: {
+        Plant: true
+    }
+    MoveSpeed: 1
+    AttackDelay: 1
+    AttackMotion: 1
+    DamageMotion: 1
+    Drops: {
+        BugLeg: 5000
+    }
+},
+{
     Id: 1100
     SpriteName: "PoisonSkull"
     Name: "Poison Skull"
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 8eaf5ea8..6c60c207 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -212,6 +212,17 @@ mob_skill_db:(
 			val0: 1025
 		}
 	}
+	Beehive: {
+		NPC_SUMMONMONSTER: {
+			SkillState: "MSS_DEAD"
+			SkillLevel: 5
+			Rate: 10000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_ALWAYS"
+			ConditionData: 15
+			val0: 1029
+		}
+	}
 	PoisonSkull: {
 		NPC_POISON: {
 			SkillState: "MSS_BERSERK"
diff --git a/maps/re/008-1-1.mcache b/maps/re/008-1-1.mcache
index 5362c3e6..5a8705a2 100644
--- a/maps/re/008-1-1.mcache
+++ b/maps/re/008-1-1.mcache
diff --git a/maps/re/008-1.mcache b/maps/re/008-1.mcache
index b8d09505..2c416411 100644
--- a/maps/re/008-1.mcache
+++ b/maps/re/008-1.mcache
diff --git a/maps/re/008-3-0.mcache b/maps/re/008-3-0.mcache
index 2f2ec9a0..d39f9fae 100644
--- a/maps/re/008-3-0.mcache
+++ b/maps/re/008-3-0.mcache
diff --git a/maps/re/008-3-1.mcache b/maps/re/008-3-1.mcache
index 6dbdd57c..e34f7676 100644
--- a/maps/re/008-3-1.mcache
+++ b/maps/re/008-3-1.mcache
diff --git a/npc/001-1/koga.txt b/npc/001-1/koga.txt
index 1359f4e3..3aecb09a 100644
--- a/npc/001-1/koga.txt
+++ b/npc/001-1/koga.txt
@@ -5,11 +5,11 @@
 //    The Koga in Artis, only accessable via Rowboat.
 // THIS IS A PLACEHOLDER!
 
-001-1,225,59,0	script	Koga	NPC_KOGA,{
+001-1,225,59,0	script	Koga#001-1	NPC_KOGA,{
     speech
-        l("Oh, hi."),
-        l("In case you don't have a commendatory letter from you-know-whom, I am just sitting here and observe the whales.");
-        l("Perhaps, and only perhaps, if you bring me the latter, I can bring you to a ship that will perhaps, and only perhaps, be able to bring you to Woodland.");
+        l("Ah, whom did you bring here?"),
+        l("Isnt that the one Nard found on a float in the sea, with the sign of the Legion on his chest?");
+        l("I hope they know what they are doing. So, come on board. I am looking forward to go back to Woodland, haven't been there for a while.");
 
     close;
 
diff --git a/npc/008-1-1/_import.txt b/npc/008-1-1/_import.txt
index ea6fd468..b6807450 100644
--- a/npc/008-1-1/_import.txt
+++ b/npc/008-1-1/_import.txt
@@ -1,3 +1,5 @@
 // Map 008-1-1: Woodland
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-1-1/_mobs.txt",
 "npc/008-1-1/_warps.txt",
+"npc/008-1-1/koga.txt",
diff --git a/npc/008-1-1/_mobs.txt b/npc/008-1-1/_mobs.txt
new file mode 100644
index 00000000..8fc5e8ff
--- /dev/null
+++ b/npc/008-1-1/_mobs.txt
@@ -0,0 +1,23 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-1-1: Woodland mobs
+008-1-1,173,86,25,5	monster	Forest Maggot	1028,12,500,2500
+008-1-1,132,56,7,5	monster	Forest Maggot	1028,5,500,2500
+008-1-1,144,91,11,16	monster	Butterfly	1032,8,10000,10000
+008-1-1,63,73,11,5	monster	Maggot	1026,7,500,10000
+008-1-1,206,87,6,4	monster	Mouboo	1023,3,30000,60000
+008-1-1,131,45,0,0	monster	Beehive	1056,1,30000,100000
+008-1-1,156,51,10,4	monster	Alizarin Plant	1037,3,1000,25000
+008-1-1,167,61,2,2	monster	Pink Flower	1034,1,100,10000
+008-1-1,153,176,9,7	monster	Silkworm	1040,4,3000,6000
+008-1-1,96,47,3,2	monster	Mauve Plant	1036,3,1000,2000
+008-1-1,162,78,6,3	monster	Gamboge Plant	1038,2,1000,10000
+008-1-1,197,67,7,5	monster	Cobalt Plant	1039,2,1000,30000
+008-1-1,165,109,2,2	monster	Pink Flower	1034,1,100,10000
+008-1-1,217,62,2,2	monster	Pink Flower	1034,1,100,10000
+008-1-1,119,66,2,2	monster	Pink Flower	1034,1,100,10000
+008-1-1,112,75,2,2	monster	Pink Flower	1034,1,100,10000
+008-1-1,110,46,3,2	monster	Mauve Plant	1036,3,1000,2000
+008-1-1,159,93,9,7	monster	Silkworm	1040,4,3000,6000
+008-1-1,68,29,7,7	monster	Mouboo	1023,3,30000,60000
+008-1-1,126,45,0,0	monster	Beehive	1056,1,30000,100000
+008-1-1,121,45,0,0	monster	Beehive	1056,1,30000,100000
diff --git a/npc/008-1-1/_warps.txt b/npc/008-1-1/_warps.txt
index 8dc1e0b5..56d9cc3f 100644
--- a/npc/008-1-1/_warps.txt
+++ b/npc/008-1-1/_warps.txt
@@ -1,3 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 008-1-1: Woodland warps
 008-1-1,247,85,0	warp	#008-1-1_247_85	0,1,008-1,21,85
+008-1-1,202,47,0	warp	#008-1-1_202_47	0,0,008-3-0,129,112
diff --git a/npc/008-1-1/koga.txt b/npc/008-1-1/koga.txt
new file mode 100644
index 00000000..f32e953c
--- /dev/null
+++ b/npc/008-1-1/koga.txt
@@ -0,0 +1,20 @@
+// Evol scripts.
+// Author:
+//    Micksha
+// Description:
+//    The Koga in Artis, only accessable via Rowboat.
+// THIS IS A PLACEHOLDER!
+
+008-1-1,30,60,0	script	Koga#008-1-1	NPC_KOGA,{
+    speech
+        l("So, finally, we are here."),
+        l("Do you want to go back to Artis? You really should be afraid of the Legion there, now that you have been here in Woodland. They somehow smell the odor of the Brotherhood.");
+        l("Better you stay here for a while. Come back when you are stronger.");
+
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 4;
+    end;
+}
diff --git a/npc/008-3-0/_import.txt b/npc/008-3-0/_import.txt
index 2a9fe448..11ecbf2d 100644
--- a/npc/008-3-0/_import.txt
+++ b/npc/008-3-0/_import.txt
@@ -1,2 +1,4 @@
 // Map 008-3-0: Rossy Cave
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-3-0/_mobs.txt",
+"npc/008-3-0/_warps.txt",
diff --git a/npc/008-3-0/_mobs.txt b/npc/008-3-0/_mobs.txt
new file mode 100644
index 00000000..f7062926
--- /dev/null
+++ b/npc/008-3-0/_mobs.txt
@@ -0,0 +1,22 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-0: Rossy Cave mobs
+008-3-0,83,62,21,7	monster	Cave Maggot	1027,5,500,2000
+008-3-0,101,117,13,7	monster	Cave Maggot	1027,5,500,2000
+008-3-0,79,144,10,6	monster	Cave Maggot	1027,7,500,2000
+008-3-0,158,87,10,12	monster	Cave Maggot	1027,7,500,2000
+008-3-0,34,28,3,4	monster	Poison Skull	1100,1,35000,60000
+008-3-0,160,124,5,3	monster	Ratto	1005,4,35000,15000
+008-3-0,155,163,1,7	monster	Ratto	1005,4,35000,15000
+008-3-0,128,146,5,3	monster	Ratto	1005,4,35000,15000
+008-3-0,120,61,5,3	monster	Ratto	1005,4,35000,15000
+008-3-0,138,64,10,7	monster	Crafty	1018,10,1000,120000
+008-3-0,130,103,9,6	monster	Crafty	1018,6,1000,120000
+008-3-0,67,114,10,2	monster	Spider	1044,3,4000,8000
+008-3-0,109,145,4,10	monster	Spider	1044,5,4000,8000
+008-3-0,68,84,3,7	monster	Spider	1044,4,4000,8000
+008-3-0,83,166,0,0	monster	Ruby Vein	1051,1,600000,60000
+008-3-0,80,169,0,0	monster	Diamond Vein	1045,1,600000,60000
+008-3-0,89,168,0,0	monster	Emerald Vein	1052,1,600000,60000
+008-3-0,100,180,0,0	monster	Topaz Vein	1054,1,600000,60000
+008-3-0,97,176,0,0	monster	Sapphire Vein	1053,1,600000,60000
+008-3-0,94,180,0,0	monster	Amethyst Vein	1055,1,600000,60000
diff --git a/npc/008-3-0/_warps.txt b/npc/008-3-0/_warps.txt
new file mode 100644
index 00000000..7426d274
--- /dev/null
+++ b/npc/008-3-0/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-3-0: Rossy Cave warps
+008-3-0,130,113,0	warp	#008-3-0_130_113	1,0,008-1-1,202,48
diff --git a/npc/_anchors.txt b/npc/_anchors.txt
index 5142b8c9..1ca080cb 100644
--- a/npc/_anchors.txt
+++ b/npc/_anchors.txt
@@ -16,6 +16,7 @@ OnInit:
     htput(.ht, "^HARB|^MASTER", "001-2-16 28 32");
     htput(.ht, "^HOLD$", "000-2-2 42 31");
     htput(.ht, "^HURN", "008-1 250 109");
+    htput(.ht, "^LAVA", "008-3-0 35 28");
     htput(.ht, "^LEG", "001-2-33 34 42");
     htput(.ht, "^LIB", "001-2-4 42 35");
     htput(.ht, "^LIGHT", "001-2-0 37 32");
@@ -29,10 +30,12 @@ OnInit:
     htput(.ht, "^NOBLE4$", "001-2-12 34 32");
     htput(.ht, "^NOBLE5$", "001-2-15 34 38");
     htput(.ht, "^RED|PLUSH|^INN", "001-2-28 30 35");
+    htput(.ht, "^ROSSY", "008-3-0 130 108");
     htput(.ht, "^SECOND|^DECK2$", "000-2-1 67 32");
     htput(.ht, "^SHIP2$", "001-2-21 23 28");
     htput(.ht, "^START2$", "000-0-0 26 28");
     htput(.ht, "^START3$", "000-0-1 26 28");
     htput(.ht, "^START|^BEGIN", "000-0 22 24");
+    htput(.ht, "^VEIN", "008-3-0 85 172");
     htput(.ht, "^WARE", "001-2-18 37 31");
 }