Remove OP (#757)

* remove outdated content

* Update migration.yml

* Update twoHandedStaffs.yml

Resources/Locale/en-US/_CP14/traits/trait.ftl

@@ -21,12 +21,4 @@ cp14-trait-snoring-name = Loud snoring
 cp14-trait-snoring-desc = It is simply impossible to sleep next to you because you snore terribly loudly at everything.
 
 cp14-trait-mana-wasting-name = Magical mediocrity.
-cp14-trait-mana-wasting-desc = Fate has decreed that magic is just an empty sound for you. You are unable to store or use magical energy.
-
-# Backgrounds
-
-cp14-trait-bg-entertainer-name = Entertainer
-cp14-trait-bg-entertainer-desc = You have to thrive in front of an audience. You know the way how to entertain them, entrance them and also even how to inspire them. Your poetics able to stir the hearts like those who awakening grief or joy, anger or laughter. Their spirits can be raised by your music and also it captures their sorrow. Actually, your dance steps are captivate and also your humor will cuts to the quick. Finally, your art is your life whatever the techniques you use. 
-
-cp14-trait-bg-soldier-name = Soldier
-cp14-trait-bg-soldier-desc = War has been your life for as long as you care to remember. You trained as a youth, studied the use of weapons and armor, learned basic survival techniques, including how to stay alive on the battlefield. You might have been part of a standing national army or a mercenary company, or perhaps a member of a local militia who rose to prominence during a recent war.
+cp14-trait-mana-wasting-desc = Fate has decreed that magic is just an empty sound for you. You are unable to store or use magical energy.

Resources/Locale/ru-RU/_CP14/traits/trait.ftl

@@ -21,12 +21,4 @@ cp14-trait-snoring-name = Громкий храп
 cp14-trait-snoring-desc = Спать рядом с вами просто невозможно, потому что во все вы жутко громко храпите.
 
 cp14-trait-mana-wasting-name = Магическая бездарность
-cp14-trait-mana-wasting-desc = Судьба распорядилась так, что магия для вас - лишь пустой звук. Вы не способны ни накапливать, ни использовать магическую энергию.
-
-# Backgrounds
-
-cp14-trait-bg-entertainer-name = Артист
-cp14-trait-bg-entertainer-desc = Вам нравится выступать на публике. Вы знаете, как их развлечь, очаровать и даже воодушевить. Ваша поэзия может трогать сердца слушателей, пробуждать в них горе или радость, смех или гнев. Ваша музыка ободряет их или заставляет скорбеть. Ваши танцы захватывают, а шутки всегда смешны. Чем бы вы ни занимались, ваша жизнь тесно связана с искусством.
-
-cp14-trait-bg-soldier-name = Солдат
-cp14-trait-bg-soldier-desc = Сколько вы помните, в вашей жизни всегда была война. С молодости вы проходили тренировки, учились использовать оружие и доспехи, изучали технику выживания, включая то, как оставаться живым на поле боя. Вы могли быть частью армии страны или отряда наёмников, а может, были местным ополченцем во время войны.
+cp14-trait-mana-wasting-desc = Судьба распорядилась так, что магия для вас - лишь пустой звук. Вы не способны ни накапливать, ни использовать магическую энергию.

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml

@@ -25,6 +25,23 @@
     damage:
       types: 
         Blunt: 3
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: CP14MeleeSelfDamage
+    damageToSelf:
+      types:
+        Blunt: 1 # 50 hits
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 50
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: MetalBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
   - type: MeleeWeapon
     angle: 100
     attackRate: 1.3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml

@@ -1,40 +0,0 @@
-- type: entity
-  id: CP14BaseBattleStaff
-  parent:
-  - BaseItem
-  - CP14BaseWeaponDestructible
-  name: battle staff
-  description: an extremely simple and effective weapon - a long straight and heavy stick.
-  components:
-  - type: Item
-    size: Ginormous
-  - type: Sprite
-    sprite: _CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi
-    layers:
-    - state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types: 
-        Blunt: 4
-  - type: MeleeWeapon
-    angle: 100
-    attackRate: 1.3
-    range: 1.3
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Blunt: 6
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.3
-    cPAnimationOffset: -1.3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml

@@ -1,86 +0,0 @@
-- type: entity
-  id: CP14BaseTwoHandedSword
-  parent:
-  - BaseItem
-  - CP14BaseWeaponDestructible
-  - CP14BaseWeaponSharp
-  - CP14BaseWeaponChemical
-  name: two-handed sword
-  description: A powerful weapon that requires tremendous strength and skill to use effectively.
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi
-    state: icon
-  - type: Clothing
-    equipDelay: 1
-    unequipDelay: 1
-    sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi
-    quickEquip: false
-    breakOnMove: false
-    slots:
-    - neck
-  - type: MeleeWeapon
-    angle: 120
-    attackRate: 0.7
-    range: 1.8
-    wideAnimationRotation: 135
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Slash: 5
-        Blunt: 4
-        Structural: 1
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.6
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Slash: 12
-        Blunt: 4
-        Structural: 3
-  - type: Item
-    size: Ginormous
-  - type: ClothingSpeedModifier
-    walkModifier: 0.9
-    sprintModifier: 0.8
-  - type: HeldSpeedModifier
-  - type: CP14SkillRequirement
-    fuckupChance: 0.5
-    requiredSkills:
-    - Warcraft
-  - type: CP14Currency
-    currency: 5000
-
-- type: entity
-  id: CP14TwoHandedSwordScythe
-  parent: CP14BaseTwoHandedSword
-  name: scythe
-  description: A large, two-handed scythe. What will you mow with it? Millet or heads?
-  components:
-  - type: Sprite
-    sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi
-    state: icon
-  - type: Clothing
-    sprite: _CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi
-  - type: Tag
-    tags:
-    - CP14HerbalGathering
-  - type: MeleeWeapon
-    angle: 110
-    attackRate: 0.6
-    range: 1.4
-    wideAnimation: CP14WeaponArcSlash
-    damage:
-      types:
-        Slash: 4
-        Blunt: 3
-    soundHit:
-      collection: MetalThud
-    cPAnimationLength: 0.6
-  - type: Wieldable
-  - type: IncreaseDamageOnWield
-    damage:
-      types:
-        Slash: 6

Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml

@@ -34,14 +34,6 @@
     CP14Cloth: 1
   result: CP14BaseMop
 
-- type: CP14Recipe
-  id: CP14BaseBattleStaff
-  tag: CP14RecipeWorkbench
-  craftTime: 4
-  stacks:
-    CP14WoodenPlanks: 3
-  result: CP14BaseBattleStaff
-
 - type: CP14Recipe
   id: CP14Torch
   tag: CP14RecipeWorkbench

Resources/Prototypes/_CP14/Traits/backgrounds.yml

@@ -1,21 +0,0 @@
-#- type: trait
-#  id: CP14BackgroundSoldier
-#  name: cp14-trait-bg-soldier-name
-#  description: cp14-trait-bg-soldier-desc
-#  traitGear: CP14BaseTwoHandedSword
-#  cost: 1
-#  category: CP14Background
-#  components:
-#    - type: CP14AutoAddSkill
-#      skills:
-#      - Warcraft
-#
-#- type: trait
-#  id: CP14BackgroundEntertainer
-#  name: cp14-trait-bg-entertainer-name
-#  description: cp14-trait-bg-entertainer-desc
-#  traitGear: AcousticGuitarInstrument
-#  cost: 1
-#  category: CP14Background
-#  components:
-#    - type: CP14AutoAddSkill

Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json

@@ -1,34 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 48,
-    "y": 48
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json

@@ -1,30 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT1",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT2",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/meta.json

@@ -1,33 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "shard"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT1",
-      "directions": 4
-    },
-    {
-      "name": "equipped-BELT2",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json

@@ -1,22 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json

@@ -1,34 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 48,
-    "y": 48
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    }
-  ]
-}

Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/meta.json

@@ -1,34 +0,0 @@
-{
-  "version": 1,
-  "license": "CLA",
-  "copyright": "Created by TheShuEd (Github)",
-  "size": {
-    "x": 48,
-    "y": 48
-  },
-  "states": [
-    {
-      "name": "icon"
-    },
-    {
-      "name": "inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-left",
-      "directions": 4
-    },
-    {
-      "name": "wielded-inhand-right",
-      "directions": 4
-    },
-    {
-      "name": "equipped-NECK",
-      "directions": 4
-    }
-  ]
-}

Resources/migration.yml

@@ -208,10 +208,16 @@ CP14BaseBroom: null
 CP14DemiplanKey: CP14DemiplaneKeyT1
 CP14SpawnerExpeditionLootCommon: CP14SpawnerDemiplaneLootT1
 
-#2024-06-01
+#2025-06-01
 CP14AuraNodeBase: null
 CP14AuraScanner: null
 
+#2025-01-14
+CP14BaseBattleStaff: null
+CP14BaseTwoHandedSword: null
+CP14TwoHandedSwordScythe: null
+
+
 # <---> CrystallEdge migration zone end