7d84f595e4
Collapse the spiky/sticky/skewer box-variant assets into a single per-
instance `adhesion` property on any moveable block, chosen in the editor
via a dropdown next to the colour picker and stored in the .sav alongside
the class.
- spiky -> sticky: soft grab on every true edge (goopy shader)
- skewer -> gluey: rigid weld on every true edge (spiked outline)
- old trailing-face sticky is removed; its saves fold into new sticky
Move the spike geometry + drawGlueySprite into shaders.lua, fold drawing
and the adhesion flag into GenericMoveable, and delete the three
Generic{Sticky,Spiky,Skewer} classes and box_variants.lua. Room:createEntity
normalises legacy spiky_/skewer_/sticky_ class prefixes so old saves load,
and serialization emits `adhesion`. World/map previews and the movement
proxy follow the rename.
Backfill rooms/*.sav to the new format via tools/backfill_adhesion.lua
(41 objects across 8 files). Update tests to the two-mode model; the two
tests asserting the removed lateral-shear limitation are dropped and a
legacy-load migration test added. 27/27 pass.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
383 lines
No EOL
3.8 KiB
Text
383 lines
No EOL
3.8 KiB
Text
{
|
|
objects={
|
|
{
|
|
x=6,
|
|
y=1,
|
|
color="blue",
|
|
class="door"
|
|
},
|
|
{
|
|
x=1,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=2,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=3,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=4,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=5,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=7,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=8,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=9,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=10,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=1,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=1,
|
|
y=11,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=11,
|
|
color="blue",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=1,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="blue"
|
|
},
|
|
{
|
|
x=3,
|
|
y=6,
|
|
color="blue",
|
|
class="box"
|
|
},
|
|
{
|
|
x=4,
|
|
y=6,
|
|
color="blue",
|
|
class="box_1x2_1-1"
|
|
},
|
|
{
|
|
x=5,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_1x2_1-1",
|
|
color="blue"
|
|
},
|
|
{
|
|
x=6,
|
|
y=5,
|
|
color="blue",
|
|
class="box_2x2_11-10"
|
|
},
|
|
{
|
|
x=7,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="blue"
|
|
},
|
|
{
|
|
x=9,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="blue"
|
|
},
|
|
{
|
|
x=6,
|
|
y=1,
|
|
color="red",
|
|
class="door"
|
|
},
|
|
{
|
|
x=1,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=2,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=3,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=4,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=5,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=7,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=8,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=9,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=10,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=1,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=1,
|
|
y=11,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=11,
|
|
color="red",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=1,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="red"
|
|
},
|
|
{
|
|
x=3,
|
|
y=6,
|
|
color="red",
|
|
class="box"
|
|
},
|
|
{
|
|
x=4,
|
|
y=6,
|
|
color="red",
|
|
class="box_1x2_1-1"
|
|
},
|
|
{
|
|
x=5,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_1x2_1-1",
|
|
color="red"
|
|
},
|
|
{
|
|
x=6,
|
|
y=5,
|
|
color="red",
|
|
class="box_2x2_11-10"
|
|
},
|
|
{
|
|
x=7,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="red"
|
|
},
|
|
{
|
|
x=9,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="red"
|
|
},
|
|
{
|
|
x=6,
|
|
y=1,
|
|
color="green",
|
|
class="door"
|
|
},
|
|
{
|
|
x=1,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=2,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=3,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=4,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=5,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=7,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=8,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=9,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=10,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=1,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=1,
|
|
y=11,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=11,
|
|
y=11,
|
|
color="green",
|
|
class="static_wall"
|
|
},
|
|
{
|
|
x=3,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="green"
|
|
},
|
|
{
|
|
x=1,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="green"
|
|
},
|
|
{
|
|
x=5,
|
|
y=6,
|
|
color="green",
|
|
class="box"
|
|
},
|
|
{
|
|
x=6,
|
|
y=6,
|
|
color="green",
|
|
class="box_1x2_1-1"
|
|
},
|
|
{
|
|
x=7,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_1x2_1-1",
|
|
color="green"
|
|
},
|
|
{
|
|
x=8,
|
|
y=5,
|
|
color="green",
|
|
class="box_2x2_11-10"
|
|
},
|
|
{
|
|
x=9,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="green"
|
|
},
|
|
{
|
|
x=11,
|
|
y=6,
|
|
adhesion="sticky",
|
|
class="box_2x1_11",
|
|
color="green"
|
|
}
|
|
}
|
|
} |