Skip to content

Commit b638a46

Browse files
Jayden CosgroveJayden Cosgrove
Jayden Cosgrove
authored and
Jayden Cosgrove
committed
Revert "Revert ">h2a/h4 ui basically done and working""
This reverts commit e376921.
1 parent e376921 commit b638a46

File tree

4 files changed

+756
-39
lines changed

4 files changed

+756
-39
lines changed

‎HaloPogSwitch/MyForm.cs‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -127,38 +127,51 @@ private void FuckingCunt_Load(object sender, EventArgs e)
127127
// processHandler.PairModule(halo2a, ModuleType.halo2A);
128128

129129
//C_HaloReach1.GetFlow(HaloReachMenuType.colour).Controls.Add(new TrainerEnumNestedButtonHolder());
130-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_ColourPrimary.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
131-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_ColourSecondary.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
130+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_ColourPrimary.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.color).Controls);
131+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_ColourSecondary.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.color).Controls);
132132

133133
//// Halo 2A
134-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Helmates.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
135-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Visors.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
136-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Chest.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
137-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Arms.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
138-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Legs.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
139-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_LShoulder.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
140-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_RShoulder.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
134+
135+
new TrainerUpdater<string>(new StringAdressSetter(new AdressGetter(ModuleType.halo2A, 0x19BA32C), 4), new TrainerText("Service Tag", "4 Letter Tag:", 4, true, CharacterCasing.Upper, true), uC_Halo2a1.GetHalo2AFlow(H2ATab.serviceid).Controls);
136+
new TrainerUpdater<bool>(new BoolAdressSetter(new AdressGetter(ModuleType.halo2A, 0x19BA30C)), new TrainerBool("Species", "Elite Biped"), uC_Halo2a1.GetHalo2AFlow(H2ATab.species).Controls);
137+
new TrainerUpdater<bool>(new ComplexBoolAdressSetter(new AdressGetter(ModuleType.halo2A, 0x19BA148), 0x18, 0x38), new TrainerBool("Spartan Gender", "Is Female"), uC_Halo2a1.GetHalo2AFlow(H2ATab.gender).Controls);
138+
139+
140+
141+
142+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Helmates.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.helmateVisor).Controls);
143+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Visors.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.helmateVisor).Controls);
144+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Chest.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.chest).Controls);
145+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Arms.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.wrist).Controls);
146+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_Legs.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.knees).Controls);
147+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_LShoulder.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.shoulder).Controls);
148+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_RShoulder.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.shoulder).Controls);
141149

142150

143151
////thingys that i added
144-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Helm.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
145-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Chest.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
146-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Arms.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
147-
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Legs.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
152+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Helm.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.elitearmor).Controls);
153+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Chest.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.elitearmor).Controls);
154+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Arms.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.elitearmor).Controls);
155+
CSVPuller.GetTrainerUpdater<byte>((@"H2A_E_Legs.csv"), uC_Halo2a1.GetHalo2AFlow(H2ATab.elitearmor).Controls);
156+
157+
//// halo 4
158+
159+
new TrainerUpdater<string>(new StringAdressSetter(new AdressGetter(ModuleType.halo4, 0x2D64B04), 4), new TrainerText("Service Tag", "4 Letter Tag:", 4, true, CharacterCasing.Upper, true), uC_Halo41.GetHalo4Flow(Halo4MenuType.serviceid).Controls);
160+
new TrainerUpdater<bool>(new ComplexBoolAdressSetter(new AdressGetter(ModuleType.halo4, 0x2D64928), 0x18, 0x38), new TrainerBool("Spartan Gender", "Is Female"), uC_Halo41.GetHalo4Flow(Halo4MenuType.gender).Controls);
148161

149162

150-
CSVPuller.GetTrainerUpdater<byte>((@"H4_Visors.csv"), uC_Halo41.GetReachFlow(Halo4MenuType.helmateVisor).Controls);
151-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_Helmets.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
152-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_L_Shoulder.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
153-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_R_Shoulder.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
154-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_Chest.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
155-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_Arms.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
156-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_Legs.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
163+
CSVPuller.GetTrainerUpdater<byte>((@"H4_Visors.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.helmateVisor).Controls);
164+
CSVPuller.GetTrainerUpdater<byte>((@"H4_Helmets.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.helmateVisor).Controls);
165+
CSVPuller.GetTrainerUpdater<byte>((@"H4_L_Shoulder.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.shoulder).Controls);
166+
CSVPuller.GetTrainerUpdater<byte>((@"H4_R_Shoulder.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.shoulder).Controls);
167+
CSVPuller.GetTrainerUpdater<byte>((@"H4_Chest.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.chest).Controls);
168+
CSVPuller.GetTrainerUpdater<byte>((@"H4_Arms.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.forearms).Controls);
169+
CSVPuller.GetTrainerUpdater<byte>((@"H4_Legs.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.legs).Controls);
157170

158171

159172

160-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_ColourPrimary.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
161-
//CSVPuller.GetTrainerUpdater<byte>((@"H4_ColourSecondary.csv"), uC_Halo2a1.GetControls(H2ATab.visor));
173+
CSVPuller.GetTrainerUpdater<byte>((@"H4_ColourPrimary.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.color).Controls);
174+
CSVPuller.GetTrainerUpdater<byte>((@"H4_ColourSecondary.csv"), uC_Halo41.GetHalo4Flow(Halo4MenuType.color).Controls);
162175

163176

164177
}

0 commit comments

Comments
 (0)