From e07326b0aa71a74cacd425e30745bb01a60b153f Mon Sep 17 00:00:00 2001 From: Playtester Date: Fri, 16 Jun 2006 10:02:18 +0000 Subject: * Commited Silent's Fix to the duplicate NPCs - needs testing - can't be fully fixed because of length limitation of names git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7200 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/jobs/1-1/merchant.txt | 5 +++-- npc/jobs/1-1/swordman.txt | 23 ++++++++++++----------- npc/jobs/2-1/assassin.txt | 7 ++++--- npc/jobs/2-1/blacksmith.txt | 5 +++-- npc/jobs/2-1/hunter.txt | 5 +++-- npc/jobs/2-2/monk.txt | 33 +++++++++++++++++---------------- npc/jobs/2-2/rogue.txt | 15 ++++++++------- npc/jobs/novice/novice.txt | 27 ++++++++++++++------------- 8 files changed, 64 insertions(+), 56 deletions(-) (limited to 'npc/jobs') diff --git a/npc/jobs/1-1/merchant.txt b/npc/jobs/1-1/merchant.txt index cec41e4f3..9ad6b5a33 100644 --- a/npc/jobs/1-1/merchant.txt +++ b/npc/jobs/1-1/merchant.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.6 +//= 1.7 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -15,6 +15,7 @@ //= v1.4 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.5 Changed Prontera->Izlude teleport price to 600 [Lupus] //= 1.6 Now saves/restores all quest skills [Lupus] +//= 1.7 Removed Duplicates [Silent] //============================================================ @@ -687,7 +688,7 @@ L_WrongDest: } // -- Kafra(Prontera) -- -prontera.gat,248,42,8 script Kafra 115,{ +prontera.gat,248,42,8 script Kafra#01 115,{ cutin "kafra_03",2; if(BaseJob==Job_Novice && job_merchant_q3>0) goto L_Start; L_Other: diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt index 76ec9d464..ec3cd7c42 100644 --- a/npc/jobs/1-1/swordman.txt +++ b/npc/jobs/1-1/swordman.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.7 +//= 1.8 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -18,6 +18,7 @@ //= v1.5 Optimised and moved first checker to Jfunc1-1 [massdriller] //= 1.6 Fixed possible EXP abuse [Lupus] //= 1.7 Now saves/restores all quest skills [Lupus] +//= 1.8 Removed Duplicates [Silent] //============================================================ @@ -183,13 +184,13 @@ L_Done: } // -- Swordsman -- -izlude_in.gat,65,171,5 script Swordsman 85,{ +izlude_in.gat,65,171,5 script Swordsman#01 85,{ doevent "Swordsman::OnStart"; end; } // -- Hidden Npc -- -izlude_in.gat,65,171,5 script Swordsman -1,{ +izlude_in.gat,65,171,5 script Swordsman#02 -1,{ OnStart: mes "[Swordsman]"; @@ -323,7 +324,7 @@ sword_1-1.gat,1,1,0 script TimerSwrdmn -1,{ // -- Medic 1 -- -sword_1-1.gat,230,245,2 script Medic 105,{ +sword_1-1.gat,230,245,2 script Medic#01 105,{ mes "[Medic]"; mes "This is the 1st check point! You're doing great!"; percentheal 100, 100; @@ -331,7 +332,7 @@ sword_1-1.gat,230,245,2 script Medic 105,{ } // -- Test Hall Staff 2 -- -sword_1-1.gat,230,242,2 script Test Hall Staff 105,{ +sword_1-1.gat,230,242,2 script Test Hall Staff#01 105,{ mes "[Test Hall Staff]"; mes "Do you surrender?"; next; @@ -347,7 +348,7 @@ sword_1-1.gat,230,242,2 script Test Hall Staff 105,{ } // -- Medic 2 -- -sword_1-1.gat,230,207,2 script Medic 105,{ +sword_1-1.gat,230,207,2 script Medic#02 105,{ mes "[Medic]"; mes "This is the 2nd check point! Keep up the good work!"; percentheal 100, 100; @@ -355,7 +356,7 @@ sword_1-1.gat,230,207,2 script Medic 105,{ } // -- Test Hall Staff 3 -- -sword_1-1.gat,230,204,2 script Test Hall Staff 105,{ +sword_1-1.gat,230,204,2 script Test Hall Staff#02 105,{ mes "[Test Hall Staff]"; mes "Do you surrender?"; next; @@ -562,9 +563,9 @@ sword_1-1.gat,16,251,4 script 1_blank_1a#1::1_blank 139,0,1,{ // -- Duplicates -- sword_1-1.gat,19,251,4 duplicate(1_blank) 1_blank_1b 139,0,1 sword_1-1.gat,17,250,4 duplicate(1_blank) 1_blank_1c 139,1,0 -sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1a 139,1,1 -sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1b 139,1,1 -sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1c 139,1,1 +sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1d 139,1,1 +sword_1-1.gat,18,251,4 duplicate(1_blank) 1_blank_1e 139,1,1 +sword_1-1.gat,17,251,4 duplicate(1_blank) 1_blank_1f 139,1,1 sword_1-1.gat,16,238,4 duplicate(1_blank) 1_blank_2a 139,0,1 sword_1-1.gat,19,238,4 duplicate(1_blank) 1_blank_2b 139,0,1 sword_1-1.gat,17,239,4 duplicate(1_blank) 1_blank_2c 139,0,1 @@ -676,7 +677,7 @@ sword_1-1.gat,26,168,4 duplicate(3_blank) 3_blank_3_d 139,0,2 sword_1-1.gat,36,169,4 duplicate(3_blank) 3_blank_4_a 139,0,0 sword_1-1.gat,37,169,4 duplicate(3_blank) 3_blank_4_b 139,0,0 sword_1-1.gat,37,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0 -sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_c 139,0,0 +sword_1-1.gat,36,168,4 duplicate(3_blank) 3_blank_4_d 139,0,0 sword_1-1.gat,40,175,4 duplicate(3_blank) 3_blank_5_a 139,0,1 sword_1-1.gat,41,175,4 duplicate(3_blank) 3_blank_5_b 139,0,1 sword_1-1.gat,41,171,4 duplicate(3_blank) 3_blank_6_a 139,1,0 diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 76dc4a00a..6b9596fd7 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena RC4 //===== Description: ========================================= @@ -26,6 +26,7 @@ //= 2nd Job Quests again. It also guides adv classes where //= to go. [Lupus] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -1432,7 +1433,7 @@ in_moc_16.gat,167,114,3 script guildmaster_Trig#0 139,4,0,{ } // Guild Master ----------------------------------------------------------------------------- -in_moc_16.gat,149,80,4 script Guild Master 106,1,1,{ +in_moc_16.gat,149,80,4 script Guild Master#01 106,1,1,{ end; OnTouch: @@ -1842,7 +1843,7 @@ in_moc_16.gat,186,107,0 script maze_trig#9 139,0,0,{ //================================================// // Decoy Chief //================================================// -in_moc_16.gat,186,81,0 script Guild Master#2 55,{ +in_moc_16.gat,186,81,0 script Guild Master#02 55,{ mes "[Guild Master Botogun]"; mes "I'm sorry but I am not the person in charge here."; mes "The real Guild Chief is on the other side."; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index cbaae1c8c..ce76d0772 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -7,7 +7,7 @@ //= Optimized and further edited by kobra_k88. //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0+ //===== Description: ========================================= @@ -25,6 +25,7 @@ //= 1.7 item quantity/ids typos fix //= 1.8 Moved the Quest to Einbroch [Poki#3] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] ============================================================== @@ -1415,7 +1416,7 @@ L_Result: //=========================== NPC that tells you, that the Guild moved //=========================== She's there on kRO, but the current text is custom ^^ -geffen_in.gat,110,169,4 script Guildsman 726,{ +geffen_in.gat,110,169,4 script Guildsman#01 726,{ mes "[Blacksmith Guildsman]"; mes "Welcome! We're the masters of the metal, blacksmiths!"; mes "Our skills in creating weapons, in a way, is almost an art form!."; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 19d4267a9..bb424fd66 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -5,7 +5,7 @@ //= Converted by kobra_k88 //= Further bugfixed and tested by Lupus //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 //===== Description: ========================================= @@ -27,6 +27,7 @@ //= reported the bug) [Lupus] //= 1.7 Moved the Job QUest to Hugel [Poki#3] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ //<====================================== Job Changer ========================================>\\ @@ -488,7 +489,7 @@ L_Done: //<=============================== Guild Master: Last Test =================================>\\ -payon_in02.gat,21,31,1 script Guild Master 59,{ +payon_in02.gat,21,31,1 script Guild Master#03 59,{ if(BaseJob == Job_Archer) goto L_Archer; if(BaseJob == Job_Hunter) goto L_Hnt; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 8d52e1e14..8efb65fae 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dino9021, Edited / Translated by Celest //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -21,6 +21,7 @@ //= 1.9 Added a missing check in Fuhai and fixed a LOT of Engrish. [Zephiris] //= 1.9b Fixed another bug in Fuhai. [Zephiris] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -1458,10 +1459,10 @@ monk_test.gat,386,42,0 script monk2-1 139,0,0,{callfunc "MnkTraps";} monk_test.gat,386,43,0 script monk2-2 139,0,0,{callfunc "MnkTraps";} monk_test.gat,387,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} monk_test.gat,387,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,388,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,388,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,389,42,0 script monk2-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,389,43,0 script monk2-4 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,388,42,0 script monk2-5 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,388,43,0 script monk2-6 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,389,42,0 script monk2-7 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,389,43,0 script monk2-8 139,0,0,{callfunc "MnkTraps";} //--------------------- monk_test.gat,184,11,0 script monk3-1 139,0,3,{callfunc "MnkTraps";} monk_test.gat,185,11,0 script monk3-2 139,0,3,{callfunc "MnkTraps";} @@ -1517,13 +1518,13 @@ monk_test.gat,82,391,0 script monk8-2 139,0,0,{callfunc "MnkTraps";} monk_test.gat,83,390,0 script monk8-3 139,0,0,{callfunc "MnkTraps";} monk_test.gat,83,391,0 script monk8-4 139,0,0,{callfunc "MnkTraps";} //--------------------- -monk_test.gat,82,384,0 script monk8-1 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,82,385,0 script monk8-2 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,83,384,0 script monk8-3 139,0,0,{callfunc "MnkTraps";} -monk_test.gat,83,385,0 script monk8-4 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,82,384,0 script monk9-1 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,82,385,0 script monk9-2 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,83,384,0 script monk9-3 139,0,0,{callfunc "MnkTraps";} +monk_test.gat,83,385,0 script monk9-4 139,0,0,{callfunc "MnkTraps";} //--------------------- -prt_monk.gat,225,179,4 script XuanWu 89,{ +prt_monk.gat,225,179,4 script XuanWu#01 89,{ mes "[XuanWu]"; mes "To see the growing of crops, I deeply appreciate the grace of God."; next; @@ -1545,7 +1546,7 @@ prt_monk.gat,225,179,4 script XuanWu 89,{ mes "The farmer is the root of world. That is quite true."; close; } -job_monk.gat,225,179,4 script XuanWu 89,{ +job_monk.gat,225,179,4 script XuanWu#02 89,{ if(MONK_Q == 8 ) goto Part2; if(@mission_start == 1 ) goto Part1; @@ -1709,7 +1710,7 @@ Part2: close; } -monk_test.gat,88,91,4 script Test Assistant 52,{ +monk_test.gat,88,91,4 script Test Assistant#01 52,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1757,7 +1758,7 @@ monk_test.gat,155,180,4 script monk_mob1_4 139,0,19,{ //~ disablenpc "monk_mob1_4"; end; } -monk_test.gat,165,179,4 script monk_mob3_warp 45,1,1,{ +monk_test.gat,165,179,4 script monk_mob3_warp#01 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; killmonster "monk_test.gat","monk_mob1"; @@ -1769,7 +1770,7 @@ monk_test.gat,1,1,1 script monk_mob1 -1,{ end; } -monk_test.gat,95,85,4 script Test Assistant 79,{ +monk_test.gat,95,85,4 script Test Assistant#02 79,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1831,7 +1832,7 @@ monk_test.gat,1,1,1 script monk_mob2 -1,{ end; } -monk_test.gat,82,85,4 script Test Assistant 95,{ +monk_test.gat,82,85,4 script Test Assistant#03 95,{ mes "[Test Assistant]"; mes "Are you ready for training in the dispersement of evil?"; next; @@ -1881,7 +1882,7 @@ monk_test.gat,260,281,4 script monk_mob3_4 139,0,19,{ //~ disablenpc "monk_mob3_4"; end; } -monk_test.gat,269,279,4 script monk_mob3_warp 45,1,1,{ +monk_test.gat,269,279,4 script monk_mob3_warp#02 45,1,1,{ set MONK_Q, 9; mapannounce "monk_test.gat","Congratulations!!" + strcharinfo(0)+ " Passes!! Please go to [Daowen], he is deep inside the building.",8; killmonster "monk_test.gat","monk_mob3"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 26b13e64e..e1f9f140d 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.0 +//= 2.1 //===== Compatible With: ===================================== //= eAthena 1.0 + //===== Description: ========================================= @@ -18,6 +18,7 @@ //= 2nd Job Quests again. It also guides adv classes where //= to go. [Lupus] //= 2.0 Changed numbers to constants. [Vicious] +//= 2.1 Removed Duplicates [Silent] //============================================================ @@ -438,17 +439,17 @@ in_rogue.gat,272,136,3 script Hermanthorn Jr. 85,{ } // -------------------------------------------------------------------------- -cmd_fild09.gat,106,195,0 script Aragham Junior 45,1,1,{ +cmd_fild09.gat,106,195,0 script Aragham Junior#01 45,1,1,{ callfunc "F_RogueTest3", 1, "Aragham", "never", "hoarded", "upgrade items.", 244, 24; } // ----------------------------------------------------------------------------- -cmd_fild09.gat,335,143,0 script Hollgrehen Junior 45,1,1,{ +cmd_fild09.gat,335,143,0 script Hollgrehen Junior#01 45,1,1,{ callfunc "F_RogueTest3", 2, "My father", "never", "hoarded", "upgrade items.", 168, 34; } // ------------------------------------------------------------------------------ -cmd_fild04.gat,304,179,0 script Antonio Junior 45,1,1,{ +cmd_fild04.gat,304,179,0 script Antonio Junior#01 45,1,1,{ callfunc "F_RogueTest3", 3, "Antonio", "doesn't like", "breaking", "refining materials.", 165, 104; } @@ -564,15 +565,15 @@ sF_Password: // Guildsman //=============================================== //--------------------------------------------------------------------------- -in_rogue.gat,244,39,4 script Aragham Junior 99,{ +in_rogue.gat,244,39,4 script Aragham Junior#02 99,{ callfunc "F_RogueTest4", "Aragham Junior", 245, 27; } //--------------------------------------------------------------------------- -in_rogue.gat,152,27,6 script Hollgrehen Junior 85,{ +in_rogue.gat,152,27,6 script Hollgrehen Junior#02 85,{ callfunc "F_RogueTest4", "Hollgrehen Junior", 160, 32; } //--------------------------------------------------------------------------- -in_rogue.gat,183,105,4 script Antonio Junior 88,{ +in_rogue.gat,183,105,4 script Antonio Junior#02 88,{ callfunc "F_RogueTest4", "Antonio Junior", 175, 107; } diff --git a/npc/jobs/novice/novice.txt b/npc/jobs/novice/novice.txt index e0d710a2a..8c06d6a47 100644 --- a/npc/jobs/novice/novice.txt +++ b/npc/jobs/novice/novice.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= Dr.Evil & MasterOfMuppets //===== Current Version: ===================================== -//= 1.1b +//= 1.2 //===== Compatible With: ===================================== //= eAthena SVN 3422+(Requires jA Script System) //===== Description: ========================================= @@ -13,6 +13,7 @@ //= 1.0 Added the New Novice Training Grounds, a big thanks [MasterOfMuppets] //= to Dr.Evil who did 90% of the work =) //= 1.0b Temp measure to stop exploits. [Vicious] +//= 1.2 Removed Duplicates [Silent] //============================================================ //==================================================================== @@ -207,14 +208,14 @@ L_Fail: end; } -new_1-1.gat,144,116,2 script Guard 105,{ +new_1-1.gat,144,116,2 script Guard#01 105,{ mes "[Training Grounds Guard]"; mes "Welcome to the Training Grounds."; mes "You are now in the outer court yard. Please go inside the castle to begin your training."; close; } -new_1-1.gat,144,107,2 script Guard 105,{ +new_1-1.gat,144,107,2 script Guard#02 105,{ mes "[Training Grounds Guard]"; switch ( rand(2) ) { case 0: mes "Come in!"; @@ -2417,7 +2418,7 @@ function script training_personnel3 { return; } -new_1-3.gat,95,30,4 script Training Center Employee 84,{ +new_1-3.gat,95,30,4 script Training Center Employee#01 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel2"; break; @@ -2425,7 +2426,7 @@ new_1-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_2-3.gat,95,30,4 script Training Center Employee 84,{ +new_2-3.gat,95,30,4 script Training Center Employee#02 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2433,7 +2434,7 @@ new_2-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_3-3.gat,95,30,4 script Training Center Employee 84,{ +new_3-3.gat,95,30,4 script Training Center Employee#03 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2441,7 +2442,7 @@ new_3-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_4-3.gat,95,30,4 script Training Center Employee 84,{ +new_4-3.gat,95,30,4 script Training Center Employee#04 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2449,7 +2450,7 @@ new_4-3.gat,95,30,4 script Training Center Employee 84,{ case 3: callfunc "training_personnel0"; } } -new_5-3.gat,95,30,4 script Training Center Employee 84,{ +new_5-3.gat,95,30,4 script Training Center Employee#05 84,{ callfunc "training_personnel"; switch( select("I don't want a challenge~","I wanna fight tough monsters!","Cancel.") ) { case 1: callfunc "training_personnel1"; break; @@ -2475,11 +2476,11 @@ L2: mes "[Keyman]"; mes "So you want to stay here longer? Continue training, and train hard!"; close; } -new_1-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_2-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_3-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_4-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 -new_5-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa 85 +new_1-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#01 85 +new_2-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#02 85 +new_3-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#03 85 +new_4-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#04 85 +new_5-3.gat,96,174,4 duplicate(supervision) Petugas Pemeriksa#05 85 //Novice Instructor new_1-4.gat,91,22,4 script Novice Instructor 57,{ -- cgit v1.2.3-70-g09d2