Add two more tips to the tutorial map

diff --git a/data/maps/tutorial.bsp b/data/maps/tutorial.bsp
index b408e1e32ea58d8be67983c5543079a1c7e62350..b8c069c0ec607e1d4900729321a08ae0964f0403 100644 (file)
Binary files a/data/maps/tutorial.bsp and b/data/maps/tutorial.bsp differ

diff --git a/data/maps/tutorial.map b/data/maps/tutorial.map
index e1515bd5b1d31241a3fb3863baaa5f51c12e5cd3..4b2c4daacef0233cfda3f6e44cc63db5559c6c3b 100644 (file)
--- a/data/maps/tutorial.map
+++ b/data/maps/tutorial.map
@@ -18688,10 +18688,6 @@ e7/e7panelwood
 // entity 405\r
 {\r
 "classname" "func_group"\r
-}\r
-// entity 406\r
-{\r
-"classname" "func_group"\r
 // brush 0\r
 {\r
 patchDef2\r
@@ -18725,7 +18721,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 407\r
+// entity 406\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -18761,7 +18757,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 408\r
+// entity 407\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -18776,7 +18772,7 @@ e7/e7panelwood
 ( 22668 316 1408 ) ( 22676 324 1400 ) ( 22668 324 1400 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 409\r
+// entity 408\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -18827,7 +18823,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 410\r
+// entity 409\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -18843,21 +18839,21 @@ e7/e7panelwood
 ( 22680 316 1420 ) ( 22664 316 1420 ) ( 22680 316 1424 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 411\r
+// entity 410\r
 {\r
 "classname" "light"\r
 "origin" "22672.000000 324.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 412\r
+// entity 411\r
 {\r
 "classname" "target_speaker"\r
 "origin" "22672.000000 324.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 413\r
+// entity 412\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -18872,7 +18868,7 @@ e7/e7panelwood
 ( 22668 -132 1400 ) ( 22676 -132 1400 ) ( 22668 -124 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 414\r
+// entity 413\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -18923,7 +18919,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 415\r
+// entity 414\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -18939,21 +18935,21 @@ e7/e7panelwood
 ( 22680 -124 1424 ) ( 22664 -124 1420 ) ( 22680 -124 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 416\r
+// entity 415\r
 {\r
 "classname" "light"\r
 "origin" "22672.000000 -132.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 417\r
+// entity 416\r
 {\r
 "classname" "target_speaker"\r
 "origin" "22672.000000 -132.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 418\r
+// entity 417\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "22912.000000 288.001160 1336.000000"\r
@@ -18963,7 +18959,7 @@ e7/e7panelwood
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 419\r
+// entity 418\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -18980,7 +18976,7 @@ e7/e7panelwood
 ( 22848 272 1344 ) ( 22848 304 1344 ) ( 22848 272 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 420\r
+// entity 419\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19016,7 +19012,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 421\r
+// entity 420\r
 {\r
 "classname" "func_plat"\r
 "lip" "16"\r
@@ -19041,7 +19037,7 @@ common/invisible
 ( 22440 -16 1280 ) ( 22440 16 1280 ) ( 22440 -16 1296 ) e7/e7beam02 32 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 422\r
+// entity 421\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23808.000000 287.999756 1336.000000"\r
@@ -19051,7 +19047,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 423\r
+// entity 422\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19067,7 +19063,7 @@ common/invisible
 ( 23744 272 1344 ) ( 23744 304 1344 ) ( 23744 272 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 424\r
+// entity 423\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19103,7 +19099,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 425\r
+// entity 424\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23232.000000 -160.000244 1336.000000"\r
@@ -19113,7 +19109,7 @@ common/invisible
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 426\r
+// entity 425\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19129,7 +19125,7 @@ common/invisible
 ( 23168 -176 1344 ) ( 23168 -144 1344 ) ( 23168 -176 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 427\r
+// entity 426\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19165,7 +19161,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 428\r
+// entity 427\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23616.000000 -288.000244 1336.000000"\r
@@ -19175,7 +19171,7 @@ common/invisible
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 429\r
+// entity 428\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19191,7 +19187,7 @@ common/invisible
 ( 23552 -304 1344 ) ( 23552 -272 1344 ) ( 23552 -304 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 430\r
+// entity 429\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19227,7 +19223,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 431\r
+// entity 430\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24512.000000 287.999756 1336.000000"\r
@@ -19237,7 +19233,7 @@ common/invisible
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 432\r
+// entity 431\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19253,7 +19249,7 @@ common/invisible
 ( 24448 272 1344 ) ( 24448 304 1344 ) ( 24448 272 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 433\r
+// entity 432\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19289,7 +19285,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 434\r
+// entity 433\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24384.000000 479.999756 1336.000000"\r
@@ -19299,7 +19295,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 435\r
+// entity 434\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19315,7 +19311,7 @@ common/invisible
 ( 24320 464 1344 ) ( 24320 496 1344 ) ( 24320 464 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 436\r
+// entity 435\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19351,7 +19347,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 437\r
+// entity 436\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23936.000000 352.000000 1336.000000"\r
@@ -19361,7 +19357,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 438\r
+// entity 437\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19377,7 +19373,7 @@ common/invisible
 ( 23872 336 1344 ) ( 23872 368 1344 ) ( 23872 336 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 439\r
+// entity 438\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19413,7 +19409,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 440\r
+// entity 439\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24384.000000 -224.000244 1336.000000"\r
@@ -19423,7 +19419,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 441\r
+// entity 440\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19439,7 +19435,7 @@ common/invisible
 ( 24320 -240 1344 ) ( 24320 -208 1344 ) ( 24320 -240 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 442\r
+// entity 441\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19475,7 +19471,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 443\r
+// entity 442\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23808.000000 -96.000244 1336.000000"\r
@@ -19485,7 +19481,7 @@ common/invisible
 "skin" "1"\r
 "angle" "90"\r
 }\r
-// entity 444\r
+// entity 443\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19501,7 +19497,7 @@ common/invisible
 ( 23744 -112 1344 ) ( 23744 -80 1344 ) ( 23744 -112 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 445\r
+// entity 444\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19537,7 +19533,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 446\r
+// entity 445\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24000.000000 -224.000244 1336.000000"\r
@@ -19546,7 +19542,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 447\r
+// entity 446\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19562,7 +19558,7 @@ common/invisible
 ( 23936 -240 1344 ) ( 23936 -208 1344 ) ( 23936 -240 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 448\r
+// entity 447\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19598,7 +19594,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 449\r
+// entity 448\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23808.000000 799.999756 1336.000000"\r
@@ -19608,7 +19604,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 450\r
+// entity 449\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19624,7 +19620,7 @@ common/invisible
 ( 23744 784 1344 ) ( 23744 816 1344 ) ( 23744 784 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 451\r
+// entity 450\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19660,7 +19656,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 452\r
+// entity 451\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "23872.000000 -608.000244 1336.000000"\r
@@ -19670,7 +19666,7 @@ common/invisible
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 453\r
+// entity 452\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19686,7 +19682,7 @@ common/invisible
 ( 23808 -624 1344 ) ( 23808 -592 1344 ) ( 23808 -624 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 454\r
+// entity 453\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19722,7 +19718,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 455\r
+// entity 454\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -19737,7 +19733,7 @@ common/invisible
 ( 24548 -964 1400 ) ( 24548 -956 1400 ) ( 24540 -964 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 456\r
+// entity 455\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19788,7 +19784,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 457\r
+// entity 456\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -19804,21 +19800,21 @@ e7/e7panelwood
 ( 24540 -952 1424 ) ( 24540 -968 1420 ) ( 24540 -952 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 458\r
+// entity 457\r
 {\r
 "classname" "light"\r
 "origin" "24548.000000 -960.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 459\r
+// entity 458\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24548.000000 -960.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "0.000001"\r
 }\r
-// entity 460\r
+// entity 459\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -19833,7 +19829,7 @@ e7/e7panelwood
 ( 23844 -964 1408 ) ( 23836 -956 1400 ) ( 23836 -964 1400 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 461\r
+// entity 460\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -19884,7 +19880,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 462\r
+// entity 461\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -19900,49 +19896,49 @@ e7/e7panelwood
 ( 23844 -952 1420 ) ( 23844 -968 1420 ) ( 23844 -952 1424 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 463\r
+// entity 462\r
 {\r
 "classname" "light"\r
 "origin" "23836.000000 -960.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 464\r
+// entity 463\r
 {\r
 "classname" "target_speaker"\r
 "origin" "23836.000000 -960.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "0.000001"\r
 }\r
-// entity 465\r
+// entity 464\r
 {\r
 "classname" "info_player_deathmatch"\r
 "origin" "24416.000000 -1056.000000 1344.000000"\r
 "angle" "135.000000"\r
 "restriction" "1"\r
 }\r
-// entity 466\r
+// entity 465\r
 {\r
 "classname" "info_player_deathmatch"\r
 "origin" "24416.000000 -832.000000 1344.000000"\r
 "angle" "-135.000000"\r
 "restriction" "1"\r
 }\r
-// entity 467\r
+// entity 466\r
 {\r
 "classname" "info_player_deathmatch"\r
 "origin" "23968.000000 -832.000000 1344.000000"\r
 "angle" "-45.000008"\r
 "restriction" "1"\r
 }\r
-// entity 468\r
+// entity 467\r
 {\r
 "classname" "info_player_deathmatch"\r
 "origin" "23968.000000 -1056.000000 1344.000000"\r
 "angle" "45.000000"\r
 "restriction" "1"\r
 }\r
-// entity 469\r
+// entity 468\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24448.000000 -1216.000244 1336.000000"\r
@@ -19952,7 +19948,7 @@ e7/e7panelwood
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 470\r
+// entity 469\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -19968,7 +19964,7 @@ e7/e7panelwood
 ( 24384 -1232 1344 ) ( 24384 -1200 1344 ) ( 24384 -1232 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 471\r
+// entity 470\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20004,7 +20000,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 472\r
+// entity 471\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24448.000000 607.999756 1336.000000"\r
@@ -20014,7 +20010,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 473\r
+// entity 472\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -20030,7 +20026,7 @@ common/invisible
 ( 24384 592 1344 ) ( 24384 624 1344 ) ( 24384 592 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 474\r
+// entity 473\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20066,7 +20062,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 475\r
+// entity 474\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24896.000000 -416.000244 1336.000000"\r
@@ -20076,7 +20072,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 476\r
+// entity 475\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -20092,7 +20088,7 @@ common/invisible
 ( 24832 -432 1344 ) ( 24832 -400 1344 ) ( 24832 -432 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 477\r
+// entity 476\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20128,7 +20124,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 478\r
+// entity 477\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20141,7 +20137,7 @@ common/invisible
 ( 25280 0 1440 ) ( 25280 224 1440 ) ( 25280 0 1632 ) e7/e7panelwood2 -64 0 90 0.5 0.5 134217728 0 0\r
 }\r
 }\r
-// entity 479\r
+// entity 478\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -20156,7 +20152,7 @@ common/invisible
 ( 25572 324 1400 ) ( 25564 324 1400 ) ( 25572 316 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 480\r
+// entity 479\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20207,7 +20203,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 481\r
+// entity 480\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -20223,21 +20219,21 @@ e7/e7panelwood
 ( 25560 316 1424 ) ( 25576 316 1420 ) ( 25560 316 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 482\r
+// entity 481\r
 {\r
 "classname" "light"\r
 "origin" "25568.000000 324.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 483\r
+// entity 482\r
 {\r
 "classname" "target_speaker"\r
 "origin" "25568.000000 324.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 484\r
+// entity 483\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -20252,7 +20248,7 @@ e7/e7panelwood
 ( 25572 -124 1408 ) ( 25564 -132 1400 ) ( 25572 -132 1400 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 485\r
+// entity 484\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20303,7 +20299,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 486\r
+// entity 485\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -20319,21 +20315,21 @@ e7/e7panelwood
 ( 25560 -124 1420 ) ( 25576 -124 1420 ) ( 25560 -124 1424 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 487\r
+// entity 486\r
 {\r
 "classname" "light"\r
 "origin" "25568.000000 -132.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 488\r
+// entity 487\r
 {\r
 "classname" "target_speaker"\r
 "origin" "25568.000000 -132.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 489\r
+// entity 488\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "25664.000000 96.000244 1336.000000"\r
@@ -20343,7 +20339,7 @@ e7/e7panelwood
 "skin" "0"\r
 "angle" "180.000000"\r
 }\r
-// entity 490\r
+// entity 489\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -20360,7 +20356,7 @@ e7/e7panelwood
 ( 25728 80 1360 ) ( 25728 112 1344 ) ( 25728 80 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 491\r
+// entity 490\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20396,7 +20392,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 492\r
+// entity 491\r
 {\r
 "classname" "trigger_multiple"\r
 "target" "level1"\r
@@ -20410,14 +20406,14 @@ common/invisible
 ( 25888 -160 1312 ) ( 25888 0 1312 ) ( 25888 -160 1568 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 493\r
+// entity 492\r
 {\r
 "classname" "target_changelevel"\r
 "origin" "25792.000000 -80.000000 1440.000000"\r
 "targetname" "level1"\r
 "chmap" "tutorial"\r
 }\r
-// entity 494\r
+// entity 493\r
 {\r
 "classname" "trigger_multiple"\r
 "target" "level2"\r
@@ -20431,13 +20427,13 @@ common/invisible
 ( 25888 192 1312 ) ( 25888 352 1312 ) ( 25888 192 1568 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 495\r
+// entity 494\r
 {\r
 "classname" "target_changelevel"\r
 "origin" "25792.000000 272.000000 1440.000000"\r
 "targetname" "level2"\r
 }\r
-// entity 496\r
+// entity 495\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -20453,7 +20449,7 @@ common/invisible
 ( 25888 -80 1360 ) ( 25888 -48 1344 ) ( 25888 -80 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 497\r
+// entity 496\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -20469,7 +20465,7 @@ common/invisible
 ( 25888 272 1360 ) ( 25888 304 1344 ) ( 25888 272 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 498\r
+// entity 497\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20569,49 +20565,49 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 499\r
+// entity 498\r
 {\r
 "classname" "light"\r
 "origin" "16896.000000 320.000000 1280.000000"\r
 "light" "75"\r
 "_color" "0.75 0.75 1"\r
 }\r
-// entity 500\r
+// entity 499\r
 {\r
 "classname" "light"\r
 "origin" "15840.000000 192.000000 1280.000000"\r
 "light" "75"\r
 "_color" "0.75 0.75 1"\r
 }\r
-// entity 501\r
+// entity 500\r
 {\r
 "classname" "light"\r
 "origin" "16064.000000 -192.000000 1280.000000"\r
 "light" "75"\r
 "_color" "1 0.75 0.75"\r
 }\r
-// entity 502\r
+// entity 501\r
 {\r
 "classname" "light"\r
 "origin" "17120.000000 -320.000000 1280.000000"\r
 "light" "75"\r
 "_color" "1 0.75 0.75"\r
 }\r
-// entity 503\r
+// entity 502\r
 {\r
 "classname" "light"\r
 "origin" "16896.000000 192.000000 1280.000000"\r
 "light" "75"\r
 "_color" "0.75 0.75 1"\r
 }\r
-// entity 504\r
+// entity 503\r
 {\r
 "classname" "light"\r
 "origin" "17120.000000 -192.000000 1280.000000"\r
 "light" "75"\r
 "_color" "1 0.75 0.75"\r
 }\r
-// entity 505\r
+// entity 504\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20679,107 +20675,107 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 506\r
+// entity 505\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "17376.000000 -96.000000 1184.000000"\r
 }\r
-// entity 507\r
+// entity 506\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "17376.000000 96.000000 1184.000000"\r
 }\r
-// entity 508\r
+// entity 507\r
 {\r
 "classname" "item_health_small"\r
 "origin" "22112.000000 -96.000000 512.000000"\r
 }\r
-// entity 509\r
+// entity 508\r
 {\r
 "classname" "item_health_small"\r
 "origin" "22144.000000 -64.000000 512.000000"\r
 }\r
-// entity 510\r
+// entity 509\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "22176.000000 -96.000000 512.000000"\r
 }\r
-// entity 511\r
+// entity 510\r
 {\r
 "classname" "item_health_small"\r
 "origin" "22240.000000 -96.000000 512.000000"\r
 }\r
-// entity 512\r
+// entity 511\r
 {\r
 "classname" "item_health_small"\r
 "origin" "22208.000000 -64.000000 512.000000"\r
 }\r
-// entity 513\r
+// entity 512\r
 {\r
 "classname" "weapon_grabber"\r
 "origin" "24192.000000 -1216.000000 1328.000000"\r
 }\r
-// entity 514\r
+// entity 513\r
 {\r
 "classname" "item_fuel"\r
 "origin" "24288.000000 -1232.000000 1328.000000"\r
 }\r
-// entity 515\r
+// entity 514\r
 {\r
 "classname" "item_fuel"\r
 "origin" "24096.000000 -1232.000000 1328.000000"\r
 }\r
-// entity 516\r
+// entity 515\r
 {\r
 "classname" "item_health_large"\r
 "origin" "24432.000000 -144.000000 1312.000000"\r
 }\r
-// entity 517\r
+// entity 516\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "24464.000000 -112.000000 1312.000000"\r
 }\r
-// entity 518\r
+// entity 517\r
 {\r
 "classname" "item_health_small"\r
 "origin" "24400.000000 -176.000000 1312.000000"\r
 }\r
-// entity 519\r
+// entity 518\r
 {\r
 "classname" "weapon_grabber"\r
 "origin" "24192.000000 800.000000 1328.000000"\r
 }\r
-// entity 520\r
+// entity 519\r
 {\r
 "classname" "item_fuel"\r
 "origin" "24288.000000 816.000000 1328.000000"\r
 }\r
-// entity 521\r
+// entity 520\r
 {\r
 "classname" "item_fuel"\r
 "origin" "24096.000000 816.000000 1328.000000"\r
 }\r
-// entity 522\r
+// entity 521\r
 {\r
 "classname" "item_health_small"\r
 "origin" "24960.000000 -192.000000 1312.000000"\r
 }\r
-// entity 523\r
+// entity 522\r
 {\r
 "classname" "item_health_small"\r
 "origin" "24960.000000 -128.000000 1312.000000"\r
 }\r
-// entity 524\r
+// entity 523\r
 {\r
 "classname" "item_health_small"\r
 "origin" "24960.000000 320.000000 1312.000000"\r
 }\r
-// entity 525\r
+// entity 524\r
 {\r
 "classname" "item_health_small"\r
 "origin" "24960.000000 384.000000 1312.000000"\r
 }\r
-// entity 526\r
+// entity 525\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -20794,7 +20790,7 @@ e7/e7panelwood
 ( 24484 836 1400 ) ( 24476 836 1400 ) ( 24484 828 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 527\r
+// entity 526\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20845,7 +20841,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 528\r
+// entity 527\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -20861,21 +20857,21 @@ e7/e7panelwood
 ( 24472 828 1424 ) ( 24488 828 1420 ) ( 24472 828 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 529\r
+// entity 528\r
 {\r
 "classname" "light"\r
 "origin" "24480.000000 836.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 530\r
+// entity 529\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24480.000000 836.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 531\r
+// entity 530\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -20890,7 +20886,7 @@ e7/e7panelwood
 ( 23908 836 1400 ) ( 23900 836 1400 ) ( 23908 828 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 532\r
+// entity 531\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -20941,7 +20937,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 533\r
+// entity 532\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -20957,21 +20953,21 @@ e7/e7panelwood
 ( 23896 828 1424 ) ( 23912 828 1420 ) ( 23896 828 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 534\r
+// entity 533\r
 {\r
 "classname" "light"\r
 "origin" "23904.000000 836.000000 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 535\r
+// entity 534\r
 {\r
 "classname" "target_speaker"\r
 "origin" "23904.000000 836.000000 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 "angle" "90.000000"\r
 }\r
-// entity 536\r
+// entity 535\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -20986,7 +20982,7 @@ e7/e7panelwood
 ( 23923.3138427734 370.34324646 1400 ) ( 23917.6569976807 364.6864013672 1400 ) ( 23928.970703125 364.6864013672 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 537\r
+// entity 536\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21037,7 +21033,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 538\r
+// entity 537\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -21053,20 +21049,20 @@ e7/e7panelwood
 ( 23920.4854278564 356.2011108398 1424 ) ( 23931.7991333008 367.514831543 1420 ) ( 23920.4854278564 356.2011108398 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 539\r
+// entity 538\r
 {\r
 "classname" "light"\r
 "origin" "23920.484375 367.515686 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 540\r
+// entity 539\r
 {\r
 "classname" "target_speaker"\r
 "origin" "23920.484375 367.514709 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 }\r
-// entity 541\r
+// entity 540\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -21081,7 +21077,7 @@ e7/e7panelwood
 ( 23928.970703125 -172.6864013672 1408 ) ( 23917.6569976807 -172.6864013672 1400 ) ( 23923.3138427734 -178.34324646 1400 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 542\r
+// entity 541\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21132,7 +21128,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 543\r
+// entity 542\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -21148,20 +21144,20 @@ e7/e7panelwood
 ( 23920.4854278564 -164.2011108398 1420 ) ( 23931.7991333008 -175.514831543 1420 ) ( 23920.4854278564 -164.2011108398 1424 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 544\r
+// entity 543\r
 {\r
 "classname" "light"\r
 "origin" "23920.484375 -175.515686 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 545\r
+// entity 544\r
 {\r
 "classname" "target_speaker"\r
 "origin" "23920.484375 -175.514709 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 }\r
-// entity 546\r
+// entity 545\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -21176,7 +21172,7 @@ e7/e7panelwood
 ( 24455.029296875 364.6864013672 1408 ) ( 24466.3430023193 364.6864013672 1400 ) ( 24460.6861572266 370.34324646 1400 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 547\r
+// entity 546\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21227,7 +21223,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 548\r
+// entity 547\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -21243,20 +21239,20 @@ e7/e7panelwood
 ( 24463.5145721436 356.2011108398 1420 ) ( 24452.2008666992 367.514831543 1420 ) ( 24463.5145721436 356.2011108398 1424 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 549\r
+// entity 548\r
 {\r
 "classname" "light"\r
 "origin" "24463.515625 367.515686 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 550\r
+// entity 549\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24463.515625 367.514709 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 }\r
-// entity 551\r
+// entity 550\r
 {\r
 "classname" "func_pointparticles"\r
 "mdl" "torch_small"\r
@@ -21271,7 +21267,7 @@ e7/e7panelwood
 ( 24460.6861572266 -178.34324646 1400 ) ( 24466.3430023193 -172.6864013672 1400 ) ( 24455.029296875 -172.6864013672 1408 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 552\r
+// entity 551\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21322,7 +21318,7 @@ e7/e7panelwood
 }\r
 }\r
 }\r
-// entity 553\r
+// entity 552\r
 {\r
 "classname" "trigger_hurt"\r
 "dmg" "15"\r
@@ -21338,20 +21334,20 @@ e7/e7panelwood
 ( 24463.5145721436 -164.2011108398 1424 ) ( 24452.2008666992 -175.514831543 1420 ) ( 24463.5145721436 -164.2011108398 1420 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 554\r
+// entity 553\r
 {\r
 "classname" "light"\r
 "origin" "24463.515625 -175.515686 1404.000000"\r
 "light" "800"\r
 "_color" "1 0.5 0.25"\r
 }\r
-// entity 555\r
+// entity 554\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24463.515625 -175.514709 1420.000000"\r
 "noise" "sound/ambient/fire_dry.ogg"\r
 }\r
-// entity 556\r
+// entity 555\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "24768.000000 -608.000244 1336.000000"\r
@@ -21361,7 +21357,7 @@ e7/e7panelwood
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 557\r
+// entity 556\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -21377,7 +21373,7 @@ e7/e7panelwood
 ( 24704 -624 1344 ) ( 24704 -592 1344 ) ( 24704 -624 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 558\r
+// entity 557\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21413,7 +21409,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 559\r
+// entity 558\r
 {\r
 "classname" "trigger_multiple"\r
 "target" "items1"\r
@@ -21428,227 +21424,227 @@ common/invisible
 ( 13280 -96 0 ) ( 13280 96 0 ) ( 13280 -96 160 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 560\r
+// entity 559\r
 {\r
 "classname" "target_speaker"\r
 "origin" "18432.000000 384.000000 1024.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 561\r
+// entity 560\r
 {\r
 "classname" "target_speaker"\r
 "origin" "18432.000000 -384.000000 1024.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 562\r
+// entity 561\r
 {\r
 "classname" "target_speaker"\r
 "origin" "8448.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 563\r
+// entity 562\r
 {\r
 "classname" "target_speaker"\r
 "origin" "8960.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 564\r
+// entity 563\r
 {\r
 "classname" "target_speaker"\r
 "origin" "9472.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 565\r
+// entity 564\r
 {\r
 "classname" "target_speaker"\r
 "origin" "9984.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 566\r
+// entity 565\r
 {\r
 "classname" "target_speaker"\r
 "origin" "10496.000000 128.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 567\r
+// entity 566\r
 {\r
 "classname" "target_speaker"\r
 "origin" "11008.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 568\r
+// entity 567\r
 {\r
 "classname" "target_speaker"\r
 "origin" "11520.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 569\r
+// entity 568\r
 {\r
 "classname" "target_speaker"\r
 "origin" "12032.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 570\r
+// entity 569\r
 {\r
 "classname" "target_speaker"\r
 "origin" "12544.000000 0.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 571\r
+// entity 570\r
 {\r
 "classname" "target_speaker"\r
 "origin" "2560.000000 -4.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 572\r
+// entity 571\r
 {\r
 "classname" "target_speaker"\r
 "origin" "1664.000000 -4.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 573\r
+// entity 572\r
 {\r
 "classname" "target_speaker"\r
 "origin" "2112.000000 -4.000000 -128.000000"\r
 "noise" "sound/desertfactory/machinevat_loop.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 574\r
+// entity 573\r
 {\r
 "classname" "target_speaker"\r
 "origin" "20000.000000 0.000000 320.000000"\r
 "noise" "sound/ambient/water.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 575\r
+// entity 574\r
 {\r
 "classname" "target_speaker"\r
 "origin" "21344.000000 0.000000 320.000000"\r
 "noise" "sound/ambient/water.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 576\r
+// entity 575\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "24544.000000 -960.000000 1312.000000"\r
 }\r
-// entity 577\r
+// entity 576\r
 {\r
 "classname" "item_health_medium"\r
 "origin" "23840.000000 -960.000000 1312.000000"\r
 }\r
-// entity 578\r
+// entity 577\r
 {\r
 "classname" "target_speaker"\r
 "origin" "22480.000000 0.000000 1024.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 579\r
+// entity 578\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24192.000000 608.000000 1440.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 580\r
+// entity 579\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24192.000000 -416.000000 1440.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 581\r
+// entity 580\r
 {\r
 "classname" "target_speaker"\r
 "origin" "23680.000000 96.000000 1440.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 582\r
+// entity 581\r
 {\r
 "classname" "target_speaker"\r
 "origin" "24704.000000 96.000000 1440.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 583\r
+// entity 582\r
 {\r
 "classname" "target_speaker"\r
 "origin" "17600.000000 0.000000 1280.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 584\r
+// entity 583\r
 {\r
 "classname" "target_speaker"\r
 "origin" "11776.000000 0.000000 384.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 585\r
+// entity 584\r
 {\r
 "classname" "target_speaker"\r
 "origin" "10496.000000 0.000000 384.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 586\r
+// entity 585\r
 {\r
 "classname" "target_speaker"\r
 "origin" "9216.000000 0.000000 384.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 587\r
+// entity 586\r
 {\r
 "classname" "target_speaker"\r
 "origin" "6464.000000 0.000000 128.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 588\r
+// entity 587\r
 {\r
 "classname" "target_speaker"\r
 "origin" "0.000000 0.000000 192.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 589\r
+// entity 588\r
 {\r
 "classname" "target_speaker"\r
 "origin" "5088.000000 0.000000 128.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 590\r
+// entity 589\r
 {\r
 "classname" "target_speaker"\r
 "origin" "4416.000000 0.000000 128.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 591\r
+// entity 590\r
 {\r
 "classname" "target_speaker"\r
 "origin" "5760.000000 0.000000 128.000000"\r
 "noise" "sound/ambient/demonwind01.wav"\r
 "angle" "90.000000"\r
 }\r
-// entity 592\r
+// entity 591\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "-64.000000 448.000275 24.000000"\r
@@ -21658,7 +21654,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 593\r
+// entity 592\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -21674,7 +21670,7 @@ common/invisible
 ( -128 432 32 ) ( -128 464 32 ) ( -128 432 48 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 594\r
+// entity 593\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21710,7 +21706,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 595\r
+// entity 594\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "-415.999756 160.000000 24.000000"\r
@@ -21720,7 +21716,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 596\r
+// entity 595\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21756,7 +21752,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 597\r
+// entity 596\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "-160.000000 159.999756 24.000000"\r
@@ -21766,7 +21762,7 @@ common/invisible
 "solid" "0"\r
 "skin" "0"\r
 }\r
-// entity 598\r
+// entity 597\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21802,7 +21798,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 599\r
+// entity 598\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "-447.999756 96.000000 24.000000"\r
@@ -21812,7 +21808,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 600\r
+// entity 599\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21848,7 +21844,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 601\r
+// entity 600\r
 {\r
 "classname" "misc_gamemodel"\r
 "origin" "-352.000000 -159.999771 24.000000"\r
@@ -21858,7 +21854,7 @@ common/invisible
 "solid" "0"\r
 "skin" "1"\r
 }\r
-// entity 602\r
+// entity 601\r
 {\r
 "classname" "func_group"\r
 // brush 0\r
@@ -21894,7 +21890,7 @@ common/invisible
 }\r
 }\r
 }\r
-// entity 603\r
+// entity 602\r
 {\r
 "classname" "trigger_multiple"\r
 "wait" "2"\r
@@ -21910,7 +21906,7 @@ common/invisible
 ( -224 144 32 ) ( -224 176 32 ) ( -224 144 48 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
 }\r
 }\r
-// entity 604\r
+// entity 603\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -21949,7 +21945,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 605\r
+// entity 604\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -21988,7 +21984,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 606\r
+// entity 605\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22027,7 +22023,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 607\r
+// entity 606\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22066,7 +22062,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 608\r
+// entity 607\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22105,7 +22101,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 609\r
+// entity 608\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22144,7 +22140,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 610\r
+// entity 609\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22183,7 +22179,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 611\r
+// entity 610\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22222,7 +22218,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 612\r
+// entity 611\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22261,7 +22257,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 613\r
+// entity 612\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22300,7 +22296,7 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
-// entity 614\r
+// entity 613\r
 {\r
 "classname" "func_bobbing"\r
 "height" "16"\r
@@ -22339,3 +22335,127 @@ mirceakitsune/indicator_green
 }\r
 }\r
 }\r
+// entity 614\r
+{\r
+"classname" "misc_gamemodel"\r
+"origin" "25152.000000 415.999756 1336.000000"\r
+"model" "models/player/vixen.zym"\r
+"frame" "7"\r
+"angle" "-90"\r
+"solid" "0"\r
+"skin" "1"\r
+}\r
+// entity 615\r
+{\r
+"classname" "trigger_multiple"\r
+"wait" "2"\r
+"angle" "0"\r
+"message" "^3Trainee: ^7Already leaving? Good luck to you then! Let me give you a tip on your way out:\n\nIf a predator is going too fast, he will throw up his prey due to the speed. So if you're team healing or digesting someone, don't go running around too quickly or using high velocity jump pads, as you may lose your prey before you're done."\r
+// brush 0\r
+{\r
+( 25168 432 1392 ) ( 25168 400 1392 ) ( 25136 432 1392 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25168 480 1360 ) ( 25136 480 1360 ) ( 25168 480 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25216 432 1360 ) ( 25216 432 1344 ) ( 25216 400 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25136 400 1312 ) ( 25168 400 1312 ) ( 25136 432 1312 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25136 352 1344 ) ( 25136 352 1360 ) ( 25168 352 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25088 400 1344 ) ( 25088 432 1344 ) ( 25088 400 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+}\r
+}\r
+// entity 616\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+patchDef2\r
+{\r
+common/invisible\r
+( 9 3 0 0 0 )\r
+(\r
+( ( 25136 416 1312 0 0 ) ( 25136 416 1344 0 -0.5 ) ( 25136 416 1376 0 -1 ) )\r
+( ( 25136 400 1312 0.25 0 ) ( 25136 400 1344 0.25 -0.5 ) ( 25136 400 1376 0.25 -1 ) )\r
+( ( 25152 400 1312 0.5 0 ) ( 25152 400 1344 0.5 -0.5 ) ( 25152 400 1376 0.5 -1 ) )\r
+( ( 25168 400 1312 0.75 0 ) ( 25168 400 1344 0.75 -0.5 ) ( 25168 400 1376 0.75 -1 ) )\r
+( ( 25168 416 1312 1 0 ) ( 25168 416 1344 1 -0.5 ) ( 25168 416 1376 1 -1 ) )\r
+( ( 25168 432 1312 1.25 0 ) ( 25168 432 1344 1.25 -0.5 ) ( 25168 432 1376 1.25 -1 ) )\r
+( ( 25152 432 1312 1.5 0 ) ( 25152 432 1344 1.5 -0.5 ) ( 25152 432 1376 1.5 -1 ) )\r
+( ( 25136 432 1312 1.75 0 ) ( 25136 432 1344 1.75 -0.5 ) ( 25136 432 1376 1.75 -1 ) )\r
+( ( 25136 416 1312 2 0 ) ( 25136 416 1344 2 -0.5 ) ( 25136 416 1376 2 -1 ) )\r
+)\r
+}\r
+}\r
+// brush 1\r
+{\r
+patchDef2\r
+{\r
+common/invisible\r
+( 3 5 0 0 0 )\r
+(\r
+( ( 25136 416 1376 0 0 ) ( 25136 432 1376 0 -0.25 ) ( 25152 432 1376 0 -0.5 ) ( 25168 432 1376 0 -0.75 ) ( 25168 416 1376 0 -1 ) )\r
+( ( 25136 416 1376 0.25 0 ) ( 25136 416 1376 0.25 -0.25 ) ( 25152 416 1376 0.25 -0.5 ) ( 25168 416 1376 0.25 -0.75 ) ( 25168 416 1376 0.25 -1 ) )\r
+( ( 25136 416 1376 0.5 0 ) ( 25136 400 1376 0.5 -0.25 ) ( 25152 400 1376 0.5 -0.5 ) ( 25168 400 1376 0.5 -0.75 ) ( 25168 416 1376 0.5 -1 ) )\r
+)\r
+}\r
+}\r
+}\r
+// entity 617\r
+{\r
+"classname" "misc_gamemodel"\r
+"origin" "25216.000000 -160.000244 1336.000000"\r
+"model" "models/player/vixen.zym"\r
+"frame" "7"\r
+"angle" "-179.999985"\r
+"solid" "0"\r
+"skin" "1"\r
+}\r
+// entity 618\r
+{\r
+"classname" "trigger_multiple"\r
+"wait" "2"\r
+"angle" "0"\r
+"message" "^3Trainee: ^7Ouch, be careful! My leg still hurts like hell. What happened? Well, I made the mistake of forgetting I had someone in my stomach and jumped off a ledge like I always do. Being heavier, I took damage from the fall. So yeah, if there's someone in your belly, you may get hurt when jumping from a height that's otherwise safe."\r
+// brush 0\r
+{\r
+( 25232 -144 1392 ) ( 25232 -176 1392 ) ( 25200 -144 1392 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25232 -96 1360 ) ( 25200 -96 1360 ) ( 25232 -96 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25248 -144 1360 ) ( 25248 -144 1344 ) ( 25248 -176 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25200 -176 1312 ) ( 25232 -176 1312 ) ( 25200 -144 1312 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25200 -224 1344 ) ( 25200 -224 1360 ) ( 25232 -224 1344 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+( 25152 -176 1344 ) ( 25152 -144 1344 ) ( 25152 -176 1360 ) common/trigger 0 0 0 0.5 0.5 0 0 0\r
+}\r
+}\r
+// entity 619\r
+{\r
+"classname" "func_group"\r
+// brush 0\r
+{\r
+patchDef2\r
+{\r
+common/invisible\r
+( 9 3 0 0 0 )\r
+(\r
+( ( 25200 -160 1312 0 0 ) ( 25200 -160 1344 0 -0.5 ) ( 25200 -160 1376 0 -1 ) )\r
+( ( 25200 -176 1312 0.25 0 ) ( 25200 -176 1344 0.25 -0.5 ) ( 25200 -176 1376 0.25 -1 ) )\r
+( ( 25216 -176 1312 0.5 0 ) ( 25216 -176 1344 0.5 -0.5 ) ( 25216 -176 1376 0.5 -1 ) )\r
+( ( 25232 -176 1312 0.75 0 ) ( 25232 -176 1344 0.75 -0.5 ) ( 25232 -176 1376 0.75 -1 ) )\r
+( ( 25232 -160 1312 1 0 ) ( 25232 -160 1344 1 -0.5 ) ( 25232 -160 1376 1 -1 ) )\r
+( ( 25232 -144 1312 1.25 0 ) ( 25232 -144 1344 1.25 -0.5 ) ( 25232 -144 1376 1.25 -1 ) )\r
+( ( 25216 -144 1312 1.5 0 ) ( 25216 -144 1344 1.5 -0.5 ) ( 25216 -144 1376 1.5 -1 ) )\r
+( ( 25200 -144 1312 1.75 0 ) ( 25200 -144 1344 1.75 -0.5 ) ( 25200 -144 1376 1.75 -1 ) )\r
+( ( 25200 -160 1312 2 0 ) ( 25200 -160 1344 2 -0.5 ) ( 25200 -160 1376 2 -1 ) )\r
+)\r
+}\r
+}\r
+// brush 1\r
+{\r
+patchDef2\r
+{\r
+common/invisible\r
+( 3 5 0 0 0 )\r
+(\r
+( ( 25200 -160 1376 0 0 ) ( 25200 -144 1376 0 -0.25 ) ( 25216 -144 1376 0 -0.5 ) ( 25232 -144 1376 0 -0.75 ) ( 25232 -160 1376 0 -1 ) )\r
+( ( 25200 -160 1376 0.25 0 ) ( 25200 -160 1376 0.25 -0.25 ) ( 25216 -160 1376 0.25 -0.5 ) ( 25232 -160 1376 0.25 -0.75 ) ( 25232 -160 1376 0.25 -1 ) )\r
+( ( 25200 -160 1376 0.5 0 ) ( 25200 -176 1376 0.5 -0.25 ) ( 25216 -176 1376 0.5 -0.5 ) ( 25232 -176 1376 0.5 -0.75 ) ( 25232 -160 1376 0.5 -1 ) )\r
+)\r
+}\r
+}\r
+}\r

diff --git a/data/maps/tutorial.waypoints.cache b/data/maps/tutorial.waypoints.cache
index ef278d0dd535b4519ecc1b714f435b6ae4a13085..3e4a58b979e898731f2700443e6a4f59996a557d 100644 (file)
--- a/data/maps/tutorial.waypoints.cache
+++ b/data/maps/tutorial.waypoints.cache
@@ -14,7 +14,6 @@
 '7872.0   0.0  32.0'*'8000.0 352.0  24.0'\r
 '10496.0   0.0 -208.0'*'7872.0   0.0  32.0'\r
 '6624.0   0.0 -208.0'*'3712.0   0.0  32.0'\r
-'2112.0   0.0 -208.0'*'1344.0 -192.0  32.0'\r
 '24960.0 384.0 1336.0'*'24960.0 320.0 1336.0'\r
 '24960.0 384.0 1336.0'*'24960.0 -128.0 1336.0'\r
 '24960.0 384.0 1336.0'*'24960.0 -192.0 1336.0'\r
@@ -144,3 +143,4 @@
 '7520.0 -336.0  40.0'*'7392.0 -336.0  40.0'\r
 '7456.0 -336.0  40.0'*'7392.0 -336.0  40.0'\r
 '7456.0 -336.0  40.0'*'7520.0 -336.0  40.0'\r
+'2112.0   0.0 -208.0'*'1344.0 192.0  32.0'\r

diff --git a/data/maps/tutorial/lm_0000.tga b/data/maps/tutorial/lm_0000.tga
index 793f1bd4865030739bcabe34640aca4ffc0a54b7..1631686a9a68d4f27d217ff58bdc6078557c9804 100644 (file)
Binary files a/data/maps/tutorial/lm_0000.tga and b/data/maps/tutorial/lm_0000.tga differ

diff --git a/data/maps/tutorial/lm_0001.tga b/data/maps/tutorial/lm_0001.tga
index 85525dd7b499798f48317f29ed0318b09d81a486..83ef6429393cdcf3fa87892f9f622be848c90418 100644 (file)
Binary files a/data/maps/tutorial/lm_0001.tga and b/data/maps/tutorial/lm_0001.tga differ

diff --git a/data/maps/tutorial/lm_0002.tga b/data/maps/tutorial/lm_0002.tga
index a4bbac6a7ffc2ef0ebe2338bd9fd7cfed7e1b4f4..bc443ac41ec79c479a5531b224c6e526be9eb130 100644 (file)
Binary files a/data/maps/tutorial/lm_0002.tga and b/data/maps/tutorial/lm_0002.tga differ

diff --git a/data/maps/tutorial/lm_0003.tga b/data/maps/tutorial/lm_0003.tga
index 6bee1b2457e44d2afb949e95677b7df09914dcc2..46dd9d0d0a6a4874310456c993d7107e0a0ab854 100644 (file)
Binary files a/data/maps/tutorial/lm_0003.tga and b/data/maps/tutorial/lm_0003.tga differ

diff --git a/data/maps/tutorial/lm_0004.tga b/data/maps/tutorial/lm_0004.tga
index a3ec1b2be8d50276f46f0f281e397660f0f5446a..433c31613ad372b6451f1157922da7a9d6316e73 100644 (file)
Binary files a/data/maps/tutorial/lm_0004.tga and b/data/maps/tutorial/lm_0004.tga differ

diff --git a/data/maps/tutorial/lm_0005.tga b/data/maps/tutorial/lm_0005.tga
index 251ca35de6011942d4cc600718a9df7c6f160ff5..bb15f7879143688431228147a2acce377443dbfb 100644 (file)
Binary files a/data/maps/tutorial/lm_0005.tga and b/data/maps/tutorial/lm_0005.tga differ

diff --git a/data/maps/tutorial/lm_0006.tga b/data/maps/tutorial/lm_0006.tga
index f34cc619cabe3c91bc2612c6565cb8084be29cbf..fb8036d4a0c8674aaf469d987a389e17f6ba22b7 100644 (file)
Binary files a/data/maps/tutorial/lm_0006.tga and b/data/maps/tutorial/lm_0006.tga differ

diff --git a/data/maps/tutorial/lm_0007.tga b/data/maps/tutorial/lm_0007.tga
index a8bc4905bb18576e69203ea67b1b9d622552af39..25cbc1d75ac4c1f4d8cfb71967a8d9408346116a 100644 (file)
Binary files a/data/maps/tutorial/lm_0007.tga and b/data/maps/tutorial/lm_0007.tga differ

diff --git a/data/maps/tutorial/lm_0008.tga b/data/maps/tutorial/lm_0008.tga
index 19aa36b10b9aa70c60d6da19416d459a77685aba..b9ab1a5b0d3dde4924fa3b4cee11728edc51a3d2 100644 (file)
Binary files a/data/maps/tutorial/lm_0008.tga and b/data/maps/tutorial/lm_0008.tga differ

diff --git a/data/maps/tutorial/lm_0009.tga b/data/maps/tutorial/lm_0009.tga
index 3e5dda8e1c18edc3c6af6100f987c110403ee50d..4069004d10bb001a8236e165d8cb3f2725462e5f 100644 (file)
Binary files a/data/maps/tutorial/lm_0009.tga and b/data/maps/tutorial/lm_0009.tga differ

diff --git a/data/maps/tutorial/lm_0010.tga b/data/maps/tutorial/lm_0010.tga
index 303542d4b2e2a6b21b681375d085ad42960fb2bf..e5e675d03528879b5419454318794b0908327ba0 100644 (file)
Binary files a/data/maps/tutorial/lm_0010.tga and b/data/maps/tutorial/lm_0010.tga differ

diff --git a/data/maps/tutorial/lm_0011.tga b/data/maps/tutorial/lm_0011.tga
index 1f19901f87e6f53b056326944fede7f1e2af6738..5ba4cf24b63c01365a3d79bec92094a466433a30 100644 (file)
Binary files a/data/maps/tutorial/lm_0011.tga and b/data/maps/tutorial/lm_0011.tga differ

diff --git a/data/maps/tutorial/lm_0012.tga b/data/maps/tutorial/lm_0012.tga
index 3fcadf61197c095aa64c3d1c3b2e31eaf4dfd622..2bed316b2acc7fd6888f1dd42fb68eedd667e1f6 100644 (file)
Binary files a/data/maps/tutorial/lm_0012.tga and b/data/maps/tutorial/lm_0012.tga differ

diff --git a/data/maps/tutorial/lm_0013.tga b/data/maps/tutorial/lm_0013.tga
index d14c45b779444b6d92680e7204d60ca581fbff28..09cb87583933f095edecb9b07719cf8215585c9f 100644 (file)
Binary files a/data/maps/tutorial/lm_0013.tga and b/data/maps/tutorial/lm_0013.tga differ