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

Nodes/Player.tscn

@@ -1,26 +1,50 @@
-[gd_scene load_steps=5 format=3 uid="uid://vwjd5od63jgh"]
+[gd_scene load_steps=9 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://cy6x8d3xe8lux" path="res://icon.svg" id="2_yjfj7"]
+[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="CapsuleShape3D" id="CapsuleShape3D_p76ml"]
 radius = 0.500599
 height = 1.99403
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_ndwdl"]
-radius = 0.567567
+radius = 1.26679
+height = 2.53358
 
 [node name="CharacterBody3D" type="CharacterBody3D"]
 script = ExtResource("1_dta8q")
 
-[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-visible = false
-shape = SubResource("CapsuleShape3D_p76ml")
+[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, 1, 0)
+frames = SubResource("SpriteFrames_liykb")
+animation = &"idle"
+speed_scale = 2.0
+playing = true
 
 [node name="Sprite3D" type="Sprite3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, -4.37114e-08, 1, 0, -1, -4.37114e-08, 0, 2, 0)
+visible = false
 texture = ExtResource("2_yjfj7")
 
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+shape = SubResource("CapsuleShape3D_p76ml")
+
 [node name="HitBox" type="Area3D" parent="."]
 collision_mask = 5
 

Nodes/cannon.tscn

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

Nodes/game.tscn

@@ -49,10 +49,13 @@ mesh = SubResource("BoxMesh_ognqx")
 shape = SubResource("ConcavePolygonShape3D_p3d4e")
 
 [node name="CharacterBody3D" parent="Player1" instance=ExtResource("4_1ipcp")]
-transform = Transform3D(1, 0, -3.55271e-15, 0, 1, 0, 3.55271e-15, 0, 1, 0, 0, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 5, 0)
 
 [node name="Cannon2" parent="Player1" instance=ExtResource("2_vrf6k")]
 
+[node name="Storage" parent="Player1" instance=ExtResource("6_8ef51")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.84663, 0, 3.75554)
+
 [node name="Player2" type="Node3D" parent="."]
 transform = Transform3D(0.999998, 0, 0, 0, 1, 0, 0, 0, 0.999998, 12, 0, 0)
 script = ExtResource("2_xl0he")
@@ -67,7 +70,6 @@ transform = Transform3D(1, 8.23952e-25, 0, -1.6479e-25, 1, 0, 0, -1.65436e-24, 1
 shape = SubResource("ConcavePolygonShape3D_l76gd")
 
 [node name="CharacterBody3D" parent="Player2" instance=ExtResource("4_1ipcp")]
-transform = Transform3D(-0.0154457, -5.21527e-12, 0.999882, -6.75147e-10, 1, -5.21524e-12, -0.999882, -6.75146e-10, -0.0154457, 0, 0, 0)
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
 transform = Transform3D(1, 0, 0, 0, 0.258819, 0.965926, 0, -0.965926, 0.258819, 0, 0, 0)