juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,149 Commits 57 Branches 0 Tags
924897e27ddf3ef12e908a5e43e84fa07fbfc1d5
Commit Graph

200 Commits

Author SHA1 Message Date
Red
40246e9b13 Merge branch 'master' into ed-12-05-2025-upstream 2025-05-23 12:58:11 +03:00
Red
1d093c3919 Critical bugfixes (#1291) 
* fix modifier duplication

* fix scrap melting
 2025-05-21 00:30:16 +03:00
Red
f4caea3c6c Garbage delete (#1284) 
* fuck this

* and this

* aaand this

* content fix

* Update base.yml

* Update physical.yml

* kill bob
 2025-05-19 14:53:00 +03:00
Ed
0274826e32 Species free innate skill (#1277) 
* innate free job skills

* returns species magic buff + unlock all skill

* Update tiefling.yml

* fix
 2025-05-18 00:37:04 +03:00
Ed
23c9e11019 Blood moon part 2 (#1272) 
* som tweaks

* fixing all

* bloodlust spell

* atatat
 2025-05-17 14:12:49 +03:00
Ed
132d1db37b search of life spell (#1273) 2025-05-16 00:58:48 +03:00
Ed
e0a4f5592f Blood moon (#1270) 
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
 2025-05-15 17:32:26 +03:00
Ed
26e4088cdd Silva Photosynthes returns + Carcat guidebook page (#1269) 
* f

* restore silva feature

* carcat guidebook

* day cycle
 2025-05-15 00:37:42 +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
1551f2fb6d Update CP14SharedMagicSystem.cs 2025-05-14 12:29:18 +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
518b439c0f integrate 2025-04-30 20:50:03 +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
Tornado Tech
ad2fc18356 Dimensional (#1140) 
* add: Temporamancy tree with new shadow swap spell

* feat: Increased tempo loadout to 2

* feat: Remove most popups from swap spell

* fix: Swap with no mob entities

* feat: Add CanCast to spell effect

* fix: Handeling cancaled event & swap state

* feat: Add UseCustomCastConditions

* feat: Add swap to magic shadow staff

* feat: Add tempo essence & magic type

* feat: Add Tempo type to all dimension spells

* fix: Magic shadow staff tempo manacost modify

* fix: Spell type local

* feat: Add touhou lore

* fix: Review

* feat: Add target dead block component

* feat: Remove checking access

* feat: Add RequireCanInteract

* feat: Remove essence

* fix: Review

* fuck

* fuck part 2

* Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs

* Update dimension.png

* minor nitpick

* fix

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-04-30 17:25:10 +03:00
Ed
cff9dc6fcf Wendigo renamed to Lurker (#1213) 
* Добавлены изменения для создания пулл реквеста

* Update Step.yml

* rename!

* fix

* interrupting toggleable spells
 2025-04-26 16:38:54 +03:00
ArZarLordOfMango
07132cdbd8 [Fix]Roof (#1147) 
* roof

* why you dont work...

* fix and locale

* weh check

* Update no-roof-in-tile.ftl

* Update no-roof-in-tile.ftl

* Update roofs.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-04-26 15:23:11 +03:00
Ed
1ee7b9b76c fixes 2025-04-26 13:07:04 +03:00
Ed
a8b1b0ed37 sphere of light redesign 2025-04-25 14:11:36 +03:00
Ed
62cdf9e1c5 Bugfixes + QoL (#1218) 
* fix keyring

* fix #1209

* fix #1116

* fix water, test reenable ambient loop

* recipe categories in workbecnhes

* Update CP14StoreWindow.xaml

* refactor: review

* Update CP14WorkbenchWindow.xaml.cs

* Update SharedCP14MagicEnergySystem.cs

* categorizize all recipes + some UI fix

* Update round_end.yml

---------

Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com>
 2025-04-25 13:39:20 +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
Ed
b437be5cf8 Random bullfix go! (#1197) 
* some fixes for AI pathfinding

* cobblestone tile

* stonebrick update

* fix #1194

* fix #1193

* Update stonebricks_square_carved.png
 2025-04-18 22:47:17 +03:00
Gagarinten-Noverdo
e1326c00b1 sharpness reduce on throw hit (#1164) 
* sharpness reduce on throw hit

* kill me please, submod update

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-18 13:51:15 +03:00
Ed
39ca6175e6 Simple sponsorship system (#1189) 
* simple sponsorship system

* priority Join

* OOC Sponsor Color

* Update CP14SponsorRolePrototype.cs

* loadout sponsorship

* bruh

* refactor to interfaces

* Update CP14ClientSponsorManager.cs

* finish loadout option

* role pass
 2025-04-17 19:55:25 +03:00
Ed
c61a76fa69 Merge pull request #1004 from crystallpunk-14/ed-11-03-2025-discord-auth 
Discord Auth expanse
 2025-04-15 22:50:08 +03:00
Tornado Tech
52f31e4403 refactor: Magic system (#1138) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-14 17:32:41 +03:00
Ed
e968c7a9b8 wendigo tweak 2025-04-13 12:34:03 +03:00
Ed
26d81b684b Weather refill (#1175) 
* refillable by weather

* fix
 2025-04-13 01:01:22 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174) 
* wendigo

* ritual3

* Update sky_lightning.yml
 2025-04-12 17:32:53 +03:00
Ed
da5190ae60 Farming rebalance (#1171) 
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs
 2025-04-11 23:45:03 +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
b4ab1a714c Update CP14SharedFarmingSystem.Interactions.cs 2025-04-06 14:05:04 +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
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
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
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
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
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
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
Ed
52e6e9b28f Carcat night vision (#1046) 
* carcat night vision

* Update nightVision.yml
 2025-03-21 16:53:59 +03:00
Ed
a951193dba Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-03-19 14:04:35 +03:00
Ed
4002b0a41c Update CP14SellWhitelistService.cs 2025-03-19 13:45:59 +03:00
Арт
709b78080f Weapon Sharpening System Update & Bread Slicing Fix (#915) 
* SharpeningUpdate

* BreadSlicingFix

Before that, bread slices could be cut endlessly into new bread slices.

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-19 13:36:46 +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
Link
6c7933cd7f Fixing TagResource (Meat Pies) and coffins (#1024) 
* Update coffin.yml

* PierogI
 2025-03-13 17:19:04 +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