diff --git a/Assets/Model/Objects/AmmoPile.glb b/Assets/Model/Objects/AmmoPile.glb new file mode 100644 index 0000000..d04843d Binary files /dev/null and b/Assets/Model/Objects/AmmoPile.glb differ diff --git a/Assets/Model/Objects/AmmoPile.glb.import b/Assets/Model/Objects/AmmoPile.glb.import new file mode 100644 index 0000000..e3ffdf6 --- /dev/null +++ b/Assets/Model/Objects/AmmoPile.glb.import @@ -0,0 +1,37 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://dhev2lm3feo0q" +path="res://.godot/imported/AmmoPile.glb-7542487c08d7d02a64277e8ba20146f8.scn" + +[deps] + +source_file="res://Assets/Model/Objects/AmmoPile.glb" +dest_files=["res://.godot/imported/AmmoPile.glb-7542487c08d7d02a64277e8ba20146f8.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +} +} +} diff --git a/Assets/Model/Objects/GunpowerBarrel.glb b/Assets/Model/Objects/GunpowerBarrel.glb new file mode 100644 index 0000000..eb5a51c Binary files /dev/null and b/Assets/Model/Objects/GunpowerBarrel.glb differ diff --git a/Assets/Model/Objects/GunpowerBarrel.glb.import b/Assets/Model/Objects/GunpowerBarrel.glb.import new file mode 100644 index 0000000..6bfbf7c --- /dev/null +++ b/Assets/Model/Objects/GunpowerBarrel.glb.import @@ -0,0 +1,41 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c06gvrsynr7p7" +path="res://.godot/imported/GunpowerBarrel.glb-3d40b09d320a371932acfb07cd5fc8db.scn" + +[deps] + +source_file="res://Assets/Model/Objects/GunpowerBarrel.glb" +dest_files=["res://.godot/imported/GunpowerBarrel.glb-3d40b09d320a371932acfb07cd5fc8db.scn"] + +[params] + +nodes/root_type="Node3D" +nodes/root_name="Scene Root" +nodes/apply_root_scale=true +nodes/root_scale=1.0 +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +import_script/path="" +_subresources={ +"materials": { +"Material": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/CopperNew/CleanIronDark.tres" +}, +"Material.001": { +"use_external/enabled": true, +"use_external/path": "res://Assets/Textures/Wood/M_Wood.tres" +} +} +} diff --git a/Nodes/Train_P1.tscn b/Nodes/Train_P1.tscn index b6ec077..decd9b5 100644 --- a/Nodes/Train_P1.tscn +++ b/Nodes/Train_P1.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=26 format=3 uid="uid://md2ofbviios3"] +[gd_scene load_steps=30 format=3 uid="uid://c2er6jf4t2e8t"] [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"] [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="3_1ix85"] @@ -8,14 +8,18 @@ [ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_c3xfc"] [ext_resource type="Texture2D" uid="uid://d1m2jplf8u0h0" path="res://Nodes/walking_ball1.png" id="5_rgwud"] [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="5_vgxqe"] +[ext_resource type="Texture2D" uid="uid://b4yysvn1ibspa" path="res://walking_giant1.png" id="6_fw3nx"] [ext_resource type="Texture2D" uid="uid://b5hai0ap763xu" path="res://walking_coal1.png" id="6_hoc8x"] [ext_resource type="Texture2D" uid="uid://d35iaj0nq122a" path="res://walking_powder1.png" id="6_kfxv2"] [ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="6_m0hj7"] [ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="7_d8go0"] +[ext_resource type="Texture2D" uid="uid://nbfs0w8tpjt4" path="res://walking_large1.png" id="7_p66t1"] [ext_resource type="Texture2D" uid="uid://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_0u1e2"] [ext_resource type="Texture2D" uid="uid://ckdlv6b7okseq" path="res://walking_powder2.png" id="10_a137a"] [ext_resource type="Texture2D" uid="uid://b5ioch3ad8y6r" path="res://walking_coal2.png" id="11_1jgcf"] +[ext_resource type="Texture2D" uid="uid://4hcjvygte1em" path="res://walking_giant2.png" id="13_hvlfc"] [ext_resource type="Texture2D" uid="uid://bhmyyu0uhx541" path="res://Assets/Textures/Opera_senza_titolo (2).png" id="14_503dh"] +[ext_resource type="Texture2D" uid="uid://clgd25fer2yka" path="res://walking_large2.png" id="14_bfbb2"] [ext_resource type="Texture2D" uid="uid://biyvvql2ufkdf" path="res://Assets/Textures/Opera_senza_titolo (1).png" id="15_dew1j"] [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="16_q3kvk"] [ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_ajifv"] @@ -38,6 +42,16 @@ animations = [{ "name": &"idle_coal", "speed": 1.0 }, { +"frames": [ExtResource("6_fw3nx")], +"loop": true, +"name": &"idle_giant", +"speed": 1.0 +}, { +"frames": [ExtResource("7_p66t1")], +"loop": true, +"name": &"idle_large", +"speed": 1.0 +}, { "frames": [ExtResource("6_kfxv2")], "loop": true, "name": &"idle_powder", @@ -58,6 +72,16 @@ animations = [{ "name": &"walking_coal", "speed": 2.0 }, { +"frames": [ExtResource("6_fw3nx"), ExtResource("13_hvlfc")], +"loop": true, +"name": &"walking_giant", +"speed": 2.0 +}, { +"frames": [ExtResource("7_p66t1"), ExtResource("14_bfbb2")], +"loop": true, +"name": &"walking_large", +"speed": 2.0 +}, { "frames": [ExtResource("6_kfxv2"), ExtResource("10_a137a")], "loop": true, "name": &"walking_powder", @@ -86,7 +110,7 @@ transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 3.19744e [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_6p0y6") -animation = &"walking_coal" +animation = &"walking_giant" speed_scale = 2.0 playing = true @@ -112,7 +136,7 @@ transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 0.70291, -0.287106, 10.1948) [node name="Storage3" parent="." instance=ExtResource("4_5jw5g")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4, 0, -11) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -4.63306, -0.159192, -10.7834) currentType = 1 icon = ExtResource("19_5df2b") audioClip = ExtResource("17_ajifv") @@ -122,7 +146,7 @@ transform = Transform3D(-6.55671e-08, 0, 1.5, 0, 1.5, 0, -1.5, 0, -6.55671e-08, [node name="StaticBody3D2" type="StaticBody3D" parent="train"] transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, 6, -0.137826, -1.33333) -collision_layer = 4 +collision_layer = 2 [node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22) diff --git a/Nodes/Train_P2.tscn b/Nodes/Train_P2.tscn index 6680a49..31e3302 100644 --- a/Nodes/Train_P2.tscn +++ b/Nodes/Train_P2.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=27 format=3 uid="uid://bikdn7ep2vpxw"] +[gd_scene load_steps=31 format=3 uid="uid://cr2qnrachvh01"] [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"] @@ -9,13 +9,17 @@ [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://86mwqq8jadtj" path="res://o_walking_giant1.png" id="8_536nm"] [ext_resource type="Texture2D" uid="uid://j7jwtqmvg0m8" path="res://o_walking2.png" id="8_isr5o"] +[ext_resource type="Texture2D" uid="uid://ifauy3vee10v" path="res://o_walking_large1.png" id="9_pwqf0"] [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"] [ext_resource type="PackedScene" uid="uid://bkpnrgcfr1jgl" path="res://Nodes/Bin.tscn" id="14_n2rwc"] +[ext_resource type="Texture2D" uid="uid://ce5imf2m4w5y2" path="res://o_walking_giant2.png" id="15_iu8ul"] [ext_resource type="PackedScene" uid="uid://byo1m0n20yl45" path="res://Nodes/cannon.tscn" id="15_sof53"] [ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="16_7dojn"] +[ext_resource type="Texture2D" uid="uid://b3pb0trgav15s" path="res://o_walking_large2.png" id="16_87m18"] [ext_resource type="PackedScene" uid="uid://bhivunrkj87cy" path="res://Nodes/engine.tscn" id="17_regf7"] [ext_resource type="AudioStream" uid="uid://b52sd64x20ulv" path="res://Assets/Sounds/_SOUNDFX_/Gunpowder.wav" id="17_xnc4h"] [ext_resource type="Texture2D" uid="uid://bhmyyu0uhx541" path="res://Assets/Textures/Opera_senza_titolo (2).png" id="18_flxwh"] @@ -51,6 +55,16 @@ animations = [{ "name": &"idle_coal", "speed": 1.0 }, { +"frames": [ExtResource("8_536nm")], +"loop": true, +"name": &"idle_giant", +"speed": 1.0 +}, { +"frames": [ExtResource("9_pwqf0")], +"loop": true, +"name": &"idle_large", +"speed": 1.0 +}, { "frames": [ExtResource("7_lwj85")], "loop": true, "name": &"idle_powder", @@ -71,6 +85,16 @@ animations = [{ "name": &"walking_coal", "speed": 2.0 }, { +"frames": [ExtResource("8_536nm"), ExtResource("15_iu8ul")], +"loop": true, +"name": &"walking_giant", +"speed": 2.0 +}, { +"frames": [ExtResource("9_pwqf0"), ExtResource("16_87m18")], +"loop": true, +"name": &"walking_large", +"speed": 2.0 +}, { "frames": [ExtResource("7_lwj85"), ExtResource("11_eefgn")], "loop": true, "name": &"walking_powder", @@ -86,7 +110,7 @@ transform = Transform3D(1.96701e-07, 0, -1.5, 0, 1.5, 0, 1.5, 0, 1.96701e-07, -3 [node name="StaticBody3D2" type="StaticBody3D" parent="train"] transform = Transform3D(-2.91409e-08, 0, -0.666667, 0, 0.666667, 0, 0.666667, 0, -2.91409e-08, 6, -0.137826, -1.33333) -collision_layer = 4 +collision_layer = 2 [node name="CollisionShape3D2" type="CollisionShape3D" parent="train/StaticBody3D2"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.5, 2, 4.23516e-22) @@ -118,7 +142,7 @@ 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 = &"walking_coal" +animation = &"walking_giant" speed_scale = 2.0 playing = true diff --git a/Nodes/game.gdshader b/Nodes/game.gdshader new file mode 100644 index 0000000..77f7fde --- /dev/null +++ b/Nodes/game.gdshader @@ -0,0 +1,13 @@ +shader_type spatial; +render_mode unshaded; + +uniform vec2 direction_and_speed = vec2(0.25, 0.00); +uniform vec2 scale = vec2(1.0); +uniform bool flip = false; +uniform sampler2D albedo; + +void fragment() { + vec2 uv = UV * scale - direction_and_speed * TIME; + if (flip) { uv = 1.0 - uv; } + ALBEDO = texture(albedo, uv).rgb; +} \ No newline at end of file diff --git a/Nodes/game.tscn b/Nodes/game.tscn index 16b0fe0..1046f80 100644 --- a/Nodes/game.tscn +++ b/Nodes/game.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=10 format=3 uid="uid://b8u4bo4mklj55"] +[gd_scene load_steps=14 format=3 uid="uid://b8u4bo4mklj55"] [ext_resource type="Script" path="res://scripts/Logic/Game.gd" id="1_dubwq"] -[ext_resource type="PackedScene" uid="uid://nxapkgcq2c70" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] +[ext_resource type="PackedScene" path="res://Nodes/light_setup.tscn" id="2_1lh4t"] [ext_resource type="PackedScene" uid="uid://bqe8ucbruto1j" path="res://Nodes/StartNode.tscn" id="3_xcgy2"] [ext_resource type="PackedScene" uid="uid://md2ofbviios3" path="res://Nodes/Train_P1.tscn" id="4_gg4ea"] [ext_resource type="PackedScene" uid="uid://bikdn7ep2vpxw" path="res://Nodes/Train_P2.tscn" id="5_wi6pu"] @@ -9,6 +9,19 @@ [ext_resource type="AudioStream" uid="uid://c5jhukuk8r3mf" path="res://Assets/Sounds/_MUSIC_/GameJamGameLoop.wav" id="7_wagg2"] [ext_resource type="AudioStream" uid="uid://n4ynf7hg2pcl" path="res://Assets/Sounds/_SOUNDFX_/GleiseLoop.wav" id="8_c6uwu"] [ext_resource type="AudioStream" uid="uid://dovvnflvxtqpi" path="res://Assets/Sounds/_SOUNDFX_/WindLoop.wav" id="9_q7v3t"] +[ext_resource type="Shader" path="res://Nodes/game.gdshader" id="10_s0qsw"] +[ext_resource type="Texture2D" uid="uid://cy6x8d3xe8lux" path="res://icon.svg" id="11_1bton"] + +[sub_resource type="ShaderMaterial" id="ShaderMaterial_l0twu"] +render_priority = 0 +shader = ExtResource("10_s0qsw") +shader_parameter/albedo = ExtResource("11_1bton") +shader_parameter/direction_and_speed = Vector2(0, 0) +shader_parameter/flip = false +shader_parameter/scale = Vector2(7, 7) + +[sub_resource type="BoxMesh" id="BoxMesh_ygh83"] +material = SubResource("ShaderMaterial_l0twu") [node name="Game" type="Node"] script = ExtResource("1_dubwq") @@ -44,3 +57,9 @@ autoplay = true stream = ExtResource("9_q7v3t") volume_db = -2.476 autoplay = true + +[node name="Node3D" type="Node3D" parent="."] + +[node name="MeshInstance3D" type="MeshInstance3D" parent="Node3D"] +transform = Transform3D(-1.21955e-05, 0, 243, 0, 1.168, 0, -279, 0, -1.06219e-05, 0, -1.88844, 0) +mesh = SubResource("BoxMesh_ygh83") diff --git a/Storage.tscn b/Storage.tscn index ade95e8..66a5103 100644 --- a/Storage.tscn +++ b/Storage.tscn @@ -33,6 +33,7 @@ shape = SubResource("CylinderShape3D_orr2n") [node name="Sprite3D2" type="Sprite3D" parent="."] transform = Transform3D(0.15, 0, 0, 0, -6.55671e-09, 0.15, 0, -0.15, -6.55671e-09, 0, 3.10039, 0) +visible = false texture = ExtResource("3_ojyse") [connection signal="body_entered" from="Area3D" to="." method="on_Player_enter"] diff --git a/Train1.png b/Train1.png new file mode 100644 index 0000000..1aac06e Binary files /dev/null and b/Train1.png differ diff --git a/Train1.png.import b/Train1.png.import new file mode 100644 index 0000000..ac23ad2 --- /dev/null +++ b/Train1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://c4l3oxhn8m50w" +path="res://.godot/imported/Train1.png-591e0f491cd65b7eb0c2aeb76e18aaca.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Train1.png" +dest_files=["res://.godot/imported/Train1.png-591e0f491cd65b7eb0c2aeb76e18aaca.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/Train2.png b/Train2.png new file mode 100644 index 0000000..a7f014c Binary files /dev/null and b/Train2.png differ diff --git a/Train2.png.import b/Train2.png.import new file mode 100644 index 0000000..d20382e --- /dev/null +++ b/Train2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://di46ht2wjsjy3" +path="res://.godot/imported/Train2.png-ec744864a6880cc37639071ca55033fe.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Train2.png" +dest_files=["res://.godot/imported/Train2.png-ec744864a6880cc37639071ca55033fe.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/scripts/Logic/Game.gd b/scripts/Logic/Game.gd index 96c3f24..f0c5f5e 100644 --- a/scripts/Logic/Game.gd +++ b/scripts/Logic/Game.gd @@ -172,4 +172,4 @@ func fight(): emit_signal("shoot") tween.tween_callback(func(): fight_state = FOUGHT).set_delay(0.7) - #Hallo + #Halloa