From eb1c2abd3d093f0c293568dfbcbbf0d8c4caa12f Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Fri, 14 Dec 2018 02:34:47 -0200 Subject: New Hercules Syntax for getnpcid(). sed -i 's/getnpcid(0, /getnpcid(/g' */*.txt --- npc/001-1/bgmaster.txt | 6 +++--- npc/001-1/rewards.txt | 2 +- npc/003-0-1/colin.txt | 2 +- npc/003-0-1/luca.txt | 2 +- npc/003-0-1/maxime.txt | 2 +- npc/003-0/berserk.txt | 2 +- npc/003-0/paladin.txt | 2 +- npc/003-0/priest.txt | 2 +- npc/003-0/sage.txt | 2 +- npc/003-0/tanker.txt | 2 +- npc/003-0/wizard.txt | 2 +- npc/003-1/aidan.txt | 2 +- npc/003-1/ched.txt | 2 +- npc/003-1/eomie.txt | 2 +- npc/003-1/gladys.txt | 2 +- npc/003-1/inac.txt | 2 +- npc/003-1/inar.txt | 2 +- npc/003-1/ishi.txt | 2 +- npc/003-1/itka.txt | 2 +- npc/003-1/jakod.txt | 2 +- npc/003-1/lieutenantdausen.txt | 2 +- npc/003-1/mahoud.txt | 2 +- npc/003-1/malivox.txt | 2 +- npc/003-1/neko.txt | 2 +- npc/003-1/ninathetraveler.txt | 2 +- npc/003-1/sarah.txt | 2 +- npc/003-1/silvia.txt | 2 +- npc/003-1/swezanne.txt | 2 +- npc/003-1/tinris.txt | 2 +- npc/003-10/arnea.txt | 2 +- npc/003-13/arnea.txt | 4 ++-- npc/003-2/eistein.txt | 2 +- npc/003-2/estard.txt | 2 +- npc/003-2/lua.txt | 2 +- npc/003-4/sorfina.txt | 2 +- npc/003-5/jeweler.txt | 2 +- npc/003-6/cyndala.txt | 2 +- npc/004-1/anwar.txt | 2 +- npc/004-1/elanore.txt | 2 +- npc/005-1/vincent.txt | 2 +- npc/005-5/nylo.txt | 2 +- npc/005-7/nurse.txt | 2 +- npc/005-7/trainer.txt | 2 +- npc/007-1/caelum.txt | 2 +- npc/007-1/dracoula.txt | 2 +- npc/007-1/pylon.txt | 2 +- npc/007-1/tycoon.txt | 2 +- npc/009-1/charles.txt | 2 +- npc/009-1/foxhound.txt | 2 +- npc/009-1/guards.txt | 2 +- npc/009-1/lynnthetraveler.txt | 2 +- npc/009-2/librarian.txt | 2 +- npc/009-2/ryan.txt | 2 +- npc/009-3/dangrostra.txt | 2 +- npc/009-3/kevin.txt | 2 +- npc/009-4/nurse.txt | 2 +- npc/009-4/yumi.txt | 2 +- npc/009-5/alvasus.txt | 2 +- npc/009-5/joaquim.txt | 2 +- npc/009-5/luanna.txt | 2 +- npc/010-2/sawis.txt | 2 +- npc/012-1/bot.txt | 2 +- npc/012-1/dyrinthetraveler.txt | 2 +- npc/012-1/guards.txt | 4 ++-- npc/012-1/hinnak.txt | 2 +- npc/012-1/luffyx.txt | 2 +- npc/012-1/mahad.txt | 2 +- npc/012-2/helena.txt | 2 +- npc/012-2/melina.txt | 2 +- npc/012-4/wyara.txt | 2 +- npc/012-6/nurse.txt | 2 +- npc/012-7/airlia.txt | 2 +- npc/012-7/celestia.txt | 2 +- npc/014-3/oscar.txt | 2 +- npc/015-2/guard.txt | 2 +- npc/016-1/laranja.txt | 4 ++-- npc/017-1/misc.txt | 2 +- npc/017-1/paxel.txt | 2 +- npc/017-1/shops.txt | 4 ++-- npc/017-3/doug.txt | 2 +- npc/017-4/pihro.txt | 2 +- npc/017-4/pyndragon.txt | 2 +- npc/017-5/nahrec.txt | 2 +- npc/017-6/azwell.txt | 2 +- npc/019-1-1/miler.txt | 2 +- npc/019-2/angela.txt | 2 +- npc/024-1/guard.txt | 2 +- 87 files changed, 93 insertions(+), 93 deletions(-) (limited to 'npc') diff --git a/npc/001-1/bgmaster.txt b/npc/001-1/bgmaster.txt index 73849a5e5..13aa30ee0 100644 --- a/npc/001-1/bgmaster.txt +++ b/npc/001-1/bgmaster.txt @@ -144,7 +144,7 @@ OnVictor2: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, GMRobe); // Dress setunitdata(.@npcId, UDT_HEADMIDDLE, NPCEyes); // Not needed setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes @@ -241,7 +241,7 @@ OnSet: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, LightPlatemail); // Light armor setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes @@ -267,7 +267,7 @@ OnSet: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor); // Terranite armor setunitdata(.@npcId, UDT_HEADMIDDLE, JeansShorts); // Pants setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes diff --git a/npc/001-1/rewards.txt b/npc/001-1/rewards.txt index 9e3d4d9ea..68968d50c 100644 --- a/npc/001-1/rewards.txt +++ b/npc/001-1/rewards.txt @@ -19,7 +19,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, TopHat); setunitdata(.@npcId, UDT_HEADMIDDLE, GoldenWarlordPlate); setunitdata(.@npcId, UDT_WEAPON, JeansChaps); diff --git a/npc/003-0-1/colin.txt b/npc/003-0-1/colin.txt index d4b055892..688c60d49 100644 --- a/npc/003-0-1/colin.txt +++ b/npc/003-0-1/colin.txt @@ -355,7 +355,7 @@ L_T2_Final: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/003-0-1/luca.txt b/npc/003-0-1/luca.txt index 778fea0ef..f1294e6e1 100644 --- a/npc/003-0-1/luca.txt +++ b/npc/003-0-1/luca.txt @@ -355,7 +355,7 @@ L_T2_Final: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, BromenalChest); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/003-0-1/maxime.txt b/npc/003-0-1/maxime.txt index aef604644..695999f50 100644 --- a/npc/003-0-1/maxime.txt +++ b/npc/003-0-1/maxime.txt @@ -71,7 +71,7 @@ L_Missing: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, ChefHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-0/berserk.txt b/npc/003-0/berserk.txt index 8506a3e0d..862a4e87f 100644 --- a/npc/003-0/berserk.txt +++ b/npc/003-0/berserk.txt @@ -207,7 +207,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, GoldenWarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, ShortGladius); diff --git a/npc/003-0/paladin.txt b/npc/003-0/paladin.txt index 63f4430ab..0c55cac1c 100644 --- a/npc/003-0/paladin.txt +++ b/npc/003-0/paladin.txt @@ -208,7 +208,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, GoldenWarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-0/priest.txt b/npc/003-0/priest.txt index be513ed71..04ff8b558 100644 --- a/npc/003-0/priest.txt +++ b/npc/003-0/priest.txt @@ -234,7 +234,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); // TODO: wizard hat setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-0/sage.txt b/npc/003-0/sage.txt index 6e79dab39..b93983860 100644 --- a/npc/003-0/sage.txt +++ b/npc/003-0/sage.txt @@ -240,7 +240,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); // TODO: wizard hat setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-0/tanker.txt b/npc/003-0/tanker.txt index 7f7e7d72d..c495b538d 100644 --- a/npc/003-0/tanker.txt +++ b/npc/003-0/tanker.txt @@ -205,7 +205,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, SteelShield); diff --git a/npc/003-0/wizard.txt b/npc/003-0/wizard.txt index 9e19b9981..d8d8166cb 100644 --- a/npc/003-0/wizard.txt +++ b/npc/003-0/wizard.txt @@ -212,7 +212,7 @@ L_Member: goto L_Member; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); // TODO: wizard hat setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-1/aidan.txt b/npc/003-1/aidan.txt index 6087b8789..08f4ab05c 100644 --- a/npc/003-1/aidan.txt +++ b/npc/003-1/aidan.txt @@ -178,7 +178,7 @@ L_Finish: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt index 60a041bea..244b8901a 100644 --- a/npc/003-1/ched.txt +++ b/npc/003-1/ched.txt @@ -148,7 +148,7 @@ L_Autumn: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, SamuraiHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-1/eomie.txt b/npc/003-1/eomie.txt index 8de219162..dac04c054 100644 --- a/npc/003-1/eomie.txt +++ b/npc/003-1/eomie.txt @@ -82,7 +82,7 @@ L_Gift: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, PinkieHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt index 9dc6ad9dd..7874c28e5 100644 --- a/npc/003-1/gladys.txt +++ b/npc/003-1/gladys.txt @@ -85,7 +85,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, "Gladys"); + .@npcId = getnpcid("Gladys"); setunitdata(.@npcId, UDT_HEADTOP, TrapperHat); // Whaaaaaaaaat setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt index 37ae82899..689f48efc 100644 --- a/npc/003-1/inac.txt +++ b/npc/003-1/inac.txt @@ -24,7 +24,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Bandana); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt index b45f8f8ae..54bcd1687 100644 --- a/npc/003-1/inar.txt +++ b/npc/003-1/inar.txt @@ -21,7 +21,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO diff --git a/npc/003-1/ishi.txt b/npc/003-1/ishi.txt index 1f7febe04..9d5d33c8d 100644 --- a/npc/003-1/ishi.txt +++ b/npc/003-1/ishi.txt @@ -221,7 +221,7 @@ L_Give_all: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt index 20caf7935..ae96c8b01 100644 --- a/npc/003-1/itka.txt +++ b/npc/003-1/itka.txt @@ -16,7 +16,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckSweater); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt index 5faf36cf1..6800e5b37 100644 --- a/npc/003-1/jakod.txt +++ b/npc/003-1/jakod.txt @@ -81,7 +81,7 @@ L_Tier2: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 263e73673..7fab08921 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -551,7 +551,7 @@ OnInit: // Check items.xml for info about this. // NOTE: Why Dausen item list is on Philip...? - .@npcId = getnpcid(0, "Lieutenant Dausen"); + .@npcId = getnpcid("Lieutenant Dausen"); setunitdata(.@npcId, UDT_HEADTOP, Bull); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionTrainingShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt index 73d97dcb4..61a126909 100644 --- a/npc/003-1/mahoud.txt +++ b/npc/003-1/mahoud.txt @@ -45,7 +45,7 @@ OnInit: .sex = G_MALE; .distance = 7; - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); // Check items.xml for info about this setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt index 95bc0981a..0a06bd038 100644 --- a/npc/003-1/malivox.txt +++ b/npc/003-1/malivox.txt @@ -89,7 +89,7 @@ L_Quit: goodbye; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt index de1f5e292..08bf2c9cd 100644 --- a/npc/003-1/neko.txt +++ b/npc/003-1/neko.txt @@ -55,7 +55,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // FIXME: LeatherTrousers are BROKEN! diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt index 83fca7270..5ef8760ab 100644 --- a/npc/003-1/ninathetraveler.txt +++ b/npc/003-1/ninathetraveler.txt @@ -90,7 +90,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/003-1/sarah.txt b/npc/003-1/sarah.txt index 4034f4fbd..5063c97c6 100644 --- a/npc/003-1/sarah.txt +++ b/npc/003-1/sarah.txt @@ -73,7 +73,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, TerraniteArmor); setunitdata(.@npcId, UDT_HEADMIDDLE, RaidTrousers); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt index 9c0166886..ac8218669 100644 --- a/npc/003-1/silvia.txt +++ b/npc/003-1/silvia.txt @@ -80,7 +80,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); //setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); // TODO diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt index 1268703e6..bacae524a 100644 --- a/npc/003-1/swezanne.txt +++ b/npc/003-1/swezanne.txt @@ -94,7 +94,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, BromenalChest); setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/003-1/tinris.txt b/npc/003-1/tinris.txt index 75a30c80c..7f4c0f433 100644 --- a/npc/003-1/tinris.txt +++ b/npc/003-1/tinris.txt @@ -160,7 +160,7 @@ L_Lying: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, 2929); // TODO: This NPC is an Elf and therefore, CANNOT use NPCEyes. setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-10/arnea.txt b/npc/003-10/arnea.txt index c9eb27819..841ae3492 100644 --- a/npc/003-10/arnea.txt +++ b/npc/003-10/arnea.txt @@ -124,7 +124,7 @@ L_Quit: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Darkelm); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps); diff --git a/npc/003-13/arnea.txt b/npc/003-13/arnea.txt index cdfc304b3..d667c0a5f 100644 --- a/npc/003-13/arnea.txt +++ b/npc/003-13/arnea.txt @@ -48,7 +48,7 @@ L_Manage: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Darkelm); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps); @@ -61,7 +61,7 @@ OnInit: end; OnInstanceInit: - .@npcId = getnpcid(0, instance_npcname(.name$)); + .@npcId = getnpcid(instance_npcname(.name$)); setunitdata(.@npcId, UDT_HEADTOP, Darkelm); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionCopperArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps); diff --git a/npc/003-2/eistein.txt b/npc/003-2/eistein.txt index ce9f6587b..c846c7f52 100644 --- a/npc/003-2/eistein.txt +++ b/npc/003-2/eistein.txt @@ -65,7 +65,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, GraduationCap); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); diff --git a/npc/003-2/estard.txt b/npc/003-2/estard.txt index b03c9e31f..953001b8c 100644 --- a/npc/003-2/estard.txt +++ b/npc/003-2/estard.txt @@ -115,7 +115,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, BowlerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps); diff --git a/npc/003-2/lua.txt b/npc/003-2/lua.txt index ca4bc5627..c59ddfce3 100644 --- a/npc/003-2/lua.txt +++ b/npc/003-2/lua.txt @@ -198,7 +198,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, GMRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); diff --git a/npc/003-4/sorfina.txt b/npc/003-4/sorfina.txt index 99d589c4d..e9b002600 100644 --- a/npc/003-4/sorfina.txt +++ b/npc/003-4/sorfina.txt @@ -114,7 +114,7 @@ OnWarn: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); //TODO setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/003-5/jeweler.txt b/npc/003-5/jeweler.txt index 53c9a69e9..8004d7317 100644 --- a/npc/003-5/jeweler.txt +++ b/npc/003-5/jeweler.txt @@ -170,7 +170,7 @@ L_Close: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/003-6/cyndala.txt b/npc/003-6/cyndala.txt index 8569c4975..ddc43cf96 100644 --- a/npc/003-6/cyndala.txt +++ b/npc/003-6/cyndala.txt @@ -135,7 +135,7 @@ OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); //TODO setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/004-1/anwar.txt b/npc/004-1/anwar.txt index 64b560c85..6cdcf6b32 100644 --- a/npc/004-1/anwar.txt +++ b/npc/004-1/anwar.txt @@ -128,7 +128,7 @@ OnTimer1000: domovestep; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FarmerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, DesertShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, LeatherTrousers); diff --git a/npc/004-1/elanore.txt b/npc/004-1/elanore.txt index e03187dfc..8909123b5 100644 --- a/npc/004-1/elanore.txt +++ b/npc/004-1/elanore.txt @@ -81,7 +81,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, 2929); setunitdata(.@npcId, UDT_HEADMIDDLE, SorcererRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/005-1/vincent.txt b/npc/005-1/vincent.txt index 57d9a5546..7bdd1543e 100644 --- a/npc/005-1/vincent.txt +++ b/npc/005-1/vincent.txt @@ -60,7 +60,7 @@ L_QuestDone: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, CreasedShirt); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShorts); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/005-5/nylo.txt b/npc/005-5/nylo.txt index 4a328bbc0..4050e40bc 100644 --- a/npc/005-5/nylo.txt +++ b/npc/005-5/nylo.txt @@ -162,7 +162,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADMIDDLE, 1321); // Maybe Nylo could use the whole Candor set... setunitdata(.@npcId, UDT_HEADTOP, CreasedShirt); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShorts); diff --git a/npc/005-7/nurse.txt b/npc/005-7/nurse.txt index 44647f851..6728f412a 100644 --- a/npc/005-7/nurse.txt +++ b/npc/005-7/nurse.txt @@ -77,7 +77,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonShorts); setunitdata(.@npcId, UDT_HEADMIDDLE, ShortTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/005-7/trainer.txt b/npc/005-7/trainer.txt index 8f31e1a08..ee3a63a13 100644 --- a/npc/005-7/trainer.txt +++ b/npc/005-7/trainer.txt @@ -509,7 +509,7 @@ OnKillManaBug: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, LeatherShirt); setunitdata(.@npcId, UDT_HEADMIDDLE, CottonTrousers); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/007-1/caelum.txt b/npc/007-1/caelum.txt index 6aaa2aa0a..455f9f9ad 100644 --- a/npc/007-1/caelum.txt +++ b/npc/007-1/caelum.txt @@ -139,7 +139,7 @@ L_TooWeak: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, MinerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, LeatherShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/007-1/dracoula.txt b/npc/007-1/dracoula.txt index 1c9f99c4c..4730bca96 100644 --- a/npc/007-1/dracoula.txt +++ b/npc/007-1/dracoula.txt @@ -137,7 +137,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, MinerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ArtisTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/007-1/pylon.txt b/npc/007-1/pylon.txt index c68e3763a..c5d32e54e 100644 --- a/npc/007-1/pylon.txt +++ b/npc/007-1/pylon.txt @@ -132,7 +132,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, MinerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ArtisTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/007-1/tycoon.txt b/npc/007-1/tycoon.txt index e2951dc98..dd3a44ffc 100644 --- a/npc/007-1/tycoon.txt +++ b/npc/007-1/tycoon.txt @@ -280,7 +280,7 @@ OnKillBlackScorpion: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, MinerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ArtisTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/009-1/charles.txt b/npc/009-1/charles.txt index 60a7ef47f..c49b913ee 100644 --- a/npc/009-1/charles.txt +++ b/npc/009-1/charles.txt @@ -183,7 +183,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, BurglarMask); setunitdata(.@npcId, UDT_HEADMIDDLE, Chainmail); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-1/foxhound.txt b/npc/009-1/foxhound.txt index f6386c472..c56261b66 100644 --- a/npc/009-1/foxhound.txt +++ b/npc/009-1/foxhound.txt @@ -179,7 +179,7 @@ L_Close: close; OnInit: - //.@npcId = getnpcid(0, .name$); + //.@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); //setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); //setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-1/guards.txt b/npc/009-1/guards.txt index e0aa43dbd..fbf846159 100644 --- a/npc/009-1/guards.txt +++ b/npc/009-1/guards.txt @@ -196,7 +196,7 @@ OnInit: // Check items.xml for info about this. // NOTE: Why Dausen item list is on Philip...? - .@npcId = getnpcid(0, "Lieutenant Jacob"); + .@npcId = getnpcid("Lieutenant Jacob"); setunitdata(.@npcId, UDT_HEADTOP, Bull); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionTrainingShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-1/lynnthetraveler.txt b/npc/009-1/lynnthetraveler.txt index 91cd3758f..02d47c8b7 100644 --- a/npc/009-1/lynnthetraveler.txt +++ b/npc/009-1/lynnthetraveler.txt @@ -76,7 +76,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/009-2/librarian.txt b/npc/009-2/librarian.txt index 1f9027c8e..89ed94583 100644 --- a/npc/009-2/librarian.txt +++ b/npc/009-2/librarian.txt @@ -121,7 +121,7 @@ L_Report: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt); //setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/009-2/ryan.txt b/npc/009-2/ryan.txt index 4be079e38..a10853dc6 100644 --- a/npc/009-2/ryan.txt +++ b/npc/009-2/ryan.txt @@ -87,7 +87,7 @@ L_Prologue: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, ChefHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonTrousers); diff --git a/npc/009-3/dangrostra.txt b/npc/009-3/dangrostra.txt index 3cc61349f..055bc7930 100644 --- a/npc/009-3/dangrostra.txt +++ b/npc/009-3/dangrostra.txt @@ -24,7 +24,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-3/kevin.txt b/npc/009-3/kevin.txt index 4db972e28..b85a52257 100644 --- a/npc/009-3/kevin.txt +++ b/npc/009-3/kevin.txt @@ -132,7 +132,7 @@ L_Quit: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/009-4/nurse.txt b/npc/009-4/nurse.txt index 2d3dd0dbd..3f6e1ebec 100644 --- a/npc/009-4/nurse.txt +++ b/npc/009-4/nurse.txt @@ -7,7 +7,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); // I am too lazy to dress every NPC I add >.< setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, MiniSkirt); diff --git a/npc/009-4/yumi.txt b/npc/009-4/yumi.txt index dd6cd30f1..151e26c7e 100644 --- a/npc/009-4/yumi.txt +++ b/npc/009-4/yumi.txt @@ -46,7 +46,7 @@ L_DoIt: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-5/alvasus.txt b/npc/009-5/alvasus.txt index e5d2869b8..23e2fa037 100644 --- a/npc/009-5/alvasus.txt +++ b/npc/009-5/alvasus.txt @@ -173,7 +173,7 @@ L_NoItem: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, DesertHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SilkRobe); setunitdata(.@npcId, UDT_WEAPON, CreasedBoots); diff --git a/npc/009-5/joaquim.txt b/npc/009-5/joaquim.txt index 6b5570289..3362a2ef4 100644 --- a/npc/009-5/joaquim.txt +++ b/npc/009-5/joaquim.txt @@ -168,7 +168,7 @@ L_Missing: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/009-5/luanna.txt b/npc/009-5/luanna.txt index 089062310..c2b570b39 100644 --- a/npc/009-5/luanna.txt +++ b/npc/009-5/luanna.txt @@ -13,7 +13,7 @@ OnTimer30000: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, VneckJumper); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/010-2/sawis.txt b/npc/010-2/sawis.txt index dd18d68cc..d81c1e3a7 100644 --- a/npc/010-2/sawis.txt +++ b/npc/010-2/sawis.txt @@ -119,7 +119,7 @@ L_TooWeak: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADMIDDLE, DesertShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); setunitdata(.@npcId, UDT_WEAPON, DeepBlackBoots); diff --git a/npc/012-1/bot.txt b/npc/012-1/bot.txt index 8423567f4..8f471bb34 100644 --- a/npc/012-1/bot.txt +++ b/npc/012-1/bot.txt @@ -70,7 +70,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, CenturionHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, SaviorArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots); diff --git a/npc/012-1/dyrinthetraveler.txt b/npc/012-1/dyrinthetraveler.txt index ebacbfecd..43853b860 100644 --- a/npc/012-1/dyrinthetraveler.txt +++ b/npc/012-1/dyrinthetraveler.txt @@ -89,7 +89,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater); // All travelers wear this stuff setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots); diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt index 492ef05a0..ff34e134c 100644 --- a/npc/012-1/guards.txt +++ b/npc/012-1/guards.txt @@ -84,7 +84,7 @@ OnInit: .sex = G_MALE; .distance = 4; - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Bull); setunitdata(.@npcId, UDT_HEADMIDDLE, LegionTrainingShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); @@ -131,7 +131,7 @@ OnSet: OnInit: .CYCLES=0; - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, GoldenWarlordPlate); // Light armor setunitdata(.@npcId, UDT_HEADMIDDLE, JeansChaps); // Pants setunitdata(.@npcId, UDT_HEADBOTTOM, DeepBlackBoots); // Shoes diff --git a/npc/012-1/hinnak.txt b/npc/012-1/hinnak.txt index cce9100b1..89172ee84 100644 --- a/npc/012-1/hinnak.txt +++ b/npc/012-1/hinnak.txt @@ -140,7 +140,7 @@ L_Thanks: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FarmerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, LeatherShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots); diff --git a/npc/012-1/luffyx.txt b/npc/012-1/luffyx.txt index 283a1c8d7..54f521bbb 100644 --- a/npc/012-1/luffyx.txt +++ b/npc/012-1/luffyx.txt @@ -71,7 +71,7 @@ L_Lying: goto L_Main; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, CommunityShirt); setunitdata(.@npcId, UDT_HEADMIDDLE, JeansChaps); setunitdata(.@npcId, UDT_HEADBOTTOM, DeepBlackBoots); diff --git a/npc/012-1/mahad.txt b/npc/012-1/mahad.txt index de1b02728..4631825d7 100644 --- a/npc/012-1/mahad.txt +++ b/npc/012-1/mahad.txt @@ -47,7 +47,7 @@ OnInit: .sex = G_MALE; .distance = 7; - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); // Check items.xml for info about this setunitdata(.@npcId, UDT_HEADTOP, InfantryHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); diff --git a/npc/012-2/helena.txt b/npc/012-2/helena.txt index ffde25870..0e9268793 100644 --- a/npc/012-2/helena.txt +++ b/npc/012-2/helena.txt @@ -269,7 +269,7 @@ L_Finish: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FairyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, CottonSkirt); diff --git a/npc/012-2/melina.txt b/npc/012-2/melina.txt index 5d5ba9137..639eb0be5 100644 --- a/npc/012-2/melina.txt +++ b/npc/012-2/melina.txt @@ -17,7 +17,7 @@ OnTimer1000: domovestep; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, CottonGloves); setunitdata(.@npcId, UDT_HEADMIDDLE, CottonShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, AssassinBoots); diff --git a/npc/012-4/wyara.txt b/npc/012-4/wyara.txt index a287a5128..57b1834b5 100644 --- a/npc/012-4/wyara.txt +++ b/npc/012-4/wyara.txt @@ -110,7 +110,7 @@ L_Quit: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, SailorShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, BromenalPants); diff --git a/npc/012-6/nurse.txt b/npc/012-6/nurse.txt index 607ae2dbf..a818325d7 100644 --- a/npc/012-6/nurse.txt +++ b/npc/012-6/nurse.txt @@ -8,7 +8,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); //setunitdata(.@npcId, UDT_HEADTOP, BrimmedFeatherHat); setunitdata(.@npcId, UDT_HEADMIDDLE, MiniSkirt); setunitdata(.@npcId, UDT_HEADBOTTOM, ShortTankTop); diff --git a/npc/012-7/airlia.txt b/npc/012-7/airlia.txt index b085a9230..c7ca72bc5 100644 --- a/npc/012-7/airlia.txt +++ b/npc/012-7/airlia.txt @@ -52,7 +52,7 @@ L_Mayor: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Earmuffs); setunitdata(.@npcId, UDT_HEADMIDDLE, RedknightArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, Boots); diff --git a/npc/012-7/celestia.txt b/npc/012-7/celestia.txt index c394de3e5..8e0d9e740 100644 --- a/npc/012-7/celestia.txt +++ b/npc/012-7/celestia.txt @@ -227,7 +227,7 @@ L_QuestionTea: OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, MurdererCrown); setunitdata(.@npcId, UDT_HEADMIDDLE, ValentineDress); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/014-3/oscar.txt b/npc/014-3/oscar.txt index 47c7e249f..4acaeb483 100644 --- a/npc/014-3/oscar.txt +++ b/npc/014-3/oscar.txt @@ -139,7 +139,7 @@ OnKillPinkie: end; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FarmerHat); setunitdata(.@npcId, UDT_HEADMIDDLE, LeatherShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, TulimsharGuardBoots); diff --git a/npc/015-2/guard.txt b/npc/015-2/guard.txt index ac7b6da48..28d505e25 100644 --- a/npc/015-2/guard.txt +++ b/npc/015-2/guard.txt @@ -57,7 +57,7 @@ L_BanditLord: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FairyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, ForestArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansChaps); diff --git a/npc/016-1/laranja.txt b/npc/016-1/laranja.txt index 66d692e43..32c1770e7 100644 --- a/npc/016-1/laranja.txt +++ b/npc/016-1/laranja.txt @@ -38,7 +38,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, ShortTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); @@ -54,7 +54,7 @@ OnInit: end; OnInstanceInit: - .@npcId = getnpcid(0, instance_npcname(.name$)); + .@npcId = getnpcid(instance_npcname(.name$)); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, ShortTankTop); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/017-1/misc.txt b/npc/017-1/misc.txt index 0cd181b7c..903f74378 100644 --- a/npc/017-1/misc.txt +++ b/npc/017-1/misc.txt @@ -136,7 +136,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater); setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts); diff --git a/npc/017-1/paxel.txt b/npc/017-1/paxel.txt index 93bd5790b..b6dda6b6f 100644 --- a/npc/017-1/paxel.txt +++ b/npc/017-1/paxel.txt @@ -170,7 +170,7 @@ L_Spring: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, PrsmHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/017-1/shops.txt b/npc/017-1/shops.txt index 8d8e5c017..ec30f6422 100644 --- a/npc/017-1/shops.txt +++ b/npc/017-1/shops.txt @@ -9,7 +9,7 @@ close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, any(ShortTankTop, CandorShirt, Chainmail)); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); @@ -40,7 +40,7 @@ OnClock0112: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, NPCEyes); setunitdata(.@npcId, UDT_HEADMIDDLE, any(ShortTankTop, CandorShirt, Chainmail)); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/017-3/doug.txt b/npc/017-3/doug.txt index 8a64d3019..a887e3fa1 100644 --- a/npc/017-3/doug.txt +++ b/npc/017-3/doug.txt @@ -49,7 +49,7 @@ L_Weak: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/017-4/pihro.txt b/npc/017-4/pihro.txt index 325c0971e..804742109 100644 --- a/npc/017-4/pihro.txt +++ b/npc/017-4/pihro.txt @@ -90,7 +90,7 @@ L_Craft: OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, Monocle); setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/017-4/pyndragon.txt b/npc/017-4/pyndragon.txt index 516dad4f4..6c69b294b 100644 --- a/npc/017-4/pyndragon.txt +++ b/npc/017-4/pyndragon.txt @@ -130,7 +130,7 @@ L_Close: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, GoldenWarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/017-5/nahrec.txt b/npc/017-5/nahrec.txt index 9d9ce4aac..705feb865 100644 --- a/npc/017-5/nahrec.txt +++ b/npc/017-5/nahrec.txt @@ -135,7 +135,7 @@ L_Savior: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, FancyHat); setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/017-6/azwell.txt b/npc/017-6/azwell.txt index 91a23b309..f21284a72 100644 --- a/npc/017-6/azwell.txt +++ b/npc/017-6/azwell.txt @@ -105,7 +105,7 @@ OnTimer1000: domovestep; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, ChemistHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, AlchemistArmor); setunitdata(.@npcId, UDT_HEADBOTTOM, RaidTrousers); diff --git a/npc/019-1-1/miler.txt b/npc/019-1-1/miler.txt index 8ed2270a5..20c856cb7 100644 --- a/npc/019-1-1/miler.txt +++ b/npc/019-1-1/miler.txt @@ -179,7 +179,7 @@ L_GHQ: close; OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, KnitHat); setunitdata(.@npcId, UDT_HEADMIDDLE, CreasedShirt); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/019-2/angela.txt b/npc/019-2/angela.txt index 9fce3c279..ec93bbb09 100644 --- a/npc/019-2/angela.txt +++ b/npc/019-2/angela.txt @@ -101,7 +101,7 @@ L_Start: OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, KnitHat); setunitdata(.@npcId, UDT_HEADMIDDLE, TneckSweater); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); diff --git a/npc/024-1/guard.txt b/npc/024-1/guard.txt index b32f51185..23384e3ba 100644 --- a/npc/024-1/guard.txt +++ b/npc/024-1/guard.txt @@ -7,7 +7,7 @@ OnInit: - .@npcId = getnpcid(0, .name$); + .@npcId = getnpcid(.name$); setunitdata(.@npcId, UDT_HEADTOP, WarlordHelmet); setunitdata(.@npcId, UDT_HEADMIDDLE, WarlordPlate); setunitdata(.@npcId, UDT_HEADBOTTOM, NPCEyes); -- cgit v1.2.3-70-g09d2