Sync with Legacy repo

2 files changed, 96 insertions, 11 deletions

diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf
index b5cbc267..2b3e7565 100644
--- a/db/pre-re/item_db.conf
+++ b/db/pre-re/item_db.conf
@@ -1484,7 +1484,7 @@ item_db: (
 	">
 },
 {
-	Id: 5272
+	Id: 5269
 	AegisName: "ManaPearl"
 	Name: "Mana Pearl"
 	Type: "IT_ARMOR"
@@ -1504,7 +1504,7 @@ item_db: (
 	">
 },
 {
-	Id: 5274
+	Id: 5268
 	AegisName: "AssassinRing"
 	Name: "Assassin Ring"
 	Type: "IT_ARMOR"
@@ -1524,7 +1524,7 @@ item_db: (
 	">
 },
 {
-	Id: 5275
+	Id: 5269
 	AegisName: "AssassinAmulet"
 	Name: "Assassin Amulet"
 	Type: "IT_ARMOR"
@@ -5169,13 +5169,14 @@ item_db: (
 	Refine: false
 	ViewSprite: 755
 	Script: <"
-		callfunc "BrawlingItem", EQI_HEAD_MID;
+		callfunc "BrawlingItem", EQI_HEAD_MID; // @EVOL2
+		//callfunc "BrawlingItem"; // @TMWA
 		bonus bAgi, 15;
 		bonus bSpeedAddRate,  10;
 		bonus bFlee,  20;
 		bonus bHit,  20;
 		bonus bMaxHP,  200;
-		bonus bMatkRate, -3;
+		bonus bMatkRate, -3; // @EVOL2
 	">
 },
 {
@@ -12137,7 +12138,7 @@ item_db: (
 	">
 },
 {
-	Id: 5273
+	Id: 5267
 	AegisName: "AssassinMask"
 	Name: "Assassin Mask"
 	Type: "IT_ARMOR"
@@ -13807,7 +13808,7 @@ item_db: (
 	">
 },
 {
-	Id: 5267
+	Id: 5141
 	AegisName: "AlizarinScroll"
 	Name: "Alizarin Scroll"
 	Type: "IT_USABLE"
@@ -13822,7 +13823,7 @@ item_db: (
 	">
 },
 {
-	Id: 5268
+	Id: 5142
 	AegisName: "CobaltScroll"
 	Name: "Cobalt Scroll"
 	Type: "IT_USABLE"
@@ -13837,7 +13838,7 @@ item_db: (
 	">
 },
 {
-	Id: 5269
+	Id: 5143
 	AegisName: "GambogeScroll"
 	Name: "Gamboge Scroll"
 	Type: "IT_USABLE"
@@ -13852,7 +13853,7 @@ item_db: (
 	">
 },
 {
-	Id: 5270
+	Id: 5144
 	AegisName: "MauveScroll"
 	Name: "Mauve Scroll"
 	Type: "IT_USABLE"
@@ -13867,7 +13868,7 @@ item_db: (
 	">
 },
 {
-	Id: 5271
+	Id: 5145
 	AegisName: "JoyplimScroll"
 	Name: "Joyplim Scroll"
 	Type: "IT_USABLE"
@@ -15139,4 +15140,48 @@ item_db: (
 		bpet;
 	">
 },
+
+
+// Not Yet Implemented
+{
+	Id: 589
+	AegisName: "DragonSword"
+	Name: "Dragon Sword"
+},
+{
+	Id: 609
+	AegisName: "ImperialBow"
+	Name: "Imperial Bow"
+},
+{
+	Id: 5288
+	AegisName: "Naftalin"
+	Name: "Naphthalene"
+},
+{
+	Id: 5289
+	AegisName: "ArmorBreaker"
+	Name: "Armor Breaker Arrow"
+},
+{
+	Id: 5290
+	AegisName: "SilverArrow"
+	Name: "Silver Arrow"
+},
+{
+	Id: 5291
+	AegisName: "ThornArrow"
+	Name: "Thorn Arrow"
+},
+{
+	Id: 5292
+	AegisName: "SilverOre"
+	Name: "Silver Ore"
+},
+{
+	Id: 1170
+	AegisName: "SweetTooth"
+	Name: "Sweet Tooth"
+},
+
 )
diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf
index 0407ae69..ec76c6be 100644
--- a/db/pre-re/mob_db.conf
+++ b/db/pre-re/mob_db.conf
@@ -3827,6 +3827,7 @@ mob_db: (
 	MutationStrength: 10
 	Drops: {
 		TreasureKey: 800
+		Naftalin: 150
 		UndeadEar: 90
 		UndeadEye: 80
 		RottenRags: 70
@@ -7129,6 +7130,7 @@ mob_db: (
 		IronOre: 1500
 		TreasureKey: 1000
 		Coal: 300
+		SilverOre: 25
 	}
 },
 {
@@ -7491,4 +7493,42 @@ mob_db: (
 // TODO: 1169 Crystal Spider 140,    1000,   0,      800,    200,    1,      80,     95,     8,      12,     20,     15,     20,     11,     45,     30,     1,      1,      1,      0,      25,     155,    1000,   1500,   672,    480,    537,    500,    535,    100,    638,    20,     526,    200,    0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      2,      40
 // TODO: 1170 Crystal Golem 180,    25000,  280,    68000,  2200,   3,      170,    190,    75,     40,     35,     26,     99,     127,    255,    105,    31,     30,     1,      0,      69,     187,    320,    1000,   672,    50,     4002,   50,     4003,   50,     4004,   50,     4005,   50,     4006,   50,     4007,   50,     0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
 // TODO: 1171 Black Crystal Golem 180,    25000,  280,    68000,  2200,   3,      170,    190,    75,     40,     35,     26,     99,     127,    255,    105,    31,     30,     1,      0,      69,     181,    320,    1000,   672,    50,     631,    10000,  0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0,      0
+{
+	Id: 1172
+	SpriteName: "Bif"
+	Name: "Bif"
+	Lv: 1
+	Hp: 1
+	Sp: 0
+	Exp: 1
+	JExp: 1
+	AttackRange: 1
+	Attack: [0, 0]
+	Def: 1
+	Mdef: 0
+	Stats: {
+		Str: 0
+		Agi: 0
+		Vit: 0
+		Int: 0
+		Dex: 0
+		Luk: 0
+	}
+	ViewRange: 9
+	ChaseRange: 10
+	Size: 1
+	Race: 3
+	Element: (2, 1)
+	MoveSpeed: 800
+	AttackDelay: 800
+	AttackMotion: 672
+	DamageMotion: 480
+	Drops: {
+		IronPowder: 1200
+		IronOre: 1000
+		Coal: 800
+		SilverOre: 500
+		TerraniteOre: 15
+	}
+},
 )