Commit Graph

500 Commits

Author SHA1 Message Date
Red
30d7da4b2b Ed 06 07 2025 guards trading (#1505)
* guard trading

* Refactor trading reputation special and update guard assets

Renamed CP14AddGlobalReputationSpecial to CP14AddTradingReputationSpecial and updated its logic to use a configurable set of factions. Updated job prototypes for guard, guard commander, investigator, and merchant to use the new special and specify relevant factions. Also updated guard helmet textures and metadata.
2025-07-06 17:35:49 +03:00
Red
6b6d6ae3f9 return guards to Comoss (#1504)
* return guards to Comoss

* salary system

* Update Frigid_Coast.yml

* Update migration.yml
2025-07-06 14:28:57 +03:00
Red
6570b1b4b6 Public market + Solutions requests (#1503)
* Add platform markup to trading platform prices

Introduces a PlatformMarkupProcent field to CP14TradingPlatformComponent and applies it to price calculations in both client and server logic. Adds a new public trading platform entity with a higher markup and updates related sprites and metadata.

* Add platform markup percent to selling platforms

Introduces a PlatformMarkupProcent field to CP14SellingPlatformComponent, allowing selling platforms to apply a markup or markdown to item prices. Updates server logic to use this value when calculating payouts and UI state. Adds a new public selling platform entity with a lower markup in the trade_platform.yml prototype.

* Add Brad Potions trading requests prototype

Introduces a new YAML prototype defining multiple cp14TradingRequest entries for the BradPotions faction, each specifying requirements for various potion effects with minimum purity and amount.

* Apply platform markup to selling prices and payouts

Updated the selling request control and platform window to factor in the platform's markup percentage when displaying prices. Adjusted the server-side payout logic to multiply the payout by the platform markup percentage, ensuring consistency between client display and server rewards.

* replace mapping to public platforms

* bug + remove eepy potions request

* Clarify purity requirement in workbench reagent text

Updated the reagent requirement string in both English and Russian locale files to indicate that the required purity is '{$purity}%+' instead of just '{$purity}%'. This clarifies that the purity must be at least the specified percentage.
2025-07-06 00:09:03 +03:00
Red
a68da0eacd Magotech (#1498)
* Add brass material, bars

Introduces the new brass material, including its prototype, stack, and bar entities, along with associated sprites. Updates English and Russian localization files to include brass and adds a new construction condition for mana power. Also moves glass sheet entities to the correct file.

* Add CP14ManaFilled construction condition

Introduces a new construction condition that checks if an entity's mana container is fully filled. Includes examination feedback and construction guide entry for user clarity.

* electromancy respawn

* Update T2.yml

* Update meta.json

* ffif

* Update speed_ballade.yml

* Update thaumaturgy.yml

* Update undead.yml
2025-07-05 14:54:09 +03:00
Nim
cb01a6b66c Reprise of doors, vials, and labeler (#1495)
* birch door

* hand labeler

* vial

* fix door

* vials

* frame
2025-07-04 17:35:59 +03:00
Nim
dc1922c6f2 Food and cutlery (#1483)
* food and cutlery

* goblet

* jelly

* ham in cheese

* Klanir stuffed pumpkin

* fix

* jelly fix
2025-07-02 17:17:39 +03:00
gogenych
890af47853 The carpets update! (#1461)
* carpets!

* fix

* second fix

* 3 fix

* crafts 2

* locale

* some changes

* price

* names

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-07-01 16:24:03 +03:00
Nim
4dc06e42f1 Wooden weapon (#1471)
* wooden weapon

* Stamina
2025-07-01 13:07:09 +03:00
Tudibidab
71f16a4976 MobFairy (#1465)
* MobFairy

New mob Fairy. Magic parasite.
Mana Splitting now deals damage when the target has no mana.

* Update attributions.yml

Добавил чёрточки

* Update fairy.yml

* Update modifier_sets.yml

* Update fairy.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update fairy.yml

* Update fairy.yml

* Update mobs.yml

* Update fairy.yml

* Update fairy.yml

* Update fairy.yml

* Update fairy.yml

* minor fixes

* add to demiplane generation

---------

Co-authored-by: Viator-MV <egor44148@gmail.com>
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-06-29 17:06:55 +03:00
JustSome1Nearby
a1c995fdd7 Birch Grips (Craft, Sprite) (#1488)
* BirchHandle

* BirchHandle2

* GRAAAH JUST CALL IT BIRCH ITS ALLREADY WOOD

* Delete gitlog

* Delete BirchWood for just wood

* Delete BirchWood2

* Update Resources/Prototypes/_CP14/Recipes/Workbench/Workbench/misc.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-29 15:34:27 +03:00
Red
af0a502dab Alchemy furnace integration (#1489)
* furnace integration + fix gates

* fix

* d
2025-06-29 13:38:05 +03:00
Red
777c5f9a29 Electromancy magic branch (#1485)
* basic electromancy tree

* electric strike

* Update CP14SpellProjectile.cs

* fix throwing
2025-06-29 12:20:47 +03:00
Red
ecadfb3ea5 Big content update (#1484)
* Add investigator's cloak entity and sprites

Introduced a new investigator's cloak for senior investigators, including its entity definition and associated sprites. Also updated helmet sprites for the guard role.

* Add Investigator job to CP14 roles and assets

Introduces the Investigator job, including English and Russian localization, job prototype, loadout, play time tracker, and status icon. Updates department and role loadout configurations to include the new job. Enables setPreference for Guard and Guard Commander jobs. Adds Investigator job icon and updates related metadata.

* Rebalance mana splitting spell parameters

Reduced mana cost from 15 to 10, adjusted mana change effect, and updated spell event to use a toggleable action with new cast time and distance threshold. Also changed visual effect colors for the spell impact.

* job spawner

* remove mana splitting from mana glove

* Update tools.yml

* reduce memory points to 0.5 for tier magics

* Add CP14 spell to create beams and extend beam system

Introduces CP14SpellCreateBeam, a new spell effect for creating beams using the shared beam system. Adds a virtual TryCreateBeam method to SharedBeamSystem and overrides it in BeamSystem to support shared spell functionality.

* athletic branch refactor

* second wind skill

* minor fixes

* remove skeletons specific spells

* small magic splitting

* Update migration.yml

* clear references

* guidebook species update, -0.5 people memory, innate athletic to carcat, nerf night vision

* disable guards again
2025-06-29 00:02:04 +03:00
Ed
64410a53b5 fix #1470 2025-06-27 01:20:08 +03:00
Alexsey Bezyuk
9c393ff8b5 [TRADE] Reagent and Food price rework and 4 new contracts: Butchers, Diary, Gardeners and Tailors (#1453)
* contracts

* meat prices

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* contracts

* cheese and egg

* blue and aged cheese

* aged and blue parts and slices

* cheese json

* revert meat prices

* Cheese prices

* egg price remove

* revert meat prices

* factions

* contracts

* meta.json

* remove monster part price

* sickle, hoe

* up price per unit

* Trade ref, cheese fix, plate PhysCompos

* Update coins.yml

* prices reagents rework, raw nutrient decrease, food container rework

* prices

* materials, remove bars

* tailors faction

* factions

* sprite fixes

* enyity fix

* Physical compositions

* tailord dye and loot in crate

* comment

* Ore buy to bar

* move to buy positions

* factions and contracts in main page

* move flint position

* Квартц вместо стекла

* quartz price up

* glass sheet sell position

* price precurser. Again

* essences prices

* english comment

* ooops missed

* price up

* sell requests and small flowers variations

* yaml fix

* test fix?

* flowers => to vials

* 2 => 1 count

* flowers icons

* remove small variations

* clear

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-26 18:18:19 +03:00
Fr0goo
9fa706720d changed Flem pallete blah blah blah blah (#1475)
flem uhhhhhh femfifimmifeiefmifiemfemfimefieemefieimfemfei. he looks better now
2025-06-26 16:31:49 +03:00
Red
81e044758f Magical vision skill (#1467)
* fix firewave error spamming

* basic magic traces entities

* Add magical vision system and mana trace entities

Introduces the magical vision mechanic, including the CP14MagicVisionComponent, marker entities, and related systems for tracking and displaying magical traces. Adds new actions, skill integration, localization strings, and icons for magical vision and trace markers. Magic traces are now spawned on spell use and mob state changes, with directional pointers and localized descriptions.

* Show time passed for magic vision markers

Adds a display of the time elapsed since a magic vision marker was spawned, using a localized string. Updates English and Russian locale files with the new 'cp14-magic-vision-timed-past' entry.

* aura imprints

* Update critical and death messages for inclusivity

Revised the 'critical' and 'dead' messages in both English and Russian locale files to use more inclusive language, replacing references to 'magical creature' with 'someone'.

* Move magic vision spawn on mob state change to server

Transferred the logic for spawning magic vision markers on mob state changes (Critical/Dead) from CP14SharedMagicVisionSystem to CP14AuraImprintSystem. This centralizes the event handling on the server side. Also increased the duration of magic vision markers for spell usage from 20 to 50 seconds.

* Integrate magic vision with visibility mask system

Added a CP14MagicVision flag to VisibilityFlags and updated the magic vision and religion systems to use the visibility mask system. Magic vision markers now use the Visibility component, and visibility is refreshed when relevant components are added or removed. Removed client-side toggling logic in favor of server-driven visibility.

* drowsiness overlay

* noir shader

* sfx design
2025-06-26 13:49:53 +03:00
SenorJaba
0cc7b6bf36 Asian clothing! (#1459)
* Asian clothing

* Fix
2025-06-26 13:46:38 +03:00
Nim
ee1222dcf4 slice (#1472) 2025-06-26 13:45:52 +03:00
Nim
61511edc19 Hot potato (#1463)
* hot potato

* Temperature
2025-06-23 16:42:02 +03:00
SenorJaba
6ae8d2639d Plushies! (#1456)
* I NEED THEM PLUSHIESgit add -A!

* Typo in attributions oops

* My greggit add -A!

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-23 12:53:05 +03:00
Nim
94ce2b0c2f Big bear (#1442)
* bear

* spawner

* voice

* target action

* animation
2025-06-23 12:25:20 +03:00
Red
b1a9fca5ee Trading request system (#1460)
* mapping public stores update

* base selling platform update

* basic UI setup

* Update coin icon textures

Refreshed the c, g, p, and s coin images in the interface textures. This likely improves their appearance or corrects previous visual issues.

* parse requests data into UI

* selling platform UI state now include price

Updated the selling platform UI to display the calculated price of placed items. Moved the UpdateSellingUIState logic from the shared system to the server system, and modified the CP14SellingPlatformUiState to include a price field. The client window now uses the state-provided price instead of a hardcoded value.

* Update selling UI state on item placed or removed

Added event subscriptions for ItemPlacedEvent and ItemRemovedEvent to update the selling UI state when items are placed or removed from the selling platform. Refactored UpdateSellingUIState to remove the user parameter, as it is no longer needed.

* sell button works now

Replaces the previous sell request mechanism with a new CP14TradingSellAttempt message for selling items on the platform. Updates client and server logic to use this new message, adds a CanSell helper for item validation, and refactors related UI and event handling code for improved clarity and maintainability.

* auto pricing requirements

* Refactor reputation reward to use cashback rate

Reputation rewards for selling requests are now calculated as a percentage (cashback) of the sale price, rather than a fixed value. Updated the relevant UI, server logic, and prototype fields to reflect this change. Also cleaned up the brad_potions.yml prototype file by removing a duplicate entry and correcting an ID.

* request rerolling
2025-06-23 01:21:25 +03:00
Red
aeda7c6f38 Silver needle berries (#1451)
* move flowers rsi

* silver needle

* Update silver_needle.yml
2025-06-20 12:31:37 +03:00
Red
8d984b7670 Dash (#1445)
* dash basic logic + predict spell casts

* dash

* Update kick.yml

* Update CP14SharedMagicSystem.Checks.cs
2025-06-19 00:14:58 +03:00
Red
3a4bbcb289 Area of influence depends on followers MobState (#1439)
* simple anti-religion zone shader

* observers refactor
2025-06-18 21:46:58 +03:00
Red
637cfe4be8 nerf gods (#1436) 2025-06-17 01:19:09 +03:00
Ed
0f8a52af53 lobby screens update 2025-06-16 12:02:59 +03:00
paige404
7cdfaafb6b Innkeeper tweaks: modular mops, wearable buckets, and more (#1387)
* Clarify the naming of the farming sacks. Make mops breakable. Add modular mophead craftable at a workbench. Add lucens mophead. Make all mops and other tools not meant for swinging at things break faster. Tweaked damage numbers on certain tools. Add lucens bucket. Make all buckets wearable as shitty helmets. Add recipes to (slowly) craft ropes from the inventory.

* Revert all changes to the CP14BaseMop, as it doesn't need to be touched. Use migration to replace it instead.

* Remove the old mop

* Correct sprites based on feedback from omsoyk. Dewhimsy the lucens mop and bucket--mop head looks more logical, bucket's rope color is plain rope. Correct certain mop sprites facing the wrong way.

* Bring mops up to speed with the belt changes

* Make lucens bucket just a norma bucket, in blue

* Fix the errors by removing unnecessary fields from the craft recipes, updating the crate loot to use the new preset mop

* One more attempt to fix linting errors

* Final(?) bugsquash. Remove unnecessary name field

* Add clumsy tranlated localization

* Revise bucket helmet sprite to sit higher on the head at a jaunty angle

* Update old guidebook mop references

* Minor shading mistake: 💀

* Move rope craft recipes to the workbench

* Remove construction component from rope

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-16 11:30:21 +03:00
Red
d30b51c982 Firewave (#1430)
* nerf spiders

* firebolt to firewave

* Update firebolt.yml

* rename file

* Update firewave.yml

* Update firewave.yml
2025-06-15 18:03:38 +03:00
Red
04f6627e16 Lumera patron (#1427)
* mind upgrade works only on followers

* wrath of lumera, removing memory points

* enable lumera for players

* add lumera to maps

* job desc update

* guidebook
2025-06-15 15:00:18 +03:00
Red
4be22326ce Gods part 6 (#1425)
* Skill scanning + bugfixes

* memory point examining

* Update base.yml

* predict skill examining

* moon beam lumera action

* balance
2025-06-15 01:50:16 +03:00
Red
71abce8db8 Skill scanning + bugfixes (#1424) 2025-06-14 19:04:33 +03:00
Red
7760e8f628 God part 4 (#1422)
* projectile spell improve

* mind improve
2025-06-14 14:21:25 +03:00
Red
fc0beb5ccf Gods part 3 (#1421)
* apprice action, dead notice

* fix refollowing

* mist lumera action
2025-06-14 02:11:36 +03:00
Red
422a0c5e10 Gods and religions (#1405)
* basic religion vision

* block god interactions

* skill tree mob specify

* silvania setup??

* clustering shader optimization

* gods department & job

* random gods jobs

* Luxian god

* Update Nature.png

* Update sphere_of_light.yml

* god chat

* Update ChatSystem.cs

* OBSERVATION

* public observation and basic follower api

* shader tweaks

* improve shaders

* spawning and praying on altars

* altars ppvs override

* move pvs overridiation from altars to observers

* shader coloration

* spectral z mover

* god magic radius restricted

* guide how to believe in god

* sends messages to god when smoeone wanna become follower

* follower doAfter

* goodbye luxian, welcome lumera

* goodbye silvania, welcome merkas

* som polish and renamings

* gods fast travel

* Update altar.ftl

* some lumera sfx

* renouncing patrons!

* renounce followers

* followewr percentage calculation

* remove from player-facing

* fix

* Update sphere_of_light.yml

* Update base.yml
2025-06-13 14:15:48 +03:00
Fr0goo
542bd2d948 Flem Creature (#1402)
* added Flem Creature

a weird looking fish creature that will spawn in the demiplanes with open skies and herbals. that will attack you if you get too close

* fixed placement of lines

should be in the right places now

* changed location of fish outfit, ajusted the sprite, and made it not foldable

* added flem modifier and fixed some thingy

* Update attributions.yml

* Update mobs.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-13 13:25:33 +03:00
SenorJaba
8ab0939698 Merchant's monocle and ability (#1413)
* New trading stuff

* Crafts skill tree

* More trading fixes, baby!

* Last trading fix I hope

* Merchants' supremacy

* Gimme money

* Readonly
2025-06-13 12:24:36 +03:00
firebat4321
d89ef56907 Firebolt (#1354)
* added firebolt spell yml, added to spellbook tree

* Added new sprites for Firebolt action/spellbook, in-game bolt sprite.

* Missing comma from fire .json file.

* Updated firebolt IDs to use own ID instead of Fireball's ID.

* Spell doesn't break on move now.

* Updated on soundHit effect

* Corrected Fireball IDs to Firebolt

* Updated copyright entries

* Update firebolt.yml

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-10 14:14:07 +03:00
Nim
f0a25ddef6 Two-handed crossbow (#1315)
* Crossbow

* bow

* size

* size crossbow

* PhysicalComposition
2025-06-10 11:08:07 +03:00
Nim
747f76242f Rocks with moss (#1412)
* rockmoss

* line
2025-06-10 11:07:13 +03:00
Viator-MV
e06e1bb7fc Druid stuff (#1396)
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
2025-06-09 14:35:56 +03:00
Nim
024d22dc05 Slippers and hat (#1398)
* Slippers and hat

* sound

* fix
2025-06-08 10:53:19 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
Red
17be798db4 Grass bags (#1381)
* grass bugs

* move to victoria

* Update tiles_grass_bag.yml
2025-06-04 12:22:54 +03:00
Nim
dedd3a8b33 New carpets (#1375)
* new carpets

* Flammable
2025-06-04 09:57:09 +03:00
Nim
dd6f5a7e6f lockpick artifact (#1374) 2025-06-03 15:37:25 +03:00
TheKittehJesus
4c7b035c9c New belt controls (#1298)
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-03 14:39:39 +03:00
DeLTaAlarm0
261441dd67 Open/closed table sign (#1275)
* Added open/closed sign

* Added open/closed sign

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update workbench recipes

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update misc.yml
2025-06-03 14:22:24 +03:00
paige404
881a504334 Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes (#1300) 2025-06-03 00:59:07 +03:00