From aeda7c6f389aede23adbe45692ffda14519b706d Mon Sep 17 00:00:00 2001 From: Red <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 20 Jun 2025 12:31:37 +0300 Subject: [PATCH] Silver needle berries (#1451) * move flowers rsi * silver needle * Update silver_needle.yml --- .../en-US/_CP14/demiplane/modifiers.ftl | 1 + .../reagents/meta/thaumaturgy/precurser.ftl | 3 ++ .../ru-RU/_CP14/demiplane/modifiers.ftl | 1 + .../reagents/meta/thaumaturgy/precurser.ftl | 3 ++ .../_CP14/Entities/Objects/Flora/wild.yml | 32 ++++++++++++++++++ .../Flora/Gatherable/Wild/blood_flower.yml | 2 +- .../Flora/Gatherable/Wild/dayflin.yml | 2 +- .../Flora/Gatherable/Wild/silver_needle.yml | 26 ++++++++++++++ .../Demiplane/Modifiers/Reward/herbals.yml | 23 +++++++++++-- .../Prototypes/_CP14/Reagents/precurser.yml | 23 +++++++++++++ .../Thaumaturgy/Precursor/silver_needle.yml | 29 ++++++++++++++++ .../Flora/Wild/silver_needle.rsi/base1.png | Bin 0 -> 458 bytes .../Flora/Wild/silver_needle.rsi/base2.png | Bin 0 -> 443 bytes .../Flora/Wild/silver_needle.rsi/meta.json | 17 ++++++++++ .../blood_flower.rsi}/meta.json | 0 .../blood_flower.rsi}/world1.png | Bin .../blood_flower.rsi}/world2.png | Bin .../blood_flower.rsi}/world3.png | Bin .../Flora/Wild/silver_needle.rsi/meta.json | 20 +++++++++++ .../Flora/Wild/silver_needle.rsi/world1.png | Bin 0 -> 555 bytes .../Flora/Wild/silver_needle.rsi/world2.png | Bin 0 -> 531 bytes .../Flora/Wild/silver_needle.rsi/world3.png | Bin 0 -> 652 bytes .../yellow_dayflin.rsi/meta.json | 0 .../yellow_dayflin.rsi/world1.png | Bin .../yellow_dayflin.rsi/world2.png | Bin .../yellow_dayflin.rsi/world3.png | Bin .../yellow_dayflin.rsi/world4.png | Bin .../yellow_dayflin.rsi/world5.png | Bin 28 files changed, 178 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Wild/silver_needle.yml create mode 100644 Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/silver_needle.yml create mode 100644 Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base1.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/base2.png create mode 100644 Resources/Textures/_CP14/Objects/Flora/Wild/silver_needle.rsi/meta.json rename Resources/Textures/_CP14/Structures/Flora/{Flowers/red_rose.rsi => Wild/blood_flower.rsi}/meta.json (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers/red_rose.rsi => Wild/blood_flower.rsi}/world1.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers/red_rose.rsi => Wild/blood_flower.rsi}/world2.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers/red_rose.rsi => Wild/blood_flower.rsi}/world3.png (100%) create mode 100644 Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world1.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world2.png create mode 100644 Resources/Textures/_CP14/Structures/Flora/Wild/silver_needle.rsi/world3.png rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/meta.json (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/world1.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/world2.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/world3.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/world4.png (100%) rename Resources/Textures/_CP14/Structures/Flora/{Flowers => Wild}/yellow_dayflin.rsi/world5.png (100%) 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 0000000000000000000000000000000000000000..e3cfa72afeaa6a5d972885a762d193669af9bace GIT binary patch literal 458 zcmV;*0X6=KP)Px$gh@m}R9J=Wl`(6BKp2MKD^7uANkTwy$REg7vYp`UnxW)BSST5iAt0nfhfLi& zIt4m8WhnHvl1~1CLJwSwO9h7_T!(VjN{AYV(%>`6;eGFW?|q*F4Gj$q=YqLr;$MoB zy5e+Vi_X{p09?HALKdvYhlCkQ1Tx+i)yh%$*&{j$oBq zr4q=Kp9lb$JGPx$bxA})R9J=Wl|O63Kp2OADVYKaB}yTXf?q)BNg0~5ULcTzu2e%j(g)5Z6btsW)7w@W0_iRbHyXU?4PXLWZquCICNQBC| zy-f*l7Avh&5?GDa4~a-?tnd6;JK__$2DMu}7)aa l0Knp)^!fKYjYgx9Px$U;%P)5U+F)IUM3RIpI!W)Ig+M{(#> z5QM{_gU}2G=^zw@E~Udkpm5~|+Y_WE4w_io;z;%aKxWKgbfJ250L@N6ivLdlZtPQ6>Tu$9ffO-wth5rw z$lEAaZK1K#jt;<$Ctg*I0dO@cS>#g}ND;H^-CMvW zVH_$~ZJ~m91kX;M2@ zHXK1caSj*lJ#h>GfWsE^srvWZ+Gk2xv z`c9fwNg9N|DQy79O0%<<%fAEQwL(>D7d;+r03&asyVrxr4#L2q#DFrsf;KR4K@jDKAyZcVl%`hVPODT1w%*4Oo^?>cVKgS3+z(^ae#8%f*u`! zk+-G3mUayrmF%1YpSmJ=Rk5(tJTU#3;qM3|Z=-tRT=|BG5(A-P!x8w@g=D70cpD)2 t4YAA}5I2K^%=XK)v>*&{wkpm4TW`i+2(fHuWOo1n002ovPDHLkV1fpf^-}-< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..aadd312e190af34a3264203547b1f1d228e8d1ec GIT binary patch literal 531 zcmV+u0_^>XP)Px$%}GQ-R9J=WR=sM%P!v9?eF2}Ldmlj|Q=vDD;4JzGDJ>lXZW??8adHY|Q925} zLqIwd1i?iz1OkHM;7>u6)1kd-es0nvMnUjf5>5{1eEIG<=N^D7G6qp8Ch@;H6%jwe zh-FS-YtNlzan#71z+pKJ*oaE;<*NZ!yAmM8B_PUrqH}cPz4I(=?KuGasKH=NW?31mI8ptvzS) z2+!F=fT$FU)h4^v4aI1GwIJ z+UOXtgj7?6T>cJLx V_LN};Ksx{c002ovPDHLkV1oSnPx%MoC0LR9J=WRxxYaP!Rsqgbsxk41q$RQ^rEqY!+x%7DKuk^(UAnWGM)`MZ*8U z>69tpB@en8s=*+#6%1L72Z6w#V5n_%sksc!6Hia?$#O)d`U4F*p6!a5%t=1{`azAR}#>n4zWr6fZ_eLoPg~IWI7(Dagqxb_1YACw`*0U`HdMr zUw?+x>F4}p1guV<=A#gMjU%jPV&~EtUnFp*m}%5i*43Gh zLIA+qkH?vP3)sz5_jdooCk(o+69BCAwAJa8_#1fXtWKXy$0NCvRY^QO8TNH2SFbOizkmfd z?up8-a}@R3G>NZpiSwM@_5&(YkG2QOf~k;6_5C`S7*v+^i^6m~;sXspVerVTU4act^XNHR4#r2)x&c0wi z3NxSDIl$+?xD&Y3G)^#_7B3efRkCRjNr=JNOPe0Kg-1eriix@T2Ac0000