Skip to content

Commit 381e290

Browse files
committed
Improve scaffold wall emitter placement
Had this sitting in my unstaged changes for a while, don't remember how finished it was. This will fix #4106
1 parent 53d58b9 commit 381e290

File tree

4 files changed

+459
-3
lines changed

4 files changed

+459
-3
lines changed

packages/scaffold/info.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@
131131
"" "* The first item will use its Start Enabled property as well as inputs to control the platform. "
132132
"" "* Enable Start Reversed to make the platform oscillate between endpoints, instead of stopping. "
133133
"" "* The platform is always positioned upright."
134+
"" "* The various movement handle positions for wall emitters have been adjusted to produce more useful results, and may not exactly match what is displayed in the editor."
135+
"" "* When placed on the floor, the platform will be lower so that it can be jumped onto."
134136
}
135137
"Version"
136138
{

packages/scaffold/items/wall/editoritems.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"SOUND_DELETED" "P2Editor.RemoveOther"
2222
}
2323
}
24-
"MovementHandle" "HANDLE_6_POSITIONS"
24+
"MovementHandle" "HANDLE_8_POSITIONS"
2525
"InvalidSurface" "CEILING"
2626
}
2727
"Properties"

packages/scaffold/items/wall_clean.cfg

Lines changed: 61 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,76 @@
77

88
"Condition"
99
{
10-
"Orientation" "up"
10+
"Orientation" "floor"
1111
// On the floor, we move the platform to be right next to the emitter so you
1212
// can jump up to it.
1313
"Result"
1414
{
1515
"ChangeInstance" "instances/BEE2/clean/items/scaffold/floor_emitter.vmf"
16-
"OffsetInst" "0 0 -56"
16+
// Move 16 units towards center of voxel
17+
"OffsetInst" "16 0 -56"
1718
}
1819
"Else"
1920
{
2021
"ChangeInstance" "instances/BEE2/clean/items/scaffold/wall_emitter.vmf"
22+
23+
// Shift the various sub-voxel handle positions to be more useful
24+
"Condition"
25+
{
26+
// -X pointing up - top positions, shift 16 units towards +X (down)
27+
"Orientation"
28+
{
29+
"direction" "up"
30+
"from_dir" "-1 0 0"
31+
}
32+
"Result"
33+
{
34+
"OffsetInst" "16 0 0"
35+
}
36+
}
37+
"Condition"
38+
{
39+
// -X pointing down - bottom positions, shift 16 towards -X (down)
40+
"Orientation"
41+
{
42+
"direction" "down"
43+
"from_dir" "-1 0 0"
44+
}
45+
"Result"
46+
{
47+
"OffsetInst" "-16 0 0"
48+
}
49+
}
50+
"Condition"
51+
{
52+
// +Y pointing up - left positions, shift 16 out and 32 towards +Y (up)
53+
"Orientation"
54+
{
55+
"direction" "up"
56+
"from_dir" "0 1 0"
57+
}
58+
"Result"
59+
{
60+
"OffsetInst" "-16 32 0"
61+
}
62+
}
63+
"Condition"
64+
{
65+
// +Y pointing down - right positions, shift 16 out and 32 towards -Y (up)
66+
"Orientation"
67+
{
68+
"direction" "down"
69+
"from_dir" "0 1 0"
70+
}
71+
"Result"
72+
{
73+
"OffsetInst" "-16 -32 0"
74+
}
75+
}
76+
"TemplateBrush"
77+
{
78+
"ID" "BEE2_UNST_SCAFFOLD_BACKING_CLEAN"
79+
}
2180
}
2281
}
2382
"Result"

0 commit comments

Comments
 (0)