diff --git a/.gitea/workflows/build-push.yml b/.gitea/workflows/build-push.yml index f80141c..c7cf090 100644 --- a/.gitea/workflows/build-push.yml +++ b/.gitea/workflows/build-push.yml @@ -8,14 +8,11 @@ on: - ".gitea/workflows/**" env: - # TODO: replace with your actual Harbor hostname - REGISTRY: harbor.aeternalisgames.com - # Harbor project name (create this in Harbor UI first) + REGISTRY: registry.aeternalisgames.com PROJECT: sor jobs: build-and-push: - # TODO: update this label to match your Gitea runner's label runs-on: ubuntu-latest steps: @@ -27,7 +24,6 @@ jobs: id: tag run: echo "SHA=$(echo '${{ github.sha }}' | cut -c1-8)" >> $GITHUB_OUTPUT - # Log in to Harbor using repository secrets HARBOR_USERNAME / HARBOR_PASSWORD. - name: Log in to Harbor uses: docker/login-action@v3 with: @@ -40,17 +36,17 @@ jobs: uses: docker/setup-buildx-action@v3 # ── SOR.Host ──────────────────────────────────────────────────────────── - - name: Build and push sor-host + - name: Build and push sor-server uses: docker/build-push-action@v5 with: context: Server file: Server/Dockerfile.host push: true - cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:buildcache - cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:buildcache,mode=max + cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:buildcache + cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:buildcache,mode=max tags: | - ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:${{ steps.tag.outputs.SHA }} - ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:latest + ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:${{ steps.tag.outputs.SHA }} + ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:latest # ── SOR.Admin ─────────────────────────────────────────────────────────── - name: Build and push sor-admin @@ -70,7 +66,7 @@ jobs: - name: Update deployment image tags run: | SHA=${{ steps.tag.outputs.SHA }} - sed -i "s|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:.*|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-host:${SHA}|" deploy/k8s/deployment-host.yaml + sed -i "s|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:.*|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-server:${SHA}|" deploy/k8s/deployment-host.yaml sed -i "s|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-admin:.*|image: ${{ env.REGISTRY }}/${{ env.PROJECT }}/sor-admin:${SHA}|" deploy/k8s/deployment-admin.yaml - name: Commit updated manifests diff --git a/deploy/k8s/deployment-admin.yaml b/deploy/k8s/deployment-admin.yaml index 93a65d1..f1e15bf 100644 --- a/deploy/k8s/deployment-admin.yaml +++ b/deploy/k8s/deployment-admin.yaml @@ -21,8 +21,7 @@ spec: containers: - name: sor-admin # CI updates this image tag on every push to master. - # TODO: replace with your actual Harbor hostname/project before first deploy. - image: harbor.aeternalisgames.com/sor/sor-admin:latest + image: registry.aeternalisgames.com/sor/sor-admin:latest ports: - containerPort: 8080 diff --git a/deploy/k8s/deployment-host.yaml b/deploy/k8s/deployment-host.yaml index be4ad61..eb111a5 100644 --- a/deploy/k8s/deployment-host.yaml +++ b/deploy/k8s/deployment-host.yaml @@ -22,8 +22,7 @@ spec: containers: - name: sor-host # CI updates this image tag on every push to master. - # TODO: replace with your actual Harbor hostname/project before first deploy. - image: harbor.aeternalisgames.com/sor/sor-host:latest + image: registry.aeternalisgames.com/sor/sor-server:latest ports: - containerPort: 8080 diff --git a/deploy/secrets/harbor-pull-secret.yaml.template b/deploy/secrets/harbor-pull-secret.yaml.template index 9507163..aadc7dd 100644 --- a/deploy/secrets/harbor-pull-secret.yaml.template +++ b/deploy/secrets/harbor-pull-secret.yaml.template @@ -5,21 +5,19 @@ metadata: namespace: stone-server type: kubernetes.io/dockerconfigjson stringData: - # Base64-encoded Docker config JSON. - # Easiest way to generate this — run locally then paste the output: + # Generate with: # # kubectl create secret docker-registry harbor-credentials \ - # --docker-server=harbor.aeternalisgames.com \ + # --docker-server=registry.aeternalisgames.com \ # --docker-username=HARBOR_USERNAME \ # --docker-password=HARBOR_PASSWORD \ # --namespace=stone-server \ # --dry-run=client -o yaml # - # TODO: replace with output from the command above. .dockerconfigjson: | { "auths": { - "harbor.aeternalisgames.com": { + "registry.aeternalisgames.com": { "username": "CHANGEME", "password": "CHANGEME", "auth": "CHANGEME_BASE64_OF_USER:PASS" diff --git a/gameplay-effects-gap.md b/gameplay-effects-gap.md index 9da56a1..72baf1d 100644 --- a/gameplay-effects-gap.md +++ b/gameplay-effects-gap.md @@ -3,48 +3,13 @@ Generated from `Effects.cs` (declared effect models) vs `AbilitySystem.ExecuteEffect` (implemented `case` handlers). - Declared effects: **68** -- Implemented handlers: **47** -- Missing handlers: **21** +- Implemented handlers: **66** +- Missing handlers: **2** (deferred — require additional combat type design) -## Critical gameplay gap noted - -- `SearchDeckEffect` is declared but not executed server-side. This means "search deck" style Repentance/Instinct effects are currently unavailable as designed. - -## Missing effect handlers by section +## Deferred effect handlers ### 5.1 Stat modification -- `GrantAdditionalAttackEffect` -- `SetStatModMultiplierEffect` - -### 5.2 Unit flags -- `SetCanBeAttackedEffect` -- `SetCanBeBlockedEffect` -- `SetCanBeObstructedEffect` -- `SetCanUseAbilityEffect` -- `SetCanBeSacrificedEffect` - -### 5.3 Ability modification -- `AddAbilityEffect` -- `RemoveAbilityEffect` -- `EnableAbilityEffect` -- `DisableAbilityEffect` +- `SetStatModMultiplierEffect` — requires combat multiplier design ### 5.7 Zone/card ops -- `ReturnToBattlefieldEffect` -- `SearchDeckEffect` -- `RevealCardsEffect` -- `PlaceOnDeckEffect` -- `ChannelCardEffect` - -### 5.9 Displacement -- `DisplaceUnitEffect` - -### 5.10 Control -- `GrantMovementControlEffect` -- `SetFixedSacrificeReturnEffect` - -### 5.11 Token -- `SummonTokenEffect` - -### 5.12 Deferred -- `ApplyOnEventEffect` +- `ChannelCardEffect` — requires rules design for ability-triggered card channeling diff --git a/gameplay-todo.md b/gameplay-todo.md index 33bcd2c..e09e710 100644 --- a/gameplay-todo.md +++ b/gameplay-todo.md @@ -1,45 +1,5 @@ # Gameplay TODO -## Target-gated Repentance/Instinct resolution - -### Problem -Repentance and Instinct are resolved through `EffectsJson` action lists. Some actions can be defined with explicit target selectors (`Player`, `Tile`, `Spirit`, `ArchSpirit`, `Ruin`, etc.). - -If an action semantically requires a target, allowing the card to resolve without one can produce ambiguous or unintended behavior (silent no-op, wrong implicit target, or inconsistent rules enforcement). - -### Why this matters -- **Rules integrity:** cards that say "choose a target" must not resolve without a legal choice. -- **Determinism:** server-side resolution should be unambiguous and reproducible. -- **Client UX:** players should get a clear validation error instead of a partial/quiet mis-resolution. -- **Future-proofing:** as more conditional and chained actions are added, implicit target fallbacks become high-risk. - -### Current state -- `ChannelCard` now enforces `CanChannel*` restrictions (including `CanChannelRepentance` and `CanChannelInstinct`). -- Instinct is now quick-play (any turn except Setup/Placement/GameOver). -- Ability model supports explicit target types and per-action target indexing. -- `SearchDeckEffect` is declared in effect models but currently missing server-side execution in `AbilitySystem.ExecuteEffect` (see `gameplay-effects-gap.md`). - -### Required fix -Add strict server-side target validation for Repentance/Instinct action execution: - -1. **Per action**, determine whether target input is mandatory from `TargetSelector`: - - mandatory: specific target type with `Count.N > 0` and not `All`, not `UpTo` - - optional: `All == true` or `UpTo == true` where fewer than `N` is allowed -2. If mandatory and no matching client target(s) are supplied, reject play (`INSUFFICIENT_TARGETS` or equivalent). -3. Validate target kind compatibility: - - `Tile` actions require `Coord` - - unit/card/player actions require `InstanceId` (or player resolution contract) -4. Validate ownership/scope/filter legality during resolution (already mostly present) and return explicit error on mismatch. -5. Keep behavior deterministic for multi-action cards: each action uses `ActionIndex`-scoped targets only. - -### Acceptance criteria -- A Repentance/Instinct card with required targets cannot resolve without valid target payload. -- Invalid target payload fails with explicit error. -- Optional-target actions still resolve when legal to do so. -- Existing non-targeted Repentance/Instinct cards continue to work unchanged. - ---- - ## Aura transition walkthrough scenario (movement) Goal scenario: "A spirit moves on the battlefield and another spirit enters its aura range."