summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt4
-rw-r--r--npc/custom/mvm.txt224
2 files changed, 117 insertions, 111 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index ffaa37c48..5a1a35454 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,7 +33,9 @@ KarLaeda
Date Added
======
-12/11 * Added Yuno Government Buildings warps. Thanks to $ephiroth [Lupus]
+12/11
+ * Some cleanup & optimization for MvM Arena [KarLaeda]
+ * Added Yuno Government Buildings warps. Thanks to $ephiroth [Lupus]
- Added missing next, removed extra line to Wizard Job Quest
* Fixed Rogue / Assassin exploit, thanks to El Nino
12/06
diff --git a/npc/custom/mvm.txt b/npc/custom/mvm.txt
index 47bd8cc23..e3bddd97e 100644
--- a/npc/custom/mvm.txt
+++ b/npc/custom/mvm.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= acky - god@acky.com
//===== Current Version: =====================================
-//= 1.1.3
+//= 1.1.5
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -19,6 +19,7 @@
//= 1.1.2 Changed all gmcommand to atcommand as Poki#3 suggested. [Vicious]
//= 1.1.3 Removed Duplicate Names [Silent]
//= 1.1.4 Fixed SummonPad syntax. [KarLaeda]
+//= 1.1.5 Some cleanup & optimization [KarLaeda]
//============================================================
// Entrance //
@@ -220,41 +221,44 @@ menu "Level 4-7",L_4to6,"^FF0000All Levels",L_High;
close;
L_High:
+close2;
savepoint "gon_test.gat",56,99;
set @battle,1;
-warp "gon_test.gat",72,87;
atcommand strcharinfo(0) + "@option 64 0 64";
-close;
+warp "gon_test.gat",72,87;
+end;
L_4to6:
+close2;
savepoint "gon_test.gat",56,99;
set @battle,1;
-warp "gon_test.gat",57,86;
atcommand strcharinfo(0) + "@option 64 0 64";
-close;
+warp "gon_test.gat",57,86;
+end;
L_1to3:
+close2;
savepoint "gon_test.gat",56,99;
set @battle,1;
-warp "gon_test.gat",43,87;
atcommand strcharinfo(0) + "@option 64 0 64";
-close;
-
+warp "gon_test.gat",43,87;
+end;
L_Exit:
+close2;
savepoint "prontera.gat",149,186;
set @battle,0;
atcommand strcharinfo(0) + "@option 0 0 0";
warp "prontera.gat",149,186;
end;
-close;
L_Spec:
-atcommand strcharinfo(0) + "@option 0 0 0";
+close2;
savepoint "gon_test.gat",56,99;
set @battle,0;
+atcommand strcharinfo(0) + "@option 0 0 0";
warp "gon_test.gat",57,99;
-close;
+end;
L_NoMon:
mes "[Usher]";
@@ -373,162 +377,162 @@ close;
set #monpoints,#monpoints-10;
mes "Upgraded to Fabre!";
close;
-
+
L_Up2:
mes "Which monster would you like to upgrade to?";
next;
menu "Lunatic",U_Lunatic,"Drops",U_Drops,"Picky",U_Picky;
-
+
U_Drops:
set #monster,31;
set #monpoints,#monpoints-20;
mes "[Monster Trainer]";
mes "Upgraded to Drops!";
close;
-
+
U_Picky:
set #monster,32;
set #monpoints,#monpoints-20;
mes "[Monster Trainer]";
mes "Upgraded to Picky!";
close;
-
+
U_Lunatic:
set #monster,30;
set #monpoints,#monpoints-20;
mes "[Monster Trainer]";
mes "Upgraded to Lunatic!";
close;
-
+
L_Up3:
mes "Which monster would you like to upgrade to?";
next;
menu "ChonChon",U_ChonChon,"Super Picky",U_SPicky,"Willow",U_Willow;
-
+
U_ChonChon:
set #monster,40;
set #monpoints,#monpoints-40;
mes "[Monster Trainer]";
mes "Upgraded to ChonChon!";
close;
-
+
U_SPicky:
set #monster,41;
set #monpoints,#monpoints-40;
mes "[Monster Trainer]";
mes "Upgraded to Super Picky!";
close;
-
+
U_Willow:
set #monster,42;
set #monpoints,#monpoints-40;
mes "[Monster Trainer]";
mes "Upgraded to Willow!";
close;
-
+
L_Up4:
mes "Which monster would you like to upgrade to?";
next;
menu "Condor",U_Condor,"Roda Frog",U_Roda;
-
+
U_Condor:
set #monster,51;
set #monpoints,#monpoints-80;
mes "[Monster Trainer]";
mes "Upgraded to Condor!";
close;
-
+
U_Roda:
set #monster,50;
set #monpoints,#monpoints-80;
mes "[Monster Trainer]";
mes "Upgraded to Roda Frog!";
close;
-
+
L_Up5:
set #monster,60;
set #monpoints,#monpoints-160;
mes "Upgraded to Thief Bug Larva!";
close;
-
+
L_Up6:
set #monster,70;
set #monpoints,#monpoints-320;
mes "Upgraded to Savage Babe!";
close;
-
+
L_Up7:
mes "Which monster would you like to upgrade to?";
next;
menu "Familiar",U_Familiar,"Hornet",U_Hornet;
-
+
U_Hornet:
set #monster,81;
set #monpoints,#monpoints-640;
mes "[Monster Trainer]";
mes "Upgraded to Hornet!";
close;
-
+
U_Familiar:
set #monster,80;
set #monpoints,#monpoints-640;
mes "[Monster Trainer]";
mes "Upgraded to Familiar!";
close;
-
+
L_Up8:
mes "[Monster Trainer]";
mes "Which monster would you like to upgrade to?";
next;
menu "Desert Wolf Puppy",U_Puppy,"Spore",U_Spore,"Rocker",U_Rocker;
-
+
U_Spore:
set #monster,91;
set #monpoints,#monpoints-1280;
mes "[Monster Trainer]";
mes "Upgraded to Spore!";
close;
-
+
U_Rocker:
set #monster,92;
set #monpoints,#monpoints-1280;
mes "[Monster Trainer]";
mes "Upgraded to Rocker!";
close;
-
+
U_Puppy:
set #monster,90;
set #monpoints,#monpoints-1280;
mes "[Monster Trainer]";
mes "Upgraded to Desert Wolf Puppy!";
close;
-
+
L_Up9:
mes "Which monster would you like to upgrade to?";
next;
menu "Skeleton",U_Skeleton,"Antonio",U_Antonio,"Plankton",U_Plankton,"Thief Bug Female",U_ThiefFemale;
-
+
U_Plankton:
set #monster,101;
set #monpoints,#monpoints-2560;
mes "[Monster Trainer]";
mes "Upgraded to Plankton!";
close;
-
+
U_Antonio:
set #monster,102;
set #monpoints,#monpoints-2560;
mes "[Monster Trainer]";
mes "Upgraded to Antonio!";
close;
-
+
U_ThiefFemale:
set #monster,103;
set #monpoints,#monpoints-2560;
mes "[Monster Trainer]";
mes "Upgraded to Thief Bug Female!";
close;
-
+
U_Skeleton:
set #monster,100;
set #monpoints,#monpoints-2560;
@@ -556,159 +560,159 @@ close;
// Kill Trigger //
// 6/Final. ---Change to Add Monsters--- //
- gon_test.gat,56,91,6 script OnPoringKilled -1,{
+gon_test.gat,56,91,6 script OnPoringKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+1;
announce "You killed a Poring - Gained 1 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnFaberKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnFaberKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+2;
announce "You killed a Faber - Gained 2 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnLunaticKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnLunaticKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+4;
announce "You killed a Lunatic - Gained 4 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnDropsKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnDropsKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+4;
announce "You killed a Drops - Gained 4 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnPickyKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnPickyKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+4;
announce "You killed a Picky - Gained 4 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnChonChonKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnChonChonKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+8;
announce "You killed a ChonChon - Gained 8 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnSPickyKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnSPickyKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+8;
announce "You killed a Super Picky - Gained 8 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnWillowKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnWillowKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+8;
announce "You killed a Willow - Gained 8 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnRodaKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnRodaKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+16;
announce "You killed a Roda Frog - Gained 16 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnCondorKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnCondorKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+16;
announce "You killed a Condor - Gained 16 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnThiefKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnThiefKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+32;
announce "You killed a Theif Bug Larva - Gained 32 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnSavageKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnSavageKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+64;
announce "You killed a Savage Babe - Gained 64 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnFamiliarKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnFamiliarKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+128;
announce "You killed a Familiar - Gained 128 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnHornetKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnHornetKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+128;
announce "You killed a Hornet - Gained 128 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnPuppyKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnPuppyKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+256;
announce "You killed a Desert Wolf Puppy - Gained 256 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnRockerKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnRockerKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+256;
announce "You killed a Rocker - Gained 256 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnSporeKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnSporeKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+256;
announce "You killed a Spore - Gained 256 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnSkeletonKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnSkeletonKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+512;
announce "You killed a Skeleton - Gained 512 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnPlanktonKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnPlanktonKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+512;
announce "You killed a Plankton - Gained 512 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnAntonioKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnAntonioKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+512;
announce "You killed an Antonio - Gained 512 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnThiefFemaleKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnThiefFemaleKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+512;
announce "You killed a Thief Bug Female - Gained 512 exp",19;
callfunc "duelkill";
- }
-
- gon_test.gat,56,91,6 script OnSpecialKilled -1,{
+}
+
+gon_test.gat,56,91,6 script OnSpecialKilled -1,{
if (@marena == 0) callfunc "illegalkill";
set #monpoints,#monpoints+512;
announce "You killed a Special Monster - Gained 1024 exp",19;
callfunc "duelkill";
- }
+}
function script duelkill {
if (strcharinfo(0) == $@duelist1$ || strcharinfo(0) == $@duelist2$) goto L_Heal;
@@ -720,7 +724,7 @@ end;
set @healing,0;
end;
}
-
+
function script illegalkill {
announce "Illegal Kill by " + strcharinfo(0) + " Detected",1;
percentheal -100,-100;
@@ -836,23 +840,23 @@ close;
mes "^FF0000" + $@duelist2$ + "^000000 [Monster Level: ^FF0000" + $@monster2 + "^000000]";
next;
menu "Spectate",L_Spec,"Cancel",L_Exit;
-
+
L_Spec:
set @battle,0;
atcommand strcharinfo(0) + "@option 64 0 64";
warp "gon_test.gat",49,5;
close;
-
+
L_Exit:
mes "[Duel Master]";
mes "Goodbye.";
close;
-
+
L_NoMon:
mes "[Duel Master]";
mes "You haven't got a monster, you can't participate.";
close;
-
+
L_NeedHeal:
mes "[Duel Master]";
mes "You need to heal before you can join.";
@@ -870,20 +874,20 @@ close;
L_Leave:
if ($@duelist1$ == strcharinfo(0)) goto L_Leave1;
if ($@duelist2$ == strcharinfo(0)) goto L_Leave2;
-
+
L_Leave3:
atcommand strcharinfo(0) + "@option 0 0 0";
set @battle,0;
warp "gon_test.gat",57,99;
close;
-
+
L_Leave1:
set $@duelist1$,$@duelist2$;
set $@monster1,$@monster2;
set $@duel,$@duel-1;
announce strcharinfo(0) + " stopped dueling",1;
goto L_Leave3;
-
+
L_Leave2:
set $@duelist2$,"";
set $@monster2,0;
@@ -891,6 +895,6 @@ close;
announce strcharinfo(0) + " stopped dueling",1;
goto L_Leave3;
}
-
+
gon_test.gat,49,5,5 duplicate(SummonPad) Summon Pad 4 111,2,2
gon_test.gat,55,8,6 duplicate(monsterreferee) Referee#02 61 \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-02 07:59:20 +0000