Bläddra i källkod

renaming assets

lairaalmas 1 år sedan
förälder
incheckning
e8f470ec37
82 ändrade filer med 113 tillägg och 88 borttagningar
  1. 0 0
      src/assets/img/characters/balloon/ballon_basket.png
  2. 0 0
      src/assets/img/characters/balloon/balloon.png
  3. 0 0
      src/assets/img/characters/kid/lost.png
  4. 0 0
      src/assets/img/characters/kid/running.png
  5. 0 0
      src/assets/img/characters/kid/walking.png
  6. 0 0
      src/assets/img/characters/scale/scale_arm.png
  7. 0 0
      src/assets/img/characters/scale/scale_base.png
  8. 0 0
      src/assets/img/characters/scale/scale_plate.png
  9. 0 0
      src/assets/img/characters/tractor/tractor.png
  10. 0 0
      src/assets/img/flags/br.png
  11. 0 0
      src/assets/img/flags/fr.png
  12. 0 0
      src/assets/img/flags/it.png
  13. 0 0
      src/assets/img/flags/pe.png
  14. 0 0
      src/assets/img/flags/us.png
  15. 0 0
      src/assets/img/icons_interactive/answer_correct.png
  16. 0 0
      src/assets/img/icons_interactive/answer_wrong.png
  17. 0 0
      src/assets/img/icons_interactive/arrow_down.png
  18. 0 0
      src/assets/img/icons_interactive/btn.png
  19. 0 0
      src/assets/img/icons_interactive/btn_square.png
  20. 0 0
      src/assets/img/icons_interactive/close.png
  21. 0 0
      src/assets/img/icons_interactive/info.png
  22. 0 0
      src/assets/img/icons_interactive/pointer.png
  23. 0 0
      src/assets/img/icons_interactive/selection_box.png
  24. 0 0
      src/assets/img/icons_menu/circleOne.png
  25. 0 0
      src/assets/img/icons_menu/circleOne_1.png
  26. 0 0
      src/assets/img/icons_menu/circleOne_2.png
  27. 0 0
      src/assets/img/icons_menu/operation_equals.png
  28. 0 0
      src/assets/img/icons_menu/operation_minus.png
  29. 0 0
      src/assets/img/icons_menu/operation_mixed.png
  30. 0 0
      src/assets/img/icons_menu/operation_plus.png
  31. 0 0
      src/assets/img/icons_menu/scaleOne.png
  32. 0 0
      src/assets/img/icons_menu/scaleOne_1.png
  33. 0 0
      src/assets/img/icons_menu/squareOne.png
  34. 0 0
      src/assets/img/icons_menu/squareOne_1.png
  35. 0 0
      src/assets/img/icons_menu/squareOne_2.png
  36. 0 0
      src/assets/img/icons_menu/squareTwo.png
  37. 0 0
      src/assets/img/icons_menu/squareTwo_1.png
  38. 0 0
      src/assets/img/icons_menu/squareTwo_2.png
  39. 0 0
      src/assets/img/icons_navigation/audio.png
  40. 0 0
      src/assets/img/icons_navigation/back.png
  41. 0 0
      src/assets/img/icons_navigation/home.png
  42. 0 0
      src/assets/img/icons_navigation/language.png
  43. 0 0
      src/assets/img/icons_navigation/menu.png
  44. 0 0
      src/assets/img/icons_navigation/show_solution.png
  45. 0 0
      src/assets/img/scene/bg_default.jpg
  46. BIN
      src/assets/img/scene/bricks/brick_1.png
  47. BIN
      src/assets/img/scene/bricks/brick_10.png
  48. BIN
      src/assets/img/scene/bricks/brick_11.png
  49. BIN
      src/assets/img/scene/bricks/brick_12.png
  50. BIN
      src/assets/img/scene/bricks/brick_13.png
  51. BIN
      src/assets/img/scene/bricks/brick_14.png
  52. BIN
      src/assets/img/scene/bricks/brick_15.png
  53. BIN
      src/assets/img/scene/bricks/brick_16.png
  54. BIN
      src/assets/img/scene/bricks/brick_2.png
  55. BIN
      src/assets/img/scene/bricks/brick_3.png
  56. BIN
      src/assets/img/scene/bricks/brick_4.png
  57. BIN
      src/assets/img/scene/bricks/brick_5.png
  58. BIN
      src/assets/img/scene/bricks/brick_6.png
  59. BIN
      src/assets/img/scene/bricks/brick_7.png
  60. BIN
      src/assets/img/scene/bricks/brick_8.png
  61. BIN
      src/assets/img/scene/bricks/brick_9.png
  62. 0 0
      src/assets/img/scene/new_level/bg_snow.png
  63. 0 0
      src/assets/img/scene/new_level/floor_snow.png
  64. 0 0
      src/assets/img/scene/new_level/floor_stone.png
  65. 0 0
      src/assets/img/scene/new_level/floor_stone_left.png
  66. 0 0
      src/assets/img/scene/new_level/floor_stone_right.png
  67. 0 0
      src/assets/img/scene/new_level/stone_shelf.png
  68. 0 0
      src/assets/img/scene/new_level/wood_shelf.png
  69. 0 0
      src/assets/img/scene/sign_broken.png
  70. 0 0
      src/assets/img/scene/tree_1.png
  71. 0 0
      src/assets/img/scene/tree_2.png
  72. 0 0
      src/assets/img/scene/tree_3.png
  73. 0 0
      src/assets/img/scene/tree_4.png
  74. 12 4
      src/js/games/circleOne.js
  75. 1 1
      src/js/games/scaleOne.js
  76. 11 3
      src/js/games/squareOne.js
  77. 10 2
      src/js/games/squareTwo.js
  78. 1 1
      src/js/globals/globals_functions.js
  79. 74 73
      src/js/globals/globals_tokens.js
  80. 1 1
      src/js/menus/preMenu_name.js
  81. 1 1
      src/js/moodle/studentReport.js
  82. 2 2
      src/js/screens/map.js

src/assets/img/character/balloon/airballoon_base.png → src/assets/img/characters/balloon/ballon_basket.png


src/assets/img/character/balloon/airballoon_upper.png → src/assets/img/characters/balloon/balloon.png


src/assets/img/character/kid/lost.png → src/assets/img/characters/kid/lost.png


src/assets/img/character/kid/run.png → src/assets/img/characters/kid/running.png


src/assets/img/character/kid/walk.png → src/assets/img/characters/kid/walking.png


src/assets/img/character/scale/scale_top.png → src/assets/img/characters/scale/scale_arm.png


src/assets/img/character/scale/scale_base.png → src/assets/img/characters/scale/scale_base.png


src/assets/img/character/scale/scale_plate.png → src/assets/img/characters/scale/scale_plate.png


src/assets/img/character/tractor/tractor.png → src/assets/img/characters/tractor/tractor.png


src/assets/img/flag/br.png → src/assets/img/flags/br.png


src/assets/img/flag/fr.png → src/assets/img/flags/fr.png


src/assets/img/flag/it.png → src/assets/img/flags/it.png


src/assets/img/flag/pe.png → src/assets/img/flags/pe.png


src/assets/img/flag/us.png → src/assets/img/flags/us.png


src/assets/img/interac_icon/ok.png → src/assets/img/icons_interactive/answer_correct.png


src/assets/img/interac_icon/error.png → src/assets/img/icons_interactive/answer_wrong.png


src/assets/img/interac_icon/down.png → src/assets/img/icons_interactive/arrow_down.png


src/assets/img/interac_icon/button.png → src/assets/img/icons_interactive/btn.png


src/assets/img/interac_icon/button_square.png → src/assets/img/icons_interactive/btn_square.png


src/assets/img/interac_icon/close.png → src/assets/img/icons_interactive/close.png


src/assets/img/interac_icon/info.png → src/assets/img/icons_interactive/info.png


src/assets/img/interac_icon/pointer.png → src/assets/img/icons_interactive/pointer.png


src/assets/img/interac_icon/selection_box.png → src/assets/img/icons_interactive/selection_box.png


src/assets/img/levels/circleOne.png → src/assets/img/icons_menu/circleOne.png


src/assets/img/levels/circleOne_1.png → src/assets/img/icons_menu/circleOne_1.png


src/assets/img/levels/circleOne_2.png → src/assets/img/icons_menu/circleOne_2.png


src/assets/img/levels/operation_equals.png → src/assets/img/icons_menu/operation_equals.png


src/assets/img/levels/operation_minus.png → src/assets/img/icons_menu/operation_minus.png


src/assets/img/levels/operation_mixed.png → src/assets/img/icons_menu/operation_mixed.png


src/assets/img/levels/operation_plus.png → src/assets/img/icons_menu/operation_plus.png


src/assets/img/levels/scaleOne.png → src/assets/img/icons_menu/scaleOne.png


src/assets/img/levels/scaleOne_1.png → src/assets/img/icons_menu/scaleOne_1.png


src/assets/img/levels/squareOne.png → src/assets/img/icons_menu/squareOne.png


src/assets/img/levels/squareOne_1.png → src/assets/img/icons_menu/squareOne_1.png


src/assets/img/levels/squareOne_2.png → src/assets/img/icons_menu/squareOne_2.png


src/assets/img/levels/squareTwo.png → src/assets/img/icons_menu/squareTwo.png


src/assets/img/levels/squareTwo_1.png → src/assets/img/icons_menu/squareTwo_1.png


src/assets/img/levels/squareTwo_2.png → src/assets/img/icons_menu/squareTwo_2.png


src/assets/img/navig_icon/audio.png → src/assets/img/icons_navigation/audio.png


src/assets/img/navig_icon/back.png → src/assets/img/icons_navigation/back.png


src/assets/img/navig_icon/home.png → src/assets/img/icons_navigation/home.png


src/assets/img/navig_icon/language.png → src/assets/img/icons_navigation/language.png


src/assets/img/navig_icon/menu.png → src/assets/img/icons_navigation/menu.png


src/assets/img/navig_icon/help.png → src/assets/img/icons_navigation/show_solution.png


src/assets/img/scene/bg.jpg → src/assets/img/scene/bg_default.jpg


BIN
src/assets/img/scene/bricks/brick_1.png


BIN
src/assets/img/scene/bricks/brick_10.png


BIN
src/assets/img/scene/bricks/brick_11.png


BIN
src/assets/img/scene/bricks/brick_12.png


BIN
src/assets/img/scene/bricks/brick_13.png


BIN
src/assets/img/scene/bricks/brick_14.png


BIN
src/assets/img/scene/bricks/brick_15.png


BIN
src/assets/img/scene/bricks/brick_16.png


BIN
src/assets/img/scene/bricks/brick_2.png


BIN
src/assets/img/scene/bricks/brick_3.png


BIN
src/assets/img/scene/bricks/brick_4.png


BIN
src/assets/img/scene/bricks/brick_5.png


BIN
src/assets/img/scene/bricks/brick_6.png


BIN
src/assets/img/scene/bricks/brick_7.png


BIN
src/assets/img/scene/bricks/brick_8.png


BIN
src/assets/img/scene/bricks/brick_9.png


src/assets/img/scene/bg_snow.png → src/assets/img/scene/new_level/bg_snow.png


src/assets/img/scene/floor_snow.png → src/assets/img/scene/new_level/floor_snow.png


src/assets/img/scene/floor_stone.png → src/assets/img/scene/new_level/floor_stone.png


src/assets/img/scene/floor_stone_left.png → src/assets/img/scene/new_level/floor_stone_left.png


src/assets/img/scene/floor_stone_right.png → src/assets/img/scene/new_level/floor_stone_right.png


src/assets/img/scene/stone_shelf.png → src/assets/img/scene/new_level/stone_shelf.png


src/assets/img/scene/wood_shelf.png → src/assets/img/scene/new_level/wood_shelf.png


src/assets/img/scene/broken_sign.png → src/assets/img/scene/sign_broken.png


src/assets/img/scene/tree.png → src/assets/img/scene/tree_1.png


src/assets/img/scene/tree2.png → src/assets/img/scene/tree_2.png


src/assets/img/scene/tree3.png → src/assets/img/scene/tree_3.png


src/assets/img/scene/tree4.png → src/assets/img/scene/tree_4.png


+ 12 - 4
src/js/games/circleOne.js

@@ -317,7 +317,7 @@ const circleOne = {
     this.kid = game.add.sprite(
       startX,
       startY - 31 - this.circles.all.length * this.circles.diameter,
-      'kid_walk',
+      'kid_walking',
       0,
       1.2
     );
@@ -349,7 +349,7 @@ const circleOne = {
     this.basket.anchor(0.5, 0.5);
 
     // Help pointer
-    this.help = game.add.image(0, 0, 'help_pointer', 0.5);
+    this.help = game.add.image(0, 0, 'pointer', 0.5);
     this.help.anchor(0.5, 0);
     this.help.alpha = 0;
 
@@ -457,7 +457,11 @@ const circleOne = {
         self.kid.curFrame = self.kid.curFrame < 12 ? 24 : 25;
         if (audioStatus) game.audio.okSound.play();
         game.add
-          .image(context.canvas.width / 2, context.canvas.height / 2, 'ok')
+          .image(
+            context.canvas.width / 2,
+            context.canvas.height / 2,
+            'answer_correct'
+          )
           .anchor(0.5, 0.5);
         completedLevels++;
         if (isDebugMode) console.log('Completed Levels: ' + completedLevels);
@@ -465,7 +469,11 @@ const circleOne = {
         self.result = false; // Answer is incorrect
         if (audioStatus) game.audio.errorSound.play();
         game.add
-          .image(context.canvas.width / 2, context.canvas.height / 2, 'error')
+          .image(
+            context.canvas.width / 2,
+            context.canvas.height / 2,
+            'answer_wrong'
+          )
           .anchor(0.5, 0.5);
       }
 

+ 1 - 1
src/js/games/scaleOne.js

@@ -118,7 +118,7 @@ const scaleOne = {
       self.scale.top = game.add.image(
         self.control.scale.x0,
         self.control.scale.y0 - 170,
-        'scale_top',
+        'scale_arm',
         2
       );
       self.scale.top.rotate = self.control.scale.rotate;

+ 11 - 3
src/js/games/squareOne.js

@@ -151,7 +151,7 @@ const squareOne = {
     }
 
     // Help pointer
-    this.help = game.add.image(0, 0, 'help_pointer', 1.7);
+    this.help = game.add.image(0, 0, 'pointer', 1.7);
     this.help.anchor(0.5, 0);
     this.help.alpha = 0;
 
@@ -276,7 +276,11 @@ const squareOne = {
 
         // Displays feedback image and sound
         game.add
-          .image(context.canvas.width / 2, context.canvas.height / 2, 'ok')
+          .image(
+            context.canvas.width / 2,
+            context.canvas.height / 2,
+            'answer_correct'
+          )
           .anchor(0.5, 0.5);
         if (audioStatus) game.audio.okSound.play();
 
@@ -286,7 +290,11 @@ const squareOne = {
         // Incorrect answer
         // Displays feedback image and sound
         game.add
-          .image(context.canvas.width / 2, context.canvas.height / 2, 'error')
+          .image(
+            context.canvas.width / 2,
+            context.canvas.height / 2,
+            'answer_wrong'
+          )
           .anchor(0.5, 0.5);
         if (audioStatus) game.audio.errorSound.play();
       }

+ 10 - 2
src/js/games/squareTwo.js

@@ -366,7 +366,11 @@ const squareTwo = {
           if (audioStatus) game.audio.okSound.play();
 
           game.add
-            .image(context.canvas.width / 2, context.canvas.height / 2, 'ok')
+            .image(
+              context.canvas.width / 2,
+              context.canvas.height / 2,
+              'answer_correct'
+            )
             .anchor(0.5, 0.5);
           canGoToNextMapPosition = true; // Allow character to move to next level in map state
           completedLevels++;
@@ -377,7 +381,11 @@ const squareTwo = {
         } else {
           if (audioStatus) game.audio.errorSound.play();
           game.add
-            .image(context.canvas.width / 2, context.canvas.height / 2, 'error')
+            .image(
+              context.canvas.width / 2,
+              context.canvas.height / 2,
+              'answer_wrong'
+            )
             .anchor(0.5, 0.5);
           canGoToNextMapPosition = false; // Doesnt allow character to move to next level in map state
         }

+ 1 - 1
src/js/globals/globals_functions.js

@@ -331,7 +331,7 @@ const renderBackground = (type) => {
   }
 
   // Add background image
-  game.add.image(0, 0, 'bgimage', 2.2);
+  game.add.image(0, 0, 'bg_default', 2.2);
 
   // Add clouds
   game.add.image(640, 100, 'cloud', 1.5);

+ 74 - 73
src/js/globals/globals_tokens.js

@@ -13,8 +13,8 @@ const gameList = [
     // info
     gameShape: 'square',
     assets: {
-      gameNameBtn: 'game0',
-      gameModeBtn: ['mode0', 'mode1'],
+      gameNameBtn: 'game_0',
+      gameModeBtn: ['mode_0', 'mode_1'],
       gameOperationBtn: ['operation_plus', 'operation_minus'],
       mapCharacterAnimation: (operation) => {
         return operation === 'plus'
@@ -75,8 +75,8 @@ const gameList = [
     // info
     gameShape: 'circle',
     assets: {
-      gameNameBtn: 'game1',
-      gameModeBtn: ['mode2', 'mode3'],
+      gameNameBtn: 'game_1',
+      gameModeBtn: ['mode_2', 'mode_3'],
       gameOperationBtn: [
         'operation_plus',
         'operation_minus',
@@ -89,7 +89,7 @@ const gameList = [
         return game.add.sprite(
           self.points.x[curMapPosition],
           self.points.y[curMapPosition],
-          'kid_run',
+          'kid_running',
           0,
           0.6
         );
@@ -110,7 +110,7 @@ const gameList = [
         3,
       ],
       endCharacter: () => {
-        const char = game.add.sprite(0, -152, 'kid_run', 0, 0.7);
+        const char = game.add.sprite(0, -152, 'kid_running', 0, 0.7);
         char.anchor(0.5, 0.5);
         return char;
       },
@@ -125,8 +125,8 @@ const gameList = [
     // info
     gameShape: 'square',
     assets: {
-      gameNameBtn: 'game2',
-      gameModeBtn: ['mode4', 'mode5'],
+      gameNameBtn: 'game_2',
+      gameModeBtn: ['mode_4', 'mode_5'],
       gameOperationBtn: ['operation_equals'],
       mapCharacterAnimation: (operation) => {
         return ['kid', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10], 3];
@@ -135,7 +135,7 @@ const gameList = [
         return game.add.sprite(
           self.points.x[curMapPosition],
           self.points.y[curMapPosition],
-          'kid_run',
+          'kid_running',
           0,
           0.6
         );
@@ -156,7 +156,7 @@ const gameList = [
         3,
       ],
       endCharacter: () => {
-        const char = game.add.sprite(0, 460, 'kid_run', 6, 0.7);
+        const char = game.add.sprite(0, 460, 'kid_running', 6, 0.7);
         char.anchor(0.5, 0.5);
         return char;
       },
@@ -171,8 +171,8 @@ const gameList = [
     // info
     gameShape: 'noShape',
     assets: {
-      gameNameBtn: 'game3',
-      gameModeBtn: ['mode6'],
+      gameNameBtn: 'game_3',
+      gameModeBtn: ['mode_6'],
       gameOperationBtn: ['operation_equals'],
       mapCharacterAnimation: (operation) => {
         return operation === 'plus'
@@ -415,52 +415,53 @@ const url = {
      * audio: [ [name, [source, alternative source] ], ... ]
      */
     image: [
+      // scene new level
+      ['floor_stone_left', baseUrl + 'scene/new_level/floor_stone_left.png'],
+      ['floor_stone_right', baseUrl + 'scene/new_level/floor_stone_right.png'],
+      ['floor_stone', baseUrl + 'scene/new_level/floor_stone.png'],
+      ['wood_shelf', baseUrl + 'scene/new_level/wood_shelf.png'],
+      ['bg_snow', baseUrl + 'scene/new_level/bg_snow.png'],
       // Scene
-      ['bgimage', baseUrl + 'scene/bg.jpg'],
-      ['bg_snow', baseUrl + 'scene/bg_snow.png'],
-      ['bgmap', baseUrl + 'scene/bg_map.png'],
-      ['broken_sign', baseUrl + 'scene/broken_sign.png'],
+      ['bg_default', baseUrl + 'scene/bg_default.jpg'],
+      ['bg_map', baseUrl + 'scene/bg_map.png'],
       ['bush', baseUrl + 'scene/bush.png'],
       ['cloud', baseUrl + 'scene/cloud.png'],
-      ['floor_stone_left', baseUrl + 'scene/floor_stone_left.png'],
-      ['floor_stone_right', baseUrl + 'scene/floor_stone_right.png'],
-      ['floor_stone', baseUrl + 'scene/floor_stone.png'],
       ['floor', baseUrl + 'scene/floor.png'],
-      ['wood_shelf', baseUrl + 'scene/wood_shelf.png'],
       ['place_off', baseUrl + 'scene/place_off.png'],
       ['place_on', baseUrl + 'scene/place_on.png'],
       ['rock', baseUrl + 'scene/rock.png'],
       ['road', baseUrl + 'scene/road.png'],
       ['sign', baseUrl + 'scene/sign.png'],
-      ['tree1', baseUrl + 'scene/tree.png'],
-      ['tree2', baseUrl + 'scene/tree2.png'],
-      ['tree3', baseUrl + 'scene/tree3.png'],
-      ['tree4', baseUrl + 'scene/tree4.png'],
+      ['sign_broken', baseUrl + 'scene/sign_broken.png'],
+      ['tree_1', baseUrl + 'scene/tree_1.png'],
+      ['tree_2', baseUrl + 'scene/tree_2.png'],
+      ['tree_3', baseUrl + 'scene/tree_3.png'],
+      ['tree_4', baseUrl + 'scene/tree_4.png'],
       // Flags
-      ['flag_BR', baseUrl + 'flag/br.png'],
-      ['flag_FR', baseUrl + 'flag/fr.png'],
-      ['flag_IT', baseUrl + 'flag/it.png'],
-      ['flag_PE', baseUrl + 'flag/pe.png'],
-      ['flag_US', baseUrl + 'flag/us.png'],
+      ['flag_BR', baseUrl + 'flags/br.png'],
+      ['flag_FR', baseUrl + 'flags/fr.png'],
+      ['flag_IT', baseUrl + 'flags/it.png'],
+      ['flag_PE', baseUrl + 'flags/pe.png'],
+      ['flag_US', baseUrl + 'flags/us.png'],
       // Navigation icons on the top of the page
-      ['back', baseUrl + 'navig_icon/back.png'],
-      ['help', baseUrl + 'navig_icon/help.png'],
-      ['home', baseUrl + 'navig_icon/home.png'],
-      ['language', baseUrl + 'navig_icon/language.png'],
-      ['menu', baseUrl + 'navig_icon/menu.png'],
+      ['back', baseUrl + 'icons_navigation/back.png'],
+      ['show_solution', baseUrl + 'icons_navigation/show_solution.png'],
+      ['home', baseUrl + 'icons_navigation/home.png'],
+      ['language', baseUrl + 'icons_navigation/language.png'],
+      ['menu', baseUrl + 'icons_navigation/menu.png'],
       // Interactive icons
-      ['arrow_down', baseUrl + 'interac_icon/down.png'],
-      ['close', baseUrl + 'interac_icon/close.png'],
-      ['error', baseUrl + 'interac_icon/error.png'],
-      ['help_pointer', baseUrl + 'interac_icon/pointer.png'],
-      ['info', baseUrl + 'interac_icon/info.png'],
-      ['ok', baseUrl + 'interac_icon/ok.png'],
-      ['button', baseUrl + 'interac_icon/button.png'],
+      ['answer_correct', baseUrl + 'icons_interactive/answer_correct.png'],
+      ['answer_wrong', baseUrl + 'icons_interactive/answer_wrong.png'],
+      ['arrow_down', baseUrl + 'icons_interactive/arrow_down.png'],
+      ['btn', baseUrl + 'icons_interactive/btn.png'],
+      ['close', baseUrl + 'icons_interactive/close.png'],
+      ['info', baseUrl + 'icons_interactive/info.png'],
+      ['pointer', baseUrl + 'icons_interactive/pointer.png'],
       // Menu icons - Games
-      ['game0', baseUrl + 'levels/squareOne.png'], // Square I
-      ['game1', baseUrl + 'levels/circleOne.png'], // Circle I
-      ['game2', baseUrl + 'levels/squareTwo.png'], // Square II
-      ['game3', baseUrl + 'levels/scaleOne.png'], // Scale I
+      ['game_0', baseUrl + 'icons_menu/squareOne.png'], // Square I
+      ['game_1', baseUrl + 'icons_menu/circleOne.png'], // Circle I
+      ['game_2', baseUrl + 'icons_menu/squareTwo.png'], // Square II
+      ['game_3', baseUrl + 'icons_menu/scaleOne.png'], // Scale I
       // Menu icons - Info box
       ['c1-A', baseUrl + 'info_box/c1-A.png'],
       ['c1-A-h', baseUrl + 'info_box/c1-A-h.png'],
@@ -489,25 +490,25 @@ const url = {
     ],
     sprite: [
       // Game Sprites
-      ['kid_walk', baseUrl + 'character/kid/walk.png', 26],
+      ['kid_walking', baseUrl + 'characters/kid/walking.png', 26],
       // Navigation icons on the top of the page
-      ['audio', baseUrl + 'navig_icon/audio.png', 2],
+      ['audio', baseUrl + 'icons_navigation/audio.png', 2],
       // Interactive icons
-      ['select', baseUrl + 'interac_icon/selection_box.png', 2],
-      ['btn_square', baseUrl + 'interac_icon/button_square.png', 2],
+      ['select', baseUrl + 'icons_interactive/selection_box.png', 2],
+      ['btn_square', baseUrl + 'icons_interactive/btn_square.png', 2],
       // Menu icons - Game modes
-      ['mode0', baseUrl + 'levels/squareOne_1.png', 2], // Square I : A
-      ['mode1', baseUrl + 'levels/squareOne_2.png', 2], // Square I : B
-      ['mode2', baseUrl + 'levels/circleOne_1.png', 2], // Circle I : A
-      ['mode3', baseUrl + 'levels/circleOne_2.png', 2], // Circle I : B
-      ['mode4', baseUrl + 'levels/squareTwo_1.png', 2], // Square II : A
-      ['mode5', baseUrl + 'levels/squareTwo_2.png', 2], // Square II : B
-      ['mode6', baseUrl + 'levels/scaleOne_1.png', 2], // Scale I : A
+      ['mode_0', baseUrl + 'icons_menu/squareOne_1.png', 2], // Square I : A
+      ['mode_1', baseUrl + 'icons_menu/squareOne_2.png', 2], // Square I : B
+      ['mode_2', baseUrl + 'icons_menu/circleOne_1.png', 2], // Circle I : A
+      ['mode_3', baseUrl + 'icons_menu/circleOne_2.png', 2], // Circle I : B
+      ['mode_4', baseUrl + 'icons_menu/squareTwo_1.png', 2], // Square II : A
+      ['mode_5', baseUrl + 'icons_menu/squareTwo_2.png', 2], // Square II : B
+      ['mode_6', baseUrl + 'icons_menu/scaleOne_1.png', 2], // Scale I : A
       // Menu icons - Math operations
-      ['operation_plus', baseUrl + 'levels/operation_plus.png', 2], // Square/circle I : right
-      ['operation_minus', baseUrl + 'levels/operation_minus.png', 2], // Square/circle I : left
-      ['operation_mixed', baseUrl + 'levels/operation_mixed.png', 2], // Circle I : mixed
-      ['operation_equals', baseUrl + 'levels/operation_equals.png', 2], // Square II : equals
+      ['operation_plus', baseUrl + 'icons_menu/operation_plus.png', 2],
+      ['operation_minus', baseUrl + 'icons_menu/operation_minus.png', 2],
+      ['operation_mixed', baseUrl + 'icons_menu/operation_mixed.png', 2],
+      ['operation_equals', baseUrl + 'icons_menu/operation_equals.png', 2],
     ],
     audio: [
       // Sound effects
@@ -528,7 +529,7 @@ const url = {
     ],
     sprite: [
       // Game sprites
-      ['tractor', baseUrl + 'character/tractor/tractor.png', 15],
+      ['tractor', baseUrl + 'characters/tractor/tractor.png', 15],
     ],
     audio: [],
   },
@@ -540,8 +541,8 @@ const url = {
     ],
     sprite: [
       // Game sprites
-      ['kid_standing', baseUrl + 'character/kid/lost.png', 6],
-      ['kid_run', baseUrl + 'character/kid/run.png', 12],
+      ['kid_standing', baseUrl + 'characters/kid/lost.png', 6],
+      ['kid_running', baseUrl + 'characters/kid/running.png', 12],
     ],
     audio: [],
   },
@@ -551,12 +552,12 @@ const url = {
       ['house', baseUrl + 'scene/house.png'],
       ['school', baseUrl + 'scene/school.png'],
       // Game images
-      ['balloon', baseUrl + 'character/balloon/airballoon_upper.png'],
-      ['balloon_basket', baseUrl + 'character/balloon/airballoon_base.png'],
+      ['balloon', baseUrl + 'characters/balloon/balloon.png'],
+      ['balloon_basket', baseUrl + 'characters/balloon/balloon_basket.png'],
     ],
     sprite: [
       // Game sprites
-      ['kid_run', baseUrl + 'character/kid/run.png', 12],
+      ['kid_running', baseUrl + 'characters/kid/running.png', 12],
     ],
     audio: [],
   },
@@ -565,15 +566,15 @@ const url = {
       // Map buildings
       ['farm', baseUrl + 'scene/farm.png'],
       ['garage', baseUrl + 'scene/garage.png'],
-
-      ['scale_base', baseUrl + 'character/scale/scale_base.png'],
-      ['scale_top', baseUrl + 'character/scale/scale_top.png'],
-      ['scale_plate', baseUrl + 'character/scale/scale_plate.png'],
+      // Game images
+      ['scale_base', baseUrl + 'characters/scale/scale_base.png'],
+      ['scale_arm', baseUrl + 'characters/scale/scale_arm.png'],
+      ['scale_plate', baseUrl + 'characters/scale/scale_plate.png'],
     ],
     sprite: [
-      // Game sprites
-      ['tractor', baseUrl + 'character/tractor/tractor.png', 15],
-      ['floor_snow', baseUrl + 'scene/floor_snow.png', 9],
+      // Map buildings
+      ['tractor', baseUrl + 'characters/tractor/tractor.png', 15],
+      ['floor_snow', baseUrl + 'scene/new_level/floor_snow.png', 9],
     ],
     audio: [],
   },

+ 1 - 1
src/js/menus/preMenu_name.js

@@ -31,7 +31,7 @@ const nameState = {
     this.okBtn = game.add.image(
       context.canvas.width / 2,
       context.canvas.height / 2 + 93 + 44,
-      'button',
+      'btn',
       1.5
     );
     this.okBtn.anchor(0.5, 0.5);

+ 1 - 1
src/js/moodle/studentReport.js

@@ -69,7 +69,7 @@ const studentReport = {
         const sign = game.add.image(
           x,
           context.canvas.height - 100,
-          'broken_sign',
+          'sign_broken',
           0.7
         );
         sign.anchor(0.5, 0.5);

+ 2 - 2
src/js/screens/map.js

@@ -130,7 +130,7 @@ const mapState = {
     }
 
     // Map
-    game.add.image(wOffset, hOffset + 40, 'bgmap', 1.5);
+    game.add.image(wOffset, hOffset + 40, 'bg_map', 1.5);
 
     // Progress bar
     const percentText = completedLevels * 25;
@@ -201,7 +201,7 @@ const mapState = {
     // Trees
     for (let i in trees.type) {
       game.add
-        .image(trees.x[i], trees.y[i], 'tree' + trees.type[i], 0.9)
+        .image(trees.x[i], trees.y[i], 'tree_' + trees.type[i], 0.9)
         .anchor(0.5, 0.95);
     }