Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rules_update #20

Merged
merged 3 commits into from
Jul 11, 2023
Merged

rules_update #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9db2ed4
rules and a few vending and event and ui tweaks
Cheackraze Jul 11, 2023
69c6feb
vend
Cheackraze Jul 11, 2023
3ab88c3
dun
Cheackraze Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Content.Client/Shipyard/UI/ShipyardConsoleMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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); };
Expand Down
25 changes: 24 additions & 1 deletion Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading