Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
8dde2a6
GitHub Classroom Feedback
github-classroom[bot] Mar 21, 2024
a1c42ea
Setting up GitHub Classroom Feedback
github-classroom[bot] Mar 21, 2024
d33000e
coppied over templet into egdd.md, as well as one of the pictures for…
SibylRoosen Mar 21, 2024
016a9dd
Coppied over all but the gameplay objectives, and storyboarding is no…
SibylRoosen Mar 21, 2024
4879be1
Added the gameplay objectives
SibylRoosen Mar 21, 2024
395cb37
Added images to storyboarding
SibylRoosen Mar 22, 2024
f6d6e8b
fixed images
SibylRoosen Mar 22, 2024
e97918a
Added remaining images for gameplay screens
jmeredith20 Mar 22, 2024
3e50423
Added final screen images
jmeredith20 Mar 22, 2024
7c140ab
Testing pushing to Alpha
jmeredith20 Mar 22, 2024
7404d31
"Testing push to Alpha attempt two"
jmeredith20 Mar 22, 2024
8f8e95d
Added loadoutScreen and type-able textboxes with user input
jmeredith20 Mar 23, 2024
91b2fa6
started to build levels by copying over some code
SibylRoosen Mar 25, 2024
879e55f
Created clickable text boxes for navigating menu
jmeredith20 Apr 2, 2024
86b82b3
Renamed loadoutScene to loadoutSceneOne
jmeredith20 Apr 2, 2024
79fe7dc
Added a few menu screens
jmeredith20 Apr 2, 2024
7cca782
Got the base code working and presenting on the deployed screen, it i…
SibylRoosen Apr 2, 2024
e5f2744
pulled and resolved conflicts
SibylRoosen Apr 2, 2024
876e806
fixed errors with config
SibylRoosen Apr 2, 2024
3853ab6
changed images, not fully working yet, but the functions work as the…
SibylRoosen Apr 2, 2024
fe4f094
Added rest of menu, still need to tweak text input
jmeredith20 Apr 2, 2024
ddb0d62
Merge branch 'Alpha' of https://github.com/UD-S24-CISC374/final-proje…
jmeredith20 Apr 2, 2024
6f3a27a
Added more menu screens
jmeredith20 Apr 2, 2024
e5b7282
Fixed textbox bug with overlapping textboxes
jmeredith20 Apr 3, 2024
f9de526
Added a test scene to figure out how to make mutible textboxes
jmeredith20 Apr 3, 2024
b654739
Added new textbox logic in test scene
jmeredith20 Apr 3, 2024
157eaa6
Finalized new textbox code (thank you ChatGPT)
jmeredith20 Apr 3, 2024
14e40ff
Finally got textboxes working correctly (fr now)
jmeredith20 Apr 3, 2024
ae82a3c
FINALLY correctly added functional textboxes
jmeredith20 Apr 4, 2024
cd4048a
fixed the platforms
SibylRoosen Apr 4, 2024
2dbfff9
Added logic to check what user input and button to submit code
jmeredith20 Apr 5, 2024
c8b0266
does not work yet, working on adding a tile map
SibylRoosen Apr 5, 2024
506959c
Merge branch 'Alpha' of https://github.com/UD-S24-CISC374/final-proje…
SibylRoosen Apr 5, 2024
e5c8606
started working on a file using tiles, got base game working.
SibylRoosen Apr 5, 2024
1dcb673
Bullets can be fired, the problem is right now when a collision is ad…
SibylRoosen Apr 10, 2024
23e5a2c
Got the bullets to work the way that they are supposed to. Makes the …
SibylRoosen Apr 11, 2024
9e6dd76
Added error messages for incorrect code input when submit button is c…
jmeredith20 Apr 11, 2024
bc7a639
Added a cheat button for dev level testing purposes
jmeredith20 Apr 11, 2024
578cc60
made bullets visable
SibylRoosen Apr 11, 2024
9cd806f
Merge branch 'Alpha' of https://github.com/UD-S24-CISC374/final-proje…
SibylRoosen Apr 11, 2024
00c4ae2
added extra baddies, the checkpoint and an end scene
SibylRoosen Apr 12, 2024
f4605ba
Added brief instructions for Menu items
jmeredith20 Apr 12, 2024
a7b8c8a
added an instruction screen to tell user how to play the game
SibylRoosen Apr 12, 2024
16f308a
Merge branch 'Alpha' of https://github.com/UD-S24-CISC374/final-proje…
SibylRoosen Apr 12, 2024
cb33474
Removed error grids
jmeredith20 Apr 17, 2024
d1f808c
Commetented out stars
jmeredith20 Apr 17, 2024
dba164a
Commetented out stars & changed screen ordering
jmeredith20 Apr 17, 2024
63a6c4c
Commented out 'score' as it currently does nothing
jmeredith20 Apr 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Empty file added .github/.keep
Empty file.
Binary file added assets/.DS_Store
Binary file not shown.
4 changes: 4 additions & 0 deletions assets/ground.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="ground" tilewidth="18" tileheight="18" tilecount="3632" columns="227">
<image source="final-project-mint/assets/img/LevelImg/ground.png" width="4096" height="301"/>
</tileset>
4 changes: 4 additions & 0 deletions assets/ground2.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="ground2" tilewidth="64" tileheight="64" tilecount="256" columns="64">
<image source="final-project-mint/assets/img/LevelImg/ground.png" width="4096" height="301"/>
</tileset>
4 changes: 4 additions & 0 deletions assets/ground3.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="ground3" tilewidth="162" tileheight="162" tilecount="25" columns="25">
<image source="final-project-mint/assets/img/LevelImg/ground.png" width="4096" height="301"/>
</tileset>
Binary file added assets/img/.DS_Store
Binary file not shown.
Binary file added assets/img/CharacterView.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/.DS_Store
Binary file not shown.
Binary file added assets/img/LevelImg/baddie1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/baddie2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/baddie_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/baddie_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/baddie_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/baddie_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/checkpoint.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/checkpoint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/ground.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/ground.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/groundV2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
245 changes: 245 additions & 0 deletions assets/img/LevelImg/levelOneMap.json

Large diffs are not rendered by default.

Binary file added assets/img/LevelImg/level_background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/new_item_example_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/new_item_example_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/platform.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/platform.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/platformV2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelImg/sheriff.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelOneBoss.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelOneMid.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelOneStart.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelScreen.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelTwoBoss.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelTwoMid.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/LevelTwoStart.jpg
Binary file added assets/img/LoadoutMenu.jpg
Binary file added assets/img/LoadoutMenuOne.jpg
Binary file added assets/img/LoadoutMenuTwo.jpg
Binary file added assets/img/MainScreen.jpg
Binary file added assets/img/WildWest.jpeg
Binary file added assets/img/bomb.png
Binary file added assets/img/dude.png
Binary file added assets/img/keyboard.jpg
Binary file added assets/img/platform.png
Binary file added assets/img/star.png
138 changes: 138 additions & 0 deletions assets/levelOneMap.json

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions assets/levelOneMap.tiled-session
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"last.imagePath": "/Users/sibyl/CISC-374/final-project-mint/assets"
}
109 changes: 109 additions & 0 deletions assets/levelOneMap.tmx

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions assets/platform.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="platform" tilewidth="72" tileheight="72" tilecount="14" columns="7">
<grid orientation="orthogonal" width="32" height="32"/>
<image source="final-project-mint/assets/img/LevelImg/platform.png" width="575" height="177"/>
</tileset>
4 changes: 4 additions & 0 deletions assets/platform2.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="platform2" tilewidth="32" tileheight="32" tilecount="85" columns="17">
<image source="final-project-mint/assets/img/LevelImg/platform.png" width="575" height="177"/>
</tileset>
Binary file added assets/tilemap_packed.png
4 changes: 4 additions & 0 deletions assets/tiles1.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<tileset version="1.10" tiledversion="1.10.2" name="tiles1" tilewidth="18" tileheight="18" tilecount="112" columns="16">
<image source="../Downloads/kenney_pixel-platformer-farm-expansion/Tilemap/tilemap_packed.png" width="288" height="126"/>
</tileset>
227 changes: 226 additions & 1 deletion docs/egdd.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions final-project-mint
Submodule final-project-mint added at 3e5042
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 29 additions & 3 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,21 @@
import Phaser from "phaser";
import MainScene from "./scenes/mainScene";
import PreloadScene from "./scenes/preloadScene";
import LoadoutSceneTextboxInserts from "./scenes/loadoutSceneTextboxInserts";
import LoadoutSceneOne from "./scenes/loadoutSceneOne";
import LoadoutSceneGun from "./scenes/loadoutSceneGun";
import LoadoutSceneGunMagazine from "./scenes/loadoutSceneGunMagazine";
import LoadoutSceneGunScope from "./scenes/loadoutSceneGunScope";
import LoadoutSceneClothes from "./scenes/loadoutSceneClothes";
import LoadoutSceneClothesShirt from "./scenes/loadoutSceneClothesShirt";
import LoadoutSceneClothesPants from "./scenes/loadoutSceneClothesPants";
import levelOne from "./scenes/levelOne";
import endScene from "./scenes/endScene";
import instructions from "./scenes/instructions";
//import levelOnetry from "./scenes/level1";

const DEFAULT_WIDTH = 1280;
const DEFAULT_HEIGHT = 720;
const DEFAULT_WIDTH = 4096;
const DEFAULT_HEIGHT = 1714;

export const CONFIG = {
title: "My Untitled Phaser 3 Game",
Expand All @@ -17,7 +29,21 @@ export const CONFIG = {
width: DEFAULT_WIDTH,
height: DEFAULT_HEIGHT,
},
scene: [PreloadScene, MainScene],
scene: [
PreloadScene,
MainScene,
LoadoutSceneOne,
LoadoutSceneTextboxInserts,
LoadoutSceneGun,
LoadoutSceneGunMagazine,
LoadoutSceneGunScope,
LoadoutSceneClothes,
LoadoutSceneClothesPants,
LoadoutSceneClothesShirt,
levelOne,
endScene,
instructions,
],
physics: {
default: "arcade",
arcade: {
Expand Down
30 changes: 30 additions & 0 deletions src/scenes/endScene.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import Phaser from "phaser";
export default class endScene extends Phaser.Scene {
private scoreText?: Phaser.GameObjects.Text;
private cursors?: Phaser.Types.Input.Keyboard.CursorKeys;
constructor() {
super({ key: "endScene" });
}

create() {
this.add.image(2048, 857, "levelBackg");
this.cursors = this.input.keyboard?.createCursorKeys();
this.scoreText = this.add.text(2048, 857, "Game End!", {
fontSize: "60px",
color: "#000",
});
this.scoreText = this.add.text(2048, 1000, "Space bar to start over!", {
fontSize: "32px",
color: "#000",
});
}

update() {
if (!this.cursors) {
return;
}
if (this.cursors.space.isDown) {
this.scene.start("instructions");
}
}
}
75 changes: 75 additions & 0 deletions src/scenes/instructions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
import Phaser from "phaser";
export default class instructions extends Phaser.Scene {
private scoreText?: Phaser.GameObjects.Text;
private cursors?: Phaser.Types.Input.Keyboard.CursorKeys;
constructor() {
super({ key: "instructions" });
}

create() {
this.add.image(2048, 857, "levelBackg");
this.cursors = this.input.keyboard?.createCursorKeys();
this.scoreText = this.add.text(1300, 500, "Western Weaponsmith!", {
fontSize: "125px",
color: "#000",
});
this.scoreText = this.add.text(
550,
800,
"1. Click on words under “Menu” to see what classes, types, and attributes you have unlocked",
{
fontSize: "45px",
color: "#000",
}
);
this.scoreText = this.add.text(
550,
900,
"2. Click on each red box and begin typing to replace the text in the box with the correct class, attribute, and type names. ",
{
fontSize: "45px",
color: "#000",
}
);
this.scoreText = this.add.text(
550,
1000,
"3. Click “Submit Code” and rectify any errors that you see in the errors box.",
{
fontSize: "45px",
color: "#000",
}
);
this.scoreText = this.add.text(
550,
1100,
"4. Navigate your player with up down left right arrow keys and press space bar to fire weapon.",
{
fontSize: "45px",
color: "#000",
}
);
this.scoreText = this.add.text(
550,
1150,
" Defeat all enemies and jump into the win flag.",
{
fontSize: "45px",
color: "#000",
}
);
this.scoreText = this.add.text(550, 1500, "Space bar to start!", {
fontSize: "45px",
color: "#000",
});
}
update() {
if (!this.cursors) {
return;
}
if (this.cursors.space.isDown) {
this.scene.launch("LoadoutSceneTextboxInserts");
this.scene.start("LoadoutSceneOne");
}
}
}
25 changes: 25 additions & 0 deletions src/scenes/level1.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import Phaser from "phaser";
//import PhaserLogo from "../objects/phaserLogo";
//import FpsText from "../objects/fpsText";

export default class level1 extends Phaser.Scene {
private player?: Phaser.Physics.Arcade.Sprite;

constructor() {
super({ key: "levelOne" });
}

create() {
this.add.image(2048, 857, "levelBackg");
this.add.image(3072, 857, "levelBackg");
this.player = this.physics.add.sprite(100, 450, "dude");
this.player.setBounce(0.2);
this.player.setCollideWorldBounds(true);
//const map = this.make.tilemap({ key: "tilemap" });
//const tileset1 = map.addTilesetImage("ground3", "ground");
//const tileset2 = map.addTilesetImage("tiles1", "tiles");

//map.createLayer("ground", tileset1);
//console.log(map);
}
}
Loading