diff --git a/Florian/Map/Oktoberfest_new.tscn b/Florian/Map/Oktoberfest_new.tscn index e0d1bdb..2b766cf 100644 --- a/Florian/Map/Oktoberfest_new.tscn +++ b/Florian/Map/Oktoberfest_new.tscn @@ -9,7 +9,7 @@ [ext_resource type="Texture2D" uid="uid://b0l15aswgn0mp" path="res://Amanda/medieval_tavern_props_pack/textures/tex_lamp_wood.png" id="4_o4c6g"] [ext_resource type="Texture2D" uid="uid://crs6pqip73lnb" path="res://Amanda/medieval_tavern_props_pack/textures/tex_candle_plate.png" id="5_j18cs"] [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="Texture2D" uid="uid://cgkadhjwrildd" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood.png" id="7_j18cs"] @@ -19,10 +19,10 @@ [ext_resource type="Texture2D" uid="uid://c1xqukfjgdfkf" path="res://Amanda/medieval_tavern_props_pack/textures/tex_sack.png" id="9_y7kr0"] [ext_resource type="Texture2D" uid="uid://oq7sc7ifxcuh" path="res://Amanda/medieval_tavern_props_pack/textures/tex_shelf_wood.png" id="10_6j042"] [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="Texture2D" uid="uid://bc165uwvli2g3" path="res://Amanda/medieval_tavern_props_pack/textures/planks.png" id="10_nbq5r"] [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"] @@ -37,10 +37,10 @@ [ext_resource type="Texture2D" uid="uid://btvin3pkgvu3s" path="res://Amanda/medieval_tavern_props_pack/textures/tex_bar_counter.png" id="21_fese6"] [ext_resource type="AudioStream" uid="uid://yeqii4bqw3d5" 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://bfq21ks4r8gma" path="res://Florian/Entity/People/accor.tscn" id="23_0a0yf"] -[ext_resource type="Script" path="res://Florian/Map/accor_animation.gd" id="24_ho8ja"] -[ext_resource type="PackedScene" path="res://Nikita/finish_screen.tscn" id="30_s3xcw"] -[ext_resource type="PackedScene" path="res://Nikita/pause_menu.tscn" id="31_fese6"] +[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"] +[ext_resource type="PackedScene" uid="uid://dl42xs7anteub" path="res://Nikita/finish_screen.tscn" id="30_s3xcw"] +[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="31_fese6"] [ext_resource type="PackedScene" uid="uid://dg7bbk825ux3u" path="res://Amanda/medieval_tavern_props_pack/roof_scene.tscn" id="42_wvrfj"] [ext_resource type="PackedScene" uid="uid://c0lf4alak6nha" path="res://Amanda/chandelier/scene.gltf" id="43_n03eg"] diff --git a/Florian/Player/cool_camera.gd b/Florian/Player/cool_camera.gd index 453c91d..76913f1 100644 --- a/Florian/Player/cool_camera.gd +++ b/Florian/Player/cool_camera.gd @@ -63,6 +63,8 @@ func _calculate_picture_objects(): var label = Label3D.new() label.billboard = BaseMaterial3D.BILLBOARD_ENABLED label.fixed_size = true + label.top_level = true + label.global_position = takeable.global_position label.font_size = 100 label.pixel_size = 0.001 diff --git a/Nikita/ballon_gold.tscn b/Nikita/ballon_gold.tscn new file mode 100644 index 0000000..14e09ca --- /dev/null +++ b/Nikita/ballon_gold.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=4 format=3 uid="uid://b56u6jt4qr0i6"] + +[ext_resource type="PackedScene" uid="uid://dqtg4fdim4qay" path="res://Nikita/source/hot_air_balloon_-_low_poly.glb" id="1_5m5nl"] +[ext_resource type="Texture2D" uid="uid://b645nd8b5125w" path="res://Nikita/source/hot_air_balloon_-_low_poly_3.png" id="2_5m5nl"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_38pwp"] +cull_mode = 2 +albedo_texture = ExtResource("2_5m5nl") + +[node name="Sketchfab_Scene" instance=ExtResource("1_5m5nl")] + +[node name="Hot Air Balloon_Material_001_0" parent="Sketchfab_model/59e77a23ceb44029a1d8b7668bedda12_fbx/RootNode/Hot Air Balloon" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_38pwp") diff --git a/Nikita/balloonfest.tscn b/Nikita/balloonfest.tscn index a3c1312..efe117f 100644 --- a/Nikita/balloonfest.tscn +++ b/Nikita/balloonfest.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=29 format=3 uid="uid://cge0bfktyd7ka"] +[gd_scene load_steps=36 format=3 uid="uid://cge0bfktyd7ka"] [ext_resource type="Texture2D" uid="uid://b0ml0awb8t7yh" path="res://Nikita/textures/golden_gate_hills_1k.png" id="1_dcn22"] [ext_resource type="PackedScene" uid="uid://djdo6lntq4tq0" path="res://Nikita/source/ballons.glb" id="1_fqyqv"] @@ -21,7 +21,13 @@ [ext_resource type="PackedScene" uid="uid://nepyioiql1p7" path="res://Nikita/source/simple_car_break_low_poly.glb" id="18_3unov"] [ext_resource type="PackedScene" uid="uid://dv7728isc44gi" path="res://Nikita/source/simple_car_low_poly.glb" id="19_34i2w"] [ext_resource type="Script" uid="uid://c8g6sb8ucm421" path="res://Nikita/scripts/path_follow_balloon.gd" id="20_34i2w"] +[ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="21_oq2w4"] [ext_resource type="Script" uid="uid://dvb3u2fiio68w" path="res://Nikita/scripts/path_follow_balloon_up.gd" id="22_hsesi"] +[ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="23_cqpa7"] +[ext_resource type="Script" uid="uid://be7duobvgkkeo" path="res://Nikita/scripts/path_follow_3d.gd" id="25_6exkg"] +[ext_resource type="PackedScene" uid="uid://b56u6jt4qr0i6" path="res://Nikita/ballon_gold.tscn" id="25_rdcwi"] +[ext_resource type="AudioStream" uid="uid://cqbl4amwc7856" path="res://Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3" id="27_r7sp0"] +[ext_resource type="AudioStream" uid="uid://bu1o0ehw476w6" path="res://Nikita/source/6188e449e9fae91.mp3" id="28_jr03o"] [sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_eb1mq"] panorama = ExtResource("1_dcn22") @@ -60,6 +66,15 @@ _data = { } point_count = 3 +[sub_resource type="Curve3D" id="Curve3D_oq2w4"] +closed = true +bake_interval = 15.0 +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 35.175, 14.6756, -1.82783, 0.490643, 0, 0, 0, 0, 0, 6.125, -5.04593, 26.9871, 49.7222, 0, 0, 23.33, 0, 0, -28.3, 0, 52.2766, 0), +"tilts": PackedFloat32Array(0, 0, 0) +} +point_count = 3 + [node name="Balloonfest" type="Node3D"] script = ExtResource("1_ojto3") @@ -214,6 +229,15 @@ transform = Transform3D(0.995198, 0, 0.0978782, 0, 1, 0, -0.0978782, 0, 0.995198 transform = Transform3D(0.736459, 0, 0, 0, 0.462981, 0, 0, 0, 0.935879, 0, 1.22559, -0.459291) points_name = "car green" +[node name="guys" parent="StaticObjects" instance=ExtResource("23_cqpa7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8138, 0.9, 10.0745) + +[node name="guys2" parent="StaticObjects" instance=ExtResource("23_cqpa7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8138, 0.9, 12.3287) + +[node name="guys3" parent="StaticObjects" instance=ExtResource("23_cqpa7")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.8936, 0.9, 12.3287) + [node name="Balloons" type="Node" parent="."] [node name="Path3D" type="Path3D" parent="Balloons"] @@ -237,7 +261,7 @@ transform = Transform3D(-0.173545, 0, 0.984826, 0, 1, 0, -0.984826, 0, -0.173545 curve = SubResource("Curve3D_3unov") [node name="PathFollow3D" type="PathFollow3D" parent="Balloons/Path3D2"] -transform = Transform3D(-0.0958825, -0.018765, 0.995209, -0.192064, 0.981379, -1.11758e-08, -0.976683, -0.191145, -0.0977012, -64.1844, 20, -27.8943) +transform = Transform3D(-0.0958825, -0.018765, 0.995208, -0.192064, 0.981379, -1.11758e-08, -0.976683, -0.191145, -0.0977011, -64.1844, 20, -27.8943) progress = 91.2869 rotation_mode = 1 script = ExtResource("20_34i2w") @@ -249,6 +273,9 @@ transform = Transform3D(3.65105, 0, 0, 0, 7.64798, 0, 0, 0, 3.65105, 0, 9.7302, points_worth = 100 points_name = "red balloon" +[node name="saxophone" parent="Balloons/Path3D2/PathFollow3D/Balloon_red" instance=ExtResource("21_oq2w4")] +transform = Transform3D(1, 1.86265e-08, 0, 7.45058e-09, 1, 0, 0, -3.72529e-09, 1, -0.204922, 1.04708, 0) + [node name="Path3D3" type="Path3D" parent="Balloons"] transform = Transform3D(0.967674, 0, -0.252204, 0, 1, 0, 0.252204, 0, 0.967674, 38.7874, 0, -21.8904) curve = SubResource("Curve3D_34i2w") @@ -266,12 +293,15 @@ transform = Transform3D(3.65105, 0, 0, 0, 7.64798, 0, 0, 0, 3.65105, 0, 9.7302, points_worth = 100 points_name = "green balloon" +[node name="guys" parent="Balloons/Path3D3/PathFollow3D/Ballon_green" instance=ExtResource("23_cqpa7")] +transform = Transform3D(0.728493, 0.0679675, 0.323537, -0.0743622, 0.796531, 0.000104495, -0.322129, -0.0301701, 0.731653, 0, 1.17756, 0) + [node name="Path3D4" type="Path3D" parent="Balloons"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 36.0308, 43.2901, 15.5027) curve = SubResource("Curve3D_hsesi") [node name="PathFollow3D" type="PathFollow3D" parent="Balloons/Path3D4"] -transform = Transform3D(0.919657, 0.29319, -0.261245, -0.302015, 0.953273, 0.00664529, 0.250986, 0.0727895, 0.965241, 10, 0, 8) +transform = Transform3D(0.919657, 0.29319, -0.261245, -0.302015, 0.953273, 0.0066453, 0.250986, 0.0727895, 0.965242, 10, 0, 8) rotation_mode = 1 script = ExtResource("22_hsesi") @@ -283,7 +313,7 @@ points_worth = 100 points_name = "blue balloon" [node name="PathFollow3D2" type="PathFollow3D" parent="Balloons/Path3D4"] -transform = Transform3D(0.963826, 0.0899486, 0.250846, -0.0929528, 0.995663, 0.000130762, -0.249747, -0.0234432, 0.968018, 4.18684, -4.32774, -53.3213) +transform = Transform3D(0.963824, 0.0899486, 0.250846, -0.0929527, 0.995663, 0.000130762, -0.249747, -0.0234432, 0.968018, 4.18684, -4.32774, -53.3213) progress = 89.7982 rotation_mode = 1 script = ExtResource("22_hsesi") @@ -294,3 +324,32 @@ script = ExtResource("22_hsesi") transform = Transform3D(3.65105, 0, 0, 0, 7.64798, 0, 0, 0, 3.65105, 0, 9.7302, 0) points_worth = 100 points_name = "red balloon" + +[node name="Path3D5" type="Path3D" parent="Balloons"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.2645, 36.366, -1.58754) +curve = SubResource("Curve3D_oq2w4") + +[node name="PathFollow3D" type="PathFollow3D" parent="Balloons/Path3D5"] +transform = Transform3D(-0.762206, 0, 0.647327, 0, 0.999999, 0, -0.647325, 0, -0.762209, -2.69563, 23.5, 47.7876) +progress = 58.6301 +rotation_mode = 1 +script = ExtResource("25_6exkg") + +[node name="Sketchfab_Scene" parent="Balloons/Path3D5/PathFollow3D" instance=ExtResource("25_rdcwi")] + +[node name="PointThing" parent="Balloons/Path3D5/PathFollow3D/Sketchfab_Scene" instance=ExtResource("8_kwais")] +points_worth = 300 +points_name = "gold balloon" + +[node name="AudioStreamPlayer3D" type="AudioStreamPlayer3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -39.8459, 17.0931, 2.63612) +stream = ExtResource("28_jr03o") +autoplay = true +max_distance = 40.0 +parameters/looping = true + +[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."] +stream = ExtResource("27_r7sp0") +volume_db = -9.369 +autoplay = true +parameters/looping = true diff --git a/Nikita/scripts/path_follow_3d.gd b/Nikita/scripts/path_follow_3d.gd new file mode 100644 index 0000000..9fff0df --- /dev/null +++ b/Nikita/scripts/path_follow_3d.gd @@ -0,0 +1,4 @@ +extends PathFollow3D + +func _process(delta: float) -> void: + progress += 1 * delta diff --git a/Nikita/scripts/path_follow_3d.gd.uid b/Nikita/scripts/path_follow_3d.gd.uid new file mode 100644 index 0000000..03b0b95 --- /dev/null +++ b/Nikita/scripts/path_follow_3d.gd.uid @@ -0,0 +1 @@ +uid://be7duobvgkkeo diff --git a/Nikita/source/6188e449e9fae91.mp3 b/Nikita/source/6188e449e9fae91.mp3 new file mode 100644 index 0000000..b77c7db Binary files /dev/null and b/Nikita/source/6188e449e9fae91.mp3 differ diff --git a/Nikita/source/6188e449e9fae91.mp3.import b/Nikita/source/6188e449e9fae91.mp3.import new file mode 100644 index 0000000..10600b6 --- /dev/null +++ b/Nikita/source/6188e449e9fae91.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://bu1o0ehw476w6" +path="res://.godot/imported/6188e449e9fae91.mp3-28d82417eba0df0d881a203bfce7ec99.mp3str" + +[deps] + +source_file="res://Nikita/source/6188e449e9fae91.mp3" +dest_files=["res://.godot/imported/6188e449e9fae91.mp3-28d82417eba0df0d881a203bfce7ec99.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3 b/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3 new file mode 100644 index 0000000..e437ce5 Binary files /dev/null and b/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3 differ diff --git a/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3.import b/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3.import new file mode 100644 index 0000000..9f389cc --- /dev/null +++ b/Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://cqbl4amwc7856" +path="res://.godot/imported/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3-6eb2fccd8e18e1b5a8d95a363fc222b5.mp3str" + +[deps] + +source_file="res://Nikita/source/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3" +dest_files=["res://.godot/imported/frna-field-mountain-insects-grasshopper-flyers-with-light-wind-in-tree.mp3-6eb2fccd8e18e1b5a8d95a363fc222b5.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Nikita/source/hot_air_balloon_-_low_poly_3.png b/Nikita/source/hot_air_balloon_-_low_poly_3.png new file mode 100644 index 0000000..0587946 Binary files /dev/null and b/Nikita/source/hot_air_balloon_-_low_poly_3.png differ diff --git a/Nikita/source/hot_air_balloon_-_low_poly_3.png.import b/Nikita/source/hot_air_balloon_-_low_poly_3.png.import new file mode 100644 index 0000000..8786ce2 --- /dev/null +++ b/Nikita/source/hot_air_balloon_-_low_poly_3.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b645nd8b5125w" +path.s3tc="res://.godot/imported/hot_air_balloon_-_low_poly_3.png-db4a16b785953286e619281b4cf0a96e.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://Nikita/source/hot_air_balloon_-_low_poly_3.png" +dest_files=["res://.godot/imported/hot_air_balloon_-_low_poly_3.png-db4a16b785953286e619281b4cf0a96e.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