summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/item_db.conf26
-rw-r--r--npc/000-0-0/_import.txt2
-rw-r--r--npc/000-0-0/q'onan.txt15
-rw-r--r--npc/000-0-0/qonan.txt15
-rw-r--r--npc/000-2-0/billybons.txt12
-rw-r--r--npc/000-2-1/_import.txt1
-rw-r--r--npc/000-2-1/_savepoints.txt9
-rw-r--r--npc/000-2-1/knife.txt15
-rw-r--r--npc/000-2-1/q'onan.txt16
9 files changed, 46 insertions, 65 deletions
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 6c8ad57ac..8f96f60cf 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -6332,6 +6332,32 @@ item_db: (
Sprite: 0
},
{
+ Id: 833
+ AegisName: "EmptyBottle"
+ Name: "EmptyBottle"
+ Type: "IT_ETC"
+ Buy: 100
+ Sell: 10
+ Weight: 5
+ Atk: 0
+ Matk: 0
+ Def: 0
+ Range: 0
+ Slots: 0
+ Job: {
+ All: true
+ }
+ Gender: "SEX_ANY"
+ WeaponLv: 0
+ EquipLv: 0
+ Refine: false
+ ViewSprite: 833
+ BindOnEquip: false
+ BuyingStore: true
+ Delay: 0
+ Sprite: 0
+},
+{
Id: 1000
AegisName: "BromenalFourLeafAmulet"
Name: "Bromenal Four-Leaf Amulet"
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt
index 70fa958cc..fa572a35a 100644
--- a/npc/000-0-0/_import.txt
+++ b/npc/000-0-0/_import.txt
@@ -1,6 +1,4 @@
// Map 000-0-0: Sailor's Room
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/000-0-0/mapflags.txt",
-"npc/000-0-0/q'onan.txt",
-"npc/000-0-0/qonan.txt",
"npc/000-0-0/sailors.txt",
diff --git a/npc/000-0-0/q'onan.txt b/npc/000-0-0/q'onan.txt
deleted file mode 100644
index d262c1ca1..000000000
--- a/npc/000-0-0/q'onan.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Evol scripts.
-// Authors:
-// Alige
-// Vasily_Makarov
-// Description:
-// Sleeping and snoring NPC.
-
-000-0-0,29,28,0 script Q'Onan#000-0-0 NPC_ORC_SAILOR,{
- asleep;
- close;
-
-OnInit:
- .sex = G_MALE;
- end;
-}
diff --git a/npc/000-0-0/qonan.txt b/npc/000-0-0/qonan.txt
deleted file mode 100644
index d262c1ca1..000000000
--- a/npc/000-0-0/qonan.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// Evol scripts.
-// Authors:
-// Alige
-// Vasily_Makarov
-// Description:
-// Sleeping and snoring NPC.
-
-000-0-0,29,28,0 script Q'Onan#000-0-0 NPC_ORC_SAILOR,{
- asleep;
- close;
-
-OnInit:
- .sex = G_MALE;
- end;
-}
diff --git a/npc/000-2-0/billybons.txt b/npc/000-2-0/billybons.txt
index 23e056a89..4a4e63682 100644
--- a/npc/000-2-0/billybons.txt
+++ b/npc/000-2-0/billybons.txt
@@ -6,6 +6,8 @@
000-2-0,20,23,0 script Billy Bons NPC_BILLY_BONS,{
if (rand(5) == 2) goto L_Hic;
+ .@q = getq(ShipQuests_Bottle);
+ if (.@q) == 1 close;
mesn;
mesq l("You? Here?");
@@ -26,6 +28,7 @@
menu
l("Are you ok?"), L_Quit,
+ ("Take the bottle?"), L_Give,
l("Alright... Bye."), -;
mes "";
@@ -89,6 +92,15 @@ L_Quit:
close;
+ L_Give:
+ mes "";
+ inventoryplace 833, 1;
+
+ setq ShipQuests_Bottle, 1;
+ getitem 833, 1;
+
+ close;
+
OnInit:
.sex = G_MALE;
.distance = 3;
diff --git a/npc/000-2-1/_import.txt b/npc/000-2-1/_import.txt
index ba87b23ef..03a56e8c9 100644
--- a/npc/000-2-1/_import.txt
+++ b/npc/000-2-1/_import.txt
@@ -13,5 +13,4 @@
"npc/000-2-1/knife.txt",
"npc/000-2-1/mapflags.txt",
"npc/000-2-1/peter.txt",
-"npc/000-2-1/q'onan.txt",
"npc/000-2-1/story_save.txt",
diff --git a/npc/000-2-1/_savepoints.txt b/npc/000-2-1/_savepoints.txt
index 14b79c7e4..4d48830c8 100644
--- a/npc/000-2-1/_savepoints.txt
+++ b/npc/000-2-1/_savepoints.txt
@@ -18,15 +18,6 @@ OnInit:
.sex = G_OTHER;
end;
}
-000-2-1,50,38,0 script #save_000-2-1_50_38 NPC_SAVE_POINT,{
- savepointparticle .map$, .x, .y, NO_INN;
- close;
-
-OnInit:
- .distance = 2;
- .sex = G_OTHER;
- end;
-}
000-2-1,55,40,0 script #save_000-2-1_55_40 NPC_SAVE_POINT,{
savepointparticle .map$, .x, .y, NO_INN;
close;
diff --git a/npc/000-2-1/knife.txt b/npc/000-2-1/knife.txt
index d8d1d54ad..6fe6ea55a 100644
--- a/npc/000-2-1/knife.txt
+++ b/npc/000-2-1/knife.txt
@@ -1,6 +1,7 @@
// Evol scripts.
// Authors:
-// Ablu
+// Ablu
+// Saulc
// Qwerty Dragon
// Description:
// Knife on the table.
@@ -15,22 +16,22 @@
if (.@q) close;
mesn "Narrator";
- mes col(l("There are some knives on the table. Would you like to take one?"), 9);
+ mes col(l("There are some old rusty knives on the table. Would you like to take one?"), 9);
next;
menu
- l("Yes."), L_Give,
- l("No."), -;
-
+ l("Yeah !."), L_Give,
+ l("Na."), -;
+
closedialog;
close;
L_Give:
mes "";
- inventoryplace Knife, 1;
+ inventoryplace RustyKnife, 1;
setq ShipQuests_Knife, 1;
- getitem Knife, 1;
+ getitem RustyKnife, 1;
mesn "Narrator";
mes col(l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client."), 9);
diff --git a/npc/000-2-1/q'onan.txt b/npc/000-2-1/q'onan.txt
deleted file mode 100644
index bee4f34a9..000000000
--- a/npc/000-2-1/q'onan.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// Evol scripts.
-// Authors:
-// Alige
-// Vasily_Makarov
-// Description:
-// Sleeping and snoring NPC.
-
-000-2-1,53,38,0 script Q'Onan#000-2-1 NPC_ORC_SAILOR,{
- asleep;
- close;
-
-OnInit:
- .sex = G_MALE;
- .distance = 2;
- end;
-}