Converted sample Function and Skill scripts into plain English. More to follow.

Also, Akkarin's first commit!

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16730 54d463be-8e91-2dee-dedb-b68131a5f0ec

2 files changed, 29 insertions, 23 deletions

diff --git a/doc/sample/npc_test_func.txt b/doc/sample/npc_test_func.txt
index 2e613404f..1f50afb46 100644
--- a/doc/sample/npc_test_func.txt
+++ b/doc/sample/npc_test_func.txt
@@ -1,26 +1,27 @@
 
-// 値を返さない関数
+// Define the function func001
 function	script	func001	{
-	mes "ユーザー定義関数";
+	mes "Hello there!";
 	next;
-	return;		// 省略できない
+	return;		// continue script
 }
 
-// 値を返す関数
+// Define the function func002
 function	script	func002	{
-	return "ユーザー定義関数２";
+	return "I'm a function";
 }
 
-// 関数の呼び出しとサブルーティンのテスト
-prontera,168,189,1	script	関数テスト	112,{
-	callfunc "func001";		// ユーザー定義関数は文字列で指定
-	mes callfunc("func002");
+// An NPC using 3 different methods of displaying npc dialog from both internal
+// and external sources.
+prontera,168,189,1	script	Functions	112,{
+	callfunc "func001";		// Calls func001 and displays "Hello there!"
+	mes callfunc("func002"); // Calls func002 and displays "I'm a function"
 	next;
-	callsub L_SUB001;	// サブルーティンはラベルを直接指定
+	callsub L_SUB001;	// Calls the label L_SUB001 and displays "I'm a label"
 	close;
 	end;
 
 L_SUB001:
-	mes "サブルーティン";
-	return;		// 省略できない
+	mes "I'm a label";
+	return;		// continue script
 }
diff --git a/doc/sample/npc_test_skill.txt b/doc/sample/npc_test_skill.txt
index 55864a117..8d7d88dfe 100644
--- a/doc/sample/npc_test_skill.txt
+++ b/doc/sample/npc_test_skill.txt
@@ -1,19 +1,24 @@
-// スキル所得テスト
+// Giving skills to characters via an NPC
 
-// skill スキルID ,スキルLV [,フラグ];
-//	フラグは省略可能、省略時は１。
-//	フラグ=1でカードなどの一時的な所得、
-//	フラグ=2でクエストなどによる恒久的な所得(skill_tree.txtに依存)
+// skill <skill id>,<level>{,<flag>};
+//	flag=0 Grants the skill permanently
+//	flag=1 Grants the skill temporarily
+//	flag=2 Level bonus, stackable
+// If flag is undefined, it defaults to 1
+// View db/(pre-)re/skill_db.txt for skill IDs
 
-prontera,157,182,0	script	スキル所得テスト	116,{
-	mes "スキル所得テスト";
-	menu "応急処置所得",L_GETSKILL142,"死んだ振り所得",L_GETSKILL143,"やめる",L_YAME;
+prontera,157,182,0	script	Skills	116,{
+	mes "What skill would you like?";
+	menu "First Aid",L_GETSKILL142,"Play Dead",L_GETSKILL143,"Heal",L_GETSKILL28,"None",L_YAME;
 L_GETSKILL142:
-	skill 142,1,0;
+	skill 142,1,0; // Permanently gives player level 1 First Aid
 	close;
 L_GETSKILL143:
-	skill 143,1,0;
+	skill 143,1,0; // Permanently gives player level 1 Play Dead
+	close;
+L_GETSKILL28:
+	skill 28,3,1; // Temporarily gives player level 3 Heal
 	close;
 L_YAME:
 	close;
-}
\ No newline at end of file
+}