StikmanMann/OpticTraveler
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/StikmanMann/allaroundtheworld

Browse source
This commit is contained in:
G3rkul3s 2025-09-19 11:15:43 +02:00
commit c1559afc30
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Florian/Map/Oktoberfest.tscn
View file

@ -1,41 +1,41 @@
[gd_scene load_steps=114 format=4 uid="uid://by5cq6m32hbor"] [gd_scene load_steps=114 format=4 uid="uid://by5cq6m32hbor"]
[ext_resource type="Script" uid="uid://bhh76i4a51brf" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"] [ext_resource type="Script" uid="uid://bhh76i4a51brf" path="res://Florian/Map/oktoberfest.gd" id="1_20xaa"]
[ext_resource type="Texture2D" uid="uid://c6rwhjuvbddf1" path="res://Amanda/medieval_tavern_props_pack/textures/tex_chair_wood.png" id="1_kmmfq"] [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="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="2_82wr0"]
[ext_resource type="Texture2D" uid="uid://ccyfq5sclccnj" path="res://Amanda/medieval_tavern_props_pack/textures/tex_barrel.png" id="2_o3vbn"] [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://yeevlg6sfih0" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood_round.png" id="3_6t3lb"] [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://bobfhgsydmmr2" path="res://Florian/pyro.tscn" id="4_h8052"]
[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://b0jksn1bn7px1" 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="Texture2D" uid="uid://dhgqwoq5exevs" 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="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" 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://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://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"] [ext_resource type="Texture2D" uid="uid://clxlbssqj1i04" path="res://Amanda/medieval_tavern_props_pack/textures/tex_table_wood.png" id="7_j18cs"]
[ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="7_miqpv"] [ext_resource type="PackedScene" uid="uid://c5552lenumx2j" path="res://Florian/Entity/People/saxophone.tscn" id="7_miqpv"]
[ext_resource type="Texture2D" uid="uid://wrd5lxdbrbbk" path="res://Amanda/medieval_tavern_props_pack/textures/tex_bucket_wood.png" id="8_rbdeg"] [ext_resource type="Texture2D" uid="uid://dpgy6mtsyiog8" path="res://Amanda/medieval_tavern_props_pack/textures/tex_bucket_wood.png" id="8_rbdeg"]
[ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="9_3box6"] [ext_resource type="PackedScene" uid="uid://bybsn53hd1mge" path="res://Florian/Entity/People/guys.tscn" id="9_3box6"]
[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://cu1fswbmt4jem" 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="Texture2D" uid="uid://rjjmyyhp61at" 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="PackedScene" uid="uid://bw73kprk7ptvn" path="res://Florian/PointsLogic/PictureSpot.tscn" id="10_28ddj"]
[ext_resource type="Script" uid="uid://cu3fdbo1lelob" 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="Texture2D" uid="uid://c3w4rywml57e7" 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://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://m3sk1ustdixv" 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="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://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="PackedScene" uid="uid://ctcspqlxrw22q" path="res://Florian/PhysicsProps/PhysicsBarrel.tscn" id="13_ijkca"]
[ext_resource type="Texture2D" uid="uid://dgwh2eg2adqvf" path="res://Florian/Textures/bush.jpg" id="14_70e5e"] [ext_resource type="Texture2D" uid="uid://b668hlnork7jt" path="res://Florian/Textures/bush.jpg" id="14_70e5e"]
[ext_resource type="Texture2D" uid="uid://qtwhgo8sq7g7" path="res://Amanda/medieval_tavern_props_pack/Holz Dark Seamless.jpg" id="17_1dni4"] [ext_resource type="Texture2D" uid="uid://dxlk16usht40h" path="res://Amanda/medieval_tavern_props_pack/Holz Dark Seamless.jpg" id="17_1dni4"]
[ext_resource type="Texture2D" uid="uid://b1llux0jpvxis" path="res://Amanda/medieval_tavern_props_pack/textures/tex_fireplace_2.png" id="17_sdh5o"] [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="PackedScene" uid="uid://ow35tpunk744" path="res://Florian/PhysicsProps/physics_beer.tscn" id="18_3uiso"]
[ext_resource type="Texture2D" uid="uid://cq0uucc77ce56" path="res://Amanda/medieval_tavern_props_pack/textures/Holz Dark Seamless.jpg" id="18_o4c6g"] [ext_resource type="Texture2D" uid="uid://dgorc2akvuk46" path="res://Amanda/medieval_tavern_props_pack/textures/Holz Dark Seamless.jpg" id="18_o4c6g"]
[ext_resource type="Texture2D" uid="uid://bmgydj38uhwoe" path="res://Amanda/skybox/Skydome_0.png" id="19_20xaa"] [ext_resource type="Texture2D" uid="uid://bmgydj38uhwoe" path="res://Amanda/skybox/Skydome_0.png" id="19_20xaa"]
[ext_resource type="PackedScene" uid="uid://bxruw32nq7qfw" 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="PackedScene" uid="uid://v86q0i25q2dj" path="res://Florian/PhysicsProps/DrunkFollow.tscn" id="20_20xaa"]
[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="Texture2D" uid="uid://2yix8eddgqlr" 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="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://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="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="Script" uid="uid://btok1rqmtms4o" path="res://Florian/Map/accor_animation.gd" id="24_ho8ja"]

6
Florian/Map/chinese_ny.tscn
View file

@ -16,13 +16,13 @@
[ext_resource type="Texture2D" uid="uid://c0so272ko5xmv" path="res://Amanda/Sprite assets/Untitled_Artwork-1 17.png" id="14_s4atm"] [ext_resource type="Texture2D" uid="uid://c0so272ko5xmv" 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://ciiwxhviiq2vy" path="res://Florian/Props/clothgrown.jpg" id="15_bowqk"]
[ext_resource type="Texture2D" uid="uid://w207q4aq0uoc" path="res://Amanda/Sprite assets/Untitled_Artwork-1 18.png" id="15_hp67e"] [ext_resource type="Texture2D" uid="uid://w207q4aq0uoc" 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="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="PackedScene" uid="uid://dggx2w2c8xojc" path="res://Florian/PhysicsProps/firework.tscn" id="19_qqao8"]
[ext_resource type="AudioStream" uid="uid://cr4l7i1y227ru" path="res://Florian/Audio/chineseAmbientMusicGame.ogg" id="20_72n5s"] [ext_resource type="AudioStream" uid="uid://cr4l7i1y227ru" 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="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://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"] [ext_resource type="PackedScene" uid="uid://byhsp6ujjsh8m" path="res://Florian/Entity/interactable.tscn" id="23_4rmvb"]
[ext_resource type="Texture2D" uid="uid://dsb36yt01ism8" path="res://Amanda/Sprite assets/boy_c.png" id="23_oagmg"] [ext_resource type="Texture2D" uid="uid://blcs63wvumsoa" path="res://Amanda/Sprite assets/boy_c.png" id="23_oagmg"]
[sub_resource type="CylinderMesh" id="CylinderMesh_qqwfx"] [sub_resource type="CylinderMesh" id="CylinderMesh_qqwfx"]
top_radius = 50.0 top_radius = 50.0
@ -504,7 +504,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.799, 0.57123, -0.0450044)
curve = SubResource("Curve3D_hp67e") curve = SubResource("Curve3D_hp67e")
[node name="NPCPathFollower" type="PathFollow3D" parent="Path3D" node_paths=PackedStringArray("path")] [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") script = ExtResource("17_3f12g")
speed = 5 speed = 5
path = NodePath("..") path = NodePath("..")

2
Florian/Props/beer_stand.tscn
View file

@ -1,6 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://bxruw32nq7qfw"] [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://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="PackedScene" uid="uid://dj13enetumsfm" path="res://Florian/Entity/People/waitress.tscn" id="3_ftwn5"]