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

302 Commits

Author SHA1 Message Date
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
Nim
d3be599ccb carcat tail (#1141) 2025-04-06 17:26:36 +03:00
Ed
52c06249ea f (#1136) 2025-04-05 13:46:23 +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
Nim
c91a6c3f59 Adapted watchers (#1129) 
* watcher

* co

* sadly
 2025-04-04 17:30:26 +03:00
creamybag
dd9aea718c The guildmaster's rapier was not given out in the round. (#1123) 
* fix

* fix2
 2025-04-03 15:34:35 +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
Ed
edc67dd280 Storm nerf (#1107) 
* weather lightning nerf

* port storm weather to gamerule events

* fix
 2025-03-31 23:46:21 +03:00
Nim
2e85ac0263 Magic damage (#1047) 
* magic damage

* mana-healing potion

* slimes

* ManaDepletion

* Examinable

* color
 2025-03-31 13:03:42 +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
abdd46c7d5 Random bugfixes and balance (#1088) 
* shared magic energy examine

* fix #1067

* fix #984

* nerf slimes

* fireSpread nerf

* slimes demiplane examine + remove whistler
 2025-03-29 22:08:58 +03:00
Ed
fddbb010cf Skill requirements (#1085) 
* prerequites refactor

* tiefling only spells

* metamagic update

* sort trying

* goblin speed port
 2025-03-29 16:50:14 +03: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
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
Nim
44b775b308 Request editing (#1063) 
* request editing

* skeleton

* no bank

* job
 2025-03-24 17:07:48 +03:00
Ed
2dbc3e7a4d Back to Ru CBT + Bugfixes (#1065) 
* Update Dev.toml

* fix #1059

* fix #1061

* fix #1060

* fix #1058
 2025-03-24 17:06:09 +03:00
ArZarLordOfMango
28d30571ca locale-fix (#1055) 2025-03-23 16:28:54 +03:00
Ed
29278ca98b localization (#1054) 2025-03-23 15:00:18 +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
Nim
08bc5289cd Перевод на RU (#1034) 
* translated 3

* fix

* fixxxx

* c

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-18 09:15:33 +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
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
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
Link
0168dbabbb Separated mana modifiers (#1001) 
* brainrot

* Update test_armor.yml
 2025-03-11 10:23:09 +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
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
Nim
cea7d93d12 Fixes (#975) 
* fixs

* not
 2025-03-06 16:33:10 +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
Nim
2855cc906b Мелкий фикс перевода (#966) 
* fix

* a

* ehh

* yep
 2025-03-03 23:17:00 +03:00
Nim
9ea547d8be Перевод на RU (#949) 
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
 2025-03-03 09:38:09 +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
3d398e89ab integration whistler poison into alchemy (#950) 2025-02-27 15:12:30 +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
aed7e0994a pax bard (#943) 2025-02-26 12:01:14 +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
creamybag
ba6ceac7ef DismasHair (#939) 
* DismasHair

* new rsi, new meta, new name
 2025-02-25 17:32:45 +03:00
Ed
3e26334c53 healing bard spell (#938) 2025-02-25 15:44:22 +03:00
Ed
1020288d12 Epic alchemy buff (#931) 
* alchemy update

* damage heat
 2025-02-22 12:45:55 +03:00