Skip to content

Commit 5ac55f8

Browse files
committed
Merge branch 'feature' into develop
2 parents 0b0cc94 + c7ec2d4 commit 5ac55f8

File tree

66 files changed

+33974
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+33974
-180
lines changed
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

CYPVP/.vs/CYPVP/v17/.suo

32 KB
Binary file not shown.

CYPVP/CYPVP.csproj

Lines changed: 44 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,13 @@
4848
<ItemGroup>
4949
<Compile Include="AudioManager.cs" />
5050
<Compile Include="Character.cs" />
51+
<Compile Include="Chest.cs" />
52+
<Compile Include="ClassMenu.cs">
53+
<SubType>Form</SubType>
54+
</Compile>
55+
<Compile Include="ClassMenu.Designer.cs">
56+
<DependentUpon>ClassMenu.cs</DependentUpon>
57+
</Compile>
5158
<Compile Include="EndGame.cs">
5259
<SubType>Form</SubType>
5360
</Compile>
@@ -77,8 +84,18 @@
7784
<Compile Include="MainMenu.cs" />
7885
<Compile Include="Program.cs" />
7986
<Compile Include="Properties\AssemblyInfo.cs" />
87+
<Compile Include="Question.cs" />
88+
<Compile Include="QuestionForm.cs">
89+
<SubType>Form</SubType>
90+
</Compile>
91+
<Compile Include="QuestionForm.Designer.cs">
92+
<DependentUpon>QuestionForm.cs</DependentUpon>
93+
</Compile>
8094
<Compile Include="Slime.cs" />
8195
<Compile Include="Star.cs" />
96+
<EmbeddedResource Include="ClassMenu.resx">
97+
<DependentUpon>ClassMenu.cs</DependentUpon>
98+
</EmbeddedResource>
8299
<EmbeddedResource Include="EndGame.resx">
83100
<DependentUpon>EndGame.cs</DependentUpon>
84101
</EmbeddedResource>
@@ -101,6 +118,9 @@
101118
<DependentUpon>Resources.resx</DependentUpon>
102119
<DesignTime>True</DesignTime>
103120
</Compile>
121+
<EmbeddedResource Include="QuestionForm.resx">
122+
<DependentUpon>QuestionForm.cs</DependentUpon>
123+
</EmbeddedResource>
104124
<None Include="Properties\Settings.settings">
105125
<Generator>SettingsSingleFileGenerator</Generator>
106126
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -156,9 +176,6 @@
156176
<ItemGroup>
157177
<None Include="Resources\3.png" />
158178
</ItemGroup>
159-
<ItemGroup>
160-
<None Include="Resources\4.png" />
161-
</ItemGroup>
162179
<ItemGroup>
163180
<None Include="Resources\5.png" />
164181
</ItemGroup>
@@ -255,5 +272,29 @@
255272
<ItemGroup>
256273
<None Include="Resources\Yayyy Sound Effect.wav" />
257274
</ItemGroup>
275+
<ItemGroup>
276+
<None Include="Resources\4.png" />
277+
</ItemGroup>
278+
<ItemGroup>
279+
<None Include="Resources\chest_open_preview_rev_1.png" />
280+
</ItemGroup>
281+
<ItemGroup>
282+
<None Include="Resources\chest_unopen_preview_rev_1.png" />
283+
</ItemGroup>
284+
<ItemGroup>
285+
<None Include="Resources\output-onlinepngtools.png" />
286+
</ItemGroup>
287+
<ItemGroup>
288+
<None Include="Resources\chest_landing.wav" />
289+
</ItemGroup>
290+
<ItemGroup>
291+
<None Include="Resources\chest_opening.wav" />
292+
</ItemGroup>
293+
<ItemGroup>
294+
<None Include="Resources\Correct Answer Sound Effect.wav" />
295+
</ItemGroup>
296+
<ItemGroup>
297+
<None Include="Resources\Incorrect sound effect.wav" />
298+
</ItemGroup>
258299
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
259300
</Project>

CYPVP/Character.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@ public class Character
1515
public bool CanMoveDown { get; set; }
1616
public bool CanMoveRight { get; set; }
1717
public bool CanMoveLeft { get; set; }
18+
1819
public Character(PictureBox Character)
1920
{
2021
CharacterSkin = Character;
2122
CharacterSkin.BackColor = Color.Transparent;
2223
}
24+
2325
public void Move(String Position,int Speed,int Height,int Width,int x,int y)
2426
{
2527

@@ -78,6 +80,7 @@ public void Move(String Position,int Speed,int Height,int Width,int x,int y)
7880

7981

8082
}
83+
8184
public bool Check()
8285
{
8386
return CanMoveDown == false && CanMoveUp == false && CanMoveLeft == false && CanMoveRight == false;

CYPVP/Chest.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
using System.Threading.Tasks;
6+
using System.Windows.Forms;
7+
8+
namespace CYPVP
9+
{
10+
public class Chest
11+
{
12+
public PictureBox ChestSkin { get; set; }
13+
public bool isOpen { get; set; }
14+
public bool hasSpawned { get; set; }
15+
16+
public Chest(PictureBox chestSkin)
17+
{
18+
ChestSkin = chestSkin;
19+
isOpen = false;
20+
hasSpawned = false;
21+
22+
}
23+
}
24+
}

0 commit comments

Comments
 (0)