Skip to content

Commit 9b73ad1

Browse files
MishimaHarunaMishimaHaruna
authored
Merge pull request #3307 from jasonch35/update-npc-getpartymember-commands
Update all npc getpartymember commands
2 parents c00541d + 4d928f1 commit 9b73ad1

File tree

8 files changed

+20
-36
lines changed

8 files changed

+20
-36
lines changed

‎npc/custom/quests/hunting_missions.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,11 +275,11 @@ OnNPCKillEvent:
275275
} else if (.Party) {
276276
set .@mob, killedrid;
277277
getmapxy(.@map1$, .@x1, .@y1, UNITTYPE_PC);
278-
getpartymember getcharid(CHAR_ID_PARTY),1;
279-
getpartymember getcharid(CHAR_ID_PARTY),2;
280-
for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) {
281-
if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) {
282-
attachrid $@partymemberaid[.@i];
278+
getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@accid);
279+
.@count = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_CHARID, .@charid);
280+
for (.@i = 0; .@i < .@count; .@i++) {
281+
if (isloggedin(.@accid[.@i], .@charid[.@i])) {
282+
attachrid(.@accid[.@i]);
283283
if (#Mission_Count && Mission0 && Hp > 0) {
284284
getmapxy(.@map2$, .@x2, .@y2, UNITTYPE_PC);
285285
if ((.@map1$ == .@map2$ || .Party == 1) && (distance(.@x1,.@y1,.@x2,.@y2) <= 30 || .Party < 3)) {

‎npc/other/marriage.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -577,8 +577,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
577577
if (!getpartnerid()) {
578578
if (!$@wedding) {
579579
if (wedding_sign == 1) {
580-
getpartymember(getcharid(CHAR_ID_PARTY));
581-
.@partymembercount = $@partymembercount;
580+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
582581
if (.@partymembercount == 2) {
583582
if (Sex == SEX_MALE) {
584583
$@wedding = 1;
@@ -648,8 +647,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
648647
}
649648
else if ($@wedding == 1) {
650649
if (wedding_sign == 1) {
651-
getpartymember(getcharid(CHAR_ID_PARTY));
652-
.@partymembercount = $@partymembercount;
650+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
653651
if (.@partymembercount == 2) {
654652
if (Sex == SEX_FEMALE) {
655653
if (strcharinfo(PC_NAME) == $@wed_bride$) {

‎npc/quests/guildrelay.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2527,8 +2527,7 @@
25272527
close;
25282528
}
25292529
}
2530-
getpartymember(getcharid(CHAR_ID_PARTY));
2531-
.@partymembercount = $@partymembercount;
2530+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
25322531
.@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2);
25332532
if (guildrelay_q == 91) {
25342533
if (.@partymembercount == 6) {

‎npc/quests/partyrelay.txt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
//=========================================================================
3535

3636
payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{
37-
getpartymember(getcharid(CHAR_ID_PARTY));
38-
.@partymembercount = $@partymembercount;
37+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
3938
.@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2);
4039
if (checkweight(Resin,300) == 0) {
4140
mes "^3355FFWait a minute! You're";
@@ -402,8 +401,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{
402401
}
403402

404403
payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{
405-
getpartymember(getcharid(CHAR_ID_PARTY));
406-
.@partymembercount = $@partymembercount;
404+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
407405
.@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2);
408406
if (checkweight(Resin,300) == 0) {
409407
mes "^3355FFWait a minute! You're";
@@ -1837,8 +1835,7 @@ payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{
18371835
}
18381836

18391837
payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
1840-
getpartymember(getcharid(CHAR_ID_PARTY));
1841-
.@partymembercount = $@partymembercount;
1838+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
18421839
.@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2);
18431840
if (checkweight(Resin,300) == 0) {
18441841
mes "^3355FFWait a minute! You're";
@@ -2470,8 +2467,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{
24702467
}
24712468

24722469
payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{
2473-
getpartymember(getcharid(CHAR_ID_PARTY));
2474-
.@partymembercount = $@partymembercount;
2470+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
24752471
.@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2);
24762472
if (checkweight(Resin,300) == 0) {
24772473
mes "^3355FFWait a minute! You're";

‎npc/quests/quests_louyang.txt

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4643,8 +4643,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{
46434643
mes strcharinfo(PC_NAME)+ "...!";
46444644
mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!";
46454645
next;
4646-
getpartymember(getcharid(CHAR_ID_PARTY));
4647-
@partymember = $@partymembercount;
4646+
@partymember = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
46484647
if (getpartyleader(getcharid(CHAR_ID_PARTY),1) == getcharid(CHAR_ID_CHAR) || !@partymember) {
46494648
mes "[Sun Mao]";
46504649
mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight.";
@@ -4677,8 +4676,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{
46774676
mes "Go back safe.";
46784677
close;
46794678
}
4680-
getpartymember(getcharid(CHAR_ID_PARTY));
4681-
@partymember = $@partymembercount;
4679+
@partymember = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
46824680
if (QL_REVOL < 8) {
46834681
if (@partymember == QL_REVOL +1) {
46844682
if (@partymember != 8) {
@@ -4869,8 +4867,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{
48694867

48704868
lou_in01,43,147,3 script Gunpowder Expert 4_M_ALCHE_C,{
48714869
if (ch_make == 0) {
4872-
getpartymember(getcharid(CHAR_ID_PARTY));
4873-
@partymember = $@partymembercount;
4870+
@partymember = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
48744871
if (!QL_REVOL) {
48754872
mes "[Hao Chenryu]";
48764873
mes "Who...";

‎npc/quests/quests_morocc.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,
946946
close;
947947
case 2:
948948
if ($@re_moc < 3) {
949-
getpartymember(getcharid(CHAR_ID_PARTY));
950-
.@partymembercount = $@partymembercount;
951-
copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount;
949+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_NAME, .@partymembername$);
952950
while (.@partymembercount >= 0) {
953951
.@name$ = .@partymembername$[.@partymembercount];
954952
if (isloggedin(getcharid(CHAR_ID_ACCOUNT,.@name$))) {
@@ -1009,9 +1007,7 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3,
10091007
mes "[Continental Guard]";
10101008
mes "Ah, you're an adventurer working for the Continental Guard. Nice to meet you. Feel free to ask me if you need my assistance.";
10111009
next;
1012-
getpartymember(getcharid(CHAR_ID_PARTY));
1013-
.@partymembercount = $@partymembercount;
1014-
copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount;
1010+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_NAME, .@partymembername$);
10151011
while (.@partymembercount >= 0) {
10161012
.@name$ = .@partymembername$[.@partymembercount];
10171013
if (isloggedin(getcharid(CHAR_ID_ACCOUNT,.@name$))) {

‎npc/quests/quests_nameless.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10177,8 +10177,7 @@ moc_fild18,108,116,0 script #treasure CLEAR_NPC,{
1017710177
mes "protection to get the treasure.^000000";
1017810178
next;
1017910179
input(.@input$);
10180-
getpartymember(getcharid(CHAR_ID_PARTY));
10181-
.@partymembercount = $@partymembercount;
10180+
.@partymembercount = getpartymember(getcharid(CHAR_ID_PARTY), PT_MEMBER_ACCID, .@temp);
1018210181
if (.@partymembercount > 1) {
1018310182
if ((.@input$ == "OpenSesame" && treasure_nd == 9) || (.@input$ == "UnlockTreasure" && treasure_nd == 10)) {
1018410183
mes "^3355FFThe Z Gang must have split";

‎npc/re/instances/MalangdoCulvert.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -784,9 +784,8 @@ OnEnable:
784784
areamonster(.@map$, .@c[0], .@c[1], .@c[2], .@c[3], _("Abysmal Cornutus"), MD_CORNUTUS, rand(1, 3), .@label$);
785785
specialeffect(EF_MAPPILLAR2, ALL_SAMEMAP); //currently broken
786786
getmapxy(.@map$, .@x, .@y, UNITTYPE_NPC);
787-
getpartymember('party_id, 2);
788-
copyarray(.@partymemberaid[0], $@partymemberaid[0], $@partymembercount);
789-
for(.@i = 0; .@i<$@partymembercount; ++.@i) {
787+
.@partymembercount = getpartymember('party_id, PT_MEMBER_ACCID, .@partymemberaid);
788+
for(.@i = 0; .@i < .@partymembercount; ++.@i) {
790789
if (attachrid(.@partymemberaid[.@i])) {
791790
if (strcharinfo(PC_MAP) == .@map$)
792791
viewpoint(0, .@x, .@y, .@index, C_YELLOW);

0 commit comments

Comments
 (0)