From 4458a4cba08718ea9d9db404fbfcab9a57385c76 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Wed, 4 Sep 2024 11:43:25 -0300 Subject: [PATCH 01/12] Cambion Inicial --- .../Mobs/Customization/Markings/Oni_horns.yml | 4 +- .../Mobs/Customization/Markings/oni_horns.yml | 88 +++++++++--------- .../Customization/Markings/pointy_ears.yml | 18 ++-- .../EstacaoPirata/Damage/modifier_sets.yml | 5 + .../EstacaoPirata/Mobs/Player/Cambion.yml | 30 ++++++ .../EstacaoPirata/Mobs/Species/Cambion.yml | 54 +++++++++++ .../EstacaoPirata/Species/Cambion.yml | 47 ++++++++++ .../Mobs/Customization/Markings/Oni_horns.yml | 14 +-- .../Mobs/Customization/Markings/Cambion.yml | 17 ++++ .../cambion_tail.rsi/cambion_tail.png | Bin 0 -> 872 bytes .../Customization/cambion_tail.rsi/meta.json | 19 ++++ .../cambion_tail.rsi/nightcrawler_tail.png | Bin 0 -> 943 bytes 12 files changed, 234 insertions(+), 62 deletions(-) create mode 100644 Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml create mode 100644 Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml create mode 100644 Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml create mode 100644 Resources/Prototypes/EstacaoPirata/Species/Cambion.yml create mode 100644 Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml create mode 100644 Resources/Textures/Mobs/Customization/cambion_tail.rsi/cambion_tail.png create mode 100644 Resources/Textures/Mobs/Customization/cambion_tail.rsi/meta.json create mode 100644 Resources/Textures/Mobs/Customization/cambion_tail.rsi/nightcrawler_tail.png diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml index fbf78c92e52f..df1d0be1add9 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: shaved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: bull diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml index 88d4ee493dbd..213e713c3a94 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved @@ -12,7 +12,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_1 @@ -25,7 +25,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull @@ -34,7 +34,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_1 @@ -47,7 +47,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: crowned @@ -57,7 +57,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket @@ -67,7 +67,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_1 @@ -81,7 +81,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces @@ -91,7 +91,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_2tone_1 @@ -103,7 +103,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_1 @@ -117,7 +117,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo @@ -127,7 +127,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_1 @@ -141,7 +141,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius @@ -151,7 +151,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_1 @@ -165,7 +165,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas @@ -175,7 +175,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_1 @@ -189,7 +189,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara @@ -199,7 +199,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_2tone_1 @@ -211,7 +211,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_1 @@ -225,7 +225,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta @@ -235,7 +235,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_1 @@ -249,7 +249,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus @@ -259,7 +259,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_2tone_1 @@ -271,7 +271,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_1 @@ -285,7 +285,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries @@ -295,7 +295,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_1 @@ -309,7 +309,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris @@ -319,7 +319,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_1 @@ -333,7 +333,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined @@ -343,7 +343,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_1 @@ -357,7 +357,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy @@ -367,7 +367,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_2tone_1 @@ -379,7 +379,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_1 @@ -393,7 +393,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_2tone_1 @@ -405,7 +405,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_1 @@ -419,7 +419,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: unicorn @@ -429,7 +429,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -439,7 +439,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_1 @@ -453,7 +453,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -465,7 +465,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick @@ -475,7 +475,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_2tone_1 @@ -487,7 +487,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_1 @@ -501,7 +501,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_1 @@ -515,7 +515,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index 10016fb9851c..51169e28f0d6 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -3,7 +3,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_standard @@ -13,7 +13,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_wide @@ -23,7 +23,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_small @@ -33,7 +33,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_upwards @@ -43,7 +43,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_tall @@ -53,7 +53,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_slanted @@ -63,7 +63,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_thin @@ -73,7 +73,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_large @@ -83,7 +83,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_none diff --git a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml new file mode 100644 index 000000000000..75ba8aa07b37 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml @@ -0,0 +1,5 @@ +- type: damageModifierSet + id: Cambion + coefficients: + Heat: 0.50 + Cold: 1.30 \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml new file mode 100644 index 000000000000..98a8ec5354f3 --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml @@ -0,0 +1,30 @@ +- type: entity + save: false + name: Urist McTief + parent: MobCambionBase + id: MobCambion + components: + - type: CombatMode + - type: MindContainer + showExamineInfo: true + - type: Input + context: "human" + - type: MobMover + - type: InputMover + - type: Respirator + damage: + types: + Asphyxiation: 1.0 + damageRecovery: + types: + Asphyxiation: -1.0 + - type: Alerts + - type: Actions + - type: Eye + - type: CameraRecoil + - type: Examiner + - type: CanHostGuardian + - type: NpcFactionMember + factions: + - NanoTrasen + - type: PotentialPsionic diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml new file mode 100644 index 000000000000..9e01a00e62fa --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml @@ -0,0 +1,54 @@ +- type: entity + parent: BaseMobHuman + name: Urist McTief + id: MobCambionBase + abstract: true + components: + - type: HumanoidAppearance + species: Cambion + - type: MeleeWeapon + soundHit: + path: /Audio/Weapons/pierce.ogg + angle: 30 + animation: WeaponArcClaw + damage: + types: + Slash: 3.5 + Heat: 1.5 + - type: Body + prototype: Human + - type: TypingIndicator + proto: oni + - type: Stamina + critThreshold: 85 + - type: Temperature + heatDamageThreshold: 500 + coldDamageThreshold: 270 + currentTemperature: 310.15 + specificHeat: 42 + coldDamage: + types: + Cold : 1 #per second, scales with temperature & other constants + heatDamage: + types: + Heat : 0.5 #per second, scales with temperature & other constants + - type: Damageable + damageModifierSet: Cambion + - type: LanguageKnowledge + speaks: + - GalacticCommon + - Nekomimetic + understands: + - GalacticCommon + - Nekomimetic + - type: MovementSpeedModifier + baseWalkSpeed : 7 + baseSprintSpeed : 7 + +- type: entity + save: false + name: Urist McDemon + parent: MobHumanDummy + id: MobCambionDummy + noSpawn: true + description: A dummy Cambion meant to be used in character setup. diff --git a/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml new file mode 100644 index 000000000000..e4ccc35edb8a --- /dev/null +++ b/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml @@ -0,0 +1,47 @@ +- type: species + id: Cambion + name: species-name-oni + roundStart: true + prototype: MobCambion #Alterar + dollPrototype: MobCambionDummy #Alterar + markingLimits: MobCambionMarkingLimits + sprites: MobHumanSprites + skinColoration: Hues + maleFirstNames: names_oni_male + femaleFirstNames: names_oni_female + lastNames: names_oni_location + naming: LastNoFirst + +- type: markingPoints + id: MobCambionMarkingLimits + points: + Hair: + points: 1 + required: false + FacialHair: + points: 1 + required: false + HeadTop: + points: 1 + required: true + defaultMarkings: [ OniHornPisces ] + HeadSide: + points: 1 + required: true + defaultMarkings: [ PointyEarsStandard ] + Snout: + points: 2 + required: false + Chest: + points: 1 + required: false + Legs: + points: 6 + required: false + Arms: + points: 6 + required: false + Tail: + points: 1 + required: true + defaultMarkings: [ CambionTail ] diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 39dca5ef9ab5..78600acde905 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_curved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_left_curved @@ -23,7 +23,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_right_curved @@ -33,7 +33,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved_outwards @@ -43,7 +43,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved @@ -53,7 +53,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_left_broke_curved @@ -63,7 +63,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni] + speciesRestriction: [Oni, Cambion] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved diff --git a/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml b/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml new file mode 100644 index 000000000000..6872ebda5b1c --- /dev/null +++ b/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml @@ -0,0 +1,17 @@ +- type: marking + id: CambionTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Cambion] + sprites: + - sprite: Mobs/Customization/cambion_tail.rsi + state: cambion_tail + +- type: marking + id: CambionNightCrawlerTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Cambion] + sprites: + - sprite: Mobs/Customization/cambion_tail.rsi + state: nightcrawler_tail diff --git a/Resources/Textures/Mobs/Customization/cambion_tail.rsi/cambion_tail.png b/Resources/Textures/Mobs/Customization/cambion_tail.rsi/cambion_tail.png new file mode 100644 index 0000000000000000000000000000000000000000..0fe6e85556f5c5cb5c6f3771554ca3f5e06a4c8e GIT binary patch literal 872 zcmV-u1DE`XP)Px&2uVaiRCr$Pn!T&?FcikqK@i0ctb;oE1uiZwE-r$bgZ{NTxCt&UE`qoSS{&5D ziXZ6Wke8>BORb_QHScY1Qz%?7$?-hD^PHrZY9!#77I6JU0Z>2)dB%GfZ7FA3#b+dI04lH0XKlWyTD{Jq4j#*vx7Yc_zed^{BE}+oleJd{+99&&`g)0|9v;W-JyXkx0Y}?}YG>pj~`8944k|l4vw)P2`1u{>L1A zsaxl`0f4dZARv!qGHHc89*+cT(klp008n{|#{~fF;$77l0A65jMLWkc2+sdQJcQ$7 ze=`Vn7igQ!hN4%U)yKp}qan<~UWLB`f#RX{R;$&6W0@NO1nUNCh3oZ7ErAfvdLB<$ zx~_AH{~r%M-vY&)34L}aNK@f&fpErA07Q|MC9ZOSER_1O_*=%yp^HNc_b4Q~Q&1SRY ze!p`=;1&V^`~BXx;u$PJNT<`^2e4QysGqBE2LKmTDiyBcat%WDZ?_x4?N|HT0pJi6 zH_!VCTmWDz_60HkaFeSAz%)&&>-rOnUax1J^B)ceE9Uup_U#tPL}M$A$K%$=R4Qd1 zly2xBvHBG|{4nN{yf4^>j&fNmrA$u195Ddd0lv0A%c5v5f zH46x|TLAC@0{?<|2ICV121rBIG3hUf=Y@cAmKCtbp})~Pu#8MS|LI}Lxh6mx(~1TC yABw4}z>K6c;s5{u4rN$LW=%~1DgXcg2mk;800000(o>TF0000VD|TPaSW-5 zdpql(x0R#F@pMsVAMd5jtTS(|o!lh5hsCj-@9Xrkkc-X&6(5COIPPIl<$87SjF2+V z%pZJb{$2YU*>`K(<~JO1cjnIg{&&y&YHd5yN1vuYEBfog7{FIx$r#F{XWo$2w2CE! zbH|(pEyn564z{czoGXN2a>etRzJLF2GW%@an+Lt-8xA`P+<*W57Z+;&bzDj&E0kZLvBBcdLxbI=CQ>hbcZO(P z+`HGdsH*B0Kf@;ekL%a3fAaXTvv{}fkHkf>bD0HL)nLvyu3V( zIRZRvGnE+}o!w=5*q(g;TxZYRSgpT$61zs|MKO_+GInx@)zfsaZz4H_!$-FSd`#EMWA3t8awE2AKBg6aM z@|mv7U9&~m{x>nmDJbI zKWpK_zWI<7FqMf!9{t?I#N-yA&HSQl_Z6F~N561{q@LR+$PmM@eOCMC?k#668G@BA z80))yyMO;a=RLmyhG%sZvtth&Z#cG4m$|{yprdkcoSD2y-;wtm^2)=$a*<(cP1SUydWHVX zJ;$*yY;|Drq^(tZ{o>=|ZkUL+RD7GOG0*ugC)4!~dp{Q?!9xrQiB@yVN}iqVi+aYg zF1os+B7vczy}am|tKx_E+&ku{%F6HAyLaN;xw1{W3WLt-zgA6CcaXl`)%K6oh~dto nwWqDzf%%LtHNrE^*Ox&H$mRfI5V#aP8AN%y`njxgN@xNAI`pQD literal 0 HcmV?d00001 From 18e22936b6ba50ea21c20bc1585631e12d4447fd Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:48:32 -0300 Subject: [PATCH 02/12] =?UTF-8?q?Balanceamentos=20e=20corre=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 645177112e1d6d80ff9ff6048e306ca472bfacff) --- Resources/Locale/en-US/species/species.ftl | 1 + .../Prototypes/EstacaoPirata/Damage/modifier_sets.yml | 5 +++-- .../Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml | 10 +++++----- Resources/Prototypes/EstacaoPirata/Species/Cambion.yml | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index f492959a4394..4da30a117bc8 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -11,3 +11,4 @@ species-name-moth = Moth Person species-name-skeleton = Skeleton species-name-vox = Vox species-name-ipc = IPC +species-name-cambion = Cambion \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml index 75ba8aa07b37..8e9984a39eae 100644 --- a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml +++ b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml @@ -1,5 +1,6 @@ - type: damageModifierSet id: Cambion coefficients: - Heat: 0.50 - Cold: 1.30 \ No newline at end of file + Heat: 0.6 + Cold: 1.30 + Piercing: 1.2 \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml index 9e01a00e62fa..2de869b373c3 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml @@ -1,9 +1,12 @@ - type: entity parent: BaseMobHuman - name: Urist McTief + name: Urist McDemon id: MobCambionBase abstract: true components: + #- type: MovementSpeedModifier + # baseWalkSpeed : 7 + # baseSprintSpeed : 7 - type: HumanoidAppearance species: Cambion - type: MeleeWeapon @@ -28,7 +31,7 @@ specificHeat: 42 coldDamage: types: - Cold : 1 #per second, scales with temperature & other constants + Cold : 0.3 #per second, scales with temperature & other constants heatDamage: types: Heat : 0.5 #per second, scales with temperature & other constants @@ -41,9 +44,6 @@ understands: - GalacticCommon - Nekomimetic - - type: MovementSpeedModifier - baseWalkSpeed : 7 - baseSprintSpeed : 7 - type: entity save: false diff --git a/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml index e4ccc35edb8a..5b88a5b7e636 100644 --- a/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml @@ -1,6 +1,6 @@ - type: species id: Cambion - name: species-name-oni + name: species-name-cambion roundStart: true prototype: MobCambion #Alterar dollPrototype: MobCambionDummy #Alterar From 22f33b82126912f7ca63440e8d628ccb4437704d Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Thu, 5 Sep 2024 16:58:09 -0300 Subject: [PATCH 03/12] Descartada a ideia de move speed a mais (cherry picked from commit e63e476b6f6f45b713c5e0fd0f22e8d7813ca6c0) --- Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml index 2de869b373c3..f5bfef71f7ca 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml @@ -4,9 +4,6 @@ id: MobCambionBase abstract: true components: - #- type: MovementSpeedModifier - # baseWalkSpeed : 7 - # baseSprintSpeed : 7 - type: HumanoidAppearance species: Cambion - type: MeleeWeapon @@ -22,8 +19,6 @@ prototype: Human - type: TypingIndicator proto: oni - - type: Stamina - critThreshold: 85 - type: Temperature heatDamageThreshold: 500 coldDamageThreshold: 270 From 4d3dcf37604bea8a64d374ec2b67d21c3a7bcf93 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Thu, 5 Sep 2024 17:52:34 -0300 Subject: [PATCH 04/12] Define o nome para Daengati (cherry picked from commit 10bf9001493de05e225e8e4c4453b7e53cb35b83) --- .../Mobs/Customization/Markings/Oni_horns.yml | 4 +- .../Mobs/Customization/Markings/oni_horns.yml | 88 +++++++++--------- .../Customization/Markings/pointy_ears.yml | 18 ++-- .../EstacaoPirata/Damage/modifier_sets.yml | 6 +- .../Mobs/Player/{Cambion.yml => Daengati.yml} | 4 +- .../Species/{Cambion.yml => Daengati.yml} | 16 ++-- .../Species/{Cambion.yml => Daengati.yml} | 14 +-- .../Mobs/Customization/Markings/Oni_horns.yml | 14 +-- .../Mobs/Customization/Markings/Cambion.yml | 17 ---- .../Mobs/Customization/Markings/Daengati.yml | 17 ++++ .../daengati_tail.png} | Bin .../meta.json | 2 +- .../nightcrawler_tail.png | Bin 13 files changed, 100 insertions(+), 100 deletions(-) rename Resources/Prototypes/EstacaoPirata/Mobs/Player/{Cambion.yml => Daengati.yml} (92%) rename Resources/Prototypes/EstacaoPirata/Mobs/Species/{Cambion.yml => Daengati.yml} (70%) rename Resources/Prototypes/EstacaoPirata/Species/{Cambion.yml => Daengati.yml} (76%) delete mode 100644 Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml create mode 100644 Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml rename Resources/Textures/Mobs/Customization/{cambion_tail.rsi/cambion_tail.png => daengati_tail.rsi/daengati_tail.png} (100%) rename Resources/Textures/Mobs/Customization/{cambion_tail.rsi => daengati_tail.rsi}/meta.json (90%) rename Resources/Textures/Mobs/Customization/{cambion_tail.rsi => daengati_tail.rsi}/nightcrawler_tail.png (100%) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml index df1d0be1add9..126f7a153b68 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: shaved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: DeltaV/Mobs/Customization/Oni/oni_horns.rsi state: bull diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml index 213e713c3a94..4985fa4e0549 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved @@ -12,7 +12,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_curved_3tone_1 @@ -25,7 +25,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull @@ -34,7 +34,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: tall_bull_3tone_1 @@ -47,7 +47,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: crowned @@ -57,7 +57,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket @@ -67,7 +67,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: serket_3tone_1 @@ -81,7 +81,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces @@ -91,7 +91,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_2tone_1 @@ -103,7 +103,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: pisces_3tone_1 @@ -117,7 +117,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo @@ -127,7 +127,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: virgo_3tone_1 @@ -141,7 +141,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius @@ -151,7 +151,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: sagittarius_3tone_1 @@ -165,7 +165,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas @@ -175,7 +175,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: vantas_3tone_1 @@ -189,7 +189,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara @@ -199,7 +199,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_2tone_1 @@ -211,7 +211,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns48x48.rsi state: makara_3tone_1 @@ -225,7 +225,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta @@ -235,7 +235,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: nepeta_3tone_1 @@ -249,7 +249,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus @@ -259,7 +259,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_2tone_1 @@ -271,7 +271,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: taurus_3tone_1 @@ -285,7 +285,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries @@ -295,7 +295,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: aries_3tone_1 @@ -309,7 +309,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris @@ -319,7 +319,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: tavris_3tone_1 @@ -333,7 +333,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined @@ -343,7 +343,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: inclined_3tone_1 @@ -357,7 +357,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy @@ -367,7 +367,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_2tone_1 @@ -379,7 +379,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: wavy_3tone_1 @@ -393,7 +393,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_2tone_1 @@ -405,7 +405,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: antlers_3tone_1 @@ -419,7 +419,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: unicorn @@ -429,7 +429,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -439,7 +439,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia_3tone_1 @@ -453,7 +453,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: erebia @@ -465,7 +465,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick @@ -475,7 +475,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_2tone_1 @@ -487,7 +487,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_thick_3tone_1 @@ -501,7 +501,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_3tone_1 @@ -515,7 +515,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Mobs/Customization/Oni/oni_horns.rsi state: double_curved_outwards_3tone_1 diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml index 51169e28f0d6..ab0a8a88918c 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/pointy_ears.yml @@ -3,7 +3,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_standard @@ -13,7 +13,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_wide @@ -23,7 +23,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_small @@ -33,7 +33,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_upwards @@ -43,7 +43,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_tall @@ -53,7 +53,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_slanted @@ -63,7 +63,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_thin @@ -73,7 +73,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_large @@ -83,7 +83,7 @@ bodyPart: HeadSide markingCategory: HeadSide forcedColoring: true - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Daengati] sprites: - sprite: Mobs/Customization/pointy_ears.rsi state: pointy_ears_none diff --git a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml index 8e9984a39eae..ea9fa70ec236 100644 --- a/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml +++ b/Resources/Prototypes/EstacaoPirata/Damage/modifier_sets.yml @@ -1,6 +1,6 @@ - type: damageModifierSet - id: Cambion + id: Daengati coefficients: Heat: 0.6 - Cold: 1.30 - Piercing: 1.2 \ No newline at end of file + Cold: 1.3 + Piercing: 1.15 \ No newline at end of file diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml similarity index 92% rename from Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml rename to Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml index 98a8ec5354f3..7d521d6f802c 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml @@ -1,8 +1,8 @@ - type: entity save: false name: Urist McTief - parent: MobCambionBase - id: MobCambion + parent: MobDaengatiBase + id: MobDaengati components: - type: CombatMode - type: MindContainer diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml similarity index 70% rename from Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml rename to Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml index f5bfef71f7ca..df700c43a00e 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml @@ -1,11 +1,11 @@ - type: entity parent: BaseMobHuman name: Urist McDemon - id: MobCambionBase + id: MobDaengatiBase abstract: true components: - type: HumanoidAppearance - species: Cambion + species: Daengati - type: MeleeWeapon soundHit: path: /Audio/Weapons/pierce.ogg @@ -14,7 +14,7 @@ damage: types: Slash: 3.5 - Heat: 1.5 + Heat: 2 - type: Body prototype: Human - type: TypingIndicator @@ -26,12 +26,12 @@ specificHeat: 42 coldDamage: types: - Cold : 0.3 #per second, scales with temperature & other constants + Cold : 0.4 #o padrão é 0.1 heatDamage: types: - Heat : 0.5 #per second, scales with temperature & other constants + Heat : 0.5 #O padrão é 1.5 - type: Damageable - damageModifierSet: Cambion + damageModifierSet: Daengati - type: LanguageKnowledge speaks: - GalacticCommon @@ -44,6 +44,6 @@ save: false name: Urist McDemon parent: MobHumanDummy - id: MobCambionDummy + id: MobDaengatiDummy noSpawn: true - description: A dummy Cambion meant to be used in character setup. + description: A dummy Daengati meant to be used in character setup. diff --git a/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml similarity index 76% rename from Resources/Prototypes/EstacaoPirata/Species/Cambion.yml rename to Resources/Prototypes/EstacaoPirata/Species/Daengati.yml index 5b88a5b7e636..bac5b5820cf1 100644 --- a/Resources/Prototypes/EstacaoPirata/Species/Cambion.yml +++ b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml @@ -1,10 +1,10 @@ - type: species - id: Cambion - name: species-name-cambion + id: Daengati + name: species-name-daengati roundStart: true - prototype: MobCambion #Alterar - dollPrototype: MobCambionDummy #Alterar - markingLimits: MobCambionMarkingLimits + prototype: MobDaengati #Alterar + dollPrototype: MobDaengatiDummy #Alterar + markingLimits: MobDaengatiMarkingLimits sprites: MobHumanSprites skinColoration: Hues maleFirstNames: names_oni_male @@ -13,7 +13,7 @@ naming: LastNoFirst - type: markingPoints - id: MobCambionMarkingLimits + id: MobDaengatiMarkingLimits points: Hair: points: 1 @@ -44,4 +44,4 @@ Tail: points: 1 required: true - defaultMarkings: [ CambionTail ] + defaultMarkings: [ DaengatiTail ] diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml index 78600acde905..ee755466a5ea 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Customization/Markings/Oni_horns.yml @@ -3,7 +3,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_curved @@ -13,7 +13,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_left_curved @@ -23,7 +23,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: single_right_curved @@ -33,7 +33,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved_outwards @@ -43,7 +43,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_curved @@ -53,7 +53,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_left_broke_curved @@ -63,7 +63,7 @@ bodyPart: HeadTop markingCategory: HeadTop forcedColoring: false - speciesRestriction: [Oni, Cambion] + speciesRestriction: [Oni, Daengati] sprites: - sprite: Nyanotrasen/Mobs/Customization/oni_horns.rsi state: double_right_broke_curved diff --git a/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml b/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml deleted file mode 100644 index 6872ebda5b1c..000000000000 --- a/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Cambion.yml +++ /dev/null @@ -1,17 +0,0 @@ -- type: marking - id: CambionTail - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Cambion] - sprites: - - sprite: Mobs/Customization/cambion_tail.rsi - state: cambion_tail - -- type: marking - id: CambionNightCrawlerTail - bodyPart: Tail - markingCategory: Tail - speciesRestriction: [Cambion] - sprites: - - sprite: Mobs/Customization/cambion_tail.rsi - state: nightcrawler_tail diff --git a/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml b/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml new file mode 100644 index 000000000000..1a6db1e1ab7a --- /dev/null +++ b/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml @@ -0,0 +1,17 @@ +- type: marking + id: DaengatiTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: daengati_tail + +- type: marking + id: DaengatiNightCrawlerTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: nightcrawler_tail diff --git a/Resources/Textures/Mobs/Customization/cambion_tail.rsi/cambion_tail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/daengati_tail.png similarity index 100% rename from Resources/Textures/Mobs/Customization/cambion_tail.rsi/cambion_tail.png rename to Resources/Textures/Mobs/Customization/daengati_tail.rsi/daengati_tail.png diff --git a/Resources/Textures/Mobs/Customization/cambion_tail.rsi/meta.json b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json similarity index 90% rename from Resources/Textures/Mobs/Customization/cambion_tail.rsi/meta.json rename to Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json index 4739b8c07fcd..b045196d4091 100644 --- a/Resources/Textures/Mobs/Customization/cambion_tail.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json @@ -8,7 +8,7 @@ }, "states": [ { - "name": "cambion_tail", + "name": "daengati_tail", "directions": 4 }, { diff --git a/Resources/Textures/Mobs/Customization/cambion_tail.rsi/nightcrawler_tail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png similarity index 100% rename from Resources/Textures/Mobs/Customization/cambion_tail.rsi/nightcrawler_tail.png rename to Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png From 6a5bb2da7248fc2818a3acc7bfff344e59d38fe8 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Fri, 6 Sep 2024 10:15:46 -0300 Subject: [PATCH 05/12] =?UTF-8?q?corre=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/en-US/species/species.ftl | 2 +- .../Entities/Mobs/Customization/Markings/Daengati.yml | 0 Resources/Prototypes/EstacaoPirata/Species/Daengati.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) rename Resources/{Textures => Prototypes}/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml (100%) diff --git a/Resources/Locale/en-US/species/species.ftl b/Resources/Locale/en-US/species/species.ftl index 4da30a117bc8..59eac9525ba3 100644 --- a/Resources/Locale/en-US/species/species.ftl +++ b/Resources/Locale/en-US/species/species.ftl @@ -11,4 +11,4 @@ species-name-moth = Moth Person species-name-skeleton = Skeleton species-name-vox = Vox species-name-ipc = IPC -species-name-cambion = Cambion \ No newline at end of file +species-name-daengati = Daengati \ No newline at end of file diff --git a/Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml similarity index 100% rename from Resources/Textures/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml rename to Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml diff --git a/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml index bac5b5820cf1..357c61a627ea 100644 --- a/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Species/Daengati.yml @@ -11,6 +11,7 @@ femaleFirstNames: names_oni_female lastNames: names_oni_location naming: LastNoFirst + maxHeight: 1.1 - type: markingPoints id: MobDaengatiMarkingLimits From b95282ce7ae2be64bc427ef493dc23c4402fd30d Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:42:28 -0300 Subject: [PATCH 06/12] Novos rabos --- .../Mobs/Customization/Markings/Daengati.yml | 40 ++++++++++++++++++ .../daengati_tail.rsi/DragonLong-tip.png | Bin 0 -> 472 bytes .../daengati_tail.rsi/DragonLong.png | Bin 0 -> 764 bytes .../daengati_tail.rsi/HeartTail-tip.png | Bin 0 -> 408 bytes .../daengati_tail.rsi/HeartTail.png | Bin 0 -> 714 bytes .../daengati_tail.rsi/RaboCortado.png | Bin 0 -> 563 bytes .../daengati_tail.rsi/RaboEnrolado.png | Bin 0 -> 710 bytes .../Customization/daengati_tail.rsi/meta.json | 24 +++++++++++ 8 files changed, 64 insertions(+) create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboCortado.png create mode 100644 Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml index 1a6db1e1ab7a..722c04013e94 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml @@ -15,3 +15,43 @@ sprites: - sprite: Mobs/Customization/daengati_tail.rsi state: nightcrawler_tail + +- type: marking + id: DaengatiHeartTail + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: HeartTail + - sprite: Mobs/Customization/daengati_tail.rsi + state: HeartTail-tip + +- type: marking + id: DaengatiDragonLong + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: DragonLong + - sprite: Mobs/Customization/daengati_tail.rsi + state: DragonLong-tip + +- type: marking + id: DaengatiRaboCortado + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: RaboCortado + +- type: marking + id: DaengatiRaboEnrolado + bodyPart: Tail + markingCategory: Tail + speciesRestriction: [Daengati] + sprites: + - sprite: Mobs/Customization/daengati_tail.rsi + state: RaboEnrolado diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..fb6f811405854a1561dbf9caff466ce8c09f5d53 GIT binary patch literal 472 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zD?D8sLn`9l z&T`~xHQ;fHF427P*MH@MpqJ{c9>RO`q#yp4VhytiSfckq0%d&wnxVDlndtP2jd* zZtg7b8C=NR9g_VfUW0o1?&IqFJ+HU{8rn3n>*^!Y!(m2N0|z{o>iW! zjo-F+cJg^2hEMYoyYtLhY*@XSCrsR)q0A^YeL}VeL(wj=T$KZlgo=1M9sI5@>Sc+D zaayOyc;aQ$mWd4A-X}~|7%XGE&4dyPId`_PC@jyu=*Fa@r+9q=!;=!-TSkmeXZY+h zT9+4~tN&`@vZcnaY#O*GXs5UcpL!{NRco=)#(jphyWHL>KHQ$4!&}#Jt-GN}!^v0h zdR0FA)ej;ia+9sk8(&E_d=z2nec70C>$KY&rsOs03Rj8!{qlBwa?y&)I>>bOYbh{7_);T0(|mmyw18|5AO?X;!IMFh Mr>mdKI;Vst0HLe5>;M1& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png new file mode 100644 index 0000000000000000000000000000000000000000..c61512d28ead08c51163e995102ed0a7f81a69d8 GIT binary patch literal 764 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>V4CCU;uum9 z_jcClb%z`{+HSwN$tce>m-~Raqdb!xiSdYA|M@aCXK(ZzgqcU{<76ONt3LIB^Zb7Icl)nw3|Ues)c*aqZguPA1ihOb zKljbjxfqq6wV&O6;UC@5C!)HOyRWi+xU)-@At-J3`NGq73ZXKNDq$R)G&u@L!1MPgXh#`Gqcro&VJ8~l3(qSbXAF)!S77e z6UzWjraj8*nEs?zTugdWETFRA?$pzjg0FWwyj*aczouUJ?2P+Y_oqbx6D?nAglC$s aFM}44%>l$9a4C2)i1Kvxb6Mw<&;$UM;!sck literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png new file mode 100644 index 0000000000000000000000000000000000000000..61f09bb402e01ac2a199a707179f3e35d9e920a5 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj(QuLn`9l z&f2)P#es))FDnCQ?}d6n6DKB-4e@SKN7mXg^38wVbopgVv$@=Rwq+5Y{5|L0XJ}wN z$!WlJlJ$W=3X4SJ6A)%9;5K0DaVP>|#vQB@jBW?cTq|A6mlQcID0^?+^q`bC6=_vz zdy9Te|8IGIv+w1U!v;4h=b7~_=4p6rk#&0O``x*>%S?Z>U2qQIy6<*J@yo+{1{03n zo<}zyEc^a5#iZYihas>?t5jmarIQ(aJROsQR~}}V>gQIR;4o#5mn_?g5~Eqn%!{6c zyfScDI{BiEgn;Vupms*BxjoMgG-y~(wc-hQnPS4u=5li7mAkhS`IqdH`<|1p{Ym6? zA^V4IO8d_@Jhx`*di{~@;n%+m^$+%c-FRxvc9~kYJjShj^=F$I<2zT{_A_S5{+*@1 tm$5!ouf%at=#fxhfbykAc&7RKGH3zW96$^Lmx3pQC{I^Emvv4FO#rB@pt%45 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png new file mode 100644 index 0000000000000000000000000000000000000000..76a170c4dd65b626b911e060567354d1ba80a5a5 GIT binary patch literal 714 zcmV;*0yX`KP)Px%YDq*vRCr$Pnn8}kAPhyx0h(^QY!1=;A0mfnmt9Pf12FoL98n6Cn34)`7FAUR zhX4F+q_I2I_|rA6UkLzlK;r}?1sXSi6hTP=NrA=*ND4G=0J#Mu1tbL;Cm<=%xB<$& z1+><>>$+qICvWfz2SNPf@leAsB%eQdgI@rc=UGqF^gRIMIBE#F-EJM|;yc$~-?C;1 z>|Ow-CR6LG6Ce2Ta=EDU`K(T-lUkNV^?lEB$NhfS*XxxHFvd}PQvkq77o78aKG$Gx z0Bi_c@pO1V0L;{Vd@%L`z&_*}Q~V16f zNal{Jy+1_aH{bM#t401&1YPZ8`XkixN*SKW4TPc`njf+?ZU90(cZz=M^vF>FsHy8} zhugCYD*&^>=vze1M(*rTZt=7~6+52`>~{GJfDkc6A5SR&KDmJA1%d!f>z5$jc7YFq z*~0e%C{=t61SbG<8U&lr$XrR0x9f~+(#6zPx$(@8`@RCr$Pn!%2RAPhxut8uOW|8=@Hx@FRrG~qcSAo5zmo$VCcp5C^TfzCAk z(>0#I0RSkVaRO+8#sz>Oh!#K#G)@35(6|7w1<(R$fyN1-1sWGXy<1@4cRLJ2wt}-i zAfX^ie%m%P&vSPC*&mPqV6C<5y6OZ#!F63%6s&3h%d*&U9L*d3=~I_#02DMqn5M~; zQUU;Io&mp7z;PVrjZN@xSdn~ry*wRgrCWd?Q*1F1LVqt@PHQ^U_x-1bQz7sW(=%N!c?9_8+UjEC5$T zr2stjn+4#hQ%&apKvOj&Vu1oAsB7{G1!$^0J<2xdpqFf`cZ)I4S<_G*_C?p z6RK+J@A-=U4g%-w1yF193@ZfT3jiH*pOVy`d(>yZ#OW}-te`%sN%p=rIV*we z+$Xkww~RK_0A literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png new file mode 100644 index 0000000000000000000000000000000000000000..6bb55160928bbe9730fa6eca4ea483fe5c097440 GIT binary patch literal 710 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-HD>U`q3JaSW-5 zdmH7w?vMdbPWSqW-PtcxH<&-(36T=Req$4~Sf_ zWDaAR%YA^)QJYb_@touap%*a>-$XYE0U2{ZBCG{>)*mqO{rt4(WY`Cr^Tv~H`yOw~ z+v<2?h3Qmij;Hh&9(QBC` zF8{5Yzi^fYqsc99me>BvFE3c>ugh7@QL#79`=pBK2ThJO`{UL(hfEPmITPpIaOZSy zZYa~NW>v8SPNsS1mq(@UJF?C%@I;(fYW_7Zfrc9lSU?oK@2uvK}?9*(>fM)w|UA-DmaLOZWAe zZ7gb1^=vq^Z<%*YH&5B}!7vA*u$eSR}7C?xOBug2wy2e+zjv;X~0FMdjQkRCAk@ufz1ruq6ZXaU(A UKnwzxf+vG0Pgg&ebxsLQ0OYkU82|tP literal 0 HcmV?d00001 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json index b045196d4091..3de592d5f87c 100644 --- a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json +++ b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/meta.json @@ -14,6 +14,30 @@ { "name": "nightcrawler_tail", "directions": 4 + }, + { + "name": "HeartTail", + "directions": 4 + }, + { + "name": "HeartTail-tip", + "directions": 4 + }, + { + "name": "DragonLong", + "directions": 4 + }, + { + "name": "DragonLong-tip", + "directions": 4 + }, + { + "name": "RaboCortado", + "directions": 4 + }, + { + "name": "RaboEnrolado", + "directions": 4 } ] } From f9712122d497111d9564b4c586bc611dd97ab7e3 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Tue, 10 Sep 2024 17:44:15 -0300 Subject: [PATCH 07/12] Corrigido um erro nos daengati --- Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml index 7d521d6f802c..847863fe81e1 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Player/Daengati.yml @@ -27,4 +27,3 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic From 2f3abc44b86c3d498b9f9c0f037024dbc5e3dc9d Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Tue, 10 Sep 2024 18:24:02 -0300 Subject: [PATCH 08/12] =?UTF-8?q?Adi=C3=A7=C3=B5es=20e=20corre=C3=A7=C3=B5?= =?UTF-8?q?es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Locale/pt-BR/species/species.ftl | 1 + .../Mobs/Customization/Markings/Daengati.yml | 4 ++-- .../EstacaoPirata/Mobs/Species/Daengati.yml | 6 +++--- .../daengati_tail.rsi/DragonLong.png | Bin 764 -> 752 bytes 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Resources/Locale/pt-BR/species/species.ftl b/Resources/Locale/pt-BR/species/species.ftl index bdc72cd97a1a..7d15aa7550f3 100644 --- a/Resources/Locale/pt-BR/species/species.ftl +++ b/Resources/Locale/pt-BR/species/species.ftl @@ -11,3 +11,4 @@ species-name-arachne = Aracne species-name-moth = Pessoa Mariposa species-name-skeleton = Esqueleto species-name-vox = Vox +species-name-daengati = Daengati diff --git a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml index 722c04013e94..1b82db66e556 100644 --- a/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Entities/Mobs/Customization/Markings/Daengati.yml @@ -35,8 +35,8 @@ sprites: - sprite: Mobs/Customization/daengati_tail.rsi state: DragonLong - - sprite: Mobs/Customization/daengati_tail.rsi - state: DragonLong-tip + #- sprite: Mobs/Customization/daengati_tail.rsi + # state: DragonLong-tip - type: marking id: DaengatiRaboCortado diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml index df700c43a00e..e6e4850648e1 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml @@ -20,7 +20,7 @@ - type: TypingIndicator proto: oni - type: Temperature - heatDamageThreshold: 500 + heatDamageThreshold: 535 coldDamageThreshold: 270 currentTemperature: 310.15 specificHeat: 42 @@ -35,10 +35,10 @@ - type: LanguageKnowledge speaks: - GalacticCommon - - Nekomimetic + - Nekomimetic #Alterar essa linguagem para uma nova understands: - GalacticCommon - - Nekomimetic + - Nekomimetic #Alterar essa linguagem para uma nova - type: entity save: false diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/DragonLong.png index c61512d28ead08c51163e995102ed0a7f81a69d8..6eb287e7ae3cce076d3dcfe1bec3178c8584dd3b 100644 GIT binary patch delta 681 zcmV;a0#^O}1@HxsF@KOrL_t(|UhSGu&cYxJ$Hz5%)1&A)Je}v*j-qc~gD+jurR!HV z7%Ks(FD7O~`s=?fP~6b@$8~Q1U;s=3ofEJS=v)An1T6$C1Ue^RA<(%1tP0E_@P5Dj z^?DtgbKQl68^_TD1OU(r1hg6KUOWyz_5gv~xsv>^Ly+wI7k~5c(EWb@$$TK$)+_)p z=J9w$CvEip?RHzeBZdHfsJ68NRIShFGn@*55_-K}{`q`H(=8219YBsj-g~dTo=63N z4&BTFXDJ{QYdKK)y8wBbrlb&nF?N&SSry={aYE2i0YoVP3Bh6rl3-3As0{$Oje^}R zgGWG=0032BuYVHIxrgQ?0>CBlyjDK2LDB{Q^MWu4LEwhtUPmhLVyWXBq!bV(m(yDi zVmEo4wVv*pViz4SsT5$j)qz5wW5uet+Qm*P7zDpca1r5~1t4`jo@!Ky=d%Emn4tE5 z7yxa;wU2KKsNF-_^D_l#6Rv%HQ$Xz=(w?6wK$~#wi< z;G2fQ3IJUTwB~sZP=bKZhzdYjbeRa=Z$b7U^&W5t+_rfyfIl9+U~r~%HO7+cqE7t- P+!AE@!sS4flhy(z9)(0O delta 693 zcmeys`iFIbVf`FW7srr_xVN)TuRG+x(RTaAC71Z6@Ba(z>r&G*wM`U~a(Q;^k}}`j z9UD^H`s>#j@XfVPe*TZ2?||q9OGbI7x!ecT9p#zqSgh0^I4>w>{Glb#cHnK5YQ)HLtttqcYWCUKdCJLIg{Y9aM|nHa+@Po{?H z+h#E*JvSSvjv|i`9+B4`%H)IlCg`=Cki@3!PYm6>n(Vng2X5XsgwV%;{nK z6RZo0Z9a9MwVgD3R^PE4?@IpBOsq^nBY41Q;{qMld=a5C*tUdQw&wc=vZlVSmt{dT9Gt`vN|+u`Mc V Date: Tue, 10 Sep 2024 21:01:46 -0300 Subject: [PATCH 09/12] Adiciona novos rabos e balancemanto --- .../EstacaoPirata/Mobs/Species/Daengati.yml | 6 +++--- .../daengati_tail.rsi/HeartTail.png | Bin 714 -> 747 bytes .../daengati_tail.rsi/RaboCortado.png | Bin 563 -> 660 bytes .../daengati_tail.rsi/RaboEnrolado.png | Bin 710 -> 750 bytes 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml index e6e4850648e1..830522bf01e8 100644 --- a/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml +++ b/Resources/Prototypes/EstacaoPirata/Mobs/Species/Daengati.yml @@ -13,8 +13,8 @@ animation: WeaponArcClaw damage: types: - Slash: 3.5 - Heat: 2 + Slash: 3 + Heat: 3 - type: Body prototype: Human - type: TypingIndicator @@ -26,7 +26,7 @@ specificHeat: 42 coldDamage: types: - Cold : 0.4 #o padrão é 0.1 + Cold : 0.75 #o padrão é 0.1 heatDamage: types: Heat : 0.5 #O padrão é 1.5 diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png index 76a170c4dd65b626b911e060567354d1ba80a5a5..c570f764c1ab79ba38e45fa2942c996263928a1b 100644 GIT binary patch delta 676 zcmX@b`kHluVSTr!i(^Pd+}l}(eTNJLT<0=%@^!LVEm+Fn)psz^l1(+>0+XzXM~R0> z++Ppj%FWvzTb#T#F+Z`UU z>|hlVXSfd(1Bwbi5c7y(_`8?&+wZ-1-j?->-l=F7;If)q@As){FBjW|X-p0xQ)AX& zpZV+V@?8=AwKdmvty{U8A-b+|K}CYm%#QQVmD>(4tgxGJ$#cEo%JU1eyN@2K-g|oH z_S?R4{qE1jHarbi>1=0fZv0WVzqgsayh-ID-bn5d@omY2QmSunDXE^ctZ{73Rznfl2F+3`2 zbzn6;tD4)N^!fK+y&8uL0!ISo`YoS(hGEhc-lkbUGE9ulDQ7omaa@mPtlbv1)@54i zT($Mh3;6s)WIE5M8E5PK7fQJrlK;4z$E{Rem ztdvqrN@Q(WAa{A@nuZyx1eL_X95`MX&OOORq*SYQ&w^VUjwgHh^&U-`czx6H+f}+t zy*-vm_=@e^Z0k2IT-JHhX_wOK@S`iLSr6QlJO1qUTQmFZ+4bkoi_7eEHhaA%=a~q@ zh96(6I-eG;+TBd|xMp2QqIjk49KRK;s;8?(P;rf$Ug$zak-CGOz zo!4h2OlwcF+`fqQ1GBA&fi_g6Cn#QpGhmb-uTP8~!3q)!3&rOz=;Uc#gX02B8+ AX#fBK delta 650 zcmV;50(JfC18}fMaco0Zn|s^(fc1FhiI2wOp*gI`jH$_ z3Y3_V3UC%xRRxCs{B5MMJJtBpHLhO?0C7O$1SAC-H-HpDNdZZL#tBFYG;RR71tbL| z1sW$HDbTn9%Dn}&*1GGuWCtg2@Cye){NwRZ!!RVDKY4>+0DqY0Sx?jSJpki4Y6!XA zZXM|2JJ(*{vStYEUI3;hQ|qb|ANcWdxv2B`tWKwsT9!riea~{o{eIWi>y-^K#!-7y z0KiBWob!A>*I;h|YzSQOba+4j%+!5+F!ln#KI9rx{0jhrKxASf;d>`HfW0X|=Y-R3 zeQ!3$;jtj4!hhyYgZXdP(=x3o8|yNh$))KH0PKYtfL!5%$PEDJqBQsffdcBQOU^<^ zRg(jP#HZXOvFR6rUe_pBFWVu z4&aijWt}*nmPm4Shy%FfYFQ@^s3nqI9b0!88+@ZZ&OJ!(b-ot)uJ(8d{|5J+(bpp1 zYJfQ-;A%Kh#}|=`ZAj*hs=Yr%;y2&)h^s~ZQUqP?WBMc1@=6(=$PI*|9GV}pHEsYx zJ$H(J>VNdeQ2?l^>uQJFvkNN#v%%`-p;v_BO)p9}1E`3ry$F+?9vDF8mX zfaV2)08HzbAl`O?4}#gk_W~$Yd<+C90CO4yo6yKyNs+hfjBC=x)P{84ZULGN!V9J3 kdrV<92PY6@(ns3=0hTS!P_#waF8}}l4rN$LW|PeV9xk!WC(P4!m@-_NxXr_F_ST~@dT#_ zw~HRbP1YqqsHCo-E3lK{$2+FgSH1M7dv9tw$@kCMara$6@p{*Vi&z(Iz4rR+uDJ}K zY_4y2{g zRawYPn_s{Cy4hW(4&K}c%m=4Br}p1!)+t#fefwp}ts6WB=jHS`)XMhEKmYtx?q$m* zPV!bClA8}Yq((mb5_{aaUPK{gefZX!IdOM-k3Vj=$SIwD)Sh!wpG&M=kJOt|J68q9 zg0IuHUzpYSGhJw7Sz*Y*pyl}P+aiW{qDzkHb1e{hlBdu0AkH!C&m!U^I22Dj%>Qsf zVy`H}@yREb)IXWJY~}V?j)YgY4nJJ*FnRags{3*u{f;o~xSMBh{f&#YDS40I@?d)g z>q?fV#ZN?}YGhwCGSoRKRA@3VJo{WJnY{k`=S?e>7v|T*=uH=5;`6S}n|OEfN-N7& z<>0>;GnN!^on~~{emnH|Tvvztl{gtyl@A>V0)T2nw^W_r%8MONY O1L|*HyFQthNeuveN(mDH delta 491 zcmV3`KFPajpOVb-FgXWzv^4;W;88@>;^3 z?G)Rd-nNs0&NTkhHJ-l#04Shw0%(E81%M%l7C;L$P5>>?xB##P&;n?I#tEPW8W%vl zTVUUJI}Ag%g0nv$p&&|r+cq=Lb9VgMACLfGt+ngA>I6W+b$?w~6s&3h%d*&U9L*d3 z=~I_#02DMqn5M~;QUU;Io&mp7z;PVrjZN@xSdn~ry*wRgrCWd?Q*1F1LVqt@PHQ^U z_x-1bQz7sW(=% zN!c?9_8+UjEPnu3M5O>c^_vCYsZ&ko06$ zBvYWL*glC70AdI;S+cD`0V#1tDZm9#^65)VF+w(UnPB?}fNyxX*WGjKfbR`}n>^W-dh-*iYU=O#ivA7)=j;VgYw`>$1mOz+9de(N)Si3@f}88t5TwNE hFukmxKB`IfzBV~4f$ZETwtu&bNKjY(?c$Se0w!)v-lzZo diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/RaboEnrolado.png index 6bb55160928bbe9730fa6eca4ea483fe5c097440..068c95e65c772f2340dc019d3eaa0d2c6c407a1c 100644 GIT binary patch delta 679 zcmV;Y0$BaV1?~lqF@KIpL_t(|UhSH((!wAN$LXe%u8xlS82a2g`UpC9?5dM)e3#y( z7ZGTn*L?IyH}3)@zx)H7q%oC$P37?$1)vJ3oPd@<?c=Y)`9*@JguLreRMmts?NV z>pH^)K-9Qo9{>n*mQX4H3fA?_y9aPH5wa^4fKQ!2 zr$EZ?`kw&cNPkQ5HB_2E632SM;J8OkOlDIRoa? zK++O-3Gnmt`Iy`7_TwK7JmyPulMCIRVi^SmNd%8RP$f{mAmiW%e6dSi)-FGXq^Hga zAlx}Px7kSmQt#tagPddhBmi?bBt54BkS1Q*da8iZGJhiNk19Z#cxmgY0!qt>v_Gl< zY2u}=rwS-7Bhvn;0;GwTww@}Ww2VmmqY98FUfO!905>B`=@Cd#Qta>j;M17ID{o2= zxwf(9i2luhPCV8lAo2E}8z_!*eH@F)3&7VSfQo>H=5BzAx=oJtHK(h}|(Yb9ixpkd74l=%4txT+ef_AV(0np%= zkbQ)ODhNSf0a$AA90*}OxcpzB=e8y*LyuW^Ew^B+2~ NLtoc~S38rS0w(wcLWKYT delta 650 zcmaFIdW>~~VSSpXi(^Pd+}kMcb%zXia>5UAy{q?%5Dlx9TC(zviM_bTCGql574>gD z$1_`O`R3XuKmWn5d_d%aC36_lT;YL1G%ao#6YL_cV9 ztl1y8zBy!ySjw3=?}j_4dvimXW;LsdC2%s$JHI?Cb>ES7et{?Ayi)V8c?mS!FyZ80 zS@l^`k&|Wq@0Al%66^av|NOIAs6l@UW5@(AiH5^=C3=S8yY`enG~U{Vj# z9%~pgNr@gcsAN~EX=agX*S)#ynVcERku;XR59T|h7w5Dp8@_ul${6!TS|#DM_SNpy zGi&2}Sl%Q>&r+|MXj^`N0*m#&S$#Q~Mm2`JE-N1V$*|p2@Ak<}4=d|gm{P7=v~hD* zO?Sw8)U;-=xQkTpQsZ}@)n_l=*Jrk|s7ckc;mp2e-Z9-gWy_N{GjHNq#NzS6{lq?- z^B?4t6uTQ1H=S2J=*@8R5!+5?wyjI%Jr3uqD7eJ>x`X%m&9tD9ygR=dmn$CJs=Ceo d_dC7#DcwPO3=9l>sS%!OzP=1vldmvI0RXZpCPe@M From 7debc127da80cdd6a0ef51657ad76e322f08f972 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Tue, 10 Sep 2024 21:41:01 -0300 Subject: [PATCH 10/12] =?UTF-8?q?Adiciona=20as=20customiza=C3=A7=C3=B5es?= =?UTF-8?q?=20que=20estava=20faltando?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Mobs/Customization/Markings/gauze.yml | 32 +++++++++---------- .../Mobs/Customization/Markings/makeup.yml | 8 ++--- .../Mobs/Customization/Markings/scars.yml | 10 +++--- .../Mobs/Customization/Markings/tattoos.yml | 16 +++++----- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml index 3ca7a78b398e..5ac5035a722f 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml @@ -2,7 +2,7 @@ id: GauzeLefteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -16,7 +16,7 @@ id: GauzeLefteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -30,7 +30,7 @@ id: GauzeRighteyePatch bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: GauzeRighteyePad bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -58,7 +58,7 @@ id: GauzeBlindfold bodyPart: Eyes markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin] # Delta V - Felinid, Oni, Harpy, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Harpy, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Harpy, Vulpkanin coloring: default: type: @@ -72,7 +72,7 @@ id: GauzeShoulder bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -86,7 +86,7 @@ id: GauzeStomach bodyPart: Chest markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -100,7 +100,7 @@ id: GauzeUpperArmRight bodyPart: RArm markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -114,7 +114,7 @@ id: GauzeLowerArmRight bodyPart: RArm, RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -128,7 +128,7 @@ id: GauzeLeftArm bodyPart: LArm, LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -142,7 +142,7 @@ id: GauzeLowerLegLeft bodyPart: LFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -156,7 +156,7 @@ id: GauzeUpperLegLeft bodyPart: LLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -170,7 +170,7 @@ id: GauzeUpperLegRight bodyPart: RLeg markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -184,7 +184,7 @@ id: GauzeLowerLegRight bodyPart: RFoot markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Arachnid, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -198,7 +198,7 @@ id: GauzeBoxerWrapRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -212,7 +212,7 @@ id: GauzeBoxerWrapLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml index 901bf6e75cf4..37abc6a7b575 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/makeup.yml @@ -2,7 +2,7 @@ id: MakeupLips bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Dwarf, Human, SlimePerson, Felinid, Oni, Harpy, Daengati] # Delta V - Felinid, Oni, Harpy coloring: default: type: @@ -16,7 +16,7 @@ id: MakeupBlush bodyPart: Head markingCategory: Head - speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy] # Delta V - Felinid, Oni, Vulpkanin, Harpy + speciesRestriction: [Dwarf, Human, Reptilian, SlimePerson, Felinid, Oni, Vulpkanin, Harpy, Daengati] # Delta V - Felinid, Oni, Vulpkanin, Harpy coloring: default: type: @@ -30,7 +30,7 @@ id: MakeupNailPolishRight bodyPart: RHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: @@ -44,7 +44,7 @@ id: MakeupNailPolishLeft bodyPart: LHand markingCategory: Overlay - speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin] # Delta V - Felinid, Oni, Vulpkanin + speciesRestriction: [Dwarf, Human, Reptilian, Arachnid, SlimePerson, Felinid, Oni, Vulpkanin, Daengati] # Delta V - Felinid, Oni, Vulpkanin coloring: default: type: diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml index 79e0a0ff012b..9fb461ae4285 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/scars.yml @@ -2,7 +2,7 @@ id: ScarEyeRight bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Daengati] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -12,7 +12,7 @@ id: ScarEyeLeft bodyPart: Head markingCategory: Head - speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni] # Delta V - Felinid, Oni, Harpy + speciesRestriction: [Human, Dwarf, Felinid, Harpy, Oni, Daengati] # Delta V - Felinid, Oni, Harpy followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi @@ -22,7 +22,7 @@ id: ScarTopSurgeryShort bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] sexRestriction: [Male] followSkinColor: true sprites: @@ -33,7 +33,7 @@ id: ScarTopSurgeryLong bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] sexRestriction: [Male] followSkinColor: true sprites: @@ -44,7 +44,7 @@ id: ScarChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] followSkinColor: true sprites: - sprite: Mobs/Customization/scars.rsi diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml index b9ffd9ba0d64..19e8a4bf7988 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/tattoos.yml @@ -2,7 +2,7 @@ id: TattooHiveChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -16,7 +16,7 @@ id: TattooNightlingChest bodyPart: Chest markingCategory: Chest - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -30,7 +30,7 @@ id: TattooSilverburghLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -44,7 +44,7 @@ id: TattooSilverburghRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -58,7 +58,7 @@ id: TattooCampbellLeftArm bodyPart: LArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -72,7 +72,7 @@ id: TattooCampbellRightArm bodyPart: RArm markingCategory: Arms - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -86,7 +86,7 @@ id: TattooCampbellLeftLeg bodyPart: LLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: @@ -100,7 +100,7 @@ id: TattooCampbellRightLeg bodyPart: RLeg markingCategory: Legs - speciesRestriction: [Human, Dwarf, Felinid, Oni] # Delta V - Felinid, Oni + speciesRestriction: [Human, Dwarf, Felinid, Oni, Daengati] # Delta V - Felinid, Oni coloring: default: type: From 093c155fe7fc7fb19e3650802227b010fc1269c6 Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Wed, 11 Sep 2024 00:27:48 -0300 Subject: [PATCH 11/12] =?UTF-8?q?leve=20mudan=C3=A7a=20em=20um=20rabo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daengati_tail.rsi/nightcrawler_tail.png | Bin 943 -> 863 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/nightcrawler_tail.png index 075af5e0c05d3674e92f63a57ea5489e9657f94a..2ace02d38409ab92ef3bd9f7d497b58fb70c604f 100644 GIT binary patch delta 794 zcmV+#1Lgd$2j2#eFnkLb z#)^`al47AqC|Mwdg(PHSacs3{~RI627sZ>68 z@W%oEg@cB}As!3{$g}`DoerMOX2t~2Y&LPBP|(#`wOS1yk4IwyfZPlQgGf&Zh6VsN z0U&rh9#k%ub#a2}0q9x-8jS{~mAzOj{%QsFb^vsN!{LC|>$R#n0P_J&N?k(|IG@jP zI2^Xnhrz;uKz{(G(`n5R^acQ8)Iy+hfibjjZnsqU0Eoj|ZaMSrEjwFv!m;;hF5i0k!=LZJ{^ ztyXUrfI@IOoycmnA}Qy8Bc9d!IBOU`#go?sReAkWK%Val06ecAi@6I2u%O6u4B-Ht zSC7Tqg#%bnY))3*b+mold9tbULBQWTI-*6#m|eklk*F zeLmmI_5T5YlC~$Iu)Va|Y*49Gdb$qcQ>hfX-|t*F0QUWqeneHT*D>sPClU!sANkPl z_p!}pLm(awB>-T5II`KSA?;7or`zq4y-uYx0Dk~*4 zk@KGdpmpFK1keM!!*r1?=QckkZ4NHLly?65Fk!TyOe=O5S>rF$#G-TN|5{jb|Ax?Ch>-Dt4bge?FzUdbX~Oy}h_l^RMGl zGFhSg0*wt8haMX2E;W&Q>AN#T>*C(MwnbG{zxWw8@qb*ue*KfjkDbN4>wSMDE{dJY zEWoNZ>*M=(kNphd+bcNC?Iz~sEed_~aqXk=ZsyD>hVcVVGdKgpJVp&@#Doyo6mKXr+w#i8zH*UaYfaU3qT@}&5!ReSy7aE From fe5ac5a3f07d24194dea1bbcf831e5ef3bfa348d Mon Sep 17 00:00:00 2001 From: Lary <89530982+LaryNevesPR@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:37:57 -0300 Subject: [PATCH 12/12] =?UTF-8?q?Altera=20o=20rabo=20de=20cora=C3=A7=C3=A3?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daengati_tail.rsi/HeartTail-tip.png | Bin 408 -> 481 bytes .../daengati_tail.rsi/HeartTail.png | Bin 747 -> 819 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail-tip.png index 61f09bb402e01ac2a199a707179f3e35d9e920a5..ac456da16779112d0201a7da491cf527e2e917d7 100644 GIT binary patch delta 408 zcmbQi{E&HqVSS^gi(^Pd+}l~Fd7BLcTnfcy7Ba1y;<$3k!KqviJj7kLrDXrSabVt~ zk549bYzVq{W{t3B@~T7f%L@K=F&QwnY9A2Quwk%a*~t{scu4dCmxvrg9d`li4yIP^ z2Vn{Gp5L`Ak4=A)t&*G6lXiRC-gU1PT0{>voqoNOdt#Ew>s{~aeJ@+QD3tl0D5011 zM6aRrzO=Ta?(XhA^}$WY);-s7>$cdl$OV3fK#A+3G}gNnJSjt_SALP8C91U)v!?qc{fKcuDaK=A*EmslNM za~#>l_^)acPvZr_idXh6q7H94Y`)6#wJT(~A6TYvOia|l%*`ZT|G(Me^V^CUS=I@B y4f}Ce@kbfQN4tL_ZY5v2g@r%3>K>_{$>72pzTe<4gZyd9^Kbsi>P{|VR09C*-?gOx delta 334 zcmV-U0kQt!1DFGlF@HEoL_t(|UhSH(t%N`f1-%6T360Qy5i~*q6tG`LTEwkB0S=$% zg45}QgEt=U2Bui@Pf4EN0Du9>2`~c51>g{51Q>zj1Q>zj0&oj30*pX%0*pX%0k{Pi z0Y<>g)^)88Vp*0_YrTG#Qe^CSW_o75a{8D5InT3A(`3Ui*nfGRHjbkVfa5r7%eC*j zZQFJ=`v%ZMPzv8h+#&Sge*iQHjf~>i;HLNaWHgU93;p3(#dEJ42Y6bslx!3 zPDXQJK$M(H9R{d$GMWPeqU2QSFhHe~(Hs~MC8tt{0Vg`Ih8sLQ0Zhe2L?pR zsnp%uVGpFb9z*wRZ!7W?>v0G0wj#gJfaf~`itF(P;r0Chf8f9MvC6Es9DPP^0ksZ) g&4U47iK#u00csunnkT&he`PLoL84W}Rg=2`CUsDiApigX diff --git a/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png b/Resources/Textures/Mobs/Customization/daengati_tail.rsi/HeartTail.png index c570f764c1ab79ba38e45fa2942c996263928a1b..c9ff74026505705eba2b09f8071085d5801f9019 100644 GIT binary patch delta 748 zcmV?3P=i!oPeaj z$OAxb0Z9Q#fsqp^Qs8_(=lH$ZY%=}tUt&|IF?&27`FuVvL4N=OgzL{!2jS9~-EOyh zxm*^a4~Ij(-|s(Q#0WsQ)n^~PPma~!gZ3ii=|g>^y63*bhWH$|U9VR~&hnk<(paRx z@p!Ck21>i#PEl(34jB6LrT|=Z2wONnCsK18@Bn%kL_iE)2x&v5F#imhcX3Hn-Snb@y$P2yTf%Y z?iBtT+-9TR`L68_n~TimD80ySNOC>Y=Q@{-1jY)0GaEo-GcY*T(HZIvndxjo)*%#A zV!mk$z2V7iIrZsT?q280+XzXM~R0> z++Ppj%FWvzTb#T#F+Z`UU z>|hlVXSfd(1Bwbi5c7y(_`8?&+wZ-1-j?->-l=F7;If)q@As){FBjW|X-p0xQ)AX& zpZV+V@?8=AwKdmvty{U8A-b+|K}CYm%#QQVmD>(4tgxGJ$#cEo%JU1eyN@2K-g|oH z_S?R4{qE1jHarbi>1=0fZv0WVzqgsayh-ID-bn5d@omY2QmSunDXE^ctZ{73Rznfl2F+3`2 zbzn6;tD4)N^!fK+y&8uL0!ISo`YoS(hGEhc-lkbUGE9ulDQ7omaa@mPtlbv1)@54i zT($Mh3;6s)WIE5M8E5PK7fQJrlK;4z$E{Rem ztdvqrN@Q(WAa{A@nuZyx1eL_X95`MX&OOORq*SYQ&w^VUjwgHh^&U-`czx6H+f}+t zy*-vm_=@e^Z0k2IT-JHhX_wOK@S`iLSr6QlJO1qUTQmFZ+4bkoi_7eEHhaA%=a~q@ zh96(6I-eG;+TBd|xMp2QqIjk49KRK;s;8?(P;rf$Ug$zak-CGOz zo!4h2OlwcF+`fqQ1GBA&fi_g6Cn#QpGhmb-uTP8~!3q)!3&rOz=;=4Dm`0N4yV Ay#N3J