cblech
9 months ago
parent
1782ff91b4
commit
71ca6c3305
@ -0,0 +1,6 @@
|
||||
[gd_scene load_steps=2 format=3 uid="uid://bs3vs05wp5a20"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cpbv0b3ahorep" path="res://scripts/CSharp/Common/WorldManagement/WorldChangeTrigger.cs" id="1_wqqyh"]
|
||||
|
||||
[node name="WorldChangeTrigger" type="Area3D"]
|
||||
script = ExtResource("1_wqqyh")
|
||||
@ -0,0 +1,8 @@
|
||||
[gd_resource type="Resource" script_class="SpawnPointResource" load_steps=2 format=3 uid="uid://cipetn2hmnew4"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cjr2efpm660kr" path="res://scripts/CSharp/Common/WorldManagement/SpawnPointResource.cs" id="1_ymkjy"]
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_ymkjy")
|
||||
name = ""
|
||||
metadata/_custom_type_script = "uid://cjr2efpm660kr"
|
||||
@ -0,0 +1,8 @@
|
||||
[gd_resource type="Resource" script_class="SpawnPointResource" load_steps=2 format=3 uid="uid://daow8nx85vuc8"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cjr2efpm660kr" path="res://scripts/CSharp/Common/WorldManagement/SpawnPointResource.cs" id="1_kdbco"]
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_kdbco")
|
||||
name = "GameStart"
|
||||
metadata/_custom_type_script = "uid://cjr2efpm660kr"
|
||||
@ -0,0 +1,8 @@
|
||||
[gd_resource type="Resource" script_class="SpawnPointResource" load_steps=2 format=3 uid="uid://dissbtj4nflu5"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://cjr2efpm660kr" path="res://scripts/CSharp/Common/WorldManagement/SpawnPointResource.cs" id="1_vyl4c"]
|
||||
|
||||
[resource]
|
||||
script = ExtResource("1_vyl4c")
|
||||
name = "tmp1"
|
||||
metadata/_custom_type_script = "uid://cjr2efpm660kr"
|
||||
@ -1,17 +1,21 @@
|
||||
[gd_scene load_steps=4 format=3 uid="uid://dbgkbil1ultks"]
|
||||
[gd_scene load_steps=6 format=3 uid="uid://dbgkbil1ultks"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://dbxy2y85r1d8x" path="res://scenes/worlds/Babushka_world_item_pickup_testing.tscn" id="1_l112d"]
|
||||
[ext_resource type="Script" uid="uid://g338f4yomfo3" path="res://scripts/CSharp/Common/WorldManagement/WorldContainer.cs" id="1_l112d"]
|
||||
[ext_resource type="PackedScene" uid="uid://dbxy2y85r1d8x" path="res://scenes/worlds/Babushka_world_item_pickup_testing.tscn" id="2_akoq3"]
|
||||
[ext_resource type="PackedScene" uid="uid://dbd1niu3tp8y5" path="res://prefabs/Player3D.tscn" id="2_l45op"]
|
||||
[ext_resource type="Resource" uid="uid://daow8nx85vuc8" path="res://resources/spawnpoints/spawnpoint_game_start.tres" id="3_4ix36"]
|
||||
[ext_resource type="PackedScene" uid="uid://cgjc4wurbgimy" path="res://prefabs/UI/Inventory/Inventory.tscn" id="3_akoq3"]
|
||||
|
||||
[node name="BabushkaSceneMain" type="Node"]
|
||||
|
||||
[node name="WorldContainer" type="Node" parent="."]
|
||||
script = ExtResource("1_l112d")
|
||||
startingWorld = ExtResource("2_akoq3")
|
||||
startingSpawnPoint = ExtResource("3_4ix36")
|
||||
|
||||
[node name="WorldItemPickupTest" parent="WorldContainer" instance=ExtResource("1_l112d")]
|
||||
|
||||
[node name="Player3d" parent="." node_paths=PackedStringArray("_fieldParent") instance=ExtResource("2_l45op")]
|
||||
[node name="Player3d" parent="." instance=ExtResource("2_l45op")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.51633, 0.725631, 3.57249)
|
||||
_fieldParent = NodePath("")
|
||||
|
||||
[node name="Inventory" parent="." instance=ExtResource("3_akoq3")]
|
||||
|
||||
[connection signal="WorldChanged" from="WorldContainer" to="Player3d" method="TeleportTo"]
|
||||
|
||||
@ -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")
|
||||
@ -0,0 +1 @@
|
||||
uid://bb4fc5y43ksfg
|
||||
@ -0,0 +1,8 @@
|
||||
using Godot;
|
||||
using System;
|
||||
using Babushka.scripts.CSharp.Common.WorldManagement;
|
||||
|
||||
public partial class SpawnPointMarker : Node3D
|
||||
{
|
||||
[Export] public SpawnPointResource spawnPointResource;
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
uid://c7eaa0neniiss
|
||||
@ -0,0 +1 @@
|
||||
uid://cjr2efpm660kr
|
||||
@ -0,0 +1,21 @@
|
||||
using Godot;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Babushka.scripts.CSharp.Common.WorldManagement;
|
||||
|
||||
public partial class World : Node
|
||||
{
|
||||
public IReadOnlyDictionary<SpawnPointResource, SpawnPointMarker> SpawnPoints;
|
||||
|
||||
public override void _EnterTree()
|
||||
{
|
||||
GD.Print("World Enter Tree");
|
||||
|
||||
// find all child nodes of type SpawnPoint
|
||||
SpawnPoints = FindChildren("*")
|
||||
.OfType<SpawnPointMarker>()
|
||||
.Select(sp => new KeyValuePair<SpawnPointResource, SpawnPointMarker>(sp.spawnPointResource, sp))
|
||||
.ToDictionary();
|
||||
}
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
uid://6aq8mr0sofrs
|
||||
@ -0,0 +1,26 @@
|
||||
using Godot;
|
||||
using System;
|
||||
using Babushka.scripts.CSharp.Common.WorldManagement;
|
||||
|
||||
public partial class WorldChangeTrigger : Area3D
|
||||
{
|
||||
[Export] private PackedScene switchToWorld;
|
||||
[Export] private SpawnPointResource switchToSpawnPoint;
|
||||
|
||||
public override void _EnterTree()
|
||||
{
|
||||
//AreaEntered += AreaEnteredHandler;
|
||||
}
|
||||
|
||||
public override void _ExitTree()
|
||||
{
|
||||
//AreaEntered -= AreaEnteredHandler;
|
||||
}
|
||||
|
||||
public void AreaEnteredHandler(Area3D area)
|
||||
{
|
||||
GD.Print("Area Entered");
|
||||
var worldContainer = (WorldContainer)FindParent("WorldContainer");
|
||||
worldContainer.SwitchWorld(switchToWorld, switchToSpawnPoint);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
uid://cpbv0b3ahorep
|
||||
@ -0,0 +1,41 @@
|
||||
using Godot;
|
||||
using System;
|
||||
using System.Linq;
|
||||
using Babushka.scripts.CSharp.Common.WorldManagement;
|
||||
|
||||
public partial class WorldContainer : Node
|
||||
{
|
||||
[Export] private PackedScene startingWorld;
|
||||
[Export] private SpawnPointResource startingSpawnPoint;
|
||||
|
||||
[Signal] public delegate void WorldChangedEventHandler(Vector3 spawnPointPosition);
|
||||
|
||||
public void SwitchWorld(PackedScene newWorldScene, SpawnPointResource spawnPoint)
|
||||
{
|
||||
// Unload the current world
|
||||
if (GetChildCount() > 0)
|
||||
{
|
||||
GetChild(0).QueueFree();
|
||||
}
|
||||
|
||||
// Load the new world
|
||||
var newWorld = newWorldScene.Instantiate<World>();
|
||||
AddChild(newWorld);
|
||||
|
||||
// Switch to the new spawn point
|
||||
if (newWorld.SpawnPoints.TryGetValue(spawnPoint, out var spawnPointMarker))
|
||||
{
|
||||
EmitSignalWorldChanged(spawnPointMarker.GlobalPosition);
|
||||
}
|
||||
else
|
||||
{
|
||||
GD.PrintErr("Selected spawn point not found in the new world.");
|
||||
EmitSignalWorldChanged(newWorld.SpawnPoints.First().Value.GlobalPosition);
|
||||
}
|
||||
}
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
SwitchWorld(startingWorld,startingSpawnPoint);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
uid://g338f4yomfo3
|
||||
Loading…
Reference in new issue