From 52864b40d6f9df5682b257ac2f36d645895364be Mon Sep 17 00:00:00 2001
From: shennetsind <ind@henn.et>
Date: Wed, 6 Nov 2013 22:41:24 -0200
Subject: Update Fix

Re-added the changes that were gone in the update conflict.

Signed-off-by: shennetsind <ind@henn.et>
---
 conf/messages.conf | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'conf')

diff --git a/conf/messages.conf b/conf/messages.conf
index a9f0a5984..3564de043 100644
--- a/conf/messages.conf
+++ b/conf/messages.conf
@@ -316,6 +316,13 @@
 290: The player is no longer killable.
 291: Weather effects will dispell on warp/refresh
 292: Killer state reset.
+//Item Bind System
+293: This bounded item cannot be traded to that character.
+294: This bounded item cannot be stored there.
+295: Please enter an item name or ID (usage: @itembound <item name/ID> <quantity> <bound_type>).
+296: Please enter all parameters (usage: @itembound2 <item name/ID> <quantity>
+297:   <identify_flag> <refine> <attribute> <card1> <card2> <card3> <card4> <bound_type>).
+298: Invalid bound type. Valid types are - 1:Account 2:Guild 3:Party 4:Character
 // Guild Castles Number
 // --------------------
 //299: ?? Castles
@@ -455,6 +462,13 @@
 // Messages of others (not for GM commands)
 // ----------------------------------------
 
+// Account-Bound Items
+497: You cannot distribute this item - it is an account bounded item!
+
+// @itembound / @itembound2
+498: Cannot create bounded pet eggs or pet armors.
+499: Cannot create bounded stackable items.
+
 //500: FREE
 501: Your account time limit is: %d-%m-%Y %H:%M:%S.
 502: Day Mode is activated
@@ -715,7 +729,7 @@
 983: Please enter an item name or ID (usage: @item <item name/ID> <quantity>).
 
 // @item2
-984: Please enter all parameters (usage: @item2 <item name/ID> <quantity>
+984: Please enter all parameters (usage: @item2 <item name/ID> <quantity>).
 985:   <identify_flag> <refine> <attribute> <card1> <card2> <card3> <card4>).
 
 // @baselevelup
-- 
cgit v1.2.3-60-g2f50