diff options
-rw-r--r-- | npc/000-2-1/alige.txt | 8 | ||||
-rw-r--r-- | npc/000-2-1/arpan.txt | 26 | ||||
-rw-r--r-- | npc/000-2-1/chefgado.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/devis.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/hammock.txt | 20 | ||||
-rw-r--r-- | npc/000-2-1/knife.txt | 2 | ||||
-rw-r--r-- | npc/000-2-1/peter.txt | 44 | ||||
-rw-r--r-- | npc/000-2-1/story_save.txt | 2 | ||||
-rw-r--r-- | npc/000-2-2/doors.txt | 4 | ||||
-rw-r--r-- | npc/000-2-2/ratto.txt | 18 | ||||
-rw-r--r-- | npc/005-3/barrel.txt | 18 |
11 files changed, 73 insertions, 73 deletions
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 +}
|