summaryrefslogtreecommitdiff
path: root/npc/jobs
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-05 02:42:20 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-09-05 02:42:20 +0000
commit4e6774e4173eccff9d0b51b45fe2af07e682e67d (patch)
tree9f2d1c6e3c28343f601247bb9db557a45317fb3c /npc/jobs
parente7a4ce6eb8222a4abba8ee44d318c1d803c79797 (diff)
downloadhercules-4e6774e4173eccff9d0b51b45fe2af07e682e67d.tar.gz
hercules-4e6774e4173eccff9d0b51b45fe2af07e682e67d.tar.bz2
hercules-4e6774e4173eccff9d0b51b45fe2af07e682e67d.tar.xz
hercules-4e6774e4173eccff9d0b51b45fe2af07e682e67d.zip
* Follow-up r16742, revised quest sample (doc\sample\npc_test_quest.txt) and whisper system documentation (doc\whisper_sys.txt)
* Follow-up r16745, fixed a few typos in atcommand documentation (doc\atcommands.txt) * Minor cleaning - spacing, tabulation, comments, dividers git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16746 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/jobs')
-rw-r--r--npc/jobs/1-1e/taekwon.txt1
-rw-r--r--npc/jobs/2-2/bard.txt47
-rw-r--r--npc/jobs/2-2/crusader.txt4
-rw-r--r--npc/jobs/2-2/monk.txt4
-rw-r--r--npc/jobs/2-2/rogue.txt4
-rw-r--r--npc/jobs/2-2/sage.txt4
6 files changed, 24 insertions, 40 deletions
diff --git a/npc/jobs/1-1e/taekwon.txt b/npc/jobs/1-1e/taekwon.txt
index 54a6c8ce2..6d4b2ad52 100644
--- a/npc/jobs/1-1e/taekwon.txt
+++ b/npc/jobs/1-1e/taekwon.txt
@@ -16,7 +16,6 @@
//= 1.4 Removed use of 'goto', and fixed some indentation. [L0ne_W0lf]
//============================================================
-
payon,157,141,5 script Phoenix#TKJobChange 753,{
if(Upper == 2) {
mes "[Phoenix]";
diff --git a/npc/jobs/2-2/bard.txt b/npc/jobs/2-2/bard.txt
index a4b158ec8..788542b76 100644
--- a/npc/jobs/2-2/bard.txt
+++ b/npc/jobs/2-2/bard.txt
@@ -25,7 +25,8 @@
//= 2.6 Removed the need for use of 'goto.' [L0ne_W0lf]
//============================================================
-//=============== Ayealo ============================
+// Ayealo
+//============================================================
comodo,226,123,5 script Wandering Bard 741,{
if(Upper == 1) {
mes "[Lalo]";
@@ -912,28 +913,28 @@ comodo,226,123,5 script Wandering Bard 741,{
end;
S_ChangeJob:
- completequest 3004;
- callfunc "Job_Change",Job_Bard;
- callfunc "F_ClearJobVar";
- mes "[Lalo]";
- mes "Good job. I will make you a job change souvenir with this.";
- mes "Wait just a moment.";
- next;
- mes "[Lalo]";
- mes "^3355FFScrape Scrape Tang Tang^000000";
- mes "^3355FFSqueak Squeak Scratch Scratch^000000";
- delitem getarg(0),60;
- getitem getarg(1),1;
- next;
- mes "[Lalo]";
- mes "Here you go, a souvenir. It is useful when you sing.";
- mes "Hope you sing happy songs.";
- next;
- mes "[Lalo]";
- mes "See you next time!";
- close2;
- cutin "job_bard_aiolo01",255;
- end;
+ completequest 3004;
+ callfunc "Job_Change",Job_Bard;
+ callfunc "F_ClearJobVar";
+ mes "[Lalo]";
+ mes "Good job. I will make you a job change souvenir with this.";
+ mes "Wait just a moment.";
+ next;
+ mes "[Lalo]";
+ mes "^3355FFScrape Scrape Tang Tang^000000";
+ mes "^3355FFSqueak Squeak Scratch Scratch^000000";
+ delitem getarg(0),60;
+ getitem getarg(1),1;
+ next;
+ mes "[Lalo]";
+ mes "Here you go, a souvenir. It is useful when you sing.";
+ mes "Hope you sing happy songs.";
+ next;
+ mes "[Lalo]";
+ mes "See you next time!";
+ close2;
+ cutin "job_bard_aiolo01",255;
+ end;
}
//============================================================
diff --git a/npc/jobs/2-2/crusader.txt b/npc/jobs/2-2/crusader.txt
index 5f0cebf45..fc54de2c2 100644
--- a/npc/jobs/2-2/crusader.txt
+++ b/npc/jobs/2-2/crusader.txt
@@ -1459,10 +1459,6 @@ OnStop:
}
//============================================================
-// mapflag
-//============================================================
-
-//============================================================
// Old changelog
//============================================================
//= Need optimalization and fixing
diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt
index 869011f09..f2d1ade8b 100644
--- a/npc/jobs/2-2/monk.txt
+++ b/npc/jobs/2-2/monk.txt
@@ -2607,10 +2607,6 @@ job_monk,0,0,0,0 monster Thief Mushroom 1182,70,0,0,0
job_monk,0,0,0,0 monster Thief Bug Larva 1051,20,0,0,0
//============================================================
-// mapflag
-//============================================================
-
-//============================================================
// Old changelog
//============================================================
//= 1.1 Fixed missing '";'. Now it's loading fine [Lupus]
diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt
index 6d9ffe14f..ba6938052 100644
--- a/npc/jobs/2-2/rogue.txt
+++ b/npc/jobs/2-2/rogue.txt
@@ -2013,10 +2013,6 @@ in_rogue,399,286,1 script switch#rogreset 88,{
}
//============================================================
-// mapflag
-//============================================================
-
-//============================================================
// Old changelog
//============================================================
//= 1.1 fixed 3 wrong questions, added missing lines [Lupus]
diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt
index 481392c60..49ada45f4 100644
--- a/npc/jobs/2-2/sage.txt
+++ b/npc/jobs/2-2/sage.txt
@@ -2894,10 +2894,6 @@ OnTimer9000:
}
//============================================================
-// Mapflag
-//============================================================
-
-//============================================================
// Old changelog
//============================================================
//= Script mostly based on translated jA script