juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,944 Commits 57 Branches 0 Tags
workbench-update
Commit Graph

97 Commits

Author SHA1 Message Date
Nim
ca23fddd8a Lyre and flute (#759) 
* music

* fix desc

* Update T1_fire_rune.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-17 01:26:39 +03:00
Ed
cf41cabcea Remove OP (#757) 
* remove outdated content

* Update migration.yml

* Update twoHandedStaffs.yml
 2025-01-14 14:36:10 +03:00
Nim
2644fe26ea Ashes and Russian translation edits with a couple of minor fixes (#735) 
* ash++++

* fix

* по запросу
 2025-01-13 23:01:34 +03:00
Ed
0af7a7ec64 Alchemist content (#718) 
* reinforced vials

* glass recipes

* roundstart alchemist potions
 2025-01-10 16:17:32 +03:00
Ed
c41927cdf2 Bugfixes (#716) 
* job localization fix

* Update job.ftl

* metall scraps

* tomato seeds craft

* fix #105

* health alerts fixed

* bucket size fix

* hat fix
 2025-01-09 22:28:39 +03:00
Ed
be3064b99c Modular sprites auto coloring (#697) 
* axe and dagger update

* more blade processing

* shovel and sickle

* sword

* gardes

* grips

* modular presets

* blade material modifiers

* modular spear blade

* balance sharp garde, add sturdy garde

* Update sturdy.yml
 2025-01-05 04:01:31 +03:00
A.Ne.
57a795261f mithril and lucens modular parts (#682) 
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-15 22:40:05 +03:00
A.Ne.
f655f74b03 mithril and lucens (#660) 
* mithril and manarium

* Rename manarium to Lucens

* pointlight to tree

* lucens tile

* Update trees.yml

* logs sprite

* Update trees.yml

* delete acacia tiles, recolor lucen example

* tiles new palette

* Update ores.yml

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

* tiles update

* Update tiles.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-15 12:53:31 +03:00
Ed
58269bb65e Snowballs (#677) 
* snowballs

* biome update

* fixes
 2024-12-14 14:57:15 +03:00
Ed
d7d0977eb6 New year preparation (#674) 
* garland

* presents filter

* vladimirs weather

* snowed tilebrick
 2024-12-14 01:01:36 +03:00
Ed
5384adb2b3 Blacksmith again (#652) 
* golden and copper sword

* copper sickle

* maces

* shovels

* modular axes

* fixes
 2024-12-09 00:40:27 +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
Nim
417668b88b Crayon (#634) 
* crayon

* add crayon into loots

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-07 00:50:54 +03:00
Ed
64df860b50 Salary for the guards (#631) 
* public API

* salary init

* salary finish

* Update entities.ftl

* Update salary.yml
 2024-12-06 00:59:37 +03:00
Ed
304e1a268a Balance pack (#628) 
* map fixes, move crystalls from houses into startgear

* fix lock types

* fix item throwing, reduce lock powers, add lockpick into anvil

* new store positions

* restruct swords

* nerf skeleton, bone halberd
 2024-12-05 00:29:14 +03:00
A.Ne.
e6a6900719 Prototypes for Guard (#616) 
* Prototypes for Guard

* imperial laws

* merge

* yml clean up

* flags + change in imperial laws

* map update

* guard clothing resprite

* cool guard helmet

* guards grip and halberd

* fill cabinets, add guard commander stamp

* key and keyring fix

* Update arenas.yml

* Update migration.yml

* tapestry fix

* guidebook spacing

* Update meta.json

* add bold tags

* Update flags_wallmount.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-04 18:11:33 +03:00
Ed
f6630e1ec9 Key distribution system (#625) 
* data restruct

* yay

* Update arenas.yml

* fixes

* auto labeling

* shuffle
 2024-12-03 12:34:07 +03:00
Ed
7e6e4709c4 Ed 01 12 2024 rapier (#623) 
* Rapier blade

* file restruct

* golden garde

* iron sharp garde

* copper garde
 2024-12-02 00:08:23 +03:00
Ed
c6ac192dfb Gold & Copper modular parts 1 (#621) 
* gold & copper daggers

* copper and gold short grip

* gold & copper grips

* golden pickaxe

* copper pickaxe

* Update anvil.yml
 2024-12-01 20:11:59 +03:00
Ed
109edeb4b5 Modular weapon crafting WIP (#611) 
* data initalizing

* modular assembling

* grips and blades sprites

* first prototypes

* jewerly decoration

* disassemble modular weapon

* grip start stats

* blade modifiers

* inhand sprites generation

* resprites inhand, add sickle, add attempt modify size

* auto inhand sprite parsing

* icon default parsing

* spear blade

* mace ball

* sword blade

* sharedization + autonetwork hotswipe

* wielding sprite support!

* iron long grip

* wielded sickle, fix ERROR sprite if state not added

* Update grips.yml

* wielded spear + ruby rework

* wielding damage bonus modifier

* modular size fix

* fix storedOffset rotation

* parts offset

* fix inheriting modifiers

* some bugfix and balance tweaks

* DPS Meter

* fix dividing by zero

* rebalance

* replace baseknife to modular knife. Delete ice knife spell

* sickle and mace modular replace

* modular spear & sword replacement. add wielded icons

* Update CP14DPSMeterSystem.cs

* back to serverization

* grip disassemble drop again

* clothing sprite generation code

* back slot long grips and mace

* remove jewerly slot, add more clothing states

* finish clothing states

* shovel modular

* YEEEEE

* anvil modular craft

* bugfixes

* more integration check fixes
 2024-11-29 01:31:42 +03:00
Ed
897a9cf683 localization sync (#597) 
* localization sync

* init

* Update entities.ftl

* внезапный респрайт лома
 2024-11-24 14:33:02 +03:00
Ed
548433baca Torch craft (#603) 
* fix

* Update crates.yml

* loadout torch, flint craft workbench
 2024-11-21 22:48:14 +03:00
Ed
96fc06a443 Fire update (#602) 
* fire spread fixes and optimization

* fix liquid drops nefty and suffix

* some sharedization

* melee fire extinguish

* clean up fireSpread system

* caution popup

* cuffable zombies

* fix zombie AI

* lighter

* torch integration attempt

* fix torch igniting

* yml tweaks

* bonus flammable damage
 2024-11-21 22:01:14 +03:00
Ed
e79b046c4a Magic redesign (#594) 
* water spell textures

* water creation spell

* mana consume, and mana glove

* remove mana transfer ring

* Update migration.yml

* copy Wizden loadout PR

* add sprite component to all spells

* spell dummy loadouts

* delete spell traits

* really give spells from loadouts

* update crates fill and demiplane spawners

* beer creation spell, fix passivedamage

* Update PassiveDamageSystem.cs
 2024-11-20 00:23:44 +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
5bcc378bbe Clean up, increase build stability (#583) 
* Update base.yml

* bandit -> sociopath

* some fixes

* syringe

* vaults

* Update ContentAudioSystem.CP14AmbientLoop.cs
 2024-11-13 17:56:07 +03:00
Ed
84e07c1ded Next spellStorage experiment (#572) 
* scroll spells

* refactor magic system

* Update spawners.yml

* safe use

* Update magic-spells.ftl

* fix magic containers

* fix mole

* all scrolls

* remove shadow step ring

* fix scrolls
 2024-11-10 16:15:08 +03:00
Ed
c8ab937cf0 Spell scrolls (#571) 
* scroll spells

* refactor magic system

* Update spawners.yml

* safe use

* Update magic-spells.ftl
 2024-11-09 17:55:16 +03:00
Nim
e062d386fc Herbal bandages and gauze (#545) 
* gauze and bandage

* fix

* spawn

* dele

* doAfter buff

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-11-08 09:26:31 +03:00
Ed
87dc3f9fa5 Order board (#546) 
* orders board! work for the Witcher

* stamps

* wtf

* Update closets.yml
 2024-11-08 00:10:59 +03:00
Ed
b5df675187 Spellcaster slowdown, mole nerf, new shoulder slot, healing staff (#538) 
* healing staff sprite

* new back slot and move all big things to whis slot

* replace ring to staff

* caster sowdown! Mole rebalance

* loadouts fix

* fix weapon rotation

* Update spawners.yml
 2024-11-05 19:05:40 +03:00
Ed
120386bb2d Windows + weapon shiny (#536) 
* add wooden window crafting

* weapon resprite

* Update anvil.yml

* Update walls.yml
 2024-11-05 12:12:21 +03:00
Ed
54c7a40967 Blacksmith role (#534) 
* disable crowbar door prying

* blacksmith role

* finish role

* map update

* more recipes to anvil

* Update arenas.yml

* glass!

* ores rebalance
 2024-11-04 16:25:19 +03:00
Ed
16a0b99daf Magic crystal lanterns + Aftertest balance (#532) 
* lamp visual update

* deleete ice floor spell

* mana gift spell

* magic lantern

* wallmount crystal lamps

* QoL

* crafting

* Update StyleNano.cs

* examining simplify

* rings name

* remove snakes modifier

* trinkets update

* remove snakes, add boars and rabbits to demiplans

* Update flashlight.yml

* fix

* Update test.yml

* Update migration.yml

* ыы
 2024-11-04 00:55:15 +03:00
Jaraten
7124eb5335 galasass (#525) 2024-11-01 14:45:53 +03:00
Ed
3e43d0695f Some tile update + dayflin resprite (#517) 
* foundtion update

* dirt from grass and seedbed craft rebalance

* crowbar, tile prying

* fix high fence

* yellow dayflin sprite update

* fix currency calculation bug

* Update sewing_table.yml
 2024-10-27 21:37:15 +03:00
Ed
546e1d8fa1 Tomatoes + farming trading (#513) 
* farm trading

* ruond prices

* add tomatoes sprites

* TOMATOES

* Update tomatoes.yml
 2024-10-27 01:26:22 +03:00
Ed
0652c3f0b4 Prazat jewelry stones (#504) 
* marble floor

* fix

* bank wallpaper, marble floor resprite

* marble window

* rename whitebrick wall to marble wall, delete iron walls

* job desc fix

* jewelry

* Update jewelry.yml
 2024-10-23 21:25:58 +03:00
Ed
9a8d30022a Wallpaper update + paper folder (#495) 
* paper folders

* Update CP14WorkbenchSystem.cs

* wallpaper update

* Update walls.yml

* remove cable sprites

* Update migration.yml
 2024-10-17 13:08:36 +03:00
Ed
d2c5aa74b4 Ritualizm (#474) 
* ritual cucumber setup

* entities requirements

* try graph???

* Revert "try graph???"

This reverts commit c90c6353cb.

* pipyau

* fixes

* yay, it works

* spawn effect

* regex lower message restrictions

* unique speakers support

* apply entity effect ritual

* ritual chalk

* Update SpawnEntity.cs

* ritual stability

* stability event

* add guidebook description to all ritual actions

* Readability added

* Update RequiredResource.cs

* finish describer

* clean up describer

* Update triggers.ftl

* cave ambient loop

* parry sound update

* rituals end start

* magic ambience add

* global sharedization

* Update phases.yml

* daytime requirement

* Update phases.yml

* start ritual

* fixes

* more ambient work

* rritual visualizer

* end ritual

* magic orbs!

* required orbs

* orbs design

* consume orbs

* setup neutral cluster triggers and edges

* listener proxy

* restucture graph

* fix time triggers

* healing cluster

* fixes

* Create CP14RitualTest.cs

* test errors for check test

* YEEEE

* Fuck triggers, its broken now, YAY

* triggers redo

* fix

* fix test

* Update CP14RitualTest.cs

* Update neutral_cluster.yml

* Update CP14RitualSystem.Triggers.cs

* clean up, documentation

* redo triggers again

* and another one

* species sacrifice trigger

* whitelist trigger

* fix

* describer refactor

* fix memory leaking  + hyperlinks

* dd
 2024-10-06 18:04:18 +03:00
Ed
35baaacbce Blue amanita flower, mana potions! (#478) 
* merge bloodgrass and red flowers

* delete sprites

* add blue amanita sprites

* restruct alchemy reactions folders

* mana heal and damage reagent

* add gatherable to worldgen

* fixes

* Update sewing_table.yml

* Update Alchemy.xml

* Update Alchemy.xml

* Update migration.yml
 2024-10-04 19:19:13 +03:00
Ed
4d9e657f6f Split decal cleaner into Broom + Max Gab papers and hair (#470) 
* add broom

* water fix

* new hair

* paper added

* feather pen

* some unfinished inkwell

* inkstorage

* Update meta.json

* fixes
 2024-09-29 11:02:39 +03:00
Ed
0dc7982109 Footprints + Mop + Force undersky liquid evaporation (#469) 
* all evaporation under sky

* footprints system

* puddle footprints

* split to holder and trailer

* mop added

* mop finish
 2024-09-28 18:09:30 +03:00
Ed
0456d40bef Content pack (#444) 
* cable sprite

* steel plates

* iron wall

* vladimirs resprite

* resprite cables

* cable item

* lv cable finish

* round table

* curtains! (need resprite)

* plates + cucumbers

* more procedural cooking

* some tweaks

* fix test

* пипяу

* finish

* ah

* l

* pip

* some cool

* hide station ai

* revert localization

* Update crates.yml

* Update crates.yml

* red and blue curtains

* Update crates.yml

* Update crates.yml

* fix cupboard

* Update exp_tavern.yml

* fix sliceable recursion
 2024-09-23 14:53:03 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +03:00
Ed
ca318a1849 Cucumber! Potato! (#430) 
* some ambient loops tweak

* cucumber! potato!

* seed craft

* fix CLA

* Update CP14DayCycleSystem.cs

* Update CP14DayCycleSystem.cs

* weather
 2024-09-01 16:14:56 +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
a944cd9834 Cloth pack (#423) 
* content

* Update battle_royale_temp.yml
 2024-08-27 08:58:58 +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