From 115f47bada567c0b57d84aecab3ec285253d522f Mon Sep 17 00:00:00 2001
From: ulukyn <none@none>
Date: Sat, 11 Aug 2018 14:46:37 +0200
Subject: [PATCH] Added: RRP points (win on events) display and icons for all
 others points note: urls are hardcoded, not the best way...

--HG--
branch : compatibility-develop
---
 .../gamedev/interfaces_v3/info_player.xml     | 19 ++++++++--
 .../data/gamedev/interfaces_v3/widgets.xml    | 38 +++++++++++--------
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index 41ad27320..673aa485a 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -257,14 +257,27 @@
                 </group>
                 <view type="text" id="ecosystem_points_title" posparent="ecosystem_points" posref="TL BL" x="0" y="0" hardtext="uiR2EDEcosystemPointsTitle" shadow="true" color="255 255 255 255" global_color="false" fontsize="12" />
                 <instance template="faction_points_widget" id="fp" posparent="ecosystem_points" posref="BL TL" x="0" y="-10" />
-                <group id="pvp_points" posparent="fp" posref="BL TL" sizeref="wh" w="-1" h="40" y="-10">
+                <group id="pvp_points" posparent="fp" posref="BL TL" sizeref="w" w="-1" h="50" y="-10">
                     <view type="text" id="pvppoints_t" posref="TL TL" x="0" y="0" hardtext="uiPvpPoints" shadow="true" color="255 255 255 255" global_color="false" fontsize="12" />
-                    <group id="black" posref="TL TL" x="0" sizeref="w" y="-16" w="0" h="26" inherit_gc_alpha="true">
-                        <view type="text" id="total" posref="ML ML" x="8" y="0" hardtext="uiPvpTotal" shadow="true" color="255 255 255 255" global_color="true" fontsize="12" />
+                    <group id="black" posref="TL TL" x="0" sizeref="w" y="-18" w="0" h="30" inherit_gc_alpha="true">
+                        <view type="bitmap" id="icon" posref="ML ML" x="8" y="0" inherit_gc_alpha="true" texture="points_pvp_24.tga" global_color="false" />
+                        <view type="text" id="total" posref="ML ML" x="34" y="0" hardtext="uiPvpTotal" shadow="true" color="255 255 255 255" global_color="true" fontsize="12" />
                         <view type="text_number" id="val" posref="MR MR" x="-8" y="0" color="255 255 255 255" global_color="true" fontsize="12" value="SERVER:USER:RRPS_LEVELS0:VALUE" shadow="true" />
                     </group>
                     <instance template="inner_thin_border" posparent="black" inherit_gc_alpha="true" />
                 </group>
+                <group id="ark_points" posparent="pvp_points" posref="BL TL" sizeref="wh" h="210" w="0" y="-5">
+                    <view type="text" id="arkpoints_t" posref="TL TL" x="0" y="0" hardtext="uiR2EDRrpsLevelTitle" shadow="true" color="255 255 255 255" global_color="false" fontsize="12" />
+                    <group id="black" posref="TL TL" x="0" sizeref="w" y="-16" w="0" h="205" inherit_gc_alpha="true">
+                        <group type="webig_html" id="html" posref="TL TL" url="https://app.ryzom.com/app_arcc/index.php?action=mScript_Run&amp;script_name=DisplayPoints&amp;no_html_header=1" title_prefix="" sizeref="wh" x="-5" y="5" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="100 255 100 255" text_font_size="10" h1_font_size="20" h2_font_size="18" h3_font_size="16" h4_font_size="14" h5_font_size="12" h6_font_size="10" paragraph_begin_space="1" multi_line_space_factor="0.25" td_begin_space="16" li_begin_space="4" ul_begin_space="12" li_indent="0" ul_indent="30" checkbox_bitmap_normal="w_slot_on.tga" checkbox_bitmap_pushed="w_opacity_on.tga" checkbox_bitmap_over="" background_bitmap_view="black2" home="https://app.ryzom.com/app_arcc/index.php?action=mScript_Run&amp;script_name=DisplayPoints&amp;no_html_header=1" browse_next_time="true" form_text_area_group="edit_box_widget_multiline">
+                            <group id="black" posref="BR BR" sizeref="hw" w="-12" h="-12" inherit_gc_alpha="true" />
+                            <view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false" />
+                            <group active="1" type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000" />
+                            <ctrl style="skin_scroll" id="scroll_bar" />
+                        </group>
+                    </group>
+                    <instance template="inner_thin_border" posparent="black" inherit_gc_alpha="true" />
+                </group>
             </group>
             <group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
                 <ctrl style="text_button_header" button_type="push_button" id="browse_home" posref="TR TR" x="-1" y="-2" hardtext="uiBrowseRefresh" tooltip="uittBrowseRefresh" onclick_l="browse_home" params_l="name=ui:interface:info_player_skills:content:rpjobs:html" />
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index fcb6eeb3c..22e849df3 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -492,32 +492,40 @@
     <!-- *   FACTION POINTS  * -->
     <!-- ********************* -->
     <template name="faction_points_widget" id="" posref="TL TL" posparent="parent" x="0" y="0" sizeref="w" sizeparent="parent" w="0">
-        <group id="#id" posref="#posref" posparent="#posparent" x="#x" y="#y" sizeref="#sizeref" sizeparent="#sizeparent" w="#w" h="74">
+        <group id="#id" posref="#posref" posparent="#posparent" x="#x" y="#y" sizeref="#sizeref" sizeparent="#sizeparent" w="#w" h="98">
             <!-- the title -->
             <view type="text" id="factionpt_t" posref="TL TL" x="0" y="0" hardtext="uiFactionPointTable" shadow="true" color="255 255 255 255" global_color="false" fontsize="12" />
             <instance template="text_tt" tooltip="uittIdentityFaction" posparent="factionpt_t" />
             <!-- left part : kami fyros zorai -->
-            <group id="left" posref="TL TL" x="0" y="-14" sizeref="w5" w="0" h="60" inherit_gc_alpha="true">
+            <group id="left" posref="TL TL" x="0" y="-14" sizeref="w5" w="0" h="84" inherit_gc_alpha="true">
+                <!-- icons -->
+                <view type="bitmap" id="ikami" posref="TL TL" x="8" y="-8" inherit_gc_alpha="true" texture="points_kami_24.tga" global_color="false" />
+                <view type="bitmap" id="ifyro" posref="TL TL" x="8" y="-32" inherit_gc_alpha="true" texture="points_fyros_24.tga" global_color="false" />
+                <view type="bitmap" id="izora" posref="TL TL" x="8" y="-56" inherit_gc_alpha="true" texture="points_zorai_24.tga" global_color="false" />
                 <!-- texts -->
-                <view type="text" id="tkami" posref="TL TL" x="8" y="-8" w="-16" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Kami" />
-                <view type="text" id="tfyro" posref="TL TL" x="8" y="-24" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Fyros" />
-                <view type="text" id="tzora" posref="TL TL" x="8" y="-40" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Zorai" />
+                <view type="text" id="tkami" posref="TL TL" x="34" y="-12" w="-16" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Kami" />
+                <view type="text" id="tfyro" posref="TL TL" x="34" y="-36" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Fyros" />
+                <view type="text" id="tzora" posref="TL TL" x="34" y="-60" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Zorai" />
                 <!-- numbers -->
-                <view type="text_number" id="vkami" posref="TR TR" x="-8" y="-8" w="-16" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_kami" positive="true" />
-                <view type="text_number" id="vfyro" posref="TR TR" x="-8" y="-24" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_fyros" positive="true" />
-                <view type="text_number" id="vzora" posref="TR TR" x="-8" y="-40" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_zorai" positive="true" />
+                <view type="text_number" id="vkami" posref="TR TR" x="-8" y="-12" w="-16" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_kami" positive="true" />
+                <view type="text_number" id="vfyro" posref="TR TR" x="-8" y="-36" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_fyros" positive="true" />
+                <view type="text_number" id="vzora" posref="TR TR" x="-8" y="-60" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_zorai" positive="true" />
                 <instance template="inner_thin_border" posparent="parent" inherit_gc_alpha="true" />
             </group>
             <!-- right part : karavan matis tryker -->
-            <group id="right" posref="TR TR" x="0" y="-14" sizeref="w5" w="0" h="60" inherit_gc_alpha="true">
+            <group id="right" posref="TR TR" x="0" y="-14" sizeref="w5" w="0" h="84" inherit_gc_alpha="true">
+                <!-- icons -->
+                <view type="bitmap" id="ikara" posref="TL TL" x="8" y="-8" inherit_gc_alpha="true" texture="points_karavan_24.tga" global_color="false" />
+                <view type="bitmap" id="imati" posref="TL TL" x="8" y="-32" inherit_gc_alpha="true" texture="points_matis_24.tga" global_color="false" />
+                <view type="bitmap" id="itryk" posref="TL TL" x="8" y="-56" inherit_gc_alpha="true" texture="points_tryker_24.tga" global_color="false" />
                 <!-- texts -->
-                <view type="text" id="tkara" posref="TL TL" x="8" y="-8" w="-16" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Karavan" />
-                <view type="text" id="tmati" posref="TL TL" x="8" y="-24" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Matis" />
-                <view type="text" id="ttryk" posref="TL TL" x="8" y="-40" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Tryker" />
+                <view type="text" id="tkara" posref="TL TL" x="34" y="-12" w="-16" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Karavan" />
+                <view type="text" id="tmati" posref="TL TL" x="34" y="-36" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Matis" />
+                <view type="text" id="ttryk" posref="TL TL" x="34" y="-60" color="255 255 255 255" fontsize="12" shadow="true" hardtext="uiFactionPoint_Tryker" />
                 <!-- numbers -->
-                <view type="text_number" id="vkara" posref="TR TR" x="-8" y="-8" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_karavan" positive="true" />
-                <view type="text_number" id="vmati" posref="TR TR" x="-8" y="-24" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_matis" positive="true" />
-                <view type="text_number" id="vtryk" posref="TR TR" x="-8" y="-40" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_tryker" positive="true" />
+                <view type="text_number" id="vkara" posref="TR TR" x="-8" y="-12" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_karavan" positive="true" />
+                <view type="text_number" id="vmati" posref="TR TR" x="-8" y="-36" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_matis" positive="true" />
+                <view type="text_number" id="vtryk" posref="TR TR" x="-8" y="-60" color="255 255 255 255" shadow="true" fontsize="12" value="%faction_points_tryker" positive="true" />
                 <instance template="inner_thin_border" posparent="parent" inherit_gc_alpha="true" />
             </group>
         </group>