summaryrefslogtreecommitdiff
path: root/world/map/db/mob_db.conf
diff options
context:
space:
mode:
Diffstat (limited to 'world/map/db/mob_db.conf')
-rw-r--r--world/map/db/mob_db.conf20
1 files changed, 20 insertions, 0 deletions
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 916cb0b8..dab9706c 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -148,7 +148,11 @@ mob_db: (
Dagger: 70
SharpKnife: 10
PileOfAsh: 500
+<<<<<<< HEAD
BromenalDroplet: 20
+=======
+ BromenalDroplet: 20
+>>>>>>> 63187407 (mob drops)
}
},
{
@@ -1359,7 +1363,11 @@ mob_db: (
Dagger: 70
SharpKnife: 10
PileOfAsh: 500
+<<<<<<< HEAD
BromenalDroplet: 30
+=======
+ BromenalDroplet: 30
+>>>>>>> 63187407 (mob drops)
}
},
{
@@ -3184,8 +3192,12 @@ mob_db: (
IronOre: 1000
PileOfAsh: 1000
Coal: 1000
+<<<<<<< HEAD
BromenalDroplet: 200
BromenalDroplet: 100
+=======
+ BromenalDroplet: 100
+>>>>>>> 63187407 (mob drops)
TinyManaElixir: 500
}
},
@@ -7344,7 +7356,11 @@ mob_db: (
TreasureKey: 1000
Coal: 300
SilverOre: 30
+<<<<<<< HEAD
BromenalOre: 20
+=======
+ BromenalOre: 20
+>>>>>>> 63187407 (mob drops)
GoldOre: 10
}
},
@@ -7901,7 +7917,11 @@ mob_db: (
IronOre: 800
Coal: 1000
SilverOre: 150
+<<<<<<< HEAD
BromenalOre: 100
+=======
+ BromenalOre: 100
+>>>>>>> 63187407 (mob drops)
GoldOre: 50
}
},