Add poison damage over time tactics
This commit is contained in:
@@ -14,7 +14,7 @@ Godot 4 tactical RPG prototype inspired by classic turn-based Romance of the Thr
|
||||
- Damage forecast for selected-unit attacks.
|
||||
- Terrain defense and avoid affect physical attack damage and hit chance.
|
||||
- Min/max attack ranges and counterattack forecasts.
|
||||
- MP tactics with low/high damage options, healing options, ally support buffs, enemy debuffs, a skill list menu, previews, and target overlays.
|
||||
- MP tactics with low/high damage options, healing options, ally support buffs, enemy debuffs, poison damage-over-time, a skill list menu, previews, and target overlays.
|
||||
- Campaign inventory consumables with an item menu, HP/MP recovery preview, and target overlay.
|
||||
- Weapon, armor, and accessory rewards can be stored, displayed, and equipped from the battle HUD.
|
||||
- Scenario-specific pre-battle shop purchases, optional finite shop stock, and 50% sell-back save immediately and sync into the upcoming battle inventory.
|
||||
@@ -111,7 +111,7 @@ Godot 4 tactical RPG prototype inspired by classic turn-based Romance of the Thr
|
||||
- Dialogue portrait slot with officer default image paths, optional per-line overrides, and speaker-initial fallback.
|
||||
- Dialogue lines can place the portrait on the left or right side of the dialogue panel.
|
||||
- Placeholder menu/battle BGM plus UI, movement, attack, tactic, item, victory, and defeat SFX.
|
||||
- Floating combat text for damage, recovery, misses, support effects, level-ups, and promotions.
|
||||
- Floating combat text for damage, recovery, misses, support effects, poison ticks, level-ups, and promotions.
|
||||
- Short unit slide animation for board movement.
|
||||
- Hover target preview badges for attacks, tactics, and items.
|
||||
- Low-HP board unit warning rings and HP bar color states.
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
"move_type": "foot",
|
||||
"move": 4,
|
||||
"attack_range": [1, 1],
|
||||
"skills": ["spark", "fire_tactic", "mend", "guard_order", "rally_order", "disrupt_order"],
|
||||
"skills": ["spark", "fire_tactic", "mend", "guard_order", "rally_order", "disrupt_order", "poison_mist"],
|
||||
"growth": { "hp": "C", "mp": "A", "atk": "E", "def": "D", "int": "A", "agi": "C" },
|
||||
"base_bonus": { "hp": -2, "mp": 8, "atk": -2, "def": -1, "int": 2 },
|
||||
"equipment_slots": {
|
||||
@@ -176,7 +176,7 @@
|
||||
"move_type": "foot",
|
||||
"move": 4,
|
||||
"attack_range": [1, 1],
|
||||
"skills": ["spark", "fire_tactic", "mend", "great_mend", "guard_order", "rally_order", "disrupt_order"],
|
||||
"skills": ["spark", "fire_tactic", "mend", "great_mend", "guard_order", "rally_order", "disrupt_order", "poison_mist"],
|
||||
"growth": { "hp": "B", "mp": "A", "atk": "E", "def": "C", "int": "A", "agi": "C" },
|
||||
"base_bonus": { "hp": 2, "mp": 6, "atk": -2, "def": 1, "int": 2 },
|
||||
"equipment_slots": {
|
||||
|
||||
@@ -79,5 +79,17 @@
|
||||
"effects": [
|
||||
{ "type": "stat_bonus", "stat": "atk", "amount": -3, "duration_turns": 2 }
|
||||
]
|
||||
},
|
||||
"poison_mist": {
|
||||
"name": "Poison Mist",
|
||||
"kind": "support",
|
||||
"target": "enemy",
|
||||
"mp_cost": 6,
|
||||
"range": [1, 3],
|
||||
"power": 0,
|
||||
"stat": "int",
|
||||
"effects": [
|
||||
{ "type": "damage_over_time", "status": "poison", "amount": 4, "duration_turns": 2 }
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -38,9 +38,9 @@
|
||||
4. Show scenario briefing with the campaign chapter header, battle header, objective summary, chapter overview, manual checkpoint menu, and optional pre-battle shop, Armory, Roster, and Formation setup.
|
||||
5. Player selects a unit.
|
||||
6. Briefing completion dispatches battle-begin events, including opening dialogue.
|
||||
7. Unit moves, attacks, chooses a tactic or consumable item from the side menu, changes equipment, counters, gains EXP, levels up, promotes at class thresholds, or waits. Tactic buttons show MP cost, kind, range, and power, support, or debuff effect. Physical attacks roll hit chance from unit agility and target terrain avoid; misses give reduced EXP. The scene plays placeholder SFX, a short movement slide, low-HP warning rings, hover target preview badges, and floating combat text for core action and UI feedback.
|
||||
7. Unit moves, attacks, chooses a tactic or consumable item from the side menu, changes equipment, counters, gains EXP, levels up, promotes at class thresholds, or waits. Tactic buttons show MP cost, kind, range, and power, support, debuff, or damage-over-time effect. Physical attacks roll hit chance from unit agility and target terrain avoid; misses give reduced EXP. The scene plays placeholder SFX, a short movement slide, low-HP warning rings, hover target preview badges, and floating combat text for core action and UI feedback.
|
||||
8. Player ends turn.
|
||||
9. Enemy AI moves, attacks, and can cast damage or healing tactics through the same combat and skill resolvers.
|
||||
9. Enemy AI moves, attacks, and can cast damage, healing, support, debuff, or damage-over-time tactics through the same combat and skill resolvers.
|
||||
10. Battle checks scenario-defined defeat conditions first, including commander loss and turn limits, then victory conditions such as enemy defeat or reaching a marked destination tile.
|
||||
11. Turn-start and movement-triggered scenario events run as phases change or units enter marked cells, and may update objectives or deploy reinforcements.
|
||||
12. On first-time victory, `CampaignState` snapshots player progression and the battle inventory, applies rewards once, advances `current_scenario_id`, and writes `user://campaign_save.json`.
|
||||
@@ -58,6 +58,6 @@ Joined officers gate whether `requires_joined` player deployments are loaded at
|
||||
|
||||
Inventory and campaign flags are copied from `CampaignState` into `BattleState` when a scenario starts. The pre-battle Chapters overview reads `CampaignState` chapter progress and can load completed or current battles without mutating the save. The pre-battle Save menu can write the current campaign state to `user://campaign_manual_save.json`, and loading that checkpoint restores it into `user://campaign_save.json` before re-entering the same pending-choice, completion, or current-briefing branch as startup. Pre-battle shop stock comes from the loaded scenario's `shop.items` list plus matching `shop.conditional_items` blocks, with optional finite limits from item entries or `stock` maps. Shop purchases and 50% sell-back are campaign transactions: they update saved gold, unequipped inventory, and finite-stock purchase counts immediately, write the save file, and refresh the already-loaded battle inventory before the player begins the battle. Pre-battle Armory equipment changes use the same equipment rules as battle HUD equipment changes, then immediately save merged roster equipment/stat snapshots and inventory stock. Pre-battle Roster uses scenario `roster.max_units`, `roster.required_officers`, and `roster.required_units` to mark optional player deployments as sortie or reserve; reserve units remain in the candidate list but are excluded from board occupancy, drawing, selection, AI targeting, and living-unit victory checks. Non-controllable player units can act as protected escort targets: enemies can attack them and conditions can reference them, but they are skipped by player selection, Armory, Formation, counterattacks, and campaign roster progression snapshots when `persist_progression` is false. Scenario `ai_target_priority` nudges enemy movement and damage-skill scoring toward important targets such as envoys without overriding defeat bonuses or range checks. Pre-battle Formation uses the loaded scenario's `formation.cells` and only mutates current battle unit positions before battle-begin events fire. Destination victory cells from `unit_reaches_tile` conditions are exposed to the scene for objective overlays and tile info. Movement-triggered `unit_reaches_tile` events receive the unit that just moved, so ambushes fire on entry rather than from units already standing on a marker. Briefing data can append matching `briefing.conditional_lines`, and scenario events can use `when.campaign_flags` to branch dialogue, objective changes, and reinforcements from saved campaign choices. Consumable use can restore HP or MP, and in-battle item use plus equipment swaps mutate only the battle copy until victory; defeats and restarts do not spend saved items or preserve in-battle gear changes. Post-battle choices write campaign `flags` only after the result-panel button is pressed; if the player reloads after rewards are saved but before selecting, the pending scenario id restores the victory choice panel without replaying rewards. The next battle button stays locked until the campaign choice save succeeds. Equipment rewards share the same `item_id -> count` inventory stock, cover weapon, armor, and accessory slots, can be equipped from the side HUD before the selected unit moves or acts, and do not appear in the consumable action menu. Already completed scenarios can be replayed without granting duplicate rewards, choices, replay inventory consumption, save writes, current-scenario advancement, or finite-stock purchases; pre-battle Shop, Armory, Roster, Formation, and Save are disabled on completed-scenario replays to avoid side effects.
|
||||
|
||||
The battle scene owns presentation feedback: briefing and result states use menu BGM, briefing headers combine `CampaignState` chapter ranges, campaign order, and title data with `BattleState` briefing and objective text, active battles use battle BGM, dialogue lines can show optional portrait textures or speaker-initial fallback panels and can place the portrait on the left or right side of the dialogue panel, board units render low-HP warning rings and HP bar color states from battle state fields, hover previews are rendered as target badges from existing `BattleState` forecast APIs, log/result hooks trigger placeholder SFX, support and debuff effects use distinct floating feedback colors, `BattleState.unit_motion_requested` asks the scene to interpolate a unit's draw position during movement, and `BattleState.combat_feedback_requested` asks the scene to draw transient floating combat text without changing battle rules.
|
||||
The battle scene owns presentation feedback: briefing and result states use menu BGM, briefing headers combine `CampaignState` chapter ranges, campaign order, and title data with `BattleState` briefing and objective text, active battles use battle BGM, dialogue lines can show optional portrait textures or speaker-initial fallback panels and can place the portrait on the left or right side of the dialogue panel, board units render low-HP warning rings and HP bar color states from battle state fields, hover previews are rendered as target badges from existing `BattleState` forecast APIs, log/result hooks trigger placeholder SFX, support, debuff, and poison effects use distinct floating feedback colors, `BattleState.unit_motion_requested` asks the scene to interpolate a unit's draw position during movement, and `BattleState.combat_feedback_requested` asks the scene to draw transient floating combat text without changing battle rules.
|
||||
|
||||
The `New Campaign` button clears `user://campaign_save.json`, resets campaign state to the first scenario, and reloads the opening briefing.
|
||||
|
||||
@@ -226,7 +226,7 @@ Classes provide movement, min/max attack range, skill access, growth grades, cla
|
||||
|
||||
## Skills
|
||||
|
||||
Skills define MP tactics. A class, officer, or scenario deployment can add skill ids to the runtime unit. `range` is `[min, max]` in Manhattan distance and can use `0` as the minimum for self-targeting support skills. Skill `kind` can be `damage`, `heal`, or `support`. Enemy AI can use `damage` and `heal` skills when it has enough MP.
|
||||
Skills define MP tactics. A class, officer, or scenario deployment can add skill ids to the runtime unit. `range` is `[min, max]` in Manhattan distance and can use `0` as the minimum for self-targeting support skills. Skill `kind` can be `damage`, `heal`, or `support`. Enemy AI can use damage, healing, support, debuff, and damage-over-time skills when it has enough MP.
|
||||
|
||||
```json
|
||||
{
|
||||
@@ -242,9 +242,26 @@ Skills define MP tactics. A class, officer, or scenario deployment can add skill
|
||||
}
|
||||
```
|
||||
|
||||
Support skills use an `effects` array. The first supported effect is `stat_bonus`, with `stat` in `atk`, `def`, `int`, or `agi`, a non-zero `amount`, and positive `duration_turns`. Positive amounts are buffs and negative amounts are debuffs; both are battle-only and expire when the target's team begins enough future phases.
|
||||
Support skills use an `effects` array. `stat_bonus` uses `stat` in `atk`, `def`, `int`, or `agi`, a non-zero `amount`, and positive `duration_turns`. Positive amounts are buffs and negative amounts are debuffs; both are battle-only and expire when the target's team begins enough future phases. `damage_over_time` uses a stable `status`, positive `amount`, and positive `duration_turns`; it ticks at the start of the target team's phase before expiration and can defeat units without awarding delayed defeat EXP.
|
||||
|
||||
The current single-target tactic set includes `spark`, `fire_tactic`, `blaze`, `mend`, `great_mend`, `guard_order`, `rally_order`, and `disrupt_order`. Hero and strategist classes get low-cost Spark alongside Fire/Mend, ally orders, and the first enemy debuff, promoted command/advisor classes add Great Mend, and late scenario deployments can add stronger pressure skills such as Blaze without changing their base class.
|
||||
```json
|
||||
{
|
||||
"poison_mist": {
|
||||
"name": "Poison Mist",
|
||||
"kind": "support",
|
||||
"target": "enemy",
|
||||
"mp_cost": 6,
|
||||
"range": [1, 3],
|
||||
"power": 0,
|
||||
"stat": "int",
|
||||
"effects": [
|
||||
{ "type": "damage_over_time", "status": "poison", "amount": 4, "duration_turns": 2 }
|
||||
]
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
The current single-target tactic set includes `spark`, `fire_tactic`, `blaze`, `mend`, `great_mend`, `guard_order`, `rally_order`, `disrupt_order`, and `poison_mist`. Hero classes get low-cost Spark alongside Fire/Mend and ally orders, strategist classes also get Poison Mist, promoted command/advisor classes add Great Mend, and late scenario deployments can add stronger pressure skills such as Blaze without changing their base class.
|
||||
|
||||
## Terrain
|
||||
|
||||
@@ -475,7 +492,7 @@ Event-spawned units use the same compact deployment shape as scenario starting u
|
||||
|
||||
## Current Implementation
|
||||
|
||||
`scripts/core/data_catalog.gd` reads definition files once and `BattleState._apply_battle_data()` accepts either legacy `units` or catalog-backed `deployments`. Runtime units now carry `min_range`, `range`, `skills`, `exp`, `growth`, `growth_bonus`, and battle-only `status_effects` so the battle resolver can handle counterattacks, MP tactics, support buffs, enemy debuffs, EXP, level-ups, and enemy tactic AI without changing scenario files.
|
||||
`scripts/core/data_catalog.gd` reads definition files once and `BattleState._apply_battle_data()` accepts either legacy `units` or catalog-backed `deployments`. Runtime units now carry `min_range`, `range`, `skills`, `exp`, `growth`, `growth_bonus`, and battle-only `status_effects` so the battle resolver can handle counterattacks, MP tactics, support buffs, enemy debuffs, damage-over-time statuses, EXP, level-ups, and enemy tactic AI without changing scenario files.
|
||||
|
||||
`scripts/core/campaign_state.gd` writes `user://campaign_save.json` with `save_version`, completed scenarios, gold, inventory counts, joined officers, pending post-battle choice scenario id, applied post-battle choice ids, campaign flags, per-scenario shop purchase counts, and player roster progression. The same snapshot can be copied to the one-slot manual checkpoint at `user://campaign_manual_save.json` from the pre-battle Save menu. Loading that checkpoint restores it into the active automatic save and then reloads the pending choice panel, campaign completion state, or current scenario briefing. Roster snapshots include level, EXP, stats, class id/name, class-derived movement/range/growth fields, skills, and equipment. Rewards, joined/left officers, and post-battle choices are guarded by completed scenario id so restarting a finished battle does not duplicate gold, items, membership changes, branch decisions, or finite shop purchases. On load, completed-scenario officer join/leave transitions are reconciled without replaying gold or item rewards, which lets new officer rewards added to older completed scenarios become available to existing saves.
|
||||
|
||||
@@ -491,4 +508,4 @@ Before a battle starts, `BattleScene` can buy priced items through `CampaignStat
|
||||
|
||||
When every campaign scenario id is present in `completed_scenarios`, the battle scene shows a campaign completion panel. Starting a new campaign clears the automatic save file and resets `current_scenario_id` to `start_scenario`; the manual checkpoint is left alone until overwritten from the Save menu.
|
||||
|
||||
Run `tools/validate_data.ps1` after data edits to check campaign paths, chapter ranges, map dimensions, terrain keys, class/officer/item/skill references, item effect names and amounts, equipment slot compatibility including accessory types, promotion routes and promotion equipment compatibility, condition/event names, condition unit references, destination condition coordinates, campaign flag references, joined-officer gates, briefing line blocks, deployment ids, deployment bounds, impassable spawn cells, shop stock, roster rules, formation cells, post-battle dialogue, post-battle choices, and reward item ids.
|
||||
Run `tools/validate_data.ps1` after data edits to check campaign paths, chapter ranges, map dimensions, terrain keys, class/officer/item/skill references, skill status effect shapes, item effect names and amounts, equipment slot compatibility including accessory types, promotion routes and promotion equipment compatibility, condition/event names, condition unit references, destination condition coordinates, campaign flag references, joined-officer gates, briefing line blocks, deployment ids, deployment bounds, impassable spawn cells, shop stock, roster rules, formation cells, post-battle dialogue, post-battle choices, and reward item ids.
|
||||
|
||||
@@ -46,6 +46,7 @@ powershell -NoProfile -ExecutionPolicy Bypass -File tools\check_godot46_readines
|
||||
- Finite-stock Shop entries show remaining counts and disable once sold out.
|
||||
- Manual checkpoint save/load restores the expected current briefing without script errors.
|
||||
- A player unit can move, attack, wait, use a tactic, use an item, and equip compatible gear.
|
||||
- Poison Mist applies poison, poison ticks at the target team's phase start, and poison defeat immediately ends the battle when it satisfies a victory or defeat condition.
|
||||
- Enemy turn advances and AI acts.
|
||||
- Victory and defeat panels still appear.
|
||||
- Post-battle dialogue and post-battle choices still block progression until a choice is saved.
|
||||
|
||||
@@ -32,9 +32,9 @@
|
||||
- Weapon, armor, and accessory slots. Basic stat bonuses exist.
|
||||
- Equipment rewards can be stored, displayed, and swapped from the battle HUD.
|
||||
- Terrain movement, defense, and avoid modifiers affect combat.
|
||||
- Skills, tactics, and MP. Multiple single-target damage/heal tactics, ally support buffs, enemy debuffs, a skill list menu with range/effect hints, and enemy tactic AI exist.
|
||||
- Skills, tactics, and MP. Multiple single-target damage/heal tactics, ally support buffs, enemy debuffs, poison damage-over-time, a skill list menu with range/effect hints, and enemy tactic AI exist.
|
||||
- Consumable item use. Basic global inventory, Bean HP recovery, Wine MP recovery, item menu, preview, and target overlay exist.
|
||||
- Counterattacks exist. Battle-only support and debuff status effects exist; richer ailment/status families are still planned.
|
||||
- Counterattacks exist. Battle-only support, debuff, and first damage-over-time status effects exist; richer ailment/status families are still planned.
|
||||
- Battle EXP, level-ups, class promotion, and campaign roster persistence exist.
|
||||
|
||||
## Milestone 3: Scenario Layer
|
||||
@@ -133,7 +133,7 @@
|
||||
|
||||
- Portrait pipeline. Officer definitions can provide default portrait paths, dialogue lines can override them, and missing art falls back to speaker initials.
|
||||
- Unit sprites and animations. Board movement now has a short slide animation, and board units show low-HP warning rings.
|
||||
- Battle effects. First floating combat text now covers damage, recovery, misses, support effects, level-ups, and promotions. Hover target preview badges summarize attacks, tactics, and items.
|
||||
- Battle effects. First floating combat text now covers damage, recovery, misses, support effects, poison ticks, level-ups, and promotions. Hover target preview badges summarize attacks, tactics, and items.
|
||||
- Music and sound. Basic placeholder BGM and SFX now play for menus, battle flow, unit actions, tactics, items, and result states.
|
||||
- Chapter UI and visual novel scenes. Pre-battle briefing now uses campaign chapter ranges for chapter-aware numbering, has a chapter progress/replay overview, and dialogue lines can choose left or right portrait placement.
|
||||
|
||||
|
||||
@@ -843,7 +843,10 @@ func _skill_has_support_effects(skill: Dictionary) -> bool:
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) == "stat_bonus" and _is_supported_status_stat(str(effect.get("stat", ""))) and int(effect.get("amount", 0)) != 0:
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
if effect_type == "stat_bonus" and _is_supported_status_stat(str(effect.get("stat", ""))) and int(effect.get("amount", 0)) != 0:
|
||||
return true
|
||||
if effect_type == "damage_over_time" and int(effect.get("amount", 0)) > 0:
|
||||
return true
|
||||
return false
|
||||
|
||||
@@ -855,19 +858,33 @@ func _resolve_skill_support(caster: Dictionary, target: Dictionary, skill_id: St
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) != "stat_bonus":
|
||||
continue
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
status_effects.append({
|
||||
"source_skill": skill_id,
|
||||
"name": str(skill.get("name", skill_id)),
|
||||
"stat": stat,
|
||||
"amount": amount,
|
||||
"remaining_phases": max(1, int(effect.get("duration_turns", 1)))
|
||||
})
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
if effect_type == "stat_bonus":
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
status_effects.append({
|
||||
"source_skill": skill_id,
|
||||
"name": str(skill.get("name", skill_id)),
|
||||
"type": effect_type,
|
||||
"stat": stat,
|
||||
"amount": amount,
|
||||
"remaining_phases": max(1, int(effect.get("duration_turns", 1)))
|
||||
})
|
||||
elif effect_type == "damage_over_time":
|
||||
var damage: int = max(0, int(effect.get("amount", 0)))
|
||||
if damage <= 0:
|
||||
continue
|
||||
var status := str(effect.get("status", "poison"))
|
||||
status_effects.append({
|
||||
"source_skill": skill_id,
|
||||
"name": str(skill.get("name", skill_id)),
|
||||
"type": effect_type,
|
||||
"status": status,
|
||||
"amount": damage,
|
||||
"remaining_phases": max(1, int(effect.get("duration_turns", 1)))
|
||||
})
|
||||
target["status_effects"] = status_effects
|
||||
_emit_log("%s casts %s on %s. %s" % [
|
||||
caster["name"],
|
||||
@@ -900,16 +917,22 @@ func _format_support_effects(skill: Dictionary) -> String:
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) != "stat_bonus":
|
||||
continue
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
var duration: int = maxi(1, int(effect.get("duration_turns", 1)))
|
||||
var duration_text := "next phase" if duration == 1 else "%d phases" % duration
|
||||
parts.append("%s %s%d until %s" % [stat.to_upper(), sign, amount, duration_text])
|
||||
if effect_type == "stat_bonus":
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
parts.append("%s %s%d until %s" % [stat.to_upper(), sign, amount, duration_text])
|
||||
elif effect_type == "damage_over_time":
|
||||
var damage := int(effect.get("amount", 0))
|
||||
if damage <= 0:
|
||||
continue
|
||||
var status_name := _status_display_name(str(effect.get("status", "poison")))
|
||||
parts.append("%s -%d HP for %s" % [status_name, damage, duration_text])
|
||||
if parts.is_empty():
|
||||
return "No support effect."
|
||||
return _join_strings(parts, ", ")
|
||||
@@ -920,20 +943,29 @@ func _format_support_popup(skill: Dictionary) -> String:
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) != "stat_bonus":
|
||||
continue
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
parts.append("%s %s%d" % [stat.to_upper(), sign, amount])
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
if effect_type == "stat_bonus":
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
parts.append("%s %s%d" % [stat.to_upper(), sign, amount])
|
||||
elif effect_type == "damage_over_time":
|
||||
var damage := int(effect.get("amount", 0))
|
||||
if damage > 0:
|
||||
parts.append(_status_display_name(str(effect.get("status", "poison"))).to_upper())
|
||||
if parts.is_empty():
|
||||
return "Support"
|
||||
return _join_strings(parts, ", ")
|
||||
|
||||
|
||||
func _support_feedback_kind(skill: Dictionary) -> String:
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) == "damage_over_time" and int(effect.get("amount", 0)) > 0:
|
||||
return str(effect.get("status", "poison"))
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
@@ -945,8 +977,13 @@ func _support_feedback_kind(skill: Dictionary) -> String:
|
||||
func _format_active_status_effects(unit: Dictionary) -> String:
|
||||
var parts := []
|
||||
for effect in _active_status_effects(unit):
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var effect_type := str(effect.get("type", "stat_bonus"))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if effect_type == "damage_over_time":
|
||||
if amount > 0:
|
||||
parts.append("%s -%d HP" % [_status_display_name(str(effect.get("status", "poison"))), amount])
|
||||
continue
|
||||
var stat := str(effect.get("stat", ""))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
@@ -954,6 +991,13 @@ func _format_active_status_effects(unit: Dictionary) -> String:
|
||||
return _join_strings(parts, ", ")
|
||||
|
||||
|
||||
func _status_display_name(status: String) -> String:
|
||||
var normalized := status.strip_edges()
|
||||
if normalized.is_empty():
|
||||
return "Status"
|
||||
return normalized.replace("_", " ").capitalize()
|
||||
|
||||
|
||||
func _is_supported_status_stat(stat: String) -> bool:
|
||||
return stat == "atk" or stat == "def" or stat == "int" or stat == "agi"
|
||||
|
||||
@@ -979,12 +1023,15 @@ func end_player_turn() -> void:
|
||||
|
||||
selected_unit_id = ""
|
||||
current_team = TEAM_ENEMY
|
||||
_reset_team_actions(TEAM_ENEMY)
|
||||
_emit_log("Enemy phase begins.")
|
||||
_run_events("turn_start", current_team, turn_number)
|
||||
_reset_team_actions(TEAM_ENEMY)
|
||||
if battle_status == STATUS_ACTIVE:
|
||||
_run_events("turn_start", current_team, turn_number)
|
||||
_check_battle_status()
|
||||
if battle_status == STATUS_ACTIVE:
|
||||
_run_enemy_turn()
|
||||
else:
|
||||
_notify_changed()
|
||||
|
||||
|
||||
func get_unit(unit_id: String) -> Dictionary:
|
||||
@@ -1853,9 +1900,10 @@ func _run_enemy_turn() -> void:
|
||||
if battle_status == STATUS_ACTIVE:
|
||||
turn_number += 1
|
||||
current_team = TEAM_PLAYER
|
||||
_reset_team_actions(TEAM_PLAYER)
|
||||
_emit_log("Player phase begins.")
|
||||
_run_events("turn_start", current_team, turn_number)
|
||||
_reset_team_actions(TEAM_PLAYER)
|
||||
if battle_status == STATUS_ACTIVE:
|
||||
_run_events("turn_start", current_team, turn_number)
|
||||
_check_battle_status()
|
||||
|
||||
_notify_changed()
|
||||
@@ -2012,18 +2060,25 @@ func _support_ai_score(caster: Dictionary, target: Dictionary, skill: Dictionary
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) != "stat_bonus":
|
||||
continue
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
if amount > 0 and target_is_ally:
|
||||
score += amount * _support_ai_stat_weight(stat)
|
||||
if target.get("id", "") == caster.get("id", ""):
|
||||
score += 3
|
||||
elif amount < 0 and not target_is_ally:
|
||||
score += absi(amount) * _support_ai_stat_weight(stat)
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
if effect_type == "stat_bonus":
|
||||
var stat := str(effect.get("stat", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if not _is_supported_status_stat(stat) or amount == 0:
|
||||
continue
|
||||
if amount > 0 and target_is_ally:
|
||||
score += amount * _support_ai_stat_weight(stat)
|
||||
if target.get("id", "") == caster.get("id", ""):
|
||||
score += 3
|
||||
elif amount < 0 and not target_is_ally:
|
||||
score += absi(amount) * _support_ai_stat_weight(stat)
|
||||
score += _ai_target_priority_score(target)
|
||||
elif effect_type == "damage_over_time" and not target_is_ally:
|
||||
var damage := int(effect.get("amount", 0))
|
||||
if damage <= 0:
|
||||
continue
|
||||
var duration: int = max(1, int(effect.get("duration_turns", 1)))
|
||||
score += damage * duration * 5
|
||||
score += _ai_target_priority_score(target)
|
||||
return score
|
||||
|
||||
@@ -2681,6 +2736,10 @@ func _spawn_event_deployment(deployment) -> bool:
|
||||
|
||||
|
||||
func _reset_team_actions(team: String) -> void:
|
||||
_apply_phase_status_effects_for_team(team)
|
||||
_check_battle_status()
|
||||
if battle_status != STATUS_ACTIVE:
|
||||
return
|
||||
_expire_status_effects_for_team(team)
|
||||
for unit in units:
|
||||
if unit.get("team", "") == team and unit.get("alive", false):
|
||||
@@ -2688,6 +2747,27 @@ func _reset_team_actions(team: String) -> void:
|
||||
unit["moved"] = false
|
||||
|
||||
|
||||
func _apply_phase_status_effects_for_team(team: String) -> void:
|
||||
for unit in units:
|
||||
if unit.get("team", "") != team or not unit.get("alive", false):
|
||||
continue
|
||||
for effect in _active_status_effects(unit):
|
||||
if str(effect.get("type", "")) != "damage_over_time":
|
||||
continue
|
||||
var damage: int = max(0, int(effect.get("amount", 0)))
|
||||
if damage <= 0:
|
||||
continue
|
||||
unit["hp"] = max(0, int(unit.get("hp", 0)) - damage)
|
||||
var status := str(effect.get("status", "poison"))
|
||||
_emit_log("%s suffers %d %s damage." % [unit["name"], damage, status.replace("_", " ")])
|
||||
_emit_combat_feedback(unit, "-%d" % damage, status)
|
||||
if int(unit.get("hp", 0)) <= 0:
|
||||
unit["alive"] = false
|
||||
_emit_log("%s is defeated by %s." % [unit["name"], status.replace("_", " ")])
|
||||
_emit_combat_feedback(unit, "DOWN", "defeat")
|
||||
break
|
||||
|
||||
|
||||
func _expire_status_effects_for_team(team: String) -> void:
|
||||
for unit in units:
|
||||
if unit.get("team", "") != team:
|
||||
|
||||
@@ -1051,6 +1051,8 @@ func _floating_text_color(kind: String) -> Color:
|
||||
return Color(1.0, 0.88, 0.28)
|
||||
if kind == "debuff":
|
||||
return Color(0.80, 0.52, 1.0)
|
||||
if kind == "poison":
|
||||
return Color(0.54, 0.95, 0.36)
|
||||
if kind == "miss" or kind == "fade":
|
||||
return Color(0.82, 0.84, 0.90)
|
||||
if kind == "defeat":
|
||||
@@ -1138,7 +1140,7 @@ func _skill_target_preview_badge(selected: Dictionary, target: Dictionary) -> Di
|
||||
return _make_target_preview_badge("+%d HP" % heal, "heal")
|
||||
if kind == "support":
|
||||
var effect_text := str(preview.get("effect_text", "Support"))
|
||||
var badge_kind := "debuff" if effect_text.contains("-") else "support"
|
||||
var badge_kind := "poison" if effect_text.contains("Poison") else ("debuff" if effect_text.contains("-") else "support")
|
||||
return _make_target_preview_badge(_compact_support_preview_text(effect_text), badge_kind)
|
||||
|
||||
var result_text := "KO" if bool(preview.get("would_defeat", false)) else "-%d" % int(preview.get("damage", 0))
|
||||
@@ -1185,6 +1187,9 @@ func _compact_support_preview_text(effect_text: String) -> String:
|
||||
var until_index := part.find(" until ")
|
||||
if until_index >= 0:
|
||||
part = part.substr(0, until_index)
|
||||
var for_index := part.find(" for ")
|
||||
if for_index >= 0:
|
||||
part = part.substr(0, for_index)
|
||||
if not part.is_empty() and part != "No support effect.":
|
||||
parts.append(part)
|
||||
if parts.is_empty():
|
||||
@@ -1205,6 +1210,8 @@ func _target_preview_badge_color(kind: String) -> Color:
|
||||
return Color(1.0, 0.88, 0.30)
|
||||
if kind == "debuff":
|
||||
return Color(0.78, 0.55, 1.0)
|
||||
if kind == "poison":
|
||||
return Color(0.54, 0.95, 0.36)
|
||||
return Color(0.78, 0.80, 0.86)
|
||||
|
||||
|
||||
@@ -3245,13 +3252,16 @@ func _format_tactic_effect_text(skill: Dictionary) -> String:
|
||||
for effect in skill.get("effects", []):
|
||||
if typeof(effect) != TYPE_DICTIONARY:
|
||||
continue
|
||||
if str(effect.get("type", "")) != "stat_bonus":
|
||||
continue
|
||||
var effect_type := str(effect.get("type", ""))
|
||||
var amount := int(effect.get("amount", 0))
|
||||
if amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
parts.append("%s %s%d" % [str(effect.get("stat", "")).to_upper(), sign, amount])
|
||||
if effect_type == "stat_bonus":
|
||||
if amount == 0:
|
||||
continue
|
||||
var sign := "+" if amount > 0 else ""
|
||||
parts.append("%s %s%d" % [str(effect.get("stat", "")).to_upper(), sign, amount])
|
||||
elif effect_type == "damage_over_time" and amount > 0:
|
||||
var status_name := str(effect.get("status", "status")).replace("_", " ").capitalize()
|
||||
parts.append("%s -%d" % [status_name, amount])
|
||||
if not parts.is_empty():
|
||||
return _join_strings(parts, ", ")
|
||||
return "P%d" % int(skill.get("power", 0))
|
||||
|
||||
@@ -100,7 +100,7 @@ $validBonusStats = @("hp", "mp", "atk", "def", "int", "agi")
|
||||
$validSkillKinds = @("damage", "heal", "support")
|
||||
$validSkillTargets = @("enemy", "ally", "self", "any")
|
||||
$validSkillStats = @("atk", "def", "int", "agi")
|
||||
$validSkillEffectTypes = @("stat_bonus")
|
||||
$validSkillEffectTypes = @("stat_bonus", "damage_over_time")
|
||||
$validDialogueSides = @("left", "right")
|
||||
$validPortraitPathPattern = '^res://.+\.(png|jpg|jpeg|webp)$'
|
||||
$knownFlagIds = New-Object System.Collections.Generic.HashSet[string]
|
||||
@@ -773,6 +773,17 @@ function Check-Skill-Definitions() {
|
||||
if ([int](Get-Prop $effect "duration_turns" 1) -le 0) {
|
||||
Fail "Skill $skillId stat_bonus effect must have positive duration_turns."
|
||||
}
|
||||
} elseif ($effectType -eq "damage_over_time") {
|
||||
$status = [string](Get-Prop $effect "status" "")
|
||||
if ([string]::IsNullOrWhiteSpace($status) -or -not ($status -match '^[a-z0-9_]+$')) {
|
||||
Fail "Skill $skillId damage_over_time effect must have a stable status."
|
||||
}
|
||||
if ([int](Get-Prop $effect "amount" 0) -le 0) {
|
||||
Fail "Skill $skillId damage_over_time effect must have positive amount."
|
||||
}
|
||||
if ([int](Get-Prop $effect "duration_turns" 1) -le 0) {
|
||||
Fail "Skill $skillId damage_over_time effect must have positive duration_turns."
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user