From 593430577e0eb5f6e96715f5463d2764caf6dd7c Mon Sep 17 00:00:00 2001 From: og2 Date: Fri, 13 Jan 2012 01:16:04 +0000 Subject: *Fixed the "bing#n1" issue (bugreport:5050). *Fixed variables typos. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15439 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/turbotrack/Expert_16.txt | 5 ++-- npc/other/turbotrack/Expert_4.txt | 5 ++-- npc/other/turbotrack/Expert_8.txt | 5 ++-- npc/other/turbotrack/Normal_16.txt | 5 ++-- npc/other/turbotrack/Normal_4.txt | 5 ++-- npc/other/turbotrack/Normal_8.txt | 5 ++-- npc/other/turbotrack/Normal_Solo.txt | 52 +++++++++++++++++++++++++++++++++--- 7 files changed, 67 insertions(+), 15 deletions(-) diff --git a/npc/other/turbotrack/Expert_16.txt b/npc/other/turbotrack/Expert_16.txt index 7131edc8d..f9d78b394 100644 --- a/npc/other/turbotrack/Expert_16.txt +++ b/npc/other/turbotrack/Expert_16.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.5 Fixed variable typo [Slim] //============================================================ turbo_room,124,135,3 script Expert mode - 16 person 124,{ @@ -1470,7 +1471,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_e_16",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Expert_4.txt b/npc/other/turbotrack/Expert_4.txt index 18c618906..5091df596 100644 --- a/npc/other/turbotrack/Expert_4.txt +++ b/npc/other/turbotrack/Expert_4.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.5 Fixed variable typo [Slim] //============================================================ turbo_room,110,135,3 script Expert mode - 4 person 124,{ @@ -1388,7 +1389,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_e_4",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Expert_8.txt b/npc/other/turbotrack/Expert_8.txt index 46c8e7857..46df00488 100644 --- a/npc/other/turbotrack/Expert_8.txt +++ b/npc/other/turbotrack/Expert_8.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.5 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,6 +15,7 @@ //= 1.2 Fixed a little mistake [akrus] //= 1.3 Corrected issue with top record setting. [L0ne_W0lf] //= 1.4 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.5 Fixed variable typo [Slim] //============================================================ turbo_room,117,135,3 script Expert mode - 8 person 124,{ @@ -1392,7 +1393,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_e_8",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Normal_16.txt b/npc/other/turbotrack/Normal_16.txt index a5c8d42f3..e15b6347f 100644 --- a/npc/other/turbotrack/Normal_16.txt +++ b/npc/other/turbotrack/Normal_16.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Fixed name being saved under expert mode. (bugreport:4433) [L0ne_W0lf] //= 1.6 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.7 Fixed variable typo [Slim] //============================================================ turbo_room,91,135,3 script Normal mode - 16 person 124,{ @@ -1472,7 +1473,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_n_16",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Normal_4.txt b/npc/other/turbotrack/Normal_4.txt index 811f40a29..0005e0fb7 100644 --- a/npc/other/turbotrack/Normal_4.txt +++ b/npc/other/turbotrack/Normal_4.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.5 +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -16,6 +16,7 @@ //= 1.3 Fixed a little mistake [akrus] //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.6 Fixed variable typo [Slim] //============================================================ turbo_room,77,135,3 script Normal mode - 4 person 124,{ @@ -1388,7 +1389,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_n_4",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Normal_8.txt b/npc/other/turbotrack/Normal_8.txt index 1eddb6b43..d9204e152 100644 --- a/npc/other/turbotrack/Normal_8.txt +++ b/npc/other/turbotrack/Normal_8.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -17,6 +17,7 @@ //= 1.4 Corrected issue with top record setting. [L0ne_W0lf] //= 1.5 Fixed name being saved under expert mode. (bugreport:4433) [L0ne_W0lf] //= 1.6 Updated 'waitingroom' to support required zeny/lvl. [Kisuka] +//= 1.7 Fixed variable typo [Slim] //============================================================ turbo_room,84,135,3 script Normal mode - 8 person 124,{ @@ -1393,7 +1394,7 @@ OnInit: end; OnTouch: - set bing1,rand(1,10); + set .@bing1,rand(1,10); if (.@bing1 == 1) warp "turbo_n_8",217,232; else if (.@bing1 == 2) diff --git a/npc/other/turbotrack/Normal_Solo.txt b/npc/other/turbotrack/Normal_Solo.txt index 1594c400e..1cdf14574 100644 --- a/npc/other/turbotrack/Normal_Solo.txt +++ b/npc/other/turbotrack/Normal_Solo.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.4 +//= 1.6 //===== Compatible With: ===================================== //= rAthena SVN //===== Description: ========================================= @@ -15,6 +15,8 @@ //= 1.2 Fixed end timer not enabling warp. (bugreport:1682) [L0ne_W0lf] //= 1.3 Replaced effect numerics with constants. [L0ne_W0lf] //= 1.4 Fixed a little mistake [akrus] +//= 1.5 Fixed variable typo [Slim] +//= 1.6 Fixed the "bing#n1" issue. (bugreport:5050) [Slim] //============================================================ turbo_room,72,132,3 script Solo Mode#n1 124,{ @@ -321,6 +323,7 @@ OnTimer927000: // monster reset donpcevent "snake#n1::Onreset"; donpcevent "hunting#n1::Onreset"; + disablenpc "bing2#n1"; // NPC disablenpc "Guide#TBT_n_1"; enablenpc "cos_n_1_end"; @@ -853,7 +856,7 @@ OnTouch: turbo_n_1,93,19,0 script cos_n_1_7 45,1,1,{ OnTouch: - mapannounce "turbo_n_1","" + strcharinfo(0) +" has just passed the Small Cave course! Hurry, you're almost at the finish!",bc_map,"0x70DBDB"; + mapannounce "turbo_n_1","" + strcharinfo(0) +" has just passed the Small Cave course! Hurry, you're so close to the finish!",bc_map,"0x70DBDB"; warp "turbo_n_1",167,55; end; } @@ -1087,10 +1090,12 @@ OnTimer52000: mapannounce "turbo_n_1","Have a good day.",bc_map,"0x33FF66"; end; +//--- warp all players to turbo room OnTimer56000: mapwarp "turbo_n_1","turbo_room",72,89; end; - + +//----end game, reset all OnTimer60000: disablenpc "Guide#TBT_n_1"; enablenpc "cos_n_1_end"; @@ -1105,6 +1110,7 @@ OnTimer60000: donpcevent "snake#n1::Onreset"; donpcevent "hunting#n1::Onreset"; donpcevent "Solo Mode#n1::OnEnable"; + disablenpc "bing2#n1"; stopnpctimer; end; } @@ -1289,3 +1295,43 @@ turbo_n_1,368,48,0 duplicate(TurboTrap_n1) trap_n1#F92 139,1,1 turbo_n_1,368,44,0 duplicate(TurboTrap_n1) trap_n1#F93 139,1,1 turbo_n_1,368,40,0 duplicate(TurboTrap_n1) trap_n1#F94 139,1,1 turbo_n_1,368,36,0 duplicate(TurboTrap_n1) trap_n1#F95 139,1,1 + +turbo_n_1,217,214,0 script bing#n1 45,3,3,{ +OnTouch: + set .@bing1,rand(1,10); + if (.@bing1 > 0 && .@bing1 < 4) + warp "turbo_n_1",217,232; + else if (.@bing1 == 6) + warp "turbo_n_1",233,207; + else if (.@bing1 == 7) + warp "turbo_n_1",208,219; + else if (.@bing1 == 8) + warp "turbo_n_1",219,202; + else if (.@bing1 == 9) + warp "turbo_n_1",218,228; + disablenpc "bing#n1"; + enablenpc "bing2#n1"; + end; +} + +turbo_n_1,217,214,0 script bing2#n1 45,3,3,{ +OnInit: + disablenpc "bing2#n1"; + end; + +OnTouch: + set .@bing1,rand(1,10); + if (.@bing1 == 1) + warp "turbo_n_1",217,232; + else if (.@bing1 == 2) + warp "turbo_n_1",233,207; + else if (.@bing1 == 3) + warp "turbo_n_1",208,219; + else if (.@bing1 == 4) + warp "turbo_n_1",219,202; + else if (.@bing1 == 5) + warp "turbo_n_1",218,228; + else if (.@bing1 == 6) + warp "turbo_n_1",220,195; + end; +} \ No newline at end of file -- cgit v1.2.3-60-g2f50