summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-25 22:22:16 +0000
committermasao87 <masao87@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-12-25 22:22:16 +0000
commitb5a513bad885278a5107876b37befe101728f8fd (patch)
treedbf48f492a05aa0d0d7caed28559e4d96bb1cf87
parentca35e19be4ad9c41d817fbf8930d315111681b1b (diff)
downloadhercules-b5a513bad885278a5107876b37befe101728f8fd.tar.gz
hercules-b5a513bad885278a5107876b37befe101728f8fd.tar.bz2
hercules-b5a513bad885278a5107876b37befe101728f8fd.tar.xz
hercules-b5a513bad885278a5107876b37befe101728f8fd.zip
- Fixed wrong variable used in quest_ayothaya. bugreport:5129
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15280 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/quests/eden/eden_service.txt8
-rw-r--r--npc/quests/quests_ayothaya.txt26
2 files changed, 17 insertions, 17 deletions
diff --git a/npc/quests/eden/eden_service.txt b/npc/quests/eden/eden_service.txt
index 3ae4d61ba..630165ed8 100644
--- a/npc/quests/eden/eden_service.txt
+++ b/npc/quests/eden/eden_service.txt
@@ -1,17 +1,17 @@
-//===== eAthena Script =======================================
+//===== rAthena Script =======================================
// Eden Group Quests - Service NPCs
//===== By: ==================================================
//= L0ne_W0lf
//===== Current Version: =====================================
//= 1.0
//===== Compatible With: =====================================
-//= eAthena 1.0
+//= Any rAthena SVN
//===== Description: =========================================
//= [AEGIS Conversion]
-//= Paradise Group storage access.
+//= Paradise Group storage access.
//===== Additional Comments: =================================
//= 1.0 First Version.
-//= 1.1 Replaced 2nd NPC with duplicate function.
+//= 1.1 Replaced 2nd NPC with duplicate function. [Masao]
//============================================================
moc_para01,173,120,0 script Goods Cabinet#01::goodsc 111,{
diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt
index 1751d05a2..37d8d774b 100644
--- a/npc/quests/quests_ayothaya.txt
+++ b/npc/quests/quests_ayothaya.txt
@@ -2929,15 +2929,15 @@ OnTouch:
mes "As you kids say,";
mes "^990000Let's get eXtreme!^000000";
next;
- set user_score,0;
- set pc_score,0;
+ set @user_score,0;
+ set @pc_score,0;
mes "[Mr. Jun]";
mes "Rock!";
mes "Paper!";
mes "Scissors!";
next;
while(1) {
- if (.@pc_score == 5 || .@user_score == 3) {
+ if (@pc_score == 5 || @user_score == 3) {
break;
}
else {
@@ -2958,7 +2958,7 @@ OnTouch:
else if (.@jun_mark == 2) {
emotion e_rock;
emotion e_scissors,1;
- set .@pc_score,.@pc_score + 1;
+ set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Yes...!";
mes "Oh my God, yes!";
@@ -2967,8 +2967,8 @@ OnTouch:
else {
emotion e_paper;
emotion e_scissors,1;
- set .@pc_score,.@pc_score + 1;
- set .@user_score,.@user_score + 1;
+ set @pc_score,@pc_score + 1;
+ set @user_score,@user_score + 1;
mes "[Mr. Jun]";
mes "What...?";
mes "I don't believe it!";
@@ -2980,8 +2980,8 @@ OnTouch:
if (.@jun_mark == 1) {
emotion e_scissors;
emotion e_rock,1;
- set .@pc_score,.@pc_score + 1;
- set .@user_score,.@user_score + 1;
+ set @pc_score,@pc_score + 1;
+ set @user_score,@user_score + 1;
mes "[Mr. Jun]";
mes "No...!";
mes "Sacrilege!";
@@ -3001,7 +3001,7 @@ OnTouch:
else {
emotion e_paper;
emotion e_rock,1;
- set .@pc_score,.@pc_score + 1;
+ set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Bwahahaha!";
mes "You lose, kid!";
@@ -3012,7 +3012,7 @@ OnTouch:
if (.@jun_mark == 1) {
emotion e_scissors;
emotion e_paper,1;
- set .@pc_score,.@pc_score + 1;
+ set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Heh heh~";
mes "Young fool!";
@@ -3021,8 +3021,8 @@ OnTouch:
else if (.@jun_mark == 2) {
emotion e_rock;
emotion e_paper,1;
- set .@user_score,.@user_score + 1;
- set .@pc_score,.@pc_score + 1;
+ set @user_score,@user_score + 1;
+ set @pc_score,@pc_score + 1;
mes "[Mr. Jun]";
mes "Noooo...!";
mes "This cannot be!";
@@ -3043,7 +3043,7 @@ OnTouch:
}
}
}
- if (.@user_score == 3) {
+ if (@user_score == 3) {
emotion e_pif;
mes "[Mr. Jun]";
mes "You... won.";