diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-22 15:38:30 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-12-22 15:38:30 +0000 |
| commit | 5f2901fbbb6d4f7deafa6f1a6638ca7f1d4dce87 (patch) | |
| tree | e7a97e0f0c6fe330ceaafd5e74af71c04e8c27cf /npc/custom | |
| parent | a65e4681cd29db1d0936523cc8ff5646dc7dca5b (diff) | |
| download | hercules-5f2901fbbb6d4f7deafa6f1a6638ca7f1d4dce87.tar.gz hercules-5f2901fbbb6d4f7deafa6f1a6638ca7f1d4dce87.tar.bz2 hercules-5f2901fbbb6d4f7deafa6f1a6638ca7f1d4dce87.tar.xz hercules-5f2901fbbb6d4f7deafa6f1a6638ca7f1d4dce87.zip | |
- Simplified the global function "getJobName"
- Simplified function agitcheck so it isn't crash prone. Now it takes no arguments, and will return whether WoE is on or not.
- Updated bundled scripts as required for this change.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9559 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom')
| -rw-r--r-- | npc/custom/WoE_Setter.txt | 6 | ||||
| -rw-r--r-- | npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/custom/WoE_Setter.txt b/npc/custom/WoE_Setter.txt index 8a842dec7..9fafa0233 100644 --- a/npc/custom/WoE_Setter.txt +++ b/npc/custom/WoE_Setter.txt @@ -120,7 +120,7 @@ L_Reset: mes "Are you sure?"; next; menu "No, what was I thinking",L_No,"Yes I really want to do it",-; - if(agitcheck(0)==1) goto L_WoEOn; + if(agitcheck()) goto L_WoEOn; deletearray $sday[0],200; deletearray $eday[0],200; deletearray $woetime[0],200; @@ -173,14 +173,14 @@ L_StartLoop: // Stop WoE L_End: - if(agitcheck(0)==0) end; + if(!agitcheck()) end; Announce "The War Of Emperium is over!",8; AgitEnd; end; // Start WoE L_Start: - if(agitcheck(0)==1) end; + if(agitcheck()) end; Announce "The War Of Emperium has begun!",8; AgitStart; end; diff --git a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt index 2adce07a0..f9aefbb49 100644 --- a/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt +++ b/npc/custom/eAAC_Scripts/kafraExpress/ke_warp_woe.txt @@ -25,7 +25,7 @@ function script F_keWarpWOE { callfunc "F_keIntro", e_srt, "Sorry, these warps are only available to people who belong to a Guild."; return; } - if ($@kewg_checkAgit && agitcheck(0) == 0) { + if ($@kewg_checkAgit && !agitcheck()) { callfunc "F_keIntro", e_srt, "Sorry, these warps are only enabled during the Guild Wars."; return; } |