From 71e6bd4f24e596fef0a3417f8407bf6487750d12 Mon Sep 17 00:00:00 2001
From: Ed <96445749+TheShuEd@users.noreply.github.com>
Date: Mon, 6 Jan 2025 14:05:46 +0300
Subject: [PATCH] Elf (#702)
---
.../Actions/Spells/Meta/T0_mana_consume.yml | 15 ++++++++
.../_CP14/Entities/Mobs/Species/elf.yml | 10 +++++
.../_CP14/Guidebook/Eng/alchemy.yml | 16 --------
.../_CP14/Guidebook/Eng/species.yml | 23 ++++++++++++
.../Prototypes/_CP14/Guidebook/Ru/alchemy.yml | 16 --------
.../Prototypes/_CP14/Guidebook/Ru/species.yml | 23 ++++++++++++
.../_CP14/Loadouts/Jobs/general.yml | 37 +++++++++++--------
.../_CP14/Guidebook_EN/SpeciesTabs/Elf.xml | 22 +++++++++++
.../_CP14/Guidebook_EN/SpeciesTabs/Silva.xml | 2 +-
.../_CP14/Guidebook_RU/SpeciesTabs/Elf.xml | 22 +++++++++++
.../_CP14/Guidebook_RU/SpeciesTabs/Silva.xml | 2 +-
11 files changed, 139 insertions(+), 49 deletions(-)
create mode 100644 Resources/Prototypes/_CP14/Guidebook/Eng/species.yml
create mode 100644 Resources/Prototypes/_CP14/Guidebook/Ru/species.yml
create mode 100644 Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Elf.xml
create mode 100644 Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Elf.xml
diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
index 0209990fe2..93ff668929 100644
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/T0_mana_consume.yml
@@ -37,6 +37,21 @@
castTime: 10
breakOnMove: true
+- type: entity
+ id: CP14ActionSpellManaConsumeElf
+ parent: CP14ActionSpellManaConsume
+ name: Carefull mana consume
+ description: You absorb a small amount of mana from the target neatly and without loss.
+ components:
+ - type: CP14MagicEffect
+ effects:
+ - !type:CP14SpellSpawnEntityOnTarget
+ spawns:
+ - CP14ImpactEffectManaConsume
+ - !type:CP14SpellConsumeManaEffect
+ mana: 10
+ lossMultiplier: 1
+
- type: entity
id: CP14RuneManaConsume
parent: CP14BaseMagicRune
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
index 20eb67d61a..5f4cbc301c 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
@@ -21,6 +21,16 @@
requiredLegs: 2
- type: Bloodstream
bloodReagent: CP14BloodElf
+ - type: CP14MagicEnergyContainer #BIG mana container
+ maxEnergy: 500
+ energy: 250
+ - type: CP14MagicEnergyDraw #No passive mana regen
+ energy: 0.5
+ delay: 10
+ - type: CP14SpellStorage
+ grantAccessToSelf: true
+ spells:
+ - CP14ActionSpellManaConsumeElf
- type: Inventory
templateId: CP14Human
displacements:
diff --git a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
index bdb9476a17..db9817aa53 100644
--- a/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/alchemy.yml
@@ -34,20 +34,4 @@
id: CP14_EN_Imperial_Laws
name: Imperial laws
text: "/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml"
- filterEnabled: True
-
-- type: guideEntry
- crystallPunkAllowed: true
- id: CP14_EN_Species
- name: Playable species
- text: "/ServerInfo/_CP14/Guidebook_EN/Species.xml"
- children:
- - CP14_EN_Silva
- filterEnabled: True
-
-- type: guideEntry
- crystallPunkAllowed: true
- id: CP14_EN_Silva
- name: Silva
- text: "/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml"
filterEnabled: True
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml b/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml
new file mode 100644
index 0000000000..806dbcd263
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Guidebook/Eng/species.yml
@@ -0,0 +1,23 @@
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_EN_Species
+ name: Playable species
+ text: "/ServerInfo/_CP14/Guidebook_EN/Species.xml"
+ children:
+ - CP14_EN_Elf
+ - CP14_EN_Silva
+ filterEnabled: True
+
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_EN_Silva
+ name: Silva
+ text: "/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml"
+ filterEnabled: True
+
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_EN_Elf
+ name: Elf
+ text: "/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Elf.xml"
+ filterEnabled: True
\ No newline at end of file
diff --git a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
index 7949be1932..579ef66a89 100644
--- a/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/alchemy.yml
@@ -34,20 +34,4 @@
id: CP14_RU_Imperial_Laws
name: Имперские законы
text: "/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml"
- filterEnabled: True
-
-- type: guideEntry
- crystallPunkAllowed: true
- id: CP14_RU_Species
- name: Играбельные расы
- text: "/ServerInfo/_CP14/Guidebook_RU/Species.xml"
- children:
- - CP14_RU_Silva
- filterEnabled: True
-
-- type: guideEntry
- crystallPunkAllowed: true
- id: CP14_RU_Silva
- name: Сильва
- text: "/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.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
new file mode 100644
index 0000000000..cb0adb163c
--- /dev/null
+++ b/Resources/Prototypes/_CP14/Guidebook/Ru/species.yml
@@ -0,0 +1,23 @@
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_RU_Species
+ name: Играбельные расы
+ text: "/ServerInfo/_CP14/Guidebook_RU/Species.xml"
+ children:
+ - CP14_RU_Elf
+ - CP14_RU_Silva
+ filterEnabled: True
+
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_RU_Silva
+ name: Сильва
+ text: "/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml"
+ filterEnabled: True
+
+- type: guideEntry
+ crystallPunkAllowed: true
+ id: CP14_RU_Elf
+ name: Эльф
+ text: "/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Elf.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 32de985d8c..4bd28205ff 100644
--- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml
@@ -431,6 +431,7 @@
- CP14ActionSpellCureWounds
- CP14ActionSpellCureBurn
- CP14ActionSpellBloodPurification
+ - CP14ActionSpellPlantGrowth
- CP14ActionSpellSphereOfLight
- CP14ActionSpellManaConsume
- CP14ActionSpellManaGift
@@ -438,7 +439,6 @@
- CP14ActionSpellWaterCreation
- CP14ActionSpellBeerCreation
- CP14ActionSpellSprint
- - CP14ActionSpellPlantGrowth
- type: loadout
id: CP14ActionSpellFlameCreation
@@ -464,6 +464,19 @@
actions:
- CP14ActionSpellBloodPurification
+- type: loadout
+ id: CP14ActionSpellPlantGrowth
+ dummyEntity: CP14ActionSpellPlantGrowth
+ actions:
+ - CP14ActionSpellPlantGrowth
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:SpeciesRequirement
+ species:
+ - CP14Silva
+ inverted: true # Silvas cannot take this spell, thwy have buffed version by default
+
- type: loadout
id: CP14ActionSpellSphereOfLight
dummyEntity: CP14ActionSpellSphereOfLight
@@ -475,6 +488,13 @@
dummyEntity: CP14ActionSpellManaConsume
actions:
- CP14ActionSpellManaConsume
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:SpeciesRequirement
+ species:
+ - CP14Elf
+ inverted: true # Elves cannot take this spell, thwy have buffed version by default
- type: loadout
id: CP14ActionSpellManaGift
@@ -515,17 +535,4 @@
id: CP14ActionSpellSprint
dummyEntity: CP14ActionSpellSprint
actions:
- - CP14ActionSpellSprint
-
-- type: loadout
- id: CP14ActionSpellPlantGrowth
- dummyEntity: CP14ActionSpellPlantGrowth
- actions:
- - CP14ActionSpellPlantGrowth
- effects:
- - !type:JobRequirementLoadoutEffect
- requirement:
- !type:SpeciesRequirement
- species:
- - CP14Silva
- inverted: true # Silvas cannot take this spell, thwy have buffed version by default
\ No newline at end of file
+ - CP14ActionSpellSprint
\ No newline at end of file
diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Elf.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Elf.xml
new file mode 100644
index 0000000000..480bc85ce8
--- /dev/null
+++ b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Elf.xml
@@ -0,0 +1,22 @@
+
+# Elves
+
+
+
+
+
+There will be a lore description
+
+## Ancient Magic
+
+Elves have a magic reserve 5 times higher than normal, but their natural regeneration of magical energy is nearly nullified.
+
+## Careful Mana Manipulation
+
+Elves cannot take the Mana Consume spell, but they have an improved version of it that absorbs energy without the standard 20% loss.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml
index 8a68f99bdd..cdb076e939 100644
--- a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml
+++ b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml
@@ -5,7 +5,7 @@
-Silvas - Don't have a lore description of the race in the guidebook yet. We await the text from the Wanderer.
+The Silva are a race of humanoid plants living in deep relic forests. Emerging from the mother tree in the centre of their cities, the Silvas do not travel the world very often.
## Magical photosynthesis
diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Elf.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Elf.xml
new file mode 100644
index 0000000000..2b8ca9d76b
--- /dev/null
+++ b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Elf.xml
@@ -0,0 +1,22 @@
+
+# Эльфы
+
+
+
+
+
+Тут будет лорное описание
+
+## Древняя магия
+
+Эльфы имеют магический резерв в 5 раз выше чем обычно, но их естественная регенерация магической энергии почти сведена к нулю.
+
+## Аккуратное манипулирование маной
+
+Эльфы не могут взять заклинание "Поглощение маны", но они имеют его улучшенную версию, которая поглощает энергию без стандартных 20% потерь.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml
index 71e66fa819..73434536ff 100644
--- a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml
+++ b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml
@@ -5,7 +5,7 @@
-Сильвы - пока что не имеют лорное описание расы в гайдбуке. Ждем текста от летописи.
+Сильва - раса гуманоидных растений обитающих в глубоких реликтовых лесах. Появляясь в центре своих городов из материнского дерева, Сильвы не особо часто путешествуют по миру.
## Магический фотосинтез