diff options
Diffstat (limited to 'npc/re/cities/malaya.txt')
| -rw-r--r-- | npc/re/cities/malaya.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index c8171b9d6..f18bbd0af 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -183,17 +183,17 @@ OnBingx2: donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnTouch: - if (getcharid(1)) { - if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { + if (getcharid(CHAR_ID_PARTY)) { + if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) { donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; } if (rand(1,5)%2) { switch(atoi(strnpcinfo(NPC_NAME_HIDDEN))) { - case 1: $ma_name04$ = strcharinfo(0); break; - case 5: $ma_name05$ = strcharinfo(0); break; - case 9: $ma_name06$ = strcharinfo(0); break; + case 1: $ma_name04$ = strcharinfo(PC_NAME); break; + case 5: $ma_name05$ = strcharinfo(PC_NAME); break; + case 9: $ma_name06$ = strcharinfo(PC_NAME); break; } } donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; @@ -236,7 +236,7 @@ OnBingx2: OnTouch: .@i = atoi(strnpcinfo(NPC_NAME_HIDDEN)); if (.@i%4 == 2) { - if (getcharid(0) == getpartyleader(getcharid(1),2)) + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) .@pass = 1; } else if (.@i%4 == 3) { if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME)) @@ -246,7 +246,7 @@ OnTouch: .@pass = 1; } if (.@pass) { - if ($ma_name04$ == strcharinfo(0) || $ma_name05$ == strcharinfo(0) || $ma_name06$ == strcharinfo(0)) { + if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) { donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; close; @@ -256,16 +256,16 @@ OnTouch: case 2: case 3: case 4: - $ma_name04$ = strcharinfo(0); + $ma_name04$ = strcharinfo(PC_NAME); break; case 6: case 7: case 8: - $ma_name05$ = strcharinfo(0); + $ma_name05$ = strcharinfo(PC_NAME); break; case 10: case 11: - $ma_name06$ = strcharinfo(0); + $ma_name06$ = strcharinfo(PC_NAME); break; } } |