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

166 Commits

Author SHA1 Message Date
Red
43913d9d11 cozy (#1367) 2025-06-03 00:38:19 +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
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web 
Spider content update
 2025-05-31 14:31:44 +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
Nim
91cebc07c4 Merge pull request #1278 from Nimfar11/books 
Books sprite
 2025-05-26 12:52:58 +03:00
Alexsey Bezyuk
a73f8e3113 Seed sack and craft (#1287) 
* seed_sack

* full seed sack

* seed sack sprite

* name and description
 2025-05-21 12:41:22 +03:00
Ed
fd6965efe0 skimimimi 2025-05-18 15:36:28 +03:00
Ed
1cd20edecf Workshop resprite pack (#1279) 
* Jaraten resprite pack

* stamina TTomattT

* shrooms jaraten

* cloak fix

* passport resprite
 2025-05-18 01:24:07 +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
Nim
6e86a54a88 meat cooked (#1261) 2025-05-10 12:21:55 +03:00
4g10w
63a2248201 Medieval Screwdriver (#1253) 
* Medieval Screwdriver
Prototye & Texture

Added: screwdriver.rsi
- in hand textures
- main texture (with major help from omsoyk, tysm!)
- meta file
As opposed to vanilla SS14 screwdriver, this one only has one main texture.

Changed: screwdriver.yml prototype
- added all components from vanilla SS14 screwdriver (can be found in tools.yml prototype),
except for RandomSprite component that gives random color
- changed parent attribute from Screwdriver to BaseItem since we're making brand new screwdriver
- all components from initial prototype remained

* removed unused components

* Screwdriver recipe

Removed:
- Screwdriver recipe from anvil (iron bar)
Added:
- Screwdriver recipe to workbench (wooden grip + iron bolt)

To fit more with updated screwdriver visuals, recipe is updated too.
 2025-05-04 22:29:34 +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
a1153843a2 Storage durability rebalance + Fuck nails (#1225) 
* fix storage

* bye nails

* Update target.yml

* f

* Update migration.yml

* Update migration.yml
 2025-04-26 17:20:52 +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
Nim
5bbf0df340 Bell (#1185) 
* bell

* soundCollection

* sound

* bell sound

* bell short

* surrendering
 2025-04-21 11:46:58 +03:00
Ed
f787bb5ea4 Ice bow artifact (#1200) 
* pvs

* fix tradepost

* ice bow artifact
 2025-04-19 17:24:57 +03:00
Nim
1a0136c21f a variety of fixes (#1191) 2025-04-17 16:12:04 +03:00
Ed
3c27e0ed99 Revert "Another Try" (#1170) 
* Revert "Another Try (#1167)"

This reverts commit 355fc410a3.

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 1f75981e59.
 2025-04-12 12:03:18 +03:00
Ed
355fc410a3 Another Try (#1167) 
* tick

* Update simple.yml

* revert deep

* revert straw

* revert surko

* revert fix

* revert beards

* Revert "revert surko"

This reverts commit 9ea597414a.

* Revert "revert fix"

This reverts commit 910da9d6e6.

* Revert "revert beards"

This reverts commit a941a41788.

* Revert "revert deep"

This reverts commit 8dd25a4b96.

* Reapply "revert deep"

This reverts commit cbde613021.
 2025-04-11 19:53:00 +03:00
Ed
948d711336 Bunch of bugfixes (#1165) 
* watcher fix

* fix #1162

* fix #1111

* make watcher move smoothly

* s

* Delete test_xeno.yml
 2025-04-10 22:28:50 +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
f7f7feb837 Marble update (#1146) 
* all marble resprite

* Update meta.json

* marble table

* marble natural wall

* marble cave floor

* marble material

* marble small floor bricks

* marble in demiplanes
 2025-04-07 21:27:20 +03:00
Ed
e77645d9d6 old tiles YES (#1144) 2025-04-07 01:34:45 +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
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
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
Nim
afea64252b Wrench sprite and fix mask (#1075) 
* wrench

* stored

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-27 16:37:11 +02: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
creamybag
ee2846613a guildmaster's rapier (#1070) 2025-03-25 17:47:44 +03:00
Nim
b2095a01cc Trade orders (#1037) 
* orders

* sprite

* fix orders

* different

* layers

* scrolls

* flora

* loot

* groups

* entity-group

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-24 17:15:44 +03:00
Viator-MV
9c5662d7f5 Skeleton upgrade (#1053) 
* skeleton upgrade

* armor upgradde

* skelute

* true, not real

* fix
 2025-03-23 14:27:14 +03:00
Nim
391cc8e7a5 Green salad (#999) 
* green salad

* maxvol

* duplicate
 2025-03-10 15:18:36 +03:00
Nim
228258e575 Dice (#989) 
* dice

* wallet

* crate
 2025-03-07 15:36:58 +03:00
Ed
bef78c62c0 Alchemical bomb (#965) 
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
 2025-03-03 14:06:50 +03:00
creamybag
8bbb0dad84 lute (#962) 2025-03-02 17:03:40 +03:00
Ed
8652e71b39 Essence nodes (#961) 
* essence nodes

* Update essence_nodes.yml
 2025-03-02 15:13:21 +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
Nim
2d4ace0b10 Tip sprite (#954) 
* tip sprite

* fix

* heh

* solution
 2025-03-01 01:26:36 +03:00
Nim
15d9657139 Invisible whistler (#941) 
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
 2025-02-27 14:02:30 +03:00
Ed
1542459864 Books and bookshelf (#944) 
* guidebooks

* guard spawns

* books restruct

* bookshelf

* Update crates.yml
 2025-02-26 14:38:22 +03:00
Nim
88462e5a1b Modular arrows (#906) 
* arrow

* sprite

* slots

* migration

* fix

* fix2

* del

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-19 22:36:21 +03:00
Nim
970dc7bb1f Sack new (#822) 
* new

* tag

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-17 10:46:09 +03:00
Ed
ffa565484c Modular weapon inlay (#903) 
* slots lists

* blade inlay

* tadam
 2025-02-16 11:41:43 +03:00
Nim
19c29e126d Onion and pepper (#889) 
* onion and pepper

* flavor

* crates
 2025-02-13 15:21:41 +03:00
Nim
460f438bb2 Various meats (#865) 
* meat

* color fix

* recipe

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-13 11:29:19 +03:00
Ed
73b4060c65 passport (#886) 2025-02-12 17:20:50 +03:00
Ed
88c1569266 Unique artifacts (#859) 
* unique artifacts

* Update demiplane_keys.yml

* shadow staff

* fixes

* rename solution

* Update CP14UniqueLootSystem.cs

* try fix

* Update CP14UniqueLootSystem.cs
 2025-02-08 17:29:29 +03:00
Ed
3fd780bc8e Bank rename (#855) 
* job renamings

* Job proto rename to merchant

* loadout renaming

* clothing rename

* Update migration.yml

* catalog

* more folders rename

* fix wood abuse

* add selling ores

* refolder

* fix icons

* herbals selling
 2025-02-07 15:28:31 +03:00