juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 57 Branches 0 Tags
655cba76746584537d3937231865c5ebfc849664
Commit Graph

139 Commits

Author SHA1 Message Date
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
Nim
fed38041e0 pie pumpkin (#841) 2025-02-05 22:39:30 +03:00
Nim
bf46e6b5e8 Smoking pipe new (#823) 
* pipe

* fix delayed smoke ignition

* sage

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-02-05 17:44:34 +03:00
Nim
4becbd2c12 Frogs (#831) 
* frogs

* uee

* yep
 2025-02-05 10:51:50 +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
8e1d310a8e Guildmaster YML implementation + Clothing pack (#832) 
* banker clothing resprite

* dinazewwr

* commandant cape resprite

* guildmaster cloak

* Guildmaster loadout

* guildmaster job icon

* key locks work

* map update

* guildmaster keys

* guildmaster stamp

* update guildmaster house

* track demiplanes

* player death track

* localization

* guildmaster objective

* Update empire_orders.yml

* fix

* fix map
 2025-02-01 17:52:01 +03:00
Ed
3f70d8600c Fixes (#824) 
* delete round seed

* delete worldEdge locale

* Update CP14BiomeSpawnerSystem.cs

* nails to 50 max stack

* wood planks stack increase

* flora material stack edit

* Update EntityTest.cs

* Update EntityTest.cs
 2025-01-31 18:24:54 +03:00
Ed
b3eed32588 Workbench Refactor (#826) 
* Workbench refactor

* fixes

* update all recipes protos

* scrap resprite

* scrap melting

* scrap weapon drop

* demiplane loot update

* weapon parts melting

* fix

* boilerplate

* material localization
 2025-01-31 14:47:51 +03:00
Ed
8c42cdbbdf Stackable ore (#820) 
* ore stacks

* Update ores.yml
 2025-01-30 13:48:42 +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
Nim
918c7d1e3b Pies (#794) 
* pie

* qwe

* recipe

* Solution

* dough

* some tweaks

* fix crafting bugs

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-25 14:40:16 +03:00
Ed
fb604d1e08 fix CLA licensing 2025-01-24 22:02:46 +03:00
Ed
cc7fadf45f fix 2025-01-23 00:05:21 +03:00
Ed
2962085b9a Modular hammers (#792) 
* modular hammer

* QoL modular assemble

* remove gattle big hammer

* crossbow crafting
 2025-01-22 23:53:36 +03:00
Ed
1bffc4b6aa Merge pull request #784 from Nimfar11/bow-and-quiver 
Bow and sprite quiver
 2025-01-22 14:31:42 +03:00
Nim
988ab82208 Apple (#787) 
* bread

* apple

* sprite

* no bread

* eee
 2025-01-22 00:06:31 +03:00
Ed
ca1281fcb3 Merge branch 'master' into bow-and-quiver 2025-01-22 00:01:44 +03:00
Ed
312f2ae14c Великая жарка мяса (#788) 
* temperature transform

* Update CP14TemperatureSystem.cs

* fix heating entities

* cooking!

* fix cooking

* aaa

* foodsequence remove

* fix

* fix
 2025-01-21 23:03:50 +03:00
Nimfar11
b19b5c9bb6 bow and quiver 2025-01-20 03:45:37 +02:00
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