From 00864187e9c93ce0059ad9f3fa67bfae7184dc25 Mon Sep 17 00:00:00 2001 From: samuray22 Date: Sat, 27 Sep 2008 12:41:13 +0000 Subject: * Continues replacing of specialeffect/2 numerics with constants. * Corrected an If to continue the President's Quest. (bugreport:2276) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13241 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/arena/arena_lvl50.txt | 9 +++++---- npc/other/arena/arena_lvl60.txt | 9 +++++---- npc/other/arena/arena_lvl70.txt | 9 +++++---- npc/other/arena/arena_lvl80.txt | 9 +++++---- npc/other/arena/arena_party.txt | 9 +++++---- npc/other/gympass.txt | 19 ++++++++++--------- npc/other/hugel_bingo.txt | 7 ++++--- 7 files changed, 39 insertions(+), 32 deletions(-) (limited to 'npc/other') diff --git a/npc/other/arena/arena_lvl50.txt b/npc/other/arena/arena_lvl50.txt index 8775e3957..2672c6bc1 100644 --- a/npc/other/arena/arena_lvl50.txt +++ b/npc/other/arena/arena_lvl50.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 50 //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Replaced effect numerics with constants. [Samuray22] //============================================================ arena_room,64,138,5 script lvl 50s Waiting Room 124,{ @@ -883,7 +884,7 @@ prt_are_in,129,188,3 script Staff#50-1 67,{ mes "[Staff]"; mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 7; + specialeffect2 EF_EXIT; warp "arena_room",100,75; end; } @@ -961,7 +962,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ mes "See you later~"; close2; } - specialeffect2 7; + specialeffect2 EF_EXIT; donpcevent "cast#50::Onnomal1"; warp "arena_room",100,75; donpcevent "#arn_timer_50::Onstop"; @@ -1012,7 +1013,7 @@ prt_are_in,25,188,3 script Staff#50-2 67,{ mes "See you later~"; close2; } - specialeffect2 4; + specialeffect2 EF_HIT5; donpcevent "cast#50::Onnomal2"; warp "arena_room",100,75; donpcevent "#arn_timer_50::Onstop"; diff --git a/npc/other/arena/arena_lvl60.txt b/npc/other/arena/arena_lvl60.txt index cac8b6c23..4eb9aafbe 100644 --- a/npc/other/arena/arena_lvl60.txt +++ b/npc/other/arena/arena_lvl60.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.1 +//= 1.2 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Fixed coordinate typo. (bugreport:1663) [L0ne_W0lf] +//= 1.2 Replaced effect numerics with constants. [Samuray22] //============================================================ arena_room,38,88,5 script lvl 60s Waiting Room 124,{ @@ -880,7 +881,7 @@ prt_are_in,129,135,3 script Staff#60-1 67,{ mes "[Staff]"; mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 4; + specialeffect2 EF_EXIT; warp "arena_room",100,75; end; } @@ -958,7 +959,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ mes "See you later~"; close2; } - specialeffect2 4; + specialeffect2 EF_EXIT; donpcevent "cast#60::Onnomal1"; warp "arena_room",100,75; donpcevent "#arn_timer_60::Onstop"; @@ -1009,7 +1010,7 @@ prt_are_in,25,135,3 script Staff#60-2 67,{ mes "See you later~"; close2; } - specialeffect2 4; + specialeffect2 EF_HIT5; donpcevent "cast#60::Onnomal2"; warp "arena_room",100,75; donpcevent "#arn_timer_60::Onstop"; diff --git a/npc/other/arena/arena_lvl70.txt b/npc/other/arena/arena_lvl70.txt index 10d55b513..55132b857 100644 --- a/npc/other/arena/arena_lvl70.txt +++ b/npc/other/arena/arena_lvl70.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 70 //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Replaced effect numerics with constants. [Samuray22] //============================================================ arena_room,52,42,7 script lvl 70s Waiting Room 124,{ @@ -860,7 +861,7 @@ prt_are_in,129,83,3 script Staff#70-1 67,{ mes "[Staff]"; mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 7; + specialeffect2 EF_EXIT; warp "arena_room",100,75; end; } @@ -938,7 +939,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ mes "See you later~"; close2; } - specialeffect2 7; + specialeffect2 EF_EXIT; donpcevent "cast#70::Onnomal1"; warp "arena_room",100,75; donpcevent "#arn_timer_70::Onstop"; @@ -989,7 +990,7 @@ prt_are_in,25,84,3 script Staff#70-2 67,{ mes "See you later~"; close2; } - specialeffect2 4; + specialeffect2 EF_HIT5; donpcevent "cast#70::Onnomal2"; warp "arena_room",100,75; donpcevent "#arn_timer_70::Onstop"; diff --git a/npc/other/arena/arena_lvl80.txt b/npc/other/arena/arena_lvl80.txt index 985ec7d14..ca0e881cb 100644 --- a/npc/other/arena/arena_lvl80.txt +++ b/npc/other/arena/arena_lvl80.txt @@ -3,13 +3,14 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= //= Izlude Battle Arena Level 80 //===== Additional Comments: ================================= //= 1.0 First version. +//= 1.1 Replaced effect numerics with constants. [Samuray22] //============================================================ arena_room,147,42,1 script lvl 80s Waiting Room 124,{ @@ -833,7 +834,7 @@ prt_are_in,181,188,3 script Staff#80-1 67,{ mes "[Staff]"; mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 7; + specialeffect2 EF_EXIT; warp "arena_room",100,75; end; } @@ -911,7 +912,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ mes "See you later~"; close2; } - specialeffect2 7; + specialeffect2 EF_EXIT; donpcevent "cast#80::Onnomal1"; warp "arena_room",100,75; donpcevent "#arn_timer_80::Onstop"; @@ -962,7 +963,7 @@ prt_are_in,77,187,3 script Staff#80-2 67,{ mes "See you later~"; close2; } - specialeffect2 4; + specialeffect2 EF_HIT5; donpcevent "cast#80::Onnomal2"; warp "arena_room",100,75; donpcevent "#arn_timer_80::Onstop"; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index eca3e1416..032731445 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.0a +//= 1.1 //===== Compatible With: ===================================== //= Any Athena Version //===== Description: ========================================= @@ -11,6 +11,7 @@ //===== Additional Comments: ================================= //= 1.0 First version. //= 1.0a Fixed a typo. +//= 1.1 Replaced effect numerics with constants. [Samuray22] //============================================================ arena_room,162,88,3 script Ponox 124,{ @@ -1148,7 +1149,7 @@ prt_are_in,181,135,3 script Staff#party-1 67,{ mes "[Staff]"; mes "Let me guide you outside. I hope you had a good time."; close2; - specialeffect2 4; + specialeffect2 EF_HIT5; warp "arena_room",100,75; end; } @@ -1233,7 +1234,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ donpcevent "alloff#pt::Onon"; donpcevent "Ponox::Onstart"; } - specialeffect2 4; + specialeffect2 EH_HIT5; donpcevent "cast#pt::Onnomal1"; warp "arena_room",100,75; end; @@ -1325,7 +1326,7 @@ prt_are_in,77,135,3 script Staff#party-2 67,{ donpcevent "alloff#pt::Onon"; donpcevent "Ponox::Onstart"; } - specialeffect2 4; + specialeffect2 EF_HIT5; warp "arena_room",100,75; end; } diff --git a/npc/other/gympass.txt b/npc/other/gympass.txt index 1d4ae0c19..f5bf8a320 100644 --- a/npc/other/gympass.txt +++ b/npc/other/gympass.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Kisuka //===== Current Version: ===================================== -//= v1.1 +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -12,6 +12,7 @@ //===== Additional Comments: ================================= //= 1.0 First version [L0ne_W0lf] //= 1.1 Fixed the NPC saying you "00" [L0ne_W0lf] +//= 1.2 Replaced effect numerics with constants. [Samuray22] //============================================================ payon,173,141,4 script Ripped Cabus#GymPass 899,{ @@ -75,13 +76,13 @@ payon,173,141,4 script Ripped Cabus#GymPass 899,{ mes "and try to feel the burn."; mes "Ready? Let's do this."; next; - specialeffect2 79; + specialeffect2 EF_EARTHSPIKE; next; - specialeffect2 372; + specialeffect2 EF_DEVIL; next; - specialeffect2 10; + specialeffect2 EF_COIN; next; - specialeffect2 62; + specialeffect2 EF_SIGHTRASHER; next; skill "ALL_INCCARRY",getskilllv("ALL_INCCARRY")+1,0; delitem 7776,1; @@ -122,13 +123,13 @@ payon,173,141,4 script Ripped Cabus#GymPass 899,{ mes "as muscle memory. It's won't take"; mes "as long to build 'em back up..."; next; - specialeffect2 79; + specialeffect2 EF_EARTHSPIKE; next; - specialeffect2 372; + specialeffect2 EF_DEVIL; next; - specialeffect2 10; + specialeffect2 EF_COIN; next; - specialeffect2 62; + specialeffect2 EF_SIGHTRASHER; next; skill 681,gympassmemory,0; mes "[Ripped]"; diff --git a/npc/other/hugel_bingo.txt b/npc/other/hugel_bingo.txt index 651ceaa0c..0f824b48f 100644 --- a/npc/other/hugel_bingo.txt +++ b/npc/other/hugel_bingo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= SinSloth //===== Current Version: ===================================== -//= 1.5 +//= 1.7 //===== Compatible With: ===================================== //= Any eAthena Version //===== Description: ========================================= @@ -16,7 +16,8 @@ //= preventing players from launching another. [SinSloth] //= 1.4 - Fixed a minor bug added in the last revision. [SinSloth] //= 1.5 - Applied a fix to players locations which were not rotating properly. [SinSloth] -//= 1.6- Removed nescesity to win to proceed with quest [Yommy] +//= 1.6 - Removed nescesity to win to proceed with quest [Yommy] +//= 1.7 - Replaced effect numerics with constants. [Samuray22] //============================================================ que_bingo,48,84,5 script Bingo Waiting Room 124,{ @@ -812,7 +813,7 @@ OnInit: OnTouch: if($@bingowinner$ != strcharinfo(0)) end; - specialeffect 183; + specialeffect EF_SUI_EXPLOSION; soundeffect "tming_success.wav",1; if($@bingoresult == 16) getitem 7515,50; else getitem 7515,1; -- cgit v1.2.3-70-g09d2