Фиксы и фичи еще раз (#426)

* fix: constructs are cultists now * rename: announcementPrototype -> arrivalNotificationPrototype * fix: fix naming * fix: hop became head * resprite: cult bola looks like cult stuff now * add: repsrite files * translation: translation for cult bola * tweak: now bola fits in belt * refactor: refactor KnockDownOnCollideSystem * tweak: bolas knockdown on hit * add: energy bola * cleanup: less components
2024-07-06 09:34:29 +03:00
parent ccbbeb1d02
commit d9b8325fa7
27 changed files with 134 additions and 40 deletions
--- a/Resources/Locale/ru-RU/_white/white-shit.ftl
+++ b/Resources/Locale/ru-RU/_white/white-shit.ftl
@@ -50,4 +50,13 @@ salvage-expedition-difficulty-Minor = Незначительная

 ent-ToySwordDouble = двойной игрушечный меч

+# Cult

+ent-CultBola = магическая { ent-Bola }
+    .desc = { ent-Bola.desc }
+    .suffic = культ
+
+# Energy bola
+
+ent-EnergyBola = энергобола
+    .desc = Соверешенное слияние технологии и справедливости для отлова преступников.
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/sec.yml
@@ -7,7 +7,7 @@
    SmokeGrenade: 6
    GrenadeStinger: 4
    Flash: 7
-    Bola: 7
+    EnergyBola: 7
    Tourniquet: 7
    FlashlightSeclite: 5
    ClothingEyesGlassesSunglasses: 2
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -519,6 +519,7 @@
        - SmokeOnTrigger
        - Flash
        - Handcuff
+        - Ensnaring
  - type: ItemMapper
    mapLayers:
      flashbang:
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/bolts.yml
@@ -26,4 +26,3 @@
        hard: false
        mask:
        - Opaque
-  - type: KnockdownOnCollide
--- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/mini_ebow.yml
@@ -34,3 +34,4 @@
          True: { state: icon }
          False: { state: empty }
  - type: Appearance
+    useBlur: true
--- a/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Throwable/bola.yml
@@ -44,9 +44,12 @@
    breakoutTime: 3.5 #all bola should generally be fast to remove
    walkSpeed: 0.7 #makeshift bola shouldn't slow too much
    sprintSpeed: 0.7
-    staminaDamage: 55 # Sudden weight increase sapping stamina
+    staminaDamage: 33 # Sudden weight increase sapping stamina
    canThrowTrigger: true
    canMoveBreakout: true
+  - type: KnockdownOnCollide
+
+# WD added

 - type: entity
  parent: Bola
@@ -54,9 +57,42 @@
  name: Bola
  description: Linked together with some spare cuffs and metal.
  components:
+    - type: Sprite
+      sprite: White/Cult/bola.rsi
    - type: Ensnaring
      freeTime: 2.0
      breakoutTime: 3.5 #all bola should generally be fast to remove
      walkSpeed: 0.5
      sprintSpeed: 0.5
      canThrowTrigger: true
+
+- type: entity
+  parent: Bola
+  id: EnergyBola
+  name: Bola
+  description: Linked together with some spare cuffs and metal.
+  components:
+  - type: Item
+    size: Small
+  - type: Sprite
+    sprite: White/Objects/Weapons/Throwable/energybola.rsi
+  - type: Ensnaring
+    freeTime: 1
+    breakoutTime: 2
+    walkSpeed: 0.8
+    sprintSpeed: 0.8
+    staminaDamage: 33
+  - type: EmitSoundOnLand
+    collection: sparks
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: EnergyMiss
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: KnockdownOnCollide
--- a/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
+++ b/Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
@@ -15,7 +15,7 @@
  weight: 10
  startingGear: QuartermasterGear
  icon: "JobIconQuarterMaster"
-  announcementPrototype: QuartermasterArrivalNotification
+  arrivalNotificationPrototype: QuartermasterArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Command/captain.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/captain.yml
@@ -20,7 +20,7 @@
  icon: "JobIconCaptain"
  requireAdminNotify: true
  joinNotifyCrew: true
-  announcementPrototype: CaptainArrivalNotification
+  arrivalNotificationPrototype: CaptainArrivalNotification
  supervisors: job-supervisors-centcom
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
+++ b/Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
@@ -19,7 +19,7 @@
  startingGear: HoPGear
  icon: "JobIconHeadOfPersonnel"
  requireAdminNotify: true
-  announcementPrototype: HeadOfPersonnelArrivalNotification
+  arrivalNotificationPrototype: HeadOfPersonnelArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
@@ -16,7 +16,7 @@
  startingGear: ChiefEngineerGear
  icon: "JobIconChiefEngineer"
  requireAdminNotify: true
-  announcementPrototype: ChiefEngineerArrivalNotification
+  arrivalNotificationPrototype: ChiefEngineerArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
+++ b/Resources/Prototypes/Roles/Jobs/Justice/inspector.yml
@@ -14,7 +14,7 @@
      time: 36000 #10 hrs
  startingGear: InspectorGear
  icon: "JobIconInspector"
-  announcementPrototype: InspectorArrivalNotification
+  arrivalNotificationPrototype: InspectorArrivalNotification
  supervisors: job-supervisors-captain
  access:
    - Service
--- a/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
+++ b/Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
@@ -14,7 +14,7 @@
  weight: 10
  startingGear: CMOGear
  icon: "JobIconChiefMedicalOfficer"
-  announcementPrototype: ChiefMedicalOfficerArrivalNotification
+  arrivalNotificationPrototype: ChiefMedicalOfficerArrivalNotification
  requireAdminNotify: true
  supervisors: job-supervisors-captain
  whitelistedSpecies:
--- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
+++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml
@@ -13,7 +13,7 @@
  startingGear: ResearchDirectorGear
  icon: "JobIconResearchDirector"
  requireAdminNotify: true
-  announcementPrototype: ResearchDirectorArrivalNotification
+  arrivalNotificationPrototype: ResearchDirectorArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
+++ b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -16,7 +16,7 @@
  startingGear: HoSGear
  icon: "JobIconHeadOfSecurity"
  requireAdminNotify: true
-  announcementPrototype: HeadOfSecurityArrivalNotification
+  arrivalNotificationPrototype: HeadOfSecurityArrivalNotification
  supervisors: job-supervisors-captain
  whitelistedSpecies:
    - Human
--- a/Resources/Prototypes/_White/Entities/Cult/constructs.yml
+++ b/Resources/Prototypes/_White/Entities/Cult/constructs.yml
@@ -79,6 +79,8 @@
        - DoorBumpOpener
    - type: NameIdentifier
      group: Construct
+    - type: GlobalAntagonist
+      antagonistPrototype: globalAntagonistCult

 - type: entity
  id: JuggernautConstruct
--- a/Resources/Textures/White/Cult/bola.rsi/icon.png
+++ b/Resources/Textures/White/Cult/bola.rsi/icon.png
--- a/Resources/Textures/White/Cult/bola.rsi/meta.json
+++ b/Resources/Textures/White/Cult/bola.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/3cfea7eb92246d311de8b531347795bc76d6dab6",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}
--- a/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/icon.png
+++ b/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/icon.png
--- a/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/meta.json
+++ b/Resources/Textures/White/Objects/Weapons/Throwable/energybola.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": null,
+  "copyright": null,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon",
+      "delays": [
+        [
+          0.1,
+          0.1
+        ]
+      ]
+    }
+  ]
+}