1
Fork 0
mirror of https://github.com/Steffo99/cinnos.git synced 2024-11-21 23:54:20 +00:00
This commit is contained in:
Steffo 2023-11-25 16:50:06 +01:00
parent d83b4d4596
commit e5c3ed714b
6 changed files with 139 additions and 40 deletions

View file

@ -1,17 +1,8 @@
extends Area3D 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): func _on_body_entered(body):
if body is Player: if body is Player:
body.on_banana() body.velocity *= 2
pass # Replace with function body. queue_free()

View file

@ -1,7 +1,5 @@
[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="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="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://uogmi4pvp64t" path="res://addons/bisio.png" id="3_27tel"]
@ -11,10 +9,10 @@
[ext_resource type="Script" path="res://TextBox.gd" id="4_gpkq6"] [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="FontFile" uid="uid://qf3uxmta6lpw" path="res://fonts/FiraCode-Medium.ttf" id="5_yvnu2"]
[ext_resource type="Script" path="res://Camera3D.gd" id="8_auifr"] [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="Script" path="res://Buccia.gd" id="10_ffcw5"]
[ext_resource type="PackedScene" uid="uid://dp7p16vtxd1xr" path="res://obstacles/house_c.tscn" id="9_xyam4"] [ext_resource type="PackedScene" uid="uid://dp7p16vtxd1xr" path="res://obstacles/house_c.tscn" id="9_xyam4"]
[ext_resource type="PackedScene" uid="uid://ccs202pcy4pce" path="res://obstacles/dialog.tscn" id="10_6ihn6"] [ext_resource type="PackedScene" uid="uid://ccs202pcy4pce" path="res://obstacles/dialog.tscn" id="10_6ihn6"]
[ext_resource type="Script" path="res://Buccia.gd" id="12_7dfpx"]
[ext_resource type="PackedScene" uid="uid://72q4p7x8l08y" path="res://models/banana.glb" id="13_ecp45"]
[sub_resource type="Theme" id="Theme_hkcet"] [sub_resource type="Theme" id="Theme_hkcet"]
Label/fonts/font = ExtResource("3_p3wyc") Label/fonts/font = ExtResource("3_p3wyc")
@ -46,14 +44,8 @@ size = Vector2(200, 200)
[sub_resource type="BoxShape3D" id="BoxShape3D_2bm1d"] [sub_resource type="BoxShape3D" id="BoxShape3D_2bm1d"]
size = Vector3(200, 4, 200) 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"] [node name="Root" type="Node3D"]
@ -147,7 +139,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.927202, 0)
script = ExtResource("1_wt4gx") script = ExtResource("1_wt4gx")
input_accel = 8.0 input_accel = 8.0
jump_impulse = Vector3(0, 10, 0) jump_impulse = Vector3(0, 10, 0)
friction = 0.99 friction = 0.98
[node name="Man" type="CollisionShape3D" parent="Player"] [node name="Man" type="CollisionShape3D" parent="Player"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05, 0) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.05, 0)
@ -193,19 +185,6 @@ target = NodePath("../Player")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] [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.579826, -0.58827, -0.563685, 0.632141, -0.761305, 0.144266, -0.514003, -0.272679, 0.813294, 0, 0, 0)
[node name="Buccia" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.36238, 0.418784, -3.1441)
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")] [node name="HouseC" parent="." instance=ExtResource("9_xyam4")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 14.9482, 0, -6.46428) 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) transform = Transform3D(4, 0, 0, 0, 4, 0, 0, 0, 4, 0, 1, -25)
text = "tre" text = "tre"
duration = 1.0 duration = 1.0
>>>>>>> 4e66fbe9af34678e24d9fbad2b46ae8ad17981eb
[node name="Buccia" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.41567, 0, -6.54346)
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="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="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"]

32
models/banana.glb.import Normal file
View file

@ -0,0 +1,32 @@
[remap]
importer="scene"
importer_version=1
type="PackedScene"
uid="uid://72q4p7x8l08y"
path="res://.godot/imported/banana.glb-19dba9f467c52208a261d869c3fa5d32.scn"
[deps]
source_file="res://models/banana.glb"
dest_files=["res://.godot/imported/banana.glb-19dba9f467c52208a261d869c3fa5d32.scn"]
[params]
nodes/root_type="Node3D"
nodes/root_name="Scene Root"
nodes/apply_root_scale=true
nodes/root_scale=0.15
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

BIN
models/banana_palette1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 281 B

View file

@ -0,0 +1,36 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://dbq5vwg41bvcv"
path.s3tc="res://.godot/imported/banana_palette1.png-4421b4760ffc2b88bc6c7512415eaed8.s3tc.ctex"
metadata={
"imported_formats": ["s3tc_bptc"],
"vram_texture": true
}
generator_parameters={}
[deps]
source_file="res://models/banana_palette1.png"
dest_files=["res://.godot/imported/banana_palette1.png-4421b4760ffc2b88bc6c7512415eaed8.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

19
obstacles/buccia.tscn Normal file
View file

@ -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"]