When a Triggered ability fires and any of its actions require a human target
pick, the server now pauses execution instead of auto-resolving:
Server:
- AbilitySystem.FireTrigger detects actions needing client input via
ActionNeedsClientTargets(); stores PendingTriggeredTarget in GameState and
returns early rather than executing the ability
- PushStateToPlayersAsync (GameHandlerBase) checks for PendingTriggeredTarget
after every state push and sends a game.ability.triggered_target_request push
to the owning player carrying the action definition and range
- New GameTriggeredTargetHandler (game.triggered_target) receives the player's
picks, calls AbilitySystem.ResumeTriggeredAbility, and broadcasts the result
- PendingTriggeredTarget model stored in GameState.PendingTriggeredTarget (JSONB)
Client:
- Game.gd handles the triggered_target_request push and emits a signal
- game_screen.gd connects the signal, re-uses the existing ABILITY_TARGET mode
and _start_ability_targeting() flow, then sends game.triggered_target instead
of game.activate_ability when done
- A brief banner ("Triggered: <name> — select a target") informs the player
"Warrant Cover" (OnChanneled, Owner unit pick) will now correctly prompt the
player to select which friendly unit gains +1 Defense.
Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
106 lines
5.2 KiB
C#
106 lines
5.2 KiB
C#
namespace SOR.Game;
|
|
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
using SOR.Database;
|
|
using SOR.Game.Handlers;
|
|
using SOR.Networking.Abstractions.Messaging;
|
|
|
|
/// <summary>
|
|
/// Registers all game service components into the DI container.
|
|
/// Called from SOR.Host/Program.cs when ENABLED_SERVICES includes "game".
|
|
/// </summary>
|
|
public static class ServiceRegistration
|
|
{
|
|
public static IServiceCollection AddGameService(
|
|
this IServiceCollection services,
|
|
IConfiguration configuration)
|
|
{
|
|
services.AddGameDatabase(configuration);
|
|
services.AddIdentityDatabase(configuration);
|
|
services.AddCollectionDatabase(configuration);
|
|
services.AddCatalogDatabase(configuration);
|
|
|
|
// Abandons any Initializing sessions left over from a previous process (redeploy/crash).
|
|
services.AddHostedService<GameStartupCleanupService>();
|
|
|
|
// Monitors active sessions for player inactivity.
|
|
services.AddHostedService<GameInactivityMonitorService>();
|
|
|
|
// Manages per-session turn timers; registered as singleton so handlers can inject it,
|
|
// and as a hosted service so it receives app-lifetime Start/Stop callbacks.
|
|
services.AddSingleton<GameTurnTimerService>();
|
|
services.AddHostedService(sp => sp.GetRequiredService<GameTurnTimerService>());
|
|
|
|
// Tracks spectators per session (in-memory; spectators only, players are not registered here).
|
|
services.AddSingleton<SpectatorRegistryService>();
|
|
|
|
// Tracks clients subscribed to game activity events for the live-star skybox.
|
|
services.AddSingleton<GameActivityRegistry>();
|
|
|
|
services.AddTransient<IMessageHandler, GameReadyHandler>();
|
|
services.AddTransient<IMessageHandler, GameGetStateHandler>();
|
|
services.AddTransient<IMessageHandler, GameGetActiveSessionHandler>();
|
|
services.AddTransient<IMessageHandler, GameDrawHandler>();
|
|
services.AddTransient<IMessageHandler, GamePlaceArchSpiritHandler>();
|
|
services.AddTransient<IMessageHandler, GamePlayCardHandler>();
|
|
services.AddTransient<IMessageHandler, GameMoveUnitHandler>();
|
|
services.AddTransient<IMessageHandler, GameAttackHandler>();
|
|
services.AddTransient<IMessageHandler, GameSacrificeHandler>();
|
|
services.AddTransient<IMessageHandler, GameAscendHandler>();
|
|
services.AddTransient<IMessageHandler, GameTransitionHandler>();
|
|
services.AddTransient<IMessageHandler, GameActivateAbilityHandler>();
|
|
services.AddTransient<IMessageHandler, GameEndTurnHandler>();
|
|
services.AddTransient<IMessageHandler, GameConcedeHandler>();
|
|
services.AddTransient<IMessageHandler, GameForceConcedeHandler>();
|
|
|
|
// Custom lobby handlers
|
|
services.AddTransient<IMessageHandler, GameCreateCustomLobbyHandler>();
|
|
services.AddTransient<IMessageHandler, GameJoinCustomLobbyHandler>();
|
|
services.AddTransient<IMessageHandler, GameLeaveCustomLobbyHandler>();
|
|
services.AddTransient<IMessageHandler, GameListCustomLobbiesHandler>();
|
|
services.AddTransient<IMessageHandler, GameGetLobbyHandler>();
|
|
services.AddTransient<IMessageHandler, GameListActiveLobbiesHandler>();
|
|
|
|
// Ready-up handlers
|
|
services.AddTransient<IMessageHandler, GameLobbyReadyHandler>();
|
|
services.AddTransient<IMessageHandler, GameUnreadyHandler>();
|
|
services.AddTransient<IMessageHandler, GameChangeLobbyDeckHandler>();
|
|
services.AddTransient<IMessageHandler, GameUpdateLobbyRulesHandler>();
|
|
|
|
// Spectator handlers
|
|
services.AddTransient<IMessageHandler, GameSpectateHandler>();
|
|
services.AddTransient<IMessageHandler, GameStopSpectatingHandler>();
|
|
|
|
// Skybox activity feed handlers
|
|
services.AddTransient<IMessageHandler, GameSubscribeActivityHandler>();
|
|
services.AddTransient<IMessageHandler, GameUnsubscribeActivityHandler>();
|
|
|
|
// Preset vote service (in-memory, one active vote per lobby at a time).
|
|
services.AddSingleton<VoteSessionService>();
|
|
|
|
// Preset handlers
|
|
services.AddTransient<IMessageHandler, GameSavePresetHandler>();
|
|
services.AddTransient<IMessageHandler, GameListPresetsHandler>();
|
|
services.AddTransient<IMessageHandler, GameDeletePresetHandler>();
|
|
services.AddTransient<IMessageHandler, GameProposePresetHandler>();
|
|
services.AddTransient<IMessageHandler, GameVotePresetHandler>();
|
|
|
|
// Rule suggestion service (in-memory, one pending suggestion per lobby at a time).
|
|
services.AddSingleton<RuleSuggestionService>();
|
|
|
|
// Rule suggestion handlers (guest proposes → host accepts or rejects)
|
|
services.AddTransient<IMessageHandler, GameSuggestRulesHandler>();
|
|
services.AddTransient<IMessageHandler, GameAcceptRuleSuggestionHandler>();
|
|
services.AddTransient<IMessageHandler, GameRejectRuleSuggestionHandler>();
|
|
|
|
// Team assignment handler (host reassigns seats to teams)
|
|
services.AddTransient<IMessageHandler, GameReassignTeamHandler>();
|
|
|
|
// Triggered ability target response (player submits picks for a paused trigger)
|
|
services.AddTransient<IMessageHandler, GameTriggeredTargetHandler>();
|
|
|
|
return services;
|
|
}
|
|
}
|