Skip to content

Commit 7f0ed7f

Browse files
TheRealDjmrTheRealDjmr
authored
Merge pull request #24 from TheRealDjmr/Minimap
Minimap
2 parents c646035 + 3a36888 commit 7f0ed7f

File tree

3 files changed

+1509
-27
lines changed

3 files changed

+1509
-27
lines changed

‎ImprovedUI/Public/Game/GUI/Library/DataTemplates.xaml

+27-27
Original file line numberDiff line numberDiff line change
@@ -1959,127 +1959,127 @@
19591959
<Setter Property="Margin" Value="0,-15,0,0"/>
19601960
</MultiDataTrigger.Setters>
19611961
</MultiDataTrigger>
1962-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPoint">
1962+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="PsiPoint">
19631963
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.PsiPointGroup}"/>
19641964
<Setter Property="MaxGroupActionPoints" Value="1"/>
19651965
<Setter Property="ActionPointSize" Value="48" />
19661966
</DataTrigger>
19671967
<MultiDataTrigger>
19681968
<MultiDataTrigger.Conditions>
1969-
<Condition Binding="{Binding TypeId}" Value="PsiPoint"/>
1970-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
1969+
<Condition Binding="{Binding ActionResource.TypeId}" Value="PsiPoint"/>
1970+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
19711971
</MultiDataTrigger.Conditions>
19721972
<MultiDataTrigger.Setters>
19731973
<Setter Property="Margin" Value="0,-15,0,0"/>
19741974
</MultiDataTrigger.Setters>
19751975
</MultiDataTrigger>
1976-
<DataTrigger Binding="{Binding TypeId}" Value="PsiPointMastery">
1976+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="PsiPointMastery">
19771977
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.PsiPointGroup}"/>
19781978
<Setter Property="MaxGroupActionPoints" Value="1"/>
19791979
<Setter Property="ActionPointSize" Value="48" />
19801980
</DataTrigger>
19811981
<MultiDataTrigger>
19821982
<MultiDataTrigger.Conditions>
1983-
<Condition Binding="{Binding TypeId}" Value="PsiPointMastery"/>
1984-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
1983+
<Condition Binding="{Binding ActionResource.TypeId}" Value="PsiPointMastery"/>
1984+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
19851985
</MultiDataTrigger.Conditions>
19861986
<MultiDataTrigger.Setters>
19871987
<Setter Property="Margin" Value="0,-15,0,0"/>
19881988
</MultiDataTrigger.Setters>
19891989
</MultiDataTrigger>
1990-
<DataTrigger Binding="{Binding TypeId}" Value="HitDice">
1990+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="HitDice">
19911991
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.HitDiceGroup}"/>
19921992
<Setter Property="MaxGroupActionPoints" Value="1"/>
19931993
<Setter Property="ActionPointSize" Value="48" />
19941994
</DataTrigger>
19951995
<MultiDataTrigger>
19961996
<MultiDataTrigger.Conditions>
1997-
<Condition Binding="{Binding TypeId}" Value="HitDice"/>
1998-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
1997+
<Condition Binding="{Binding ActionResource.TypeId}" Value="HitDice"/>
1998+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
19991999
</MultiDataTrigger.Conditions>
20002000
<MultiDataTrigger.Setters>
20012001
<Setter Property="Margin" Value="0,-15,0,0"/>
20022002
</MultiDataTrigger.Setters>
20032003
</MultiDataTrigger>
2004-
<DataTrigger Binding="{Binding TypeId}" Value="RampageDie">
2004+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="RampageDie">
20052005
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.RampageDieGroup}"/>
20062006
<Setter Property="MaxGroupActionPoints" Value="1"/>
20072007
<Setter Property="ActionPointSize" Value="48" />
20082008
</DataTrigger>
20092009
<MultiDataTrigger>
20102010
<MultiDataTrigger.Conditions>
2011-
<Condition Binding="{Binding TypeId}" Value="RampageDie"/>
2012-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2011+
<Condition Binding="{Binding ActionResource.TypeId}" Value="RampageDie"/>
2012+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20132013
</MultiDataTrigger.Conditions>
20142014
<MultiDataTrigger.Setters>
20152015
<Setter Property="Margin" Value="0,-15,0,0"/>
20162016
</MultiDataTrigger.Setters>
20172017
</MultiDataTrigger>
2018-
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD4">
2018+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD4">
20192019
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup1}"/>
20202020
<Setter Property="MaxGroupActionPoints" Value="1"/>
20212021
<Setter Property="ActionPointSize" Value="48" />
20222022
</DataTrigger>
20232023
<MultiDataTrigger>
20242024
<MultiDataTrigger.Conditions>
2025-
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD4"/>
2026-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2025+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD4"/>
2026+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20272027
</MultiDataTrigger.Conditions>
20282028
<MultiDataTrigger.Setters>
20292029
<Setter Property="Margin" Value="0,-15,0,0"/>
20302030
</MultiDataTrigger.Setters>
20312031
</MultiDataTrigger>
2032-
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD6">
2032+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD6">
20332033
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup2}"/>
20342034
<Setter Property="MaxGroupActionPoints" Value="1"/>
20352035
<Setter Property="ActionPointSize" Value="48" />
20362036
</DataTrigger>
20372037
<MultiDataTrigger>
20382038
<MultiDataTrigger.Conditions>
2039-
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD6"/>
2040-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2039+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD6"/>
2040+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20412041
</MultiDataTrigger.Conditions>
20422042
<MultiDataTrigger.Setters>
20432043
<Setter Property="Margin" Value="0,-15,0,0"/>
20442044
</MultiDataTrigger.Setters>
20452045
</MultiDataTrigger>
2046-
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD8">
2046+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD8">
20472047
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup3}"/>
20482048
<Setter Property="MaxGroupActionPoints" Value="1"/>
20492049
<Setter Property="ActionPointSize" Value="48" />
20502050
</DataTrigger>
20512051
<MultiDataTrigger>
20522052
<MultiDataTrigger.Conditions>
2053-
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD8"/>
2054-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2053+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD8"/>
2054+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20552055
</MultiDataTrigger.Conditions>
20562056
<MultiDataTrigger.Setters>
20572057
<Setter Property="Margin" Value="0,-15,0,0"/>
20582058
</MultiDataTrigger.Setters>
20592059
</MultiDataTrigger>
2060-
<DataTrigger Binding="{Binding TypeId}" Value="MartialArtsDieD10">
2060+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD10">
20612061
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.MartialArtsDieGroup4}"/>
20622062
<Setter Property="MaxGroupActionPoints" Value="1"/>
20632063
<Setter Property="ActionPointSize" Value="48" />
20642064
</DataTrigger>
20652065
<MultiDataTrigger>
20662066
<MultiDataTrigger.Conditions>
2067-
<Condition Binding="{Binding TypeId}" Value="MartialArtsDieD10"/>
2068-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2067+
<Condition Binding="{Binding ActionResource.TypeId}" Value="MartialArtsDieD10"/>
2068+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20692069
</MultiDataTrigger.Conditions>
20702070
<MultiDataTrigger.Setters>
20712071
<Setter Property="Margin" Value="0,-15,0,0"/>
20722072
</MultiDataTrigger.Setters>
20732073
</MultiDataTrigger>
2074-
<DataTrigger Binding="{Binding TypeId}" Value="NecroThaum">
2074+
<DataTrigger Binding="{Binding ActionResource.TypeId}" Value="NecroThaum">
20752075
<Setter Property="ActionPointTemplate" Value="{StaticResource ActionResources.ActionGroup.NecroThaumGroup}"/>
20762076
<Setter Property="MaxGroupActionPoints" Value="1"/>
20772077
<Setter Property="ActionPointSize" Value="48" />
20782078
</DataTrigger>
20792079
<MultiDataTrigger>
20802080
<MultiDataTrigger.Conditions>
2081-
<Condition Binding="{Binding TypeId}" Value="NecroThaum"/>
2082-
<Condition Binding="{Binding Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
2081+
<Condition Binding="{Binding ActionResource.TypeId}" Value="NecroThaum"/>
2082+
<Condition Binding="{Binding ActionResource.Value, Converter={StaticResource GreaterThanConverter}, ConverterParameter=1}" Value="True"/>
20832083
</MultiDataTrigger.Conditions>
20842084
<MultiDataTrigger.Setters>
20852085
<Setter Property="Margin" Value="0,-15,0,0"/>

0 commit comments

Comments
 (0)