diff --git a/README_IMAGE/1.PNG b/README_IMAGE/1.PNG new file mode 100644 index 0000000000000000000000000000000000000000..8606150d036a315ae5bcba60b651ae3468125a5c Binary files /dev/null and b/README_IMAGE/1.PNG differ diff --git a/README_IMAGE/10.PNG b/README_IMAGE/10.PNG new file mode 100644 index 0000000000000000000000000000000000000000..7572b93cb9d6ab19dcaf14ac6d3500e8bbd3d064 Binary files /dev/null and b/README_IMAGE/10.PNG differ diff --git a/README_IMAGE/11.PNG b/README_IMAGE/11.PNG new file mode 100644 index 0000000000000000000000000000000000000000..dd72f3534e15b11514bde7704ba5efe02206af16 Binary files /dev/null and b/README_IMAGE/11.PNG differ diff --git a/README_IMAGE/12.PNG b/README_IMAGE/12.PNG new file mode 100644 index 0000000000000000000000000000000000000000..7aa897428c5f4685941c98337eb2bc0f06c8b416 Binary files /dev/null and b/README_IMAGE/12.PNG differ diff --git a/README_IMAGE/13.PNG b/README_IMAGE/13.PNG new file mode 100644 index 0000000000000000000000000000000000000000..1cef0ef73d5ddd0f0a76c129a570d13f10989402 Binary files /dev/null and b/README_IMAGE/13.PNG differ diff --git a/README_IMAGE/14.PNG b/README_IMAGE/14.PNG new file mode 100644 index 0000000000000000000000000000000000000000..9a9342f719ba790e2e218cd7498eaa23408dd3f0 Binary files /dev/null and b/README_IMAGE/14.PNG differ diff --git a/README_IMAGE/15.PNG b/README_IMAGE/15.PNG new file mode 100644 index 0000000000000000000000000000000000000000..d4444cba1c99675767f2b4196f3d5b85c5c9819d Binary files /dev/null and b/README_IMAGE/15.PNG differ diff --git a/README_IMAGE/2.PNG b/README_IMAGE/2.PNG new file mode 100644 index 0000000000000000000000000000000000000000..cd72d0291f9512fbbc4d79e9770cdbf59f202c91 Binary files /dev/null and b/README_IMAGE/2.PNG differ diff --git a/README_IMAGE/3.PNG b/README_IMAGE/3.PNG new file mode 100644 index 0000000000000000000000000000000000000000..ecb7152311f799be3025f3070fe165c4f050d72c Binary files /dev/null and b/README_IMAGE/3.PNG differ diff --git a/README_IMAGE/4.PNG b/README_IMAGE/4.PNG new file mode 100644 index 0000000000000000000000000000000000000000..077802cb5ddda0d50bc4a24f02f322004dff6f6a Binary files /dev/null and b/README_IMAGE/4.PNG differ diff --git a/README_IMAGE/5.PNG b/README_IMAGE/5.PNG new file mode 100644 index 0000000000000000000000000000000000000000..33d04b4b65e48ff5b380eaa0c0a74c4fbc6b23e4 Binary files /dev/null and b/README_IMAGE/5.PNG differ diff --git a/README_IMAGE/6.PNG b/README_IMAGE/6.PNG new file mode 100644 index 0000000000000000000000000000000000000000..253ec9d3c9a478fc772c9238deaa59b1470c6600 Binary files /dev/null and b/README_IMAGE/6.PNG differ diff --git a/README_IMAGE/7.PNG b/README_IMAGE/7.PNG new file mode 100644 index 0000000000000000000000000000000000000000..47f86855428797e666df33faf8ceada1aab255a7 Binary files /dev/null and b/README_IMAGE/7.PNG differ diff --git a/README_IMAGE/8.PNG b/README_IMAGE/8.PNG new file mode 100644 index 0000000000000000000000000000000000000000..fc8c3ae840bf20d69051247abb7e227faf005620 Binary files /dev/null and b/README_IMAGE/8.PNG differ diff --git a/README_IMAGE/9.PNG b/README_IMAGE/9.PNG new file mode 100644 index 0000000000000000000000000000000000000000..73f7a5d6656ea87e558e3f75c7dc48e86ce463b5 Binary files /dev/null and b/README_IMAGE/9.PNG differ diff --git a/out/artifacts/bagel_jar/bagel.jar b/out/artifacts/bagel_jar/bagel.jar index 7ce0f3913a18c311801a003e0464086e1dc83121..cc3f1f15591a1351c96740c2d06e06d1475e2b38 100644 Binary files a/out/artifacts/bagel_jar/bagel.jar and b/out/artifacts/bagel_jar/bagel.jar differ diff --git a/res/ActorExtensionPack/Level/MonsterParty.csv b/res/ActorExtensionPack/Level/MonsterParty.csv index 04bf6ed6921e16f309fe924f3c56c556382dd3dd..bbd80006ad6a5f8ab35c8fb8b50c76e3de969dc6 100644 --- a/res/ActorExtensionPack/Level/MonsterParty.csv +++ b/res/ActorExtensionPack/Level/MonsterParty.csv @@ -23,16 +23,16 @@ SignUp,1,5 Chest,1,1 Witch,2,8,2,5 Skull,3,3,0,5 -Spider,2,6,1,2,2 +Spider,2,6,1,0,2 SignUp,1,10 -Spider,1,9,1,0,5 +Spider,1,9,1,0,3 Portal,10,5,5,7 Portal,5,7,10,5 Skeleton,5,4,1,4 SignDown,8,4 Skeleton,11,8,0,6 Skeleton,11,1,2,7 -Spider,12,7,3,2,2 +Spider,12,7,3,2,3 Spider,14,3,3,2,4 Skeleton,10,3,1,4 Skeleton,2,9,1,4 diff --git a/src/Level/Level.java b/src/Level/Level.java index 59a2e7d302cda0866b55c7cd68c829a9344f52c4..a6a7abdfd2d36153d377a58b923cb9c54ed5f5f9 100644 --- a/src/Level/Level.java +++ b/src/Level/Level.java @@ -50,6 +50,7 @@ public class Level { private final int extraActorY = 4; private final int extraInfo0 = 3; private final int extraInfo1 = 4; + private final int extraInfo2 = 5; //refreshRate public static final int STEP_REFRESH = 63; @@ -480,7 +481,6 @@ public class Level { checkInt(actorInfo[actorY], filename, lineNum) * TILED_LENGTH); //add attribute - int extraInfo2 = 2; add(new Spider(spawnPoint, checkInt(actorInfo[extraInfo0], filename, lineNum), checkInt(actorInfo[extraInfo1], filename, lineNum), checkInt(actorInfo[extraInfo2], filename, lineNum))); } diff --git a/src/actor/Skeleton.java b/src/actor/Skeleton.java index 6e988b15ece4a9904803d8e1e93b15b83f88c9a4..599b9c9b3359dfadb2320041f11e61031743f140 100644 --- a/src/actor/Skeleton.java +++ b/src/actor/Skeleton.java @@ -8,13 +8,13 @@ import myUtil.Vec2D; public class Skeleton extends Actor { //state private static final int IDLE_VERTICAL = 0; - private static final int WALK_VERTICAL = 2; private static final int IDLE_HORIZON = 1; + private static final int WALK_VERTICAL = 2; private static final int WALK_HORIZON = 3; private static final int IDLE_VERTICAL_LEFT = 4; - private static final int WALK_VERTICAL_LEFT = 5; - private static final int IDLE_HORIZON_LEFT = 6; + private static final int IDLE_HORIZON_LEFT = 5; + private static final int WALK_VERTICAL_LEFT = 6; private static final int WALK_HORIZON_LEFT = 7; private static final int LAYER = 2;