Merge branch 'main' of https://github.com/Steffo99/jam

Buccia.gd

@@ -1,17 +1,8 @@
 extends Area3D
-
+class_name Buccia
-
-# Called when the node enters the scene tree for the first time.
-func _ready():
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta):
-	pass
 
 
 func _on_body_entered(body):
 	if body is Player:
-		body.on_banana()
+		body.velocity *= 2
-	pass # Replace with function body.
+		queue_free()

Root.tscn

@@ -1,33 +1,25 @@
-[gd_scene load_steps=25 format=3 uid="uid://4whij2hmts0t"]
+[gd_scene load_steps=24 format=3 uid="uid://4whij2hmts0t"]
 
 [ext_resource type="Script" path="res://Player.gd" id="1_wt4gx"]
 [ext_resource type="Material" path="res://Unshaded.material" id="2_upp15"]
-[ext_resource type="Script" path="res://Player.gd" id="1_wt4gx"]
-[ext_resource type="Material" uid="uid://dondfiavgo2ws" path="res://Unshaded.material" id="2_upp15"]
 [ext_resource type="Texture2D" uid="uid://uogmi4pvp64t" path="res://addons/bisio.png" id="3_27tel"]
 [ext_resource type="Texture2D" uid="uid://bwiymy4ls5l8a" path="res://addons/kenney_prototype_textures/red/texture_05.png" id="3_gtnhv"]
 [ext_resource type="FontFile" uid="uid://cseshyj4yw2f5" path="res://fonts/FiraSans-Medium.ttf" id="3_p3wyc"]
 [ext_resource type="Script" path="res://GameTimer.gd" id="3_y362g"]
 [ext_resource type="Script" path="res://TextBox.gd" id="4_gpkq6"]
 [ext_resource type="FontFile" uid="uid://qf3uxmta6lpw" path="res://fonts/FiraCode-Medium.ttf" id="5_yvnu2"]
+[ext_resource type="PackedScene" uid="uid://4i2c481rpxe3" path="res://models/cinno.glb" id="8_32hx2"]
 [ext_resource type="Script" path="res://Camera3D.gd" id="8_auifr"]
-[ext_resource type="PackedScene" uid="uid://ck1im1d6yhv84" path="res://obstacles/house.tscn" id="8_ntqnl"]
+[ext_resource type="PackedScene" path="res://obstacles/house_c.tscn" id="9_xyam4"]
-[ext_resource type="Script" path="res://Buccia.gd" id="10_ffcw5"]
+[ext_resource type="PackedScene" path="res://obstacles/dialog.tscn" id="10_6ihn6"]
-[ext_resource type="PackedScene" uid="uid://dp7p16vtxd1xr" path="res://obstacles/house_c.tscn" id="9_xyam4"]
+[ext_resource type="Script" path="res://Buccia.gd" id="12_7dfpx"]
-[ext_resource type="PackedScene" uid="uid://ccs202pcy4pce" path="res://obstacles/dialog.tscn" id="10_6ihn6"]
+[ext_resource type="PackedScene" uid="uid://72q4p7x8l08y" path="res://models/banana.glb" id="13_ecp45"]
 
 [sub_resource type="Theme" id="Theme_hkcet"]
 Label/fonts/font = ExtResource("3_p3wyc")
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_castg"]
 
-[sub_resource type="CapsuleMesh" id="CapsuleMesh_pnmjt"]
-material = ExtResource("2_upp15")
-
-[sub_resource type="BoxMesh" id="BoxMesh_4tnse"]
-material = ExtResource("2_upp15")
-size = Vector3(1, 0.1, 3)
-
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lw6u7"]
 shading_mode = 0
 albedo_color = Color(0.435294, 0.615686, 1, 1)
@@ -36,6 +28,10 @@ albedo_color = Color(0.435294, 0.615686, 1, 1)
 material = SubResource("StandardMaterial3D_lw6u7")
 size = Vector3(0.3, 0.3, 0.3)
 
+[sub_resource type="BoxMesh" id="BoxMesh_4tnse"]
+material = ExtResource("2_upp15")
+size = Vector3(1, 0.1, 3)
+
 [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_lkb30"]
 albedo_texture = ExtResource("3_gtnhv")
 
@@ -46,14 +42,8 @@ size = Vector2(200, 200)
 [sub_resource type="BoxShape3D" id="BoxShape3D_2bm1d"]
 size = Vector3(200, 4, 200)
 
-[sub_resource type="BoxShape3D" id="BoxShape3D_stil7"]
+[sub_resource type="BoxShape3D" id="BoxShape3D_p1ebg"]
-size = Vector3(0.976957, 1, 1)
+size = Vector3(1.5, 1.5, 1.5)
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_icp2k"]
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hs2tx"]
-
-[sub_resource type="BoxMesh" id="BoxMesh_n8jcf"]
 
 [node name="Root" type="Node3D"]
 
@@ -147,23 +137,17 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.927202, 0)
 script = ExtResource("1_wt4gx")
 input_accel = 8.0
 jump_impulse = Vector3(0, 10, 0)
-friction = 0.99
+friction = 0.98
 
 [node name="Man" type="CollisionShape3D" parent="Player"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05, 0)
 shape = SubResource("CapsuleShape3D_castg")
 
-[node name="Mesh" type="MeshInstance3D" parent="Player/Man"]
+[node name="cinno" parent="Player/Man" instance=ExtResource("8_32hx2")]
-mesh = SubResource("CapsuleMesh_pnmjt")
+transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0.253272, 0)
-skeleton = NodePath("../..")
 
 [node name="Board" type="Node3D" parent="Player"]
 
-[node name="Mesh" type="MeshInstance3D" parent="Player/Board"]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
-mesh = SubResource("BoxMesh_4tnse")
-skeleton = NodePath("../..")
-
 [node name="PlayerPart" type="CPUParticles3D" parent="Player/Board"]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 1.5)
 emitting = false
@@ -176,6 +160,11 @@ gravity = Vector3(0, 0, 0)
 initial_velocity_min = 8.0
 initial_velocity_max = 8.0
 
+[node name="Mesh" type="MeshInstance3D" parent="Player/Board"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
+mesh = SubResource("BoxMesh_4tnse")
+skeleton = NodePath("../..")
+
 [node name="Plane" type="StaticBody3D" parent="."]
 
 [node name="MeshInstance3D" type="MeshInstance3D" parent="Plane"]
@@ -191,20 +180,10 @@ script = ExtResource("8_auifr")
 target = NodePath("../Player")
 
 [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
-transform = Transform3D(-0.579826, -0.58827, -0.563685, 0.632141, -0.761305, 0.144266, -0.514003, -0.272679, 0.813294, 0, 0, 0)
+transform = Transform3D(0.886591, 0.349146, -0.303401, 0.462553, -0.669221, 0.581539, 0, -0.655927, -0.754824, 4.33804, 4.6698, -3.35676)
-
+light_color = Color(1, 1, 0.678431, 1)
-[node name="Buccia" type="Area3D" parent="."]
+light_energy = 2.026
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.36238, 0.418784, -3.1441)
+shadow_enabled = true
-script = ExtResource("10_ffcw5")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="Buccia"]
-shape = SubResource("BoxShape3D_stil7")
-
-[node name="MeshInstance3D" type="MeshInstance3D" parent="Buccia/CollisionShape3D"]
-material_override = SubResource("StandardMaterial3D_icp2k")
-material_overlay = SubResource("StandardMaterial3D_hs2tx")
-mesh = SubResource("BoxMesh_n8jcf")
-skeleton = NodePath("../..")
 
 [node name="HouseC" parent="." instance=ExtResource("9_xyam4")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.9482, 0, -6.46428)
@@ -232,7 +211,49 @@ duration = 1.0
 transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1, -25)
 text = "tre"
 duration = 1.0
->>>>>>> 4e66fbe9af34678e24d9fbad2b46ae8ad17981eb
+
+[node name="Buccia" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.76751, 1.11292, -6.57832)
+script = ExtResource("12_7dfpx")
+
+[node name="banana" parent="Buccia" instance=ExtResource("13_ecp45")]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Buccia"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0)
+shape = SubResource("BoxShape3D_p1ebg")
+
+[node name="Buccia2" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -11.1426, 0, -14.8313)
+script = ExtResource("12_7dfpx")
+
+[node name="banana" parent="Buccia2" instance=ExtResource("13_ecp45")]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Buccia2"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0)
+shape = SubResource("BoxShape3D_p1ebg")
+
+[node name="Buccia3" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.80737, 0, -21.5372)
+script = ExtResource("12_7dfpx")
+
+[node name="banana" parent="Buccia3" instance=ExtResource("13_ecp45")]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Buccia3"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0)
+shape = SubResource("BoxShape3D_p1ebg")
+
+[node name="Buccia4" type="Area3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -10.1818, 0, -31.1759)
+script = ExtResource("12_7dfpx")
+
+[node name="banana" parent="Buccia4" instance=ExtResource("13_ecp45")]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="Buccia4"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0)
+shape = SubResource("BoxShape3D_p1ebg")
 
 [connection signal="timeout" from="UI/TextBox/Timer" to="UI/TextBox" method="_on_timer_timeout"]
 [connection signal="body_entered" from="Buccia" to="Buccia" method="_on_body_entered"]
+[connection signal="body_entered" from="Buccia2" to="Buccia2" method="_on_body_entered"]
+[connection signal="body_entered" from="Buccia3" to="Buccia3" method="_on_body_entered"]
+[connection signal="body_entered" from="Buccia4" to="Buccia4" method="_on_body_entered"]

models/banana.glb.import

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://crutnf3331kvn"
+uid="uid://72q4p7x8l08y"
 path="res://.godot/imported/banana.glb-19dba9f467c52208a261d869c3fa5d32.scn"
 
 [deps]
@@ -16,7 +16,11 @@ dest_files=["res://.godot/imported/banana.glb-19dba9f467c52208a261d869c3fa5d32.s
 nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
+<<<<<<< HEAD
 nodes/root_scale=1.0
+=======
+nodes/root_scale=0.15
+>>>>>>> b35d2f377cd4ca3253360662fa3b1b6f890ffdf3
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

models/banana_palette1.png.import

@@ -2,7 +2,7 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://binl5qo4hm2e2"
+uid="uid://dbq5vwg41bvcv"
 path.s3tc="res://.godot/imported/banana_palette1.png-4421b4760ffc2b88bc6c7512415eaed8.s3tc.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc"],

models/cinno.glb.import

@@ -16,7 +16,7 @@ dest_files=["res://.godot/imported/cinno.glb-d8cb2252e6ec370ad3e6e2fc25b85565.sc
 nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
-nodes/root_scale=1.0
+nodes/root_scale=0.3
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

models/house1.glb.import

@@ -16,7 +16,7 @@ dest_files=["res://.godot/imported/house1.glb-d8a9dfacda96bd9f0626f3ec531569ba.s
 nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
-nodes/root_scale=1.0
+nodes/root_scale=4.0
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

models/house2.glb.import

@@ -16,7 +16,7 @@ dest_files=["res://.godot/imported/house2.glb-6e22127dbb861a6239d11a50574fccf5.s
 nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
-nodes/root_scale=1.0
+nodes/root_scale=4.0
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

models/house3.glb.import

@@ -16,7 +16,7 @@ dest_files=["res://.godot/imported/house3.glb-e1742caa9404f392e328f9ca135ee769.s
 nodes/root_type="Node3D"
 nodes/root_name="Scene Root"
 nodes/apply_root_scale=true
-nodes/root_scale=1.0
+nodes/root_scale=4.0
 meshes/ensure_tangents=true
 meshes/generate_lods=true
 meshes/create_shadow_meshes=true

obstacles/buccia.tscn

@@ -0,0 +1,19 @@
+[gd_scene load_steps=4 format=3 uid="uid://cfh3s7oepx4yv"]
+
+[ext_resource type="Script" path="res://Buccia.gd" id="1_6ytlm"]
+[ext_resource type="PackedScene" uid="uid://72q4p7x8l08y" path="res://models/banana.glb" id="2_3mtde"]
+
+[sub_resource type="BoxShape3D" id="BoxShape3D_p1ebg"]
+size = Vector3(1.5, 1.5, 1.5)
+
+[node name="Buccia" type="Area3D"]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -6.54346)
+script = ExtResource("1_6ytlm")
+
+[node name="banana" parent="." instance=ExtResource("2_3mtde")]
+
+[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.75, 0)
+shape = SubResource("BoxShape3D_p1ebg")
+
+[connection signal="body_entered" from="." to="." method="_on_body_entered"]

obstacles/house_a.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://ck1im1d6yhv84"]
+[gd_scene load_steps=3 format=3 uid="uid://b03t3lbwlddqm"]
 
 [ext_resource type="PackedScene" uid="uid://b0v72ewtji1ga" path="res://models/house1.glb" id="1_6lk2f"]
 
@@ -7,7 +7,6 @@
 [node name="HouseA" type="StaticBody3D"]
 
 [node name="house1" parent="." instance=ExtResource("1_6lk2f")]
-transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(8, 0, 0, 0, 10, 0, 0, 0, 8, 0, 5, 0)

obstacles/house_b.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://dpm1n7fku8ypr"]
+[gd_scene load_steps=3 format=3 uid="uid://blc38wif555cb"]
 
 [ext_resource type="PackedScene" uid="uid://b61483mtne85g" path="res://models/house2.glb" id="1_fuiwk"]
 
@@ -8,7 +8,6 @@
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.14025, 0, -9.44414)
 
 [node name="house2" parent="." instance=ExtResource("1_fuiwk")]
-transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 0, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(8, 0, 0, 0, 10, 0, 0, 0, 8, 0, 5, 0)

obstacles/house_c.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=3 format=3 uid="uid://dp7p16vtxd1xr"]
+[gd_scene load_steps=3 format=3 uid="uid://bxj354o6rycsf"]
 
 [ext_resource type="PackedScene" uid="uid://01cg0ph8uglg" path="res://models/house3.glb" id="1_7obe1"]
 
@@ -7,7 +7,7 @@
 [node name="HouseC" type="StaticBody3D"]
 
 [node name="house3" parent="." instance=ExtResource("1_7obe1")]
-transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 4, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(8, 0, 0, 0, 10, 0, 0, 0, 8, 0, 5, 0)