juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,796 Commits 57 Branches 0 Tags
58edb8783bd7896a511f0c4db6d99ba059c4fecf
Commit Graph

338 Commits

Author SHA1 Message Date
Ed
58edb8783b test with joinqueue 2025-05-21 00:31:04 +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
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
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
8c47af421f balance pass 2025-05-14 18:22:05 +03:00
Ed
c2c66e77c1 Shrimp progression (#1268) 
* Ore modifier category

* roundstart adventurer weapon equip

* forgot about guard

* Update adventure.yml
 2025-05-14 14:22:33 +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
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +03:00
Nim
d8e360367e Well and new bed, aristocratic cloak (#1228) 
* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-06 09:47:46 +03:00
Nim
89c737f37d Перевод на RU (#1231) 
* translated

* end

* review desert

* review 2

* fix
 2025-05-06 09:46:46 +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
Viator-MV
3bbf692da5 Ultraskeletom Revmech Update (#1145) 
* help me

* reinforced swords

* skill tree

* fix

* T2 fix

* components

* fix 2

* fix

* halberd fix

* other variant

* recheck it please

* fix

* deskill

* deslikk++

* skel physical buffs

* bad fix

* fix

* extended life time

* fix

* fix

* fix

* heal from death

* sword fix

* fix

* try to fix

* valid crashout?

idk

* It's not my fault.

* fix

* fix

* fix

* review fix

* forgot

* fix

* ашч

* meh

* reequipment

* wrong agony

* fix

* gripfix

* fix

* looking for result

* coment remove

* some fixes

* ok

* aaaaaaaaaaaaaaaaa

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-03 16:51:25 +03:00
Ed
e792440c19 Gob hairs (#1250) 
* renorma

* gobhairs
 2025-04-30 22:14:13 +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
c3b6938388 unicorns 2025-04-29 17:14:05 +03:00
Deserty0
8089be4596 Loc fix (#1229) 
* fun

* Revert "fun"

This reverts commit 419b4e9e8f.

* fix
 2025-04-27 13:11:23 +03:00
Ed
a1153843a2 Storage durability rebalance + Fuck nails (#1225) 
* fix storage

* bye nails

* Update target.yml

* f

* Update migration.yml

* Update migration.yml
 2025-04-26 17:20:52 +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
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
Nim
b70af8848c Modular helmet (#1206) 
* modular helmet

* fix

* del Bascinet
 2025-04-22 14:12:41 +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
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
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
Nim
1a0136c21f a variety of fixes (#1191) 2025-04-17 16:12:04 +03:00
Ed
b40cbfb5d7 Automatic Open tests (#1142) 
* auto eng obt

* Update CP14RoundEndSystem.CBT.cs

* Update CP14EdSystem.cs

* cbt cbt!

* Update CP14RoundEndSystem.CBT.cs
 2025-04-15 23:09:49 +03:00
Ed
5df9a526f0 new horns 2025-04-13 23:27:24 +03:00
Ed
4a98d86330 wastelands (#1181) 2025-04-13 22:43:47 +03:00
Ed
ac541b63ef new round leave system (#1178) 
* round leave

* maps update
 2025-04-13 15:36:41 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174) 
* wendigo

* ritual3

* Update sky_lightning.yml
 2025-04-12 17:32:53 +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
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
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