Skip to content

Commit 682eb6c

Browse files
committed
This is the actually submitted version.
Added rock rearrangement at new level.
1 parent de2249e commit 682eb6c

File tree

4 files changed

+39
-12
lines changed

4 files changed

+39
-12
lines changed

CFNGamejam2/CFNGamejam2.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<AssemblyFileVersionSettings>MMddStamp.DayOfYearStamp.MonthStamp.TimeStamp</AssemblyFileVersionSettings>
2525
<AssemblyInfoVersionSettings>YearStamp.DateStamp.DeltaDayStamp.Increment</AssemblyInfoVersionSettings>
2626
<PrimaryVersionType>AssemblyVersionAttribute</PrimaryVersionType>
27-
<AssemblyVersion>1.764.14.0101</AssemblyVersion>
27+
<AssemblyVersion>1.765.14.0101</AssemblyVersion>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
3030
<DebugSymbols>true</DebugSymbols>

CFNGamejam2/Entities/Ground.cs

+35-9
Original file line numberDiff line numberDiff line change
@@ -131,29 +131,25 @@ public void BeginRun()
131131
{
132132
ExtraLargeRocks.Add(new Rock(Game, RefGameLogic));
133133
ExtraLargeRocks.Last().SetModel(ExtraLargeRockModel);
134-
SpawnExtraLargeRock(ExtraLargeRocks.Last());
134+
//SpawnExtraLargeRock(ExtraLargeRocks.Last());
135135
}
136136

137137
for (int i = 0; i < 30; i++)
138138
{
139139
LargeRocks.Add(new Rock(Game, RefGameLogic));
140140
LargeRocks.Last().SetModel(LargeRockModel);
141-
SpawnLargeRock(LargeRocks.Last());
141+
//SpawnLargeRock(LargeRocks.Last());
142142

143143
MedRocks.Add(new Rock(Game, RefGameLogic));
144144
MedRocks.Last().SetModel(MedRockModel);
145-
SpawnMedRock(MedRocks.Last());
145+
//SpawnMedRock(MedRocks.Last());
146146

147147
SmallRocks.Add(new Rock(Game, RefGameLogic));
148148
SmallRocks.Last().SetModel(SmallRockModel);
149-
SpawnSmallRock(SmallRocks.Last());
149+
//SpawnSmallRock(SmallRocks.Last());
150150
}
151151

152-
Vector3[] path = new Vector3[2];
153-
path[0] = new Vector3(0, -11, -Border);
154-
path[1] = new Vector3(0, -11, Border);
155-
156-
ClearPath(path);
152+
ResetRocks();
157153
}
158154

159155
public override void Update(GameTime gameTime)
@@ -216,6 +212,36 @@ public void ClearPath(Vector3[] path)
216212
}
217213
}
218214

215+
public void ResetRocks()
216+
{
217+
foreach (Rock rock in ExtraLargeRocks)
218+
{
219+
SpawnExtraLargeRock(rock);
220+
}
221+
222+
foreach (Rock rock in LargeRocks)
223+
{
224+
SpawnLargeRock(rock);
225+
}
226+
227+
foreach (Rock rock in MedRocks)
228+
{
229+
SpawnMedRock(rock);
230+
}
231+
232+
foreach (Rock rock in SmallRocks)
233+
{
234+
SpawnSmallRock(rock);
235+
}
236+
237+
238+
Vector3[] path = new Vector3[2];
239+
path[0] = new Vector3(0, -11, -Border);
240+
path[1] = new Vector3(0, -11, Border);
241+
242+
ClearPath(path);
243+
}
244+
219245
bool MoveTowardsPoint(Vector3 goal)
220246
{
221247
if (Position == goal)

CFNGamejam2/GameLogic.cs

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ public void SwitchToMainMenu()
9090

9191
public void NewWave()
9292
{
93+
RefGround.ResetRocks();
9394
RefEnemy.NewWave();
9495
}
9596

CFNGamejam2/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.764.14.0101")]
36-
[assembly: AssemblyFileVersion("0114.14.1.0613")]
35+
[assembly: AssemblyVersion("1.765.14.0101")]
36+
[assembly: AssemblyFileVersion("0114.14.1.1850")]

0 commit comments

Comments
 (0)