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

Update debug info

Browse Source
This commit is contained in:
bigJIU 2023-03-07 20:50:56 +08:00
parent 551013c736
commit 4b7513a30a
8 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/workspace.xml generated
View File

@ -1,16 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c32bfd4e-6189-47f3-9d6c-c1825d3d7e5f" name="Changes" comment=""> <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="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@ -233,7 +224,7 @@
<workItem from="1677595224096" duration="799000" /> <workItem from="1677595224096" duration="799000" />
<workItem from="1677674512203" duration="4789000" /> <workItem from="1677674512203" duration="4789000" />
<workItem from="1677840429576" duration="1147000" /> <workItem from="1677840429576" duration="1147000" />
<workItem from="1678093963205" duration="6636000" /> <workItem from="1678093963205" duration="7404000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -255,6 +246,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$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$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_.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> </component>
</project> </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.

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

@ -25,7 +25,6 @@ public class Play {
//FIXME: Debug Use //FIXME: Debug Use
//playGameMain("lvl1"); //playGameMain("lvl1");
// initialGame(); // initialGame();
// playJavaGame(); // playJavaGame();
System.out.println("Java: Play Java Main Function Done"); System.out.println("Java: Play Java Main Function Done");
@ -34,8 +33,9 @@ public class Play {
game = new MarioGame(); game = new MarioGame();
String levelName = "t1"; String levelName = "t1";
String levelPath = String.format("/app/levels/%s.lvl", levelName); // For web String levelPath = String.format("/app/levels/%s.lvl", levelName); // For web
String repPath = String.format("/files/%s_sav.rep", levelName); // For web String repPath = String.format("/files/lvl1_sav.rep"); // For web
game.playGame(new HumanAgent(true),getLevel(levelPath),0,repPath,10); //game.playGame(new HumanAgent(true),getLevel(levelPath),0,repPath,10);
game.playGame(Replay.getRepAgentFromFile(repPath),getLevel(levelPath), 10, repPath,10);
return true; return true;
} }

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

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

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

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

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

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