Refactor Damage to use Protoypes (#4262)
* Add DamageType And DamageGroup Prototypes * Remove DamageTypePrototype Field "name" as its redundant * Change I/DamageableComponent to use prototypes * Update DamageContainer, ReisistanceSet and DamageChangeData * Change Barotrauma Component to use DamageType from DamageSystem * Update AsteroidRockComponent * update some more components * update some more components * Fix m o r e c o m p o n e n t s and their damageType * all thats left is bug/missing node hunting then verification. * push changes * update submodule * Merge fixes * Revert "#3935 implemented suggestions from PR" This reverts commit a9b1c7b96333ca570067d6a9df1954481005892a. * #4219 revert of single sound removal in EmitSoundSystem * #4219 single sounds in EmitSoundSystem should work now * #4219 some small project tweaks * push DGP for example * update damagecomponent across shared and server * fix a few bugs * #4219 upgraded EmitSoundSystem to use SoundSpecifier * replacing sound (collection) names with SoundSpecifier - part 1 * #4219 pr tweaks * #4219 pr tweak (cherry picked from commit 00b80cb1df2434259ab5df45188e176be57603af) * emitsoundsystem tweak * first windoor commit * finished yaml * windoors work #Dab * sound + locked prototypes * Inserted SoundSpecifier where appropiate * added comment * removed TryGetSound + made some SoundSpecifier datafields required * changed some prototypes' sound paths * test fixes * Fix Merge issues * Made plasma grindable (#4334) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> * Automatic changelog update * Fixes invalid yaml line (#4408) * Fix potential timer exception * SetTile during extensions test (#4409) Mainly so it can actually account for accurate grid bounds when doing the test Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> * Update submodule * GasFilter appearance, EnabledAtmosDeviceVisualizer improvements. * Add Enabled property to SubFloorHideComponent, make it networked. (#4404) * Refactor IDoorCheck into entity events (#4366) * IDoorCheck refactored to events # Conflicts: # Content.Server/Atmos/TileAtmosphere.cs # Content.Server/Doors/Components/AirlockComponent.cs # Content.Server/Doors/Components/FirelockComponent.cs # Content.Server/Doors/Components/ServerDoorComponent.cs # Content.Server/Doors/IDoorCheck.cs * namespaces * Fix mapinit bug with refreshautoclose * ok i guess these just didnt feel like staging today * Automatic changelog update * AtmosDevices can optionally process in space. (#4405) Refactors some misc atmos things, too. * Fix gravity generator yeeting * Enables nullables for atmos internals * Meth (#4186) * adds an overdose metabolism with sensible default settings * adds the compoenents for the run fast part of meth * not sure what I changed here but I trust my past self to not fuck up for once * adds basic meth recipe * correctly names comething * I really should've checked my spelling before making this pr Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * adds suggestion from the maintaner, who managed to get to this pr suprisingly fast * Revert "adds suggestion from the maintaner, who managed to get to this pr suprisingly fast" This reverts commit 9b0f07402e35ed5890b3af805691b690671b950c. * tweak * tweak * git's gitting on my nerves * some small tweaks * don't need these anymore * makes some stuff required * changes the meth recipe to arbitary bullshit to get the yaml thingy to leave me alone goddamnit * extremely minor change * removes overdose, because however it's gonna be done, it's definitely not my way * i should really double check every key I press * hm * sigh, I should be more thorough with looking at error messages. * beenus * gay sex is gay * this one goes out to bingo * reviews * not sure why status lifetime description wasn't being commited * Update MovespeedModifierMetabolism.cs Co-authored-by: mirrorcult <notzombiedude@gmail.com> * adds VV to component variables * rebalances meth, and makes the completely unrealistic recipe properly work now * meth effects should go away now or something do you think I test these changes before pushing?? * ah yes, orginization * adds proper recipe and prequisite chemicals * fixes linter hopefully * Update chemicals.yml * a * starts working on prediction * thing * predmiction?? * changes thing * does it properly * uses timespan instead of timer * uses dif timers and adds a system * updates robust and tweaks a small thing * Fixes * "Fix" prediction * starts changing the timer to timespans to avoid icky on timer end * okay fixes the check thing but now meth is broken and I don't know why * fixes predicition (partially) * Delete ContentNetIDs.cs whoops * some changes advised by sloth * certified scalycode fix right here * moves resettimer to the metabolism to make it less oop stinky * moves resettimer to the metabolism to make it less oop stinky * gamin * when the is * updates mth colour to be accurate because I forgot * abc hard ok * everything should be up to date now * makes MovespeedModifierMetabolism ECS and cleans up some other stuff * does a fixy wixy * fix thing * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth" This reverts commit 62886561098be02f9adb6352f4e858a8269d5bd5, reversing changes made to ca34fffb5b7a40f19aec7b9e4bc37bdeab914bc1. * Revert "Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth"" This reverts commit 4f550da19656abfd0be05f818fc6b7100252d5b8. * fix hopefully * updates metabolism to works with mirror's fancy new system * updates yaml + tweaks * bruh * yaml moment * :yaml moment * Revert " :yaml moment" This reverts commit 8cb51573c64db76d989de22acdbb9c50b2c6d052. * 99th commit yay, also I need to not do this * removes something that I don't need * makes system work with this and gets rid of unnesescary check * make the update only work on active components * oops * Cleanup * alphabetise this shit * Touchup * Woops stupid alloc by me * Nerf nyoom for now Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Random offset for DefaultGrid every round (#4411) * Random offset for DefaultGrid every round This is useful to make coders aware of entitycoordinates and mapcoordinates being different and to help spot problems early. It also puts the onus of fixing positioning bugs back onto the original coder rather than someone else if they happen to spot it. * Fix clickable test * Fix entitysystemextensions * Automatic changelog update * Document a few atmos classes. * Update submodule We do a little bit of debugging * Make pulling feel less crap (#4414) Something something pulling refactor someday * Automatic changelog update * Comment joint prediction * Add CVar for random grid offset, disable it by default. * Fixes not taking pressure damage in space. Fixes #4415 * Automatic changelog update * Adds an alternate jumpsuit for botany (#4419) * Adds an alternate botanists jumpsuit * Updated license information * Automatic changelog update * Added two new small areas to maintenence (#4359) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Updated meta.json to standard * Update meta.json to standard * a * Revert "Update meta.json to standard" This reverts commit4c6702f17b. * Revert "Updated meta.json to standard" This reverts commit8ea7a3ad1f. * fix rsi * proper sprites + visualizes nicely * Removes broken new-line markers from a few desc. * Fixes a localization error with solution container descriptions * construction * reviews + test * remove SetLayerVisibility, doesnt work for some reason * swept moment * leftover * Automatic changelog update * Fix can't return to body bug (#4424) * Automatic changelog update * Update submodule * Fix gas tile overlays on shuttles * Offset station on roundstart again * Fix PlaceableSurface incorrect coordinate usage. It set world position to entity coordinate positions... * Automatic changelog update * Fix pickup animation incorrect coordinate usage. Animation finalPosition was world position, while initialPosition was local position. * Automatic changelog update * Pointing coordinate fixes. * Automatic changelog update * Further pickup animation improvements. * Adds Science Windoors (#4433) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Gave CMO a Hardsuit (#4434) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fixed station engineer table spawn (#4436) * Maps in windoors (#4432) * Automatic changelog update * Losing a head doesn't mean you lose your eyes #3956 #4061 (#4225) Co-authored-by: Michael Will <will_m@outlook.de> * Automatic changelog update * Adds windoors for security and the brig. (#4441) * Automatic changelog update * Remaps Chemistry and Security, and some Mapping Fixes (#4442) * Automatic changelog update * Made the cloning pod and medical scanner constructible (#4439) * Made the cloning machine pod constructable * Added everything like I did but with the Medical Scanner Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fix fixed-point format specifier in PowerCellComponent * Update submodule * Actually update submodule The last one was a test to check if you were paying attention. * Update maps for grid collisions (#4450) * Update submodule * Fixes the windoor in science. (#4444) * Automatic changelog update * Remove IActionBlocker.CanMove (#4449) * Remove IActionBlocker.CanMove Ported the remainders over to using MovementAttemptEvent which should also help make mob movement a bit faster. * Make that check faster * Added restrictions for what can be inserted into most belts (#4367) * Belts now restrict what can be inserted into them * Bandolier now only holds shotgun shells * Tiny typo * Another tiny typo * Automatic changelog update * Fix indentation * Fix stuff * Fix gas canister * Organize gas canister prototype * Fix audio occlusion This was previously being done on every SoundComponent. * Call SoundSystem instead * Parents crowbar-red and merges RSIs * Deletes old crowbar_red.rsi * Abstracts BasePlushie and ReagentContainerBase * Adds missing suffixes to debug items and tags them all * Crematorium now makes a noise on start and during cremation (#4459) * Automatic changelog update * Refactor disposals to ECS (#4418) * ECS up disposals Also significantly reduced its CPU usage. * Make update significantly less S L O W * Start units pressurised * Client-side flush lerping * Fix powered not toggling UI * Fix flush button * InteractUsing * Minor optimisations * Fix collisions * Make visual state ECS * Almost done with shared * Most stuff moved * Optimise item sleeping * Automatic changelog update * Fix door sound dampening (#4453) * Completely fix NPC pathfinding Through rigorous investigation and hard work. * Implement Entity List Display and rework StorageComponent window (#4140) * Create EntityListDisplay * Rework ClientStorage window * Add styling * Remove unnecessary colors * Rename list * Make scrollbar push content * Change children update a bit * Add old index * Localize ClientStorageComponent * Add size return * Remove spaces * Fix usings * Fix tool sounds. Fixes #4465 * Automatic changelog update * Fix missing sounds (#4466) * Fix missing sounds * Make SoundHitSpecies fallback to SoundHit * Fix crayon YAML * Update PlaySoundBehavior YAML * Fix required * Update README.md * Fix taser physics (#4470) * Increase MoverController performance (#4448) Should be a decent amount; rest will come from removing IActionBlocker. * Remove throwing fixture error * Update submodule * Fix sound crash when making foam (#4476) * Automatic changelog update * Centers some sprites * Fix showatmos * Fix tests. Flashlight RSI state names had been changed, and some places weren't updated properly * Remove pillcomponent (#4469) * Remove PillComponent * Make food without any solution left delete and create trash * Replace PillComponent references with a Pill tag * Clean up * Add swallow message to food * Change to eatMessage override * Change FoodComponent transferAmount to nullable * Change properties to private * ItemCabinetVisualizer uses layers (#4445) * ItemCabinetVisualizer uses layers * Reviews applied * Fixes the fireaxe cabinet as well * I'm dumb * Fixes bedsheets being unpickupable (#4479) * Automatic changelog update * Adds inhands for crayons and the crayon box (#4481) * Automatic changelog update * Fixes cigarette animations and matches now have lit/unlit inhand sprites (#4480) * Automatic changelog update * Adds plant clippers and changes hydro tool sprites to be more consistent (#4482) * Adds plant clippers * Updates sycthe, hoe and spade sprites * Adds inhands for radio/walkietalkie (#4483) * Adds inhands for radio/walkietalkie and separates layers * License thingy * Fixes test * Can now equip fireaxe, claymore, spear and baseball back on your back (#4484) * Can equip spears and claymores on your back now * Adds fireaxe and baseball bat back equip * Automatic changelog update * Makes Match[sticks/box] ECS, Makes Matchsticks ignite plasma * am big dumdum pls no shed * Owner Transform to Owner in SoundSystem calls (#4460) * Owner Transform to Owner * Owner Transform to Owner minor fixes * Improve hand pickup code This way I can break EntityCoordinates' API without breaking content. BWAHAHAHAHAH! * Update submodule * Version v0.5.11 does not exist * Update submodule We don't talk about v0.5.12 either. * Update submodule For the last time * Adds duck-related content and a seclite (#4489) * Added rubber ducky * Adds ducky slippers * Adds seclite * Update Resources/Textures/Objects/Tools/seclite.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Fun/ducky.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * The duck slippers now quack as you walk Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Automatic changelog update * Adds the ability to assign equip sounds in ClothingComponent (#4485) * Initial * Works (Kinda) * Polish * Reviews * Removes vending inventory desc and adds missing vending machine descriptions (#4493) * Removes inventory descriptions * Adds missing vending machine descriptions using inventory descriptions * Woops missed a file * Automatic changelog update * Adds a ton more inhands (#4488) * Removed useless loc and added inhands for some lamps * Adds a ton of inhands to the game * Actually adds the pill inhand * Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Added open/close/stacklayers for Matchbox and inhands (#4496) * Added open/close/stacklayers for Matchbox * Added inhands for matchbox * What am I a clown not gonna leave no indent spaces * Adds sound to fire extinguisher safety (#4494) * Automatic changelog update * Adds a 6pack of Cola (#4499) * Adds a 6pack of Cola * Revert "Adds a 6pack of Cola" This reverts commit 99f024b94ab3c684ce62e28018bd0fe2f26a2e09. * Revert "Revert "Adds a 6pack of Cola"" This reverts commit 9e3d31e41c8ea61a962ad7d4d3c0ea7124e82653. * Automatic changelog update * Fix H-pulling? (#4425) In retrospect the answer is easy, but man this took a while. * Automatic changelog update * Makes DiceComponent ECS * Makes PlaceableSurface ECS * Added classic announcement sound to announcements (#4504) * Automatic changelog update * Refactors throw events, makes cream pies ECS (#4500) * Automatic changelog update * Port the tumbler from Box2D (#4486) * Subscribe TransformComponent events by-ref (#4478) * Refactor damageablecomponent update (#4406) * Fixing merge. I messed up part of the merge. this should fix it? * Barotrauma now uses prototypeManager As System.Runtime.CompilerServices also has a [Dependency], I think I had to use the full path [Robust.Shared.IoC.Dependency] * FlammableComponent now uses prototypeManager * SuicideCommands now use prototypeManager * Changed many files to use prototypeManager to resolve damaege prototypes Yeah.... prototype references would be very nice. maybe this was all a waste of time. * Grouping prototypeManager.Index with datafield definitions This will make it easier to eventually add prototype references * removed unused variable * Moved lines around. Lines now consistent with other TODO PROTOTYPE blocks * Grouping more prototypeManager.Index with datafield definitions * Removed unnecessary code * Added more prototypeManager indexing These ones weren't pointed out by DrSmug. But I think this is all of them? That or my regex is shit. * Remove redundant _damage field * Remove redundant _currentTemperature * Moved variables down * Added prototypeManager indexing to TemperatureComponent * WeaponComponent/System now use ProtptypeManager And as far as I can tell damageType is required, and therefore should never have been null anyway? * Make ranged weapon clumsy fire effects datafields And yes, the order in which the clumsy effects occur is very important. * Made damage on vital body part loss a datafield * Renamed several damageGroup variables to group * Capitalised DamageListToDamageGroup * Make radiation and explosion damage types datafields * Renamed _supportedDamageGroupIDs and _supportedDamageTypeIDs * Fixed mistakes Frogot to remove prototypeManager index DamageTypeTrigger, and wrong variable visibility in TemperatureComponent * Added necessary code Is something tragically wrong? * MeleeWeapon damageType is not actually required * Fixing someone else's mistakes A search comes up with nothing in the yaml files, and its not a required field. So no one uses it? Hopefully? * Changed and renamed damageTypeToDamageGroup Previously would incorrectly return the total container damage for each group, not the total in the group * renaming varitables * Renamed variable DamageClasses * Added dictionary converting functions * Added ID-keyed dictionaries * Making MedicalScanner use ID dictionaries, instead of prototype dictionaries Oh oh no. I've been able to avoid UI & networking up until now. I have no Idea what I am doing. * Fix Medical Scanner * Summary (required) The joke here is that this fixes the empty summary. * Removed DamageableComponent.GetDamageGroup/Type * Renamed "damage classes" to groups. * Update ChangeDamage description * Replaced Heal() with SettAllDamage() Heal() was just a confusing name, * More Class -> Group renaming * Replace Class with Group in yaml files DamageClassTrigger does not appear in any yaml? only in testing? DamageTypeTrigger appears only in human.yaml? HealthChangeMetabolism is Mostly in medicine.yml and one in soad.yaml Why the hell is Cola metabolizable by plants? Who is pouring cola on their plants!?!? * Fix _prototypeManager being null errors. * Changing comments Where are the prototype references * MetabolismComponent doesn't give free heals anymore. * Changes HungerComponent healing. Previously I think it would actually damage you. Only did this as I though it was causing the fast healing. Turns out that was just BREATHING. * Generalised a function in DamageableComponent and moved it to DamageGroupPrototype previously DamageTypesDictToDamageGroupDict was private to DamageableComponent, but was also quite general (nearly a static function). As this sort of function may be needed by other components using DamageGroupPrototypes in the future, I moved it there as a static function instead. * modified DamageableComponent.ChangeDamage() ignoreResistances was renamed to ignoreDamageResistances to make it clearer that it had no effect on healing. Now uses default argument for ignoreDamageResistances, so when healing you are not forced to specify an argument that does nothing. Also made some general changes to ignoreResistances() * Changed class->group and added missing damage type functionality to DamageContainerPrototypes * Added Comments to damage.yml * Misc Changes to DamageableComponent * Differentiated between group support and group applicability So far, every damage type is a member of one, and only one, damage group. So this change has no real effect so far. * Added proposed alternative to ChangeDamage() * fixed error in DamageGroupPrototype * Changes to DamageableComponent Lots of changes to comments. Some variables renamed in IDamageableComponent and DamageableComponent (also required renaming in other files) Some minor logic changes, mostly for incorrect descirptions of boolean return values. Also further differentiating between ApplicableGroups and SupportedGroups... if that will ever even matter * Generalised MedicalScannerComponent If needed, can print miscellaneous damage types now * Fixed HealthChangeMetabolism bug * Changing Comments around * More questions * Made Barotrauma default to blunt * Fix RejuvenateTest.cs * Comments * Coments and variable names * fix some master-merge issues * Removed redundant fields * Misc changes for readbility of PR diff * Consistent naming * Fixed atmos damage bug * Removed Ranting * Fixed Hunger after I broke it * Fixing Bugs * Removed stupid question * Removed more stupid questions * Fix potential null errors. * Made boolean return values consistent Also renamed several functions, to make it clear they return a bool. Docs were also updated. * Removed IoCManager.InjectDependencies() * Removed unnecessary 'suffocation' prefix * Fixed Spelling Also removed accidentally left in logger call * Fixed Medical Scanner * Apply suggestions from code review Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Changing comments and whitespaces * Made damage thresholds trigger datafields required * So many typos * Changes to DamageableComponents Changed documentation in IDamageableComponent Made testing code more readable. Relabelled groups as 'Applicable' either 'Fully Supported' * Removed function and degeneralised * Update DamageableComponent.cs Removed unused parameters Fixed Networking * Added IoCManager.Resolve * Now using alternative TryChangeDamage() * Removed function from DamageGroupPrototype * Removing comments * Remove bad if statement? * Fix damageChanged ordering * Fix hurt server command * Changed //TODO PROTOTYPE blocks Now use PrototypeManager differently. Wherever possible, only retrieve the prototype once. Also added default damage types to some more datafields * Update Content.Shared/Damage/Container/DamageContainerPrototype.cs Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * renamed _accumulatedHealth -> _accumulatedDamage and added TODOs * Another class-> group * Fix bug in generalisation of damage container prototypes * Addes Tests to make sure I dont keep adding bugs to my own code. * Changed Return values when setting * Removed unused class * Added more tests, split tests into three files * Made damage types public and VV read-write-able * Minor changes to DamageableComponent Replaced internal use of GetDamagePerType with _damageDict and removed some unnecessary fields * Fix Suicide, by adding IoC Resolve() * Fix DamageGroupTrigger bug * Fix typos in tests * Change comments./docstrings & spacing * Merge tests, use test prototypes Co-authored-by: Leon Friedrich <60421075+leonsfriedrich@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Add Alt-click functionality (#4497) * Fix ItemSlot Bug * Add Alt-use Key * Fix TransferAmount window bug * Alt-click functionality * Added AltInteract verbs * Add new verbs * verb icons * Changed Comments * Change Comments * Fix disposal verbs * Changed Get...() to Get...OrNull() * Changed alt-interact combat behaviour * Update verb icons * Inventory interact event * Add Alt+E secondary binding * Add alt-z keybinding * Rename AltUse -> AltActivateItemInWorld * Automatic changelog update * Fixes chocolate/energy bar (#4503) * Bring refactor-damageablecomponent branch up-to-date with master (#4510) * Revert "#3935 implemented suggestions from PR" This reverts commit a9b1c7b96333ca570067d6a9df1954481005892a. * #4219 revert of single sound removal in EmitSoundSystem * #4219 single sounds in EmitSoundSystem should work now * #4219 some small project tweaks * #4219 upgraded EmitSoundSystem to use SoundSpecifier * replacing sound (collection) names with SoundSpecifier - part 1 * #4219 pr tweaks * #4219 pr tweak (cherry picked from commit 00b80cb1df2434259ab5df45188e176be57603af) * emitsoundsystem tweak * first windoor commit * finished yaml * windoors work #Dab * sound + locked prototypes * Inserted SoundSpecifier where appropiate * added comment * removed TryGetSound + made some SoundSpecifier datafields required * changed some prototypes' sound paths * test fixes * Made plasma grindable (#4334) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> * Automatic changelog update * Fixes invalid yaml line (#4408) * Fix potential timer exception * SetTile during extensions test (#4409) Mainly so it can actually account for accurate grid bounds when doing the test Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> * Update submodule * GasFilter appearance, EnabledAtmosDeviceVisualizer improvements. * Add Enabled property to SubFloorHideComponent, make it networked. (#4404) * Refactor IDoorCheck into entity events (#4366) * IDoorCheck refactored to events # Conflicts: # Content.Server/Atmos/TileAtmosphere.cs # Content.Server/Doors/Components/AirlockComponent.cs # Content.Server/Doors/Components/FirelockComponent.cs # Content.Server/Doors/Components/ServerDoorComponent.cs # Content.Server/Doors/IDoorCheck.cs * namespaces * Fix mapinit bug with refreshautoclose * ok i guess these just didnt feel like staging today * Automatic changelog update * AtmosDevices can optionally process in space. (#4405) Refactors some misc atmos things, too. * Fix gravity generator yeeting * Enables nullables for atmos internals * Meth (#4186) * adds an overdose metabolism with sensible default settings * adds the compoenents for the run fast part of meth * not sure what I changed here but I trust my past self to not fuck up for once * adds basic meth recipe * correctly names comething * I really should've checked my spelling before making this pr Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * adds suggestion from the maintaner, who managed to get to this pr suprisingly fast * Revert "adds suggestion from the maintaner, who managed to get to this pr suprisingly fast" This reverts commit 9b0f07402e35ed5890b3af805691b690671b950c. * tweak * tweak * git's gitting on my nerves * some small tweaks * don't need these anymore * makes some stuff required * changes the meth recipe to arbitary bullshit to get the yaml thingy to leave me alone goddamnit * extremely minor change * removes overdose, because however it's gonna be done, it's definitely not my way * i should really double check every key I press * hm * sigh, I should be more thorough with looking at error messages. * beenus * gay sex is gay * this one goes out to bingo * reviews * not sure why status lifetime description wasn't being commited * Update MovespeedModifierMetabolism.cs Co-authored-by: mirrorcult <notzombiedude@gmail.com> * adds VV to component variables * rebalances meth, and makes the completely unrealistic recipe properly work now * meth effects should go away now or something do you think I test these changes before pushing?? * ah yes, orginization * adds proper recipe and prequisite chemicals * fixes linter hopefully * Update chemicals.yml * a * starts working on prediction * thing * predmiction?? * changes thing * does it properly * uses timespan instead of timer * uses dif timers and adds a system * updates robust and tweaks a small thing * Fixes * "Fix" prediction * starts changing the timer to timespans to avoid icky on timer end * okay fixes the check thing but now meth is broken and I don't know why * fixes predicition (partially) * Delete ContentNetIDs.cs whoops * some changes advised by sloth * certified scalycode fix right here * moves resettimer to the metabolism to make it less oop stinky * moves resettimer to the metabolism to make it less oop stinky * gamin * when the is * updates mth colour to be accurate because I forgot * abc hard ok * everything should be up to date now * makes MovespeedModifierMetabolism ECS and cleans up some other stuff * does a fixy wixy * fix thing * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth" This reverts commit 62886561098be02f9adb6352f4e858a8269d5bd5, reversing changes made to ca34fffb5b7a40f19aec7b9e4bc37bdeab914bc1. * Revert "Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth"" This reverts commit 4f550da19656abfd0be05f818fc6b7100252d5b8. * fix hopefully * updates metabolism to works with mirror's fancy new system * updates yaml + tweaks * bruh * yaml moment * :yaml moment * Revert " :yaml moment" This reverts commit 8cb51573c64db76d989de22acdbb9c50b2c6d052. * 99th commit yay, also I need to not do this * removes something that I don't need * makes system work with this and gets rid of unnesescary check * make the update only work on active components * oops * Cleanup * alphabetise this shit * Touchup * Woops stupid alloc by me * Nerf nyoom for now Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Random offset for DefaultGrid every round (#4411) * Random offset for DefaultGrid every round This is useful to make coders aware of entitycoordinates and mapcoordinates being different and to help spot problems early. It also puts the onus of fixing positioning bugs back onto the original coder rather than someone else if they happen to spot it. * Fix clickable test * Fix entitysystemextensions * Automatic changelog update * Document a few atmos classes. * Update submodule We do a little bit of debugging * Make pulling feel less crap (#4414) Something something pulling refactor someday * Automatic changelog update * Comment joint prediction * Add CVar for random grid offset, disable it by default. * Fixes not taking pressure damage in space. Fixes #4415 * Automatic changelog update * Adds an alternate jumpsuit for botany (#4419) * Adds an alternate botanists jumpsuit * Updated license information * Automatic changelog update * Added two new small areas to maintenence (#4359) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Updated meta.json to standard * Update meta.json to standard * a * Revert "Update meta.json to standard" This reverts commit4c6702f17b. * Revert "Updated meta.json to standard" This reverts commit8ea7a3ad1f. * fix rsi * proper sprites + visualizes nicely * Removes broken new-line markers from a few desc. * Fixes a localization error with solution container descriptions * construction * reviews + test * remove SetLayerVisibility, doesnt work for some reason * swept moment * leftover * Automatic changelog update * Fix can't return to body bug (#4424) * Automatic changelog update * Update submodule * Fix gas tile overlays on shuttles * Offset station on roundstart again * Fix PlaceableSurface incorrect coordinate usage. It set world position to entity coordinate positions... * Automatic changelog update * Fix pickup animation incorrect coordinate usage. Animation finalPosition was world position, while initialPosition was local position. * Automatic changelog update * Pointing coordinate fixes. * Automatic changelog update * Further pickup animation improvements. * Adds Science Windoors (#4433) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Gave CMO a Hardsuit (#4434) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fixed station engineer table spawn (#4436) * Maps in windoors (#4432) * Automatic changelog update * Losing a head doesn't mean you lose your eyes #3956 #4061 (#4225) Co-authored-by: Michael Will <will_m@outlook.de> * Automatic changelog update * Adds windoors for security and the brig. (#4441) * Automatic changelog update * Remaps Chemistry and Security, and some Mapping Fixes (#4442) * Automatic changelog update * Made the cloning pod and medical scanner constructible (#4439) * Made the cloning machine pod constructable * Added everything like I did but with the Medical Scanner Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fix fixed-point format specifier in PowerCellComponent * Update submodule * Actually update submodule The last one was a test to check if you were paying attention. * Update maps for grid collisions (#4450) * Update submodule * Fixes the windoor in science. (#4444) * Automatic changelog update * Remove IActionBlocker.CanMove (#4449) * Remove IActionBlocker.CanMove Ported the remainders over to using MovementAttemptEvent which should also help make mob movement a bit faster. * Make that check faster * Added restrictions for what can be inserted into most belts (#4367) * Belts now restrict what can be inserted into them * Bandolier now only holds shotgun shells * Tiny typo * Another tiny typo * Automatic changelog update * Fix indentation * Fix stuff * Fix gas canister * Organize gas canister prototype * Fix audio occlusion This was previously being done on every SoundComponent. * Call SoundSystem instead * Parents crowbar-red and merges RSIs * Deletes old crowbar_red.rsi * Abstracts BasePlushie and ReagentContainerBase * Adds missing suffixes to debug items and tags them all * Crematorium now makes a noise on start and during cremation (#4459) * Automatic changelog update * Refactor disposals to ECS (#4418) * ECS up disposals Also significantly reduced its CPU usage. * Make update significantly less S L O W * Start units pressurised * Client-side flush lerping * Fix powered not toggling UI * Fix flush button * InteractUsing * Minor optimisations * Fix collisions * Make visual state ECS * Almost done with shared * Most stuff moved * Optimise item sleeping * Automatic changelog update * Fix door sound dampening (#4453) * Completely fix NPC pathfinding Through rigorous investigation and hard work. * Implement Entity List Display and rework StorageComponent window (#4140) * Create EntityListDisplay * Rework ClientStorage window * Add styling * Remove unnecessary colors * Rename list * Make scrollbar push content * Change children update a bit * Add old index * Localize ClientStorageComponent * Add size return * Remove spaces * Fix usings * Fix tool sounds. Fixes #4465 * Automatic changelog update * Fix missing sounds (#4466) * Fix missing sounds * Make SoundHitSpecies fallback to SoundHit * Fix crayon YAML * Update PlaySoundBehavior YAML * Fix required * Update README.md * Fix taser physics (#4470) * Increase MoverController performance (#4448) Should be a decent amount; rest will come from removing IActionBlocker. * Remove throwing fixture error * Update submodule * Fix sound crash when making foam (#4476) * Automatic changelog update * Centers some sprites * Fix showatmos * Fix tests. Flashlight RSI state names had been changed, and some places weren't updated properly * Remove pillcomponent (#4469) * Remove PillComponent * Make food without any solution left delete and create trash * Replace PillComponent references with a Pill tag * Clean up * Add swallow message to food * Change to eatMessage override * Change FoodComponent transferAmount to nullable * Change properties to private * ItemCabinetVisualizer uses layers (#4445) * ItemCabinetVisualizer uses layers * Reviews applied * Fixes the fireaxe cabinet as well * I'm dumb * Fixes bedsheets being unpickupable (#4479) * Automatic changelog update * Adds inhands for crayons and the crayon box (#4481) * Automatic changelog update * Fixes cigarette animations and matches now have lit/unlit inhand sprites (#4480) * Automatic changelog update * Adds plant clippers and changes hydro tool sprites to be more consistent (#4482) * Adds plant clippers * Updates sycthe, hoe and spade sprites * Adds inhands for radio/walkietalkie (#4483) * Adds inhands for radio/walkietalkie and separates layers * License thingy * Fixes test * Can now equip fireaxe, claymore, spear and baseball back on your back (#4484) * Can equip spears and claymores on your back now * Adds fireaxe and baseball bat back equip * Automatic changelog update * Makes Match[sticks/box] ECS, Makes Matchsticks ignite plasma * am big dumdum pls no shed * Owner Transform to Owner in SoundSystem calls (#4460) * Owner Transform to Owner * Owner Transform to Owner minor fixes * Improve hand pickup code This way I can break EntityCoordinates' API without breaking content. BWAHAHAHAHAH! * Update submodule * Version v0.5.11 does not exist * Update submodule We don't talk about v0.5.12 either. * Update submodule For the last time * Adds duck-related content and a seclite (#4489) * Added rubber ducky * Adds ducky slippers * Adds seclite * Update Resources/Textures/Objects/Tools/seclite.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Fun/ducky.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * The duck slippers now quack as you walk Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Automatic changelog update * Adds the ability to assign equip sounds in ClothingComponent (#4485) * Initial * Works (Kinda) * Polish * Reviews * Removes vending inventory desc and adds missing vending machine descriptions (#4493) * Removes inventory descriptions * Adds missing vending machine descriptions using inventory descriptions * Woops missed a file * Automatic changelog update * Adds a ton more inhands (#4488) * Removed useless loc and added inhands for some lamps * Adds a ton of inhands to the game * Actually adds the pill inhand * Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Added open/close/stacklayers for Matchbox and inhands (#4496) * Added open/close/stacklayers for Matchbox * Added inhands for matchbox * What am I a clown not gonna leave no indent spaces * Adds sound to fire extinguisher safety (#4494) * Automatic changelog update * Adds a 6pack of Cola (#4499) * Adds a 6pack of Cola * Revert "Adds a 6pack of Cola" This reverts commit 99f024b94ab3c684ce62e28018bd0fe2f26a2e09. * Revert "Revert "Adds a 6pack of Cola"" This reverts commit 9e3d31e41c8ea61a962ad7d4d3c0ea7124e82653. * Automatic changelog update * Fix H-pulling? (#4425) In retrospect the answer is easy, but man this took a while. * Automatic changelog update * Makes DiceComponent ECS * Makes PlaceableSurface ECS * Added classic announcement sound to announcements (#4504) * Automatic changelog update * Refactors throw events, makes cream pies ECS (#4500) * Automatic changelog update * Port the tumbler from Box2D (#4486) * Subscribe TransformComponent events by-ref (#4478) * Add Alt-click functionality (#4497) * Fix ItemSlot Bug * Add Alt-use Key * Fix TransferAmount window bug * Alt-click functionality * Added AltInteract verbs * Add new verbs * verb icons * Changed Comments * Change Comments * Fix disposal verbs * Changed Get...() to Get...OrNull() * Changed alt-interact combat behaviour * Update verb icons * Inventory interact event * Add Alt+E secondary binding * Add alt-z keybinding * Rename AltUse -> AltActivateItemInWorld * Automatic changelog update * Fixes chocolate/energy bar (#4503) * Fix merge issues Co-authored-by: Galactic Chimp <GalacticChimpanzee@gmail.com> Co-authored-by: Kara Dinyes <lunarautomaton6@gmail.com> Co-authored-by: SethLafuente <84478872+SethLafuente@users.noreply.github.com> Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com> Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: ScalyChimp <72841710+scaly-chimp@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Jaskanbe <86671825+Jaskanbe@users.noreply.github.com> Co-authored-by: scrato <Mickaello2003@gmx.de> Co-authored-by: Michael Will <will_m@outlook.de> Co-authored-by: TimrodDX <timrod@gmail.com> Co-authored-by: Leon Friedrich <60421075+leonsfriedrich@users.noreply.github.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Paul <ritter.paul1+git@googlemail.com> Co-authored-by: ColdAutumnRain <73938872+ColdAutumnRain@users.noreply.github.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Singularity fixes (#4383) * Singularity fixes * Fix the rest * Woops * ahh * Nerf singulo for now * Final touchups for now * Review * Automatic changelog update * Fix PA construction crash, make it clear that PA construction needs LV cables (#4506) * Automatic changelog update * Add security barriers (#4458) * Add sprites * Lock system now raises lock toggle events * Add prototype and barrier system * Toggle lock on click * Barrier blocks bullets (like a real wall) * Barrier now destroyable * Fancy visualzer and lighting. Also unlock by default * Deleted comma * Ignored components? * Update Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Update Resources/Prototypes/Entities/Objects/Specific/Security/barrier.yml Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Toggle Lock no longer handled * Made it much easier to move through airlocks Co-authored-by: Swept <sweptwastaken@protonmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * Automatic changelog update * Updates name of LV cable coil * Admin ghosts can now interact with stuff (#4178) * Ghosts now have a bool for interacting with stuff * Wrong ghost * Simping for Swept * Merge cleanup * IT'S ODNE Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Added Basic Parts Technology (#4440) * Added parts Technology * is something they're something bad grammar * Update Parts.yml * Update technologies.yml Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> * Add basic meteor swarm (#4420) * Add basic meteor swarm * Map fixes * Dependency cache * Fix projectile crash * Last of the reviews * Automatic changelog update * Update content for PhysicsMapComponent (#4462) * Update content for PhysicsMapComponent * Fix command * Cache broadphasesystem * Update submodule * Update SS14 for grid contraction (#4452) * Update SS14 for grid contraction * Remove more dummy chunks * Update submodule * ratio's rects * Add DamageType And DamageGroup Prototypes * Remove DamageTypePrototype Field "name" as its redundant * Change I/DamageableComponent to use prototypes * Update DamageContainer, ReisistanceSet and DamageChangeData * Change Barotrauma Component to use DamageType from DamageSystem * Update AsteroidRockComponent * update some more components * update some more components * Fix m o r e c o m p o n e n t s and their damageType * all thats left is bug/missing node hunting then verification. * push changes * update submodule * Merge fixes * push DGP for example * update damagecomponent across shared and server * fix a few bugs * Fix Merge issues * Refactor damageablecomponent update (#4406) * Fixing merge. I messed up part of the merge. this should fix it? * Barotrauma now uses prototypeManager As System.Runtime.CompilerServices also has a [Dependency], I think I had to use the full path [Robust.Shared.IoC.Dependency] * FlammableComponent now uses prototypeManager * SuicideCommands now use prototypeManager * Changed many files to use prototypeManager to resolve damaege prototypes Yeah.... prototype references would be very nice. maybe this was all a waste of time. * Grouping prototypeManager.Index with datafield definitions This will make it easier to eventually add prototype references * removed unused variable * Moved lines around. Lines now consistent with other TODO PROTOTYPE blocks * Grouping more prototypeManager.Index with datafield definitions * Removed unnecessary code * Added more prototypeManager indexing These ones weren't pointed out by DrSmug. But I think this is all of them? That or my regex is shit. * Remove redundant _damage field * Remove redundant _currentTemperature * Moved variables down * Added prototypeManager indexing to TemperatureComponent * WeaponComponent/System now use ProtptypeManager And as far as I can tell damageType is required, and therefore should never have been null anyway? * Make ranged weapon clumsy fire effects datafields And yes, the order in which the clumsy effects occur is very important. * Made damage on vital body part loss a datafield * Renamed several damageGroup variables to group * Capitalised DamageListToDamageGroup * Make radiation and explosion damage types datafields * Renamed _supportedDamageGroupIDs and _supportedDamageTypeIDs * Fixed mistakes Frogot to remove prototypeManager index DamageTypeTrigger, and wrong variable visibility in TemperatureComponent * Added necessary code Is something tragically wrong? * MeleeWeapon damageType is not actually required * Fixing someone else's mistakes A search comes up with nothing in the yaml files, and its not a required field. So no one uses it? Hopefully? * Changed and renamed damageTypeToDamageGroup Previously would incorrectly return the total container damage for each group, not the total in the group * renaming varitables * Renamed variable DamageClasses * Added dictionary converting functions * Added ID-keyed dictionaries * Making MedicalScanner use ID dictionaries, instead of prototype dictionaries Oh oh no. I've been able to avoid UI & networking up until now. I have no Idea what I am doing. * Fix Medical Scanner * Summary (required) The joke here is that this fixes the empty summary. * Removed DamageableComponent.GetDamageGroup/Type * Renamed "damage classes" to groups. * Update ChangeDamage description * Replaced Heal() with SettAllDamage() Heal() was just a confusing name, * More Class -> Group renaming * Replace Class with Group in yaml files DamageClassTrigger does not appear in any yaml? only in testing? DamageTypeTrigger appears only in human.yaml? HealthChangeMetabolism is Mostly in medicine.yml and one in soad.yaml Why the hell is Cola metabolizable by plants? Who is pouring cola on their plants!?!? * Fix _prototypeManager being null errors. * Changing comments Where are the prototype references * MetabolismComponent doesn't give free heals anymore. * Changes HungerComponent healing. Previously I think it would actually damage you. Only did this as I though it was causing the fast healing. Turns out that was just BREATHING. * Generalised a function in DamageableComponent and moved it to DamageGroupPrototype previously DamageTypesDictToDamageGroupDict was private to DamageableComponent, but was also quite general (nearly a static function). As this sort of function may be needed by other components using DamageGroupPrototypes in the future, I moved it there as a static function instead. * modified DamageableComponent.ChangeDamage() ignoreResistances was renamed to ignoreDamageResistances to make it clearer that it had no effect on healing. Now uses default argument for ignoreDamageResistances, so when healing you are not forced to specify an argument that does nothing. Also made some general changes to ignoreResistances() * Changed class->group and added missing damage type functionality to DamageContainerPrototypes * Added Comments to damage.yml * Misc Changes to DamageableComponent * Differentiated between group support and group applicability So far, every damage type is a member of one, and only one, damage group. So this change has no real effect so far. * Added proposed alternative to ChangeDamage() * fixed error in DamageGroupPrototype * Changes to DamageableComponent Lots of changes to comments. Some variables renamed in IDamageableComponent and DamageableComponent (also required renaming in other files) Some minor logic changes, mostly for incorrect descirptions of boolean return values. Also further differentiating between ApplicableGroups and SupportedGroups... if that will ever even matter * Generalised MedicalScannerComponent If needed, can print miscellaneous damage types now * Fixed HealthChangeMetabolism bug * Changing Comments around * More questions * Made Barotrauma default to blunt * Fix RejuvenateTest.cs * Comments * Coments and variable names * fix some master-merge issues * Removed redundant fields * Misc changes for readbility of PR diff * Consistent naming * Fixed atmos damage bug * Removed Ranting * Fixed Hunger after I broke it * Fixing Bugs * Removed stupid question * Removed more stupid questions * Fix potential null errors. * Made boolean return values consistent Also renamed several functions, to make it clear they return a bool. Docs were also updated. * Removed IoCManager.InjectDependencies() * Removed unnecessary 'suffocation' prefix * Fixed Spelling Also removed accidentally left in logger call * Fixed Medical Scanner * Apply suggestions from code review Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Changing comments and whitespaces * Made damage thresholds trigger datafields required * So many typos * Changes to DamageableComponents Changed documentation in IDamageableComponent Made testing code more readable. Relabelled groups as 'Applicable' either 'Fully Supported' * Removed function and degeneralised * Update DamageableComponent.cs Removed unused parameters Fixed Networking * Added IoCManager.Resolve * Now using alternative TryChangeDamage() * Removed function from DamageGroupPrototype * Removing comments * Remove bad if statement? * Fix damageChanged ordering * Fix hurt server command * Changed //TODO PROTOTYPE blocks Now use PrototypeManager differently. Wherever possible, only retrieve the prototype once. Also added default damage types to some more datafields * Update Content.Shared/Damage/Container/DamageContainerPrototype.cs Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * renamed _accumulatedHealth -> _accumulatedDamage and added TODOs * Another class-> group * Fix bug in generalisation of damage container prototypes * Addes Tests to make sure I dont keep adding bugs to my own code. * Changed Return values when setting * Removed unused class * Added more tests, split tests into three files * Made damage types public and VV read-write-able * Minor changes to DamageableComponent Replaced internal use of GetDamagePerType with _damageDict and removed some unnecessary fields * Fix Suicide, by adding IoC Resolve() * Fix DamageGroupTrigger bug * Fix typos in tests * Change comments./docstrings & spacing * Merge tests, use test prototypes Co-authored-by: Leon Friedrich <60421075+leonsfriedrich@users.noreply.github.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> * Bring refactor-damageablecomponent branch up-to-date with master (#4510) * Revert "#3935 implemented suggestions from PR" This reverts commit a9b1c7b96333ca570067d6a9df1954481005892a. * #4219 revert of single sound removal in EmitSoundSystem * #4219 single sounds in EmitSoundSystem should work now * #4219 some small project tweaks * #4219 upgraded EmitSoundSystem to use SoundSpecifier * replacing sound (collection) names with SoundSpecifier - part 1 * #4219 pr tweaks * #4219 pr tweak (cherry picked from commit 00b80cb1df2434259ab5df45188e176be57603af) * emitsoundsystem tweak * first windoor commit * finished yaml * windoors work #Dab * sound + locked prototypes * Inserted SoundSpecifier where appropiate * added comment * removed TryGetSound + made some SoundSpecifier datafields required * changed some prototypes' sound paths * test fixes * Made plasma grindable (#4334) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> * Automatic changelog update * Fixes invalid yaml line (#4408) * Fix potential timer exception * SetTile during extensions test (#4409) Mainly so it can actually account for accurate grid bounds when doing the test Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> * Update submodule * GasFilter appearance, EnabledAtmosDeviceVisualizer improvements. * Add Enabled property to SubFloorHideComponent, make it networked. (#4404) * Refactor IDoorCheck into entity events (#4366) * IDoorCheck refactored to events # Conflicts: # Content.Server/Atmos/TileAtmosphere.cs # Content.Server/Doors/Components/AirlockComponent.cs # Content.Server/Doors/Components/FirelockComponent.cs # Content.Server/Doors/Components/ServerDoorComponent.cs # Content.Server/Doors/IDoorCheck.cs * namespaces * Fix mapinit bug with refreshautoclose * ok i guess these just didnt feel like staging today * Automatic changelog update * AtmosDevices can optionally process in space. (#4405) Refactors some misc atmos things, too. * Fix gravity generator yeeting * Enables nullables for atmos internals * Meth (#4186) * adds an overdose metabolism with sensible default settings * adds the compoenents for the run fast part of meth * not sure what I changed here but I trust my past self to not fuck up for once * adds basic meth recipe * correctly names comething * I really should've checked my spelling before making this pr Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> * adds suggestion from the maintaner, who managed to get to this pr suprisingly fast * Revert "adds suggestion from the maintaner, who managed to get to this pr suprisingly fast" This reverts commit 9b0f07402e35ed5890b3af805691b690671b950c. * tweak * tweak * git's gitting on my nerves * some small tweaks * don't need these anymore * makes some stuff required * changes the meth recipe to arbitary bullshit to get the yaml thingy to leave me alone goddamnit * extremely minor change * removes overdose, because however it's gonna be done, it's definitely not my way * i should really double check every key I press * hm * sigh, I should be more thorough with looking at error messages. * beenus * gay sex is gay * this one goes out to bingo * reviews * not sure why status lifetime description wasn't being commited * Update MovespeedModifierMetabolism.cs Co-authored-by: mirrorcult <notzombiedude@gmail.com> * adds VV to component variables * rebalances meth, and makes the completely unrealistic recipe properly work now * meth effects should go away now or something do you think I test these changes before pushing?? * ah yes, orginization * adds proper recipe and prequisite chemicals * fixes linter hopefully * Update chemicals.yml * a * starts working on prediction * thing * predmiction?? * changes thing * does it properly * uses timespan instead of timer * uses dif timers and adds a system * updates robust and tweaks a small thing * Fixes * "Fix" prediction * starts changing the timer to timespans to avoid icky on timer end * okay fixes the check thing but now meth is broken and I don't know why * fixes predicition (partially) * Delete ContentNetIDs.cs whoops * some changes advised by sloth * certified scalycode fix right here * moves resettimer to the metabolism to make it less oop stinky * moves resettimer to the metabolism to make it less oop stinky * gamin * when the is * updates mth colour to be accurate because I forgot * abc hard ok * everything should be up to date now * makes MovespeedModifierMetabolism ECS and cleans up some other stuff * does a fixy wixy * fix thing * Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth" This reverts commit 62886561098be02f9adb6352f4e858a8269d5bd5, reversing changes made to ca34fffb5b7a40f19aec7b9e4bc37bdeab914bc1. * Revert "Revert "Merge branch 'master' of https://github.com/space-wizards/space-station-14 into meth"" This reverts commit 4f550da19656abfd0be05f818fc6b7100252d5b8. * fix hopefully * updates metabolism to works with mirror's fancy new system * updates yaml + tweaks * bruh * yaml moment * :yaml moment * Revert " :yaml moment" This reverts commit 8cb51573c64db76d989de22acdbb9c50b2c6d052. * 99th commit yay, also I need to not do this * removes something that I don't need * makes system work with this and gets rid of unnesescary check * make the update only work on active components * oops * Cleanup * alphabetise this shit * Touchup * Woops stupid alloc by me * Nerf nyoom for now Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> * Automatic changelog update * Random offset for DefaultGrid every round (#4411) * Random offset for DefaultGrid every round This is useful to make coders aware of entitycoordinates and mapcoordinates being different and to help spot problems early. It also puts the onus of fixing positioning bugs back onto the original coder rather than someone else if they happen to spot it. * Fix clickable test * Fix entitysystemextensions * Automatic changelog update * Document a few atmos classes. * Update submodule We do a little bit of debugging * Make pulling feel less crap (#4414) Something something pulling refactor someday * Automatic changelog update * Comment joint prediction * Add CVar for random grid offset, disable it by default. * Fixes not taking pressure damage in space. Fixes #4415 * Automatic changelog update * Adds an alternate jumpsuit for botany (#4419) * Adds an alternate botanists jumpsuit * Updated license information * Automatic changelog update * Added two new small areas to maintenence (#4359) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Updated meta.json to standard * Update meta.json to standard * a * Revert "Update meta.json to standard" This reverts commit4c6702f17b. * Revert "Updated meta.json to standard" This reverts commit8ea7a3ad1f. * fix rsi * proper sprites + visualizes nicely * Removes broken new-line markers from a few desc. * Fixes a localization error with solution container descriptions * construction * reviews + test * remove SetLayerVisibility, doesnt work for some reason * swept moment * leftover * Automatic changelog update * Fix can't return to body bug (#4424) * Automatic changelog update * Update submodule * Fix gas tile overlays on shuttles * Offset station on roundstart again * Fix PlaceableSurface incorrect coordinate usage. It set world position to entity coordinate positions... * Automatic changelog update * Fix pickup animation incorrect coordinate usage. Animation finalPosition was world position, while initialPosition was local position. * Automatic changelog update * Pointing coordinate fixes. * Automatic changelog update * Further pickup animation improvements. * Adds Science Windoors (#4433) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Gave CMO a Hardsuit (#4434) Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fixed station engineer table spawn (#4436) * Maps in windoors (#4432) * Automatic changelog update * Losing a head doesn't mean you lose your eyes #3956 #4061 (#4225) Co-authored-by: Michael Will <will_m@outlook.de> * Automatic changelog update * Adds windoors for security and the brig. (#4441) * Automatic changelog update * Remaps Chemistry and Security, and some Mapping Fixes (#4442) * Automatic changelog update * Made the cloning pod and medical scanner constructible (#4439) * Made the cloning machine pod constructable * Added everything like I did but with the Medical Scanner Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> * Automatic changelog update * Fix fixed-point format specifier in PowerCellComponent * Update submodule * Actually update submodule The last one was a test to check if you were paying attention. * Update maps for grid collisions (#4450) * Update submodule * Fixes the windoor in science. (#4444) * Automatic changelog update * Remove IActionBlocker.CanMove (#4449) * Remove IActionBlocker.CanMove Ported the remainders over to using MovementAttemptEvent which should also help make mob movement a bit faster. * Make that check faster * Added restrictions for what can be inserted into most belts (#4367) * Belts now restrict what can be inserted into them * Bandolier now only holds shotgun shells * Tiny typo * Another tiny typo * Automatic changelog update * Fix indentation * Fix stuff * Fix gas canister * Organize gas canister prototype * Fix audio occlusion This was previously being done on every SoundComponent. * Call SoundSystem instead * Parents crowbar-red and merges RSIs * Deletes old crowbar_red.rsi * Abstracts BasePlushie and ReagentContainerBase * Adds missing suffixes to debug items and tags them all * Crematorium now makes a noise on start and during cremation (#4459) * Automatic changelog update * Refactor disposals to ECS (#4418) * ECS up disposals Also significantly reduced its CPU usage. * Make update significantly less S L O W * Start units pressurised * Client-side flush lerping * Fix powered not toggling UI * Fix flush button * InteractUsing * Minor optimisations * Fix collisions * Make visual state ECS * Almost done with shared * Most stuff moved * Optimise item sleeping * Automatic changelog update * Fix door sound dampening (#4453) * Completely fix NPC pathfinding Through rigorous investigation and hard work. * Implement Entity List Display and rework StorageComponent window (#4140) * Create EntityListDisplay * Rework ClientStorage window * Add styling * Remove unnecessary colors * Rename list * Make scrollbar push content * Change children update a bit * Add old index * Localize ClientStorageComponent * Add size return * Remove spaces * Fix usings * Fix tool sounds. Fixes #4465 * Automatic changelog update * Fix missing sounds (#4466) * Fix missing sounds * Make SoundHitSpecies fallback to SoundHit * Fix crayon YAML * Update PlaySoundBehavior YAML * Fix required * Update README.md * Fix taser physics (#4470) * Increase MoverController performance (#4448) Should be a decent amount; rest will come from removing IActionBlocker. * Remove throwing fixture error * Update submodule * Fix sound crash when making foam (#4476) * Automatic changelog update * Centers some sprites * Fix showatmos * Fix tests. Flashlight RSI state names had been changed, and some places weren't updated properly * Remove pillcomponent (#4469) * Remove PillComponent * Make food without any solution left delete and create trash * Replace PillComponent references with a Pill tag * Clean up * Add swallow message to food * Change to eatMessage override * Change FoodComponent transferAmount to nullable * Change properties to private * ItemCabinetVisualizer uses layers (#4445) * ItemCabinetVisualizer uses layers * Reviews applied * Fixes the fireaxe cabinet as well * I'm dumb * Fixes bedsheets being unpickupable (#4479) * Automatic changelog update * Adds inhands for crayons and the crayon box (#4481) * Automatic changelog update * Fixes cigarette animations and matches now have lit/unlit inhand sprites (#4480) * Automatic changelog update * Adds plant clippers and changes hydro tool sprites to be more consistent (#4482) * Adds plant clippers * Updates sycthe, hoe and spade sprites * Adds inhands for radio/walkietalkie (#4483) * Adds inhands for radio/walkietalkie and separates layers * License thingy * Fixes test * Can now equip fireaxe, claymore, spear and baseball back on your back (#4484) * Can equip spears and claymores on your back now * Adds fireaxe and baseball bat back equip * Automatic changelog update * Makes Match[sticks/box] ECS, Makes Matchsticks ignite plasma * am big dumdum pls no shed * Owner Transform to Owner in SoundSystem calls (#4460) * Owner Transform to Owner * Owner Transform to Owner minor fixes * Improve hand pickup code This way I can break EntityCoordinates' API without breaking content. BWAHAHAHAHAH! * Update submodule * Version v0.5.11 does not exist * Update submodule We don't talk about v0.5.12 either. * Update submodule For the last time * Adds duck-related content and a seclite (#4489) * Added rubber ducky * Adds ducky slippers * Adds seclite * Update Resources/Textures/Objects/Tools/seclite.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Fun/ducky.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * The duck slippers now quack as you walk Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Automatic changelog update * Adds the ability to assign equip sounds in ClothingComponent (#4485) * Initial * Works (Kinda) * Polish * Reviews * Removes vending inventory desc and adds missing vending machine descriptions (#4493) * Removes inventory descriptions * Adds missing vending machine descriptions using inventory descriptions * Woops missed a file * Automatic changelog update * Adds a ton more inhands (#4488) * Removed useless loc and added inhands for some lamps * Adds a ton of inhands to the game * Actually adds the pill inhand * Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> * Added open/close/stacklayers for Matchbox and inhands (#4496) * Added open/close/stacklayers for Matchbox * Added inhands for matchbox * What am I a clown not gonna leave no indent spaces * Adds sound to fire extinguisher safety (#4494) * Automatic changelog update * Adds a 6pack of Cola (#4499) * Adds a 6pack of Cola * Revert "Adds a 6pack of Cola" This reverts commit 99f024b94ab3c684ce62e28018bd0fe2f26a2e09. * Revert "Revert "Adds a 6pack of Cola"" This reverts commit 9e3d31e41c8ea61a962ad7d4d3c0ea7124e82653. * Automatic changelog update * Fix H-pulling? (#4425) In retrospect the answer is easy, but man this took a while. * Automatic changelog update * Makes DiceComponent ECS * Makes PlaceableSurface ECS * Added classic announcement sound to announcements (#4504) * Automatic changelog update * Refactors throw events, makes cream pies ECS (#4500) * Automatic changelog update * Port the tumbler from Box2D (#4486) * Subscribe TransformComponent events by-ref (#4478) * Add Alt-click functionality (#4497) * Fix ItemSlot Bug * Add Alt-use Key * Fix TransferAmount window bug * Alt-click functionality * Added AltInteract verbs * Add new verbs * verb icons * Changed Comments * Change Comments * Fix disposal verbs * Changed Get...() to Get...OrNull() * Changed alt-interact combat behaviour * Update verb icons * Inventory interact event * Add Alt+E secondary binding * Add alt-z keybinding * Rename AltUse -> AltActivateItemInWorld * Automatic changelog update * Fixes chocolate/energy bar (#4503) * Fix merge issues Co-authored-by: Galactic Chimp <GalacticChimpanzee@gmail.com> Co-authored-by: Kara Dinyes <lunarautomaton6@gmail.com> Co-authored-by: SethLafuente <84478872+SethLafuente@users.noreply.github.com> Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com> Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: ScalyChimp <72841710+scaly-chimp@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: Jaskanbe <86671825+Jaskanbe@users.noreply.github.com> Co-authored-by: scrato <Mickaello2003@gmx.de> Co-authored-by: Michael Will <will_m@outlook.de> Co-authored-by: TimrodDX <timrod@gmail.com> Co-authored-by: Leon Friedrich <60421075+leonsfriedrich@users.noreply.github.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Paul <ritter.paul1+git@googlemail.com> Co-authored-by: ColdAutumnRain <73938872+ColdAutumnRain@users.noreply.github.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com> Co-authored-by: Galactic Chimp <GalacticChimpanzee@gmail.com> Co-authored-by: Kara Dinyes <lunarautomaton6@gmail.com> Co-authored-by: Leon Friedrich <leonsfriedrich@gmail.com> Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com> Co-authored-by: SethLafuente <84478872+SethLafuente@users.noreply.github.com> Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com> Co-authored-by: Swept <sweptwastaken@protonmail.com> Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com> Co-authored-by: metalgearsloth <metalgearsloth@gmail.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Vera Aguilera Puerto <gradientvera@outlook.com> Co-authored-by: Vera Aguilera Puerto <6766154+Zumorica@users.noreply.github.com> Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com> Co-authored-by: ScalyChimp <72841710+scaly-chimp@users.noreply.github.com> Co-authored-by: mirrorcult <notzombiedude@gmail.com> Co-authored-by: Jaskanbe <86671825+Jaskanbe@users.noreply.github.com> Co-authored-by: scrato <Mickaello2003@gmx.de> Co-authored-by: Michael Will <will_m@outlook.de> Co-authored-by: TimrodDX <timrod@gmail.com> Co-authored-by: Leon Friedrich <60421075+leonsfriedrich@users.noreply.github.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Paul <ritter.paul1+git@googlemail.com> Co-authored-by: ColdAutumnRain <73938872+ColdAutumnRain@users.noreply.github.com> Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: 20kdc <asdd2808@gmail.com> Co-authored-by: Alex Evgrashin <aevgrashin@yandex.ru>
This commit is contained in:
Silver
@@ -18,67 +18,242 @@ namespace Content.Shared.Damage.Components
|
||||
{
|
||||
/// <summary>
|
||||
/// Component that allows attached entities to take damage.
|
||||
/// This basic version never dies (thus can take an indefinite amount of damage).
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// The supported damage types are specified using a <see cref="DamageContainerPrototype"/>s. DamageContainers
|
||||
/// are effectively a dictionary of damage types and damage numbers, along with functions to modify them. Damage
|
||||
/// groups are collections of damage types. A damage group is 'applicable' to a damageable component if it
|
||||
/// supports at least one damage type in that group. A subset of these groups may be 'fully supported' when every
|
||||
/// member of the group is supported by the container. This basic version never dies (thus can take an
|
||||
/// indefinite amount of damage).
|
||||
/// </remarks>
|
||||
[RegisterComponent]
|
||||
[ComponentReference(typeof(IDamageableComponent))]
|
||||
[NetworkedComponent()]
|
||||
public class DamageableComponent : Component, IDamageableComponent, IRadiationAct, ISerializationHooks
|
||||
{
|
||||
public override string Name => "Damageable";
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
=======
|
||||
|
||||
=======
|
||||
>>>>>>> fix a few bugs
|
||||
public override string Name => "Damageable";
|
||||
public override uint? NetID => ContentNetIDs.DAMAGEABLE;
|
||||
|
||||
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
||||
<<<<<<< HEAD
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
>>>>>>> update damagecomponent across shared and server
|
||||
=======
|
||||
>>>>>>> Fix Merge issues
|
||||
// TODO define these in yaml?
|
||||
public const string DefaultResistanceSet = "defaultResistances";
|
||||
public const string DefaultDamageContainer = "metallicDamageContainer";
|
||||
=======
|
||||
/// <summary>
|
||||
/// The main damage dictionary. All the damage information is stored in this dictionary with <see cref="DamageTypePrototype"/> keys.
|
||||
/// </summary>
|
||||
private Dictionary<DamageTypePrototype, int> _damageDict = new();
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
private readonly Dictionary<DamageType, int> _damageList = DamageTypeExtensions.ToNewDictionary();
|
||||
|
||||
[DataField("resistances")] public string ResistanceSetId = DefaultResistanceSet;
|
||||
|
||||
// TODO DAMAGE Use as default values, specify overrides in a separate property through yaml for better (de)serialization
|
||||
[ViewVariables] [DataField("damageContainer")] public string DamageContainerId { get; set; } = DefaultDamageContainer;
|
||||
=======
|
||||
[DataField("resistances")]
|
||||
public string ResistanceSetId { get; set; } = "defaultResistances";
|
||||
|
||||
[ViewVariables] public ResistanceSet Resistances { get; set; } = new();
|
||||
>>>>>>> Merge fixes
|
||||
|
||||
// TODO DAMAGE Cache this
|
||||
[ViewVariables] public int TotalDamage => _damageList.Values.Sum();
|
||||
// TODO DAMAGE Use as default values, specify overrides in a separate property through yaml for better (de)serialization
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
[ViewVariables] [DataField("damageContainer")] public string DamageContainerId { get; set; } = DefaultDamageContainer;
|
||||
=======
|
||||
|
||||
/// <summary>
|
||||
/// The main damage dictionary. All the damage information is stored in this dictionary with <see cref="DamageTypePrototype"/> keys.
|
||||
/// </summary>
|
||||
private Dictionary<DamageTypePrototype, int> _damageDict = new();
|
||||
|
||||
[DataField("resistances")]
|
||||
public string ResistanceSetId { get; set; } = "defaultResistances";
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
|
||||
[ViewVariables] public ResistanceSet Resistances { get; set; } = new();
|
||||
=======
|
||||
[ViewVariables]
|
||||
[DataField("damageContainer")]
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public string DamageContainerId { get; set; } = DefaultDamageContainer;
|
||||
>>>>>>> fix a few bugs
|
||||
|
||||
// TODO DAMAGE Use as default values, specify overrides in a separate property through yaml for better (de)serialization
|
||||
[ViewVariables]
|
||||
[DataField("damageContainer")]
|
||||
public string DamageContainerId { get; set; } = "metallicDamageContainer";
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageClass, int> DamageClasses => _damageList.ToClassDictionary();
|
||||
=======
|
||||
// TODO DAMAGE Cache this
|
||||
// When moving logic from damageableComponent --> Damage System, make damageSystem update these on damage change.
|
||||
[ViewVariables] public int TotalDamage => _damageDict.Values.Sum();
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageTypePrototype, int> GetDamagePerType => _damageDict;
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageGroupPrototype, int> GetDamagePerApplicableGroup => DamageTypeDictToDamageGroupDict(_damageDict, ApplicableDamageGroups);
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageGroupPrototype, int> GetDamagePerFullySupportedGroup => DamageTypeDictToDamageGroupDict(_damageDict, FullySupportedDamageGroups);
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageType, int> DamageTypes => _damageList;
|
||||
// Whenever sending over network, also need a <string, int> dictionary
|
||||
// TODO DAMAGE MAYBE Cache this?
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerApplicableGroupIDs => ConvertDictKeysToIDs(GetDamagePerApplicableGroup);
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerFullySupportedGroupIDs => ConvertDictKeysToIDs(GetDamagePerFullySupportedGroup);
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerTypeIDs => ConvertDictKeysToIDs(_damageDict);
|
||||
|
||||
[ViewVariables] public HashSet<DamageType> SupportedTypes { get; } = new();
|
||||
// TODO PROTOTYPE Replace these datafield variables with prototype references, once they are supported.
|
||||
// Also requires appropriate changes in OnExplosion() and RadiationAct()
|
||||
[ViewVariables]
|
||||
[DataField("radiationDamageTypes")]
|
||||
public List<string> RadiationDamageTypeIDs { get; set; } = new() {"Radiation"};
|
||||
[ViewVariables]
|
||||
[DataField("explosionDamageTypes")]
|
||||
public List<string> ExplosionDamageTypeIDs { get; set; } = new() { "Piercing", "Heat" };
|
||||
|
||||
[ViewVariables] public HashSet<DamageClass> SupportedClasses { get; } = new();
|
||||
public HashSet<DamageGroupPrototype> ApplicableDamageGroups { get; } = new();
|
||||
|
||||
<<<<<<< HEAD
|
||||
public bool SupportsDamageClass(DamageClass @class)
|
||||
{
|
||||
return SupportedClasses.Contains(@class);
|
||||
}
|
||||
=======
|
||||
public HashSet<DamageGroupPrototype> SupportedGroups { get; } = new();
|
||||
=======
|
||||
public string DamageContainerId { get; set; } = "metallicDamageContainer";
|
||||
|
||||
public bool SupportsDamageType(DamageType type)
|
||||
// TODO DAMAGE Cache this
|
||||
// When moving logic from damageableComponent --> Damage System, make damageSystem update these on damage change.
|
||||
[ViewVariables] public int TotalDamage => _damageDict.Values.Sum();
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageTypePrototype, int> GetDamagePerType => _damageDict;
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageGroupPrototype, int> GetDamagePerApplicableGroup => DamageTypeDictToDamageGroupDict(_damageDict, ApplicableDamageGroups);
|
||||
[ViewVariables] public IReadOnlyDictionary<DamageGroupPrototype, int> GetDamagePerFullySupportedGroup => DamageTypeDictToDamageGroupDict(_damageDict, FullySupportedDamageGroups);
|
||||
|
||||
// Whenever sending over network, also need a <string, int> dictionary
|
||||
// TODO DAMAGE MAYBE Cache this?
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerApplicableGroupIDs => ConvertDictKeysToIDs(GetDamagePerApplicableGroup);
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerFullySupportedGroupIDs => ConvertDictKeysToIDs(GetDamagePerFullySupportedGroup);
|
||||
public IReadOnlyDictionary<string, int> GetDamagePerTypeIDs => ConvertDictKeysToIDs(_damageDict);
|
||||
|
||||
// TODO PROTOTYPE Replace these datafield variables with prototype references, once they are supported.
|
||||
// Also requires appropriate changes in OnExplosion() and RadiationAct()
|
||||
[ViewVariables]
|
||||
[DataField("radiationDamageTypes")]
|
||||
public List<string> RadiationDamageTypeIDs { get; set; } = new() {"Radiation"};
|
||||
[ViewVariables]
|
||||
[DataField("explosionDamageTypes")]
|
||||
public List<string> ExplosionDamageTypeIDs { get; set; } = new() { "Piercing", "Heat" };
|
||||
|
||||
public HashSet<DamageGroupPrototype> ApplicableDamageGroups { get; } = new();
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
public HashSet<DamageGroupPrototype> FullySupportedDamageGroups { get; } = new();
|
||||
|
||||
public HashSet<DamageTypePrototype> SupportedDamageTypes { get; } = new();
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public bool SupportsDamageClass(DamageGroupPrototype damageGroup)
|
||||
{
|
||||
return SupportedTypes.Contains(type);
|
||||
return SupportedGroups.Contains(damageGroup);
|
||||
>>>>>>> Merge fixes
|
||||
}
|
||||
=======
|
||||
public HashSet<DamageGroupPrototype> FullySupportedDamageGroups { get; } = new();
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
|
||||
public HashSet<DamageTypePrototype> SupportedDamageTypes { get; } = new();
|
||||
|
||||
=======
|
||||
>>>>>>> update damagecomponent across shared and server
|
||||
protected override void Initialize()
|
||||
{
|
||||
base.Initialize();
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
var prototypeManager = IoCManager.Resolve<IPrototypeManager>();
|
||||
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
// TODO DAMAGE Serialize damage done and resistance changes
|
||||
var damagePrototype = prototypeManager.Index<DamageContainerPrototype>(DamageContainerId);
|
||||
var damageContainerPrototype = _prototypeManager.Index<DamageContainerPrototype>(DamageContainerId);
|
||||
|
||||
ApplicableDamageGroups.Clear();
|
||||
FullySupportedDamageGroups.Clear();
|
||||
SupportedDamageTypes.Clear();
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
SupportedClasses.Clear();
|
||||
SupportedTypes.Clear();
|
||||
=======
|
||||
=======
|
||||
>>>>>>> fix a few bugs
|
||||
_prototypeManager = IoCManager.Resolve<IPrototypeManager>();
|
||||
=======
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
// TODO DAMAGE Serialize damage done and resistance changes
|
||||
var damageContainerPrototype = _prototypeManager.Index<DamageContainerPrototype>(DamageContainerId);
|
||||
>>>>>>> update damagecomponent across shared and server
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
DamageContainerId = damagePrototype.ID;
|
||||
SupportedClasses.UnionWith(damagePrototype.SupportedClasses);
|
||||
SupportedTypes.UnionWith(damagePrototype.SupportedTypes);
|
||||
=======
|
||||
SupportedGroups.Clear();
|
||||
SupportedTypes.Clear();
|
||||
=======
|
||||
ApplicableDamageGroups.Clear();
|
||||
FullySupportedDamageGroups.Clear();
|
||||
SupportedDamageTypes.Clear();
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
var resistancePrototype = prototypeManager.Index<ResistanceSetPrototype>(ResistanceSetId);
|
||||
Resistances = new ResistanceSet(resistancePrototype);
|
||||
//Get Damage groups/types from the DamageContainerPrototype.
|
||||
DamageContainerId = damageContainerPrototype.ID;
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
SupportedGroups.UnionWith(damageContainerPrototype.SupportedDamageGroups);
|
||||
SupportedTypes.UnionWith(damageContainerPrototype.SupportedDamageTypes);
|
||||
>>>>>>> Merge fixes
|
||||
=======
|
||||
ApplicableDamageGroups.UnionWith(damageContainerPrototype.ApplicableDamageGroups);
|
||||
FullySupportedDamageGroups.UnionWith(damageContainerPrototype.FullySupportedDamageGroups);
|
||||
SupportedDamageTypes.UnionWith(damageContainerPrototype.SupportedDamageTypes);
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
=======
|
||||
//Get Damage groups/types from the DamageContainerPrototype.
|
||||
DamageContainerId = damageContainerPrototype.ID;
|
||||
ApplicableDamageGroups.UnionWith(damageContainerPrototype.ApplicableDamageGroups);
|
||||
FullySupportedDamageGroups.UnionWith(damageContainerPrototype.FullySupportedDamageGroups);
|
||||
SupportedDamageTypes.UnionWith(damageContainerPrototype.SupportedDamageTypes);
|
||||
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
//initialize damage dictionary 0 damage
|
||||
_damageDict = new(SupportedDamageTypes.Count);
|
||||
foreach (var type in SupportedDamageTypes)
|
||||
{
|
||||
_damageDict.Add(type, 0);
|
||||
}
|
||||
|
||||
Resistances = new ResistanceSet(_prototypeManager.Index<ResistanceSetPrototype>(ResistanceSetId));
|
||||
}
|
||||
|
||||
protected override void Startup()
|
||||
@@ -88,9 +263,25 @@ namespace Content.Shared.Damage.Components
|
||||
ForceHealthChangedEvent();
|
||||
}
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
=======
|
||||
public DamageTypePrototype GetDamageType(string ID)
|
||||
{
|
||||
return _prototypeManager.Index<DamageTypePrototype>(ID);
|
||||
}
|
||||
|
||||
public DamageGroupPrototype GetDamageGroup(string ID)
|
||||
{
|
||||
return _prototypeManager.Index<DamageGroupPrototype>(ID);
|
||||
}
|
||||
|
||||
>>>>>>> update damagecomponent across shared and server
|
||||
=======
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
public override ComponentState GetComponentState(ICommonSession player)
|
||||
{
|
||||
return new DamageableComponentState(_damageList);
|
||||
return new DamageableComponentState(GetDamagePerTypeIDs);
|
||||
}
|
||||
|
||||
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
|
||||
@@ -102,49 +293,104 @@ namespace Content.Shared.Damage.Components
|
||||
return;
|
||||
}
|
||||
|
||||
_damageList.Clear();
|
||||
_damageDict.Clear();
|
||||
|
||||
foreach (var (type, damage) in state.DamageList)
|
||||
foreach (var (type, damage) in state.DamageDict)
|
||||
{
|
||||
_damageList[type] = damage;
|
||||
_damageDict[_prototypeManager.Index<DamageTypePrototype>(type)] = damage;
|
||||
}
|
||||
}
|
||||
|
||||
public int GetDamage(DamageType type)
|
||||
public int GetDamage(DamageTypePrototype type)
|
||||
{
|
||||
return _damageList.GetValueOrDefault(type);
|
||||
return GetDamagePerType.GetValueOrDefault(type);
|
||||
}
|
||||
|
||||
public bool TryGetDamage(DamageType type, out int damage)
|
||||
public bool TryGetDamage(DamageTypePrototype type, out int damage)
|
||||
{
|
||||
return _damageList.TryGetValue(type, out damage);
|
||||
return GetDamagePerType.TryGetValue(type, out damage);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public int GetDamage(DamageClass @class)
|
||||
{
|
||||
if (!SupportsDamageClass(@class))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
=======
|
||||
public int GetDamage(DamageGroupPrototype group)
|
||||
{
|
||||
return GetDamagePerApplicableGroup.GetValueOrDefault(group);
|
||||
}
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
public int GetDamage(DamageGroupPrototype group)
|
||||
{
|
||||
return GetDamagePerApplicableGroup.GetValueOrDefault(group);
|
||||
}
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
|
||||
var damage = 0;
|
||||
public bool TryGetDamage(DamageGroupPrototype group, out int damage)
|
||||
{
|
||||
return GetDamagePerApplicableGroup.TryGetValue(group, out damage);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
foreach (var type in @class.ToTypes())
|
||||
{
|
||||
damage += GetDamage(type);
|
||||
}
|
||||
|
||||
return damage;
|
||||
=======
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
public bool IsApplicableDamageGroup(DamageGroupPrototype group)
|
||||
{
|
||||
return ApplicableDamageGroups.Contains(group);
|
||||
}
|
||||
|
||||
public bool IsFullySupportedDamageGroup(DamageGroupPrototype group)
|
||||
{
|
||||
return FullySupportedDamageGroups.Contains(group);
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
}
|
||||
|
||||
public bool IsSupportedDamageType(DamageTypePrototype type)
|
||||
{
|
||||
return SupportedDamageTypes.Contains(type);
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
}
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
|
||||
<<<<<<< HEAD
|
||||
public bool IsSupportedDamageType(DamageTypePrototype type)
|
||||
{
|
||||
return SupportedDamageTypes.Contains(type);
|
||||
}
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public bool TryGetDamage(DamageClass @class, out int damage)
|
||||
{
|
||||
if (!SupportsDamageClass(@class))
|
||||
=======
|
||||
public bool TrySetDamage(DamageGroupPrototype group, int newValue)
|
||||
{
|
||||
if (!ApplicableDamageGroups.Contains(group))
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
public bool TrySetDamage(DamageGroupPrototype group, int newValue)
|
||||
{
|
||||
if (!ApplicableDamageGroups.Contains(group))
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
damage = 0;
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
damage = GetDamage(@class);
|
||||
return true;
|
||||
}
|
||||
@@ -156,44 +402,90 @@ namespace Content.Shared.Damage.Components
|
||||
/// True if successful, false if this container does not support that type.
|
||||
/// </returns>
|
||||
public bool TrySetDamage(DamageType type, int newValue)
|
||||
{
|
||||
=======
|
||||
if (newValue < 0)
|
||||
{
|
||||
// invalid value
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (var type in group.DamageTypes)
|
||||
{
|
||||
TrySetDamage(type, newValue);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool TrySetAllDamage(int newValue)
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
if (newValue < 0)
|
||||
{
|
||||
// invalid value
|
||||
return false;
|
||||
}
|
||||
|
||||
foreach (var type in group.DamageTypes)
|
||||
{
|
||||
TrySetDamage(type, newValue);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool TrySetAllDamage(int newValue)
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
if (newValue < 0)
|
||||
{
|
||||
// invalid value
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
var damageClass = type.ToClass();
|
||||
|
||||
if (SupportedClasses.Contains(damageClass))
|
||||
=======
|
||||
if (SupportedTypes.Contains(type))
|
||||
>>>>>>> Merge fixes
|
||||
=======
|
||||
foreach (var type in SupportedDamageTypes)
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
foreach (var type in SupportedDamageTypes)
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
var old = _damageList[type] = newValue;
|
||||
_damageList[type] = newValue;
|
||||
|
||||
var delta = newValue - old;
|
||||
var datum = new DamageChangeData(type, newValue, delta);
|
||||
var data = new List<DamageChangeData> {datum};
|
||||
|
||||
OnHealthChanged(data);
|
||||
|
||||
return true;
|
||||
TrySetDamage(type, newValue);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
return false;
|
||||
}
|
||||
|
||||
public void Heal(DamageType type)
|
||||
{
|
||||
SetDamage(type, 0);
|
||||
=======
|
||||
return true;
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
return true;
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
}
|
||||
|
||||
public void Heal()
|
||||
public bool TryChangeDamage(DamageTypePrototype type, int amount, bool ignoreDamageResistances = false)
|
||||
{
|
||||
foreach (var type in SupportedTypes)
|
||||
// Check if damage type is supported, and get the current value if it is.
|
||||
if (!GetDamagePerType.TryGetValue(type, out var current))
|
||||
{
|
||||
Heal(type);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public bool ChangeDamage(
|
||||
DamageType type,
|
||||
int amount,
|
||||
@@ -202,13 +494,19 @@ namespace Content.Shared.Damage.Components
|
||||
DamageChangeParams? extraParams = null)
|
||||
{
|
||||
if (!SupportsDamageType(type))
|
||||
=======
|
||||
if (amount == 0)
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
if (amount == 0)
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Apply resistances (does nothing if amount<0)
|
||||
var finalDamage = amount;
|
||||
|
||||
if (!ignoreResistances)
|
||||
if (!ignoreDamageResistances)
|
||||
{
|
||||
finalDamage = Resistances.CalculateDamage(type, amount);
|
||||
}
|
||||
@@ -216,24 +514,23 @@ namespace Content.Shared.Damage.Components
|
||||
if (finalDamage == 0)
|
||||
return false;
|
||||
|
||||
if (!_damageList.TryGetValue(type, out var current))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
// Are we healing below zero?
|
||||
if (current + finalDamage < 0)
|
||||
{
|
||||
if (current == 0)
|
||||
// Damage type is supported, but there is nothing to do
|
||||
return false;
|
||||
_damageList[type] = 0;
|
||||
|
||||
// Cap healing down to zero
|
||||
_damageDict[type] = 0;
|
||||
finalDamage = -current;
|
||||
}
|
||||
else
|
||||
{
|
||||
_damageList[type] = current + finalDamage;
|
||||
_damageDict[type] = current + finalDamage;
|
||||
}
|
||||
|
||||
current = _damageList[type];
|
||||
current = _damageDict[type];
|
||||
|
||||
var datum = new DamageChangeData(type, current, finalDamage);
|
||||
var data = new List<DamageChangeData> {datum};
|
||||
@@ -243,6 +540,8 @@ namespace Content.Shared.Damage.Components
|
||||
return true;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public bool ChangeDamage(DamageClass @class, int amount, bool ignoreResistances,
|
||||
IEntity? source = null,
|
||||
DamageChangeParams? extraParams = null)
|
||||
@@ -252,98 +551,149 @@ namespace Content.Shared.Damage.Components
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
var types = @class.ToTypes();
|
||||
=======
|
||||
var types = damageGroup.DamageTypes.ToArray();
|
||||
>>>>>>> Merge fixes
|
||||
=======
|
||||
public bool TryChangeDamage(DamageGroupPrototype group, int amount, bool ignoreDamageResistances = false)
|
||||
{
|
||||
var types = group.DamageTypes.ToArray();
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
public bool TryChangeDamage(DamageGroupPrototype group, int amount, bool ignoreDamageResistances = false)
|
||||
{
|
||||
var types = group.DamageTypes.ToArray();
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
|
||||
if (amount < 0)
|
||||
{
|
||||
// Changing multiple types is a bit more complicated. Might be a better way (formula?) to do this,
|
||||
// but essentially just loops between each damage category until all healing is used up.
|
||||
var healingLeft = -amount;
|
||||
var healThisCycle = 1;
|
||||
// We are Healing. Keep track of how much we can hand out (with a better var name for readability).
|
||||
var availableHealing = -amount;
|
||||
|
||||
// While we have healing left...
|
||||
while (healingLeft > 0 && healThisCycle != 0)
|
||||
// Get total group damage.
|
||||
var damageToHeal = GetDamagePerApplicableGroup[group];
|
||||
<<<<<<< HEAD
|
||||
|
||||
// Is there any damage to even heal?
|
||||
if (damageToHeal == 0)
|
||||
return false;
|
||||
|
||||
=======
|
||||
|
||||
// Is there any damage to even heal?
|
||||
if (damageToHeal == 0)
|
||||
return false;
|
||||
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
// If total healing is more than there is damage, just set to 0 and return.
|
||||
if (damageToHeal <= availableHealing)
|
||||
{
|
||||
// Infinite loop fallback, if no healing was done in a cycle
|
||||
// then exit
|
||||
healThisCycle = 0;
|
||||
|
||||
int healPerType;
|
||||
if (healingLeft < types.Count)
|
||||
{
|
||||
// Say we were to distribute 2 healing between 3
|
||||
// this will distribute 1 to each (and stop after 2 are given)
|
||||
healPerType = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
// Say we were to distribute 62 healing between 3
|
||||
// this will distribute 20 to each, leaving 2 for next loop
|
||||
healPerType = healingLeft / types.Count;
|
||||
}
|
||||
|
||||
foreach (var type in types)
|
||||
{
|
||||
var damage = GetDamage(type);
|
||||
var healAmount = Math.Min(healingLeft, damage);
|
||||
healAmount = Math.Min(healAmount, healPerType);
|
||||
|
||||
ChangeDamage(type, -healAmount, true);
|
||||
healThisCycle += healAmount;
|
||||
healingLeft -= healAmount;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
var damageLeft = amount;
|
||||
|
||||
while (damageLeft > 0)
|
||||
{
|
||||
int damagePerType;
|
||||
|
||||
if (damageLeft < types.Count)
|
||||
{
|
||||
damagePerType = 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
damagePerType = damageLeft / types.Count;
|
||||
TrySetDamage(group, 0);
|
||||
return true;
|
||||
}
|
||||
|
||||
// Partially heal each damage group
|
||||
int healing, damage;
|
||||
foreach (var type in types)
|
||||
{
|
||||
var damageAmount = Math.Min(damagePerType, damageLeft);
|
||||
ChangeDamage(type, damageAmount, true);
|
||||
damageLeft -= damageAmount;
|
||||
if (!_damageDict.TryGetValue(type, out damage))
|
||||
{
|
||||
// Damage Type is not supported. Continue without reducing availableHealing
|
||||
continue;
|
||||
}
|
||||
|
||||
// Apply healing to the damage type. The healing amount may be zero if either damage==0, or if
|
||||
// integer rounding made it zero (i.e., damage is small)
|
||||
healing = (availableHealing * damage) / damageToHeal;
|
||||
TryChangeDamage(type, -healing, ignoreDamageResistances);
|
||||
|
||||
// remove this damage type from the damage we consider for future loops, regardless of how much we
|
||||
// actually healed this type.
|
||||
damageToHeal -= damage;
|
||||
availableHealing -= healing;
|
||||
|
||||
// If we now healed all the damage, exit. otherwise 1/0 and universe explodes.
|
||||
if (damageToHeal == 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// Damage type is supported, there was damage to heal, and resistances were ignored
|
||||
// --> Damage must have changed
|
||||
return true;
|
||||
}
|
||||
else if (amount > 0)
|
||||
{
|
||||
// Resistances may result in no actual damage change. We need to keep track if any damage got through.
|
||||
var damageChanged = false;
|
||||
|
||||
// We are adding damage. Keep track of how much we can dish out (with a better var name for readability).
|
||||
var availableDamage = amount;
|
||||
|
||||
// How many damage types do we have to distribute over?.
|
||||
var numberDamageTypes = types.Length;
|
||||
|
||||
// Apply damage to each damage group
|
||||
int damage;
|
||||
foreach (var type in types)
|
||||
{
|
||||
// Distribute the remaining damage over the remaining damage types.
|
||||
damage = availableDamage / numberDamageTypes;
|
||||
|
||||
// Try apply the damage type. If damage type is not supported, this has no effect.
|
||||
// We also use the return value to check whether any damage has changed
|
||||
damageChanged = TryChangeDamage(type, damage, ignoreDamageResistances) || damageChanged;
|
||||
|
||||
// regardless of whether we dealt damage, reduce the amount to distribute.
|
||||
availableDamage -= damage;
|
||||
numberDamageTypes -= 1;
|
||||
|
||||
}
|
||||
return damageChanged;
|
||||
}
|
||||
|
||||
return true;
|
||||
// amount==0 no damage change.
|
||||
return false;
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public bool SetDamage(DamageType type, int newValue, IEntity? source = null, DamageChangeParams? extraParams = null)
|
||||
=======
|
||||
public bool SetDamage(DamageTypePrototype type, int newValue, IEntity? source = null, DamageChangeParams? extraParams = null)
|
||||
>>>>>>> Fix Merge issues
|
||||
=======
|
||||
public bool TrySetDamage(DamageTypePrototype type, int newValue)
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
public bool TrySetDamage(DamageTypePrototype type, int newValue)
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
if (newValue >= TotalDamage)
|
||||
if (!_damageDict.TryGetValue(type, out var oldValue))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (newValue < 0)
|
||||
{
|
||||
// invalid value
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_damageList.ContainsKey(type))
|
||||
if (oldValue == newValue)
|
||||
{
|
||||
return false;
|
||||
// No health change.
|
||||
// But we are trying to set, not trying to change.
|
||||
return true;
|
||||
}
|
||||
|
||||
var old = _damageList[type];
|
||||
_damageList[type] = newValue;
|
||||
_damageDict[type] = newValue;
|
||||
|
||||
var delta = newValue - old;
|
||||
var delta = newValue - oldValue;
|
||||
var datum = new DamageChangeData(type, 0, delta);
|
||||
var data = new List<DamageChangeData> {datum};
|
||||
|
||||
@@ -356,7 +706,7 @@ namespace Content.Shared.Damage.Components
|
||||
{
|
||||
var data = new List<DamageChangeData>();
|
||||
|
||||
foreach (var type in SupportedTypes)
|
||||
foreach (var type in SupportedDamageTypes)
|
||||
{
|
||||
var damage = GetDamage(type);
|
||||
var datum = new DamageChangeData(type, damage, 0);
|
||||
@@ -372,6 +722,32 @@ namespace Content.Shared.Damage.Components
|
||||
OnHealthChanged(args);
|
||||
}
|
||||
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
=======
|
||||
private IReadOnlyDictionary<DamageGroupPrototype, int> damageListToDamageGroup(IReadOnlyDictionary<DamageTypePrototype, int> damagelist)
|
||||
{
|
||||
var damageGroupDict = new Dictionary<DamageGroupPrototype, int>();
|
||||
int damageGroupSumDamage = 0;
|
||||
int damageTypeDamage = 0;
|
||||
foreach (var damageGroup in SupportedGroups)
|
||||
{
|
||||
damageGroupSumDamage = 0;
|
||||
foreach (var damageType in SupportedTypes)
|
||||
{
|
||||
damageTypeDamage = 0;
|
||||
damagelist.TryGetValue(damageType, out damageTypeDamage);
|
||||
damageGroupSumDamage += damageTypeDamage;
|
||||
}
|
||||
damageGroupDict.Add(damageGroup, damageGroupSumDamage);
|
||||
}
|
||||
|
||||
return damageGroupDict;
|
||||
}
|
||||
|
||||
>>>>>>> Merge fixes
|
||||
=======
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
protected virtual void OnHealthChanged(DamageChangedEventArgs e)
|
||||
{
|
||||
Owner.EntityManager.EventBus.RaiseEvent(EventSource.Local, e);
|
||||
@@ -382,11 +758,25 @@ namespace Content.Shared.Damage.Components
|
||||
Dirty();
|
||||
}
|
||||
|
||||
void IRadiationAct.RadiationAct(float frameTime, SharedRadiationPulseComponent radiation)
|
||||
public void RadiationAct(float frameTime, SharedRadiationPulseComponent radiation)
|
||||
{
|
||||
var totalDamage = Math.Max((int)(frameTime * radiation.RadsPerSecond), 1);
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
ChangeDamage(DamageType.Radiation, totalDamage, false, radiation.Owner);
|
||||
=======
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
foreach (var typeID in RadiationDamageTypeIDs)
|
||||
{
|
||||
TryChangeDamage(_prototypeManager.Index<DamageTypePrototype>(typeID), totalDamage);
|
||||
}
|
||||
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
}
|
||||
|
||||
public void OnExplosion(ExplosionEventArgs eventArgs)
|
||||
@@ -399,19 +789,99 @@ namespace Content.Shared.Damage.Components
|
||||
_ => throw new ArgumentOutOfRangeException()
|
||||
};
|
||||
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
ChangeDamage(DamageType.Piercing, damage, false);
|
||||
ChangeDamage(DamageType.Heat, damage, false);
|
||||
=======
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
foreach (var typeID in ExplosionDamageTypeIDs)
|
||||
{
|
||||
TryChangeDamage(_prototypeManager.Index<DamageTypePrototype>(typeID), damage);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Take a dictionary with <see cref="IPrototype"/> keys and return a dictionary using <see cref="IPrototype.ID"/> as keys
|
||||
/// instead.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Useful when sending damage type and group prototypes dictionaries over the network.
|
||||
/// </remarks>
|
||||
public static IReadOnlyDictionary<string, int>
|
||||
ConvertDictKeysToIDs<TPrototype>(IReadOnlyDictionary<TPrototype, int> prototypeDict)
|
||||
where TPrototype : IPrototype
|
||||
{
|
||||
Dictionary<string, int> idDict = new(prototypeDict.Count);
|
||||
foreach (var entry in prototypeDict)
|
||||
{
|
||||
idDict.Add(entry.Key.ID, entry.Value);
|
||||
}
|
||||
return idDict;
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Convert a dictionary with damage type keys to a dictionary of damage groups keys.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Takes a dictionary with damage types as keys and integers as values, and an iterable list of damage
|
||||
/// groups. Returns a dictionary with damage group keys, with values calculated by adding up the values for
|
||||
/// each damage type in that group. If a damage type is associated with more than one supported damage
|
||||
/// group, it will contribute to the total of each group. Conversely, some damage types may not contribute
|
||||
/// to the new dictionary if their associated group(s) are not in given list of groups.
|
||||
/// </remarks>
|
||||
public static IReadOnlyDictionary<DamageGroupPrototype, int>
|
||||
DamageTypeDictToDamageGroupDict(IReadOnlyDictionary<DamageTypePrototype, int> damageTypeDict, IEnumerable<DamageGroupPrototype> groupKeys)
|
||||
{
|
||||
var damageGroupDict = new Dictionary<DamageGroupPrototype, int>();
|
||||
int damageGroupSumDamage, damageTypeDamage;
|
||||
// iterate over the list of group keys for our new dictionary
|
||||
foreach (var group in groupKeys)
|
||||
{
|
||||
// For each damage type in this group, add up the damage present in the given dictionary
|
||||
damageGroupSumDamage = 0;
|
||||
foreach (var type in group.DamageTypes)
|
||||
{
|
||||
// if the damage type is in the dictionary, add it's damage to the group total.
|
||||
if (damageTypeDict.TryGetValue(type, out damageTypeDamage))
|
||||
{
|
||||
damageGroupSumDamage += damageTypeDamage;
|
||||
}
|
||||
}
|
||||
damageGroupDict.Add(group, damageGroupSumDamage);
|
||||
}
|
||||
return damageGroupDict;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
[Serializable, NetSerializable]
|
||||
public class DamageableComponentState : ComponentState
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< refs/remotes/origin/master
|
||||
public readonly Dictionary<DamageType, int> DamageList;
|
||||
|
||||
public DamageableComponentState(Dictionary<DamageType, int> damageList)
|
||||
=======
|
||||
public readonly IReadOnlyDictionary<string, int> DamageDict;
|
||||
|
||||
public DamageableComponentState(IReadOnlyDictionary<string, int> damageDict)
|
||||
|
||||
>>>>>>> Refactor damageablecomponent update (#4406)
|
||||
=======
|
||||
public readonly IReadOnlyDictionary<string, int> DamageDict;
|
||||
|
||||
public DamageableComponentState(IReadOnlyDictionary<string, int> damageDict)
|
||||
|
||||
>>>>>>> refactor-damageablecomponent
|
||||
{
|
||||
DamageList = damageList;
|
||||
DamageDict = damageDict;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user