Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Add a LOT more dakka (#1033)

Browse Source 
* Start adding flashy flash

* Change slop

Might give a smoother decline

* flashy flash

* Add flashbang and flash projectiles

Bang bang bang pull my flash trigger

* Add collision check to area flash

* Flash cleanupo

* flash.ogg mixed to mono
* Adjusted flash curve again

* Enhancing flashes with unshaded and lights and shit

Still a WIP

* Add the other ballistic gun types

Re-organised some of the gun stuff so the powercell guns share the shooting code with the ballistic guns.

* Re-merging branch with master

Also fixed some visualizer bugs

* Last cleanup

Fixed some crashes
Fixed Deckard sprite
Fixed Hitscan effects
Re-applied master changes
Re-factor to using soundsystem
Add some more audio effects

* Cleanup flashes for merge

Can put flashbangs in lockers so you don't get blinded

Fix some bugs

* Fix shotties

Also removed some redundant code

* Bulldoze some legacycode

brrrrrrrrt

* Fix clientignore warnings

* Add the other Stunnable types to StunnableProjectile

* Some gun refactoring

* Removed extra visualizers
* All casing ejections use the same code
* Speed loaders can have their ammo pulled out
* Bolt sound less loud

* Stop ThrowController from throwing

* Fix speed loader visuals

* Update hitscan collision mask and fix typo

* Cleanup

* Fit hitscan and flashbang collisions
* Use the new flags support

* Update taser placeholder description

* Update protonames per style guide

* Add yaml flag support for gun firerates

* Cleanup crew

* Fix Audio up (components, audio file, + remove global sounds)
* Add server-side recoil back-in (forgot that I was testing this client-side)
* Add Flag support for fire-rate selectors

* Wrong int you dolt

* Fix AI conflicts

Haha ranged bulldozer go BRR
(I'll rewrite it after the other AI systems are done).

* Mix bang.ogg from stereo to mono

* Make sure serializer's reading for guns

Fixes integration test

* Change EntitySystem calls to use the static function

Also removed the Pumpbarrel commented-out code

* Change StunnableProjectile defaults to 0

* Fix taser paralyse

Apparently removing defaults means you have to specify the values, whodathunkit

* Add slowdown to stunnableprojectiles and fix tasers

* Remove FlagsFor from gun components

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
This commit is contained in:
metalgearsloth
2020-06-22 05:47:15 +10:00
committed by GitHub
parent ac19ad7eac
commit 95995b6232
1977 changed files with 13600 additions and 11229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/DropEmptyBallisticExp.cs
View File

@@ -1,28 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic
{
public sealed class DropEmptyBallisticExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<InventoryState>().GetValue())
{
if (entity.HasComponent<BallisticMagazineWeaponComponent>())
{
yield return new DropEmptyBallistic(owner, entity, Bonus);
}
}
}
}
}

24
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/EquipBallisticExp.cs
View File

@@ -1,24 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Inventory;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic
{
public sealed class EquipBallisticExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<InventoryState>().GetValue())
{
yield return new EquipBallistic(owner, entity, Bonus);
}
}
}
}

32
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Ballistic/PickUpAmmoExp.cs
View File

@@ -1,32 +0,0 @@
using System;
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic;
using Content.Server.AI.Utils;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Ballistic
{
public sealed class PickUpAmmoExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
if (!owner.TryGetComponent(out AiControllerComponent controller))
{
throw new InvalidOperationException();
}
foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(BallisticMagazineComponent),
controller.VisionRadius))
{
yield return new PickUpAmmo(owner, entity, Bonus);
}
}
}
}

32
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/ChargeEquippedHitscanExp.cs
View File

@@ -1,32 +0,0 @@
using System;
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.Utils;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.Components.Power.Chargers;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan
{
public sealed class ChargeEquippedHitscanExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
if (!owner.TryGetComponent(out AiControllerComponent controller))
{
throw new InvalidOperationException();
}
foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(WeaponCapacitorChargerComponent),
controller.VisionRadius))
{
yield return new PutHitscanInCharger(owner, entity, Bonus);
}
}
}
}

28
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/DropEmptyHitscanExp.cs
View File

@@ -1,28 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Inventory;
using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan
{
public class DropEmptyHitscanExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<InventoryState>().GetValue())
{
if (entity.HasComponent<HitscanWeaponComponent>())
{
yield return new DropEmptyHitscan(owner, entity, Bonus);
}
}
}
}
}

24
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/EquipHitscanExp.cs
View File

@@ -1,24 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Inventory;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan
{
public sealed class EquipHitscanExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<InventoryState>().GetValue())
{
yield return new EquipHitscan(owner, entity, Bonus);
}
}
}
}

37
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/Hitscan/PickUpHitscanFromChargersExp.cs
View File

@@ -1,37 +0,0 @@
using System;
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.Utils;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.GameObjects.Components.Movement;
using Content.Server.GameObjects.Components.Power.Chargers;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged.Hitscan
{
public sealed class PickUpHitscanFromChargersExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
if (!owner.TryGetComponent(out AiControllerComponent controller))
{
throw new InvalidOperationException();
}
foreach (var entity in Visibility.GetEntitiesInRange(owner.Transform.GridPosition, typeof(WeaponCapacitorChargerComponent),
controller.VisionRadius))
{
var contained = entity.GetComponent<WeaponCapacitorChargerComponent>().HeldItem;
if (contained != null)
{
yield return new PickUpHitscanFromCharger(owner, entity, contained, Bonus);
}
}
}
}
}

35
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/PickUpRangedExp.cs
View File

@@ -1,35 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Combat.Nearby;
using Content.Server.GameObjects.Components.Weapon.Ranged.Hitscan;
using Content.Server.GameObjects.Components.Weapon.Ranged.Projectile;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged
{
public sealed class PickUpRangedExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatPrepBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<NearbyRangedWeapons>().GetValue())
{
if (entity.HasComponent<HitscanWeaponComponent>())
{
yield return new PickUpHitscanWeapon(owner, entity, Bonus);
}
if (entity.HasComponent<BallisticMagazineWeaponComponent>())
{
yield return new PickUpBallisticMagWeapon(owner, entity, Bonus);
}
}
}
}
}

26
Content.Server/AI/Utility/ExpandableActions/Combat/Ranged/RangedAttackNearbySpeciesExp.cs
View File

@@ -1,26 +0,0 @@
using System.Collections.Generic;
using Content.Server.AI.Utility.Actions;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Ballistic;
using Content.Server.AI.Utility.Actions.Combat.Ranged.Hitscan;
using Content.Server.AI.WorldState;
using Content.Server.AI.WorldState.States;
using Content.Server.AI.WorldState.States.Mobs;
namespace Content.Server.AI.Utility.ExpandableActions.Combat.Ranged
{
public sealed class RangedAttackNearbySpeciesExp : ExpandableUtilityAction
{
public override float Bonus => UtilityAction.CombatBonus;
public override IEnumerable<UtilityAction> GetActions(Blackboard context)
{
var owner = context.GetState<SelfState>().GetValue();
foreach (var entity in context.GetState<NearbySpeciesState>().GetValue())
{
yield return new HitscanAttackEntity(owner, entity, Bonus);
yield return new BallisticAttackEntity(owner, entity, Bonus);
}
}
}
}