Skip to content

Detached6 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hannan813 wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Detached6 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2a0bbd3
git commit --amend
itzabedoya Sep 26, 2024
d50289e
we tried to add the player mario
hannanhirsi Oct 22, 2024
260effd
we tried to add the player mario
hannanhirsi Nov 5, 2024
cde0378
we tried to add the player mario
hannanhirsi Nov 11, 2024
72cb640
we tried to add the player mario
hannanhirsi Nov 14, 2024
54fd6d7
end of year project
hannanhirsi Nov 17, 2024
001e0c2
end of year project
hannanhirsi Nov 17, 2024
4f9cee8
end of year project
hannanhirsi Nov 28, 2024
98c0f8e
end of year project
hannanhirsi Nov 30, 2024
f7bce3c
end of year project
hannanhirsi Nov 30, 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
152 changes: 152 additions & 0 deletions exportToHTML/edu/sdccd/cisc190/EndOfYearProject.java.html
View file
Open in desktop

Large diffs are not rendered by default.

43 changes: 43 additions & 0 deletions exportToHTML/edu/sdccd/cisc190/main.java.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<html>
<head>
<title>main.java</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style type="text/css">
.s0 { color: #cf8e6d;}
.s1 { color: #bcbec4;}
.s2 { color: #bcbec4;}
.s3 { color: #6aab73;}
</style>
</head>
<body bgcolor="#1e1f22">
<table CELLSPACING=0 CELLPADDING=5 COLS=1 WIDTH="100%" BGCOLOR="#606060" >
<tr><td><center>
<font face="Arial, Helvetica" color="#000000">
main.java</font>
</center></td></tr></table>
<pre><span class="s0">package </span><span class="s1">edu</span><span class="s2">.</span><span class="s1">sdccd</span><span class="s2">.</span><span class="s1">cisc190</span><span class="s2">;</span>

<span class="s0">import </span><span class="s1">javax</span><span class="s2">.</span><span class="s1">swing</span><span class="s2">.</span><span class="s1">JFrame</span><span class="s2">;</span>

<span class="s0">public class </span><span class="s1">main </span><span class="s2">{</span>
<span class="s0">public static void </span><span class="s1">main</span><span class="s2">(</span><span class="s1">String</span><span class="s2">[] </span><span class="s1">args</span><span class="s2">) {</span>
<span class="s1">JFrame window </span><span class="s2">= </span><span class="s0">new </span><span class="s1">JFrame</span><span class="s2">();</span>
<span class="s1">window</span><span class="s2">.</span><span class="s1">setDefaultCloseOperation</span><span class="s2">(</span><span class="s1">JFrame</span><span class="s2">.</span><span class="s1">EXIT_ON_CLOSE</span><span class="s2">);</span>
<span class="s1">window</span><span class="s2">.</span><span class="s1">setResizable</span><span class="s2">(</span><span class="s0">false</span><span class="s2">);</span>
<span class="s1">window</span><span class="s2">.</span><span class="s1">setTitle</span><span class="s2">(</span><span class="s3">&quot;2D Adventure&quot;</span><span class="s2">);</span>

<span class="s1">GamePanel gamePanel </span><span class="s2">= </span><span class="s0">new </span><span class="s1">GamePanel</span><span class="s2">();</span>
<span class="s1">window</span><span class="s2">.</span><span class="s1">add</span><span class="s2">(</span><span class="s1">gamePanel</span><span class="s2">);</span>

<span class="s1">window</span><span class="s2">.</span><span class="s1">pack</span><span class="s2">();</span>

<span class="s1">window</span><span class="s2">.</span><span class="s1">setLocationRelativeTo</span><span class="s2">(</span><span class="s0">null</span><span class="s2">);</span>
<span class="s1">window</span><span class="s2">.</span><span class="s1">setVisible</span><span class="s2">(</span><span class="s0">true</span><span class="s2">);</span>

<span class="s1">gamePanel</span><span class="s2">.</span><span class="s1">startGameThread</span><span class="s2">();</span>
<span class="s2">}</span>
<span class="s2">}</span>

</pre>
</body>
</html>
122 changes: 18 additions & 104 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>edu.sdccd.cisc190</groupId>
<artifactId>FinalProject</artifactId>
<version>1.0.0</version>

<properties>
<!-- Project Globals -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<!-- Java Version -->
<compile.java.version>21</compile.java.version>

<!-- Dependency Versions -->
<javafx.version>21.0.5</javafx.version>
<jupiter.version>5.11.0</jupiter.version>
<javafx.version>22.0.2</javafx.version>

<!-- Plugin Versions -->
<javafx-maven-plugin.version>0.0.8</javafx-maven-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-site-plugin.version>3.20.0</maven-site-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
</properties>

<dependencies>
<!-- JavaFX Dependencies -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-base</artifactId>
Expand All @@ -44,6 +32,7 @@
<version>${javafx.version}</version>
</dependency>

<!-- JUnit for Testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
Expand All @@ -54,14 +43,24 @@

<build>
<plugins>
<!-- JavaFX Maven Plugin -->
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
<version>${javafx-maven-plugin.version}</version>
<version>0.0.8</version>
<configuration>
<mainClass>edu.sdccd.cisc190.Main</mainClass>
<options>
<!-- JavaFX modules -->
<option>--module-path</option>
<option>${java.home}/lib/modules</option>
<option>--add-modules</option>
<option>javafx.controls,javafx.graphics</option>
</options>
</configuration>
</plugin>

<!-- Compiler Plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
Expand All @@ -71,91 +70,6 @@
<target>${compile.java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<reuseForks>false</reuseForks>
<forkCount>1</forkCount>
<workingDirectory>target</workingDirectory>
</configuration>
</plugin>
<!-- Add source to jar manifest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>${maven-source-plugin.version}</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${maven-javadoc-plugin.version}</version>
<configuration>
<quiet>true</quiet>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Add versioning to jar manifest -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>${maven-jar-plugin.version}</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</plugin>
<!-- Skip site plugin http://veithen.blogspot.com/2013/05/maven-patterns-skipping-site-generation.html -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>${maven-site-plugin.version}</version>
<executions>
<execution>
<id>default-site</id>
<phase>site</phase>
<goals>
<goal>site</goal>
</goals>
<configuration>
<skip>true</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

<!-- Distribute to internal repo -->
<distributionManagement>
<repository>
<id>cisc191</id>
<name>CISC191 Maven Repo</name>
<url>https://maven.pkg.github.com/MiramarCISC/CISC191-TEMPLATE</url>
</repository>
</distributionManagement>
</project>
</project>
Binary file added resources/goombas.png
View file
Open in desktop
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 resources/mario.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 17 additions & 0 deletions src/main/java/edu/sdccd/cisc190/Coin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package edu.sdccd.cisc190;

public class Coin {
private int x, y;

public Coin(int x, int y) {
this.x = x;
this.y = y;
}

public void collect(Player player) {
// Check if player collides with the coin
}

public int getX() { return x; }
public int getY() { return y; }
}
16 changes: 16 additions & 0 deletions src/main/java/edu/sdccd/cisc190/CongratulationsScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package edu.sdccd.cisc190;

import javafx.scene.layout.Pane;
import javafx.scene.text.Text;

public class CongratulationsScreen {

public Pane createCongratsScreen() {
Pane congratsPane = new Pane();
Text congratsText = new Text(300, 200, "Congratulations, you finished the game!");
congratsText.setStyle("-fx-font-size: 30px;");
congratsPane.getChildren().add(congratsText);
return congratsPane;
}
}

40 changes: 40 additions & 0 deletions src/main/java/edu/sdccd/cisc190/EndOfYearProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package edu.sdccd.cisc190;

import javafx.application.Application;
import javafx.scene.Scene;
import javafx.scene.Group;
import javafx.scene.canvas.Canvas;
import javafx.stage.Stage;

public class EndOfYearProject extends Application {
private Game game;

public static void main(String[] args) {
int m = 100; // Example starting coordinates
int n = 50;
int L = 20; // Example scale factor

Player player = new Player(m, n, L); // Pass m, n, and L to the Player constructor
// Now the player object can use m, n, and L
launch(args);
}

public static String getAppName() {
return "EndOfYearProject";
}

@Override
public void start(Stage primaryStage) {
Canvas canvas = new Canvas(800, 500);
Group root = new Group(canvas);
Scene scene = new Scene(root);

game = new Game(canvas); // Initialize the game
game.setupInput(scene); // Set up input handlers
game.startGameLoop(); // Start the game loop

primaryStage.setTitle("End of Year Project");
primaryStage.setScene(scene);
primaryStage.show();
}
}
38 changes: 38 additions & 0 deletions src/main/java/edu/sdccd/cisc190/Enemy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package edu.sdccd.cisc190;

import javafx.scene.canvas.GraphicsContext;
import javafx.scene.paint.Color;

public class Enemy {
private int x, y;
private boolean movingRight;
private static final int SPEED = 4;

public Enemy(int index) {
this.x = (index % 2 == 0) ? 300 : 500;
this.y = 100 + index * 40;
this.movingRight = index % 2 == 0;
}

public void update() {
if (movingRight) x += SPEED;
else x -= SPEED;

// Reverse direction if hitting boundary
if (x < 100 || x > 700) movingRight = !movingRight;
}

public void render(GraphicsContext gc) {
gc.setFill(Color.BROWN); // the coding for the goombas so this is where the image wouldgo
gc.fillOval(x, y, 20, 20);
}

public int getX() {
return x;
}

public int getY() {
return y;
}
}

Loading