summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-11-06 22:41:24 -0200
committershennetsind <ind@henn.et>2013-11-06 22:41:24 -0200
commit52864b40d6f9df5682b257ac2f36d645895364be (patch)
tree45a366ef4f3c911b038487fac8fa5aa6b706e6dd
parentb1f7e524a79ce3e7afd64becaa7657c71d59f18f (diff)
downloadhercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.gz
hercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.bz2
hercules-52864b40d6f9df5682b257ac2f36d645895364be.tar.xz
hercules-52864b40d6f9df5682b257ac2f36d645895364be.zip
Update Fix
Re-added the changes that were gone in the update conflict. Signed-off-by: shennetsind <ind@henn.et>
-rw-r--r--conf/messages.conf16
-rw-r--r--src/common/mmo.h2
-rw-r--r--src/map/pc_groups.c1
-rw-r--r--src/map/pc_groups.h1
4 files changed, 18 insertions, 2 deletions
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
diff --git a/src/common/mmo.h b/src/common/mmo.h
index b1a1caf24..f676893ea 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -222,7 +222,7 @@ struct item {
char attribute;
short card[MAX_SLOTS];
unsigned int expire_time;
- char favorite;
+ char favorite, bound;
uint64 unique_id;
};
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 78d111b1c..c44e2634a 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -417,6 +417,7 @@ void do_init_pc_groups(void) {
{ "disable_pvp", PC_PERM_DISABLE_PVP },
{ "disable_commands_when_dead", PC_PERM_DISABLE_CMD_DEAD },
{ "hchsys_admin", PC_PERM_HCHSYS_ADMIN },
+ { "can_trade_bounded", PC_PERM_TRADE_BOUNDED },
};
unsigned char i, len = ARRAYLENGTH(pc_g_defaults);
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 28c82d619..df99b19df 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -30,6 +30,7 @@ enum e_pc_permission {
PC_PERM_DISABLE_PVP = 0x080000, // #20
PC_PERM_DISABLE_CMD_DEAD = 0x100000,
PC_PERM_HCHSYS_ADMIN = 0x200000,
+ PC_PERM_TRADE_BOUNDED = 0x400000,
};
// Cached config settings for quick lookup