Merge branch 'patches' into 'master'

Typos in two item names.



See merge request !14

4 files changed, 12 insertions, 12 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c85d7d47..d9bd45c5 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -749,8 +749,8 @@ item_db: (
 },
 {
     Id: 520
-    AegisName: "PibberiesInfusion"
-    Name: "Pibberies Infusion"
+    AegisName: "PiberriesInfusion"
+    Name: "Piberries Infusion"
     Type: "IT_HEALING"
     Buy: 140
     Sell: 20
@@ -2002,7 +2002,7 @@ item_db: (
 {
     Id: 729
     AegisName: "FluffyFur"
-    Name: "Flufy Fur"
+    Name: "Fluffy Fur"
     Type: "IT_ETC"
     Buy: 200
     Sell: 8
diff --git a/npc/001-1/enora.txt b/npc/001-1/enora.txt
index 7a86343e..41124908 100644
--- a/npc/001-1/enora.txt
+++ b/npc/001-1/enora.txt
@@ -230,7 +230,7 @@
 
         speech 5,
             l("Oh yes, I have one last errand for you, Q'Pid in the market sells potions."),
-            l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink (PibberiesInfusion)),
+            l("It has been some days now since I asked her for a box of @@s, but she hasn't delivered anything yet.", getitemlink (PiberriesInfusion)),
             l("Please try to figure out what went wrong with this order and bring me these potions."),
             l("You will be able to find her in the market on the south-east of Artis.");
 
@@ -259,7 +259,7 @@
         inventoryplace TrainingGladius, 3;
         getitem TrainingGladius, 1;
         getitem2 ArtisTankTop, 1, 1, 0, 0, 5005, 0, 0, 0;
-        getitem PibberiesInfusion, 5;
+        getitem PiberriesInfusion, 5;
         setq ArtisQuests_Enora, 10;
         enora_reward (80, 175);
 
@@ -343,7 +343,7 @@
 
         if (askyesno() == ASK_YES)
         {
-            delitem PibberiesInfusion, 5;
+            delitem PiberriesInfusion, 5;
             enora_fourth_quest;
         }
 
@@ -372,7 +372,7 @@
         menuint
             rif(.@q == 0, l("She told me that you had some tasks for me.")), 0,
             rif(.@q == 4 || .@q == 6 || .@q == 9, l("I have your package.")), 1,
-            rif(.@q == 8 && countitem(PibberiesInfusion) >= 5, l("I have your package.")), 2,
+            rif(.@q == 8 && countitem(PiberriesInfusion) >= 5, l("I have your package.")), 2,
             rif(.@q >= 10, l("I cleaned up the hill.")), 3,
             rif(.@q >= 10, l("How many Fluffies did I kill on the hill?")), 4,
             rif(.@q >= 1, l("Who is Don?")), 5,
diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt
index fb768780..473841c1 100644
--- a/npc/001-1/shop.txt
+++ b/npc/001-1/shop.txt
@@ -217,7 +217,7 @@ OnClock1600:
 OnInit:
     tradertype(NST_MARKET);
 
-    sellitem PibberiesInfusion, -1, 200;
+    sellitem PiberriesInfusion, -1, 200;
     sellitem FatesPotion, -1, 100;
     sellitem ClothoLiquor, -1, 50;
     sellitem LachesisBrew, -1, 30;
@@ -229,14 +229,14 @@ OnInit:
     end;
 
 OnClock0000:
-    restoreshopitem PibberiesInfusion, 150;
+    restoreshopitem PiberriesInfusion, 150;
     restoreshopitem FatesPotion, 80;
     restoreshopitem ClothoLiquor, 40;
     restoreshopitem LachesisBrew, 20;
     restoreshopitem AtroposMixture, 7;
     restoreshopitem ElixirOfLife, 1;
 OnClock1200:
-    restoreshopitem PibberiesInfusion, 80;
+    restoreshopitem PiberriesInfusion, 80;
     restoreshopitem FatesPotion, 40;
     restoreshopitem ClothoLiquor, 20;
     restoreshopitem LachesisBrew, 10;
diff --git a/npc/001-2-26/ivan.txt b/npc/001-2-26/ivan.txt
index ae559b99..9a037467 100644
--- a/npc/001-2-26/ivan.txt
+++ b/npc/001-2-26/ivan.txt
@@ -18,10 +18,10 @@
     function enora_quest {
         speech 5, l("How many? What kind? I can produce two dozen boxes per day.");
 
-        select (l("5 @@s.", getitemlink(PibberiesInfusion)));
+        select (l("5 @@s.", getitemlink(PiberriesInfusion)));
 
         speech 5,
-            l("5 boxes... Alright, @@ are my speciality!", getitemlink (PibberiesInfusion)),
+            l("5 boxes... Alright, @@ are my speciality!", getitemlink (PiberriesInfusion)),
             l("I can prepare them in an hour or so!");
 
         select (l("You missunderstood, it's 5 potions."));