summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-17 21:46:46 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-17 21:46:46 +0000
commite0c7262029f3d59a849c87dccb112c0990cdb91b (patch)
tree7462a3749a09c4514f0317145efeecabb2ad8c1a
parent4bac24c0b19d40d3d39e9e32a5ef603c4f126e60 (diff)
parent551673457d8260125dd0a812fdd7c41dc99145d2 (diff)
downloadserverdata-e0c7262029f3d59a849c87dccb112c0990cdb91b.tar.gz
serverdata-e0c7262029f3d59a849c87dccb112c0990cdb91b.tar.bz2
serverdata-e0c7262029f3d59a849c87dccb112c0990cdb91b.tar.xz
serverdata-e0c7262029f3d59a849c87dccb112c0990cdb91b.zip
Merge branch 'emo_db' into 'master'
Emo added to DB See merge request legacy/serverdata!643
Diffstat
m---------client-data0
m---------tools0
-rw-r--r--world/map/db/const-aegis.txt1
-rw-r--r--world/map/db/item_db_weapon.txt2
-rw-r--r--world/map/db/mob_db.conf48
-rw-r--r--world/map/db/mob_db_0_19.txt4
-rw-r--r--world/map/db/mob_db_20_39.txt4
-rw-r--r--world/map/db/mob_db_over_100.txt1
-rw-r--r--world/map/db/mob_skill_db.txt3
9 files changed, 57 insertions, 6 deletions
diff --git a/client-data b/client-data
-Subproject c18664a43c474bd9a623f1513180fb132abd9cd
+Subproject dec8b89ad4a7373563ad4342b7dea9cfe1267f2
diff --git a/tools b/tools
-Subproject 44536183f98feaa25df6c4e8813950128d60f42
+Subproject 3efb70c0054856e2fd6558242b9d002df14cf3a
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 752c9874..80082a50 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -1154,3 +1154,4 @@ CrystalSpider 1169
CrystalGolem 1170
BlackCrystalGolem 1171
Bif 1172
+Emo 1172
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index 0689a2a7..4fe6f58a 100644
--- a/world/map/db/item_db_weapon.txt
+++ b/world/map/db/item_db_weapon.txt
@@ -31,7 +31,7 @@
584, Jackal, 4, 8000, 4000, 100, 120, 0, 1, 0, 0, 2, 2, 0, 1, 10, 0, {}, {bonus bMaxHP, 50; bonus2 bHPDrainRate, 100, 5; bonus bCriticalDef, 2; bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5;}
587, Sword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";}
588, BastardSword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";}
-590, DragonSword, 4, 8000, 4000, 100, 141, -2, 1, 0, 0, 2, 2, 0, 1, 3, 0, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;}
+590, DragonSword, 4, 8000, 4000, 100, 141, -2, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;}
591, LongSword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";}
594, Spear, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";}
596, Pike, 4, 20, 10, 1600, 140, 0, 2, 0, 0, 2, 34, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";}
diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf
index 841d43d1..8b36fb9c 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -7835,7 +7835,53 @@ mob_db: (
IronOre: 1000
Coal: 800
SilverOre: 500
- TerraniteOre: 15
+ }
+},
+{
+ Id: 1174
+ SpriteName: "Emo"
+ Name: "Emo"
+ Lv: 150
+ Hp: 50000
+ Sp: 80
+ Exp: 500000
+ JExp: 1000
+ AttackRange: 2
+ Attack: [453, 555]
+ Def: 80
+ Mdef: 90
+ CriticalDef: 80
+ Stats: {
+ Str: 100
+ Agi: 60
+ Vit: 80
+ Int: 90
+ Dex: 100
+ Luk: 100
+ }
+ ViewRange: 40
+ ChaseRange: 10
+ Size: 1
+ Race: 1
+ Element: (1, 2)
+ Mode: {
+ Aggressive: true
+ Boss: true
+ CanAttack: true
+ CanMove: true
+ CastSensorIdle: true
+ ChangeChase: true
+ ChangeTargetChase: true
+ ChangeTargetMelee: true
+ Looter: true
+ }
+ MoveSpeed: 200
+ AttackDelay: 250
+ AttackMotion: 672
+ DamageMotion: 50
+ Drops: {
+ Boots: 5000
+ LeatherGloves: 200
}
},
)
diff --git a/world/map/db/mob_db_0_19.txt b/world/map/db/mob_db_0_19.txt
index 91531ff3..c3b3f93c 100644
--- a/world/map/db/mob_db_0_19.txt
+++ b/world/map/db/mob_db_0_19.txt
@@ -16,11 +16,11 @@
1063, Pumpkin, Pumpkin, 1, 200, 0, 17, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 3000, 100, 3001, 20, 3002, 10, 3003, 15, 3011, 500, 3006, 1500, 3007, 2000, 3010, 2500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1082, Serqet, Serqet, 10, 100, 0, 12, 2, 1, 10, 15, 0, 5, 0, 1, 1, 1, 0, 15, 5, 9, 10, 1, 3, 10, 129, 2000, 1872, 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
1092, SlimeBlast, SlimeBlast, 10, 100, 0, 20, 8, 1, 10, 10, 10, 10, 0, 10, 10, 10, 10, 10, 10, 9, 10, 1, 0, 31, 143, 250, 1872, 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, 1, 20
-1095, WhiteBell, WhiteBell, 10, 100, 0, 25, 40, 2, 70, 75, 0, 5, 0, 16, 12, 20, 20, 20, 50, 2, 10, 1, 3, 12, 128, 800, 800, 672, 480, 535, 100, 540, 10, 526, 400, 861, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50
+1095, WhiteBell, WhiteBell, 10, 100, 0, 25, 40, 2, 70, 75, 0, 5, 0, 16, 12, 20, 20, 20, 50, 2, 10, 1, 3, 12, 128, 800, 800, 672, 480, 535, 100, 540, 10, 526, 400, 5260, 600, 861, 5000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 50
1105, ViciousSquirrel, ViciousSquirrel, 15, 140, 1, 35, 7, 1, 20, 25, 1, 6, 0, 3, 3, 1, 0, 15, 40, 9, 10, 1, 3, 10, 133, 800, 800, 672, 480, 704, 7000, 680, 1000, 681, 1000, 682, 1000, 683, 1000, 807, 800, 4005, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 15
1135, LovelyMaggot, LovelyMaggot, 1, 50, 0, 1, 1, 1, 69, 6969, 0, 5, 0, 5, 5, 1, 0, 6, 5, 9, 10, 1, 3, 11, 133, 200, 1872, 672, 480, 505, 400, 501, 70, 518, 200, 533, 75, 502, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1136, LesserGhost, LesserGhost, 1, 1, 0, 1, 1, 0, 150, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 10, 1, 1, 17, 131, 340, 1800, 672, 950, 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, 4, 20
1162, Grinchboo, Grinchboo, 5, 50, 0, 6, 1, 1, 5, 10, 0, 5, 0, 1, 1, 1, 0, 6, 5, 9, 10, 1, 3, 11, 129, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 400, 527, 50, 527, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
1165, ChristmasGift, ChristmasGift, 1, 1, 0, 1, 1, 1, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 742, 5, 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
//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
-1172, Bif, Bif, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 704, 1200, 640, 1000, 4001, 800, 5292, 500, 763, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+1172, Bif, Bif, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 9, 10, 1, 3, 12, 0, 800, 800, 672, 480, 704, 1200, 640, 1000, 4001, 800, 5292, 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
diff --git a/world/map/db/mob_db_20_39.txt b/world/map/db/mob_db_20_39.txt
index 7221f653..b5f394f8 100644
--- a/world/map/db/mob_db_20_39.txt
+++ b/world/map/db/mob_db_20_39.txt
@@ -23,12 +23,12 @@
1087, Larvern, Larvern, 20, 550, 0, 165, 26, 1, 50, 200, 30, 65, 0, 35, 20, 50, 0, 70, 20, 9, 10, 1, 0, 12, 139, 1500, 1500, 672, 480, 836, 2000, 518, 1000, 807, 300, 806, 300, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1089, HungryFluffy, HungryFluffy, 30, 500, 0, 111, 10, 1, 6, 10, 1, 5, 0, 1, 2, 1, 0, 20, 25, 9, 10, 1, 3, 10, 133, 800, 1600, 672, 480, 611, 500, 527, 150, 752, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40
//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
-1093, WhiteSlime, WhiteSlime, 20, 200, 0, 55, 15, 1, 80, 120, 10, 10, 0, 20, 30, 10, 10, 30, 20, 9, 10, 1, 0, 31, 137, 500, 1872, 672, 480, 541, 500, 4026, 200, 864, 200, 863, 100, 4002, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20
+1093, WhiteSlime, WhiteSlime, 20, 200, 0, 55, 15, 1, 80, 120, 10, 10, 0, 20, 30, 10, 10, 30, 20, 9, 10, 1, 0, 31, 137, 500, 1872, 672, 480, 5260, 4000, 541, 500, 4026, 200, 864, 200, 863, 100, 4002, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 20
1094, Reinboo, Reinboo, 35, 1100, 0, 275, 29, 2, 40, 75, 35, 5, 0, 15, 5, 15, 0, 40, 10, 2, 10, 1, 3, 10, 129, 600, 1872, 672, 480, 512, 1000, 736, 1200, 737, 1200, 738, 1200, 739, 1200, 869, 50, 4042, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 30
1099, SleepingBandit, SleepingBandit, 20, 25, 0, 3, 1, 1, 0, 0, 0, 0, 0, 10, 10, 10, 10, 10, 10, 9, 10, 1, 1, 17, 0, 500, 1500, 672, 900, 4016, 800, 521, 200, 526, 500, 535, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
1100, AzulSlime, AzulSlime, 20, 200, 0, 55, 10, 1, 80, 120, 10, 10, 0, 20, 30, 10, 10, 30, 20, 9, 10, 1, 0, 31, 131, 500, 1872, 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, 1, 20
1107, Bluepar, Bluepar, 30, 350, 0, 77, 8, 2, 7, 15, 0, 5, 0, 1, 1, 1, 0, 20, 25, 2, 10, 1, 3, 10, 133, 800, 1872, 672, 480, 567, 800, 568, 800, 4002, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 50
1108, AngryFireGoblin, AngryFireGoblin, 30, 320, 0, 85, 12, 1, 25, 40, 0, 10, 0, 3, 3, 3, 2, 10, 50, 9, 10, 1, 3, 13, 133, 800, 1872, 672, 480, 505, 800, 501, 150, 518, 800, 502, 150, 521, 70, 522, 10, 701, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30
-1113, Pollett, Pollett, 30, 500, 0, 100, 7, 1, 6, 10, 1, 5, 0, 1, 2, 1, 0, 20, 25, 9, 10, 1, 3, 10, 129, 800, 1600, 672, 480, 4026, 1000, 4023, 500, 700, 300, 862, 100, 1189, 400, 1189, 400, 1189, 400, 611, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40
+1113, Pollett, Pollett, 30, 500, 0, 100, 7, 1, 6, 10, 1, 5, 0, 1, 2, 1, 0, 20, 25, 9, 10, 1, 3, 10, 129, 800, 1600, 672, 480, 4026, 1000, 4023, 500, 700, 300, 862, 100, 1189, 400, 1189, 400, 1189, 400, 611, 500, 5260, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40
1131, ManaBug, ManaBug, 25, 300, 0, 52, 5, 2, 10, 17, 4, 6, 0, 1, 4, 1, 4, 5, 4, 2, 10, 1, 3, 12, 137, 800, 1800, 672, 480, 505, 1000, 518, 800, 533, 400, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
1168, Floyd, Floyd, 20, 150, 0, 27, 3, 1, 5, 25, 0, 5, 0, 1, 1, 1, 0, 20, 25, 9, 10, 1, 3, 12, 129, 800, 1872, 672, 480, 515, 1000, 505, 800, 516, 500, 501, 150, 518, 400, 533, 150, 521, 70, 522, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index d991bbd1..0ada077d 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -46,3 +46,4 @@
//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
1167, SnowmanBoss, SnowmanBoss, 100, 35000, 0, 28970, 1689, 3, 60, 80, 20, 20, 0, 15, 15, 10, 15, 95, 50, 14, 16, 1, 3, 10, 165, 700, 1672, 672, 480, 567, 800, 568, 800, 4002, 50, 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
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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 40
+1172, Emo, Emo, 150, 50000, 80, 500000, 1000, 2, 453, 555, 80, 90, 80, 100, 60, 80, 90, 100, 100, 40, 10, 1, 1, 21, 183, 200, 250, 672, 50, 528, 5000, 532, 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
diff --git a/world/map/db/mob_skill_db.txt b/world/map/db/mob_skill_db.txt
index d52c3166..23d85820 100644
--- a/world/map/db/mob_skill_db.txt
+++ b/world/map/db/mob_skill_db.txt
@@ -104,3 +104,6 @@
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,
+// Emo skills
+// Copied from Reaper (1068) to act the same. Altered spawn conditions
+1174,Emo@NPC_SUMMONSLAVE_ballX2,attack,198,1,4000,1000,5000,no,self,slavelt,2,1070,0,0,0,0,
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-05-18 23:13:17 +0000