summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-11 10:16:35 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-07-11 10:16:35 +0000
commitcd78dd490000e45dbb8ce70c9f54abc65c3f385f (patch)
treeec5c834d08adaf7c6148384bbeb308f53356db8b /npc
parent9151040781fe1180081f17e65ace8649ad8a361f (diff)
downloadhercules-cd78dd490000e45dbb8ce70c9f54abc65c3f385f.tar.gz
hercules-cd78dd490000e45dbb8ce70c9f54abc65c3f385f.tar.bz2
hercules-cd78dd490000e45dbb8ce70c9f54abc65c3f385f.tar.xz
hercules-cd78dd490000e45dbb8ce70c9f54abc65c3f385f.zip
- Fixed a bug in Dancer Quest.
- Some fixes on guild2/schg_cas03.txt git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12937 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/guild2/schg_cas03.txt42
-rw-r--r--npc/jobs/2-2/dancer.txt6
2 files changed, 24 insertions, 24 deletions
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 112791ba3..1137eacaa 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -896,7 +896,7 @@ OnGuardianStoneDied:
end;
OnTimer300000:
- donpcevent "2nd Guardian Stone#sch03::OnGuardian";
+ donpcevent "2nd Guardian Stone#sch03::OnEnable";
setarray $agit_sc03[1],2; //Global Variable
stopnpctimer;
end;
@@ -1075,7 +1075,7 @@ schg_cas03,376,250,0 script 2nd Guardian Stone#sch03 844,{
mes "of a magic power conflict.^000000";
close;
case 2:
- mes "You placed the Yellow Gemstone.";
+ mes "^3355FFYou placed the Yellow Gemstone.^000000";
set .@nice,.@nice+10;
set .@roof0,.@roof0 + 1;
specialeffect 18; //"2nd Guardian Stone#sch03" EF_STEAL
@@ -1462,7 +1462,7 @@ schg_cas03,335,298,0 script control device01#sch03 111,{
delitem 984,5; //Oridecon
close2;
donpcevent "#sch03_RL01::OnEnable";
- disablenpc "control device01#sch03";
+ disablenpc "Control Device01#sch03";
mapannounce "schg_cas03","The 1st Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
setarray $agit_sc03[2],0;
end;
@@ -1493,19 +1493,19 @@ schg_cas03,335,298,0 script control device01#sch03 111,{
end;
OnInit:
- disablenpc "control device01#sch03";
+ disablenpc "Control Device01#sch03";
end;
OnEnable:
- enablenpc "control device01#sch03";
+ enablenpc "Control Device01#sch03";
end;
OnDisable:
- disablenpc "control device01#sch03";
+ disablenpc "Control Device01#sch03";
end;
}
-schg_cas03,200,227,0 script control device02#sch03 111,{
+schg_cas03,200,227,0 script Control Device02#sch03 111,{
set .@GID, GetCastleData("schg_cas03",1);
if (getcharid(2) == .@GID) {
if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -1699,11 +1699,11 @@ schg_cas03,200,227,0 script control device02#sch03 111,{
delitem 984,5; //Oridecon
close2;
donpcevent "#sch03_RL02::OnEnable";
- disablenpc "control device02#sch03";
+ disablenpc "Control Device02#sch03";
mapannounce "schg_cas03","The 2nd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
setarray $agit_sc03[3],0; //Global Variable
setarray $agit_sc03[2],2; //Global Variable
- donpcevent "control device01#sch03::OnEnable";
+ donpcevent "Control Device01#sch03::OnEnable";
end;
}
else {
@@ -1732,19 +1732,19 @@ schg_cas03,200,227,0 script control device02#sch03 111,{
end;
OnInit:
- disablenpc "control device02#sch03";
+ disablenpc "Control Device02#sch03";
end;
OnEnable:
- enablenpc "control device02#sch03";
+ enablenpc "Control Device02#sch03";
end;
OnDisable:
- disablenpc "control device02#sch03";
+ disablenpc "Control Ddevice02#sch03";
end;
}
-schg_cas03,273,205,0 script control device03#sch03 111,{
+schg_cas03,273,205,0 script Control Device03#sch03 111,{
set .@GID, GetCastleData("schg_cas03",1);
if (getcharid(2) == .@GID) {
if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -1938,11 +1938,11 @@ schg_cas03,273,205,0 script control device03#sch03 111,{
delitem 984,5; //Oridecon
close2;
donpcevent "#sch03_RL03::OnEnable";
- disablenpc "control device03#sch03";
+ disablenpc "Control Device03#sch03";
mapannounce "schg_cas03","The 3rd Fortress Gate has been reconstructed!",bc_map,"0x00ff00";
setarray $agit_sc03[4],0;
setarray $agit_sc03[3],2;
- donpcevent "control device02#sch03::OnEnable";
+ donpcevent "Control Device02#sch03::OnEnable";
end;
}
else {
@@ -1971,15 +1971,15 @@ schg_cas03,273,205,0 script control device03#sch03 111,{
end;
OnInit:
- disablenpc "control device03#sch03";
+ disablenpc "Control Device03#sch03";
end;
OnEnable:
- enablenpc "control device03#sch03";
+ enablenpc "Control Device03#sch03";
end;
OnDisable:
- disablenpc "control device03#sch03";
+ disablenpc "Control Device03#sch03";
end;
}
@@ -2055,7 +2055,7 @@ schg_cas03,346,199,0 script LF-04#schg_cas03 111,{
case 1:
warp "schg_cas03",266,263;
end;
- case 3:
+ case 2:
close;
}
}
@@ -2108,7 +2108,7 @@ schg_cas03,301,213,0 script LF-07#schg_cas03 111,{
mes "Teleport Service. Please";
mes "choose a destination";
mes "within the stronghold.^000000";
- switch(select("Gate House Fork:Cancel")) {
+ switch(select("Area 1-2:Area 2-2:Area 3-2:Cancel")) {
case 1:
warp "schg_cas03",262,323;
end;
@@ -2140,7 +2140,7 @@ schg_cas03,301,209,0 script LF-08#schg_cas03 111,{
warp "schg_cas03",348,292;
end;
case 3:
- warp "schg_cas03",226,263;
+ warp "schg_cas03",326,263;
end;
case 4:
close;
diff --git a/npc/jobs/2-2/dancer.txt b/npc/jobs/2-2/dancer.txt
index 5bc75b95e..c492cb2a8 100644
--- a/npc/jobs/2-2/dancer.txt
+++ b/npc/jobs/2-2/dancer.txt
@@ -293,9 +293,9 @@ job_duncer,43,93,4 script Aile#da 724,{
setarray .@count[0], 2,5,20,10,1;
break;
}
- set .@size, (getarraysize(.@item)-1);
- for( set .@i,0 ; .@i <= .@size && countitem(.@item[.@i]) >= .@count[.@i] ; set .@i,.@i+1 );
- if(.@i == .@size && Zeny > 9999) {
+ set .@size, getarraysize(.@item);
+ for( set .@i, 0; .@i < .@size && countitem(.@item[.@i]) >= .@count[.@i]; set .@i, .@i + 1 );
+ if( .@i == .@size && Zeny > 9999 ) {
cutin "job_dancer_eir02",2;
mes "[Aile]";
mes "Oh...!";