Magic 4 (#345)

* - fix: Fix teleport scroll. * - add: Spell book. * - add: Smite scroll & update shuttle. * - tweak: Tweak cost.
2024-06-10 10:57:32 +00:00
parent d8e71e4926
commit 01511adbb2
24 changed files with 650 additions and 328 deletions
--- a/Resources/Locale/ru-RU/_white/wizard/scrolls.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/scrolls.ftl
@@ -15,6 +15,7 @@ scroll-component-clown = бананы
 scroll-component-silence = тишину
 scroll-component-recall = призыв
 scroll-component-teleport = телепортацию
+scroll-component-smite = кару

 ent-BaseScroll = магический свиток
    .desc = Этот древний пергамент, ставший реликвией в арканных преданиях, хранит в себе бесчисленные мистические заклятия и забытые заклинания.
@@ -46,3 +47,5 @@ ent-ScrollInstantRecall = свиток мгновенного призыва
    .desc = { ent-BaseScroll.desc }
 ent-ScrollTeleport = свиток телепортации
    .desc = { ent-BaseScroll.desc }
+ent-ScrollSmite = свиток кары
+    .desc = { ent-BaseScroll.desc }
--- a/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
+++ b/Resources/Locale/ru-RU/_white/wizard/wizard.ftl
@@ -20,3 +20,13 @@ magic-component-missing-req = Недостающие требования! Ва

 ent-WizardSurviveObjective = Переживете смену, устроив как можно больше хаоса.
    .desc = Федерация Космических Волшебников отправила вас на станцию Nanotrasen, чтобы навести там смуту. Не разочаруйте их.
+
+ent-SpellBook = книга заклинаний
+    .desc = Неземной фолиант, излучающий силу.
+
+store-currency-display-spell-point = Очки заклинаний
+
+store-category-spells-attack = Атакующие заклинания
+store-category-spells-defence = Защитные заклинания
+store-category-spells-utility = Вспомогательные заклинания
+store-category-magic-items = Магические предметы
--- a/Resources/Maps/White/Shuttles/wizard.yml
+++ b/Resources/Maps/White/Shuttles/wizard.yml
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -545,6 +545,7 @@
        Slash: 0.9
        Piercing: 0.9
        Heat: 0.9
+  - type: WizardClothes

 #Organic Space Suit
 - type: entity
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -703,6 +703,7 @@
    useRate: 0
  - type: UseDelay
    delay: 10.0
+  - type: WizardClothes

 #Ling Space Suit
 - type: entity
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -120,4 +120,10 @@
  id: BaseStationAllEventsEligible
  abstract: true
  components:
-    - type: StationEventEligible # For when someone makes this more granular in the future.
+    - type: StationEventEligible # For when someone makes this more granular in the future.
+
+- type: entity
+  id: BaseStationTeleportLocation
+  abstract: true
+  components:
+    - type: TeleportLocationTargetStation
--- a/Resources/Prototypes/Entities/Stations/nanotrasen.yml
+++ b/Resources/Prototypes/Entities/Stations/nanotrasen.yml
@@ -25,6 +25,7 @@
    - BaseStationSiliconLawCrewsimov
    - BaseStationAllEventsEligible
    - BaseStationNanotrasen
+    - BaseStationTeleportLocation
  noSpawn: true
  components:
    - type: Transform
--- a/Resources/Prototypes/Magic/knock_spell.yml
+++ b/Resources/Prototypes/Magic/knock_spell.yml
@@ -4,12 +4,11 @@
  description: This spell opens nearby doors.
  noSpawn: true
  components:
-  - type: Magic
-    requiresClothes: false
  - type: InstantAction
    useDelay: 8
    itemIconStyle: BigAction
    checkCanInteract: false
+    alwaysPlaySound: false
    icon:
      sprite: Objects/Magic/magicactions.rsi
      state: knock
--- a/Resources/Prototypes/Magic/smite_spells.yml
+++ b/Resources/Prototypes/Magic/smite_spells.yml
@@ -1,9 +1,11 @@
- type: entity
+- type: entity
  id: ActionSmite
  name: Smite
  description: Instantly gibs a target.
  noSpawn: true
  components:
+  - type: Magic
+    requiresClothes: true
  - type: EntityTargetAction
    useDelay: 60
    itemIconStyle: BigAction
@@ -12,6 +14,7 @@
      - Body
    canTargetSelf: false
    interactOnMiss: false
+    alwaysPlaySound: false
    sound: !type:SoundPathSpecifier
      path: /Audio/Magic/disintegrate.ogg
    icon:
--- a/Resources/Prototypes/Magic/white.yml
+++ b/Resources/Prototypes/Magic/white.yml
@@ -217,6 +217,9 @@
  noSpawn: true
  components:
    - type: EntityTargetAction
+      whitelist:
+        components:
+        - HumanoidAppearance
      canTargetSelf: false
      range: 3
      useDelay: 60
@@ -233,6 +236,9 @@
  noSpawn: true
  components:
    - type: EntityTargetAction
+      whitelist:
+        components:
+        - HumanoidAppearance
      canTargetSelf: false
      range: 3
      useDelay: 30
@@ -249,6 +255,9 @@
  noSpawn: true
  components:
    - type: EntityTargetAction
+      whitelist:
+        components:
+        - HumanoidAppearance
      canTargetSelf: false
      range: 3
      useDelay: 30
@@ -278,8 +287,6 @@
  name: Teleport
  noSpawn: true
  components:
-    - type: Magic
-      requiresClothes: true
    - type: InstantAction
      checkCanInteract: false
      useDelay: 60
--- a/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
+++ b/Resources/Prototypes/_White/Entities/Objects/Weapons/chaplain_weapons.yml
@@ -36,7 +36,6 @@
    - HolyKatana
    - MultiverseBlade
    - VorpalScythe
-    - HighFrequencyBlade
    - SpellBlade
    - PossessedBlade
    - ChainsawHand
@@ -196,29 +195,6 @@
    sprite: White/Objects/Weapons/Chaplain/scythe-inhands.rsi
  - type: HolyWeapon

- type: entity
-  name: высокочастотный клинок
-  parent: HolyKatana
-  id: HighFrequencyBlade
-  description: Клинок, способный отражать выстрелы.
-  components:
-  - type: Sprite
-    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
-  - type: MeleeWeapon
-    damage:
-      types:
-        Slash: 18
-  - type: Clothing
-    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
-    slots:
-    - back
-    - suitStorage
-  - type: Reflect
-    reflectProb: 0.33
-  - type: Item
-    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
-  - type: HolyWeapon
-
 - type: entity
  name: клинок заклинаний
  parent: HolyKatana
--- a/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml
+++ b/Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml
@@ -142,3 +142,12 @@
    - type: Scroll
      actionId: ActionTeleportSpell
      learnPopup: scroll-component-teleport
+
+- type: entity
+  id: ScrollSmite
+  parent: BaseScroll
+  name: "Smite scroll"
+  components:
+    - type: Scroll
+      actionId: ActionSmite
+      learnPopup: scroll-component-smite
--- a/Resources/Prototypes/_White/Wizard/magic_items.yml
+++ b/Resources/Prototypes/_White/Wizard/magic_items.yml
@@ -0,0 +1,23 @@
+- type: entity
+  name: высокочастотный клинок
+  parent: Katana
+  id: HighFrequencyBlade
+  description: Клинок, атакующий с невероятной быстротой, а также способный отражать выстрелы.
+  components:
+  - type: Sprite
+    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
+  - type: MeleeWeapon
+    autoAttack: true
+    attackRate: 4
+    damage:
+      types:
+        Slash: 10
+  - type: Clothing
+    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
+    slots:
+    - back
+    - suitStorage
+  - type: Reflect
+    reflectProb: 0.4
+  - type: Item
+    sprite: White/Objects/Weapons/Chaplain/hfrequency.rsi
--- a/Resources/Prototypes/_White/Wizard/spellbook.yml
+++ b/Resources/Prototypes/_White/Wizard/spellbook.yml
@@ -0,0 +1,63 @@
+- type: entity
+  id: SpellBook
+  parent: BaseItem
+  name: spell book
+  description: An unearthly tome that glows with power.
+  components:
+  - type: Sprite
+    sprite: Objects/Misc/books.rsi
+    layers:
+    - state: paper
+    - state: cover_old
+      color: "#473F40"
+    - state: decor_wingette
+      color: "#352D2F"
+    - state: icon_stars
+      color: gold
+  - type: UserInterface
+    interfaces:
+    - key: enum.StoreUiKey.Key
+      type: StoreBoundUserInterface
+  - type: ActivatableUI
+    key: enum.StoreUiKey.Key
+  - type: Store
+    preset: StorePresetSpellBook
+    balance:
+      SpellPoint: 10
+  - type: GiftIgnore
+
+- type: storePreset
+  id: StorePresetSpellBook
+  storeName: Spell Book
+  categories:
+  - AttackSpells
+  - DefenceSpells
+  - UtilitySpells
+  - MagicItems
+  currencyWhitelist:
+  - SpellPoint
+
+- type: currency
+  id: SpellPoint
+  displayName: store-currency-display-spell-point
+  canWithdraw: false
+
+- type: storeCategory
+  id: AttackSpells
+  name: store-category-spells-attack
+  priority: 0
+
+- type: storeCategory
+  id: DefenceSpells
+  name: store-category-spells-defence
+  priority: 1
+
+- type: storeCategory
+  id: UtilitySpells
+  name: store-category-spells-utility
+  priority: 2
+
+- type: storeCategory
+  id: MagicItems
+  name: store-category-magic-items
+  priority: 3
--- a/Resources/Prototypes/_White/Wizard/spellbook_catalog.yml
+++ b/Resources/Prototypes/_White/Wizard/spellbook_catalog.yml
@@ -0,0 +1,249 @@
+- type: listing
+  id: SpellBookFireball
+  name: spellbook-fireball-name
+  description: spellbook-fireball-desc
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: fireball
+  productEntity: ScrollFireball
+  cost:
+    SpellPoint: 2
+  categories:
+  - AttackSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookForcewall
+  name: spellbook-forcewall-name
+  description: spellbook-forcewall-desc
+  productEntity: ScrollForcewall
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: shield
+  cost:
+    SpellPoint: 1
+  categories:
+  - DefenceSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookKnock
+  name: spellbook-knock-name
+  description: spellbook-knock-desc
+  productEntity: ScrollKnock
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: knock
+  cost:
+    SpellPoint: 1
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookArc
+  name: spellbook-arc-name
+  description: spellbook-arc-desc
+  productEntity: ScrollArc
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: thunder
+  cost:
+    SpellPoint: 2
+  categories:
+  - AttackSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookForce
+  name: spellbook-force-name
+  description: spellbook-force-desc
+  productEntity: ScrollForce
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: push
+  cost:
+    SpellPoint: 2
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookCards
+  name: spellbook-cards-name
+  description: spellbook-cards-desc
+  productEntity: ScrollCards
+  icon:
+    sprite: Objects/Magic/card.rsi
+    state: icon
+  cost:
+    SpellPoint: 2
+  categories:
+  - AttackSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookBlink
+  name: spellbook-blink-name
+  description: spellbook-blink-desc
+  productEntity: ScrollBlink
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: blink
+  cost:
+    SpellPoint: 1
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookEtherealJaunt
+  name: spellbook-jaunt-name
+  description: spellbook-jaunt-desc
+  productEntity: ScrollEtherealJaunt
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: jaunt
+  cost:
+    SpellPoint: 2
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookEmp
+  name: spellbook-emp-name
+  description: spellbook-emp-desc
+  productEntity: ScrollEmp
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: emp_new
+  cost:
+    SpellPoint: 1
+  categories:
+  - DefenceSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookCluwneCurse
+  name: spellbook-cluwne-name
+  description: spellbook-cluwne-desc
+  productEntity: ScrollCluwneCurse
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: cluwne
+  cost:
+    SpellPoint: 2
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookBananaTouch
+  name: spellbook-clown-name
+  description: spellbook-clown-desc
+  productEntity: ScrollBananaTouch
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: clown
+  cost:
+    SpellPoint: 1
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookMimeTouch
+  name: spellbook-mime-name
+  description: spellbook-mime-desc
+  productEntity: ScrollMimeTouch
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: mime_curse
+  cost:
+    SpellPoint: 1
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookInstantRecall
+  name: spellbook-recall-name
+  description: spellbook-recall-desc
+  productEntity: ScrollInstantRecall
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: summons
+  cost:
+    SpellPoint: 1
+  categories:
+  - UtilitySpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookSmite
+  name: spellbook-smite-name
+  description: spellbook-smite-desc
+  productEntity: ScrollSmite
+  icon:
+    sprite: Objects/Magic/magicactions.rsi
+    state: gib
+  cost:
+    SpellPoint: 2
+  categories:
+  - AttackSpells
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookHardsuit
+  name: spellbook-hardsuit-name
+  description: spellbook-hardsuit-desc
+  productEntity: ClothingOuterHardsuitWizard
+  cost:
+    SpellPoint: 4
+  categories:
+  - MagicItems
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
+
+- type: listing
+  id: SpellBookHighFrequencyBlade
+  name: spellbook-hfrequency-name
+  description: spellbook-hfrequency-desc
+  productEntity: HighFrequencyBlade
+  cost:
+    SpellPoint: 2
+  categories:
+  - MagicItems
+  conditions:
+  - !type:ListingLimitedStockCondition
+    stock: 1
--- a/Resources/Prototypes/_White/Wizard/wizard.yml
+++ b/Resources/Prototypes/_White/Wizard/wizard.yml
@@ -42,6 +42,7 @@
    head: ClothingHeadHatRealWizardFancy
    outerClothing: ClothingOuterRealWizardFancy
    shoes: ClothingShoesWizard
+    pocket1: SpellBook
  innerClothingSkirt: ClothingUniformJumpskirtColorDarkBlue
  satchel: ClothingBackpackSatchelFilled
  duffelbag: ClothingBackpackDuffelFilled