made test floor, replaced sara frames, replaced shield frames, set many enemies to shaded and adjusted heights/sizes, added solid mesh doorways, added filth and ballos' vfx,
This commit is contained in:
Pal
@@ -21,51 +21,51 @@ public partial class MonsterRoom : DungeonRoom
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
SpawnItems();
|
||||
SpawnItems();
|
||||
}
|
||||
|
||||
public void SpawnEnemies(Godot.Collections.Dictionary<EnemyType, float> enemyInfo)
|
||||
{
|
||||
var rng = new RandomNumberGenerator();
|
||||
rng.Randomize();
|
||||
var enemySpawnPoints = EnemySpawnPoints.GetChildren();
|
||||
var numberOfEnemiesToSpawn = rng.RandiRange(1, enemySpawnPoints.Count);
|
||||
var rng = new RandomNumberGenerator();
|
||||
rng.Randomize();
|
||||
var enemySpawnPoints = EnemySpawnPoints.GetChildren();
|
||||
var numberOfEnemiesToSpawn = rng.RandiRange(1, enemySpawnPoints.Count);
|
||||
|
||||
foreach (var spawnPoint in enemySpawnPoints.Cast<Marker3D>())
|
||||
{
|
||||
if (numberOfEnemiesToSpawn <= 0)
|
||||
break;
|
||||
numberOfEnemiesToSpawn--;
|
||||
foreach (var spawnPoint in enemySpawnPoints.Cast<Marker3D>())
|
||||
{
|
||||
if (numberOfEnemiesToSpawn <= 0)
|
||||
break;
|
||||
numberOfEnemiesToSpawn--;
|
||||
|
||||
var index = rng.RandWeighted([.. enemyInfo.Values]);
|
||||
var selectedEnemy = enemyInfo.ElementAt((int)index);
|
||||
var instantiatedEnemy = EnemyTypeToEnemyConverter.Convert(selectedEnemy.Key);
|
||||
instantiatedEnemy.Position = new Vector3(spawnPoint.Position.X, 1.75f, spawnPoint.Position.Z);
|
||||
AddChild(instantiatedEnemy);
|
||||
}
|
||||
var index = rng.RandWeighted([.. enemyInfo.Values]);
|
||||
var selectedEnemy = enemyInfo.ElementAt((int)index);
|
||||
var instantiatedEnemy = EnemyTypeToEnemyConverter.Convert(selectedEnemy.Key);
|
||||
instantiatedEnemy.Position = new Vector3(spawnPoint.Position.X, 1.75f, spawnPoint.Position.Z);
|
||||
AddChild(instantiatedEnemy);
|
||||
}
|
||||
}
|
||||
|
||||
private void SpawnItems()
|
||||
{
|
||||
if (ItemSpawnPoints == null)
|
||||
return;
|
||||
if (ItemSpawnPoints == null)
|
||||
return;
|
||||
|
||||
var itemSpawnPoints = ItemSpawnPoints.GetChildren();
|
||||
var rng = new RandomNumberGenerator();
|
||||
rng.Randomize();
|
||||
var numberOfItemsToSpawn = rng.RandiRange(1, itemSpawnPoints.Count);
|
||||
itemSpawnPoints.Shuffle();
|
||||
var database = new ItemDatabase();
|
||||
foreach (var spawnPoint in itemSpawnPoints.Cast<Marker3D>())
|
||||
{
|
||||
if (numberOfItemsToSpawn <= 0)
|
||||
break;
|
||||
numberOfItemsToSpawn--;
|
||||
var itemSpawnPoints = ItemSpawnPoints.GetChildren();
|
||||
var rng = new RandomNumberGenerator();
|
||||
rng.Randomize();
|
||||
var numberOfItemsToSpawn = rng.RandiRange(1, itemSpawnPoints.Count);
|
||||
itemSpawnPoints.Shuffle();
|
||||
var database = new ItemDatabase();
|
||||
foreach (var spawnPoint in itemSpawnPoints.Cast<Marker3D>())
|
||||
{
|
||||
if (numberOfItemsToSpawn <= 0)
|
||||
break;
|
||||
numberOfItemsToSpawn--;
|
||||
|
||||
var selectedItem = database.PickItem<InventoryItem>();
|
||||
var duplicated = selectedItem.Duplicate((int)DuplicateFlags.UseInstantiation) as Node3D;
|
||||
duplicated.Position = new Vector3(spawnPoint.Position.X, -1.5f, spawnPoint.Position.Z);
|
||||
AddChild(duplicated);
|
||||
}
|
||||
var selectedItem = database.PickItem<InventoryItem>();
|
||||
var duplicated = selectedItem.Duplicate((int)DuplicateFlags.UseInstantiation) as Node3D;
|
||||
duplicated.Position = new Vector3(spawnPoint.Position.X, -1.5f, spawnPoint.Position.Z);
|
||||
AddChild(duplicated);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -0,0 +1,154 @@
|
||||
[gd_scene load_steps=11 format=3 uid="uid://c5ekisphioovm"]
|
||||
|
||||
[ext_resource type="PackedScene" uid="uid://dhkbvos11tkdw" path="res://src/map/dungeon/rooms/Set A/12. Jump Scare Room.tscn" id="1_crv4e"]
|
||||
[ext_resource type="PackedScene" uid="uid://dhm2lyfkrjugf" path="res://src/map/dungeon/rooms/Set A/11. Long Room.tscn" id="2_yrcgx"]
|
||||
[ext_resource type="PackedScene" uid="uid://dpec2lbt83dhe" path="res://src/map/dungeon/rooms/Set A/03. Antechamber A.tscn" id="3_cfhj4"]
|
||||
[ext_resource type="PackedScene" uid="uid://b82dx66mgs2d7" path="res://src/map/dungeon/rooms/Set A/08. Basin Room.tscn" id="4_4sygy"]
|
||||
[ext_resource type="PackedScene" uid="uid://cihbmyo0ltq4m" path="res://src/map/dungeon/rooms/Set A/19. Floor Exit A.tscn" id="5_hkp1m"]
|
||||
[ext_resource type="PackedScene" uid="uid://dfjc54vc4yc45" path="res://src/map/dungeon/corridors/A - Corridor - Straight .tscn" id="6_hsujv"]
|
||||
[ext_resource type="PackedScene" uid="uid://cjxrkxr0bgeh1" path="res://src/map/dungeon/corridors/A - Corridor - Corner .tscn" id="7_y0uwp"]
|
||||
[ext_resource type="PackedScene" uid="uid://8d6n4tk5aam0" path="res://src/map/dungeon/corridors/A - Corridor - End Piece Straight .tscn" id="8_nv4rm"]
|
||||
[ext_resource type="PackedScene" uid="uid://8u5kue6pljh0" path="res://src/map/dungeon/corridors/A - Corridor - T-Block.tscn" id="9_n5246"]
|
||||
[ext_resource type="PackedScene" uid="uid://6wwibo25iv0f" path="res://src/map/assets/Dungeon Doors/A1DOORWAY.glb" id="10_yrcgx"]
|
||||
|
||||
[node name="Node3D" type="Node3D"]
|
||||
|
||||
[node name="JumpScareRoom" parent="." instance=ExtResource("1_crv4e")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -53.8502, 0, 23.8802)
|
||||
|
||||
[node name="Long Room" parent="." instance=ExtResource("2_yrcgx")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -16.157, -0.024, -1.918)
|
||||
|
||||
[node name="Antechamber A" parent="." instance=ExtResource("3_cfhj4")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.33252, -0.012, 31.9863)
|
||||
|
||||
[node name="BasinRoom" parent="." instance=ExtResource("4_4sygy")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.0285, -0.025, 63.8523)
|
||||
|
||||
[node name="Floor Exit A" parent="." instance=ExtResource("5_hkp1m")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 33.9096, -0.064, -31.904)
|
||||
|
||||
[node name="Corridors" type="Node3D" parent="."]
|
||||
|
||||
[node name="Node3D24" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -10.1227, 0, 42.017)
|
||||
|
||||
[node name="Node3D25" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -10.1296, 0, 46.0239)
|
||||
|
||||
[node name="Node3D26" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -18.0845, 0, 53.9123)
|
||||
|
||||
[node name="Node3D27" parent="Corridors" instance=ExtResource("7_y0uwp")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -18.0845, 0, 49.9123)
|
||||
|
||||
[node name="Node3D28" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -14.0845, 0, 49.9123)
|
||||
|
||||
[node name="Node3D31" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 13.79, -0.00370741, -1.99336)
|
||||
|
||||
[node name="Node3D32" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.79, -0.00370741, -1.99336)
|
||||
|
||||
[node name="Node3D33" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 21.79, -0.00370741, -1.99336)
|
||||
|
||||
[node name="Node3D34" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 25.79, -0.00370741, -1.99336)
|
||||
|
||||
[node name="Node3D35" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 29.79, -0.00370741, -1.99336)
|
||||
|
||||
[node name="Node3D36" parent="Corridors" instance=ExtResource("7_y0uwp")]
|
||||
transform = Transform3D(-1, 0, 8.74228e-08, 0, 1, 0, -8.74228e-08, 0, -1, 33.8615, -0.00370741, -1.8335)
|
||||
|
||||
[node name="Node3D37" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 33.7453, -0.00370741, -5.86964)
|
||||
|
||||
[node name="Node3D38" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 33.7581, -0.00370741, -9.86964)
|
||||
|
||||
[node name="Node3D39" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, 33.7581, -0.00370741, -13.8696)
|
||||
|
||||
[node name="Node3D30" parent="Corridors" instance=ExtResource("8_nv4rm")]
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 9.84968, -0.00370741, -1.83335)
|
||||
|
||||
[node name="Node3D" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8222, 0, 1.98113)
|
||||
|
||||
[node name="Node3D2" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8222, 0, 5.98113)
|
||||
|
||||
[node name="Node3D3" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8222, 0, 9.98113)
|
||||
|
||||
[node name="Node3D4" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8222, 0, 13.9811)
|
||||
|
||||
[node name="Node3D5" parent="Corridors" instance=ExtResource("9_n5246")]
|
||||
transform = Transform3D(-1, 0, -8.9407e-08, 0, 1, 0, 8.9407e-08, 0, -1, -53.8655, 0, -1.90519)
|
||||
|
||||
[node name="Node3D6" parent="Corridors" instance=ExtResource("7_y0uwp")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -53.9383, 0, -22.0189)
|
||||
|
||||
[node name="Node3D7" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8223, 0, -6.01887)
|
||||
|
||||
[node name="Node3D8" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8223, 0, -10.0189)
|
||||
|
||||
[node name="Node3D9" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8223, 0, -14.0189)
|
||||
|
||||
[node name="Node3D10" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D11" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D12" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D13" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -53.8223, 0, -18.0189)
|
||||
|
||||
[node name="Node3D14" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D15" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -33.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D16" parent="Corridors" instance=ExtResource("7_y0uwp")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -29.9088, 0, -22.0189)
|
||||
|
||||
[node name="Node3D17" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, 1, 0, 1, 0, -1, 0, -4.37114e-08, -30.0618, 0, -18.0189)
|
||||
|
||||
[node name="Node3D18" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -41.9088, 0, -2.01887)
|
||||
|
||||
[node name="Node3D19" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -45.9088, 0, -2.01887)
|
||||
|
||||
[node name="Node3D20" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -49.9088, 0, -2.01887)
|
||||
|
||||
[node name="Node3D21" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -2.08452, 0, 13.9893)
|
||||
|
||||
[node name="Node3D22" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -2.08452, 0, 17.9893)
|
||||
|
||||
[node name="Node3D23" parent="Corridors" instance=ExtResource("6_hsujv")]
|
||||
transform = Transform3D(-4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -2.08452, 0, 21.9893)
|
||||
|
||||
[node name="Node3D29" parent="Corridors" instance=ExtResource("7_y0uwp")]
|
||||
transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, -10.0497, 0, 49.9862)
|
||||
|
||||
[node name="A1DOORWAY" parent="." instance=ExtResource("10_yrcgx")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -30.0831, 0, 11)
|
||||
|
||||
[node name="A1DOORWAY2" parent="." instance=ExtResource("10_yrcgx")]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.07064, 0, -15)
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user