summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2024-02-23 13:56:31 +0100
committerHoraK-FDF <horak-fdf@web.de>2024-04-14 10:47:39 +0200
commit57d35a6fbdeefc1a1465a59e48c0bd2854d596fd (patch)
treea963128ee71386bac86afa3b064eab63ee75c308
parent9cd5417d3289b2cd7abc36d494b5a295537b31b2 (diff)
downloadserverdata-57d35a6fbdeefc1a1465a59e48c0bd2854d596fd.tar.gz
serverdata-57d35a6fbdeefc1a1465a59e48c0bd2854d596fd.tar.bz2
serverdata-57d35a6fbdeefc1a1465a59e48c0bd2854d596fd.tar.xz
serverdata-57d35a6fbdeefc1a1465a59e48c0bd2854d596fd.zip
mob drops add
-rw-r--r--world/map/db/mob_db.conf20
1 files changed, 0 insertions, 20 deletions
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index dab9706c..09a82978 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -148,11 +148,7 @@ mob_db: (
Dagger: 70
SharpKnife: 10
PileOfAsh: 500
-<<<<<<< HEAD
- BromenalDroplet: 20
-=======
BromenalDroplet: 20
->>>>>>> 63187407 (mob drops)
}
},
{
@@ -1363,11 +1359,7 @@ mob_db: (
Dagger: 70
SharpKnife: 10
PileOfAsh: 500
-<<<<<<< HEAD
- BromenalDroplet: 30
-=======
BromenalDroplet: 30
->>>>>>> 63187407 (mob drops)
}
},
{
@@ -3192,12 +3184,8 @@ mob_db: (
IronOre: 1000
PileOfAsh: 1000
Coal: 1000
-<<<<<<< HEAD
BromenalDroplet: 200
BromenalDroplet: 100
-=======
- BromenalDroplet: 100
->>>>>>> 63187407 (mob drops)
TinyManaElixir: 500
}
},
@@ -7356,11 +7344,7 @@ mob_db: (
TreasureKey: 1000
Coal: 300
SilverOre: 30
-<<<<<<< HEAD
BromenalOre: 20
-=======
- BromenalOre: 20
->>>>>>> 63187407 (mob drops)
GoldOre: 10
}
},
@@ -7917,11 +7901,7 @@ mob_db: (
IronOre: 800
Coal: 1000
SilverOre: 150
-<<<<<<< HEAD
BromenalOre: 100
-=======
- BromenalOre: 100
->>>>>>> 63187407 (mob drops)
GoldOre: 50
}
},