Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
88914b4
GitHub Classroom Feedback
github-classroom[bot] Mar 21, 2024
9257cff
Setting up GitHub Classroom Feedback
github-classroom[bot] Mar 21, 2024
ec4678a
Update egdd.md - Added EGDD
ClayWW Mar 21, 2024
45ce768
Delete docs/egdd.md
ACTrexler Mar 21, 2024
96392cd
added new egdd
ACTrexler Mar 21, 2024
f117b86
removed space
ACTrexler Mar 21, 2024
54176d2
spell correction
ACTrexler Mar 21, 2024
62d29f4
added BooleanBlock class
ACTrexler Mar 26, 2024
6b26497
BlockGrid displaying correctly
ACTrexler Mar 26, 2024
0b29a65
changed scaling and positioning of BlockGrid
ACTrexler Mar 26, 2024
7a8e22f
Added documentation and removed phaser logo
ACTrexler Mar 26, 2024
2453841
Blocks are movable by clicking separately
ACTrexler Apr 2, 2024
87f4871
added comments
ACTrexler Apr 2, 2024
33e02f4
added blocktype getter for BooleanBlocks
ACTrexler Apr 2, 2024
b002132
Added timer
Apr 3, 2024
c20cc5e
Added functions to get the grid for truthiness
ClayWW Apr 3, 2024
003b4fe
Added functions for removing a row or column and updating the grid
ClayWW Apr 3, 2024
3d61da7
Moved truthiness functions to blockGrid and fixed expression evaluation
ACTrexler Apr 3, 2024
f5ca030
Merge branch 'main' into alex
ACTrexler Apr 3, 2024
6a26a55
Merge pull request #2 from UD-S24-CISC374/alex
ACTrexler Apr 3, 2024
f503815
Added functions for removing a row or column and updating the grid
ClayWW Apr 3, 2024
17fdeaf
Merge branch 'alex' of https://github.com/UD-S24-CISC374/final-projec…
ACTrexler Apr 3, 2024
e149005
fixed merge issue
ACTrexler Apr 3, 2024
8388350
Merge pull request #3 from UD-S24-CISC374/alex
ACTrexler Apr 3, 2024
57e2a20
Got the block breaking mechanism done
ClayWW Apr 3, 2024
4ed2c8e
Changed the centering of the grid
ClayWW Apr 3, 2024
6903d28
Merge pull request #4 from UD-S24-CISC374/clay
ClayWW Apr 4, 2024
b2f166e
Changed falsy value
ClayWW Apr 4, 2024
3010886
Merge pull request #5 from UD-S24-CISC374/clay
ClayWW Apr 4, 2024
7c7dc51
Merge pull request #6 from UD-S24-CISC374/main
ACTrexler Apr 4, 2024
bf5200d
added block breaking sound with credit
ACTrexler Apr 4, 2024
e208d4b
Merge pull request #7 from UD-S24-CISC374/alex
ACTrexler Apr 4, 2024
d63327e
Basic menu functionality
Apr 4, 2024
8b70e4f
added gameplay music with credit
ACTrexler Apr 4, 2024
5e81d83
Merge pull request #8 from UD-S24-CISC374/murphyme44-menu
ACTrexler Apr 4, 2024
dddcad2
added gameplay music
ACTrexler Apr 4, 2024
f6e40d8
Merge pull request #9 from UD-S24-CISC374/alex
murphyme44 Apr 4, 2024
41fe34a
Update main.yml
murphyme44 Apr 4, 2024
d95353f
added animation to swapping blocks
ACTrexler Apr 4, 2024
6e157f0
Merge pull request #10 from UD-S24-CISC374/alex
ACTrexler Apr 4, 2024
211c9f7
Merge pull request #11 from UD-S24-CISC374/main
ACTrexler Apr 4, 2024
8bb8f72
updated menu with button and sound
ACTrexler Apr 4, 2024
cd0cb6e
added music to main menu
ACTrexler Apr 4, 2024
1bf0ca8
Merge pull request #12 from UD-S24-CISC374/alex
ACTrexler Apr 4, 2024
133540c
added score object that updates with matches
ACTrexler Apr 7, 2024
9186b62
Merge pull request #13 from UD-S24-CISC374/alex
ACTrexler Apr 7, 2024
260a3f4
Merge pull request #14 from UD-S24-CISC374/main
ClayWW Apr 7, 2024
7fef24e
Added block breaking effects
ClayWW Apr 7, 2024
1199ad5
preloaded the effects
ClayWW Apr 7, 2024
5a00eaf
Added the effects to the blocks breaking
ClayWW Apr 7, 2024
beb696e
Merge pull request #15 from UD-S24-CISC374/clay
ClayWW Apr 7, 2024
fde2952
Merge pull request #16 from UD-S24-CISC374/main
ACTrexler Apr 7, 2024
4e995a3
added post-level scene to continue playing
ACTrexler Apr 8, 2024
b285d9a
Merge pull request #17 from UD-S24-CISC374/alex
ACTrexler Apr 8, 2024
b037f9d
Added 3 x 3 grid working on adding a button to access it
Apr 8, 2024
dab726f
Merge pull request #18 from UD-S24-CISC374/murphyme44-menu
murphyme44 Apr 8, 2024
0ddace7
Added 3x3 mode and shuffle feature
Apr 9, 2024
a8be8e1
Merge pull request #19 from UD-S24-CISC374/murphyme44
murphyme44 Apr 9, 2024
203adb5
Merge pull request #20 from UD-S24-CISC374/main
ACTrexler Apr 9, 2024
5a545c9
added button image for 3x3 mode
ACTrexler Apr 9, 2024
5e56f45
Merge branch 'alex' of https://github.com/UD-S24-CISC374/final-projec…
ACTrexler Apr 9, 2024
31efcfe
added menu button for 3x3 mode
ACTrexler Apr 9, 2024
e7de467
fixed menu issue
ACTrexler Apr 9, 2024
0b7e315
Merge pull request #21 from UD-S24-CISC374/alex
ACTrexler Apr 9, 2024
1cac286
Merge pull request #22 from UD-S24-CISC374/main
ClayWW Apr 9, 2024
050a60c
Fixed 3x3 animations
Apr 9, 2024
b99c85c
Merge pull request #23 from UD-S24-CISC374/murphyme44-menu
murphyme44 Apr 9, 2024
1616997
working on even distribution of blocks (wip)
Apr 25, 2024
462aa59
block generation now follows the ideal ratio
ACTrexler Apr 29, 2024
4bd07d6
Merge pull request #24 from UD-S24-CISC374/murphyme44-menu
ACTrexler Apr 30, 2024
15ea854
started tutorial
Apr 30, 2024
9e3f84b
Merge pull request #25 from UD-S24-CISC374/main
ACTrexler Apr 30, 2024
9b14393
first couple steps of tutorial
Apr 30, 2024
19bdd24
more progress on tutorial moves to 5 x 5 gird (wip)
May 1, 2024
b38514a
Merge pull request #26 from UD-S24-CISC374/main
ClayWW May 2, 2024
accf608
added pause menu to both game modes
ACTrexler May 2, 2024
e4c1c19
Merge pull request #27 from UD-S24-CISC374/alex
ACTrexler May 2, 2024
56860ba
Merge pull request #28 from UD-S24-CISC374/main
ClayWW May 2, 2024
40099ef
added more to tutorial (5 x 5)
May 2, 2024
c8a359c
Merge pull request #29 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 2, 2024
dde11bc
updated pause menu with feedback and fixed bugs
ACTrexler May 2, 2024
6246a1e
Merge pull request #30 from UD-S24-CISC374/murphyme44-menu
ACTrexler May 2, 2024
7b87c86
Fixed row generation
ClayWW May 2, 2024
c91be58
Merge pull request #31 from UD-S24-CISC374/main
ClayWW May 2, 2024
eb057ff
merged tutorial with button changes
ACTrexler May 2, 2024
cb42958
Merge pull request #33 from UD-S24-CISC374/clay
ClayWW May 2, 2024
676dca7
Merge branch 'main' into alex
ACTrexler May 2, 2024
ed94f32
Merge pull request #32 from UD-S24-CISC374/alex
ACTrexler May 2, 2024
b236b24
fixed ability to move blocks while paused
ACTrexler May 2, 2024
126baa9
Fixed row and column generation bias
ClayWW May 2, 2024
9b8907b
Merge pull request #34 from UD-S24-CISC374/clay
ClayWW May 2, 2024
d45604c
Merge pull request #35 from UD-S24-CISC374/main
ACTrexler May 2, 2024
3ea468a
fixed block type distributions
ACTrexler May 3, 2024
bcecc88
fixed block breaking error and updated tutorial
ACTrexler May 7, 2024
945c541
Merge branch 'main' into alex
ACTrexler May 7, 2024
da79a08
Merge pull request #36 from UD-S24-CISC374/alex
ACTrexler May 7, 2024
3ff91a2
fixed merge issues
ACTrexler May 7, 2024
8725fbb
Merge pull request #37 from UD-S24-CISC374/alex
ACTrexler May 7, 2024
540a145
added animations to new block generation
ACTrexler May 7, 2024
6d51137
Merge pull request #38 from UD-S24-CISC374/alex
ACTrexler May 7, 2024
dc10cb7
adding tint when blocks are clicked on for 5x5 3x3
May 13, 2024
213964a
Merge pull request #39 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 13, 2024
333d05c
fixed possibly null variable issue for mouseclick variable previous b…
May 13, 2024
aa0ced6
Merge pull request #40 from UD-S24-CISC374/main
ACTrexler May 14, 2024
ef10044
Merge branch 'alex' of https://github.com/UD-S24-CISC374/final-projec…
ACTrexler May 14, 2024
5eea10f
updated readme template
ACTrexler May 14, 2024
06cfe73
Merge pull request #41 from UD-S24-CISC374/alex
ACTrexler May 14, 2024
7f5d9e2
Update README.md
ACTrexler May 14, 2024
0359101
added select tint to tutorial
May 14, 2024
9589735
Merge pull request #43 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 14, 2024
d9082df
added blurb and basic instructions
May 14, 2024
64c97b5
Merge pull request #44 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 14, 2024
fa3cd51
Update README.md
ACTrexler May 15, 2024
de4e329
Add files via upload
ACTrexler May 15, 2024
0fef851
Update README.md
ACTrexler May 15, 2024
97710dd
changed game icons
ACTrexler May 15, 2024
d65455a
updated package and manifest
ACTrexler May 15, 2024
53995a7
Update README.md
ACTrexler May 15, 2024
29ac689
Update README.md
ACTrexler May 15, 2024
a607d5f
Update README.md
ACTrexler May 15, 2024
5996983
Update egdd.md
ACTrexler May 15, 2024
fc3a809
Update README.md
ACTrexler May 15, 2024
f01d9c5
Update README.md
ACTrexler May 15, 2024
d56ddb0
Fixed video link
ClayWW May 15, 2024
92fcb89
modified tutorial so that it does not skip instructions
May 16, 2024
7649e4e
Merge pull request #45 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 16, 2024
7b71d29
Merge pull request #46 from UD-S24-CISC374/main
ACTrexler May 16, 2024
f276308
work in progress new 5x5 visuals
ACTrexler May 16, 2024
a06184b
added high score feature
May 16, 2024
3b4c0aa
Merge pull request #47 from UD-S24-CISC374/murphyme44-menu
murphyme44 May 16, 2024
ec51ce3
Merge pull request #48 from UD-S24-CISC374/main
ACTrexler May 16, 2024
38a7166
visual updates to background and number displays
ACTrexler May 17, 2024
36f2963
adjusted break animation coordinates for 3x3
ACTrexler May 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
Empty file added .github/.keep
Empty file.
2 changes: 0 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
# Runs on pushes targeting the default branch
push:
branches: [main]
pull_request:
branches: [main]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand Down
69 changes: 68 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,68 @@
REPLACE THIS WITH A DESCRIPTION OF YOUR GAME (in the README.md file).
# Boolean Bonanza

# Team Color

cyan

# Developers

- Alex Trexler ([email protected])
- Michael Murphy ([email protected])
- Clay Wilfong ([email protected])

# Blurb

Boolean Bonanza is a dynamic puzzle game where players are presented with a grid of squares labeled with boolean values and operators such as True, False, And, Or and Not. The goal of the game is to click and move these blocks throughout the rows and columns of the grid to craft a boolean statement that evaluates to True. After successfully making a row or column that evaluates to True, the row or column will be cleared from the grid and the player will add points to their score. Boolean Bonanza is designed to offer a fun way to learn boolean logic.

# Basic Instructions

Starting the Game

- Select one of the three options on the menu:
- Tutorial (An interactive walkthrough of the game)
- Play 3 x 3 (A game mode that presents a 3 x 3 grid of boolean blocks and operators)
- Play 5 x 5 (A game mode that presents a 5 x 5 grid of boolean blocks and operators)

Gameplay Instructions

- Interact with the grid by clicking on one of the blocks. (The block will be tinted indicating you have clicked on it)
- Click on another block to swap its position with your already selected block.
- Maneuver the blocks in this manner to make a row or column that demonstrates a boolean statement that evaluates to True such as:
- T AND T
- F OR T
- T AND T OR F

Scoring / Time

- After making a row or column that evaluates to True, the row or column will disappear and add points to the player's score.
- The player must make as many True boolean statements as they can before the time limit in the corner of the screen runs out and ends the game

# Screenshot

![screenshot](https://github.com/UD-S24-CISC374/final-project-cyan/blob/main/docs/large.png?raw=true)

# Gameplay Video

https://www.youtube.com/embed/qgengQMsyD0?si=A9qvKEe1d8bq5z-h

# Educational Game Design Document

Link to our [egdd](https://github.com/UD-S24-CISC374/final-project-cyan/blob/main/docs/egdd.md)

# Credits

Boolean block textures: Alex Trexler

Block break sound: Cork by Blender Foundation (submitted by Lamoot) https://opengameart.org/content/cork

Gameplay background music: Contemplation by Bart https://opengameart.org/content/contemplation

Button press sound: Cloud Click by Mobeyee Sounds https://mobeyee.com

Main menu music: Puzzle Menu by caret7 https://opengameart.org/content/puzzle-menu

Block Break Animations: AlotofImpacts - 5 Frame Impacts by JoesAlotofthings https://opengameart.org/users/joesalotofthings




Binary file added assets/audio/effects/click.mp3
Binary file not shown.
Binary file added assets/audio/effects/cork.mp3
Binary file not shown.
Binary file added assets/audio/music/contemplation.mp3
Binary file not shown.
Binary file added assets/audio/music/puzzlemenu.ogg
Binary file not shown.
Binary file added assets/backgrounds/3x3backplate.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/backgrounds/5x5backplate.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/blocks/And.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/blocks/False.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/blocks/Not.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/blocks/Or.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/blocks/True.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/effects/effects/ImpactMetal8DkBlue .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/effects/effects/ImpactMetal8Green .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/effects/effects/ImpactMetal8Purple .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/effects/effects/ImpactMetal8Red .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/effects/effects/ImpactMetal8Yellow .png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/effects/effects/PhysicalImpact01Red 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/effects/effects/PhysicalImpact01Red 3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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/effects/effects/blue.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/effects/effects/green.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/effects/effects/purple.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/effects/effects/red.png
Binary file added assets/effects/effects/yellow.png
Binary file modified assets/favicon.ico
Binary file not shown.
Binary file removed assets/img/phaser-logo.png
Diff not rendered.
Binary file added assets/menu/MainMenuButton.png
Binary file added assets/menu/PauseButton.png
Binary file added assets/menu/PlayAgainButton.png
Binary file added assets/menu/ResumeButton.png
Binary file added assets/menu/menuBackplate.png
Binary file added assets/menu/play3Button.png
Binary file added assets/menu/play5Button.png
Binary file added assets/menu/tutorialButton.png
Binary file added assets/tutorial/instruction1.png
Binary file added assets/tutorial/instruction2.png
Binary file added assets/tutorial/instruction3.png
Binary file added assets/tutorial/instruction4.png
Binary file added assets/tutorial/instruction5.png
8 changes: 8 additions & 0 deletions docs/credits.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Credits for Boolean Bonanza

Boolean block textures: Alex Trexler
Block break sound: Cork by Blender Foundation (submitted by Lamoot) https://opengameart.org/content/cork
Gameplay background music: Contemplation by Bart https://opengameart.org/content/contemplation
Button press sound: Cloud Click by Mobeyee Sounds https://mobeyee.com
Main menu music: Puzzle Menu by caret7 https://opengameart.org/content/puzzle-menu
Block Break Animations: AlotofImpacts - 5 Frame Impacts by JoesAlotofthings https://opengameart.org/users/joesalotofthings
194 changes: 193 additions & 1 deletion docs/egdd.md

Large diffs are not rendered by default.

Binary file added docs/large.png
Binary file added docs/small.png
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.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "final-project",
"version": "4.0.0",
"description": "Phaser 3 Final Project",
"homepage": "https://github.com/UD-S24-CISC374/final-project-template#readme",
"name": "Boolean Bonanza",
"version": "1.0.0",
"description": "Team Cyan Phaser 3 Final Project",
"homepage": "https://github.com/UD-S24-CISC374/final-project-cyan",
"main": "index.js",
"scripts": {
"start": "webpack serve --config webpack/webpack.dev.js",
Expand All @@ -24,12 +24,12 @@
"starter"
],
"author": {
"name": "Austin Cory Bart",
"name": "Alex Trexler, Michael Murphy, and Clay Wilfong",
"url": "https://github.com/acbart"
},
"repository": {
"type": "git",
"url": "https://github.com/UD-S24-CISC374/final-project-template.git"
"url": "https://github.com/UD-S24-CISC374/final-project-cyan"
},
"engines": {
"node": ">=12"
Expand Down
Binary file modified pwa/icons/icons-192.png
Binary file modified pwa/icons/icons-512.png
4 changes: 2 additions & 2 deletions pwa/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "Phaser Game",
"name": "My Cool Phaser 3 Game",
"short_name": "Boolean Bonanza",
"name": "Boolean Bonanza",
"icons": [
{
"src": "./icons/icons-192.png",
Expand Down
21 changes: 17 additions & 4 deletions src/config.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import Phaser from "phaser";
import MainScene from "./scenes/mainScene";
import PreloadScene from "./scenes/preloadScene";
import MenuScene from "./scenes/menuScene";
import FiveByFiveLevel from "./scenes/fiveByFiveLevel";
import PostLevelScene from "./scenes/postLevelScene";
import ThreeByThreeLevel from "./scenes/threeByThreeLevel";
import TutorialLevel from "./scenes/tutorial";
import AdvancedTutorial from "./scenes/advancedTutorial";

const DEFAULT_WIDTH = 1280;
const DEFAULT_HEIGHT = 720;

export const CONFIG = {
title: "My Untitled Phaser 3 Game",
version: "0.0.1",
title: "Boolean Bonanza",
version: "0.1.1",
type: Phaser.AUTO,
backgroundColor: "#ffffff",
scale: {
Expand All @@ -17,7 +22,15 @@ export const CONFIG = {
width: DEFAULT_WIDTH,
height: DEFAULT_HEIGHT,
},
scene: [PreloadScene, MainScene],
scene: [
PreloadScene,
MenuScene,
FiveByFiveLevel,
PostLevelScene,
ThreeByThreeLevel,
TutorialLevel,
AdvancedTutorial,
],
physics: {
default: "arcade",
arcade: {
Expand Down
Loading