diff options
Diffstat (limited to 'npc/re/guild')
| -rw-r--r-- | npc/re/guild/invest_main.txt | 24 | ||||
| -rw-r--r-- | npc/re/guild/invest_npc.txt | 5 |
2 files changed, 13 insertions, 16 deletions
diff --git a/npc/re/guild/invest_main.txt b/npc/re/guild/invest_main.txt index e8c2a011a..a5a7b1e72 100644 --- a/npc/re/guild/invest_main.txt +++ b/npc/re/guild/invest_main.txt @@ -1,18 +1,18 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hall of Abyss - Core Scripts //===== By: ================================================== //= Euphy //===== Current Version: ===================================== -//= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN +//= 1.1 //===== Description: ========================================= +//= [Official Conversion] //= Expansion for War of Emperium FE. //= Invest in each realm to unlock new maps: //= - Guild Dungeon F2, total 20,000,000z. //= - Hall of Abyss, total 70,000,000z. //===== Additional Comments: ================================= //= 1.0 First version. Missing official times. [Euphy] +//= 1.1 Added GM management function. [Euphy] //============================================================ // Global Variables @@ -58,7 +58,7 @@ $@vfund_*_extra // Investment Functions & Controller //============================================================ -// Note: The time in this section are almost entirely custom. +// Note: The times in this section are almost entirely custom. - script #invest_timer -1,{ OnClock0000: // Open investments on Wed (1 hour after WoE) @@ -387,11 +387,10 @@ OnReset: } prt_gld,2,2,0 script Investment_total#fund00 844,{ -/* + callfunc "F_GM_NPC"; mes "Is this not working properly?"; next; - input .@input; - if (.@input == 1854) { + if (callfunc("F_GM_NPC",1854,0) == 1) { mes "If you think the investment timer is dead, please adjust the timer."; next; switch(select("Turn on the timer:Cancel")) { @@ -407,8 +406,7 @@ prt_gld,2,2,0 script Investment_total#fund00 844,{ mes "I don't need to adjust anything now."; close; } -*/ - end; + OnInit: if (callfunc("F_Invest_Status") == 1) { initnpctimer; @@ -1147,7 +1145,7 @@ OnAgitInvest: callfunc "F_Invest_Abyss","$fund_"+.@npc$+"0"+.@id,"[Gate Manager]"; end; case 2: - callsub L_Enter,1,.@realm$; + callsub L_Enter,1,.@realm$,.@npc$; mes "[Gate Manager]"; mes "You are interested in exploring the "+.@realm$+" Guild Dungeon Deepest Layer (2F)."; mes "Let me guide you. Good luck."; @@ -1187,7 +1185,7 @@ OnAgitInvest: } end; case 3: - callsub L_Enter,2,.@realm$; + callsub L_Enter,2,.@realm$,.@npc$; mes "[Gate Manager]"; mes "Let me guide you to the Abyss Gap connected with "+.@realm$+", the Abyss Gate 'Way of the Warrior'."; close2; @@ -1235,7 +1233,7 @@ OnAgitInvest: L_Enter: set .@invest_status, callfunc("F_Invest_Status"); if (.@invest_status == 3) { - set .@status, getd("$"+.@npc$+"_invest_result"); + set .@status, getd("$"+getarg(2)+"_invest_result"); if ((getarg(0) == 1 && .@status == 2) || .@status == 3) return; else { diff --git a/npc/re/guild/invest_npc.txt b/npc/re/guild/invest_npc.txt index 3c6c45ee5..edc8eeacf 100644 --- a/npc/re/guild/invest_npc.txt +++ b/npc/re/guild/invest_npc.txt @@ -1,12 +1,11 @@ -//===== rAthena Script ======================================= +//===== Hercules Script ====================================== //= Hall of Abyss - NPC Duplicates //===== By: ================================================== //= Euphy //===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================================== -//= rAthena SVN //===== Description: ========================================= +//= [Official Conversion] //= Expansion for War of Emperium FE. //= Invest in each realm to unlock new maps: //= - Guild Dungeon F2, total 20,000,000z. |