mirror of
https://github.com/WWhiteDreamProject/wwdpublic.git
synced 2026-04-17 05:27:38 +03:00
# Description Picked 400 commits (and skipped many, many more) from WizDen since #540. Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby Refactor). --- # TODO - [x] Pick - [x] Compile - [x] Fix runtime errors - [ ] Fix up humanoid profile editor - [ ] Test everything --- # Changelog 🆑 - add: Merged 400 WizDen PRs. Happy testing! --------- Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com> Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com> Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com> Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com> Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com> Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com> Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com> Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com> Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com> Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com> Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com> Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com> Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com> Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com> Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com> Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com> Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com> Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com> Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com> Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com> Co-authored-by: ShadowCommander <shadowjjt@gmail.com> Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com> Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com> Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com> Co-authored-by: Jezithyr <jezithyr@gmail.com> Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com> Co-authored-by: no <165581243+pissdemon@users.noreply.github.com> Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com> Co-authored-by: Ciac32 <aknoxlor@gmail.com> Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com> Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com> Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com> Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com> Co-authored-by: Tayrtahn <tayrtahn@gmail.com> Co-authored-by: nao fujiwara <awkwarddryad@gmail.com> Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com> Co-authored-by: Vasilis <vasilis@pikachu.systems> Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com> Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com> Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com> Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com> Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com> Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com> Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com> Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com> Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com> Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com> Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com> Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com> Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com> Co-authored-by: exincore <me@exin.xyz> Co-authored-by: 0x6273 <0x40@keemail.me> Co-authored-by: Kara <lunarautomaton6@gmail.com> Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com> Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz> Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com> Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com> Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com> Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com> Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com> Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com> Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com> Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com> Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com> Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com> Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com> Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com> Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com> Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com> Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com> Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com> Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com> Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com> Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com> Co-authored-by: ike709 <ike709@users.noreply.github.com> Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com> Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com> Co-authored-by: VMSolidus <evilexecutive@gmail.com> Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com> Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> # Conflicts: # Content.Client/Input/ContentContexts.cs # Content.Client/Lobby/LobbyState.cs # Content.Client/Lobby/UI/HumanoidProfileEditor.xaml # Content.Client/Lobby/UI/LobbyGui.xaml # Content.Client/Lobby/UI/LobbyGui.xaml.cs # Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs # Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml # Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs # Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs # Content.Server/GameTicking/GameTicker.Spawning.cs # Content.Shared/Alert/AlertType.cs # Content.Shared/Input/ContentKeyFunctions.cs # Content.Shared/Preferences/HumanoidCharacterProfile.cs # Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs # Resources/ConfigPresets/EinsteinEngines/default.toml # Resources/Prototypes/Alerts/alerts.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml # Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml # Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml # Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml # Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml # Resources/Prototypes/Voice/speech_emotes.yml # Resources/keybinds.yml
311 lines
11 KiB
C#
311 lines
11 KiB
C#
using Content.Shared.Damage;
|
|
using Content.Shared.Damage.Prototypes;
|
|
using NUnit.Framework;
|
|
using Robust.Shared.IoC;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Serialization.Manager;
|
|
using System.Collections.Generic;
|
|
using Content.Shared.FixedPoint;
|
|
|
|
namespace Content.Tests.Shared
|
|
{
|
|
// Basic tests of various damage prototypes and classes.
|
|
[TestFixture]
|
|
[TestOf(typeof(DamageSpecifier))]
|
|
[TestOf(typeof(DamageModifierSetPrototype))]
|
|
[TestOf(typeof(DamageGroupPrototype))]
|
|
public sealed class DamageTest : ContentUnitTest
|
|
{
|
|
|
|
private static Dictionary<string, float> _resistanceCoefficientDict = new()
|
|
{
|
|
// "missing" blunt entry
|
|
{ "Piercing", -2 },// Turn Piercing into Healing
|
|
{ "Slash", 3 },
|
|
{ "Radiation", 1.5f },
|
|
};
|
|
|
|
private static Dictionary<string, float> _resistanceReductionDict = new()
|
|
{
|
|
{ "Blunt", - 5 },
|
|
// "missing" piercing entry
|
|
{ "Slash", 8 },
|
|
{ "Radiation", 0.5f }, // Fractional adjustment
|
|
};
|
|
|
|
private IPrototypeManager _prototypeManager;
|
|
|
|
private DamageSpecifier _damageSpec;
|
|
|
|
[OneTimeSetUp]
|
|
public void OneTimeSetup()
|
|
{
|
|
IoCManager.Resolve<ISerializationManager>().Initialize();
|
|
_prototypeManager = IoCManager.Resolve<IPrototypeManager>();
|
|
_prototypeManager.Initialize();
|
|
_prototypeManager.LoadString(_damagePrototypes);
|
|
_prototypeManager.ResolveResults();
|
|
|
|
// Create a damage data set
|
|
_damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 6);
|
|
_damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Radiation"), 3);
|
|
_damageSpec += new DamageSpecifier(_prototypeManager.Index<DamageTypePrototype>("Slash"), -1); // already exists in brute
|
|
}
|
|
|
|
//Check that DamageSpecifier will split groups and can do arithmetic operations
|
|
[Test]
|
|
public void DamageSpecifierTest()
|
|
{
|
|
// Create a copy of the damage data
|
|
DamageSpecifier damageSpec = new(_damageSpec);
|
|
|
|
// Check that it properly split up the groups into types
|
|
FixedPoint2 damage;
|
|
Assert.That(damageSpec.GetTotal(), Is.EqualTo(FixedPoint2.New(8)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Radiation", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(3)));
|
|
|
|
// check that integer multiplication works
|
|
damageSpec = damageSpec * 2;
|
|
Assert.That(damageSpec.GetTotal(), Is.EqualTo(FixedPoint2.New(16)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Radiation", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(6)));
|
|
|
|
// check that float multiplication works
|
|
damageSpec = damageSpec * 2.2f;
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(8.8)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(8.8)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4.4)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Radiation", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(13.2)));
|
|
Assert.That(damageSpec.GetTotal(), Is.EqualTo(FixedPoint2.New(8.8 + 8.8 + 4.4 + 13.2)));
|
|
|
|
// check that integer division works
|
|
damageSpec = damageSpec / 2;
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4.4)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4.4)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2.2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Radiation", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(6.6)));
|
|
|
|
// check that float division works
|
|
damageSpec = damageSpec / 2.2f;
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(2)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Radiation", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(3)));
|
|
|
|
// Lets also test the constructor with damage types and damage groups works properly.
|
|
damageSpec = new(_prototypeManager.Index<DamageGroupPrototype>("Brute"), 4);
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Blunt", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Slash", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.33)));
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(1.34))); // doesn't divide evenly, so the 0.01 goes to the last one
|
|
|
|
damageSpec = new(_prototypeManager.Index<DamageTypePrototype>("Piercing"), 4);
|
|
Assert.That(damageSpec.DamageDict.TryGetValue("Piercing", out damage));
|
|
Assert.That(damage, Is.EqualTo(FixedPoint2.New(4)));
|
|
}
|
|
|
|
//Check that DamageSpecifier will be properly adjusted by a resistance set
|
|
[Test]
|
|
public void ModifierSetTest()
|
|
{
|
|
// Create a copy of the damage data
|
|
DamageSpecifier damageSpec = 10 * new DamageSpecifier(_damageSpec);
|
|
|
|
// Create a modifier set
|
|
DamageModifierSetPrototype modifierSet = new()
|
|
{
|
|
Coefficients = _resistanceCoefficientDict,
|
|
FlatReduction = _resistanceReductionDict
|
|
};
|
|
|
|
//damage is initially 20 / 20 / 10 / 30
|
|
//Each time we subtract -5 / 0 / 8 / 0.5
|
|
//then multiply by 1 / -2 / 3 / 1.5
|
|
|
|
// Apply once
|
|
damageSpec = DamageSpecifier.ApplyModifierSet(damageSpec, modifierSet);
|
|
Assert.That(damageSpec.DamageDict["Blunt"], Is.EqualTo(FixedPoint2.New(25)));
|
|
Assert.That(damageSpec.DamageDict["Piercing"], Is.EqualTo(FixedPoint2.New(-40))); // became healing
|
|
Assert.That(damageSpec.DamageDict["Slash"], Is.EqualTo(FixedPoint2.New(6)));
|
|
Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(44.25)));
|
|
|
|
// And again, checking for some other behavior
|
|
damageSpec = DamageSpecifier.ApplyModifierSet(damageSpec, modifierSet);
|
|
Assert.That(damageSpec.DamageDict["Blunt"], Is.EqualTo(FixedPoint2.New(30)));
|
|
Assert.That(damageSpec.DamageDict["Piercing"], Is.EqualTo(FixedPoint2.New(-40))); // resistances don't apply to healing
|
|
Assert.That(!damageSpec.DamageDict.ContainsKey("Slash")); // Reduction reduced to 0, and removed from specifier
|
|
Assert.That(damageSpec.DamageDict["Radiation"], Is.EqualTo(FixedPoint2.New(65.62)));
|
|
}
|
|
|
|
// Default damage Yaml
|
|
private string _damagePrototypes = @"
|
|
- type: damageType
|
|
id: Blunt
|
|
name: damage-type-blunt
|
|
|
|
- type: damageType
|
|
id: Slash
|
|
name: damage-type-slash
|
|
|
|
- type: damageType
|
|
id: Piercing
|
|
name: damage-type-piercing
|
|
|
|
- type: damageType
|
|
id: Heat
|
|
name: damage-type-heat
|
|
|
|
- type: damageType
|
|
id: Shock
|
|
name: damage-type-shock
|
|
|
|
- type: damageType
|
|
id: Cold
|
|
name: damage-type-cold
|
|
|
|
# Poison damage. Generally caused by various reagents being metabolised.
|
|
- type: damageType
|
|
id: Poison
|
|
name: damage-type-poison
|
|
|
|
- type: damageType
|
|
id: Radiation
|
|
name: damage-type-radiation
|
|
|
|
# Damage due to being unable to breathe.
|
|
# Represents not enough oxygen (or equivalent) getting to the blood.
|
|
# Usually healed automatically if entity can breathe
|
|
- type: damageType
|
|
id: Asphyxiation
|
|
name: damage-type-asphyxiation
|
|
|
|
# Damage representing not having enough blood.
|
|
# Represents there not enough blood to supply oxygen (or equivalent).
|
|
- type: damageType
|
|
id: Bloodloss
|
|
name: damage-type-bloodloss
|
|
|
|
- type: damageType
|
|
id: Cellular
|
|
name: damage-type-cellular
|
|
|
|
- type: damageGroup
|
|
id: Brute
|
|
name: damage-group-brute
|
|
damageTypes:
|
|
- Blunt
|
|
- Slash
|
|
- Piercing
|
|
|
|
- type: damageGroup
|
|
id: Burn
|
|
name: damage-group-burn
|
|
damageTypes:
|
|
- Heat
|
|
- Shock
|
|
- Cold
|
|
|
|
# Airloss (sometimes called oxyloss)
|
|
# Caused by asphyxiation or bloodloss.
|
|
# Note that most medicine and damaging effects should probably modify either asphyxiation or
|
|
# bloodloss, not this whole group, unless you have a wonder drug that affects both.
|
|
- type: damageGroup
|
|
id: Airloss
|
|
name: damage-group-airloss
|
|
damageTypes:
|
|
- Asphyxiation
|
|
- Bloodloss
|
|
|
|
# As with airloss, most medicine and damage effects should probably modify either poison or radiation.
|
|
# Though there are probably some radioactive poisons.
|
|
- type: damageGroup
|
|
id: Toxin
|
|
name: damage-group-toxin
|
|
damageTypes:
|
|
- Poison
|
|
- Radiation
|
|
|
|
- type: damageGroup
|
|
id: Genetic
|
|
name: damage-group-genetic
|
|
damageTypes:
|
|
- Cellular
|
|
|
|
- type: damageModifierSet
|
|
id: Metallic
|
|
coefficients:
|
|
Blunt: 0.7
|
|
Slash: 0.5
|
|
Piercing: 0.7
|
|
Shock: 1.2
|
|
flatReductions:
|
|
Blunt: 5
|
|
|
|
- type: damageModifierSet
|
|
id: Inflatable
|
|
coefficients:
|
|
Blunt: 0.5
|
|
Piercing: 2.0
|
|
Heat: 0.5
|
|
Shock: 0
|
|
flatReductions:
|
|
Blunt: 5
|
|
|
|
- type: damageModifierSet
|
|
id: Glass
|
|
coefficients:
|
|
Blunt: 0.5
|
|
Slash: 0.5
|
|
Piercing: 0.5
|
|
Heat: 0
|
|
Shock: 0
|
|
flatReductions:
|
|
Blunt: 5
|
|
|
|
- type: damageContainer
|
|
id: Biological
|
|
supportedGroups:
|
|
- Brute
|
|
- Burn
|
|
- Toxin
|
|
- Airloss
|
|
- Genetic
|
|
|
|
- type: damageContainer
|
|
id: Inorganic
|
|
supportedGroups:
|
|
- Brute
|
|
supportedTypes:
|
|
- Heat
|
|
- Shock
|
|
";
|
|
}
|
|
}
|