Merge remote-tracking branch 'github/master'

dist/shattered_sword_assets/jsons/level1endstory.json

@@ -2,7 +2,7 @@
     "texts": [
         {
             "speaker": "",
-            "content": "Hiro collected one more piece of sword!",
+            "content": "Hiro collected one more sword shard!",
             "actions": [
                 {
                     "type": "loadSprite",
@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "Congrats! You can choose buff to gain from completing this level!",
+            "content": "Congrats! You can choose a buff to gain from completing this level!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level1story.json

@@ -44,7 +44,7 @@
         },
         {
             "speaker": "",
-            "content": "Press Z or space to jump, double-click to double-jump",
+            "content": "Press Z or space to jump, you can jump an extra time while in the air",
             "actions": [
                 {
                     "type": "hideSprite",
@@ -113,7 +113,7 @@
         },
         {
             "speaker": "",
-            "content": "Use the number key to select buff.",
+            "content": "Use the number keys to select buffs.",
             "actions": [
                 {
                     "type": "hideSprite",
@@ -186,6 +186,25 @@
                 }
             ]
         },
+        {
+            "speaker": "",
+            "content": "Snakes can fall from the sky at any moment, and apply poison when they hit you.",
+            "actions": [
+                {
+                    "type": "loadSprite",
+                    "key": "enemies",
+                    "path": "shattered_sword_assets/images/forest_story1.png",
+                    "positon": [
+                        300,
+                        150
+                    ],
+                    "scale": [
+                        3,
+                        3
+                    ]
+                }
+            ]
+        },
         {
             "speaker": "",
             "content": "Besides the enemies, watch out for the gaps.",

dist/shattered_sword_assets/jsons/level2endstory.json

@@ -2,7 +2,7 @@
     "texts": [
         {
             "speaker": "",
-            "content": "Hiro collected one more piece of sword!",
+            "content": "Hiro collected one more sword shard!",
             "actions": [
                 {
                     "type": "loadSprite",
@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "Congrats! You can choose buff to gain from completing this level!",
+            "content": "Congrats! You can choose a buff to gain from completing this level!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level3endstory.json

@@ -2,7 +2,7 @@
     "texts": [
         {
             "speaker": "",
-            "content": "Hiro collected one more piece of sword!",
+            "content": "Hiro collected one more sword shard!",
             "actions": [
                 {
                     "type": "loadSprite",
@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "Congrats! You can choose buff to gain from completing this level!",
+            "content": "Congrats! You can choose a buff to gain from completing this level!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level3story.json

@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "There're bulls and slimes in the great wall. Hint: the bull will dash when attack.",
+            "content": "There're bulls and slimes on the great wall. Hint: The bulls like to charge at you!.",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level4endstory.json

@@ -2,7 +2,7 @@
     "texts": [
         {
             "speaker": "",
-            "content": "Hiro collected one more piece of sword!",
+            "content": "Hiro collected one more sword piece!",
             "actions": [
                 {
                     "type": "loadSprite",
@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "Congrats! You can choose buff to gain from completing this level!",
+            "content": "Congrats! You can choose a buff to gain from completing this level!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level4story.json

@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "We're now in a snow mountain. There're archers and slimes in the mountain.",
+            "content": "We're now in a snow mountain. There're archers and slimes on the mountain.",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level5endstory.json

@@ -2,7 +2,7 @@
     "texts": [
         {
             "speaker": "",
-            "content": "Hiro collected one more piece of sword!",
+            "content": "Hiro collected one more sword piece!",
             "actions": [
                 {
                     "type": "loadSprite",
@@ -44,7 +44,7 @@
         },
         {
             "speaker": "",
-            "content": "You can choose buff to gain from completing this level!",
+            "content": "You can choose a buff to gain from completing this level!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/jsons/level5story.json

@@ -21,7 +21,7 @@
         },
         {
             "speaker": "",
-            "content": "Hiro is now in a multi-level store. There're monsters and slimes in the store.",
+            "content": "Hiro is now in a multi-level store. There're monsters in the store.",
             "actions": [
                 {
                     "type": "hideSprite",
@@ -44,7 +44,7 @@
         },
         {
             "speaker": "",
-            "content": "Hint: the monster camouflaged into walls!",
+            "content": "Hint: The monsters camouflage into the walls and can teleport to you!",
             "actions": [
                 {
                     "type": "hideSprite",

dist/shattered_sword_assets/spritesheets/Assassin.json

@@ -3,7 +3,7 @@
    "spriteSheetImage": "Assassin.png",
    "spriteWidth": 64,
    "spriteHeight": 64,
-    "columns": 13,
+   "columns": 16,
    "rows": 1,
    "durationType": "time",
    "animations": [
@@ -116,6 +116,28 @@
                "duration": 20
             }
          ]
+      },
+      {
+         "name": "WALK",
+         "repeat": true,
+         "frames": [
+            {
+               "index": 13,
+               "duration": 15
+            },
+            {
+               "index": 14,
+               "duration": 15
+            },
+            {
+               "index": 13,
+               "duration": 15
+            },
+            {
+               "index": 15,
+               "duration": 15
+            }
+         ]
       }
     ]
  }