juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,652 Commits 57 Branches 0 Tags
581ca2f5efefe8aeb53397af1f02bdf52012abea
Commit Graph

37 Commits

Author SHA1 Message Date
Nim
5a2ccc3e08 Resprite (#1328) 
* well resprite

* broken well

* Campfire

* meta

* Quantity
 2025-06-02 14:16:42 +03:00
SenorJaba
3972d047c7 Guard bell resprite change (#1335) 2025-05-30 09:49:21 +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
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +03:00
Nim
d8e360367e Well and new bed, aristocratic cloak (#1228) 
* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-06 09:47:46 +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
e308eec703 Hoe dirt preparing (#1135) 
* seedbed returns

* modular hoe!

* hoe gameplay

* remove onion seeds
 2025-04-05 01:00:39 +03:00
Ed
504adb6738 Fools day end (#1115) 
* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "April fools fix (#1113)"

This reverts commit e2dec03cbb.

* Revert "Update secret_weights.yml"

This reverts commit 256476b576.

* Update Dev.toml
 2025-04-01 21:40:43 +03:00
Ed
655cba7674 April 2025 fool (#1109) 
* Новый геймплей кузнеца и алхимика (#1084)

* anvilvat

Vat is now anvil

* deleted layers

* я даун

* тесты скажите что не так

* fuck documentation

* finally ok

* Alloys

* test not give up

* fix tests mk2 and anvil rename

* anvilgril

* FUCK TABS

* cattle

* meow

* the чистка

* armor

* fuck

* Update tags.yml

* ДА КАК ЭТО Я ВООБЩЕ БЛЯТЬ МОГ СДЕЛАТЬ НАХУЙ

* garde

* yes

* сохранить забыл

* голова потекла

* упс

* b

---------

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

* Viator's april fools (#1091)

* uno reverse

* comos!

* desery special

---------

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

* [April Fools] Mob Pumpkin King!!! (#1092)

* MobPumpkinKing

* generation

---------

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

* asdsasdd (#1110)

* wait what???

* some fixes

* Поправка локализации на завтра (#1108)

* локаль

* упс

* Create TOPSECRET.xml

* Update entry.yml

* Update TOPSECRET.xml

* ч

---------

Co-authored-by: Deserty0 <86846189+Deserty0@users.noreply.github.com>
Co-authored-by: Viator-MV <egor44148@gmail.com>
Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
 2025-04-01 00:05:46 +03:00
Ed
c1acf81541 NewTrade (#969) 
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
 2025-03-06 12:01:43 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955) 
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
 2025-03-02 13:28:13 +03:00
Ed
3fd47443ae Essence collector (#952) 
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
 2025-02-28 15:55:47 +03:00
Ed
5524e029f4 Essence splitter (#948) 
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
 2025-02-27 13:48:38 +03:00
Ed
ba901d5e0e Crystals Update (#925) 
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
 2025-02-25 23:37:05 +03:00
Ed
a3849c8aa9 pressure plate (#902) 2025-02-16 00:39:36 +03:00
Ed
a6262a471d Resprites + Satchels (#834) 
* magic essence experiment

* demiplane key resprite

* some resprites

* guard commander cape

* vat and cauldron resprite

* flint resprite

* satchels!
 2025-02-02 03:29:55 +03:00
Ed
42627a0c33 Random content (#815) 
* demiplane crystal sprite update

* fix demiplane astral haze vanilla

* fix infinity money stacking

* rabbits outbreak!

* fix meta

* fix rga

* fix CLRF

* move subterranean leap action to actions folder

* Update audio.yml

* Update natural.yml

* restore lzk commit

* fix endscreen text

* fix goblin displacement, fix #809

* Update kudzu.yml
 2025-01-28 13:04:10 +03:00
Ed
af182db79e Another assets relicense (#814) 
* TheShuEd assets relicensing

* Max Gab mass relicensing

* omsoyk mass relicensing

* Prazat mass relicense

* Jaraten mass relicensing

* Update meta.json

* jaraten part 2

* finalize

* validation

* unrelated fixes

* Revert "jaraten part 2"

This reverts commit b39ee0cdb9.

* Revert "Jaraten mass relicensing"

This reverts commit 44febae380.

* Revert "validation"

This reverts commit 3d2f388f47.

* Revert "finalize"

This reverts commit 775f21a18d.

* final fix
 2025-01-27 16:03:13 +03:00
Ed
fb604d1e08 fix CLA licensing 2025-01-24 22:02:46 +03:00
Ed
4979b0a5d0 Simple round end redesign (#723) 
* round end monolith system

* disable default evac

* auto close demiplanes, and block its opening when no monolith mana

* Update CP14RoundEndSystem.cs

* enable default evac code (its disabled viaa cvar)

* apply brainstorm monolith changes

* comoss update
 2025-01-18 17:55:41 +03:00
Ed
e1f67be2a8 Snowdrifts (#669) 
* snowdrifts

* Update fire.png

* alerts sprite optimize

* Update wooden.png

* stone wall fix
 2024-12-13 16:59:37 +03:00
Ed
61454e351c Another blacksmith minor update (#648) 
* modular golden sickle

* anvil and furnace resprite

* Update comoss.yml
 2024-12-08 14:17:48 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00
Ed
d259191d3d Cargo system (#487) 
* simple storeship arriving

* pupu

* ship cycling

* buy positions prototypes

* i hate UI

* PriceControl

* second tab ui

* baloon! pallets!

* update shop in town

* setup billboard timer

* split to sell and buy categories

* renaming gaming

* actually selling

* fix infinity selling

* improve timer

* move description too rigt part UI

* bar selling

* iron cabinet

* purge currency categories

* remove town balance, add money box

* special proposal, FTLImmune anchor

* fix UI

* remove tests buying

* Update CP14StoreWindow.xaml.cs

* currency converter

* currency clean up

* Update CP14CargoSystem.cs

* clean up part 2

* rider petpet

* coins audio

* coin improvment

* Update coins.yml

* translate

* more coins roundstart

* Update wallet.yml

* Update wallet.yml

* generate coin problem fix

* refactor proto reading

* fixes

* huh

* shuttle logshit fix, add to tavern map

* Update CP14StationTravelingStoreShipTargetComponent.cs
 2024-10-15 15:22:06 +03:00
Ed
22171de45a Fix soil refilling (#442) 
* fix soil

* Revert "fix soil"

This reverts commit 8176355286.

* Reapply "fix soil"

This reverts commit 0c958f4c9c.
 2024-09-18 15:56:50 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +03:00
Ed
37a4068334 CLA license update (#429) 
* pupu

* Update LICENSE.TXT

* CLA

* CLA!

* Revert "CLA!"

This reverts commit f999e341a1.

* CLA2

* Update rsi.json

* CLA3

* Workbench sublicense
 2024-08-29 18:23:33 +03:00
Ed
e02a9951a7 Flowers + some love for Alchemy (#427) 
* red rose proto and sprite

* 242 changed files guys

* yellow dayflin

* jitter + drunk solution, also refactor alchemy recipes

* dyes entity

* dye crafting, dye using

* add flowers to generation
 2024-08-29 00:31:09 +05:00
Ed
d3189b83cf Pumpkin + Cabbage (#417) 
* seeds

* import Omsoyk plant sprites

* cabbage slicing

* sliceable pumpkin

* some tweaks

* seedbed clean fix, remove shitcode systems

* seed crafting, knife fix

* utencil

* Update base.yml

* cabbage rebalance

* abstract seed
 2024-08-22 17:35:00 +03:00
Ed
22bb0ae283 Energy pilons WIP (#326) 
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-29 21:01:36 +03:00
Ed
8cbd26ae2f Farming WIP (#269) 
* setup planting doafter

* spawn plants after use seed

* some work

* move comps to separate folder

* public check daylight

* daylight plant energy regeneration

* some fixes

* bruh, im thinking

* added ingame soil

* added hoe

* attaching plants

* hoe system

* block plant dublicating

* some planting refactor

* shovel as pant + soil remover

* plant growing visualizer

* soil resprite

* split farming system to second partial class

* update throught event refactor

* tring sync update plant with update visuals

* finish visual sync

* plants growing

* more partial splitting, naming work, clean up

* Update FARMINGTEST.yml

* Update FARMINGTEST.yml

* fix typo

* prototype value validating

* Оно бухает воду!

* solution visualizer in soil

* forgot some fix

* part of Tornado review fix

* destroy RemovePlantComponent

* more fixes

* simple harvesting

* refactor plant component values changing

* harvest redo

* gather on destroyByTool

* sickle resprite

* plant fading

* fading per minute!

* wheat sprites

* YML restruct

* fixes

* auto root plants

* add comments

* move sprites

* split structures from object textures

* wheat farming!

* Update CP14FarmingSystem.Interactions.cs

* seedbed (#297)

seedbed :^)

* a

* Update soil.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-15 23:58:03 +03:00
Ed
0211a50581 Energy crystal (#243) 
* init magic container system

* charging and discharging

* add energy regenerator

* thaumaturgy glasses, scanning energy

* add energy quartz prorotypes and sprites

* light power controller

* commit special for _des

* simple normalizer crystal slot

* YEEEEEEE BOIII, examined crystalls inside things

* кристал теперь видно, когда он вставлен в стабилизатор

* TryUseCharge приборами

* hello deserty, how are you doing?

* rename regenerator to EnergyDraw, allow draw from slot

* normalizer жрет magic energy файналли

* Update normalizer.yml

* visual polishing

* Update crystal.yml
 2024-06-13 22:55:20 +03:00
Ed
2cfdc4a52f Solution normalizer (#227) 
* dropper

* add stabilizer

* fuck, now

* Update CP14SolutionNormalizerComponent.cs
 2024-06-08 18:46:09 +03:00
Ed
b33a094f65 change licenses (#191) 
* change licenses

* Update rsi-schema.json

* change codebase license

* try make schema

* Create rsi.json

* rga fix
 2024-05-31 00:01:22 +03:00
Ed
4c692d7d4a Alchemy + Guidebook initialization (#124) 
* remove Guidebook

* water and blood

* localization things

* added vital extract

* some fixes

* added bloodgrass

* guidebook localization

* fixes icons and remove unnecesary fields

* added inhand cauldron

* fix wallmount board

* Update bonfire.yml

* Update bonfire.yml

* alchemy furnace + mist

* fixes

* Guidebook localization

* Update drinks.yml

* Revert "remove Guidebook"

This reverts commit 7924cf235f.

* fix filtering guidebook

* test fix

* Update heater.yml
 2024-05-02 20:41:11 +03:00
Ed
0169cb55d8 Alchemy instruments (#122) 
* add beer barrel

* add vet

* add storage to vat

* make bucket viable!

* bandage vat item fix

* Update vat.yml

* add small vial

* tiny vial

* Update SharedStorageSystem.cs

* Create biological.yml

* spilable and bonfire climbing
 2024-04-30 16:48:08 +03:00
Ed
485873839b Работа для кузнеца (#80) 
* add content

* Update CPSharpenedComponent.cs

* Update twoHandedSword.yml

* update
 2024-04-12 21:09:54 +03:00