Map cleanup, mapinfo, screenshot

diff --git a/maps/xoylent.map b/maps/xoylent.map
index 877b881a8ad05962747b9a42935688809963a667..a2ea9b1f75b22f1b270198b448a2488f94251b5c 100644 (file)
--- a/maps/xoylent.map
+++ b/maps/xoylent.map
@@ -420,7 +420,7 @@ map_xoylent/panels_floor
 ( -160 -200 920 ) ( -160 -200 1008 ) ( -128 -200 920 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -128 -192 864 ) ( -320 -192 864 ) ( -128 -192 640 ) map_xoylent/panels_wall 168 128 0 -0.125 0.125 134217728 0 0
 ( -128 -192 1008 ) ( -128 -192 920 ) ( -128 -200 1008 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -64 -192 928 ) ( -64 -200 920 ) ( 64 -192 928 ) map_xoylent/border_big 576 0.0043945312 0 0.083329998 0.0833334923 134217728 0 0
+( -64 -192 928 ) ( -64 -200 920 ) ( 64 -192 928 ) map_xoylent/border_big 576 0.0043945313 0 0.083329998 0.0833334923 134217728 0 0
 ( -156 -192 928 ) ( -168 -192 940 ) ( -160 -200 920 ) map_xoylent/border_big 0 64 135 0.0883900002 0.0883900002 134217728 0 0
 ( -128 -64 928 ) ( -168 64 960 ) ( -128 64 928 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -176 -200 -64 ) ( -168 -192 -64 ) ( -176 -200 64 ) map_xoylent/border_big 704 0 90 0.083329998 0.083329998 134217728 0 0
@@ -454,7 +454,7 @@ map_xoylent/panels_floor
 ( 416 -224 872 ) ( 384 -224 864 ) ( 384 -224 872 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 384 -224 864 ) ( 384 -192 872 ) ( 384 -224 872 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 408 -224 1728 ) ( 400 -216 1856 ) ( 408 -224 1856 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 416 -224 864 ) ( 408 -224 872 ) ( 384 -200 872 ) map_xoylent/border_big 256 0.0024414062 135 0.0883900002 0.0589256287 134217728 0 0
+( 416 -224 864 ) ( 408 -224 872 ) ( 384 -200 872 ) map_xoylent/border_big 256 0.0024414063 135 0.0883900002 0.0589256287 134217728 0 0
 ( 404 -212 1728 ) ( 408 -216 1856 ) ( 404 -212 1856 ) map_xoylent/panels_wall 856 640 0 -0.09375 0.125 134217728 0 0
 ( 384 -64 640 ) ( 392 64 640 ) ( 384 64 640 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -462,7 +462,7 @@ map_xoylent/panels_floor
 ( 384 -224 920 ) ( 384 -224 928 ) ( 416 -224 920 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 384 -224 920 ) ( 384 -192 920 ) ( 384 -224 928 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 408 -224 -64 ) ( 400 -216 -64 ) ( 408 -224 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 384 -200 920 ) ( 408 -224 920 ) ( 416 -224 928 ) map_xoylent/border_big 256 0.0024414062 135 0.0883900002 0.0589256287 134217728 0 0
+( 384 -200 920 ) ( 408 -224 920 ) ( 416 -224 928 ) map_xoylent/border_big 256 0.0024414063 135 0.0883900002 0.0589256287 134217728 0 0
 ( 404 -212 -64 ) ( 408 -216 -64 ) ( 404 -212 64 ) map_xoylent/panels_wall 856 128 0 -0.09375 0.125 134217728 0 0
 ( 384 64 1008 ) ( 392 64 1008 ) ( 384 -64 1008 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -596,7 +596,7 @@ map_xoylent/panels_floor
 ( 192 -224 872 ) ( 192 -224 864 ) ( 160 -224 872 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 192 -224 872 ) ( 192 -192 872 ) ( 192 -224 864 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 168 -224 1856 ) ( 176 -216 1856 ) ( 168 -224 1728 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 192 -200 872 ) ( 168 -224 872 ) ( 160 -224 864 ) map_xoylent/border_big 240 0.0024414062 45 0.0883900002 0.0589299984 134217728 0 0
+( 192 -200 872 ) ( 168 -224 872 ) ( 160 -224 864 ) map_xoylent/border_big 240 0.0024414063 45 0.0883900002 0.0589299984 134217728 0 0
 ( 172 -212 1856 ) ( 168 -216 1856 ) ( 172 -212 1728 ) map_xoylent/panels_wall 168 640 0 0.09375 0.125 134217728 0 0
 ( 192 64 640 ) ( 184 64 640 ) ( 192 -64 640 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -604,7 +604,7 @@ map_xoylent/panels_floor
 ( 160 -224 920 ) ( 192 -224 928 ) ( 192 -224 920 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 192 -224 928 ) ( 192 -192 920 ) ( 192 -224 920 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 168 -224 64 ) ( 176 -216 -64 ) ( 168 -224 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 160 -224 928 ) ( 168 -224 920 ) ( 192 -200 920 ) map_xoylent/border_big 368 0.0024414062 45 0.0883900002 0.0589256026 134217728 0 0
+( 160 -224 928 ) ( 168 -224 920 ) ( 192 -200 920 ) map_xoylent/border_big 368 0.0024414063 45 0.0883900002 0.0589256026 134217728 0 0
 ( 172 -212 64 ) ( 168 -216 -64 ) ( 172 -212 -64 ) map_xoylent/panels_wall 168 128 0 0.09375 0.125 134217728 0 0
 ( 192 -64 1008 ) ( 184 64 1008 ) ( 192 64 1008 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -2860,7 +2860,7 @@ map_xoylent/border_big
 }
 {
 ( 878 -138 632 ) ( 898 -138 632 ) ( 878 -96 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 880 -132 640 ) ( 832 -168 632 ) ( 872 -128 632 ) map_xoylent/border_big 0 64.0004882812 45 0.0883900002 0.0883900002 134217728 0 0
+( 880 -132 640 ) ( 832 -168 632 ) ( 872 -128 632 ) map_xoylent/border_big 0 64.0004882813 45 0.0883900002 0.0883900002 134217728 0 0
 ( 860 -152 -64 ) ( 856 -144 -64 ) ( 860 -152 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 864 -136 -64 ) ( 872 -140 -64 ) ( 864 -136 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 872 -140 -64 ) ( 860 -152 -64 ) ( 872 -140 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -4823,7 +4823,7 @@ map_xoylent/border_big
 {
 ( 112 64 128 ) ( 96 64 136 ) ( 112 -64 128 ) map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
 ( 96 64 144 ) ( 112 64 136 ) ( 96 -64 144 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -384 -192 384 ) ( -400 -200 384 ) ( -368 -200 368 ) map_xoylent/border_big 383.9997558594 0.0043945312 0 0.083329998 0.083329998 134217728 0 0
+( -384 -192 384 ) ( -400 -200 384 ) ( -368 -200 368 ) map_xoylent/border_big 383.9997558594 0.0043945313 0 0.083329998 0.083329998 134217728 0 0
 ( 240 -288 72 ) ( 240 -280 64 ) ( 232 -288 76 ) map_xoylent/border_big 0 0 0 0.083329998 0.083329998 134217728 0 0
 ( -400 64 384 ) ( -400 64 392 ) ( -400 -64 384 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -400 -200 -64 ) ( -384 -192 -64 ) ( -400 -200 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -7902,7 +7902,7 @@ map_xoylent/border_big
 ( -512 -224 1016 ) ( -384 -216 1016 ) ( -384 -224 1016 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -96 -176 -64 ) ( -128 -192 -64 ) ( -96 -176 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -600 -192 1024 ) ( -728 -192 1016 ) ( -728 -192 1024 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -600 -176 1008 ) ( -728 -168 1016 ) ( -728 -176 1008 ) map_xoylent/border_big 0 0.0024414062 0 0.083329998 0.083329998 134217728 0 0
+( -600 -176 1008 ) ( -728 -168 1016 ) ( -728 -176 1008 ) map_xoylent/border_big 0 0.0024414063 0 0.083329998 0.083329998 134217728 0 0
 ( -96 -168 -64 ) ( -96 -176 -64 ) ( -96 -168 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -352 -168 64 ) ( -352 -176 -64 ) ( -352 -168 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -352 -176 64 ) ( -320 -192 -64 ) ( -352 -176 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -12018,7 +12018,7 @@ map_xoylent/border_big
 ( -280 -192 824 ) ( -168 -192 836 ) ( -280 -192 836 ) map_xoylent/panels_wall 168 640 0 -0.125 0.125 134217728 0 0
 ( -280 -200 824 ) ( -168 -200 836 ) ( -168 -200 824 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -128 -192 864 ) ( -128 -192 640 ) ( -128 -200 864 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -272 -200 872 ) ( -272 -198 870 ) ( -144 -200 872 ) map_xoylent/border_big 224 0.0043945312 0 0.083329998 0.0833334923 134217728 0 0
+( -272 -200 872 ) ( -272 -198 870 ) ( -144 -200 872 ) map_xoylent/border_big 224 0.0043945313 0 0.083329998 0.0833334923 134217728 0 0
 ( -168 -240 840 ) ( -128 -112 864 ) ( -168 -112 840 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -176 -200 -48 ) ( -168 -192 -48 ) ( -176 -200 80 ) map_xoylent/border_big 0 0 90 0.083329998 0.083329998 134217728 0 0
 ( -168 64 840 ) ( -176 64 848 ) ( -168 -64 840 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -12253,7 +12253,7 @@ map_xoylent/border_big
 {
 ( 136 -1108 632 ) ( 132 -1108 632 ) ( 136 -1182 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 136 -1116 -64 ) ( 144 -1120 -64 ) ( 136 -1116 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 176 -992 632 ) ( 168 -992 640 ) ( 176 -864 632 ) map_xoylent/border_big 0 0.0024414062 90 0.083329998 0.0833334327 134217728 0 0
+( 176 -992 632 ) ( 168 -992 640 ) ( 176 -864 632 ) map_xoylent/border_big 0 0.0024414063 90 0.083329998 0.0833334327 134217728 0 0
 ( 128 -1216 640 ) ( 128 -1112 640 ) ( 172 -1216 640 ) map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
 ( 128 -1216 632 ) ( 124 -1208 640 ) ( 168 -1164 640 ) map_xoylent/border_big 0 0 45 0.0883882716 0.0883886516 134217728 0 0
 ( 124 -1208 -64 ) ( 108 -1152 -64 ) ( 124 -1208 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -12340,7 +12340,7 @@ map_xoylent/border_big
 ( 678 202 632 ) ( 642 88 632 ) ( 678 88 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 776 140 640 ) ( 748 168 640 ) ( 768 160 632 ) map_xoylent/border_big 228 64 135 0.0883900002 0.0883900002 134217728 0 0
 ( 776 140 640 ) ( 748 48 640 ) ( 748 140 640 ) map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
-( 784 -64 632 ) ( 776 64 640 ) ( 784 64 632 ) map_xoylent/border_big 0 0.0395507812 90 0.083329998 0.083329998 134217728 0 0
+( 784 -64 632 ) ( 776 64 640 ) ( 784 64 632 ) map_xoylent/border_big 0 0.0395507813 90 0.083329998 0.083329998 134217728 0 0
 ( 728 116 64 ) ( 760 36 -64 ) ( 728 116 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 704 144 1376 ) ( 700 136 1376 ) ( 704 144 1248 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 512 168 640 ) ( 640 176 632 ) ( 640 168 640 ) map_xoylent/border_big 0 0.001953125 0 0.083329998 0.083329998 134217728 0 0
@@ -13399,7 +13399,7 @@ map_xoylent/border_big
 {
 ( 136 254 632 ) ( 132 180 632 ) ( 136 180 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 136 188 64 ) ( 144 192 -64 ) ( 136 188 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 176 -64 632 ) ( 168 64 640 ) ( 176 64 632 ) map_xoylent/border_big 0 0.0024414062 90 0.083329998 0.0833334327 134217728 0 0
+( 176 -64 632 ) ( 168 64 640 ) ( 176 64 632 ) map_xoylent/border_big 0 0.0024414063 90 0.083329998 0.0833334327 134217728 0 0
 ( 172 288 640 ) ( 128 184 640 ) ( 128 288 640 ) map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
 ( 168 236 640 ) ( 124 280 640 ) ( 128 288 632 ) map_xoylent/border_big 734 32 135 0.0883900002 0.0883900002 134217728 0 0
 ( 124 280 64 ) ( 108 224 -64 ) ( 124 280 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -14705,8 +14705,8 @@ map_xoylent/panels_trim
 ( 164 -368 640 ) ( 166 -366 768 ) ( 164 -368 768 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 170 -368 640 ) ( 166 -372 768 ) ( 170 -368 768 ) map_xoylent/panels_wall 0 0 0 0.125 0.125 134217728 0 0
 ( 212 -320 640 ) ( 214 -324 768 ) ( 212 -320 768 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( 166 -366 332 ) ( 164 -368 332 ) ( 166 -372 336 ) map_xoylent/border_withlight 736 16.0043945312 45 0.0883900002 0.0883884355 134217728 0 0
-( 166 -372 380 ) ( 164 -368 384 ) ( 166 -366 384 ) map_xoylent/border_small 672 16.0043945312 45 0.0883900002 0.0883884355 134217728 0 0
+( 166 -366 332 ) ( 164 -368 332 ) ( 166 -372 336 ) map_xoylent/border_withlight 736 16.0043945313 45 0.0883900002 0.0883884355 134217728 0 0
+( 166 -372 380 ) ( 164 -368 384 ) ( 166 -366 384 ) map_xoylent/border_small 672 16.0043945313 45 0.0883900002 0.0883884355 134217728 0 0
 }
 {
 ( 214 -324 644 ) ( 212 -320 772 ) ( 214 -324 772 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
@@ -15784,7 +15784,7 @@ map_xoylent/panels_floor
 }
 {
 ( 352 -1112 -256 ) ( 360 -1120 -384 ) ( 352 -1112 -384 ) map_xoylent/panels_trim 768 16 0 0.125 0.125 134217728 0 0
-( 360 -1120 120 ) ( 352 -1112 124 ) ( 356 -1112 128 ) map_xoylent/border_small 0.017578125 23.9965820312 -45 0.1178499982 0.1178499982 134217728 0 0
+( 360 -1120 120 ) ( 352 -1112 124 ) ( 356 -1112 128 ) map_xoylent/border_small 0.017578125 23.9965820313 -45 0.1178499982 0.1178499982 134217728 0 0
 ( 360 -1112 -256 ) ( 352 -1112 -384 ) ( 360 -1112 -384 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 380 64 72 ) ( 372 64 72 ) ( 380 -64 72 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( 438 -1120 72 ) ( 444 -1120 120 ) ( 444 -1120 72 ) map_xoylent/panels_trim 832 0 0 -0.125 0.125 134217728 0 0
@@ -16548,7 +16548,7 @@ map_xoylent/panels_floor
 ( -48 -320 640 ) ( -48 -352 640 ) ( -80 -320 640 ) map_xoylent/panels_warning 0 0 0 0.125 0.125 134217728 0 0
 ( -52 -312 -64 ) ( -48 -320 -64 ) ( -52 -312 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -68 64 636 ) ( -76 64 636 ) ( -68 -64 636 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -50 -316 640 ) ( -48 -320 636 ) ( -50 -322 636 ) map_xoylent/border_small 32 32.0004882812 45 0.0883900002 0.0883900002 134217728 0 0
+( -50 -316 640 ) ( -48 -320 636 ) ( -50 -322 636 ) map_xoylent/border_small 32 32.0004882813 45 0.0883900002 0.0883900002 134217728 0 0
 ( -56 -304 64 ) ( -96 -362 -64 ) ( -56 -304 -64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -96 -232 -64 ) ( -96 -224 -64 ) ( -96 -232 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -16941,7 +16941,7 @@ map_xoylent/panels_floor
 ( -176 -784 632 ) ( -144 -736 632 ) ( -176 -736 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -272 -752 -64 ) ( -280 -776 -64 ) ( -272 -752 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -280 -736 640 ) ( -288 -736 640 ) ( -280 -736 632 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
-( -288 64 632 ) ( -280 64 640 ) ( -288 -64 632 ) map_xoylent/border_big 0 95.9985351562 90 0.083329998 0.083329998 134217728 0 0
+( -288 64 632 ) ( -280 64 640 ) ( -288 -64 632 ) map_xoylent/border_big 0 95.9985351563 90 0.083329998 0.083329998 134217728 0 0
 ( -280 -776 -64 ) ( -288 -792 -64 ) ( -280 -776 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -280 -736 -64 ) ( -272 -752 -64 ) ( -280 -736 64 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
@@ -20870,7 +20870,7 @@ exx/wall-panels08b
 ( -412 64 472 ) ( -384 64 472 ) ( -412 -64 472 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 ( -64 -576 472 ) ( -64 -576 468 ) ( 64 -576 472 ) exx/base-metal04 0 0 0 0.125 0.125 134217728 0 0
 ( -64 -640 464 ) ( -64 -640 472 ) ( 64 -640 464 ) exx/base-metal04 0 0 0 0.125 0.125 134217728 0 0
-( -420 64 468 ) ( -424 64 472 ) ( -420 -64 468 ) map_xoylent/light-u201-surfacelight -0 42.6665039062 -90 0.125 0.1875 134217728 0 0
+( -420 64 468 ) ( -424 64 472 ) ( -420 -64 468 ) map_xoylent/light-u201-surfacelight -0 42.6665039063 -90 0.125 0.1875 134217728 0 0
 ( -396 64 448 ) ( -400 64 448 ) ( -396 -64 448 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
 }
 {
@@ -29049,6 +29049,16 @@ exx/trim-baseboard
 }
 {
 "classname" "info_autoscreenshot"
-"origin" "'1715.1 535.4 943.4'"
-"angles" "' 21.8 -136.6   0.0'"
+"origin" "1518.79773 619.401733 1073.21436"
+"angles" "20.725708 -129.072876 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "1428.83386 -924.846436 287.496796"
+"angles" "16.6333008 150.540161 0"
+}
+{
+"classname" "info_autoscreenshot"
+"origin" "-701.056213 97.5969925 806.1427"
+"angles" "17.1606445 -42.4456787 0"
 }

diff --git a/maps/xoylent.map.options b/maps/xoylent.map.options
index 54ad7e84f9349a8c4bba2ab47350492e46a42045..3233ef17bcf032d6ec05608ed45b7425183aac1f 100644 (file)
--- a/maps/xoylent.map.options
+++ b/maps/xoylent.map.options
@@ -3,4 +3,4 @@
 -vis +
 -minimap +
 -nosRGB
-Version: 2
+Version: 4
\ No newline at end of file

diff --git a/maps/xoylent.mapinfo b/maps/xoylent.mapinfo
index 710f88b395c3fee4f24b25f55963c62d82da5940..cabb5ec1d0ba705d3fd2ec7ba551aaa6524b9579 100644 (file)
--- a/maps/xoylent.mapinfo
+++ b/maps/xoylent.mapinfo
@@ -1,6 +1,7 @@
 title Xoylent
-description A remake of soylent.
+description A remake of Soylent
 author sev, Strahlemann
+cdtrack 6
 has weapons
 gametype dm
 gametype lms
@@ -8,6 +9,4 @@ gametype arena
 gametype tdm
 gametype ca
 gametype ft
-gametype rune
-gametype ka
-cdtrack 7
+gametype ka
\ No newline at end of file

diff --git a/maps/xoylent.tga b/maps/xoylent.tga
index f1bd2e4b294e2c3ed79c4d633f5a51686a547552..cf95503d5e0abf830ece4c81dfb6af5a93fd36a6 100644 (file)
Binary files a/maps/xoylent.tga and b/maps/xoylent.tga differ