Skip to content

Commit f1259f3

Browse files
Squall-LeonhartSquall-Leonhart
committed
Merge remote-tracking branch 'upstream/develop'
2 parents ec73e53 + 4510ad1 commit f1259f3

File tree

7 files changed

+194
-59
lines changed

7 files changed

+194
-59
lines changed

‎xivModdingFramework/Cache/XivDependencyGraph.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ public async Task<List<string>> GetMaterialFiles(int materialVariant = -1, Index
665665
materials.Add(path);
666666
}
667667

668-
if(Info.PrimaryId == XivRace.Hrothgar.GetRaceCodeInt())
668+
if(Info.PrimaryId == XivRace.Hrothgar_Male.GetRaceCodeInt())
669669
{
670670
// JK, Hrothgar actually have 5 material sets (that's how their fur pattern stuff is set)
671671
for (int i = 2; i <= 5; i++)

‎xivModdingFramework/General/Enums/XivRace.cs

Lines changed: 75 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,14 @@ public enum XivRace
101101
[Description("1304")] AuRa_Male_NPC,
102102
[Description("1401")] AuRa_Female,
103103
[Description("1404")] AuRa_Female_NPC,
104-
[Description("1501")] Hrothgar,
105-
[Description("1504")] Hrothgar_NPC,
106-
[Description("1801")] Viera,
107-
[Description("1804")] Viera_NPC,
104+
[Description("1501")] Hrothgar_Male,
105+
[Description("1504")] Hrothgar_Male_NPC,
106+
[Description("1601")] Hrothgar_Female,
107+
[Description("1604")] Hrothgar_Female_NPC,
108+
[Description("1701")] Viera_Male,
109+
[Description("1704")] Viera_Male_NPC,
110+
[Description("1801")] Viera_Female,
111+
[Description("1804")] Viera_Female_NPC,
108112
[Description("9104")] NPC_Male,
109113
[Description("9204")] NPC_Female,
110114
[Description("0000")] All_Races,
@@ -156,6 +160,13 @@ private static void CheckTree()
156160
Children = new List<XivRaceNode>(),
157161
HasSkin = true
158162
});
163+
dict.Add(XivRace.Viera_Male, new XivRaceNode()
164+
{
165+
Parent = dict[XivRace.Hyur_Midlander_Male],
166+
Race = XivRace.Viera_Male,
167+
Children = new List<XivRaceNode>(),
168+
HasSkin = true
169+
});
159170

160171

161172
// Muscular Race Males
@@ -173,10 +184,10 @@ private static void CheckTree()
173184
Children = new List<XivRaceNode>(),
174185
HasSkin = true
175186
});
176-
dict.Add(XivRace.Hrothgar, new XivRaceNode()
187+
dict.Add(XivRace.Hrothgar_Male, new XivRaceNode()
177188
{
178189
Parent = dict[XivRace.Roegadyn_Male],
179-
Race = XivRace.Hrothgar,
190+
Race = XivRace.Hrothgar_Male,
180191
Children = new List<XivRaceNode>(),
181192
HasSkin = true
182193
});
@@ -196,10 +207,10 @@ private static void CheckTree()
196207
Race = XivRace.Elezen_Female,
197208
Children = new List<XivRaceNode>()
198209
});
199-
dict.Add(XivRace.Viera, new XivRaceNode()
210+
dict.Add(XivRace.Viera_Female, new XivRaceNode()
200211
{
201212
Parent = dict[XivRace.Hyur_Midlander_Female],
202-
Race = XivRace.Viera,
213+
Race = XivRace.Viera_Female,
203214
Children = new List<XivRaceNode>(),
204215
HasSkin = true
205216
});
@@ -269,6 +280,13 @@ private static void CheckTree()
269280
Race = XivRace.Hyur_Highlander_Male_NPC,
270281
Children = new List<XivRaceNode>()
271282
});
283+
dict.Add(XivRace.Viera_Male_NPC, new XivRaceNode()
284+
{
285+
Parent = dict[XivRace.Hyur_Highlander_Male],
286+
Race = XivRace.Viera_Male_NPC,
287+
Children = new List<XivRaceNode>()
288+
});
289+
272290

273291
dict.Add(XivRace.Hyur_Highlander_Female_NPC, new XivRaceNode()
274292
{
@@ -339,16 +357,16 @@ private static void CheckTree()
339357
Race = XivRace.Lalafell_Female_NPC,
340358
Children = new List<XivRaceNode>()
341359
});
342-
dict.Add(XivRace.Viera_NPC, new XivRaceNode()
360+
dict.Add(XivRace.Viera_Female_NPC, new XivRaceNode()
343361
{
344-
Parent = dict[XivRace.Viera],
345-
Race = XivRace.Viera_NPC,
362+
Parent = dict[XivRace.Viera_Female],
363+
Race = XivRace.Viera_Female_NPC,
346364
Children = new List<XivRaceNode>()
347365
});
348-
dict.Add(XivRace.Hrothgar_NPC, new XivRaceNode()
366+
dict.Add(XivRace.Hrothgar_Male_NPC, new XivRaceNode()
349367
{
350-
Parent = dict[XivRace.Hrothgar],
351-
Race = XivRace.Hrothgar_NPC,
368+
Parent = dict[XivRace.Hrothgar_Male],
369+
Race = XivRace.Hrothgar_Male_NPC,
352370
Children = new List<XivRaceNode>()
353371
});
354372

@@ -599,11 +617,11 @@ public static XivBaseRace GetBaseRace(this XivRace race)
599617
case XivRace.AuRa_Male_NPC:
600618
case XivRace.AuRa_Female_NPC:
601619
return XivBaseRace.AuRa;
602-
case XivRace.Viera:
603-
case XivRace.Viera_NPC:
620+
case XivRace.Viera_Female:
621+
case XivRace.Viera_Female_NPC:
604622
return XivBaseRace.Viera;
605-
case XivRace.Hrothgar:
606-
case XivRace.Hrothgar_NPC:
623+
case XivRace.Hrothgar_Male:
624+
case XivRace.Hrothgar_Male_NPC:
607625
return XivBaseRace.Hrothgar;
608626
default:
609627
return XivBaseRace.Hyur;
@@ -649,8 +667,9 @@ public static class XivRaces
649667
XivRace.Lalafell_Female,
650668
XivRace.AuRa_Male,
651669
XivRace.AuRa_Female,
652-
XivRace.Hrothgar,
653-
XivRace.Viera,
670+
XivRace.Hrothgar_Male,
671+
XivRace.Viera_Female,
672+
XivRace.Viera_Male,
654673
};
655674

656675
/// <summary>
@@ -693,8 +712,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
693712
case XivRace.Miqote_Female_NPC:
694713
case XivRace.AuRa_Female:
695714
case XivRace.AuRa_Female_NPC:
696-
case XivRace.Viera:
697-
case XivRace.Viera_NPC:
715+
case XivRace.Viera_Female:
716+
case XivRace.Viera_Female_NPC:
698717
case XivRace.Hyur_Highlander_Female:
699718
case XivRace.Hyur_Highlander_Female_NPC:
700719
case XivRace.Elezen_Female:
@@ -710,8 +729,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
710729
XivRace.Miqote_Female_NPC,
711730
XivRace.AuRa_Female,
712731
XivRace.AuRa_Female_NPC,
713-
XivRace.Viera,
714-
XivRace.Viera_NPC,
732+
XivRace.Viera_Female,
733+
XivRace.Viera_Female_NPC,
715734
XivRace.Hyur_Highlander_Female,
716735
XivRace.Hyur_Highlander_Female_NPC,
717736
XivRace.Elezen_Female,
@@ -728,6 +747,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
728747
XivRace.Elezen_Male_NPC,
729748
XivRace.AuRa_Male,
730749
XivRace.AuRa_Male_NPC,
750+
XivRace.Viera_Male,
751+
XivRace.Viera_Male_NPC,
731752

732753
// Highlander Next
733754
XivRace.Hyur_Highlander_Male,
@@ -736,8 +757,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
736757
// Roe M? These are pretty fucked at this point.
737758
XivRace.Roegadyn_Male,
738759
XivRace.Roegadyn_Male_NPC,
739-
XivRace.Hrothgar,
740-
XivRace.Hrothgar_NPC,
760+
XivRace.Hrothgar_Male,
761+
XivRace.Hrothgar_Male_NPC,
741762

742763
// Lala ?
743764
XivRace.Lalafell_Male,
@@ -755,6 +776,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
755776
case XivRace.Elezen_Male_NPC:
756777
case XivRace.AuRa_Male:
757778
case XivRace.AuRa_Male_NPC:
779+
case XivRace.Viera_Male:
780+
case XivRace.Viera_Male_NPC:
758781
return new List<XivRace>()
759782
{
760783
// Male Base Races First
@@ -766,6 +789,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
766789
XivRace.Elezen_Male_NPC,
767790
XivRace.AuRa_Male,
768791
XivRace.AuRa_Male_NPC,
792+
XivRace.Viera_Male,
793+
XivRace.Viera_Male_NPC,
769794

770795
// Highlander Next
771796
XivRace.Hyur_Highlander_Male,
@@ -778,8 +803,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
778803
XivRace.Miqote_Female_NPC,
779804
XivRace.AuRa_Female,
780805
XivRace.AuRa_Female_NPC,
781-
XivRace.Viera,
782-
XivRace.Viera_NPC,
806+
XivRace.Viera_Female,
807+
XivRace.Viera_Female_NPC,
783808
XivRace.Hyur_Highlander_Female,
784809
XivRace.Hyur_Highlander_Female_NPC,
785810
XivRace.Elezen_Female,
@@ -790,8 +815,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
790815
// Roe M? These are pretty fucked at this point.
791816
XivRace.Roegadyn_Male,
792817
XivRace.Roegadyn_Male_NPC,
793-
XivRace.Hrothgar,
794-
XivRace.Hrothgar_NPC,
818+
XivRace.Hrothgar_Male,
819+
XivRace.Hrothgar_Male_NPC,
795820

796821
// Lala ?
797822
XivRace.Lalafell_Male,
@@ -818,6 +843,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
818843
XivRace.Elezen_Male_NPC,
819844
XivRace.AuRa_Male,
820845
XivRace.AuRa_Male_NPC,
846+
XivRace.Viera_Male,
847+
XivRace.Viera_Male_NPC,
821848

822849
// Standard Female Races Next ? We're getting into trouble territory here.
823850
XivRace.Hyur_Midlander_Female,
@@ -826,8 +853,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
826853
XivRace.Miqote_Female_NPC,
827854
XivRace.AuRa_Female,
828855
XivRace.AuRa_Female_NPC,
829-
XivRace.Viera,
830-
XivRace.Viera_NPC,
856+
XivRace.Viera_Female,
857+
XivRace.Viera_Female_NPC,
831858
XivRace.Hyur_Highlander_Female,
832859
XivRace.Hyur_Highlander_Female_NPC,
833860
XivRace.Elezen_Female,
@@ -838,8 +865,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
838865
// Roe M? These are pretty fucked at this point.
839866
XivRace.Roegadyn_Male,
840867
XivRace.Roegadyn_Male_NPC,
841-
XivRace.Hrothgar,
842-
XivRace.Hrothgar_NPC,
868+
XivRace.Hrothgar_Male,
869+
XivRace.Hrothgar_Male_NPC,
843870

844871
// Lala ?
845872
XivRace.Lalafell_Male,
@@ -851,15 +878,15 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
851878
// Big Boys
852879
case XivRace.Roegadyn_Male:
853880
case XivRace.Roegadyn_Male_NPC:
854-
case XivRace.Hrothgar:
855-
case XivRace.Hrothgar_NPC:
881+
case XivRace.Hrothgar_Male:
882+
case XivRace.Hrothgar_Male_NPC:
856883
return new List<XivRace>()
857884
{
858885
// Roe M
859886
XivRace.Roegadyn_Male,
860887
XivRace.Roegadyn_Male_NPC,
861-
XivRace.Hrothgar,
862-
XivRace.Hrothgar_NPC,
888+
XivRace.Hrothgar_Male,
889+
XivRace.Hrothgar_Male_NPC,
863890

864891
// Highlander Next
865892
XivRace.Hyur_Highlander_Male,
@@ -874,6 +901,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
874901
XivRace.Elezen_Male_NPC,
875902
XivRace.AuRa_Male,
876903
XivRace.AuRa_Male_NPC,
904+
XivRace.Viera_Male,
905+
XivRace.Viera_Male_NPC,
877906

878907
// Standard Female Races Next ? We're getting into trouble territory here.
879908
XivRace.Hyur_Midlander_Female,
@@ -882,8 +911,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
882911
XivRace.Miqote_Female_NPC,
883912
XivRace.AuRa_Female,
884913
XivRace.AuRa_Female_NPC,
885-
XivRace.Viera,
886-
XivRace.Viera_NPC,
914+
XivRace.Viera_Female,
915+
XivRace.Viera_Female_NPC,
887916
XivRace.Hyur_Highlander_Female,
888917
XivRace.Hyur_Highlander_Female_NPC,
889918
XivRace.Elezen_Female,
@@ -920,6 +949,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
920949
XivRace.Elezen_Male_NPC,
921950
XivRace.AuRa_Male,
922951
XivRace.AuRa_Male_NPC,
952+
XivRace.Viera_Male,
953+
XivRace.Viera_Male_NPC,
923954

924955
// Standard Female Races Next ? We're getting into trouble territory here.
925956
XivRace.Hyur_Midlander_Female,
@@ -928,8 +959,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
928959
XivRace.Miqote_Female_NPC,
929960
XivRace.AuRa_Female,
930961
XivRace.AuRa_Female_NPC,
931-
XivRace.Viera,
932-
XivRace.Viera_NPC,
962+
XivRace.Viera_Female,
963+
XivRace.Viera_Female_NPC,
933964
XivRace.Hyur_Highlander_Female,
934965
XivRace.Hyur_Highlander_Female_NPC,
935966
XivRace.Elezen_Female,
@@ -944,8 +975,8 @@ public static List<XivRace> GetModelPriorityList(this XivRace race)
944975
// Roe M
945976
XivRace.Roegadyn_Male,
946977
XivRace.Roegadyn_Male_NPC,
947-
XivRace.Hrothgar,
948-
XivRace.Hrothgar_NPC
978+
XivRace.Hrothgar_Male,
979+
XivRace.Hrothgar_Male_NPC
949980
};
950981

951982
}

‎xivModdingFramework/Items/Categories/Character.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -635,10 +635,12 @@ public async Task<List<string>> GetDecalPaths(XivDecalType type)
635635
{"1304", XivRace.AuRa_Male_NPC},
636636
{"1401", XivRace.AuRa_Female},
637637
{"1404", XivRace.AuRa_Female_NPC},
638-
{"1501", XivRace.Hrothgar},
639-
{"1504", XivRace.Hrothgar_NPC},
640-
{"1801", XivRace.Viera},
641-
{"1804", XivRace.Viera_NPC},
638+
{"1501", XivRace.Hrothgar_Male},
639+
{"1504", XivRace.Hrothgar_Male_NPC},
640+
{"1701", XivRace.Viera_Male},
641+
{"1704", XivRace.Viera_Male_NPC},
642+
{"1801", XivRace.Viera_Female},
643+
{"1804", XivRace.Viera_Female_NPC},
642644
{"9104", XivRace.NPC_Male},
643645
{"9204", XivRace.NPC_Female}
644646
};

‎xivModdingFramework/Items/Categories/Gear.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,10 +606,14 @@ public async Task<List<XivRace>> GetRacesForModels(XivGear xivGear, XivDataFile
606606
{"1304", XivRace.AuRa_Male_NPC},
607607
{"1401", XivRace.AuRa_Female},
608608
{"1404", XivRace.AuRa_Female_NPC},
609-
{"1501", XivRace.Hrothgar},
610-
{"1504", XivRace.Hrothgar_NPC},
611-
{"1801", XivRace.Viera},
612-
{"1804", XivRace.Viera_NPC},
609+
{"1501", XivRace.Hrothgar_Male},
610+
{"1504", XivRace.Hrothgar_Male_NPC},
611+
{"1601", XivRace.Hrothgar_Female},
612+
{"1604", XivRace.Hrothgar_Female_NPC},
613+
{"1701", XivRace.Viera_Male},
614+
{"1704", XivRace.Viera_Male_NPC},
615+
{"1801", XivRace.Viera_Female},
616+
{"1804", XivRace.Viera_Female_NPC},
613617
{"9104", XivRace.NPC_Male},
614618
{"9204", XivRace.NPC_Female}
615619
};

‎xivModdingFramework/Models/FileTypes/Eqp.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ public class Eqp
6161
XivRace.Lalafell_Female,
6262
XivRace.AuRa_Male,
6363
XivRace.AuRa_Female,
64-
XivRace.Hrothgar,
65-
XivRace.Viera,
64+
XivRace.Hrothgar_Male,
65+
XivRace.Viera_Female,
6666
};
6767

6868
// List of All Races including their NPC Versions
@@ -82,8 +82,9 @@ public class Eqp
8282
XivRace.Lalafell_Female,
8383
XivRace.AuRa_Male,
8484
XivRace.AuRa_Female,
85-
XivRace.Hrothgar,
86-
XivRace.Viera,
85+
XivRace.Hrothgar_Male,
86+
XivRace.Viera_Female,
87+
XivRace.Viera_Male,
8788
XivRace.Hyur_Midlander_Male_NPC,
8889
XivRace.Hyur_Midlander_Female_NPC,
8990
XivRace.Hyur_Highlander_Male_NPC,
@@ -98,8 +99,9 @@ public class Eqp
9899
XivRace.Lalafell_Female_NPC,
99100
XivRace.AuRa_Male_NPC,
100101
XivRace.AuRa_Female_NPC,
101-
XivRace.Hrothgar_NPC,
102-
XivRace.Viera_NPC,
102+
XivRace.Hrothgar_Male_NPC,
103+
XivRace.Viera_Female_NPC,
104+
XivRace.Viera_Male_NPC,
103105
XivRace.NPC_Male,
104106
XivRace.NPC_Female
105107
};

0 commit comments

Comments
 (0)