support DivingFlipper

turtle-insect · Jul 4, 2024 · ed2760f · ed2760f
1 parent 3bd1163
commit ed2760f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/CMNDAT/MainWindow.xaml b/CMNDAT/MainWindow.xaml
@@ -78,20 +78,22 @@
 						<CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding Skill.Bag}" VerticalAlignment="Center"/>
 						<Label Grid.Row="5" Content="Windbraker"/>
 						<CheckBox Grid.Row="5" Grid.Column="1" IsChecked="{Binding Skill.Windbraker}" VerticalAlignment="Center"/>
-						<Label Grid.Row="6" Content="Hammer3x"/>
-						<CheckBox Grid.Row="6" Grid.Column="1" IsChecked="{Binding Skill.Hammer3x}" VerticalAlignment="Center"/>
-						<Label Grid.Row="7" Content="Hammer5x"/>
-						<CheckBox Grid.Row="7" Grid.Column="1" IsChecked="{Binding Skill.Hammer5x}" VerticalAlignment="Center"/>
-						<Label Grid.Row="8" Content="Transform-O-Trowel(grade up)"/>
-						<CheckBox Grid.Row="8" Grid.Column="1" IsChecked="{Binding Skill.Transform}" VerticalAlignment="Center"/>
-						<Label Grid.Row="9" Content="Bottomless Pot(use)"/>
-						<CheckBox Grid.Row="9" Grid.Column="1" IsChecked="{Binding Skill.BottomlessPotUse}" VerticalAlignment="Center"/>
-						<Label Grid.Row="10" Content="Bottomless Pot(grade up)"/>
-						<CheckBox Grid.Row="10" Grid.Column="1" IsChecked="{Binding Skill.BottomlessPot}" VerticalAlignment="Center"/>
+						<Label Grid.Row="6" Content="DivingFlipper"/>
+						<CheckBox Grid.Row="6" Grid.Column="1" IsChecked="{Binding Skill.DivingFlipper}" VerticalAlignment="Center"/>
+						<Label Grid.Row="7" Content="Hammer3x"/>
+						<CheckBox Grid.Row="7" Grid.Column="1" IsChecked="{Binding Skill.Hammer3x}" VerticalAlignment="Center"/>
+						<Label Grid.Row="8" Content="Hammer5x"/>
+						<CheckBox Grid.Row="8" Grid.Column="1" IsChecked="{Binding Skill.Hammer5x}" VerticalAlignment="Center"/>
+						<Label Grid.Row="9" Content="Transform-O-Trowel(grade up)"/>
+						<CheckBox Grid.Row="9" Grid.Column="1" IsChecked="{Binding Skill.Transform}" VerticalAlignment="Center"/>
+						<Label Grid.Row="10" Content="Bottomless Pot(use)"/>
+						<CheckBox Grid.Row="10" Grid.Column="1" IsChecked="{Binding Skill.BottomlessPotUse}" VerticalAlignment="Center"/>
+						<Label Grid.Row="11" Content="Bottomless Pot(grade up)"/>
+						<CheckBox Grid.Row="11" Grid.Column="1" IsChecked="{Binding Skill.BottomlessPot}" VerticalAlignment="Center"/>
 
 						<!--
-                        <Label Grid.Row="12" Content="WateringType"/>
-                        <CheckBox Grid.Row="12" Grid.Column="1" IsChecked="{Binding Skill.WateringType}" VerticalAlignment="Center"/>
+                        <Label Grid.Row="13" Content="WateringType"/>
+                        <CheckBox Grid.Row="13" Grid.Column="1" IsChecked="{Binding Skill.WateringType}" VerticalAlignment="Center"/>
                         -->
 
 						<Label Grid.Row="12" Content="Buildnoculars"/>

diff --git a/CMNDAT/Skill.cs b/CMNDAT/Skill.cs
@@ -16,8 +16,14 @@ public bool Bag
 
 		public bool Windbraker
 		{
-			get { return SaveData.Instance().ReadNumber(0x6A8A2, 1) == 2; }
-			set { SaveData.Instance().WriteNumber(0x6A8A2, 1, value == true ? 2u : 0); }
+			get { return SaveData.Instance().ReadBit(0x6A8A2, 1); }
+			set { SaveData.Instance().WriteBit(0x6A8A2, 1, value); }
+		}
+
+		public bool DivingFlipper
+		{
+			get { return SaveData.Instance().ReadBit(0x6A8A3, 1); }
+			set { SaveData.Instance().WriteBit(0x6A8A3, 1, value); }
 		}
 
 		public bool Hammer3x