Jonathan/Babushka
2
0
Fork 0
Code Pull Requests 1 Releases Activity

World transision WIP

Browse Source
This commit is contained in:
cblech
2025-04-21 15:31:01 +02:00
parent 1782ff91b4
commit 71ca6c3305
22 changed files with 257 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scenes/worlds/Babushka_world_item_pickup_testing.tscn
+32 -2
View File
@@ -1,11 +1,17 @@
[gd_scene load_steps=10 format=3 uid="uid://dbxy2y85r1d8x"]
[gd_scene load_steps=17 format=3 uid="uid://dbxy2y85r1d8x"]
[ext_resource type="Script" uid="uid://6aq8mr0sofrs" path="res://scripts/CSharp/Common/WorldManagement/World.cs" id="1_jnel3"]
[ext_resource type="PackedScene" uid="uid://biwd3jj65qrlh" path="res://prefabs/farming/base_field.tscn" id="2_741gk"]
[ext_resource type="PackedScene" uid="uid://5hltxpdxmqcq" path="res://prefabs/interactions/generic_item_on_ground.tscn" id="5_sjt6k"]
[ext_resource type="Resource" uid="uid://cndd64batns31" path="res://resources/items/bucket.tres" id="6_nvnpb"]
[ext_resource type="Script" uid="uid://d17si23dtlg72" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
[ext_resource type="Script" uid="uid://12hleqx8amr8" path="res://scripts/CSharp/Common/Farming/FieldService.cs" id="7_3rkjv"]
[ext_resource type="Resource" uid="uid://c5yg3lx756v4v" path="res://resources/items/hoe.tres" id="7_hv2km"]
[ext_resource type="Resource" uid="uid://d1uuxp1lp4aro" path="res://resources/items/tomato_seed.tres" id="8_hv2km"]
[ext_resource type="Script" uid="uid://c7eaa0neniiss" path="res://scripts/CSharp/Common/WorldManagement/SpawnPointMarker.cs" id="8_w0pbi"]
[ext_resource type="Resource" uid="uid://daow8nx85vuc8" path="res://resources/spawnpoints/spawnpoint_game_start.tres" id="9_sal3e"]
[ext_resource type="Resource" uid="uid://cipetn2hmnew4" path="res://resources/spawnpoints/from_test_scene.tres" id="10_sal3e"]
[ext_resource type="PackedScene" uid="uid://bs3vs05wp5a20" path="res://prefabs/world_elements/world_change_trigger.tscn" id="11_43jow"]
[ext_resource type="PackedScene" uid="uid://cidjhvp38n4b4" path="res://scenes/worlds/babushka_world_level_change_test.tscn" id="12_oux87"]
[sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"]
@@ -15,7 +21,11 @@ albedo_color = Color(0.505882, 0.588235, 0.494118, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_t58di"]
size = Vector3(2.01563, 0.160522, 2.00824)
[sub_resource type="BoxShape3D" id="BoxShape3D_oux87"]
size = Vector3(1, 1, 2.94604)
[node name="WorldItemPickupTest" type="Node3D"]
script = ExtResource("1_jnel3")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
@@ -62,6 +72,26 @@ _infiniteSupply = true
_blueprint = ExtResource("8_hv2km")
[node name="Spawnpoint" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.87715, 0, 1.54015)
script = ExtResource("8_w0pbi")
spawnPointResource = ExtResource("9_sal3e")
[node name="Spawnpoint tmp" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.3672, 0, 0.113484)
script = ExtResource("8_w0pbi")
spawnPointResource = ExtResource("10_sal3e")
[node name="WorldChangeTrigger" parent="." instance=ExtResource("11_43jow")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.78829, 0.546566, -0.241783)
collision_mask = 17
switchToWorld = ExtResource("12_oux87")
switchToSpawnPoint = ExtResource("10_sal3e")
[node name="CollisionShape3D" type="CollisionShape3D" parent="WorldChangeTrigger"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.193655, 0, 0.233521)
shape = SubResource("BoxShape3D_oux87")
[connection signal="area_entered" from="WorldChangeTrigger" to="WorldChangeTrigger" method="AreaEnteredHandler"]
[editable path="GenericItemOnGround"]
[editable path="GenericItemOnGround2"]
scenes/worlds/babushka_world_level_change_test.tscn
+56
View File
@@ -0,0 +1,56 @@
[gd_scene load_steps=11 format=3 uid="uid://cidjhvp38n4b4"]
[ext_resource type="Script" uid="uid://6aq8mr0sofrs" path="res://scripts/CSharp/Common/WorldManagement/World.cs" id="1_nat7a"]
[ext_resource type="PackedScene" uid="uid://bs3vs05wp5a20" path="res://prefabs/world_elements/world_change_trigger.tscn" id="5_tb7xe"]
[ext_resource type="PackedScene" uid="uid://dbxy2y85r1d8x" path="res://scenes/worlds/Babushka_world_item_pickup_testing.tscn" id="6_evakd"]
[ext_resource type="Script" uid="uid://c7eaa0neniiss" path="res://scripts/CSharp/Common/WorldManagement/SpawnPointMarker.cs" id="8_pl6uc"]
[ext_resource type="Resource" uid="uid://daow8nx85vuc8" path="res://resources/spawnpoints/spawnpoint_game_start.tres" id="9_rutwt"]
[ext_resource type="Resource" uid="uid://cipetn2hmnew4" path="res://resources/spawnpoints/from_test_scene.tres" id="10_s5gm8"]
[sub_resource type="PlaneMesh" id="PlaneMesh_8yprl"]
[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_8tgff"]
albedo_color = Color(0.505882, 0.588235, 0.494118, 1)
[sub_resource type="BoxShape3D" id="BoxShape3D_t58di"]
size = Vector3(2.01563, 0.160522, 2.00824)
[sub_resource type="BoxShape3D" id="BoxShape3D_tydq3"]
size = Vector3(1, 1, 6.21814)
[node name="WorldItemPickupTest" type="Node3D"]
script = ExtResource("1_nat7a")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(10, 0, 0, 0, 10, 0, 0, 0, 10, 0, 0, 0)
mesh = SubResource("PlaneMesh_8yprl")
skeleton = NodePath("")
surface_material_override/0 = SubResource("StandardMaterial3D_8tgff")
[node name="StaticBody3D" type="StaticBody3D" parent="MeshInstance3D"]
[node name="CollisionShape3D" type="CollisionShape3D" parent="MeshInstance3D/StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.000976563, -0.0739136, -0.00112915)
shape = SubResource("BoxShape3D_t58di")
[node name="DirectionalLight3D" type="DirectionalLight3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 0.618408, 0.785857, 0, -0.785857, 0.618408, -0.802612, 0, 4.73262)
[node name="Spawnpoint" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.87715, 0, 1.54015)
script = ExtResource("8_pl6uc")
spawnPointResource = ExtResource("9_rutwt")
[node name="Spawnpoint tmp" type="Node3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 8.00564, 0, 0.0870138)
script = ExtResource("8_pl6uc")
spawnPointResource = ExtResource("10_s5gm8")
[node name="WorldChangeTrigger" parent="." instance=ExtResource("5_tb7xe")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 9.82414, 0, 0)
switchToWorld = ExtResource("6_evakd")
switchToSpawnPoint = ExtResource("10_s5gm8")
[node name="CollisionShape3D" type="CollisionShape3D" parent="WorldChangeTrigger"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.235657)
shape = SubResource("BoxShape3D_tydq3")