ajout des fichiers modifié de khanat-code et deplacment des fichiers generer par le shard

LICENSE

@@ -1,7 +1,5 @@
 Attribution-ShareAlike 4.0 International
-
 =======================================================================
-
 Creative Commons Corporation ("Creative Commons") is not a law firm and
 does not provide legal services or legal advice. Distribution of
 Creative Commons public licenses does not create a lawyer-client or
@@ -11,16 +9,13 @@ warranties regarding its licenses, any material licensed under their
 terms and conditions, or any related information. Creative Commons
 disclaims all liability for damages resulting from their use to the
 fullest extent possible.
-
 Using Creative Commons Public Licenses
-
 Creative Commons public licenses provide a standard set of terms and
 conditions that creators and other rights holders may use to share
 original works of authorship and other material subject to copyright
 and certain other rights specified in the public license below. The
 following considerations are for informational purposes only, are not
 exhaustive, and do not form part of our licenses.
-
      Considerations for licensors: Our public licenses are
      intended for use by those authorized to give the public
      permission to use material in ways otherwise restricted by
@@ -34,7 +29,6 @@ exhaustive, and do not form part of our licenses.
      licensed material, or material used under an exception or
      limitation to copyright. More considerations for licensors:
 	wiki.creativecommons.org/Considerations_for_licensors
-
      Considerations for the public: By using one of our public
      licenses, a licensor grants the public permission to use the
      licensed material under specified terms and conditions. If
@@ -51,12 +45,9 @@ exhaustive, and do not form part of our licenses.
      respect those requests where reasonable. More_considerations
      for the public: 
 	wiki.creativecommons.org/Considerations_for_licensees
-
 =======================================================================
-
 Creative Commons Attribution-ShareAlike 4.0 International Public
 License
-
 By exercising the Licensed Rights (defined below), You accept and agree
 to be bound by the terms and conditions of this Creative Commons
 Attribution-ShareAlike 4.0 International Public License ("Public
@@ -66,10 +57,7 @@ acceptance of these terms and conditions, and the Licensor grants You
 such rights in consideration of benefits the Licensor receives from
 making the Licensed Material available under these terms and
 conditions.
-
-
 Section 1 -- Definitions.
-
   a. Adapted Material means material subject to Copyright and Similar
      Rights that is derived from or based upon the Licensed Material
      and in which the Licensed Material is translated, altered,
@@ -79,15 +67,12 @@ Section 1 -- Definitions.
      Material is a musical work, performance, or sound recording,
      Adapted Material is always produced where the Licensed Material is
      synched in timed relation with a moving image.
-
   b. Adapter's License means the license You apply to Your Copyright
      and Similar Rights in Your contributions to Adapted Material in
      accordance with the terms and conditions of this Public License.
-
   c. BY-SA Compatible License means a license listed at
      creativecommons.org/compatiblelicenses, approved by Creative
      Commons as essentially the equivalent of this Public License.
-
   d. Copyright and Similar Rights means copyright and/or similar rights
      closely related to copyright including, without limitation,
      performance, broadcast, sound recording, and Sui Generis Database
@@ -95,33 +80,26 @@ Section 1 -- Definitions.
      categorized. For purposes of this Public License, the rights
      specified in Section 2(b)(1)-(2) are not Copyright and Similar
      Rights.
-
   e. Effective Technological Measures means those measures that, in the
      absence of proper authority, may not be circumvented under laws
      fulfilling obligations under Article 11 of the WIPO Copyright
      Treaty adopted on December 20, 1996, and/or similar international
      agreements.
-
   f. Exceptions and Limitations means fair use, fair dealing, and/or
      any other exception or limitation to Copyright and Similar Rights
      that applies to Your use of the Licensed Material.
-
   g. License Elements means the license attributes listed in the name
      of a Creative Commons Public License. The License Elements of this
      Public License are Attribution and ShareAlike.
-
   h. Licensed Material means the artistic or literary work, database,
      or other material to which the Licensor applied this Public
      License.
-
   i. Licensed Rights means the rights granted to You subject to the
      terms and conditions of this Public License, which are limited to
      all Copyright and Similar Rights that apply to Your use of the
      Licensed Material and that the Licensor has authority to license.
-
   j. Licensor means the individual(s) or entity(ies) granting rights
      under this Public License.
-
   k. Share means to provide material to the public by any means or
      process that requires permission under the Licensed Rights, such
      as reproduction, public display, public performance, distribution,
@@ -129,39 +107,28 @@ Section 1 -- Definitions.
      available to the public including in ways that members of the
      public may access the material from a place and at a time
      individually chosen by them.
-
   l. Sui Generis Database Rights means rights other than copyright
      resulting from Directive 96/9/EC of the European Parliament and of
      the Council of 11 March 1996 on the legal protection of databases,
      as amended and/or succeeded, as well as other essentially
      equivalent rights anywhere in the world.
-
   m. You means the individual or entity exercising the Licensed Rights
      under this Public License. Your has a corresponding meaning.
-
-
 Section 2 -- Scope.
-
   a. License grant.
-
        1. Subject to the terms and conditions of this Public License,
           the Licensor hereby grants You a worldwide, royalty-free,
           non-sublicensable, non-exclusive, irrevocable license to
           exercise the Licensed Rights in the Licensed Material to:
-
             a. reproduce and Share the Licensed Material, in whole or
                in part; and
-
             b. produce, reproduce, and Share Adapted Material.
-
        2. Exceptions and Limitations. For the avoidance of doubt, where
           Exceptions and Limitations apply to Your use, this Public
           License does not apply, and You do not need to comply with
           its terms and conditions.
-
        3. Term. The term of this Public License is specified in Section
           6(a).
-
        4. Media and formats; technical modifications allowed. The
           Licensor authorizes You to exercise the Licensed Rights in
           all media and formats whether now known or hereafter created,
@@ -173,37 +140,30 @@ Section 2 -- Scope.
           Technological Measures. For purposes of this Public License,
           simply making modifications authorized by this Section 2(a)
           (4) never produces Adapted Material.
-
        5. Downstream recipients.
-
             a. Offer from the Licensor -- Licensed Material. Every
                recipient of the Licensed Material automatically
                receives an offer from the Licensor to exercise the
                Licensed Rights under the terms and conditions of this
                Public License.
-
             b. Additional offer from the Licensor -- Adapted Material.
                Every recipient of Adapted Material from You
                automatically receives an offer from the Licensor to
                exercise the Licensed Rights in the Adapted Material
                under the conditions of the Adapter's License You apply.
-
             c. No downstream restrictions. You may not offer or impose
                any additional or different terms or conditions on, or
                apply any Effective Technological Measures to, the
                Licensed Material if doing so restricts exercise of the
                Licensed Rights by any recipient of the Licensed
                Material.
-
        6. No endorsement. Nothing in this Public License constitutes or
           may be construed as permission to assert or imply that You
           are, or that Your use of the Licensed Material is, connected
           with, or sponsored, endorsed, or granted official status by,
           the Licensor or others designated to receive attribution as
           provided in Section 3(a)(1)(A)(i).
-
   b. Other rights.
-
        1. Moral rights, such as the right of integrity, are not
           licensed under this Public License, nor are publicity,
           privacy, and/or other similar personality rights; however, to
@@ -211,110 +171,78 @@ Section 2 -- Scope.
           assert any such rights held by the Licensor to the limited
           extent necessary to allow You to exercise the Licensed
           Rights, but not otherwise.
-
        2. Patent and trademark rights are not licensed under this
           Public License.
-
        3. To the extent possible, the Licensor waives any right to
           collect royalties from You for the exercise of the Licensed
           Rights, whether directly or through a collecting society
           under any voluntary or waivable statutory or compulsory
           licensing scheme. In all other cases the Licensor expressly
           reserves any right to collect such royalties.
-
-
 Section 3 -- License Conditions.
-
 Your exercise of the Licensed Rights is expressly made subject to the
 following conditions.
-
   a. Attribution.
-
        1. If You Share the Licensed Material (including in modified
           form), You must:
-
             a. retain the following if it is supplied by the Licensor
                with the Licensed Material:
-
                  i. identification of the creator(s) of the Licensed
                     Material and any others designated to receive
                     attribution, in any reasonable manner requested by
                     the Licensor (including by pseudonym if
                     designated);
-
                 ii. a copyright notice;
-
                iii. a notice that refers to this Public License;
-
                 iv. a notice that refers to the disclaimer of
                     warranties;
-
                  v. a URI or hyperlink to the Licensed Material to the
                     extent reasonably practicable;
-
             b. indicate if You modified the Licensed Material and
                retain an indication of any previous modifications; and
-
             c. indicate the Licensed Material is licensed under this
                Public License, and include the text of, or the URI or
                hyperlink to, this Public License.
-
        2. You may satisfy the conditions in Section 3(a)(1) in any
           reasonable manner based on the medium, means, and context in
           which You Share the Licensed Material. For example, it may be
           reasonable to satisfy the conditions by providing a URI or
           hyperlink to a resource that includes the required
           information.
-
        3. If requested by the Licensor, You must remove any of the
           information required by Section 3(a)(1)(A) to the extent
           reasonably practicable.
-
   b. ShareAlike.
-
      In addition to the conditions in Section 3(a), if You Share
      Adapted Material You produce, the following conditions also apply.
-
        1. The Adapter's License You apply must be a Creative Commons
           license with the same License Elements, this version or
           later, or a BY-SA Compatible License.
-
        2. You must include the text of, or the URI or hyperlink to, the
           Adapter's License You apply. You may satisfy this condition
           in any reasonable manner based on the medium, means, and
           context in which You Share Adapted Material.
-
        3. You may not offer or impose any additional or different terms
           or conditions on, or apply any Effective Technological
           Measures to, Adapted Material that restrict exercise of the
           rights granted under the Adapter's License You apply.
-
-
 Section 4 -- Sui Generis Database Rights.
-
 Where the Licensed Rights include Sui Generis Database Rights that
 apply to Your use of the Licensed Material:
-
   a. for the avoidance of doubt, Section 2(a)(1) grants You the right
      to extract, reuse, reproduce, and Share all or a substantial
      portion of the contents of the database;
-
   b. if You include all or a substantial portion of the database
      contents in a database in which You have Sui Generis Database
      Rights, then the database in which You have Sui Generis Database
      Rights (but not its individual contents) is Adapted Material,
-
      including for purposes of Section 3(b); and
   c. You must comply with the conditions in Section 3(a) if You Share
      all or a substantial portion of the contents of the database.
-
 For the avoidance of doubt, this Section 4 supplements and does not
 replace Your obligations under this Public License where the Licensed
 Rights include other Copyright and Similar Rights.
-
-
 Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
   a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
      EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
      AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
@@ -325,7 +253,6 @@ Section 5 -- Disclaimer of Warranties and Limitation of Liability.
      ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
      KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
      ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
   b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
      TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
      NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
@@ -335,78 +262,55 @@ Section 5 -- Disclaimer of Warranties and Limitation of Liability.
      ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
      DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
      IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
   c. The disclaimer of warranties and limitation of liability provided
      above shall be interpreted in a manner that, to the extent
      possible, most closely approximates an absolute disclaimer and
      waiver of all liability.
-
-
 Section 6 -- Term and Termination.
-
   a. This Public License applies for the term of the Copyright and
      Similar Rights licensed here. However, if You fail to comply with
      this Public License, then Your rights under this Public License
      terminate automatically.
-
   b. Where Your right to use the Licensed Material has terminated under
      Section 6(a), it reinstates:
-
        1. automatically as of the date the violation is cured, provided
           it is cured within 30 days of Your discovery of the
           violation; or
-
        2. upon express reinstatement by the Licensor.
-
      For the avoidance of doubt, this Section 6(b) does not affect any
      right the Licensor may have to seek remedies for Your violations
      of this Public License.
-
   c. For the avoidance of doubt, the Licensor may also offer the
      Licensed Material under separate terms or conditions or stop
      distributing the Licensed Material at any time; however, doing so
      will not terminate this Public License.
-
   d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
      License.
-
-
 Section 7 -- Other Terms and Conditions.
-
   a. The Licensor shall not be bound by any additional or different
      terms or conditions communicated by You unless expressly agreed.
-
   b. Any arrangements, understandings, or agreements regarding the
      Licensed Material not stated herein are separate from and
      independent of the terms and conditions of this Public License.
-
-
 Section 8 -- Interpretation.
-
   a. For the avoidance of doubt, this Public License does not, and
      shall not be interpreted to, reduce, limit, restrict, or impose
      conditions on any use of the Licensed Material that could lawfully
      be made without permission under this Public License.
-
   b. To the extent possible, if any provision of this Public License is
      deemed unenforceable, it shall be automatically reformed to the
      minimum extent necessary to make it enforceable. If the provision
      cannot be reformed, it shall be severed from this Public License
      without affecting the enforceability of the remaining terms and
      conditions.
-
   c. No term or condition of this Public License will be waived and no
      failure to comply consented to unless expressly agreed to by the
      Licensor.
-
   d. Nothing in this Public License constitutes or may be interpreted
      as a limitation upon, or waiver of, any privileges and immunities
      that apply to the Licensor or You, including from the legal
      processes of any jurisdiction or authority.
-
-
 =======================================================================
-
 Creative Commons is not a party to its public
 licenses. Notwithstanding, Creative Commons may elect to apply one of
 its public licenses to material it publishes and in those instances
@@ -423,6 +327,4 @@ to any of its public licenses or any other arrangements,
 understandings, or agreements concerning use of licensed material. For
 the avoidance of doubt, this paragraph does not form part of the
 public licenses.
-
 Creative Commons may be contacted at creativecommons.org.
-

data/kh/kh_interfaces/bg_downloader.xml

@@ -2,73 +2,39 @@
 
 <root id="interface" x="0" y="0" w="800" h="600" active="true" />
 
-
 <lua file="bg_downloader.lua" />
 
 <proc id="bg_downloader_active">
 	<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=1" />
-	
 </proc>
 
 <proc id="bg_downloader_deactive">
 	<action handler="set" params="dblink=UI:VARIABLES:ISACTIVE:BG_DOWNLOADER|value=0" />
 </proc>
 
-
 <!-- Window for the background downloader -->
-<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"
-	movable="true" opened="true" openable="false"	
-	pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100"	
-	h="100"
-	w="410"
-	active="false"	
-	savable="true"
-	header_color="UI:SAVE:WIN:COLORS:OPT"
-	on_deactive="proc"	on_deactive_params="bg_downloader_deactive"
-	on_active="proc" on_active_params="bg_downloader_active"
->	
-	<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" 
-	 group_onclick_r="active_menu"
-	 group_params_r="menu=ui:interface:base_menu_with_color"	
-	>
-	</group>
-	
-	<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" 
-	 group_onclick_r="active_menu"
-	 group_params_r="menu=ui:interface:base_menu_with_color"
-	>		
-	</group>
-	<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >				
-		<view type="text" id="text"	active="true" y="-12" posref="TM TM"	hardtext="" fontsize="10" color="255 255 255 255"
-		 auto_clamp="true"
-		 global_color="false"
-		/>
-		<view type="text" id="ellipsis"	active="true" y="0" posref="BR BL"	posparent="text" hardtext="" fontsize="13" color="255 255 255 255"
-		 global_color="false"
-		/>
+<group type="container" id="bg_downloader" title="uiBGD_WindowTitle" global_color="false" line_at_bottom="false"movable="true" opened="true" openable="false" pop_min_w="410" pop_min_h="100" pop_max_w="410" pop_max_h="100" h="100" w="410" active="false" savable="true" header_color="UI:SAVE:WIN:COLORS:OPT" on_deactive="proc" on_deactive_params="bg_downloader_deactive" on_active="proc" on_active_params="bg_downloader_active">
 
-		<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR"
-		 global_color="false"
-		/>
-		<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2"
-		 global_color="false"
-		/>	
+	<group id="header_closed" x="0" y="0" child_resize_w="true" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
+	</group>
 
-		<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" 
-		 posref="BM TM"
-		 posparent="progress"
-		 on_change="lua:bgdownloader:onChangePriority()" on_change_params=""
-		 tooltip="uiBGD_PriorityTooltip"
-		 global_color="false"
-		>		
-			<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>			
+	<group id="header_opened" x="0" y="0" w="800" h="16" posref="TL TL" group_onclick_r="active_menu" group_params_r="menu=ui:interface:base_menu_with_color">
+	</group>
+
+	<group id="content" x="0" y="0" sizeref="wh" w="0" h="0" posref="TL TL" >
+		<view type="text" id="text"	active="true" y="-12" posref="TM TM"	hardtext="" fontsize="10" color="255 255 255 255" auto_clamp="true" global_color="false" />
+		<view type="text" id="ellipsis"	active="true" y="0" posref="BR BL"	posparent="text" hardtext="" fontsize="13" color="255 255 255 255" global_color="false" />
+		<view type="bitmap" id="bm" active="false" y="1" x="-1" texture="W_answer_16_valid.tga" posparent="text" posref="ML MR" global_color="false" />
+		<view type="bar" id="progress" parent="" active="true" posparent="text" posref="BM TM" y="-2" global_color="false" />
+		<group type="combo_box" id="prio" sizeref="w" w="32" x="0" y="-8" child_resize_h="true" child_resize_hmargin="6" linked_to_db="false" posref="BM TM" posparent="progress" on_change="lua:bgdownloader:onChangePriority()" on_change_params="" tooltip="uiBGD_PriorityTooltip" global_color="false">
+			<instance template="combo_box_def1" tooltip="uiBGD_PriorityTooltip"/>
 			<combo_text name="uiBGD_Paused" />
 			<combo_text name="uiBGD_LowPriority" />
-			<combo_text name="uiBGD_NormalPriority" />			
+			<combo_text name="uiBGD_NormalPriority" />
 		</group>
 	</group>
 </group>
 
 <tree node="bg_downloader"/>
 
-</interface_config>
+</interface_config>

data/kh/kh_interfaces/interaction.xml

@@ -1510,14 +1510,14 @@
               posref="MR MR"
               mini="true"
               x="-16"
-              color1="%sta_color"
+              color1="ChaScore2_color"
               value1="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
               range1="UI:CONST:127"
-              color2="%sap_color"
+              color2="%ChaScore3_color"
               value2="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore2"
               range2="UI:CONST:127"
-              color3="%hp_color"
-              color3_negative="%hp_color_neg"
+              color3="%ChaScore1_color"
+              color3_negative="%ChaScore1_color_neg"
               value3="UI:VARIABLES:BARS:TEAM:#team_mate_index:ChaScore1"
               range3="UI:CONST:127" />
         <view type="bitmap"

data/kh/kh_interfaces/login_main.xml

@@ -352,7 +352,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t
 
 
 <!-- ******************** -->
-<!-- * CHECKING PROGESS * -->
+<!-- * CHECKING PROGRESS * -->
 <!-- ******************** -->
 
 

data/kh/kh_interfaces/player.xml

@@ -52,7 +52,7 @@
     <ctrl type="tooltip"
           id="tt1"
           on_tooltip="player_tt_stamina"
-          color="%sta_color"
+          color="%ChaScore2_color"
           posparent="jauges"
           posref="TL TL"
           x="0"
@@ -576,7 +576,7 @@
                 posparent="b_ChaScore1"
                 posref="TL TL"
                 color="214 56 7 255"
-                color_gray="160 42 5 255"
+                color_gray="200 42 5 255"
                 text="uiHP"
                 val="%player_ChaScore1"
                 maxval="%player_ChaScore1_max"
@@ -587,7 +587,7 @@
                 posparent="b_ChaScore3"
                 posref="TL TL"
                 color="133 189 5 255"
-                color_gray="100 141 3 255"
+                color_gray="100 161 3 255"
                 text="uiSap"
                 val="%player_ChaScore3"
                 maxval="%player_ChaScore3_max"
@@ -598,7 +598,7 @@
                 posparent="b_ChaScore2"
                 posref="TL TL"
                 color="202 67 152 255"
-                color_gray="151 50 114 255"
+                color_gray="181 50 134 255"
                 text="uiStamina"
                 val="%player_ChaScore2"
                 maxval="%player_ChaScore2_max"
@@ -608,8 +608,8 @@
                 id="jChaScore4"
                 posparent="b_ChaScore4"
                 posref="TL TL"
-                color="31 155 197 255"
-                color_gray="23 116 147 255"
+                color="150 150 150 255"
+                color_gray="130 130 130 255"
                 text="uiFocus"
                 val="%player_ChaScore4"
                 maxval="%player_ChaScore4_max"

data/kh/kh_interfaces/widgets.xml

@@ -3897,39 +3897,39 @@
           active="false"
           global_color="false"/>
     <view type="bitmap"
-          id="ChaScore1_cost"
+          id="hp_cost"
           texture="ico_heal.tga"
           global_color="false"
           posref="BL TL"
           posparent="success_rate" />
     <view type="bitmap"
-          id="ChaScore2_cost"
+          id="sta_cost"
           y="0"
           texture="ico_stamina.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore1_cost" />
+          posparent="hp_cost" />
     <view type="bitmap"
-          id="ChaScore3_cost"
+          id="sap_cost"
           y="0"
           texture="ico_sap.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore2_cost" />
+          posparent="sta_cost" />
     <view type="bitmap"
-          id="ChaScore4_cost"
+          id="focus_cost"
           y="0"
           texture="ico_focus.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore3_cost" />
+          posparent="sap_cost" />
     <view type="bitmap"
           id="cast_time"
           y="0"
           texture="ico_time.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore4_cost" />
+          posparent="focus_cost" />
     <view type="bitmap"
           id="cast_range"
           y="0"
@@ -3938,26 +3938,26 @@
           posref="BL TL"
           posparent="cast_time" />
     <view type="text"
-          id="ChaScore1_cost_text"
-          posparent="ChaScore1_cost"
+          id="hp_cost_text"
+          posparent="hp_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore2_cost_text"
-          posparent="ChaScore2_cost"
+          id="sta_cost_text"
+          posparent="sta_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore3_cost_text"
-          posparent="ChaScore3_cost"
+          id="sap_cost_text"
+          posparent="sap_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore4_cost_text"
-          posparent="ChaScore4_cost"
+          id="focus_cost_text"
+          posparent="focus_cost"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
@@ -4104,7 +4104,7 @@
           line_maxw="300"
           multi_line_maxw_only="true" />
     <view type="bitmap"
-          id="ChaScore1_buff"
+          id="hp_buff"
           h="15"
           y="0"
           texture="ico_heal.tga"
@@ -4113,47 +4113,47 @@
           posparent="text" 
           active="true"/>
     <view type="bitmap"
-          id="ChaScore2_buff"
+          id="sta_buff"
           y="0"
           texture="ico_stamina.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore1_buff" />
+          posparent="hp_buff" />
     <view type="bitmap"
-          id="ChaScore3_buff"
+          id="sap_buff"
           y="0"
           texture="ico_sap.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore2_buff" />
+          posparent="sta_buff" />
     <view type="bitmap"
-          id="ChaScore4_buff"
+          id="focus_buff"
           y="0"
           texture="ico_focus.tga"
           global_color="false"
           posref="BL TL"
-          posparent="ChaScore3_buff" />
+          posparent="sap_buff" />
     <view type="text"
-          id="ChaScore1_buff_text"
-          posparent="ChaScore1_buff"
+          id="hp_buff_text"
+          posparent="hp_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore2_buff_text"
-          posparent="ChaScore2_buff"
+          id="sta_buff_text"
+          posparent="sta_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore3_buff_text"
-          posparent="ChaScore3_buff"
+          id="sap_buff_text"
+          posparent="sap_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>
     <view type="text"
-          id="ChaScore4_buff_text"
-          posparent="ChaScore4_buff"
+          id="focus_buff_text"
+          posparent="focus_buff"
           posref="MR ML"
           hardtext="0"
           global_color="false"/>