Leahnaya/NHSE
1
0
Fork 0
mirror of https://github.com/kwsch/NHSE.git synced 2026-04-24 07:07:44 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Relabel W1/W2 as w1/w2 (recessive)

Browse Source 
Closes #296
This commit is contained in:
Kurt 2020-06-05 20:09:10 -07:00
parent ca7a59cf73
commit ed53d331d9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NHSE.Core/Structures/Item/FlowerGene.cs
View File

@ -13,8 +13,8 @@ public enum FlowerGene : byte
R2 = 1 << 1,
Y1 = 1 << 2,
Y2 = 1 << 3,
W1 = 1 << 4,
W2 = 1 << 5,
w1 = 1 << 4, // inverted; both bits on = no gene (not white)
w2 = 1 << 5, // inverted; both bits on = no gene (not white)
S1 = 1 << 6,
S2 = 1 << 7,
}

8
NHSE.WinForms/Controls/ItemEditor.cs
View File

@ -285,8 +285,8 @@ private void LoadGenes(FlowerGene genes)
CHK_R2.Checked = (genes & FlowerGene.R2) != 0;
CHK_Y1.Checked = (genes & FlowerGene.Y1) != 0;
CHK_Y2.Checked = (genes & FlowerGene.Y2) != 0;
CHK_W1.Checked = (genes & FlowerGene.W1) != 0;
CHK_W2.Checked = (genes & FlowerGene.W2) != 0;
CHK_W1.Checked = (genes & FlowerGene.w1) == 0; // inverted; both bits on = no gene (not white)
CHK_W2.Checked = (genes & FlowerGene.w2) == 0; // inverted; both bits on = no gene (not white)
CHK_S1.Checked = (genes & FlowerGene.S1) != 0;
CHK_S2.Checked = (genes & FlowerGene.S2) != 0;
}
@ -298,8 +298,8 @@ private FlowerGene SaveGenes()
if (CHK_R2.Checked) val |= FlowerGene.R2;
if (CHK_Y1.Checked) val |= FlowerGene.Y1;
if (CHK_Y2.Checked) val |= FlowerGene.Y2;
if (CHK_W1.Checked) val |= FlowerGene.W1;
if (CHK_W2.Checked) val |= FlowerGene.W2;
if (!CHK_W1.Checked) val |= FlowerGene.w1; // inverted; both bits on = no gene (not white)
if (!CHK_W2.Checked) val |= FlowerGene.w2; // inverted; both bits on = no gene (not white)
if (CHK_S1.Checked) val |= FlowerGene.S1;
if (CHK_S2.Checked) val |= FlowerGene.S2;
return val;