Commit Graph

43 Commits

Author SHA1 Message Date
Red
963bdc022f Rethinking equipment (#1711)
* delete all modular content

* clean up

* Update guard.yml

* spear first pass

* Add imperial two-handed sword and update spear

Introduces the imperial two-handed sword with new sprites, prototype, and animations. Refines spear configuration: adjusts damage, animation, and offsets, and updates its sprites and prototype to use a new resource path. Improves melee weapon animation logic for both thrust and slash attacks.

* neck displacement

* Update neck.png

* Update migration.yml

* dagger

* Add sword prototype and refactor melee weapon swing logic

Introduces a new sword entity and associated textures. Refactors melee weapon swing logic by renaming SwingLeft to CPSwingLeft and updating related code. Adjusts animation offsets and rotation values for daggers, spears, and two-handed swords. Moves and updates dagger texture assets to a new directory structure.

* hatchet

* sickle

* Add skimitar sword entity and sprites

Introduced a new 'skimitar' sword entity with description and associated sprite assets, including icon, in-hand, and equipped states. Also updated the imperial sword's name and description for clarity.

* Add rapier weapon and adjust melee weapon balance

Introduced the imperial rapier weapon with associated prototype and textures. Increased the default single-target melee damage modifier to 1.3 and removed per-weapon clickDamageModifier overrides from dagger, spear, sword, and two-handed sword. Also increased sword base damage to 10 for better balance.

* Add iron tool/weapon variants and update wall thresholds

Introduces iron variants for pickaxe, shovel, dagger, rapier, spear, sword, and two-handed sword, including new sprites and YAML prototypes. Adjusts wall and ore vein damage thresholds for destruction and sound triggers. Updates migration.yml to map modular iron weapons to new iron variants and spawns stone blocks on stonebrick wall breakage. Also refactors dagger textures to use an 'iron' directory.

* Refactor ice dagger and adjust blacksmith skills

Replaced CP14IceDagger with CP14WeaponDaggerIce, updating its parent, stats, and components for consistency. Adjusted base dagger damage types. Blacksmith job and related melting skills are now commented out or disabled, reflecting a change in skill progression and job setup.

* Update ice_dagger.yml

* Deprecate sword mastery skills and update melee swing logic

Commented out SwordMastery, RapierMastery, and SkimitarMastery skills and removed their assignment from guard and artisan job prototypes. Renamed CPSwingLeft to SwingLeft in melee weapon code for clarity and updated related logic.

* Remove requiredSkills from anvil and furnace recipes

Eliminated the 'requiredSkills' field from all recipes in Anvil/misc.yml and furnace.yml. This simplifies recipe definitions and removes skill prerequisites for crafting these items.

* Update guard_commander.yml

* Comment out freeLearnedSkills for T1 and T2 skeletons

Disabled the freeLearnedSkills entries, including SwordMastery and SkimitarMastery, in both T1 and T2 DemiplaneAntag skeleton YAML prototypes. This change may be for balancing or testing purposes.

* Update migration.yml

* Update migration.yml

* guidebook

* r

* spear passive + hammer passive

* tool hammer + skimitar refactor

* balance tweak

* kick nerf

* TOWER DEFENCE UPDATE

* default shield refactor

* buckler (only sprites)

* Update migration.yml

* buckler parry

* some fixes

* Update T2.yml

* Update T2.yml

* Update instruments.yml

* Update migration.yml

* M O P

* war axe

* Update migration.yml

* Keen Eye skill

* arrows + bow + loadouts

* Update tools.yml

* trading

* fix

* Update misc.yml

* Update migration.yml
2025-09-06 00:59:58 +03:00
Kit
7d29519922 Cackle: EVIL PLANT THAT WANTS TO STEAL YOUR BLOOD (#1602)
* bleeding toxin

* cackle itself

* sprites

* spike

* Cackle now spawn

* lower danger points

* color change

* new demis

* more cackle changes to new system

* hope fix conflict

* try 2

* try 3

* try 4

* try 5

* try 6

* try 6

* undo try 6

* clumsy cackle

* changes

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-08-18 11:41:34 +03:00
Red
29a7234ae6 Add guard weapon loadouts and new electric staff (#1525)
Introduces new guard weapon loadouts including guard's sword, halberd, rapier, and a magic electric staff. Adds the 'lightning strike small' spell and related assets, updates spell damage values, and provides new modular grip and staff sprites. Updates localization, trading positions, and integrates new equipment into guard roles.
2025-07-12 14:52:12 +03:00
Nim
f0a25ddef6 Two-handed crossbow (#1315)
* Crossbow

* bow

* size

* size crossbow

* PhysicalComposition
2025-06-10 11:08:07 +03:00
Viator-MV
e06e1bb7fc Druid stuff (#1396)
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
2025-06-09 14:35:56 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
TheKittehJesus
4c7b035c9c New belt controls (#1298)
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-06-03 14:39:39 +03:00
Ed
f787bb5ea4 Ice bow artifact (#1200)
* pvs

* fix tradepost

* ice bow artifact
2025-04-19 17:24:57 +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
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
Nim
15d9657139 Invisible whistler (#941)
* invisible whistler

* Parts

* spike

* flavor

* flavor

* filter

* sprite

* demiplan
2025-02-27 14:02:30 +03:00
Ed
88c1569266 Unique artifacts (#859)
* unique artifacts

* Update demiplane_keys.yml

* shadow staff

* fixes

* rename solution

* Update CP14UniqueLootSystem.cs

* try fix

* Update CP14UniqueLootSystem.cs
2025-02-08 17:29:29 +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
fb604d1e08 fix CLA licensing 2025-01-24 22:02:46 +03:00
Nimfar11
b19b5c9bb6 bow and quiver 2025-01-20 03:45:37 +02:00
Ed
cf41cabcea Remove OP (#757)
* remove outdated content

* Update migration.yml

* Update twoHandedStaffs.yml
2025-01-14 14:36:10 +03:00
Ed
109edeb4b5 Modular weapon crafting WIP (#611)
* data initalizing

* modular assembling

* grips and blades sprites

* first prototypes

* jewerly decoration

* disassemble modular weapon

* grip start stats

* blade modifiers

* inhand sprites generation

* resprites inhand, add sickle, add attempt modify size

* auto inhand sprite parsing

* icon default parsing

* spear blade

* mace ball

* sword blade

* sharedization + autonetwork hotswipe

* wielding sprite support!

* iron long grip

* wielded sickle, fix ERROR sprite if state not added

* Update grips.yml

* wielded spear + ruby rework

* wielding damage bonus modifier

* modular size fix

* fix storedOffset rotation

* parts offset

* fix inheriting modifiers

* some bugfix and balance tweaks

* DPS Meter

* fix dividing by zero

* rebalance

* replace baseknife to modular knife. Delete ice knife spell

* sickle and mace modular replace

* modular spear & sword replacement. add wielded icons

* Update CP14DPSMeterSystem.cs

* back to serverization

* grip disassemble drop again

* clothing sprite generation code

* back slot long grips and mace

* remove jewerly slot, add more clothing states

* finish clothing states

* shovel modular

* YEEEEE

* anvil modular craft

* bugfixes

* more integration check fixes
2024-11-29 01:31:42 +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
Ed
b5df675187 Spellcaster slowdown, mole nerf, new shoulder slot, healing staff (#538)
* healing staff sprite

* new back slot and move all big things to whis slot

* replace ring to staff

* caster sowdown! Mole rebalance

* loadouts fix

* fix weapon rotation

* Update spawners.yml
2024-11-05 19:05:40 +03:00
Ed
120386bb2d Windows + weapon shiny (#536)
* add wooden window crafting

* weapon resprite

* Update anvil.yml

* Update walls.yml
2024-11-05 12:12:21 +03:00
vladimir.s
8d022dd502 Wooden objects and structures resprite (#436) 2024-09-17 13:06:34 +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
1f4b7f68bf Playtest polishing (#383)
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
2024-08-05 15:22:14 +03:00
Ed
31c9485e3b Magic rings (#378)
* flame creation spell backend

* flame creation visuals

* flame creation spell visual

* tweak

* some tweaks

* ice dagger spell

* move spells to rings

* Update ring.yml

* fix server crash
2024-08-02 00:48:36 +03:00
GrandApothecary19
fee5cc25ce Deleting all CP14 guns proto (#346)
* Deleting all CP14 guns proto

* sprites deleting to
2024-07-22 19:11:07 +03:00
Ed
a81465f0d9 Rock and stone mini update (#344)
* ore resprite

* tools restruct, ore repath, add pickaxr

* fixes

* localizattion sync

* fixes

* Update migration.yml
2024-07-22 18:46:26 +03:00
Ed
2bf17fdc35 Content pack (#337)
* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl
2024-07-19 00:03:08 +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
Ed
20d6ccffdb Scythe (#311)
* Scythe

* Update entities.ftl
2024-07-07 12:55:03 +03:00
Ed
1dbe308527 Entity ru localization sync (#285)
* first use

* LOCALIZAAATION

* and again

* Update fire.yml

* Update entities.ftl

* Update main.py

* Update main.py

* delete wrong locales

* battle staff locale

* Update main.py

* more remove

* Update wielded-inhand-right.png
2024-06-28 12:25:20 +03:00
Ed
54ecb1b23e added battle staff (#286) 2024-06-27 23:29:27 +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
Jaraten
f0c3d99706 repsite hammer (#248) 2024-06-16 14:40:58 +03:00
Ed
16bc737d9a Battle hammer (#206)
* add hammer

* Update battleHammer.yml

* remove 32
2024-06-04 15:28:52 +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
Nim
f411126191 rifle (#134) 2024-05-05 00:43:56 +03:00
Ed
ba05b56d51 Fence fix + Navy revolver (#130)
* Update fence_wood.yml

* added revolver navy

* Update guns.yml

* Update wooden_fence.yml
2024-05-04 13:20:21 +03:00
Ed
1f9f88883c Content (#110)
* Add many test walls

* minor bug fix

* fix torch

* add wallmount variation

* final wood wall!

* great sprite clearing + locales

* fixes

* Update bonfire.yml

* Update wallmount_torch.yml

* Update cave-arena.yml
2024-04-26 11:09:38 +03:00
Ed
8ba56847bb add crossBOLT 2024-04-22 22:01:47 +03:00
Ed
39f64dea73 added light crossbow 2024-04-22 21:46:11 +03:00
Ed
aeb4772c14 Пачка несвязанных обновлений (#88)
* add coins, start ftl

* localization patch

* fixes

* localization patch

* tiefling

* Update structures.ftl

* add tag

* Update LICENSE.TXT

* Update README.md

* move dagger and sickle to belt slot

* fix license

* Update equipped-CLOAK.png
2024-04-13 19:13:16 +03:00
Ed
9720dcffc5 spears and mace (#66) 2024-04-06 22:58:08 +03:00
Ed
80958e4d71 Hairs init + move textures to _CP14 folder (#43)
* move textures to _CP14 folder

* hairs

* maps update
2024-04-06 10:01:45 +03:00