summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-12-02 23:27:31 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-12-02 23:27:31 +0000
commitdd9742380ea7144fdda5382cc79ad9ce72a24145 (patch)
tree46001a36decd27467e25c36dd50f6b89abb7aab7
parent9300c3d6f32c3c7553cd1d98541f3989bd1a8878 (diff)
parentd363b9a759227ed3678fbeb04a89ef609da1f6b3 (diff)
downloadserverdata-dd9742380ea7144fdda5382cc79ad9ce72a24145.tar.gz
serverdata-dd9742380ea7144fdda5382cc79ad9ce72a24145.tar.bz2
serverdata-dd9742380ea7144fdda5382cc79ad9ce72a24145.tar.xz
serverdata-dd9742380ea7144fdda5382cc79ad9ce72a24145.zip
Merge branch 'dailies_balance' into 'master'
Increased black scorp stinger drop by 1% and less logs needed by Jack+ map spawns increased See merge request legacy/serverdata!704
m---------client-data0
-rw-r--r--world/map/db/mob_db.conf2
-rw-r--r--world/map/db/mob_db_over_100.txt2
-rw-r--r--world/map/npc/009-1/jack.txt2
-rw-r--r--world/map/npc/011-4/_mobs.txt2
-rw-r--r--world/map/npc/013-3/_mobs.txt2
-rw-r--r--world/map/npc/027-2/_mobs.txt2
7 files changed, 6 insertions, 6 deletions
diff --git a/client-data b/client-data
-Subproject e6695cbf9d6a0cc907b8c05e34d245107343925
+Subproject cc5ad13c68677cba6b32e633953915f4412c104
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 357ca635..a6cbc0bd 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -1454,7 +1454,7 @@ mob_db: (
LeatherShirt: (150, "ODG_BASICSTAT")
ChocolateBar: 100
BugLeg: 800
- BlackScorpionStinger: 800
+ BlackScorpionStinger: 900
}
},
{
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index cf88932a..ee582501 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -2,7 +2,7 @@
//DO NOT EDIT IT DIRECTLY
//Edit mob_db.conf instead!
//ID, Name, Jname, LV, HP, SP, EXP, JEXP, Range1, ATK1, ATK2, DEF, MDEF, CRITDEF,STR, AGI, VIT, INT, DEX, LUK, Range2, Range3, Scale, Race, Element,Mode, Speed, Adelay, Amotion,Dmotion,Drop0id,Drop0%, Drop1id,Drop1%, Drop2id,Drop2%, Drop3id,Drop3%, Drop4id,Drop4%, Drop5id,Drop5%, Drop6id,Drop6%, Drop7id,Drop7%, Drop8id,Drop8%, Drop9id,Drop9%, Item1, Item2, MEXP, ExpPer, MVP1id, MVP1per,MVP2id, MVP2per,MVP3id, MVP3per,mutationcount,mutationstrength
-1009, BlackScorpion, BlackScorpion, 100, 600, 0, 500, 37, 1, 60, 100, 4, 6, 0, 16, 30, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 1000, 1500, 672, 480, 523, 150, 509, 100, 518, 800, 709, 800, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50
+1009, BlackScorpion, BlackScorpion, 100, 600, 0, 500, 37, 1, 60, 100, 4, 6, 0, 16, 30, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 1000, 1500, 672, 480, 523, 150, 509, 100, 518, 800, 709, 900, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50
1010, Snake, Snake, 115, 850, 0, 722, 56, 1, 75, 90, 4, 6, 0, 20, 11, 10, 10, 35, 10, 9, 10, 1, 0, 10, 133, 900, 1300, 672, 480, 641, 150, 714, 400, 714, 400, 710, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1012, Spider, Spider, 125, 800, 0, 690, 115, 1, 70, 85, 4, 6, 0, 14, 13, 10, 10, 35, 10, 9, 10, 1, 0, 12, 143, 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, 0, 0, 0, 0, 2, 40
1013, EvilMushroom, EvilMushroom, 110, 650, 0, 233, 35, 1, 65, 80, 4, 6, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 535, 500, 540, 10, 534, 100, 526, 400, 566, 1000, 566, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60
diff --git a/world/map/npc/009-1/jack.txt b/world/map/npc/009-1/jack.txt
index 7a4f6573..c3319705 100644
--- a/world/map/npc/009-1/jack.txt
+++ b/world/map/npc/009-1/jack.txt
@@ -262,7 +262,7 @@ L_Made_Shield:
L_Daily:
set @dq_level, 30;
set @dq_cost, 25;
- set @dq_count, 30;
+ set @dq_count, 25;
set @dq_name$, "RawLog";
set @dq_friendly_name$, "raw logs";
set @dq_money, 4000;
diff --git a/world/map/npc/011-4/_mobs.txt b/world/map/npc/011-4/_mobs.txt
index 92d32ddf..3f33053f 100644
--- a/world/map/npc/011-4/_mobs.txt
+++ b/world/map/npc/011-4/_mobs.txt
@@ -2,7 +2,7 @@
// Lake Cave mobs
011-4,52,30,39,39|monster|SpikyMushroom|1019,1,100000ms,30000ms
-011-4,93,114,39,39|monster|CaveSnake|1021,1,100000ms,30000ms
+011-4,93,114,39,39|monster|CaveSnake|1021,1,60000ms,20000ms
011-4,0,0,0,0|monster|CaveSnake|1021,40,0ms,0ms
011-4,0,0,0,0|monster|SpikyMushroom|1019,15,0ms,0ms
011-4,60,78,56,75|monster|CaveMaggot|1056,10,100000ms,30000ms
diff --git a/world/map/npc/013-3/_mobs.txt b/world/map/npc/013-3/_mobs.txt
index 970a5172..5923ff5d 100644
--- a/world/map/npc/013-3/_mobs.txt
+++ b/world/map/npc/013-3/_mobs.txt
@@ -1,7 +1,7 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
// Woodland Hills Cave mobs
-013-3,28,89,16,52|monster|CaveSnake|1021,10,120000ms,60000ms
+013-3,28,89,16,52|monster|CaveSnake|1021,20,60000ms,30000ms
013-3,61,22,2,2|monster|FireSkull|1023,1,120000ms,60000ms
013-3,81,22,2,2|monster|PoisonSkull|1024,1,120000ms,60000ms
013-3,109,31,6,22|monster|BlackScorpion|1009,20,50000ms,25000ms
diff --git a/world/map/npc/027-2/_mobs.txt b/world/map/npc/027-2/_mobs.txt
index b0a3cb57..d2fe9d2b 100644
--- a/world/map/npc/027-2/_mobs.txt
+++ b/world/map/npc/027-2/_mobs.txt
@@ -2,6 +2,6 @@
// Graveyard Indoor mobs
027-2,25,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms
-027-2,35,88,28,39|monster|VampireBat|1066,15,100000ms,30000ms
+027-2,35,88,28,39|monster|VampireBat|1066,20,80000ms,20000ms
027-2,25,99,9,19|monster|DrunkenSkeleton|1077,1,100000ms,30000ms
027-2,25,99,9,19|monster|TipsySkeleton|1078,1,100000ms,30000ms