Skip to content
This repository has been archived by the owner on May 5, 2021. It is now read-only.

Commit

Permalink
- Attempted to fix issue with street room entries being shorn off by …
Browse files Browse the repository at this point in the history
…the street shape clean-up rules, resulting in joiner or direct connections being unable to meet (therefore causing an assert)

- Decreased maximum seed grid size again.
  • Loading branch information
GTD-Carthage committed Jul 26, 2019
1 parent e1880a1 commit 163c012
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/scripts/defs.lua
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ LENGTH_CHOICES =
SEED_SIZE = 128

-- largest map size
SEED_W = 96 --112
SEED_H = 96 --112
SEED_W = 90 --112
SEED_H = 90 --112
-- MSSP: the absolute maximum size is tightened down to the largest
-- agreed map size for performance's sake. Current agreed maximum is 74 W.
-- any higher will cause skyboxes and teleporter rooms to start merging with
Expand Down
12 changes: 10 additions & 2 deletions src/scripts/seed.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1061,9 +1061,17 @@ function Edge_new(kind, S, dir, long)
-- add it into each seed
for i = 1, long do
if not S then
print(table.tostr(R))
print(table.tostr(A))
gui.printf(kind .. "\n")
gui.printf(table.tostr(R .. "\n"))
gui.printf(table.tostr(A .. "\n"))
-- note: this mostly only happens when a
-- room-to-room connection (direct or via joiner)
-- does not perfectly meet
-- each other on the edge
-- check shape rules for misbehaved shapes
error("OH GOD I CAN'T COMPUTER PLS TO HELP")
end

assert(S)

if S.edge[dir] then
Expand Down
5 changes: 4 additions & 1 deletion src/scripts/shapes.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6814,10 +6814,10 @@ STREETS_ENTRY_RSVOL_4 =

structure =
{
"....","1111"
"11..","1111"
"11..","1111"
"....","1111"
"....","1111"
}
}

Expand All @@ -6829,6 +6829,7 @@ STREETS_ENTRY_RSVOL_6 =

structure =
{
"....","1111"
"11..","1111"
"11..","1111"
"11..","1111"
Expand All @@ -6844,10 +6845,12 @@ STREETS_ENTRY_RSVOL_8 =

structure =
{
"....","1111"
"11..","1111"
"11..","1111"
"11..","1111"
"11..","1111"
"....","1111"
}
}

Expand Down

0 comments on commit 163c012

Please sign in to comment.