Merge branch 'feature/merge-from-ryzom-data' into main/yubo-dev

ryzom/common/data_common/database.xml

@@ -234,7 +234,8 @@
         <leaf name="ACCEPTED" type="I1" />
         <leaf name="MONEY" type="I64" />
         <branch name="GIVE">
-            <branch name="" count="8">
+            <branch name="" count="10">
+                <!-- Change in local_database.xml, player_trade.lua and NbExchangeSlots on server-->
                 <!-- Common Item Data -->
                 <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
                 <leaf name="QUALITY" type="I10" />
@@ -265,7 +266,8 @@
             </branch>
         </branch>
         <branch name="RECEIVE">
-            <branch name="" count="8">
+            <branch name="" count="10">
+                <!-- Change in local_database.xml, player_trade.lua and NbExchangeSlots on server-->
                 <!-- Common Item Data -->
                 <leaf name="SHEET" type="I32" cppType="NLMISC::CSheetId" />
                 <leaf name="QUALITY" type="I10" />
@@ -410,7 +412,7 @@
             <leaf name="ENABLE_TAKE" type="I1" />
             <!-- Used only in forage -->
         </branch>
-        <!-- used to share items between team members (up to 8 players) 
+        <!-- used to share items between team members (up to 8 players)
                         DO NOT FORGET if you modify this to do the the same modification in local database file -->
         <branch name="SHARE">
             <leaf name="SESSION" type="I8" />
@@ -558,8 +560,8 @@
         <leaf name="HAS_NEXT" type="I1" />
         <!-- are there pages left ? -->
         <branch name="" count="8">
-            <!-- 
-                        if high order bit == 0 : guild icon : 58 low order bits - back:3 bits, symbol:6 bits, Invert:1 bit, color1&2:24 bits each 
+            <!--
+                        if high order bit == 0 : guild icon : 58 low order bits - back:3 bits, symbol:6 bits, Invert:1 bit, color1&2:24 bits each
                         if high order bit == 1 : low order bits = entry in the LIFT_ICONS::TLiftIcon enum
                         -->
             <leaf name="ICON" type="I64" />
@@ -884,7 +886,7 @@
                 </branch>
                 <branch name="SQUADS">
                     <!-- Squad -->
-                    <!-- 24 max squads: The First 12th are the squads that spawn at start 
+                    <!-- 24 max squads: The First 12th are the squads that spawn at start
                                                 The second 12th are the one that spawn after
                                         -->
                     <branch name="SP" count="24">

ryzom/common/data_common/msg.xml

@@ -207,7 +207,7 @@
         <leaf name="INVALIDATE" sendto="EGS" />
         <leaf name="END" sendto="EGS" format="" />
         <leaf name="SEEDS" sendto="EGS" format="u64" />
-        <leaf name="ADD" sendto="EGS" format="u16 u16 u16" description="add an item from the bag(index_in_bag index_in_exchange quantity)" />
+        <leaf name="ADD" sendto="EGS" format="u16 u16 u16 u16" description="add an item from the bag(inventory_src index_in_bag index_in_exchange quantity)" />
         <leaf name="REMOVE" sendto="EGS" format="u16" description="remove an item from the exchange" />
     </branch>
     <branch name="DEBUG">
@@ -245,6 +245,7 @@
         <leaf name="REMOTE_ADMIN_ANSWER" sendto="EGS" format="u32 s s" description="client send the answer of the remote command" />
         <leaf name="SIT" sendto="EGS" format="b" description="client send to the server the sitting state" />
         <leaf name="AFK" sendto="EGS" format="b" description="AFK command is sent to EGS" />
+        <leaf name="SELFKILL" sendto="EGS" format="" description="client asks EGS to kill self" />
         <leaf name="RANDOM" sendto="EGS" format="s16 s16" description="client asks EGS to roll a dice and tell result around" />
         <leaf name="GUILDMOTD" sendto="EGS" format="s" description="client asks EGS to set the guild message of the day" />
         <leaf name="AUTOPACT" sendto="EGS" format="u8" description="client want set AUTOPACT to TRUE or FALSE" />

ryzom/tidy_config.txt

@@ -5,4 +5,3 @@ output-xml: yes
 input-xml: yes
 wrap: 0
 
-