summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2019-11-17 15:53:05 +0100
committerGitHub <noreply@github.com>2019-11-17 15:53:05 +0100
commitd92a4cdd378ab3c952f2419c46cd645348e1c61f (patch)
treecdeea33ba7d1ce3672f44c772bc0b853b21da02e /npc/quests
parent16f3d5e12cdf28c5209af7ce74d1dfe4614deb00 (diff)
parent50f7cd8138cafc307b51d5c1f02c7f2893d2a0c5 (diff)
downloadhercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.gz
hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.bz2
hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.tar.xz
hercules-d92a4cdd378ab3c952f2419c46cd645348e1c61f.zip
Merge pull request #2566 from Helianthella/guild
add getguildinfo()
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/guildrelay.txt14
-rw-r--r--npc/quests/okolnir.txt8
-rw-r--r--npc/quests/seals/god_weapon_creation.txt14
3 files changed, 18 insertions, 18 deletions
diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt
index 87c72ef16..ec4b081fa 100644
--- a/npc/quests/guildrelay.txt
+++ b/npc/quests/guildrelay.txt
@@ -86,7 +86,7 @@
close;
}
if (getcharid(CHAR_ID_GUILD) == .@GID) {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
if (guildrelay_q == 100) {
if (guildtime > 22) {
if (gettime(GETTIME_HOUR) > 1 && gettime(GETTIME_HOUR) < guildtime) {
@@ -1265,7 +1265,7 @@
close;
}
if (getcharid(CHAR_ID_GUILD) == .@GID) {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
if (countitem(Soul_Of_Guild) > 0) {
mes "[" + .@name$ + "]";
mes "Hm. You can't just keep";
@@ -1728,7 +1728,7 @@
}
}
else {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[" + .@name$ + "]";
mes "Hm? What brings you";
mes "here? Feel free to take";
@@ -1769,7 +1769,7 @@
close;
}
if (getcharid(CHAR_ID_GUILD) == .@GID) {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
if (countitem(Soul_Of_Confidence) > 0) {
mes "[" + .@name$ + "]";
mes "Hm? What are you doing?";
@@ -2283,7 +2283,7 @@
}
}
else {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[" + .@name$ + "]";
mes "Hm. You're the master";
mes "of another guild, aren't";
@@ -2453,7 +2453,7 @@
close;
}
if (getcharid(CHAR_ID_GUILD) == .@GID) {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
if (countitem(Soul_Of_Peace) > 0) {
mes "[" + .@name$ + "]";
mes "Hm? That spirit that";
@@ -3076,7 +3076,7 @@
}
}
else {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[" + .@name$ + "]";
mes "You might be the master";
mes "of a guild, but you and I";
diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt
index bdf763bd5..c6e0b57c7 100644
--- a/npc/quests/okolnir.txt
+++ b/npc/quests/okolnir.txt
@@ -194,7 +194,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306
.@GID = getcastledata(.@t$,1);
if (getcharid(CHAR_ID_GUILD) == .@GID) {
cutin "wish_maiden31",1;
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[Wish Maiden]";
mes "I am... Wish maiden.";
mes "Mourning in this virtual realm, Okolnir.";
@@ -258,7 +258,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306
donpcevent "#okolnir_"+.@sub$+"::OnEnable";
disablenpc "Wish Maiden#gq_"+.@sub$;
cutin "wish_maiden11",255;
- announce "["+ strcharinfo(PC_NAME) +"], of the guild ["+ getguildname(.@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
+ announce "["+ strcharinfo(PC_NAME) +"], of the guild ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] has opened the gates to the realm of Okolnir.",bc_all,"0x70dbdb";
end;
}
else {
@@ -2162,7 +2162,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS
.@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1));
.@GID = getcastledata(.@t$,1);
if (getcharid(CHAR_ID_GUILD) == .@GID) {
- if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
if (compare(.@sub$,"aru")) {
setarray .@n, 7835,1,7836,1,7837,1,7838,1,2513,1,7291,10,7293,10,7063,100,985,20;
.@rwd = 2541; //Asprika
@@ -2198,7 +2198,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS
delitem .@n[.@i],.@n[.@i+1];
getitem .@rwd,1;
getitem Valkyrie_Gift,1;
- announce "["+ strcharinfo(PC_NAME) +"], of guild ["+ getguildname(.@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
+ announce "["+ strcharinfo(PC_NAME) +"], of guild ["+ getguildinfo(GUILDINFO_NAME, .@GID) +"] has brought a "+getitemname(.@rwd)+" into this world.",bc_all,"0x70dbdb";
close2;
cutin "wish_maiden11",255;
disablenpc "Wish Maiden#"+.@sub$+"_gift";
diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt
index 3f32461fa..037c96197 100644
--- a/npc/quests/seals/god_weapon_creation.txt
+++ b/npc/quests/seals/god_weapon_creation.txt
@@ -91,7 +91,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{
case 3:
.@GID = getcharid(CHAR_ID_GUILD);
if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){
- if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(PC_NAME) == getguildmaster(.@GID))) {
+ if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(PC_NAME) == getguildinfo(GUILDINFO_MASTER_NAME, .@GID))) {
mes "[Dwarf Grunburti]";
mes "Hmm...";
mes "I'll need some things to make a weapon for you. What exactly were you interested in having?";
@@ -167,7 +167,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{
mes "Stop bothering me and get out of here! Go play with some monsters, you simple minded fool!";
close;
}
- if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[Dwarf Grunburti]";
mes "I'll only present";
mes "my magnificent skills";
@@ -413,7 +413,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
close;
}
.@GID = getcharid(CHAR_ID_GUILD);
- if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) {
+ if (strcharinfo(PC_NAME) != getguildinfo(GUILDINFO_MASTER_NAME, .@GID)) {
mes "[Dwarf Grunburti]";
mes "How in the...";
mes "Get out of here!";
@@ -515,7 +515,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
$God2 = 0;
$God3 = 0;
$God4 = 0;
- announce "[Brisingamen] has come into the hands of [" + strcharinfo(PC_NAME) + "], master of the [" + getguildname(.@GID) + "] guild.",bc_all;
+ announce "[Brisingamen] has come into the hands of [" + strcharinfo(PC_NAME) + "], master of the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all;
mes "[Dwarf Grunburti]";
mes "Ah, just look at this dazzling beauty. No other piece of jewelry complemented Freya as well as Brisingamen.";
close;
@@ -589,7 +589,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
$God2 = 0;
$God3 = 0;
$God4 = 0;
- announce "[Megingjard] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildname(.@GID) + "].",bc_all;
+ announce "[Megingjard] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildinfo(GUILDINFO_NAME, .@GID) + "].",bc_all;
mes "[Dwarf Grunburti]";
mes "Here...";
mes "Be careful with how";
@@ -679,7 +679,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
$God2 = 0;
$God3 = 0;
$God4 = 0;
- announce "[Sleipnir] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildname(.@GID) + "].",bc_all;
+ announce "[Sleipnir] the godly item has been given to [" + strcharinfo(PC_NAME) + "], the master of the guild [" + getguildinfo(GUILDINFO_NAME, .@GID) + "].",bc_all;
mes "[Dwarf Grunburti]";
mes "There...";
mes "Wear these, and";
@@ -768,7 +768,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{
$God2 = 0;
$God3 = 0;
$God4 = 0;
- announce "[Mjolnir] has been bestowed to [" + strcharinfo(PC_NAME) + "], the master of the [" + getguildname(.@GID) + "] guild.",bc_all;
+ announce "[Mjolnir] has been bestowed to [" + strcharinfo(PC_NAME) + "], the master of the [" + getguildinfo(GUILDINFO_NAME, .@GID) + "] guild.",bc_all;
mes "[Dwarf Grunburti]";
mes "It's done.";
mes "Take it. How does";