edit the recently merged locker-to-heaven practice

lengran · May 12, 2024 · e471cd5 · e471cd5
1 parent 63db2d3
commit e471cd5
Show file tree

Hide file tree

Showing 7 changed files with 124 additions and 92 deletions.
diff --git a/OpenPrefirePrac.cs b/OpenPrefirePrac.cs
@@ -793,11 +793,19 @@ private void MovePlayer(CCSPlayerController? player, bool crouch, Vector pos, QA
         // Console.WriteLine($"[OpenPrefirePrac] DEBUG: {player.PlayerName} moved to spawn point.");
 
         // Only bot can crouch
-        if (crouch && player.IsBot)
+        if (player.IsBot)
         {
             var movementService = new CCSPlayer_MovementServices(player.PlayerPawn.Value.MovementServices!.Handle);
-            AddTimer(0.1f, () => movementService.DuckAmount = 1);
-            AddTimer(0.2f, () => player.PlayerPawn.Value.Bot!.IsCrouching = true);
+            if (crouch)
+            {
+                AddTimer(0.05f, () => movementService.DuckAmount = 1);
+                AddTimer(0.1f, () => player.PlayerPawn.Value.Bot!.IsCrouching = true);
+            }
+            else
+            {
+                AddTimer(0.05f, () => movementService.DuckAmount = 0);
+                AddTimer(0.1f, () => player.PlayerPawn.Value.Bot!.IsCrouching = false);
+            }
         }
 
         player.PlayerPawn.Value.Teleport(pos, ang, Vector.Zero);
@@ -1030,7 +1038,7 @@ private void SaveConvars()
                 {
                     var value = tmpConvar.StringValue;
                     _serverStatus.StringConvars.Add(convarName, value);
-                    // Console.WriteLine($"[OpenPrefirePrac] {convarName}: {value}");
+                    // Console.WriteLine($"[OpenPrefirePrac] DEBUG {convarName}: {value}");
                 }
             }
         }

diff --git a/lang/en.json b/lang/en.json
@@ -76,7 +76,8 @@
     "map.de_nuke.hut_to_a": "Attack A site from hut",
     "map.de_nuke.ramp_to_b": "Attack B site from ramp",
     "map.de_nuke.t_side_entrance_of_lobby": "Entrance of lobby (T side)",
-    "map.de_nuke.j_hall_to_upper": "Attack Upper from Ramp/J-Hall",
+    "map.de_nuke.radio_to_ramp": "From radio to ramp",
+    "map.de_nuke.j_hall_to_upper": "Attack A site from Ramp/J-Hall",
     "map.de_nuke.t_outside_to_lower": "Attack Lower from T-Side Outside",
     "map.de_nuke.ropzPlay_to_upper": "Attack Upper doing the ropz maneuver"
 } 
diff --git a/lang/pt-BR.json b/lang/pt-BR.json
@@ -75,5 +75,7 @@
     "map.de_dust2.mid_to_b": "Atacar o local B a partir do meio",
     "map.de_nuke.hut_to_a": "Atacar o local do A a partir do HUT",
     "map.de_nuke.ramp_to_b": "Atacar o local B a partir da rampa",
-    "map.de_nuke.t_side_entrance_of_lobby": "Entrada do saguão (lado T)"
+    "map.de_nuke.t_side_entrance_of_lobby": "Entrada do saguão (lado T)",
+    "map.de_nuke.radio_to_ramp": "Do rádio à rampa",
+    "map.de_nuke.j_hall_to_upper": "Ataque ao site A da rampa/J-Hall"
 }
diff --git a/lang/zh.json b/lang/zh.json
@@ -75,5 +75,7 @@
     "map.de_dust2.mid_to_b": "从中门进攻 B 包点",
     "map.de_nuke.hut_to_a": "从黄房进攻 A 包点",
     "map.de_nuke.ramp_to_b": "从铁板进攻 B 包点",
-    "map.de_nuke.t_side_entrance_of_lobby": "（匪家侧）匪厅入口"
+    "map.de_nuke.t_side_entrance_of_lobby": "（匪家侧）匪厅入口",
+    "map.de_nuke.radio_to_ramp": "从连接进攻铁板",
+    "map.de_nuke.j_hall_to_upper": "从三楼下回防/进攻 A 区"
 } 
diff --git a/maps/de_nuke/j_hall_to_upper.txt b/maps/de_nuke/j_hall_to_upper.txt
@@ -1,50 +1,60 @@
-ramp_to_b hut_to_a
+ramp_to_b hut_to_a radio_to_ramp
 8 1
-335.538422 31.614428 -415.96875 -0.369600 3.132346 0.000000 False
-574.104980 927.911621 -479.96875 -3.049201 -64.390930 0.000000 False
-1210.969971 -78.537659 -415.96875 -0.000014 156.793747 0.000000 False
-1028.156982 -195.521912 -415.96875 -0.554414 93.407478 0.000000 False
-1382.649048 -745.306641 -372.764069 2.771977 115.121536 0.000000 False
-1293.381592 -468.023926 -415.96875 0.215587 120.326653 0.000000 False
-1050.031738 -533.781067 -415.96875 0.153985 86.077148 0.000000 False
-1383.969116 -668.875305 -368.707489 3.880792 118.355644 0.000000 True
-1228.474365 -598.028870 -415.96875 0.030800 108.992386 0.000000 True
-1363.982788 -299.031494 -415.462219 -0.123213 173.087570 0.000000 False
-1242.234863 -751.700317 -415.96875 -0.184829 97.504021 0.000000 False
-1040.034546 -382.070068 -415.96875 -0.616015 76.991188 0.000000 False
-1179.902710 -471.968384 -127.96875 54.238785 104.803543 0.000000 False
-288.031342 -947.968750 -127.96875 0.061709 34.663486 0.000000 False
-1579.301025 -726.406372 -415.96875 -0.123217 132.308395 0.000000 False
-1649.838135 -794.266418 -301.96875 9.178400 132.647476 0.000000 True
-1530.971558 -438.159668 -415.96875 -0.369629 179.770798 0.000000 False
-1259.968750 -316.031250 -127.96875 19.712067 -131.996048 0.000000 False
-352.083557 -331.031494 -415.46228 -20.512615 -7.625018 0.000000 False
-449.810455 -336.033813 -415.46228 -24.485798 -8.087014 0.000000 False
-991.968628 -945.968750 -127.96875 -0.492695 90.852242 0.000000 False
-352.033051 -965.817017 -255.96875 -6.252291 37.404694 -0.000000 True
-328.031799 -1426.034546 -415.96875 -12.135113 55.145470 0.000000 False
-547.530884 -1216.031372 -415.96875 -17.463491 59.611450 0.000000 True
-663.877869 -833.962891 -415.96875 -24.331827 74.672554 0.000000 False
-927.968689 -1471.969360 -415.96875 -13.705894 89.240974 0.000000 False
-496.031006 -1021.568909 -415.96875 -21.005447 43.472179 0.000000 False
-957.686401 -352.027466 -331.922607 -74.308464 160.397812 0.000000 False
-846.243591 -652.954224 -399.968262 -42.122406 63.008331 0.000000 False
-459.390991 -745.461609 -415.648193 -22.256401 36.428093 0.000000 False
-316.700500 -1018.972046 -391.96875 -15.726823 52.906021 0.000000 False
-783.869324 -1046.835449 -415.96875 -22.471987 72.073143 0.000000 False
-337.605164 67.983047 -415.96875
-1117.768921 69.391647 -415.96875
-1117.512817 -369.510376 -415.96875
-1165.332153 -443.862488 -415.96875
-1151.116577 -447.127319 -415.96875
-1151.116577 -445.968140 -386.159058
-1151.116577 -446.280884 -350.328003
-1151.116577 -445.159302 -285.56311
-1151.116577 -444.349487 -198.066772
-1143.881226 -443.222900 -123.96875
-1137.922241 -333.460938 -127.96875
-980.613037 -330.353027 -127.96875
-965.171387 -333.507324 -127.96875
-964.636230 -289.862061 -127.96875
-691.016602 -306.714111 -127.96875
-483.774780 -312.603638 -127.96875
+632.624756 69.560097 -401.968750 -0.501703 -0.342242 0.000000
+1210.969971 -78.537659 -415.96875 -0.000014 156.793747 0.000000 False 1
+1202.140137 -323.192627 -415.96875 -0.413587 117.872566 0.000000 False 2
+1228.474365 -598.028870 -415.96875 0.030800 108.992386 0.000000 False 3
+1028.156982 -195.521912 -415.96875 -0.554414 93.407478 0.000000 False 4
+1050.031738 -533.781067 -415.96875 0.153985 86.077148 0.000000 False 5
+1579.301025 -726.406372 -415.96875 -0.123217 132.308395 0.000000 False 6
+1179.902710 -471.968384 -127.96875 54.238785 104.803543 0.000000 True 7
+1864.210693 -878.123352 -351.96875 3.612635 139.321838 0.000000 False 8
+1432.025024 -459.613586 -415.96875 -0.193369 145.437683 0.000000 False 9
+1916.522339 -767.386353 -351.96875 3.832616 148.143906 0.000000 False 10
+1363.982788 -299.031494 -415.462219 -0.123213 173.087570 0.000000 False 11
+1619.968750 -314.031067 -415.96875 0.488140 -146.895645 0.000000 False 12
+1533.703491 -451.029785 -415.96875 -0.699642 178.486572 0.000000 False 13
+1757.520264 -1651.129639 -415.96875 -0.303860 106.953438 0.000000 False 14
+1040.279297 -816.031250 -407.96875 1.478407 50.271458 0.000000 True new15
+1619.968628 -280.031250 -367.96875 7.858074 -140.825043 0.000000 False 15
+1543.483276 -280.029480 -415.96875 -0.083861 -127.227776 0.000000 False 16
+1424.031372 -280.049805 -367.96875 8.892128 -89.521301 0.000000 False 17
+1259.968750 -316.031250 -127.96875 19.712067 -131.996048 0.000000 False 18
+1083.520142 -316.034668 -127.96875 -1.865685 -22.865261 0.000000 False 19
+305.056976 -292.028198 -127.96875 -0.281696 -6.651062 0.000000 False 20
+1259.968506 -471.956543 -127.96875 -0.809335 83.988319 0.000000 False new
+288.031250 -947.971863 -127.96875 -0.303632 34.974274 0.000000 False 21
+352.033295 -1056.612549 -255.96875 -7.607666 43.405228 -0.000000 False 22
+449.619263 -365.511475 -415.96875 -25.185692 -1.510019 0.000000 False 23
+526.209229 -672.450134 -399.96875 -25.493620 25.276983 0.000000 False 24
+328.031799 -1426.034546 -415.96875 -12.135113 55.145470 0.000000 False 25
+547.530884 -1216.031372 -415.96875 -17.463491 59.611450 0.000000 False 26
+663.661133 -609.491882 -410.142914 -35.569653 23.956905 0.000000 False 27
+692.648010 -1585.801514 -415.96875 -13.415852 74.929810 0.000000 False 28
+982.887878 -945.326172 -127.96875 -0.193917 90.639145 0.000000 False 29
+801.564697 -796.802856 -399.968262 -26.593895 71.300430 0.000000 False 30
+882.031311 -1471.968750 -415.96875 -13.547997 86.569504 -0.000000 False 31
+238.601730 -1074.546509 -415.96875 -3.141541 51.053062 0.000000 True 32
+455.968750 -1159.972534 -391.96875 0.862456 99.937187 0.000000 False 33
+935.608398 68.535507 -415.96875
+1125.768921 69.391647 -415.96875
+1125.512817 -443.510376 -415.96875
+1455.000732 -451.362671 -406.96875
+1467.873047 -805.111755 -406.96875
+1323.264526 -805.111755 -398.96875
+1323.264526 -805.111755 -230.96875
+1332.259521 -744.045898 -230.96875
+1065.043335 -739.413513 -230.96875
+1067.023071 -532.973450 -230.96875
+1266.440063 -529.586670 -118.96875
+1332.137451 -530.493591 -118.96875
+1331.459839 -388.541138 -118.96875
+1119.586670 -391.342773 -118.96875
+1125.512817 -443.510376 -127.96875
+1125.512817 -443.510376 -415.96875
+1125.512817 -443.510376 -127.96875
+1119.586670 -391.342773 -118.96875
+962.689697 -379.831848 -127.96875
+962.689697 -379.831848 -406.96875
+398.601166 -487.400146 -406.96875
+378.582916 -712.319336 -406.96875
diff --git a/maps/de_nuke/radio_to_ramp.txt b/maps/de_nuke/radio_to_ramp.txt
@@ -0,0 +1,43 @@
+t_side_entrance_of_lobby ramp_to_b j_hall_to_upper
+8 0.65
+-144.349609 -924.317261 -401.968750 0.703874 89.361572 0.000000
+141.189987 -235.653503 -415.96875 0.197265 -129.792007 0.000000 False
+251.968735 -463.968750 -415.96875 0.835258 179.981949 0.000000 False
+251.968277 -504.860779 -373.96875 5.961282 170.741852 0.000000 False
+251.968658 -635.968750 -415.96875 -0.066705 146.717560 0.000000 False
+4.031250 -635.968689 -415.96875 -0.594700 91.475433 0.000000 False
+281.693665 31.130829 -415.565033 0.351306 -118.792664 0.000000 False
+497.254150 417.547852 -393.516266 1.495287 -119.298996 0.000000 False
+536.618225 574.210022 -489.867126 -3.652716 -116.248581 0.000000 False
+657.199158 872.554626 -479.96875 -2.574718 -114.950607 0.000000 False
+536.346924 864.031311 -479.96875 -2.750721 -107.778625 0.000000 False
+65.031616 110.380203 -415.96875 0.109275 -81.114426 0.000000 False
+65.031250 -192.799927 -415.96875 0.131274 -54.692825 0.000000 False
+562.823059 322.028351 -371.96875 4.135321 -134.721008 0.000000 False
+637.906860 236.920029 -414.96875 0.339845 -151.066681 0.000000 False
+971.478455 424.295074 -439.144653 -1.772152 -149.989044 0.000000 False
+1177.798340 142.968506 -415.96875 -0.210152 -172.802750 0.000000 False
+1028.031738 4.714843 -415.96875 -0.760152 177.803192 0.000000 False
+967.968750 -132.031250 -415.96875 -0.122152 166.539551 0.000000 False
+749.968750 -233.968750 -415.96875 -0.496110 149.994217 0.000000 False
+322.245087 -60.520386 -287.96875 49.773933 92.179443 0.000000 False
+304.031616 575.232056 -472.686249 -7.800031 -87.736221 0.000000 False
+560.116028 -233.968567 -415.96875 -0.012110 108.458015 0.000000 False
+318.031250 -218.971252 -274.919373 15.651973 74.329414 0.000000 False
+603.031250 297.968719 -414.96875 0.559997 -95.884750 0.000000 False
+1162.657715 -108.465271 -415.96875 3.200019 142.169601 0.000000 False
+496.031494 900.379639 -479.96875 -2.498004 -91.858971 0.000000 False
+1178.744507 -298.654907 -415.96875 3.155996 116.253159 0.000000 False
+609.620789 911.391113 -479.96875 0.911997 -87.348923 0.000000 False
+862.699890 -96.828857 -639.96875 -14.619969 123.776199 0.000000 False
+515.258972 95.968323 -639.96875 -14.377952 88.149490 0.000000 False
+409.172546 -86.660034 -639.96875 -14.400009 55.114193 0.000000 False
+767.617676 95.968292 -639.96875 -16.522142 92.938667 0.000000 False
+-143.311584 -777.210815 -406.96875
+-139.228638 -414.614990 -406.96875
+161.942123 -413.416687 -406.96875
+164.830963 64.283897 -406.96875
+369.623016 65.256485 -406.96875
+367.776794 307.430450 -406.96875
+371.202423 613.914490 -470.403625
+372.559021 649.859436 -470.96875
diff --git a/maps/de_nuke/ramp_to_b.txt b/maps/de_nuke/ramp_to_b.txt
@@ -1,34 +1,6 @@
 hut_to_a t_side_entrance_of_lobby
-8 0.5
--144.349609 -924.317261 -401.968750 0.703874 89.361572 0.000000
-141.189987 -235.653503 -415.96875 0.197265 -129.792007 0.000000 False
-251.968735 -463.968750 -415.96875 0.835258 179.981949 0.000000 False
-251.968277 -504.860779 -373.96875 5.961282 170.741852 0.000000 False
-251.968658 -635.968750 -415.96875 -0.066705 146.717560 0.000000 False
-4.031250 -635.968689 -415.96875 -0.594700 91.475433 0.000000 False
-281.693665 31.130829 -415.565033 0.351306 -118.792664 0.000000 False
-497.254150 417.547852 -393.516266 1.495287 -119.298996 0.000000 False
-536.618225 574.210022 -489.867126 -3.652716 -116.248581 0.000000 False
-657.199158 872.554626 -479.96875 -2.574718 -114.950607 0.000000 False
-536.346924 864.031311 -479.96875 -2.750721 -107.778625 0.000000 False
-65.031616 110.380203 -415.96875 0.109275 -81.114426 0.000000 False
-65.031250 -192.799927 -415.96875 0.131274 -54.692825 0.000000 False
-562.823059 322.028351 -371.96875 4.135321 -134.721008 0.000000 False
-637.906860 236.920029 -414.96875 0.339845 -151.066681 0.000000 False
-971.478455 424.295074 -439.144653 -1.772152 -149.989044 0.000000 False
-1177.798340 142.968506 -415.96875 -0.210152 -172.802750 0.000000 False
-1028.031738 4.714843 -415.96875 -0.760152 177.803192 0.000000 False
-967.968750 -132.031250 -415.96875 -0.122152 166.539551 0.000000 False
-749.968750 -233.968750 -415.96875 -0.496110 149.994217 0.000000 False
-322.245087 -60.520386 -287.96875 49.773933 92.179443 0.000000 False
-304.031616 575.232056 -472.686249 -7.800031 -87.736221 0.000000 False
-560.116028 -233.968567 -415.96875 -0.012110 108.458015 0.000000 False
-318.031250 -218.971252 -274.919373 15.651973 74.329414 0.000000 False
-603.031250 297.968719 -414.96875 0.559997 -95.884750 0.000000 False
-1162.657715 -108.465271 -415.96875 3.200019 142.169601 0.000000 False
-496.031494 900.379639 -479.96875 -2.498004 -91.858971 0.000000 False
-1178.744507 -298.654907 -415.96875 3.155996 116.253159 0.000000 False
-609.620789 911.391113 -479.96875 0.911997 -87.348923 0.000000 False
+8 0.8
+327.931305 345.699341 -407.678955 7.479604 68.731003 0.000000
 862.699890 -96.828857 -639.96875 -14.619969 123.776199 0.000000 False
 515.258972 95.968323 -639.96875 -14.377952 88.149490 0.000000 False
 847.987244 95.968559 -639.96875 -1.067932 173.984497 0.000000 False
@@ -52,12 +24,6 @@ hut_to_a t_side_entrance_of_lobby
 1264.031372 -923.488220 -767.96875 0.296192 -178.015457 0.000000 False
 943.968750 -1276.041870 -767.96875 -2.299802 175.737350 0.000000 True
 121.287056 -1324.842529 -775.96875 -0.913802 7.415567 0.000000 False
--143.311584 -777.210815 -406.96875
--139.228638 -414.614990 -406.96875
-161.942123 -413.416687 -406.96875
-164.830963 64.283897 -406.96875
-369.623016 65.256485 -406.96875
-367.776794 307.430450 -406.96875
 371.202423 613.914490 -470.403625
 372.559021 649.859436 -470.96875
 641.421326 640.029968 -470.96875