Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed silly copy paste errors in Tierra Gorge entrance npcs. (bugreport:4401)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14391 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
L0ne_W0lf 2010-08-21 16:01:12 +00:00
parent 0b1cd84732
commit 7869596502
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
npc/Changelog.txt
View File

@ -1,5 +1,7 @@
Date Added Date Added
====== ======
2010/08/21
* Rev. 14391 Fixed silly copy paste errors in Tierra Gorge entrance npcs. (bugreport:4401) [L0ne_W0lf]
2010/08/20 2010/08/20
* Rev. 14385 Fixed wrong events being called for flavius02 BG waiting rooms. (bugreport:4395) [L0ne_W0lf] * Rev. 14385 Fixed wrong events being called for flavius02 BG waiting rooms. (bugreport:4395) [L0ne_W0lf]
* Fixed the setwalls in Tierra gorge, again. Removed extra mapflags. * Fixed the setwalls in Tierra gorge, again. Removed extra mapflags.

21
npc/battleground/tierra/tierra_enter.txt
View File

@ -11,9 +11,10 @@
//= Tierra Gorge Battleground Entrance NPCs //= Tierra Gorge Battleground Entrance NPCs
//===== Additional Comments: ================================= //===== Additional Comments: =================================
//= 1.0 First Version. //= 1.0 First Version.
//= 1.1 Fixed silly copy paste errors. (bugreport:4401)
//============================================================ //============================================================
// First Tierra Gorge Officers - Guillaume & Croix // First Tierra Gorge Officers - Guillaume
//============================================================ //============================================================
bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{ bat_room,124,178,5 script Tierra Gorge Officer#01a 418,{
if (checkweight(1201,1) == 0) { if (checkweight(1201,1) == 0) {
@ -245,7 +246,7 @@ bat_room,143,121,1 script Croix Knight#2 413,{
close; close;
} }
// Second Tierra Gorge Officers - Guillaume & Croix // Second Tierra Gorge Officers - Croix
//============================================================ //============================================================
bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
if (checkweight(1201,1) == 0) { if (checkweight(1201,1) == 0) {
@ -256,24 +257,24 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
mes "- after you loose some weight. -"; mes "- after you loose some weight. -";
close; close;
} }
mes "[Guillaume Army Officer]"; mes "[Croix Army Officer]";
mes "Let's show the power of the Guillaume Army to those stinky Croixs!"; mes "Let's show the power of the Croix Army to those stinky Guillaumes!";
next; next;
switch(select("I want to join your army!:End Conversation")) { switch(select("I want to join your army!:End Conversation")) {
case 1: case 1:
if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) { if ((Class == job_Novice) || (BaseClass == Job_Supernovice)) {
mes "[Guillaume Army Officer]"; mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
} }
else { else {
if (BaseLevel < 80) { if (BaseLevel < 80) {
mes "[Guillaume Army Officer]"; mes "[Croix Army Officer]";
mes "I'm very pleased that you want to join us and fight the Croix Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield."; mes "I'm very pleased that you want to join us and fight the Guillaume Army, but I'm sorry: I can't send a rookie like you to die on the cruel battlefield.";
} }
else { else {
set .@chk_urtime,checkquest(2069,PLAYTIME); set .@chk_urtime,checkquest(2069,PLAYTIME);
if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) { if ((.@chk_urtime == 0)|| (.@chk_urtime == 1)) {
mes "[Guillaume Army Officer]"; mes "[Croix Army Officer]";
mes "You seem to have just returned from the battlefield."; mes "You seem to have just returned from the battlefield.";
mes "It's too early for you to go back. Go rest, and leave the enemies to us!"; mes "It's too early for you to go back. Go rest, and leave the enemies to us!";
} }
@ -307,7 +308,7 @@ bat_room,125,121,1 script Tierra Gorge Officer#01b 414,{
} }
break; break;
case 2: case 2:
mes "[Guillaume Army Officer]"; mes "[Croix Army Officer]";
mes "Today, we shall be victorious!"; mes "Today, we shall be victorious!";
break; break;
} }