Commit Graph

253 Commits

Author SHA1 Message Date
Red
f6dd89ea7a d (#1351) 2025-06-01 21:55:20 +03:00
Red
5c5a473ec0 More merchant content (#1349)
* energy crystals

* thaumaturgy trading
2025-06-01 19:21:41 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347)
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
2025-06-01 15:10:36 +03:00
Red
a99f2fcd50 Remove random reaction system (#1345)
* wow

* d
2025-06-01 15:01:32 +03:00
Ed
f78b1e07c5 cs fix, demiplane fix 2025-05-30 13:28:08 +03:00
Ed
5e6d1d0b3a dungenore wawa 2025-05-29 22:14:14 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308)
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
2025-05-29 00:22:47 +03:00
paige404
100603ece6 Sentient items no longer count as party members (#1317) 2025-05-26 13:29:33 +03:00
Red
0ce4771f3d Update CP14RoundEndSystem.CBT.cs 2025-05-22 14:53:46 +03:00
Ed
0f4decfa9b Update CP14RoundEndSystem.CBT.cs 2025-05-21 21:28:11 +03:00
Red
2d0d79ca41 Daily English CBT (#1286)
* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs

* Update CP14RoundEndSystem.CBT.cs
2025-05-21 21:06:44 +03:00
Red
1d093c3919 Critical bugfixes (#1291)
* fix modifier duplication

* fix scrap melting
2025-05-21 00:30:16 +03:00
TheKittehJesus
2fc1384780 Proofreading changes [EN] (#1288)
* First batch of text fixes

* Tweaks

* that the tavern

---------

Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
2025-05-20 22:22:43 +03:00
Red
f4caea3c6c Garbage delete (#1284)
* fuck this

* and this

* aaand this

* content fix

* Update base.yml

* Update physical.yml

* kill bob
2025-05-19 14:53:00 +03:00
Alexsey Bezyuk
3472feefea Increase WorkbenchRadius (#1281) 2025-05-19 10:38:19 +03:00
Ed
e70e64011f Update CP14BloodMoonCurseRule.cs 2025-05-18 16:59:39 +03:00
Ed
23c9e11019 Blood moon part 2 (#1272)
* som tweaks

* fixing all

* bloodlust spell

* atatat
2025-05-17 14:12:49 +03:00
Viator-MV
74707a98c3 emiplane ghostrole fix (#1271)
* fine

* fix

* Update Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-05-16 15:26:02 +03:00
Ed
e0a4f5592f Blood moon (#1270)
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
2025-05-15 17:32:26 +03:00
Ed
26e4088cdd Silva Photosynthes returns + Carcat guidebook page (#1269)
* f

* restore silva feature

* carcat guidebook

* day cycle
2025-05-15 00:37:42 +03:00
Ed
c2c66e77c1 Shrimp progression (#1268)
* Ore modifier category

* roundstart adventurer weapon equip

* forgot about guard

* Update adventure.yml
2025-05-14 14:22:33 +03:00
Ed
be495f274c Skill progression system (#1263)
* delete skill trees

* Revert "delete skill trees"

This reverts commit 9d7fae73c4.

* learning refactor

* UI tweaks

* sword mastery skill

* telegraphy

* rapier mastery

* research table ui

* finish studing

* polish UI researching

* pyrokinetic

* more skill tree working

* heat adapt

* alchemist and metamagic update

* skill multiple effects support + metamagic bugg manapool

* impossible 😢

* skimitar gaming

* skimidi

* blacksmithing branch

* remove research restrictions

* remove species magic buff

* fix loc

* Update thaumaturgy.yml

* pip

* Delete skill_tree.yml
2025-05-14 12:43:43 +03:00
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256)
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251)
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
2025-05-05 15:19:44 +03:00
Ed
518b439c0f integrate 2025-04-30 20:50:03 +03:00
Ed
0c8735f6df some hotfixes 2 2025-04-30 19:44:38 +03:00
Ed
2358bc46d6 Torches + Cotton (#1246)
* torches add, wallmount crystals deletion

* cotton

* Update buy.yml

* craftis

* delete elemental quartz

* energy crystal resprite and rewamp

* fix

* Update misc.yml

* а

* delete rituals

* riat

* Update migration.yml

* Delete CP14ClientRitualSystem.cs

* Update statues.yml

* fix

* Update wallmount_lamp.yml

* fix
2025-04-30 17:28:38 +03:00
Ed
4bb614981f Keys & Locks crafting (#1207)
* keeye

* random locks for demiplanes

* blank keys, material keys

* craft blank keys

* key file

* fix skill tree UIScaling

* fix audio and sounds and prediction

* delete crowbar, merge its into pickaxe

* QoL key shaping

* lock introdusing

* QoL progress lockpicking

* examinable lock

* lock insert

* mithril lockkpick

* Update wall_dirt.yml
2025-04-24 17:10:52 +03:00
Ed
25fd73fec9 Update DiscordAuthManager.cs 2025-04-20 16:41:55 +03:00
Ed
f787bb5ea4 Ice bow artifact (#1200)
* pvs

* fix tradepost

* ice bow artifact
2025-04-19 17:24:57 +03:00
Ed
b437be5cf8 Random bullfix go! (#1197)
* some fixes for AI pathfinding

* cobblestone tile

* stonebrick update

* fix #1194

* fix #1193

* Update stonebricks_square_carved.png
2025-04-18 22:47:17 +03:00
Ed
39ca6175e6 Simple sponsorship system (#1189)
* simple sponsorship system

* priority Join

* OOC Sponsor Color

* Update CP14SponsorRolePrototype.cs

* loadout sponsorship

* bruh

* refactor to interfaces

* Update CP14ClientSponsorManager.cs

* finish loadout option

* role pass
2025-04-17 19:55:25 +03:00
Ed
b40cbfb5d7 Automatic Open tests (#1142)
* auto eng obt

* Update CP14RoundEndSystem.CBT.cs

* Update CP14EdSystem.cs

* cbt cbt!

* Update CP14RoundEndSystem.CBT.cs
2025-04-15 23:09:49 +03:00
Ed
c61a76fa69 Merge pull request #1004 from crystallpunk-14/ed-11-03-2025-discord-auth
Discord Auth expanse
2025-04-15 22:50:08 +03:00
Tornado Tech
52f31e4403 refactor: Magic system (#1138)
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-04-14 17:32:41 +03:00
Ed
4a98d86330 wastelands (#1181) 2025-04-13 22:43:47 +03:00
Ed
ac541b63ef new round leave system (#1178)
* round leave

* maps update
2025-04-13 15:36:41 +03:00
Ed
26d81b684b Weather refill (#1175)
* refillable by weather

* fix
2025-04-13 01:01:22 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174)
* wendigo

* ritual3

* Update sky_lightning.yml
2025-04-12 17:32:53 +03:00
Ed
da5190ae60 Farming rebalance (#1171)
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs
2025-04-11 23:45:03 +03:00
Ed
0decd375e4 Birch tree (#1154)
* birch

* wooden birch log and planks

* birch tile crafting

* add birch to worldgen

* Update grasslands.yml

* wooden planks (any)

* universal wood crafting

* birch wall
2025-04-09 15:54:38 +03:00
Ed
e77645d9d6 old tiles YES (#1144) 2025-04-07 01:34:45 +03:00
Ed
b66ee390a6 Dynamic demiplane weather + farming hotfix (#1131)
* dynamic demiplane weather

* add skeleton sprite

* hotfix farming

* Update wheat.yml
2025-04-04 10:35:48 +03:00
Ed
48831380b4 Give some love to farming (#1124)
* give some love to farming

* Queryptimization

* Fuck soil!!!

* fuck soil in prototypes!

* seeds improve

* partial merge wild and farm

* some strange fix

* plant kills refactor, add compost

* fix compost

* Update migration.yml

* rain can watering plants

* sage update

* Update seeds.yml

* sage smoking update

* Update seeds.yml
2025-04-03 15:29:08 +03:00
Ed
edc67dd280 Storm nerf (#1107)
* weather lightning nerf

* port storm weather to gamerule events

* fix
2025-03-31 23:46:21 +03:00
Ed
011e90a5d1 Weather gameplay effects (#1089)
* pipa

* Weather effects

* Weather in demiplanes!

* demiplane enter roofs

* Demiplane ruins

* Update weather.yml

* Update paper.yml

* Update paper.yml
2025-03-30 17:27:05 +03:00
Ed
abdd46c7d5 Random bugfixes and balance (#1088)
* shared magic energy examine

* fix #1067

* fix #984

* nerf slimes

* fireSpread nerf

* slimes demiplane examine + remove whistler
2025-03-29 22:08:58 +03:00
ArZarLordOfMango
f81f7a836e mana-fix (#1082) 2025-03-29 16:57:13 +03:00
Link
b9fad6cbd4 Mana no longer regenerates after death (#1027)
* Update CP14MagicEnergySystem.Draw.cs

* :nerd:

* Update CP14MagicEnergySystem.Draw.cs

* Update CP14MagicEnergySystem.Draw.cs

* oops...

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-03-28 11:10:42 +03:00
Ed
1e36a61339 Skill progression system [Draft] (#1056)
* fuck all

* clean up

* remove knowledge books

* Update base.yml

* cl

* fix #991

* fix

* Update subgamemodes.yml

* manual migration + recipes fix

* Update comoss.yml

* setup data

* setup skills systems

* more blacksmithing skills

* Update base.yml

* Create CP14SkillEffectAction.cs

* skill button returns

* base graph UI window

* skill tree drawing

* UI improve

* pyro setup

* skill trees selection, dragging control

* refactor skill system: rename Skills to LearnedSkills, add experience tracking and learning logic

* Create available.png

* skill description generation setup

* auto parsing skill names and descriptions

* Hydrosophistry

* water light fire and metamagic ported to skill tre

* ice dagger spell returns

* Update ice_dagger.yml

* delete old files

* Update modular_garde.yml

* ice arrow spell

* link graph with parallax

* show experience counter

* polish

* puf

* p

* pipap

* finally ready to merg?

* fix

* fix 2
2025-03-27 17:20:20 +03:00