forked from liza/Questionable
master #3
@ -579,6 +579,7 @@
|
|||||||
"AfterInteraction",
|
"AfterInteraction",
|
||||||
"AfterItemUse",
|
"AfterItemUse",
|
||||||
"AfterAction",
|
"AfterAction",
|
||||||
|
"AfterEmote",
|
||||||
"OverworldEnemies",
|
"OverworldEnemies",
|
||||||
"FateEnemies"
|
"FateEnemies"
|
||||||
]
|
]
|
||||||
|
@ -10,6 +10,7 @@ public sealed class EnemySpawnTypeConverter() : EnumConverter<EEnemySpawnType>(V
|
|||||||
{ EEnemySpawnType.AfterInteraction, "AfterInteraction" },
|
{ EEnemySpawnType.AfterInteraction, "AfterInteraction" },
|
||||||
{ EEnemySpawnType.AfterItemUse, "AfterItemUse" },
|
{ EEnemySpawnType.AfterItemUse, "AfterItemUse" },
|
||||||
{ EEnemySpawnType.AfterAction, "AfterAction" },
|
{ EEnemySpawnType.AfterAction, "AfterAction" },
|
||||||
|
{ EEnemySpawnType.AfterEmote, "AfterEmote" },
|
||||||
{ EEnemySpawnType.AutoOnEnterArea, "AutoOnEnterArea" },
|
{ EEnemySpawnType.AutoOnEnterArea, "AutoOnEnterArea" },
|
||||||
{ EEnemySpawnType.OverworldEnemies, "OverworldEnemies" },
|
{ EEnemySpawnType.OverworldEnemies, "OverworldEnemies" },
|
||||||
{ EEnemySpawnType.FateEnemies, "FateEnemies" },
|
{ EEnemySpawnType.FateEnemies, "FateEnemies" },
|
||||||
|
@ -10,6 +10,7 @@ public enum EEnemySpawnType
|
|||||||
AfterInteraction,
|
AfterInteraction,
|
||||||
AfterItemUse,
|
AfterItemUse,
|
||||||
AfterAction,
|
AfterAction,
|
||||||
|
AfterEmote,
|
||||||
AutoOnEnterArea,
|
AutoOnEnterArea,
|
||||||
OverworldEnemies,
|
OverworldEnemies,
|
||||||
FateEnemies,
|
FateEnemies,
|
||||||
|
@ -33,17 +33,14 @@ internal static class Combat
|
|||||||
switch (step.EnemySpawnType)
|
switch (step.EnemySpawnType)
|
||||||
{
|
{
|
||||||
case EEnemySpawnType.AfterInteraction:
|
case EEnemySpawnType.AfterInteraction:
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(step.DataId);
|
ArgumentNullException.ThrowIfNull(step.DataId);
|
||||||
|
|
||||||
yield return new Interact.Task(step.DataId.Value, quest, EInteractionType.None, true);
|
yield return new Interact.Task(step.DataId.Value, quest, EInteractionType.None, true);
|
||||||
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
||||||
yield return CreateTask(quest, sequence, step);
|
yield return CreateTask(quest, sequence, step);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case EEnemySpawnType.AfterItemUse:
|
case EEnemySpawnType.AfterItemUse:
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(step.DataId);
|
ArgumentNullException.ThrowIfNull(step.DataId);
|
||||||
ArgumentNullException.ThrowIfNull(step.ItemId);
|
ArgumentNullException.ThrowIfNull(step.ItemId);
|
||||||
|
|
||||||
@ -52,10 +49,8 @@ internal static class Combat
|
|||||||
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
||||||
yield return CreateTask(quest, sequence, step);
|
yield return CreateTask(quest, sequence, step);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
|
||||||
case EEnemySpawnType.AfterAction:
|
case EEnemySpawnType.AfterAction:
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(step.DataId);
|
ArgumentNullException.ThrowIfNull(step.DataId);
|
||||||
ArgumentNullException.ThrowIfNull(step.Action);
|
ArgumentNullException.ThrowIfNull(step.Action);
|
||||||
|
|
||||||
@ -65,7 +60,18 @@ internal static class Combat
|
|||||||
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
||||||
yield return CreateTask(quest, sequence, step);
|
yield return CreateTask(quest, sequence, step);
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
|
case EEnemySpawnType.AfterEmote:
|
||||||
|
ArgumentNullException.ThrowIfNull(step.Emote);
|
||||||
|
|
||||||
|
yield return new Mount.UnmountTask();
|
||||||
|
if (step.DataId != null)
|
||||||
|
yield return new Emote.UseOnObject(step.Emote.Value, step.DataId.Value);
|
||||||
|
else
|
||||||
|
yield return new Emote.UseOnSelf(step.Emote.Value);
|
||||||
|
yield return new WaitAtEnd.WaitDelay(TimeSpan.FromSeconds(1));
|
||||||
|
yield return CreateTask(quest, sequence, step);
|
||||||
|
break;
|
||||||
|
|
||||||
case EEnemySpawnType.AutoOnEnterArea:
|
case EEnemySpawnType.AutoOnEnterArea:
|
||||||
if (step.CombatDelaySecondsAtStart == null)
|
if (step.CombatDelaySecondsAtStart == null)
|
||||||
|
Loading…
Reference in New Issue
Block a user