diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/Changelog.txt | 1 | ||||
| -rw-r--r-- | npc/guild/agit_template.txt | 11 | ||||
| -rw-r--r-- | npc/jobs/2-2/alchemist.txt | 4 | ||||
| -rw-r--r-- | npc/other/turbotrack/Normal_Solo.txt | 2 | ||||
| -rw-r--r-- | npc/quests/quests_gonryun.txt | 2 | ||||
| -rw-r--r-- | npc/quests/seals/brisingamen_seal.txt | 2 | ||||
| -rw-r--r-- | npc/quests/skills/assassin_skills.txt | 2 |
7 files changed, 8 insertions, 16 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 3ce8015ea..68972dcc2 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -2,6 +2,7 @@ Date Added ====== 2008/06/03 * Rev. 12754 Fixed a typo in schg_cas01 treasure spawning. [L0ne_W0lf] + * Changed more "+ name +" to "+ strcharinfo(0) +" in some NPC [Lupus] 2008/05/31 * Rev. 12750 Fixed bug in eye of hellion quests (bugreport:1581) [L0ne_W0lf] * Fixed the position of one of the Splendid (spl) warps. (Bugreport:1585) diff --git a/npc/guild/agit_template.txt b/npc/guild/agit_template.txt index 89b6acf2f..ae9251609 100644 --- a/npc/guild/agit_template.txt +++ b/npc/guild/agit_template.txt @@ -621,16 +621,7 @@ OnRecvCastle: } } set .@menu$,.@gname$[0]+":"+.@gname$[1]+":"+.@gname$[2]+":"+.@gname$[3]+":"+.@gname$[4]+":"+.@gname$[5]+":"+.@gname$[6]+":"+.@gname$[7]; - switch(select(.@menu$)) { - case 1: set .@GDnum,10; break; - case 2: set .@GDnum,11; break; - case 3: set .@GDnum,12; break; - case 4: set .@GDnum,13; break; - case 5: set .@GDnum,14; break; - case 6: set .@GDnum,15; break; - case 7: set .@GDnum,16; break; - case 8: set .@GDnum,17; break; - } + set .@GDnum,select(.@menu$)+9; mes "[ Steward " + .@name$ + " ]"; mes "Will you summon the chosen guardian? 10000 zeny is required to summon."; next; diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index b2c21d337..67c00f6ab 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -35,7 +35,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{ } if (BaseJob != Job_Merchant) { if (BaseJob == Job_Alchemist) { - mes "Welcome, " + name + "."; + mes "Welcome, " + strcharinfo(0) + "."; mes "The Alchemist Union"; mes "is busy today, like always."; next; @@ -177,7 +177,7 @@ alde_alche,27,185,5 script Alchemist Guildsman#am 744,{ set zeny,zeny-50000; mes "[Parmy Gianino]"; mes "Let's see."; - mes "" + name + ""; + mes "" + strcharinfo(0); mes "needs to bring..."; switch(rand(1,3)) { case 1: diff --git a/npc/other/turbotrack/Normal_Solo.txt b/npc/other/turbotrack/Normal_Solo.txt index 2be224c29..208abbbcc 100644 --- a/npc/other/turbotrack/Normal_Solo.txt +++ b/npc/other/turbotrack/Normal_Solo.txt @@ -855,7 +855,7 @@ OnTouch: turbo_n_1,232,14,0 script cos_n_1_8 45,1,1,{ OnTouch: - mapannounce "turbo_n_1","" + name +" has just passed the Invisible Maze! Speed up, you're getting closer to the finish!",bc_map,"0x70DBDB"; + mapannounce "turbo_n_1","" + strcharinfo(0) +" has just passed the Invisible Maze! Speed up, you're getting closer to the finish!",bc_map,"0x70DBDB"; set .@move1,rand(1,3); if (.@move1 == 1) warp "turbo_n_1",307,52; diff --git a/npc/quests/quests_gonryun.txt b/npc/quests/quests_gonryun.txt index 8862e8763..7e825ccce 100644 --- a/npc/quests/quests_gonryun.txt +++ b/npc/quests/quests_gonryun.txt @@ -2100,7 +2100,7 @@ gon_dun03,62,222,0 script Strange dead body#gnbs 111,{ mes "He probably couldn't take it any longer...^000000"; close; } - mes "[ ^6699FF" + name + "^000000 ]"; + mes "[ ^6699FF" + strcharinfo(0) + "^000000 ]"; mes "Eew, no!"; mes " "; mes "Yucky yucky YUCKY!"; diff --git a/npc/quests/seals/brisingamen_seal.txt b/npc/quests/seals/brisingamen_seal.txt index 2dabc6d71..e8e949911 100644 --- a/npc/quests/seals/brisingamen_seal.txt +++ b/npc/quests/seals/brisingamen_seal.txt @@ -4924,7 +4924,7 @@ prt_fild02,185,269,0 script #brisindwarf2 111,3,3,{ close; } L_Kick: - mes "[" + name + "]"; + mes "[" + strcharinfo(0) + "]"; mes "^333333*Cough cough!*"; mes "Aaaack!"; mes "It's so dusty!"; diff --git a/npc/quests/skills/assassin_skills.txt b/npc/quests/skills/assassin_skills.txt index ca02014a3..229253973 100644 --- a/npc/quests/skills/assassin_skills.txt +++ b/npc/quests/skills/assassin_skills.txt @@ -115,7 +115,7 @@ in_moc_16,14,27,5 script Assassin#realman 884,{ next; select("New skills?"); mes "[Killtin]"; - mes "That's right, "+name+"."; + mes "That's right, "+ strcharinfo(0) +"."; mes "The first skill specifically"; mes "enhances the Sonic Blow"; mes "skill, and the second skill"; |