Skip to content

Commit

Permalink
Fix #4308: Enlarge P1/1950s Small Glass Hole slightly to allow pellet…
Browse files Browse the repository at this point in the history
…s through
  • Loading branch information
TeamSpen210 committed Jan 6, 2024
1 parent c36387b commit 81ca7fa
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 101 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

# Version `<dev>`

## Enhancements:
* #4308: Enlarge P1/1950s Small Glass Hole slightly to allow pellets through.

### Bugfixes:
* Fix neurotoxin timer not compiling in P1 style.

Expand Down
2 changes: 1 addition & 1 deletion packages/glass_hole/items/hole/properties.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"" " * Unfortunately voxels with an adjacent wall make this difficult. Filling the block in, placing the hole item, then hollowing and adding the glass second will help in some situations."
"" "* Use the Start Open property to select the small or large variant."
"" "* For large holes, glass must also be present above, below, left and right."
"" "* Small holes allow portal shots, bullets, lasers and paint splatter. Large holes allow anything through that physically fits."
"" "* Small holes allow portal shots, bullets, lasers, pellets and paint splatter. Large holes allow anything through that physically fits."
"" "* This also works with grating, although it is less useful."
}

Expand Down
2 changes: 1 addition & 1 deletion packages/glass_hole/items/p1.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"Options"
{
"glass_hole_temp" "BEE2_HOLE_SQUARE"
"glass_hole_size_small" "32"
"glass_hole_size_small" "36"
"glass_hole_size_large" "160"
}

Expand Down
2 changes: 1 addition & 1 deletion packages/glass_hole/items/retro.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"Options"
{
"glass_hole_temp" "BEE2_HOLE_SQUARE"
"glass_hole_size_small" "32"
"glass_hole_size_small" "36"
"glass_hole_size_large" "160"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
versioninfo
{
"editorversion" "400"
"editorbuild" "8997"
"mapversion" "10"
"editorbuild" "9672"
"mapversion" "11"
"formatversion" "100"
"prefab" "0"
}
Expand All @@ -14,13 +14,13 @@ viewsettings
"bSnapToGrid" "1"
"bShowGrid" "1"
"bShowLogicalGrid" "0"
"nGridSpacing" "4"
"nGridSpacing" "2"
"bShow3DGrid" "0"
}
world
{
"id" "1"
"mapversion" "10"
"mapversion" "11"
"classname" "worldspawn"
"detailmaterial" "detail/detailsprites"
"detailvbsp" "detail.vbsp"
Expand All @@ -38,9 +38,9 @@ entity
side
{
"id" "84"
"plane" "(60 16 -16) (60 12 -12) (60 -12 -12)"
"plane" "(60 18 -18) (60 14 -14) (60 -14 -14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 0 -1 -4] 0.25"
"uaxis" "[0 0 -1 -12] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -49,9 +49,9 @@ entity
side
{
"id" "83"
"plane" "(64 -12 -12) (64 12 -12) (64 16 -16)"
"plane" "(64 -14 -14) (64 14 -14) (64 18 -18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 0 -1 -4] 0.25"
"uaxis" "[0 0 -1 -12] 0.25"
"vaxis" "[0 -1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -60,7 +60,7 @@ entity
side
{
"id" "82"
"plane" "(64 -16 -16) (64 16 -16) (60 16 -16)"
"plane" "(64 -18 -18) (64 18 -18) (60 18 -18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 -1 0 386] 0.25"
Expand All @@ -71,29 +71,29 @@ entity
side
{
"id" "81"
"plane" "(60 -16 -16) (60 -12 -12) (64 -12 -12)"
"plane" "(60 -18 -18) (60 -14 -14) (64 -14 -14)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 -0.707107 -0.707107 22.6274] 0.25"
"vaxis" "[0 -0.707107 -0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "80"
"plane" "(64 16 -16) (64 12 -12) (60 12 -12)"
"plane" "(64 18 -18) (64 14 -14) (60 14 -14)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 0.707107 -0.707107 22.6274] 0.25"
"vaxis" "[0 0.707107 -0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "79"
"plane" "(64 12 -12) (64 -12 -12) (60 -12 -12)"
"plane" "(64 14 -14) (64 -14 -14) (60 -14 -14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 -1 0 128] 0.25"
Expand All @@ -114,9 +114,9 @@ entity
side
{
"id" "90"
"plane" "(60 -16 16) (60 -12 12) (60 12 12)"
"plane" "(60 -18 18) (60 -14 14) (60 14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 0 1 -4] 0.25"
"uaxis" "[0 0 1 -12] 0.25"
"vaxis" "[0 1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -125,9 +125,9 @@ entity
side
{
"id" "89"
"plane" "(64 12 12) (64 -12 12) (64 -16 16)"
"plane" "(64 14 14) (64 -14 14) (64 -18 18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 0 1 -4] 0.25"
"uaxis" "[0 0 1 -12] 0.25"
"vaxis" "[0 1 0 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -136,7 +136,7 @@ entity
side
{
"id" "88"
"plane" "(64 16 16) (64 -16 16) (60 -16 16)"
"plane" "(64 18 18) (64 -18 18) (60 -18 18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 1 0 386] 0.25"
Expand All @@ -147,29 +147,29 @@ entity
side
{
"id" "87"
"plane" "(64 12 12) (64 16 16) (60 16 16)"
"plane" "(64 14 14) (64 18 18) (60 18 18)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 0.707107 0.707107 22.6274] 0.25"
"vaxis" "[0 0.707107 0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "86"
"plane" "(60 -12 12) (60 -16 16) (64 -16 16)"
"plane" "(60 -14 14) (60 -18 18) (64 -18 18)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 -0.707107 0.707107 22.6274] 0.25"
"vaxis" "[0 -0.707107 0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "85"
"plane" "(64 -12 12) (64 12 12) (60 12 12)"
"plane" "(64 -14 14) (64 14 14) (60 14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 1 0 128] 0.25"
Expand All @@ -190,9 +190,9 @@ entity
side
{
"id" "96"
"plane" "(60 -12 -12) (60 -12 12) (60 -16 16)"
"plane" "(60 -18 -18) (60 -14 -14) (60 -14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 -1 0 -4] 0.25"
"uaxis" "[0 -1 0 -12] 0.25"
"vaxis" "[0 0 1 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -201,9 +201,9 @@ entity
side
{
"id" "95"
"plane" "(64 -12 12) (64 -12 -12) (64 -16 -16)"
"plane" "(64 -18 18) (64 -14 14) (64 -14 -14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 -1 0 -4] 0.25"
"uaxis" "[0 -1 0 -12] 0.25"
"vaxis" "[0 0 1 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -212,7 +212,7 @@ entity
side
{
"id" "94"
"plane" "(60 -16 -16) (60 -16 16) (64 -16 16)"
"plane" "(64 -18 -18) (60 -18 -18) (60 -18 18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 0 1 386] 0.25"
Expand All @@ -223,29 +223,29 @@ entity
side
{
"id" "93"
"plane" "(64 -12 12) (64 -16 16) (60 -16 16)"
"plane" "(60 -14 14) (64 -14 14) (64 -18 18)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 -0.707107 0.707107 22.6274] 0.25"
"vaxis" "[0 -0.707107 0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "92"
"plane" "(64 -16 -16) (64 -12 -12) (60 -12 -12)"
"plane" "(60 -18 -18) (64 -18 -18) (64 -14 -14)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 -0.707107 -0.707107 22.6274] 0.25"
"vaxis" "[0 -0.707107 -0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "91"
"plane" "(64 -12 -12) (64 -12 12) (60 -12 12)"
"plane" "(60 -14 -14) (64 -14 -14) (64 -14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 0 1 128] 0.25"
Expand All @@ -266,9 +266,9 @@ entity
side
{
"id" "102"
"plane" "(60 16 16) (60 12 12) (60 12 -12)"
"plane" "(60 18 -18) (60 18 18) (60 14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 1 0 -4] 0.25"
"uaxis" "[0 1 0 -12] 0.25"
"vaxis" "[0 0 -1 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -277,9 +277,9 @@ entity
side
{
"id" "101"
"plane" "(64 12 -12) (64 12 12) (64 16 16)"
"plane" "(64 18 -18) (64 14 -14) (64 14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[0 1 0 -4] 0.25"
"uaxis" "[0 1 0 -12] 0.25"
"vaxis" "[0 0 -1 0] 0.25"
"rotation" "0"
"lightmapscale" "16"
Expand All @@ -288,7 +288,7 @@ entity
side
{
"id" "100"
"plane" "(64 16 -16) (64 16 16) (60 16 16)"
"plane" "(60 18 -18) (64 18 -18) (64 18 18)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 0 -1 386] 0.25"
Expand All @@ -299,29 +299,29 @@ entity
side
{
"id" "99"
"plane" "(60 16 -16) (60 12 -12) (64 12 -12)"
"plane" "(64 18 -18) (60 18 -18) (60 14 -14)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[1 0 0 0] 0.25"
"vaxis" "[0 0.707107 -0.707107 22.6274] 0.25"
"vaxis" "[0 0.707107 -0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "98"
"plane" "(60 12 12) (60 16 16) (64 16 16)"
"plane" "(64 14 14) (60 14 14) (60 18 18)"
"material" "TOOLS/TOOLSNODRAW"
"uaxis" "[-1 0 0 0] 0.25"
"vaxis" "[0 0.707107 0.707107 22.6274] 0.25"
"vaxis" "[0 0.707107 0.707107 16.9705] 0.25"
"rotation" "0"
"lightmapscale" "16"
"smoothing_groups" "0"
}
side
{
"id" "97"
"plane" "(60 12 -12) (60 12 12) (64 12 12)"
"plane" "(64 14 -14) (60 14 -14) (60 14 14)"
"material" "ANIM_WP/FRAMEWORK/SQUAREBEAMS_RUSTY_01"
"uaxis" "[-1 0 0 257] 0.25"
"vaxis" "[0 0 -1 128] 0.25"
Expand Down
Loading

0 comments on commit 81ca7fa

Please sign in to comment.