From 6bfe825f6f1f0e82562ca2c8e881f1f485f9a236 Mon Sep 17 00:00:00 2001
From: Mark Klara <mrhappyasthma@gmail.com>
Date: Sat, 7 Jan 2017 23:46:02 -0800
Subject: [PATCH] Merge in JinZero's changes.

JinZero ported the changes to the other UIs: Sentinel and Razor.

http://forums.heroesofnewerth.com/showthread.php?590771-HoN-Mod-Enable-the-old-expandable-scoreboard&p=16523107&viewfull=1#post16523107
---
 mod.xml | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 284 insertions(+), 5 deletions(-)

diff --git a/mod.xml b/mod.xml
index e0f0089..d0fd712 100644
--- a/mod.xml
+++ b/mod.xml
@@ -4,10 +4,10 @@
   appversion="*"
   mmversion="*"
   name="Expandable Scoreboard"
-  version="1.0"
-  date="1/7/2017"
+  version="1.1"
+  date="1/8/2017"
   description="Enables the old expandable scoreboard in HoN 4.0."
-  author="MrHappyAsthma"
+  author="MrHappyAsthma and JinZero"
   weblink="https://github.com/mrhappyasthma/HoN-Expandable-Scoreboard-Mod"
   updatecheckurl="http://raw.githubusercontent.com/mrhappyasthma/HoN-Expandable-Scoreboard-Mod/master/version.txt"
   updatedownloadurl="http://github.com/mrhappyasthma/HoN-Expandable-Scoreboard-Mod/releases/download/Latest/expandable_scoreboard.honmod"
@@ -157,9 +157,288 @@
   </editfile>
 
   <!-- Razor UI -->
-  <!-- TODO(mrhappyasthma) -->
+  <editfile name="ui/game_apex.interface">
+    <!-- First, we need to add the missing elements back into the scoreboard
+         entries. (Username, kills, deaths, assists, add-a-friend button. -->
+    <find><![CDATA[				<label x="0.2h" y="-0.1h" width="2.0h" height="100%" textalign="center" textvalign="center" font="dyn_10" color="yellow" shadow="true" shadowcolor="black" noclick="true"
+					watch="ScoreboardPlayerRespawn{index}"
+					ontriggerlua="	self:SetVisible((tonumber(param0) > 0) and (not AtoB(param1)))
+									self:SetText(param0)"]]>
+    </find>
+    <insert position="before"><![CDATA[
+      <!-- Player name -->
+      <label height="100%" textvalign="center" font="dyn_9" color="white" shadow="true" noclick="true"
+        watch="ScoreboardPlayer{index}"
+        ontriggerlua="self:SetText(param0) self:SetColor(param3)"
+      />
+
+      <panel x="-3.6h" width="10.0h" height="100%" align="right" float="right" color="invisible" noclick="true">
+        <!-- Kills -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="0 1 0 1" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param5)"
+        />
+        <panel width="5%" height="100%" color="invisible" noclick="1">
+          <label height="100%" textalign="center" textvalign="center" color=".8 .8 .8 1" shadow="true" font="dyn_9" noclick="1" content="/" />
+        </panel>
+        <!-- Deaths -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="1 0 0 1" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param6)"
+        />
+        <panel width="5%" height="100%" color="invisible" noclick="1">
+          <label height="100%" textalign="center" textvalign="center" color=".8 .8 .8 1" shadow="true" font="dyn_9" noclick="1" content="/" />
+        </panel>
+        <!-- Assists -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="#ffaa00" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param7)"
+        />
+      </panel>
+
+      <!-- Add Friend Btn -->
+      <instance name="addfriend_button" index="{index}" />
+    ]]></insert>
+
+    <!-- Second, we need to reposition the scoreboard to its old location. -->
+    <find><![CDATA[	<panel name="Nstatusboard" height="2.0h" width="29.5h" x="23.0h" y="8.0h" align="right" noclick="true" >]]>
+    </find>
+    <replace><![CDATA[]
+      <panel name="Nstatusboard" height="2.0h" width="29.5h" x="23.0h" y="4.0h" align="right" noclick="true" >
+    ]]></replace>
+
+    <!-- Third, we need to adjust the unexpanded state to show the hero icon AND
+         the player's level (as before). -->
+    <find><![CDATA[		<panel y="0.5h" x="2h" grow="true" growinvis="false" width="28.0h" align="right" float="bottom" padding="1" noclick="true">]]>
+    </find>
+    <replace><![CDATA[
+      <panel y="0.5h" grow="true" growinvis="false" width="28.0h" align="right" float="bottom" padding="1" noclick="true">
+    ]]></replace>
+
+    <!-- Not sure why... but the padding is slight off now (even though the
+         values match the old ones...) Just adjust this manually for now. -->
+    <find><![CDATA[					<panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.2h">]]>
+    </find>
+    <replace><![CDATA[
+      <panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.3h">
+    ]]></replace>
+    <find><![CDATA[					<panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.2h">]]>
+    </find>
+    <replace><![CDATA[
+      <panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.3h">
+    ]]></replace>
+
+    <!-- Lastly we need to add the expand/unexpand buttons. (Note: Place these
+         outside one layer of panels, so it looks like before.) -->
+    <find><![CDATA[			<button
+				name="Nscores_max"
+				visible="true"
+				y="-1.0h" x="-1h" height="1.8h" width="1.8h"
+				color="invisible"
+				onmouseluplua="GetWidget('game_scoreboard_popup', 'game'):SetVisible(0)"
+				onmouseldownlua="GetWidget('game_scoreboard_popup', 'game'):SetVisible(1)"
+				onclicklua=""
+				interactive="false"
+			>]]>
+    </find>
+    <replace><![CDATA[</panel>
+		<!-- Collapse Scoreboard -->
+		<button
+			name="Nscores_min"
+			visible="false"
+			y="-0.3h" height="1.7h" width="1.7h"
+			color="invisible"
+			onclicklua="
+        GetWidget('Nscores_min', 'game'):SetVisible(false)
+        GetWidget('Nscores_max', 'game'):SetVisible(true)
+        GetWidget('Nstatusboard', 'game'):SlideX('23h', 250)
+      "
+			interactive="false"
+		>
+			<widgetstate statename="up">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#007191" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color=".75 .75 .75 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+			<widgetstate statename="over">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#0096ec" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color="1 1 1 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+			<widgetstate statename="down" x="1" y="1">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#007191" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color="1 1 1 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+		</button>
+
+    <!-- Expand Scoreboard -->
+		<button
+			name="Nscores_max"
+			visible="true"
+			y="-0.3h" height="1.7h" width="1.7h"
+			color="invisible"
+			onclicklua="
+        GetWidget('Nscores_min', 'game'):SetVisible(true)
+        GetWidget('Nscores_max', 'game'):SetVisible(false)
+        GetWidget('Nstatusboard'):SlideX('1h', 250)
+      "
+			interactive="false"
+		>]]>
+    </replace>
+
+    <!-- Remove one of the closing panel tags, since we place the buttons
+         outside of one already. -->
+    <find><![CDATA[			<panel width="100%" height="0.1h" noclick="true" />
+		</panel>
+	</panel>]]>
+    </find>
+    <replace><![CDATA[
+    	  <panel width="100%" height="0.1h" noclick="true" />
+		  </panel>
+    ]]></replace>
+  </editfile>
 
   <!-- Sentinel UI -->
-  <!-- TODO(mrhappyasthma) -->
+  <editfile name="ui/game_garena_other.interface">
+    <!-- First, we need to add the missing elements back into the scoreboard
+         entries. (Username, kills, deaths, assists, add-a-friend button. -->
+    <find><![CDATA[				<label x="0.2h" y="-0.1h" width="2.0h" height="100%" textalign="center" textvalign="center" font="dyn_10" color="yellow" shadow="true" shadowcolor="black" noclick="true"
+					watch="ScoreboardPlayerRespawn{index}"
+					ontriggerlua="	self:SetVisible((tonumber(param0) > 0) and (not AtoB(param1)))
+									self:SetText(param0)"]]>
+    </find>
+    <insert position="before"><![CDATA[
+      <!-- Player name -->
+      <label height="100%" textvalign="center" font="dyn_9" color="white" shadow="true" noclick="true"
+        watch="ScoreboardPlayer{index}"
+        ontriggerlua="self:SetText(param0) self:SetColor(param3)"
+      />
+
+      <panel x="-3.6h" width="10.0h" height="100%" align="right" float="right" color="invisible" noclick="true">
+        <!-- Kills -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="0 1 0 1" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param5)"
+        />
+        <panel width="5%" height="100%" color="invisible" noclick="1">
+          <label height="100%" textalign="center" textvalign="center" color=".8 .8 .8 1" shadow="true" font="dyn_9" noclick="1" content="/" />
+        </panel>
+        <!-- Deaths -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="1 0 0 1" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param6)"
+        />
+        <panel width="5%" height="100%" color="invisible" noclick="1">
+          <label height="100%" textalign="center" textvalign="center" color=".8 .8 .8 1" shadow="true" font="dyn_9" noclick="1" content="/" />
+        </panel>
+        <!-- Assists -->
+        <label width="30%" height="100%" textalign="center" textvalign="center" color="#ffaa00" shadow="true" font="dyn_9" noclick="true"
+          watch="ScoreboardPlayer{index}"
+          ontriggerlua="self:SetText(param7)"
+        />
+      </panel>
+
+      <!-- Add Friend Btn -->
+      <instance name="addfriend_button" index="{index}" />
+    ]]></insert>
+
+    <!-- Second, we need to reposition the scoreboard to its old location. -->
+    <find><![CDATA[	<panel name="Nstatusboard" height="2.0h" width="29.5h" x="23.0h" y="8.0h" align="right" noclick="true" >]]>
+    </find>
+    <replace><![CDATA[]
+      <panel name="Nstatusboard" height="2.0h" width="29.5h" x="23.0h" y="4.0h" align="right" noclick="true" >
+    ]]></replace>
 
+    <!-- Third, we need to adjust the unexpanded state to show the hero icon AND
+         the player's level (as before). -->
+    <find><![CDATA[		<panel y="0.5h" x="2h" grow="true" growinvis="false" width="28.0h" align="right" float="bottom" padding="1" noclick="true">]]>
+    </find>
+    <replace><![CDATA[
+      <panel y="0.5h" grow="true" growinvis="false" width="28.0h" align="right" float="bottom" padding="1" noclick="true">
+    ]]></replace>
+
+    <!-- Not sure why... but the padding is slight off now (even though the
+         values match the old ones...) Just adjust this manually for now. -->
+    <find><![CDATA[					<panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.2h">]]>
+    </find>
+    <replace><![CDATA[
+      <panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.3h">
+    ]]></replace>
+    <find><![CDATA[					<panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.2h">]]>
+    </find>
+    <replace><![CDATA[
+      <panel grow="true" growinvis="false" width="100%" noclick="true" float="bottom" padding="0.3h">
+    ]]></replace>
+
+    <!-- Lastly we need to add the expand/unexpand buttons. (Note: Place these
+         outside one layer of panels, so it looks like before.) -->
+    <find><![CDATA[			<button
+				name="Nscores_max"
+				visible="true"
+				y="-1.0h" x="-1h" height="1.8h" width="1.8h"
+				color="invisible"
+				onmouseluplua="GetWidget('game_scoreboard_popup', 'game'):SetVisible(0)"
+				onmouseldownlua="GetWidget('game_scoreboard_popup', 'game'):SetVisible(1)"
+				onclicklua=""
+				interactive="false"
+			>]]>
+    </find>
+    <replace><![CDATA[</panel>
+		<!-- Collapse Scoreboard -->
+		<button
+			name="Nscores_min"
+			visible="false"
+			y="-0.3h" height="1.7h" width="1.7h"
+			color="invisible"
+			onclicklua="
+        GetWidget('Nscores_min', 'game'):SetVisible(false)
+        GetWidget('Nscores_max', 'game'):SetVisible(true)
+        GetWidget('Nstatusboard', 'game'):SlideX('23h', 250)
+      "
+			interactive="false"
+		>
+			<widgetstate statename="up">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#007191" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color=".75 .75 .75 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+			<widgetstate statename="over">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#0096ec" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color="1 1 1 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+			<widgetstate statename="down" x="1" y="1">
+				<frame texture="/ui/frames/rounded_bg_white.tga" borderthickness="0.5h" color="#007191" blockinput="false" noclick="true"/>
+				<frame texture="/ui/frames/roundframe.tga" color="0 0 0 1" borderthickness="0.5h" blockinput="false" noclick="true"/>
+				<image width="1.3h" height="1.3h" align="center" valign="center" color="1 1 1 1" texture="/ui/fe2/elements/minimize_bar.tga" noclick="true" />
+			</widgetstate>
+		</button>
+
+    <!-- Expand Scoreboard -->
+		<button
+			name="Nscores_max"
+			visible="true"
+			y="-0.3h" height="1.7h" width="1.7h"
+			color="invisible"
+			onclicklua="
+        GetWidget('Nscores_min', 'game'):SetVisible(true)
+        GetWidget('Nscores_max', 'game'):SetVisible(false)
+        GetWidget('Nstatusboard'):SlideX('1h', 250)
+      "
+			interactive="false"
+		>]]>
+    </replace>
+
+    <!-- Remove one of the closing panel tags, since we place the buttons
+         outside of one already. -->
+    <find><![CDATA[			<panel width="100%" height="0.1h" noclick="true" />
+		</panel>
+	</panel>]]>
+    </find>
+    <replace><![CDATA[
+    	  <panel width="100%" height="0.1h" noclick="true" />
+		  </panel>
+    ]]></replace>
+  </editfile>
 </modification>
\ No newline at end of file