diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/custom/bartershop.txt | 21 | ||||
| -rw-r--r-- | npc/custom/events/disguise.txt | 10 | ||||
| -rw-r--r-- | npc/re/jobs/3-2/sura.txt | 6 | ||||
| -rw-r--r-- | npc/scripts_custom.conf | 1 |
4 files changed, 35 insertions, 3 deletions
diff --git a/npc/custom/bartershop.txt b/npc/custom/bartershop.txt new file mode 100644 index 000000000..bcb61795e --- /dev/null +++ b/npc/custom/bartershop.txt @@ -0,0 +1,21 @@ +//===== Hercules Script ====================================== +//= Barter shop demo +//===== By: ================================================== +//= 4144 +//===== Current Version: ===================================== +//= 1.0 +//===== Description: ========================================= +//= Barter shop demo in prontera. +//============================================================ + +prontera,159,284,4 trader Barter Shop#prt 4_M_KID1,{ +OnInit: + tradertype(NST_BARTER); + sellitem White_Herb, 100, Red_Potion, 2; + sellitem Blue_Herb, 200, Orange_Potion, 3; + sellitem Green_Herb, 100, Red_Potion, 4; + sellitem White_Herb, 100, Orange_Potion, 1; + sellitem Apple, -1, Orange_Potion, 1; + sellitem Praetorian_Shield, 100, Berserk_Potion, 10; + end; +} diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index b9071d162..fde5e544a 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -8,6 +8,7 @@ //= Note: This script requires PCRE to run properly. //= 5.0 Last update by GmOcean. //= 5.1 Cleaned and standardized, mostly. [Euphy] +//= 5.2 Fix a bug that causes this event run indefinitely [AnnieRuru] //============================================================ prontera,160,155,4 script Disguise Event 4_M_NFDEADMAN,{ @@ -183,6 +184,15 @@ OnTimer30000: deletepset 1; stopnpctimer; setnpctimer 0; + ++.RoundCount; + if (.RoundCount >= .Rounds) { + setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; + .RoundCount = 0; + .Change = 0; + .EventON = 0; + npctalk "Thank you all for playing. That was the last round of the Disguise Event. Come play again later."; + end; + } initnpctimer; end; OnTimer60000: diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index 63e689acc..4e0108fd8 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -654,14 +654,14 @@ OnTimer305000: OnTimer315000: mapannounce "sword_2-1","Come on here.",bc_map; donpcevent "Buddy#job_shuaneh::OnDisable"; - donpcevent "#Sura_garajjom::OnEnable"; + // donpcevent "#Sura_garajjom::OnEnable"; // Commented to prevent #Sura_garajjom allowing player to success the test at any case (even when failing it). end; OnTimer320000: mapannounce "sword_2-1","I guess you're not ready to meet the master yet...",bc_map; mapwarp "sword_2-1","yuno_fild07",255,178; - donpcevent "#Sura_garajjom::OnDisable"; - donpcevent "Drawing Room::OnEnable"; + // donpcevent "#Sura_garajjom::OnDisable"; donpcevent "Buddy#Sura_Salon::OnDisable"; + donpcevent "Drawing Room::OnEnable"; end; } diff --git a/npc/scripts_custom.conf b/npc/scripts_custom.conf index 14384fd17..a5aad9767 100644 --- a/npc/scripts_custom.conf +++ b/npc/scripts_custom.conf @@ -50,6 +50,7 @@ //"npc/custom/card_remover.txt", //"npc/custom/item_signer.txt", //"npc/custom/woe_controller.txt", +//"npc/custom/bartershop.txt", //================= Other Scripts ========================================= // -- MVP Arena |