diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/MOTD.txt | 4 | ||||
| -rw-r--r-- | npc/instances/OrcsMemory.txt | 47 | ||||
| -rw-r--r-- | npc/kafras/functions_kafras.txt | 2 | ||||
| -rw-r--r-- | npc/pre-re/quests/collection/quest_disguiseloliruri.txt | 2 | ||||
| -rw-r--r-- | npc/re/merchants/coin_exchange.txt | 6 |
5 files changed, 31 insertions, 30 deletions
diff --git a/npc/MOTD.txt b/npc/MOTD.txt index ceb3f4cda..99bd8c773 100644 --- a/npc/MOTD.txt +++ b/npc/MOTD.txt @@ -1,4 +1,4 @@ -//======= Hercules Script =========================== +//================== Hercules Script ================= //= _ _ _ = //= | | | | | | = //= | |_| | ___ _ __ ___ _ _| | ___ ___ = @@ -6,7 +6,7 @@ //= | | | | __/ | | (__| |_| | | __/\__ \ = //= \_| |_/\___|_| \___|\__,_|_|\___||___/ = //= = -//= http://hercules.ws/board/ = +//= http://herc.ws/board/ = //==================================================== // run when any character logs in, attached to them. - script HerculesMOTD -1,{ diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index e43e3df10..68cf8b2e9 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -52,7 +52,19 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ } .@orctime = questprogress(12059,PLAYTIME); - if (!.@orctime) { + if (.@orctime == 2) { + mes "^0000ffAll records and after-effects related to the Orc's Memory Dungeon are deleted. You can now regenerate or re-enter the dungeon.^000000"; + erasequest 12059; + close; + } + + if (.@orctime == 1) { + mes "You can enter the Dungeon if it has been generated."; + next; + if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2) + close; + // Fall through to access the dungeon + } else { // !.@orctime if (getcharid(0) == getpartyleader(.@party_id,2)) { mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?"; next; @@ -79,28 +91,17 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ mes "After making a reservation, you have to select 'Enter the Dungeon' from the menu if you wish to enter the "+.@md_name$+"."; close; case 2: - callsub L_Enter,0; + break; // Fall through to access the dungeon (after the else) case 3: close; } - } - if(select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2) + } else if (select(.@md_name$ + " Enter the Memorial Dungeon:Cancel") == 2) end; - callsub L_Enter,1; - } else if (.@orctime == 1) { - mes "You can enter the Dungeon if it has been generated."; - next; - if(select("Enter the Dungeon "+.@md_name$+":Cancel") == 2) - close; - callsub L_Enter,0; - } else if (.@orctime == 2) { - mes "^0000ffAll records and after-effects related to the Orc's Memory Dungeon are deleted. You can now regenerate or re-enter the dungeon.^000000"; - erasequest 12059; - close; + // Else access the dungeon } - mes "In order to generate a dungeon you must be the Party Leader and have at least 2 members in the party."; - close; -L_Enter: + + // Dungeon access + if (has_instance("1@orcs") == "") { mes "Memorial Dungeon "+.@md_name$+" does not exist."; mes "The party leader has not reserved entrance to the dungeon yet."; @@ -108,12 +109,12 @@ L_Enter: mes "Once the reservation is complete, the dungeon will be generated."; mes "If your dungeon has been destroyed you must wait 7 days before re-entering."; close; - } else { - mapannounce "gef_fild10", .@p_leader$ + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99"; - if (!questprogress(12059)) setquest 12059; - warp "1@orcs",179,15; - end; } + + mapannounce "gef_fild10", strcharinfo(0) + " of the party, " + .@p_name$ + " is entering the "+.@md_name$+".",bc_map,"0x00ff99"; + if (!questprogress(12059)) setquest 12059; + warp "1@orcs",179,15; + end; } gef_fild10,238,202,6 script Mad Scientist#orc 4_LGTSCIENCE,{ diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 483e9b72a..eabd3f1d8 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -315,7 +315,7 @@ function script F_KafTele { mes "your destination."; next; .@menu$ = ""; - for (.@i = 0; .@i <= 6; ++.@i) + for (.@i = 0; .@i <= getarraysize(@wrpD$); ++.@i) .@menu$ += @wrpC$[.@i] + ":"; .@j = select(.@menu$) - 1; if (@wrpC$[.@j] == "Cancel") diff --git a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt index 8ff2ebce3..f267eb7d4 100644 --- a/npc/pre-re/quests/collection/quest_disguiseloliruri.txt +++ b/npc/pre-re/quests/collection/quest_disguiseloliruri.txt @@ -11,7 +11,7 @@ //= 1.0 First version. //============================================================ -nif_fild02,332,327,4 script Deadman 4_M_NFDEADMAN,{ +nif_fild01,332,327,4 script Deadman 4_M_NFDEADMAN,{ if (questprogress(60173)) { if (questprogress(60173,HUNTING) != 2) { diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index f2ee8a506..cabd9753b 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -828,7 +828,7 @@ malangdo,150,135,5 script Roving Merchant 4_M_MERCAT1,{ // Eclage //============================================================ -ecl_in01,66,95,3 script Armor Merchant Naphara#e::glove 4_F_FAIRYKID,{ +ecl_in01,66,95,3 script Armor Merchant Naphara#e 4_F_FAIRYKID,{ if (!checkweight(Axe,3)) { mes "- Stop Here!! -"; mes "- You have too many items. -"; @@ -947,7 +947,7 @@ ecl_in01,64,97,5 script Slot Expert Nattuer#ecl 4_F_FAIRYKID,{ close; } -ecl_in01,33,98,5 script Armor Merchant Naphara#e::armor 4_M_FAIRYKID2,{ +ecl_in01,33,98,5 script Herb Merchant Plafina#e 4_M_FAIRYKID2,{ if (checkweight(Axe,1)==0) { mes "- Stop Here!! -"; mes "- You have too many items. -"; @@ -1004,7 +1004,7 @@ ecl_in01,33,98,5 script Armor Merchant Naphara#e::armor 4_M_FAIRYKID2,{ mes "[Herb Merchant]"; mes "Thank you for your business."; delitem Splendide_Coin,.cost[.@item]*.@buy; //Splendide_Coin - getitem Snow_Flip,.@buy; + getitem .items[.@item],.@buy; close; OnInit: |