From: Spike29 Date: Wed, 24 May 2023 20:05:51 +0000 (+0200) Subject: Trident: fix misaligned textures on the wall behind the Electro X-Git-Tag: xonotic-v0.8.6~22^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=959caedd4833ff5c66c21ff8789e0d70630744dc;p=xonotic%2Fxonotic-maps.pk3dir.git Trident: fix misaligned textures on the wall behind the Electro --- diff --git a/maps/trident.map b/maps/trident.map index c6951fee..fc84806f 100644 --- a/maps/trident.map +++ b/maps/trident.map @@ -4385,9 +4385,9 @@ patchDef2 trak4x/base-concrete4a ( 3 3 0 0 0 ) ( -( ( 992 -192 64 0 0 ) ( 992 -192 96 0 -0.25 ) ( 992 -192 128 0 -0.5 ) ) -( ( 992 -384 64 1.5 0 ) ( 992 -384 96 1.5 -0.25 ) ( 992 -384 128 1.5 -0.5 ) ) -( ( 800 -384 64 3 0 ) ( 800 -384 96 3 -0.25 ) ( 800 -384 128 3 -0.5 ) ) +( ( 992 -192 64 0.5 0.5 ) ( 992 -192 96 0.5 0.25 ) ( 992 -192 128 0.5 0 ) ) +( ( 992 -384 64 2 0.5 ) ( 992 -384 96 2 0.25 ) ( 992 -384 128 2 0 ) ) +( ( 800 -384 64 3.5 0.5 ) ( 800 -384 96 3.5 0.25 ) ( 800 -384 128 3.5 0 ) ) ) } } @@ -4397,9 +4397,9 @@ patchDef2 trak4x/base-concrete4b ( 3 3 0 0 0 ) ( -( ( 992 -192 0 0 0 ) ( 992 -192 32 0 -0.25 ) ( 992 -192 64 0 -0.5 ) ) -( ( 992 -384 0 1.5 0 ) ( 992 -384 32 1.5 -0.25 ) ( 992 -384 64 1.5 -0.5 ) ) -( ( 800 -384 0 3 0 ) ( 800 -384 32 3 -0.25 ) ( 800 -384 64 3 -0.5 ) ) +( ( 992 -192 0 0.5 0 ) ( 992 -192 32 0.5 -0.25 ) ( 992 -192 64 0.5 -0.5 ) ) +( ( 992 -384 0 2 0 ) ( 992 -384 32 2 -0.25 ) ( 992 -384 64 2 -0.5 ) ) +( ( 800 -384 0 3.5 0 ) ( 800 -384 32 3.5 -0.25 ) ( 800 -384 64 3.5 -0.5 ) ) ) } } @@ -5636,71 +5636,71 @@ brushDef { brushDef { -( -256 262 206 ) ( -256 256 248 ) ( -256 256 200 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -252 256 206 ) ( -256 256 248 ) ( -256 262 206 ) ( ( 0.0078125 0.0000000001 511.72265625 ) ( 0 0.0078124981 508.8998413086 ) ) exx/base-crete01red 0 0 0 -( -256 256 200 ) ( -256 250 206 ) ( -252 256 206 ) ( ( 0.0078125019 0.0000000001 510.6132507324 ) ( 0 0.0078125 509.5111083984 ) ) exx/base-crete01red 0 0 0 -( -252 256 206 ) ( -256 262 206 ) ( -256 256 200 ) ( ( 0.0078125019 -0.0000000001 511.72265625 ) ( 0 0.0078125 510.0492248535 ) ) exx/base-crete01red 0 0 0 -( -256 250 206 ) ( -256 256 248 ) ( -252 256 206 ) ( ( 0.0078125 -0.0000000001 510.6132507324 ) ( -0 0.0078124981 508.9874572754 ) ) exx/base-crete01red 0 0 0 +( -256 262 206 ) ( -256 256 248 ) ( -256 256 200 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -252 256 206 ) ( -256 256 248 ) ( -256 262 206 ) ( ( 0.0078125 0.0000000001 511.72265625 ) ( 0 0.0078124981 508.8998413086 ) ) exx/base-crete01red 134217728 0 0 +( -256 256 200 ) ( -256 250 206 ) ( -252 256 206 ) ( ( 0.0078125019 0.0000000001 510.6132507324 ) ( 0 0.0078125 509.5111083984 ) ) exx/base-crete01red 134217728 0 0 +( -252 256 206 ) ( -256 262 206 ) ( -256 256 200 ) ( ( 0.0078125019 -0.0000000001 511.72265625 ) ( 0 0.0078125 510.0492248535 ) ) exx/base-crete01red 134217728 0 0 +( -256 250 206 ) ( -256 256 248 ) ( -252 256 206 ) ( ( 0.0078125 -0.0000000001 510.6132507324 ) ( -0 0.0078124981 508.9874572754 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 270 240 ) ( -256 264 248 ) ( -256 266 236 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -252 266 240 ) ( -256 264 248 ) ( -256 270 240 ) ( ( 0.0078124991 0 0.0000005364 ) ( 0 0.0078125 508.6870422363 ) ) exx/base-crete01red 0 0 0 -( -256 266 236 ) ( -256 262 240 ) ( -252 266 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -256 266 236 ) ( -252 266 240 ) ( -256 270 240 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 0 0 0 -( -256 262 240 ) ( -256 264 248 ) ( -252 266 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078124981 509.0458068848 ) ) exx/base-crete01red 0 0 0 +( -256 270 240 ) ( -256 264 248 ) ( -256 266 236 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -252 266 240 ) ( -256 264 248 ) ( -256 270 240 ) ( ( 0.0078124991 0 0.0000005364 ) ( 0 0.0078125 508.6870422363 ) ) exx/base-crete01red 134217728 0 0 +( -256 266 236 ) ( -256 262 240 ) ( -252 266 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -256 266 236 ) ( -252 266 240 ) ( -256 270 240 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 134217728 0 0 +( -256 262 240 ) ( -256 264 248 ) ( -252 266 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078124981 509.0458068848 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 276 212 ) ( -256 266 240 ) ( -256 272 208 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -252 272 212 ) ( -256 266 240 ) ( -256 276 212 ) ( ( 0.0078124991 0 0.0000005364 ) ( 0 0.0078124981 508.7450561523 ) ) exx/base-crete01red 0 0 0 -( -256 268 212 ) ( -252 272 212 ) ( -256 272 208 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -256 276 212 ) ( -256 272 208 ) ( -252 272 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 0 0 0 -( -256 268 212 ) ( -256 266 240 ) ( -252 272 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125037 509.0038146973 ) ) exx/base-crete01red 0 0 0 +( -256 276 212 ) ( -256 266 240 ) ( -256 272 208 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -252 272 212 ) ( -256 266 240 ) ( -256 276 212 ) ( ( 0.0078124991 0 0.0000005364 ) ( 0 0.0078124981 508.7450561523 ) ) exx/base-crete01red 134217728 0 0 +( -256 268 212 ) ( -252 272 212 ) ( -256 272 208 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -256 276 212 ) ( -256 272 208 ) ( -252 272 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 134217728 0 0 +( -256 268 212 ) ( -256 266 240 ) ( -252 272 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125037 509.0038146973 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 272 216 ) ( -256 252 218 ) ( -256 276 212 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -256 272 216 ) ( -256 276 212 ) ( -252 272 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 508.7340087891 ) ) exx/base-crete01red 0 0 0 -( -256 272 208 ) ( -256 252 218 ) ( -252 272 212 ) ( ( 0.0078125 0 510.6583557129 ) ( 0 0.0078125 510.0620727539 ) ) exx/base-crete01red 0 0 0 -( -256 272 208 ) ( -252 272 212 ) ( -256 276 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 0 0 0 -( -252 272 212 ) ( -256 252 218 ) ( -256 272 216 ) ( ( 0.0078125 -0.0000000001 511.1044616699 ) ( -0.0000000002 0.0078125009 509.1013793945 ) ) exx/base-crete01red 0 0 0 +( -256 272 216 ) ( -256 252 218 ) ( -256 276 212 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -256 272 216 ) ( -256 276 212 ) ( -252 272 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 508.7340087891 ) ) exx/base-crete01red 134217728 0 0 +( -256 272 208 ) ( -256 252 218 ) ( -252 272 212 ) ( ( 0.0078125 0 510.6583557129 ) ( 0 0.0078125 510.0620727539 ) ) exx/base-crete01red 134217728 0 0 +( -256 272 208 ) ( -252 272 212 ) ( -256 276 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 134217728 0 0 +( -252 272 212 ) ( -256 252 218 ) ( -256 272 216 ) ( ( 0.0078125 -0.0000000001 511.1044616699 ) ( -0.0000000002 0.0078125009 509.1013793945 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 246 236 ) ( -256 248 248 ) ( -256 242 240 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -256 242 240 ) ( -256 248 248 ) ( -252 246 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.3496398926 ) ) exx/base-crete01red 0 0 0 -( -256 246 236 ) ( -252 246 240 ) ( -256 250 240 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 0 0 0 -( -256 246 236 ) ( -256 242 240 ) ( -252 246 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -252 246 240 ) ( -256 248 248 ) ( -256 250 240 ) ( ( 0.0078124991 0 0 ) ( 0 0.0078124981 508.799621582 ) ) exx/base-crete01red 0 0 0 +( -256 246 236 ) ( -256 248 248 ) ( -256 242 240 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -256 242 240 ) ( -256 248 248 ) ( -252 246 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.3496398926 ) ) exx/base-crete01red 134217728 0 0 +( -256 246 236 ) ( -252 246 240 ) ( -256 250 240 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 134217728 0 0 +( -256 246 236 ) ( -256 242 240 ) ( -252 246 240 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -252 246 240 ) ( -256 248 248 ) ( -256 250 240 ) ( ( 0.0078124991 0 0 ) ( 0 0.0078124981 508.799621582 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 244 212 ) ( -256 246 240 ) ( -256 240 208 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -256 236 212 ) ( -256 246 240 ) ( -252 240 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078124981 509.0912780762 ) ) exx/base-crete01red 0 0 0 -( -256 240 208 ) ( -252 240 212 ) ( -256 244 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 0 0 0 -( -252 240 212 ) ( -256 240 208 ) ( -256 236 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -252 240 212 ) ( -256 246 240 ) ( -256 244 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125037 509.0751342773 ) ) exx/base-crete01red 0 0 0 +( -256 244 212 ) ( -256 246 240 ) ( -256 240 208 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -256 236 212 ) ( -256 246 240 ) ( -252 240 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078124981 509.0912780762 ) ) exx/base-crete01red 134217728 0 0 +( -256 240 208 ) ( -252 240 212 ) ( -256 244 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125 510.3670349121 ) ) exx/base-crete01red 134217728 0 0 +( -252 240 212 ) ( -256 240 208 ) ( -256 236 212 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -252 240 212 ) ( -256 246 240 ) ( -256 244 212 ) ( ( 0.0078124991 0 0.0000000596 ) ( 0 0.0078125037 509.0751342773 ) ) exx/base-crete01red 134217728 0 0 } } { brushDef { -( -256 240 208 ) ( -256 260 218 ) ( -256 236 212 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 0 0 0 -( -252 240 212 ) ( -256 236 212 ) ( -256 240 216 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -252 240 212 ) ( -256 260 218 ) ( -256 240 208 ) ( ( 0.0078125 0 511.5527954102 ) ( 0 0.0078125 510.6583557129 ) ) exx/base-crete01red 0 0 0 -( -256 236 212 ) ( -252 240 212 ) ( -256 240 208 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 0 0 0 -( -256 240 216 ) ( -256 260 218 ) ( -252 240 212 ) ( ( 0.0078125 0.0000000001 510.905456543 ) ( 0.0000000002 0.0078125009 509.2417602539 ) ) exx/base-crete01red 0 0 0 +( -256 240 208 ) ( -256 260 218 ) ( -256 236 212 ) ( ( 0.0625 0 8 ) ( 0 0.0625 232 ) ) common/caulk 134217728 0 0 +( -252 240 212 ) ( -256 236 212 ) ( -256 240 216 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -252 240 212 ) ( -256 260 218 ) ( -256 240 208 ) ( ( 0.0078125 0 511.5527954102 ) ( 0 0.0078125 510.6583557129 ) ) exx/base-crete01red 134217728 0 0 +( -256 236 212 ) ( -252 240 212 ) ( -256 240 208 ) ( ( 0.0078124991 0 510.5857849121 ) ( 0 0.0078125 509.5505065918 ) ) exx/base-crete01red 134217728 0 0 +( -256 240 216 ) ( -256 260 218 ) ( -252 240 212 ) ( ( 0.0078125 0.0000000001 510.905456543 ) ( 0.0000000002 0.0078125009 509.2417602539 ) ) exx/base-crete01red 134217728 0 0 } } { @@ -8010,9 +8010,6 @@ brushDef "origin" "-1408.000000 288.000000 256.000000" } { -"classname" "func_illusionary" -} -{ "classname" "func_group" { patchDef2 @@ -9234,21 +9231,6 @@ trak5x/base-pipe1c "spawnflags" "1" } { -"classname" "func_group" -} -{ -"classname" "func_sparks" -} -{ -"classname" "func_sparks" -} -{ -"classname" "func_sparks" -} -{ -"classname" "func_sparks" -} -{ "classname" "trigger_hurt" "dmg" "5" "message" "was electrocuted"