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

381 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
creamybag
05de87e9e9 Merge pull request #1090 from creamybag/toadslippers 
Frogerge
 2025-03-31 23:01:14 +03:00
creamybag
4d1094cd6b scars (#1094) 2025-03-31 13:05:03 +03:00
Ed
987f00a493 s (#1096) 2025-03-30 20:31:37 +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
6706a14163 secret polymorph spell 2025-03-29 14:22:53 +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
6a6350a827 Blacksmith's gloves (#1045) 
* gloves

* fix
 2025-03-27 17:02:52 +03:00
creamybag
9271500fe4 mime (#1074) 2025-03-27 17:02:35 +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
creamybag
b5a2508ebc Maid Update (#1064) 
* MaidUpdate

* fix
 2025-03-24 17:15:29 +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
Ed
eaf9c009c1 Slimes mob (#1049) 
* import sprites

* pipia

* 3 slime types

* Delete generic_magic_effects.yml

* Update scrolls.yml

* demiplane integration

* Update fire.yml

* Update crystals.yml

* local

* Update fire.yml

* fix AI stuck

* Update base.yml

* loot

* Update mobs.yml
 2025-03-23 14:14:08 +03:00
creamybag
d71fd8ef80 jager2 (#1042) 2025-03-19 12:58:30 +03:00
creamybag
d7c4bc0a5c A set of "jagermeister" clothes. (#1039) 
* jagermeister

* fix
 2025-03-18 17:26:39 +03:00
Nim
e4eea533a5 Decorative sprite pack (#1009) 
* cobweb

* statue

* demiplan fun

* flowers

* head

* head

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-18 16:33:11 +03:00
Nim
eef078111d bone mask and armor (#1025) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-18 09:13:52 +03:00
Nim
41f33bf005 Potions pouch (#1026) 
* pouch

* loadout

* fix

* fix name

* fix name duo

* loadouts2
 2025-03-15 16:30:40 +02:00
creamybag
b5edb27623 Working with armor sprites. (#1028) 
* ChainMail

* fix
 2025-03-15 15:54:19 +03:00
Ed
f989980df3 Carcats species [Draft] (#1023) 
* body parts

* proto setup

* inhand displacements

* carcat cloak

* eyes

* gloves

* pants carcat

* pants

* shirt

* markings nose + ears

* Update 5.png

* shoes + naming

* helmet adapt

* carcat sounds

* Update sewing_table.yml

* s

* Update comoss.yml

* Update factoria.yml

* s
 2025-03-14 14:11:41 +03:00
creamybag
44c9897893 dress (#1022) 2025-03-13 15:30:18 +03:00
Ed
0616d552f2 demiplane hints (#1011) 
* demiplane hints

* lava update

* water resprite

* Update demiplane_hint.yml
 2025-03-12 15:22:14 +03:00
Ed
93ed28d34c Trading content (#1010) 
* reroll positions

* more trading content

* bugfixes

* more content

* guidebook uodate

* Update buy.yml
 2025-03-12 00:51:58 +03:00
Ed
56f4012a49 Lava + Chest resprite (#1007) 
* simple lava

* add into demiplanes

* Update meta.json

* wooden chest update

* Update migration.yml

* Update dev_map.yml

* manual migration

* Update factoria.yml
 2025-03-11 17:39:46 +03:00
Nim
74fa1251c7 Modular armour 1 (#936) 
* armor

* fix

* fix color

* migra

* + *

* balance

* caustic

* presets

* migr2

* plate

* chainmail

* fix speed

* ehh

* ehh2

* ehh3

* fix layers

* mask craft

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-10 16:24:10 +03:00
Nim
391cc8e7a5 Green salad (#999) 
* green salad

* maxvol

* duplicate
 2025-03-10 15:18:36 +03:00
Ed
10b38f04ce 129 Dinazewwr hairstyles (#717) 
* first pass

* Sync new sprites

* ru loc

* chatgpt moment

* clean up

* Update human-hair.ftl
 2025-03-10 13:06:18 +03:00
Ed
978f9cf4b9 vampire buff 2025-03-08 14:46:13 +03:00
creamybag
d0602d7d1d Jaster update! (#990) 
* hihihi

* hihihi 32x32
 2025-03-07 17:13:52 +03:00
Nim
228258e575 Dice (#989) 
* dice

* wallet

* crate
 2025-03-07 15:36:58 +03:00
Ed
0b5712ce97 Vampire antag (#988) 
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
 2025-03-07 14:52:43 +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
Nim
e54e8a95ee Sheep (#972) 
* sheep

* demi mod
 2025-03-05 17:30:06 +03:00
creamybag
d9a5869504 Merge pull request #973 from creamybag/GuildmasterHat 
Guildmaster hat
 2025-03-05 17:28:41 +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
a16dd2fd3e Shirts in pants #2 (#934) 
* New shirt, all fix

* merchant,chainmail
 2025-03-02 22:16:34 +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
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
Nim
15d9657139 Invisible whistler (#941) 
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
 2025-02-27 14:02:30 +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
c6cc4daa3f Magical ballade (#946) 
* mana ballade

* mana gift + consume merged in 1 loadout option

* Update T0_mana_gift.yml
 2025-02-26 17:23:53 +03:00
Ed
9440115087 Fire ballade (#945) 2025-02-26 14:49:32 +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
Ed
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +03:00
Ed
d0f1bba9d8 speed up ballade (#942) 2025-02-26 10:51:23 +03:00