juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,782 Commits 57 Branches 0 Tags
ebca84d28f51e56307ffe4d39e58571dfef09ff8
Commit Graph

84 Commits

Author SHA1 Message Date
Ed
ebca84d28f Minor fixes (#494) 
* minor loadout tweaks

* wooden counter

* fix parry predicting

* tables crafting simplify
 2024-10-16 17:32:41 +03:00
Ed
d259191d3d Cargo system (#487) 
* simple storeship arriving

* pupu

* ship cycling

* buy positions prototypes

* i hate UI

* PriceControl

* second tab ui

* baloon! pallets!

* update shop in town

* setup billboard timer

* split to sell and buy categories

* renaming gaming

* actually selling

* fix infinity selling

* improve timer

* move description too rigt part UI

* bar selling

* iron cabinet

* purge currency categories

* remove town balance, add money box

* special proposal, FTLImmune anchor

* fix UI

* remove tests buying

* Update CP14StoreWindow.xaml.cs

* currency converter

* currency clean up

* Update CP14CargoSystem.cs

* clean up part 2

* rider petpet

* coins audio

* coin improvment

* Update coins.yml

* translate

* more coins roundstart

* Update wallet.yml

* Update wallet.yml

* generate coin problem fix

* refactor proto reading

* fixes

* huh

* shuttle logshit fix, add to tavern map

* Update CP14StationTravelingStoreShipTargetComponent.cs
 2024-10-15 15:22:06 +03:00
Ed
b9df2a495a some blacksmith bandage (#483) 
* anvil

* iron and copper ore walls + procedural cave update

* vladimirs rocks

* furnace

* Revert "furnace"

This reverts commit f378e4fb85.

* Revert "vladimirs rocks"

This reverts commit b2c6a193fc.

* Revert "iron and copper ore walls + procedural cave update"

This reverts commit dc6d70b10e.

* Revert "anvil"

This reverts commit 3ab1649992.

* Reapply "anvil"

This reverts commit 91c226d18d.

* huh

* fuck anvil

* Revert "fuck anvil"

This reverts commit 3c3a87c25e.

* Revert "huh"

This reverts commit 7fb44b4908.

* fix comment

* Reapply "iron and copper ore walls + procedural cave update"

This reverts commit 891c3ba0aa.

* Reapply "vladimirs rocks"

This reverts commit 4f2eaef6c1.

* Reapply "furnace"

This reverts commit 9d7e042ddf.

* Update anvil.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* Update workbenchs.yml

* EVIL anvil

* Update workbenchs.yml
 2024-10-09 13:40:06 +03:00
Ed
d2c5aa74b4 Ritualizm (#474) 
* ritual cucumber setup

* entities requirements

* try graph???

* Revert "try graph???"

This reverts commit c90c6353cb.

* pipyau

* fixes

* yay, it works

* spawn effect

* regex lower message restrictions

* unique speakers support

* apply entity effect ritual

* ritual chalk

* Update SpawnEntity.cs

* ritual stability

* stability event

* add guidebook description to all ritual actions

* Readability added

* Update RequiredResource.cs

* finish describer

* clean up describer

* Update triggers.ftl

* cave ambient loop

* parry sound update

* rituals end start

* magic ambience add

* global sharedization

* Update phases.yml

* daytime requirement

* Update phases.yml

* start ritual

* fixes

* more ambient work

* rritual visualizer

* end ritual

* magic orbs!

* required orbs

* orbs design

* consume orbs

* setup neutral cluster triggers and edges

* listener proxy

* restucture graph

* fix time triggers

* healing cluster

* fixes

* Create CP14RitualTest.cs

* test errors for check test

* YEEEE

* Fuck triggers, its broken now, YAY

* triggers redo

* fix

* fix test

* Update CP14RitualTest.cs

* Update neutral_cluster.yml

* Update CP14RitualSystem.Triggers.cs

* clean up, documentation

* redo triggers again

* and another one

* species sacrifice trigger

* whitelist trigger

* fix

* describer refactor

* fix memory leaking  + hyperlinks

* dd
 2024-10-06 18:04:18 +03:00
Nim
21ea4290a5 Paintings (#479) 
* oppa

* fix

* Update Resources/Textures/_CP14/Structures/Wallmount/wallmount_painting.rsi/meta.json

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-04 21:18:01 +03:00
Ed
35baaacbce Blue amanita flower, mana potions! (#478) 
* merge bloodgrass and red flowers

* delete sprites

* add blue amanita sprites

* restruct alchemy reactions folders

* mana heal and damage reagent

* add gatherable to worldgen

* fixes

* Update sewing_table.yml

* Update Alchemy.xml

* Update Alchemy.xml

* Update migration.yml
 2024-10-04 19:19:13 +03:00
Jaraten
6c08ca60f3 frame & table (#464) 
* frame & table

* rem superfluous sprite

* merge conflict

* duplicate_ID

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-10-01 16:32:14 +03:00
Ed
4cd9e41469 Mist + Lampposts (#472) 
* lamppost

* mist weather

* maps update

* Update weather.yml

* Update meta.json
 2024-09-29 13:07:30 +03:00
Ed
dca61c009d 2 new Lobby image, some bugfix (#468) 
* +2 lobby screens

* Update goblin.yml

* workbench recipes remove nesting

* tips update

* Update sewing_table.yml
 2024-09-28 01:29:02 +03:00
Ed
a92c623672 Fences update (#458) 
* small fences update

* Update wooden_fence.yml

* reparent all fences, fix high fence

* iron grille fix

* migration

* Update migration.yml

* construction recipes

* Update migration.yml

* fix dev map

* Update migration.yml

* Update migration.yml

* Update migration.yml
 2024-09-26 14:57:24 +03:00
Jaraten
693ba93e44 Content pack jr (#457) 
* 24.09.24

* wallpapers

* backpack parenting setup

* goblin backpack

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-09-25 12:31:31 +03:00
Ed
75bc6d4eac Doors update (#455) 
* sprites

* mirrored + windowed wooden doors

* cooking table sprite

* craftable doors
 2024-09-24 21:19:52 +03:00
Ed
07637bd691 Prototypes cleaning: destructable, flammable (#453) 
* damage rethinking, bush fix

* flammable rethink

* trying to fix fire

* airtight false default

* autoignite

* Update fire.yml

* Update fire.yml

* Update fire.yml
 2024-09-24 13:46:26 +03:00
Ed
0456d40bef Content pack (#444) 
* cable sprite

* steel plates

* iron wall

* vladimirs resprite

* resprite cables

* cable item

* lv cable finish

* round table

* curtains! (need resprite)

* plates + cucumbers

* more procedural cooking

* some tweaks

* fix test

* пипяу

* finish

* ah

* l

* pip

* some cool

* hide station ai

* revert localization

* Update crates.yml

* Update crates.yml

* red and blue curtains

* Update crates.yml

* Update crates.yml

* fix cupboard

* Update exp_tavern.yml

* fix sliceable recursion
 2024-09-23 14:53:03 +03:00
Ed
22171de45a Fix soil refilling (#442) 
* fix soil

* Revert "fix soil"

This reverts commit 8176355286.

* Reapply "fix soil"

This reverts commit 0c958f4c9c.
 2024-09-18 15:56:50 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +03:00
Ed
ca318a1849 Cucumber! Potato! (#430) 
* some ambient loops tweak

* cucumber! potato!

* seed craft

* fix CLA

* Update CP14DayCycleSystem.cs

* Update CP14DayCycleSystem.cs

* weather
 2024-09-01 16:14:56 +03:00
Ed
37a4068334 CLA license update (#429) 
* pupu

* Update LICENSE.TXT

* CLA

* CLA!

* Revert "CLA!"

This reverts commit f999e341a1.

* CLA2

* Update rsi.json

* CLA3

* Workbench sublicense
 2024-08-29 18:23:33 +03:00
Ed
e02a9951a7 Flowers + some love for Alchemy (#427) 
* red rose proto and sprite

* 242 changed files guys

* yellow dayflin

* jitter + drunk solution, also refactor alchemy recipes

* dyes entity

* dye crafting, dye using

* add flowers to generation
 2024-08-29 00:31:09 +05:00
Skilets
e938b2f9ed Icon (#426) 
* Fix Hud

* skulls wall

---------

Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-28 15:32:22 +03:00
Ed
aa5f9104df Wallpaper (#424) 
* wallpaper system

* fix startup ordering

* cool doAfters

* green test wallpapers

* wallpaper finite stacks

* dev update

* Update CP14ClientWallpaperSystem.cs

* fix wall rotations

* yippee

* Update battle_royale.yml

* Update test-ship.yml
 2024-08-28 15:11:32 +03:00
Ed
d3189b83cf Pumpkin + Cabbage (#417) 
* seeds

* import Omsoyk plant sprites

* cabbage slicing

* sliceable pumpkin

* some tweaks

* seedbed clean fix, remove shitcode systems

* seed crafting, knife fix

* utencil

* Update base.yml

* cabbage rebalance

* abstract seed
 2024-08-22 17:35:00 +03:00
Jaraten
32ce8f2164 directional window (#401) 
* pu-pu-piri-pu

* fx remove
 2024-08-10 01:10:22 +03:00
Jaraten
f70e3051ed update update (#403) 2024-08-09 14:08:50 +03:00
Ed
37e0ffa173 Workshop update (#392) 
* kreks spell icons

* vladimirs walls update

* add flora material
 2024-08-05 22:46:22 +03:00
GrandApothecary19
72cbed696f More sprites for tavern (#357) 
* - add sprites

* - fixo for .ftl

* - fix because no whiskey in Eberron((

* - fixo
 2024-08-03 15:51:29 +03:00
Nim
19365c0314 Statue of Gob (#376) 
* statue of Gob

* fix
 2024-08-01 09:15:44 +03:00
Jaraten
5072800d4a wood furniture resprite (#360) 
* wood table + workbench

* cupboard + dresser

* wooden bucket

* wooden crates

* Update Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml

* barrel

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-30 17:07:43 +03:00
Ed
22bb0ae283 Energy pilons WIP (#326) 
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-29 21:01:36 +03:00
Jaraten
cf6b42d20c Stone-brick wall crushed (#336) 2024-07-28 17:27:24 +03:00
Ed
9f1b4fc51c Melting molds (#347) 
* temp tweak

* add metall bars

* melting molds

* add sawing molds table

* sawing sounds

* fix
 2024-07-23 10:29:41 +03:00
Ed
f91a642428 Workbench (#341) 
* craft prototype

* comp + empty system

* simple crafting

* 2 crafts!

* craft dound + delay

* ingredient waste

* verb message

* stack support

* sprite + collision + real crafts

* workbench craft

* fuck

* Update CP14WorkbenchSystem.cs

* fuck ItemPlacer, _lookup lets go
 2024-07-22 12:16:32 +03:00
Jaraten
77b1113d5d Walls upd (#333) 
* wewe

* oops

* oooopsss 2
 2024-07-18 16:11:59 +03:00
Ed
8cbd26ae2f Farming WIP (#269) 
* setup planting doafter

* spawn plants after use seed

* some work

* move comps to separate folder

* public check daylight

* daylight plant energy regeneration

* some fixes

* bruh, im thinking

* added ingame soil

* added hoe

* attaching plants

* hoe system

* block plant dublicating

* some planting refactor

* shovel as pant + soil remover

* plant growing visualizer

* soil resprite

* split farming system to second partial class

* update throught event refactor

* tring sync update plant with update visuals

* finish visual sync

* plants growing

* more partial splitting, naming work, clean up

* Update FARMINGTEST.yml

* Update FARMINGTEST.yml

* fix typo

* prototype value validating

* Оно бухает воду!

* solution visualizer in soil

* forgot some fix

* part of Tornado review fix

* destroy RemovePlantComponent

* more fixes

* simple harvesting

* refactor plant component values changing

* harvest redo

* gather on destroyByTool

* sickle resprite

* plant fading

* fading per minute!

* wheat sprites

* YML restruct

* fixes

* auto root plants

* add comments

* move sprites

* split structures from object textures

* wheat farming!

* Update CP14FarmingSystem.Interactions.cs

* seedbed (#297)

seedbed :^)

* a

* Update soil.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-15 23:58:03 +03:00
Jaraten
82f1ed1493 upd cliffs (#320) 
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-09 21:31:36 +03:00
Ed
3182447fbf Grass update v2 (#303) 
* high bush

* update worldgen
 2024-07-04 23:25:22 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
Jaraten
294f81bd0f resprite stone&red_brick-walls (#265) 2024-06-22 00:17:10 +03:00
Nim
3492a7892a Mannequin (#253) 
* mannequin

* fix

* fix2

* Update mannequin.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-21 23:17:49 +03:00
Ed
03adbaf851 Tiles update + iron bards (#260) 
* wooden tiles update

* add iron bars

* dirt tile update

* fix foundation tile
 2024-06-21 00:18:47 +03:00
Jaraten
f79c6de912 fix cardboard wall sprites (#250) 
* fix cardboard wall sprites

* То что лень делать тебе, придется делать мне.

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-17 00:40:35 +03:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249) 
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
 2024-06-16 18:31:47 +03:00
Ed
0211a50581 Energy crystal (#243) 
* init magic container system

* charging and discharging

* add energy regenerator

* thaumaturgy glasses, scanning energy

* add energy quartz prorotypes and sprites

* light power controller

* commit special for _des

* simple normalizer crystal slot

* YEEEEEEE BOIII, examined crystalls inside things

* кристал теперь видно, когда он вставлен в стабилизатор

* TryUseCharge приборами

* hello deserty, how are you doing?

* rename regenerator to EnergyDraw, allow draw from slot

* normalizer жрет magic energy файналли

* Update normalizer.yml

* visual polishing

* Update crystal.yml
 2024-06-13 22:55:20 +03:00
Ed
2cfdc4a52f Solution normalizer (#227) 
* dropper

* add stabilizer

* fuck, now

* Update CP14SolutionNormalizerComponent.cs
 2024-06-08 18:46:09 +03:00
Ed
df695cc39b Dirt wall (#223) 
* add dirt wall sprites

* added dirt wall proto

* add dirt material, dirt wall crafting and dirt drop from wall
 2024-06-06 21:06:32 +03:00
Ed
7f27b36506 Quartz crystal as alchemy reagent (#217) 
* added quartz as alchemy reagent

* quartz is not deadend

* added barrels
 2024-06-06 00:19:30 +03:00
Jaraten
a623704416 add&resprite furnitures (#196) 
* add&resprite furnitures

* license and sprite fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-05 20:15:51 +03:00
Ed
b33a094f65 change licenses (#191) 
* change licenses

* Update rsi-schema.json

* change codebase license

* try make schema

* Create rsi.json

* rga fix
 2024-05-31 00:01:22 +03:00
Ed
2e91620630 Wall lantern + floor water (PLaceholders) (#167) 
* fix lamp sprite

* Update wallmount_torch.yml

* add water test sprite

* add simple water entity

* add reversed crystall sprites

* add sand tile
 2024-05-22 23:18:18 +03:00