summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2024-04-12 07:34:30 +0000
committerLed Mitz <smoothshifter@tuta.io>2024-04-12 07:34:30 +0000
commitfa2bb42c2e56aaa315bc9c85ce6dd369754831ec (patch)
tree84221579c32c2f61bb395a2c109c2ae76182ee17
parent9395e84b3498cd6f60c96434b9e4c02f697d2981 (diff)
downloadserverdata-fa2bb42c2e56aaa315bc9c85ce6dd369754831ec.tar.gz
serverdata-fa2bb42c2e56aaa315bc9c85ce6dd369754831ec.tar.bz2
serverdata-fa2bb42c2e56aaa315bc9c85ce6dd369754831ec.tar.xz
serverdata-fa2bb42c2e56aaa315bc9c85ce6dd369754831ec.zip
git sucks when servers have interruptions
Please tell me this works this time!!! ****
Diffstat
m---------client-data0
-rw-r--r--world/map/db/const-aegis.txt2
-rw-r--r--world/map/db/item_db.conf2
-rw-r--r--world/map/db/mob_db.conf100
-rw-r--r--world/map/db/mob_db_over_100.txt4
-rw-r--r--world/map/db/mob_skill_db.txt17
6 files changed, 120 insertions, 5 deletions
diff --git a/client-data b/client-data
-Subproject b9f70100f6f3ccbfac62793ea406d958b3b6fc8
+Subproject 538b72382c76f172ef6e7cf019384ec764e8655
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 8d550ca2..b593f7fb 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -1215,3 +1215,5 @@ Croc 1193
Birb 1194
Brainblow 1195
RickLime 1196
+Blanc 1197
+Blanc 1198
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index b4168e85..cee20ed9 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -1358,7 +1358,7 @@ item_db: (
{
Id: 5284
AegisName: "Flintlock"
- Name: "Flintlock Pistol"
+ Name: "Flintlock"
Type: "IT_WEAPON"
Buy: 150000
Sell: 500
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index e3ebf0b9..75673d39 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -7940,7 +7940,7 @@ mob_db: (
Lv: 129
Hp: 50150
Sp: 80
- Exp: 500000
+ Exp: 150000
JExp: 1000
AttackRange: 2
Attack: [200, 350]
@@ -8981,4 +8981,102 @@ mob_db: (
Rainerang: 5
}
},
+{
+ Id: 1197
+ SpriteName: "Blanc"
+ Name: "Blanc1"
+ Lv: 120
+ Hp: 55055
+ Sp: 0
+ Exp: 300000
+ JExp: 3000
+ AttackRange: 9
+ Attack: [300, 500]
+ Def: 50
+ Mdef: 60
+ CriticalDef: 30
+ Stats: {
+ Str: 30
+ Agi: 99
+ Vit: 80
+ Int: 33
+ Dex: 123
+ Luk: 123
+ }
+ ViewRange: 9
+ ChaseRange: 10
+ Size: 1
+ Race: 1
+ Element: (7, 3)
+ Mode: {
+ CanMove: true
+ Aggressive: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ MoveSpeed: 200
+ AttackDelay: 350
+ AttackMotion: 672
+ DamageMotion: 200
+ Drops: {
+ CoinBag: 10000
+ CoinBag: 500
+ CoinBag: 500
+ CrazyRum: 750
+ CrazyRum: 750
+ CasinoCoins: 250
+ CasinoCoins: 250
+ HMCPirateHat: 3
+ }
+},
+{
+ Id: 1198
+ SpriteName: "Blanc"
+ Name: "Blanc2"
+ Lv: 120
+ Hp: 33033
+ Sp: 0
+ Exp: 200000
+ JExp: 2000
+ AttackRange: 2
+ Attack: [150, 250]
+ Def: 50
+ Mdef: 60
+ CriticalDef: 30
+ Stats: {
+ Str: 30
+ Agi: 99
+ Vit: 80
+ Int: 33
+ Dex: 123
+ Luk: 123
+ }
+ ViewRange: 6
+ ChaseRange: 6
+ Size: 1
+ Race: 1
+ Element: (7, 3)
+ Mode: {
+ CanMove: true
+ Aggressive: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ MoveSpeed: 200
+ AttackDelay: 200
+ AttackMotion: 672
+ DamageMotion: 200
+ Drops: {
+ CoinBag: 10000
+ CoinBag: 500
+ CoinBag: 500
+ CrazyRum: 750
+ CrazyRum: 750
+ CasinoCoins: 250
+ CasinoCoins: 250
+ HMCPirateHat: 2
+ }
+},
)
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index b52bee3b..60a1725f 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -47,7 +47,7 @@
1167, SnowmanBoss, SnowmanBoss, 100, 35000, 0, 88970, 2689, 4, 220, 240, 77, 50, 0, 45, 20, 110, 150, 255, 110, 14, 16, 1, 3, 10, 165, 700, 1672, 672, 480, 567, 1600, 5310, 1600, 568, 1600, 4002, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1169, CrystalSpider, CrystalSpider, 140, 1000, 0, 800, 200, 1, 80, 95, 8, 12, 0, 20, 15, 20, 11, 45, 30, 1, 1, 1, 0, 22, 139, 1000, 1500, 672, 480, 537, 500, 535, 100, 638, 20, 526, 200, 4002, 20, 4003, 20, 4004, 20, 4005, 20, 4006, 20, 4007, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1173, MontBlanc, MontBlanc, 100, 30000, 0, 88000, 200, 12, 357, 777, 80, 60, 80, 30, 1, 100, 1, 100, 100, 12, 12, 1, 3, 12, 164, 800, 2000, 672, 480, 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, 0, 0, 0, 0, 0, 0
-1174, Emo, Emo, 129, 50150, 80, 500000, 1000, 2, 200, 350, 30, 60, 60, 70, 60, 100, 60, 90, 90, 40, 10, 1, 1, 21, 183, 250, 450, 672, 50, 528, 5000, 532, 200, 5294, 500, 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
+1174, Emo, Emo, 129, 50150, 80, 150000, 1000, 2, 200, 350, 30, 60, 60, 70, 60, 100, 60, 90, 90, 40, 10, 1, 1, 21, 183, 250, 450, 672, 50, 528, 5000, 532, 200, 5294, 500, 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
1175, MegaManaBug, MegaManaBug, 111, 675, 0, 275, 40, 1, 60, 85, 3, 8, 0, 16, 14, 15, 20, 30, 30, 9, 10, 1, 4, 12, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 540, 10, 526, 400, 5309, 1000, 5309, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60
1176, Rotter, Rotter, 130, 6000, 0, 5533, 733, 4, 213, 333, 20, 25, 50, 30, 15, 30, 1, 100, 113, 7, 11, 1, 1, 17, 141, 1200, 2222, 672, 900, 631, 1000, 777, 800, 778, 200, 779, 500, 1198, 500, 5297, 10, 3004, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1177, Rot, Rot, 100, 13, 0, 11, 1, 1, 111, 333, 0, 0, 0, 0, 0, 0, 0, 255, 13, 1, 1, 1, 0, 11, 132, 0, 500, 672, 480, 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, 0, 0, 0, 0, 0, 0
@@ -58,3 +58,5 @@
1188, Junglefowl, Junglefowl, 125, 25500, 0, 15000, 2125, 1, 175, 250, 45, 47, 0, 70, 99, 80, 22, 99, 70, 7, 11, 1, 2, 12, 169, 400, 1000, 672, 200, 562, 2520, 562, 1520, 4023, 500, 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
1194, Birb, Birb, 101, 57000, 0, 44000, 2000, 1, 320, 370, 45, 70, 0, 12, 63, 88, 110, 141, 77, 9, 12, 1, 2, 17, 161, 320, 2100, 672, 200, 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, 0, 0, 0, 0, 0, 0
1196, RickLime, RickLime, 120, 54321, 0, 100001, 777, 7, 123, 321, 11, 33, 22, 30, 99, 80, 33, 123, 123, 9, 10, 1, 1, 37, 133, 120, 321, 672, 200, 526, 500, 526, 500, 526, 500, 526, 1000, 526, 2000, 742, 5, 742, 5, 5280, 10, 909, 5, 910, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1197, Blanc, Blanc, 120, 55055, 0, 300000, 3000, 9, 300, 500, 50, 60, 30, 30, 99, 80, 33, 123, 123, 9, 10, 1, 1, 37, 133, 200, 350, 672, 200, 526, 10000, 526, 500, 526, 500, 5294, 750, 5294, 750, 503, 250, 503, 250, 5287, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1198, Blanc, Blanc, 120, 33033, 0, 200000, 2000, 2, 150, 250, 50, 60, 30, 30, 99, 80, 33, 123, 123, 6, 6, 1, 1, 37, 133, 200, 200, 672, 200, 526, 10000, 526, 500, 526, 500, 5294, 750, 5294, 750, 503, 250, 503, 250, 5287, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt
index 64fbb044..c539464b 100644
--- a/world/map/db/mob_skill_db.txt
+++ b/world/map/db/mob_skill_db.txt
@@ -105,8 +105,21 @@
1145,Golem@NPC_SUMMONSLAVE_slayerX2,any,198,2,9000,1000,155000,no,self,slavelt,6,1143,0,0,0,0,
1145,Golem@NPC_POISON,attack,178,10,1800,0,500,yes,target,always,0,0,10,0,0,0,
+// Blanc skills
+1197,Blanc1@NPC_SUMMONSLAVE_ballX2,attack,198,1,8000,1000,5000,no,self,slavelt,2,1070,0,0,0,0,
+1198,Blanc2@NPC_SUMMONSLAVE_ballX2,attack,198,1,8000,1000,5000,no,self,slavelt,2,1070,0,0,0,0,
+1197,Blanc1@NPC_SUMMONSLAVE_emoX1,any,198,1,10000,1000,2000,no,self,myhpltmaxrate,1,1174,80,0,0,0,
+1198,Blanc2@NPC_SUMMONSLAVE_emoX1,any,198,1,10000,1000,2000,no,self,myhpltmaxrate,1,1174,80,0,0,0,
+1197,Blanc1@NPC_SUMMONSLAVE_thugX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1119,0,0,0,0,
+1198,Blanc2@NPC_SUMMONSLAVE_thugX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1119,0,0,0,0,
+1197,Blanc1@NPC_SUMMONSLAVE_swashbX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1120,0,0,0,0,
+1198,Blanc2@NPC_SUMMONSLAVE_swashbX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1120,0,0,0,0,
+1197,Blanc1@NPC_SUMMONSLAVE_grenadX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1121,0,0,0,0,
+1198,Blanc2@NPC_SUMMONSLAVE_grenadX2,any,198,1,7000,1000,5000,no,self,slavelt,2,1121,0,0,0,0,
+
// Emo skills
1174,Emo@NPC_SUMMONSLAVE_ballX2,attack,198,1,4000,1000,5000,no,self,slavelt,2,1070,0,0,0,0,
+1174,Emo@NPC_SUMMONSLAVE_thugX2,any,198,1,5000,1000,5000,no,self,slavelt,2,1119,0,0,0,0,
// Rotter Skills
1176,Rotter@NPC_SUMMONSLAVE_rotX3,any,198,1,8000,1000,5000,no,self,slavelt,3,1177,0,0,0,0,
@@ -115,6 +128,6 @@
1177,Rot@NPC_POISON,attack,178,10,3000,0,500,yes,target,always,0,0,10,0,0,0,
//Rick Lime Skills
-1196,RickLime@NPC_SUMMONSLAVE_brblowX2,any,198,1,10000,500,200,no,self,myhpltmaxrate,80,60,40,20,10,0,
-1196,RickLime@NPC_SUMMONSLAVE_cloverX1,any,198,1,1000,5000,5000,no,self,slavelt,1,0,0,0,0,0,
+1196,RickLime@NPC_SUMMONSLAVE_brblowX2,any,198,1,10000,3000,1000,no,self,slavelt,2,1195,0,0,0,0,
+1196,RickLime@NPC_SUMMONSLAVE_cloverX1,any,198,1,1000,5000,15000,no,self,slavelt,1,1037,0,0,0,0,
1195,Brainblow@NPC_SELFDESTRUCTION,attack,175,1,10000,100,300,yes,target,always,0,30,0,0,0,0,
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-06-01 21:09:44 +0000