diff options
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/db/mob_db.conf | 32 | ||||
| -rw-r--r-- | world/map/db/mob_db_over_100.txt | 6 | ||||
| -rw-r--r-- | world/map/npc/008-1/_mobs.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/012-1/_mobs.txt | 2 | ||||
| -rw-r--r-- | world/map/npc/017-1/_mobs.txt | 1 | ||||
| -rw-r--r-- | world/map/npc/018-1/_mobs.txt | 1 |
8 files changed, 27 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 298f9953..2de0f1fe 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -103,7 +103,10 @@ clientdata: - cd evolved - git checkout master - cp -v ../client-data/monsters.xml . + - rm -r graphics/sprites/monsters/* - cp -v --recursive ../client-data/graphics/sprites/monsters/* graphics/sprites/monsters/ + - rm -r sfx/* + - cp -v --recursive ../client-data/sfx/* sfx/ - git status - git config user.email "numa@themanaworld.org" - git config user.name "Numa" diff --git a/client-data b/client-data -Subproject aef5a308463414c4fa2317c7a2af7ffef73195a +Subproject bb56017d36802fcf111bf79d8b758dca5fa9992 diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index c502afbb..9b9e7959 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -3001,7 +3001,7 @@ mob_db: ( MvpExp: 1198 Drops: { Bone: 210 - UnderworldMask: 5 + UnderworldMask: 2 Skull: 300 DarkCrystal: 1000 WarlordHelmet: (3, "ODG_BASICSTAT") @@ -3055,7 +3055,7 @@ mob_db: ( MvpExp: 1198 Drops: { Bone: 210 - Phylactery: 1 + Phylactery: 2 Skull: 300 DarkCrystal: 1000 WarlordHelmet: (3, "ODG_BASICSTAT") @@ -7880,23 +7880,23 @@ mob_db: ( Id: 1174 SpriteName: "Emo" Name: "Emo" - Lv: 130 - Hp: 50000 + Lv: 129 + Hp: 50150 Sp: 80 Exp: 500000 JExp: 1000 AttackRange: 2 - Attack: [453, 555] - Def: 70 - Mdef: 80 - CriticalDef: 80 + Attack: [200, 350] + Def: 30 + Mdef: 60 + CriticalDef: 60 Stats: { - Str: 100 - Agi: 40 - Vit: 80 - Int: 90 - Dex: 100 - Luk: 100 + Str: 70 + Agi: 60 + Vit: 100 + Int: 60 + Dex: 90 + Luk: 90 } ViewRange: 40 ChaseRange: 10 @@ -7914,8 +7914,8 @@ mob_db: ( ChangeTargetMelee: true Looter: true } - MoveSpeed: 200 - AttackDelay: 250 + MoveSpeed: 250 + AttackDelay: 450 AttackMotion: 672 DamageMotion: 50 Drops: { diff --git a/world/map/db/mob_db_over_100.txt b/world/map/db/mob_db_over_100.txt index 8aa503e2..8734fde3 100644 --- a/world/map/db/mob_db_over_100.txt +++ b/world/map/db/mob_db_over_100.txt @@ -27,8 +27,8 @@ 1123, DreadPirateMarleyClone, DreadPirateMarleyClone, 150, 2000, 0, 1652, 0, 4, 175, 250, 18, 22, 0, 10, 40, 30, 20, 80, 40, 9, 10, 1, 0, 10, 175, 500, 1200, 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 1126, PsiBrain, PsiBrain, 100, 10000, 0, 7255, 4000, 2, 220, 500, 23, 30, 0, 35, 15, 3, 50, 50, 50, 2, 10, 1, 1, 17, 175, 340, 1800, 672, 950, 775, 75, 775, 115, 776, 135, 631, 40, 5111, 700, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 20 1127, GeneralKrukan, GeneralKrukan, 140, 40000, 0, 27536, 1663, 2, 180, 430, 5, 20, 0, 40, 3, 25, 5, 80, 45, 9, 10, 1, 1, 27, 165, 300, 1200, 672, 300, 775, 1000, 776, 1000, 631, 1000, 5128, 2, 636, 6, 637, 25, 638, 50, 639, 8, 778, 500, 1198, 500, 0, 0, 778, 0, 0, 0, 0, 0, 0, 0, 6, 50 -1128, GeneralRazha, GeneralRazha, 140, 40000, 0, 27536, 1663, 2, 180, 430, 5, 20, 0, 40, 3, 25, 5, 80, 45, 9, 10, 1, 1, 27, 165, 300, 1200, 672, 300, 775, 210, 5129, 5, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 1198, 0, 0, 0, 0, 0, 0, 0, 4, 50 -1129, GeneralTerogan, GeneralTerogan, 140, 40000, 0, 27536, 1663, 2, 180, 430, 5, 20, 0, 40, 3, 25, 5, 80, 45, 9, 10, 1, 1, 27, 165, 300, 1200, 672, 300, 775, 210, 5130, 1, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 1198, 0, 0, 0, 0, 0, 0, 0, 4, 50 +1128, GeneralRazha, GeneralRazha, 140, 40000, 0, 27536, 1663, 2, 180, 430, 5, 20, 0, 40, 3, 25, 5, 80, 45, 9, 10, 1, 1, 27, 165, 300, 1200, 672, 300, 775, 210, 5129, 2, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 1198, 0, 0, 0, 0, 0, 0, 0, 4, 50 +1129, GeneralTerogan, GeneralTerogan, 140, 40000, 0, 27536, 1663, 2, 180, 430, 5, 20, 0, 40, 3, 25, 5, 80, 45, 9, 10, 1, 1, 27, 165, 300, 1200, 672, 300, 775, 210, 5130, 2, 776, 300, 631, 1000, 636, 3, 658, 2, 532, 35, 778, 500, 1198, 500, 0, 0, 0, 0, 1198, 0, 0, 0, 0, 0, 0, 0, 4, 50 1130, Moonshroom, Moonshroom, 110, 550, 0, 224, 35, 4, 70, 80, 4, 4, 0, 16, 12, 10, 10, 35, 10, 9, 10, 1, 3, 12, 133, 800, 1800, 672, 480, 566, 500, 518, 500, 703, 400, 730, 300, 540, 100, 5145, 50, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 60 1132, LavaSlime, LavaSlime, 135, 4144, 0, 6000, 1111, 2, 105, 260, 75, 80, 0, 30, 15, 35, 10, 70, 250, 9, 10, 1, 0, 23, 135, 900, 1300, 672, 100, 904, 10000, 703, 5000, 703, 5000, 640, 1000, 701, 1000, 4001, 1000, 825, 500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 40 1133, Anne, Anne, 110, 12000, 0, 1100, 889, 1, 200, 300, 20, 35, 0, 60, 40, 40, 30, 60, 40, 9, 10, 1, 1, 17, 133, 380, 872, 672, 900, 838, 6000, 839, 6000, 840, 6000, 1229, 200, 1230, 500, 1231, 500, 1232, 500, 1281, 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 30 @@ -47,4 +47,4 @@ 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 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, 130, 50000, 80, 500000, 1000, 2, 453, 555, 70, 80, 80, 100, 40, 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 +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, 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/npc/008-1/_mobs.txt b/world/map/npc/008-1/_mobs.txt index 6c077242..5104239e 100644 --- a/world/map/npc/008-1/_mobs.txt +++ b/world/map/npc/008-1/_mobs.txt @@ -10,3 +10,4 @@ 008-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 008-1,0,0,0,0|monster|Squirrel|1038,10,30ms,20ms 008-1,0,0,0,0|monster|Butterfly|1055,10,30ms,20ms +008-1,124,34,10,12|monster|PinkFlower|1014,2,0ms,250ms diff --git a/world/map/npc/012-1/_mobs.txt b/world/map/npc/012-1/_mobs.txt index 4f85e2ff..be05b580 100644 --- a/world/map/npc/012-1/_mobs.txt +++ b/world/map/npc/012-1/_mobs.txt @@ -12,3 +12,5 @@ 012-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 012-1,0,0,0,0|monster|Squirrel|1038,25,30ms,20ms 012-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms +012-1,66,145,11,5|monster|PinkFlower|1014,2,0ms,250ms +012-1,24,54,6,8|monster|PinkFlower|1014,2,0ms,250ms diff --git a/world/map/npc/017-1/_mobs.txt b/world/map/npc/017-1/_mobs.txt index d4e5955a..79b8ff0d 100644 --- a/world/map/npc/017-1/_mobs.txt +++ b/world/map/npc/017-1/_mobs.txt @@ -19,3 +19,4 @@ 017-1,0,0,0,0|monster|MauvePlant|1029,5,0ms,0ms 017-1,0,0,0,0|monster|Silkworm|1035,10,0ms,0ms 017-1,0,0,0,0|monster|Squirrel|1038,30,20ms,10ms +017-1,23,27,7,8|monster|PinkFlower|1014,2,0ms,250ms diff --git a/world/map/npc/018-1/_mobs.txt b/world/map/npc/018-1/_mobs.txt index ced34aa9..f9538b52 100644 --- a/world/map/npc/018-1/_mobs.txt +++ b/world/map/npc/018-1/_mobs.txt @@ -28,3 +28,4 @@ 018-1,0,0,0,0|monster|CloverPatch|1037,2,0ms,1000ms 018-1,0,0,0,0|monster|Butterfly|1055,20,30ms,20ms 018-1,134,80,14,39|monster|Maggot|1002,15,30ms,0ms +018-1,31,95,10,7|monster|PinkFlower|1014,2,0ms,250ms |