Skip to content

Make "Starting AoE Caster Item" guarantee that an AoE attack magic item exists (if possible) #1098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markyys wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

Make "Starting AoE Caster Item" guarantee that an AoE attack magic item exists (if possible) #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1570a10
Fix mixed tabs and spaces for indentation in Magic.cs. No functional …
markyys Feb 1, 2023
394bf60
Make it clear that you will not be able to receive a caster item if t…
markyys Feb 1, 2023
cfe3554
SpellHelper: Add a method which encapsulates the "find all AoE attack…
markyys Feb 1, 2023
2494f54
MagicSpell: Add a method which makes it easy to tell if a given spell…
markyys Feb 1, 2023
9dd0b45
StartingEquipment: Call the "get a list of all AoE attack spells" log…
markyys Feb 1, 2023
231936a
ItemMagic: If we are supposed to start with an AoE attack item and it…
markyys Feb 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions FF1Blazorizer/Tabs/ItemEquipmentTab.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentDragonslayer" IsEnabled="!Flags.Weaponizer" @bind-Value="Flags.StartingEquipmentDragonslayer">Dragonslayer</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentLegendKit" IsEnabled="!Flags.Weaponizer" @bind-Value="Flags.StartingEquipmentLegendKit">Legendary Kit</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" DisableTooltip="true" @bind-Value="Flags.StartingEquipmentRandomEndgameWeapon">Random Endgame Weapon</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentRandomAoE" @bind-Value="Flags.StartingEquipmentRandomAoe">Random AoE Caster Item</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction"DisableTooltip="true" @bind-Value="Flags.StartingEquipmentRandomCasterItem">Random Caster Item</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentRandomAoE" @bind-Value="Flags.StartingEquipmentRandomAoe" isEnabled="Flags.ItemMagicMode != ItemMagicMode.None">Random AoE Caster Item</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction"DisableTooltip="true" @bind-Value="Flags.StartingEquipmentRandomCasterItem" isEnabled="Flags.ItemMagicMode != ItemMagicMode.None">Random Caster Item</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentOneItem" @bind-Value="Flags.StartingEquipmentOneItem">One Legendary/Caster Item</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentRandomTypeWeapon" @bind-Value="Flags.StartingEquipmentRandomTypeWeapon">Random Typed Weapon</TriStateCheckBox>
<TriStateCheckBox UpdateAction="@UpdateAction" Id="startingEquipmentGrandpasSecretStash" @bind-Value="Flags.StartingEquipmentGrandpasSecretStash">Grandpa's Secret Stash</TriStateCheckBox>
Expand Down
9 changes: 9 additions & 0 deletions FF1Lib/Helpers/SpellHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,14 @@ public SpellHelper(List<MagicSpell> _spellInfos)
//yeah stupid way of doing it, but i don't care
return SpellInfos.Select(s => ((Spell)Convert.ToByte((int)Spell.CURE + s.Index), s)).ToList();
}

public IEnumerable<(Spell Id, MagicSpell Info)> GetAoEAttackSpells()
{
var damageAoes = FindSpells(SpellRoutine.Damage, SpellTargeting.AllEnemies);
var instaAoes = FindSpells(SpellRoutine.InflictStatus, SpellTargeting.AllEnemies, SpellElement.Any, SpellStatus.Death);
var powerWordAoes = FindSpells(SpellRoutine.PowerWord, SpellTargeting.AllEnemies, SpellElement.Any, SpellStatus.Death);

return damageAoes.Concat(instaAoes).Concat(powerWordAoes);
}
}
}
10 changes: 10 additions & 0 deletions FF1Lib/ItemMagic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ public void ShuffleItemMagic(MT19337 rng, Flags flags)
Spells = GetAllSpells(rng);
}

if ((bool)flags.StartingEquipmentRandomAoe && flags.ItemMagicMode != ItemMagicMode.None) {
Copy link
Contributor

@wildham0 wildham0 Sep 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so that doesn't seem to do what is intended, the aoe spell is placed at the end of the list so it will never be picked, and because it doesn't discriminate it could introduce back excluded aoe spells (like nuke in balanced)

Copy link
Contributor Author

@markyys markyys Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good point. Is there an existing "exclude spells" utility which could be used to filter the list before picking a new random spell?
And yes, I did think that we may be required to also remove a spell from the pool, good to know.

Copy link
Contributor

@wildham0 wildham0 Sep 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

as madmartin said you don't need to create a new list, the generated list has already all the valid spells, you need to find the aoe's in that list and move it up

// guarantee that at least one item has an AoE attack spell
if (!Spells.Any(spell => spell.IsAoEAttack())) {
var spellHelper = new SpellHelper(this);
var aoe_spells = new List<MagicSpell>(spellHelper.GetAoEAttackSpells().Select(s => s.Info).ToList());
aoe_spells.Shuffle(rng);
Spells.Add(aoe_spells.First());
}
}

foreach (var item in Spells.Zip(magicItems, (s, i) => new { Spell = s, Item = i }))
{
WriteItemSpellData(item.Spell, item.Item);
Expand Down
Loading