mirror of
https://github.com/Relintai/broken_seals.git
synced 2024-11-20 21:07:17 +01:00
Now the dungeons will delete themselves when their teleporter goes out of range in the world. (The world is disabled while in a dungeon, so they won't despawn while the player is inside.)
This commit is contained in:
parent
d4cb1684ca
commit
12e7618cd3
@ -154,5 +154,6 @@ func spawn_dungeon(chunk: TerraChunk) -> void:
|
||||
|
||||
var dt : Spatial = dungeon_teleporter.instance()
|
||||
chunk.voxel_world.add_child(dt)
|
||||
dt.owner_chunk = chunk
|
||||
dt.transform = Transform(Basis().scaled(Vector3(chunk.voxel_scale, chunk.voxel_scale, chunk.voxel_scale)), Vector3(x, vwh, z))
|
||||
|
||||
|
@ -7,11 +7,14 @@ export(float) var use_range : float = 5
|
||||
export(PackedScene) var dungeon : PackedScene
|
||||
export(PackedScene) var dungeon_back_teleporter : PackedScene
|
||||
|
||||
var owner_chunk : TerraChunk = null
|
||||
var _dungeon : Spatial = null
|
||||
var _dungeon_back_teleporter : Spatial = null
|
||||
|
||||
var teleport_to : Vector3 = Vector3()
|
||||
|
||||
var _world : TerraWorld = null
|
||||
|
||||
func _ready():
|
||||
connect("mouse_entered", self, "on_mouse_entered")
|
||||
connect("mouse_exited", self, "on_mouse_exited")
|
||||
@ -31,11 +34,16 @@ func on_mouse_exited():
|
||||
|
||||
Input.set_default_cursor_shape(Input.CURSOR_ARROW)
|
||||
|
||||
#func _enter_tree():
|
||||
# if get_parent().has_method("get_voxel_scale"):
|
||||
#
|
||||
func _enter_tree():
|
||||
_world = get_node("..")
|
||||
|
||||
if _world:
|
||||
_world.connect("chunk_removed", self, "on_chunk_removed")
|
||||
|
||||
func _exit_tree():
|
||||
if _world:
|
||||
_world.disconnect("chunk_removed", self, "on_chunk_removed")
|
||||
|
||||
if _dungeon:
|
||||
_dungeon.queue_free()
|
||||
|
||||
@ -50,10 +58,8 @@ func _input_event(camera: Object, event: InputEvent, click_position: Vector3, cl
|
||||
teleport()
|
||||
|
||||
func teleport():
|
||||
var world = get_node("..")
|
||||
|
||||
if world && world._player:
|
||||
var p : Entity = world._player
|
||||
if _world && _world._player:
|
||||
var p : Entity = _world._player
|
||||
|
||||
if (p.get_body().transform.origin - transform.origin).length() > use_range:
|
||||
return
|
||||
@ -78,9 +84,15 @@ func teleport():
|
||||
get_parent().add_child(_dungeon_back_teleporter)
|
||||
|
||||
#turn off world
|
||||
world.active = false
|
||||
_world.active = false
|
||||
#turn on dungeon
|
||||
_dungeon.show()
|
||||
|
||||
p.get_body().teleport(teleport_to)
|
||||
# p.get_body().transform.origin = teleport_to
|
||||
|
||||
|
||||
func on_chunk_removed(chunk : TerraChunk) -> void:
|
||||
if chunk == owner_chunk:
|
||||
queue_free()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user