Deukhoofd
/
PkmnLib.NET
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adds battle history, fixes code style

This commit is contained in:
Deukhoofd 2024-08-23 09:24:00 +02:00
parent d48889e21a
commit e7dc885afd
21 changed files with 80 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PkmnLib.Dataloader/Models/SerializedAbility.cs
View File

@ -1,6 +1,5 @@
using System.Collections.Generic;
using System.Text.Json.Nodes;
using PkmnLib.Static.Utils;
namespace PkmnLib.Dataloader.Models;

8
PkmnLib.Dataloader/Models/SerializedItem.cs
View File

@ -2,10 +2,10 @@ namespace PkmnLib.Dataloader.Models;
public class SerializedItem
{
public string Name { get; set; }
public string ItemType { get; set; }
public string BattleType { get; set; }
public string[] Flags { get; set; }
public string Name { get; set; } = null!;
public string ItemType { get; set; } = null!;
public string BattleType { get; set; } = null!;
public string[] Flags { get; set; } = null!;
public int Price { get; set; }
public byte FlingPower { get; set; }
}

16
PkmnLib.Dataloader/Models/SerializedMove.cs
View File

@ -5,26 +5,26 @@ namespace PkmnLib.Dataloader.Models;
public class SerializedMoveDataWrapper
{
public SerializedMove[] Data { get; set; }
public SerializedMove[] Data { get; set; } = null!;
}
public class SerializedMove
{
public string Name { get; set; }
public string Type { get; set; }
public string Name { get; set; } = null!;
public string Type { get; set; } = null!;
public byte Power { get; set; }
public byte PP { get; set; }
public byte Accuracy { get; set; }
public sbyte Priority { get; set; }
public string Target { get; set; }
public string Category { get; set; }
public string[] Flags { get; set; }
public string Target { get; set; } = null!;
public string Category { get; set; } = null!;
public string[] Flags { get; set; } = null!;
public SerializedMoveEffect? Effect { get; set; }
}
public class SerializedMoveEffect
{
public string Name { get; set; }
public string Name { get; set; } = null!;
public float Chance { get; set; }
public Dictionary<string, JsonNode>? Parameters { get; set; }
public Dictionary<string, JsonNode>? Parameters { get; set; } = null!;
}

37
PkmnLib.Dataloader/Models/SerializedSpecies.cs
View File

@ -1,46 +1,45 @@
using System.Collections.Generic;
using System.Text.Json;
using System.Text.Json.Nodes;
namespace PkmnLib.Dataloader.Models;
public class SerializedSpecies
{
public string Species { get; set; }
public string Species { get; set; } = null!;
public ushort Id { get; set; }
public float GenderRatio { get; set; }
public string GrowthRate { get; set; }
public string GrowthRate { get; set; } = null!;
public byte BaseHappiness { get; set; }
public byte CatchRate { get; set; }
public string Color { get; set; }
public string Color { get; set; } = null!;
public bool GenderDifference { get; set; }
public string[] EggGroups { get; set; }
public string[] EggGroups { get; set; } = null!;
public int EggCycles { get; set; }
public string[] Flags { get; set; } = [];
public Dictionary<string, SerializedForm> Formes { get; set; }
public Dictionary<string, SerializedForm> Formes { get; set; } = null!;
public SerializedEvolution[] Evolutions { get; set; } = [];
}
public class SerializedForm
{
public string[] Abilities { get; set; }
public string[] Abilities { get; set; } = null!;
public string[] HiddenAbilities { get; set; } = [];
public SerializedStats BaseStats { get; set; }
public SerializedStats EVReward { get; set; }
public string[] Types { get; set; }
public SerializedStats BaseStats { get; set; } = null!;
public SerializedStats EVReward { get; set; } = null!;
public string[] Types { get; set; } = null!;
public float Height { get; set; }
public float Weight { get; set; }
public uint BaseExp { get; set; }
public bool IsMega { get; set; }
public SerializedMoves Moves { get; set; }
public SerializedMoves Moves { get; set; } = null!;
public string[] Flags { get; set; } = [];
}
public class SerializedEvolution
{
public string Species { get; set; }
public string Method { get; set; }
public JsonNode Data { get; set; }
public string Species { get; set; } = null!;
public string Method { get; set; } = null!;
public JsonNode Data { get; set; } = null!;
}
public class SerializedStats
@ -55,14 +54,14 @@ public class SerializedStats
public class SerializedLevelMove
{
public string Name { get; set; }
public string Name { get; set; } = null!;
public uint Level { get; set; }
}
public class SerializedMoves
{
public SerializedLevelMove[] LevelMoves { get; set; }
public string[] EggMoves { get; set; }
public string[] TutorMoves { get; set; }
public string[] Machine { get; set; }
public SerializedLevelMove[] LevelMoves { get; set; } = null!;
public string[] EggMoves { get; set; } = null!;
public string[] TutorMoves { get; set; } = null!;
public string[] Machine { get; set; } = null!;
}

4
PkmnLib.Dataloader/SpeciesDataLoader.cs
View File

@ -187,7 +187,7 @@ public static class SpeciesDataLoader
Name = "location",
Parameters = new Dictionary<StringKey, object?>
{
["location"] = evolution.Data.ToString() ?? throw new InvalidDataException("Location is null.")
["location"] = evolution.Data.ToString() ?? throw new InvalidDataException("Location is null."),
},
ToSpecies = evolution.Species,
},
@ -200,7 +200,7 @@ public static class SpeciesDataLoader
.ToDictionary(x => new StringKey(x.Key), x => x.Value!.ToParameter()),
ToSpecies = evolution.Species,
},
_ => throw new InvalidDataException($"Evolution type {evolution.Method} is invalid.")
_ => throw new InvalidDataException($"Evolution type {evolution.Method} is invalid."),
};
}
}

31
PkmnLib.Dynamic/Models/Battle.cs
View File

@ -110,6 +110,12 @@ public interface IBattle : IScriptSource
/// Gets the current weather of the battle. If no weather is present, this returns null.
/// </summary>
StringKey? WeatherName { get; }
/// <summary>
/// Gets the turn choices of the previous turn. This is a list of lists, where each list represents the choices
/// for a single turn. The outer list is ordered from oldest to newest turn.
/// </summary>
IReadOnlyList<IReadOnlyList<ITurnChoice>> PreviousTurnChoices { get; }
}
/// <inheritdoc cref="IBattle"/>
@ -172,7 +178,8 @@ public class BattleImpl : ScriptSource, IBattle
public IPokemon? GetPokemon(byte side, byte position) => Sides[side].Pokemon[position];
/// <inheritdoc />
public bool CanSlotBeFilled(byte side, byte position) => Parties.Any(x => x.IsResponsibleForIndex(new ResponsibleIndex(side, position)) && x.HasPokemonNotInField());
public bool CanSlotBeFilled(byte side, byte position) => Parties.Any(x =>
x.IsResponsibleForIndex(new ResponsibleIndex(side, position)) && x.HasPokemonNotInField());
/// <inheritdoc />
public void ValidateBattleState()
@ -207,7 +214,7 @@ public class BattleImpl : ScriptSource, IBattle
HasEnded = true;
return;
}
// If only one side is left, that side has won
Result = BattleResult.Conclusive(survivingSide!.Index);
HasEnded = true;
@ -267,17 +274,22 @@ public class BattleImpl : ScriptSource, IBattle
choice.RunScriptHook(script => script.ChangePriority(moveChoice, ref priority));
moveChoice.Priority = priority;
}
var speed = choice.User.BoostedStats.Speed;
choice.RunScriptHook(script => script.ChangeSpeed(choice, ref speed));
choice.Speed = speed;
choice.RandomValue = (uint)Random.GetInt();
choices[index * PositionsPerSide + i] = choice;
choices[index * PositionsPerSide + i] = choice;
}
side.ResetChoices();
}
_previousTurnChoices.Add(choices.ToList());
CurrentTurnNumber += 1;
ChoiceQueue = new BattleChoiceQueue(choices);
@ -288,6 +300,7 @@ public class BattleImpl : ScriptSource, IBattle
}
private readonly ScriptContainer _weatherScript = new();
/// <inheritdoc />
public void SetWeather(StringKey? weatherName)
{
@ -303,19 +316,25 @@ public class BattleImpl : ScriptSource, IBattle
_weatherScript.Clear();
}
}
private IScriptSet Volatile { get; } = new ScriptSet();
/// <inheritdoc />
public StringKey? WeatherName => _weatherScript.Script?.Name;
private readonly List<IReadOnlyList<ITurnChoice>> _previousTurnChoices = new();
/// <inheritdoc />
public IReadOnlyList<IReadOnlyList<ITurnChoice>> PreviousTurnChoices => _previousTurnChoices;
/// <inheritdoc />
public override int ScriptCount => 2;
/// <inheritdoc />
public override void GetOwnScripts(List<IEnumerable<ScriptContainer>> scripts)
{
scripts.Add(_weatherScript );
scripts.Add(_weatherScript);
scripts.Add(Volatile);
}

2
PkmnLib.Dynamic/Models/BattleFlow/MoveTurnExecutor.cs
View File

@ -168,7 +168,7 @@ internal static class MoveTurnExecutor
var hitEventBatch = new EventBatchId();
battle.EventHook.Invoke(new MoveHitEvent(executingMove, hitData, target)
{
BatchId = hitEventBatch
BatchId = hitEventBatch,
});
target.Damage(damage, DamageSource.MoveDamage, hitEventBatch);
if (!target.IsFainted)

10
PkmnLib.Dynamic/Models/BattleFlow/TargetResolver.cs
View File

@ -22,7 +22,7 @@ public static class TargetResolver
MoveTarget.AllAdjacent => GetAllAdjacent(battle, side, position),
MoveTarget.AllAlly => battle.Sides[side].Pokemon.ToList(),
MoveTarget.AllOpponent => battle.Sides[GetOppositeSide(side)].Pokemon.ToList(),
_ => throw new ArgumentOutOfRangeException(nameof(target), target, null)
_ => throw new ArgumentOutOfRangeException(nameof(target), target, null),
};
}
@ -49,7 +49,7 @@ public static class TargetResolver
return
[
battle.GetPokemon(side, position), battle.GetPokemon(GetOppositeSide(side), position),
battle.GetPokemon(side, (byte)right)
battle.GetPokemon(side, (byte)right),
];
}
@ -58,14 +58,14 @@ public static class TargetResolver
return
[
battle.GetPokemon(side, position), battle.GetPokemon(GetOppositeSide(side), position),
battle.GetPokemon(side, (byte)left)
battle.GetPokemon(side, (byte)left),
];
}
return
[
battle.GetPokemon(side, position), battle.GetPokemon(GetOppositeSide(side), position),
battle.GetPokemon(side, (byte)left), battle.GetPokemon(side, (byte)right)
battle.GetPokemon(side, (byte)left), battle.GetPokemon(side, (byte)right),
];
}
@ -90,7 +90,7 @@ public static class TargetResolver
return
[
battle.GetPokemon(side, position), battle.GetPokemon(side, (byte)left), battle.GetPokemon(side, (byte)right)
battle.GetPokemon(side, position), battle.GetPokemon(side, (byte)left), battle.GetPokemon(side, (byte)right),
];
}
}

8
PkmnLib.Dynamic/Models/Choices/TurnChoiceComparer.cs
View File

@ -12,7 +12,7 @@ public class TurnChoiceComparer : IComparer<ITurnChoice>
{
XEqualsY = 0,
XLessThanY = -1,
XGreaterThanY = 1
XGreaterThanY = 1,
}
private static CompareValues CompareForSameType(ITurnChoice x, ITurnChoice y)
@ -58,7 +58,7 @@ public class TurnChoiceComparer : IComparer<ITurnChoice>
{
IMoveChoice => CompareValues.XLessThanY,
IItemChoice itemY => CompareForSameType(itemX, itemY),
_ => CompareValues.XGreaterThanY
_ => CompareValues.XGreaterThanY,
};
case ISwitchChoice switchX:
// Switch choices go third
@ -66,7 +66,7 @@ public class TurnChoiceComparer : IComparer<ITurnChoice>
{
IMoveChoice or IItemChoice => CompareValues.XLessThanY,
ISwitchChoice switchY => CompareForSameType(switchX, switchY),
_ => CompareValues.XGreaterThanY
_ => CompareValues.XGreaterThanY,
};
case IPassChoice passX:
// Pass choices go last
@ -74,7 +74,7 @@ public class TurnChoiceComparer : IComparer<ITurnChoice>
{
IMoveChoice or IItemChoice or ISwitchChoice => CompareValues.XLessThanY,
IPassChoice passY => CompareForSameType(passX, passY),
_ => CompareValues.XGreaterThanY
_ => CompareValues.XGreaterThanY,
};
}

2
PkmnLib.Dynamic/Models/LearnedMove.cs
View File

@ -35,7 +35,7 @@ public enum MoveLearnMethod
/// <summary>
/// The move is learned when the Pokémon changes form.
/// </summary>
FormChange
FormChange,
}
/// <summary>

4
PkmnLib.Dynamic/Models/Pokemon.cs
View File

@ -523,7 +523,7 @@ public class PokemonImpl : ScriptSource, IPokemon
{
> 0 => StatBoost.IncreaseStatistic(stat, change),
< 0 => StatBoost.DecreaseStatistic(stat, change),
_ => changed
_ => changed,
};
if (!changed)
return false;
@ -599,7 +599,7 @@ public class PokemonImpl : ScriptSource, IPokemon
// If the Pokémon is in a battle, we trigger an event to the front-end.
BattleData.Battle.EventHook.Invoke(new DamageEvent(this, CurrentHealth, newHealth, source)
{
BatchId = batchId
BatchId = batchId,
});
// And allow scripts to execute.
this.RunScriptHook(script => script.OnDamage(this, source, CurrentHealth, newHealth));

4
PkmnLib.Dynamic/ScriptHandling/Script.cs
View File

@ -14,7 +14,6 @@ namespace PkmnLib.Dynamic.ScriptHandling;
/// </summary>
public abstract class Script
{
private bool _markedForDeletion;
private int _suppressCount;
/// <summary>
@ -24,9 +23,6 @@ public abstract class Script
/// </summary>
public virtual StringKey Name => this.ResolveName();
public bool MarkForDeletion() => _markedForDeletion = true;
public bool IsMarkedForDeletion() => _markedForDeletion;
/// <summary>
/// A script can be suppressed by other scripts. If a script is suppressed by at least one script
/// we will not execute its methods. This should return the number of suppressions on the script.

2
PkmnLib.Dynamic/ScriptHandling/ScriptContainer.cs
View File

@ -52,7 +52,6 @@ public class ScriptContainer : IEnumerable<ScriptContainer>
if (Script is not null)
{
Script.OnRemove();
Script.MarkForDeletion();
}
Script = script;
}
@ -65,7 +64,6 @@ public class ScriptContainer : IEnumerable<ScriptContainer>
if (Script is not null)
{
Script.OnRemove();
Script.MarkForDeletion();
}
Script = null;
}

1
PkmnLib.Dynamic/ScriptHandling/ScriptSet.cs
View File

@ -122,7 +122,6 @@ public class ScriptSet : IScriptSet
if (!script.IsEmpty)
{
script.Script.OnRemove();
script.Script.MarkForDeletion();
}
}
_scripts.Clear();

4
PkmnLib.Static/Species/Form.cs
View File

@ -166,7 +166,7 @@ public class FormImpl : IForm
return new AbilityIndex
{
IsHidden = false,
Index = (byte)i
Index = (byte)i,
};
}
for (var i = 0; i < HiddenAbilities.Count && i < 255; i++)
@ -175,7 +175,7 @@ public class FormImpl : IForm
return new AbilityIndex
{
IsHidden = true,
Index = (byte)i
Index = (byte)i,
};
}
return null;

2
PkmnLib.Static/Species/Gender.cs
View File

@ -17,5 +17,5 @@ public enum Gender : byte
/// <summary>
/// The Pokémon is female.
/// </summary>
Female
Female,
}

2
PkmnLib.Static/Statistic.cs
View File

@ -28,5 +28,5 @@ public enum Statistic : byte
/// <summary>
/// Speed determines the order that a Pokémon can act in battle.
/// </summary>
Speed
Speed,
}

2
PkmnLib.Static/StatisticSet.cs
View File

@ -63,7 +63,7 @@ public record ImmutableStatisticSet<T>
Statistic.SpecialAttack => SpecialAttack,
Statistic.SpecialDefense => SpecialDefense,
Statistic.Speed => Speed,
_ => throw new ArgumentException("Invalid statistic.")
_ => throw new ArgumentException("Invalid statistic."),
};
}
}

4
Plugins/PkmnLib.Plugin.Gen7/Libraries/Gen7BattleStatCalculator.cs
View File

@ -23,7 +23,7 @@ public class Gen7BattleStatCalculator : IBattleStatCalculator
return stat switch
{
Statistic.Hp => CalculateHealthStat(pokemon),
_ => CalculateNormalStat(pokemon, stat)
_ => CalculateNormalStat(pokemon, stat),
};
}
@ -90,7 +90,7 @@ public class Gen7BattleStatCalculator : IBattleStatCalculator
4 => 6.0f / 2.0f,
5 => 7.0f / 2.0f,
6 => 8.0f / 2.0f,
_ => throw new System.ArgumentException("Stat boost was out of expected range of -6 to 6")
_ => throw new System.ArgumentException("Stat boost was out of expected range of -6 to 6"),
};
}
}

4
Plugins/PkmnLib.Plugin.Gen7/Libraries/Gen7DamageCalculator.cs
View File

@ -62,7 +62,7 @@ public class Gen7DamageCalculator(bool hasRandomness) : IDamageCalculator
{
> uint.MaxValue => uint.MaxValue,
< 1 => 1,
_ => (uint)floatDamage
_ => (uint)floatDamage,
};
executingMove.RunScriptHook(script =>
script.ChangeDamage(executingMove, target, hitNumber, ref damage));
@ -98,7 +98,7 @@ public class Gen7DamageCalculator(bool hasRandomness) : IDamageCalculator
0 => random.GetInt(24) == 0,
1 => random.GetInt(8) == 0,
2 => random.GetInt(2) == 0,
_ => true
_ => true,
};
}

2
Plugins/PkmnLib.Plugin.Gen7/Libraries/Gen7MiscLibrary.cs
View File

@ -32,7 +32,7 @@ public class Gen7MiscLibrary : IMiscLibrary
>= 6 and <= 9 => TimeOfDay.Morning,
>= 10 and <= 16 => TimeOfDay.Day,
17 => TimeOfDay.Evening,
_ => TimeOfDay.Night
_ => TimeOfDay.Night,
};
}
}