From cc6a5253cd97ec0c25b40634e8c91d1c509a0446 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 03:17:02 -0200 Subject: Silence all errors but script_rid2sd one. Game runs normally, but was not tested. This commit must be reverted as at least these errors are fixed: + Missing maps at npc/003-1/_warps.txt + Missing CheckEnfant() function at lieutenentdausen Millions of warnings remains. --- npc/002-2/ratto.txt | 2 +- npc/003-1/_warps.txt | 9 +++++---- npc/003-1/lieutenantdausen.txt | 36 ++++++++++++++++++------------------ 3 files changed, 24 insertions(+), 23 deletions(-) (limited to 'npc') diff --git a/npc/002-2/ratto.txt b/npc/002-2/ratto.txt index 39827420a..32499f437 100644 --- a/npc/002-2/ratto.txt +++ b/npc/002-2/ratto.txt @@ -17,7 +17,7 @@ // [8] = Shows how many seconds passed since ratto number 4 died. // [9] = Shows how many seconds passed since the player started the quest. -000-2,47,30,0 script RattosControl NPC_HIDDEN,{ +002-2,47,30,0 script RattosControl NPC_HIDDEN,{ OnSpawn: areamonster "002-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; diff --git a/npc/003-1/_warps.txt b/npc/003-1/_warps.txt index 16531a287..e73d16ada 100644 --- a/npc/003-1/_warps.txt +++ b/npc/003-1/_warps.txt @@ -1,18 +1,19 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. +// Some warps were manually disabled because missing map // Map 003-1: Tulimshar warps 003-1,49,72,0 warp #003-1_49_72 0,0,003-2,35,40 003-1,46,72,0 warp #003-1_46_72 0,0,003-2,32,40 003-1,52,72,0 warp #003-1_52_72 0,0,003-2,38,40 003-1,56,99,0 warp #003-1_56_99 0,0,003-3,39,40 -003-1,54,137,0 warp #003-1_54_137 0,0,003-4,35,40 +//003-1,54,137,0 warp #003-1_54_137 0,0,003-4,35,40 003-1,51,119,0 warp #003-1_51_119 0,0,003-1,82,119 003-1,81,119,0 warp #003-1_81_119 0,0,003-1,52,119 003-1,96,144,0 warp #003-1_96_144 0,0,003-5,38,40 -003-1,106,147,0 warp #003-1_106_147 0,0,003-6,35,40 -003-1,112,147,0 warp #003-1_112_147 0,0,003-6,35,40 +//003-1,106,147,0 warp #003-1_106_147 0,0,003-6,35,40 +//003-1,112,147,0 warp #003-1_112_147 0,0,003-6,35,40 003-1,111,137,0 warp #003-1_111_137 0,0,003-7,39,40 003-1,107,132,0 warp #003-1_107_132 0,0,003-7,29,31 003-1,112,100,0 warp #003-1_112_100 0,0,003-8,31,43 -003-1,82,68,0 warp #003-1_82_68 0,0,003-9,35,40 +//003-1,82,68,0 warp #003-1_82_68 0,0,003-9,35,40 003-1,51,65,0 warp #003-1_51_65 0,0,003-2,42,34 003-1,115,93,0 warp #003-1_115_93 0,0,003-8,41,28 diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 0c9d739d7..30b4cfdb0 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -83,7 +83,7 @@ function script CheckGuard { 003-1,98,100,0 script Guard Philip 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); // FIXME and everywhere else: Missing Function } end; OnInit: @@ -94,7 +94,7 @@ OnInit: 003-1,98,121,0 script Guard Defou 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -105,7 +105,7 @@ OnInit: 003-1,102,121,0 script Guard Avou 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -116,7 +116,7 @@ OnInit: 003-1,58,158,0 script Guard Benji 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -127,7 +127,7 @@ OnInit: 003-1,62,158,0 script Guard Valou 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -138,7 +138,7 @@ OnInit: 003-1,71,138,0 script Guard Nutelo 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -149,7 +149,7 @@ OnInit: 003-1,58,128,0 script Guard Moustacha 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -160,7 +160,7 @@ OnInit: 003-1,58,100,0 script Guard Popaul 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -171,7 +171,7 @@ OnInit: 003-1,51,73,0 script Guard Yen 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -182,7 +182,7 @@ OnInit: 003-2,41,37,0 script Guard Youn 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -193,7 +193,7 @@ OnInit: 003-1,54,52,0 script Guard Maxim 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -204,7 +204,7 @@ OnInit: 003-1,50,36,0 script Guard Totor 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -215,7 +215,7 @@ OnInit: 003-1,53,36,0 script Guard Roukin 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -226,7 +226,7 @@ OnInit: 003-1,35,34,0 script Guard Falko 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -237,7 +237,7 @@ OnInit: 003-3,39,37,0 script Guard Malindax 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -248,7 +248,7 @@ OnInit: 003-1,111,101,0 script Guard Fromag 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -259,7 +259,7 @@ OnInit: 003-1,102,80,0 script Guard Tetric 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: @@ -270,7 +270,7 @@ OnInit: 003-1,107,80,0 script Guard Biscop 451,{ if (getq(CandorQuest_HAS) == 1) { - CheckEnfant(); + //CheckEnfant(); } end; OnInit: -- cgit v1.2.3-70-g09d2 From 17baf5eee6147c093e37c432b95ff3dab3da0b29 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 11:00:25 -0200 Subject: Fix duplicate NPC names. Check diff for details about renamings. --- npc/000-2-1/alige.txt | 8 ++++---- npc/000-2-1/arpan.txt | 26 +++++++++++++------------- npc/000-2-1/chefgado.txt | 2 +- npc/000-2-1/devis.txt | 2 +- npc/000-2-1/hammock.txt | 20 ++++++++++---------- npc/000-2-1/knife.txt | 2 +- npc/000-2-1/peter.txt | 44 ++++++++++++++++++++++---------------------- npc/000-2-1/story_save.txt | 2 +- npc/000-2-2/doors.txt | 4 ++-- npc/000-2-2/ratto.txt | 18 +++++++++--------- npc/005-3/barrel.txt | 18 +++++++++--------- 11 files changed, 73 insertions(+), 73 deletions(-) (limited to 'npc') diff --git a/npc/000-2-1/alige.txt b/npc/000-2-1/alige.txt index cc57c0d7a..c2ab33074 100644 --- a/npc/000-2-1/alige.txt +++ b/npc/000-2-1/alige.txt @@ -17,18 +17,18 @@ // 2 Accept the task. // 3 Bring first food. -000-2-1,43,32,0 script AligeTrigger NPC_HIDDEN,1,1,{ +000-2-1,43,32,0 script AligeTrigger#000-2-1 NPC_HIDDEN,1,1,{ OnTouch: if (getareausers() <= 1) { - setnpcdir "Alige", 2; + setnpcdir "Alige#000-2-1", 2; stopnpctimer; initnpctimer; } if (getq(ShipQuests_Alige) > 0) close; - doevent "Alige::OnFirstEncounter"; + doevent "Alige#000-2-1::OnFirstEncounter"; close; @@ -50,7 +50,7 @@ OnTimer190: end; } -000-2-1,43,31,0 script Alige NPC_ALIGE,{ +000-2-1,43,31,0 script Alige#000-2-1 NPC_ALIGE,{ .@q = getq(ShipQuests_Alige); if (.@q > 1) goto L_AskForFood; diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 9207e03df..54f626028 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -16,38 +16,38 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-1,49,36,0 script LeftDoorCheck NPC_HIDDEN,0,0,{ +000-2-1,49,36,0 script LeftDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); - if (.@q == 0) doevent "Magic Arpan::OnTalk"; + if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,54,36,0 script RightDoorCheck NPC_HIDDEN,0,0,{ +000-2-1,54,36,0 script RightDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); - if (.@q == 0) doevent "Magic Arpan::OnTalk"; + if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,47,32,0 script LeftBarrierCheck NPC_HIDDEN,0,2,{ +000-2-1,47,32,0 script LeftBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; if (.@q == 2) goto L_Equip; if (.@q == 1) goto L_GetCloth; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; L_Equip: warp "000-2-1", 49, 32; - doevent "Magic Arpan::OnEquip"; + doevent "Magic Arpan#000-2-1::OnEquip"; close; L_GetCloth: warp "000-2-1", 49, 32; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; close; @@ -57,24 +57,24 @@ L_EquipDone: close; } -000-2-1,56,32,0 script RightBarrierCheck NPC_HIDDEN,0,2,{ +000-2-1,56,32,0 script RightBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; if (.@q == 2) goto L_Equip; if (.@q == 1) goto L_GetCloth; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; L_Equip: warp "000-2-1", 55, 32; - doevent "Magic Arpan::OnEquip"; + doevent "Magic Arpan#000-2-1::OnEquip"; close; L_GetCloth: warp "000-2-1", 55, 32; - doevent "Magic Arpan::OnClothNotTaken"; + doevent "Magic Arpan#000-2-1::OnClothNotTaken"; close; @@ -84,7 +84,7 @@ L_EquipDone: close; } -000-2-1,49,33,0 script Magic Arpan NPC_MAGIC_ARPAN,{ +000-2-1,49,33,0 script Magic Arpan#000-2-1 NPC_MAGIC_ARPAN,{ .@q = getq(ShipQuests_Arpan); .@q_nard = getq(ShipQuests_Nard); .@q_julia = getq(ShipQuests_Julia); diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt index ca069d8e0..1aa4c8be1 100644 --- a/npc/000-2-1/chefgado.txt +++ b/npc/000-2-1/chefgado.txt @@ -16,7 +16,7 @@ // 5 Quest complete. Julia wins (poison dish returned). // 6 Quest complete. Julia wins. -000-2-1,27,28,0 script Chef Gado NPC_CHEF_GADO,{ +000-2-1,27,28,0 script Chef Gado#Org NPC_CHEF_GADO,{ .@q = getq(ShipQuests_ChefGado); .@n = getq(ShipQuests_Nard); if (.@q == 1) goto L_QuestAccepted; diff --git a/npc/000-2-1/devis.txt b/npc/000-2-1/devis.txt index caf421bfb..d3d6b566e 100644 --- a/npc/000-2-1/devis.txt +++ b/npc/000-2-1/devis.txt @@ -6,7 +6,7 @@ // Description: // Sleeping and grumbling NPC. -000-2-1,32,38,0 script Devis NPC_HAMMOC,{ +000-2-1,32,38,0 script Devis#000-2-1 NPC_HAMMOC,{ asleep; close; diff --git a/npc/000-2-1/hammock.txt b/npc/000-2-1/hammock.txt index 3e188eedf..94df3b60e 100644 --- a/npc/000-2-1/hammock.txt +++ b/npc/000-2-1/hammock.txt @@ -4,7 +4,7 @@ // Description: // Animated hammock at the mid level of the ship. -000-2-1,32,27,0 script #hammock1 NPC_LEFT_HAMMOCK,1,0,{ +000-2-1,32,27,0 script #hammock1-Org NPC_LEFT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -16,7 +16,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,32,25,0 script #hammock2 NPC_LEFT_HAMMOCK,1,0,{ +000-2-1,32,25,0 script #hammock2-Org NPC_LEFT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -28,7 +28,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,25,0 script #hammock3 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,25,0 script #hammock3-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -40,7 +40,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,27,0 script #hammock4 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,27,0 script #hammock4-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -52,7 +52,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,29,0 script #hammock5 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,29,0 script #hammock5-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -64,7 +64,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,34,0 script #hammock6 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,34,0 script #hammock6-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -76,7 +76,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,36,0 script #hammock7 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,36,0 script #hammock7-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -88,7 +88,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,38,0 script #hammock8 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,38,0 script #hammock8-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -100,7 +100,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,32,40,0 script #hammock9 NPC_LEFT_HAMMOCK,1,0,{ +000-2-1,32,40,0 script #hammock9-Org NPC_LEFT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; @@ -112,7 +112,7 @@ OnTimer5440: hamTimerLeft; } -000-2-1,37,40,0 script #hammock10 NPC_RIGHT_HAMMOCK,1,0,{ +000-2-1,37,40,0 script #hammock10-Org NPC_RIGHT_HAMMOCK,1,0,{ OnTouch: hamTouchLeft; diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt index 6fe6ea55a..d531a8111 100644 --- a/npc/000-2-1/knife.txt +++ b/npc/000-2-1/knife.txt @@ -11,7 +11,7 @@ // 0 Default, not taken. // 1 Knife taken. -000-2-1,50,24,0 script #knife NPC_KNIVES,{ +000-2-1,50,24,0 script #knife-Org NPC_KNIVES,{ .@q = getq(ShipQuests_Knife); if (.@q) close; diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt index 341087a23..75f8e630a 100644 --- a/npc/000-2-1/peter.txt +++ b/npc/000-2-1/peter.txt @@ -39,7 +39,7 @@ // [9] = Shows how many seconds passed since the player started the quest. // [10] = Shows how many seconds passed since the player done the quest. -000-2-1,72,34,0 script AreaNPC NPC_HIDDEN,0,1,{ +000-2-1,72,34,0 script AreaNPC#000-2-1 NPC_HIDDEN,0,1,{ OnTouch: if (BaseLevel < 5) goto L_Stop; @@ -55,41 +55,41 @@ L_NoCountDown: if (.@peter == 1 || .@peter == 2) goto L_Rfail; if (.@peter == 3 || .@peter == 4) goto L_Rwin; if (.@peter > 5) goto L_SecondTime; - doevent "Peter::OnReturnWin"; + doevent "Peter#000-2-1::OnReturnWin"; close; L_Stop: - doevent "Peter::OnStop"; + doevent "Peter#000-2-1::OnStop"; close; L_Occupied: - doevent "Peter::OnDontneedHelp"; + doevent "Peter#000-2-1::OnDontneedHelp"; close; L_Task: - doevent "Peter::OnGiveTask"; + doevent "Peter#000-2-1::OnGiveTask"; close; L_Rfail: - doevent "Peter::OnReturnFail"; + doevent "Peter#000-2-1::OnReturnFail"; close; L_Rwin: - doevent "Peter::OnReturnWin"; + doevent "Peter#000-2-1::OnReturnWin"; close; L_NoGoodTick: - doevent "Peter::OnNoGoodTick"; + doevent "Peter#000-2-1::OnNoGoodTick"; close; } -000-2-1,70,35,0 script Peter NPC_RATTO_SAILOR,{ +000-2-1,70,35,0 script Peter#000-2-1 NPC_RATTO_SAILOR,{ if (BaseLevel < 5) goto OnTooWeak; if ($@RAT_SAILOR_COUNTDOWN == 0) goto L_NoCountDown; if ((gettimetick(2) - $@RAT_SAILOR_COUNTDOWN) < 10) goto OnNoGoodTick; @@ -212,7 +212,7 @@ OnStartOutside: $@RAT_SAILOR_DEATHS = PC_DIE_COUNTER; initnpctimer; warp "000-2-2", 48, 28; - doevent "RattosControl::OnSpawn"; + doevent "RattosControl#000-2-2::OnSpawn"; goto L_Quit; @@ -232,10 +232,10 @@ L_CheckRattos: if ($@RAT_SAILOR_CONTROL[2]) $@RAT_SAILOR_CONTROL[6] = $@RAT_SAILOR_CONTROL[6] + 2; if ($@RAT_SAILOR_CONTROL[3]) $@RAT_SAILOR_CONTROL[7] = $@RAT_SAILOR_CONTROL[7] + 2; if ($@RAT_SAILOR_CONTROL[4]) $@RAT_SAILOR_CONTROL[8] = $@RAT_SAILOR_CONTROL[8] + 2; - if ($@RAT_SAILOR_CONTROL[5] > 45) doevent "RattosControl::OnRatto1Respawn"; - if ($@RAT_SAILOR_CONTROL[6] > 45) doevent "RattosControl::OnRatto2Respawn"; - if ($@RAT_SAILOR_CONTROL[7] > 45) doevent "RattosControl::OnRatto3Respawn"; - if ($@RAT_SAILOR_CONTROL[8] > 45) doevent "RattosControl::OnRatto4Respawn"; + if ($@RAT_SAILOR_CONTROL[5] > 45) doevent "RattosControl#000-2-2::OnRatto1Respawn"; + if ($@RAT_SAILOR_CONTROL[6] > 45) doevent "RattosControl#000-2-2::OnRatto2Respawn"; + if ($@RAT_SAILOR_CONTROL[7] > 45) doevent "RattosControl#000-2-2::OnRatto3Respawn"; + if ($@RAT_SAILOR_CONTROL[8] > 45) doevent "RattosControl#000-2-2::OnRatto4Respawn"; L_NotYet: setnpctimer 0; @@ -280,10 +280,10 @@ L_CleaningEnd: $@RAT_SAILOR_HELPER$ = ""; $@RAT_SAILOR_DEATHS = 0; cleararray $@RAT_SAILOR_CONTROL, 0, 11; - killmonster "000-2-2", "RattosControl::OnRatto1Death"; - killmonster "000-2-2", "RattosControl::OnRatto2Death"; - killmonster "000-2-2", "RattosControl::OnRatto3Death"; - killmonster "000-2-2", "RattosControl::OnRatto4Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto1Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto2Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto3Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto4Death"; end; @@ -293,10 +293,10 @@ L_CleaningClose: $@RAT_SAILOR_HELPER$ = ""; $@RAT_SAILOR_DEATHS = 0; cleararray $@RAT_SAILOR_CONTROL, 0, 11; - killmonster "000-2-2", "RattosControl::OnRatto1Death"; - killmonster "000-2-2", "RattosControl::OnRatto2Death"; - killmonster "000-2-2", "RattosControl::OnRatto3Death"; - killmonster "000-2-2", "RattosControl::OnRatto4Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto1Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto2Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto3Death"; + killmonster "000-2-2", "RattosControl#000-2-2::OnRatto4Death"; $@RAT_SAILOR_COUNTDOWN = gettimetick(2); close; diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt index 44171ad62..5901795a8 100644 --- a/npc/000-2-1/story_save.txt +++ b/npc/000-2-1/story_save.txt @@ -4,7 +4,7 @@ // Description: // Scritpted save locations in 000-2-1 map. -000-2-1,50,38,0 script #name3 NPC_FINAL_POINT,{ +000-2-1,50,38,0 script #name3-Org NPC_FINAL_POINT,{ .@q_nard = getq(ShipQuests_Nard); .@q_narr = getq(General_Narrator); diff --git a/npc/000-2-2/doors.txt b/npc/000-2-2/doors.txt index 1dbef8328..6c50db882 100644 --- a/npc/000-2-2/doors.txt +++ b/npc/000-2-2/doors.txt @@ -6,7 +6,7 @@ // Description: // Doors NPCs. -000-2-2,48,29,0 script DoorUpwards NPC_HIDDEN,0,0,{ +000-2-2,48,29,0 script DoorUpwards#000-2-2 NPC_HIDDEN,0,0,{ OnTouch: if (mobcount("000-2-2","all") > 0) goto L_Warn; @@ -35,7 +35,7 @@ L_Warp: close; } -000-2-2,24,31,0 script LeftDoor NPC_HIDDEN,0,0,{ +000-2-2,24,31,0 script LeftDoor#000-2-2 NPC_HIDDEN,0,0,{ OnTouch: mesn "Narrator"; diff --git a/npc/000-2-2/ratto.txt b/npc/000-2-2/ratto.txt index 1392d5716..5a6099716 100644 --- a/npc/000-2-2/ratto.txt +++ b/npc/000-2-2/ratto.txt @@ -17,35 +17,35 @@ // [8] = Shows how many seconds passed since ratto number 4 died. // [9] = Shows how many seconds passed since the player started the quest. -000-2-2,47,30,0 script RattosControl NPC_HIDDEN,{ +000-2-2,47,30,0 script RattosControl#000-2-2 NPC_HIDDEN,{ OnSpawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto1Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto2Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto3Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto4Death"; close; OnRatto1Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto1Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto1Death"; $@RAT_SAILOR_CONTROL[1] = 0; $@RAT_SAILOR_CONTROL[5] = 0; end; OnRatto2Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto2Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto2Death"; $@RAT_SAILOR_CONTROL[2] = 0; $@RAT_SAILOR_CONTROL[6] = 0; end; OnRatto3Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto3Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto3Death"; $@RAT_SAILOR_CONTROL[3] = 0; $@RAT_SAILOR_CONTROL[7] = 0; end; OnRatto4Respawn: - areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl::OnRatto4Death"; + areamonster "000-2-2", 23, 19, 50, 40, "Ratto", 1005, 1, "RattosControl#000-2-2::OnRatto4Death"; $@RAT_SAILOR_CONTROL[4] = 0; $@RAT_SAILOR_CONTROL[8] = 0; end; diff --git a/npc/005-3/barrel.txt b/npc/005-3/barrel.txt index bc93085a6..ec7f06b4f 100644 --- a/npc/005-3/barrel.txt +++ b/npc/005-3/barrel.txt @@ -35,7 +35,7 @@ function script CheckBarrel { } -005-3,24,36,0 script Barrel NPC_NO_SPRITE,{ +005-3,24,36,0 script Barrel#1 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -48,7 +48,7 @@ OnInit: end; } -005-3,24,39,0 script Barrel NPC_NO_SPRITE,{ +005-3,24,39,0 script Barrel#2 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -61,7 +61,7 @@ OnInit: end; } -005-3,29,37,0 script Barrel NPC_NO_SPRITE,{ +005-3,29,37,0 script Barrel#3 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -73,7 +73,7 @@ OnInit: .distance = 1; end; } -005-3,35,34,0 script Barrel NPC_NO_SPRITE,{ +005-3,35,34,0 script Barrel#4 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -85,7 +85,7 @@ OnInit: .distance = 1; end; } -005-3,38,34,0 script Barrel NPC_NO_SPRITE,{ +005-3,38,34,0 script Barrel#5 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -97,7 +97,7 @@ OnInit: .distance = 1; end; } -005-3,44,40,0 script Barrel NPC_NO_SPRITE,{ +005-3,44,40,0 script Barrel#6 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -109,7 +109,7 @@ OnInit: .distance = 1; end; } -005-3,38,41,0 script Barrel NPC_NO_SPRITE,{ +005-3,38,41,0 script Barrel#7 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -121,7 +121,7 @@ OnInit: .distance = 1; end; } -005-3,29,41,0 script Barrel NPC_NO_SPRITE,{ +005-3,29,41,0 script Barrel#8 NPC_NO_SPRITE,{ if (.questState == 0) { .questState = 1; @@ -132,4 +132,4 @@ OnInit: .sex = G_OTHER; .distance = 1; end; -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From 85eba47228ccfaed69a53ac333776edb4fc4ccdb Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 12:23:57 -0200 Subject: Fix bugs in AyashaT, and basic grammar check at Ayasha. --- npc/005-1/ayasha.txt | 14 +++++++------- npc/005-1/movetest.txt | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'npc') diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index f47968c48..a59b586df 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -19,11 +19,11 @@ if (.@has == 0) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("Hello can you help me for find all kids"); + l("Hello! can you help me for find all kids?"); do { select - l("Yes"), + l("Yes!"), menuaction(l("Quit")); switch (@menu) @@ -43,7 +43,7 @@ else if (.@has == 2) { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("Thank you, there is your reward"); + l("Thank you, here is your reward."); narrator("You receive 30 exp."); getexp 30, 0; setq CandorQuest_HAS, 3; @@ -56,8 +56,8 @@ close; } - closedialog; - goodbye; + //closedialog; + //goodbye; close; OnInit: @@ -68,10 +68,10 @@ OnInit: function script CheckEnfant { - .questCheck = .questCheck + 1; + .questCheck = .questCheck + 1; // NOTE: Do we really want this as a **NPC** variable? These affects other players, right? l("Oh Welcome then."); speech S_FIRST_BLANK_LINE | S_LAST_NEXT, - l("Oh! You found me well played !."); + l("Oh! You found me. Well played!"); narrator("You receive 5 exp."); if (.questCheck == 6) { diff --git a/npc/005-1/movetest.txt b/npc/005-1/movetest.txt index f69a20ab4..21868c2d9 100644 --- a/npc/005-1/movetest.txt +++ b/npc/005-1/movetest.txt @@ -12,16 +12,16 @@ OnTimer1000: OnInit: initpath "move", 44, 35, - "dir", TOP, 0, + //"dir", TOP, 0, "wait", 2, 0, "move", 51, 81, - "dir", DOWN, 0, + //"dir", DOWN, 0, "wait", 2, 0,"" "Mmove", 50, 88, - "dir", DOWN, 0, + //"dir", DOWN, 0, "wait", 2, 0; initialmove; initnpctimer; .distance = 5; -} \ No newline at end of file +} -- cgit v1.2.3-70-g09d2 From 6d1070255bc244168fd40234f840632d2a97d7f3 Mon Sep 17 00:00:00 2001 From: jesusalva Date: Wed, 7 Feb 2018 12:40:18 -0200 Subject: We still have an issue here and there, but the main bulk is now gone. --- db/constants.conf | 1 + npc/000-2-1/arpan.txt | 8 +-- npc/003-1/ched.txt | 4 +- npc/003-1/constableperry.txt | 2 +- npc/003-1/cyndala.txt | 4 +- npc/003-1/eomie.txt | 4 +- npc/003-1/gladys.txt | 4 +- npc/003-1/inac.txt | 4 +- npc/003-1/inar.txt | 4 +- npc/003-1/itka.txt | 4 +- npc/003-1/jakod.txt | 2 +- npc/003-1/jerican.txt | 4 +- npc/003-1/lieutenantdausen.txt | 121 ++++++++++++----------------------------- npc/003-1/luca.txt | 4 +- npc/003-1/mahoud.txt | 4 +- npc/003-1/malivox.txt | 4 +- npc/003-1/mariusthebard.txt | 4 +- npc/003-1/michel.txt | 4 +- npc/003-1/neko.txt | 4 +- npc/003-1/ninathetraveler.txt | 2 +- npc/003-1/silvia.txt | 4 +- npc/003-1/swezanne.txt | 4 +- npc/003-1/tinris.txt | 4 +- npc/003-8/jhedia.txt | 2 +- npc/005-1/ayasha.txt | 12 ++-- npc/005-1/movetest.txt | 6 +- npc/005-4/rosen.txt | 2 +- 27 files changed, 88 insertions(+), 138 deletions(-) (limited to 'npc') diff --git a/db/constants.conf b/db/constants.conf index 90a8a9e4a..3d50162f8 100644 --- a/db/constants.conf +++ b/db/constants.conf @@ -3891,6 +3891,7 @@ constants_db: { NPC_DEVIS_ARTIS: 448 NPC_MOUBOO: 449 NPC_MONA: 450 + NPC_GUARD1: 451 NPC_TEST1: 800 NPC_PLAYER: 801 diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt index 54f626028..353e2dc8e 100644 --- a/npc/000-2-1/arpan.txt +++ b/npc/000-2-1/arpan.txt @@ -16,21 +16,21 @@ // 11 Need to see Julia // 12 Has been registered by Julia -000-2-1,49,36,0 script LeftDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ +000-2-1,49,36,0 script LeftDoorCheck#000-21 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,54,36,0 script RightDoorCheck#000-2-1 NPC_HIDDEN,0,0,{ +000-2-1,54,36,0 script RightDoorCheck#000-21 NPC_HIDDEN,0,0,{ .@q = getq(ShipQuests_Arpan); if (.@q == 0) doevent "Magic Arpan#000-2-1::OnTalk"; close; } -000-2-1,47,32,0 script LeftBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ +000-2-1,47,32,0 script LeftBarrierCheck#000-21 NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; @@ -57,7 +57,7 @@ L_EquipDone: close; } -000-2-1,56,32,0 script RightBarrierCheck#000-2-1 NPC_HIDDEN,0,2,{ +000-2-1,56,32,0 script RightBarrierCheck{::RightBC-000-2-1} NPC_HIDDEN,0,2,{ .@q = getq(ShipQuests_Arpan); if (.@q > 2) close; if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone; diff --git a/npc/003-1/ched.txt b/npc/003-1/ched.txt index db824681f..1bb7d38bf 100644 --- a/npc/003-1/ched.txt +++ b/npc/003-1/ched.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,40,49,0 script Ched 450,{ +003-1,40,49,0 script Ched NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/constableperry.txt b/npc/003-1/constableperry.txt index b2094dd79..64ab70e4d 100644 --- a/npc/003-1/constableperry.txt +++ b/npc/003-1/constableperry.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,47,75,0 script Constable Perry 449,{ +003-1,47,75,0 script Constable Perry NPC_MOUBOO,{ hello; diff --git a/npc/003-1/cyndala.txt b/npc/003-1/cyndala.txt index c22f1446a..aeee8c7de 100644 --- a/npc/003-1/cyndala.txt +++ b/npc/003-1/cyndala.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,41,80,0 script Cyndala 450,{ +003-1,41,80,0 script Cyndala NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/eomie.txt b/npc/003-1/eomie.txt index a2676728f..b566af4f5 100644 --- a/npc/003-1/eomie.txt +++ b/npc/003-1/eomie.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,68,24,0 script Eomie 450,{ +003-1,68,24,0 script Eomie NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/gladys.txt b/npc/003-1/gladys.txt index bb49a0a36..19849edda 100644 --- a/npc/003-1/gladys.txt +++ b/npc/003-1/gladys.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,63,105,0 script Gladys 450,{ +003-1,63,105,0 script Gladys NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt index ffa7bcb7d..0358d01bf 100644 --- a/npc/003-1/inac.txt +++ b/npc/003-1/inac.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,55,82,0 script Inac 450,{ +003-1,55,82,0 script Inac NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/inar.txt b/npc/003-1/inar.txt index 90197520d..c51aba60a 100644 --- a/npc/003-1/inar.txt +++ b/npc/003-1/inar.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,109,109,0 script Inar 450,{ +003-1,109,109,0 script Inar NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/itka.txt b/npc/003-1/itka.txt index d8ec1d3cd..7db081dbc 100644 --- a/npc/003-1/itka.txt +++ b/npc/003-1/itka.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,63,141,0 script Itka 450,{ +003-1,63,141,0 script Itka NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/jakod.txt b/npc/003-1/jakod.txt index 6d513d1dd..d1f7a12be 100644 --- a/npc/003-1/jakod.txt +++ b/npc/003-1/jakod.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,62,76,0 script Jakod 450,{ +003-1,62,76,0 script Jakod NPC_MONA,{ hello; diff --git a/npc/003-1/jerican.txt b/npc/003-1/jerican.txt index 5a4a1cdb0..1ec7d8b48 100644 --- a/npc/003-1/jerican.txt +++ b/npc/003-1/jerican.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,93,125,0 script Jerican 450,{ +003-1,93,125,0 script Jerican NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/lieutenantdausen.txt b/npc/003-1/lieutenantdausen.txt index 30b4cfdb0..9144aac2d 100644 --- a/npc/003-1/lieutenantdausen.txt +++ b/npc/003-1/lieutenantdausen.txt @@ -80,7 +80,7 @@ function script CheckGuard { getexp 5,0; close; } -003-1,98,100,0 script Guard Philip 451,{ +003-1,98,100,0 script Guard Philip NPC_GUARD1,{ if (getq(CandorQuest_HAS) == 1) { //CheckEnfant(); // FIXME and everywhere else: Missing Function @@ -91,187 +91,136 @@ OnInit: .distance = 1; end; } -003-1,98,121,0 script Guard Defou 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,98,121,0 script Guard Defou NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,102,121,0 script Guard Avou 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,102,121,0 script Guard Avou NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,58,158,0 script Guard Benji 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,58,158,0 script Guard Benji NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,62,158,0 script Guard Valou 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,62,158,0 script Guard Valou NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,71,138,0 script Guard Nutelo 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,71,138,0 script Guard Nutelo NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,58,128,0 script Guard Moustacha 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,58,128,0 script Guard Moustacha NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,58,100,0 script Guard Popaul 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,58,100,0 script Guard Popaul NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,51,73,0 script Guard Yen 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,51,73,0 script Guard Yen NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-2,41,37,0 script Guard Youn 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-2,41,37,0 script Guard Youn NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,54,52,0 script Guard Maxim 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,54,52,0 script Guard Maxim NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,50,36,0 script Guard Totor 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,50,36,0 script Guard Totor NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,53,36,0 script Guard Roukin 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,53,36,0 script Guard Roukin NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,35,34,0 script Guard Falko 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,35,34,0 script Guard Falko NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-3,39,37,0 script Guard Malindax 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-3,39,37,0 script Guard Malindax NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,111,101,0 script Guard Fromag 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,111,101,0 script Guard Fromag NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,102,80,0 script Guard Tetric 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,102,80,0 script Guard Tetric NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; .distance = 1; end; } -003-1,107,80,0 script Guard Biscop 451,{ - if (getq(CandorQuest_HAS) == 1) - { - //CheckEnfant(); - } +003-1,107,80,0 script Guard Biscop NPC_GUARD1,{ + legiontalk; end; OnInit: .sex = G_OTHER; diff --git a/npc/003-1/luca.txt b/npc/003-1/luca.txt index 8c090ae29..0b79ebb68 100644 --- a/npc/003-1/luca.txt +++ b/npc/003-1/luca.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,109,129,0 script Luca 450,{ +003-1,109,129,0 script Luca NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/mahoud.txt b/npc/003-1/mahoud.txt index cadd72f34..ae169bbe5 100644 --- a/npc/003-1/mahoud.txt +++ b/npc/003-1/mahoud.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,46,79,0 script Mahoud 450,{ +003-1,46,79,0 script Mahoud NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/malivox.txt b/npc/003-1/malivox.txt index 05a0ba6ca..bdb9d481c 100644 --- a/npc/003-1/malivox.txt +++ b/npc/003-1/malivox.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,114,106,0 script Malivox 450,{ +003-1,114,106,0 script Malivox NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/mariusthebard.txt b/npc/003-1/mariusthebard.txt index 0296c7cdb..fe7169084 100644 --- a/npc/003-1/mariusthebard.txt +++ b/npc/003-1/mariusthebard.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,88,135,0 script Marius The Bard 441,{ +003-1,88,135,0 script Marius The Bard NPC_WATER_SPLASH,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/michel.txt b/npc/003-1/michel.txt index 3c70f7e81..c6665e932 100644 --- a/npc/003-1/michel.txt +++ b/npc/003-1/michel.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,89,109,0 script Michel 450,{ +003-1,89,109,0 script Michel NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/neko.txt b/npc/003-1/neko.txt index f2d62df52..330fd03fc 100644 --- a/npc/003-1/neko.txt +++ b/npc/003-1/neko.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,103,106,0 script Neko 450,{ +003-1,103,106,0 script Neko NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/ninathetraveler.txt b/npc/003-1/ninathetraveler.txt index 771a495ab..31180615d 100644 --- a/npc/003-1/ninathetraveler.txt +++ b/npc/003-1/ninathetraveler.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,56,143,0 script Nina The Traveler 451,{ +003-1,56,143,0 script Nina The Traveler NPC_GUARD1,{ .cake = CherryCake; .reward = FancyHat; diff --git a/npc/003-1/silvia.txt b/npc/003-1/silvia.txt index 6798e360c..6acc4acb2 100644 --- a/npc/003-1/silvia.txt +++ b/npc/003-1/silvia.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,109,150,0 script Silvia 450,{ +003-1,109,150,0 script Silvia NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/swezanne.txt b/npc/003-1/swezanne.txt index 99d85d001..04e2dde0a 100644 --- a/npc/003-1/swezanne.txt +++ b/npc/003-1/swezanne.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,70,100,0 script Swezanne 450,{ +003-1,70,100,0 script Swezanne NPC_MONA,{ hello; @@ -10,4 +10,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-1/tinris.txt b/npc/003-1/tinris.txt index d4d4434aa..de267dff8 100644 --- a/npc/003-1/tinris.txt +++ b/npc/003-1/tinris.txt @@ -1,7 +1,7 @@ // Author: // Saulc -003-1,66,30,0 script Tinris 450,{ +003-1,66,30,0 script Tinris NPC_MONA,{ hello; @@ -9,4 +9,4 @@ OnInit: .sex = G_MALE; .distance = 3; end; -} \ No newline at end of file +} diff --git a/npc/003-8/jhedia.txt b/npc/003-8/jhedia.txt index 7994be439..9f661fa20 100644 --- a/npc/003-8/jhedia.txt +++ b/npc/003-8/jhedia.txt @@ -2,7 +2,7 @@ // Author: // Crazyfefe -003-8,28,30,0 script Jhedia 427,{ +003-8,28,30,0 script Jhedia NPC_ELVEN_FEMALE,{ .Item1 = IronOre; //7 .Item2 = Coal; //11 diff --git a/npc/005-1/ayasha.txt b/npc/005-1/ayasha.txt index a59b586df..8a6338455 100644 --- a/npc/005-1/ayasha.txt +++ b/npc/005-1/ayasha.txt @@ -80,7 +80,7 @@ function script CheckEnfant { getexp 5,0; close; } -005-1,69,90,0 script Charda 451,{ +005-1,69,90,0 script Charda NPC_GUARD1,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); @@ -91,7 +91,7 @@ OnInit: .distance = 1; end; } -005-1,23,84,0 script Faris 451,{ +005-1,23,84,0 script Faris NPC_GUARD1,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); @@ -102,7 +102,7 @@ OnInit: .distance = 1; end; } -005-1,84,21,0 script Ghada 445,{ +005-1,84,21,0 script Ghada NPC_HUMAN_M_ARTIS,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); @@ -113,7 +113,7 @@ OnInit: .distance = 1; end; } -005-1,38,58,0 script Latif 445,{ +005-1,38,58,0 script Latif NPC_HUMAN_M_ARTIS,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); @@ -124,7 +124,7 @@ OnInit: .distance = 1; end; } -005-1,18,43,0 script Rasin 445,{ +005-1,18,43,0 script Rasin NPC_HUMAN_M_ARTIS,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); @@ -135,7 +135,7 @@ OnInit: .distance = 1; end; } -005-1,38,65,0 script Djinx 451,{ +005-1,38,65,0 script Djinx NPC_GUARD1,{ if (getq(CandorQuest_HAS) == 1) { CheckEnfant(); diff --git a/npc/005-1/movetest.txt b/npc/005-1/movetest.txt index 21868c2d9..dcec64459 100644 --- a/npc/005-1/movetest.txt +++ b/npc/005-1/movetest.txt @@ -12,13 +12,13 @@ OnTimer1000: OnInit: initpath "move", 44, 35, - //"dir", TOP, 0, + "dir", UP, 0, "wait", 2, 0, "move", 51, 81, - //"dir", DOWN, 0, + "dir", DOWN, 0, "wait", 2, 0,"" "Mmove", 50, 88, - //"dir", DOWN, 0, + "dir", DOWN, 0, "wait", 2, 0; initialmove; diff --git a/npc/005-4/rosen.txt b/npc/005-4/rosen.txt index 958d74dee..e42e30bd2 100644 --- a/npc/005-4/rosen.txt +++ b/npc/005-4/rosen.txt @@ -14,7 +14,7 @@ // 5 Light Armor Shop quest delivered. // 6 Light Armor Shop gave the cloths. -005-4,29,36,0 script Rosen 451,{ +005-4,29,36,0 script Rosen NPC_GUARD1,{ function explain_ironingot { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, -- cgit v1.2.3-70-g09d2