diff --git a/assets/3d/DefaultMaterial.material b/media/3d/DefaultMaterial.material similarity index 100% rename from assets/3d/DefaultMaterial.material rename to media/3d/DefaultMaterial.material diff --git a/assets/3d/Material.material b/media/3d/Material.material similarity index 100% rename from assets/3d/Material.material rename to media/3d/Material.material diff --git a/assets/3d/crt.fbx b/media/3d/crt.fbx similarity index 100% rename from assets/3d/crt.fbx rename to media/3d/crt.fbx diff --git a/assets/3d/mac_classic.fbx b/media/3d/mac_classic.fbx similarity index 100% rename from assets/3d/mac_classic.fbx rename to media/3d/mac_classic.fbx diff --git a/assets/audio/sfx/Randomize7.wav b/media/audio/sfx/Randomize7.wav similarity index 100% rename from assets/audio/sfx/Randomize7.wav rename to media/audio/sfx/Randomize7.wav diff --git a/assets/audio/sfx/box_drop.wav b/media/audio/sfx/box_drop.wav similarity index 100% rename from assets/audio/sfx/box_drop.wav rename to media/audio/sfx/box_drop.wav diff --git a/assets/audio/sfx/box_pickup.wav b/media/audio/sfx/box_pickup.wav similarity index 100% rename from assets/audio/sfx/box_pickup.wav rename to media/audio/sfx/box_pickup.wav diff --git a/assets/audio/sfx/box_throw.wav b/media/audio/sfx/box_throw.wav similarity index 100% rename from assets/audio/sfx/box_throw.wav rename to media/audio/sfx/box_throw.wav diff --git a/assets/audio/sfx/box_throw_long.wav b/media/audio/sfx/box_throw_long.wav similarity index 100% rename from assets/audio/sfx/box_throw_long.wav rename to media/audio/sfx/box_throw_long.wav diff --git a/assets/audio/sfx/btn3.wav b/media/audio/sfx/btn3.wav similarity index 100% rename from assets/audio/sfx/btn3.wav rename to media/audio/sfx/btn3.wav diff --git a/assets/audio/sfx/button.wav b/media/audio/sfx/button.wav similarity index 100% rename from assets/audio/sfx/button.wav rename to media/audio/sfx/button.wav diff --git a/assets/audio/sfx/hit0.wav b/media/audio/sfx/hit0.wav similarity index 100% rename from assets/audio/sfx/hit0.wav rename to media/audio/sfx/hit0.wav diff --git a/assets/audio/sfx/hit1.wav b/media/audio/sfx/hit1.wav similarity index 100% rename from assets/audio/sfx/hit1.wav rename to media/audio/sfx/hit1.wav diff --git a/assets/audio/sfx/hit10.wav b/media/audio/sfx/hit10.wav similarity index 100% rename from assets/audio/sfx/hit10.wav rename to media/audio/sfx/hit10.wav diff --git a/assets/audio/sfx/hit14.wav b/media/audio/sfx/hit14.wav similarity index 100% rename from assets/audio/sfx/hit14.wav rename to media/audio/sfx/hit14.wav diff --git a/assets/audio/sfx/hit6.wav b/media/audio/sfx/hit6.wav similarity index 100% rename from assets/audio/sfx/hit6.wav rename to media/audio/sfx/hit6.wav diff --git a/assets/audio/sfx/hit9.wav b/media/audio/sfx/hit9.wav similarity index 100% rename from assets/audio/sfx/hit9.wav rename to media/audio/sfx/hit9.wav diff --git a/assets/audio/sfx/jump1.wav b/media/audio/sfx/jump1.wav similarity index 100% rename from assets/audio/sfx/jump1.wav rename to media/audio/sfx/jump1.wav diff --git a/assets/audio/sfx/player_die.wav b/media/audio/sfx/player_die.wav similarity index 100% rename from assets/audio/sfx/player_die.wav rename to media/audio/sfx/player_die.wav diff --git a/assets/audio/sfx/player_jump.wav b/media/audio/sfx/player_jump.wav similarity index 100% rename from assets/audio/sfx/player_jump.wav rename to media/audio/sfx/player_jump.wav diff --git a/assets/audio/sfx/portal2.wav b/media/audio/sfx/portal2.wav similarity index 100% rename from assets/audio/sfx/portal2.wav rename to media/audio/sfx/portal2.wav diff --git a/assets/audio/sfx/sfx10.wav b/media/audio/sfx/sfx10.wav similarity index 100% rename from assets/audio/sfx/sfx10.wav rename to media/audio/sfx/sfx10.wav diff --git a/assets/audio/sfx/sfx4.wav b/media/audio/sfx/sfx4.wav similarity index 100% rename from assets/audio/sfx/sfx4.wav rename to media/audio/sfx/sfx4.wav diff --git a/assets/audio/sfx/sfx5.wav b/media/audio/sfx/sfx5.wav similarity index 100% rename from assets/audio/sfx/sfx5.wav rename to media/audio/sfx/sfx5.wav diff --git a/assets/audio/sfx/wipe.wav b/media/audio/sfx/wipe.wav similarity index 100% rename from assets/audio/sfx/wipe.wav rename to media/audio/sfx/wipe.wav diff --git a/assets/font/m3x6.tres b/media/font/m3x6.tres similarity index 60% rename from assets/font/m3x6.tres rename to media/font/m3x6.tres index d8735d2..0627311 100644 --- a/assets/font/m3x6.tres +++ b/media/font/m3x6.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://assets/font/m3x6.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://media/font/m3x6.ttf" type="DynamicFontData" id=1] [resource] extra_spacing_top = -5 diff --git a/assets/font/m3x6.ttf b/media/font/m3x6.ttf similarity index 100% rename from assets/font/m3x6.ttf rename to media/font/m3x6.ttf diff --git a/assets/font/m5x7.tres b/media/font/m5x7.tres similarity index 65% rename from assets/font/m5x7.tres rename to media/font/m5x7.tres index e2d4b15..4dd9832 100644 --- a/assets/font/m5x7.tres +++ b/media/font/m5x7.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://assets/font/m5x7.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://media/font/m5x7.ttf" type="DynamicFontData" id=1] [resource] extra_spacing_top = -4 diff --git a/assets/font/m5x7.ttf b/media/font/m5x7.ttf similarity index 100% rename from assets/font/m5x7.ttf rename to media/font/m5x7.ttf diff --git a/assets/font/m6x11.tres b/media/font/m6x11.tres similarity index 61% rename from assets/font/m6x11.tres rename to media/font/m6x11.tres index 691de12..d1dd4cd 100644 --- a/assets/font/m6x11.tres +++ b/media/font/m6x11.tres @@ -1,6 +1,6 @@ [gd_resource type="DynamicFont" load_steps=2 format=2] -[ext_resource path="res://assets/font/m6x11.ttf" type="DynamicFontData" id=1] +[ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=1] [resource] extra_spacing_bottom = -1 diff --git a/assets/font/m6x11.ttf b/media/font/m6x11.ttf similarity index 100% rename from assets/font/m6x11.ttf rename to media/font/m6x11.ttf diff --git a/assets/image/1pixel.png b/media/image/1pixel.png similarity index 100% rename from assets/image/1pixel.png rename to media/image/1pixel.png diff --git a/assets/image/8pixel.png b/media/image/8pixel.png similarity index 100% rename from assets/image/8pixel.png rename to media/image/8pixel.png diff --git a/assets/image/9slice.png b/media/image/9slice.png similarity index 100% rename from assets/image/9slice.png rename to media/image/9slice.png diff --git a/assets/image/box.png b/media/image/box.png similarity index 100% rename from assets/image/box.png rename to media/image/box.png diff --git a/assets/image/brickA.png b/media/image/brickA.png similarity index 100% rename from assets/image/brickA.png rename to media/image/brickA.png diff --git a/assets/image/brickA100.png b/media/image/brickA100.png similarity index 100% rename from assets/image/brickA100.png rename to media/image/brickA100.png diff --git a/assets/image/brickB.png b/media/image/brickB.png similarity index 100% rename from assets/image/brickB.png rename to media/image/brickB.png diff --git a/assets/image/bricks.png b/media/image/bricks.png similarity index 100% rename from assets/image/bricks.png rename to media/image/bricks.png diff --git a/assets/image/btn.png b/media/image/btn.png similarity index 100% rename from assets/image/btn.png rename to media/image/btn.png diff --git a/assets/image/corner.png b/media/image/corner.png similarity index 100% rename from assets/image/corner.png rename to media/image/corner.png diff --git a/assets/image/crate.png b/media/image/crate.png similarity index 100% rename from assets/image/crate.png rename to media/image/crate.png diff --git a/assets/image/crate_tiles.png b/media/image/crate_tiles.png similarity index 100% rename from assets/image/crate_tiles.png rename to media/image/crate_tiles.png diff --git a/assets/image/door.png b/media/image/door.png similarity index 100% rename from assets/image/door.png rename to media/image/door.png diff --git a/assets/image/explode.png b/media/image/explode.png similarity index 100% rename from assets/image/explode.png rename to media/image/explode.png diff --git a/assets/image/explode2.png b/media/image/explode2.png similarity index 100% rename from assets/image/explode2.png rename to media/image/explode2.png diff --git a/assets/image/guy.png b/media/image/guy.png similarity index 100% rename from assets/image/guy.png rename to media/image/guy.png diff --git a/assets/image/hud2.png b/media/image/hud2.png similarity index 100% rename from assets/image/hud2.png rename to media/image/hud2.png diff --git a/assets/image/pixel.png b/media/image/pixel.png similarity index 100% rename from assets/image/pixel.png rename to media/image/pixel.png diff --git a/assets/image/player.png b/media/image/player.png similarity index 100% rename from assets/image/player.png rename to media/image/player.png diff --git a/assets/image/portal.json b/media/image/portal.json similarity index 100% rename from assets/image/portal.json rename to media/image/portal.json diff --git a/assets/image/portal.png b/media/image/portal.png similarity index 100% rename from assets/image/portal.png rename to media/image/portal.png diff --git a/assets/image/solid_bricks.png b/media/image/solid_bricks.png similarity index 100% rename from assets/image/solid_bricks.png rename to media/image/solid_bricks.png diff --git a/assets/image/spike.png b/media/image/spike.png similarity index 100% rename from assets/image/spike.png rename to media/image/spike.png diff --git a/assets/image/star.png b/media/image/star.png similarity index 100% rename from assets/image/star.png rename to media/image/star.png diff --git a/assets/image/timer.png b/media/image/timer.png similarity index 100% rename from assets/image/timer.png rename to media/image/timer.png diff --git a/assets/image/tread.png b/media/image/tread.png similarity index 100% rename from assets/image/tread.png rename to media/image/tread.png diff --git a/assets/image/wipe.json b/media/image/wipe.json similarity index 100% rename from assets/image/wipe.json rename to media/image/wipe.json diff --git a/assets/image/wipe.png b/media/image/wipe.png similarity index 100% rename from assets/image/wipe.png rename to media/image/wipe.png diff --git a/src/3d/MonitorScene.tscn b/src/3d/MonitorScene.tscn index 4054463..06d57c1 100644 --- a/src/3d/MonitorScene.tscn +++ b/src/3d/MonitorScene.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=11 format=2] [ext_resource path="res://src/map/06.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] +[ext_resource path="res://media/3d/DefaultMaterial.material" type="Material" id=2] +[ext_resource path="res://media/3d/Material.material" type="Material" id=3] + [sub_resource type="CubeMesh" id=1] diff --git a/src/actor/Box.tscn b/src/actor/Box.tscn index 1abe030..a576ad8 100644 --- a/src/actor/Box.tscn +++ b/src/actor/Box.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://assets/image/crate_tiles.png" type="Texture" id=1] -[ext_resource path="res://assets/audio/sfx/hit10.wav" type="AudioStream" id=2] +[ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://media/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" length = 0.4 diff --git a/src/actor/Door.tscn b/src/actor/Door.tscn index 9588e48..3710f42 100644 --- a/src/actor/Door.tscn +++ b/src/actor/Door.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://assets/image/door.png" type="Texture" id=1] +[ext_resource path="res://media/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] +[ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=3] + diff --git a/src/actor/Exit.tscn b/src/actor/Exit.tscn index 3c9fe86..15fa5e1 100644 --- a/src/actor/Exit.tscn +++ b/src/actor/Exit.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://assets/image/portal.png" type="Texture" id=1] +[ext_resource path="res://media/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://media/image/pixel.png" type="Texture" id=3] +[ext_resource path="res://media/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 loop = true diff --git a/src/actor/Passthrough.tscn b/src/actor/Passthrough.tscn index bc3c155..7a8abaf 100644 --- a/src/actor/Passthrough.tscn +++ b/src/actor/Passthrough.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=2] [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] +[ext_resource path="res://media/image/crate.png" type="Texture" id=2] +[ext_resource path="res://media/audio/sfx/hit0.wav" type="AudioStream" id=3] + [node name="Passthrough" type="Node2D" groups=[ "actor", diff --git a/src/actor/Player.tscn b/src/actor/Player.tscn index 687d3df..035dbe2 100644 --- a/src/actor/Player.tscn +++ b/src/actor/Player.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=13 format=2] [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] +[ext_resource path="res://media/audio/sfx/player_jump.wav" type="AudioStream" id=2] +[ext_resource path="res://media/image/player.png" type="Texture" id=3] +[ext_resource path="res://media/audio/sfx/btn3.wav" type="AudioStream" id=4] +[ext_resource path="res://media/audio/sfx/sfx10.wav" type="AudioStream" id=5] +[ext_resource path="res://media/audio/sfx/box_drop.wav" type="AudioStream" id=6] + [sub_resource type="Animation" id=1] length = 0.6 diff --git a/src/actor/Spike.tscn b/src/actor/Spike.tscn index 8892040..04cd84c 100644 --- a/src/actor/Spike.tscn +++ b/src/actor/Spike.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] [ext_resource path="res://src/actor/Actor.gd" type="Script" id=2] -[ext_resource path="res://assets/image/spike.png" type="Texture" id=3] +[ext_resource path="res://media/image/spike.png" type="Texture" id=3] + [node name="Spike" type="Node2D" groups=[ "actor", diff --git a/src/actor/Switch.tscn b/src/actor/Switch.tscn index 784f4f9..7d4adee 100644 --- a/src/actor/Switch.tscn +++ b/src/actor/Switch.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://assets/image/crate.png" type="Texture" id=1] +[ext_resource path="res://media/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] +[ext_resource path="res://media/audio/sfx/btn3.wav" type="AudioStream" id=3] + diff --git a/src/actor/SwitchBlock.tscn b/src/actor/SwitchBlock.tscn index d4aeb7a..a7ba5e4 100644 --- a/src/actor/SwitchBlock.tscn +++ b/src/actor/SwitchBlock.tscn @@ -1,11 +1,12 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/image/crate.png" type="Texture" id=1] +[ext_resource path="res://media/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=[ "actor", ]] diff --git a/src/actor/Treadmill.tscn b/src/actor/Treadmill.tscn index 620c8e3..decf105 100644 --- a/src/actor/Treadmill.tscn +++ b/src/actor/Treadmill.tscn @@ -1,13 +1,14 @@ [gd_scene load_steps=5 format=2] [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://media/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] shader = ExtResource( 3 ) shader_param/speed = 4.0 diff --git a/src/autoload/DevConsole.tscn b/src/autoload/DevConsole.tscn index 6db635d..c29b6ac 100644 --- a/src/autoload/DevConsole.tscn +++ b/src/autoload/DevConsole.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=12 format=2] [ext_resource path="res://src/autoload/DevConsole.gd" type="Script" id=2] -[ext_resource path="res://assets/font/m3x6.ttf" type="DynamicFontData" id=3] +[ext_resource path="res://media/font/m3x6.ttf" type="DynamicFontData" id=3] + [sub_resource type="StyleBoxFlat" id=1] bg_color = Color( 0.247059, 0.247059, 0.247059, 0.247059 ) diff --git a/src/autoload/HUD.tscn b/src/autoload/HUD.tscn index 8580d17..f8ce42c 100644 --- a/src/autoload/HUD.tscn +++ b/src/autoload/HUD.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=6 format=2] -[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://media/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://media/image/timer.png" type="Texture" id=2] [ext_resource path="res://src/autoload/HUD.gd" type="Script" id=3] -[ext_resource path="res://assets/image/hud2.png" type="Texture" id=4] +[ext_resource path="res://media/image/hud2.png" type="Texture" id=4] [ext_resource path="res://src/fx/Wipe.tscn" type="PackedScene" id=5] [node name="HUD" type="CanvasLayer"] diff --git a/src/autoload/Pause.tscn b/src/autoload/Pause.tscn index 5c78df8..83399e1 100644 --- a/src/autoload/Pause.tscn +++ b/src/autoload/Pause.tscn @@ -1,12 +1,13 @@ [gd_scene load_steps=8 format=2] -[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://media/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://media/image/9slice.png" type="Texture" id=2] [ext_resource path="res://src/autoload/Pause.gd" type="Script" id=3] -[ext_resource path="res://assets/image/8pixel.png" type="Texture" id=4] -[ext_resource path="res://assets/font/m6x11.ttf" type="DynamicFontData" id=5] +[ext_resource path="res://media/image/8pixel.png" type="Texture" id=4] +[ext_resource path="res://media/font/m6x11.ttf" type="DynamicFontData" id=5] [ext_resource path="res://src/menu/Buttons/bSelect.tscn" type="PackedScene" id=6] + [sub_resource type="DynamicFont" id=1] outline_size = 1 outline_color = Color( 0, 0, 0, 1 ) diff --git a/src/fx/Explosion.tscn b/src/fx/Explosion.tscn index 04de490..f75638f 100644 --- a/src/fx/Explosion.tscn +++ b/src/fx/Explosion.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=5 format=2] [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] +[ext_resource path="res://media/image/explode.png" type="Texture" id=2] +[ext_resource path="res://media/audio/sfx/Randomize7.wav" type="AudioStream" id=3] + [sub_resource type="Animation" id=1] length = 0.45 diff --git a/src/fx/Explosion2.tscn b/src/fx/Explosion2.tscn index 109f953..f394030 100644 --- a/src/fx/Explosion2.tscn +++ b/src/fx/Explosion2.tscn @@ -1,9 +1,10 @@ [gd_scene load_steps=5 format=2] -[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://media/image/explode2.png" type="Texture" id=1] +[ext_resource path="res://media/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 step = 0.01 diff --git a/src/fx/Wipe.tscn b/src/fx/Wipe.tscn index 0bebb93..ca6965c 100644 --- a/src/fx/Wipe.tscn +++ b/src/fx/Wipe.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://assets/image/wipe.png" type="Texture" id=1] -[ext_resource path="res://assets/audio/sfx/wipe.wav" type="AudioStream" id=2] +[ext_resource path="res://media/image/wipe.png" type="Texture" id=1] +[ext_resource path="res://media/audio/sfx/wipe.wav" type="AudioStream" id=2] [sub_resource type="GDScript" id=1] script/source = "extends Node2D diff --git a/src/map/21.tscn b/src/map/21.tscn index 1d94bc0..1538179 100644 --- a/src/map/21.tscn +++ b/src/map/21.tscn @@ -8,8 +8,9 @@ [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/actor/Exit.tscn" type="PackedScene" id=8] -[ext_resource path="res://assets/image/solid_bricks.png" type="Texture" id=10] -[ext_resource path="res://assets/image/brickA.png" type="Texture" id=11] +[ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=10] +[ext_resource path="res://media/image/brickA.png" type="Texture" id=11] + [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" diff --git a/src/map/22.tscn b/src/map/22.tscn index a052b6f..9831d67 100644 --- a/src/map/22.tscn +++ b/src/map/22.tscn @@ -8,8 +8,9 @@ [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/actor/Exit.tscn" type="PackedScene" id=8] -[ext_resource path="res://assets/image/solid_bricks.png" type="Texture" id=9] -[ext_resource path="res://assets/image/brickA.png" type="Texture" id=10] +[ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=9] +[ext_resource path="res://media/image/brickA.png" type="Texture" id=10] + [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" diff --git a/src/menu/Buttons/bGame.tscn b/src/menu/Buttons/bGame.tscn index 68e409c..ee78475 100644 --- a/src/menu/Buttons/bGame.tscn +++ b/src/menu/Buttons/bGame.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/font/m6x11.tres" type="DynamicFont" id=1] -[ext_resource path="res://assets/image/btn.png" type="Texture" id=2] +[ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=1] +[ext_resource path="res://media/image/btn.png" type="Texture" id=2] [node name="Buttons" type="Node2D"] diff --git a/src/menu/Buttons/bPause.tscn b/src/menu/Buttons/bPause.tscn index 2def014..41e545f 100644 --- a/src/menu/Buttons/bPause.tscn +++ b/src/menu/Buttons/bPause.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/font/m6x11.tres" type="DynamicFont" id=1] -[ext_resource path="res://assets/image/btn.png" type="Texture" id=2] +[ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=1] +[ext_resource path="res://media/image/btn.png" type="Texture" id=2] [node name="Buttons" type="Node2D"] diff --git a/src/menu/Buttons/bSelect.tscn b/src/menu/Buttons/bSelect.tscn index 6098eb4..013a500 100644 --- a/src/menu/Buttons/bSelect.tscn +++ b/src/menu/Buttons/bSelect.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/image/btn.png" type="Texture" id=1] -[ext_resource path="res://assets/font/m6x11.tres" type="DynamicFont" id=2] +[ext_resource path="res://media/image/btn.png" type="Texture" id=1] +[ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=2] [node name="Buttons" type="Node2D"] diff --git a/src/menu/StartMenu.tscn b/src/menu/StartMenu.tscn index 49be8bf..0c8fe05 100644 --- a/src/menu/StartMenu.tscn +++ b/src/menu/StartMenu.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=1] +[ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=1] [sub_resource type="GDScript" id=1] script/source = "extends Node2D diff --git a/src/menu/select.tscn b/src/menu/select.tscn index 65ac969..28e065d 100644 --- a/src/menu/select.tscn +++ b/src/menu/select.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=10 format=2] -[ext_resource path="res://assets/image/corner.png" type="Texture" id=1] -[ext_resource path="res://assets/font/m3x6.tres" type="DynamicFont" id=2] -[ext_resource path="res://assets/image/btn.png" type="Texture" id=3] -[ext_resource path="res://assets/font/m6x11.tres" type="DynamicFont" id=4] +[ext_resource path="res://media/image/corner.png" type="Texture" id=1] +[ext_resource path="res://media/font/m3x6.tres" type="DynamicFont" id=2] +[ext_resource path="res://media/image/btn.png" type="Texture" id=3] +[ext_resource path="res://media/font/m6x11.tres" type="DynamicFont" id=4] [ext_resource path="res://src/menu/Buttons/bSelect.tscn" type="PackedScene" id=5] [ext_resource path="res://src/shader/outline2D_outer.shader" type="Shader" id=6] diff --git a/src/stage/DetailTileMap.tscn b/src/stage/DetailTileMap.tscn index 7a4bb5c..acf98a7 100644 --- a/src/stage/DetailTileMap.tscn +++ b/src/stage/DetailTileMap.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=4 format=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] +[ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://media/image/bricks.png" type="Texture" id=2] + [sub_resource type="TileSet" id=1] diff --git a/src/stage/SolidTileMap.tscn b/src/stage/SolidTileMap.tscn index b5cc30c..e09c743 100644 --- a/src/stage/SolidTileMap.tscn +++ b/src/stage/SolidTileMap.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://assets/image/solid_bricks.png" type="Texture" id=2] +[ext_resource path="res://media/image/solid_bricks.png" type="Texture" id=2] + [sub_resource type="TileSet" id=1] 0/name = "solid_bricks.png 0" diff --git a/src/stage/SpikeTileMap.tscn b/src/stage/SpikeTileMap.tscn index 855c4b8..ffb3461 100644 --- a/src/stage/SpikeTileMap.tscn +++ b/src/stage/SpikeTileMap.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=4 format=2] -[ext_resource path="res://assets/image/crate_tiles.png" type="Texture" id=1] +[ext_resource path="res://media/image/crate_tiles.png" type="Texture" id=1] + [sub_resource type="TileSet" id=1] 0/name = "crate_tiles.png 0"