From 2615c998bfb622352838ec4ebb3ed7cad5d65eeb Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Wed, 29 Apr 2020 06:15:41 -0300
Subject: Make variables easier to understand

---
 npc/042-2/boss.txt | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'npc')

diff --git a/npc/042-2/boss.txt b/npc/042-2/boss.txt
index d9f11a795..9a68c435d 100644
--- a/npc/042-2/boss.txt
+++ b/npc/042-2/boss.txt
@@ -34,16 +34,16 @@ OnArrival:
     if ($@KAMELOT_WAVE[.@g] > 3)
         end;
     $@KAMELOT_WAVE[.@g]=100;
-    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[.@g]);
-    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[.@g]);
+    setd("$@GTEMP_PC_"+.@m$, $KAMELOT_PC[.@g]);
+    setd("$@GTEMP_MX_"+.@m$, $KAMELOT_MX[.@g]);
     initnpctimer;
     //debugmes "Timer Started";
     end;
 
 OnEmergency:
     .@m$=instance_mapname("042-2");
-    setd("$@GTEMP2_"+.@m$, $KAMELOT_PC[getcharid(2)]);
-    setd("$@GTEMP3_"+.@m$, $KAMELOT_MX[getcharid(2)]);
+    setd("$@GTEMP_PC_"+.@m$, $KAMELOT_PC[getcharid(2)]);
+    setd("$@GTEMP_MX_"+.@m$, $KAMELOT_MX[getcharid(2)]);
     initnpctimer;
     end;
 
@@ -54,7 +54,7 @@ OnEmergency2:
 OnTimer1000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "??? : What's this? Why do I hear a commotion up there??", 0;
-    .@gcount=getd("$@GTEMP2_"+.@m$);
+    .@gcount=getd("$@GTEMP_PC_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59); // Prologue monsters
     end;
 
@@ -88,21 +88,21 @@ OnTimer74000:
 OnTimer80000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : Both is impossible for weaklings like you lot. Minions, ATTACK!", 0;
-    .@gcount=getd("$@GTEMP2_"+.@m$);
+    .@gcount=getd("$@GTEMP_PC_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
 OnTimer100000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : MUhahahahaha! Minions, Dispose of these Adventurers! Kill them already!", 0;
-    .@gcount=getd("$@GTEMP2_"+.@m$);
+    .@gcount=getd("$@GTEMP_PC_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
 OnTimer120000:
     .@m$=instance_mapname("042-2");
     mapannounce .@m$, "General Krukan : *facepalm* Now, you're just being pathetic minions. How about you try a different approach and kill them already!", 0;
-    .@gcount=getd("$@GTEMP2_"+.@m$);
+    .@gcount=getd("$@GTEMP_PC_"+.@m$);
     kdoor0422Spawn(.@gcount*2, 20, 24, 59, 59);
     end;
 
@@ -110,10 +110,10 @@ OnTimer180000:
     .@m$=instance_mapname("042-2");
     .@n$=instance_npcname(.name$);
     mapannounce .@m$, "General Krukan : Looks like if you want something done right you have to do it yourself. Charge!", 0;
-    .@gcount=getd("$@GTEMP2_"+.@m$);
-    .@avg=getd("$@GTEMP3_"+.@m$);
+    .@gcount=getd("$@GTEMP_PC_"+.@m$);
+    .@avg=getd("$@GTEMP_MX_"+.@m$);
     kdoor0422Spawn(.@gcount*3, 20, 24, 59, 59);
-    .@avg=getd("$@GTEMP3_"+.@m$);
+    .@avg=getd("$@GTEMP_MX_"+.@m$);
     //debugmes "BOSS - %d, map %s (power %d)", .@gcount, .@m$, .@avg;
     .@mob=monster(.@m$, 34, 26, strmobinfo(1, GeneralKrukan), GeneralKrukan, 1, .@n$+"::OnKillBoss");
     // Reconfigure the monster
@@ -148,7 +148,7 @@ OnTimer185000:
     //debugmes "Timer Running";
     .@m$=instance_mapname("042-2");
     .@mob=getd("$@GTEMP_"+.@m$);
-    .@gdcount=getd("$@GTEMP2_"+.@m$);
+    .@gdcount=getd("$@GTEMP_PC_"+.@m$);
     .@ratio=getunitdata(.@mob, UDT_HP)*10/getunitdata(.@mob, UDT_MAXHP);
     //debugmes "Ratio %d/%d", .@ratio, getd("$@GTEMP1_"+.@m$);
     if (.@ratio < getd("$@GTEMP1_"+.@m$)) {
@@ -199,7 +199,7 @@ OnKillMob:
 OnKillBoss:
     setd("$@GTEMP_"+.@m$, 0);
     setd("$@GTEMP1_"+.@m$, 0);
-    setd("$@GTEMP2_"+.@m$, 0);
+    setd("$@GTEMP_PC_"+.@m$, 0);
     .@g=getcharid(2);
     dispbottom l("This is all in KAMELOT for now.");
     $KAMELOT_QUEST[.@g]=$KAMELOT_QUEST[.@g]|4; // FIXME
@@ -235,7 +235,7 @@ function kdoor0422Spawn {
     .@y1=getarg(2);
     .@x2=getarg(3);
     .@y2=getarg(4);
-    .@avg=getd("$@GTEMP3_"+.@m$);
+    .@avg=getd("$@GTEMP_MX_"+.@m$);
     .@m$=instance_mapname("042-2");
     //debugmes "Total %d, map %s (power %d)", .@gcount, .@m$, .@avg;
     freeloop(true);
-- 
cgit v1.2.3-60-g2f50