diff --git a/Content.Shared/_CP14/MagicEnergy/Components/CP14MagicEnergyPhotosynthesisComponent.cs b/Content.Shared/_CP14/MagicEnergy/Components/CP14MagicEnergyPhotosynthesisComponent.cs index 423a1f7126..fff151e761 100644 --- a/Content.Shared/_CP14/MagicEnergy/Components/CP14MagicEnergyPhotosynthesisComponent.cs +++ b/Content.Shared/_CP14/MagicEnergy/Components/CP14MagicEnergyPhotosynthesisComponent.cs @@ -15,7 +15,7 @@ public sealed partial class CP14MagicEnergyPhotosynthesisComponent : Component [DataField] [GuidebookData] - public FixedPoint2 DarknessEnergy = -2f; + public FixedPoint2 DarknessEnergy = -0.25f; /// /// how often objects will try to change magic energy. In Seconds diff --git a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml index ec338a1acd..b25c3845fd 100644 --- a/Resources/Prototypes/_CP14/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_CP14/Damage/modifier_sets.yml @@ -52,4 +52,16 @@ id: CP14Tiefling coefficients: Heat: 0.5 - Cold: 1.5 \ No newline at end of file + Cold: 1.5 + +- type: damageModifierSet + id: CP14Goblin + coefficients: + Blunt: 1.5 + Slash: 1.5 + Piercing: 1.5 + Heat: 1.5 + Cold: 1.5 + Shock: 1.5 + Poison: 0.5 + Caustic: 0.5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml index 6df3def502..a488e8d46d 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/T0_Sprint.yml @@ -7,7 +7,7 @@ sprite: _CP14/Effects/Magic/spells_icons.rsi state: sprint - type: CP14MagicEffectCastSlowdown - speedMultiplier: 1.4 + speedMultiplier: 1.3 - type: CP14MagicEffectStaminaCost stamina: 3 - type: CP14MagicEffect @@ -26,4 +26,14 @@ effectFrequency: 0.2 cooldown: 2 castTime: 10 - hidden: true \ No newline at end of file + hidden: true + +- type: entity + parent: CP14ActionSpellSprint + id: CP14ActionSpellSprintGoblin + name: Goblin agility + components: + - type: CP14MagicEffectCastSlowdown + speedMultiplier: 1.5 + - type: CP14MagicEffectStaminaCost + stamina: 5 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml index fc47da6627..7e632b4886 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml @@ -26,6 +26,35 @@ requiredLegs: 2 - type: Bloodstream bloodReagent: CP14BloodGoblin + - type: Fixtures + fixtures: # Smaller hitbox & less weight + fix1: + shape: + !type:PhysShapeCircle + radius: 0.25 + density: 100 + restitution: 0.0 + mask: + - MobMask + layer: + - MobLayer + - type: Damageable + damageContainer: Biological + damageModifierSet: CP14Goblin #+25% all damage, -50% poison + - type: Stamina + decay: 5 # 3 default + critThreshold: 120 # 100 default + stunTime: 4 #6 default + - type: CP14MagicEnergyContainer #SMALL mana container + maxEnergy: 25 + energy: 25 + - type: CP14MagicEnergyDraw #Cool x3 mana regen! + energy: 1.5 + delay: 3 + - type: CP14SpellStorage + grantAccessToSelf: true + spells: + - CP14ActionSpellSprintGoblin - type: Hands handDisplacement: sizeMaps: diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml index cc9975d667..1103f643f5 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml @@ -74,7 +74,6 @@ - type: Body prototype: CP14Silva requiredLegs: 2 - - type: Wagging - type: Bloodstream bloodReagent: CP14BloodFlowerSap #Lol - type: Inventory diff --git a/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml b/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml index 83a5269d85..e7083ab0f4 100644 --- a/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml +++ b/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml @@ -8,6 +8,7 @@ - CP14_EN_Silva - CP14_EN_Elf - CP14_EN_Tiefling + - CP14_EN_Goblin filterEnabled: True - type: guideEntry @@ -36,4 +37,11 @@ id: CP14_EN_Tiefling name: Tiefling text: "/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Tiefling.xml" + filterEnabled: True + +- type: guideEntry + crystallPunkAllowed: true + id: CP14_EN_Goblin + name: Goblin + text: "/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Goblin.xml" filterEnabled: True \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Guidebook/Ru/species.yml b/Resources/Prototypes/_CP14/Guidebook/Ru/species.yml index 0261f928ac..fdd7c8f88e 100644 --- a/Resources/Prototypes/_CP14/Guidebook/Ru/species.yml +++ b/Resources/Prototypes/_CP14/Guidebook/Ru/species.yml @@ -8,6 +8,7 @@ - CP14_RU_Silva - CP14_RU_Elf - CP14_RU_Tiefling + - CP14_RU_Goblin filterEnabled: True - type: guideEntry @@ -36,4 +37,11 @@ id: CP14_RU_Tiefling name: Тифлинг text: "/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Tiefling.xml" + filterEnabled: True + +- type: guideEntry + crystallPunkAllowed: true + id: CP14_RU_Goblin + name: Гоблин + text: "/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Goblin.xml" filterEnabled: True \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index 4bd28205ff..04845864d9 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -475,7 +475,7 @@ !type:SpeciesRequirement species: - CP14Silva - inverted: true # Silvas cannot take this spell, thwy have buffed version by default + inverted: true # Silvas cannot take this spell, they have buffed version by default - type: loadout id: CP14ActionSpellSphereOfLight @@ -494,7 +494,7 @@ !type:SpeciesRequirement species: - CP14Elf - inverted: true # Elves cannot take this spell, thwy have buffed version by default + inverted: true # Elves cannot take this spell, they have buffed version by default - type: loadout id: CP14ActionSpellManaGift @@ -535,4 +535,11 @@ id: CP14ActionSpellSprint dummyEntity: CP14ActionSpellSprint actions: - - CP14ActionSpellSprint \ No newline at end of file + - CP14ActionSpellSprint + effects: + - !type:JobRequirementLoadoutEffect + requirement: + !type:SpeciesRequirement + species: + - CP14Goblin + inverted: true # Goblins cannot take this spell, they have buffed version by default \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Goblin.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Goblin.xml new file mode 100644 index 0000000000..56f21ff03c --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Goblin.xml @@ -0,0 +1,34 @@ + +# Goblins + + + + + +Goblins are a race of stunted goblinoids that have settled en masse throughout Sylate. Although the other races are prejudiced against them, goblins rarely try to cause trouble on purpose. + +## Smallness of body + +Goblins are rather short in stature, and this greatly affects their lifestyle: +- It's harder to pull large objects +- Others find it easier to pull goblins +- Reduced hitbox. Goblins are harder to hit +- All incoming damage increased by 50%. Except for poisons. Poisons, on the other hand, do 50% less damage +- Faster recovery from stamina crit +- More resilient than the others + +## Smallness of soul + +Nature has deprived goblins of the gift of magic: +- Maximum mana reserve reduced by 75% +- Mana regeneration rate increased by 1.5 times + +## Goblin Agility + +Goblins cannot take the Sprint spell, but they have an improved version of it that speeds up more than usual + + + + + + \ No newline at end of file diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Goblin.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Goblin.xml new file mode 100644 index 0000000000..a69bf62cdb --- /dev/null +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Goblin.xml @@ -0,0 +1,33 @@ + +# Гоблины + + + + + +Гоблины - раса низкорослых гоблиноидов которые массово расселились по всей силейты. Хоть и отношение остальных рас к ним предвзятое, гоблины редко стараются специально устроить проблемы кому-то. + +## Маленькость тела + +Гоблины достаточно низкорослы, и это сильно влияет на их образ жизни: +- Тяжелее тащить большие объекты +- Другим легче тащить гоблинов +- Уменьшенный хитбокс. По гоблинам тяжелее попасть +- Весь входящий урон увеличен на 50%. Кроме ядов. Яды наоборот, наносят на 50% урона меньше +- Быстрее поднимаются из оглушения +- Более выносливые чем остальные + +## Маленькость души + +Природа обделила гоблинов магическим даром: +- Максимальный резерв маны уменьшен на 75% + +## Проворство гоблина + +Гоблины не могут взять заклинание "Спринт", но они имеют его улучшенную версию, ускоряющую сильнее обычного + + + + + + \ No newline at end of file