summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusalva Jesusalva <jesusalva@themanaworld.org>2022-11-17 19:25:43 +0000
committerJesusalva Jesusalva <jesusalva@themanaworld.org>2022-11-17 19:25:43 +0000
commitd48928c3e87c18ea11447117e307cf06f33829f6 (patch)
treec8b886ca87175a0cfd7d5804dfbc18cc2b0f55ba
parent7fbbb920f32cc5b00ad95211b1804a26ed21508b (diff)
parentdd86e5d442074381a9e071f7790ac6493e77f276 (diff)
downloadserverdata-master.tar.gz
serverdata-master.tar.bz2
serverdata-master.tar.xz
serverdata-master.zip
Merge branch 'summon_magic' into 'master'HEADmaster
Summon magic See merge request legacy/serverdata!618
-rw-r--r--world/map/npc/magic/event-summon-manatyrant.txt2
-rw-r--r--world/map/npc/magic/level1-grow-alizarin.txt2
-rw-r--r--world/map/npc/magic/level1-grow-cobalt.txt2
-rw-r--r--world/map/npc/magic/level1-grow-gamboge.txt2
-rw-r--r--world/map/npc/magic/level1-grow-mauve.txt2
-rw-r--r--world/map/npc/magic/level1-summon-maggots.txt2
-rw-r--r--world/map/npc/magic/level2-summon-fluffies.txt2
-rw-r--r--world/map/npc/magic/level2-summon-mouboo.txt2
-rw-r--r--world/map/npc/magic/level2-summon-pinkie.txt2
-rw-r--r--world/map/npc/magic/level2-summon-snakes.txt8
-rw-r--r--world/map/npc/magic/level2-summon-spiky-mushroom.txt2
-rw-r--r--world/map/npc/magic/level2-summon-wickedmushroom.txt6
12 files changed, 17 insertions, 17 deletions
diff --git a/world/map/npc/magic/event-summon-manatyrant.txt b/world/map/npc/magic/event-summon-manatyrant.txt
index 6ac84349..bb36d415 100644
--- a/world/map/npc/magic/event-summon-manatyrant.txt
+++ b/world/map/npc/magic/event-summon-manatyrant.txt
@@ -51,7 +51,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Tyrant Summon", 1150, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mana Tyrant Summon", ManaTyrant, 2, .lifetime;
destroy;
L_Cooldown:
diff --git a/world/map/npc/magic/level1-grow-alizarin.txt b/world/map/npc/magic/level1-grow-alizarin.txt
index 75fee526..4169c729 100644
--- a/world/map/npc/magic/level1-grow-alizarin.txt
+++ b/world/map/npc/magic/level1-grow-alizarin.txt
@@ -23,7 +23,7 @@ OnSummon:
end;
S_SummonAll:
- summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Summoned Monster", AlizarinPlant, 1, (@spellpower*50)+10000;
+ summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Alizarin Plant Summon", AlizarinPlant, 1, (@spellpower*50)+10000;
set @summon[0], @summon[0] + 1;
if (@summon[0] < @summon[1]) goto S_SummonAll;
return;
diff --git a/world/map/npc/magic/level1-grow-cobalt.txt b/world/map/npc/magic/level1-grow-cobalt.txt
index 51ff67f0..e50cfb39 100644
--- a/world/map/npc/magic/level1-grow-cobalt.txt
+++ b/world/map/npc/magic/level1-grow-cobalt.txt
@@ -23,7 +23,7 @@ OnSummon:
end;
S_SummonAll:
- summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Summoned Monster", CobaltPlant, 1, (@spellpower*50)+10000;
+ summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Cobalt Plant Summon", CobaltPlant, 1, (@spellpower*50)+10000;
set @summon[0], @summon[0] + 1;
if (@summon[0] < @summon[1]) goto S_SummonAll;
return;
diff --git a/world/map/npc/magic/level1-grow-gamboge.txt b/world/map/npc/magic/level1-grow-gamboge.txt
index 0336d339..cb7f6221 100644
--- a/world/map/npc/magic/level1-grow-gamboge.txt
+++ b/world/map/npc/magic/level1-grow-gamboge.txt
@@ -23,7 +23,7 @@ OnSummon:
end;
S_SummonAll:
- summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Summoned Monster", GambogePlant, 1, (@spellpower*50)+10000;
+ summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Gamboge Plant Summon", GambogePlant, 1, (@spellpower*50)+10000;
set @summon[0], @summon[0] + 1;
if (@summon[0] < @summon[1]) goto S_SummonAll;
return;
diff --git a/world/map/npc/magic/level1-grow-mauve.txt b/world/map/npc/magic/level1-grow-mauve.txt
index e337a563..f90b3b89 100644
--- a/world/map/npc/magic/level1-grow-mauve.txt
+++ b/world/map/npc/magic/level1-grow-mauve.txt
@@ -23,7 +23,7 @@ OnSummon:
end;
S_SummonAll:
- summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Summoned Monster", MauvePlant, 1, (@spellpower*50)+10000;
+ summon getmap(), rand(POS_X-2,POS_X+2), rand(POS_Y-2,POS_Y+2), BL_ID, "Mauve Plant Summon", MauvePlant, 1, (@spellpower*50)+10000;
set @summon[0], @summon[0] + 1;
if (@summon[0] < @summon[1]) goto S_SummonAll;
return;
diff --git a/world/map/npc/magic/level1-summon-maggots.txt b/world/map/npc/magic/level1-summon-maggots.txt
index 9a462a0a..a70ab869 100644
--- a/world/map/npc/magic/level1-summon-maggots.txt
+++ b/world/map/npc/magic/level1-summon-maggots.txt
@@ -47,7 +47,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Summoned Monster", Maggot, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Maggot Summon", Maggot, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-fluffies.txt b/world/map/npc/magic/level2-summon-fluffies.txt
index 84245b6a..d232b96e 100644
--- a/world/map/npc/magic/level2-summon-fluffies.txt
+++ b/world/map/npc/magic/level2-summon-fluffies.txt
@@ -48,7 +48,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Fluffy Summon", 1020, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Fluffy Summon", Fluffy, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-mouboo.txt b/world/map/npc/magic/level2-summon-mouboo.txt
index e9d2740b..5b5887e7 100644
--- a/world/map/npc/magic/level2-summon-mouboo.txt
+++ b/world/map/npc/magic/level2-summon-mouboo.txt
@@ -48,7 +48,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mouboo Summon", 1028, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mouboo Summon", Mouboo, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-pinkie.txt b/world/map/npc/magic/level2-summon-pinkie.txt
index 0b327481..e788382d 100644
--- a/world/map/npc/magic/level2-summon-pinkie.txt
+++ b/world/map/npc/magic/level2-summon-pinkie.txt
@@ -48,7 +48,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Pinkie", 1018, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Pinkie Summon", Pinkie, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-snakes.txt b/world/map/npc/magic/level2-summon-snakes.txt
index c275bc59..db0d0b6c 100644
--- a/world/map/npc/magic/level2-summon-snakes.txt
+++ b/world/map/npc/magic/level2-summon-snakes.txt
@@ -51,10 +51,10 @@ OnDestroy:
S_SummonAll:
set .@sn, rand(0, 3);
- if (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Cave Snake Summon", 1021, 2, .lifetime;
- elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Snake Summon", 1010, 2, .lifetime;
- elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mountain Snake Summon", 1026, 2, .lifetime;
- elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Grass Snake Summon", 1034, 2, .lifetime;
+ if (.@sn == 0) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Cave Snake Summon", CaveSnake, 2, .lifetime;
+ elif (.@sn == 1) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Snake Summon", Snake, 2, .lifetime;
+ elif (.@sn == 2) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Mountain Snake Summon", MountainSnake, 2, .lifetime;
+ elif (.@sn == 3) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Grass Snake Summon", GrassSnake, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-spiky-mushroom.txt b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
index b91e0b29..1edab6f4 100644
--- a/world/map/npc/magic/level2-summon-spiky-mushroom.txt
+++ b/world/map/npc/magic/level2-summon-spiky-mushroom.txt
@@ -48,7 +48,7 @@ OnDestroy:
destroy;
S_SummonAll:
- summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Spiky Mushroom Summon", 1019, 2, .lifetime;
+ summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Spiky Mushroom Summon", SpikyMushroom, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;
diff --git a/world/map/npc/magic/level2-summon-wickedmushroom.txt b/world/map/npc/magic/level2-summon-wickedmushroom.txt
index 175593ff..eced8c3a 100644
--- a/world/map/npc/magic/level2-summon-wickedmushroom.txt
+++ b/world/map/npc/magic/level2-summon-wickedmushroom.txt
@@ -51,9 +51,9 @@ OnDestroy:
S_SummonAll:
set .@rnd, rand(0, 9);
- if (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Wicked Mushroom Summon", 1106, 2, .lifetime;
- elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Moonshroom Summon", 1130, 2, .lifetime;
- elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Evil Mushroom Summon", 1013, 2, .lifetime;
+ if (.@rnd < 6) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Wicked Mushroom Summon", WickedMushroom, 2, .lifetime;
+ elif (.@rnd < 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Moonshroom Summon", Moonshroom, 2, .lifetime;
+ elif (.@rnd == 9) summon .@map$, rand(.@x-2,.@x+2), rand(.@y-2,.@y+2), .master, "Evil Mushroom Summon", EvilMushroom, 2, .lifetime;
set .@i, .@i + 1;
if (.@i < .count) goto S_SummonAll;
destroy;