aly/qstbak
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

muffin v6.14

Browse source
This commit is contained in:
alydev 2025-10-09 08:33:08 +10:00
parent b08d196477
commit 344451fa8e
7 changed files with 74 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Questionable/Properties/AssemblyInfo.cs
View file

@ -7,12 +7,12 @@ using System.Security.Permissions;
[assembly: AssemblyCompany("Questionable")]
[assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.13.0.0")]
[assembly: AssemblyInformationalVersion("6.13+1f54814b9cb724c2d6bc1cd7614ccb494d8bbd75")]
[assembly: AssemblyFileVersion("6.14.0.0")]
[assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")]
[assembly: AssemblyProduct("Questionable")]
[assembly: AssemblyTitle("Questionable")]
[assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")]
[assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.13.0.0")]
[assembly: AssemblyVersion("6.14.0.0")]
[module: RefSafetyRules(11)]

20
Questionable/Questionable.Controller/QuestController.cs
View file

@ -513,9 +513,17 @@ internal sealed class QuestController : MiniTaskController<QuestController>
}
if (_startedQuest != null && !_questFunctions.IsQuestAccepted(_startedQuest.Quest.Id))
{
if (!_startedQuest.Quest.Info.IsRepeatable && !_questFunctions.IsQuestComplete(_startedQuest.Quest.Id) && _questFunctions.IsReadyToAcceptQuest(_startedQuest.Quest.Id))
{
_logger.LogInformation("Quest {QuestId} is ready to accept but not yet accepted, moving to next quest", _startedQuest.Quest.Id);
SetNextQuest(_startedQuest.Quest);
_startedQuest = null;
return;
}
if (_startedQuest.Quest.Info.IsRepeatable)
{
_logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id);
_startedQuest = null;
}
else if (!_questFunctions.IsQuestComplete(_startedQuest.Quest.Id))
{
@ -608,7 +616,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
if ((object)valueOrDefault2.Item1 != null)
{
(elementId, b) = valueOrDefault2;
goto IL_0813;
goto IL_08b5;
}
}
Quest quest2 = ManualPriorityQuests.FirstOrDefault((Quest x) => _questFunctions.IsReadyToAcceptQuest(x.Id));
@ -618,7 +626,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
SetNextQuest(quest2);
return;
}
goto IL_0813;
goto IL_08b5;
}
questProgress = _startedQuest;
b = _startedQuest.Sequence;
@ -665,8 +673,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>
}
}
}
goto IL_0b43;
IL_0b43:
goto IL_0be5;
IL_0be5:
if (questProgress == null)
{
DebugState = "No quest active";
@ -725,7 +733,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
DebugState = null;
}
return;
IL_0813:
IL_08b5:
if (elementId == null || elementId.Value == 0)
{
if (_startedQuest != null)
@ -785,7 +793,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
}
questProgress = _startedQuest;
}
goto IL_0b43;
goto IL_0be5;
}
}