juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,784 Commits 57 Branches 0 Tags
655cba76746584537d3937231865c5ebfc849664
Commit Graph

147 Commits

Author SHA1 Message Date
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
Nim
e4eea533a5 Decorative sprite pack (#1009) 
* cobweb

* statue

* demiplan fun

* flowers

* head

* head

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-18 16:33:11 +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
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
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
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
3fd47443ae Essence collector (#952) 
* collector attract essence

* collector

* Update magic-essence.yml

* Update essence_collelctor.yml
 2025-02-28 15:55:47 +03:00
Ed
5524e029f4 Essence splitter (#948) 
* disable rotting

* pipipi

* essence storage

* energy splitter

* Update essence_splitter.yml

* Update impact.png

* visual fixes

* sound fix

* Update twoHandedStaffs.yml

* unhardcode

* Update meta.json

* fix
 2025-02-27 13:48:38 +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
Ed
ba901d5e0e Crystals Update (#925) 
* portal frame

* resprited sharpening stone

* portal frame entity

* darkness -> dimension magic type

* thaumaturgy platforms, some refactor

* magic energy refactor

* Update AirlockPryingTest.cs

* transfering tweaks

* fixed magic manipulation
 2025-02-25 23:37:05 +03:00
Ed
a3849c8aa9 pressure plate (#902) 2025-02-16 00:39:36 +03:00
Ed
02379e37f7 Leaf maze demiplane + crayon update (#901) 
* crayons update

* Update workbench.yml

* leaf maze demiplane

* Update t2_leaf_maze.yml
 2025-02-15 17:49:05 +03:00
Ed
2c5daec98c leaf wall (#900) 2025-02-14 23:14:27 +03:00
Ed
af83322c90 Glass showcase (#891) 
* glass showcase

* fixes

* Update closets.yml

* Update closets.yml
 2025-02-13 18:12:17 +03:00
Nim
19c29e126d Onion and pepper (#889) 
* onion and pepper

* flavor

* crates
 2025-02-13 15:21:41 +03:00
Ed
007249b675 Master fix + Bank removal (#888) 
* bugfix

* bank removal

* red and blue carpet

* Update carpets.yml
 2025-02-12 22:36:19 +03:00
Арт
21592c24bc New construction recipes (#872) 
* FilesSort

* NewCrafts

* Locale

* Doors&Tomb

* RemFrames&SmallFixes

* Grilles

* BarrelsBenchPalletCurtains

* EditLocale

* BarrelIconSprite

* Fix_ResDuplicates

* Res_Fix

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-02-10 22:18:22 +03:00
omsoyk
72606bda02 Fix cave stone iron (#880) 2025-02-10 20:39:20 +03:00
Ed
d100ed765b Echoes of voices from the demiplanes (#840) 
* split lightdarkness type magic to 2

* signal lights

* finish spells

* demiplane voices echoes

* Update closets.yml

* spells impact relay

* sprite fix
 2025-02-05 14:21:12 +03:00
Ed
a6262a471d Resprites + Satchels (#834) 
* magic essence experiment

* demiplane key resprite

* some resprites

* guard commander cape

* vat and cauldron resprite

* flint resprite

* satchels!
 2025-02-02 03:29:55 +03:00
Ed
2bb465cb8b Different crystals type update (#816) 
* crystals update

* fixes

* fixes

* hehehe
 2025-01-28 18:05:15 +03:00
Ed
42627a0c33 Random content (#815) 
* demiplane crystal sprite update

* fix demiplane astral haze vanilla

* fix infinity money stacking

* rabbits outbreak!

* fix meta

* fix rga

* fix CLRF

* move subterranean leap action to actions folder

* Update audio.yml

* Update natural.yml

* restore lzk commit

* fix endscreen text

* fix goblin displacement, fix #809

* Update kudzu.yml
 2025-01-28 13:04:10 +03:00
Ed
af182db79e Another assets relicense (#814) 
* TheShuEd assets relicensing

* Max Gab mass relicensing

* omsoyk mass relicensing

* Prazat mass relicense

* Jaraten mass relicensing

* Update meta.json

* jaraten part 2

* finalize

* validation

* unrelated fixes

* Revert "jaraten part 2"

This reverts commit b39ee0cdb9.

* Revert "Jaraten mass relicensing"

This reverts commit 44febae380.

* Revert "validation"

This reverts commit 3d2f388f47.

* Revert "finalize"

This reverts commit 775f21a18d.

* final fix
 2025-01-27 16:03:13 +03:00
Ed
65faa9ae63 fix ice wall sprite 2025-01-25 02:43:16 +03:00
Ed
62658f5017 ice block window 2025-01-25 01:40:05 +03:00
Ed
fb604d1e08 fix CLA licensing 2025-01-24 22:02:46 +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
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
732bc267f7 Bench (#751) 
* bench

* anchored
 2025-01-13 22:59:57 +03:00
Nim
61897eae4f target (#730) 2025-01-12 02:01:53 +03:00
Ed
5c21ec2774 fix 2025-01-07 23:41:42 +03:00
Ed
35eb0c48c1 Graves and Tombstones (#705) 
* dirt grave

* Update grave.yml

* tombstone

* Update grave.yml
 2025-01-07 18:08:47 +03:00
Nim
9ea8111d9e angel statue (#696) 2025-01-05 19:10:33 +03:00
Nim
945e74b690 Holiday Gob (#691) 
* gob

* festive system
 2025-01-04 23:42:09 +03:00
Nim
a248c176ae Crane barrel (#672) 
* crane barrel

* fix

* sprite resize, file rename

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-16 11:43:29 +03:00
A.Ne.
f655f74b03 mithril and lucens (#660) 
* mithril and manarium

* Rename manarium to Lucens

* pointlight to tree

* lucens tile

* Update trees.yml

* logs sprite

* Update trees.yml

* delete acacia tiles, recolor lucen example

* tiles new palette

* Update ores.yml

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* tiles update

* Update tiles.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-12-15 12:53:31 +03:00
Ed
d7d0977eb6 New year preparation (#674) 
* garland

* presents filter

* vladimirs weather

* snowed tilebrick
 2024-12-14 01:01:36 +03:00
Ed
4cea96f6eb Garland (#673) 
* garland

* presents filter
 2024-12-13 22:20:00 +03:00
Ed
e1f67be2a8 Snowdrifts (#669) 
* snowdrifts

* Update fire.png

* alerts sprite optimize

* Update wooden.png

* stone wall fix
 2024-12-13 16:59:37 +03:00
Ed
eb76a9ef6a Ed 12 12 2024 bugfixes (#668) 
* fix #665

* fix #664

* fix #661

* fix #666
 2024-12-12 23:00:16 +03:00
Ed
93a49ca398 Snowy (#659) 
* snow tiles

* snow trees (2\6)

* +1 tree

* third snow layer, and simple snow biome
 2024-12-12 21:51:03 +03:00
Ed
576bbe91d0 Roofs (#657) 
* simple roo system

* tweaks

* roof sprite update

* transparent roof

* wooden roof sprite

* remove weather: false from all tiles

* stone roof + roofs crafting

* final shtrix, maps update

* fuck

* fix checks

* reagent auto vaporize tweaks

* Update base.yml
 2024-12-11 14:44:16 +03:00
Ed
e4b60b31c0 Ed 10 12 2024 aah (#656) 
* fix ghost zlevel moving

* stairways autorotation

* ladders sprite update

* slow space swimming

* fix wrong wood spawn

* deadly ocean

* Update zLevels.yml
 2024-12-10 21:24:06 +03:00
Ed
99786342fb Comoss sewers (zlevels added) (#655) 
* comoss zlevel sewers

* Update biome_template_caves.yml

* Update GhostSystem.cs

* Update GhostSystem.cs
 2024-12-10 00:43:30 +03:00
Ed
61454e351c Another blacksmith minor update (#648) 
* modular golden sickle

* anvil and furnace resprite

* Update comoss.yml
 2024-12-08 14:17:48 +03:00
A.Ne.
e6a6900719 Prototypes for Guard (#616) 
* Prototypes for Guard

* imperial laws

* merge

* yml clean up

* flags + change in imperial laws

* map update

* guard clothing resprite

* cool guard helmet

* guards grip and halberd

* fill cabinets, add guard commander stamp

* key and keyring fix

* Update arenas.yml

* Update migration.yml

* tapestry fix

* guidebook spacing

* Update meta.json

* add bold tags

* Update flags_wallmount.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-12-04 18:11:33 +03:00
Ed
0e88b6dc6f Table fences (#626) 
* collision fucks

* map update
 2024-12-03 16:21:07 +03:00
Ed
bb43b37fd8 Bugfixes (#619) 
* clean up

* Update empire_orders.yml
 2024-11-30 14:16:48 +03:00
Ed
191112a8a8 Tampestry (#607) 
* Update T0_cure_heat.yml

* tampestry

* palisade wip
 2024-11-24 18:27:18 +03:00
Ed
d67f7619c4 Edgefication (#590) 
* bloat

* bloat 2

* bloat 3

* final bloat

* Update icon.ico

* Create integration_test_run.bat

* Arggh

* Disable some tests

* revert roomfill clearexisting changes
 2024-11-18 14:40:52 +03:00