From d841fc529949f361e915b73a073d1fa9d4ec60f7 Mon Sep 17 00:00:00 2001 From: Kisuka Date: Tue, 5 Apr 2011 06:00:20 +0000 Subject: - Completed L0ne's 2007 request for 'waitingroom' to support required zeny and level. - Updated NPC files which required the waitingroom update. - Added Poring War script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14765 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/mapflag/nobranch.txt | 6 +- conf/mapflag/noicewall.txt | 4 + conf/mapflag/nomemo.txt | 4 + conf/mapflag/nopenalty.txt | 3 + conf/mapflag/nosave.txt | 4 + conf/mapflag/noteleport.txt | 5 + conf/mapflag/nowarp.txt | 4 + conf/mapflag/nowarpto.txt | 4 + doc/script_commands.txt | 15 +- npc/battleground/flavius/flavius01.txt | 7 +- npc/battleground/flavius/flavius02.txt | 7 +- npc/battleground/tierra/tierra01.txt | 7 +- npc/battleground/tierra/tierra02.txt | 7 +- npc/other/arena/arena_aco.txt | 8 +- npc/other/hugel_bingo.txt | 5 +- npc/other/poring_war.txt | 1767 ++++++++++++++++++++++++++++++++ npc/other/turbotrack/Expert_16.txt | 6 +- npc/other/turbotrack/Expert_4.txt | 6 +- npc/other/turbotrack/Expert_8.txt | 6 +- npc/other/turbotrack/Normal_16.txt | 6 +- npc/other/turbotrack/Normal_4.txt | 6 +- npc/other/turbotrack/Normal_8.txt | 6 +- npc/quests/The_Sign_Quest.txt | 6 +- npc/scripts_athena.conf | 1 + src/map/chat.c | 34 +- src/map/chat.h | 5 +- src/map/script.c | 58 +- 27 files changed, 1906 insertions(+), 91 deletions(-) create mode 100644 npc/other/poring_war.txt diff --git a/conf/mapflag/nobranch.txt b/conf/mapflag/nobranch.txt index 3e91263da..0684fbe74 100644 --- a/conf/mapflag/nobranch.txt +++ b/conf/mapflag/nobranch.txt @@ -335,4 +335,8 @@ jupe_core2 mapflag nobranch brasilis mapflag nobranch bra_in01 mapflag nobranch -//evt_zombie mapflag nobranch \ No newline at end of file +//evt_zombie mapflag nobranch + +// Poring War ================== +poring_w01 mapflag nobranch +poring_w02 mapflag nobranch \ No newline at end of file diff --git a/conf/mapflag/noicewall.txt b/conf/mapflag/noicewall.txt index 13af8e2f4..ae64cc3c0 100644 --- a/conf/mapflag/noicewall.txt +++ b/conf/mapflag/noicewall.txt @@ -141,3 +141,7 @@ nguild_prt mapflag noicewall 4@tower mapflag noicewall 5@tower mapflag noicewall 6@tower mapflag noicewall + +// Poring War ==================== +poring_w01 mapflag noicewall +poring_w02 mapflag noicewall diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt index 6e57620c9..e7aea26b6 100644 --- a/conf/mapflag/nomemo.txt +++ b/conf/mapflag/nomemo.txt @@ -681,3 +681,7 @@ spl_in01 mapflag nomemo 2@nyd mapflag nomemo //evt_zombie mapflag nomemo + +// Poring War ==================== +poring_w01 mapflag nomemo +poring_w02 mapflag nomemo \ No newline at end of file diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt index 0d22861aa..3c7d781a4 100644 --- a/conf/mapflag/nopenalty.txt +++ b/conf/mapflag/nopenalty.txt @@ -251,3 +251,6 @@ bat_a01 mapflag nopenalty bat_a02 mapflag nopenalty //evt_zombie mapflag nopenalty + +// Poring War ================== +poring_w02 mapflag nopenalty \ No newline at end of file diff --git a/conf/mapflag/nosave.txt b/conf/mapflag/nosave.txt index 7c254eee2..5296b049a 100644 --- a/conf/mapflag/nosave.txt +++ b/conf/mapflag/nosave.txt @@ -269,3 +269,7 @@ arug_dun01 mapflag nosave SavePoint schg_dun01 mapflag nosave SavePoint //evt_zombie mapflag nosave SavePoint + +// Poring War ==================== +poring_w01 mapflag nosave SavePoint +poring_w02 mapflag nosave SavePoint \ No newline at end of file diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt index 10672aea9..15bd644f0 100644 --- a/conf/mapflag/noteleport.txt +++ b/conf/mapflag/noteleport.txt @@ -391,3 +391,8 @@ nyd_dun02 mapflag noteleport 2@nyd mapflag monster_noteleport //evt_zombie mapflag noteleport + +// Poring War ==================== +poring_w01 mapflag noteleport +poring_w02 mapflag noteleport +poring_w02 mapflag monster_noteleport \ No newline at end of file diff --git a/conf/mapflag/nowarp.txt b/conf/mapflag/nowarp.txt index 63c9aaaae..853dcf586 100644 --- a/conf/mapflag/nowarp.txt +++ b/conf/mapflag/nowarp.txt @@ -65,3 +65,7 @@ bat_b01 mapflag nowarp bat_b02 mapflag nowarp bat_a01 mapflag nowarp bat_a02 mapflag nowarp + +// Poring War ================== +poring_w01 mapflag nowarp +poring_w02 mapflag nowarp \ No newline at end of file diff --git a/conf/mapflag/nowarpto.txt b/conf/mapflag/nowarpto.txt index ca81f6d35..3fc30624b 100644 --- a/conf/mapflag/nowarpto.txt +++ b/conf/mapflag/nowarpto.txt @@ -139,3 +139,7 @@ spl_in01 mapflag nowarpto // Nidhoggr's Instance =========== 1@nyd mapflag nowarpto 2@nyd mapflag nowarpto + +// Poring War ==================== +poring_w01 mapflag nowarpto +poring_w02 mapflag nowarpto \ No newline at end of file diff --git a/doc/script_commands.txt b/doc/script_commands.txt index 2c8662cca..978e48183 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -166,6 +166,8 @@ //= Added 'bg_getareausers' and 'bg_get_data' commands. [Ai4rei] //= Updated description of 'waitingroom2bg_single' command. //= Documented optional parameter 'npc name' of 'waitingroom2bg' command. +//= 3.40.20110404 +//= Updated description of 'waitingroom' command to include required zeny/lvl. [Kisuka] //========================================================= This document is a reference manual for all the scripting commands and functions @@ -5708,7 +5710,7 @@ The function returns 0 if the shop was not found, 1 otherwise. --------------------------------------- -*waitingroom "",{,,}; +*waitingroom "",{,,,,,}; This command will create a chat room, owned by the NPC object running this script and displayed above the NPC sprite. @@ -5719,9 +5721,6 @@ optional event and trigger parameters are given, the event label ("::