diff options
| author | Asheraf <acheraf1998@gmail.com> | 2016-08-29 17:40:13 +0100 |
|---|---|---|
| committer | hemagx <ibrahem.h.basyone@gmail.com> | 2016-09-02 04:56:00 +0200 |
| commit | 0f1d0507eb95cf07ce7eb66d89ad9853938612e6 (patch) | |
| tree | 57780b1ecc7c5ae125be1c89406f8db1e00a581b /npc/custom | |
| parent | 0f1d03f505fdc03533122db8ba19fa55f64f11b7 (diff) | |
| download | hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.gz hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.bz2 hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.tar.xz hercules-0f1d0507eb95cf07ce7eb66d89ad9853938612e6.zip | |
change *strcharinfo to use constants
Diffstat (limited to 'npc/custom')
33 files changed, 193 insertions, 193 deletions
diff --git a/npc/custom/battleground/bg_common.txt b/npc/custom/battleground/bg_common.txt index b6404d57d..7ba3eecb0 100644 --- a/npc/custom/battleground/bg_common.txt +++ b/npc/custom/battleground/bg_common.txt @@ -204,7 +204,7 @@ bat_room,156,178,5 script Tierra Valley Officer#1 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -274,7 +274,7 @@ bat_room,156,121,1 script Tierra Valley Officer#2 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -344,7 +344,7 @@ bat_room,164,178,5 script Tierra Valley Officer#3 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -414,7 +414,7 @@ bat_room,164,121,1 script Tierra Valley Officer#4 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -485,7 +485,7 @@ bat_room,172,178,5 script Flavius Officer#1 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -556,7 +556,7 @@ bat_room,172,121,1 script Flavius Officer#2 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -627,7 +627,7 @@ bat_room,148,178,5 script Flavius Officer#3 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -698,7 +698,7 @@ bat_room,148,121,1 script Flavius Officer#4 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -766,7 +766,7 @@ bat_room,140,178,5 script KVM [80-99] Officer#1 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -834,7 +834,7 @@ bat_room,140,121,1 script KVM [80-99] Officer#2 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -902,7 +902,7 @@ bat_room,132,178,5 script KVM [60-79] Officer#1 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -970,7 +970,7 @@ bat_room,132,121,1 script KVM [60-79] Officer#2 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -1038,7 +1038,7 @@ bat_room,124,178,5 script KVM [1-59] Officer#1 4_M_KY_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Guillaume Army to those stinky Croixs!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; @@ -1106,7 +1106,7 @@ bat_room,124,121,1 script KVM [1-59] Officer#2 4_M_CRU_KNT,{ close; } - mes "Hello " + strcharinfo(0) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; + mes "Hello " + strcharinfo(PC_NAME) + ", let's show the power of the Croix Army to those stinky Guillaumes!"; next; if( select("I want to join your army!", "End Conversation") == 2 ) close; diff --git a/npc/custom/battleground/bg_flavius_01.txt b/npc/custom/battleground/bg_flavius_01.txt index 33c662d93..0520902ba 100644 --- a/npc/custom/battleground/bg_flavius_01.txt +++ b/npc/custom/battleground/bg_flavius_01.txt @@ -276,7 +276,7 @@ bat_b01,390,13,5 script Guillaume Vintenar#fl1 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; set .@reward, 9; } else { @@ -305,12 +305,12 @@ bat_b01,10,293,5 script Croix Vintenar#fl1 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; set .@reward, 9; } else { mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; diff --git a/npc/custom/battleground/bg_flavius_02.txt b/npc/custom/battleground/bg_flavius_02.txt index eef7cf308..da6c9cfef 100644 --- a/npc/custom/battleground/bg_flavius_02.txt +++ b/npc/custom/battleground/bg_flavius_02.txt @@ -276,7 +276,7 @@ bat_b02,390,13,5 script Guillaume Vintenar#fl2 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; set .@reward, 9; } else { @@ -305,12 +305,12 @@ bat_b02,10,293,5 script Croix Vintenar#fl2 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; set .@reward, 9; } else { mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; diff --git a/npc/custom/battleground/bg_kvm01.txt b/npc/custom/battleground/bg_kvm01.txt index a4bd65e43..c27e042a2 100644 --- a/npc/custom/battleground/bg_kvm01.txt +++ b/npc/custom/battleground/bg_kvm01.txt @@ -317,7 +317,7 @@ bat_c01,51,130,5 script Guillaume Vintenar::VintenarKvM01a 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; @@ -353,12 +353,12 @@ bat_c01,148,53,1 script Croix Vintenar::VintenarKvM01b 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; diff --git a/npc/custom/battleground/bg_kvm02.txt b/npc/custom/battleground/bg_kvm02.txt index 833a33747..cd13241cb 100644 --- a/npc/custom/battleground/bg_kvm02.txt +++ b/npc/custom/battleground/bg_kvm02.txt @@ -317,7 +317,7 @@ bat_c02,51,130,5 script Guillaume Vintenar::VintenarKvM02a 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; @@ -353,12 +353,12 @@ bat_c02,148,53,1 script Croix Vintenar::VintenarKvM02b 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; diff --git a/npc/custom/battleground/bg_kvm03.txt b/npc/custom/battleground/bg_kvm03.txt index 9ca29deaf..3ec87355e 100644 --- a/npc/custom/battleground/bg_kvm03.txt +++ b/npc/custom/battleground/bg_kvm03.txt @@ -317,7 +317,7 @@ bat_c03,51,130,5 script Guillaume Vintenar::VintenarKvM03a 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 0; @@ -353,12 +353,12 @@ bat_c03,148,53,1 script Croix Vintenar::VintenarKvM03b 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 0; mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "Please don't forget this battle. We can win the next."; close2; diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt index 05b48c63e..bab80916b 100644 --- a/npc/custom/battleground/bg_tierra_01.txt +++ b/npc/custom/battleground/bg_tierra_01.txt @@ -326,12 +326,12 @@ bat_a01,45,19,3 script Croix Vintenar#tv1 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; @@ -355,7 +355,7 @@ bat_a01,53,377,3 script Guillaume Vintenar#tv1 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt index b3b6cff21..791f02109 100644 --- a/npc/custom/battleground/bg_tierra_02.txt +++ b/npc/custom/battleground/bg_tierra_02.txt @@ -326,12 +326,12 @@ bat_a02,45,19,3 script Croix Vintenar#tv2 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croax!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; mes "[Swandery]"; - mes "Oh, " + strcharinfo(0) + ". Don't be sad."; + mes "Oh, " + strcharinfo(PC_NAME) + ". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We can win the next."; close2; @@ -355,7 +355,7 @@ bat_a02,53,377,3 script Guillaume Vintenar#tv2 4_M_KY_HEAD,{ mes "[Swandery]"; mes "Blessed Guillaume!!"; mes "Let's enjoy our glorious victory!"; - mes "" + strcharinfo(0) + ", its a sign reflecting victory"; + mes "" + strcharinfo(PC_NAME) + ", its a sign reflecting victory"; close2; } else { set .@reward, 1; diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 8fac6a76b..33561db0a 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -445,7 +445,7 @@ bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ mes "[Axl Rose]"; mes "Blessed Guillaume!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,9; } @@ -453,7 +453,7 @@ bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ mes "[Axl Rose]"; mes "Blessed Guillaume!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,.@medal_gap; } @@ -497,7 +497,7 @@ bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ mes "[Swandery]"; mes "Blessed Croix!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,9; } @@ -505,7 +505,7 @@ bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ mes "[Swandery]"; mes "Blessed Croix!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,.@medal_gap; } @@ -515,7 +515,7 @@ bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ set .@medal_gap,500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -523,7 +523,7 @@ bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ } else { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -631,7 +631,7 @@ bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ mes "[Axl Rose]"; mes "Blessed Guillaume!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,9; } @@ -639,7 +639,7 @@ bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ mes "[Axl Rose]"; mes "Blessed Guillaume!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,.@medal_gap; } @@ -707,7 +707,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ set .@medal_gap,500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -715,7 +715,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ } else { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -727,7 +727,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ set .@medal_gap,500 - .@your_medal; if (.@medal_gap > 2) { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -735,7 +735,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ } else { mes "[Swandery]"; - mes "Oh, "+strcharinfo(0)+". Don't be sad."; + mes "Oh, "+strcharinfo(PC_NAME)+". Don't be sad."; mes "Even though we didn't win, we did our best."; mes "This is a Royal gift from Croix, and please don't forget this battle. We will win the next one."; close2; @@ -749,7 +749,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croix!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,9; } @@ -757,7 +757,7 @@ bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ mes "[Swandery]"; mes "Blessed Croix!"; mes "Let's enjoy our glorious victory!"; - mes ""+strcharinfo(0)+", it's a sign reflecting victory."; + mes ""+strcharinfo(PC_NAME)+", it's a sign reflecting victory."; close2; getitem BF_Badge2,.@medal_gap; } diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index 35cd63dc2..c02122c3f 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -14,7 +14,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ /* TODO: This can be optimized with just setmount(), as it can auto-detect the proper mount for the class/skills. */ if (hascashmount()) { - message strcharinfo(0),"You must first remove your mount."; + message strcharinfo(PC_NAME),"You must first remove your mount."; end; } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) { if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { @@ -48,7 +48,7 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ } else if (checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { setmount(MOUNT_MADO); } else { - message strcharinfo(0),"You do not meet requirements to rent."; + message strcharinfo(PC_NAME),"You do not meet requirements to rent."; end; } specialeffect2 EF_TEIHIT3; diff --git a/npc/custom/etc/bank_kafra.txt b/npc/custom/etc/bank_kafra.txt index c4e16a9ec..375a9f611 100644 --- a/npc/custom/etc/bank_kafra.txt +++ b/npc/custom/etc/bank_kafra.txt @@ -20,7 +20,7 @@ - script Bank Clerk::bankg 4_M_ZONDAOYAJI,{ mes"[Maniss]"; - mes strcharinfo(0)+", welcome to the 2nd Bank of Prontera!"; + mes strcharinfo(PC_NAME)+", welcome to the 2nd Bank of Prontera!"; set @kb_int,(gettime(GETTIME_MONTH)*31)+gettime(GETTIME_DAYOFMONTH); //today's number set @income,0; diff --git a/npc/custom/etc/lottery.txt b/npc/custom/etc/lottery.txt index 13d60ec2f..421fccc78 100644 --- a/npc/custom/etc/lottery.txt +++ b/npc/custom/etc/lottery.txt @@ -293,7 +293,7 @@ LWinBig: mes "Jackpot!"; mes "You've won ^0000FF" + $L_Prize_Money + "z^000000."; Zeny += $L_Prize_Money; - announce "Lottery: " + strcharinfo(0) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; + announce "Lottery: " + strcharinfo(PC_NAME) + " has won the JACKPOT of " + $L_Prize_Money + "z!",8; set #LID,0; close; @@ -303,7 +303,7 @@ LWinSmall: mes "You have matched at least 4 numbers!"; mes "You've won ^0000FF" + $L_Prize_Money_Small + "z^000000."; Zeny += $L_Prize_Money_Small; - announce "Lottery: " + strcharinfo(0) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; + announce "Lottery: " + strcharinfo(PC_NAME) + " has won a prize of " + $L_Prize_Money_Small + "z!",8; set #LID,0; close; diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 2af343023..76b0429c8 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -82,11 +82,11 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{ close; } // End official iRO dialog - if (strcharinfo(0) == $wed_groom$) { + if (strcharinfo(PC_NAME) == $wed_groom$) { SF_Groom(); end; } - if (strcharinfo(0) == $wed_bride$) { + if (strcharinfo(PC_NAME) == $wed_bride$) { SF_Bride(); end; } @@ -102,11 +102,11 @@ prt_church,100,123,4 script Vomars 1_M_PASTOR,{ mes "I am going to wed "+$wed_groom$+" and "+$wed_bride$+", do you have an objection to it?"; if (select("Sorry, please go on.","Yes, I actually do.") == 2) { //Abort - npctalk "Ladies and gentlemen, "+strcharinfo(0)+" has an objection to the wedding!"; + npctalk "Ladies and gentlemen, "+strcharinfo(PC_NAME)+" has an objection to the wedding!"; SF_wed_end(); mes "Why should they not be wed?"; input $@msg$; - npctalk strcharinfo(0)+"'s objection is: "+$@msg$; + npctalk strcharinfo(PC_NAME)+"'s objection is: "+$@msg$; emotion e_sob; mes "I see..."; } else @@ -319,7 +319,7 @@ function SF_StartCeremony { set $wed_bride_progress,5; set $wed_groom_progress,5; set $@msg$,$wed_groom$; - if (strcharinfo(0) == $wed_groom$) + if (strcharinfo(PC_NAME) == $wed_groom$) set $@msg$,$wed_bride$; if (marriage($@msg$) == 0) { next; @@ -531,7 +531,7 @@ function SF_Register { } function SF_WedProgress { - if (strcharinfo(0) == $wed_groom$) { + if (strcharinfo(PC_NAME) == $wed_groom$) { mes "["+@name$+"]"; if ($wed_bride_progress > 0) mes "The Priest will handle the rest of the ceremony."; @@ -539,7 +539,7 @@ function SF_WedProgress { mes "Tell your bride to register, what is taking so long? Time is running out."; close; } - if (strcharinfo(0) == $wed_bride$) { + if (strcharinfo(PC_NAME) == $wed_bride$) { mes "["+@name$+"]"; if ($wed_groom_progress > 0) mes "The Priest will handle the rest of the ceremony."; @@ -720,13 +720,13 @@ function SF_TryRegister { sc_start SC_WEDDING,3600000,1; //Start Wedding Effect (SC_WEDDING) if (@bride) { set $wed_bride_progress,1; - set $wed_bride$,strcharinfo(0); + set $wed_bride$,strcharinfo(PC_NAME); $wed_bride_sex = Sex; if ($@wedding_effect == 1) //Store account id for effect. set $wedding_effect_id, getcharid(3); } else { set $wed_groom_progress,1; - set $wed_groom$,strcharinfo(0); + set $wed_groom$,strcharinfo(PC_NAME); $wed_groom_sex = Sex; if ($@wedding_effect == 2) //Store account id for effect. set $wedding_effect_id, getcharid(3); @@ -867,7 +867,7 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{ } mes "["+@name$+"]"; set $@divorcee,getpartnerid(); - set $@divorcer$,strcharinfo(0); + set $@divorcer$,strcharinfo(PC_NAME); set $@divorce_progress,1; initnpctimer; mes "Very well, get your partner to confirm, and I will collect the fee for filing the divorce then."; @@ -877,7 +877,7 @@ prt_church,94,99,4 script Sister Lisa 1_F_PRIEST,{ end; function SF_InProgress { - if (strcharinfo(0) == $@divorcer$) { + if (strcharinfo(PC_NAME) == $@divorcer$) { mes "["+@name$+"]"; mes "...I am still waiting for your partner to confirm the divorce procedure."; close; @@ -912,7 +912,7 @@ function SF_InProgress { close; } Zeny -= $@wed_divorce_fee; - announce $@divorcer$+" has just divorced "+strcharinfo(0)+"...", 8; + announce $@divorcer$+" has just divorced "+strcharinfo(PC_NAME)+"...", 8; mes "["+@name$+"]"; mes "Your divorce has been filed. You are no longer wed."; emotion e_sob; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 3a25679aa..24edd14d9 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -71,27 +71,27 @@ L_Info: // Monster Summon Function // function script monstersummon { // 1. ---Change to Add Monsters--- // - if (#monster == 10) summon strcharinfo(0) + "'s Poring",1002, "OnPoringKilled"; - if (#monster == 20) summon strcharinfo(0) + "'s Fabre",1007, "OnFaberKilled"; - if (#monster == 30) summon strcharinfo(0) + "'s Lunatic",1063, "OnLunaticKilled"; - if (#monster == 31) summon strcharinfo(0) + "'s Drops",1113, "OnDropsKilled"; - if (#monster == 32) summon strcharinfo(0) + "'s Picky",1049, "OnPickyKilled"; - if (#monster == 40) summon strcharinfo(0) + "'s ChonChon",1011, "OnChonChonKilled"; - if (#monster == 41) summon strcharinfo(0) + "'s Super Picky",1050, "OnSPickyKilled"; - if (#monster == 42) summon strcharinfo(0) + "'s Willow",1010, "OnWillowKilled"; - if (#monster == 50) summon strcharinfo(0) + "'s Roda Frog",1012, "OnRodaKilled"; - if (#monster == 51) summon strcharinfo(0) + "'s Condor",1009, "OnCondorKilled"; - if (#monster == 60) summon strcharinfo(0) + "'s Thief Bug Larva",1051, "OnThiefKilled"; - if (#monster == 70) summon strcharinfo(0) + "'s Savage Babe",1167, "OnSavageKilled"; - if (#monster == 80) summon strcharinfo(0) + "'s Familiar",1005, "OnFamiliarKilled"; - if (#monster == 81) summon strcharinfo(0) + "'s Hornet",1004, "OnHornetKilled"; - if (#monster == 90) summon strcharinfo(0) + "'s Desert Wolf Puppy",1107, "OnPuppyKilled"; - if (#monster == 91) summon strcharinfo(0) + "'s Spore",1014, "OnSporeKilled"; - if (#monster == 92) summon strcharinfo(0) + "'s Rocker",1052, "OnRockerKilled"; - if (#monster == 100) summon strcharinfo(0) + "'s Skeleton",1076, "OnSkeletonKilled"; - if (#monster == 101) summon strcharinfo(0) + "'s Plankton",1161, "OnPlanktonKilled"; - if (#monster == 102) summon strcharinfo(0) + "'s Antonio",1247, "OnAntonioKilled"; - if (#monster == 103) summon strcharinfo(0) + "'s Thief Bug Female",1053, "OnThiefFemaleKilled"; + if (#monster == 10) summon strcharinfo(PC_NAME) + "'s Poring",1002, "OnPoringKilled"; + if (#monster == 20) summon strcharinfo(PC_NAME) + "'s Fabre",1007, "OnFaberKilled"; + if (#monster == 30) summon strcharinfo(PC_NAME) + "'s Lunatic",1063, "OnLunaticKilled"; + if (#monster == 31) summon strcharinfo(PC_NAME) + "'s Drops",1113, "OnDropsKilled"; + if (#monster == 32) summon strcharinfo(PC_NAME) + "'s Picky",1049, "OnPickyKilled"; + if (#monster == 40) summon strcharinfo(PC_NAME) + "'s ChonChon",1011, "OnChonChonKilled"; + if (#monster == 41) summon strcharinfo(PC_NAME) + "'s Super Picky",1050, "OnSPickyKilled"; + if (#monster == 42) summon strcharinfo(PC_NAME) + "'s Willow",1010, "OnWillowKilled"; + if (#monster == 50) summon strcharinfo(PC_NAME) + "'s Roda Frog",1012, "OnRodaKilled"; + if (#monster == 51) summon strcharinfo(PC_NAME) + "'s Condor",1009, "OnCondorKilled"; + if (#monster == 60) summon strcharinfo(PC_NAME) + "'s Thief Bug Larva",1051, "OnThiefKilled"; + if (#monster == 70) summon strcharinfo(PC_NAME) + "'s Savage Babe",1167, "OnSavageKilled"; + if (#monster == 80) summon strcharinfo(PC_NAME) + "'s Familiar",1005, "OnFamiliarKilled"; + if (#monster == 81) summon strcharinfo(PC_NAME) + "'s Hornet",1004, "OnHornetKilled"; + if (#monster == 90) summon strcharinfo(PC_NAME) + "'s Desert Wolf Puppy",1107, "OnPuppyKilled"; + if (#monster == 91) summon strcharinfo(PC_NAME) + "'s Spore",1014, "OnSporeKilled"; + if (#monster == 92) summon strcharinfo(PC_NAME) + "'s Rocker",1052, "OnRockerKilled"; + if (#monster == 100) summon strcharinfo(PC_NAME) + "'s Skeleton",1076, "OnSkeletonKilled"; + if (#monster == 101) summon strcharinfo(PC_NAME) + "'s Plankton",1161, "OnPlanktonKilled"; + if (#monster == 102) summon strcharinfo(PC_NAME) + "'s Antonio",1247, "OnAntonioKilled"; + if (#monster == 103) summon strcharinfo(PC_NAME) + "'s Thief Bug Female",1053, "OnThiefFemaleKilled"; close; } @@ -146,46 +146,46 @@ L_Start: // Special Summons // Special1: - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; - summon strcharinfo(0) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; + summon strcharinfo(PC_NAME) + "'s Assault Team",1002, "OnPoringKilled"; close; Special2: - summon strcharinfo(0) + "'s Mastering",1090, "OnSpecialKilled"; + summon strcharinfo(PC_NAME) + "'s Mastering",1090, "OnSpecialKilled"; close; Special3: - summon strcharinfo(0) + "'s Eclipse",1093, "OnSpecialKilled"; + summon strcharinfo(PC_NAME) + "'s Eclipse",1093, "OnSpecialKilled"; close; Special4: - summon strcharinfo(0) + "'s Dragon Fly",1091, "OnSpecialKilled"; + summon strcharinfo(PC_NAME) + "'s Dragon Fly",1091, "OnSpecialKilled"; close; Special5: - summon strcharinfo(0) + "'s Toad",1089, "OnSpecialKilled"; + summon strcharinfo(PC_NAME) + "'s Toad",1089, "OnSpecialKilled"; close; L_Exit: @@ -222,7 +222,7 @@ L_High: close2; savepoint "gon_test",56,99; set @battle,1; - atcommand strcharinfo(0) + "@option 64 0 64"; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",72,87; end; @@ -230,7 +230,7 @@ L_4to6: close2; savepoint "gon_test",56,99; set @battle,1; - atcommand strcharinfo(0) + "@option 64 0 64"; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",57,86; end; @@ -238,7 +238,7 @@ L_1to3: close2; savepoint "gon_test",56,99; set @battle,1; - atcommand strcharinfo(0) + "@option 64 0 64"; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",43,87; end; @@ -246,7 +246,7 @@ L_Exit: close2; savepoint "prontera",149,186; set @battle,0; - atcommand strcharinfo(0) + "@option 0 0 0"; + atcommand strcharinfo(PC_NAME) + "@option 0 0 0"; warp "prontera",149,186; end; @@ -254,7 +254,7 @@ L_Spec: close2; savepoint "gon_test",56,99; set @battle,0; - atcommand strcharinfo(0) + "@option 0 0 0"; + atcommand strcharinfo(PC_NAME) + "@option 0 0 0"; warp "gon_test",57,99; end; @@ -296,7 +296,7 @@ gon_test,52,103,6 script Monster Trainer 4_M_BARBER,{ close; L_Mon: - mes "Welcome back, " + strcharinfo(0) + "."; + mes "Welcome back, " + strcharinfo(PC_NAME) + "."; mes "Your monster has " + #monpoints + " exp points."; next; if (@fighting == 1) goto L_Heal; @@ -712,10 +712,10 @@ gon_test,56,91,6 script OnSpecialKilled FAKE_NPC,{ } function script duelkill { - if (strcharinfo(0) == $@duelist1$ || strcharinfo(0) == $@duelist2$) goto L_Heal; + if (strcharinfo(PC_NAME) == $@duelist1$ || strcharinfo(PC_NAME) == $@duelist2$) goto L_Heal; end; L_Heal: - announce strcharinfo(0) + " won the Duel",1; + announce strcharinfo(PC_NAME) + " won the Duel",1; set @fighting,0; set #heal,0; set @healing,0; @@ -723,7 +723,7 @@ L_Heal: } function script illegalkill { - announce "Illegal Kill by " + strcharinfo(0) + " Detected",1; + announce "Illegal Kill by " + strcharinfo(PC_NAME) + " Detected",1; percentheal -100,-100; end; } @@ -790,10 +790,10 @@ gon_test,58,103,5 script Duel Master#01 4_F_03,{ if (#monster > 79 && #monster < 90) set $@monster1,8; if (#monster > 89 && #monster < 100) set $@monster1,9; if (#monster > 99 && #monster < 110) set $@monster1,10; - set $@duelist1$,strcharinfo(0); + set $@duelist1$,strcharinfo(PC_NAME); set @battle,1; - announce strcharinfo(0) + " [Monster Level: " + $@monster1 + "] is waiting for a duel",1; - atcommand strcharinfo(0) + "@option 64 0 64"; + announce strcharinfo(PC_NAME) + " [Monster Level: " + $@monster1 + "] is waiting for a duel",1; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",49,5; close; @@ -818,10 +818,10 @@ L_Duel2: if (#monster > 79 && #monster < 90) set $@monster2,8; if (#monster > 89 && #monster < 100) set $@monster2,9; if (#monster > 99 && #monster < 110) set $@monster2,10; - set $@duelist2$,strcharinfo(0); + set $@duelist2$,strcharinfo(PC_NAME); set @battle,1; - announce strcharinfo(0) + " [Monster Level: " + $@monster2 + "] has joined the duel",1; - atcommand strcharinfo(0) + "@option 64 0 64"; + announce strcharinfo(PC_NAME) + " [Monster Level: " + $@monster2 + "] has joined the duel",1; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",49,5; close; @@ -834,7 +834,7 @@ L_Dueling: L_Spec: set @battle,0; - atcommand strcharinfo(0) + "@option 64 0 64"; + atcommand strcharinfo(PC_NAME) + "@option 64 0 64"; warp "gon_test",49,5; close; @@ -863,11 +863,11 @@ gon_test,42,8,5 script Duel Master#02 4_F_03,{ close; L_Leave: - if ($@duelist1$ == strcharinfo(0)) goto L_Leave1; - if ($@duelist2$ == strcharinfo(0)) goto L_Leave2; + if ($@duelist1$ == strcharinfo(PC_NAME)) goto L_Leave1; + if ($@duelist2$ == strcharinfo(PC_NAME)) goto L_Leave2; L_Leave3: - atcommand strcharinfo(0) + "@option 0 0 0"; + atcommand strcharinfo(PC_NAME) + "@option 0 0 0"; set @battle,0; warp "gon_test",57,99; close; @@ -876,14 +876,14 @@ L_Leave1: set $@duelist1$,$@duelist2$; set $@monster1,$@monster2; set $@duel,$@duel-1; - announce strcharinfo(0) + " stopped dueling",1; + announce strcharinfo(PC_NAME) + " stopped dueling",1; goto L_Leave3; L_Leave2: set $@duelist2$,""; set $@monster2,0; set $@duel,$@duel-1; - announce strcharinfo(0) + " stopped dueling",1; + announce strcharinfo(PC_NAME) + " stopped dueling",1; goto L_Leave3; } diff --git a/npc/custom/etc/morroc_raceway.txt b/npc/custom/etc/morroc_raceway.txt index 87f91ff7e..745b1d779 100644 --- a/npc/custom/etc/morroc_raceway.txt +++ b/npc/custom/etc/morroc_raceway.txt @@ -74,7 +74,7 @@ L_Menu: addtimer 2000, "Starter::OnCount2000"; addtimer 3000, "Starter::OnCount3000"; addtimer 4000, "Starter::OnCount4000"; - announce strcharinfo(0) + "Started a countdown",1; + announce strcharinfo(PC_NAME) + "Started a countdown",1; announce "Get ready to race!",1; close; @@ -135,7 +135,7 @@ pvp_y_1-5,73,247,5 script Check Point 2 HIDDEN_NPC,6,6,{ OnTouch: if (@race != 1) goto L_Miss; set @race,2; - announce "[" + strcharinfo(0) +"] has reached Checkpoint [1]",1; + announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [1]",1; end; L_Miss: mes "You have missed a Checkpoint. Please go back."; @@ -148,7 +148,7 @@ pvp_y_1-5,77,44,5 script Check Point 3 HIDDEN_NPC,6,6,{ OnTouch: if (@race != 2) goto L_Miss; set @race,3; - announce "[" + strcharinfo(0) +"] has reached Checkpoint [2]",1; + announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [2]",1; end; L_Miss: mes "You have missed a Checkpoint. Please go back."; @@ -161,7 +161,7 @@ pvp_y_1-5,249,60,5 script Check Point 4 HIDDEN_NPC,6,6,{ OnTouch: if (@race != 3) goto L_Miss; set @race,4; - announce "[" + strcharinfo(0) +"] has reached Checkpoint [3]",1; + announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [3]",1; end; L_Miss: mes "You have missed a Checkpoint. Please go back."; @@ -174,7 +174,7 @@ pvp_y_1-5,255,256,5 script Check Point 5 HIDDEN_NPC,6,6,{ OnTouch: if (@race != 4) goto L_Miss; set @race,5; - announce "[" + strcharinfo(0) +"] has reached Checkpoint [4]",1; + announce "[" + strcharinfo(PC_NAME) +"] has reached Checkpoint [4]",1; end; L_Miss: mes "You have missed a Checkpoint. Please go back."; @@ -189,7 +189,7 @@ OnTouch: if (@race != 5) goto L_Miss; set @race,6; set $@position,$@position+1; - announce "[" + strcharinfo(0) +"] has reached The Finish line! [Position: " + $@position + "]",1; + announce "[" + strcharinfo(PC_NAME) +"] has reached The Finish line! [Position: " + $@position + "]",1; end; L_Miss: mes "You have missed a Checkpoint. Please go back."; diff --git a/npc/custom/etc/shifty_assassin.txt b/npc/custom/etc/shifty_assassin.txt index ccc9810c3..4acf7c8ac 100644 --- a/npc/custom/etc/shifty_assassin.txt +++ b/npc/custom/etc/shifty_assassin.txt @@ -116,7 +116,7 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ set #ninjasr,@number-@ninjasurvived; mes "Your attack failed and only ^FF0000" + #ninjasr + "^000000 Ninjas survived."; - announce @name$+" has survived " + strcharinfo(0) +"'s Ninja attack.",8; + announce @name$+" has survived " + strcharinfo(PC_NAME) +"'s Ninja attack.",8; close; } // SUCCESSFUL ATTACK // @@ -127,8 +127,8 @@ morocc,148,86,5 script Shifty Assassin 4_F_JOB_ASSASSIN,{ set #ninjasr,@number-@ninjasurvived; mes "Your attack succeeded but only ^FF0000" + #ninjasr + "^000000 Ninjas survived."; - atcommand strcharinfo(0) + "@kill "+@name$; - announce @name$+" has been assassinated by " + strcharinfo(0) +"'s Ninjas.",bc_npc; + atcommand strcharinfo(PC_NAME) + "@kill "+@name$; + announce @name$+" has been assassinated by " + strcharinfo(PC_NAME) +"'s Ninjas.",bc_npc; close; case 3: mes "[Shifty Assassin]"; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index 2388d239d..f0967590b 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -41,7 +41,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ if (rand(50) < 4) { npctalk "WOOF!..........."; specialeffect2 72; - announce "[Cluck! Cluck! Boom!] " + strcharinfo(0) + " squeezed out the prize! Well done!",0; + announce "[Cluck! Cluck! Boom!] " + strcharinfo(PC_NAME) + " squeezed out the prize! Well done!",0; getitem $cluck_item_id,$cluck_item_amount; set .startcluck,0; } else { @@ -54,7 +54,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ } mes "[Cluckers]"; if (getgmlevel() >= .@GMAccess) { - mes "Cluck cluck! Cluuuuuck? ^FF0000~Hi GM " + strcharinfo(0) + ", Wanna play today?~^000000"; + mes "Cluck cluck! Cluuuuuck? ^FF0000~Hi GM " + strcharinfo(PC_NAME) + ", Wanna play today?~^000000"; mes "Cluck cluck... CLUCK! ^FF0000~Just tell me what to do!~^000000"; next; while(1) switch(select("Start Event", "Check Prize", "Set Prize", "Not today Cluckers")) { diff --git a/npc/custom/events/disguise.txt b/npc/custom/events/disguise.txt index 476a21f27..cd44d1767 100644 --- a/npc/custom/events/disguise.txt +++ b/npc/custom/events/disguise.txt @@ -233,7 +233,7 @@ iCorrect: deletepset 1; activatepset 1; getitem .Prize,.PrizeAmt; - announce strcharinfo(0)+" is correct! I was disguised as: "+$MonsterName$+"",bc_map | bc_blue; + announce strcharinfo(PC_NAME)+" is correct! I was disguised as: "+$MonsterName$+"",bc_map | bc_blue; if (.RoundCount>=.Rounds) { setnpcdisplay "Disguise Event", 4_M_NFDEADMAN; set .RoundCount,0; set .Change,0; set .EventON,0; diff --git a/npc/custom/events/mushroom_event.txt b/npc/custom/events/mushroom_event.txt index 6a8cbc59d..b9c54c09e 100644 --- a/npc/custom/events/mushroom_event.txt +++ b/npc/custom/events/mushroom_event.txt @@ -51,7 +51,7 @@ OnMinute10: // Start time (every hour) OnMobKilled: set .Spawn, .Spawn - 1; getitem .Prize, .Amount; - if (.Spawn) announce "[ "+strcharinfo(0)+" ] has killed a Mushroom. There are now "+.Spawn+" Mushroom(s) left.",bc_map; + if (.Spawn) announce "[ "+strcharinfo(PC_NAME)+" ] has killed a Mushroom. There are now "+.Spawn+" Mushroom(s) left.",bc_map; else { announce "The Find the Mushroom Event has ended. All the Mushrooms have been killed.",0; set .status,0; diff --git a/npc/custom/events/uneasy_cemetery.txt b/npc/custom/events/uneasy_cemetery.txt index 72ae51fc2..a2e746f20 100644 --- a/npc/custom/events/uneasy_cemetery.txt +++ b/npc/custom/events/uneasy_cemetery.txt @@ -44,7 +44,7 @@ OnZombieDead: set $@UNEASY_MOB,$@UNEASY_MOB-1; if ($@UNEASY_MOB>0) end; set $UNEASY_DL,0; - set $UNEASY_H$,strcharinfo(0); + set $UNEASY_H$,strcharinfo(PC_NAME); if (Sex == SEX_MALE) mapannounce "prontera","[Mother Mathana]: Brave "+$UNEASY_H$+" has just killed the last undead in Prontera!",0; else @@ -70,15 +70,15 @@ prontera,257,313,5 script Mother Mathana 1_F_PRIEST,{ mes "[Mother Mathana]"; if ($UNEASY_DL <= 0) goto L_Undead_Walk; mes "I'm afraid there's something wrong with our old cemetery..."; - if ($UNEASY_H$==strcharinfo(0)) mes "But thanks to you, "+$UNEASY_H$+", we'll be able to sleep " + $UNEASY_DL + " nights!"; - if ($UNEASY_H$!=strcharinfo(0)) mes "But thanks to "+$UNEASY_H$+"'s support, we've got " + $UNEASY_DL + " easy nights!"; + if ($UNEASY_H$==strcharinfo(PC_NAME)) mes "But thanks to you, "+$UNEASY_H$+", we'll be able to sleep " + $UNEASY_DL + " nights!"; + if ($UNEASY_H$!=strcharinfo(PC_NAME)) mes "But thanks to "+$UNEASY_H$+"'s support, we've got " + $UNEASY_DL + " easy nights!"; emotion 0; close; L_Undead_Walk: if ($UNEASY_DL == 0) mes "THEY could return tomorrow's night again!"; - if ($UNEASY_DL == 0 && $UNEASY_H$==strcharinfo(0)) mes "Thank you, "+$UNEASY_H$+"! Now we'll manage to rest till the next midnight!"; - if ($UNEASY_DL == 0 && $UNEASY_H$!=strcharinfo(0)) mes "But due to "+$UNEASY_H$+"'s help we'll manage to rest till the next midnight!"; + if ($UNEASY_DL == 0 && $UNEASY_H$==strcharinfo(PC_NAME)) mes "Thank you, "+$UNEASY_H$+"! Now we'll manage to rest till the next midnight!"; + if ($UNEASY_DL == 0 && $UNEASY_H$!=strcharinfo(PC_NAME)) mes "But due to "+$UNEASY_H$+"'s help we'll manage to rest till the next midnight!"; mes "To calm down the restless cemetery, we should pour all these graves with the Holy Water. But our sisters and broters have run out of it."; mes "Could you supply us with Holy Water?"; next; @@ -91,12 +91,12 @@ L_Undead_Walk: if ($UNEASY_BL > 0) { mes "[Mother Mathana]"; - mes "Thank you, good "+strcharinfo(0)+", but we still need " + $UNEASY_BL + " more Holy Water bottles."; + mes "Thank you, good "+strcharinfo(PC_NAME)+", but we still need " + $UNEASY_BL + " more Holy Water bottles."; close; } //set quiet days!!! no more undead for this period! set $UNEASY_DL,5+((0-$UNEASY_BL)/30); - set $UNEASY_H$,strcharinfo(0); + set $UNEASY_H$,strcharinfo(PC_NAME); mes "[Mother Mathana]"; mes "Thank you, "+$UNEASY_H$+"! Now we've got enough Holy Water!"; next; diff --git a/npc/custom/events/xmas_rings_event.txt b/npc/custom/events/xmas_rings_event.txt index d76c0a784..05e4f40f6 100644 --- a/npc/custom/events/xmas_rings_event.txt +++ b/npc/custom/events/xmas_rings_event.txt @@ -128,7 +128,7 @@ louyang,224,249,4 script Sneewy 4_F_KID3,{ } set Q_XMSRINGS,2; delitem 644,4; - getnameditem 2637,strcharinfo(0); + getnameditem 2637,strcharinfo(PC_NAME); emotion e_kis2; mes "Thank you! Here's my li'l something for you!"; next; @@ -178,7 +178,7 @@ izlu2dun,133,160,2 script Snoowy 4_F_06,{ } set Q_XMSRINGS,3; delitem 644,3; - getnameditem 2636,strcharinfo(0); + getnameditem 2636,strcharinfo(PC_NAME); emotion e_kis; mes "Thaank yoouu! Have this magic ring!"; close; diff --git a/npc/custom/healer.txt b/npc/custom/healer.txt index 22b505741..97c4e7284 100644 --- a/npc/custom/healer.txt +++ b/npc/custom/healer.txt @@ -20,7 +20,7 @@ if (@HD > gettimetick(2)) end; if (.@price) { - message strcharinfo(0),"Healing costs "+.@price+" Zeny."; + message strcharinfo(PC_NAME),"Healing costs "+.@price+" Zeny."; if (Zeny < .@price) end; if(select("^0055FFHeal^000000", "^777777Cancel^000000") == 2) close; Zeny -= .@price; diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index d39bfe802..66b37f4e7 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -25,7 +25,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ } mes "What kind of bind?"; .@boundtype = 1 << (select("Account", "Guild", "Character")-1); - if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(0))) { + if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME))) { mes "In order for me to bind an item to a guild you must be the master of one."; close; } @@ -92,7 +92,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ next; for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) { if(@inventorylist_id[.@item] == @bound_items[.@i] && - (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(0)) + (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME)) ) { mes "I will only unbind guild bound items that the guild master requests."; close; diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index ad18a73f5..dc4e20f79 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -24,7 +24,7 @@ prontera,152,187,6 script Hunting Missions 4_F_EDEN_MASTER,{ function Chk; function Cm; mes "[Hunting Missions]"; - mes "Hello, "+strcharinfo(0)+"!"; + mes "Hello, "+strcharinfo(PC_NAME)+"!"; if (!#Mission_Delay) { next; mes "[Hunting Missions]"; diff --git a/npc/custom/quests/quest_shop.txt b/npc/custom/quests/quest_shop.txt index 2db3b069a..f96b4cb75 100644 --- a/npc/custom/quests/quest_shop.txt +++ b/npc/custom/quests/quest_shop.txt @@ -96,7 +96,7 @@ OnMenu: } deletearray @i[0],getarraysize(@i); if (.Shops$[.@i] == "") { - message strcharinfo(0),"An error has occurred."; + message strcharinfo(PC_NAME),"An error has occurred."; end; } dispbottom "Select one item at a time."; @@ -110,7 +110,7 @@ OnBuyItem: copyarray .@q[3],getd(".q_"+.@q[0]+"[0]"),getarraysize(getd(".q_"+.@q[0])); set .@q[2],.@q[1]*.@q[3]; if (!.@q[2] || .@q[2] > 30000) { - message strcharinfo(0),"You can't purchase that many "+getitemname(.@q[0])+"."; + message strcharinfo(PC_NAME),"You can't purchase that many "+getitemname(.@q[0])+"."; end; } mes "[Quest Shop]"; @@ -143,7 +143,7 @@ OnBuyItem: if (.@q[6]) for(set .@i,6; .@i<getarraysize(.@q); set .@i,.@i+2) delitem .@q[.@i],.@q[.@i+1]*.@q[1]; getitem .@q[0],.@q[2]; - if (.Announce) announce strcharinfo(0)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0; + if (.Announce) announce strcharinfo(PC_NAME)+" has created "+((.@q[2] > 1)?.@q[2]+"x "+getitemname(.@q[0]):A_An(getitemname(.@q[0])))+"!",0; specialeffect2 EF_FLOWERLEAF; close; case 2: diff --git a/npc/custom/quests/thq/THQS_ChatingNPC.txt b/npc/custom/quests/thq/THQS_ChatingNPC.txt index 24e3f7410..2ea65e3c9 100644 --- a/npc/custom/quests/thq/THQS_ChatingNPC.txt +++ b/npc/custom/quests/thq/THQS_ChatingNPC.txt @@ -66,11 +66,11 @@ N_Member: mes "Well unless you are reading the code :)"; close; N_Chat1: - mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+"."; + mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(PC_NAME)+"."; mes "Did you hear about that brave man that went into Glast Heim alone?! He must be crazy."; close; N_Chat2: - mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest."; + mes ""+strcharinfo(PC_NAME)+" don't you have something better you could be doing? Like a quest."; close; } //another usless member @@ -82,12 +82,12 @@ yuno_in01,25,162,6 script Female Wizard 2_F_MAGICMASTER,{ N_Member: set @temp,rand(2); if (@temp == 1) goto N_Chat; - mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(0)+"."; + mes "Ahh welcome fellow Treasure Hunter "+strcharinfo(PC_NAME)+"."; mes "Did you hear about that goat man running around in the trees?"; mes " "; mes "Aperently his name is Baphomet and he has been runing around the Forest Maze out side of prontera for quite some time now."; close; N_Chat: - mes ""+strcharinfo(0)+" don't you have something better you could be doing? Like a quest."; + mes ""+strcharinfo(PC_NAME)+" don't you have something better you could be doing? Like a quest."; close; } diff --git a/npc/custom/quests/thq/THQS_GuildNPC.txt b/npc/custom/quests/thq/THQS_GuildNPC.txt index 05379e345..5a7c4883b 100644 --- a/npc/custom/quests/thq/THQS_GuildNPC.txt +++ b/npc/custom/quests/thq/THQS_GuildNPC.txt @@ -20,7 +20,7 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ if (Event_THQS==1) goto N_AlreadyReg; mes "[Keegan]"; - mes "Well "+strcharinfo(0)+" if you want to be a Treasure Hunter first you must."; + mes "Well "+strcharinfo(PC_NAME)+" if you want to be a Treasure Hunter first you must."; mes " "; mes "^FF00001.^000000 You well be changed ^FF000025,000z^000000 for basic training and your proof of being a member."; mes " "; @@ -49,13 +49,13 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ if (Event_THQS!=1) goto A_NeedReg; mes "[Keegan]"; - mes "Well "+strcharinfo(0)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there."; + mes "Well "+strcharinfo(PC_NAME)+" if you wish to take a quest go talk to the fellow Treasure Hunter in the other room there."; close; case 3: if (Event_THQS!=1) goto N_NeedMem; mes "[Keegan]"; - mes "Yes "+strcharinfo(0)+" I will take you to our shop right away!"; + mes "Yes "+strcharinfo(PC_NAME)+" I will take you to our shop right away!"; next; warp "prt_in",166,171; close; @@ -66,7 +66,7 @@ yuno_in01,124,164,6 script Guild Leader 1_M_PRON_KING,{ } N_NoZeny: mes "[Keegan]"; - mes "Hmmm you don't seem to have ^FF000025,000z^000000 "+strcharinfo(0)+". Please come back when you do."; + mes "Hmmm you don't seem to have ^FF000025,000z^000000 "+strcharinfo(PC_NAME)+". Please come back when you do."; close; N_AlreadyReg: mes "[Keegan]"; diff --git a/npc/custom/quests/thq/THQS_QuestNPC.txt b/npc/custom/quests/thq/THQS_QuestNPC.txt index 606559e74..1bbe8fd7a 100644 --- a/npc/custom/quests/thq/THQS_QuestNPC.txt +++ b/npc/custom/quests/thq/THQS_QuestNPC.txt @@ -18,11 +18,11 @@ yuno_in01,112,151,6 script Quest Manager 1_M_SIZ,{ mes "[Guy]"; - mes "Welcome to the Treasure Hunters Guild "+strcharinfo(0)+"."; + mes "Welcome to the Treasure Hunters Guild "+strcharinfo(PC_NAME)+"."; next; if (On_Quest == 0) goto N_NewQuest; mes "[Guy]"; - mes "Look " +strcharinfo(0)+ ", you can only 1 quest at a time, you should finish the quest unless you have given up."; + mes "Look " +strcharinfo(PC_NAME)+ ", you can only 1 quest at a time, you should finish the quest unless you have given up."; mes "Giving up will cost you ^FF00002500z^000000."; next; if (select("No, never would I leave a quest!", "Yah I'm pathetic... Pay 2500z") == 1) { diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index 55037eb5c..bc81fb24b 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -433,7 +433,7 @@ N_QuestComp: mes "[Czhore]"; mes "Thank god!"; mes " "; - mes "I'm so happy to see one of these Emperiums! Thank you "+strcharinfo(0)+"."; + mes "I'm so happy to see one of these Emperiums! Thank you "+strcharinfo(PC_NAME)+"."; next; mes "[Czhore]"; mes "Here have these 2 Treasure Tokens."; @@ -668,7 +668,7 @@ prontera,123,208,6 script Little Girl#thq 4_F_KID3,{ if (seven_qset == 1) goto N_QuestStart; if (eight_qset == 1) goto N_QuestStart2; mes "[Girl]"; - mes "Hello mister "+strcharinfo(0)+"."; + mes "Hello mister "+strcharinfo(PC_NAME)+"."; close; N_QuestComp: mes "[Girl]"; @@ -694,7 +694,7 @@ alberta,101,84,6 script Charles 1_M_02,{ if (seven_qset == 2 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (seven_qset == 2) goto N_QuestStart; mes "[Charles]"; - mes "Hello "+strcharinfo(0)+" welcome to Alberta."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to Alberta."; close; N_QuestComp: mes "[Charles]"; @@ -782,7 +782,7 @@ morocc,165,55,6 script Klye 1_M_02,{ if (eight_qset == 2 && countitem(Merchant_Box_1) > 0) goto N_QuestComp; if (eight_qset == 2) goto N_QuestStart; mes "[Klye]"; - mes "Hello "+strcharinfo(0)+"."; + mes "Hello "+strcharinfo(PC_NAME)+"."; close; N_QuestComp: mes "[Klye]"; @@ -858,7 +858,7 @@ geffen_in,168,124,6 script Mage 1_M_02,{ if (nine_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (nine_qset == 1) goto N_QuestStart; mes "[Mage]"; - mes "Hello "+strcharinfo(0)+" welcome to the Mage Guild."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to the Mage Guild."; close; N_QuestComp: mes "[Mage]"; @@ -873,7 +873,7 @@ N_QuestComp: close; N_QuestStart: mes "[Mage]"; - mes "Hello "+strcharinfo(0)+", Where is my box of Toad Tounges?."; + mes "Hello "+strcharinfo(PC_NAME)+", Where is my box of Toad Tounges?."; close; } //9-2; @@ -955,7 +955,7 @@ morocc,193,51,6 script Kreg 1_M_02,{ if (ten_qset == 1 && countitem(Merchant_Box_2) > 0) goto N_QuestComp; if (ten_qset == 1) goto N_QuestStart; mes "[Kreg]"; - mes "Hello "+strcharinfo(0)+" welcome to Morroc."; + mes "Hello "+strcharinfo(PC_NAME)+" welcome to Morroc."; close; N_QuestComp: mes "[Kreg]"; diff --git a/npc/custom/quests/thq/THQS_TTShop.txt b/npc/custom/quests/thq/THQS_TTShop.txt index 9883950a1..c85a9c9fe 100644 --- a/npc/custom/quests/thq/THQS_TTShop.txt +++ b/npc/custom/quests/thq/THQS_TTShop.txt @@ -154,7 +154,7 @@ function script ths_menu_weapons { // Main script prt_in,164,174,1 script Treasure Hunter's Shop 1_M_YOUNGKNIGHT,{ mes "[Ash]"; - mes "Ahh, "+strcharinfo(0)+"! Welcome to the Offical Treasure Hunter's Guild Shop."; + mes "Ahh, "+strcharinfo(PC_NAME)+"! Welcome to the Offical Treasure Hunter's Guild Shop."; mes "You currently have ^FF0000"+#Treasure_Token+"^000000 treasure tokens!!!"; next; switch( select("How does this place work?","What do you have in stock?","Nevermind") ) { diff --git a/npc/custom/stylist.txt b/npc/custom/stylist.txt index 37661ccb9..0ee7d8822 100644 --- a/npc/custom/stylist.txt +++ b/npc/custom/stylist.txt @@ -19,12 +19,12 @@ prontera,170,180,1 script Stylist#custom_stylist 2_M_DYEINGER,{ set .@style,1; while(1) { setlook .@Look[.@s], .@style; - message strcharinfo(0),"This is style #"+.@style+"."; + message strcharinfo(PC_NAME),"This is style #"+.@style+"."; set .@menu$, " ~ Next (^0055FF"+((.@style!=.@styles[.@s])?.@style+1:1)+"^000000): ~ Previous (^0055FF"+((.@style!=1)?.@style-1:.@styles[.@s])+"^000000): ~ Jump to...: ~ Revert to original (^0055FF"+.@Revert+"^000000)"; switch(select(.@menu$)) { case 1: set .@style, ((.@style!=.@styles[.@s])?.@style+1:1); break; case 2: set .@style, ((.@style!=1)?.@style-1:.@styles[.@s]); break; - case 3: message strcharinfo(0),"Choose a style between 1 - "+.@styles[.@s]+"."; + case 3: message strcharinfo(PC_NAME),"Choose a style between 1 - "+.@styles[.@s]+"."; input .@style,0,.@styles[.@s]; if (!.@style) set .@style, rand(1,.@styles[.@s]); break; diff --git a/npc/custom/warper.txt b/npc/custom/warper.txt index d240a2730..70bab9400 100644 --- a/npc/custom/warper.txt +++ b/npc/custom/warper.txt @@ -35,7 +35,7 @@ menu "Last Warp ^777777["+lastwarp$+"]^000000",-, " ~ Special Areas",Special; if (lastwarp$ == "") - message strcharinfo(0),"You haven't warped anywhere yet."; + message strcharinfo(PC_NAME),"You haven't warped anywhere yet."; else warp lastwarp$,lastwarpx,lastwarpy; end; @@ -92,7 +92,7 @@ function Pick { .@map$ = getarg(0)+((.@i<10)?"0":"")+.@i; } if (.@warp_block & (1<<.@select)) { - message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal."; + message strcharinfo(PC_NAME),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal."; end; } .@x = @c[.@i*2]; @@ -107,7 +107,7 @@ function Restrict { for (.@i = 1; .@i < getargcount(); .@i++) @warp_block = @warp_block | (1<<getarg(.@i)); } else { - message strcharinfo(0),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal."; + message strcharinfo(PC_NAME),"This map is not enabled in "+(RENEWAL?"":"Pre-")+"Renewal."; end; } } diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index b0836820f..e109951d7 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -192,13 +192,13 @@ OnReward: return; OnPCLoadMapEvent: - if (!compare(strcharinfo(3),"g_cas")) end; - if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(3),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(3))))) { - if (getcharid(2) && getcastledata(strcharinfo(3),1) == getcharid(2)) end; + if (!compare(strcharinfo(PC_MAP),"g_cas")) end; + if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(PC_MAP),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(PC_MAP))))) { + if (getcharid(2) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(2)) end; sleep2 1000; - message strcharinfo(0), getcastlename(strcharinfo(3))+" is currently inactive."; + message strcharinfo(PC_NAME), getcastlename(strcharinfo(PC_MAP))+" is currently inactive."; sleep2 5000; - if (compare(strcharinfo(3),"g_cas")) warp "SavePoint",0,0; + if (compare(strcharinfo(PC_MAP),"g_cas")) warp "SavePoint",0,0; } end; |