Merge branch 'main' of github.com:PfandBoss/SemesterGameJam2022

Nodes/Player.tscn

@@ -1,22 +1,6 @@
-[gd_scene load_steps=8 format=3 uid="uid://vwjd5od63jgh"]
+[gd_scene load_steps=4 format=3 uid="uid://vwjd5od63jgh"]
 
 [ext_resource type="Script" path="res://scripts/Player.gd" id="1_dta8q"]
-[ext_resource type="Texture2D" uid="uid://du7d6fk4dabd7" path="res://cVOQuID.png" id="2_pd1wl"]
-[ext_resource type="Texture2D" uid="uid://eg0k8esm2scp" path="res://p5lFkJY.png" id="3_hxw38"]
-[ext_resource type="Texture2D" uid="uid://dsphpbpt27t1i" path="res://a3TCqhg.png" id="4_6puyx"]
-
-[sub_resource type="SpriteFrames" id="SpriteFrames_liykb"]
-animations = [{
-"frames": [ExtResource("4_6puyx")],
-"loop": true,
-"name": &"idle",
-"speed": 1.0
-}, {
-"frames": [ExtResource("3_hxw38"), ExtResource("2_pd1wl")],
-"loop": true,
-"name": &"walking",
-"speed": 2.0
-}]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_h8ivv"]
 radius = 0.494048
@@ -28,13 +12,6 @@ radius = 0.808068
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 3, 0)
 script = ExtResource("1_dta8q")
 
-[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."]
-transform = Transform3D(0.3, 0, 0, 0, -1.31134e-08, 0.3, 0, -0.3, -1.31134e-08, 0, -2, 0)
-frames = SubResource("SpriteFrames_liykb")
-animation = &"idle"
-speed_scale = 2.0
-playing = true
-
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(1.57581, 0, 0, 0, 2.16936, 0, 0, 0, 1.5749, 0, 0, 0)
 shape = SubResource("CylinderShape3D_h8ivv")

Nodes/Train_P1.tscn

@@ -1,8 +1,15 @@
-[gd_scene load_steps=8 format=3 uid="uid://lvlbpfnwlngv"]
+[gd_scene load_steps=16 format=3 uid="uid://lvlbpfnwlngv"]
 
 [ext_resource type="Script" path="res://scripts/Train.gd" id="1_0x664"]
 [ext_resource type="PackedScene" uid="uid://vwjd5od63jgh" path="res://Nodes/Player.tscn" id="3_in6up"]
 [ext_resource type="PackedScene" uid="uid://c1mymb38wqdg6" path="res://Nodes/train.tscn" id="3_jmv6b"]
+[ext_resource type="PackedScene" uid="uid://cet80w4yr8rse" path="res://Storage.tscn" id="4_5jw5g"]
+[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://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://ctbxpx6p36bdi" path="res://walking_ball2.png" id="8_0u1e2"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_okaqh"]
 size = Vector3(1, 3.77669, 24)
@@ -16,6 +23,29 @@ size = Vector3(12, 4, 1)
 [sub_resource type="BoxShape3D" id="BoxShape3D_sm5ue"]
 size = Vector3(1, 6, 9.05915)
 
+[sub_resource type="SpriteFrames" id="SpriteFrames_6p0y6"]
+animations = [{
+"frames": [ExtResource("4_c3xfc")],
+"loop": true,
+"name": &"idle",
+"speed": 1.0
+}, {
+"frames": [ExtResource("5_rgwud")],
+"loop": true,
+"name": &"idle_ball",
+"speed": 1.0
+}, {
+"frames": [ExtResource("6_m0hj7"), ExtResource("7_d8go0")],
+"loop": true,
+"name": &"walking",
+"speed": 2.0
+}, {
+"frames": [ExtResource("5_rgwud"), ExtResource("8_0u1e2")],
+"loop": true,
+"name": &"walking_ball",
+"speed": 2.0
+}]
+
 [node name="Train1" type="Node3D"]
 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0)
 script = ExtResource("1_0x664")
@@ -52,3 +82,16 @@ shape = SubResource("BoxShape3D_sm5ue")
 
 [node name="CharacterBody3D" parent="." instance=ExtResource("3_in6up")]
 transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 3.19744e-14, 3, -9)
+
+[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 = &"idle_ball"
+speed_scale = 2.0
+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="Cannon" parent="." instance=ExtResource("5_vgxqe")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4817, 1.2303, 0.0486939)

Nodes/Train_P2.tscn

@@ -1,8 +1,13 @@
-[gd_scene load_steps=8 format=3 uid="uid://ckkn7rha3voqv"]
+[gd_scene load_steps=14 format=3 uid="uid://ckkn7rha3voqv"]
 
 [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"]
 
 [sub_resource type="BoxShape3D" id="BoxShape3D_dijw3"]
 size = Vector3(1, 3.77669, 24)
@@ -16,6 +21,29 @@ size = Vector3(12, 4, 1)
 [sub_resource type="BoxShape3D" id="BoxShape3D_psmwd"]
 size = Vector3(1, 6, 9.05915)
 
+[sub_resource type="SpriteFrames" id="SpriteFrames_ltjyh"]
+animations = [{
+"frames": [ExtResource("4_jkvql")],
+"loop": true,
+"name": &"idle",
+"speed": 1.0
+}, {
+"frames": [ExtResource("5_agdvf")],
+"loop": true,
+"name": &"idle_ball",
+"speed": 1.0
+}, {
+"frames": [ExtResource("6_lxfv3"), ExtResource("7_35jf0")],
+"loop": true,
+"name": &"walking",
+"speed": 2.0
+}, {
+"frames": [ExtResource("5_agdvf"), ExtResource("8_cgycp")],
+"loop": true,
+"name": &"walking_ball",
+"speed": 2.0
+}]
+
 [node name="Train2" type="Node3D"]
 transform = Transform3D(1, 0, 3.55271e-15, 0, 1, 0, -3.55271e-15, 0, 1, 0, 0, 0)
 script = ExtResource("1_mcmgl")
@@ -52,3 +80,10 @@ shape = SubResource("BoxShape3D_psmwd")
 
 [node name="CharacterBody3D" parent="." instance=ExtResource("3_x8j45")]
 transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 2.84217e-14, 3, -8)
+
+[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"
+speed_scale = 2.0
+playing = true

Nodes/cannon.tscn

@@ -1,11 +1,16 @@
-[gd_scene load_steps=3 format=3 uid="uid://byo1m0n20yl45"]
+[gd_scene load_steps=4 format=3 uid="uid://byo1m0n20yl45"]
 
 [ext_resource type="Script" path="res://scripts/Modules/Cannon.gd" id="1_vdn0s"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_2geka"]
 
+[sub_resource type="CylinderMesh" id="CylinderMesh_g6oe4"]
+
 [node name="Cannon" type="StaticBody3D"]
 script = ExtResource("1_vdn0s")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 shape = SubResource("CylinderShape3D_2geka")
+
+[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
+mesh = SubResource("CylinderMesh_g6oe4")

Nodes/walking_ball1.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://d1m2jplf8u0h0"
+path.s3tc="res://.godot/imported/walking_ball1.png-13be479b553c099ab41d00c61ca7cef7.s3tc.ctex"
+path.etc2="res://.godot/imported/walking_ball1.png-13be479b553c099ab41d00c61ca7cef7.etc2.ctex"
+metadata={
+"imported_formats": ["s3tc", "etc2"],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Nodes/walking_ball1.png"
+dest_files=["res://.godot/imported/walking_ball1.png-13be479b553c099ab41d00c61ca7cef7.s3tc.ctex", "res://.godot/imported/walking_ball1.png-13be479b553c099ab41d00c61ca7cef7.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

Nodes/walking_ball2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dtgegnq6abqde"
+path="res://.godot/imported/walking_ball2.png-fa9dffed0a6d685363354e68946159cc.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://Nodes/walking_ball2.png"
+dest_files=["res://.godot/imported/walking_ball2.png-fa9dffed0a6d685363354e68946159cc.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

scripts/Player.gd

@@ -9,15 +9,21 @@ var resource = 0
 var is_alive = true
 @onready var is_player1 = true
 
+var walking
+var idle
+
 enum TYPE {AMMO, GUNPOWDER, FUEL}
 
 #---------------Methods--------------#
-	
+func _ready():
+	walking = "walking"
+	idle = "idle"
+
 func _physics_process(delta):
 	if(velocity.length() > 0):
-		$AnimatedSprite3D.play("walking")
+		$AnimatedSprite3D.play(walking)
 	else:
-		$AnimatedSprite3D.play("idle")
+		$AnimatedSprite3D.play(idle)
 	
 	movement = Vector3(0,0,0)
 	check_interaction()
@@ -74,4 +80,8 @@ func check_interaction():
 func fill_inventory(type):
 	self.inventory = 1
 	self.resource = type
-	print(self.resource)
+	match self.resource:
+		0:
+			walking = "walking_ball"
+			idle = "idle_ball"
+			

walking_ball1.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://pusy1wyjb610"
+path="res://.godot/imported/walking_ball1.png-d5996f380b3907c3abba88309526c411.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://walking_ball1.png"
+dest_files=["res://.godot/imported/walking_ball1.png-d5996f380b3907c3abba88309526c411.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

walking_ball2.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://ctbxpx6p36bdi"
+path="res://.godot/imported/walking_ball2.png-d3cf75e73a5060e29a04dd3c608e6282.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://walking_ball2.png"
+dest_files=["res://.godot/imported/walking_ball2.png-d3cf75e73a5060e29a04dd3c608e6282.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