,òlkmnhjbgc

Root.tscn

@@ -1,10 +1,8 @@
-[gd_scene load_steps=32 format=3 uid="uid://4whij2hmts0t"]
+[gd_scene load_steps=31 format=3 uid="uid://4whij2hmts0t"]
 
 [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://dw80e5ieh0upb" path="res://addons/bisio.png" id="3_27tel"]
-[ext_resource type="Material" 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="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"]
@@ -17,16 +15,9 @@
 [ext_resource type="PlaneMesh" uid="uid://by8t4bly4lrhj" path="res://road_mesh_something.tres" id="10_7jwjs"]
 [ext_resource type="Texture2D" uid="uid://bx05lcriqc602" path="res://addons/asphalt_blank.png" id="11_kxmgb"]
 [ext_resource type="PackedScene" path="res://obstacles/goal_billboard.tscn" id="14_0ikhl"]
-[ext_resource type="Script" path="res://Torretta.gd" id="15_058li"]
 [ext_resource type="PackedScene" path="res://obstacles/vent.tscn" id="15_hwvsi"]
-[ext_resource type="PackedScene" uid="uid://t0gblqb4yr8m" path="res://models/turret.glb" id="16_upw73"]
-[ext_resource type="PackedScene" uid="uid://ca6gyhifgdnks" path="res://models/bar.glb" id="19_c0gkt"]
-[ext_resource type="PlaneMesh" uid="uid://jy4q18wf2j41" path="res://road_mesh_something.tres" id="10_7jwjs"]
-[ext_resource type="Texture2D" uid="uid://bx05lcriqc602" path="res://addons/asphalt_blank.png" id="11_kxmgb"]
-[ext_resource type="PackedScene" path="res://obstacles/goal_billboard.tscn" id="14_0ikhl"]
-[ext_resource type="PackedScene" path="res://obstacles/vent.tscn" id="15_hwvsi"]
-[ext_resource type="PackedScene" uid="uid://cbmkrd5kwiujt" path="res://obstacles/torretta.tscn" id="17_6hms3"]
 [ext_resource type="PackedScene" uid="uid://mahsivqsy3oo" path="res://obstacles/panchina.tscn" id="18_ijdrl"]
+[ext_resource type="PackedScene" uid="uid://ca6gyhifgdnks" path="res://models/bar.glb" id="19_c0gkt"]
 [ext_resource type="PackedScene" uid="uid://c1p6udf66lht2" path="res://obstacles/bullet.tscn" id="19_fskgs"]
 
 [sub_resource type="Theme" id="Theme_hkcet"]
@@ -268,14 +259,8 @@ duration = 1.0
 [node name="Vent" parent="." instance=ExtResource("15_hwvsi")]
 transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 168.103, 0, 8.66797)
 
-[node name="Torretta" type="StaticBody3D" parent="."]
-transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, 479.543, 0.928251, 317.357)
-script = ExtResource("15_058li")
 [node name="Panchina" parent="." instance=ExtResource("18_ijdrl")]
 
-[node name="Torretta" parent="." instance=ExtResource("17_6hms3")]
-transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, -5.62694, 0, -13.6183)
-
 [node name="Bullet" parent="." instance=ExtResource("19_fskgs")]
 transform = Transform3D(-4.37114e-08, 1, 4.37114e-08, 0, -4.37114e-08, 1, 1, 4.37114e-08, 1.91069e-15, -11.0235, 0, 14.2821)
 

models/banana.glb.import

@@ -3,7 +3,7 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://72q4p7x8l08y"
+uid="uid://ca33ta1etet1w"
 path="res://.godot/imported/banana.glb-19dba9f467c52208a261d869c3fa5d32.scn"
 
 [deps]
@@ -16,11 +16,7 @@ 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=0.3
-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/bananaa.glb.import

@@ -0,0 +1,32 @@
+[remap]
+
+importer="scene"
+importer_version=1
+type="PackedScene"
+uid="uid://d1ebnlyj23gg0"
+path="res://.godot/imported/bananaa.glb-b9a69c24b350b7706b6ccef41d80e529.scn"
+
+[deps]
+
+source_file="res://models/bananaa.glb"
+dest_files=["res://.godot/imported/bananaa.glb-b9a69c24b350b7706b6ccef41d80e529.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
+animation/remove_immutable_tracks=true
+import_script/path=""
+_subresources={}
+gltf/embedded_image_handling=1

models/bananaa_palette1.png.import

@@ -0,0 +1,36 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://cvcq7vnaw2nuf"
+path.s3tc="res://.godot/imported/bananaa_palette1.png-5d7899368478c590909964d56b7c663c.s3tc.ctex"
+metadata={
+"imported_formats": ["s3tc_bptc"],
+"vram_texture": true
+}
+generator_parameters={}
+
+[deps]
+
+source_file="res://models/bananaa_palette1.png"
+dest_files=["res://.godot/imported/bananaa_palette1.png-5d7899368478c590909964d56b7c663c.s3tc.ctex"]
+
+[params]
+
+compress/mode=2
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+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

obstacles/house_a.tscn

@@ -7,6 +7,7 @@
 [node name="HouseA" type="StaticBody3D"]
 
 [node name="house1" parent="." instance=ExtResource("1_6lk2f")]
+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)

obstacles/house_b.tscn

@@ -8,6 +8,7 @@
 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(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 4, 10)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
 transform = Transform3D(8, 0, 0, 0, 10, 0, 0, 0, 8, 0, 5, 0)

obstacles/torretta.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://cbmkrd5kwiujt"]
+[gd_scene load_steps=4 format=3 uid="uid://dfv2rsf4l7734"]
 
 [ext_resource type="Script" path="res://Torretta.gd" id="1_wqejx"]
 [ext_resource type="PackedScene" uid="uid://t0gblqb4yr8m" path="res://models/turret.glb" id="2_m7e8h"]
@@ -7,14 +7,15 @@
 size = Vector3(1.9188, 3.57475, 2.31203)
 
 [node name="Torretta" type="StaticBody3D"]
-transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, -11.1919, 0.928251, 6.08668)
+transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, 0, 0, 0)
 script = ExtResource("1_wqejx")
 initial_cooldown = 0.5
 
 [node name="turret" parent="." instance=ExtResource("2_m7e8h")]
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
-transform = Transform3D(1, 0, -2.98023e-08, 0, 1, 0, 2.98023e-08, 0, 1, 0, 1.09828, 0)
+transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.09828, 0)
 shape = SubResource("BoxShape3D_hwxik")
 
 [node name="RayCast3D" type="RayCast3D" parent="."]

obstacles/torretta_ball.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=4 format=3 uid="uid://ds01yl3tf0tva"]
+[gd_scene load_steps=4 format=3 uid="uid://dx11oegmcg867"]
 
 [ext_resource type="Script" path="res://Torretta.gd" id="1_6tulh"]
 [ext_resource type="PackedScene" uid="uid://t0gblqb4yr8m" path="res://models/turret.glb" id="2_64e5x"]
@@ -7,7 +7,7 @@
 size = Vector3(1.9188, 3.57475, 2.31203)
 
 [node name="Torretta" type="StaticBody3D"]
-transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, -11.1919, 0.928251, 6.08668)
+transform = Transform3D(-0.810819, 0, 0.585297, 0, 1, 0, -0.585297, 0, -0.810819, 0, 0, 0)
 script = ExtResource("1_6tulh")
 
 [node name="turret" parent="." instance=ExtResource("2_64e5x")]