From cf41cabceab377ac0845747715bc05ef5afca05d Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 14 Jan 2025 14:36:10 +0300 Subject: [PATCH] Remove OP (#757) * remove outdated content * Update migration.yml * Update twoHandedStaffs.yml --- Resources/Locale/en-US/_CP14/traits/trait.ftl | 10 +- Resources/Locale/ru-RU/_CP14/traits/trait.ftl | 10 +- .../Objects/Weapons/Magic/twoHandedStaffs.yml | 17 ++++ .../Objects/Weapons/Melee/battleStaff.yml | 40 -------- .../Objects/Weapons/Melee/twoHandedSword.yml | 86 ------------------ .../_CP14/Recipes/Workbench/workbench.yml | 8 -- .../Prototypes/_CP14/Traits/backgrounds.yml | 21 ----- .../battleStaff.rsi/equipped-NECK.png | Bin 558 -> 0 bytes .../BattleStaff/battleStaff.rsi/icon.png | Bin 310 -> 0 bytes .../battleStaff.rsi/inhand-left.png | Bin 795 -> 0 bytes .../battleStaff.rsi/inhand-right.png | Bin 805 -> 0 bytes .../BattleStaff/battleStaff.rsi/meta.json | 34 ------- .../battleStaff.rsi/wielded-inhand-left.png | Bin 788 -> 0 bytes .../battleStaff.rsi/wielded-inhand-right.png | Bin 801 -> 0 bytes .../Dagger/dagger.rsi/equipped-BELT1.png | Bin 318 -> 0 bytes .../Dagger/dagger.rsi/equipped-BELT2.png | Bin 311 -> 0 bytes .../Weapons/Melee/Dagger/dagger.rsi/icon.png | Bin 489 -> 0 bytes .../Melee/Dagger/dagger.rsi/inhand-left.png | Bin 372 -> 0 bytes .../Melee/Dagger/dagger.rsi/inhand-right.png | Bin 373 -> 0 bytes .../Weapons/Melee/Dagger/dagger.rsi/meta.json | 30 ------ .../Dagger/ice_dagger.rsi/equipped-BELT1.png | Bin 306 -> 0 bytes .../Dagger/ice_dagger.rsi/equipped-BELT2.png | Bin 301 -> 0 bytes .../Melee/Dagger/ice_dagger.rsi/icon.png | Bin 393 -> 0 bytes .../Dagger/ice_dagger.rsi/inhand-left.png | Bin 391 -> 0 bytes .../Dagger/ice_dagger.rsi/inhand-right.png | Bin 387 -> 0 bytes .../Melee/Dagger/ice_dagger.rsi/meta.json | 33 ------- .../Melee/Dagger/ice_dagger.rsi/shard.png | Bin 245 -> 0 bytes .../HandheldAxe/handheldAxe.rsi/icon.png | Bin 326 -> 0 bytes .../handheldAxe.rsi/inhand-left.png | Bin 581 -> 0 bytes .../handheldAxe.rsi/inhand-right.png | Bin 589 -> 0 bytes .../HandheldAxe/handheldAxe.rsi/meta.json | 22 ----- .../scythe.rsi/equipped-NECK.png | Bin 969 -> 0 bytes .../Melee/TwoHandedSword/scythe.rsi/icon.png | Bin 720 -> 0 bytes .../TwoHandedSword/scythe.rsi/inhand-left.png | Bin 1209 -> 0 bytes .../scythe.rsi/inhand-right.png | Bin 1237 -> 0 bytes .../Melee/TwoHandedSword/scythe.rsi/meta.json | 34 ------- .../scythe.rsi/wielded-inhand-left.png | Bin 1197 -> 0 bytes .../scythe.rsi/wielded-inhand-right.png | Bin 1184 -> 0 bytes .../twoHandedSword.rsi/equipped-NECK.png | Bin 828 -> 0 bytes .../twoHandedSword.rsi/icon.png | Bin 695 -> 0 bytes .../twoHandedSword.rsi/inhand-left.png | Bin 1143 -> 0 bytes .../twoHandedSword.rsi/inhand-right.png | Bin 1130 -> 0 bytes .../twoHandedSword.rsi/meta.json | 34 ------- .../wielded-inhand-left.png | Bin 1057 -> 0 bytes .../wielded-inhand-right.png | Bin 1102 -> 0 bytes Resources/migration.yml | 8 +- 46 files changed, 26 insertions(+), 361 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml delete mode 100644 Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml delete mode 100644 Resources/Prototypes/_CP14/Traits/backgrounds.yml delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-NECK.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT1.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT2.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/shard.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-NECK.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/wielded-inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/equipped-NECK.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/icon.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/inhand-right.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/meta.json delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/wielded-inhand-left.png delete mode 100644 Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/wielded-inhand-right.png diff --git a/Resources/Locale/en-US/_CP14/traits/trait.ftl b/Resources/Locale/en-US/_CP14/traits/trait.ftl index 02c2067afe..7fcce81f99 100644 --- a/Resources/Locale/en-US/_CP14/traits/trait.ftl +++ b/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. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/traits/trait.ftl b/Resources/Locale/ru-RU/_CP14/traits/trait.ftl index 2d096ccbc0..dd583c7634 100644 --- a/Resources/Locale/ru-RU/_CP14/traits/trait.ftl +++ b/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 = Судьба распорядилась так, что магия для вас - лишь пустой звук. Вы не способны ни накапливать, ни использовать магическую энергию. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml index c659769b89..67a4596abe 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml deleted file mode 100644 index afdeed3003..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleStaff.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml deleted file mode 100644 index a7259da41f..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/twoHandedSword.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml index 9d81824feb..22570efc1f 100644 --- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Traits/backgrounds.yml b/Resources/Prototypes/_CP14/Traits/backgrounds.yml deleted file mode 100644 index b28dcf4061..0000000000 --- a/Resources/Prototypes/_CP14/Traits/backgrounds.yml +++ /dev/null @@ -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 \ No newline at end of file diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/equipped-NECK.png deleted file mode 100644 index 3bcba3e35e6bd06f7cf8ada3d1a5d9e706be6355..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 558 zcmV+}0@3}6P)Px$=t)FDRCt{2+`Uc$K@h<4(f9(?G?-j*wptMzU*IZgdMX|OdTJ6H6GFi=*iafN zq|sa{2}T-f9$~FW`~-oy-8uLFdw{#$Fmt=i?TrWk0002&DbMGwKN!2vb%+0r+Ca%-Cjv@;>jcZp=6ScXXYF%itT5Da(G_&*6j0&r? zqhCZZ17ct{`eV>*W$Mu{qOc2!#pTtxh=@GCECP=tLZfceO@{44);QLHKd9C!vRd-| z52Dw~3X6Ub)_|Sz{5A9t;#I`H|0~vjE!g)5!kei1U@M?`->KBHfR z4EToV56E})i;w}IL=pYHR%Y_eSyA==UA)(VHg$DtLe=|&Jc35url~C0jHh#ZcjEir z-hY7AaxK+b#rJKuimu*28Md93wV>#F|1Lq^2RuK$nW?i|8HacEGzosDv_BXJ+4+1F z^nXC;GnS$64*&oF0000000000tctN+nYN>jrNr2-%$%6ol@&qdU{(|#Hdsa$9FC@a z|3y7b%p5r{6SWM;ZZ6Dzegpsj0000`Qra~y8aC~TnwJ5SVcTi7+#v%FV6o*+bhKLT wkO2p>)N&_U8ZCFofFp4(3IG5A005N8JHAxR4?1$qW&i*H07*qoM6N<$f*$bsLI3~& diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/icon.png deleted file mode 100644 index 8b18d00159fdc2061c032b4b3ea51e3e1853b3e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}P)Px#@JU2LRA_l&Jbapl@-*bRzlQ+$F79b)b`e(+R?RvAbzMkKxJ7AyXIApoRyZAHeb?st0 z_EMpCfy$*QrAGPTtAbboAdm{Hd8ArFv_LfJV=(MUj?|YXvE43bY86Ba06=js(P}rP z$LdOxSnXR7F8~0i;|<1KU5wVFbuKt5PzmB(a9zP^0e}_0a$W#ng^yGU0IcwqS^*%C z3ex{bss*?&yr5bD;J)xgy#NrZL&C=kHXBh=}TX02McDVb|7vZ~y=R07*qo IM6N<$f@I)-!TPx%)k#D_RCt{2-9c*;K@l3&*G|CT(DV?cTwk>YPqDk?FMud*vR)sf#rf4^#_0Q?I_;o`^STh8t&~tBG6X8 zKMM4h@bu(d3dKC+-pu#^HXd}We+z8p`=h|u1HOLwZax3beE*zkxnylmX|F$m&wT#o zOg7Zk-pkbN@gyQ5A|fIpA|fIpA|i)mxlD~|T9zcUT&5<9sX9VS^L4}R*w##&A8&*C4_h$9pK{W7n5|na-G?jl{VM= zS(64GJ0Pabtu@)$xS#ks?0^JT@7zW=!B095cW?y6p!0ACJ0OOa!}s#z=M3EpKk4}K zMG5IV;K5fA5fKrQ6`Vug1SwgDE>p8CldF8zJHUl9HF2csKV<$Vc=0wTa+OiEeebwT zZZ?4Y5=NG(S=M!+m|AXybik8muW}-iif=)onAfuMwFoR1geX%JS7ukfY?i5s!$w&% zcsA7KJ*6yb2G**q!%J&=%ht*l{1xP?yY;7XdGC?&`>+ERsBc%~;dTYx3?d>TA|fKv Z?H6loC;Fll&&~h<002ovPDHLkV1mG0fIt8M diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/inhand-right.png deleted file mode 100644 index c974b541f1510dd29b458103578ce79ec70d3dd0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 805 zcmV+=1KRwFP)Px%-$_J4RCt{2+`nrZF%$=Ixs=Wcg>(olDY@a2$+U|Plh*&hO@?fl3dNKEfXi6w z*M6iP#J7Ka-ha7e&-=n!(VDX7ztEb+yXo_?IZpFhBQSobVTPxlxD z00000Lfzhgr|AVZ9mg_hdcnKBfz}wG>Kf?x>6xyfg#9`_b0W@_CCxgI!ocdMKNp1o zPnvaYu|Cl;Nay>XijHwqna*!bhu}AzS)e5YT!btzED8hOX~pDOfDCv*+}L4n-o7>+ zhTn$$Ha|W*Ak6|~z!LN8Tei8iZaNIV4f}1M$|hizEmVD!wMLU^WtJ_N$}CVe0i(&(sWX2W zR;>jtRl95?odH%o4Zi8LVsD>*RrLa?TM_wr`Dikgjl(&{>jlS$2YlFXd-?R|RMZQE z*MQBfbvD2D`}f~iy`a;Iy?^?1vh@O?H2~-1ceK|Fy1jw7|9l=2g@N#$(v{bMQr?|Z z0N)D$000000000006_VuYCfW^Sx4ER0ArBK>zKmVQcU#Lv4zU(n8FiK+TJ<^l4hOH zvW2qS;KFObw=bXA%e7}JVsMI8my!2tyIPwYnMQFLS?YSa4{ycXmmHl`;>M2YFz!TQ zzfP80l#!DrLn;H)5!iSpb!?<;V*%|6aXk8;y_D!#In40^aS_SYxk7 jJq!Q<00000z~lS};fyhS+m03k00000NkvXXu0mjfZg6&g diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json deleted file mode 100644 index c0917d833a..0000000000 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/BattleStaff/battleStaff.rsi/wielded-inhand-left.png deleted file mode 100644 index d08f1bb1fde9364d2488931a6a45cf57829df807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 788 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>U^?gN;uumf z=j|Q)4B%{w0+sZ@M zglwI6wleHLQ1{myzu!|=0ZrbtrY_b-e%002+n2c?IP|Ay=l4go(|>sWKB+butR<8V6d`!8S z*=Rv(YPJhLeB{If0pA9t%T z#hV7l$;;uumf z=j|O^kJ*kg$3M;wFj5zZ^5V!4UQw#yI6We;B}l7PhbywHL}Qvo2$w9E)f7J75)GDE zucL}n^qkZeYPbqGXHWBZks!K-OOYdXlI7{r3F^KgzgAQ}`aGk~J~-~(yxq_1^>?Zl zs51gBhl31r*)mS9R@u$d&c6J;e0x>FdjEsx8obz3S*@9+X3p4p_WrwR&zJXz_Fr<0 z)LvbAxAsfW;bueE#oKcp7a!F-7-hEnYmQ(0)Ky_&pS#=+@2b1H{*vQP#k*f_G)!D_ zHz;yqg2SXKzy7R!D}AEta9Uk_>!EpFQ&(NvyfgTDxr)Q-&%w{W?$+n}S*sPc3P?^` z;$aYwJ)z*cuWjY$jbZl=o!POn{{Q~0Oom^(m5)`)e)_#-#_d&8(|PaieH*X-DOS3! z>Xl;7@mWsw>uW7O#?~$`SnYhn&++Vy8~4`Uy>M*fdpET->!6c6B&A+XHm%aRoi1^x zY>nm@ub1zqM6L<>`s%22?z8XN^9`j?f&>~i4aS#>C5>mzF!`qWKi9-C^HTB5W$Q0% z&AUBorq{9Ft&d}}?!2m!yB7C!!u{nLCTm`P_nx;a{d`DTV%i-R>;68A8)x2I%dH48 z%B%XlOGQ>z|H0JSgX_W{En>d>s?AROI@f$TX@lKMHvxm=(c$g-HUcYC?&z%j8*<`( zu!=;%+XTUIF5e?nJ;B8_n_tx{zdFAu!}@YEvzp**!=T5Ca&d`QHG#})7p=t?KGlu0 zzv}VsdxiB^SMc#sx%}swu0^j**<*Hf%Vd`|$CpehJpTUl#?MW!rk76w z24m5yOY;PJ+pgZe9%`L&YUR_S%iHqx>nhhOy<}i=dc*<^ bMc#i5A4`1xUYIAD1QPLd^>bP0l+XkKL@;%J diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT1.png deleted file mode 100644 index 7f823c2249d857685d59735ccd953cd711b399be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|et5b#hE&XX zdrOz^kb^+mL(PXwDx$m{YOgoUP~!;UU37;zvh%R%!Gh^)pE5-R9hCHFKCs|K5zD1b zfA4<3m}@-q?#h||EI@M@7#_60&C1-h?%*=d>#QYbSAQyya)0)(=46`TG$FVrFmPb#qvGp-gse;XnC+)r^h?+hdOxh#bu|`5Zs<+D^^Wm+rDz)cyh+ z3M3Y6J>VkcuI7F1?``ibGbJ*Ubn{cK=cr~+J{I`6H$ZF4y_T2zmdKI;Vst021zm)Bpeg diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/equipped-BELT2.png deleted file mode 100644 index ec780406d5bc9a6301eb5a46ea41dbaa22d4dd36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|K6<)1hE&XX zdrOh;kb^+$L(K#Oj!P5RE-&F~I&9*2UEx%06<5mpO`59FKIwn#-4VG=RJNM*%BTx7$<_}BrcAuDWOwQ#=ndaQAmCu=L=APVY z=3B}TIn7JvxZ~625cUVgDvk=y7Dt6o2qbbd95^ZM`rb`>@5$TKLDqP>`njxgN@xNA Dp^AFc diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/icon.png deleted file mode 100644 index 17990b0eea51b3a9ac7a5f4669ee56bd61d4ec86..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 489 zcmVPx$qe(D#0wKG(!(6gA$7?qBHJ2@Z0Qe(#-P@y7KflA zhz6w~Xi*4SYDozy`h^yyM08P8K?IF&(;XF-o<9oWp6QNz@BKXQ`@QeIU|?WiVDQJ7 zN*x#(ofN~75ddVDgtgUN^1DA#SL(q0O^)^08nR0Q;P&o8{HlP;^wffOT@49c0{NR9 zvfHUiWU>ld+Xod%lq`@=CAFFlM@GnG6|EeVNa)&ubSh~|B$C>_x)Wz7$IQ(ymnBiw zm+TLO#o%BVfJ7pR-R3}cJIS115Q|53%~^IU`2%5Lw>bbfINHPK4QkI~@u+FCHz1lHOax(z4n>8-MM+tSsPDv7OsR4(j zk=*?=8~fRBbE+or6;&-;Q3__&OhA?BYq!$hUC-9xYr&4teHiIMUA5X7e@3Xo fUX`QU;D7QCeCCSKWQSz300000NkvXXu0mjf+2h#9 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-left.png deleted file mode 100644 index 58b4fca643b362fe80d868979946edd11f76c58c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*mi1Ln`LH zy`|`PBtW3yVWV+Kj)BVStZb=OVOK)lyxPmO$^5{?g3i5%S07LoYtM*dT6L1k<0y-e z5KmgbRe^2m_oV)R&v1F>$uBb{1%ZY$Ff@2vP0dq$G_Q?AOQ~qDPR{1Io=GKBmpXRw zFVic&ZJzo5wr7`IEz>Kb?aQy1@7%NNXQ<$+tb5z9m0B0Bq=T zzqDJG{{>?ugwq>k&#Q*AQNa*dn_pVRm?+P$7d????@YScy?#S7F Q-$6Edy85}Sb4q9e0Na6{`v3p{ diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/inhand-right.png deleted file mode 100644 index 0564633cba8803df3cf729664f5df0e95ebef46f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z^*vo2Ln`LH zy`|`XI6&aQN9IPyi6JHm9?!C}#k5Ww@j1FIed38)W*N@-q_SUMxfitM&vP)HsVFSY z68|8;*UicMl+~qa|IdHhJH7h5o@u!f(0m}U-9D#p?a5!4clED6dPFYWb20O7h2F*A zlKdW@n3cBGd(Zjozopr0EU&JWB>pF diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json deleted file mode 100644 index 0f12276b8c..0000000000 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/dagger.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT1.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT1.png deleted file mode 100644 index a046727fe463d3233514287b78095efe906c0dc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-gvq=hE&XX zd&`jPkb{83#lTCIj312{x%nqBKM|PcyvIYqT_9(V%PJEgk6iU5r^3o+o>_P1U$}nC zjJbDP&vXDy0D?aSHs8J9NnG338yO?}EvzslxK%G__szTSx?MsXg5SFwxo_BE#pIg3 zyV5dNZe3Zt$|k0J=TB<&U?b(|nwHI8uB06DH wZr;RpyE?BFCW6fOboFyt=akR{06X=3(f|Me diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT2.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/equipped-BELT2.png deleted file mode 100644 index c9f5b3a67964d82a0972a1a383e2db1dec7af79f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_o4DhE&XX zdutPx$LrFwIR9J=Wlrc^MK@^6+HCApzB@M~49Kb>=3WC{i0JE(LH;`gaVMW0ms7N*> zHWtLJvCxWw1HfQ35h$dAb}YzjG!fSsS7_!dC-d^Y%=_no#bVhrPS%AWie;%<10bxs zTpS-|*647MbzwOZygWV-)?EPl^R?Wmz_1%R0G;dG^ek_QUlT;J?9bP-*;~kFZ?Rj6 zAc`eGv$x1qLMu=~6ie6lSWTvssx{uDx) zCIBcD%ZO1znR8st3%kT2facR{;}=+y#^bY(^qR3FAR$Yainf n{)B3%!nrp-2h?J*Shn#2JhF*UAk#it00000NkvXXu0mjf{n4X( diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/Dagger/ice_dagger.rsi/inhand-left.png deleted file mode 100644 index 76e694dc35539bb3bb72eaf993e0b5e6c4c47af2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z9X(wfLn`LH zy=9nn*g%Bsf&J0o@6#qM4gNmQ(fOIsi&e}eS1g_QFNP}AG&ylvw0}t9aE&Oo6^&EB zxKP(*V|>S@|F{2Mn5?S%pSc4H{HA>MGE>$^M_SYhwGZ{m%`6}l{7;aRr zTkwKc;^#8ynV5g4;Zoxp00i_>zopr0F=qA7S=dj zi6eTAUfR_&D*xlH4;#Ga?K^6&1T-87rhQ%<)qZBb#nu_ZN1Da{Y8`*N2>QtO769Y ziU>0OwXJgdt{=|ry#j(a_r#T7pAyo$D>3cvc6%=SRi!U$dq=~rXsD1@1x`4VsL_++=B e%|=Fs8;`l?pfi@Ln2y} z6C_v{CulG)UsU>E)3muWi1|)cU*HptE?Ec71veOXd##aRzrt9!I-cK0#6ooKZ~f#< z@6NkVtQn^LinrNgYryBg=J@T-m+}Mq_9?ir0Rd-aXqS%qZAOC+PkuaXEN$pns_Wb! zas5D=vlpW)-vSfHAQrPdzrNKUUY*YzF6sN~hU3b+Q!E+SRtR#XFnhgbWMkuUP6!Y= nsw^FFOGX;#HW33LU|?8Tud|Qo&Dv!^r!#oE`njxgN@xNA`}kAo diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/icon.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/icon.png deleted file mode 100644 index adbba08f3c463ecfeb4383073d5ab43184e61db7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmV-M0lEH(P)Px$07*naR9J=W(y>a!KoADtKf>86SZfhZIF4=7d9krdFM?Ri1H@PGWv&F*}D9iIa3nBc3==(luUUYzA`NPvoHk=Vr7D9+#9vz^r3Rz#i&U+6c`t?3Jz)<~| zuIsiP7pJZYxjviAVm2LpTrrPtu(7J;&4oO#R=9tB8?8Ro#$Rx9bb!;zrIZ4I YZ+ZcBS)1k|NB{r;07*qoM6N<$f-}XB+W-In diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-left.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-left.png deleted file mode 100644 index 9f860b24a16116034d4c446d40bc32600c3e6180..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 581 zcmV-L0=oT)P)Px$|4BqaRCt{2+COVrQ5XjB#}eq&4n@MnLIYN4kdWf0p|hR5kj1^5L)H%Y4EX}x z@*U2dlDS;F73B^cS|Lj15)MV`RF}8I?MaMHtI0j*#I(WN)uwir|H}r$7*t5Xar6T}{(5e03l2P=GLO6$XQ|mAYy^ z>yx)L;3i%5)qSs&io876iHL}Zh=_=Yh=~5i`oFIx6kQgDtqbcLGktII?qxI7B TDE5ed00000NkvXXu0mjfuzwDL diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/inhand-right.png deleted file mode 100644 index 8321890cd1c7a48dc6dd2da4f3fa60312d2993f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 589 zcmV-T0Px%2T4RhRCt{2+A(X}Koke?ze-7_hEhxsE=|D6P>f0N=0ay@vPSRO`~~_cvUUh$ z=obhM$W!tGtg+Z=aKRDSp+H zlu@tOpL=bV>2lcHe1q)|@A38fSuBp%4{ta;*q4i6SLh7K0L%?s`?vlb=?uqEN=Yu4 zi(-lrpp+5-sC}tCxY2B`+mb?I3jko-d9>SJY&?1h>Ve~vCXP>=jQue34#HBo_>Q4y6Ih{_Ia60fNkdy z1cO-6nd?(N)^lHmQc8TkE34{HERabz9=PE%E)X z=p-aDXA<)~W~uB>p1uI?p5S3PLaDTy{aw44$ZJs7t7*Xl3H%b&U)4fk%bc1`1J4x@ b5gF(&(%a+<*!C=`00000NkvXXu0mjfEx#MM diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json b/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json deleted file mode 100644 index 82588ec9cb..0000000000 --- a/Resources/Textures/_CP14/Objects/Weapons/Melee/HandheldAxe/handheldAxe.rsi/meta.json +++ /dev/null @@ -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 - } - ] -} diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-NECK.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/scythe.rsi/equipped-NECK.png deleted file mode 100644 index e9c09804148045be33bec6a453928d335baa9e3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 969 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 diff --git a/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/wielded-inhand-right.png b/Resources/Textures/_CP14/Objects/Weapons/Melee/TwoHandedSword/twoHandedSword.rsi/wielded-inhand-right.png deleted file mode 100644 index c5ae52edea2d698e4d265c2d47eaf301eaf8dbb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1102 zcmV-U1hM;xP)Px(2uVaiRCt{2+%aeyR~QHI|CQPlV@m>wOqU}$6i}4Wiv%46hC)gqQ-o=~7z!56 zUec{YS~_*Ai`&JETuir=wuVCBk;PqFI+)r}bA=8w$x13+-#eYc z|F;O)=I*`kd*3@_`F#Kp5fKp)5fKp)5fKp)5fKp)rOoDYO-_0Y|7j`)IihN*sC6!H z=)Bm=IQeW6w@JkA!J(z|da)BQxT>qAqO4cSvR*0oef`OUd(uBSje8qobg$&Nv}Nr_KYaB$0N|+I0ieH}hw(g5W-=K7-N5_44*+l+2Oqrq z4%+8`V?PKcwkX~-aZxoPC%-8DlT+NhT>a~hI>^n z55o{Z`hp&1Gy%gNzWYI7xvmS~-<1lWZ)=F|)uRNh*=$MxP{EI0D~&;qO3mP+$pE@R zbQ}l1?;{8T0Km%1%9Zh|;48y^Ce2bg*kQ>4@XAC?tJF_KC1WrN!0VBSshhyGZ#hIn zL_|bHL_|bHL_|bHL_|bHL_|bHL_|cdmqd^EY%bU2>b8h=&y9_ZzN1NvMnmh^RZok! z*rtk zPRmD6K+ez41L!8gRM4YVw}my>LFLJVdva<0vC(@cmg#z>Ebrd9)@$Ce_2p++n6>c5 zcRvE?KZZKVlaDG1kCyHri7m-k1w{J>sqQE{&yKN{&%(BCv@c$uebH^G5w|yl3A+b} zy-K**_!QAT7ba*;z~*vIe)~sv8&N@j8MV(A3I&}*&|>%C(8AIk83X}@5VBUQ8CxLQ z5>T&{rIXL%dhQrU?aq~6K)aW(Ym2vxPDqDnH?XfCeq{8)tgUC<_rLyWee>I2xO?N; zD;qJTv3=PfC!fXA`eVzsZJc#vultt?sa}a`P_LBbSx2IM@xn-luSB{gPP3zS2Meb7LP#Nm)SU!wK_l`!Pnzh&#Vu$=uIpN=_Z)DwsZ?C7fHA2`(A5Z# z6)+}M3BKK`=;On^q}bL=YoozFaes4`_BVRfFaRDB=MOx5m5~P05o;F UxLDjX*Z=?k07*qoM6N<$f|lzDd;kCd diff --git a/Resources/migration.yml b/Resources/migration.yml index 0c56b05bfb..b2d42c844e 100644 --- a/Resources/migration.yml +++ b/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