Magic 3 (#340)

* - add: Some tweaks and localization.

* - add: Teleport spell.

* - tweak: Tweak wizard hardsuit.

* - add: Turn off shield on cast.

* - add: New wizard clothes & update wizard shuttle,

* - remove: Remove old clothes from shuttle.

* - fix: No teleporting to centcomm.

Resources/Locale/ru-RU/_white/wizard/scrolls.ftl

@@ -0,0 +1,48 @@
+scroll-component-start = Вы начинаете изучать { $subject }.
+scroll-component-end = Вы изучили { $subject }. Свиток медленно сгорает в ваших руках.
+
+scroll-component-fireball = огненный шар
+scroll-component-forcewall = силовую стену
+scroll-component-knock = тук-тук
+scroll-component-lightning = молнию
+scroll-component-force = силу
+scroll-component-cards = карты
+scroll-component-blink = прыжок
+scroll-component-jaunt = потустороннее путешествие
+scroll-component-emp = ЭМИ
+scroll-component-cluwne = проклятье
+scroll-component-clown = бананы
+scroll-component-silence = тишину
+scroll-component-recall = призыв
+scroll-component-teleport = телепортацию
+
+ent-BaseScroll = магический свиток
+    .desc = Этот древний пергамент, ставший реликвией в арканных преданиях, хранит в себе бесчисленные мистические заклятия и забытые заклинания.
+ent-ScrollFireball = свиток огненного шара
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollForcewall = свиток силовой стены
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollKnock = свиток стука
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollArc = свиток молнии
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollForce = свиток силы
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollCards = свиток карт
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollBlink = свиток прыжка
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollEtherealJaunt = свиток потустороннего путешествия
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollEmp = свиток ЭМИ
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollCluwneCurse = свиток проклятия клувна
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollBananaTouch = свиток бананового касания
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollMimeTouch = свиток касания мима
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollInstantRecall = свиток мгновенного призыва
+    .desc = { ent-BaseScroll.desc }
+ent-ScrollTeleport = свиток телепортации
+    .desc = { ent-BaseScroll.desc }

Resources/Locale/ru-RU/_white/wizard/wizard.ftl

@@ -11,9 +11,12 @@ roles-antag-wizard-objective = Устройте хаос на станции
 
 wizard-round-end-agent-name = космический волшебник
 
-wizard-welcome = Вы - космический волшебник. Федерация Космических Волшебников отправила вас на станцию {$station}, дабы посеять хаос. Не разочаруйте их.
+wizard-welcome = Вы - космический волшебник. Федерация Космических Волшебников отправила вас на станцию {$station}, дабы посеять хаос. Вы можете попасть на станцию с помощью гиперпрыжка или с помощью магии телепортации.
 
 wizard-no-more-threat-announcement-shuttle-call = Судя по данным наших датчиков дальнего действия, магическая угроза была устранена. Эвакуационный шаттл скоро прибудет. Время прибытия: {$time} {$units}. Вы можете отозвать его, чтобы продлить смену.
 wizard-no-more-threat-announcement = Судя по данным наших датчиков дальнего действия, магическая угроза была устранена. Шаттл уже вызван.
 
 magic-component-missing-req = Недостающие требования! Вам необходимо надеть мантию и шляпу!
+
+ent-WizardSurviveObjective = Переживете смену, устроив как можно больше хаоса.
+    .desc = Федерация Космических Волшебников отправила вас на станцию Nanotrasen, чтобы навести там смуту. Не разочаруйте их.

Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml

@@ -671,10 +671,10 @@
       coefficients:
         Blunt: 0.6
         Slash: 0.6
-        Piercing: 0.4
-        Heat: 0.25
+        Piercing: 0.6
+        Heat: 0.6
         Radiation: 0.25
-        Caustic: 0.75
+        Caustic: 0.25
   - type: ToggleableClothing
     clothingPrototype: ClothingHeadHelmetHardsuitWizard
   - type: ContainerContainer
@@ -693,11 +693,11 @@
             - PowerCell
             - PowerCellSmall
   - type: EnergyDomeGenerator
-    damageEnergyDraw: 3
+    damageEnergyDraw: 5
     domePrototype: EnergyDomeSmallPink
   - type: ClothingSpeedModifier
-    walkModifier: 1
-    sprintModifier: 1
+    walkModifier: 0.9
+    sprintModifier: 0.9
   - type: PowerCellDraw
     drawRate: 8
     useRate: 0

Resources/Prototypes/Entities/Markers/warp_point.yml

@@ -4,6 +4,7 @@
   name: warp point
   components:
   - type: WarpPoint
+  - type: SpawnTeleportLocation
   - type: Sprite
     state: pink
 

Resources/Prototypes/Entities/Objects/Devices/station_beacon.yml

@@ -25,6 +25,8 @@
     defaultText: station-beacon-general
     color: "#D4D4D496"
   - type: WarpPoint
+  - type: SpawnTeleportLocation
+  - type: GiftIgnore
   - type: ActivatableUI
     key: enum.NavMapBeaconUiKey.Key
     singleUser: true

Resources/Prototypes/Magic/white.yml

@@ -31,7 +31,7 @@
     - type: VariableUseDelay
       useDelay: 6
       altUseDelay: 12
-      chargeUseDelay: 40
+      chargeUseDelay: 30
 
 - type: entity
   id: ActionForceSpell
@@ -62,7 +62,7 @@
     - type: VariableUseDelay
       useDelay: 6
       altUseDelay: 2
-      chargeUseDelay: 20
+      chargeUseDelay: 30
 
 - type: entity
   id: ActionFireballSpell
@@ -93,7 +93,7 @@
     - type: VariableUseDelay
       useDelay: 5
       altUseDelay: 10
-      chargeUseDelay: 40
+      chargeUseDelay: 30
 
 - type: entity
   id: ActionCardSpell
@@ -126,7 +126,7 @@
     - type: VariableUseDelay
       useDelay: 4
       altUseDelay: 1
-      chargeUseDelay: 40
+      chargeUseDelay: 30
 
 - type: entity
   id: ActionForcewallSpell
@@ -160,7 +160,7 @@
     - type: VariableUseDelay
       useDelay: 10
       altUseDelay: 20
-      chargeUseDelay: 60
+      chargeUseDelay: 50
 
 - type: entity
   id: ActionBlinkSpell
@@ -272,3 +272,20 @@
         sprite: Objects/Magic/magicactions.rsi
         state: summons
       event: !type:InstantRecallSpellEvent
+
+- type: entity
+  id: ActionTeleportSpell
+  name: Teleport
+  noSpawn: true
+  components:
+    - type: Magic
+      requiresClothes: true
+    - type: InstantAction
+      checkCanInteract: false
+      useDelay: 60
+      itemIconStyle: BigAction
+      icon:
+        sprite: Objects/Magic/magicactions.rsi
+        state: teleport
+      event: !type:TeleportSpellEvent
+        speech: "SCYAR FIDE!"

Resources/Prototypes/_White/Entities/Clothing/nigger.yml

@@ -33,3 +33,33 @@
   id: ClothingOuterRealWizardViolet
   components:
     - type: WizardClothes
+
+- type: entity
+  parent: ClothingHeadHatWizard
+  id: ClothingHeadHatRealWizardFancy
+  components:
+    - type: WizardClothes
+    - type: Sprite
+      sprite: White/Clothing/Head/wizhat.rsi
+    - type: Clothing
+      sprite: White/Clothing/Head/wizhat.rsi
+
+- type: entity
+  parent: ClothingHeadHatWizard
+  id: ClothingHeadHatRealWizardFancyAlt
+  components:
+    - type: WizardClothes
+    - type: Sprite
+      sprite: White/Clothing/Head/wizhat-alt.rsi
+    - type: Clothing
+      sprite: White/Clothing/Head/wizhat-alt.rsi
+
+- type: entity
+  parent: ClothingOuterWizard
+  id: ClothingOuterRealWizardFancy
+  components:
+    - type: WizardClothes
+    - type: Sprite
+      sprite: White/Clothing/OuterClothing/robe.rsi
+    - type: Clothing
+      sprite: White/Clothing/OuterClothing/robe.rsi

Resources/Prototypes/_White/Objects/Scrolls/scrolls.yml

@@ -24,7 +24,7 @@
   components:
     - type: Scroll
       actionId: ActionFireballSpell
-      learnPopup: fireball
+      learnPopup: scroll-component-fireball
 
 - type: entity
   id: ScrollForcewall
@@ -33,7 +33,7 @@
   components:
     - type: Scroll
       actionId: ActionForcewallSpell
-      learnPopup: forcewall
+      learnPopup: scroll-component-forcewall
 
 - type: entity
   id: ScrollKnock
@@ -42,7 +42,7 @@
   components:
     - type: Scroll
       actionId: ActionKnock
-      learnPopup: knock-knock
+      learnPopup: scroll-component-knock
 
 - type: entity
   id: ScrollArc
@@ -51,7 +51,7 @@
   components:
     - type: Scroll
       actionId: ActionElectricArcSpell
-      learnPopup: lightning
+      learnPopup: scroll-component-lightning
 
 - type: entity
   id: ScrollForce
@@ -60,7 +60,7 @@
   components:
     - type: Scroll
       actionId: ActionForceSpell
-      learnPopup: force
+      learnPopup: scroll-component-force
 
 - type: entity
   id: ScrollCards
@@ -69,7 +69,7 @@
   components:
     - type: Scroll
       actionId: ActionCardSpell
-      learnPopup: cards
+      learnPopup: scroll-component-cards
 
 - type: entity
   id: ScrollBlink
@@ -78,7 +78,7 @@
   components:
     - type: Scroll
       actionId: ActionBlinkSpell
-      learnPopup: blink
+      learnPopup: scroll-component-blink
 
 - type: entity
   id: ScrollEtherealJaunt
@@ -87,7 +87,7 @@
   components:
     - type: Scroll
       actionId: ActionEtherealJauntSpell
-      learnPopup: jaunt
+      learnPopup: scroll-component-jaunt
 
 - type: entity
   id: ScrollEmp
@@ -96,7 +96,7 @@
   components:
     - type: Scroll
       actionId: ActionEmpSpell
-      learnPopup: emp
+      learnPopup: scroll-component-emp
 
 - type: entity
   id: ScrollCluwneCurse
@@ -105,7 +105,7 @@
   components:
     - type: Scroll
       actionId: ActionCluwneCurseSpell
-      learnPopup: curse
+      learnPopup: scroll-component-cluwne
 
 - type: entity
   id: ScrollBananaTouch
@@ -114,7 +114,7 @@
   components:
     - type: Scroll
       actionId: ActionBananaTouchSpell
-      learnPopup: banana
+      learnPopup: scroll-component-clown
 
 - type: entity
   id: ScrollMimeTouch
@@ -123,7 +123,7 @@
   components:
     - type: Scroll
       actionId: ActionMimeTouchSpell
-      learnPopup: silence
+      learnPopup: scroll-component-silence
 
 - type: entity
   id: ScrollInstantRecall
@@ -132,4 +132,13 @@
   components:
     - type: Scroll
       actionId: ActionInstantRecallSpell
-      learnPopup: recall
+      learnPopup: scroll-component-recall
+
+- type: entity
+  id: ScrollTeleport
+  parent: BaseScroll
+  name: "Teleport scroll"
+  components:
+    - type: Scroll
+      actionId: ActionTeleportSpell
+      learnPopup: scroll-component-teleport

Resources/Prototypes/_White/Wizard/wizard.yml

@@ -39,8 +39,8 @@
   equipment:
     jumpsuit: ClothingUniformJumpsuitColorDarkBlue
     back: ClothingBackpackFilled
-    head: ClothingHeadHatRealWizardBlue
-    outerClothing: ClothingOuterRealWizardBlue
+    head: ClothingHeadHatRealWizardFancy
+    outerClothing: ClothingOuterRealWizardFancy
     shoes: ClothingShoesWizard
   innerClothingSkirt: ClothingUniformJumpskirtColorDarkBlue
   satchel: ClothingBackpackSatchelFilled

Resources/Textures/Objects/Magic/magicactions.rsi/meta.json

@@ -51,6 +51,9 @@
       },
       {
           "name": "summons"
+      },
+      {
+          "name": "teleport"
       }
   ]
 }

Resources/Textures/White/Clothing/Head/wizhat-alt.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "White Dream",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-HELMET",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }
+  

Resources/Textures/White/Clothing/Head/wizhat.rsi/meta.json

@@ -0,0 +1,27 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "White Dream",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-HELMET",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }
+  

Resources/Textures/White/Clothing/OuterClothing/robe.rsi/meta.json

@@ -0,0 +1,31 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "White Dream",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-OUTERCLOTHING",
+        "directions": 4
+      },
+      {
+        "name": "equipped-OUTERCLOTHING-body-slim",
+        "directions": 4
+      },
+      {
+        "name": "inhand-left",
+        "directions": 4
+      },
+      {
+        "name": "inhand-right",
+        "directions": 4
+      }
+    ]
+  }
+