baiyanlali/MarioWeb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/BigJIU/MarioWeb

Browse Source
This commit is contained in:
Doveliyuchen 2023-03-07 20:55:50 +08:00
commit bca819085c
8 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml generated
View File

@ -2,14 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioGame.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/Assets.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/helper/Assets.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameTutorial.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameTutorial.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -233,7 +226,7 @@
<workItem from="1677595224096" duration="799000" />
<workItem from="1677674512203" duration="4789000" />
<workItem from="1677840429576" duration="1147000" />
<workItem from="1678093963205" duration="6636000" />
<workItem from="1678093963205" duration="7404000" />
</task>
<servers />
</component>
@ -255,6 +248,6 @@
<SUITE FILE_PATH="coverage/MarioWeb$MarioWeb.coverage" NAME="MarioWeb Coverage Results" MODIFIED="1669305478201" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="" />
<SUITE FILE_PATH="coverage/MarioWeb$test.coverage" NAME="test Coverage Results" MODIFIED="1668079935841" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1677224605926" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1678190392807" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
<SUITE FILE_PATH="coverage/MarioWeb$Flask__main_py___1_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1678190791781" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" />
</component>
</project>

BIN
Mario-AI-Interface.jar
View File

Binary file not shown.

22
Mario-AI-Interface.jar.js
View File

File diff suppressed because one or more lines are too long

BIN
Mario-AI-Interface/reps/f_l_sav.rep
View File

Binary file not shown.

1
Mario-AI-Interface/src/Play.java
View File

@ -25,7 +25,6 @@ public class Play {
//FIXME: Debug Use
//playGameMain("lvl1");
// initialGame();
// playJavaGame();
System.out.println("Java: Play Java Main Function Done");

4
Mario-AI-Interface/src/engine/core/MarioGame.java
View File

@ -203,12 +203,12 @@ public class MarioGame extends KeyAdapter{
}
// Mid Break & Cheat Mode
if(actions[0]&&!actions[1]&&actions[2]&&actions[3]&&actions[4]&&actions[5]){
this.world.lose();
this.world.debug();
cheatBreak = true;
//break;
}
if(!actions[0]&&actions[1]&&actions[2]&&actions[3]&&actions[4]&&actions[5]){
this.world.lose();
this.world.debug();
replayBreak = true;
//break;
}

6
Mario-AI-Interface/src/engine/core/MarioWorld.java
View File

@ -218,6 +218,12 @@ public class MarioWorld {
this.mario.alive = false;
}
public void debug(){
this.addEvent(EventType.LOSE, 0);
this.gameStatus = GameStatus.DEBUG;
this.mario.alive = false;
}
public void timeout() {
System.out.println("Java: Time out");
this.addEvent(EventType.LOSE, 0);

3
Mario-AI-Interface/src/engine/helper/GameStatus.java
View File

@ -4,5 +4,6 @@ public enum GameStatus {
RUNNING,
WIN,
LOSE,
TIME_OUT
TIME_OUT,
DEBUG
}