summaryrefslogtreecommitdiff
path: root/world/map
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-18 02:31:42 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-18 02:31:42 +0000
commit88d6ce545e1f48c2ba7b1975af4c24b92032b5d7 (patch)
tree94558d0913fc3708c032780e6672bce2a29b0aa0 /world/map
parent778bfaad864d7ef1c663951304c01a60b4298c35 (diff)
parent952483a5b83d13e0fb19ca9a447f9932d875e503 (diff)
downloadserverdata-88d6ce545e1f48c2ba7b1975af4c24b92032b5d7.tar.gz
serverdata-88d6ce545e1f48c2ba7b1975af4c24b92032b5d7.tar.bz2
serverdata-88d6ce545e1f48c2ba7b1975af4c24b92032b5d7.tar.xz
serverdata-88d6ce545e1f48c2ba7b1975af4c24b92032b5d7.zip
Merge branch 'jesusalva/housekeeping230417' into 'master'
Submodule update. CI update. Regenerate databases. See merge request legacy/serverdata!644
Diffstat (limited to 'world/map')
-rw-r--r--world/map/db/const-aegis.txt2
-rw-r--r--world/map/db/item_db_weapon.txt2
-rw-r--r--world/map/db/mob_db.conf78
-rw-r--r--world/map/db/mob_db_over_100.txt3
4 files changed, 43 insertions, 42 deletions
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index 89e03fcf..f8b85919 100644
--- a/world/map/db/const-aegis.txt
+++ b/world/map/db/const-aegis.txt
@@ -1155,4 +1155,4 @@ CrystalGolem 1170
BlackCrystalGolem 1171
Bif 1172
MontBlanc 1173
-Emo 1174 \ No newline at end of file
+Emo 1174
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index 4fe6f58a..0689a2a7 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, 1, 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, 3, 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 f2f9b9d6..8b45e7e7 100644
--- a/world/map/db/mob_db.conf
+++ b/world/map/db/mob_db.conf
@@ -7838,6 +7838,45 @@ mob_db: (
}
},
{
+ Id: 1173
+ SpriteName: "MontBlanc"
+ Name: "Mont Blanc"
+ Lv: 100
+ Hp: 65535
+ Sp: 0
+ Exp: 1
+ JExp: 1
+ AttackRange: 12
+ Attack: [30, 40]
+ Def: 20
+ Mdef: 0
+ CriticalDef: 255
+ Stats: {
+ Str: 15
+ Agi: 10
+ Vit: 30
+ Int: 5
+ Dex: 20
+ Luk: 10
+ }
+ Mode: {
+ Aggressive: true
+ Boss: true
+ CanAttack: true
+ ChangeTargetMelee: true
+ ChangeTargetChase: true
+ }
+ ViewRange: 12
+ ChaseRange: 12
+ Size: 1
+ Race: 3
+ Element: (2, 1)
+ MoveSpeed: 800
+ AttackDelay: 800
+ AttackMotion: 672
+ DamageMotion: 480
+},
+{
Id: 1174
SpriteName: "Emo"
Name: "Emo"
@@ -7884,43 +7923,4 @@ mob_db: (
LeatherGloves: 200
}
},
-{
- Id: 1173
- SpriteName: "MontBlanc"
- Name: "Mont Blanc"
- Lv: 100
- Hp: 65535
- Sp: 0
- Exp: 1
- JExp: 1
- AttackRange: 12
- Attack: [30, 40]
- Def: 20
- Mdef: 0
- CriticalDef: 255
- Stats: {
- Str: 0
- Agi: 0
- Vit: 0
- Int: 0
- Dex: 0
- Luk: 0
- }
- Mode: {
- Aggressive: true
- Boss: true
- CanAttack: true
- ChangeTargetMelee: true
- ChangeTargetChase: true
- }
- ViewRange: 12
- ChaseRange: 12
- Size: 1
- Race: 3
- Element: (2, 1)
- MoveSpeed: 800
- AttackDelay: 800
- AttackMotion: 672
- DamageMotion: 480
-},
)
diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt
index 0ada077d..34da95f7 100644
--- a/world/map/db/mob_db_over_100.txt
+++ b/world/map/db/mob_db_over_100.txt
@@ -46,4 +46,5 @@
//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
+1173, MontBlanc, MontBlanc, 100, 65535, 0, 1, 1, 12, 30, 40, 20, 0, 255, 15, 10, 30, 5, 20, 10, 12, 12, 1, 3, 12, 164, 800, 800, 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, 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