diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index a039d07..d2c83f5 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -117,5 +117,9 @@ playing = true [node name="Storage" parent="." instance=ExtResource("4_5jw5g")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, -5.2771) +[node name="Storage2" parent="." instance=ExtResource("4_5jw5g")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.31598, 0.0193453, 0.876562) +currentType = 2 + [node name="Cannon" parent="." instance=ExtResource("5_vgxqe")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4817, 1.2303, 0.0486939) diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 95d3164..b9c01a4 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -1,13 +1,18 @@ -[gd_scene load_steps=14 format=3 uid="uid://ckkn7rha3voqv"] +[gd_scene load_steps=19 format=3 uid="uid://bikdn7ep2vpxw"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_mcmgl"] [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="2_xoa1a"] [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_x8j45"] -[ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_jkvql"] -[ext_resource type="Texture2D" uid="uid://d1m2jplf8u0h0" path="res://Nodes/walking_ball1.png" id="5_agdvf"] -[ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="6_lxfv3"] -[ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="7_35jf0"] -[ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_cgycp"] +[ext_resource type="Texture2D" uid="uid://cxfybbp5idjwg" path="res://o_idle1.png" id="4_7ygjr"] +[ext_resource type="Texture2D" uid="uid://dh6hvv1lfdnm1" path="res://o_idle2.png" id="5_p3dnb"] +[ext_resource type="Texture2D" uid="uid://c1v5tc8lk8pdo" path="res://o_walking_ball1.png" id="6_feotg"] +[ext_resource type="Texture2D" uid="uid://bjrhp4dqckoxf" path="res://o_walking1.png" id="7_4lb8v"] +[ext_resource type="Texture2D" uid="uid://ci4yd4vjr17o1" path="res://o_walking_coal1.png" id="7_jsqie"] +[ext_resource type="Texture2D" uid="uid://os0kogn0mkus" path="res://o_walking_powder1.png" id="7_lwj85"] +[ext_resource type="Texture2D" uid="uid://j7jwtqmvg0m8" path="res://o_walking2.png" id="8_isr5o"] +[ext_resource type="Texture2D" uid="uid://djsergj3l4t2c" path="res://o_walking_ball2.png" id="9_rt6ws"] +[ext_resource type="Texture2D" uid="uid://ctssikrodjqvc" path="res://o_walking_powder2.png" id="11_eefgn"] +[ext_resource type="Texture2D" uid="uid://nctqw3vt5q0y" path="res://o_walking_coal2.png" id="12_581v4"] [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"] size = Vector3(1, 3.77669, 24) @@ -23,25 +28,45 @@ size = Vector3(1, 6, 9.05915) [sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"] animations = [{ -"frames": [ExtResource("4_jkvql")], +"frames": [ExtResource("4_7ygjr"), ExtResource("5_p3dnb")], "loop": true, "name": &"idle", -"speed": 1.0 +"speed": 2.0 }, { -"frames": [ExtResource("5_agdvf")], +"frames": [ExtResource("6_feotg")], "loop": true, "name": &"idle_ball", "speed": 1.0 }, { -"frames": [ExtResource("6_lxfv3"), ExtResource("7_35jf0")], +"frames": [ExtResource("7_jsqie")], +"loop": true, +"name": &"idle_coal", +"speed": 1.0 +}, { +"frames": [ExtResource("7_lwj85")], +"loop": true, +"name": &"idle_powder", +"speed": 1.0 +}, { +"frames": [ExtResource("7_4lb8v"), ExtResource("8_isr5o")], "loop": true, "name": &"walking", "speed": 2.0 }, { -"frames": [ExtResource("5_agdvf"), ExtResource("8_cgycp")], +"frames": [ExtResource("6_feotg"), ExtResource("9_rt6ws")], "loop": true, "name": &"walking_ball", "speed": 2.0 +}, { +"frames": [ExtResource("7_jsqie"), ExtResource("12_581v4")], +"loop": true, +"name": &"walking_coal", +"speed": 2.0 +}, { +"frames": [ExtResource("7_lwj85"), ExtResource("11_eefgn")], +"loop": true, +"name": &"walking_powder", +"speed": 2.0 }] [node name="Train2" type="Node3D"] @@ -84,6 +109,6 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="CharacterBody3D"] transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0) frames = SubResource("SpriteFrames_ltjyh") -animation = &"idle_ball" +animation = &"walking_coal" speed_scale = 2.0 playing = true diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 5ad2bfd..2aa1b2d 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -2,9 +2,9 @@ [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_iox18"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="2_61aog"] -[ext_resource type="PackedScene" path="res://Nodes/Train_P1.tscn" id="3_0be5n"] +[ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="3_0be5n"] [ext_resource type="PackedScene" uid="uid://cys06pnxfjl2m" path="res://Nodes/UI.tscn" id="4_kxuy0"] -[ext_resource type="PackedScene" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"] +[ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="4_lmu0s"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ghq3e"] sky_top_color = Color(0.662745, 0.356863, 0.129412, 1) diff --git a/o_idle1.png b/o_idle1.png new file mode 100644 index 0000000..f7a8f42 Binary files /dev/null and b/o_idle1.png differ diff --git a/o_idle1.png.import b/o_idle1.png.import new file mode 100644 index 0000000..1e4fdba --- /dev/null +++ b/o_idle1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://cxfybbp5idjwg" +path="res://.godot/imported/o_idle1.png-9ad1e33384b578c92256776007ea4475.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://o_idle1.png" +dest_files=["res://.godot/imported/o_idle1.png-9ad1e33384b578c92256776007ea4475.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/o_idle2.png b/o_idle2.png new file mode 100644 index 0000000..fdf6860 Binary files /dev/null and b/o_idle2.png differ diff --git a/o_idle2.png.import b/o_idle2.png.import new file mode 100644 index 0000000..a1d00c6 --- /dev/null +++ b/o_idle2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dh6hvv1lfdnm1" +path="res://.godot/imported/o_idle2.png-7afb0370a35b05edb0e1dd193916e55e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://o_idle2.png" +dest_files=["res://.godot/imported/o_idle2.png-7afb0370a35b05edb0e1dd193916e55e.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/o_walking1.png b/o_walking1.png new file mode 100644 index 0000000..a7fa485 Binary files /dev/null and b/o_walking1.png differ diff --git a/o_walking1.png.import b/o_walking1.png.import new file mode 100644 index 0000000..c01d4e3 --- /dev/null +++ b/o_walking1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bjrhp4dqckoxf" +path="res://.godot/imported/o_walking1.png-a570560a8bd4e4a4c247cf9076ed1d3d.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://o_walking1.png" +dest_files=["res://.godot/imported/o_walking1.png-a570560a8bd4e4a4c247cf9076ed1d3d.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/o_walking2.png b/o_walking2.png new file mode 100644 index 0000000..f5ae6f5 Binary files /dev/null and b/o_walking2.png differ diff --git a/o_walking2.png.import b/o_walking2.png.import new file mode 100644 index 0000000..9d59047 --- /dev/null +++ b/o_walking2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://j7jwtqmvg0m8" +path="res://.godot/imported/o_walking2.png-1556805b62e7ad576cd1fdf859df52a4.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://o_walking2.png" +dest_files=["res://.godot/imported/o_walking2.png-1556805b62e7ad576cd1fdf859df52a4.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/o_walking_ball1.png b/o_walking_ball1.png new file mode 100644 index 0000000..9ad60d2 Binary files /dev/null and b/o_walking_ball1.png differ diff --git a/o_walking_ball1.png.import b/o_walking_ball1.png.import new file mode 100644 index 0000000..e07ee4e --- /dev/null +++ b/o_walking_ball1.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c1v5tc8lk8pdo" +path.s3tc="res://.godot/imported/o_walking_ball1.png-db942bba1c9d5c750a565458e8ed5e89.s3tc.ctex" +path.etc2="res://.godot/imported/o_walking_ball1.png-db942bba1c9d5c750a565458e8ed5e89.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://o_walking_ball1.png" +dest_files=["res://.godot/imported/o_walking_ball1.png-db942bba1c9d5c750a565458e8ed5e89.s3tc.ctex", "res://.godot/imported/o_walking_ball1.png-db942bba1c9d5c750a565458e8ed5e89.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/o_walking_ball2.png b/o_walking_ball2.png new file mode 100644 index 0000000..139066b Binary files /dev/null and b/o_walking_ball2.png differ diff --git a/o_walking_ball2.png.import b/o_walking_ball2.png.import new file mode 100644 index 0000000..5cf3044 --- /dev/null +++ b/o_walking_ball2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://djsergj3l4t2c" +path="res://.godot/imported/o_walking_ball2.png-24e87b674c9c350af889c915ece4444e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://o_walking_ball2.png" +dest_files=["res://.godot/imported/o_walking_ball2.png-24e87b674c9c350af889c915ece4444e.ctex"] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/o_walking_coal1.png b/o_walking_coal1.png new file mode 100644 index 0000000..a55b95f Binary files /dev/null and b/o_walking_coal1.png differ diff --git a/o_walking_coal1.png.import b/o_walking_coal1.png.import new file mode 100644 index 0000000..0637db9 --- /dev/null +++ b/o_walking_coal1.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ci4yd4vjr17o1" +path.s3tc="res://.godot/imported/o_walking_coal1.png-ffdb06a726c3ad120972ad0831bb4ed5.s3tc.ctex" +path.etc2="res://.godot/imported/o_walking_coal1.png-ffdb06a726c3ad120972ad0831bb4ed5.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://o_walking_coal1.png" +dest_files=["res://.godot/imported/o_walking_coal1.png-ffdb06a726c3ad120972ad0831bb4ed5.s3tc.ctex", "res://.godot/imported/o_walking_coal1.png-ffdb06a726c3ad120972ad0831bb4ed5.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/o_walking_coal2.png b/o_walking_coal2.png new file mode 100644 index 0000000..6b27f21 Binary files /dev/null and b/o_walking_coal2.png differ diff --git a/o_walking_coal2.png.import b/o_walking_coal2.png.import new file mode 100644 index 0000000..8d3a347 --- /dev/null +++ b/o_walking_coal2.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://nctqw3vt5q0y" +path.s3tc="res://.godot/imported/o_walking_coal2.png-05a9020fc65605a77e717f3532b6b309.s3tc.ctex" +path.etc2="res://.godot/imported/o_walking_coal2.png-05a9020fc65605a77e717f3532b6b309.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://o_walking_coal2.png" +dest_files=["res://.godot/imported/o_walking_coal2.png-05a9020fc65605a77e717f3532b6b309.s3tc.ctex", "res://.godot/imported/o_walking_coal2.png-05a9020fc65605a77e717f3532b6b309.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/o_walking_powder1.png b/o_walking_powder1.png new file mode 100644 index 0000000..77f73aa Binary files /dev/null and b/o_walking_powder1.png differ diff --git a/o_walking_powder1.png.import b/o_walking_powder1.png.import new file mode 100644 index 0000000..1dbc159 --- /dev/null +++ b/o_walking_powder1.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://os0kogn0mkus" +path.s3tc="res://.godot/imported/o_walking_powder1.png-fedd9f79d2c93a926d436b81ebedb88b.s3tc.ctex" +path.etc2="res://.godot/imported/o_walking_powder1.png-fedd9f79d2c93a926d436b81ebedb88b.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://o_walking_powder1.png" +dest_files=["res://.godot/imported/o_walking_powder1.png-fedd9f79d2c93a926d436b81ebedb88b.s3tc.ctex", "res://.godot/imported/o_walking_powder1.png-fedd9f79d2c93a926d436b81ebedb88b.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/o_walking_powder2.png b/o_walking_powder2.png new file mode 100644 index 0000000..25ad412 Binary files /dev/null and b/o_walking_powder2.png differ diff --git a/o_walking_powder2.png.import b/o_walking_powder2.png.import new file mode 100644 index 0000000..900ca31 --- /dev/null +++ b/o_walking_powder2.png.import @@ -0,0 +1,36 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ctssikrodjqvc" +path.s3tc="res://.godot/imported/o_walking_powder2.png-defbe8d19c7108c30dd611e1857d571f.s3tc.ctex" +path.etc2="res://.godot/imported/o_walking_powder2.png-defbe8d19c7108c30dd611e1857d571f.etc2.ctex" +metadata={ +"imported_formats": ["s3tc", "etc2"], +"vram_texture": true +} + +[deps] + +source_file="res://o_walking_powder2.png" +dest_files=["res://.godot/imported/o_walking_powder2.png-defbe8d19c7108c30dd611e1857d571f.s3tc.ctex", "res://.godot/imported/o_walking_powder2.png-defbe8d19c7108c30dd611e1857d571f.etc2.ctex"] + +[params] + +compress/mode=2 +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/bptc_ldr=0 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/scripts/Player.gd b/scripts/Player.gd index 9ad9fce..5c9a9d5 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -87,6 +87,6 @@ func fill_inventory(type): 1: walking = "walking_powder" idle = "idle_powder" - 3: + 2: walking = "walking_coal" idle = "idle_coal"