summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-29 23:23:42 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-11-29 23:23:42 +0000
commit156ab44b02dfc4b349c3c13c46b7ee5b458be033 (patch)
tree5e20d5b910be0fefd2f67c5ca36d8478c33d1b10 /npc
parente2ac585b80854892b736173006b9d800bc5e3fd4 (diff)
downloadhercules-156ab44b02dfc4b349c3c13c46b7ee5b458be033.tar.gz
hercules-156ab44b02dfc4b349c3c13c46b7ee5b458be033.tar.bz2
hercules-156ab44b02dfc4b349c3c13c46b7ee5b458be033.tar.xz
hercules-156ab44b02dfc4b349c3c13c46b7ee5b458be033.zip
- Fixed typo in WoE:SE Castle announcements (bugreport:3714).
- Fixed typo of a check in god_weapon_creation.txt (bugreport:3613). - Fixed missing changequest in Knight Job Quest (bugreport:3757). - Fixed placement of Control Device01#aru04 (bugreport:3716). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14178 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/guild2/arug_cas01.txt2
-rw-r--r--npc/guild2/arug_cas02.txt2
-rw-r--r--npc/guild2/arug_cas03.txt2
-rw-r--r--npc/guild2/arug_cas04.txt4
-rw-r--r--npc/guild2/arug_cas05.txt2
-rw-r--r--npc/guild2/schg_cas01.txt2
-rw-r--r--npc/guild2/schg_cas02.txt2
-rw-r--r--npc/guild2/schg_cas03.txt2
-rw-r--r--npc/guild2/schg_cas04.txt2
-rw-r--r--npc/guild2/schg_cas05.txt2
-rw-r--r--npc/jobs/2-1/knight.txt1
-rw-r--r--npc/quests/seals/god_weapon_creation.txt2
12 files changed, 13 insertions, 12 deletions
diff --git a/npc/guild2/arug_cas01.txt b/npc/guild2/arug_cas01.txt
index 863ad8ee1..62c39d3a5 100644
--- a/npc/guild2/arug_cas01.txt
+++ b/npc/guild2/arug_cas01.txt
@@ -2705,7 +2705,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#aru01_02::Onchange";
- mapannounce "arug_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "arug_cas01","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/arug_cas02.txt b/npc/guild2/arug_cas02.txt
index 6b1705b84..369475d19 100644
--- a/npc/guild2/arug_cas02.txt
+++ b/npc/guild2/arug_cas02.txt
@@ -2666,7 +2666,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#aru02_02::Onchange";
- mapannounce "arug_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "arug_cas02","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/arug_cas03.txt b/npc/guild2/arug_cas03.txt
index 3b6a1bbcb..e8cb337f2 100644
--- a/npc/guild2/arug_cas03.txt
+++ b/npc/guild2/arug_cas03.txt
@@ -2711,7 +2711,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#aru03_02::Onchange";
- mapannounce "arug_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "arug_cas03","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/arug_cas04.txt b/npc/guild2/arug_cas04.txt
index ca3cb2e88..e437777d3 100644
--- a/npc/guild2/arug_cas04.txt
+++ b/npc/guild2/arug_cas04.txt
@@ -1285,7 +1285,7 @@ OnDisable:
end;
}
-arug_cas04,143,158,0 script Control Device01#aru04 111,{
+arug_cas04,136,158,0 script Control Device01#aru04 111,{
set .@GID, GetCastleData("arug_cas04",1);
if (getcharid(2) == .@GID) {
if (strcharinfo(0) == getguildmaster(.@GID)) {
@@ -2713,7 +2713,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#aru04_02::Onchange";
- mapannounce "arug_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "arug_cas04","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/arug_cas05.txt b/npc/guild2/arug_cas05.txt
index b5e551975..0369b82f9 100644
--- a/npc/guild2/arug_cas05.txt
+++ b/npc/guild2/arug_cas05.txt
@@ -2713,7 +2713,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#aru05_02::Onchange";
- mapannounce "arug_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "arug_cas05","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/schg_cas01.txt b/npc/guild2/schg_cas01.txt
index acc375039..59990be8b 100644
--- a/npc/guild2/schg_cas01.txt
+++ b/npc/guild2/schg_cas01.txt
@@ -2713,7 +2713,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#sch01_02::Onchange";
- mapannounce "schg_cas01","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "schg_cas01","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/schg_cas02.txt b/npc/guild2/schg_cas02.txt
index 2a8c5b36c..2c3d5be69 100644
--- a/npc/guild2/schg_cas02.txt
+++ b/npc/guild2/schg_cas02.txt
@@ -2647,7 +2647,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#sch02_02::Onchange";
- mapannounce "schg_cas02","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "schg_cas02","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/schg_cas03.txt b/npc/guild2/schg_cas03.txt
index 3a25e86f6..7d7015f25 100644
--- a/npc/guild2/schg_cas03.txt
+++ b/npc/guild2/schg_cas03.txt
@@ -2706,7 +2706,7 @@ OnStartArena:
OnTimer10000:
donpcevent "manager#sch03_02::Onchange";
- mapannounce "schg_cas03","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "schg_cas03","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/schg_cas04.txt b/npc/guild2/schg_cas04.txt
index 057874e5a..cc4128f98 100644
--- a/npc/guild2/schg_cas04.txt
+++ b/npc/guild2/schg_cas04.txt
@@ -2710,7 +2710,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#sch04_02::Onchange";
- mapannounce "schg_cas04","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "schg_cas04","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/guild2/schg_cas05.txt b/npc/guild2/schg_cas05.txt
index aaa15e4c3..912506785 100644
--- a/npc/guild2/schg_cas05.txt
+++ b/npc/guild2/schg_cas05.txt
@@ -2710,7 +2710,7 @@ OnStartArena:
OnTimer10000:
donpcevent "Manager#sch05_02::Onchange";
- mapannounce "schg_cas05","Rebuild this stonghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
+ mapannounce "schg_cas05","Rebuild this stronghold's Guardian Stones and Fortress Gates to secure your guild's new aquisition!",bc_map,"0x00FF00",FW_NORMAL,20,0,40;
end;
}
diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt
index 22dc1677f..b96ff2635 100644
--- a/npc/jobs/2-1/knight.txt
+++ b/npc/jobs/2-1/knight.txt
@@ -653,6 +653,7 @@ prt_in,75,107,4 script Sir Andrew#knt 65,{
mes "[Sir Andrew]";
mes "Please go to my fellow Knight, Sir Siracuse, as he will give you your next test. Well done in mastering the Swordman job.";
set KNIGHT_Q,4;
+ changequest 9000,9003;
close;
}
mes "[Sir Andrew]";
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index 6f2ef1976..d4c2a80d7 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -809,7 +809,7 @@ que_god01,293,3,0 script Godly Item Quests Related#god 90,{
mes "If you wish to cancel, please enter 0.";
next;
input .@input,0,4001;
- if (.@iput < 0 || .@input > 4000) {
+ if (.@input < 0 || .@input > 4000) {
mes "[Use in case of emergency]";
mes "Password is incorrect.";
close;