More blood (#514)

* - add: Some construct stuff.

* - add: Some rune stuff.

* - add: Unvisit.

* - add: Better blood rites.

Resources/Locale/ru-RU/_white/cult/entities.ftl

@@ -8,6 +8,9 @@ ent-SoulShardGhost = камень душ
 ent-StunHand = оглушающая аура
     .desc = Оглушит и обезмолвит жертву при ударе.
 
+ent-RitesHand = аура кровавых обрядов
+    .desc = Впитывает кровь из всего, к чему прикасается. При ударе по культистам и конструктам может исцелить их. Используйте в руке, чтобы провести продвинутый обряд.
+
 ent-ShadowShackles = теневые оковы
     .desc = Оковы, сковывающие запястья с помощью зловещей магии.
 

Resources/Locale/ru-RU/_white/cult/messages.ftl

@@ -1,3 +1,12 @@
-cult-stun-component-extra-message = [color=darkgray]Выбросите ауру, чтобы навсегда избавиться от неё.[/color]
+cult-hand-component-extra-message = [color=darkgray]Выбросите ауру, чтобы навсегда избавиться от неё.[/color]
 cult-magic-holy = Сила священного предмета в руках цели препятствует магии!
 cult-magic-no-empty-hand = Вам нужна свободная рука для использования заклинания!
+
+cult-rites-examine = [color=darkred]Всего высосано крови: { $blood }.[/color]
+cult-rites-message = Всего высосано крови: { $blood }.
+cult-rites-dead = Цель мертва.
+cult-rites-heal-no-blood = Нет крови для лечения.
+cult-rites-already-healed = Он не имеет повреждений.
+cult-rites-after-heal = Осталось крови: { $blood }.
+cult-rites-no-blood = Для обряда необходимо высосать { $required } крови с помощью заклинания Кровавые Обряды. Всего высосано: { $blood }.
+cult-rites-no-hand = Вам нужна свободная рука для обряда.

Resources/Locale/ru-RU/_white/cult/verb.ftl

@@ -7,8 +7,3 @@ verb-spell-create-too-much = Начертите руну могущества,
 verb-spell-remove-text = Удалить заклинание крови
 verb-spell-remove-message = Убрать любое из созданных заклинаний крови.
 verb-spell-remove-no-spells = Заклинания крови отсутствуют.
-
-verb-blood-rites-text = Кровавые обряды
-verb-blood-rites-message = Всего высосано крови: { $blood }.
-verb-blood-rites-no-blood = Для обряда необходимо высосать { $required } крови с помощью заклинания Кровавые Обряды. Всего высосано: { $blood }.
-verb-blood-rites-no-hand = Вам нужна свободная рука для обряда.

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -221,8 +221,6 @@
         type: SpellSelectorBUI
       - key: enum.CultEmpowerRemoveUiKey.Key
         type: SpellRemoverBUI
-      - key: enum.BloodRitesUi.Key
-        type: CultistFactoryBUI
       # WD-EDIT END
   - type: Puller
   - type: Butcherable

Resources/Prototypes/_White/Actions/cult_actions.yml

@@ -123,7 +123,6 @@
         sprite: /Textures/White/Cult/actions_cult.rsi
         state: blood_rites
       event: !type:CultBloodRitesInstantActionEvent
-        speech: "Fel'th Dol Ab'orod!"
       charges: 5
       temporary: true
       removeOnNoCharges: true

Resources/Prototypes/_White/Entities/Cult/Effects/effects.yml

@@ -1,13 +1,11 @@
 - type: entity
-  id: CultTileSpawnEffect
-  name: Sparkle
+  id: CultTileEffect
+  name: cult tile effect
   placement:
     mode: SnapgridCenter
   components:
-    # Animation is like 3 something seconds so we just need to despawn it before then.
     - type: TimedDespawn
       lifetime: 0.5
-    - type: EvaporationSparkle
     - type: Transform
       noRot: true
       anchored: true
@@ -19,6 +17,14 @@
       netsync: false
       drawdepth: FloorObjects
       color: "#FF0000"
+
+- type: entity
+  parent: CultTileEffect
+  id: CultTileSpawnEffect
+  name: cult tile glow
+  placement:
+    mode: SnapgridCenter
+  components:
     - type: PointLight
       color: "#FF0000"
 
@@ -26,10 +32,8 @@
   id: CultTeleportInEffect
   name: Teleport in
   components:
-    # Animation is like 3 something seconds so we just need to despawn it before then.
     - type: TimedDespawn
       lifetime: 0.8
-    - type: EvaporationSparkle
     - type: Transform
       noRot: true
       anchored: true
@@ -47,10 +51,8 @@
   id: CultTeleportOutEffect
   name: Teleport out
   components:
-    # Animation is like 3 something seconds so we just need to despawn it before then.
     - type: TimedDespawn
       lifetime: 0.8
-    - type: EvaporationSparkle
     - type: Transform
       noRot: true
       anchored: true
@@ -70,7 +72,6 @@
   components:
     - type: TimedDespawn
       lifetime: 1
-    - type: EvaporationSparkle
     - type: Transform
       noRot: true
       anchored: true
@@ -90,7 +91,6 @@
   components:
     - type: TimedDespawn
       lifetime: 1
-    - type: EvaporationSparkle
     - type: Transform
       noRot: true
       anchored: true

Resources/Prototypes/_White/Entities/Cult/Items/hands.yml

@@ -0,0 +1,74 @@
+- type: entity
+  parent: BaseItem
+  id: BaseCultHand
+  abstract: true
+  noSpawn: true
+  name: magical aura
+  description: A sinister looking aura that distorts the flow of reality around it.
+  components:
+  - type: Item
+    size: Ginormous
+  - type: MeleeWeapon
+    canHeavyAttack: false
+    canMiss: false
+    attackRate: 2
+    wideAnimationRotation: 180
+    damage:
+      types:
+        Heat: 0
+  - type: DeleteOnDropAttempt
+    message: cult-hand-component-extra-message
+  - type: Unremoveable
+    deleteOnDrop: true
+  - type: CultItem
+    canPickUp: false
+
+- type: entity
+  parent: BaseCultHand
+  id: StunHand
+  name: stunning aura
+  description: Will stun and mute a weak-minded victim on hit.
+  components:
+  - type: Sprite
+    sprite: White/Cult/Entities/stun.rsi
+    state: icon
+  - type: Item
+    sprite: White/Cult/Entities/stun.rsi
+  - type: MeleeWeapon
+    canAttackSelf: false
+    attackWhitelist:
+      components:
+      - StatusEffects
+    attackBlacklist:
+      components:
+      - Cultist
+      - Construct
+  - type: CultStunHand
+    speech: "Fuu ma'jin!"
+
+- type: entity
+  parent: BaseCultHand
+  id: RitesHand
+  name: blood rite aura
+  description: Absorbs blood from anything you touch. Touching cultists and constructs can heal them. Use in-hand to cast an advanced rite.
+  components:
+  - type: Sprite
+    sprite: White/Cult/Entities/rites.rsi
+    state: icon
+  - type: Item
+    sprite: White/Cult/Entities/rites.rsi
+  - type: MeleeWeapon
+    attackWhitelist:
+      components:
+      - Cultist
+      - Construct
+  - type: CultRitesHand
+    speech: "Fel'th Dol Ab'orod!"
+  - type: ActivatableUI
+    key: enum.BloodRitesUi.Key
+    inHandsOnly: true
+    closeOnHandDeselect: true
+  - type: UserInterface
+    interfaces:
+    - key: enum.BloodRitesUi.Key
+      type: CultistFactoryBUI

Resources/Prototypes/_White/Entities/Cult/Items/stun_hand.yml

@@ -1,34 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: StunHand
-  name: stunning aura
-  description: Will stun and mute a weak-minded victim on hit.
-  components:
-  - type: Sprite
-    sprite: White/Cult/Entities/stun.rsi
-    state: icon
-  - type: Item
-    size: Ginormous
-    sprite: White/Cult/Entities/stun.rsi
-  - type: MeleeWeapon
-    canHeavyAttack: false
-    canAttackSelf: false
-    canMiss: false
-    attackWhitelist:
-      components:
-      - StatusEffects
-    attackBlacklist:
-      components:
-      - Cultist
-      - Construct
-    wideAnimationRotation: 180
-    damage:
-      types:
-        Heat: 0
-  - type: CultStunHand
-  - type: DeleteOnDropAttempt
-    message: cult-stun-component-extra-message
-  - type: Unremoveable
-    deleteOnDrop: true
-  - type: CultItem
-    canPickUp: false

Resources/Prototypes/_White/Entities/Cult/Runes/cult_runes.yml

@@ -30,6 +30,7 @@
   - type: Appearance
   - type: CultRuneBase
     invokePhrase: "Qu'laris ver'don, thal'sorin mik'thar!"
+    gatherInvokers: false
   - type: CultRuneBuff
   - type: CultRune
   - type: Concealable
@@ -47,6 +48,8 @@
       color: '#F80000'
   - type: Appearance
   - type: CultRuneBase
+    invokePhrase: "H'drak v'loso, mir'kanas verbot!"
+    gatherInvokers: false
   - type: CultEmpower
     isRune: true
   - type: UserInterface
@@ -55,7 +58,6 @@
       type: SpellSelectorBUI
   - type: CultRune
   - type: Concealable
-    examinableWhileConcealed: true
 
 - type: entity
   parent: CollideRune
@@ -91,7 +93,6 @@
   - type: Appearance
   - type: CultRuneBase
     invokePhrase: "N'ath reth sh'yro eth d'rekkathnor!"
-    gatherInvokers: true
   - type: CultRuneSummoning
   - type: CultRune
   - type: Concealable

Resources/Prototypes/_White/Entities/Cult/constructs.yml

@@ -7,8 +7,8 @@
       context: "human"
     - type: InputMover
     - type: MovementSpeedModifier
-      baseWalkSpeed: 2.5
-      baseSprintSpeed: 2.5
+      baseWalkSpeed: 3
+      baseSprintSpeed: 3
     - type: DamageOnHighSpeedImpact
       damage:
         types:
@@ -61,6 +61,8 @@
     - type: ContentEye
     - type: Actions
     - type: Hands
+    - type: Puller
+      needsHands: false
     - type: ShowCultHud
     - type: IsDeadIC
     - type: NightVision
@@ -138,8 +140,6 @@
       baseWalkSpeed: 3
       baseSprintSpeed: 3
     - type: MovementIgnoreGravity
-    - type: Puller
-      needsHands: false
     - type: MeleeWeapon
       canHeavyAttack: false
       hidden: true
@@ -202,8 +202,6 @@
         150: Dead
     - type: Sprite
       state: harvester
-    - type: Puller
-      needsHands: false
     - type: MeleeWeapon
       canHeavyAttack: false
       hidden: true

Resources/Prototypes/_White/Mobs/Species/harpy.yml

@@ -45,8 +45,6 @@
         type: SpellSelectorBUI
       - key: enum.CultEmpowerRemoveUiKey.Key
         type: SpellRemoverBUI
-      - key: enum.BloodRitesUi.Key
-        type: CultistFactoryBUI
       # WD-EDIT END
   - type: Sprite
     scale: 0.9, 0.9

Resources/Textures/White/Cult/Entities/rites.rsi/meta.json

@@ -0,0 +1,66 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/pull/49264/commits/d0dffe7ca643db2624424fdcebf45863f85c0448",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        },
+        {
+          "name": "inhand-left",
+          "directions": 4,
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        },
+        {
+          "name": "inhand-right",
+          "directions": 4,
+          "delays": [
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ],
+            [
+              0.1,
+              0.1,
+              0.1
+            ]
+          ]
+        }
+    ]
+}