nzp-team
/
assets
mirror of https://github.com/nzp-team/assets.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fegefeuer hotfixes (#6) 

Fix buying mbox through wall, errant hitboxes, extend barrier wall, fix texture.
This commit is contained in:
Abhid Islam 2022-12-20 04:18:57 +00:00 committed by GitHub
parent c349066dc4
commit 52af162345
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/maps/Fegefeuer.bsp
View File

Binary file not shown.

2
common/maps/Fegefeuer.way
View File

@ -60,7 +60,7 @@ target8 =
Waypoint
{
origin = '2881.5 933.0 144.0'
origin = '2904.5 933.0 144.0'
id = 4
special =
target = 3

71
source/maps/fegefeuer/Fegefeuer.map
View File

@ -201,7 +201,7 @@
}
// brush 21
{
( 2832 832 104 ) ( 2832 833 104 ) ( 2832 832 105 ) NULL [ 0 -1 0 0 ] [ -0 -0 -1 0 ] 0 1 1
( 2856 832 104 ) ( 2856 833 104 ) ( 2856 832 105 ) NULL [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 3312 832 104 ) ( 3312 832 105 ) ( 3313 832 104 ) NULL [ 1 0 -0 0 ] [ 0 -0 -1 0 ] 0 1 1
( 3312 832 104 ) ( 3313 832 104 ) ( 3312 833 104 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 3344 1032 112 ) ( 3344 1033 112 ) ( 3345 1032 112 ) VERRUCKT_T_WHIT [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
@ -251,7 +251,7 @@
( 2808 896 96 ) ( 2809 896 96 ) ( 2808 897 96 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 2832 928 112 ) ( 2832 929 112 ) ( 2833 928 112 ) VERRUCKT_T_WHIT [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 2832 976 112 ) ( 2833 976 112 ) ( 2832 976 113 ) NULL [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2832 928 112 ) ( 2832 928 113 ) ( 2832 929 112 ) NULL [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2856 928 112 ) ( 2856 928 113 ) ( 2856 929 112 ) NULL [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
}
// brush 27
{
@ -278,7 +278,7 @@
( 2808 968 96 ) ( 2809 968 96 ) ( 2808 969 96 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 2832 976 248 ) ( 2832 977 248 ) ( 2833 976 248 ) NULL [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 2832 1032 112 ) ( 2833 1032 112 ) ( 2832 1032 113 ) NULL [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2832 976 112 ) ( 2832 976 113 ) ( 2832 977 112 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
( 2856 976 112 ) ( 2856 976 113 ) ( 2856 977 112 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
}
// brush 30
{
@ -296,7 +296,7 @@
( 2808 832 96 ) ( 2809 832 96 ) ( 2808 833 96 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 2832 840 248 ) ( 2832 841 248 ) ( 2833 840 248 ) NULL [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 2832 888 112 ) ( 2833 888 112 ) ( 2832 888 113 ) VERRUCKT_WALL_E [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 2 2
( 2832 840 112 ) ( 2832 840 113 ) ( 2832 841 112 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
( 2856 840 112 ) ( 2856 840 113 ) ( 2856 841 112 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
}
// brush 32
{
@ -305,16 +305,16 @@
( 2808 960 216 ) ( 2809 960 216 ) ( 2808 961 216 ) VERRUCKT_WALL_E [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 2 2
( 2832 976 248 ) ( 2832 977 248 ) ( 2833 976 248 ) NULL [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 2832 976 224 ) ( 2833 976 224 ) ( 2832 976 225 ) NULL [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2832 976 224 ) ( 2832 976 225 ) ( 2832 977 224 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
( 2856 976 224 ) ( 2856 976 225 ) ( 2856 977 224 ) BRICKS_W_256NGN [ 0 1 0 0 ] [ 0 0 -1 96 ] 0 1 1
}
// brush 33
{
( 2816 896 112 ) ( 2816 897 112 ) ( 2816 896 113 ) CLIP [ 0 -1 0 0 ] [ -0 -0 -1 0 ] 0 1 1
( 2816 888 112 ) ( 2816 888 113 ) ( 2817 888 112 ) CLIP [ 1 0 -0 0 ] [ 0 -0 -1 0 ] 0 1 1
( 2816 896 112 ) ( 2817 896 112 ) ( 2816 897 112 ) CLIP [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 2824 976 216 ) ( 2824 977 216 ) ( 2825 976 216 ) CLIP [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 2824 976 120 ) ( 2825 976 120 ) ( 2824 976 121 ) CLIP [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2824 976 120 ) ( 2824 976 121 ) ( 2824 977 120 ) CLIP [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2840 896 112 ) ( 2840 897 112 ) ( 2840 896 113 ) CLIP [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2840 888 112 ) ( 2840 888 113 ) ( 2841 888 112 ) CLIP [ 1 0 0 -8 ] [ 0 0 -1 0 ] 0 1 1
( 2840 896 112 ) ( 2841 896 112 ) ( 2840 897 112 ) CLIP [ -1 0 0 8 ] [ 0 -1 0 0 ] 0 1 1
( 2848 976 216 ) ( 2848 977 216 ) ( 2849 976 216 ) CLIP [ 1 0 0 -8 ] [ 0 -1 0 0 ] 0 1 1
( 2848 976 120 ) ( 2849 976 120 ) ( 2848 976 121 ) CLIP [ -1 0 0 8 ] [ 0 0 -1 0 ] 0 1 1
( 2848 976 120 ) ( 2848 976 121 ) ( 2848 977 120 ) CLIP [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
}
// brush 34
{
@ -984,7 +984,7 @@
}
// brush 108
{
( 1168 2184 232 ) ( 1168 2185 232 ) ( 1168 2184 233 ) CLIP [ 0 -1 0 0 ] [ -0 -0 -1 0 ] 0 1 1
( 1176 2184 232 ) ( 1176 2185 232 ) ( 1176 2184 233 ) CLIP [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 1168 2176 232 ) ( 1168 2176 233 ) ( 1169 2176 232 ) CLIP [ 1 0 -0 0 ] [ 0 -0 -1 0 ] 0 1 1
( 1288 2208 248 ) ( 1289 2208 248 ) ( 1288 2209 248 ) CLIP [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 1288 2208 312 ) ( 1288 2209 312 ) ( 1289 2208 312 ) CLIP [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
@ -998,7 +998,7 @@
( 3000 1080 128 ) ( 3001 1080 128 ) ( 3000 1081 128 ) CLIP [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 3000 1080 248 ) ( 3000 1081 248 ) ( 3001 1080 248 ) CLIP [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
( 3000 1080 120 ) ( 3001 1080 120 ) ( 3000 1080 121 ) CLIP [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 3000 1080 120 ) ( 3000 1080 121 ) ( 3000 1081 120 ) CLIP [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
( 2992 1080 120 ) ( 2992 1080 121 ) ( 2992 1081 120 ) CLIP [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
}
// brush 110
{
@ -1058,7 +1058,7 @@
"model" "models/misc/window.mdl"
"angles" "0 270 0"
"targetname" "b1"
"origin" "3460 1636 176"
"origin" "3464 1636 176"
}
// entity 3
{
@ -1073,7 +1073,7 @@
"model" "models/misc/window.mdl"
"angles" "0 0 0"
"targetname" "b2"
"origin" "2820 924 176"
"origin" "2844 928 176"
}
// entity 5
{
@ -1143,7 +1143,7 @@
{
"classname" "mystery_box"
"angles" "0 180 0"
"origin" "2944 1064 138"
"origin" "2940 1068 138"
}
// entity 11
{
@ -1205,7 +1205,7 @@
// entity 16
{
"classname" "mystery_box_tp_spot"
"origin" "1224 2192 258"
"origin" "1228 2192 258"
}
// entity 17
{
@ -2451,14 +2451,14 @@
{
"classname" "place_model"
"model" "models/Props/sandbags.mdl"
"origin" "2820 908 112"
"origin" "2844 908 112"
"_tb_layer" "2"
}
// entity 96
{
"classname" "place_model"
"model" "models/Props/sandbags.mdl"
"origin" "2820 952 112"
"origin" "2844 952 112"
"_tb_layer" "2"
}
// entity 97
@ -5806,20 +5806,6 @@
}
// entity 257
{
"classname" "func_wall"
"_tb_layer" "20"
// brush 0
{
( 1036 1914 296 ) ( 1020 1942 296 ) ( 1020 1942 328 ) box_side3 [ 0.4999999999999954 -0.8660254037844415 0 -24.89331 ] [ 0 0 -1 8 ] 0 0.5 1
( 1020 1942 328 ) ( 1020 1942 296 ) ( 1076 1974 296 ) box_side3 [ -0.8660254037844414 -0.4999999999999954 0 62.522827 ] [ 0 0 -1 8 ] 0 1 1
( 1036 1914 296 ) ( 1092 1946 296 ) ( 1076 1974 296 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 1076 1974 328 ) ( 1092 1946 328 ) ( 1036 1914 328 ) box_side3 [ -0.8660254037844414 -0.4999999999999954 0 62.522827 ] [ -0.4999999999999954 0.8660254037844415 0 12.446655 ] 150 1 1
( 1036 1914 328 ) ( 1092 1946 328 ) ( 1092 1946 296 ) box_side3 [ 0.8660254037844414 0.4999999999999954 0 -62.522827 ] [ 0 0 -1 8 ] 0 1 1
( 1092 1946 296 ) ( 1092 1946 328 ) ( 1076 1974 328 ) box_side3 [ -0.4999999999999954 0.8660254037844415 0 24.89331 ] [ 0 0 -1 8 ] 0 0.5 1
}
}
// entity 258
{
"classname" "place_model"
"angles" "0 150 0"
"sequence" "0"
@ -5829,7 +5815,7 @@
"spawnflags" "0"
"_tb_layer" "20"
}
// entity 259
// entity 258
{
"classname" "place_model"
"angles" "0 54 0"
@ -5839,7 +5825,7 @@
"origin" "1280 1804 232"
"_tb_layer" "20"
}
// entity 260
// entity 259
{
"classname" "place_model"
"angles" "0 323 0"
@ -5849,7 +5835,7 @@
"origin" "1320 1860 232"
"_tb_layer" "20"
}
// entity 261
// entity 260
{
"classname" "func_wall"
"_tb_layer" "20"
@ -5889,8 +5875,17 @@
( 1000 1920 240 ) ( 999 1920 240 ) ( 1000 1920 239 ) box_side3 [ 4.371138994063005e-08 0 -0.9999999999999989 -24 ] [ 0.9999999999999989 0 4.371138994063005e-08 0 ] 90 1 1
( 1024 1896 296 ) ( 1024 1897 296 ) ( 1024 1896 295 ) NULL [ 0 1 -0 0 ] [ 0 -0 -1 0 ] 0 1 1
}
// brush 4
{
( 1036 1914 296 ) ( 1020 1942 296 ) ( 1020 1942 328 ) box_side3 [ 0.4999999999999954 -0.8660254037844415 0 -24.89331 ] [ 0 0 -1 8 ] 0 0.5 1
( 1020 1942 328 ) ( 1020 1942 296 ) ( 1076 1974 296 ) box_side3 [ -0.8660254037844414 -0.4999999999999954 0 62.522827 ] [ 0 0 -1 8 ] 0 1 1
( 1036 1914 296 ) ( 1092 1946 296 ) ( 1076 1974 296 ) NULL [ -1 0 0 0 ] [ -0 -1 -0 0 ] 0 1 1
( 1076 1974 328 ) ( 1092 1946 328 ) ( 1036 1914 328 ) box_side3 [ -0.8660254037844414 -0.4999999999999954 0 62.522827 ] [ -0.4999999999999954 0.8660254037844415 0 12.446655 ] 150 1 1
( 1036 1914 328 ) ( 1092 1946 328 ) ( 1092 1946 296 ) box_side3 [ 0.8660254037844414 0.4999999999999954 0 -62.522827 ] [ 0 0 -1 8 ] 0 1 1
( 1092 1946 296 ) ( 1092 1946 328 ) ( 1076 1974 328 ) box_side3 [ -0.4999999999999954 0.8660254037844415 0 24.89331 ] [ 0 0 -1 8 ] 0 0.5 1
}
// entity 262
}
// entity 261
{
"classname" "func_wall"
"_tb_layer" "20"
@ -5913,7 +5908,7 @@
( 1152 1736 240 ) ( 1152 1735 240 ) ( 1152 1736 241 ) box_side3 [ 1.2246467991473532e-16 1 0 -16 ] [ 0 0 -1 8 ] 0 0.5 1
}
}
// entity 263
// entity 262
{
"classname" "func_wall"
"_tb_layer" "20"

BIN
source/textures/wad/Ju[s]tice_null2.wad
View File

Binary file not shown.