Squashed commit of the following:

[xonotic/xonotic-maps.pk3dir.git] / maps / stormkeep.map

diff --git a/maps/stormkeep.map b/maps/stormkeep.map
index 358cdedd0b2f7590424b84d4d70212444a3ba4e5..43b8890d5db8640cc0e674508e9b5f327d21e7ac 100644 (file)
--- a/maps/stormkeep.map
+++ b/maps/stormkeep.map
@@ -6057,16 +6057,16 @@ map_stormkeep/largebrick1a
 ( -16 -352 72 ) ( 32 -352 -56 ) ( -16 -352 -56 ) common/caulk 0 16 0 0.5 0.5 0 0 0
 }
 {
-( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
-( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/base-crete01 0 0 7 0.125 0.125 134217728 0 0
-( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
+( 96 576 -16 ) ( -32 576 -16 ) ( 96 576 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 576 -16 ) ( 96 576 -32 ) ( 96 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( 96 448 -32 ) ( -32 576 -32 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
+( -32 448 -32 ) ( -32 448 -16 ) ( 96 448 -32 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 448 -32 ) ( -32 576 -32 ) ( -32 448 -16 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 64 448 48 ) ( 80 464 -80 ) ( 64 448 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 96 544 48 ) ( 80 560 -80 ) ( 96 544 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( 0 576 48 ) ( -16 560 -80 ) ( 0 576 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -32 480 48 ) ( -16 464 -80 ) ( -32 480 -80 ) exx/floor-wrn01-blue 0 0 7 0.125 0.125 134217728 0 0
+( -26 64 -26 ) ( -20 64 -26 ) ( -26 -64 -26 ) exx/floor-wrn01-blue 0 0 0 0.5 0.5 134217728 0 0
 }
 {
 ( 96 576 -24 ) ( 96 448 -24 ) ( -32 576 -24 ) exx/floor-clang01 0 0 0 0.25 0.25 134217728 0 0
@@ -11647,15 +11647,15 @@ patchDef2
 effects_jumppad/jumppadfx1_b
 ( 9 3 0 0 0 )
 (
-( ( -504 -848 -192 0 0 ) ( -504 -848 -168 0 0.5 ) ( -504 -848 -144 0 1 ) )
-( ( -504 -864 -192 0.125 0 ) ( -504 -864 -168 0.125 0.5 ) ( -504 -864 -144 0.125 1 ) )
-( ( -488 -864 -192 0.25 0 ) ( -488 -864 -168 0.25 0.5 ) ( -488 -864 -144 0.25 1 ) )
-( ( -472 -864 -192 0.375 0 ) ( -472 -864 -168 0.375 0.5 ) ( -472 -864 -144 0.375 1 ) )
-( ( -472 -848 -192 0.5 0 ) ( -472 -848 -168 0.5 0.5 ) ( -472 -848 -144 0.5 1 ) )
-( ( -472 -832 -192 0.625 0 ) ( -472 -832 -168 0.625 0.5 ) ( -472 -832 -144 0.625 1 ) )
-( ( -488 -832 -192 0.75 0 ) ( -488 -832 -168 0.75 0.5 ) ( -488 -832 -144 0.75 1 ) )
-( ( -504 -832 -192 0.875 0 ) ( -504 -832 -168 0.875 0.5 ) ( -504 -832 -144 0.875 1 ) )
-( ( -504 -848 -192 1 0 ) ( -504 -848 -168 1 0.5 ) ( -504 -848 -144 1 1 ) )
+( ( -504 -848 -192 0 0 ) ( -504 -848 -168 -0 -0.5 ) ( -504 -848 -144 -0 -1 ) )
+( ( -504 -864 -192 -0.125 0 ) ( -504 -864 -168 -0.125 -0.5 ) ( -504 -864 -144 -0.125 -1 ) )
+( ( -488 -864 -192 -0.25 0 ) ( -488 -864 -168 -0.25 -0.5 ) ( -488 -864 -144 -0.25 -1 ) )
+( ( -472 -864 -192 -0.375 0 ) ( -472 -864 -168 -0.375 -0.5 ) ( -472 -864 -144 -0.375 -1 ) )
+( ( -472 -848 -192 -0.5 0 ) ( -472 -848 -168 -0.5 -0.5 ) ( -472 -848 -144 -0.5 -1 ) )
+( ( -472 -832 -192 -0.625 0 ) ( -472 -832 -168 -0.625 -0.5 ) ( -472 -832 -144 -0.625 -1 ) )
+( ( -488 -832 -192 -0.75 0 ) ( -488 -832 -168 -0.75 -0.5 ) ( -488 -832 -144 -0.75 -1 ) )
+( ( -504 -832 -192 -0.875 0 ) ( -504 -832 -168 -0.875 -0.5 ) ( -504 -832 -144 -0.875 -1 ) )
+( ( -504 -848 -192 -1 0 ) ( -504 -848 -168 -1 -0.5 ) ( -504 -848 -144 -1 -1 ) )
 )
 }
 }
@@ -11665,15 +11665,15 @@ patchDef2
 effects_jumppad/jumppadfx1_b
 ( 9 3 0 0 0 )
 (
-( ( -1160 1590.1029052734 -10.1343383789 0 0 ) ( -1160 1583.8623046875 13.0401000977 0 0.5 ) ( -1160 1577.6215820312 36.2145080566 0 1 ) )
-( ( -1160 1570.7908935547 -15.3348999023 0.125 0 ) ( -1160 1564.5502929688 7.8395385742 0.125 0.5 ) ( -1160 1558.3095703125 31.0139465332 0.125 1 ) )
-( ( -1144 1570.7908935547 -15.3348999023 0.25 0 ) ( -1144 1564.5502929688 7.8395385742 0.25 0.5 ) ( -1144 1558.3095703125 31.0139465332 0.25 1 ) )
-( ( -1128 1570.7908935547 -15.3348999023 0.375 0 ) ( -1128 1564.5502929688 7.8395385742 0.375 0.5 ) ( -1128 1558.3095703125 31.0139465332 0.375 1 ) )
-( ( -1128 1590.1029052734 -10.1343383789 0.5 0 ) ( -1128 1583.8623046875 13.0401000977 0.5 0.5 ) ( -1128 1577.6215820312 36.2145080566 0.5 1 ) )
-( ( -1128 1609.4149169922 -4.9337768555 0.625 0 ) ( -1128 1603.1743164062 18.2406616211 0.625 0.5 ) ( -1128 1596.93359375 41.4150695801 0.625 1 ) )
-( ( -1144 1609.4149169922 -4.9337768555 0.75 0 ) ( -1144 1603.1743164062 18.2406616211 0.75 0.5 ) ( -1144 1596.93359375 41.4150695801 0.75 1 ) )
-( ( -1160 1609.4149169922 -4.9337768555 0.875 0 ) ( -1160 1603.1743164062 18.2406616211 0.875 0.5 ) ( -1160 1596.93359375 41.4150695801 0.875 1 ) )
-( ( -1160 1590.1029052734 -10.1343383789 1 0 ) ( -1160 1583.8623046875 13.0401000977 1 0.5 ) ( -1160 1577.6215820312 36.2145080566 1 1 ) )
+( ( -1160 1590.1029052734 -10.1343383789 0 0 ) ( -1160 1583.8623046875 13.0401000977 -0 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -0 -1 ) )
+( ( -1160 1570.7908935547 -15.3348999023 -0.125 0 ) ( -1160 1564.5502929688 7.8395385742 -0.125 -0.5 ) ( -1160 1558.3095703125 31.0139465332 -0.125 -1 ) )
+( ( -1144 1570.7908935547 -15.3348999023 -0.25 0 ) ( -1144 1564.5502929688 7.8395385742 -0.25 -0.5 ) ( -1144 1558.3095703125 31.0139465332 -0.25 -1 ) )
+( ( -1128 1570.7908935547 -15.3348999023 -0.375 0 ) ( -1128 1564.5502929688 7.8395385742 -0.375 -0.5 ) ( -1128 1558.3095703125 31.0139465332 -0.375 -1 ) )
+( ( -1128 1590.1029052734 -10.1343383789 -0.5 0 ) ( -1128 1583.8623046875 13.0401000977 -0.5 -0.5 ) ( -1128 1577.6215820312 36.2145080566 -0.5 -1 ) )
+( ( -1128 1609.4149169922 -4.9337768555 -0.625 0 ) ( -1128 1603.1743164062 18.2406616211 -0.625 -0.5 ) ( -1128 1596.93359375 41.4150695801 -0.625 -1 ) )
+( ( -1144 1609.4149169922 -4.9337768555 -0.75 0 ) ( -1144 1603.1743164062 18.2406616211 -0.75 -0.5 ) ( -1144 1596.93359375 41.4150695801 -0.75 -1 ) )
+( ( -1160 1609.4149169922 -4.9337768555 -0.875 0 ) ( -1160 1603.1743164062 18.2406616211 -0.875 -0.5 ) ( -1160 1596.93359375 41.4150695801 -0.875 -1 ) )
+( ( -1160 1590.1029052734 -10.1343383789 -1 0 ) ( -1160 1583.8623046875 13.0401000977 -1 -0.5 ) ( -1160 1577.6215820312 36.2145080566 -1 -1 ) )
 )
 }
 }