Merge branch 'master' into hardlight-spear

WWhiteDreamProject · Oct 11, 2024 · 5ec0722 · 5ec0722
2 parents 2ba61e9 + 574de10
commit 5ec0722
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 10 deletions.
diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
@@ -6502,3 +6502,26 @@ Entries:
   id: 6360
   time: '2024-09-29T12:15:14.0000000+00:00'
   url: https://github.com/WWhiteDreamProject/wwdpublic/pull/68
+- author: Spatison
+  changes:
+    - type: Tweak
+      message: Dwarf now weigh more / Дварфы теперь весят больше
+  id: 6361
+  time: '2024-10-11T03:54:12.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/83
+- author: Spatison
+  changes:
+    - type: Fix
+      message: >-
+        No more discounts in uplink implant / Больше никаких скидок в имплант
+        аплинка
+  id: 6362
+  time: '2024-10-11T03:55:38.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/81
+- author: Spatison
+  changes:
+    - type: Add
+      message: Added smoke implant / Добавлен имплант дыма
+  id: 6363
+  time: '2024-10-11T04:07:40.0000000+00:00'
+  url: https://github.com/WWhiteDreamProject/wwdpublic/pull/79
diff --git a/Resources/Locale/en-US/_white/store/uplink-catalog.ftl b/Resources/Locale/en-US/_white/store/uplink-catalog.ftl
@@ -12,3 +12,6 @@ uplink-ebow-desc = A fairly quiet weapon that automatically reloads and stuns. I
 
 uplink-hardlight-spear-implant-name = Hardlight spear implanter
 uplink-hardlight-spear-implant-desc = An implant injected into the body, and later activated at the user's will. It will summon a spear made out of hardlight that the user can use to wreak havoc.
+
+uplink-smoke-implant-name = Smoke implant
+uplink-smoke-implant-desc = Releases a cloud of smoke when activated.
diff --git a/Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl b/Resources/Locale/ru-RU/_white/prototypes/actions/types.ftl
@@ -1,2 +1,5 @@
 ent-ActivateHardlightSpearImplant = Создать световое копьё
-    .desc = Создает световое копьё в ваших руках.
+    .desc = Создает световое копьё в ваших руках.
+
+ent-ActivateSmokeImplant = Выпустить облако дыма
+    .desc = Выпускает облако дыма вокруг вас.
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/implanters.ftl
@@ -1,3 +1,6 @@
 ent-HardlightSpearImplanter = { ent-BaseImplanter }
     .desc = { ent-BaseImplanter.desc }
-    .suffix = световое копьё
+    .suffix = световое копьё
+
+ent-SmokeImplanter = { ent-BaseImplanter }
+    .desc = { ent-BaseImplanter.desc }
diff --git a/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl b/Resources/Locale/ru-RU/_white/prototypes/entities/objects/misc/subdermal_implants.ftl
@@ -1,2 +1,5 @@
 ent-HardlightSpearImplant = имплант световое копьё
-    .desc = Этот имплант создаёт световое копьё в ваших руках.
+    .desc = Этот имплант создаёт световое копьё в ваших руках.
+
+ent-SmokeImplant = имплант дыма
+    .desc = Этот имплант выпускает облако дыма при активации.
diff --git a/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl b/Resources/Locale/ru-RU/_white/store/uplink-catalog.ftl
@@ -11,4 +11,7 @@ uplink-ebow-name = Маленький энергетический арбале
 uplink-ebow-desc = Довольно тихое оружие, которое автоматически перезаряжается и оглушает. Хорошо сочетается с другими видами оружия.
 
 uplink-hardlight-spear-implant-name = Имплант светового копья
-uplink-hardlight-spear-implant-desc = Имплант, вводимый в тело и активируемый по желанию пользователя. Он вызывает копье из твердого света, с помощью которого пользователь может сеять хаос.
+uplink-hardlight-spear-implant-desc = Имплант, вводимый в тело и активируемый по желанию пользователя. Он вызывает копье из твердого света, с помощью которого пользователь может сеять хаос.
+
+uplink-smoke-implant-name = Имплант дыма
+uplink-smoke-implant-desc = Выпускает облако дыма при активации.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -35,8 +35,7 @@
         shape:
           !type:PhysShapeCircle
           radius: 0.35
-        # they r smaller
-        density: 120
+        density: 240 # WD EDIT
         restitution: 0.0
         mask:
         - MobMask

diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -155,7 +155,7 @@
       components:
       - Hands # prevent mouse buying grenade penguin since its not telepathic
   - type: Store
-    preset: StorePresetUplink
+    preset: StorePresetUplinkNoDiscounts
     balance:
       Telecrystal: 0
   - type: UserInterface

diff --git a/Resources/Prototypes/_White/Actions/types.yml b/Resources/Prototypes/_White/Actions/types.yml
@@ -11,4 +11,19 @@
     icon:
       sprite: _White/Objects/Weapons/Melee/Spear/hardlight_spear.rsi
       state: spear
-    event: !type:ActivateSpawnImplantEvent
+    event: !type:ActivateSpawnImplantEvent
+
+- type: entity
+  id: ActivateSmokeImplant
+  name: Release a cloud of smoke
+  description: Releases a cloud of smoke around you.
+  noSpawn: true
+  components:
+  - type: InstantAction
+    useDelay: 20
+    itemIconStyle: BigAction
+    priority: -20
+    icon:
+      sprite: Objects/Weapons/Grenades/smoke.rsi
+      state: icon
+    event: !type:ActivateImplantEvent
diff --git a/Resources/Prototypes/_White/Catalog/uplink_catalog.yml b/Resources/Prototypes/_White/Catalog/uplink_catalog.yml
@@ -67,4 +67,15 @@
     blacklist:
       tags:
       - NukeOpsUplink
-  saleLimit: 1
+  saleLimit: 1
+
+- type: listing
+  id: UplinkSmokeImplanter
+  name: uplink-smoke-implant-name
+  description: uplink-smoke-implant-desc
+  icon: { sprite: /Textures/Objects/Weapons/Grenades/smoke.rsi, state: icon }
+  productEntity: SmokeImplanter
+  cost:
+    Telecrystal: 2
+  categories:
+  - UplinkImplants
diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/implanters.yml
@@ -6,3 +6,11 @@
   components:
     - type: Implanter
       implant: HardlightSpearImplant
+
+- type: entity
+  parent: BaseImplantOnlyImplanterSyndi
+  id: SmokeImplanter
+  suffix: smoke
+  components:
+  - type: Implanter
+    implant: SmokeImplant
diff --git a/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/_White/Entities/Objects/Misc/subdermal_implants.yml
@@ -8,4 +8,20 @@
     - type: SubdermalImplant
       implantAction: ActivateHardlightSpearImplant
     - type: SpawnImplant
-      spawnId: HardlightSpear
+      spawnId: HardlightSpear
+
+- type: entity
+  parent: BaseSubdermalImplant
+  id: SmokeImplant
+  name: smoke implant
+  description: This implant releases smoke cloud on activation.
+  noSpawn: true
+  components:
+    - type: SubdermalImplant
+      implantAction: ActivateSmokeImplant
+    - type: TriggerImplantAction
+    - type: SmokeOnTrigger
+      spreadAmount: 25
+      duration: 15
+    - type: SoundOnTrigger
+      sound: /Audio/Effects/smoke.ogg
diff --git a/Resources/Prototypes/_White/Store/presets.yml b/Resources/Prototypes/_White/Store/presets.yml
@@ -0,0 +1,17 @@
+- type: storePreset
+  id: StorePresetUplinkNoDiscounts
+  storeName: Uplink
+  categories:
+  - UplinkWeapons
+  - UplinkAmmo
+  - UplinkExplosives
+  - UplinkMisc
+  - UplinkBundles
+  - UplinkTools
+  - UplinkUtility
+  - UplinkImplants
+  - UplinkJob
+  - UplinkArmor
+  - UplinkPointless
+  currencyWhitelist:
+  - Telecrystal