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

142 Commits

Author SHA1 Message Date
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
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
Red
7b7a837cf8 City Gate fix + Comoss update (#1289) 
* city gate fix

* Update comoss.yml

* fix

* Update migration.yml
 2025-05-20 22:36:43 +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
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256) 
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
 2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251) 
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
 2025-05-05 15:19:44 +03:00
Ed
e7e55cdb5e fix viator 2025-04-26 18:09:44 +03:00
Viator-MV
834fad0533 fixes (#1223) 2025-04-26 12:21:01 +03:00
Ed
0996413d72 Structure Durability rebalance - Part 1 (#1205) 
* walls rebalance pass

* windows and fence fix

* doors rebalance

* doors tweaks

* door construction rebalance

* Update WallWood.yml

* Update WallDirt.yml

* stone wall sfx

* ore rebalance

* Я не удержался и снес половину репы

* fix rsi

* Update windows.yml

* stonebrick constructions

* Update stonebrick.yml

* Update migration.yml

* Delete cargo_shuttle.yml

* Delete wall_marble.yml

* fix

* Update wooden.yml
 2025-04-22 13:22:28 +03:00
Ed
026a17be57 Raids (#1198) 
* simpliest undead raid

* map fix

* Comoss big update

* fix raids

* Update demiplane_rifts.yml

* fix

* Update mobs.yml
 2025-04-19 15:47:06 +03:00
Viator-MV
a57f613d91 all in 1 (#1192) 2025-04-18 18:00:21 +03:00
Ed
ac541b63ef new round leave system (#1178) 
* round leave

* maps update
 2025-04-13 15:36:41 +03:00
Viator-MV
0f37c24df0 fix (#1177) 2025-04-13 14:48:33 +03:00
Viator-MV
ee30ae1341 frigid coast (#1173) 
* frigid coast

* fix

* Update snow.yml

* Update default.yml

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-12 16:35:41 +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
41b84f43eb Delete Factoria (#1156) 
* bue

* Update PostMapInitTest.cs
 2025-04-10 11:10:04 +03:00
Ed
5b3688fc89 deep Comoss ocean (#1150) 
* deep Comoss ocean

* Update migration.yml
 2025-04-08 17:39:23 +03:00
Viator-MV
d0a185cca0 Empties (#1151) 
добавлены пустые пресеты карт 2 биомов со всеми нужными компонентами
 2025-04-08 16:04:45 +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
Viator-MV
32b077af63 update (#1137) 2025-04-05 14:42:51 +03:00
Ed
b66ee390a6 Dynamic demiplane weather + farming hotfix (#1131) 
* dynamic demiplane weather

* add skeleton sprite

* hotfix farming

* Update wheat.yml
 2025-04-04 10:35:48 +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
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
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
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
5512e1a665 barrel (#1052) 2025-03-23 13:32:03 +03:00
Viator-MV
dd6d3f8bc7 Factoria upd (#1044) 
* Update factoria.yml

* fact_dung

* Update Factoria.yml

* planetarize factoria

* Update factoria.yml

* Update factoria.yml

* Update factoria_d.yml

* meh

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-03-21 22:20:12 +03:00
Ed
1867903c46 Planetarization (#1040) 
* tiers to level demiplanes

* Update demiplane_keys.yml

* demiplane on planets

* migrate to wizden dayCycle + planetarize Comoss

* Update comoss_d.yml

* Update audio_music.yml

* Update dev_map.yml

* add shadows to demiplanes

* remove outdated systems

* fix silvas

* silva fix

* Update factoria.yml

* Update island.yml
 2025-03-19 12:52:37 +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
Ed
dcacd8f8da bugfixes and ENG OBT preparation (#1015) 
* bugfixes and OBT preparation

* Update CP14CargoSystem.cs
 2025-03-12 20:14:50 +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
Viator-MV
d6a2c5f9f6 Commos upate 8.03.25 (#994) 
* personal house fix comoss.yml

* Update comoss.yml

* Update comoss_d.yml

* MaGiC sPlItInG
 2025-03-08 23:26:14 +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
Ed
81b9cdfff7 Alchemy integration test (#967) 
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
 2025-03-03 23:15: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
Ed
1542459864 Books and bookshelf (#944) 
* guidebooks

* guard spawns

* books restruct

* bookshelf

* Update crates.yml
 2025-02-26 14:38:22 +03:00
Viator-MV
aace9aafd1 Update comoss_d.yml 
Atmos fix
 2025-02-23 19:55:19 +03:00
Viator-MV
79967a0ad3 Update comoss_d.yml 2025-02-22 17:21:33 +03:00
Viator-MV
05042d3bf3 Update comoss.yml 2025-02-22 17:20:28 +03:00
Ed
ce93413a17 Merge branch 'master' into ed-16-02-2025-planet-light-upstream 2025-02-17 14:51:41 +03:00
Viator-MV
2d6b39868f Comoss update 17.02.25 (#911) 
* Update comoss.yml

* Update comoss_d.yml
 2025-02-17 14:50:53 +03:00
Ed
596d9e808b arenas fix 2025-02-17 11:57:01 +03:00
Ed
82d6fe07fe roof adapt 2025-02-16 22:56:10 +03:00
Ed
01900bf2ec Update comoss_d.yml 2025-02-16 18:06:20 +03:00