Dead end collision checks and sideroom

kaosnyrb · Jun 10, 2020 · 9e5b5fd · 9e5b5fd
1 parent 2ae8ed8
commit 9e5b5fd
Show file tree

Hide file tree

Showing 14 changed files with 102 additions and 17 deletions.
diff --git a/Undaunted/RiftManager.cpp b/Undaunted/RiftManager.cpp
@@ -310,24 +310,33 @@ namespace Undaunted {
 		//Close the remaining exits
 		while (sideexits.size() > 0)
 		{
+			bool validbox = false;
 			Tile exit = sideexits.front();
-			sideexits.pop();
 			Block selectedblock = FindDeadend(exit.exittype.c_str(),"end");
 			selectedblock.RotateAroundPivot(Vector3(0, 0, 0), exit.bearing);
-			_MESSAGE("Place the block");
-			for (int i = 0; i < selectedblock.reflist.length; i++)
-			{
-				FormRef ref = selectedblock.reflist.data[i];
-				ref.pos.x += exit.x;
-				ref.pos.y += exit.y;
-				ref.pos.z += exit.z;
-				formlist.AddItem(ref);
-			}
-			placedRooms++;
-			_MESSAGE("Update the navmesh");
-			for (int i = 0; i < selectedblock.navlist.length; i++)
+			BoundingBox box;
+			box = selectedblock.boundingbox;
+			box.position.x += exit.x;
+			box.position.y += exit.y;
+			validbox = !boundingboxes.Intersects(box);
+			if (validbox)
 			{
-				MarkTile(selectedblock.navlist.data[i].x + exit.x, selectedblock.navlist.data[i].y + exit.y, selectedblock.navlist.data[i].z + exit.z, selectedblock.navlist.data[i].quadsize);
+				sideexits.pop();
+				_MESSAGE("Place the block");
+				for (int i = 0; i < selectedblock.reflist.length; i++)
+				{
+					FormRef ref = selectedblock.reflist.data[i];
+					ref.pos.x += exit.x;
+					ref.pos.y += exit.y;
+					ref.pos.z += exit.z;
+					formlist.AddItem(ref);
+				}
+				_MESSAGE("Update the navmesh");
+				for (int i = 0; i < selectedblock.navlist.length; i++)
+				{
+					MarkTile(selectedblock.navlist.data[i].x + exit.x, selectedblock.navlist.data[i].y + exit.y, selectedblock.navlist.data[i].z + exit.z, selectedblock.navlist.data[i].quadsize);
+				}
+				boundingboxes.AddItem(box);
 			}
 		}
 

diff --git a/datafiles/Mundusform.esp b/datafiles/Mundusform.esp
diff --git a/datafiles/Mundusform/Blocks/DweFacadeHallSm1way01_Exit.json b/datafiles/Mundusform/Blocks/DweFacadeHallSm1way01_Exit.json
@@ -29,6 +29,7 @@
         ["Skyrim.esm", 351246, 0.000000, 512.000000, 0.000000, 0.000000, -0.000000, 0.000000, 100]
     ],
     [
+        [0,-256,0,128],
         [0,0,0,128],
         [0,256,0,128],
         [0,512,0,128],

diff --git a/datafiles/Mundusform/Blocks/DweFacadeHallSm1wayRamp01_up.json b/datafiles/Mundusform/Blocks/DweFacadeHallSm1wayRamp01_up.json
@@ -6,6 +6,7 @@
         ["Skyrim.esm",507382,0,0,256,0,0,0,100]
     ],
     [
+        [0,-256,0,128],
         [0,0,256,128],
         [0,256,256,128]
     ],

diff --git a/datafiles/Mundusform/Blocks/DweFacadeHallSm_sideroom01.json b/datafiles/Mundusform/Blocks/DweFacadeHallSm_sideroom01.json
@@ -0,0 +1,65 @@
+[
+    ["end",0,0,0],
+    [-512,512,512,512],
+    ["DweFacadeHallSm1way01",0,0,0,128],
+    [
+        ["Skyrim.esm", 576660, 253.000000, 696.000000, -18.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 489313, -256.000000, 704.000000, 128.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 576660, 253.000000, 1842.000000, -16.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 360894, -512.000000, 1280.000000, 0.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 360889, 512.000000, 768.000000, 0.000000, 0.000000, -0.000000, 90.000003, 100],
+        ["Skyrim.esm", 360894, 512.000000, 1280.000000, 0.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 372189, 253.000000, 1880.000000, 114.000000, 0.000000, -0.000000, 90.000003, 67],
+        ["Skyrim.esm", 372189, -259.000000, 664.000000, 114.000000, 0.000000, -0.000000, 270.000001, 67],
+        ["Skyrim.esm", 489313, 250.000000, 1840.000000, 128.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 360895, 0.000000, 768.000000, 0.000000, 0.000000, -0.000000, 90.000003, 100],
+        ["Skyrim.esm", 360889, -512.000000, 1792.000000, 0.000000, 0.000000, -0.000000, 270.000001, 100],
+        ["Skyrim.esm", 360893, 0.000000, 1280.000000, 0.000000, 0.000000, 0.000000, 0.000000, 100],
+        ["Skyrim.esm", 348439, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 100],
+        ["Skyrim.esm", 489313, 256.000000, 698.000000, 126.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 360889, -512.000000, 768.000000, 0.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 576660, -259.000000, 702.000000, -16.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 372189, -259.000000, 1880.000000, 114.000000, 0.000000, -0.000000, 90.000003, 67],
+        ["Skyrim.esm", 360889, 512.000000, 1792.000000, 0.000000, 0.000000, -0.000000, 0.000000, 100],
+        ["Skyrim.esm", 576660, -259.000000, 1842.000000, -16.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 372189, 253.000000, 658.000000, 112.000000, 0.000000, -0.000000, 270.000001, 67],
+        ["Skyrim.esm", 360894, 0.000000, 1792.000000, 0.000000, 0.000000, -0.000000, 270.000001, 100],
+        ["Skyrim.esm", 489313, -262.000000, 1840.000000, 128.000000, 0.000000, -0.000000, 180.000005, 100],
+        ["Skyrim.esm", 351246, 0.000000, 512.000000, 0.000000, 0.000000, -0.000000, 0.000000, 100]
+    ],
+    [
+        [0,0,0,128],
+        [0,256,0,128],
+        [0,512,0,128],
+        [0,768,0,128],
+        [0,1024,0,128],
+        [0,1280,0,128],
+        [-256,768,0,128],
+        [-256,512,0,128],        
+        [-256,1024,0,128],
+        [-256,1280,0,128],
+        [-512,512,0,128],
+        [-512,768,0,128],
+        [-512,1024,0,128],
+        [-512,1280,0,128],
+        [-512,1536,0,128],
+        [-512,1792,0,128],
+        [-256,1792,0,128],
+        [-256,1536,0,128],
+        [0,1536,0,128],
+        [0,1792,0,128],
+        [256,1536,0,128],
+        [256,1792,0,128],
+        [256,512,0,128],
+        [256,768,0,128],
+        [256,1280,0,128],
+        [256,1024,0,128],
+        [512,1792,0,128],
+        [512,1536,0,128],
+        [512,1280,0,128],
+        [512,1024,0,128],
+        [512,768,0,128],
+        [512,512,0,128]
+    ],
+    []
+]
diff --git a/datafiles/Mundusform/Settings.json b/datafiles/Mundusform/Settings.json
@@ -3,7 +3,7 @@
     ["BaseNavmeshResolution","64", "The size of the quads stored"],
     ["NavmeshCorriderHeight","512", "The distance at which to join vertices vertically"],
     ["RiftGenerationRooms","3", "The number of rooms in a dungeon."],
-    ["RiftGenerationHallLength","5", "The length of the hall between rooms."],
+    ["RiftGenerationHallLength","10", "The length of the hall between rooms."],
     ["RiftGenerationRoomAttempts","100", "Number of times we try and place a room in the slot before trying another hall."],
     ["RiftGenerationBreaker","1000", "Number of times we try and place a block before giving up entirely. Prevents infinite loops."],    
     ["BoundingBoxCheck","1", "Use bounding boxes to prevent overlaps. Useful to turn off while debugging."]

diff --git a/datafiles/Scripts/Mundusform_CaptureAreaEffect.pex b/datafiles/Scripts/Mundusform_CaptureAreaEffect.pex
diff --git a/datafiles/Scripts/Mundusform_ExportNavMesh.pex b/datafiles/Scripts/Mundusform_ExportNavMesh.pex
diff --git a/datafiles/Scripts/Mundusform_NavTileCapture.pex b/datafiles/Scripts/Mundusform_NavTileCapture.pex
diff --git a/datafiles/Scripts/Mundusform_RiftDoor.pex b/datafiles/Scripts/Mundusform_RiftDoor.pex
diff --git a/datafiles/Scripts/Mundusform_SystemScript.pex b/datafiles/Scripts/Mundusform_SystemScript.pex
diff --git a/datafiles/Source/Scripts/Mundusform_CaptureAreaEffect.psc b/datafiles/Source/Scripts/Mundusform_CaptureAreaEffect.psc
@@ -3,4 +3,5 @@ import Mundusform_SystemScript
 
 Event OnEffectStart(Actor Target, Actor Caster)
     CaptureArea()
+    Debug.Notification("Cell saved to UndauntedRift.pas")
 EndEvent
diff --git a/datafiles/Source/Scripts/Mundusform_ExportNavMesh.psc b/datafiles/Source/Scripts/Mundusform_ExportNavMesh.psc
@@ -2,6 +2,7 @@ Scriptname Mundusform_ExportNavMesh  extends activemagiceffect
 import Mundusform_SystemScript
 
 Event OnEffectStart(Actor Target, Actor Caster)
-    Debug.Notification("Exporting Navmesh...")
+
     ExportNavMesh()
+    Debug.Notification("Exported Navmesh.")
 EndEvent
diff --git a/datafiles/Source/Scripts/Mundusform_RiftDoor.psc b/datafiles/Source/Scripts/Mundusform_RiftDoor.psc
@@ -16,5 +16,12 @@ event onActivate(objectReference akActivator)
         refs[refslength].SetAngle(rotations[(refslength * 3)],rotations[(refslength * 3)+1],rotations[(refslength * 3)+2])
     endwhile
 
+    ;Things get stuck sometimes. Do it again.
+    refslength = refs.Length
+    while(refslength > 0)
+        Debug.Notification("Translating")
+        refslength -= 1
+        refs[refslength].TranslateTo(refs[refslength].GetPositionX(), refs[refslength].GetPositionY(), refs[refslength].GetPositionZ(), rotations[(refslength * 3)], rotations[(refslength * 3)+1],rotations[(refslength * 3)+2], 1, 10.0)
+    endwhile
     Debug.Notification("Rift Complete")
-endEvent
+endEvent