Commit Graph

211 Commits

Author SHA1 Message Date
TemporalOroboros 7a77d6d5dd
Content ecs containers (#22484) 2023-12-28 01:30:03 -04:00
Nemanja 9bd03824ac
GORILLA Gauntlets (#23012)
* GORILLA gauntlets

* oh shit this too
2023-12-27 20:11:13 -07:00
Kara faca1d7043
Pacifism rework (#23037)
* Pacifism rework

* grammar
2023-12-27 02:55:48 -07:00
Darkie a3fbab84e6
ItemToggle system expansion (#22369)
* Fixed EnergySword and variants having incorrect sound on attacking when in their Off state.

* Removed the unused ItemToggle from the serverside and created a new shared ItemToggleComponent and System, now used for the e-blade family of items. Also added e-blade hum and swing sounds. Thanks Sloth for the initial code!

* Changing Stunbaton system to include the itemToggle system.

* Adapted changes that have come up in the meantime.

* Changed damagespecifier to be serializable and autoNetworked in melee weapon components. Fixes a bug that makes it so client-side, damage values are not updated on toggle.

* Made the ItemToggleSystem have both a shared and a server component. Ported the Stun Baton and Stun Prod to the new toggleable system. Added a failure to activate noise component.

* Ported the welders to the new item toggle system. Set it so deactivated damage and item size default to the item's regular options.

* Removed unnecessary usings.

* Small modification to the stun prod.

* Made the integration test use the new method to turn the welders on.

* Fixed a few testing issues, applied a few changes requested by Delta.

* Updated Stunbaton code for consistentcy when it comes to calling the itemToggle component.

* Removed a redundant return; as per Delta.
Made examining the stun baton for charge rely on the battery component instead.

* Removed the welder visualizer system, now using the generic one. Removed some unused usings. Removed the welder visuals and layers.
Ported lighters to the new system.
Added zippi (sic) lighters.

* Renamed variables used to make them less generic.

* Simplified the light update code.

* Fixed the unit test to use the itemToggle system for welders now.

* Made the name shorter. I can't tell if the welding damage when interacted with actually does anything though. I can't figure out how to trigger it.

* Fixed some YML issues.

* Added a client side item toggle system just to make the shared code run on local UID's too.

* Fixed some more Yaml.

* Made the Zippi lighter have its own parent item, so it doesnt' conflict with the random pattern on the regular lighter.

* Made the zippi lighter its own in-hand sprites.

* Added a summary for the activated property in itemtoggle component.

* Fixed a typo in the itemToggle Component.

* Fixed a typo.

* Added to the remarks for the ItemToggleComponent.

* Fixed up the lighter yaml to make it use a generic term instead of a toggle layer enum for the random skin.

* Fixed a bug I introduced accidentally with the humming sound.

* Removed 2 unnecessary events from the ItemToggleSystem and component.

* Fixed a bug by only making the server run the item activation code, since the client cannot predict whether or not the activation will be cancelled.

* Cleaned up some names and functions getting called.

* Renamed a couple of variables and removed the explicit datafields from the component. Removed "activated: false" from yml since they're already deactivated by default.

* Added an IsActivated function, used it in the welder and stun baton systems code.
Refactored welder code to remove the WelderToggle event, now using the ItemToggleActivatedEvent instead for eye protection check.

* Fixed a typo. Added some comments.

* Split the ItemToggle into smaller components.
Changed the items that used the toggle system to work with the smaller components.
Made the mirror shield reflect energy shots with a 95% chance.

* Fixed the namespaces for the server components and whatnot.

* Fixed a doubled deactivation sound from using activated wieldable items (like the double Esword).
Fixed wrong yml with the e-dagger.
Fixed the disarm malus code.

* Added the zippo lighter to the detective's trench coat.

* Removed the default hit sound for the double e-sword since it was unnecessary.

* Changed e-sword damage numbers to be in line with the changes made by Emisse.

* Made no damage sounds be autoNetworked, so it changes can be changed on activation/deactivation of items.
Made Welders and Eswords sound like themselves but quieter if they hit for 0 damage, instead of taps.
You can choose what sound to play when a weapon does 0 damage when activated now.
Fixed a bug with swing sounds.

* Typo.

* Fixed a bug where the welder would blind you if you used it while it was off.

* Created a single abstract method called when an item has completed its toggle.

* Update Content.Server/Eye/Blinding/EyeProtection/EyeProtectionSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Fixed a comment.

* Made most component variables readOnly for ItemToggle. There is no need to be able to change them from within the variable viewer.

* Removed trailing white spaces.

* Made the Use a field instead of a property in the itemToggleActivation/Deactivation attempt events.

* Small fixes.

* Removed ForceToggle, just use the toggle method instead.

* Fixed a bug with item sharpness staying even after getting deactivated, if the item gained sharpness that way (esword).

* Used ProtoId in the welder component.

* Made damage NetSerializable as well.

* Added networking and data fields to a couple of components.

* Made component variables autonetworked. Added some comments.

* Moved the events that modify item components on toggle to events, handled (where possible) in the systems linked to said components.

* Made all the component variables readWrite again.

* Added the component get to the WelderStatus.

* Added a predictable bool to the item toggle component.

* Replaced the Activated/Deactivated events with ToggleDone, with an Activated argument. Used that to simplify some systems.

* Added a reflect update raise event.

* Removed the Zippo changes. To add in a later PR.

* Removed the zippo from meta.json too.

* Small fix.

* Another small fix.

* Fixed the wieldable system thing in ItemToggle.

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-12-24 17:11:05 +11:00
Leon Friedrich 907b873145
Fix various errors/exceptions (#22841)
* Fix entity storage localization

* Fix HumanoidAppearanceComponent resolve

* Fix null reference exceptions

* Fix duplicate key error

* Fix artifact error spam

* actually maybe this is what its meant to do

* Fix entities playing sounds on deletion
2023-12-22 00:26:08 -07:00
themias 432c87f7e2
Fix spray nozzle (#22624)
* Fix spray nozzle

* what

* no
2023-12-16 18:45:18 -07:00
MendaxxDev e301378114
Make flare gun explode, damage and stun the player when used with the wrong ammo (#22349)
* Flare gun can now only be loaded with actual flares

* Make flare gun loadable with other shells, but destroy it and damage and stun the user when used

* tweak

* Logic fix + QOL add-ons

* damageOnWrongAmmo in gun component

* cleanup
2023-12-15 02:57:59 -07:00
themias 641c95f443
Fix spray nozzle (#22492) 2023-12-14 13:49:40 -07:00
Leon Friedrich 287d22cc49
Inventory slot enumerator rejig (#21788) 2023-12-08 08:20:51 +11:00
metalgearsloth 269c93245d
Unrevert audio (#21330)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2023-11-27 22:12:34 +11:00
metalgearsloth 64343c289d
Revert Arch testmerge 2 (#21901) 2023-11-26 14:20:07 +11:00
metalgearsloth 855ab4d129
Update submodule to 182.1.0 (#21900) 2023-11-26 13:53:54 +11:00
metalgearsloth d4bed09cdc
Revert the other arch changes (#21871) 2023-11-24 11:19:46 +11:00
metalgearsloth 93bd9972f1
Content arch (#20107)
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com>
2023-11-23 14:34:37 +11:00
LordEclipse f3df6b85af
Make more fields VV-writeable (#21754) 2023-11-19 12:17:53 -08:00
DrSmugleaf 2d58d19b07
Make all prototype types partial (#21374) 2023-11-01 19:56:23 -07:00
metalgearsloth 5b8f3c48c4
Revert "Update submodule to 175.0.0 (#21318)" (#21319) 2023-10-29 15:29:30 +11:00
metalgearsloth 9b1b3e03ed
Content audio (#20862) 2023-10-29 14:58:23 +11:00
Leon Friedrich e685cb626b
Un-revert IPlayerManager refactor (#21244) 2023-10-28 09:59:53 +11:00
metalgearsloth a2bbda43cc
Revert "Update submodule to 172.0.0 (#21222)" (#21225) 2023-10-24 21:55:20 +11:00
Leon Friedrich 7ba0ea2926
IPlayerManager refactor (#21215) 2023-10-24 20:19:08 +11:00
I.K df81532469
Change wide swing sprites to be that of the weapon used (#21050)
Co-authored-by: notquitehadouken <1isthisameme>
2023-10-18 12:12:00 +11:00
deltanedas 6db534ef86
uncloak ninja after attacking (#20892)
* raise MeleeAttackEvent on the user after swinging

* add disable bool to RevealNinja

* uncloak ninja after attacking

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-10 22:55:53 -04:00
Leon Friedrich 364c9b7f0a
DamageableSystem cleanup & performance improvements (#20820) 2023-10-09 03:27:41 +11:00
DrSmugleaf 783ed6f917
Change ThrownItemComponent to be removed after flytime (#20700) 2023-10-06 17:43:54 -07:00
deltanedas be55f9a825
Play sound when filling ammo (#20691)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-02 13:43:38 -08:00
DrSmugleaf a44fa86b68
Update trivial components to use auto comp states (#20539) 2023-09-28 16:20:29 -07:00
Kara f8d194b117
Bows & arrows (#19771) 2023-09-22 02:45:21 -07:00
Nemanja 170e559417
multi-gun nerf (#20194) 2023-09-14 23:15:42 -05:00
deltanedas c25b769132
fix ninja no guns (#20184)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-14 23:12:14 -04:00
DrSmugleaf 41284a60e4
Fixed error when equipping the energy katana as a space ninja (#20015) 2023-09-11 19:04:02 +10:00
metalgearsloth 5a0fc68be2
Content update for NetEntities (#18935) 2023-09-11 09:42:41 +10:00
DrSmugleaf c71f97e3a2
Refactor actions to be entities with components (#19900) 2023-09-08 18:16:05 -07:00
Arimah Greene 3269438ea8
Assign a default value to ClickDamageModifier (#19871) 2023-09-06 21:06:09 +10:00
metalgearsloth b25862365e
Revert click damage mod (#19860)
Maybe swings should be default and we make the animation not shit and the prediction slightly better.
2023-09-06 03:30:23 -05:00
deltanedas 5ead3d5108
magazine fill repeating doafter (#19780)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-03 21:49:49 -07:00
IProduceWidgets bc00a635b9
Makes Plant-B-Gone available to cargo, and Diona vulnerable. (#19555)
* Adds WeekKiller storage tanks and allows Cargo to purchase them.

* Delete CellMemberRoll.cs

Woops, this template file snuck in after I reset my local. It doesn't do anything, just empty classes.

* Switched from WeedKiller to PlantBeGone because WeedKiller is too deadly. Honestly is probably shouldn't be in Botany so readily.
Made Diona take damage from PlantBeGone and WeedKiller.
Adjusted waterguns to use less reagent per shot.
Added admeme watergun.
Adjusted watergun cargo crate.

* Fixing small .yml formatting hiccups.

* Fixing small .yml formatting.

* Fix Typo.

* watergun min solution match shot size

Makes watergun's minimum solution transfer match shot size (5u).

* I pass tests now, please?

Nothing.

* Lower Diona herbicide damages
Remove slime changes
Lower super water blaster size to 500u (100 shots)
2023-09-01 22:32:08 -07:00
metalgearsloth 3ab346f471
Remove Ammo component references (#19537) 2023-08-31 14:33:28 -07:00
metalgearsloth 6abe63cf9e
tether-gun fixes (#19658)
- Just remove container tethering entirely.
2023-08-30 18:51:42 -06:00
metalgearsloth a8bac1f91f
Fix some comps for serv4 (#19511) 2023-08-25 13:45:54 +10:00
metalgearsloth ed81d1a4da
Reflection refactor (#19253) 2023-08-25 12:48:27 +10:00
metalgearsloth 735626654a
Remove FixtureId (#19280) 2023-08-23 18:55:58 +10:00
DrSmugleaf a88e747a0b
Refactor serialization copying to use source generators (#19412) 2023-08-22 18:14:33 -07:00
Errant cf68d38aaf
Dead mobs can no longer shoot guns (#19020)
* dead shooting hotfix

* dead shooting hotfix weh

* AttemptShoot check

* actionblocker check

---------

Co-authored-by: Errant <35878406+errant@users.noreply.github.com>
2023-08-21 14:27:08 -04:00
metalgearsloth d7abbab082
Add gatherable break sounds (#19360) 2023-08-20 14:05:43 -07:00
Errant 70422845e2
Gun bolt fixes and QoL (#19349)
Co-authored-by: Errant <35878406+errant@users.noreply.github.com>
2023-08-20 21:42:36 +10:00
Volodius 59cdcd0fe3
Closing bolt no longer removes cartridge (#19251) 2023-08-20 21:32:19 +10:00
kalane15 68f312834a
bug with reflection fixed (#19127)
* bug with reflection fixed

* check for pockets added
2023-08-14 23:07:54 -06:00
metalgearsloth 3fc81bca40
Fix bolt-less gun cycling (#19051)
Oop.
2023-08-13 01:07:59 -06:00
TaralGit 8acac895fc
(Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00