diff --git a/Amanda/skybox/satara_night_no_lamps_2k.exr b/Amanda/skybox/satara_night_no_lamps_2k.exr new file mode 100644 index 0000000..cc7c929 Binary files /dev/null and b/Amanda/skybox/satara_night_no_lamps_2k.exr differ diff --git a/Florian/Audio/asian-gong.mp3 b/Florian/Audio/asian-gong.mp3 new file mode 100644 index 0000000..5e98018 Binary files /dev/null and b/Florian/Audio/asian-gong.mp3 differ diff --git a/Florian/Audio/chineseAmbientMusicGame.ogg b/Florian/Audio/chineseAmbientMusicGame.ogg new file mode 100644 index 0000000..dc771c6 Binary files /dev/null and b/Florian/Audio/chineseAmbientMusicGame.ogg differ diff --git a/Florian/Map/Oktoberfest.tscn b/Florian/Map/Oktoberfest.tscn index 73ea015..3a8e68b 100644 --- a/Florian/Map/Oktoberfest.tscn +++ b/Florian/Map/Oktoberfest.tscn @@ -1,31 +1,31 @@ -[gd_scene load_steps=58 format=4 uid="uid://by5cq6m32hbor"] -[ext_resource type="Texture2D" uid="uid://dv401srtwuvtg" path="res://icon.svg" id="1_6v0xc"] -[ext_resource type="Script" uid="uid://bhh76i4a51brf" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"] -[ext_resource type="Texture2D" uid="uid://dbxh0cr85emoy" path="res://Amanda/medieval_tavern_props_pack/textures/tex_chair_wood.png" id="1_kmmfq"] +[gd_scene load_steps=59 format=4 uid="uid://by5cq6m32hbor"] + +[ext_resource type="Script" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"] +[ext_resource type="Texture2D" uid="uid://8lntiwf30qqc" path="res://Amanda/medieval_tavern_props_pack/textures/tex_chair_wood.png" id="1_kmmfq"] [ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_82wr0"] -[ext_resource type="Texture2D" uid="uid://djp2r4gkuaneh" path="res://Amanda/medieval_tavern_props_pack/textures/tex_barrel.png" id="2_o3vbn"] -[ext_resource type="Texture2D" uid="uid://jen2qbw7xilr" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood_round.png" id="3_6t3lb"] +[ext_resource type="Texture2D" uid="uid://d0jmvu4qbxn54" path="res://Amanda/medieval_tavern_props_pack/textures/tex_barrel.png" id="2_o3vbn"] +[ext_resource type="Texture2D" uid="uid://b55s7kfqvm4we" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood_round.png" id="3_6t3lb"] [ext_resource type="PackedScene" uid="uid://bobfhgsydmmr2" path="res://Florian/pyro.tscn" id="4_h8052"] [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="5_ygtpi"] -[ext_resource type="Script" path="res://Florian/Map/lights.gd" id="6_g561u"] +[ext_resource type="Script" uid="uid://ddwcbl3nbt6j4" path="res://Florian/Map/lights.gd" id="6_g561u"] [ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="6_miqpv"] [ext_resource type="PackedScene" uid="uid://bk4djtjemu7we" path="res://Florian/Entity/People/guitar.tscn" id="6_ptxqs"] [ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="7_miqpv"] [ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="9_3box6"] [ext_resource type="PackedScene" uid="uid://bw73kprk7ptvn" path="res://Florian/PointsLogic/PictureSpot.tscn" id="10_28ddj"] -[ext_resource type="Script" path="res://Florian/Map/dancing_people.gd" id="10_mbtuy"] +[ext_resource type="Script" uid="uid://cu3fdbo1lelob" path="res://Florian/Map/dancing_people.gd" id="10_mbtuy"] [ext_resource type="PackedScene" uid="uid://k3ij7wrtwpms" path="res://Florian/table_0.tscn" id="10_ubr03"] -[ext_resource type="PackedScene" uid="uid://m3sk1ustdixv" path="res://Florian/Props/tent.tscn" id="11_4etk5"] +[ext_resource type="PackedScene" uid="uid://oxm6ufgip22u" path="res://Florian/Props/tent.tscn" id="11_4etk5"] [ext_resource type="Texture2D" uid="uid://cx783frd814e6" path="res://Florian/Decals/power.png" id="11_bsfgy"] [ext_resource type="PackedScene" uid="uid://lrf6ltd1wwg1" path="res://Florian/Entity/People/waitress_path.tscn" id="12_g561u"] [ext_resource type="PackedScene" uid="uid://ctcspqlxrw22q" path="res://Florian/PhysicsProps/PhysicsBarrel.tscn" id="13_ijkca"] -[ext_resource type="Texture2D" uid="uid://datgyl0pkq6q0" path="res://Florian/Textures/bush.jpg" id="14_70e5e"] -[ext_resource type="Texture2D" uid="uid://bdsrkmqfui1sn" path="res://Amanda/medieval_tavern_props_pack/textures/tex_fireplace_2.png" id="17_sdh5o"] +[ext_resource type="Texture2D" uid="uid://b668hlnork7jt" path="res://Florian/Textures/bush.jpg" id="14_70e5e"] +[ext_resource type="Texture2D" uid="uid://bjqu1o6hbbmrf" path="res://Amanda/medieval_tavern_props_pack/textures/tex_fireplace_2.png" id="17_sdh5o"] [ext_resource type="PackedScene" uid="uid://ow35tpunk744" path="res://Florian/PhysicsProps/physics_beer.tscn" id="18_3uiso"] [ext_resource type="Texture2D" uid="uid://bmgydj38uhwoe" path="res://Amanda/skybox/Skydome_0.png" id="19_20xaa"] -[ext_resource type="PackedScene" uid="uid://orn5b5pi73d3" path="res://Florian/Props/beer_stand.tscn" id="19_d5eeg"] +[ext_resource type="PackedScene" uid="uid://bxruw32nq7qfw" path="res://Florian/Props/beer_stand.tscn" id="19_d5eeg"] [ext_resource type="PackedScene" uid="uid://v86q0i25q2dj" path="res://Florian/PhysicsProps/DrunkFollow.tscn" id="20_20xaa"] -[ext_resource type="AudioStream" uid="uid://n05wr0n7ps0q" path="res://Florian/Audio/oktoberfestambience.mp3.ogg" id="21_mmnkp"] +[ext_resource type="AudioStream" uid="uid://bf4mxj37o7bh2" path="res://Florian/Audio/oktoberfestambience.mp3.ogg" id="21_mmnkp"] [ext_resource type="PackedScene" uid="uid://b85ujwx0p8gvn" path="res://Florian/Props/door.tscn" id="22_bv6bj"] [ext_resource type="PackedScene" uid="uid://c4fw8rjct7vms" path="res://Florian/Entity/People/accor.tscn" id="23_0a0yf"] [ext_resource type="Script" uid="uid://btok1rqmtms4o" path="res://Florian/Map/accor_animation.gd" id="24_ho8ja"] @@ -541,6 +541,9 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -3) [node name="PhysicsBarrel2" parent="Physics/Beer/BeerPodium/Barrels" instance=ExtResource("13_ijkca")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 1, -5) +[node name="PhysicsBeer" parent="Physics/Beer" instance=ExtResource("18_3uiso")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) + [node name="Barrels2" type="Node3D" parent="Physics"] [node name="PhysicsBarrel" parent="Physics/Barrels2" instance=ExtResource("13_ijkca")] @@ -558,6 +561,25 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 2.252, -14.7) [node name="PhysicsBarrel4" parent="Physics/Barrels2" instance=ExtResource("13_ijkca")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 2.252, -14.7) +[node name="PhysicsBarrel" parent="Physics" instance=ExtResource("13_ijkca")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 0.751997, -14.7) + +[node name="PhysicsBarrel2" parent="Physics" instance=ExtResource("13_ijkca")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0.751997, -14.7) + +[node name="PhysicsBarrel5" parent="Physics" instance=ExtResource("13_ijkca")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.5, 0.751997, -14.7) + +[node name="PhysicsBarrel3" parent="Physics" instance=ExtResource("13_ijkca")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 2.252, -14.7) + +[node name="PhysicsBarrel4" parent="Physics" instance=ExtResource("13_ijkca")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 2.252, -14.7) + +[node name="Barrels" type="Node3D" parent="Physics"] + +[node name="Beer2" type="Node3D" parent="Physics"] + [node name="Node3D2" type="Node3D" parent="."] [node name="BeerStand" parent="." instance=ExtResource("19_d5eeg")] @@ -1222,35 +1244,9 @@ use_collision = true size = Vector3(79, 7, 1) material = SubResource("StandardMaterial3D_tre0f") -[node name="Physics" type="Node3D" parent="."] +[node name="Physics2" type="Node3D" parent="."] -[node name="PhysicsBarrel" parent="Physics" instance=ExtResource("13_ijkca")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 0.751997, -14.7) - -[node name="PhysicsBarrel2" parent="Physics" instance=ExtResource("13_ijkca")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 0.751997, -14.7) - -[node name="PhysicsBarrel5" parent="Physics" instance=ExtResource("13_ijkca")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.5, 0.751997, -14.7) - -[node name="PhysicsBarrel3" parent="Physics" instance=ExtResource("13_ijkca")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -23, 2.252, -14.7) - -[node name="PhysicsBarrel4" parent="Physics" instance=ExtResource("13_ijkca")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -26, 2.252, -14.7) - -[node name="Barrels" type="Node3D" parent="Physics"] - -[node name="Beer" type="Node3D" parent="Physics"] - -[node name="PhysicsBeer" parent="Physics/Beer" instance=ExtResource("18_3uiso")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) - -[node name="Node3D2" type="Node3D" parent="."] - -[node name="PauseMenu" parent="." instance=ExtResource("20_mmnkp")] - -[node name="FinishScreen" parent="." instance=ExtResource("21_mmnkp")] +[node name="Node3D3" type="Node3D" parent="."] [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro" method="_turn_on_off"] [connection signal="interact" from="Stage/Interactable" to="Stage/Pyro2" method="_turn_on_off"] diff --git a/Florian/Map/chinese_ny.tscn b/Florian/Map/chinese_ny.tscn index 59f30f3..e7f3075 100644 --- a/Florian/Map/chinese_ny.tscn +++ b/Florian/Map/chinese_ny.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=59 format=3 uid="uid://c117ys2e3arbi"] +[gd_scene load_steps=65 format=3 uid="uid://b2rihishxk0on"] [ext_resource type="PackedScene" uid="uid://4qygsglmdow6" path="res://Amanda/temple_gate/source/01door.FBX.fbx" id="1_dr64d"] [ext_resource type="Texture2D" uid="uid://bnrri5m5k1c1a" path="res://Amanda/grass.png" id="2_r0dy2"] @@ -12,12 +12,17 @@ [ext_resource type="Texture2D" uid="uid://by4qtiie7iop" path="res://Amanda/SandyDry_S.jpg" id="9_8kkm8"] [ext_resource type="Texture2D" uid="uid://c2teei5qadpf5" path="res://Amanda/Sprite assets/girl_c.png" id="10_64lnl"] [ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="10_qqwfx"] +[ext_resource type="Texture2D" uid="uid://bphnmyd2oiua0" path="res://Amanda/skybox/satara_night_no_lamps_2k.exr" id="13_3f12g"] [ext_resource type="PackedScene" uid="uid://osrimuaocr1t" path="res://Amanda/tree/scene.gltf" id="13_cx38t"] [ext_resource type="Texture2D" uid="uid://cb1dwblmnwxcs" path="res://Amanda/Sprite assets/Untitled_Artwork-1 17.png" id="14_s4atm"] [ext_resource type="Texture2D" uid="uid://ciiwxhviiq2vy" path="res://Florian/Props/clothgrown.jpg" id="15_bowqk"] [ext_resource type="Texture2D" uid="uid://dvat0w2k6bb78" path="res://Amanda/Sprite assets/Untitled_Artwork-1 18.png" id="15_hp67e"] -[ext_resource type="Script" path="res://npc_path_follower.gd" id="17_3f12g"] -[ext_resource type="Texture2D" uid="uid://btt01irygbpwr" path="res://Amanda/skybox/Skydome.png" id="17_hp67e"] +[ext_resource type="Script" uid="uid://bgolfgrq66diw" path="res://npc_path_follower.gd" id="17_3f12g"] +[ext_resource type="PackedScene" uid="uid://dggx2w2c8xojc" path="res://Florian/PhysicsProps/firework.tscn" id="19_qqao8"] +[ext_resource type="AudioStream" uid="uid://yuv8dxd17p6s" path="res://Florian/Audio/chineseAmbientMusicGame.ogg" id="20_72n5s"] +[ext_resource type="Script" uid="uid://b7m4mddm1165v" path="res://Florian/Map/firework_spawn_locations.gd" id="21_yd64k"] +[ext_resource type="PackedScene" uid="uid://iky4i2bjknty" path="res://Florian/Props/gong.tscn" id="22_ppss2"] +[ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="23_4rmvb"] [sub_resource type="CylinderMesh" id="CylinderMesh_qqwfx"] top_radius = 50.0 @@ -30,6 +35,8 @@ albedo_texture = ExtResource("2_r0dy2") [sub_resource type="CylinderShape3D" id="CylinderShape3D_s4atm"] radius = 50.0 +[sub_resource type="SpriteFrames" id="SpriteFrames_oagmg"] + [sub_resource type="BoxMesh" id="BoxMesh_r0dy2"] size = Vector3(300, 2, 300) @@ -41,6 +48,28 @@ albedo_texture = ExtResource("9_8kkm8") [sub_resource type="BoxShape3D" id="BoxShape3D_cx38t"] size = Vector3(300, 2, 300) +[sub_resource type="AtlasTexture" id="AtlasTexture_olbkl"] +atlas = ExtResource("7_r0dy2") +region = Rect2(0, 0, 50, 50) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7aogo"] +atlas = ExtResource("7_r0dy2") +region = Rect2(0, 50, 50, 50) + +[sub_resource type="SpriteFrames" id="SpriteFrames_fvy46"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_olbkl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7aogo") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + [sub_resource type="AtlasTexture" id="AtlasTexture_3f12g"] atlas = ExtResource("5_tps7f") region = Rect2(0, 0, 50, 50) @@ -170,33 +199,8 @@ animations = [{ "speed": 5.0 }] -[sub_resource type="AtlasTexture" id="AtlasTexture_olbkl"] -atlas = ExtResource("7_r0dy2") -region = Rect2(0, 0, 50, 50) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7aogo"] -atlas = ExtResource("7_r0dy2") -region = Rect2(0, 50, 50, 50) - -[sub_resource type="SpriteFrames" id="SpriteFrames_fvy46"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_olbkl") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7aogo") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hp67e"] -albedo_texture = ExtResource("15_bowqk") - [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_3f12g"] -panorama = ExtResource("17_hp67e") +panorama = ExtResource("13_3f12g") [sub_resource type="Sky" id="Sky_qqao8"] sky_material = SubResource("PanoramaSkyMaterial_3f12g") @@ -264,11 +268,15 @@ animations = [{ "speed": 3.0 }] +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hp67e"] +albedo_texture = ExtResource("15_bowqk") + [node name="Node3D" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.51628, -0.84374, -0.146829, 0.54363, -0.455343, 0.705074, -0.661756, 0.284195, 0.693767, -43.737, 41.9913, -213.601) light_color = Color(0.999998, 0.996285, 0.680348, 1) +light_energy = 0.1 light_indirect_energy = 3.0 light_volumetric_fog_energy = 3.0 light_angular_distance = 7.27 @@ -276,7 +284,7 @@ light_angular_distance = 7.27 [node name="MeshInstance3D3" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -63.4748, -0.34801, 17.9661) mesh = SubResource("CylinderMesh_qqwfx") -skeleton = NodePath("../MeshInstance3D") +skeleton = NodePath("../Tower") surface_material_override/0 = SubResource("StandardMaterial3D_cx38t") [node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D3"] @@ -304,7 +312,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.28027 light_color = Color(1, 0.305882, 0.254902, 1) light_energy = 2.131 light_size = 0.1 -omni_range = 6.709 +omni_range = 16.364 +omni_attenuation = 0.225 [node name="lantern_long2" type="Sprite3D" parent="MeshInstance3D3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.4237, 12.4098, -32.8092) @@ -320,7 +329,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.28027 light_color = Color(1, 0.305882, 0.254902, 1) light_energy = 2.131 light_size = 0.1 -omni_range = 6.709 +omni_range = 16.364 +omni_attenuation = 0.225 [node name="lantern_long3" type="Sprite3D" parent="MeshInstance3D3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.054, 11.9927, -15.7553) @@ -336,7 +346,8 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.28027 light_color = Color(1, 0.305882, 0.254902, 1) light_energy = 2.131 light_size = 0.1 -omni_range = 6.709 +omni_range = 16.364 +omni_attenuation = 0.225 [node name="lantern_long4" type="Sprite3D" parent="MeshInstance3D3"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.8594, 11.9141, 4.47167) @@ -352,97 +363,36 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.28027 light_color = Color(1, 0.305882, 0.254902, 1) light_energy = 2.131 light_size = 0.1 -omni_range = 6.709 +omni_range = 16.364 +omni_attenuation = 0.225 -[node name="MeshInstance3D" type="MeshInstance3D" parent="."] +[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="MeshInstance3D3"] +sprite_frames = SubResource("SpriteFrames_oagmg") + +[node name="Tower" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9524, -1.68268, 0) mesh = SubResource("BoxMesh_r0dy2") skeleton = NodePath("StaticBody3D") surface_material_override/0 = SubResource("StandardMaterial3D_64lnl") -[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"] +[node name="StaticBody3D" type="StaticBody3D" parent="Tower"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 59.9524, 0, 0) physics_material_override = SubResource("PhysicsMaterial_qqwfx") -[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="Tower/StaticBody3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -60.054, 0, 0) shape = SubResource("BoxShape3D_cx38t") [node name="PlayerRigidbody" parent="." instance=ExtResource("8_tps7f")] -transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -20, 10.9579, -14.632) +transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -20, 0.266394, -14.632) -[node name="01door_FBX" parent="." instance=ExtResource("1_dr64d")] -transform = Transform3D(2.5, 0, 0, 0, 2.5, 0, 0, 0, 2.5, 91.0276, -3.50968, 26.52) - -[node name="lion-500k3" parent="01door_FBX" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0997822, 0, -0.00659606, 0, 0.1, 0, 0.00659606, 0, 0.0997822, -62.7302, 0.887334, 33.4865) - -[node name="lion-500k4" parent="01door_FBX" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0991298, 0, -0.0131634, 0, 0.1, 0, 0.0131634, 0, 0.0991298, -47.4066, 0.942909, 34.3398) - -[node name="01door_FBX3" parent="." instance=ExtResource("1_dr64d")] -transform = Transform3D(-0.0466391, 0, -1.99946, 0, 2.611, 0, 1.99946, 0, -0.0466391, -88.3717, -1.70738, 119.575) - -[node name="lion-500k" parent="01door_FBX3" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0.0659527, -61.9576, 0.67919, 33.7052) - -[node name="lion-500k2" parent="01door_FBX3" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) - -[node name="01door_FBX2" parent="." instance=ExtResource("1_dr64d")] -transform = Transform3D(-2.49999, 0, -0.00437835, 0, 2.5, 0, 0.00571586, 0, -1.91499, -191.851, -1.69798, 1.00809) - -[node name="lion-500k" parent="01door_FBX2" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0.0659527, -61.9576, 0.67919, 33.7052) - -[node name="lion-500k2" parent="01door_FBX2" instance=ExtResource("2_yh5on")] -transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) +[node name="OmniLight3D" type="OmniLight3D" parent="PlayerRigidbody"] +omni_range = 11.54 +omni_attenuation = 0.225 [node name="Sketchfab_Scene3" parent="." instance=ExtResource("7_hp67e")] transform = Transform3D(3, 0, 0, 0, 5, 0, 0, 0, 3, -63.7074, -0.48852, 19.9483) -[node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.9022, 3.28465, 0.0125003) -pixel_size = 0.075 -shaded = true -alpha_cut = 2 -texture_filter = 0 -sprite_frames = SubResource("SpriteFrames_4rmvb") -autoplay = "default" - -[node name="dragon_body2" type="AnimatedSprite3D" parent="."] -transform = Transform3D(-0.999937, 0, -0.0112571, 0, 1, 0, 0.0112571, 0, -0.999937, -34.9871, 3.30294, 0) -pixel_size = 0.075 -shaded = true -alpha_cut = 2 -texture_filter = 0 -sprite_frames = SubResource("SpriteFrames_hp67e") -autoplay = "default" - -[node name="dragon_tail" type="AnimatedSprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.6533, 3.35273, 0) -pixel_size = 0.075 -shaded = true -alpha_cut = 2 -texture_filter = 0 -sprite_frames = SubResource("SpriteFrames_vmaap") -autoplay = "default" -frame_progress = 0.482229 - -[node name="PointThing" parent="." instance=ExtResource("10_qqwfx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -34.4619, 3.30459, 0.0465164) -points_worth = 20 -points_name = "Dragon" - -[node name="dragon_body" type="AnimatedSprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.7454, 3.49472, 0) -pixel_size = 0.075 -shaded = true -alpha_cut = 2 -texture_filter = 0 -sprite_frames = SubResource("SpriteFrames_hp67e") -autoplay = "default" - [node name="drag_dude" type="AnimatedSprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36.7959, 1.11476, 0.0465164) pixel_size = 0.05 @@ -456,218 +406,54 @@ autoplay = "default" points_worth = 8 points_name = "Drag_guy" +[node name="DragonHead" type="AnimatedSprite3D" parent="drag_dude"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.1063, 2.16989, -0.0340161) +pixel_size = 0.075 +shaded = true +alpha_cut = 2 +texture_filter = 0 +sprite_frames = SubResource("SpriteFrames_4rmvb") +autoplay = "default" + +[node name="PointThing" parent="drag_dude/DragonHead" instance=ExtResource("10_qqwfx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.4403, 0.0199399, 0.0340161) +points_worth = 20 +points_name = "Dragon" + +[node name="dragon_body" type="AnimatedSprite3D" parent="drag_dude/DragonHead"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 6.1568, 0.21007, -0.0125003) +pixel_size = 0.075 +shaded = true +alpha_cut = 2 +texture_filter = 0 +sprite_frames = SubResource("SpriteFrames_hp67e") +autoplay = "default" + +[node name="dragon_body2" type="AnimatedSprite3D" parent="drag_dude/DragonHead/dragon_body"] +transform = Transform3D(-0.999937, 0, -0.0112571, 0, 1, 0, 0.0112571, 0, -0.999937, -3.2417, -0.19178, 0) +pixel_size = 0.075 +shaded = true +alpha_cut = 2 +texture_filter = 0 +sprite_frames = SubResource("SpriteFrames_hp67e") +autoplay = "default" + +[node name="dragon_tail" type="AnimatedSprite3D" parent="drag_dude/DragonHead/dragon_body/dragon_body2"] +transform = Transform3D(-0.999936, 0, 0.0112571, 0, 1, 0, -0.0112571, 0, -0.999936, -6.3334, 0.0497901, -0.0713002) +pixel_size = 0.075 +shaded = true +alpha_cut = 2 +texture_filter = 0 +sprite_frames = SubResource("SpriteFrames_vmaap") +autoplay = "default" +frame_progress = 0.482229 + [node name="Sketchfab_Scene2" parent="." instance=ExtResource("13_cx38t")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 16.1517, -1.20172, 18.6903) [node name="Sketchfab_Scene2" parent="Sketchfab_Scene2" instance=ExtResource("13_cx38t")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -330.285, 4.78484, -161.574) -[node name="lantern2" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -61.9547, 11.7595, 48.3527) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern2" type="Sprite3D" parent="lantern2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.0528, -0.226463, -8.46686) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern2/lantern2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern1" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.7726, 11.7047, 18.3966) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern1" type="Sprite3D" parent="lantern1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.2715, -0.074585, 21.1826) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern1/lantern1"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern6" type="Sprite3D" parent="."] -transform = Transform3D(0.999994, 0, 0.00356046, 0, 1, 0, -0.00356046, 0, 0.999994, -61.8229, 11.5187, -11.5412) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern6"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern4" type="Sprite3D" parent="."] -transform = Transform3D(0.999998, 0, 0.00178023, 0, 1, 0, -0.00178023, 0, 0.999998, -42.3437, 11.7213, -3.97876) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern4"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern5" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -92.4474, 11.325, 18.913) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern5"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern3" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.9136, 11.7556, -2.83962) -gi_mode = 2 -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("14_s4atm") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern3"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern_long" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.4904, 11.6446, 44.3281) -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("15_hp67e") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern_long" type="Sprite3D" parent="lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.4912, 0.299905, -1.03128) -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("15_hp67e") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern_long" type="Sprite3D" parent="lantern_long/lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.0212, -0.0689516, -15.9424) -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("15_hp67e") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long/lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="lantern_long" type="Sprite3D" parent="lantern_long/lantern_long/lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.2154, -0.0689516, -35.5423) -pixel_size = 0.1 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -texture = ExtResource("15_hp67e") - -[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long/lantern_long/lantern_long"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) -light_color = Color(1, 0.305882, 0.254902, 1) -light_energy = 2.131 -light_size = 0.1 -omni_range = 6.709 - -[node name="CSGTorus3D" type="CSGTorus3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62.1152, 13.3944, 18.3966) -inner_radius = 30.0 -outer_radius = 30.5 -material = SubResource("StandardMaterial3D_hp67e") - [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_72n5s") @@ -676,7 +462,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.799, 0.57123, -0.0450044) curve = SubResource("Curve3D_hp67e") [node name="NPCPathFollower" type="PathFollow3D" parent="Path3D" node_paths=PackedStringArray("path")] -transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, 0, 0, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) script = ExtResource("17_3f12g") speed = 5 path = NodePath("..") @@ -694,3 +480,288 @@ autoplay = "default" [node name="PointThing" parent="Path3D/NPCPathFollower/girl" instance=ExtResource("10_qqwfx")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.360537, 0.0389547, 0) points_name = "Girl" + +[node name="Archways" type="Node3D" parent="."] + +[node name="01door_FBX" parent="Archways" instance=ExtResource("1_dr64d")] +transform = Transform3D(2.5, 0, 0, 0, 2.5, 0, 0, 0, 2.5, 91.0276, -3.50968, 26.52) + +[node name="lion-500k3" parent="Archways/01door_FBX" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0997822, 0, -0.00659606, 0, 0.1, 0, 0.00659606, 0, 0.0997822, -62.7302, 0.887334, 33.4865) + +[node name="lion-500k4" parent="Archways/01door_FBX" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0991298, 0, -0.0131634, 0, 0.1, 0, 0.0131634, 0, 0.0991298, -47.4066, 0.942909, 34.3398) + +[node name="01door_FBX3" parent="Archways" instance=ExtResource("1_dr64d")] +transform = Transform3D(-0.0466391, 0, -1.99946, 0, 2.611, 0, 1.99946, 0, -0.0466391, -88.3717, -1.70738, 119.575) + +[node name="lion-500k" parent="Archways/01door_FBX3" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0.0659527, -61.9576, 0.67919, 33.7052) + +[node name="lion-500k2" parent="Archways/01door_FBX3" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) + +[node name="01door_FBX2" parent="Archways" instance=ExtResource("1_dr64d")] +transform = Transform3D(-2.49999, 0, -0.00437835, 0, 2.5, 0, 0.00571586, 0, -1.91499, -191.851, -1.69798, 1.00809) + +[node name="lion-500k" parent="Archways/01door_FBX2" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0.0659527, -61.9576, 0.67919, 33.7052) + +[node name="lion-500k2" parent="Archways/01door_FBX2" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) + +[node name="Firework" parent="." instance=ExtResource("19_qqao8")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -35, 5, 12) + +[node name="LanternTruss" type="Node3D" parent="."] + +[node name="Lantern" type="Node3D" parent="LanternTruss"] + +[node name="lantern2" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -61.9547, 11.7595, 48.3527) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern2" type="Sprite3D" parent="LanternTruss/Lantern/lantern2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.0528, -0.226463, -8.46686) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern2/lantern2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern1" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -31.7726, 11.7047, 18.3966) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern1" type="Sprite3D" parent="LanternTruss/Lantern/lantern1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.2715, -0.074585, 21.1826) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern1/lantern1"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern6" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(0.999994, 0, 0.00356046, 0, 1, 0, -0.00356046, 0, 0.999994, -61.8229, 11.5187, -11.5412) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern6"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern4" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(0.999998, 0, 0.00178023, 0, 1, 0, -0.00178023, 0, 0.999998, -42.3437, 11.7213, -3.97876) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern5" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -92.4474, 11.325, 18.913) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern5"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern3" type="Sprite3D" parent="LanternTruss/Lantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.9136, 11.7556, -2.83962) +gi_mode = 2 +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("14_s4atm") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/Lantern/lantern3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.182087, 0.48179, -0.195724) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="CSGTorus3D" type="CSGTorus3D" parent="LanternTruss/Lantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62.1152, 13.3944, 18.3966) +inner_radius = 30.0 +outer_radius = 30.5 +material = SubResource("StandardMaterial3D_hp67e") + +[node name="LongLantern" type="Node3D" parent="LanternTruss"] + +[node name="lantern_long" type="Sprite3D" parent="LanternTruss/LongLantern"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -51.4904, 11.6446, 44.3281) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/LongLantern/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern_long" type="Sprite3D" parent="LanternTruss/LongLantern/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.4912, 0.299905, -1.03128) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/LongLantern/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern_long" type="Sprite3D" parent="LanternTruss/LongLantern/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.0212, -0.0689516, -15.9424) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/LongLantern/lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="lantern_long" type="Sprite3D" parent="LanternTruss/LongLantern/lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.2154, -0.0689516, -35.5423) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="LanternTruss/LongLantern/lantern_long/lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 16.364 +omni_attenuation = 0.225 + +[node name="InteractableProps" type="Node3D" parent="."] + +[node name="ChineseAmbientMusicGame" type="AudioStreamPlayer3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62, 1, 21) +stream = ExtResource("20_72n5s") +autoplay = true + +[node name="FireworkSpawnLocations" type="Node3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -77, -1, -9) +script = ExtResource("21_yd64k") + +[node name="Node3D" type="Node3D" parent="FireworkSpawnLocations"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 59, 0, 15) + +[node name="Node3D2" type="Node3D" parent="FireworkSpawnLocations"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 59, 0, 58) + +[node name="Node3D3" type="Node3D" parent="FireworkSpawnLocations"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 59, 0, -41) + +[node name="Gong" parent="." instance=ExtResource("22_ppss2")] +transform = Transform3D(0.258819, 0, -0.965926, 0, 1, 0, 0.965926, 0, 0.258819, -42.9622, 1.2, 12.3637) + +[node name="Interactable" parent="Gong" instance=ExtResource("23_4rmvb")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.2, 0, 0) + +[connection signal="interact" from="Gong/Interactable" to="FireworkSpawnLocations" method="_spawn_fireworks"] +[connection signal="interact" from="Gong/Interactable" to="Gong" method="_play_gong_sound"] diff --git a/Florian/Map/firework_spawn_locations.gd b/Florian/Map/firework_spawn_locations.gd new file mode 100644 index 0000000..734ef6f --- /dev/null +++ b/Florian/Map/firework_spawn_locations.gd @@ -0,0 +1,8 @@ +extends Node3D + +const FIREWORK = preload("res://Florian/PhysicsProps/firework.tscn") + +func _spawn_fireworks(): + for child in self.get_children(): + var firework = FIREWORK.instantiate() + child.add_child(firework) diff --git a/Florian/Map/firework_spawn_locations.gd.uid b/Florian/Map/firework_spawn_locations.gd.uid new file mode 100644 index 0000000..e4969b1 --- /dev/null +++ b/Florian/Map/firework_spawn_locations.gd.uid @@ -0,0 +1 @@ +uid://b7m4mddm1165v diff --git a/Florian/PhysicsProps/firework.tscn b/Florian/PhysicsProps/firework.tscn new file mode 100644 index 0000000..5502eb5 --- /dev/null +++ b/Florian/PhysicsProps/firework.tscn @@ -0,0 +1,84 @@ +[gd_scene load_steps=14 format=3 uid="uid://dggx2w2c8xojc"] + +[ext_resource type="Script" uid="uid://cnhiesiqx3kwd" path="res://firework.gd" id="1_6yu8d"] +[ext_resource type="PackedScene" uid="uid://bobfhgsydmmr2" path="res://Florian/pyro.tscn" id="2_ss78o"] +[ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="3_7to2x"] + +[sub_resource type="SphereShape3D" id="SphereShape3D_ss78o"] + +[sub_resource type="Curve" id="Curve_ss78o"] +_limits = [-360.0, 360.0, 0.0, 1.0] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_7to2x"] +curve = SubResource("Curve_ss78o") + +[sub_resource type="Gradient" id="Gradient_1v6ks"] +offsets = PackedFloat32Array(0, 0.310078, 0.647287, 1) +colors = PackedColorArray(0, 0, 0, 1, 0.53876, 0.53876, 0.53876, 1, 0.674629, 0.674629, 0.674629, 1, 1, 1, 1, 1) + +[sub_resource type="GradientTexture1D" id="GradientTexture1D_mo22t"] +gradient = SubResource("Gradient_1v6ks") + +[sub_resource type="Curve" id="Curve_n7hv6"] +_limits = [-1.0, 1.0, 0.0, 1.0] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 1), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_tv5j2"] +curve = SubResource("Curve_n7hv6") + +[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_l21ki"] +lifetime_randomness = 1.0 +angle_min = -352.3 +angle_max = 352.3 +angle_curve = SubResource("CurveTexture_7to2x") +spread = 180.0 +initial_velocity_min = 9.32 +initial_velocity_max = 9.32 +gravity = Vector3(0, 0, 0) +scale_min = 0.5 +scale_over_velocity_min = 97.16 +scale_over_velocity_max = 363.35 +color = Color(0, 0, 1, 1) +color_ramp = SubResource("GradientTexture1D_mo22t") +hue_variation_min = -0.42 +hue_variation_max = 0.12 +hue_variation_curve = SubResource("CurveTexture_tv5j2") + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ss78o"] +emission_enabled = true +emission = Color(1, 1, 0, 1) + +[sub_resource type="BoxMesh" id="BoxMesh_r77gd"] +material = SubResource("StandardMaterial3D_ss78o") + +[node name="Firework" type="RigidBody3D"] +script = ExtResource("1_6yu8d") +lifetime = 2.0 + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("SphereShape3D_ss78o") + +[node name="Pyro" parent="." instance=ExtResource("2_ss78o")] +transform = Transform3D(-1, 8.74228e-08, 0, -8.74228e-08, -1, 0, 0, 0, 1, 0, 0, 0) + +[node name="GPUParticles3D" type="GPUParticles3D" parent="."] +emitting = false +amount = 100 +one_shot = true +explosiveness = 1.0 +randomness = 1.0 +process_material = SubResource("ParticleProcessMaterial_l21ki") +draw_pass_1 = SubResource("BoxMesh_r77gd") + +[node name="ExplosionPoints" parent="." instance=ExtResource("3_7to2x")] +visible = false +points_worth = 30 +points_name = "FireworkExplosion" +points_multiplier = 1.5 + +[node name="FireworkPoint" parent="." instance=ExtResource("3_7to2x")] +points_worth = 30 +points_name = "Firework" diff --git a/Florian/Player/PlayerRigidbody.tscn b/Florian/Player/PlayerRigidbody.tscn index 7f1deff..2d4b62e 100644 --- a/Florian/Player/PlayerRigidbody.tscn +++ b/Florian/Player/PlayerRigidbody.tscn @@ -49,7 +49,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) transform = Transform3D(1, 0, 0, 0, 0.965926, 0.258819, 0, -0.258819, 0.965926, 0, 1.94907, 3) [node name="FirstPerson" type="Node3D" parent="BoundingBox"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.5, 0) [node name="FloorChecks" type="Node3D" parent="BoundingBox"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.1, 0) diff --git a/Florian/Player/cool_camera.gd b/Florian/Player/cool_camera.gd index 56fddba..7f6ea21 100644 --- a/Florian/Player/cool_camera.gd +++ b/Florian/Player/cool_camera.gd @@ -30,6 +30,8 @@ var acceptable_length = 1 func _calculate_picture_objects(): var duplicates: Dictionary = {} for takeable in PictureTakeablesArray.picture_takables: + if not takeable: + continue #print("Checking takeable") if takeable.picture_taken(): var raycast = RayCast3D.new() @@ -70,6 +72,8 @@ func _calculate_picture_objects(): func _calculate_picture_spots(): for spot in PictureTakeablesArray.picture_spots: + if not spot: + return if spot.picture_taken(player): points_string += "{name} {points}\n".format( {"name" : spot.points_name, "points": spot.points_worth} diff --git a/Florian/Props/beer_stand.tscn b/Florian/Props/beer_stand.tscn index 83cea6d..acfb829 100644 --- a/Florian/Props/beer_stand.tscn +++ b/Florian/Props/beer_stand.tscn @@ -1,54 +1,8 @@ -[gd_scene load_steps=11 format=4 uid="uid://orn5b5pi73d3"] +[gd_scene load_steps=4 format=3 uid="uid://bxruw32nq7qfw"] -[ext_resource type="Script" path="res://Florian/Props/beer_stand.gd" id="1_qpiuw"] +[ext_resource type="Script" uid="uid://dp2yujw0u1aox" path="res://Florian/Props/beer_stand.gd" id="1_qpiuw"] [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="2_ftwn5"] [ext_resource type="PackedScene" uid="uid://dj13enetumsfm" path="res://Florian/Entity/People/waitress.tscn" id="3_ftwn5"] -[ext_resource type="Texture2D" uid="uid://vfybiixrbk3m" path="res://Amanda/medieval_tavern_props_pack/textures/tex_bar_counter.png" id="4_o5yow"] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_dm6ok"] -resource_name = "mat_bar_counter" -cull_mode = 2 -albedo_color = Color(0.906332, 0.906332, 0.906332, 1) -roughness = 0.5 - -[sub_resource type="ArrayMesh" id="ArrayMesh_pudy5"] -_surfaces = [{ -"aabb": AABB(-5.244, -0.0200002, -1, 10.488, 2.1856, 2), -"format": 34896613377, -"index_count": 192, -"index_data": PackedByteArray("AAABAAIAAwACAAEAAAACAAMAAwABAAQAAAADAAUABQADAAQAAAAGAAEABQAEAAcAAAAFAAcABwAEAAEAAAAHAAYABwABAAYACAAJAAoACAALAAkACgAMAAgACgANAAwADAANAA4ADAAOAA8AEAARABIAEAATABEAFAASABEAFAARABUAFgAUABUAFgAVABcAGAAZABoAGAAbABkAHAAYABoAGwAdABkAHAAaAB4AGwAfAB0AHwAcAB4AHwAeAB0AIAAhACIAIAAjACEAJAAgACIAIwAlACEAJAAiACYAIwAnACUAJwAkACYAJwAmACUAKAApACoAKgApACsAKAAsACkAKgArAC0ALgAsACgALQArAC8ALgAvACwALQAvAC4AMAAxADIAMgAxADMAMAA0ADEAMgAzADUANgA0ADAANQAzADcANgA3ADQANQA3ADYAOAA5ADoAOAA7ADkAPAA4ADoAOwA9ADkAPAA6AD4AOwA/AD0APwA8AD4APwA+AD0A"), -"name": "mat_bar_counter", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 64, -"vertex_data": PackedByteArray("//+Z6QAAAAD///////8AAP////8AAAAAAAD//wAAAAAAAP////8AAAAAmekAAAAA//+Z6f//AAAAAJnp//8AAJP4AADN2QAAk/hB6jQvAACT+EHqzdkAAJP4AAA0LwAAawcAAM3ZAABrB0HqzdkAAGsHQeo0LwAAawcAADQvAADl+0HqNC8AAOX7AAAo6wAA5ftB6ijrAADl+wAANC8AABkEQeoo6wAAGQQAACjrAAAZBEHqNC8AABkEAAA0LwAA0vYAALfzAADS9kHq4M8AANL2Qeq38wAA0vYAAODPAACn/QAAt/MAAKf9QergzwAAp/1B6rfzAACn/QAA4M8AANL2AADhLwAA0vZB6goMAADS9kHq4S8AANL2AAAKDAAAp/0AAOEvAACn/UHqCgwAAKf9QerhLwAAp/0AAAoMAAAsCQAAt/MAACwJQergzwAALAkAAODPAABXAkHq4M8AACwJQeq38wAAVwIAAODPAABXAgAAt/MAAFcCQeq38wAALAkAAOEvAAAsCUHqCgwAACwJAAAKDAAAVwJB6goMAAAsCUHq4S8AAFcCAAAKDAAAVwIAAOEvAABXAkHq4S8AAJR8AAC38wAAlHxB6uDPAACUfEHqt/MAAJR8AADgzwAAaYMAALfzAABpg0Hq4M8AAGmDQeq38wAAaYMAAODPAAA=") -}] -blend_shape_mode = 0 - -[sub_resource type="ArrayMesh" id="ArrayMesh_3x7iw"] -resource_name = "props_bar_counter" -_surfaces = [{ -"aabb": AABB(-5.244, -0.0200002, -1, 10.488, 2.1856, 2), -"attribute_data": PackedByteArray("qv27b//2wrr/9rtvqv3CuqUJu2//9hBppQkQaaUJwrr6Artv+gLCuqQJbcH/9m3BlOT/ZGb9DAOU5AwDZv3/ZHf9DAO04f9ktOEMA3f9/2T/9rtvpAnCuv/2wrqkCbtv3Rr/ZNMBDAPTAf9k3RoMA0oeDAPn4P9kSh7/ZOfgDAMGAgwDfx3/ZAYC/2R/HQwDU94MAzch/2RT3v9kNyEMA4YCm9IB/FDEAfyb0oYCUMSGAufgAfzn4IYCMu8B/DLvhgJ9/QH8ff2GAn39Afwy7wH8ff2GAjLvAfzn4IYC5+AB/JvShgKb0gH8UMSGAlDEhgIy7wH8ff2GAn39Afwy74YC5+AB/OfghgKb0gH8m9KGAlDEAfxQxIYCUMQB/JvShgKb0gH8UMQB/OfghgLn4AH8Mu+GAjLvAfx9/YYCff2GAufgAfyb0gH85+CGApvSAfxQxIYCUMSGAjLvAfwy74YCff0B/H39"), -"format": 34896613399, -"index_count": 192, -"index_data": PackedByteArray("AAABAAIAAAADAAEABAACAAEABQACAAQABQAEAAYABAABAAcACAAEAAcACAAHAAkACgAHAAEACgABAAsADAANAA4ADAAPAA0AEAARABIAEAATABEAFAAVABYAFAAXABUAGAAZABoAGAAbABkAHAAdAB4AHAAfAB0AIAAhACIAIAAjACEAJAAlACYAJAAnACUAKAApACoAKAArACkALAAoACoALAAqAC0ALgAsAC0ALgAtAC8AMAAuAC8AMAAvADEAMgAzADQAMgA1ADMANQA2ADMANQA3ADYANwA4ADYANwA5ADgAOQA6ADgAOQA7ADoAPAA9AD4APAA/AD0AQAA/ADwAQABBAD8AQgBBAEAAQgBDAEEARABDAEIARABFAEMARgBHAEgARgBJAEcASABHAEoASABKAEsASwBKAEwASwBMAE0ATQBMAE4ATQBOAE8AUABRAFIAUABTAFEAUwBUAFEAUwBVAFQAVgBQAFIAVgBSAFcAWABWAFcAWABXAFkA"), -"material": SubResource("StandardMaterial3D_dm6ok"), -"name": "mat_bar_counter", -"primitive": 3, -"uv_scale": Vector4(0, 0, 0, 0), -"vertex_count": 90, -"vertex_data": PackedByteArray("//+Z6QAAGvv///////9brf////8AAOvd//+Z6f//c9EAAP//AADr3f//mekAAJPhAACZ6QAAk+EAAP////9brQAAmekAABn7AACZ6f//dNEAAJnp//8+qP//men//z+ok/gAAM3ZAACT+EHqNC8AAJP4QerN2QAAk/gAADQvAADl+0HqNC//v+X7AAAo6/+f5ftB6ijr/5/l+wAANC//v///mekAAGseAACZ6f//wFf//5np///AVwAAmekAAGseawcAAM3ZAABrB0HqNC8AAGsHAAA0LwAAawdB6s3ZAAAZBEHqKOv/n+X7AAAo6/+fGQQAACjr/5/l+0HqKOv/nxkEQeo0L/+/GQQAACjr/58ZBAAANC//vxkEQeoo6/+fk/hB6s3ZAABrBwAAzdkAAJP4AADN2QAAawdB6s3ZAADS9gAAt/P8xdL2Qergz6rp0vZB6rfz/MXS9gAA4M+q6af9AAC38/zFp/1B6rfz/MWn/QAA4M+q6af9Qergz6rp0vYAAODPqunS9kHq4M+q6dL2AADhL/zF0vZB6goMqunS9kHq4S/8xdL2AAAKDKrpp/1B6goMqumn/QAACgyq6af9QerhL/zFp/0AAOEv/MXS9kHq4S/8xdL2AADhL/zFLAkAALfz/MUsCUHq4M+q6SwJAADgz6rpLAlB6rfz/MVXAgAAt/P8xVcCQeq38/zFVwIAAODPqulXAkHq4M+q6SwJAADgz6rpLAlB6uDPquksCQAA4S/8xSwJQeoKDKrpLAkAAAoMquksCUHq4S/8xVcCQeoKDKrpVwIAAAoMqulXAkHq4S/8xVcCAADhL/zFLAlB6uEv/MUsCQAA4S/8xZR8AAC38/zFlHxB6uDPqumUfEHqt/P8xZR8AADgz6rpaYNB6uDPqulpgwAA4M+q6WmDAAC38/zFaYNB6rfz/MVpgwAA4M+q6WmDQergz6rpraj6Su66u2AF0tZmSoYxUNXm+K2fC05YsSegi7rgD8X5ylHXMdCz+ZxCGa8ZL2I9//98pf8//3///3yl/z//f/9/AAD/fwAA/38AAP9/AACgC05YnEIZrxovYj2xJ6CLgdr/f/+//3//v/9/gdr/f/9/////fwAA/3////9/AAD/f////3////9/////f/////98pYHa/3///3ylgdr/f//i/+L6yvrK/+L/4vrK+sr/HP8c/xz/HAQ1BDUENQQ1+sr6yvrK+sr/4v/i+sr6yv/i/+L6yvrKBDUENQQ1BDX/HP8c/xz/HP/i/+L/4v/i/xz/HAQ1BDUENQQ1/xz/HP/i/+L/4v/i+sr6yvrK+soENQQ1BDUENf8c/xwENQQ1BDUENf8c/xz6yvrK+sr6yv/i/+L/4v/i/xz/HP8c/xz/4v/i+sr6yv/i/+L6yvrKBDUENQQ1BDX/HP8c/xz/HAQ1BDUENQQ1") -}] -blend_shape_mode = 0 -shadow_mesh = SubResource("ArrayMesh_pudy5") - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_w3ris"] -albedo_texture = ExtResource("4_o5yow") - -[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_o5yow"] - -[sub_resource type="BoxShape3D" id="BoxShape3D_3x7iw"] [node name="BeerStand" type="Node3D"] script = ExtResource("1_qpiuw") @@ -56,6 +10,10 @@ script = ExtResource("1_qpiuw") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="."] use_collision = true +[node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0) +size = Vector3(3, 1, 1) + [node name="Interactable" parent="CSGCombiner3D" instance=ExtResource("2_ftwn5")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0.4) @@ -80,16 +38,3 @@ wait_time = 3.0 [node name="waitress" parent="." instance=ExtResource("3_ftwn5")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0.7, -1) - -[node name="bar_counter" type="MeshInstance3D" parent="."] -transform = Transform3D(0.499879, 0, -0.0110208, 0, 0.5, 0, 0.0110208, 0, 0.499879, 1.70563, -0.410425, 0.155102) -mesh = SubResource("ArrayMesh_3x7iw") -skeleton = NodePath("") -surface_material_override/0 = SubResource("StandardMaterial3D_w3ris") - -[node name="StaticBody3D" type="StaticBody3D" parent="bar_counter"] -physics_material_override = SubResource("PhysicsMaterial_o5yow") - -[node name="CollisionShape3D" type="CollisionShape3D" parent="bar_counter/StaticBody3D"] -transform = Transform3D(10, 0, 0, 0, 2.5, 0, 0, 0, 2, 0, 0.974669, 0) -shape = SubResource("BoxShape3D_3x7iw") diff --git a/Florian/Props/gong.gd b/Florian/Props/gong.gd new file mode 100644 index 0000000..a9c8652 --- /dev/null +++ b/Florian/Props/gong.gd @@ -0,0 +1,5 @@ +extends Sprite3D +@onready var asian_gong: AudioStreamPlayer3D = $"Asian-gong" + +func _play_gong_sound(): + asian_gong.play() diff --git a/Florian/Props/gong.gd.uid b/Florian/Props/gong.gd.uid new file mode 100644 index 0000000..9b8ebae --- /dev/null +++ b/Florian/Props/gong.gd.uid @@ -0,0 +1 @@ +uid://ct8d8h6n6yj2h diff --git a/Florian/Props/gong.tscn b/Florian/Props/gong.tscn new file mode 100644 index 0000000..bef842c --- /dev/null +++ b/Florian/Props/gong.tscn @@ -0,0 +1,21 @@ +[gd_scene load_steps=5 format=3 uid="uid://iky4i2bjknty"] + +[ext_resource type="Texture2D" uid="uid://c5tklwgf0hx4x" path="res://Amanda/Sprite assets/gong.png" id="1_ylc3g"] +[ext_resource type="Script" uid="uid://ct8d8h6n6yj2h" path="res://Florian/Props/gong.gd" id="2_0uuuv"] +[ext_resource type="PackedScene" uid="uid://c8gnb0kut2n5h" path="res://Florian/PointsLogic/point_thing.tscn" id="2_t4br7"] +[ext_resource type="AudioStream" uid="uid://bntdj67dhby6v" path="res://Florian/Audio/asian-gong.mp3" id="3_80230"] + +[node name="Gong" type="Sprite3D"] +pixel_size = 0.05 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("1_ylc3g") +script = ExtResource("2_0uuuv") + +[node name="PointThing" parent="." instance=ExtResource("2_t4br7")] +points_name = "Gong" + +[node name="Asian-gong" type="AudioStreamPlayer3D" parent="."] +stream = ExtResource("3_80230") +autoplay = true diff --git a/firework.gd b/firework.gd new file mode 100644 index 0000000..8b3f38e --- /dev/null +++ b/firework.gd @@ -0,0 +1,34 @@ +extends RigidBody3D + +@export var speed: float = 20.0 +@export var curve_strength: float = 0.5 +@export var lifetime: float = 3.0 +@onready var particle_emitter: GPUParticles3D = $GPUParticles3D +@onready var explosion_points: PointPicture = $ExplosionPoints + +var time_alive: float = 0.0 +var initial_position: Vector3 + +func _ready() -> void: + initial_position = global_position + # Set the initial velocity to shoot upwards + linear_velocity = Vector3(0, speed, 0) + +func _process(delta: float) -> void: + time_alive += delta + if time_alive < lifetime: + # Apply a slight curve to the trajectory + var curve_offset = Vector3(curve_strength * sin(time_alive * 2.0), 0, curve_strength * cos(time_alive * 2.0)) + linear_velocity += curve_offset * delta + # Update the position + global_position += linear_velocity * delta + else: + explode() # Call the explode function when the firework reaches its lifetime + +func explode() -> void: + explosion_points.show() + if particle_emitter: + particle_emitter.emitting = true # Start emitting particles # Mark as exploded + # Start a timer to free the firework after the explosion duration + await get_tree().create_timer(1).timeout + queue_free() # Remove the firework after expl diff --git a/firework.gd.uid b/firework.gd.uid new file mode 100644 index 0000000..633e8bc --- /dev/null +++ b/firework.gd.uid @@ -0,0 +1 @@ +uid://cnhiesiqx3kwd diff --git a/picture_takeables_array.gd b/picture_takeables_array.gd index b19722a..7d38c7f 100644 --- a/picture_takeables_array.gd +++ b/picture_takeables_array.gd @@ -7,6 +7,8 @@ func _add_point_picture(point_picture: PointPicture): print("Adding picture takeable") picture_takables.append(point_picture) print(len(picture_takables)) + + func _add_picture_spot(picture_spot: PictureSpot): print("Adding picture Spot") diff --git a/project.godot b/project.godot index f4d08f9..5734852 100644 --- a/project.godot +++ b/project.godot @@ -20,10 +20,6 @@ config/icon="res://icon.svg" PictureTakeablesArray="*res://picture_takeables_array.gd" PathfindingArray="*res://pathfinding_array.gd" -[dotnet] - -project/assembly_name="AllAroundTheWorld" - [input] forward={ @@ -61,12 +57,3 @@ interact={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) ] } -pause={ -"deadzone": 0.2, -"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194305,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) -] -} - -[rendering] - -renderer/rendering_method="gl_compatibility"