Merge pull request #20

rules_update
new-frontiers-14 · Jul 11, 2023 · 4d086a1 · 4d086a1
2 parents 7c3fd79 + 3ab88c3
commit 4d086a1
Show file tree

Hide file tree

Showing 21 changed files with 291 additions and 395 deletions.
diff --git a/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs b/Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
@@ -95,7 +95,7 @@ public void PopulateProducts(ShipyardConsoleUiKey uiKey)
                 {
                     Vessel = prototype,
                     VesselName = { Text = prototype.Name },
-                    Purchase = { ToolTip = prototype.Description },
+                    Purchase = { ToolTip = prototype.Description, TooltipDelay = 0.2f },
                     Price = { Text = Loc.GetString("cargo-console-menu-points-amount", ("amount", prototype.Price.ToString())) },
                 };
                 vesselEntry.Purchase.OnPressed += (args) => { OnOrderApproved?.Invoke(args); };

diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -112,7 +112,30 @@ private void OnStartup(RoundStartingEvent ev)
         {
 
             var seed = _random.Next();
-            var offset = _random.NextVector2(1500f, 3500f);
+            var offset = _random.NextVector2(2100f, 4500f);
+            if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions
+                {
+                    Offset = offset
+                }))
+            {
+                continue;
+            }
+
+            var mapGrid = EnsureComp<MapGridComponent>(grids[0]);
+            _shuttle.AddIFFFlag(grids[0], IFFFlags.HideLabel);
+            _console.WriteLine(null, $"dungeon spawned at {offset}");
+            offset = new Vector2(0, 0);
+
+            //pls fit the grid I beg, this is so hacky
+            //its better now but i think i need to do a normalization pass on the dungeon configs
+            //because they are all offset
+            _dunGen.GenerateDungeon(dunGen, grids[0], mapGrid, (Vector2i) offset, seed);
+        }
+        foreach (var dunGen in dungenTypes)
+        {
+
+            var seed = _random.Next();
+            var offset = _random.NextVector2(2300f, 6500f);
             if (!_map.TryLoad(mapId, "/Maps/spaceplatform.yml", out var grids, new MapLoadOptions
                 {
                     Offset = offset