Opium: fix some texture inconsistencies on the pillar

diff --git a/maps/opium.map b/maps/opium.map
index ef099ef85bd5a5f8b19a604ec5bbd7e2132038e2..a9a52b0223bf0d18dd99d29671ccc8439bc4db19 100644 (file)
--- a/maps/opium.map
+++ b/maps/opium.map
@@ -4959,12 +4959,12 @@ brushDef
 {
 patchDef2
 {
-phillipk2x/floor-pk02_floor08a
+phillipk2x/trims-pk02_trim04a
 ( 3 3 0 0 0 )
 (
-( ( 0 -1336 128 -0.1250000149 -0.23046875 ) ( 0 -1336 124 -0.25 -0.23046875 ) ( 0 -1336 120 -0.375 -0.23046875 ) )
-( ( 56 -1336 128 -0.1250000149 0.2695312202 ) ( 56 -1336 124 -0.25 0.2695312202 ) ( 56 -1336 120 -0.375 0.2695312202 ) )
-( ( 56 -1280 128 -0.125 0.7695311904 ) ( 56 -1280 124 -0.2500000298 0.7695311904 ) ( 56 -1280 120 -0.375 0.7695311904 ) )
+( ( 0 -1336 128 0 0 ) ( 0 -1336 124 0 0.5 ) ( 0 -1336 120 0 1 ) )
+( ( 56 -1336 128 1 0 ) ( 56 -1336 124 1 0.5 ) ( 56 -1336 120 1 1 ) )
+( ( 56 -1280 128 2 0 ) ( 56 -1280 124 2 0.5 ) ( 56 -1280 120 2 1 ) )
 )
 }
 }
@@ -6318,15 +6318,15 @@ patchDef2
 exx/wall-crete03
 ( 9 3 0 0 0 )
 (
-( ( -40 -1280 -384 0 0 ) ( -40 -1280 -256 0 -1.46875 ) ( -40 -1280 -128 0 -2.9375 ) )
-( ( -40 -1320 -384 0.3125 0 ) ( -40 -1320 -256 0.3125 -1.46875 ) ( -40 -1320 -128 0.3125 -2.9375 ) )
-( ( 0 -1320 -384 0.625 0 ) ( 0 -1320 -256 0.625 -1.46875 ) ( 0 -1320 -128 0.625 -2.9375 ) )
-( ( 40 -1320 -384 0.9375 0 ) ( 40 -1320 -256 0.9375 -1.46875 ) ( 40 -1320 -128 0.9375 -2.9375 ) )
-( ( 40 -1280 -384 1.25 0 ) ( 40 -1280 -256 1.25 -1.46875 ) ( 40 -1280 -128 1.25 -2.9375 ) )
-( ( 40 -1240 -384 1.5625 0 ) ( 40 -1240 -256 1.5625 -1.46875 ) ( 40 -1240 -128 1.5625 -2.9375 ) )
-( ( 0 -1240 -384 1.875 0 ) ( 0 -1240 -256 1.875 -1.46875 ) ( 0 -1240 -128 1.875 -2.9375 ) )
-( ( -40 -1240 -384 2.1875 0 ) ( -40 -1240 -256 2.1875 -1.46875 ) ( -40 -1240 -128 2.1875 -2.9375 ) )
-( ( -40 -1280 -384 2.5 0 ) ( -40 -1280 -256 2.5 -1.46875 ) ( -40 -1280 -128 2.5 -2.9375 ) )
+( ( -40 -1280 -384 0 0 ) ( -40 -1280 -256 0 -1 ) ( -40 -1280 -128 0 -2 ) )
+( ( -40 -1320 -384 0.3125 0 ) ( -40 -1320 -256 0.3125 -1 ) ( -40 -1320 -128 0.3125 -2 ) )
+( ( 0 -1320 -384 0.625 0 ) ( 0 -1320 -256 0.625 -1 ) ( 0 -1320 -128 0.625 -2 ) )
+( ( 40 -1320 -384 0.9375 0 ) ( 40 -1320 -256 0.9375 -1 ) ( 40 -1320 -128 0.9375 -2 ) )
+( ( 40 -1280 -384 1.25 0 ) ( 40 -1280 -256 1.25 -1 ) ( 40 -1280 -128 1.25 -2 ) )
+( ( 40 -1240 -384 1.5625 0 ) ( 40 -1240 -256 1.5625 -1 ) ( 40 -1240 -128 1.5625 -2 ) )
+( ( 0 -1240 -384 1.875 0 ) ( 0 -1240 -256 1.875 -1 ) ( 0 -1240 -128 1.875 -2 ) )
+( ( -40 -1240 -384 2.1875 0 ) ( -40 -1240 -256 2.1875 -1 ) ( -40 -1240 -128 2.1875 -2 ) )
+( ( -40 -1280 -384 2.5 0 ) ( -40 -1280 -256 2.5 -1 ) ( -40 -1280 -128 2.5 -2 ) )
 )
 }
 }
@@ -6386,18 +6386,6 @@ brushDef
 }
 }
 {
-patchDef2
-{
-phillipk2x/trims-pk02_trim04a
-( 3 3 0 0 0 )
-(
-( ( 0 -1336 -96 0 0 ) ( 0 -1336 -100 0 -0.5 ) ( 0 -1336 -104 0 -1 ) )
-( ( 56 -1336 -96 0.875 0 ) ( 56 -1336 -100 0.875 -0.5 ) ( 56 -1336 -104 0.875 -1 ) )
-( ( 56 -1280 -96 1.75 0 ) ( 56 -1280 -100 1.75 -0.5 ) ( 56 -1280 -104 1.75 -1 ) )
-)
-}
-}
-{
 brushDef
 {
 ( 0 -1336 128 ) ( 0 -1344 128 ) ( -64 -1336 128 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0 ) ) common/caulk 134217728 0 0
@@ -6458,18 +6446,6 @@ phillipk2x/trims-pk02_trim04a
 {
 patchDef2
 {
-phillipk2x/floor-pk02_floor08a
-( 3 3 0 0 0 )
-(
-( ( 0 -1336 -96 -0.1250000149 -0.23046875 ) ( 0 -1336 -100 -0.25 -0.23046875 ) ( 0 -1336 -104 -0.375 -0.23046875 ) )
-( ( 56 -1336 -96 -0.1250000149 0.2695312202 ) ( 56 -1336 -100 -0.25 0.2695312202 ) ( 56 -1336 -104 -0.375 0.2695312202 ) )
-( ( 56 -1280 -96 -0.125 0.7695311904 ) ( 56 -1280 -100 -0.2500000298 0.7695311904 ) ( 56 -1280 -104 -0.375 0.7695311904 ) )
-)
-}
-}
-{
-patchDef2
-{
 phillipk2x/trims-pk02_trim04a
 ( 3 3 0 0 0 )
 (
@@ -30053,6 +30029,18 @@ brushDef
 ( 567 760 -568 ) ( 567 808 -568 ) ( 567 760 -560 ) ( ( 0.015625 0 0 ) ( 0 0.015625 0.125 ) ) common/nodraw 134217728 0 0
 }
 }
+{
+patchDef2
+{
+phillipk2x/trims-pk02_trim04a
+( 3 3 0 0 0 )
+(
+( ( 0 -1336 -96 0 0 ) ( 0 -1336 -100 0 0.5 ) ( 0 -1336 -104 0 1 ) )
+( ( 56 -1336 -96 1 0 ) ( 56 -1336 -100 1 0.5 ) ( 56 -1336 -104 1 1 ) )
+( ( 56 -1280 -96 2 0 ) ( 56 -1280 -100 2 0.5 ) ( 56 -1280 -104 2 1 ) )
+)
+}
+}
 }
 {
 "classname" "func_group"