From 918767bcc514135e748f7858bcaf246e36035dce Mon Sep 17 00:00:00 2001 From: ScarKy0 <106310278+ScarKy0@users.noreply.github.com> Date: Tue, 18 Feb 2025 01:21:49 +0100 Subject: [PATCH] Magical contraband type (#35254) * init * really ponderous --- .../Locale/en-US/contraband/contraband-severity.ftl | 1 + Resources/Prototypes/Entities/Clothing/Belt/belts.yml | 2 +- Resources/Prototypes/Entities/Clothing/Head/hats.yml | 2 +- .../Entities/Clothing/OuterClothing/hardsuits.yml | 2 +- .../Entities/Clothing/OuterClothing/misc.yml | 2 +- Resources/Prototypes/Entities/Objects/Fun/toys.yml | 2 +- Resources/Prototypes/Entities/Objects/Magic/books.yml | 4 ++-- .../Entities/Objects/Weapons/Guns/Basic/base_staff.yml | 2 +- .../Entities/Objects/Weapons/Guns/Basic/base_wand.yml | 2 +- .../Prototypes/Entities/Objects/base_contraband.yml | 10 +++++++++- Resources/Prototypes/Magic/staves.yml | 2 +- Resources/Prototypes/contraband_severities.yml | 5 +++++ 12 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Resources/Locale/en-US/contraband/contraband-severity.ftl b/Resources/Locale/en-US/contraband/contraband-severity.ftl index d79ecfa4b2..10baf2cb25 100644 --- a/Resources/Locale/en-US/contraband/contraband-severity.ftl +++ b/Resources/Locale/en-US/contraband/contraband-severity.ftl @@ -4,6 +4,7 @@ contraband-examine-text-Restricted-department = [color=yellow]This item is restr contraband-examine-text-Major = [color=red]This item is considered major contraband.[/color] contraband-examine-text-GrandTheft = [color=red]This item is a highly valuable target for Syndicate agents![/color] contraband-examine-text-Syndicate = [color=crimson]This item is highly illegal Syndicate contraband![/color] +contraband-examine-text-Magical = [color=#b337b3]This item is highly illegal Magical contraband![/color] contraband-examine-text-avoid-carrying-around = [color=red][italic]You probably want to avoid visibly carrying this around without a good reason.[/italic][/color] contraband-examine-text-in-the-clear = [color=green][italic]You should be in the clear to visibly carry this around.[/italic][/color] diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 19ff2f278f..a70fe17ed6 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -700,7 +700,7 @@ sprite: Clothing/Belt/suspenders_black.rsi - type: entity - parent: ClothingBeltStorageBase + parent: [ ClothingBeltStorageBase, BaseMagicalContraband ] id: ClothingBeltWand name: wand belt description: A belt designed to hold various rods of power. A veritable fanny pack of exotic magic. diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 6c0d405b4d..1e818226d5 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -580,7 +580,7 @@ - type: entity abstract: true - parent: ClothingHeadBase + parent: [ ClothingHeadBase, BaseMagicalContraband ] id: ClothingHeadHatWizardBase components: - type: WizardClothes diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index 4745bc8dbd..08ac6f32c0 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -677,7 +677,7 @@ #Wizard Hardsuit - type: entity - parent: ClothingOuterHardsuitBase + parent: [ ClothingOuterHardsuitBase, BaseMagicalContraband ] id: ClothingOuterHardsuitWizard name: wizard hardsuit description: A bizarre gem-encrusted suit that radiates magical energies. diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index c8c83f9db8..4112853021 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -168,7 +168,7 @@ - type: entity abstract: true - parent: ClothingOuterBase + parent: [ ClothingOuterBase, BaseMagicalContraband ] id: ClothingOuterWizardBase components: - type: WizardClothes diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index d7cde640a4..eeb0fa6bff 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -1345,7 +1345,7 @@ volume: -10 - type: entity - parent: BaseItem + parent: [ BaseItem, BaseMagicalContraband ] id: PonderingOrb name: pondering orb description: Ponderous, man... Really ponderous. diff --git a/Resources/Prototypes/Entities/Objects/Magic/books.yml b/Resources/Prototypes/Entities/Objects/Magic/books.yml index d000f78429..db604f92d3 100644 --- a/Resources/Prototypes/Entities/Objects/Magic/books.yml +++ b/Resources/Prototypes/Entities/Objects/Magic/books.yml @@ -1,7 +1,7 @@ - type: entity id: BaseSpellbook name: spellbook - parent: BaseItem + parent: [ BaseItem, BaseMagicalContraband ] abstract: true components: - type: Sprite @@ -25,7 +25,7 @@ id: WizardsGrimoire name: wizards grimoire suffix: Wizard - parent: [ BaseItem, StorePresetSpellbook ] + parent: [ BaseItem, StorePresetSpellbook, BaseMagicalContraband ] components: - type: Sprite sprite: Objects/Misc/books.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index 9cab4cac25..0ce441d291 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -1,7 +1,7 @@ - type: entity id: WeaponStaffBase abstract: true - parent: BaseItem + parent: [ BaseItem, BaseMagicalContraband ] components: - type: Sprite sprite: Objects/Weapons/Guns/Basic/staves.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml index c4a937ee2c..555a760c90 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml @@ -1,7 +1,7 @@ - type: entity id: WeaponWandBase abstract: true - parent: BaseItem + parent: [ BaseItem, BaseMagicalContraband ] components: - type: Sprite sprite: Objects/Weapons/Guns/Basic/wands.rsi diff --git a/Resources/Prototypes/Entities/Objects/base_contraband.yml b/Resources/Prototypes/Entities/Objects/base_contraband.yml index 7217808807..032218f8c0 100644 --- a/Resources/Prototypes/Entities/Objects/base_contraband.yml +++ b/Resources/Prototypes/Entities/Objects/base_contraband.yml @@ -1,4 +1,12 @@ -# non-stealth syndicate stuff +# any type of magical items used by wizards and similiar +- type: entity + id: BaseMagicalContraband + abstract: true + components: + - type: Contraband + severity: Magical + +# non-stealth syndicate stuff - type: entity id: BaseSyndicateContraband abstract: true diff --git a/Resources/Prototypes/Magic/staves.yml b/Resources/Prototypes/Magic/staves.yml index ea42c47d18..0582899495 100644 --- a/Resources/Prototypes/Magic/staves.yml +++ b/Resources/Prototypes/Magic/staves.yml @@ -34,7 +34,7 @@ - type: entity id: AnimationStaff - parent: BaseItem + parent: [ BaseItem, BaseMagicalContraband ] name: staff of animation description: Brings inanimate objects to life! components: diff --git a/Resources/Prototypes/contraband_severities.yml b/Resources/Prototypes/contraband_severities.yml index c103af5e0a..38349d9497 100644 --- a/Resources/Prototypes/contraband_severities.yml +++ b/Resources/Prototypes/contraband_severities.yml @@ -25,3 +25,8 @@ - type: contrabandSeverity id: Syndicate examineText: contraband-examine-text-Syndicate + +# This is magical contraband and not permitted to be used IC. +- type: contrabandSeverity + id: Magical + examineText: contraband-examine-text-Magical