From 01b3347b3ddde80d53380691cb8ba811597be5ea Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 12 Oct 2016 10:36:07 -0500 Subject: Remove hand written generic saves --- npc/000-2-1/_import.txt | 1 - npc/000-2-1/savepoint.txt | 57 --------------------------------------------- npc/000-2-1/story_save.txt | 30 ++++++++++++++++++++++++ npc/001-2-1/_import.txt | 1 - npc/001-2-1/savepoints.txt | 15 ------------ npc/001-2-10/_import.txt | 1 - npc/001-2-10/savepoints.txt | 15 ------------ npc/001-2-11/_import.txt | 1 - npc/001-2-11/savepoints.txt | 15 ------------ npc/001-2-13/_import.txt | 1 - npc/001-2-13/savepoints.txt | 15 ------------ npc/001-2-15/_import.txt | 1 - npc/001-2-15/savepoints.txt | 15 ------------ npc/001-2-22/_import.txt | 1 - npc/001-2-22/savepoint.txt | 55 ------------------------------------------- npc/001-2-22/savepoints.txt | 55 ------------------------------------------- npc/001-2-3/_import.txt | 1 - npc/001-2-3/savepoints.txt | 15 ------------ npc/001-2-37/_import.txt | 1 - npc/001-2-37/savepoints.txt | 45 ----------------------------------- npc/001-2-38/_import.txt | 1 - npc/001-2-38/savepoints.txt | 45 ----------------------------------- 22 files changed, 30 insertions(+), 357 deletions(-) delete mode 100644 npc/000-2-1/savepoint.txt create mode 100644 npc/000-2-1/story_save.txt delete mode 100644 npc/001-2-1/savepoints.txt delete mode 100644 npc/001-2-10/savepoints.txt delete mode 100644 npc/001-2-11/savepoints.txt delete mode 100644 npc/001-2-13/savepoints.txt delete mode 100644 npc/001-2-15/savepoints.txt delete mode 100644 npc/001-2-22/savepoint.txt delete mode 100644 npc/001-2-22/savepoints.txt delete mode 100644 npc/001-2-3/savepoints.txt delete mode 100644 npc/001-2-37/savepoints.txt delete mode 100644 npc/001-2-38/savepoints.txt diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt index 5ef64326..262c895d 100644 --- a/npc/000-2-1/_import.txt +++ b/npc/000-2-1/_import.txt @@ -12,4 +12,3 @@ "npc/000-2-1/knife.txt", "npc/000-2-1/peter.txt", "npc/000-2-1/q'onan.txt", -"npc/000-2-1/savepoint.txt", diff --git a/npc/000-2-1/savepoint.txt b/npc/000-2-1/savepoint.txt deleted file mode 100644 index d293cfd1..00000000 --- a/npc/000-2-1/savepoint.txt +++ /dev/null @@ -1,57 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Saves locations in 000-2-1 map. - -000-2-1,40,37,0 script #name1 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 40, 37; - close; - -OnInit: - .distance = 2; - end; -} - -000-2-1,46,37,0 script #name2 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 46, 37; - close; - -OnInit: - .distance = 2; - end; -} - -000-2-1,50,38,0 script #name3 NPC_FINAL_POINT,{ - .@q_nard = getq(ShipQuests_Nard); - .@q_narr = getq(General_Narrator); - - if(.@q_nard == 5 && .@q_narr < 1) - { -OnClick: - narrator 4, - l("You lie in the bed."), - l("Your head is suddently heavy, your eyes are closing..."), - lg("You fell asleep."); - - warp "000-0-1", 26, 28; - } - else - { - savepointparticle "000-2-1.gat", 50, 38; - } - close; - -OnInit: - .distance = 2; - end; -} - -000-2-1,55,40,0 script #name4 NPC_SAVE_POINT,{ - savepointparticle "000-2-1.gat", 55, 40; - close; - -OnInit: - .distance = 2; - end; -} diff --git a/npc/000-2-1/story_save.txt b/npc/000-2-1/story_save.txt new file mode 100644 index 00000000..e46841c1 --- /dev/null +++ b/npc/000-2-1/story_save.txt @@ -0,0 +1,30 @@ +// Evol scripts. +// Author: +// Reid +// Description: +// Scritpted save locations in 000-2-1 map. + +000-2-1,50,38,0 script #name3 NPC_FINAL_POINT,{ + .@q_nard = getq(ShipQuests_Nard); + .@q_narr = getq(General_Narrator); + + if(.@q_nard == 5 && .@q_narr < 1) + { +OnClick: + narrator 4, + l("You lie in the bed."), + l("Your head is suddently heavy, your eyes are closing..."), + lg("You fell asleep."); + + warp "000-0-1", 26, 28; + } + else + { + savepointparticle "000-2-1.gat", 50, 38; + } + close; + +OnInit: + .distance = 2; + end; +} diff --git a/npc/001-2-1/_import.txt b/npc/001-2-1/_import.txt index b130b929..874a15cc 100644 --- a/npc/001-2-1/_import.txt +++ b/npc/001-2-1/_import.txt @@ -1,4 +1,3 @@ // Map 001-2-1: Artis, Noble House "npc/001-2-1/mapflags.txt", -"npc/001-2-1/savepoints.txt", "npc/001-2-1/_warps.txt", diff --git a/npc/001-2-1/savepoints.txt b/npc/001-2-1/savepoints.txt deleted file mode 100644 index f9df8dd4..00000000 --- a/npc/001-2-1/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-1,27,30,0 script #savepoint0-001-2-1 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-10/_import.txt b/npc/001-2-10/_import.txt index d6cafa3d..227ce040 100644 --- a/npc/001-2-10/_import.txt +++ b/npc/001-2-10/_import.txt @@ -1,4 +1,3 @@ // Map 001-2-10: Artis, Noble House "npc/001-2-10/mapflags.txt", -"npc/001-2-10/savepoints.txt", "npc/001-2-10/_warps.txt", diff --git a/npc/001-2-10/savepoints.txt b/npc/001-2-10/savepoints.txt deleted file mode 100644 index 7e4d9386..00000000 --- a/npc/001-2-10/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-10,26,30,0 script #savepoint0-001-2-10 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-11/_import.txt b/npc/001-2-11/_import.txt index fd42a7a5..c7bacb62 100644 --- a/npc/001-2-11/_import.txt +++ b/npc/001-2-11/_import.txt @@ -1,5 +1,4 @@ // Map 001-2-11: Artis, Noble House "npc/001-2-11/mapflags.txt", "npc/001-2-11/mona.txt", -"npc/001-2-11/savepoints.txt", "npc/001-2-11/_warps.txt", diff --git a/npc/001-2-11/savepoints.txt b/npc/001-2-11/savepoints.txt deleted file mode 100644 index 4f360d63..00000000 --- a/npc/001-2-11/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-11,26,31,0 script #savepoint0-001-2-11 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-13/_import.txt b/npc/001-2-13/_import.txt index 669325bc..b728934e 100644 --- a/npc/001-2-13/_import.txt +++ b/npc/001-2-13/_import.txt @@ -1,4 +1,3 @@ // Map 001-2-13: Artis, Noble House, First Floor "npc/001-2-13/mapflags.txt", -"npc/001-2-13/savepoints.txt", "npc/001-2-13/_warps.txt", diff --git a/npc/001-2-13/savepoints.txt b/npc/001-2-13/savepoints.txt deleted file mode 100644 index e46700eb..00000000 --- a/npc/001-2-13/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-13,41,31,0 script #savepoint0-001-2-13 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-15/_import.txt b/npc/001-2-15/_import.txt index 84d812e1..ac3e30db 100644 --- a/npc/001-2-15/_import.txt +++ b/npc/001-2-15/_import.txt @@ -1,4 +1,3 @@ // Map 001-2-15: Artis, Noble House "npc/001-2-15/mapflags.txt", -"npc/001-2-15/savepoints.txt", "npc/001-2-15/_warps.txt", diff --git a/npc/001-2-15/savepoints.txt b/npc/001-2-15/savepoints.txt deleted file mode 100644 index 157af4d6..00000000 --- a/npc/001-2-15/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-15,27,41,0 script #savepoint0-001-2-15 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-22/_import.txt b/npc/001-2-22/_import.txt index be88ba5f..aae359a4 100644 --- a/npc/001-2-22/_import.txt +++ b/npc/001-2-22/_import.txt @@ -7,5 +7,4 @@ "npc/001-2-22/knife.txt", "npc/001-2-22/_mobs.txt", "npc/001-2-22/peter.txt", -"npc/001-2-22/savepoints.txt", "npc/001-2-22/_warps.txt", diff --git a/npc/001-2-22/savepoint.txt b/npc/001-2-22/savepoint.txt deleted file mode 100644 index b2f139e2..00000000 --- a/npc/001-2-22/savepoint.txt +++ /dev/null @@ -1,55 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-22,40,37,0 script #savepoint0-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,46,37,0 script #savepoint1-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,50,38,0 script #savepoint2-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,55,40,0 script #savepoint3-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,53,38,0 script #savepoint4-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-22/savepoints.txt b/npc/001-2-22/savepoints.txt deleted file mode 100644 index b2f139e2..00000000 --- a/npc/001-2-22/savepoints.txt +++ /dev/null @@ -1,55 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-22,40,37,0 script #savepoint0-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,46,37,0 script #savepoint1-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,50,38,0 script #savepoint2-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,55,40,0 script #savepoint3-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-22,53,38,0 script #savepoint4-001-2-22 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-3/_import.txt b/npc/001-2-3/_import.txt index 9ae1cc94..ee5e8a1e 100644 --- a/npc/001-2-3/_import.txt +++ b/npc/001-2-3/_import.txt @@ -1,4 +1,3 @@ // Map 001-2-3: Artis, Moon's House, First Floor "npc/001-2-3/mapflags.txt", -"npc/001-2-3/savepoints.txt", "npc/001-2-3/_warps.txt", diff --git a/npc/001-2-3/savepoints.txt b/npc/001-2-3/savepoints.txt deleted file mode 100644 index 799ac40e..00000000 --- a/npc/001-2-3/savepoints.txt +++ /dev/null @@ -1,15 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-3,42,32,0 script #savepoint0-001-2-3 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-37/_import.txt b/npc/001-2-37/_import.txt index 52916239..a24d32f9 100644 --- a/npc/001-2-37/_import.txt +++ b/npc/001-2-37/_import.txt @@ -1,5 +1,4 @@ // Map 001-2-37: "npc/001-2-37/hammock.txt", "npc/001-2-37/mapflags.txt", -"npc/001-2-37/savepoints.txt", "npc/001-2-37/_warps.txt", diff --git a/npc/001-2-37/savepoints.txt b/npc/001-2-37/savepoints.txt deleted file mode 100644 index 5664a390..00000000 --- a/npc/001-2-37/savepoints.txt +++ /dev/null @@ -1,45 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-37,25,41,0 script #savepoint0-001-2-37 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-37,35,41,0 script #savepoint1-001-2-37 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-37,25,46,0 script #savepoint2-001-2-37 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-37,35,46,0 script #savepoint3-001-2-37 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} diff --git a/npc/001-2-38/_import.txt b/npc/001-2-38/_import.txt index b7b44d44..75c333cc 100644 --- a/npc/001-2-38/_import.txt +++ b/npc/001-2-38/_import.txt @@ -1,5 +1,4 @@ // Map 001-2-38: "npc/001-2-38/hammock.txt", "npc/001-2-38/mapflags.txt", -"npc/001-2-38/savepoints.txt", "npc/001-2-38/_warps.txt", diff --git a/npc/001-2-38/savepoints.txt b/npc/001-2-38/savepoints.txt deleted file mode 100644 index f3b01caa..00000000 --- a/npc/001-2-38/savepoints.txt +++ /dev/null @@ -1,45 +0,0 @@ -// Evol scripts. -// Author: -// Reid -// Description: -// Free save point. - -001-2-38,25,41,0 script #savepoint0-001-2-38 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-38,35,41,0 script #savepoint1-001-2-38 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-38,25,46,0 script #savepoint2-001-2-38 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} - -001-2-38,35,46,0 script #savepoint3-001-2-38 NPC_SAVE_POINT,{ - savepointparticle .map$, .x, .y, CURRENT_INN; - close; - -OnInit: - .distance = 2; - .sex = G_OTHER; - end; -} -- cgit v1.2.3-70-g09d2