juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,954 Commits 57 Branches 0 Tags
6bef560e855cf9b80b8cb8c88c2cf31b87ee511c
Commit Graph

29954 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
6bef560e85 Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14 2025-01-19 00:43:07 +03:00
Ed
4e59cff88e Update ContentLocalizationManager.cs 2025-01-19 00:41:26 +03:00
Ed
3221056384 fix eng loc 2025-01-19 00:40:54 +03:00
Nim
f7c7c54a7e More harvest and other little things (#780) 
* harvest

* fix potato
 2025-01-19 00:12:13 +03:00
Nim
2dd5c48c75 cut clothes (#781) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-19 00:10:56 +03:00
Ed
85793e181e Bank Special sell positions (bounty system?) (#782) 
* fix round end

* remove closet skeleton event

* special positions
 2025-01-19 00:09:30 +03:00
Ed
4979b0a5d0 Simple round end redesign (#723) 
* round end monolith system

* disable default evac

* auto close demiplanes, and block its opening when no monolith mana

* Update CP14RoundEndSystem.cs

* enable default evac code (its disabled viaa cvar)

* apply brainstorm monolith changes

* comoss update
 2025-01-18 17:55:41 +03:00
Ed
68ab77d4d4 Knowledge UI (#779) 
* knowledge button in HUD

* ui controller

* bugfixes

* finish

* all-knowing ghosts

* Create knowledge-ui.ftl
 2025-01-18 14:43:11 +03:00
Ed
734d12cfac Slots separate (#778) 
* fix #67

* more all armor to new slot

* smart skeletons
 2025-01-17 22:15:54 +03:00
Ed
bccd4c19be Water lilies, Air lily alchemy reagent (#771) 
* water lilies

* air lily

* air lily achemy expand

* Update air_lily.yml

* water spawners

* swamp biome

* add air lilies into demiplanes, nerf mobs, remove xeno

* fix

* t1 swamps
 2025-01-17 17:41:49 +03:00
Nim
ca23fddd8a Lyre and flute (#759) 
* music

* fix desc

* Update T1_fire_rune.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-17 01:26:39 +03:00
Ed
50c502f598 AOE Spells (#758) 
* AoE gameplay

* Update T1_fire_rune.yml

* test

* add cool AoE visual
 2025-01-17 01:01:44 +03:00
Ed
0783eb1380 Knowledge system (#770) 
* remove all requirements

* clean up and renaming to knowledge

* update code

* add admin knowledge verbs

* move shoes under pants

* knowledge based recipes

* clean up

* sewing knowledges

* knowledge dependencies

* knowledge learning objects

* more knowledge

* metallforging skill

* knowledge books

* start knowledges, T1 and T2 books in demiplanes

* remove coins from demiplanes

* roundstart knowledge
 2025-01-17 00:08:13 +03:00
Nim
5af56d4655 fiiiiiix (#766) 2025-01-16 01:42:20 +03:00
MetalSage
6e77b82da7 fix (#763) 
Co-authored-by: MetalSage <metalsage.official@gmail.com>
 2025-01-15 20:14:50 +03:00
Nim
02cfcd620c Inter-Monster tolerance (#761) 
* Insects ai

* monster
 2025-01-15 17:34:38 +03:00
Ed
e6097da7cc Update CP14MagicEnergyPhotosynthesisComponent.cs 2025-01-15 01:05:28 +03:00
Ed
925738afc2 Workbench update (#760) 
* fix workbench icons

* workbench search

* fix 1

* UI finalize

* fix material localization

* restore shard sprite

* Update sewing_table.yml
 2025-01-15 00:34:08 +03:00
Ed
cf41cabcea Remove OP (#757) 
* remove outdated content

* Update migration.yml

* Update twoHandedStaffs.yml
 2025-01-14 14:36:10 +03:00
Ed
87d57df0e6 Omsoyk epic clothing pack (#756) 
* new shirts

* pants and dresses

* blue cloak
 2025-01-14 12:03:10 +03:00
Ed
51a47eaffc Bunch of gameplay issues (#754) 
* fix demiplane contetn filtering

* fix day demiplanes

* remove filled crystals from demiplanes

* remove armored zombies

* added candles in town crates

* remove 20% unefficient of mana moving spells

* fix #622

* revert random Viator commit

* Update demiplane_rifts.yml
 2025-01-14 01:41:11 +03:00
Nim
c7c5b4dc4c bench fix (#755) 2025-01-13 23:24:33 +03:00
Nim
2644fe26ea Ashes and Russian translation edits with a couple of minor fixes (#735) 
* ash++++

* fix

* по запросу
 2025-01-13 23:01:34 +03:00
Nim
732bc267f7 Bench (#751) 
* bench

* anchored
 2025-01-13 22:59:57 +03:00
Viator-MV
ddd61df7b8 изменение текстуры книги законов 
текстура книги законов изменена на подходящую к новым книгам
 2025-01-13 21:37:30 +03:00
Ed
025753e689 revert 2025-01-13 18:09:40 +03:00
Ed
368839dd68 Bugixes (#750) 
* fix #746

* fix #745

* fix #747

* fix #744

* fix #743

* fix #741

* fix #722
 2025-01-13 12:54:46 +03:00
vladimir.s
f5edf03bf6 double hp and mana alerts (#749) 
* double hp and mana alerts

* Update alerts.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 23:05:19 +03:00
Ed
b5f70616c3 New lobby art (#748) 
* lobby

* back to rus
 2025-01-12 22:39:33 +03:00
Nim
e11d8a1c1a fix (#736) 2025-01-12 17:22:19 +03:00
Ed
3cce07be5a switch to eng 2025-01-12 17:10:27 +03:00
Nim
93c4e6068f Balance and fixes (#733) 
* issue

* mosquitoes

* 👽
 2025-01-12 17:00:35 +03:00
MetalSage
89b9a5c1fe Additive lighting (#685) 
* Additive lighting

* adds options for all your optional needs

* one last tiny adjustment before we hit the create pr button

* spaghetti condensing

* add ccvar

* overlight correction

* fix requested changes

* cvar fix

* last fix

* nice

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 13:33:06 +03:00
MetalSage
a6847c08e8 Add "Mana Wasting" trait (#732) 
* add trait

* Update Resources/Locale/ru-RU/_CP14/magicEnergy/magic-spells.ftl

* fix magic item using

---------

Co-authored-by: MetalSage <metalsage.official@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-12 13:10:45 +03:00
Ed
485ddaa739 map fix 2025-01-12 03:06:51 +03:00
Ed
f2ef46d90e New apprentice role / Новая роль подмастерья (#731) 
* new role

* Update role_loadouts.yml

* Update jobs.yml

* Delete g.png
 2025-01-12 03:05:47 +03:00
Nim
61897eae4f target (#730) 2025-01-12 02:01:53 +03:00
Ed
4a2c3c9d59 clean up CVars 2025-01-11 13:01:53 +03:00
Ed
3d0f303930 Create Dev.toml 2025-01-11 12:37:03 +03:00
Ed
0af7a7ec64 Alchemist content (#718) 
* reinforced vials

* glass recipes

* roundstart alchemist potions
 2025-01-10 16:17:32 +03:00
Ed
c41927cdf2 Bugfixes (#716) 
* job localization fix

* Update job.ftl

* metall scraps

* tomato seeds craft

* fix #105

* health alerts fixed

* bucket size fix

* hat fix
 2025-01-09 22:28:39 +03:00
A.Ne.
c3976dd08d plants inspection, resolve #449 (#615) 
* plants inspection, resolve #449

* Update farming.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-09 22:05:22 +03:00
Nim
1af112aeb2 candle (#713) 2025-01-09 21:26:14 +03:00
Ed
9ab34417f4 More Bank positions (#715) 
* add bank positions

* Update sell.yml
 2025-01-09 17:23:35 +03:00
Nim
005a6012be sound (#714) 2025-01-09 16:40:18 +03:00
Ed
f1fc16c6f0 Update CP14IgnitionModifierComponent.cs 2025-01-09 15:27:28 +03:00
Ed
2b0fa46857 david balance pass (#712) 2025-01-09 13:13:35 +03:00
Nim
4366e940cb armor (#710) 2025-01-09 00:46:53 +03:00
Nim
76d828e9fd Мелочи фидбека (#709) 
* things

* chees

* hmm

* tag

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-01-09 00:46:27 +03:00
Ed
00ecf1f4b6 Health alerts + Modular tools labeling renaming (#708) 
* fix health alert

* grips label

* Update grips.yml
 2025-01-08 23:22:58 +03:00