summaryrefslogtreecommitdiff
path: root/npc/events/nguild
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2014-10-26 02:06:46 +0100
committerHaru <haru@dotalux.com>2014-11-02 01:36:50 +0100
commitbf4b0a281207e46a9b21a9c9f779aeafaa739b62 (patch)
tree0230ee95510255548ebb7f4080460b466c9e2ca6 /npc/events/nguild
parent6b20c5b6988c889df35b890d93c338f8b87fa430 (diff)
downloadhercules-bf4b0a281207e46a9b21a9c9f779aeafaa739b62.tar.gz
hercules-bf4b0a281207e46a9b21a9c9f779aeafaa739b62.tar.bz2
hercules-bf4b0a281207e46a9b21a9c9f779aeafaa739b62.tar.xz
hercules-bf4b0a281207e46a9b21a9c9f779aeafaa739b62.zip
Replaced 'set' with direct assignment where applicable (common folder)
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'npc/events/nguild')
-rw-r--r--npc/events/nguild/nguild_dunsw.txt2
-rw-r--r--npc/events/nguild/nguild_ev_agit.txt34
-rw-r--r--npc/events/nguild/nguild_flags.txt2
-rw-r--r--npc/events/nguild/nguild_kafras.txt6
-rw-r--r--npc/events/nguild/nguild_managers.txt2
-rw-r--r--npc/events/nguild/nguild_treas.txt18
6 files changed, 32 insertions, 32 deletions
diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt
index 9b24c50b6..f768405d7 100644
--- a/npc/events/nguild/nguild_dunsw.txt
+++ b/npc/events/nguild/nguild_dunsw.txt
@@ -14,7 +14,7 @@
//==================================================
function script F_GldDunSw {
- set .@GID, getcastledata(getarg(0),1);
+ .@GID = getcastledata(getarg(0),1);
if (.@GID == 0) {
mes "[ Echoing Voice ]";
mes " ' The one who can overcome an ordeal and show true bravery... will find the way... ' ";
diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt
index 097abb53c..5461bb975 100644
--- a/npc/events/nguild/nguild_ev_agit.txt
+++ b/npc/events/nguild/nguild_ev_agit.txt
@@ -16,10 +16,10 @@
// Function for OnAgitStart =========================================
function script F_AgitStart {
- set .@map$, getarg(0);
- set .@castle$, getarg(1);
- set .@empx, getarg(2);
- set .@empy, getarg(3);
+ .@map$ = getarg(0);
+ .@castle$ = getarg(1);
+ .@empx = getarg(2);
+ .@empy = getarg(3);
maprespawnguildid .@map$,getcastledata(.@map$,1),2;
monster .@map$,.@empx,.@empy,"Emperium",1288,1,"Agit_"+.@castle$+"::OnAgitBreak";
@@ -30,8 +30,8 @@ function script F_AgitStart {
// Function for OnGuildBreak ======================================
function script F_GuildBreak {
- set .@map$, getarg(0);
- set .@castle$, getarg(1);
+ .@map$ = getarg(0);
+ .@castle$ = getarg(1);
killmonsterall .@map$;
@@ -44,18 +44,18 @@ function script F_GuildBreak {
// Function for OnAgitBreak ======================================
function script F_AgitBreak {
- set .@map$, getarg(0);
- set .@castle$, getarg(1);
+ .@map$ = getarg(0);
+ .@castle$ = getarg(1);
- set .@GID,getcharid(2);
+ .@GID = getcharid(2);
if (.@GID <= 0) return;
- set .@Economy,getcastledata(.@map$,2) - 5;
- if (.@Economy < 0) set .@Economy, 0;
+ .@Economy = getcastledata(.@map$,2) - 5;
+ if (.@Economy < 0) .@Economy = 0;
setcastledata .@map$, 2, .@Economy;
- set .@defence,getcastledata(.@map$,3) - 5;
- if (.@defence < 0) set .@defence, 0;
+ .@defence = getcastledata(.@map$,3) - 5;
+ if (.@defence < 0) .@defence = 0;
setcastledata .@map$, 3, .@defence;
setcastledata .@map$,1, .@GID;
@@ -66,12 +66,12 @@ function script F_AgitBreak {
disablenpc "Kafra Staff#"+.@castle$;
// remove investment data and kafra
- for( set .@i, 4; .@i <= 9; set .@i, .@i+1 )
+ for (.@i = 4; .@i <= 9; ++.@i)
setcastledata .@map$, .@i, 0;
// if the new guild doesn't have Guardian Research, erase guardians
if( getgdskilllv(.@GID,10002) == 0 )
- for( set .@i, 10; .@i <= 17; set .@i, .@i+1 )
+ for (.@i = 10; .@i <= 17; ++.@i)
setcastledata .@map$, .@i, 0;
return;
@@ -80,8 +80,8 @@ function script F_AgitBreak {
// Function for OnAgitEnd ======================================
function script F_AgitEnd {
- set .@map$, getarg(0);
- set .@castle$, getarg(1);
+ .@map$ = getarg(0);
+ .@castle$ = getarg(1);
gvgoff .@map$;
// Disable the following if statment to keep empty
diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt
index 8c629adf9..dcd3dbc14 100644
--- a/npc/events/nguild/nguild_flags.txt
+++ b/npc/events/nguild/nguild_flags.txt
@@ -16,7 +16,7 @@
/// Flag Function
//============================================================
function script F_Flags {
- set .@GID, getcastledata(getarg(1),1);
+ .@GID = getcastledata(getarg(1),1);
if (getarg(5) == 0) return;
if (.@GID == 0) {
mes " [ Edict of the Divine Rune Midgard Kingdom ]";
diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt
index 100751f7a..89570fe6d 100644
--- a/npc/events/nguild/nguild_kafras.txt
+++ b/npc/events/nguild/nguild_kafras.txt
@@ -16,7 +16,7 @@
function script F_GKafra {
cutin "kafra_01",2;
- set @GID, getcastledata(getarg(0),1);
+ @GID = getcastledata(getarg(0),1);
if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG;
mes "[Kafra Service]";
@@ -24,8 +24,8 @@ function script F_GKafra {
cutin "",255;
close;
L_StartG:
- set @wrpP[0], 200;
- set @wrpD$[0], getarg(1);
+ @wrpP[0] = 200;
+ @wrpD$[0] = getarg(1);
setarray @wrpC$[0], @wrpD$[0]+" ^880000"+@wrpP[0]+"^000000 z", "Cancel", "", "", "","";
callfunc "F_Kafra",2,0,0,0,800;
end;
diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt
index 039ba9ee1..015ef20fd 100644
--- a/npc/events/nguild/nguild_managers.txt
+++ b/npc/events/nguild/nguild_managers.txt
@@ -23,7 +23,7 @@
//==============================================
function script F_GldManager {
- set @GID, getcastledata(getarg(1),1);
+ @GID = getcastledata(getarg(1),1);
mes "[ "+getarg(0)+" ]";
if (@GID == 0){
mes "I am waiting for my master. Brave adventurer, follow your destiny!";
diff --git a/npc/events/nguild/nguild_treas.txt b/npc/events/nguild/nguild_treas.txt
index 750eab88a..7a7cd64c8 100644
--- a/npc/events/nguild/nguild_treas.txt
+++ b/npc/events/nguild/nguild_treas.txt
@@ -39,7 +39,7 @@ function script F_GldTreas {
//sets the counter variable = to the box number amount
set getarg(3), getarg(2);
}
- for (set .@i,1; .@i <= getarg(3) ; set .@i,.@i+1) {
+ for (.@i = 1; .@i <= getarg(3); ++.@i) {
// set treasure box ID
set getarg(4), getarg(5) + (.@i+1) % 2;
areamonster getarg(0),getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
@@ -71,13 +71,13 @@ OnRecvCastleN01:
end;
OnInit:
if($boxNumN01 == 0) end;
- set $@bxN01, $boxNumN01;
+ $@bxN01 = $boxNumN01;
callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324+rand(10),114,218,123,227,1;
end;
OnDied:
mapannounce "nguild_alde","Treasure Chest Broken Open",17;
- set $boxNumN01, $boxNumN01 -1;
+ --$boxNumN01;
if($boxNumN01 == 0) mapannounce "nguild_alde", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0;
end;
}
@@ -97,13 +97,13 @@ OnRecvCastleN02:
end;
OnInit:
if($boxNumN02 == 0) end;
- set $@bxN02, $boxNumN02;
+ $@bxN02 = $boxNumN02;
callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334+rand(10),150,108,158,114,1;
end;
OnDied:
mapannounce "nguild_gef","Treasure Chest Broken Open",17;
- set $boxNumN02, $boxNumN02 -1;
+ --$boxNumN02;
if($boxNumN02 == 0) mapannounce "nguild_gef", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0;
end;
}
@@ -122,13 +122,13 @@ OnRecvCastleN03:
end;
OnInit:
if($boxNumN03 == 0) end;
- set $@bxN03, $boxNumN03;
+ $@bxN03 = $boxNumN03;
callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344+rand(10),286,4,295,13,1;
end;
OnDied:
mapannounce "nguild_pay","Treasure Chest Broken Open",17;
- set $boxNumN03, $boxNumN03 -1;
+ --$boxNumN03;
if($boxNumN03 == 0) mapannounce "nguild_pay", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0;
end;
}
@@ -147,13 +147,13 @@ OnRecvCastleN04:
end;
OnInit:
if($boxNumN04 == 0) end;
- set $@bxN04, $boxNumN04;
+ $@bxN04 = $boxNumN04;
callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354+rand(10),6,204,15,213,1;
end;
OnDied:
mapannounce "nguild_prt","Treasure Chest Broken Open",17;
- set $boxNumN04, $boxNumN04 -1;
+ --$boxNumN04;
if($boxNumN04 == 0) mapannounce "nguild_prt", "All of the treasure boxes have been opened. You must wait untill the next day for them to appear again.",0;
end;
}