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

Update Speed and revive and faster loading

Browse Source
This commit is contained in:
bigJIU 2023-03-07 19:08:56 +08:00
parent b81f121665
commit 2878d4288d
31 changed files with 171 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
.idea/workspace.xml generated
View File

@ -3,11 +3,33 @@
<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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/IDManager.py" beforeDir="false" afterPath="$PROJECT_DIR$/IDManager.py" 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" 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.jar.js" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface.jar.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/reps/f_l_sav.rep" 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/Play.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/Play.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$/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/core/MarioRender.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioRender.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/core/MarioWorld.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/sprites/Mario.java" beforeDir="false" afterPath="$PROJECT_DIR$/Mario-AI-Interface/src/engine/sprites/Mario.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/annotation.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/annotation.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" /> <change beforePath="$PROJECT_DIR$/data/questionare.csv" beforeDir="false" afterPath="$PROJECT_DIR$/data/questionare.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-1.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-10.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-2.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-3.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-4.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-5.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-6.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-7.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-8.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/original/lvl-9.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t1.lvl" beforeDir="false" afterPath="$PROJECT_DIR$/levels/tt1.lvl" afterDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t2.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/levels/t3.lvl" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/main.py" beforeDir="false" afterPath="$PROJECT_DIR$/main.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GameAnnotation2.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GameAnnotation2.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/GamePlay.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/GamePlay.html" afterDir="false" />
</list> </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" />
@ -153,6 +175,21 @@
<option name="launchJavascriptDebuger" value="false" /> <option name="launchJavascriptDebuger" value="false" />
<method v="2" /> <method v="2" />
</configuration> </configuration>
<configuration name="Flask (main.py)" type="Python.FlaskServer" temporary="true" nameIsGenerated="true">
<module name="MarioWeb" />
<option name="target" value="$PROJECT_DIR$/main.py" />
<option name="targetType" value="PATH" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" />
<option name="SDK_HOME" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="IS_MODULE_SDK" value="true" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="launchJavascriptDebuger" value="false" />
<method v="2" />
</configuration>
<list> <list>
<item itemvalue="Flask server.Flask (main.py) (1)" /> <item itemvalue="Flask server.Flask (main.py) (1)" />
<item itemvalue="Flask server.Flask (main.py)" /> <item itemvalue="Flask server.Flask (main.py)" />
@ -215,7 +252,8 @@
<workItem from="1677572224495" duration="2432000" /> <workItem from="1677572224495" duration="2432000" />
<workItem from="1677595224096" duration="799000" /> <workItem from="1677595224096" duration="799000" />
<workItem from="1677674512203" duration="4789000" /> <workItem from="1677674512203" duration="4789000" />
<workItem from="1677840429576" duration="740000" /> <workItem from="1677840429576" duration="1147000" />
<workItem from="1678093963205" duration="3442000" />
</task> </task>
<servers /> <servers />
</component> </component>
@ -237,6 +275,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) (1) Coverage Results" MODIFIED="1677840512007" 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$Flask__main_py___1_.coverage" NAME="Flask (main.py) Coverage Results" MODIFIED="1678187086740" 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>

2
IDManager.py
View File

@ -8,7 +8,7 @@ class idManager():
gid = 0 gid = 0
timeMin = 1 timeMin = 1
tutorialMax = 3 tutorialMax = 10
ip_id = {} ip_id = {}
ip_dic = {} ip_dic = {}
ip_recent = {} ip_recent = {}

BIN
Mario-AI-Interface.jar
View File

Binary file not shown.

12
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.

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

@ -32,10 +32,7 @@ public class Play {
} }
public static boolean initialGame(){ public static boolean initialGame(){
game = new MarioGame(); game = new MarioGame();
String levelName = "t1"; game.renderGame();
String levelPath = String.format("/app/levels/%s.lvl", levelName); // For web
String repPath = String.format("/files/%s_sav.rep", levelName); // For web
game.playGame(new HumanAgent(true),getLevel(levelPath),0,repPath,10);
return true; return true;
} }

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

@ -112,7 +112,19 @@ public class MarioGame extends KeyAdapter{
* @return statistics about the current game * @return statistics about the current game
*/ */
public MarioResult runGame(MarioAgent agent, String level, int timer,int col) { public MarioResult runGame(MarioAgent agent, String level, int timer,int col) {
return this.runGame(agent, level, timer, 0, true, 0, 2, "",col); return this.runGame(agent, level, timer, 0, true, 50, 2, "",col);
}
public boolean renderGame(){
this.window = new JFrame("Mario AI Framework");
this.render = new MarioRender(2);
this.window.setContentPane(this.render);
this.window.pack();
this.window.setResizable(false);
this.window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
this.render.init();
this.window.setVisible(true);
return true;
} }
/** /**
@ -128,7 +140,7 @@ public class MarioGame extends KeyAdapter{
* @return statistics about the current game * @return statistics about the current game
*/ */
public MarioResult runGame(MarioAgent agent, String level, int timer, int marioState, boolean visuals, int fps, float scale, String resultPath, int col) { public MarioResult runGame(MarioAgent agent, String level, int timer, int marioState, boolean visuals, int fps, float scale, String resultPath, int col) {
if (visuals) { /* if (visuals) {
this.window = new JFrame("Mario AI Framework"); this.window = new JFrame("Mario AI Framework");
this.render = new MarioRender(scale); this.render = new MarioRender(scale);
this.window.setContentPane(this.render); this.window.setContentPane(this.render);
@ -137,7 +149,7 @@ public class MarioGame extends KeyAdapter{
this.window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.window.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
this.render.init(); this.render.init();
this.window.setVisible(true); this.window.setVisible(true);
} }*/
this.setAgent(agent); this.setAgent(agent);
return this.gameLoop(level, timer, marioState, visuals, fps, resultPath, col); return this.gameLoop(level, timer, marioState, visuals, fps, resultPath, col);
} }
@ -213,7 +225,7 @@ public class MarioGame extends KeyAdapter{
} }
if(world.deathBuffer >0){ if(world.deathBuffer >0){
actions = new boolean[6]; actions = new boolean[6];
world.deathBuffer -= 30; world.deathBuffer--;
}else{ }else{
world.deathBuffer = 0; world.deathBuffer = 0;
} }

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

@ -77,9 +77,9 @@ public class MarioRender extends JComponent implements FocusListener {
break; break;
} }
if (!renderOcuppied){ if (!renderOcuppied){
System.out.println(renderBuffer); //System.out.println(renderBuffer);
if(world.deathBuffer > 999){ if(world.deathBuffer > 999){
renderBuffer = 150; renderBuffer = 100;
} }
if(renderBuffer>0){ if(renderBuffer>0){
if((renderBuffer/10)%2 == 1){ if((renderBuffer/10)%2 == 1){

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

@ -230,13 +230,14 @@ public class MarioWorld {
int newTileY = (int) this.mario.y / 16; int newTileY = (int) this.mario.y / 16;
try { try {
l: while (true) { l: while (true) {
//System.out.println(newTileX);
for (int y = this.level.tileHeight - 2; y >= 8; y--) { for (int y = this.level.tileHeight - 2; y >= 8; y--) {
if (this.level.standable(newTileX, y)) { if (this.level.standable(newTileX, y)) {
newTileY = y; newTileY = y;
break l; break l;
} }
} }
newTileX--; newTileX++;
} }
} catch (ArrayIndexOutOfBoundsException e) { } catch (ArrayIndexOutOfBoundsException e) {
this.lose(); this.lose();
@ -245,7 +246,7 @@ public class MarioWorld {
this.mario.x = (float)(newTileX * 16.0 + 8); this.mario.x = (float)(newTileX * 16.0 + 8);
this.mario.y = (float)(newTileY * 16.0); this.mario.y = (float)(newTileY * 16.0);
//Death Buffer //Death Buffer
deathBuffer = 1000; deathBuffer = 50;
} }

9
Mario-AI-Interface/src/engine/sprites/Mario.java
View File

@ -403,17 +403,17 @@ public class Mario extends MarioSprite {
} else { } else {
this.isLarge = false; this.isLarge = false;
} }
invulnerableTime = 32; invulnerableTime = 75;
} else if (this.world != null) { } else if (this.world != null) {
if (this.world.lives <= 0) { if (this.world.lives <= 0) {
this.world.lose(); this.world.lose();
} else { } else {
world.deathBuffer = 1000; world.deathBuffer = 50;
xa = 0; xa = 0;
this.world.lives -= 1; this.world.lives -= 1;
this.world.deaths += 1; this.world.deaths += 1;
world.pauseTimer = 3 * POWERUP_TIME; world.pauseTimer = 3 * POWERUP_TIME;
invulnerableTime = 32; invulnerableTime = 75;
} }
} }
} }
@ -432,12 +432,11 @@ public class Mario extends MarioSprite {
} else if (invulnerableTime <= 0) { } else if (invulnerableTime <= 0) {
this.world.lives -= 1; this.world.lives -= 1;
this.world.deaths += 1; this.world.deaths += 1;
world.deathBuffer = 1000;
xa = 0; xa = 0;
world.pauseTimer = 3 * POWERUP_TIME; world.pauseTimer = 3 * POWERUP_TIME;
} }
} }
invulnerableTime = 72; invulnerableTime = 150;
} }
public void getFlower() { public void getFlower() {

BIN
__pycache__/IDManager.cpython-39.pyc
View File

Binary file not shown.

BIN
__pycache__/main.cpython-39.pyc
View File

Binary file not shown.

2
data/annotation.csv
View File

@ -33,3 +33,5 @@ IP,A-ID,B-ID,Anno
127.0.0.1,71,60,N 127.0.0.1,71,60,N
1,169,21,B, 1,169,21,B,
1,199,148,B, 1,199,148,B,
1,86,39,N,
1,72,172,N,

Can't render this file because it has a wrong number of fields in line 34.

17
data/questionare.csv
View File

@ -210,3 +210,20 @@ IP,Style,Frequency,Age,Gender
1,A,A,A,A,A,A,, 1,A,A,A,A,A,A,,
1,A,A,A,A,A,A,, 1,A,A,A,A,A,A,,
1,A,A,A,D,A,A,, 1,A,A,A,D,A,A,,
1,A,A,A,A,A,A,,
2,C,A,A,B,A,C,,
1,C,A,A,D,A,A,,
1,B,A,A,D,A,A,,
1,A,A,B,C,A,B,,
1,C,B,B,E,E,A,,
1,C,A,A,D,E,A,,
1,A,A,A,B,B,A,,
1,A,A,A,A,A,A,,
1,A,C,A,A,A,A,,
1,A,A,A,A,A,A,,
1,B,B,D,E,B,A,,
1,B,A,A,E,E,A,,
1,A,A,A,A,A,A,,
1,C,A,D,A,E,A,,
2,C,A,A,A,A,A,,
1,A,A,A,A,A,A,,

1 IP,Style,Frequency,Age,Gender
210 1,A,A,A,A,A,A,,
211 1,A,A,A,A,A,A,,
212 1,A,A,A,D,A,A,,
213 1,A,A,A,A,A,A,,
214 2,C,A,A,B,A,C,,
215 1,C,A,A,D,A,A,,
216 1,B,A,A,D,A,A,,
217 1,A,A,B,C,A,B,,
218 1,C,B,B,E,E,A,,
219 1,C,A,A,D,E,A,,
220 1,A,A,A,B,B,A,,
221 1,A,A,A,A,A,A,,
222 1,A,C,A,A,A,A,,
223 1,A,A,A,A,A,A,,
224 1,B,B,D,E,B,A,,
225 1,B,A,A,E,E,A,,
226 1,A,A,A,A,A,A,,
227 1,C,A,D,A,E,A,,
228 2,C,A,A,A,A,A,,
229 1,A,A,A,A,A,A,,

16
levels/original/lvl-1.lvl
View File

@ -1,16 +0,0 @@
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------g-----------------------------------------------------------------------------------------------------------------------
----------------------!---------------------------------------------------------SSSSSSSS---SSS!--------------@-----------SSS----S!!S--------------------------------------------------------##------------
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------###------------
-------------------------------------------------------------------------------g----------------------------------------------------------------------------------------------------------####------------
----------------------------------------------------------------1------------------------------------------------------------------------------------------------------------------------#####------------
----------------!---S@S!S---------------------tt---------tt------------------S@S--------------C-----SU----!--!--!-----S----------SS------#--#----------##--#------------SS!S------------######------------
--------------------------------------tt------tt---------tt-----------------------------------------------------------------------------##--##--------###--##--------------------------#######------------
----------------------------tt--------tt------tt---------tt----------------------------------------------------------------------------###--###------####--###-----tt--------------tt-########------------
---------------------g------tt--------tt-g----tt-----g-g-tt------------------------------------g-g--------k-----------------gg-g-g----####--####----#####--####----tt---------gg---tt#########--------#---
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

16
levels/original/lvl-2.lvl
View File

@ -1,16 +0,0 @@
--------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------
S-----SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSLSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS--------------------
S-----------------------------------------------------SS--SSSSSS--SSSS------SSSS------------------------------------------------------------------------------
S-----------------------------------------------------SS--SSSSSS--SSSS---g--SSSS------------------------------------------------------------------------------
S----------------------------------------oooo-------SS--------SS---S----SS----------oooooo--------------------------------------------------SSS---------------
S---------------------------------------------------SS--------SS---S----SS------------------------------------------------------------------------------------
S--------------------------------------S-SSSS-U-----SS--------SS---S----SS----------SSSSSS--------------------------------------------------------------------
S----------------------------C---------SoS--SoS-----SS----ooooSS---SoU--SC--g-g-----SSSSSS-------------------------------------------------------SSSSSSU------
S---------@QQQQ--------#-#-------------SSS--SSS-----SSSS--SSSSSS---SSS--SS--SSSS-----------------------------TT------------------------g##--------------------
S--------------------#-#-#-#---#----------------------SS-----------------------------------------------TT----TT-----------SS-----------###--------------------
S----------------g-#-#-#-#-#---#-#--------------------SS-----------------------------------------------TT----TT----TT-----SS---------g####--SSS---------------
S---------------g#-#-#-#-#-#-E-#-#--------kk----------------k--g-g------------------------------g-g-g--TT----TT--g-TT-----SS---------#####---------r----------
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XX--XXXXXXXXXXXX-------XXXXXXXX--XXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XX--XXXXXXXXXXXX-------XXXXXXXX--XXX

16
levels/original/lvl-3.lvl
View File

@ -1,16 +0,0 @@
------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------oo--------------------------------------------------------------------------------------------------------------------
---------------------------------------g-g------------------------------------------------------------------------------------------------------------
----------------------ooor---------%%%%%%%-------------oooo----------R------------------oo--oo--------------------------------------------------------
---------------------%%%%%----------|||||--------------%%%%----------------g----oo---------------------------R-----oo--------------------##-----------
----------------------|||-----------|||||----oo---SSSS--||-------------%%%%%%----------------------------r-------------------------------##-----------
----------------------|||-----------|||||---------------||--------------||||-----------------------%%%%%%%%----------------------------####-----------
----------------------|||-----%%%%%-|||||---------------||--------------||||-----SSS----------------||||||---------------------SSS-----####-----------
-------------------%%%%%%%%----|||--|||||---------------||-------%%%----||||-------------SSS--------||||||-----%%%%--%%%%------------######-----------
--------------------||||||-----|||--|||||-------------U-||--------|-----||||------------------------||||||------||----||-------------######-----------
--------------------||||||--o--|||--|||||---------------||--------|-----||||-----------------%%%%---||||||------||----||-------------######-----------
-------------%%%%---||||||-%%%-|||--|||||---------------||--------|-----||||------------------||----||||||--ooo-||----||---------r---######--------#--
XXXXXXXXXXX---||----||||||--|--|||--|||||----%%%%-----%%%%%-%%%%%-|-----||||------------------||----||||||--%%%-||----||----XXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXXXXXX---||----||||||--|--|||--|||||-----||-------|||---|||--|-----||||------------------||----||||||---|--||----||----XXXXXXXXXXXXXXXXXXXXXXXXXX

32
levels/t1.lvl
View File

@ -1,16 +1,16 @@
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------SSSS-SSS-----------------------SSSSSSSSSSSSSSSSSS----------------SSSSSSSSSSSSSSSS----------------S--SSSSSS------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
----------o-----t-------------------------------------------------------------------SSSS--S----------------------SSSSSSSSSSSSSSS-------------------------------- ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
%--------S------t--------------------------------------------------------------------SS--SSS--------------------SSSSSSSSSSSSSSS--------------------------------- ----------------------------------------------------------------------------------g-----------------------------------------------------------------------------------------------------------------------
|------------------------------o----------SSSSSS--------------------Q--------------S------SS-------------------o------S----KSSS---------------@%--S------------- ----------------------!---------------------------------------------------------SSSSSSSS---SSS!--------------@-----------SSS----S!!S--------------------------------------------------------##------------
|-----------------------------------------SSSSS------oo----------------------------------------------%---------------------SS------------------|---------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------###------------
|--------------------------------------SSSSSSSS-%----%%%%%-%%--------------------------SS------------|-----------------------------------------|-----#---------- -------------------------------------------------------------------------------g----------------------------------------------------------------------------------------------------------####------------
|--------o------------------------S--SS--SSSSS--|-----|||--||--------------------------r-------S-----|------------SSo-ooo---oSSS---------------|----##---------- ----------------------------------------------------------------1------------------------------------------------------------------------------------------------------------------------#####------------
|------------------------------S----SSSSSSSSSSS-|-----|||--||-------------------%%%%%%%%%%------QQQ--|-QQ----------SSS%--%%%%%%%---#-----------|---####--##-##-# ----------------!---S@S!S---------------------tt---------tt------------------S@S--------------C-----SU----!--!--!-----S----------SS------#--#----------##--#------------SS!S------------######------------
|------------------------------t--------S-------|-T---|||--||----------------#---||||||||----#-------|----------------|---|||||----#-----------|--#####--##----# --------------------------------------tt------tt---------tt-----------------------------------------------------------------------------##--##--------###--##--------------------------#######------------
|--------------------------tt--t-------SSS%%-SS-|-TT--|||--||----------------#--S|||||||S----#-------tt---------S-----|--S||||S----#-----------|-######--##----# ----------------------------tt--------tt------tt---------tt----------------------------------------------------------------------------###--###------####--###-----tt--------------tt-########------------
|--------k-------g---------tt-kt----------||----|-TT--|||--||----kkg-------###---|||||||---------g---tt------ggg------|---||||-----#-#---------|#######--##----# ---------------------g------tt--------tt-g----tt-----g-g-tt------------------------------------g-g--------k-----------------gg-g-g----####--####----#####--####----tt---------gg---tt#########--------#---
XX-------XXXXXXXXXXXXXXXXXXXXXXXS--%------%%----|XXXX-|||--||---XXXXXXXXXXXXXXXX%|%%%%%%%-------XXXXXXXXXXXXXXXX-%%%%%%%%%%%||--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
XX-------XXXXXXXXXXXXXXXXXXXXXXX---|------||----|XXXX-|||--||---XXXXXXXXXXXXXXXXg|-|||||--------XXXXXXXXXXXXXXXXg-|||||||||-||--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

0
levels/original/lvl-10.lvl → levels/t10.lvl
View File

32
levels/t2.lvl
View File

@ -1,16 +1,16 @@
---------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------------------------------2-----------------------------------------------2-------------------- --------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------S---------------------------SSS------------- S-----SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSLSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS--------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- S-----------------------------------------------------SS--SSSSSS--SSSS------SSSS------------------------------------------------------------------------------
-----------------------------------------------U---------------------------------------------------------------------------------------------------------------U S-----------------------------------------------------SS--SSSSSS--SSSS---g--SSSS------------------------------------------------------------------------------
------------------SQ---@SSSS---S--QQQ-SSSQQ----Lo----o-----oo-2%----------------QSQS@QSSSSS@--@%-------@---------------#--------oo---U---ooo--@%--------SSSSSSSS S----------------------------------------oooo-------SS--------SS---S----SS----------oooooo--------------------------------------------------SSS---------------
---------------y---------------------------------------------K-|-------------------------------|-----------------------#-----------------------|---------------- S---------------------------------------------------SS--------SS---S----SS------------------------------------------------------------------------------------
---------------#--------------------------------S----#---------|------#------------------------|----------------SS----##--S--------------SSS---|%--------------- S--------------------------------------S-SSSS-U-----SS--------SS---S----SS----------SSSSSS--------------------------------------------------------------------
-------------###-----------------------------1-------#---------|------#------------------------|---------------------###------------#----------||--------------- S----------------------------C---------SoS--SoS-----SS----ooooSS---SoU--SC--g-g-----SSSSSS-------------------------------------------------------SSSSSSU------
------------####--2------------S---QQ-----QQ-#-----###----S-o--S---#--#--------------------QQQQQ--2-----------------####--S--------#------SSQ--||--------------- S---------@QQQQ--------#-#-------------SSS--SSS-----SSSS--SSSSSS---SSS--SS--SSSS-----------------------------TT------------------------g##--------------------
---#-------#####----------------------------##------##------------##--#--------------------------------------------#####-----------#-----------||--------------- S--------------------#-#-#-#---#----------------------SS-----------------------------------------------TT----TT-----------SS-----------###--------------------
---#------######-----------B---------------###---#--##-----------####-#---------%%------B------------------B------######---------#-#-#---------||-----B-----%--- S----------------g-#-#-#-#-#---#-#--------------------SS-----------------------------------------------TT----TT----TT-----SS---------g####--SSS---------------
---#-----#######K----------b--g-------K-K-####--#---##-------ggg-######---------gg---K--b-ggg-g-K----------b--#--#######---------#-###-------gg||-----b-----|-k- S---------------g#-#-#-#-#-#-E-#-#--------kk----------------k--g-g------------------------------g-g-g--TT----TT--g-TT-----SS---------#####---------r----------
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXX--XXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX----XX-XXXXXXXXXX---@XQXXXXXXXXXX--XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XX--XXXXXXXXXXXX-------XXXXXXXX--XXX
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXX-XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXX----XX-XXXXXXXXXX---XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX---XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX--XX--XXXXXXXXXXXX-------XXXXXXXX--XXX

32
levels/t3.lvl
View File

@ -1,16 +1,16 @@
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------
---------------------------------------------------------------------------------------------------------------------------------------------------------------- ------------------------------------------------------------------------------------------------------------------------------------------------------
------------------------------------------------SS----------SS-S--------------------S--------------------------------------------------------------------------- --------------------------------oo--------------------------------------------------------------------------------------------------------------------
-------------------------------------------------------------------g-------------------------------------------------------------------------------g------------ ---------------------------------------g-g------------------------------------------------------------------------------------------------------------
------------------------------------------------------------------##----------------------------------------------------------K--------------------------------- ----------------------ooor---------%%%%%%%-------------oooo----------R------------------oo--oo--------------------------------------------------------
S----------oo-2S------SSoSSS--@%----------------%------------------------------------------oo-2%----1-SSoSS@--@%--oo------S------------------------------------- ---------------------%%%%%----------|||||--------------%%%%----------------g----oo---------------------------R-----oo--------------------##-----------
-------------------------------|----------------|---------o----------------------S----#------K-|---------------|-------------------------oo-------------ooo----- ----------------------|||-----------|||||----oo---SSSS--||-------------%%%%%%----------------------------r-------------------------------##-----------
SS----------------------S------|----------------|----------------------SSS------SSS--##--SSS---|---------------|------------------------------------------------ ----------------------|||-----------|||||---------------||--------------||||-----------------------%%%%%%%%----------------------------####-----------
-------------------------------|----------------|-------------oo--1-----SSSS--##----###--------|---------------|-----------------------------------------S------ ----------------------|||-----%%%%%-|||||---------------||--------------||||-----SSS----------------||||||---------------------SSS-----####-----------
----#-#--U------------SSSS----Q|-------TT-------|-TT----------SS--S-----------##--#####--------|------SQQS--@QQQ--------------Q-------------------------------#- -------------------%%%%%%%%----|||--|||||---------------||-------%%%----||||-------------SSS--------||||||-----%%%%--%%%%------------######-----------
----#-#------------------------|-------TT-------|-TT---TT--------------------###--#####--------|-------------------#---#-------------------tt-------tt-------##- --------------------||||||-----|||--|||||-------------U-||--------|-----||||------------------------||||||------||----||-------------######-----------
----#-#------------------------|-------TT-------|-TT---TT-------------------###########--------|%%-----------------#---#-------------------tt-------tt------###- --------------------||||||--o--|||--|||||---------------||--------|-----||||-----------------%%%%---||||||------||----||-------------######-----------
#---#-#-----ggggK----------g--k|-------TT----k--|-TT---TT---------K--------############--------|gggggg-gggggggg--#-#-#-#----K----gg--------tt---K---tt-----####- -------------%%%%---||||||-%%%-|||--|||||---------------||--------|-----||||------------------||----||||||--ooo-||----||---------r---######--------#--
XXXXXXX------QQQ-----XXXXXXXXXX|XXXXXX-XXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX----XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXX-XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX---||----||||||--|--|||--|||||----%%%%-----%%%%%-%%%%%-|-----||||------------------||----||||||--%%%-||----||----XXXXXXXXXXXXXXXXXXXXXXXXXX
XXXXXXX-----XXXX-----XXXXXXXXXX|XXXXXX-XXXXXXXXXXXXXX--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX----XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-XXXXX-XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX---||----||||||--|--|||--|||||-----||-------|||---|||--|-----||||------------------||----||||||---|--||----||----XXXXXXXXXXXXXXXXXXXXXXXXXX

0
levels/original/lvl-4.lvl → levels/t4.lvl
View File

0
levels/original/lvl-5.lvl → levels/t5.lvl
View File

0
levels/original/lvl-6.lvl → levels/t6.lvl
View File

0
levels/original/lvl-7.lvl → levels/t7.lvl
View File

0
levels/original/lvl-8.lvl → levels/t8.lvl
View File

0
levels/original/lvl-9.lvl → levels/t9.lvl
View File

16
levels/tt1.lvl Normal file
View File

@ -0,0 +1,16 @@
----------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------
----------------------------------------------------------------------------------------------------------------------------------------------------------------
-----------------------------------------------SSSS-SSS-----------------------SSSSSSSSSSSSSSSSSS----------------SSSSSSSSSSSSSSSS----------------S--SSSSSS-------
----------o-----t-------------------------------------------------------------------SSSS--S----------------------SSSSSSSSSSSSSSS--------------------------------
%--------S------t--------------------------------------------------------------------SS--SSS--------------------SSSSSSSSSSSSSSS---------------------------------
|------------------------------o----------SSSSSS--------------------Q--------------S------SS-------------------o------S----KSSS---------------@%--S-------------
|-----------------------------------------SSSSS------oo----------------------------------------------%---------------------SS------------------|----------------
|--------------------------------------SSSSSSSS-%----%%%%%-%%--------------------------SS------------|-----------------------------------------|-----#----------
|--------o------------------------S--SS--SSSSS--|-----|||--||--------------------------r-------S-----|------------SSo-ooo---oSSS---------------|----##----------
|------------------------------S----SSSSSSSSSSS-|-----|||--||-------------------%%%%%%%%%%------QQQ--|-QQ----------SSS%--%%%%%%%---#-----------|---####--##-##-#
|------------------------------t--------S-------|-T---|||--||----------------#---||||||||----#-------|----------------|---|||||----#-----------|--#####--##----#
|--------------------------tt--t-------SSS%%-SS-|-TT--|||--||----------------#--S|||||||S----#-------tt---------S-----|--S||||S----#-----------|-######--##----#
|--------k-------g---------tt-kt----------||----|-TT--|||--||----kkg-------###---|||||||---------g---tt------ggg------|---||||-----#-#---------|#######--##----#
XX-------XXXXXXXXXXXXXXXXXXXXXXXS--%------%%----|XXXX-|||--||---XXXXXXXXXXXXXXXX%|%%%%%%%-------XXXXXXXXXXXXXXXX-%%%%%%%%%%%||--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X
XX-------XXXXXXXXXXXXXXXXXXXXXXX---|------||----|XXXX-|||--||---XXXXXXXXXXXXXXXXg|-|||||--------XXXXXXXXXXXXXXXXg-|||||||||-||--XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-X

6
main.py
View File

@ -46,7 +46,7 @@ def gamepreplay():
""]) ""])
idm.setControl(cid, result.get("control")) idm.setControl(cid, result.get("control"))
print(result.get("gamestyle")) print(result.get("gamestyle"))
return redirect(url_for('gametutorial', id=cid)) return redirect(url_for('gameplay', id=cid))
# debug use: # debug use:
# return redirect(url_for('gameanno2', id=cid)) # return redirect(url_for('gameanno2', id=cid))
@ -162,8 +162,10 @@ def gameanno2(id):
@app.route('/annotation2/<id>/result', methods=['POST']) @app.route('/annotation2/<id>/result', methods=['POST'])
def gameannoresult2(id): def gameannoresult2(id):
if request.method == 'POST': if request.method == 'POST':
print("result! " + id) print("result: " + id)
resultList = list(request.form)[0].split(",") resultList = list(request.form)[0].split(",")
print(resultList)
levelList = idm.getRecent(idm.getId(request.remote_addr)) levelList = idm.getRecent(idm.getId(request.remote_addr))
print(resultList) print(resultList)

6
templates/GameAnnotation2.html
View File

@ -367,11 +367,11 @@
console.log(slist) console.log(slist)
result = [] result = []
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
if (slist[i] === '3fx') { if (slist[i] === '359') {
result[i] = "c" result[i] = "c"
} else if (slist[i] === '3fy') { } else if (slist[i] === '35a') {
result[i] = "k" result[i] = "k"
} else if (slist[i] === '3fz') { } else if (slist[i] === '35b') {
result[i] = "r" result[i] = "r"
} else { } else {
console.log("you have change the name, dont you?") console.log("you have change the name, dont you?")

10
templates/GamePlay.html
View File

@ -212,12 +212,12 @@
var control = ("{{control}}" == "1") var control = ("{{control}}" == "1")
GameLoad().then(function () { GameLoad().then(function () {
console.log("Cheerpj Initialize Succeed!"); console.log("GameLoad Initialize Succeed!");
document.getElementById("loading").style.visibility = 'hidden'; document.getElementById("loading").style.visibility = 'hidden';
}) }).then(function (){
for (i = 0; i < levelNum - 1; i++) { for (i = 0; i < levelNum - 1; i++) {
console.log("Play level: %s", levels[i]) console.log("Play level: %s", levels[i])
PlayLevel(levels[i], control) PlayLevel(levels[i], control)
.then(function () { alert("Game Over!") }) .then(function () { alert("Game Over!") })
@ -233,6 +233,10 @@
alert("Please proceed to answer some questions about the levels you just played!") alert("Please proceed to answer some questions about the levels you just played!")
window.location.href = "{{jump}}" window.location.href = "{{jump}}"
}); });
})
</script> </script>