From 83e0ff876dcb56645a4b1c6d137745764e4df201 Mon Sep 17 00:00:00 2001
From: ali-g <gauvain.dauchy@free.fr>
Date: Sat, 29 Oct 2011 08:25:29 +0200
Subject: Made the name of each item be the same everywhere. Changed some names
 in item_db.txt and the same one in corresponding scripts.

---
 world/map/npc/027-2/crying_child.txt |  2 +-
 world/map/npc/027-2/innkeeper.txt    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'world/map/npc/027-2')

diff --git a/world/map/npc/027-2/crying_child.txt b/world/map/npc/027-2/crying_child.txt
index 80cefcb3..4081f25f 100644
--- a/world/map/npc/027-2/crying_child.txt
+++ b/world/map/npc/027-2/crying_child.txt
@@ -159,7 +159,7 @@ L_return4:
     getinventorylist;
     if (@inventorylist_count == 100)
         goto L_full;
-    getitem "RingSimple", 1;
+    getitem "SimpleRing", 1;
     set @state, 7;
     callsub S_Update_Mask;
     mes "\"I will tell my parents how great and helpful you are. Maybe they can even let you stay here at the inn for free!\"";
diff --git a/world/map/npc/027-2/innkeeper.txt b/world/map/npc/027-2/innkeeper.txt
index 769d0dfd..3b3af853 100644
--- a/world/map/npc/027-2/innkeeper.txt
+++ b/world/map/npc/027-2/innkeeper.txt
@@ -297,27 +297,27 @@ L_Sorry:
     mes "[Reid's Ghost]";
     mes "\"Welcome back.\"";
     if ((@lover == 4)
-        && (countitem("GemRawWhite") >= @DIAMOND_AMOUNT)
-        && (countitem("GemRawRed") >= @RUBY_AMOUNT)
+        && (countitem("Diamond") >= @DIAMOND_AMOUNT)
+        && (countitem("Ruby") >= @RUBY_AMOUNT)
         && (@husband == 5))
             menu
                 "Savaric asked me to give you something.",L_Diamond,
                 "Hamond sent me to bring you this.",L_Ruby,
                 "Nevermind.",-;
-    if (@lover == 4 && (countitem("GemRawWhite") >= @DIAMOND_AMOUNT))
+    if (@lover == 4 && (countitem("Diamond") >= @DIAMOND_AMOUNT))
         menu
             "Savaric asked me to give you something.",L_Diamond,
             "Nevermind.",-;
-    if (@husband == 5 && (countitem("GemRawRed") >= @RUBY_AMOUNT))
+    if (@husband == 5 && (countitem("Ruby") >= @RUBY_AMOUNT))
         menu
             "Hamond sent me to bring you this.",L_Ruby,
             "Nevermind.",-;
     goto L_Close;
 
 L_Diamond:
-    if (countitem("GemRawWhite") < @DIAMOND_AMOUNT)
+    if (countitem("Diamond") < @DIAMOND_AMOUNT)
         goto L_Kidding;
-    delitem "GemRawWhite", @DIAMOND_AMOUNT;
+    delitem "Diamond", @DIAMOND_AMOUNT;
     mes "You explain how Savaric feels and what the diamonds mean.";
     next;
     mes "[Reid's Ghost]";
@@ -329,9 +329,9 @@ L_Diamond:
     goto L_Close;
 
 L_Ruby:
-    if (countitem("GemRawRed") < @RUBY_AMOUNT)
+    if (countitem("Ruby") < @RUBY_AMOUNT)
         goto L_Kidding;
-    delitem "GemRawRed", @RUBY_AMOUNT;
+    delitem "Ruby", @RUBY_AMOUNT;
     mes "You tell her about Hamonds feelings.";
     next;
     mes "[Reid's Ghost]";
-- 
cgit v1.2.3-60-g2f50