diff --git a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl index d4f4905706..129e461a60 100644 --- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl @@ -25,6 +25,7 @@ cp14-modifier-shadow-kudzu = spreading astral haze cp14-modifier-night = darkness cp14-modifier-spiders = spider's web cp14-modifier-flem = flemings +cp14-modifier-silver-needle = silver needles cp14-modifier-storm = storm cp14-modifier-fire-storm = fire storm diff --git a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl index 2da9060c93..627902b3ab 100644 --- a/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl +++ b/Resources/Locale/en-US/_CP14/reagents/meta/thaumaturgy/precurser.ftl @@ -48,3 +48,6 @@ cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragm cp14-reagent-name-chromium-slime = Chromium slime cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly. + +cp14-reagent-name-silver-needle = Silver needle berries +cp14-reagent-desc-silver-needle = The berries of a plant that survives the harshest frosts. The juice of these berries slows down metabolism and can treat frostbite. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl index 73543d788f..532e6a1c76 100644 --- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl +++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl @@ -24,6 +24,7 @@ cp14-modifier-air-lily = воздушные лилии cp14-modifier-shadow-kudzu = поглощающий астральный мрак cp14-modifier-night = темнота cp14-modifier-spiders = паучье логово +cp14-modifier-silver-needle = серебрянные иглы cp14-modifier-storm = гроза cp14-modifier-fire-storm = огненный шторм diff --git a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl index fcffb74a26..bab4db3896 100644 --- a/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl +++ b/Resources/Locale/ru-RU/_CP14/reagents/meta/thaumaturgy/precurser.ftl @@ -45,3 +45,6 @@ cp14-reagent-desc-grounded-quartz = Порошок, получаемый из р cp14-reagent-name-chromium-slime = Хромиевая слизь cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье. + +cp14-reagent-name-silver-needle = Ягоды серебрянной иглы +cp14-reagent-desc-silver-needle = Ягоды растения, переживающие самые стойкие морозы. Сок этих ягод замедляет метаболизм и способен лечить обморожения. \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml index 6eee6a7fea..a17976f902 100644 --- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml +++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml @@ -301,3 +301,35 @@ - CP14FitInMortar - CP14AlchemicalHerbals +- type: entity + id: CP14SilverNeedle + parent: CP14WildProduceBase + name: silver needle + description: Bright orange berries of a frost-resistant plant. Widely used in medicine. + components: + - type: Sprite + sprite: _CP14/Objects/Flora/Wild/silver_needle.rsi + layers: + - state: base1 + map: ["random"] + - type: RandomSprite + available: + - random: + base1: "" + base2: "" + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14SilverNeedle + Quantity: 4 + - type: SolutionContainerManager + solutions: + food: + maxVol: 5 + reagents: + - ReagentId: CP14SilverNeedle + Quantity: 4 + - type: Tag + tags: + - CP14FitInMortar + - CP14AlchemicalHerbals diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/blood_flower.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/blood_flower.yml index eff2b75980..fb338dd787 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/blood_flower.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/blood_flower.yml @@ -7,7 +7,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Flora/Flowers/red_rose.rsi + sprite: _CP14/Structures/Flora/Wild/blood_flower.rsi layers: - state: world1 map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/dayflin.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/dayflin.yml index 021742acdb..97a00fe212 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/dayflin.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/dayflin.yml @@ -7,7 +7,7 @@ components: - type: Sprite drawdepth: FloorTiles - sprite: _CP14/Structures/Flora/Flowers/yellow_dayflin.rsi + sprite: _CP14/Structures/Flora/Wild/yellow_dayflin.rsi layers: - state: world1 map: ["random"] diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/silver_needle.yml b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/silver_needle.yml new file mode 100644 index 0000000000..3fc7909e9c --- /dev/null +++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/silver_needle.yml @@ -0,0 +1,26 @@ +- type: entity + id: CP14GatherableSilverNeedle + parent: CP14GatherableBase + name: silver needle + description: Blue sharp shoots breaking through the snow, with bright orange berries. The ability of this plant to survive even in regions with severe frosts is simply amazing. + suffix: Gatherable + components: + - type: Sprite + drawdepth: FloorTiles + sprite: _CP14/Structures/Flora/Wild/silver_needle.rsi + layers: + - state: world1 + map: ["random"] + - type: RandomSprite + available: + - random: + world1: "" + world2: "" + world3: "" + - type: CP14PlantGatherable + deleteAfterHarvest: true + loot: + All: !type:GroupSelector + children: + - id: CP14SilverNeedle + diff --git a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml index 8fe3dc1cee..deac7e99ad 100644 --- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml +++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml @@ -1,5 +1,3 @@ -# TIER 1 - - type: cp14DemiplaneModifier id: Dayflin levels: @@ -22,6 +20,27 @@ minGroupSize: 3 maxGroupSize: 5 +- type: cp14DemiplaneModifier + id: SilverNeedle + levels: + min: 1 + max: 10 + name: cp14-modifier-silver-needle + categories: + Reward: 0.15 + requiredTags: + - CP14DemiplaneCold + layers: + - !type:CP14OreDunGen + tileMask: + - CP14FloorSnow + - CP14FloorSnowDeep + - CP14FloorSnowDeepDeep + entity: CP14GatherableSilverNeedle + count: 10 + minGroupSize: 3 + maxGroupSize: 5 + - type: cp14DemiplaneModifier id: FlyAgaric levels: diff --git a/Resources/Prototypes/_CP14/Reagents/precurser.yml b/Resources/Prototypes/_CP14/Reagents/precurser.yml index cab552d6f8..135c62f1bb 100644 --- a/Resources/Prototypes/_CP14/Reagents/precurser.yml +++ b/Resources/Prototypes/_CP14/Reagents/precurser.yml @@ -157,6 +157,29 @@ Poison: 0.1 pricePerUnit: 0.2 +- type: reagent + id: CP14SilverNeedle + group: CP14Precurser + name: cp14-reagent-name-silver-needle + desc: cp14-reagent-desc-silver-needle + flavor: bitter + color: "#c2834c" + physicalDesc: cp14-reagent-physical-desc-iridescent + metabolisms: + Medicine: + effects: + - !type:HealthChange + damage: + types: + Cold: -0.5 + Poison: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.1 + pricePerUnit: 0.2 + # Slime based - type: reagent diff --git a/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/silver_needle.yml b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/silver_needle.yml new file mode 100644 index 0000000000..bca3e27de2 --- /dev/null +++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/silver_needle.yml @@ -0,0 +1,29 @@ + +# Splitting: Applying magical dispel to split precursor into essences. + +- type: reaction + id: CP14DayflinSilverNeedle + requiredMixerCategories: + - CP14MagicSplitting + reactants: + CP14SilverNeedle: + amount: 1 + products: + CP14EssenceFrost: 0.5 + CP14EssenceLife: 0.5 + +# Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions. + +- type: reaction + id: CP14SilverNeedleAdmixture1 + minTemp: 500 + reactants: + CP14SilverNeedle: + amount: 1 + CP14BasicEffectEmpty: + amount: 1 + CP14BasicEffectHealMana: + amount: 1 + products: + CP14BasicEffectHealCold: 2 + CP14BasicEffectSpeedDown: 1 diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base1.png b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base1.png new file mode 100644 index 0000000000..e3cfa72afe Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base1.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base2.png b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base2.png new file mode 100644 index 0000000000..5c6286265b Binary files /dev/null and b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base2.png differ diff --git a/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/meta.json b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/meta.json new file mode 100644 index 0000000000..8aa12ac35b --- /dev/null +++ b/Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "base1" + }, + { + "name": "base2" + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world1.png b/Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world1.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world1.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world2.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world2.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world3.png b/Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/red_rose.rsi/world3.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/blood_flower.rsi/world3.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/meta.json new file mode 100644 index 0000000000..9fc932e161 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/meta.json @@ -0,0 +1,20 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-4.0", + "copyright": "Created by TheShuEd", + "states": [ + { + "name": "world1" + }, + { + "name": "world2" + }, + { + "name": "world3" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world1.png b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world1.png new file mode 100644 index 0000000000..67ff34aee4 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world1.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world2.png new file mode 100644 index 0000000000..aadd312e19 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world2.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world3.png b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world3.png new file mode 100644 index 0000000000..9642e06403 Binary files /dev/null and b/Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world3.png differ diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/meta.json similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/meta.json rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/meta.json diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world1.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world1.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world1.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world2.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world2.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world2.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world3.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world3.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world3.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world4.png b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world4.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world4.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world4.png diff --git a/Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world5.png b/Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world5.png similarity index 100% rename from Resources/Textures/_CP14/Structures/Flora/Flowers/yellow_dayflin.rsi/world5.png rename to Resources/Textures/_CP14/Structures/Flora/Wild/yellow_dayflin.rsi/world5.png