Skip to content

Commit d64c61d

Browse files
committed
Add rest to ItemMgr
1 parent f8457dd commit d64c61d

File tree

10 files changed

+411
-168
lines changed

10 files changed

+411
-168
lines changed

src/core/ItemMgr.cpp

Lines changed: 89 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,45 +40,84 @@ void ItemMgr::SerializeImpl(Header& rHeader) const {
4040
* @brief Clears item state
4141
*/
4242
void ItemMgr::Clear() {
43+
// Common
4344
mSportFlag.ResetAll();
4445
mCategoryFlag.ResetAll();
4546

47+
// Swordplay
4648
mSwfVsBlockFlag = false;
4749
mSwfPrcPauseFlag = false;
4850
mSwfSglBlockFlag = 0;
4951
mSwfSglHeartFlag.SetDirect(0b1); // Start with one heart
5052
mSwfSglStageFlag.SetDirect(0b1); // Start with one stage
5153

54+
// Wakeboarding
5255
mWkbTimerFlag.SetDirect(0b1); // Start with one timer
5356
mWkbStageFlag.SetDirect(0b1); // Start with one stage
5457

55-
mDglHUDFlag = false;
58+
// Frisbee Dog
59+
mFldThrowFlag.SetDirect(0b1); // Start with one throw
60+
mFldSecretPopFlag = false;
5661

57-
mArcTotalArrowsFlag.SetDirect(0b1); // Start with one arrow
58-
mArcStageFlag.SetDirect(0b1); // Start with one stage
62+
// Frisbee Golf
63+
mDglDiscFlag.SetDirect(0b1); // Start with one disc
64+
mDglStageFlag.SetDirect(0b1); // Start with one stage
5965

66+
// Archery
67+
mArcAimFlag = false;
68+
mArcArrowFlag.SetDirect(0b1); // Start with one arrow
69+
mArcFruitFlag.ResetAll();
70+
mArcStageFlag.SetDirect(0b1); // Start with one difficulty
71+
72+
// Basketball
6073
mBsk3ptTimerFlag.SetDirect(0b1); // Start with one timer
61-
mBsk3ptGoldenBallFlag = false;
74+
mBsk3ptBonusFlag = false;
6275
mBskVsTimerFlag.SetDirect(0b1); // Start with one timer
6376
mBskVsPassFlag = false;
77+
mBskVs3ptFlag = false;
78+
mBskVsDunkFlag = false;
6479

65-
mGlfHUDFlag = false;
80+
// Table Tennis
81+
mPngSpinFlag = false;
82+
mPngSmashFlag = false;
83+
mPngCansFlag = false;
6684

85+
// Golf
86+
mGlfHUDFlag = false;
87+
mGlfClubFlag.SetDirect(0b1); // Start with one club
88+
mGlfTurnFlag = false;
89+
mGlfSpinFlag = false;
90+
mGlfStageFlag.SetDirect(0b1); // Start with one difficulty
91+
mGlfViewLowFlag = false;
92+
mGlfViewSlopeFlag = false;
93+
94+
// Bowling
6795
mBwlStdMoveFlag = false;
6896
mBwlStdTurnFlag = false;
97+
mBwlStdSpinFlag = false;
6998
mBwl100MoveFlag = false;
7099
mBwl100TurnFlag = false;
100+
mBwl100SpinFlag = false;
101+
mBwl100SecretBtnFlag = false;
71102
mBwlWalMoveFlag = false;
72103
mBwlWalTurnFlag = false;
104+
mBwlWalSpinFlag = false;
73105

106+
// Power Cruising
74107
mJskBoostFlag = false;
108+
mJskRingTimerFlag.ResetAll();
109+
mJsk2xRingFlag = false;
110+
mJskFreeTimerFlag.SetDirect(0b1); // Start with one timer
75111

112+
// Canoeing
76113
mCanTimerFlag.SetDirect(0b1); // Start with one timer
77114
mCanStageFlag.SetDirect(0b1); // Start with one stage
78115

116+
// Cycling
79117
mBicHeartFlag.SetDirect(0b1); // Start with one heart
80118
mBicStageFlag.SetDirect(0b1); // Start with one stage
81119

120+
// Air Sports
82121
mPlnTimerFlag.SetDirect(0b1); // Start with one timer
83122
mPlnStageFlag.SetDirect(0b1); // Start with one stage
84123
}
@@ -89,59 +128,86 @@ void ItemMgr::Clear() {
89128
void ItemMgr::Debug() {
90129
kiwi::Random r;
91130

92-
//Common
131+
// Common
93132
mSportFlag.SetAll();
94133
mCategoryFlag.SetAll();
95134

96-
//Swordplay
135+
// Swordplay
97136
mSwfVsBlockFlag = r.CoinFlip();
98137
mSwfPrcPauseFlag = r.CoinFlip();
99138
mSwfSglBlockFlag = r.CoinFlip();
100139
mSwfSglHeartFlag.Randomize();
101140
mSwfSglStageFlag.Randomize();
102141

103-
//Wakeboarding
142+
// Wakeboarding
104143
mWkbTimerFlag.Randomize();
105144
mWkbStageFlag.Randomize();
106145

107-
//Frisbee Golf
108-
mDglHUDFlag = r.CoinFlip();
146+
// Frisbee Dog
147+
mFldThrowFlag.Randomize();
148+
mFldSecretPopFlag = r.CoinFlip();
149+
150+
// Frisbee Golf
151+
mDglDiscFlag.Randomize();
152+
mDglStageFlag.Randomize();
109153

110-
//Archery
111-
mArcTotalArrowsFlag.Randomize();
154+
// Archery
155+
mArcAimFlag = r.CoinFlip();
156+
mArcArrowFlag.Randomize();
157+
mArcFruitFlag.Randomize();
112158
mArcStageFlag.Randomize();
113-
114-
//Basketball
159+
160+
// Basketball
115161
mBsk3ptTimerFlag.Randomize();
116-
mBsk3ptGoldenBallFlag = r.CoinFlip();
162+
mBsk3ptBonusFlag = r.CoinFlip();
117163
mBskVsTimerFlag.Randomize();
118164
mBskVsPassFlag = r.CoinFlip();
165+
mBskVs3ptFlag = r.CoinFlip();
166+
mBskVsDunkFlag = r.CoinFlip();
119167

120-
//Golf
121-
mGlfHUDFlag = r.CoinFlip();
168+
// Table Tennis
169+
mPngSpinFlag = r.CoinFlip();
170+
mPngSmashFlag = r.CoinFlip();
171+
mPngCansFlag = r.CoinFlip();
122172

123-
//Bowling
173+
// Golf
174+
mGlfHUDFlag = r.CoinFlip();
175+
mGlfClubFlag.Randomize();
176+
mGlfTurnFlag = r.CoinFlip();
177+
mGlfSpinFlag = r.CoinFlip();
178+
mGlfStageFlag.Randomize();
179+
mGlfViewLowFlag = r.CoinFlip();
180+
mGlfViewSlopeFlag = r.CoinFlip();
181+
182+
// Bowling
124183
mBwlStdMoveFlag = r.CoinFlip();
125184
mBwlStdTurnFlag = r.CoinFlip();
185+
mBwlStdSpinFlag = r.CoinFlip();
126186
mBwl100MoveFlag = r.CoinFlip();
127187
mBwl100TurnFlag = r.CoinFlip();
188+
mBwl100SpinFlag = r.CoinFlip();
189+
mBwl100SecretBtnFlag = r.CoinFlip();
128190
mBwlWalMoveFlag = r.CoinFlip();
129191
mBwlWalTurnFlag = r.CoinFlip();
192+
mBwlWalSpinFlag = r.CoinFlip();
130193

131-
//Power Cruising
194+
// Power Cruising
132195
mJskBoostFlag = r.CoinFlip();
196+
mJskRingTimerFlag.Randomize();
197+
mJsk2xRingFlag = r.CoinFlip();
198+
mJskFreeTimerFlag.Randomize();
133199

134-
//Canoeing
200+
// Canoeing
135201
mCanTimerFlag.Randomize();
136202
mCanStageFlag.Randomize();
137203

138-
//Cycling
204+
// Cycling
139205
mBicHeartFlag.Randomize();
140206
mBicStageFlag.Randomize();
141207

142-
//Air Sports
208+
// Air Sports
143209
mPlnTimerFlag.Randomize();
144210
mPlnStageFlag.Randomize();
145211
}
146212

147-
} // namespace AP
213+
} // namespace AP

0 commit comments

Comments
 (0)