-
Notifications
You must be signed in to change notification settings - Fork 282
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into boxingdrobe
- Loading branch information
Showing
30 changed files
with
467 additions
and
36 deletions.
There are no files selected for viewing
8 changes: 8 additions & 0 deletions
8
Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| namespace Content.Server.Abilities.Oni | ||
| { | ||
| [RegisterComponent] | ||
| public sealed partial class HeldByOniComponent : Component | ||
| { | ||
| public EntityUid Holder = default!; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using Content.Shared.Damage; | ||
|
|
||
| namespace Content.Server.Abilities.Oni | ||
| { | ||
| [RegisterComponent] | ||
| public sealed partial class OniComponent : Component | ||
| { | ||
| [DataField("modifiers", required: true)] | ||
| public DamageModifierSet MeleeModifiers = default!; | ||
|
|
||
| [DataField("stamDamageBonus")] | ||
| public float StamDamageMultiplier = 1.25f; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| using Content.Server.Tools; | ||
| using Content.Shared.Tools.Components; | ||
| using Content.Shared.Damage.Events; | ||
| using Content.Shared.Weapons.Melee.Events; | ||
| using Content.Shared.Weapons.Ranged.Components; | ||
| using Robust.Shared.Containers; | ||
|
|
||
| namespace Content.Server.Abilities.Oni | ||
| { | ||
| public sealed class OniSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly ToolSystem _toolSystem = default!; | ||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
| SubscribeLocalEvent<OniComponent, EntInsertedIntoContainerMessage>(OnEntInserted); | ||
| SubscribeLocalEvent<OniComponent, EntRemovedFromContainerMessage>(OnEntRemoved); | ||
| SubscribeLocalEvent<OniComponent, MeleeHitEvent>(OnOniMeleeHit); | ||
| SubscribeLocalEvent<HeldByOniComponent, MeleeHitEvent>(OnHeldMeleeHit); | ||
| SubscribeLocalEvent<HeldByOniComponent, StaminaMeleeHitEvent>(OnStamHit); | ||
| } | ||
|
|
||
| private void OnEntInserted(EntityUid uid, OniComponent component, EntInsertedIntoContainerMessage args) | ||
| { | ||
| var heldComp = EnsureComp<HeldByOniComponent>(args.Entity); | ||
| heldComp.Holder = uid; | ||
|
|
||
| if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool)) | ||
| tool.SpeedModifier *= 1.66f; | ||
|
|
||
| if (TryComp<GunComponent>(args.Entity, out var gun)) | ||
| { | ||
| gun.MinAngle *= 15f; | ||
| gun.AngleIncrease *= 15f; | ||
| gun.MaxAngle *= 15f; | ||
| } | ||
| } | ||
|
|
||
| private void OnEntRemoved(EntityUid uid, OniComponent component, EntRemovedFromContainerMessage args) | ||
| { | ||
| if (TryComp<ToolComponent>(args.Entity, out var tool) && _toolSystem.HasQuality(args.Entity, "Prying", tool)) | ||
| tool.SpeedModifier /= 1.66f; | ||
|
|
||
| if (TryComp<GunComponent>(args.Entity, out var gun)) | ||
| { | ||
| gun.MinAngle /= 15f; | ||
| gun.AngleIncrease /= 15f; | ||
| gun.MaxAngle /= 15f; | ||
| } | ||
|
|
||
| RemComp<HeldByOniComponent>(args.Entity); | ||
| } | ||
|
|
||
| private void OnOniMeleeHit(EntityUid uid, OniComponent component, MeleeHitEvent args) | ||
| { | ||
| args.ModifiersList.Add(component.MeleeModifiers); | ||
| } | ||
|
|
||
| private void OnHeldMeleeHit(EntityUid uid, HeldByOniComponent component, MeleeHitEvent args) | ||
| { | ||
| if (!TryComp<OniComponent>(component.Holder, out var oni)) | ||
| return; | ||
|
|
||
| args.ModifiersList.Add(oni.MeleeModifiers); | ||
| } | ||
|
|
||
| private void OnStamHit(EntityUid uid, HeldByOniComponent component, StaminaMeleeHitEvent args) | ||
| { | ||
| if (!TryComp<OniComponent>(component.Holder, out var oni)) | ||
| return; | ||
|
|
||
| args.Multiplier *= oni.StamDamageMultiplier; | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| oni-gun-fire = You can't fire guns! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| marking-OniHornSingleCurved = Single Curved | ||
| marking-OniHornSingleLeftCurved =Single Left Curved | ||
| marking-OniHornSingleRightCurved = Single Right Curved | ||
| marking-OniHornDoubleCurvedOutwards = Double Curved Outwards | ||
| marking-OniHornDoubleCurved = Double Curved | ||
| marking-OniHornDoubleLeftBrokeCurved = Double Left Broke Curved | ||
| marking-OniHornDoubleRightBrokeCurved = Double Right Broke Curved |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| namepreset-x-no-y = {$last}-no-{$first} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| species-name-oni = Oni | ||
| species-name-felinid = Felinid |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_female.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| - type: dataset | ||
| id: names_oni_female | ||
| values: | ||
| - Akari #星 | ||
| - Kira | ||
| - Kirameki | ||
| - Aki #陽 | ||
| - Akiho | ||
| - Akimi | ||
| - Akashi #明 | ||
| - Saya | ||
| - Aporo #月 | ||
| - Arute | ||
| - Meguru | ||
| - Tiara #天 | ||
| - Suisei | ||
| - Io #水 | ||
| - Aoi | ||
| - Mizu | ||
| - Shuten #epic references | ||
| - Suika |
31 changes: 31 additions & 0 deletions
31
Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_location.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| - type: dataset | ||
| id: names_oni_location | ||
| values: | ||
| - Amiboshi | ||
| - Amefuriboshi | ||
| - Aoboshi | ||
| - Ashitareboshi | ||
| - Chirikoboshi | ||
| - Chichiriboshi | ||
| - Ekieboshi | ||
| - Inamiboshi | ||
| - Hatsuinoshi | ||
| - Hikitsuboshi | ||
| - Hotohoriboshi | ||
| - Karasukiboshi | ||
| - Miboshi | ||
| - Namameboshi | ||
| - Nakagoboshi | ||
| - Nuriboshi | ||
| - Soiboshi | ||
| - Suboshi | ||
| - Subaruboshi | ||
| - Tamaonoboshi | ||
| - Tasukiboshi | ||
| - Tataraboshi | ||
| - Tomiteboshi | ||
| - Tomoboshi | ||
| - Tokakiboshi | ||
| - Torokiboshi | ||
| - Umiyameboshi | ||
| - Urukiboshi |
20 changes: 20 additions & 0 deletions
20
Resources/Prototypes/Nyanotrasen/Datasets/Names/oni_male.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| - type: dataset | ||
| id: names_oni_male | ||
| values: | ||
| - Kiyoshi #陽 | ||
| - Satoshi #明 | ||
| - Teru #光 | ||
| - Hiroshi | ||
| - Takashi #天 | ||
| - Eeichi #永一 | ||
| - Eeichirou #永一朗 | ||
| - Kyousaburou | ||
| - Tsutomu | ||
| - Tsuyoshi | ||
| - Kenshi | ||
| - Kenji | ||
| - Kenichi | ||
| - Susumu | ||
| - Kyounosuke | ||
| - Suisei #Mars | ||
| - Shuten #Reference |
Oops, something went wrong.