Updated diffs to fix exp gauges for player window, and bring current

This commit is contained in:
Isuldor
2018-07-31 20:17:44 -07:00
parent 8af6235352
commit e1a16e39d7
10 changed files with 230 additions and 157 deletions
Executable → Regular
+191 -135
View File
@@ -1,44 +1,54 @@
--- default/EQUI_PlayerWindow.xml 2014-02-14 11:00:32.000000000 -0800
+++ isuldor/EQUI_PlayerWindow.xml 2016-09-11 22:49:26.471918600 -0700
@@ -395,16 +395,32 @@
</GaugeDrawTemplate>
<AutoStretch>true</AutoStretch>
<TopAnchorOffset>1</TopAnchorOffset>
- <BottomAnchorOffset>45</BottomAnchorOffset>
+ <BottomAnchorOffset>42</BottomAnchorOffset>
<LeftAnchorOffset>2</LeftAnchorOffset>
--- /mnt/d/EverQuest/uifiles/default/EQUI_PlayerWindow.xml 2018-04-09 20:54:48.000000000 -0700
+++ /mnt/d/EverQuest/uifiles/isuldor/EQUI_PlayerWindow.xml 2018-07-31 18:16:39.365099800 -0700
@@ -363,7 +363,7 @@
<RightAnchorToLeft>false</RightAnchorToLeft>
<LeftAnchorToLeft>false</LeftAnchorToLeft>
</Button>
-
+
<Gauge item="Player_HP">
<ScreenID>PlayerHP</ScreenID>
<TextColor>
@@ -375,10 +375,10 @@
<TextOffsetX>1</TextOffsetX>
<TextOffsetY>-2</TextOffsetY>
<GaugeOffsetY>34</GaugeOffsetY>
- <FillTint>
+ <FillTint>
<R>240</R>
<G>0</G>
- <B>0</B>
+ <B>0</B>
</FillTint>
<EQType>1</EQType>
<GaugeDrawTemplate>
@@ -388,43 +388,48 @@
<EndCapLeft>A_GaugeEndCapLeft</EndCapLeft>
<EndCapRight>A_GaugeEndCapRight</EndCapRight>
</GaugeDrawTemplate>
- <AutoStretch>true</AutoStretch>
+ <AutoStretch>true</AutoStretch>
<TopAnchorOffset>1</TopAnchorOffset>
<BottomAnchorOffset>45</BottomAnchorOffset>
<LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorOffset>1</RightAnchorOffset>
- <RightAnchorToLeft>false</RightAnchorToLeft>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
</Gauge>
-
- <Label item="Player_HPLabel">
- <ScreenID>HPLabel</ScreenID>
- <EQType>19</EQType>
+ <Label item="Player_HPLabelShadow">
+ <ScreenID>HPLabelShadow</ScreenID>
+ <EQType>17</EQType>
+ <RelativePosition>true</RelativePosition>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
+ <TextColor>
+ <R>0</R>
+ <G>0</G>
+ <B>0</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <Font>5</Font>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>26</TopAnchorOffset>
+ <BottomAnchorOffset>42</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Label>
<Label item="Player_HPLabel">
<ScreenID>HPLabel</ScreenID>
- <EQType>19</EQType>
+ <EQType>17</EQType>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
<TextColor>
<R>255</R>
<G>255</G>
@@ -412,10 +428,10 @@
</TextColor>
<NoWrap>true</NoWrap>
<AlignCenter>true</AlignCenter>
- <Font>1</Font>
@@ -46,102 +56,121 @@
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>35</TopAnchorOffset>
- <BottomAnchorOffset>45</BottomAnchorOffset>
+ <TopAnchorOffset>24</TopAnchorOffset>
+ <TopAnchorOffset>26</TopAnchorOffset>
+ <BottomAnchorOffset>42</BottomAnchorOffset>
<LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
<Style_Tooltip>false</Style_Tooltip>
@@ -423,7 +439,6 @@
<Label item="Player_HPPercLabel">
<ScreenID>HPPerLabel</ScreenID>
- <Style_Tooltip>false</Style_Tooltip>
</Label>
- <Label item="Player_HPPercLabel">
- <ScreenID>HPPerLabel</ScreenID>
+ <Label item="Player_HPLabel">
+ <ScreenID>HPLabel</ScreenID>
+ <EQType>17</EQType>
<RelativePosition>true</RelativePosition>
- <Text>%</Text>
<NoWrap>true</NoWrap>
<AlignCenter>true</AlignCenter>
- <Font>1</Font>
+ <Font>5</Font>
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>35</TopAnchorOffset>
- <BottomAnchorOffset>45</BottomAnchorOffset>
- <LeftAnchorOffset>24</LeftAnchorOffset>
+ <TopAnchorOffset>24</TopAnchorOffset>
+ <BottomAnchorOffset>42</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
<Style_Tooltip>false</Style_Tooltip>
</Label>
+ <Label item="Player_HPPercLabel">
+ <ScreenID>HPPerLabel</ScreenID><!-- REQUIRED -->
+ </Label>
<Gauge item="Pet_HP">
<ScreenID>PetHP</ScreenID>
<TextColor>
<R>255</R>
<G>255</G>
@@ -488,12 +503,29 @@
<LeftAnchorOffset>2</LeftAnchorOffset>
@@ -475,33 +480,41 @@
<RightAnchorOffset>1</RightAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
</Gauge>
- <Label item="Player_ManaLabel">
- <ScreenID>ManaLabel</ScreenID>
- <EQType>20</EQType>
- <Font>1</Font>
+ <Label item="Player_ManaLabelShadow">
+ <ScreenID>ManaLabelShadow</ScreenID>
+ <EQType>124</EQType>
+ <Font>5</Font>
+ <RelativePosition>true</RelativePosition>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
+ <TextColor>
+ <R>0</R>
+ <G>0</G>
+ <B>0</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>41</TopAnchorOffset>
+ <BottomAnchorOffset>57</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Label>
<Label item="Player_ManaLabel">
<ScreenID>ManaLabel</ScreenID>
- <EQType>20</EQType>
- <Font>1</Font>
+ <EQType>124</EQType>
+ <Font>5</Font>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
<TextColor>
<R>255</R>
<G>255</G>
@@ -502,8 +534,8 @@
<NoWrap>true</NoWrap>
<AlignCenter>true</AlignCenter>
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>45</TopAnchorOffset>
- <BottomAnchorOffset>55</BottomAnchorOffset>
+ <TopAnchorOffset>39</TopAnchorOffset>
+ <TopAnchorOffset>41</TopAnchorOffset>
+ <BottomAnchorOffset>57</BottomAnchorOffset>
<LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
<Style_Tooltip>false</Style_Tooltip>
@@ -511,7 +543,6 @@
<Label item="Player_ManaPercLabel">
<ScreenID>ManPercLabel</ScreenID>
<Font>1</Font>
- <Style_Tooltip>false</Style_Tooltip>
</Label>
- <Label item="Player_ManaPercLabel">
- <ScreenID>ManPercLabel</ScreenID>
- <Font>1</Font>
- <Text>%</Text>
<TextColor>
<R>255</R>
<G>255</G>
@@ -553,7 +584,6 @@
<EQType>21</EQType>
<Font>1</Font>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
<TextColor>
<R>255</R>
<G>255</G>
@@ -571,7 +601,7 @@
<Label item="Player_FatiguePercLabel">
<ScreenID>FatiguePercLabel</ScreenID>
<Font>1</Font>
- <Text>%</Text>
+ <Text>%Fuck</Text>
<TextColor>
<R>255</R>
<G>255</G>
@@ -584,7 +614,127 @@
<LeftAnchorOffset>24</LeftAnchorOffset>
+ <Label item="Player_ManaLabel">
+ <ScreenID>ManaLabel</ScreenID>
+ <EQType>124</EQType>
+ <Font>5</Font>
+ <RelativePosition>true</RelativePosition>
+ <NoWrap>true</NoWrap>
<AlignCenter>true</AlignCenter>
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>45</TopAnchorOffset>
- <BottomAnchorOffset>55</BottomAnchorOffset>
- <LeftAnchorOffset>24</LeftAnchorOffset>
+ <TopAnchorOffset>39</TopAnchorOffset>
+ <BottomAnchorOffset>57</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
<Style_Tooltip>false</Style_Tooltip>
+ </Label><!--
+ <Gauge item="IW_ExpGauge">
+ <ScreenID>PlayerExp</ScreenID>
+ <RelativePosition>true</RelativePosition>
</Label>
+ <Label item="Player_ManaPercLabel">
+ <ScreenID>ManPercLabel</ScreenID><!-- REQUIRED -->
+ </Label>
<Gauge item="Player_Fatigue">
<ScreenID>PlayerFatigue</ScreenID>
<RelativePosition>true</RelativePosition>
@@ -528,30 +541,133 @@
</Gauge>
<Label item="Player_FatigueLabel">
<ScreenID>FatigueLabel</ScreenID>
- <EQType>21</EQType>
- <Font>1</Font>
+ </Label>
+ <Label item="Player_FatiguePercLabel">
+ <ScreenID>FatiguePercLabel</ScreenID>
+ </Label>
+ <Gauge item="Player_ExpGauge">
+ <ScreenID>PlayerExp</ScreenID>
<RelativePosition>true</RelativePosition>
- <Text>100</Text>
+ <GaugeOffsetY>0</GaugeOffsetY>
+ <FillTint>
+ <R>220</R>
+ <G>150</G>
+ <B>0</B>
+ </FillTint>
+ <LinesFillTint>
+ <R>0</R>
+ <G>80</G>
+ <B>220</B>
+ </LinesFillTint>
+ <DrawLinesFill>true</DrawLinesFill>
+ <EQType>4</EQType>
+ <GaugeDrawTemplate>
@@ -153,11 +182,12 @@
+ <EndCapRight>A_GaugeEndCapRight</EndCapRight>
+ </GaugeDrawTemplate>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>77</TopAnchorOffset>
+ <BottomAnchorOffset>87</BottomAnchorOffset>
+ <TopAnchorOffset>65</TopAnchorOffset>
+ <BottomAnchorOffset>75</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Gauge>
+ <RightAnchorOffset>1</RightAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Gauge>
+ <Label item="Player_ExpGaugeLabelShadow">
+ <ScreenID>ExpGaugeLabel</ScreenID>
+ <EQType>26</EQType>
@@ -168,34 +198,36 @@
+ <G>0</G>
+ <B>0</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>77</TopAnchorOffset>
+ <BottomAnchorOffset>89</BottomAnchorOffset>
<NoWrap>true</NoWrap>
<AlignCenter>true</AlignCenter>
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>55</TopAnchorOffset>
- <BottomAnchorOffset>65</BottomAnchorOffset>
+ <TopAnchorOffset>65</TopAnchorOffset>
+ <BottomAnchorOffset>77</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Label>
+ </Label>
+ <Label item="Player_ExpGaugeLabel">
+ <ScreenID>ExpGaugeLabel</ScreenID>
+ <EQType>26</EQType>
+ <Font>2</Font>
+ <RelativePosition>true</RelativePosition>
+ <TextColor>
+ <R>255</R>
+ <G>255</G>
+ <B>255</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>75</TopAnchorOffset>
+ <BottomAnchorOffset>87</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ <TopAnchorOffset>63</TopAnchorOffset>
+ <BottomAnchorOffset>75</BottomAnchorOffset>
<LeftAnchorOffset>2</LeftAnchorOffset>
<RightAnchorToLeft>false</RightAnchorToLeft>
- <Style_Tooltip>false</Style_Tooltip>
</Label>
- <Label item="Player_FatiguePercLabel">
- <ScreenID>FatiguePercLabel</ScreenID>
- <Font>1</Font>
- <Text>%</Text>
+ <Gauge item="Player_AAExpGauge">
+ <ScreenID>PlayerAAExp</ScreenID>
+ <ScreenID>PlayerAAExp</ScreenID>
+ <RelativePosition>true</RelativePosition>
+ <GaugeOffsetY>0</GaugeOffsetY>
+ <FillTint>
@@ -203,20 +235,28 @@
+ <G>150</G>
+ <B>0</B>
+ </FillTint>
+ <LinesFillTint>
+ <R>0</R>
+ <G>80</G>
+ <B>220</B>
+ </LinesFillTint>
+ <DrawLinesFill>true</DrawLinesFill>
+ <EQType>5</EQType>
+ <GaugeDrawTemplate>
+ <Background>A_GaugeBackground</Background>
+ <Fill>A_GaugeFill</Fill>
+ <Lines>A_GaugeLines</Lines>
+ <LinesFill>A_GaugeLinesFill</LinesFill>
+ <EndCapLeft>A_GaugeEndCapLeft</EndCapLeft>
+ <EndCapRight>A_GaugeEndCapRight</EndCapRight>
+ </GaugeDrawTemplate>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>92</TopAnchorOffset>
+ <BottomAnchorOffset>102</BottomAnchorOffset>
+ <TopAnchorOffset>75</TopAnchorOffset>
+ <BottomAnchorOffset>85</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Gauge>
+ <RightAnchorOffset>1</RightAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Gauge>
+ <Label item="Player_AAExpGaugeLabelShadow">
+ <ScreenID>AAExpGaugeLabel</ScreenID>
+ <EQType>27</EQType>
@@ -228,10 +268,13 @@
+ <B>0</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>92</TopAnchorOffset>
+ <BottomAnchorOffset>104</BottomAnchorOffset>
<AlignCenter>true</AlignCenter>
<AutoStretch>true</AutoStretch>
- <TopAnchorOffset>55</TopAnchorOffset>
- <BottomAnchorOffset>65</BottomAnchorOffset>
- <LeftAnchorOffset>24</LeftAnchorOffset>
+ <TopAnchorOffset>75</TopAnchorOffset>
+ <BottomAnchorOffset>87</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Label>
@@ -240,38 +283,33 @@
+ <EQType>27</EQType>
+ <Font>2</Font>
+ <RelativePosition>true</RelativePosition>
+ <TextColor>
+ <R>255</R>
+ <G>255</G>
+ <B>255</B>
+ </TextColor>
+ <NoWrap>true</NoWrap>
+ <AlignCenter>true</AlignCenter>
+ <AutoStretch>true</AutoStretch>
+ <TopAnchorOffset>90</TopAnchorOffset>
+ <BottomAnchorOffset>102</BottomAnchorOffset>
+ <TopAnchorOffset>73</TopAnchorOffset>
+ <BottomAnchorOffset>85</BottomAnchorOffset>
+ <LeftAnchorOffset>2</LeftAnchorOffset>
+ <RightAnchorToLeft>false</RightAnchorToLeft>
+ </Label>-->
<RightAnchorToLeft>false</RightAnchorToLeft>
- <Style_Tooltip>false</Style_Tooltip>
</Label>
<Button item="PW_VoiceVolume">
<ScreenID>PW_VoiceVolume</ScreenID>
<EQType>voicechat/SpeakingIndicator</EQType>
@@ -743,12 +893,12 @@
@@ -696,12 +812,12 @@
</Size>
<Style_VScroll>false</Style_VScroll>
<Style_HScroll>false</Style_HScroll>
- <Style_Transparent>false</Style_Transparent>
+ <Style_Transparent>true</Style_Transparent>
<DrawTemplate>WDT_Filigree3</DrawTemplate>
<Style_Titlebar>true</Style_Titlebar>
<DrawTemplate>WDT_RoundedNoTitle</DrawTemplate>
<Style_Titlebar>false</Style_Titlebar>
<Style_Closebox>false</Style_Closebox>
<Style_Minimizebox>false</Style_Minimizebox>
- <Style_Border>true</Style_Border>
+ <Style_Border>false</Style_Border>
<Style_Sizable>true</Style_Sizable>
<Style_ClientMovable>true</Style_ClientMovable>
<Escapable>false</Escapable>
<Pieces>Player_HP</Pieces>
@@ -756,8 +906,10 @@
@@ -710,13 +826,21 @@
<Pieces>Player_Mana</Pieces>
<Pieces>Player_Fatigue</Pieces>
<Pieces>Player_CombatTimer</Pieces>
@@ -282,3 +320,21 @@
<Pieces>Player_ManaLabel</Pieces>
<Pieces>Player_ManaPercLabel</Pieces>
<Pieces>Player_FatigueLabel</Pieces>
<Pieces>Player_FatiguePercLabel</Pieces>
<Pieces>Player_CombatTimerLabel</Pieces>
+ <Pieces>Player_ExpGauge</Pieces>
+ <Pieces>Player_ExpGaugeLabelShadow</Pieces>
+ <Pieces>Player_ExpGaugeLabel</Pieces>
+ <Pieces>Player_AAExpGauge</Pieces>
+ <Pieces>Player_AAExpGaugeLabelShadow</Pieces>
+ <Pieces>Player_AAExpGaugeLabel</Pieces>
<Pieces>PW_CombatStateAnim</Pieces>
<Pieces>PW_NewMailIcon</Pieces>
<Pieces>PW_ParcelsIcon</Pieces>
@@ -735,4 +859,4 @@
<Pieces>PW_AggroNameSecondaryLabel</Pieces>
<Pieces>PW_AggroPctSecondaryLabel</Pieces>
</Screen>
-</XML>
\ No newline at end of file
+</XML>