Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tome
Tales of MajEyal
Commits
405b3da3
There was a problem fetching the pipeline summary.
Commit
405b3da3
authored
7 years ago
by
DarkGod
Browse files
Options
Downloads
Patches
Plain Diff
plop
parent
a4c3565f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!509
WIP: Orange tooltip edits
Pipeline
#
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/modules/tome/data/zones/test/mapscripts/inner_outer.lua
+3
-3
3 additions, 3 deletions
game/modules/tome/data/zones/test/mapscripts/inner_outer.lua
game/modules/tome/data/zones/test/samples/wfctest5.tmx
+45
-0
45 additions, 0 deletions
game/modules/tome/data/zones/test/samples/wfctest5.tmx
with
48 additions
and
3 deletions
game/modules/tome/data/zones/test/mapscripts/inner_outer.lua
+
3
−
3
View file @
405b3da3
...
...
@@ -39,7 +39,7 @@ local wfcouter = WaveFunctionCollapse.new{
-- Inner buildings
local
wfcinner
=
WaveFunctionCollapse
.
new
{
mode
=
"overlapping"
,
async
=
true
,
sample
=
self
:
getFile
(
"!wfctest
4
.tmx"
,
"samples"
),
sample
=
self
:
getFile
(
"!wfctest
5
.tmx"
,
"samples"
),
size
=
{
self
.
mapsize
.
w
/
2
,
self
.
mapsize
.
h
-
2
},
n
=
3
,
symmetry
=
8
,
periodic_out
=
false
,
periodic_in
=
false
,
has_foundation
=
false
}
...
...
@@ -54,7 +54,7 @@ local doorwaytunnel = doorway:locateTile('E', '.')
-- Merge them all
local
tm
=
Tilemap
.
new
(
self
.
mapsize
)
wfcouter
:
merge
(
1
,
1
,
wfcwater
,
merge_order
)
--
if wfcouter:eliminateByFloodfill{'#', 'T'} < 400 then print("[inner_outer] outer is too small") return self:regenerate() end
if
wfcouter
:
eliminateByFloodfill
{
'#'
,
'T'
}
<
400
then
print
(
"[inner_outer] outer is too small"
)
return
self
:
regenerate
()
end
if
wfcinner
:
eliminateByFloodfill
{
'#'
,
'T'
}
<
400
then
print
(
"[inner_outer] inner is too small"
)
return
self
:
regenerate
()
end
tm
:
merge
(
1
,
1
,
wfcouter
,
merge_order
)
tm
:
merge
(
self
.
mapsize
.
w
-
wfcinner
.
data_w
,
2
,
wfcinner
,
merge_order
)
...
...
@@ -79,6 +79,6 @@ tm:fillAll('.', 'r')
tm
:
fillAll
()
-- Elimitate the rest
--
if tm:eliminateByFloodfill{'#', 'T'} < 400 then return self:regenerate() end
if
tm
:
eliminateByFloodfill
{
'#'
,
'T'
}
<
400
then
return
self
:
regenerate
()
end
-- tm:printResult()
return
tm
:
getResult
(
true
)
This diff is collapsed.
Click to expand it.
game/modules/tome/data/zones/test/samples/wfctest5.tmx
0 → 100644
+
45
−
0
View file @
405b3da3
<?xml version="1.0" encoding="UTF-8"?>
<map
version=
"1.0"
tiledversion=
"1.0.3"
orientation=
"orthogonal"
renderorder=
"right-down"
width=
"16"
height=
"16"
tilewidth=
"32"
tileheight=
"32"
nextobjectid=
"31"
>
<properties>
<property
name=
"status_all"
value=
"{no_teleport=true}"
/>
</properties>
<tileset
firstgid=
"1"
name=
"dg_dungeon32"
tilewidth=
"32"
tileheight=
"32"
tilecount=
"90"
columns=
"9"
>
<image
source=
"../../../../../../../tiled-maps/gfx/dg_dungeon32.gif"
width=
"288"
height=
"320"
/>
<tile
id=
"0"
>
<properties>
<property
name=
"id"
value=
"#"
/>
</properties>
</tile>
<tile
id=
"3"
>
<properties>
<property
name=
"id"
value=
"+"
/>
</properties>
</tile>
<tile
id=
"51"
>
<properties>
<property
name=
"id"
value=
"."
/>
</properties>
</tile>
<tile
id=
"54"
>
<properties>
<property
name=
"id"
value=
"_"
/>
</properties>
</tile>
<tile
id=
"58"
>
<properties>
<property
name=
"id"
value=
"r"
/>
</properties>
</tile>
</tileset>
<tileset
firstgid=
"91"
name=
"tome-terrains"
tilewidth=
"32"
tileheight=
"32"
tilecount=
"144"
columns=
"8"
>
<image
source=
"../../../../../../../tiled-maps/gfx/tome-terrains.png"
width=
"256"
height=
"576"
/>
</tileset>
<tileset
firstgid=
"235"
name=
"numbers"
tilewidth=
"32"
tileheight=
"32"
tilecount=
"36"
columns=
"6"
>
<image
source=
"../../../../../../../tiled-maps/gfx/numbers.png"
width=
"192"
height=
"192"
/>
</tileset>
<layer
name=
"Terrain"
width=
"16"
height=
"16"
>
<data
encoding=
"base64"
compression=
"zlib"
>
eJxjZGBgYKQDtkbChOSR1ZlAMSX6KbUfWR06H59+EyzqWajgflx+wGa+CVSMWP3E+m+w6ccWfujqcIU9MfqxxSUx+k2I0Eus+2mBAexcFhw=
</data>
</layer>
</map>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment