Magic Refactor + Wizard Grimoire (#22568)
* Brings over changes from the original magic refactor PR * Adds Master Spellbook, spellbook categories, WizCoin currency, and locale * Wiz€oin™ * Adds currency whitelist to Spellbook preset, grants contained actions on action added. * Adds grant contained action and remove provided action. * adds a way for actions to be upgraded to the store * Adds Fireball 3 and fixes action upgrade logic so that it checks if the action can level or if the action can upgrade separately * Fixes upgrade logic in ActionUpgradeSystem to allow for level ups without an actual upgrade. Fixed action upgrade logic in store system as well * Removes current action entity from the bought entities list and adds new or old action entity * Removes Current Entity * Removes old comments, fixes TransferAllActionsWithNewAttached * Removes TODO * Removes Product Action Upgrade Event * reverts changes to immovablerodrule * Removes stale event reference * fixes mind action grant logic * reverts shared gun system change to projectile anomaly system * forgor to remove the using * Reverts unintended changes to action container * Adds refund button to the store * Refreshes store back to origin. * Refund with correct currency * Init refund * Check for terminating and update interface * Disables refund button * Removes preset allow refund * dont refund if map changed * adds refunds to stores * Adds method to check for starting map * comments, datafields, some requested changes * turns event into ref event * Adds datafields * Switches to entity terminating event * Changes store entity to be nullable and checks if store is terminating to remove reference. * Tryadd instead of containskey * Adds a refund disable method, disables refund on bought ent container changes if not an action * Removes duplicate refundcomp * Removes unintended merges * Removed another unintended change from merge * removes extra using statement * readds using statement * might as well just remove both usings since it won't leave the PR * Fixes Action upgrades from stores * Changes to non obsolete method uses * Shares spawn code between instant and world * Adds action entity to action event, adds beforecastspellevent, adds spell requirements to magic component * puts prereq check in spell methods, sets up template code for before cast event * checks for required wizard clothes * Networks Magic Comp and Wizard Clothes Comp. Renames MagicSpawnData to MagicInstantSpawnData. * Removes posdata from projectiles * Speech > RequiresSpeech * Fixes ActionOnInteract * checks for muted * popup for missing reqs * Validate click loc for blink spell * Checks if doors are in range and not obstructed before opening * Check ents by map coords * Adds speak event * Comments spellbooks * Removes comments * Unobsoletes smite spell * Invert if * Requirements loc * Fixes spell reqs * Inverts an if * Comment updates * Starts doafter work * Removes doafter references * Balances fireball upgrades to be more reasonable * Enables refund on master spellbooks * Spells to do * update spellbook doafter * knock toggles bolts * Touch Spell comments * Comments for pending spells * more comments * adds spider polymorph to spellbook * TODOs for spells * reorganizes spellbook categories and adds wands * fixes spacing and adds limited conditions * commented owner only for future store PR * reenables owner only for the grimoire * fixes grimoire sprite * Adds wizard rod polymorph * summon ghosts event * Moves rod form to offensive category * Adds charge spell and loc for rod polymorph * Oops forgor the actual chages * Item Recall comment * Fixes UI * removes extra field for wizard rod * Cleanup * New Condition (INCOMPLETE) * Fix linter * Fix linter (for real) * fixed some descriptions * adds regions to magic * Adds a non-refund wizard grimoire, fixes blink to deselect after teleporting, reduces force wall despawn time to 12 seconds * removes limited upgrade condition --------- Co-authored-by: AJCM <AJCM@tutanota.com>
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
using System.Linq;
|
||||
using Content.Shared.Actions;
|
||||
using Content.Shared.Interaction;
|
||||
using Robust.Shared.Random;
|
||||
@@ -38,10 +39,18 @@ public sealed class ActionOnInteractSystem : EntitySystem
|
||||
|
||||
private void OnActivate(EntityUid uid, ActionOnInteractComponent component, ActivateInWorldEvent args)
|
||||
{
|
||||
if (args.Handled || component.ActionEntities == null)
|
||||
if (args.Handled)
|
||||
return;
|
||||
|
||||
var options = GetValidActions<InstantActionComponent>(component.ActionEntities);
|
||||
if (component.ActionEntities is not {} actionEnts)
|
||||
{
|
||||
if (!TryComp<ActionsContainerComponent>(uid, out var actionsContainerComponent))
|
||||
return;
|
||||
|
||||
actionEnts = actionsContainerComponent.Container.ContainedEntities.ToList();
|
||||
}
|
||||
|
||||
var options = GetValidActions<InstantActionComponent>(actionEnts);
|
||||
if (options.Count == 0)
|
||||
return;
|
||||
|
||||
@@ -58,13 +67,21 @@ public sealed class ActionOnInteractSystem : EntitySystem
|
||||
|
||||
private void OnAfterInteract(EntityUid uid, ActionOnInteractComponent component, AfterInteractEvent args)
|
||||
{
|
||||
if (args.Handled || component.ActionEntities == null)
|
||||
if (args.Handled)
|
||||
return;
|
||||
|
||||
if (component.ActionEntities is not {} actionEnts)
|
||||
{
|
||||
if (!TryComp<ActionsContainerComponent>(uid, out var actionsContainerComponent))
|
||||
return;
|
||||
|
||||
actionEnts = actionsContainerComponent.Container.ContainedEntities.ToList();
|
||||
}
|
||||
|
||||
// First, try entity target actions
|
||||
if (args.Target != null)
|
||||
{
|
||||
var entOptions = GetValidActions<EntityTargetActionComponent>(component.ActionEntities, args.CanReach);
|
||||
var entOptions = GetValidActions<EntityTargetActionComponent>(actionEnts, args.CanReach);
|
||||
for (var i = entOptions.Count - 1; i >= 0; i--)
|
||||
{
|
||||
var action = entOptions[i];
|
||||
|
||||
Reference in New Issue
Block a user