Skip to content

Commit

Permalink
Фикс бесконечной бомбежки осколками после апстрима (#423)
Browse files Browse the repository at this point in the history
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->
При 6 людей ивент с космическим мусором спавнится каждые 3 минуты. Не
круто

**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [x] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [x] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [x] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [x] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**
<!--
Здесь вы можете написать список изменений, который будет автоматически
добавлен в игру, когда ваш PR будет принят.

В журнал изменений следует помещать только то, что действительно важно
игрокам.

В списке изменений тип значка не является часть предложения, поэтому
явно указывайте - Добавлен, Удалён, Изменён.
плохо: - add: Новый инструмент для инженеров
хорошо: - add: Добавлен новый инструмент для инженеров

Вы можете указать своё имя после символа 🆑 именно оно будет
отображаться в журнале изменений (иначе будет использоваться ваше имя на
GitHub)
Например: 🆑 Ian

-->

🆑 Friskis
- fix: Благодаря стараниям флота, значительное количество космического
мусора было уничтожено
- fix: Хотфикс игры за ИИ от Коти
- add: Добавлены роли СБ борга на карты
  • Loading branch information
FrisKisDr authored Sep 7, 2024
1 parent bdd9b0c commit 0bf309b
Show file tree
Hide file tree
Showing 22 changed files with 390 additions and 211 deletions.
49 changes: 21 additions & 28 deletions Resources/Maps/ADTMaps/ADTStations/adt_aspid.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5083,8 +5083,6 @@ entities:
pos: 64.5,-23.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 7833
- 7834
Expand Down Expand Up @@ -5124,8 +5122,6 @@ entities:
pos: 68.5,-19.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 496
- 7833
Expand All @@ -5150,8 +5146,6 @@ entities:
pos: 63.5,-9.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 7835
- 7840
Expand Down Expand Up @@ -5756,8 +5750,6 @@ entities:
pos: 14.5,46.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 7968
- 7965
Expand Down Expand Up @@ -5960,8 +5952,6 @@ entities:
pos: 44.5,-9.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 445
- 8018
Expand Down Expand Up @@ -6278,8 +6268,6 @@ entities:
pos: 59.5,28.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 8141
- 8142
Expand Down Expand Up @@ -7522,7 +7510,7 @@ entities:
pos: 70.5,-27.5
parent: 2
- type: Door
secondsUntilStateChange: -5933.1836
secondsUntilStateChange: -6152.204
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -7595,7 +7583,7 @@ entities:
pos: 84.5,57.5
parent: 2
- type: Door
secondsUntilStateChange: -16036.741
secondsUntilStateChange: -16255.762
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -8049,7 +8037,7 @@ entities:
pos: 43.5,33.5
parent: 2
- type: Door
secondsUntilStateChange: -13371.057
secondsUntilStateChange: -13590.077
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -48170,8 +48158,6 @@ entities:
pos: 58.5,33.5
parent: 2
- type: DeviceList
# configurators:
# - invalid
devices:
- 8076
- 8075
Expand Down Expand Up @@ -48394,7 +48380,7 @@ entities:
- 7710
- 80
- type: Door
secondsUntilStateChange: -38988.836
secondsUntilStateChange: -39207.855
state: Closing
- type: Firelock
emergencyCloseCooldown: 85100.4006158
Expand All @@ -48418,7 +48404,7 @@ entities:
- 81
- 7711
- type: Door
secondsUntilStateChange: -39387.836
secondsUntilStateChange: -39606.855
state: Closing
- type: Firelock
emergencyCloseCooldown: 86093.4281942
Expand Down Expand Up @@ -49127,7 +49113,7 @@ entities:
pos: 66.5,-1.5
parent: 2
- type: Door
secondsUntilStateChange: -37754.125
secondsUntilStateChange: -37973.145
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -49592,7 +49578,7 @@ entities:
pos: 82.5,45.5
parent: 2
- type: Door
secondsUntilStateChange: -39477.895
secondsUntilStateChange: -39696.914
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -50425,7 +50411,7 @@ entities:
pos: 21.5,23.5
parent: 2
- type: Door
secondsUntilStateChange: -24403.965
secondsUntilStateChange: -24622.986
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -50507,7 +50493,7 @@ entities:
pos: 16.5,5.5
parent: 2
- type: Door
secondsUntilStateChange: -24748.535
secondsUntilStateChange: -24967.557
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -50587,7 +50573,7 @@ entities:
pos: 32.5,-2.5
parent: 2
- type: Door
secondsUntilStateChange: -37389.953
secondsUntilStateChange: -37608.973
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -51224,7 +51210,7 @@ entities:
pos: 58.5,23.5
parent: 2
- type: Door
secondsUntilStateChange: -14234.729
secondsUntilStateChange: -14453.749
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -51336,7 +51322,7 @@ entities:
pos: 82.5,62.5
parent: 2
- type: Door
secondsUntilStateChange: -15811.47
secondsUntilStateChange: -16030.49
state: Closing
- uid: 8082
components:
Expand Down Expand Up @@ -51459,7 +51445,7 @@ entities:
pos: 64.5,36.5
parent: 2
- type: Door
secondsUntilStateChange: -26385.248
secondsUntilStateChange: -26604.27
state: Closing
- type: DeviceNetwork
deviceLists:
Expand Down Expand Up @@ -51909,7 +51895,7 @@ entities:
pos: 40.5,73.5
parent: 2
- type: Door
secondsUntilStateChange: -30458.215
secondsUntilStateChange: -30677.236
state: Closing
- type: Firelock
emergencyCloseCooldown: 82208.0035082
Expand Down Expand Up @@ -96811,6 +96797,13 @@ entities:
- type: Transform
pos: 74.5,38.5
parent: 2
- proto: SpawnPointADTSecborg
entities:
- uid: 18126
components:
- type: Transform
pos: 36.5,55.5
parent: 2
- proto: SpawnPointAtmos
entities:
- uid: 14901
Expand Down
46 changes: 8 additions & 38 deletions Resources/Maps/ADTMaps/ADTStations/adt_astra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115283,7 +115283,7 @@ entities:
pos: 29.5,-30.5
parent: 2
- type: Door
secondsUntilStateChange: -1696.3945
secondsUntilStateChange: -1728.3838
state: Closing
- uid: 17086
components:
Expand Down Expand Up @@ -181870,43 +181870,6 @@ entities:
rot: -1.5707963267948966 rad
pos: -64.73485,-33.68395
parent: 2
- proto: RiotBulletShield
entities:
- uid: 26828
components:
- type: Transform
pos: 65.3617,-4.430693
parent: 2
- uid: 26829
components:
- type: Transform
pos: 65.68115,-4.421434
parent: 2
- uid: 26830
components:
- type: Transform
pos: 65.500595,-4.6019893
parent: 2
- uid: 26831
components:
- type: Transform
pos: 45.59504,7.4947042
parent: 2
- uid: 26832
components:
- type: Transform
pos: 45.25129,7.4790792
parent: 2
- uid: 26833
components:
- type: Transform
pos: 45.43879,7.3697042
parent: 2
- uid: 37166
components:
- type: Transform
pos: 6.4677124,-10.531189
parent: 36616
- proto: RiotLaserShield
entities:
- uid: 14335
Expand Down Expand Up @@ -188608,6 +188571,13 @@ entities:
- type: Transform
pos: -55.5,-37.5
parent: 2
- proto: SpawnPointADTSecborg
entities:
- uid: 26828
components:
- type: Transform
pos: 56.5,-3.5
parent: 2
- proto: SpawnPointAtmos
entities:
- uid: 27779
Expand Down
38 changes: 9 additions & 29 deletions Resources/Maps/ADTMaps/ADTStations/adt_avrite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155692,7 +155692,7 @@ entities:
pos: -12.5,61.5
parent: 2
- type: Door
secondsUntilStateChange: -378933.62
secondsUntilStateChange: -378976.16
state: Closing
- proto: CurtainsPurple
entities:
Expand Down Expand Up @@ -301765,33 +301765,6 @@ entities:
- type: Transform
pos: -79.51644,24.63629
parent: 2
- proto: RiotBulletShield
entities:
- uid: 40461
components:
- type: Transform
pos: -54.43207,-28.538687
parent: 2
- uid: 40462
components:
- type: Transform
pos: -54.43207,-28.538687
parent: 2
- uid: 40463
components:
- type: Transform
pos: -54.43207,-28.538687
parent: 2
- uid: 40464
components:
- type: Transform
pos: -94.4883,50.405964
parent: 2
- uid: 55152
components:
- type: Transform
pos: 6.4677124,-10.531189
parent: 54608
- proto: RiotLaserShield
entities:
- uid: 40465
Expand Down Expand Up @@ -312871,6 +312844,13 @@ entities:
- type: Transform
pos: 36.5,-59.5
parent: 2
- proto: SpawnPointADTSecborg
entities:
- uid: 40461
components:
- type: Transform
pos: -37.5,-29.5
parent: 2
- proto: SpawnPointAtmos
entities:
- uid: 42184
Expand Down Expand Up @@ -392638,7 +392618,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -140003.8
secondsUntilStateChange: -140046.33
state: Opening
- uid: 53257
components:
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/ADTMaps/ADTStations/adt_bagel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128801,6 +128801,13 @@ entities:
- type: Transform
pos: 38.5,-9.5
parent: 2
- proto: SpawnPointADTSecborg
entities:
- uid: 24525
components:
- type: Transform
pos: -28.5,-4.5
parent: 2
- proto: SpawnPointAtmos
entities:
- uid: 19432
Expand Down
11 changes: 9 additions & 2 deletions Resources/Maps/ADTMaps/ADTStations/adt_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11778,7 +11778,7 @@ entities:
pos: 24.5,16.5
parent: 8364
- type: Door
secondsUntilStateChange: -4480.5684
secondsUntilStateChange: -4527.1733
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -84687,7 +84687,7 @@ entities:
pos: 41.5,-13.5
parent: 8364
- type: Door
secondsUntilStateChange: -1093.0336
secondsUntilStateChange: -1139.6385
state: Closing
- type: Firelock
emergencyCloseCooldown: 53864.6889944
Expand Down Expand Up @@ -144154,6 +144154,13 @@ entities:
- type: Transform
pos: 44.5,-19.5
parent: 8364
- proto: SpawnPointADTSecborg
entities:
- uid: 22528
components:
- type: Transform
pos: 14.5,34.5
parent: 8364
- proto: SpawnPointAtmos
entities:
- uid: 17809
Expand Down
Loading

0 comments on commit 0bf309b

Please sign in to comment.