summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-04 22:59:57 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-04 22:59:57 +0000
commit9c08ebbab7841a2e210613f4e072da4ca48f331b (patch)
tree8df053e6f0423b5a3e42cdd951dd9171d4ceb7ee /npc/jobs
parenta0ce9e7654be46ce432cf4620f366b18220419b3 (diff)
downloadhercules-9c08ebbab7841a2e210613f4e072da4ca48f331b.tar.gz
hercules-9c08ebbab7841a2e210613f4e072da4ca48f331b.tar.bz2
hercules-9c08ebbab7841a2e210613f4e072da4ca48f331b.tar.xz
hercules-9c08ebbab7841a2e210613f4e072da4ca48f331b.zip
Many small scripts fixes - tabs, parenthesis, typo
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9137 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/1-1e/gunslinger.txt9
-rw-r--r--npc/jobs/2-1/blacksmith.txt2
-rw-r--r--npc/jobs/2-1/hunter.txt2
-rw-r--r--npc/jobs/2-1/priest.txt2
-rw-r--r--npc/jobs/2-2/rogue.txt2
-rw-r--r--npc/jobs/2-2a/Clown.txt2
6 files changed, 10 insertions, 9 deletions
diff --git a/npc/jobs/1-1e/gunslinger.txt b/npc/jobs/1-1e/gunslinger.txt
index fa739ad0b..0539f1f2c 100644
--- a/npc/jobs/1-1e/gunslinger.txt
+++ b/npc/jobs/1-1e/gunslinger.txt
@@ -7,7 +7,7 @@
//= DON'T REMOVE THIS! (by request of him, he provided all
//= the info regarding the quests and shops.)
//===== Current Version: =====================================
-//= 1.7a
+//= 1.7b
//===== Compatible With: =====================================
//= eAthena SVN
//===== Description: =========================================
@@ -21,6 +21,7 @@
//= optimized [Lupus]
//= 1.7 Now uses only ONE variable GUNS_Q [Lupus]
//= 1.7a Grammar fixes, few spelling fixes, etc [CBMaster]
+//= 1.7b Parenthesis fixes [KarLaeda]
//============================================================
que_ng.gat,152,167,3 script Gunslinger Jobchanger 901,{
@@ -212,8 +213,8 @@ payon.gat,184,65,3 script Mr. Tanieh 866,{
set @npcname$,"";
end;
}
- } else if (GUNS_Q == 10003) || (GUNS_Q == 10004) {
- if (countitem(519) >= 1) && (GUNS_Q == 10004) {
+ } else if (GUNS_Q == 10003 || GUNS_Q == 10004) {
+ if (countitem(519) >= 1 && GUNS_Q == 10004) {
mes @npcname$;
mes "THAT'S IT!! I was missing the Milk! Oh yes, thanks so much, will you give it to me?";
switch(select("Sure, take it:Sorry but I need it")) {
@@ -241,7 +242,7 @@ payon.gat,184,65,3 script Mr. Tanieh 866,{
set @npcname$,"";
set GUNS_Q,10004;
end;
- } else if (Class == Job_Gunslinger) || (GUNS_Q == 10005) {
+ } else if (Class == Job_Gunslinger || GUNS_Q == 10005) {
mes @npcname$;
mes "Hi ^0000CC"+strcharinfo(0)+"^000000!, how have you been doing? My wife sends you regards and thanks for the ingredients...";
close2;
diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt
index 40c8177cf..e053fcc75 100644
--- a/npc/jobs/2-1/blacksmith.txt
+++ b/npc/jobs/2-1/blacksmith.txt
@@ -27,7 +27,7 @@
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Removed Duplicates [Silent]
//= 2.2 Merged Jfunc, changed job numbers to constants [Lupus]
-==============================================================
+//==============================================================
diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt
index 054b7226f..4986548dc 100644
--- a/npc/jobs/2-1/hunter.txt
+++ b/npc/jobs/2-1/hunter.txt
@@ -1064,7 +1064,7 @@ job_hunte.gat,76,105,1 duplicate(HntTrap) 50-1 139,0,0
job_hunte.gat,76,104,1 duplicate(HntTrap) 50-2 139,0,0
job_hunte.gat,78,101,1 duplicate(HntTrap) 50-3 139,0,2
job_hunte.gat,79,101,1 duplicate(HntTrap) 50-4 139,0,2
-job_hunte.gat,76,99,1 duplicate(HntTrap) 51-1 139,10
+job_hunte.gat,76,99,1 duplicate(HntTrap) 51-1 139,1,0
job_hunte.gat,77,98,1 duplicate(HntTrap) 51-2 139,2,0
job_hunte.gat,74,99,1 duplicate(HntTrap) 51-3 139,0,0
job_hunte.gat,74,98,1 duplicate(HntTrap) 51-4 139,0,0
diff --git a/npc/jobs/2-1/priest.txt b/npc/jobs/2-1/priest.txt
index ecc02fcd2..b8848a9ef 100644
--- a/npc/jobs/2-1/priest.txt
+++ b/npc/jobs/2-1/priest.txt
@@ -20,7 +20,7 @@
//= to go. [Lupus]
//= 2.0 Changed numbers to constants. [Vicious]
//= 2.1 Merged JFunc [Lupus]
-==========================================================
+//==========================================================
//*********************************************************************************************************************************************************************************\\
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 4b0e35242..2a54aadef 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -967,7 +967,7 @@ in_rogue.gat,370,320,0 script rogue04 45,1,1,{
//================================================
// Timer: Keeps monsters from overspawning
//================================================
-- script RogueTest3 -1,{
+- script RogueTest3 -1,{
end;
OnMinute10:
diff --git a/npc/jobs/2-2a/Clown.txt b/npc/jobs/2-2a/Clown.txt
index 0caf3b428..02aa7d5d9 100644
--- a/npc/jobs/2-2a/Clown.txt
+++ b/npc/jobs/2-2a/Clown.txt
@@ -16,6 +16,6 @@
//============================================================
// -== Clown ==-
-valkyrie.gat,53,54,4z script Clown 741,{
+valkyrie.gat,53,54,4 script Clown 741,{
callfunc "F_Rebirth",Job_Archer_High,"High Archer",Job_Clown,"Clown";
}