From d66c678db49c11f73580d3d91c7a9f26620db413 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 4 Aug 2022 23:23:28 +0200 Subject: [PATCH] Removed the dungeon teleported from the test zone. --- .../world_generator/zones/test_zone.gd | 51 ------------------- game/worlds/test_world/test_world.tres | 3 +- 2 files changed, 1 insertion(+), 53 deletions(-) diff --git a/game/scripts/world_generator/zones/test_zone.gd b/game/scripts/world_generator/zones/test_zone.gd index e222085b..08c61d94 100644 --- a/game/scripts/world_generator/zones/test_zone.gd +++ b/game/scripts/world_generator/zones/test_zone.gd @@ -5,7 +5,6 @@ export(float) var zone_radius : float = 0.5 export(float) var zone_bevel : float = 0.3 export(float) var zone_base : float = 0 -export(PackedScene) var dungeon_teleporter : PackedScene export(PropData) var prop_tree : PropData export(PropData) var prop_tree2 : PropData @@ -33,13 +32,6 @@ func set_zone_base(ed : float) -> void: zone_base = ed emit_changed() -func get_dungeon_teleporter() -> PackedScene: - return dungeon_teleporter - -func set_dungeon_teleporter(ed : PackedScene) -> void: - dungeon_teleporter = ed - emit_changed() - func get_prop_tree() -> PropData: return prop_tree @@ -99,13 +91,6 @@ func _generate_terra_chunk(chunk: TerrainChunk, pseed : int, spawn_mobs: bool, r gen_terra_chunk(chunk, rng, raycast) -# if chunk.position_x == 0 && chunk.position_z == 0: -# #test -# spawn_dungeon(chunk, chunk_seed, spawn_mobs) -# else: -# if rng.randi() % 10 == 0: -# spawn_dungeon(chunk, chunk_seed, spawn_mobs) - if not Engine.editor_hint and spawn_mobs and rng.randi() % 4 == 0: var level : int = 1 @@ -177,46 +162,10 @@ func gen_terra_chunk(chunk: TerrainChunk, rng : RandomNumberGenerator, raycast : chunk.voxel_world.prop_add(tr, prop_tree) -func spawn_dungeon(chunk: TerrainChunk, dungeon_seed : int, spawn_mobs : bool) -> void: - var world_space_data_coordinates_x : int = chunk.position_x * chunk.size_x - var world_space_data_coordinates_z : int = chunk.position_z * chunk.size_z - - var vpx : int = 6 - var vpz : int = 6 - - var x : float = (world_space_data_coordinates_x + vpx) * chunk.voxel_scale - var z : float = (world_space_data_coordinates_z + vpz) * chunk.voxel_scale - - var vh : int = chunk.get_voxel(vpx, vpz, TerrainChunkDefault.DEFAULT_CHANNEL_ISOLEVEL) - - var orx : int = (randi() % 3) + 2 - var orz : int = (randi() % 3) + 2 - - for wx in range(vpx - orx, vpx + orx + 1): - for wz in range(vpz - orz, vpz + orz + 1): - chunk.set_voxel(vh, wx, wz, TerrainChunkDefault.DEFAULT_CHANNEL_ISOLEVEL) - var vwh : float = chunk.get_voxel_scale() * chunk.get_world_height() * (vh / 255.0) - - var dt : Spatial = dungeon_teleporter.instance() - chunk.voxel_world.add_child(dt) - dt.owner_chunk = chunk - - var level : int = 2 - - if chunk.get_voxel_world().has_method("get_mob_level"): - level = chunk.get_voxel_world().get_mob_level() - - dt.min_level = level - 1 - dt.max_level = level + 1 - dt.dungeon_seed = dungeon_seed - dt.spawn_mobs = spawn_mobs - dt.transform = Transform(Basis().scaled(Vector3(chunk.voxel_scale, chunk.voxel_scale, chunk.voxel_scale)), Vector3(x, vwh, z)) - func setup_property_inspector(inspector) -> void: .setup_property_inspector(inspector) inspector.add_h_separator() - inspector.add_slot_resource("get_dungeon_teleporter", "set_dungeon_teleporter", "Dungeon Teleporter", "PackedScene") inspector.add_slot_resource("get_prop_tree", "set_prop_tree", "Prop Tree", "PropData") inspector.add_slot_resource("get_prop_tree2", "set_prop_tree2", "Prop Tree2", "PropData") diff --git a/game/worlds/test_world/test_world.tres b/game/worlds/test_world/test_world.tres index f05e82d5..c1ab0008 100644 --- a/game/worlds/test_world/test_world.tres +++ b/game/worlds/test_world/test_world.tres @@ -34,7 +34,7 @@ dungeon_teleporter = ExtResource( 4 ) [sub_resource type="Resource" id=5] resource_name = "DungeonSpawner2" script = ExtResource( 11 ) -rect = Rect2( 11.4113, 7.34633, 6.9637, 3 ) +rect = Rect2( 16.8488, 8.40883, 1, 1.0625 ) min_size = Vector2i( 1, 1 ) max_size = Vector2i( 1e+06, 1e+06 ) locked = false @@ -51,7 +51,6 @@ subzones = [ SubResource( 2 ), SubResource( 4 ), SubResource( 5 ) ] zone_radius = 0.5 zone_bevel = 0.3 zone_base = 0.0 -dungeon_teleporter = ExtResource( 4 ) prop_tree = ExtResource( 6 ) prop_tree2 = ExtResource( 5 )