From 083891eef107d93209bceb14fa4c13d2fa6fdaa8 Mon Sep 17 00:00:00 2001 From: Harmony Monroe Date: Wed, 16 Dec 2020 13:09:49 -0500 Subject: [PATCH] new filestructure --- .gitignore | 2 +- Image/box.json | 75 ---------- Image/explode.json | 91 ------------ Image/explode2.json | 59 -------- Image/player.json | 136 ------------------ Image/portal.json | 59 -------- Script/AutoLoad/HUD.gd | 74 ---------- Script/AutoLoad/Pause.gd | 5 - .../3d/DefaultMaterial.material | Bin .../3d/Material.material | Bin crt.fbx => assets/3d/crt.fbx | Bin mac_classic.fbx => assets/3d/mac_classic.fbx | Bin .../SFX => assets/audio/sfx}/Randomize7.wav | Bin {Audio/SFX => assets/audio/sfx}/box_drop.wav | Bin .../SFX => assets/audio/sfx}/box_pickup.wav | Bin {Audio/SFX => assets/audio/sfx}/box_throw.wav | Bin .../audio/sfx}/box_throw_long.wav | Bin {Audio/SFX => assets/audio/sfx}/btn3.wav | Bin {Audio/SFX => assets/audio/sfx}/button.wav | Bin {Audio/SFX => assets/audio/sfx}/hit0.wav | Bin {Audio/SFX => assets/audio/sfx}/hit1.wav | Bin {Audio/SFX => assets/audio/sfx}/hit10.wav | Bin {Audio/SFX => assets/audio/sfx}/hit14.wav | Bin {Audio/SFX => assets/audio/sfx}/hit6.wav | Bin {Audio/SFX => assets/audio/sfx}/hit9.wav | Bin {Audio/SFX => assets/audio/sfx}/jump1.wav | Bin .../SFX => assets/audio/sfx}/player_die.wav | Bin .../SFX => assets/audio/sfx}/player_jump.wav | Bin {Audio/SFX => assets/audio/sfx}/portal2.wav | Bin {Audio/SFX => assets/audio/sfx}/sfx10.wav | Bin {Audio/SFX => assets/audio/sfx}/sfx4.wav | Bin {Audio/SFX => assets/audio/sfx}/sfx5.wav | Bin {Font => assets/font}/m3x6.tres | 2 +- {Font => assets/font}/m3x6.ttf | Bin {Image => assets/image}/9slice.png | Bin {Image => assets/image}/box.png | Bin {Image => assets/image}/bricks.png | Bin crate.png => assets/image/crate.png | Bin {Image => assets/image}/crate_tiles.png | Bin {Image => assets/image}/door.png | Bin {Image => assets/image}/explode.png | Bin {Image => assets/image}/explode2.png | Bin {Image => assets/image}/pixel.png | Bin {Image => assets/image}/player.png | Bin {Image => assets/image}/portal.png | Bin {Image => assets/image}/solid_bricks.png | Bin {Image => assets/image}/star.png | Bin {Image => assets/image}/timer.png | Bin {Image => assets/image}/tread.png | Bin project.godot | 30 ++-- {Scene => src/3d}/MonitorScene.tscn | 9 +- {Script/Actor => src/actor}/Actor.gd | 0 {Script/Actor => src/actor}/Box.gd | 0 {Scene/Actor => src/actor}/Box.tscn | 13 +- {Script/Actor => src/actor}/Door.gd | 0 {Scene/Actor => src/actor}/Door.tscn | 9 +- {Script/Actor => src/actor}/Exit.gd | 0 {Scene/Actor => src/actor}/Exit.tscn | 13 +- {Script => src/actor}/ExitStar.gd | 0 {Script/Actor => src/actor}/Passthrough.gd | 0 {Scene/Actor => src/actor}/Passthrough.tscn | 9 +- {Script/Actor => src/actor}/Player.gd | 6 +- {Scene/Actor => src/actor}/Player.tscn | 15 +- {Scene/Actor => src/actor}/Spike.tscn | 6 +- {Script/Actor => src/actor}/Switch.gd | 0 {Scene/Actor => src/actor}/Switch.tscn | 9 +- {Script/Actor => src/actor}/SwitchBlock.gd | 0 {Scene/Actor => src/actor}/SwitchBlock.tscn | 6 +- .../Actor => src/actor}/SwitchBlockBlue.tscn | 3 +- {Scene/Actor => src/actor}/SwitchBlue.tscn | 3 +- {Script/Actor => src/actor}/Treadmill.gd | 0 {Scene/Actor => src/actor}/Treadmill.tscn | 9 +- .../AutoLoad => src/autoload}/DevConsole.gd | 0 .../AutoLoad => src/autoload}/DevConsole.tscn | 6 +- src/autoload/HUD.gd | 32 +++++ {Scene/AutoLoad => src/autoload}/HUD.tscn | 9 +- src/autoload/Pause.gd | 50 +++++++ {Scene/AutoLoad => src/autoload}/Pause.tscn | 8 +- {Script/AutoLoad => src/autoload}/Shared.gd | 0 {Script/AutoLoad => src/autoload}/btn.gd | 0 {Script => src/fx}/Explosion.gd | 0 {Scene => src/fx}/Explosion.tscn | 10 +- {Script => src/fx}/Explosion2.gd | 0 {Scene => src/fx}/Explosion2.tscn | 10 +- {Map => src/map}/1-1.tscn | 17 ++- {Map => src/map}/1-2.tscn | 17 ++- {Map => src/map}/1-3.tscn | 19 +-- {Map => src/map}/1-4.tscn | 19 +-- {Map => src/map}/1-5.tscn | 19 +-- {Map => src/map}/1-6.tscn | 19 +-- {Map => src/map}/1-7.tscn | 19 +-- {Map => src/map}/map_jump_test.tscn | 17 ++- {Map => src/map}/map_switch.tscn | 27 ++-- {Map => src/map}/map_tread.tscn | 19 +-- {Map => src/map}/world.tscn | 17 ++- {Script => src/menu}/MapSelect.gd | 11 +- {Scene => src/menu}/select.tscn | 4 +- {Shader => src/shader}/scrollx.shader | 0 {Scene/Stage => src/stage}/DetailTileMap.tscn | 5 +- {Script/Stage => src/stage}/GameCamera.gd | 0 {Scene/Stage => src/stage}/GameCamera.tscn | 3 +- {Script => src/stage}/Hub.gd | 0 {Script/Stage => src/stage}/SolidTileMap.gd | 0 {Scene/Stage => src/stage}/SolidTileMap.tscn | 6 +- {Script/Stage => src/stage}/SpikeTileMap.gd | 2 +- {Scene/Stage => src/stage}/SpikeTileMap.tscn | 6 +- {Script/Stage => src/stage}/Stage.gd | 0 107 files changed, 333 insertions(+), 681 deletions(-) delete mode 100644 Image/box.json delete mode 100644 Image/explode.json delete mode 100644 Image/explode2.json delete mode 100644 Image/player.json delete mode 100644 Image/portal.json delete mode 100644 Script/AutoLoad/HUD.gd delete mode 100644 Script/AutoLoad/Pause.gd rename DefaultMaterial.material => assets/3d/DefaultMaterial.material (100%) rename Material.material => assets/3d/Material.material (100%) rename crt.fbx => assets/3d/crt.fbx (100%) rename mac_classic.fbx => assets/3d/mac_classic.fbx (100%) rename {Audio/SFX => assets/audio/sfx}/Randomize7.wav (100%) rename {Audio/SFX => assets/audio/sfx}/box_drop.wav (100%) rename {Audio/SFX => assets/audio/sfx}/box_pickup.wav (100%) rename {Audio/SFX => assets/audio/sfx}/box_throw.wav (100%) rename {Audio/SFX => assets/audio/sfx}/box_throw_long.wav (100%) rename {Audio/SFX => assets/audio/sfx}/btn3.wav (100%) rename {Audio/SFX => assets/audio/sfx}/button.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit0.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit1.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit10.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit14.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit6.wav (100%) rename {Audio/SFX => assets/audio/sfx}/hit9.wav (100%) rename {Audio/SFX => assets/audio/sfx}/jump1.wav (100%) rename {Audio/SFX => assets/audio/sfx}/player_die.wav (100%) rename {Audio/SFX => assets/audio/sfx}/player_jump.wav (100%) rename {Audio/SFX => assets/audio/sfx}/portal2.wav (100%) rename {Audio/SFX => assets/audio/sfx}/sfx10.wav (100%) rename {Audio/SFX => assets/audio/sfx}/sfx4.wav (100%) rename {Audio/SFX => assets/audio/sfx}/sfx5.wav (100%) rename {Font => assets/font}/m3x6.tres (60%) rename {Font => assets/font}/m3x6.ttf (100%) rename {Image => assets/image}/9slice.png (100%) rename {Image => assets/image}/box.png (100%) rename {Image => assets/image}/bricks.png (100%) rename crate.png => assets/image/crate.png (100%) rename {Image => assets/image}/crate_tiles.png (100%) rename {Image => assets/image}/door.png (100%) rename {Image => assets/image}/explode.png (100%) rename {Image => assets/image}/explode2.png (100%) rename {Image => assets/image}/pixel.png (100%) rename {Image => assets/image}/player.png (100%) rename {Image => assets/image}/portal.png (100%) rename {Image => assets/image}/solid_bricks.png (100%) rename {Image => assets/image}/star.png (100%) rename {Image => assets/image}/timer.png (100%) rename {Image => assets/image}/tread.png (100%) rename {Scene => src/3d}/MonitorScene.tscn (99%) rename {Script/Actor => src/actor}/Actor.gd (100%) rename {Script/Actor => src/actor}/Box.gd (100%) rename {Scene/Actor => src/actor}/Box.tscn (84%) rename {Script/Actor => src/actor}/Door.gd (100%) rename {Scene/Actor => src/actor}/Door.tscn (76%) rename {Script/Actor => src/actor}/Exit.gd (100%) rename {Scene/Actor => src/actor}/Exit.tscn (84%) rename {Script => src/actor}/ExitStar.gd (100%) rename {Script/Actor => src/actor}/Passthrough.gd (100%) rename {Scene/Actor => src/actor}/Passthrough.tscn (60%) rename {Script/Actor => src/actor}/Player.gd (97%) rename {Scene/Actor => src/actor}/Player.tscn (92%) rename {Scene/Actor => src/actor}/Spike.tscn (69%) rename {Script/Actor => src/actor}/Switch.gd (100%) rename {Scene/Actor => src/actor}/Switch.tscn (65%) rename {Script/Actor => src/actor}/SwitchBlock.gd (100%) rename {Scene/Actor => src/actor}/SwitchBlock.tscn (68%) rename {Scene/Actor => src/actor}/SwitchBlockBlue.tscn (70%) rename {Scene/Actor => src/actor}/SwitchBlue.tscn (67%) rename {Script/Actor => src/actor}/Treadmill.gd (100%) rename {Scene/Actor => src/actor}/Treadmill.tscn (67%) rename {Script/AutoLoad => src/autoload}/DevConsole.gd (100%) rename {Scene/AutoLoad => src/autoload}/DevConsole.tscn (97%) create mode 100644 src/autoload/HUD.gd rename {Scene/AutoLoad => src/autoload}/HUD.tscn (79%) create mode 100644 src/autoload/Pause.gd rename {Scene/AutoLoad => src/autoload}/Pause.tscn (83%) rename {Script/AutoLoad => src/autoload}/Shared.gd (100%) rename {Script/AutoLoad => src/autoload}/btn.gd (100%) rename {Script => src/fx}/Explosion.gd (100%) rename {Scene => src/fx}/Explosion.tscn (86%) rename {Script => src/fx}/Explosion2.gd (100%) rename {Scene => src/fx}/Explosion2.tscn (85%) rename {Map => src/map}/1-1.tscn (78%) rename {Map => src/map}/1-2.tscn (78%) rename {Map => src/map}/1-3.tscn (76%) rename {Map => src/map}/1-4.tscn (79%) rename {Map => src/map}/1-5.tscn (81%) rename {Map => src/map}/1-6.tscn (82%) rename {Map => src/map}/1-7.tscn (85%) rename {Map => src/map}/map_jump_test.tscn (82%) rename {Map => src/map}/map_switch.tscn (81%) rename {Map => src/map}/map_tread.tscn (81%) rename {Map => src/map}/world.tscn (84%) rename {Script => src/menu}/MapSelect.gd (81%) rename {Scene => src/menu}/select.tscn (92%) rename {Shader => src/shader}/scrollx.shader (100%) rename {Scene/Stage => src/stage}/DetailTileMap.tscn (94%) rename {Script/Stage => src/stage}/GameCamera.gd (100%) rename {Scene/Stage => src/stage}/GameCamera.tscn (84%) rename {Script => src/stage}/Hub.gd (100%) rename {Script/Stage => src/stage}/SolidTileMap.gd (100%) rename {Scene/Stage => src/stage}/SolidTileMap.tscn (85%) rename {Script/Stage => src/stage}/SpikeTileMap.gd (85%) rename {Scene/Stage => src/stage}/SpikeTileMap.tscn (80%) rename {Script/Stage => src/stage}/Stage.gd (100%) diff --git a/.gitignore b/.gitignore index 10b3277..2095e73 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,4 @@ data_*/ # custom *.import Export/ -Build/ \ No newline at end of file +[Bb]uild/ \ No newline at end of file diff --git a/Image/box.json b/Image/box.json deleted file mode 100644 index 76eb154..0000000 --- a/Image/box.json +++ /dev/null @@ -1,75 +0,0 @@ -{ "frames": { - "box 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "box 1.aseprite": { - "frame": { "x": 16, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 40 - }, - "box 2.aseprite": { - "frame": { "x": 32, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 40 - }, - "box 3.aseprite": { - "frame": { "x": 48, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 40 - }, - "box 4.aseprite": { - "frame": { "x": 64, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 40 - }, - "box 5.aseprite": { - "frame": { "x": 80, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 40 - }, - "box 6.aseprite": { - "frame": { "x": 96, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - } - }, - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.21-x64", - "image": "box.png", - "format": "RGBA8888", - "size": { "w": 112, "h": 16 }, - "scale": "1", - "frameTags": [ - { "name": "hit", "from": 0, "to": 6, "direction": "forward" } - ], - "layers": [ - { "name": "Layer 1", "opacity": 255, "blendMode": "normal" } - ], - "slices": [ - ] - } -} diff --git a/Image/explode.json b/Image/explode.json deleted file mode 100644 index 3a1ea19..0000000 --- a/Image/explode.json +++ /dev/null @@ -1,91 +0,0 @@ -{ "frames": { - "explode 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 1.aseprite": { - "frame": { "x": 32, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 2.aseprite": { - "frame": { "x": 64, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 3.aseprite": { - "frame": { "x": 96, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 4.aseprite": { - "frame": { "x": 128, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 5.aseprite": { - "frame": { "x": 160, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 6.aseprite": { - "frame": { "x": 192, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 7.aseprite": { - "frame": { "x": 224, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - }, - "explode 8.aseprite": { - "frame": { "x": 256, "y": 0, "w": 32, "h": 32 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 32, "h": 32 }, - "sourceSize": { "w": 32, "h": 32 }, - "duration": 50 - } - }, - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.24-x64", - "image": "explode.png", - "format": "RGBA8888", - "size": { "w": 288, "h": 32 }, - "scale": "1", - "frameTags": [ - { "name": "Loop", "from": 0, "to": 8, "direction": "forward" } - ], - "layers": [ - { "name": "Layer 1", "opacity": 255, "blendMode": "normal" } - ], - "slices": [ - ] - } -} diff --git a/Image/explode2.json b/Image/explode2.json deleted file mode 100644 index e707c4d..0000000 --- a/Image/explode2.json +++ /dev/null @@ -1,59 +0,0 @@ -{ "frames": { - "explode2 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "explode2 1.aseprite": { - "frame": { "x": 16, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "explode2 2.aseprite": { - "frame": { "x": 32, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "explode2 3.aseprite": { - "frame": { "x": 48, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "explode2 4.aseprite": { - "frame": { "x": 64, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - } - }, - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.24-x64", - "image": "explode2.png", - "format": "RGBA8888", - "size": { "w": 80, "h": 16 }, - "scale": "1", - "frameTags": [ - { "name": "Loop", "from": 0, "to": 4, "direction": "forward" } - ], - "layers": [ - { "name": "Layer 1", "opacity": 255, "blendMode": "normal" } - ], - "slices": [ - ] - } -} diff --git a/Image/player.json b/Image/player.json deleted file mode 100644 index a9f4b79..0000000 --- a/Image/player.json +++ /dev/null @@ -1,136 +0,0 @@ -{ "frames": { - "player (Layer) 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 400 - }, - "player (Layer) 1.aseprite": { - "frame": { "x": 8, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 2.aseprite": { - "frame": { "x": 16, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 3.aseprite": { - "frame": { "x": 24, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - }, - "player (Layer) 4.aseprite": { - "frame": { "x": 32, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 5.aseprite": { - "frame": { "x": 40, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - }, - "player (Layer) 6.aseprite": { - "frame": { "x": 48, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - }, - "player (Layer) 7.aseprite": { - "frame": { "x": 56, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 400 - }, - "player (Layer) 8.aseprite": { - "frame": { "x": 64, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 9.aseprite": { - "frame": { "x": 72, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 10.aseprite": { - "frame": { "x": 80, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - }, - "player (Layer) 11.aseprite": { - "frame": { "x": 88, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 200 - }, - "player (Layer) 12.aseprite": { - "frame": { "x": 96, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - }, - "player (Layer) 13.aseprite": { - "frame": { "x": 104, "y": 0, "w": 8, "h": 24 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 8, "h": 24 }, - "sourceSize": { "w": 8, "h": 24 }, - "duration": 100 - } - }, - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.24-x64", - "image": "player.png", - "format": "RGBA8888", - "size": { "w": 112, "h": 24 }, - "scale": "1", - "frameTags": [ - { "name": "idle", "from": 0, "to": 1, "direction": "forward" }, - { "name": "run", "from": 2, "to": 5, "direction": "forward" }, - { "name": "jump", "from": 6, "to": 6, "direction": "forward" }, - { "name": "box_idle", "from": 7, "to": 8, "direction": "forward" }, - { "name": "box_run", "from": 9, "to": 12, "direction": "forward" }, - { "name": "box_jump", "from": 13, "to": 13, "direction": "forward" } - ], - "layers": [ - { "name": "Layer", "opacity": 255, "blendMode": "normal" } - ], - "slices": [ - ] - } -} diff --git a/Image/portal.json b/Image/portal.json deleted file mode 100644 index 2621b06..0000000 --- a/Image/portal.json +++ /dev/null @@ -1,59 +0,0 @@ -{ "frames": { - "portal 0.aseprite": { - "frame": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 300 - }, - "portal 1.aseprite": { - "frame": { "x": 16, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 200 - }, - "portal 2.aseprite": { - "frame": { "x": 32, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 100 - }, - "portal 3.aseprite": { - "frame": { "x": 48, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 200 - }, - "portal 4.aseprite": { - "frame": { "x": 64, "y": 0, "w": 16, "h": 16 }, - "rotated": false, - "trimmed": false, - "spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 }, - "sourceSize": { "w": 16, "h": 16 }, - "duration": 300 - } - }, - "meta": { - "app": "http://www.aseprite.org/", - "version": "1.2.24-x64", - "image": "portal.png", - "format": "RGBA8888", - "size": { "w": 80, "h": 16 }, - "scale": "1", - "frameTags": [ - { "name": "Loop", "from": 0, "to": 4, "direction": "pingpong" } - ], - "layers": [ - { "name": "Layer 1", "opacity": 255, "blendMode": "normal" } - ], - "slices": [ - ] - } -} diff --git a/Script/AutoLoad/HUD.gd b/Script/AutoLoad/HUD.gd deleted file mode 100644 index 5f68bbe..0000000 --- a/Script/AutoLoad/HUD.gd +++ /dev/null @@ -1,74 +0,0 @@ -extends CanvasLayer - -var node_timer : Label -var node_death : Label - -var pause : Control -var is_paused := false -var pause_list : Label - -var cursor := 0 -var menu_items := ["resume", "options", "exit"] - - -func _ready(): - node_timer = $Timer/Label - node_death = $Death - - pause = $Pause - pause.visible = false - pause_list = $Pause/List - - pause_list.text = "" - for i in menu_items: - pause_list.text += i + "\n" - - -func _process(delta): - - - if is_paused: - var btny = btn.p("down") - btn.p("up") - if btny: - cursor = clamp(cursor + btny, 0, menu_items.size() - 1) - pause_list.text = "" - for i in menu_items.size(): - if cursor == i: - pause_list.text += "> " - pause_list.text += menu_items[i] + "\n" - - -func _input(event): - if dev.is_open: - return - - if Input.is_action_just_pressed("pause"): - toggle_pause() - if Input.is_action_just_pressed("jump"): - toggle_pause() - - -func toggle_pause(): - is_paused = !is_paused - pause.visible = is_paused - get_tree().paused = is_paused - - if is_paused: - pass - else: - pass - - -func set_time(arg): - var _min = str(int(arg / 60)) - if _min.length() == 1: - _min = "0" + _min - - var _sec = str(int(arg) % 60) - if _sec.length() == 1: - _sec = "0" + _sec - - #var _msec = str(fmod(arg, 1)) - #_msec = _msec.substr(1, 2) - - node_timer.text = _min + ":" + _sec diff --git a/Script/AutoLoad/Pause.gd b/Script/AutoLoad/Pause.gd deleted file mode 100644 index 9942f94..0000000 --- a/Script/AutoLoad/Pause.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Control - - -func _ready(): - pass diff --git a/DefaultMaterial.material b/assets/3d/DefaultMaterial.material similarity index 100% rename from DefaultMaterial.material rename to assets/3d/DefaultMaterial.material diff --git a/Material.material b/assets/3d/Material.material similarity index 100% rename from Material.material rename to assets/3d/Material.material diff --git a/crt.fbx b/assets/3d/crt.fbx similarity index 100% rename from crt.fbx rename to assets/3d/crt.fbx diff --git a/mac_classic.fbx b/assets/3d/mac_classic.fbx similarity index 100% rename from mac_classic.fbx rename to assets/3d/mac_classic.fbx diff --git a/Audio/SFX/Randomize7.wav b/assets/audio/sfx/Randomize7.wav similarity index 100% rename from Audio/SFX/Randomize7.wav rename to assets/audio/sfx/Randomize7.wav diff --git a/Audio/SFX/box_drop.wav b/assets/audio/sfx/box_drop.wav similarity index 100% rename from Audio/SFX/box_drop.wav rename to assets/audio/sfx/box_drop.wav diff --git a/Audio/SFX/box_pickup.wav b/assets/audio/sfx/box_pickup.wav similarity index 100% rename from Audio/SFX/box_pickup.wav rename to assets/audio/sfx/box_pickup.wav diff --git a/Audio/SFX/box_throw.wav b/assets/audio/sfx/box_throw.wav similarity index 100% rename from Audio/SFX/box_throw.wav rename to assets/audio/sfx/box_throw.wav diff --git a/Audio/SFX/box_throw_long.wav b/assets/audio/sfx/box_throw_long.wav similarity index 100% rename from Audio/SFX/box_throw_long.wav rename to assets/audio/sfx/box_throw_long.wav diff --git a/Audio/SFX/btn3.wav b/assets/audio/sfx/btn3.wav similarity index 100% rename from Audio/SFX/btn3.wav rename to assets/audio/sfx/btn3.wav diff --git a/Audio/SFX/button.wav b/assets/audio/sfx/button.wav similarity index 100% rename from Audio/SFX/button.wav rename to assets/audio/sfx/button.wav diff --git a/Audio/SFX/hit0.wav b/assets/audio/sfx/hit0.wav similarity index 100% rename from Audio/SFX/hit0.wav rename to assets/audio/sfx/hit0.wav diff --git a/Audio/SFX/hit1.wav b/assets/audio/sfx/hit1.wav similarity index 100% rename from Audio/SFX/hit1.wav rename to assets/audio/sfx/hit1.wav diff --git a/Audio/SFX/hit10.wav b/assets/audio/sfx/hit10.wav similarity index 100% rename from Audio/SFX/hit10.wav rename to assets/audio/sfx/hit10.wav diff --git a/Audio/SFX/hit14.wav b/assets/audio/sfx/hit14.wav similarity index 100% rename from Audio/SFX/hit14.wav rename to assets/audio/sfx/hit14.wav diff --git a/Audio/SFX/hit6.wav b/assets/audio/sfx/hit6.wav similarity index 100% rename from Audio/SFX/hit6.wav rename to assets/audio/sfx/hit6.wav diff --git a/Audio/SFX/hit9.wav b/assets/audio/sfx/hit9.wav similarity index 100% rename from Audio/SFX/hit9.wav rename to assets/audio/sfx/hit9.wav diff --git a/Audio/SFX/jump1.wav b/assets/audio/sfx/jump1.wav similarity index 100% rename from Audio/SFX/jump1.wav rename to assets/audio/sfx/jump1.wav diff --git a/Audio/SFX/player_die.wav b/assets/audio/sfx/player_die.wav similarity index 100% rename from Audio/SFX/player_die.wav rename to assets/audio/sfx/player_die.wav diff --git a/Audio/SFX/player_jump.wav b/assets/audio/sfx/player_jump.wav similarity index 100% rename from Audio/SFX/player_jump.wav rename to assets/audio/sfx/player_jump.wav diff --git a/Audio/SFX/portal2.wav b/assets/audio/sfx/portal2.wav similarity index 100% rename from Audio/SFX/portal2.wav rename to assets/audio/sfx/portal2.wav diff --git a/Audio/SFX/sfx10.wav b/assets/audio/sfx/sfx10.wav similarity index 100% rename from Audio/SFX/sfx10.wav rename to assets/audio/sfx/sfx10.wav diff --git a/Audio/SFX/sfx4.wav b/assets/audio/sfx/sfx4.wav similarity index 100% rename from Audio/SFX/sfx4.wav rename to assets/audio/sfx/sfx4.wav diff --git a/Audio/SFX/sfx5.wav b/assets/audio/sfx/sfx5.wav similarity index 100% rename from Audio/SFX/sfx5.wav rename to assets/audio/sfx/sfx5.wav diff --git a/Font/m3x6.tres b/assets/font/m3x6.tres similarity index 60% rename from Font/m3x6.tres rename to assets/font/m3x6.tres index a34b504..d8735d2 100644 --- a/Font/m3x6.tres +++ b/assets/font/m3x6.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://Font/m3x6.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://assets/font/m3x6.ttf" type="DynamicFontData" id=1] [resource] extra_spacing_top = -5 diff --git a/Font/m3x6.ttf b/assets/font/m3x6.ttf similarity index 100% rename from Font/m3x6.ttf rename to assets/font/m3x6.ttf diff --git a/Image/9slice.png b/assets/image/9slice.png similarity index 100% rename from Image/9slice.png rename to assets/image/9slice.png diff --git a/Image/box.png b/assets/image/box.png similarity index 100% rename from Image/box.png rename to assets/image/box.png diff --git a/Image/bricks.png b/assets/image/bricks.png similarity index 100% rename from Image/bricks.png rename to assets/image/bricks.png diff --git a/crate.png b/assets/image/crate.png similarity index 100% rename from crate.png rename to assets/image/crate.png diff --git a/Image/crate_tiles.png b/assets/image/crate_tiles.png similarity index 100% rename from Image/crate_tiles.png rename to assets/image/crate_tiles.png diff --git a/Image/door.png b/assets/image/door.png similarity index 100% rename from Image/door.png rename to assets/image/door.png diff --git a/Image/explode.png b/assets/image/explode.png similarity index 100% rename from Image/explode.png rename to assets/image/explode.png diff --git a/Image/explode2.png b/assets/image/explode2.png similarity index 100% rename from Image/explode2.png rename to assets/image/explode2.png diff --git a/Image/pixel.png b/assets/image/pixel.png similarity index 100% rename from Image/pixel.png rename to assets/image/pixel.png diff --git a/Image/player.png b/assets/image/player.png similarity index 100% rename from Image/player.png rename to assets/image/player.png diff --git a/Image/portal.png b/assets/image/portal.png similarity index 100% rename from Image/portal.png rename to assets/image/portal.png diff --git a/Image/solid_bricks.png b/assets/image/solid_bricks.png similarity index 100% rename from Image/solid_bricks.png rename to assets/image/solid_bricks.png diff --git a/Image/star.png b/assets/image/star.png similarity index 100% rename from Image/star.png rename to assets/image/star.png diff --git a/Image/timer.png b/assets/image/timer.png similarity index 100% rename from Image/timer.png rename to assets/image/timer.png diff --git a/Image/tread.png b/assets/image/tread.png similarity index 100% rename from Image/tread.png rename to assets/image/tread.png diff --git a/project.godot b/project.godot index c86a18f..24069aa 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ _global_script_classes=[ { "base": "Node2D", "class": "Actor", "language": "GDScript", -"path": "res://Script/Actor/Actor.gd" +"path": "res://src/actor/Actor.gd" }, { "base": "Node", "class": "AsepriteImportData", @@ -27,12 +27,12 @@ _global_script_classes=[ { "base": "Actor", "class": "Box", "language": "GDScript", -"path": "res://Script/Actor/Box.gd" +"path": "res://src/actor/Box.gd" }, { "base": "Actor", "class": "Door", "language": "GDScript", -"path": "res://Script/Actor/Door.gd" +"path": "res://src/actor/Door.gd" }, { "base": "Node", "class": "EditorTheme", @@ -42,32 +42,32 @@ _global_script_classes=[ { "base": "Actor", "class": "Exit", "language": "GDScript", -"path": "res://Script/Actor/Exit.gd" +"path": "res://src/actor/Exit.gd" }, { "base": "Actor", "class": "Passthrough", "language": "GDScript", -"path": "res://Script/Actor/Passthrough.gd" +"path": "res://src/actor/Passthrough.gd" }, { "base": "Node2D", "class": "Stage", "language": "GDScript", -"path": "res://Script/Stage/Stage.gd" +"path": "res://src/stage/Stage.gd" }, { "base": "Actor", "class": "Switch", "language": "GDScript", -"path": "res://Script/Actor/Switch.gd" +"path": "res://src/actor/Switch.gd" }, { "base": "Actor", "class": "SwitchBlock", "language": "GDScript", -"path": "res://Script/Actor/SwitchBlock.gd" +"path": "res://src/actor/SwitchBlock.gd" }, { "base": "Actor", "class": "Treadmill", "language": "GDScript", -"path": "res://Script/Actor/Treadmill.gd" +"path": "res://src/actor/Treadmill.gd" } ] _global_script_class_icons={ "Actor": "", @@ -87,16 +87,16 @@ _global_script_class_icons={ [application] config/name="gdBox" -run/main_scene="res://Scene/select.tscn" +run/main_scene="res://src/menu/select.tscn" config/icon="res://icon.png" [autoload] -btn="*res://Script/AutoLoad/btn.gd" -dev="*res://Scene/AutoLoad/DevConsole.tscn" -Shared="*res://Script/AutoLoad/Shared.gd" -HUD="*res://Scene/AutoLoad/HUD.tscn" -Pause="*res://Scene/AutoLoad/Pause.tscn" +btn="*res://src/autoload/btn.gd" +dev="*res://src/autoload/DevConsole.tscn" +Shared="*res://src/autoload/Shared.gd" +HUD="*res://src/autoload/HUD.tscn" +Pause="*res://src/autoload/Pause.tscn" [display] diff --git a/Scene/MonitorScene.tscn b/src/3d/MonitorScene.tscn similarity index 99% rename from Scene/MonitorScene.tscn rename to src/3d/MonitorScene.tscn index 068118d..3e4df2b 100644 --- a/Scene/MonitorScene.tscn +++ b/src/3d/MonitorScene.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=11 format=2] -[ext_resource path="res://Map/1-6.tscn" type="PackedScene" id=1] -[ext_resource path="res://DefaultMaterial.material" type="Material" id=2] -[ext_resource path="res://Material.material" type="Material" id=3] +[ext_resource path="res://src/map/1-6.tscn" type="PackedScene" id=1] +[ext_resource path="res://assets/3d/DefaultMaterial.material" type="Material" id=2] +[ext_resource path="res://assets/3d/Material.material" type="Material" id=3] + + + diff --git a/Script/Actor/Actor.gd b/src/actor/Actor.gd similarity index 100% rename from Script/Actor/Actor.gd rename to src/actor/Actor.gd diff --git a/Script/Actor/Box.gd b/src/actor/Box.gd similarity index 100% rename from Script/Actor/Box.gd rename to src/actor/Box.gd diff --git a/Scene/Actor/Box.tscn b/src/actor/Box.tscn similarity index 84% rename from Scene/Actor/Box.tscn rename to src/actor/Box.tscn index 5103482..eb6366c 100644 --- a/Scene/Actor/Box.tscn +++ b/src/actor/Box.tscn @@ -1,9 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Script/Actor/Box.gd" type="Script" id=1] -[ext_resource path="res://Image/box.png" type="Texture" id=2] -[ext_resource path="res://Audio/SFX/hit10.wav" type="AudioStream" id=3] - +[ext_resource path="res://assets/image/box.png" type="Texture" id=1] +[ext_resource path="res://assets/audio/sfx/hit10.wav" type="AudioStream" id=2] +[ext_resource path="res://src/actor/Box.gd" type="Script" id=3] [sub_resource type="Animation" id=1] resource_name = "hit" @@ -39,7 +38,7 @@ tracks/1/keys = { ]] z_index = 4 z_as_relative = false -script = ExtResource( 1 ) +script = ExtResource( 3 ) tag = "box" is_moving = true is_solid = true @@ -49,12 +48,12 @@ is_using_tread = true [node name="Sprite" type="Sprite" parent="."] position = Vector2( 4, 4 ) -texture = ExtResource( 2 ) +texture = ExtResource( 1 ) region_enabled = true region_rect = Rect2( 96, 0, 16, 16 ) [node name="AudioHit" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 3 ) +stream = ExtResource( 2 ) [node name="AnimationPlayer" type="AnimationPlayer" parent="."] anims/hit = SubResource( 1 ) diff --git a/Script/Actor/Door.gd b/src/actor/Door.gd similarity index 100% rename from Script/Actor/Door.gd rename to src/actor/Door.gd diff --git a/Scene/Actor/Door.tscn b/src/actor/Door.tscn similarity index 76% rename from Scene/Actor/Door.tscn rename to src/actor/Door.tscn index 312e53b..9588e48 100644 --- a/Scene/Actor/Door.tscn +++ b/src/actor/Door.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Image/door.png" type="Texture" id=1] -[ext_resource path="res://Script/Actor/Door.gd" type="Script" id=2] -[ext_resource path="res://Font/m3x6.tres" type="DynamicFont" id=3] +[ext_resource path="res://assets/image/door.png" type="Texture" id=1] +[ext_resource path="res://src/actor/Door.gd" type="Script" id=2] +[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=3] + + + [node name="Door" type="Node2D" groups=[ diff --git a/Script/Actor/Exit.gd b/src/actor/Exit.gd similarity index 100% rename from Script/Actor/Exit.gd rename to src/actor/Exit.gd diff --git a/Scene/Actor/Exit.tscn b/src/actor/Exit.tscn similarity index 84% rename from Scene/Actor/Exit.tscn rename to src/actor/Exit.tscn index af27c05..c27959f 100644 --- a/Scene/Actor/Exit.tscn +++ b/src/actor/Exit.tscn @@ -1,10 +1,13 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Image/portal.png" type="Texture" id=1] -[ext_resource path="res://Script/Actor/Exit.gd" type="Script" id=2] -[ext_resource path="res://Image/pixel.png" type="Texture" id=3] -[ext_resource path="res://Image/star.png" type="Texture" id=4] -[ext_resource path="res://Script/ExitStar.gd" type="Script" id=5] +[ext_resource path="res://assets/image/portal.png" type="Texture" id=1] +[ext_resource path="res://src/actor/Exit.gd" type="Script" id=2] +[ext_resource path="res://assets/image/pixel.png" type="Texture" id=3] +[ext_resource path="res://assets/image/star.png" type="Texture" id=4] +[ext_resource path="res://src/actor/ExitStar.gd" type="Script" id=5] + + + [sub_resource type="Animation" id=1] length = 1.6 diff --git a/Script/ExitStar.gd b/src/actor/ExitStar.gd similarity index 100% rename from Script/ExitStar.gd rename to src/actor/ExitStar.gd diff --git a/Script/Actor/Passthrough.gd b/src/actor/Passthrough.gd similarity index 100% rename from Script/Actor/Passthrough.gd rename to src/actor/Passthrough.gd diff --git a/Scene/Actor/Passthrough.tscn b/src/actor/Passthrough.tscn similarity index 60% rename from Scene/Actor/Passthrough.tscn rename to src/actor/Passthrough.tscn index f912f8f..c037083 100644 --- a/Scene/Actor/Passthrough.tscn +++ b/src/actor/Passthrough.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Script/Actor/Passthrough.gd" type="Script" id=1] -[ext_resource path="res://crate.png" type="Texture" id=2] -[ext_resource path="res://Audio/SFX/hit0.wav" type="AudioStream" id=3] +[ext_resource path="res://src/actor/Passthrough.gd" type="Script" id=1] +[ext_resource path="res://assets/image/crate.png" type="Texture" id=2] +[ext_resource path="res://assets/audio/sfx/hit0.wav" type="AudioStream" id=3] + + + [node name="Passthrough" type="Node2D" groups=[ diff --git a/Script/Actor/Player.gd b/src/actor/Player.gd similarity index 97% rename from Script/Actor/Player.gd rename to src/actor/Player.gd index f1dbe7f..d8f389e 100644 --- a/Script/Actor/Player.gd +++ b/src/actor/Player.gd @@ -36,9 +36,9 @@ var node_audio_throw : AudioStreamPlayer2D var node_camera_game : Camera2D -var scene_box = preload("res://Scene/Actor/Box.tscn") -var scene_explosion = preload("res://Scene/Explosion.tscn") -var scene_explosion2 = preload("res://Scene/Explosion2.tscn") +var scene_box = preload("res://src/actor/Box.tscn") +var scene_explosion = preload("res://src/fx/Explosion.tscn") +var scene_explosion2 = preload("res://src/fx/Explosion2.tscn") # Called when the node enters the scene tree for the first time. func _ready(): diff --git a/Scene/Actor/Player.tscn b/src/actor/Player.tscn similarity index 92% rename from Scene/Actor/Player.tscn rename to src/actor/Player.tscn index 92618c1..b92c6dc 100644 --- a/Scene/Actor/Player.tscn +++ b/src/actor/Player.tscn @@ -1,11 +1,14 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://Script/Actor/Player.gd" type="Script" id=1] -[ext_resource path="res://Audio/SFX/player_jump.wav" type="AudioStream" id=2] -[ext_resource path="res://Image/player.png" type="Texture" id=3] -[ext_resource path="res://Audio/SFX/btn3.wav" type="AudioStream" id=4] -[ext_resource path="res://Audio/SFX/sfx10.wav" type="AudioStream" id=5] -[ext_resource path="res://Audio/SFX/box_drop.wav" type="AudioStream" id=6] +[ext_resource path="res://src/actor/Player.gd" type="Script" id=1] +[ext_resource path="res://assets/audio/sfx/player_jump.wav" type="AudioStream" id=2] +[ext_resource path="res://assets/image/player.png" type="Texture" id=3] +[ext_resource path="res://assets/audio/sfx/btn3.wav" type="AudioStream" id=4] +[ext_resource path="res://assets/audio/sfx/sfx10.wav" type="AudioStream" id=5] +[ext_resource path="res://assets/audio/sfx/box_drop.wav" type="AudioStream" id=6] + + + [sub_resource type="Animation" id=1] length = 0.6 diff --git a/Scene/Actor/Spike.tscn b/src/actor/Spike.tscn similarity index 69% rename from Scene/Actor/Spike.tscn rename to src/actor/Spike.tscn index 09867f8..3913f26 100644 --- a/Scene/Actor/Spike.tscn +++ b/src/actor/Spike.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Image/crate_tiles.png" type="Texture" id=1] -[ext_resource path="res://Script/Actor/Actor.gd" type="Script" id=2] +[ext_resource path="res://assets/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://src/actor/Actor.gd" type="Script" id=2] + + [node name="Spike" type="Node2D" groups=[ diff --git a/Script/Actor/Switch.gd b/src/actor/Switch.gd similarity index 100% rename from Script/Actor/Switch.gd rename to src/actor/Switch.gd diff --git a/Scene/Actor/Switch.tscn b/src/actor/Switch.tscn similarity index 65% rename from Scene/Actor/Switch.tscn rename to src/actor/Switch.tscn index 588829e..784f4f9 100644 --- a/Scene/Actor/Switch.tscn +++ b/src/actor/Switch.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://crate.png" type="Texture" id=1] -[ext_resource path="res://Script/Actor/Switch.gd" type="Script" id=2] -[ext_resource path="res://Audio/SFX/btn3.wav" type="AudioStream" id=3] +[ext_resource path="res://assets/image/crate.png" type="Texture" id=1] +[ext_resource path="res://src/actor/Switch.gd" type="Script" id=2] +[ext_resource path="res://assets/audio/sfx/btn3.wav" type="AudioStream" id=3] + + + [node name="Switch" type="Node2D" groups=[ diff --git a/Script/Actor/SwitchBlock.gd b/src/actor/SwitchBlock.gd similarity index 100% rename from Script/Actor/SwitchBlock.gd rename to src/actor/SwitchBlock.gd diff --git a/Scene/Actor/SwitchBlock.tscn b/src/actor/SwitchBlock.tscn similarity index 68% rename from Scene/Actor/SwitchBlock.tscn rename to src/actor/SwitchBlock.tscn index efd0509..d4aeb7a 100644 --- a/Scene/Actor/SwitchBlock.tscn +++ b/src/actor/SwitchBlock.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://crate.png" type="Texture" id=1] -[ext_resource path="res://Script/Actor/SwitchBlock.gd" type="Script" id=2] +[ext_resource path="res://assets/image/crate.png" type="Texture" id=1] +[ext_resource path="res://src/actor/SwitchBlock.gd" type="Script" id=2] + + [node name="SwitchBlock" type="Node2D" groups=[ diff --git a/Scene/Actor/SwitchBlockBlue.tscn b/src/actor/SwitchBlockBlue.tscn similarity index 70% rename from Scene/Actor/SwitchBlockBlue.tscn rename to src/actor/SwitchBlockBlue.tscn index 80b6336..ad1ef61 100644 --- a/Scene/Actor/SwitchBlockBlue.tscn +++ b/src/actor/SwitchBlockBlue.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Scene/Actor/SwitchBlock.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/SwitchBlock.tscn" type="PackedScene" id=1] + [node name="SwitchBlockBlue" instance=ExtResource( 1 )] diff --git a/Scene/Actor/SwitchBlue.tscn b/src/actor/SwitchBlue.tscn similarity index 67% rename from Scene/Actor/SwitchBlue.tscn rename to src/actor/SwitchBlue.tscn index 5715a2a..2f83f8b 100644 --- a/Scene/Actor/SwitchBlue.tscn +++ b/src/actor/SwitchBlue.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Scene/Actor/Switch.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Switch.tscn" type="PackedScene" id=1] + [node name="SwitchBlue" instance=ExtResource( 1 )] diff --git a/Script/Actor/Treadmill.gd b/src/actor/Treadmill.gd similarity index 100% rename from Script/Actor/Treadmill.gd rename to src/actor/Treadmill.gd diff --git a/Scene/Actor/Treadmill.tscn b/src/actor/Treadmill.tscn similarity index 67% rename from Scene/Actor/Treadmill.tscn rename to src/actor/Treadmill.tscn index 75988cc..620c8e3 100644 --- a/Scene/Actor/Treadmill.tscn +++ b/src/actor/Treadmill.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Script/Actor/Treadmill.gd" type="Script" id=1] -[ext_resource path="res://Image/tread.png" type="Texture" id=2] -[ext_resource path="res://Shader/scrollx.shader" type="Shader" id=3] +[ext_resource path="res://src/actor/Treadmill.gd" type="Script" id=1] +[ext_resource path="res://assets/image/tread.png" type="Texture" id=2] +[ext_resource path="res://src/shader/scrollx.shader" type="Shader" id=3] + + + [sub_resource type="ShaderMaterial" id=2] diff --git a/Script/AutoLoad/DevConsole.gd b/src/autoload/DevConsole.gd similarity index 100% rename from Script/AutoLoad/DevConsole.gd rename to src/autoload/DevConsole.gd diff --git a/Scene/AutoLoad/DevConsole.tscn b/src/autoload/DevConsole.tscn similarity index 97% rename from Scene/AutoLoad/DevConsole.tscn rename to src/autoload/DevConsole.tscn index b6a2880..ea2aa25 100644 --- a/Scene/AutoLoad/DevConsole.tscn +++ b/src/autoload/DevConsole.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Font/m3x6.tres" type="DynamicFont" id=1] -[ext_resource path="res://Script/AutoLoad/DevConsole.gd" type="Script" id=2] +[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://src/autoload/DevConsole.gd" type="Script" id=2] + + diff --git a/src/autoload/HUD.gd b/src/autoload/HUD.gd new file mode 100644 index 0000000..414a54c --- /dev/null +++ b/src/autoload/HUD.gd @@ -0,0 +1,32 @@ +extends CanvasLayer + +var node_timer : Label +var node_death : Label + + +func _ready(): + node_timer = $Timer/Label + node_death = $Death + + +func _process(delta): + pass + +func _input(event): + if dev.is_open: + return + + +func set_time(arg): + var _min = str(int(arg / 60)) + if _min.length() == 1: + _min = "0" + _min + + var _sec = str(int(arg) % 60) + if _sec.length() == 1: + _sec = "0" + _sec + + #var _msec = str(fmod(arg, 1)) + #_msec = _msec.substr(1, 2) + + node_timer.text = _min + ":" + _sec diff --git a/Scene/AutoLoad/HUD.tscn b/src/autoload/HUD.tscn similarity index 79% rename from Scene/AutoLoad/HUD.tscn rename to src/autoload/HUD.tscn index 50904ab..48f49b4 100644 --- a/Scene/AutoLoad/HUD.tscn +++ b/src/autoload/HUD.tscn @@ -1,8 +1,11 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Font/m3x6.tres" type="DynamicFont" id=1] -[ext_resource path="res://Image/timer.png" type="Texture" id=2] -[ext_resource path="res://Script/AutoLoad/HUD.gd" type="Script" id=3] +[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://assets/image/timer.png" type="Texture" id=2] +[ext_resource path="res://src/autoload/HUD.gd" type="Script" id=3] + + + diff --git a/src/autoload/Pause.gd b/src/autoload/Pause.gd new file mode 100644 index 0000000..63380bc --- /dev/null +++ b/src/autoload/Pause.gd @@ -0,0 +1,50 @@ +extends Control + +var is_paused := false +var menu_list : Label + +var cursor := 0 +var menu_items := ["resume", "options", "exit"] + + +func _ready(): + visible = false + menu_list = $List + + menu_list.text = "" + for i in menu_items: + menu_list.text += i + "\n" + + +func _process(delta): + if is_paused: + var btny = btn.p("down") - btn.p("up") + if btny: + cursor = clamp(cursor + btny, 0, menu_items.size() - 1) + menu_list.text = "" + for i in menu_items.size(): + if cursor == i: + menu_list.text += "> " + menu_list.text += menu_items[i] + "\n" + + +func _input(event): + if dev.is_open: + return + + if Input.is_action_just_pressed("pause"): + toggle_pause() + if Input.is_action_just_pressed("jump"): + toggle_pause() + + +func toggle_pause(): + is_paused = !is_paused + visible = is_paused + get_tree().paused = is_paused + + if is_paused: + pass + else: + pass + diff --git a/Scene/AutoLoad/Pause.tscn b/src/autoload/Pause.tscn similarity index 83% rename from Scene/AutoLoad/Pause.tscn rename to src/autoload/Pause.tscn index c41c21d..8de185a 100644 --- a/Scene/AutoLoad/Pause.tscn +++ b/src/autoload/Pause.tscn @@ -1,10 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Font/m3x6.tres" type="DynamicFont" id=1] -[ext_resource path="res://Image/9slice.png" type="Texture" id=2] -[ext_resource path="res://Script/AutoLoad/Pause.gd" type="Script" id=3] - - +[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://assets/image/9slice.png" type="Texture" id=2] +[ext_resource path="res://src/autoload/Pause.gd" type="Script" id=3] [node name="Pause" type="Control"] script = ExtResource( 3 ) diff --git a/Script/AutoLoad/Shared.gd b/src/autoload/Shared.gd similarity index 100% rename from Script/AutoLoad/Shared.gd rename to src/autoload/Shared.gd diff --git a/Script/AutoLoad/btn.gd b/src/autoload/btn.gd similarity index 100% rename from Script/AutoLoad/btn.gd rename to src/autoload/btn.gd diff --git a/Script/Explosion.gd b/src/fx/Explosion.gd similarity index 100% rename from Script/Explosion.gd rename to src/fx/Explosion.gd diff --git a/Scene/Explosion.tscn b/src/fx/Explosion.tscn similarity index 86% rename from Scene/Explosion.tscn rename to src/fx/Explosion.tscn index c871814..04de490 100644 --- a/Scene/Explosion.tscn +++ b/src/fx/Explosion.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Image/explode.png" type="Texture" id=1] -[ext_resource path="res://Script/Explosion.gd" type="Script" id=2] -[ext_resource path="res://Audio/SFX/Randomize7.wav" type="AudioStream" id=3] +[ext_resource path="res://src/fx/Explosion.gd" type="Script" id=1] +[ext_resource path="res://assets/image/explode.png" type="Texture" id=2] +[ext_resource path="res://assets/audio/sfx/Randomize7.wav" type="AudioStream" id=3] [sub_resource type="Animation" id=1] length = 0.45 @@ -49,10 +49,10 @@ tracks/2/keys = { [node name="Explosion" type="Node2D"] z_index = 11 z_as_relative = false -script = ExtResource( 2 ) +script = ExtResource( 1 ) [node name="Sprite" type="Sprite" parent="."] -texture = ExtResource( 1 ) +texture = ExtResource( 2 ) region_enabled = true region_rect = Rect2( 0, 0, 32, 32 ) diff --git a/Script/Explosion2.gd b/src/fx/Explosion2.gd similarity index 100% rename from Script/Explosion2.gd rename to src/fx/Explosion2.gd diff --git a/Scene/Explosion2.tscn b/src/fx/Explosion2.tscn similarity index 85% rename from Scene/Explosion2.tscn rename to src/fx/Explosion2.tscn index f5913bb..109f953 100644 --- a/Scene/Explosion2.tscn +++ b/src/fx/Explosion2.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Image/explode2.png" type="Texture" id=1] -[ext_resource path="res://Script/Explosion2.gd" type="Script" id=2] -[ext_resource path="res://Audio/SFX/portal2.wav" type="AudioStream" id=3] +[ext_resource path="res://assets/image/explode2.png" type="Texture" id=1] +[ext_resource path="res://assets/audio/sfx/portal2.wav" type="AudioStream" id=2] +[ext_resource path="res://src/fx/Explosion2.gd" type="Script" id=3] [sub_resource type="Animation" id=1] length = 0.5 @@ -49,7 +49,7 @@ tracks/2/keys = { [node name="Explosion2" type="Node2D"] z_index = 11 z_as_relative = false -script = ExtResource( 2 ) +script = ExtResource( 3 ) lerp_speed = 0.2 [node name="Sprite" type="Sprite" parent="."] @@ -62,5 +62,5 @@ autoplay = "Loop" anims/Loop = SubResource( 1 ) [node name="AudioStreamPlayer2D" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 3 ) +stream = ExtResource( 2 ) attenuation = 0.0544094 diff --git a/Map/1-1.tscn b/src/map/1-1.tscn similarity index 78% rename from Map/1-1.tscn rename to src/map/1-1.tscn index 901939f..b48d903 100644 --- a/Map/1-1.tscn +++ b/src/map/1-1.tscn @@ -1,12 +1,15 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 1 ) diff --git a/Map/1-2.tscn b/src/map/1-2.tscn similarity index 78% rename from Map/1-2.tscn rename to src/map/1-2.tscn index 46f4311..6297c10 100644 --- a/Map/1-2.tscn +++ b/src/map/1-2.tscn @@ -1,12 +1,15 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 1 ) diff --git a/Map/1-3.tscn b/src/map/1-3.tscn similarity index 76% rename from Map/1-3.tscn rename to src/map/1-3.tscn index 30af145..bfaad23 100644 --- a/Map/1-3.tscn +++ b/src/map/1-3.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=3] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=3] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 3 ) diff --git a/Map/1-4.tscn b/src/map/1-4.tscn similarity index 79% rename from Map/1-4.tscn rename to src/map/1-4.tscn index 605db3d..2f30005 100644 --- a/Map/1-4.tscn +++ b/src/map/1-4.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=5] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=5] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 5 ) diff --git a/Map/1-5.tscn b/src/map/1-5.tscn similarity index 81% rename from Map/1-5.tscn rename to src/map/1-5.tscn index c6347b5..a5973a4 100644 --- a/Map/1-5.tscn +++ b/src/map/1-5.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=5] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=5] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 5 ) diff --git a/Map/1-6.tscn b/src/map/1-6.tscn similarity index 82% rename from Map/1-6.tscn rename to src/map/1-6.tscn index 9a2b345..01b75ae 100644 --- a/Map/1-6.tscn +++ b/src/map/1-6.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=7] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=8] +[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 8 ) diff --git a/Map/1-7.tscn b/src/map/1-7.tscn similarity index 85% rename from Map/1-7.tscn rename to src/map/1-7.tscn index ee21410..f835023 100644 --- a/Map/1-7.tscn +++ b/src/map/1-7.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Box.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=7] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=8] +[ext_resource path="res://src/actor/Box.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=8] + + + [node name="Stage" type="Node2D"] script = ExtResource( 8 ) diff --git a/Map/map_jump_test.tscn b/src/map/map_jump_test.tscn similarity index 82% rename from Map/map_jump_test.tscn rename to src/map/map_jump_test.tscn index 7ba943a..9456025 100644 --- a/Map/map_jump_test.tscn +++ b/src/map/map_jump_test.tscn @@ -1,12 +1,15 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] + + + diff --git a/Map/map_switch.tscn b/src/map/map_switch.tscn similarity index 81% rename from Map/map_switch.tscn rename to src/map/map_switch.tscn index c12de82..b419c0d 100644 --- a/Map/map_switch.tscn +++ b/src/map/map_switch.tscn @@ -1,17 +1,20 @@ [gd_scene load_steps=13 format=2] -[ext_resource path="res://Scene/Actor/SwitchBlock.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Actor/SwitchBlue.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] -[ext_resource path="res://Scene/Actor/Switch.tscn" type="PackedScene" id=9] -[ext_resource path="res://Scene/Actor/SwitchBlockBlue.tscn" type="PackedScene" id=10] -[ext_resource path="res://Scene/Actor/Passthrough.tscn" type="PackedScene" id=11] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=12] +[ext_resource path="res://src/actor/SwitchBlock.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/actor/SwitchBlue.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/actor/Switch.tscn" type="PackedScene" id=9] +[ext_resource path="res://src/actor/SwitchBlockBlue.tscn" type="PackedScene" id=10] +[ext_resource path="res://src/actor/Passthrough.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=12] + + + diff --git a/Map/map_tread.tscn b/src/map/map_tread.tscn similarity index 81% rename from Map/map_tread.tscn rename to src/map/map_tread.tscn index 5fb4c80..10cf7f4 100644 --- a/Map/map_tread.tscn +++ b/src/map/map_tread.tscn @@ -1,13 +1,16 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Scene/Actor/Treadmill.tscn" type="PackedScene" id=1] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=7] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=8] -[ext_resource path="res://Script/Stage/Stage.gd" type="Script" id=10] +[ext_resource path="res://src/actor/Treadmill.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/stage/Stage.gd" type="Script" id=10] + + + diff --git a/Map/world.tscn b/src/map/world.tscn similarity index 84% rename from Map/world.tscn rename to src/map/world.tscn index 039de96..5c8a1ab 100644 --- a/Map/world.tscn +++ b/src/map/world.tscn @@ -1,12 +1,15 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Scene/Stage/SpikeTileMap.tscn" type="PackedScene" id=2] -[ext_resource path="res://Scene/Actor/Exit.tscn" type="PackedScene" id=3] -[ext_resource path="res://Scene/Stage/SolidTileMap.tscn" type="PackedScene" id=4] -[ext_resource path="res://Scene/Actor/Player.tscn" type="PackedScene" id=5] -[ext_resource path="res://Scene/Stage/DetailTileMap.tscn" type="PackedScene" id=6] -[ext_resource path="res://Scene/Stage/GameCamera.tscn" type="PackedScene" id=7] -[ext_resource path="res://Script/Hub.gd" type="Script" id=8] +[ext_resource path="res://src/stage/SpikeTileMap.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/actor/Exit.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/stage/SolidTileMap.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/actor/Player.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/stage/DetailTileMap.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/stage/GameCamera.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/stage/Hub.gd" type="Script" id=8] + + + [node name="Hub" type="Node2D"] script = ExtResource( 8 ) diff --git a/Script/MapSelect.gd b/src/menu/MapSelect.gd similarity index 81% rename from Script/MapSelect.gd rename to src/menu/MapSelect.gd index 89aa7a3..835ae37 100644 --- a/Script/MapSelect.gd +++ b/src/menu/MapSelect.gd @@ -5,6 +5,7 @@ extends Node2D var label_list : RichTextLabel var label_info : RichTextLabel +var map_path := "res://src/map/" var map_list : String var maps : PoolStringArray = [] var cursor := 0 @@ -20,7 +21,7 @@ func _ready(): map_list = "" var dir = Directory.new() - if dir.open("res://Map") == OK: + if dir.open(map_path) == OK: dir.list_dir_begin(true, true) var file_name = dir.get_next() while file_name: @@ -42,7 +43,7 @@ func _process(delta): if btn.p("action"): Shared.map_name = maps[cursor] - get_tree().change_scene("res://Map/" + maps[cursor] + ".tscn") + get_tree().change_scene(map_path + maps[cursor] + ".tscn") func scroll(arg = 0): @@ -54,7 +55,7 @@ func scroll(arg = 0): func info(): label_info.text = str(cursor) + " / " + maps[cursor] + "\n" for i in Shared.stage_data: - if i.has("file") and i.file == "res://Map/" + maps[cursor] + ".tscn": + if i.has("file") and i.file == map_path + maps[cursor] + ".tscn": for j in i.size(): label_info.text += str(i.keys()[j]) + ": " + str(i.values()[j]) + "\n" break @@ -63,8 +64,8 @@ func view_map(): for i in viewport.get_children(): i.queue_free() - if ResourceLoader.exists("res://Map/" + maps[cursor] + ".tscn"): - var m = load("res://Map/" + maps[cursor] + ".tscn").instance() + if ResourceLoader.exists(map_path + maps[cursor] + ".tscn"): + var m = load(map_path + maps[cursor] + ".tscn").instance() viewport.add_child(m) for i in get_tree().get_nodes_in_group("player"): i.set_process(false) # dont process player diff --git a/Scene/select.tscn b/src/menu/select.tscn similarity index 92% rename from Scene/select.tscn rename to src/menu/select.tscn index d9fa44c..4590e65 100644 --- a/Scene/select.tscn +++ b/src/menu/select.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Font/m3x6.tres" type="DynamicFont" id=1] -[ext_resource path="res://Script/MapSelect.gd" type="Script" id=2] +[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://src/menu/MapSelect.gd" type="Script" id=2] [node name="Node2D" type="Node2D"] position = Vector2( 1, 1 ) diff --git a/Shader/scrollx.shader b/src/shader/scrollx.shader similarity index 100% rename from Shader/scrollx.shader rename to src/shader/scrollx.shader diff --git a/Scene/Stage/DetailTileMap.tscn b/src/stage/DetailTileMap.tscn similarity index 94% rename from Scene/Stage/DetailTileMap.tscn rename to src/stage/DetailTileMap.tscn index 9f8b690..7a4bb5c 100644 --- a/Scene/Stage/DetailTileMap.tscn +++ b/src/stage/DetailTileMap.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Image/crate_tiles.png" type="Texture" id=1] -[ext_resource path="res://Image/bricks.png" type="Texture" id=2] +[ext_resource path="res://assets/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://assets/image/bricks.png" type="Texture" id=2] + [sub_resource type="TileSet" id=1] 0/name = "crate_tiles.png 0" diff --git a/Script/Stage/GameCamera.gd b/src/stage/GameCamera.gd similarity index 100% rename from Script/Stage/GameCamera.gd rename to src/stage/GameCamera.gd diff --git a/Scene/Stage/GameCamera.tscn b/src/stage/GameCamera.tscn similarity index 84% rename from Scene/Stage/GameCamera.tscn rename to src/stage/GameCamera.tscn index 52822ed..10e2d44 100644 --- a/Scene/Stage/GameCamera.tscn +++ b/src/stage/GameCamera.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Script/Stage/GameCamera.gd" type="Script" id=1] +[ext_resource path="res://src/stage/GameCamera.gd" type="Script" id=1] + [node name="GameCamera" type="Camera2D"] diff --git a/Script/Hub.gd b/src/stage/Hub.gd similarity index 100% rename from Script/Hub.gd rename to src/stage/Hub.gd diff --git a/Script/Stage/SolidTileMap.gd b/src/stage/SolidTileMap.gd similarity index 100% rename from Script/Stage/SolidTileMap.gd rename to src/stage/SolidTileMap.gd diff --git a/Scene/Stage/SolidTileMap.tscn b/src/stage/SolidTileMap.tscn similarity index 85% rename from Scene/Stage/SolidTileMap.tscn rename to src/stage/SolidTileMap.tscn index 7dcad93..0c28b21 100644 --- a/Scene/Stage/SolidTileMap.tscn +++ b/src/stage/SolidTileMap.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Script/Stage/SolidTileMap.gd" type="Script" id=1] -[ext_resource path="res://Image/solid_bricks.png" type="Texture" id=2] +[ext_resource path="res://src/stage/SolidTileMap.gd" type="Script" id=1] +[ext_resource path="res://assets/image/solid_bricks.png" type="Texture" id=2] + + [sub_resource type="TileSet" id=1] diff --git a/Script/Stage/SpikeTileMap.gd b/src/stage/SpikeTileMap.gd similarity index 85% rename from Script/Stage/SpikeTileMap.gd rename to src/stage/SpikeTileMap.gd index a8f7b30..2bf679c 100644 --- a/Script/Stage/SpikeTileMap.gd +++ b/src/stage/SpikeTileMap.gd @@ -1,7 +1,7 @@ extends TileMap -var scene_spike = preload("res://Scene/Actor/Spike.tscn") +var scene_spike = preload("res://src/actor/Spike.tscn") # Called when the node enters the scene tree for the first time. func _ready(): diff --git a/Scene/Stage/SpikeTileMap.tscn b/src/stage/SpikeTileMap.tscn similarity index 80% rename from Scene/Stage/SpikeTileMap.tscn rename to src/stage/SpikeTileMap.tscn index 9e4b979..5068271 100644 --- a/Scene/Stage/SpikeTileMap.tscn +++ b/src/stage/SpikeTileMap.tscn @@ -1,7 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://Image/crate_tiles.png" type="Texture" id=1] -[ext_resource path="res://Script/Stage/SpikeTileMap.gd" type="Script" id=2] +[ext_resource path="res://assets/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://src/stage/SpikeTileMap.gd" type="Script" id=2] + + [sub_resource type="TileSet" id=1] diff --git a/Script/Stage/Stage.gd b/src/stage/Stage.gd similarity index 100% rename from Script/Stage/Stage.gd rename to src/stage/Stage.gd