diff --git a/ryzom/common/data_common/database.xml b/ryzom/common/data_common/database.xml
index 4cec96748..ce8eab025 100644
--- a/ryzom/common/data_common/database.xml
+++ b/ryzom/common/data_common/database.xml
@@ -29,25 +29,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -61,9 +61,9 @@
-
-
-
+
+
+
@@ -91,11 +91,11 @@
-
+
-
+
-
+
@@ -103,12 +103,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -117,84 +117,84 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
+
-
+
-
+
@@ -205,19 +205,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -->
@@ -225,55 +228,53 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -287,53 +288,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -350,24 +340,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -379,21 +366,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -415,28 +402,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
@@ -548,48 +533,47 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
-
+
@@ -605,28 +589,28 @@
-
-
+
+
-
-
+
+
-
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
@@ -644,29 +628,29 @@
-
+
-
+
-
+
-
+
-
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
+
@@ -724,23 +708,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ryzom/server/src/entities_game_service/database_plr.cpp b/ryzom/server/src/entities_game_service/database_plr.cpp
index 94f7915bd..5389fde9d 100644
--- a/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -1200,14 +1200,6 @@ void CBankAccessor_PLR::TEXCHANGE::TGIVE::TArray::init(ICDBStructNode *parent, u
nlassert(node != NULL);
_QUANTITY = node;
- node = parent->getNode( ICDBStructNode::CTextId("CREATE_TIME"), false );
- nlassert(node != NULL);
- _CREATE_TIME = node;
-
- node = parent->getNode( ICDBStructNode::CTextId("SERIAL"), false );
- nlassert(node != NULL);
- _SERIAL = node;
-
node = parent->getNode( ICDBStructNode::CTextId("USER_COLOR"), false );
nlassert(node != NULL);
_USER_COLOR = node;
@@ -1220,10 +1212,6 @@ void CBankAccessor_PLR::TEXCHANGE::TGIVE::TArray::init(ICDBStructNode *parent, u
nlassert(node != NULL);
_NAMEID = node;
- node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
- nlassert(node != NULL);
- _INFO_VERSION = node;
-
node = parent->getNode( ICDBStructNode::CTextId("ENCHANT"), false );
nlassert(node != NULL);
_ENCHANT = node;
@@ -1240,6 +1228,14 @@ void CBankAccessor_PLR::TEXCHANGE::TGIVE::TArray::init(ICDBStructNode *parent, u
nlassert(node != NULL);
_PREREQUISIT_VALID = node;
+ node = parent->getNode( ICDBStructNode::CTextId("WORNED"), false );
+ nlassert(node != NULL);
+ _WORNED = node;
+
+ node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
+ nlassert(node != NULL);
+ _INFO_VERSION = node;
+
// branch init
@@ -1287,14 +1283,6 @@ void CBankAccessor_PLR::TEXCHANGE::TRECEIVE::TArray::init(ICDBStructNode *parent
nlassert(node != NULL);
_QUANTITY = node;
- node = parent->getNode( ICDBStructNode::CTextId("CREATE_TIME"), false );
- nlassert(node != NULL);
- _CREATE_TIME = node;
-
- node = parent->getNode( ICDBStructNode::CTextId("SERIAL"), false );
- nlassert(node != NULL);
- _SERIAL = node;
-
node = parent->getNode( ICDBStructNode::CTextId("USER_COLOR"), false );
nlassert(node != NULL);
_USER_COLOR = node;
@@ -1307,10 +1295,6 @@ void CBankAccessor_PLR::TEXCHANGE::TRECEIVE::TArray::init(ICDBStructNode *parent
nlassert(node != NULL);
_NAMEID = node;
- node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
- nlassert(node != NULL);
- _INFO_VERSION = node;
-
node = parent->getNode( ICDBStructNode::CTextId("ENCHANT"), false );
nlassert(node != NULL);
_ENCHANT = node;
@@ -1327,6 +1311,14 @@ void CBankAccessor_PLR::TEXCHANGE::TRECEIVE::TArray::init(ICDBStructNode *parent
nlassert(node != NULL);
_PREREQUISIT_VALID = node;
+ node = parent->getNode( ICDBStructNode::CTextId("WORNED"), false );
+ nlassert(node != NULL);
+ _WORNED = node;
+
+ node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
+ nlassert(node != NULL);
+ _INFO_VERSION = node;
+
// branch init
@@ -1502,14 +1494,6 @@ void CBankAccessor_PLR::TINVENTORY::TTEMP::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_QUANTITY = node;
- node = parent->getNode( ICDBStructNode::CTextId("CREATE_TIME"), false );
- nlassert(node != NULL);
- _CREATE_TIME = node;
-
- node = parent->getNode( ICDBStructNode::CTextId("SERIAL"), false );
- nlassert(node != NULL);
- _SERIAL = node;
-
node = parent->getNode( ICDBStructNode::CTextId("USER_COLOR"), false );
nlassert(node != NULL);
_USER_COLOR = node;
@@ -1522,10 +1506,6 @@ void CBankAccessor_PLR::TINVENTORY::TTEMP::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_NAMEID = node;
- node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
- nlassert(node != NULL);
- _INFO_VERSION = node;
-
node = parent->getNode( ICDBStructNode::CTextId("ENCHANT"), false );
nlassert(node != NULL);
_ENCHANT = node;
@@ -1542,6 +1522,14 @@ void CBankAccessor_PLR::TINVENTORY::TTEMP::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_PREREQUISIT_VALID = node;
+ node = parent->getNode( ICDBStructNode::CTextId("WORNED"), false );
+ nlassert(node != NULL);
+ _WORNED = node;
+
+ node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
+ nlassert(node != NULL);
+ _INFO_VERSION = node;
+
// branch init
@@ -1600,14 +1588,6 @@ void CBankAccessor_PLR::TINVENTORY::TSHARE::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_QUANTITY = node;
- node = parent->getNode( ICDBStructNode::CTextId("CREATE_TIME"), false );
- nlassert(node != NULL);
- _CREATE_TIME = node;
-
- node = parent->getNode( ICDBStructNode::CTextId("SERIAL"), false );
- nlassert(node != NULL);
- _SERIAL = node;
-
node = parent->getNode( ICDBStructNode::CTextId("USER_COLOR"), false );
nlassert(node != NULL);
_USER_COLOR = node;
@@ -1620,10 +1600,6 @@ void CBankAccessor_PLR::TINVENTORY::TSHARE::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_NAMEID = node;
- node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
- nlassert(node != NULL);
- _INFO_VERSION = node;
-
node = parent->getNode( ICDBStructNode::CTextId("ENCHANT"), false );
nlassert(node != NULL);
_ENCHANT = node;
@@ -1640,6 +1616,10 @@ void CBankAccessor_PLR::TINVENTORY::TSHARE::TArray::init(ICDBStructNode *parent,
nlassert(node != NULL);
_PREREQUISIT_VALID = node;
+ node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
+ nlassert(node != NULL);
+ _INFO_VERSION = node;
+
node = parent->getNode( ICDBStructNode::CTextId("NB_MEMBER"), false );
nlassert(node != NULL);
_NB_MEMBER = node;
@@ -2160,14 +2140,6 @@ void CBankAccessor_PLR::TTRADING::TArray::init(ICDBStructNode *parent, uint inde
nlassert(node != NULL);
_QUANTITY = node;
- node = parent->getNode( ICDBStructNode::CTextId("CREATE_TIME"), false );
- nlassert(node != NULL);
- _CREATE_TIME = node;
-
- node = parent->getNode( ICDBStructNode::CTextId("SERIAL"), false );
- nlassert(node != NULL);
- _SERIAL = node;
-
node = parent->getNode( ICDBStructNode::CTextId("USER_COLOR"), false );
nlassert(node != NULL);
_USER_COLOR = node;
@@ -2180,10 +2152,6 @@ void CBankAccessor_PLR::TTRADING::TArray::init(ICDBStructNode *parent, uint inde
nlassert(node != NULL);
_NAMEID = node;
- node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
- nlassert(node != NULL);
- _INFO_VERSION = node;
-
node = parent->getNode( ICDBStructNode::CTextId("ENCHANT"), false );
nlassert(node != NULL);
_ENCHANT = node;
@@ -2200,6 +2168,10 @@ void CBankAccessor_PLR::TTRADING::TArray::init(ICDBStructNode *parent, uint inde
nlassert(node != NULL);
_PREREQUISIT_VALID = node;
+ node = parent->getNode( ICDBStructNode::CTextId("INFO_VERSION"), false );
+ nlassert(node != NULL);
+ _INFO_VERSION = node;
+
node = parent->getNode( ICDBStructNode::CTextId("CURRENCY"), false );
nlassert(node != NULL);
_CURRENCY = node;
@@ -2597,10 +2569,6 @@ void CBankAccessor_PLR::TEXECUTE_PHRASE::TLINK::TArray::init(ICDBStructNode *par
nlassert(node != NULL);
_PHRASE = node;
- node = parent->getNode( ICDBStructNode::CTextId("COUNTER"), false );
- nlassert(node != NULL);
- _COUNTER = node;
-
node = parent->getNode( ICDBStructNode::CTextId("HP_COST"), false );
nlassert(node != NULL);
_HP_COST = node;
@@ -2629,6 +2597,10 @@ void CBankAccessor_PLR::TEXECUTE_PHRASE::TLINK::TArray::init(ICDBStructNode *par
nlassert(node != NULL);
_TARGET_STA = node;
+ node = parent->getNode( ICDBStructNode::CTextId("COUNTER"), false );
+ nlassert(node != NULL);
+ _COUNTER = node;
+
// branch init
diff --git a/ryzom/server/src/entities_game_service/database_plr.h b/ryzom/server/src/entities_game_service/database_plr.h
index dd05a68fe..123e3170a 100644
--- a/ryzom/server/src/entities_game_service/database_plr.h
+++ b/ryzom/server/src/entities_game_service/database_plr.h
@@ -2784,16 +2784,15 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_SHEET;
ICDBStructNode *_QUALITY;
ICDBStructNode *_QUANTITY;
- ICDBStructNode *_CREATE_TIME;
- ICDBStructNode *_SERIAL;
ICDBStructNode *_USER_COLOR;
ICDBStructNode *_WEIGHT;
ICDBStructNode *_NAMEID;
- ICDBStructNode *_INFO_VERSION;
ICDBStructNode *_ENCHANT;
ICDBStructNode *_RM_CLASS_TYPE;
ICDBStructNode *_RM_FABER_STAT_TYPE;
ICDBStructNode *_PREREQUISIT_VALID;
+ ICDBStructNode *_WORNED;
+ ICDBStructNode *_INFO_VERSION;
public:
@@ -2872,46 +2871,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _QUANTITY;
}
- void setCREATE_TIME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _CREATE_TIME, value, forceSending);
- }
-
- uint32 getCREATE_TIME(const CCDBSynchronised &dbGroup)
- {
- uint32 value;
- _getProp(dbGroup, _CREATE_TIME, value);
-
- return value;
- }
-
- ICDBStructNode *getCREATE_TIMECDBNode()
- {
- return _CREATE_TIME;
- }
-
- void setSERIAL(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _SERIAL, value, forceSending);
- }
-
- uint32 getSERIAL(const CCDBSynchronised &dbGroup)
- {
- uint32 value;
- _getProp(dbGroup, _SERIAL, value);
-
- return value;
- }
-
- ICDBStructNode *getSERIALCDBNode()
- {
- return _SERIAL;
- }
-
void setUSER_COLOR(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
{
@@ -2975,26 +2934,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _NAMEID;
}
- void setINFO_VERSION(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _INFO_VERSION, value, forceSending);
- }
-
- uint8 getINFO_VERSION(const CCDBSynchronised &dbGroup)
- {
- uint8 value;
- _getProp(dbGroup, _INFO_VERSION, value);
-
- return value;
- }
-
- ICDBStructNode *getINFO_VERSIONCDBNode()
- {
- return _INFO_VERSION;
- }
-
void setENCHANT(CCDBSynchronised &dbGroup, uint16 value, bool forceSending = false)
{
@@ -3084,6 +3023,46 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _PREREQUISIT_VALID;
}
+ void setWORNED(CCDBSynchronised &dbGroup, bool value, bool forceSending = false)
+ {
+
+
+ _setProp(dbGroup, _WORNED, value, forceSending);
+ }
+
+ bool getWORNED(const CCDBSynchronised &dbGroup)
+ {
+ bool value;
+ _getProp(dbGroup, _WORNED, value);
+
+ return value;
+ }
+
+ ICDBStructNode *getWORNEDCDBNode()
+ {
+ return _WORNED;
+ }
+
+ void setINFO_VERSION(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
+ {
+
+
+ _setProp(dbGroup, _INFO_VERSION, value, forceSending);
+ }
+
+ uint8 getINFO_VERSION(const CCDBSynchronised &dbGroup)
+ {
+ uint8 value;
+ _getProp(dbGroup, _INFO_VERSION, value);
+
+ return value;
+ }
+
+ ICDBStructNode *getINFO_VERSIONCDBNode()
+ {
+ return _INFO_VERSION;
+ }
+
};
@@ -3125,16 +3104,15 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_SHEET;
ICDBStructNode *_QUALITY;
ICDBStructNode *_QUANTITY;
- ICDBStructNode *_CREATE_TIME;
- ICDBStructNode *_SERIAL;
ICDBStructNode *_USER_COLOR;
ICDBStructNode *_WEIGHT;
ICDBStructNode *_NAMEID;
- ICDBStructNode *_INFO_VERSION;
ICDBStructNode *_ENCHANT;
ICDBStructNode *_RM_CLASS_TYPE;
ICDBStructNode *_RM_FABER_STAT_TYPE;
ICDBStructNode *_PREREQUISIT_VALID;
+ ICDBStructNode *_WORNED;
+ ICDBStructNode *_INFO_VERSION;
public:
@@ -3213,46 +3191,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _QUANTITY;
}
- void setCREATE_TIME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _CREATE_TIME, value, forceSending);
- }
-
- uint32 getCREATE_TIME(const CCDBSynchronised &dbGroup)
- {
- uint32 value;
- _getProp(dbGroup, _CREATE_TIME, value);
-
- return value;
- }
-
- ICDBStructNode *getCREATE_TIMECDBNode()
- {
- return _CREATE_TIME;
- }
-
- void setSERIAL(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _SERIAL, value, forceSending);
- }
-
- uint32 getSERIAL(const CCDBSynchronised &dbGroup)
- {
- uint32 value;
- _getProp(dbGroup, _SERIAL, value);
-
- return value;
- }
-
- ICDBStructNode *getSERIALCDBNode()
- {
- return _SERIAL;
- }
-
void setUSER_COLOR(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
{
@@ -3316,26 +3254,6 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _NAMEID;
}
- void setINFO_VERSION(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
- {
-
-
- _setProp(dbGroup, _INFO_VERSION, value, forceSending);
- }
-
- uint8 getINFO_VERSION(const CCDBSynchronised &dbGroup)
- {
- uint8 value;
- _getProp(dbGroup, _INFO_VERSION, value);
-
- return value;
- }
-
- ICDBStructNode *getINFO_VERSIONCDBNode()
- {
- return _INFO_VERSION;
- }
-
void setENCHANT(CCDBSynchronised &dbGroup, uint16 value, bool forceSending = false)
{
@@ -3425,6 +3343,46 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
return _PREREQUISIT_VALID;
}
+ void setWORNED(CCDBSynchronised &dbGroup, bool value, bool forceSending = false)
+ {
+
+
+ _setProp(dbGroup, _WORNED, value, forceSending);
+ }
+
+ bool getWORNED(const CCDBSynchronised &dbGroup)
+ {
+ bool value;
+ _getProp(dbGroup, _WORNED, value);
+
+ return value;
+ }
+
+ ICDBStructNode *getWORNEDCDBNode()
+ {
+ return _WORNED;
+ }
+
+ void setINFO_VERSION(CCDBSynchronised &dbGroup, uint8 value, bool forceSending = false)
+ {
+
+
+ _setProp(dbGroup, _INFO_VERSION, value, forceSending);
+ }
+
+ uint8 getINFO_VERSION(const CCDBSynchronised &dbGroup)
+ {
+ uint8 value;
+ _getProp(dbGroup, _INFO_VERSION, value);
+
+ return value;
+ }
+
+ ICDBStructNode *getINFO_VERSIONCDBNode()
+ {
+ return _INFO_VERSION;
+ }
+
};
@@ -3799,16 +3757,15 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
ICDBStructNode *_SHEET;
ICDBStructNode *_QUALITY;
ICDBStructNode *_QUANTITY;
- ICDBStructNode *_CREATE_TIME;
- ICDBStructNode *_SERIAL;
ICDBStructNode *_USER_COLOR;
ICDBStructNode *_WEIGHT;
ICDBStructNode *_NAMEID;
- ICDBStructNode *_INFO_VERSION;
ICDBStructNode *_ENCHANT;
ICDBStructNode *_RM_CLASS_TYPE;
ICDBStructNode *_RM_FABER_STAT_TYPE;
ICDBStructNode *_PREREQUISIT_VALID;
+ ICDBStructNode *_WORNED;
+ ICDBStructNode *_INFO_VERSION;
public:
@@ -3845,7 +3802,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
{
// Check that the value is not out of database precision
- STOP_IF(value > (1<<12)-1, "setQUALITY : Value out of bound : trying to store "< (1<<10)-1, "setQUALITY : Value out of bound : trying to store "< (1<<12)-1, "setQUANTITY : Value out of bound : trying to store "< (1<<10)-1, "setQUANTITY : Value out of bound : trying to store "< (1<<4)-1, "setCOUNTER : Value out of bound : trying to store "< (1<<4)-1, "setCOUNTER : Value out of bound : trying to store "<