summaryrefslogtreecommitdiff
path: root/npc/other
diff options
context:
space:
mode:
Diffstat (limited to 'npc/other')
-rw-r--r--npc/other/CashShop_Functions.txt6
-rw-r--r--npc/other/arena/arena_party.txt8
-rw-r--r--npc/other/marriage.txt10
-rw-r--r--npc/other/poring_war.txt24
4 files changed, 24 insertions, 24 deletions
diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt
index 3197b3838..629e91b8a 100644
--- a/npc/other/CashShop_Functions.txt
+++ b/npc/other/CashShop_Functions.txt
@@ -57,9 +57,9 @@ function script F_CashStore {
// - No arguments.
function script F_CashPartyCall {
warp "Random",0,0;
- if (getpartyleader(getcharid(1),2) == getcharid(0)) {
+ if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) {
getmapxy(.@mapl$, .@xl, .@yl, UNITTYPE_PC);
- warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$;
+ warpparty .@mapl$, .@xl, .@yl, getcharid(CHAR_ID_PARTY), .@mapl$;
}
return;
}
@@ -285,7 +285,7 @@ function script F_Snowball {
case 2:
mes "Blessings.";
mes "Holy night~";
- unitskilluseid getcharid(3),"SM_ENDURE",10;
+ unitskilluseid getcharid(CHAR_ID_ACCOUNT),"SM_ENDURE",10;
close2;
cutin "",255;
break;
diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt
index ad341e8a9..d7865d441 100644
--- a/npc/other/arena/arena_party.txt
+++ b/npc/other/arena/arena_party.txt
@@ -1025,7 +1025,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
mes "[Staff]";
mes "^3131FF"+$arena_pttopn$+"^000000's running time was ^3131FF"+$top_ptmin+"^000000minutes ^3131FF"+$top_ptsec+"^000000seconds.";
next;
- .arn_party = getcharid(1);
+ .arn_party = getcharid(CHAR_ID_PARTY);
if (@gappt < 0) {
mes "[Staff]";
mes "Although you failed to make a new record, I hope you will succeed next time.";
@@ -1053,7 +1053,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
mes "See you later~";
close2;
}
- if(getpartyleader(.arn_party,2) == getcharid(0)) {
+ if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) {
donpcevent "#arn_timer_pt::OnStop";
donpcevent "alloff#pt::OnEnable";
donpcevent "Ponox::OnStart";
@@ -1068,7 +1068,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
mes "Wow! You have renewed the record!";
mes "What a great job!";
next;
- if(getpartyleader(.arn_party,2) == getcharid(0)) {
+ if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) {
mes "[Staff]";
mes "You can record you and your party members on ^FF0000the hall of Arena Time Force Battle party ^000000.";
mes "When you enter a name, the name will be remained on the top unless someone make a new record.";
@@ -1131,7 +1131,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{
mes "See you later~";
close2;
}
- if(getpartyleader(.arn_party,2) == getcharid(0)) {
+ if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) {
donpcevent "#arn_timer_pt::OnStop";
donpcevent "alloff#pt::OnEnable";
donpcevent "Ponox::OnStart";
diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt
index ea43b347f..bbd659420 100644
--- a/npc/other/marriage.txt
+++ b/npc/other/marriage.txt
@@ -577,7 +577,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
if (!getpartnerid()) {
if (!$@wedding) {
if (wedding_sign == 1) {
- getpartymember(getcharid(1));
+ getpartymember(getcharid(CHAR_ID_PARTY));
.@partymembercount = $@partymembercount;
if (.@partymembercount == 2) {
if (Sex == SEX_MALE) {
@@ -648,7 +648,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
}
else if ($@wedding == 1) {
if (wedding_sign == 1) {
- getpartymember(getcharid(1));
+ getpartymember(getcharid(CHAR_ID_PARTY));
.@partymembercount = $@partymembercount;
if (.@partymembercount == 2) {
if (Sex == SEX_FEMALE) {
@@ -689,7 +689,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
mes "Will you marry "+$@wed_groom$+"?";
next;
if (select("Yes, I do.", "^FF0000No.^000000") == 1) {
- if (isloggedin(getcharid(3,$@wed_groom$))) {
+ if (isloggedin(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$))) {
if (marriage($@wed_groom$)) {
//Call Wedding effect
wedding;
@@ -697,12 +697,12 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{
sc_start SC_WEDDING,3600000,1;
getitem Bride_Ring,1;
//Give ring to Groom, and change to wedding sprite.
- attachrid(getcharid(3,$@wed_groom$));
+ attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$));
sc_start SC_WEDDING,3600000,1;
getitem Bridegroom_Ring,1;
detachrid;
//Switch Script progression back to Bride
- attachrid(getcharid(3,$@wed_bride$));
+ attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_bride$));
cutin "wedding_bomars02",2;
mapannounce "prt_church","I now pronounce you, "+$@wed_groom$+" and "+$@wed_bride$+", husband and wife.",bc_map;
mes "[Vomars]";
diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt
index 7d58569ef..b3e0eb15a 100644
--- a/npc/other/poring_war.txt
+++ b/npc/other/poring_war.txt
@@ -644,8 +644,8 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{
close;
}
.@a_tname$ = getpartyname($@wop_team_a);
- .@pname$ = getpartyname(getcharid(1));
- if ($@wop_team_a != 0 && $@wop_team_a == getcharid(1)) {
+ .@pname$ = getpartyname(getcharid(CHAR_ID_PARTY));
+ if ($@wop_team_a != 0 && $@wop_team_a == getcharid(CHAR_ID_PARTY)) {
mes "[Mr. Doppel]";
mes "So, everyone joined the party?";
mes "The name of the party is... " + .@pname$ + ", right?";
@@ -662,7 +662,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{
mes "If you don't get there in time, you won't make it to the battle.";
close;
case 2:
- if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+ if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) {
mes "[Mr. Doppel]";
mes "So, you are the leader. Before going to the battlefield, you should check all your members.";
next;
@@ -694,7 +694,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{
}
}
else {
- if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+ if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) {
if ($@wop_team_a == 0) {
mes "[Mr. Doppel]";
mes "So, you are the party leader of Angeling Team.";
@@ -719,7 +719,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{
mes "So, I'll register your party name as - " +.@pname$ + " -.";
mes "Now, Tell your ^4d4dffmembers to confirm your party^000000.";
mes "I'll send you to the battlefield as soon as I confirm your party.";
- $@wop_team_a = getcharid(1);
+ $@wop_team_a = getcharid(CHAR_ID_PARTY);
mapannounce "poring_w02","The registration of the Angeling Team has been confirmed. The party members must confirm their team with Mr. Doppel.",0,0x33FF66;
close;
case 3:
@@ -775,8 +775,8 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{
close;
}
.@d_tname$ = getpartyname($@wop_team_d);
- .@pname$ = getpartyname(getcharid(1));
- if ($@wop_team_d != 0 && $@wop_team_d == getcharid(1)) {
+ .@pname$ = getpartyname(getcharid(CHAR_ID_PARTY));
+ if ($@wop_team_d != 0 && $@wop_team_d == getcharid(CHAR_ID_PARTY)) {
mes "[Mr. Doppel]";
mes "So, everyone joined the party?";
mes "The name of the party is... " + .@pname$ + ", right?";
@@ -793,7 +793,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{
mes "If you don't get there in time, you won't make it to the battle.";
close;
case 2:
- if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+ if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) {
mes "[Mr. Doppel]";
mes "So, you are the leader. Before going to the battlefield, you should check all your members.";
next;
@@ -823,7 +823,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{
}
}
} else {
- if ((getpartyleader(getcharid(1),2) == getcharid(0))) {
+ if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) {
if ($@wop_team_d == 0) {
mes "[Mr. Doppel]";
mes "So, you are the party leader of Deviling Team.";
@@ -848,7 +848,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{
mes "So, I'll register your party name as - " + .@pname$ + " -.";
mes "Now, Tell your ^4d4dffmembers to confirm your party^000000.";
mes "I'll send you to the battlefield as soon as I confirm your party.";
- $@wop_team_d = getcharid(1);
+ $@wop_team_d = getcharid(CHAR_ID_PARTY);
mapannounce "poring_w02","The registration of the Deviling Team has been confirmed. The party members must confirm their team with Mr. Doppel.",0,0x33FF66;
close;
case 3:
@@ -1238,7 +1238,7 @@ poring_w02,99,201,3 script Deviruchi#wop_endmaster 4_DEVIRUCHI,{
}
.@a_point = $@wop_deadcount_a;
.@d_point = $@wop_deadcount_d;
- if (getcharid(1) == $@wop_team_a) {
+ if (getcharid(CHAR_ID_PARTY) == $@wop_team_a) {
if (.@a_point < .@d_point) {
mes "[Devi]";
mes "Good work!";
@@ -1319,7 +1319,7 @@ poring_w02,99,201,3 script Deviruchi#wop_endmaster 4_DEVIRUCHI,{
}
}
}
- else if (getcharid(1) == $@wop_team_d) {
+ else if (getcharid(CHAR_ID_PARTY) == $@wop_team_d) {
if (.@a_point > .@d_point) {
mes "[Devi]";
mes "Good work!";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 11:38:16 +0000