Merge branch 'mobpt' into 'master'

Mobpt

See merge request legacy/serverdata!680

3 files changed, 192 insertions, 136 deletions

diff --git a/world/map/npc/commands/_import.txt b/world/map/npc/commands/_import.txt
index 7f85d0d4..6e2f0cc2 100644
--- a/world/map/npc/commands/_import.txt
+++ b/world/map/npc/commands/_import.txt
@@ -21,3 +21,4 @@ npc: npc/commands/deaths.txt
 npc: npc/commands/divorce.txt
 npc: npc/commands/exp.txt
 npc: npc/commands/dailypoints.txt
+npc: npc/commands/mobpoints.txt
diff --git a/world/map/npc/commands/mobpoints.txt b/world/map/npc/commands/mobpoints.txt
new file mode 100644
index 00000000..10dc4b5b
--- /dev/null
+++ b/world/map/npc/commands/mobpoints.txt
@@ -0,0 +1,11 @@
+-|script|@mobpoints|32767
+{
+    message strcharinfo(0), "Monster Points : You currently have " + Mobpt + " Monster Points.";
+    close;
+
+OnInit:
+    // TODO: allow event managers to give and take monster points
+    registercmd chr(ATCMD_SYMBOL) + "mobpoints", strnpcinfo(0);
+    registercmd chr(ATCMD_SYMBOL) + "mobpoint", strnpcinfo(0); // for typos
+    end;
+}
diff --git a/world/map/npc/mobs/mob_points.txt b/world/map/npc/mobs/mob_points.txt
index 4d63fca3..773e5773 100644
--- a/world/map/npc/mobs/mob_points.txt
+++ b/world/map/npc/mobs/mob_points.txt
@@ -5,159 +5,203 @@ function|script|MobPoints
     if (@mobID < 1002) goto L_Return;
 
     setarray @points,
-        1, // Maggot
-        2, // Scorpion
-        20, // Red Scorpion
-        40, // Green Slime
-        30, // Giant Maggot
-        15, // Yellow Slime
-        25, // Red Slime
-        45, // Black Scorpion
-        50, // Snake
-        6, // Fire Goblin
-        55, // Spider
-        35, // Evil Mushroom
-        35, // Pink Flower
-        40, // Santa Slime
-        15, // Rudolph Slime
-        2, // Bat
-        16, // Pinkie
-        10, // Spiky Mushroom
-        14, // Fluffy
-        25, // Cave Snake
-        200, // Jack O
-        85, // Fire Skull
-        85, // Poison Skull
-        20, // Log Head
-        70, // Mountain Snake
-        15, // Easter Fluffy
-        40, // Mouboo
-        0, // Mauve Plant
-        0, // Cobalt Plant
-        0, // Gamboge Plant
-        0, // Alizarin Plant
-        20, // Sea Slime
-        75, // Grass Snake
-        0, // Silk Worm
-        125, // Zombie
-        0, // Clover Patch
-        5, // Squirrel
-        0, // Fire Lizard
-        80, // Wisp
-        15, // Snail
-        80, // Spectre
-        100, // Skeleton
-        100, // Lady Skeleton
-        150, // Fallen
-        0, // Snake Lord
-        80, // Poltergeist
-        0, // Duck
-        15, // Bee
-        0, // Larvespa
-        0, // Vespa
-        0, // Hivespa
-        0, // Froad
-        0, // Troll
-        15, // Butterfly
-        2, // Cave Maggot
-        10, // Angry Scorpion
-        6, // Ice Goblin
-        20, // Archant
-        40, // Giant Cave Maggot
-        35, // Moggun
-        100, // Terranite
-        10, // Pumpkin
-        10, // Bandit
-        20, // Bandit Lord
-        30, // Vampire Bat
-        20, // Reaper
-        20, // Reaper2
-        100, // Scythe
-        20, // Ball Lightning
-        60, // Ice Element
-        80, // Yeti
-        100, // The Lost
-        60, // Red Bone
-        60, // Stalker
-        0, // Dreadwing
-        100, // Drunken Skeleton
-        100, // Tipsy Skeleton
-        100, // Drunken Lady Skeleton
-        60, // BlueSpark
-        60, // RedSpark
-        0, // Serqet
-        60, // HuntsmanSpider,
-        40, // CrotcherScorpion,
-        0, // IceSkull,
-        120, // FeyElement,
-        10, // Larvern,
-        60, // Hyvern,
-        20, // HungryFluffy,
-        40, // Wolvern,
-        50, // BlueSlime,
-        0, // SlimeBlast,
-        20, // WhiteSlime,
-        40, // Reinboo,
-        0, // WhiteBell,
-        60, // SoulSnake
-        100, // SoulEater
-        25, // CopperSlime
-        0, // SleepingBandit
-        20, // AzulSlime
-        80, // DemonicSpirit
-        940, // Luvia
-        150, // WitchGuard
-        50, // DemonicMouboo
-        15, // ViciousSquirrel
-        20, // WickedMushroom
-        18, // Bluepar
-        10, // AngryFireGoblin
-        35, // AngrySeaSlime
-        50, // CandiedSlime
-        40, // Santaboo
-        30, // Pollett
-        100, //Nutcracker
-        40, // SeaSlimeMother
-        50, // UndeadWitch
-        60, // UndeadTroll
-        80, // GreenSlimeMother
-        100, // Thug
-        100, // Swashbuckler
-        100, // Grenadier
-        150, // DreadPirateMarley
-        10, // DreadPirateMarleyClone
-        100, // Wight
-        100, // ManaGhost
-        100, // PsiBrain
-        150, // GeneralKurkan
-        175 // GeneralRazha
-        // No more room! script engine is buggy, sorry.
+        1, // 1002 Maggot
+        3, // 1003 Scorpion
+        20, // 1004 RedScorpion
+        40, // 1005 GreenSlime
+        30, // 1006 GiantMaggot
+        15, // 1007 YellowSlime
+        25, // 1008 RedSlime
+        45, // 1009 BlackScorpion
+        50, // 1010 Snake
+        6, // 1011 FireGoblin
+        55, // 1012 Spider
+        35, // 1013 EvilMushroom
+        35, // 1014 PinkFlower
+        40, // 1015 SantaSlime
+        15, // 1016 RudolphSlime
+        2, // 1017 Bat
+        16, // 1018 Pinkie
+        10, // 1019 SpikyMushroom
+        14, // 1020 Fluffy
+        25, // 1021 CaveSnake
+        200, // 1022 JackO
+        85, // 1023 FireSkull
+        85, // 1024 PoisonSkull
+        20, // 1025 LogHead
+        70, // 1026 MountainSnake
+        15, // 1027 EasterFluffy
+        40, // 1028 Mouboo
+        1, // 1029 MauvePlant
+        1, // 1030 CobaltPlant
+        1, // 1031 GambogePlant
+        1, // 1032 AlizarinPlant
+        20, // 1033 SeaSlime
+        75, // 1034 GrassSnake
+        1, // 1035 Silkworm
+        125, // 1036 Zombie
+        1, // 1037 CloverPatch
+        5, // 1038 Squirrel
+        0, // 1039 FireLizard
+        80, // 1040 Wisp
+        15, // 1041 Snail
+        80, // 1042 Spectre
+        100, // 1043 Skeleton
+        100, // 1044 LadySkeleton
+        150, // 1045 Fallen
+        2, // 1046 TameScorpion
+        80, // 1047 Poltergeist
+        0, // 1048 Duck
+        15, // 1049 Bee
+        2, // 1050 HouseMaggot
+        0, // 1051 Larvespa
+        0, // 1052 Vespa
+        0, // 1053 Hivespa
+        50, // 1054 Troll
+        2, // 1055 Butterfly
+        2, // 1056 CaveMaggot
+        10, // 1057 AngryScorpion
+        6, // 1058 IceGoblin
+        40, // 1059 GCMaggot
+        20, // 1060 Archant
+        35, // 1061 Moggun
+        100, // 1062 Terranite
+        10, // 1063 Pumpkin
+        10, // 1064 Bandit
+        20, // 1065 BanditLord
+        30, // 1066 VampireBat
+        666, // 1067 Reaper2
+        400, // 1068 Reaper
+        100, // 1069 FlyingScythe
+        20, // 1070 BallLightning
+        60, // 1071 IceElement
+        80, // 1072 Yeti
+        100, // 1073 TheLost
+        60, // 1074 RedBone
+        60, // 1075 Stalker
+        0, // 1076 Dreadwing
+        100, // 1077 DrunkenSkeleton
+        100, // 1078 TipsySkeleton
+        100, // 1079 DrunkenLadySkeleton
+        60, // 1080 BlueSpark
+        60, // 1081 RedSpark
+        1, // 1082 Serqet
+        60, // 1083 HuntsmanSpider
+        40, // 1084 CrotcherScorpion
+        100, // 1085 IceSkull
+        120, // 1086 FeyElement
+        10, // 1087 Larvern
+        60, // 1088 Hyvern
+        20, // 1089 HungryFluffy
+        40, // 1090 Wolvern
+        50, // 1091 BlueSlime
+        1, // 1092 SlimeBlast
+        20, // 1093 WhiteSlime
+        40, // 1094 Reinboo
+        10, // 1095 WhiteBell
+        60, // 1096 SoulSnake
+        100, // 1097 SoulEater
+        25, // 1098 CopperSlime
+        1, // 1099 SleepingBandit
+        20, // 1100 AzulSlime
+        80, // 1101 DemonicSpirit
+        940, // 1102 Luvia
+        150, // 1103 WitchGuard
+        50, // 1104 DemonicMouboo
+        15, // 1105 ViciousSquirrel
+        20, // 1106 WickedMushroom
+        18, // 1107 Bluepar
+        10, // 1108 AngryFireGoblin
+        35, // 1109 AngrySeaSlime
+        35, // 1110 AngryGreenSlime
+        50, // 1111 CandiedSlime
+        40, // 1112 Santaboo
+        30, // 1113 Pollett
+        100, // 1114 Nutcracker
+        40, // 1115 SeaSlimeMother
+        50, // 1116 UndeadWitch
+        60, // 1117 UndeadTroll
+        80, // 1118 GreenSlimeMother
+        100, // 1119 Thug
+        100, // 1120 Swashbuckler
+        100, // 1121 Grenadier
+        150, // 1122 DreadPirateMarley
+        10, // 1123 DreadPirateMarleyClone
+        100, // 1124 Wight
+        100, // 1125 ManaGhost
+        100, // 1126 PsiBrain
+        150 // 1127 GeneralKrukan
+        // No more room! script engine is buggy, sorry. (126 entrys)
         //   -o11c
         ; // END
 
     setarray @points_extended,
+        175, // 1128 GeneralRazha
         200, // 1129 GeneralTerogan
         100, // 1130 Moonshroom
         20, // 1131 ManaBug
         80, // 1132 LavaSlime
         80, // 1133 Anne
-        200, // 1134 SUSAN
+        400, // 1134 SUSAN
         80, // 1135 LovelyMaggot
         10, // 1136 LesserGhost
         500, // 1137 Tormenta
-        200, // 1138 ManaGuardian
-        10, // 1139 Virus
+        200, // 1138 ManaGuard
+        60, // 1139 Virus
         200, // 1140 Tengu
         200, // 1141 Sasquatch
-        999, // 1142 ZaxDeKagen
+        999, // 1142 Kage
         200, // 1143 ManaSlayer
-        200 // 1144 GreatDragon
-    ;
+        500, // 1144 Dragon
+        888, // 1145 KageGolem
+        200, // 1146 Flashmob
+        200, // 1147 Koyntety
+        200, // 1148 DoomGolem
+        200, // 1149 Enchanter
+        200, // 1150 ManaTyrant
+        100, // 1151 VoidFlower
+        80, // 1152 VoidArchant
+        80, // 1153 VoidSlime
+        100, // 1154 VoidSnake
+        100, // 1155 VoidBat
+        80, // 1156 VoidMaggot
+        120, // 1157 VoidSoldier
+        100, // 1158 VoidMouboo
+        80, // 1159 VoidScorpion
+        100, // 1160 VoidShroom
+        999, // 1161 Xakelbael
+        1, // 1162 Grinchboo
+        13, // 1163 FridayCat
+        22, // 1164 ChristmasTree
+        11, // 1165 ChristmasGift
+        100, // 1166 Snowman
+        300, // 1167 SnowmanBoss
+        1, // 1168 Floyd
+        66, // 1169 CrystalSpider
+        200, // 1170 CrystalGolem
+        200, // 1171 BlackCrystalGolem
+        1, // 1172 Bif
+        500, // 1173 MontBlanc
+        200, // 1174 Emo
+        35 // 1175 MegaManaBug
+        ; // END
+
+// the following mobs where replaced by other mobs:
+// 1046 Snake Lord <> TameScorpion
+// 1055 Froad <> Butterfly
+
+// the following mobs are still free:
+// 1039 FireLizard
+// 1048 Duck
+// 1051 Larvespa
+// 1052 Vespa
+// 1053 Hivespa
+// 1076 Dreadwing
 
-    if ((MPQUEST == 1) && (@mobID < 1129))
+    if ((MPQUEST == 1) && (@mobID < 1128))
         goto L_Table1;
 
-    if ((MPQUEST == 1) && (@mobID > 1128))
+    if ((MPQUEST == 1) && (@mobID > 1127))
         goto L_Table2;
 
     goto L_PostLoop;
@@ -167,7 +211,7 @@ L_Table1:
     goto L_PostLoop;
 
 L_Table2:
-    set Mobpt, Mobpt + @points_extended[@mobID - 1129];
+    set Mobpt, Mobpt + @points_extended[@mobID - 1128];
     goto L_PostLoop;
 
 L_PostLoop: