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
GatheringPaths/Properties/AssemblyInfo.cs
View file

@ -5,11 +5,11 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("GatheringPaths")] [assembly: AssemblyCompany("GatheringPaths")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.13.0.0")] [assembly: AssemblyFileVersion("6.14.0.0")]
[assembly: AssemblyInformationalVersion("6.13+1f54814b9cb724c2d6bc1cd7614ccb494d8bbd75")] [assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")]
[assembly: AssemblyProduct("GatheringPaths")] [assembly: AssemblyProduct("GatheringPaths")]
[assembly: AssemblyTitle("GatheringPaths")] [assembly: AssemblyTitle("GatheringPaths")]
[assembly: TargetPlatform("Windows7.0")] [assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.13.0.0")] [assembly: AssemblyVersion("6.14.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
LLib/Properties/AssemblyInfo.cs
View file

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

6
QuestPaths/Properties/AssemblyInfo.cs
View file

@ -5,9 +5,9 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("QuestPaths")] [assembly: AssemblyCompany("QuestPaths")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.13.0.0")] [assembly: AssemblyFileVersion("6.14.0.0")]
[assembly: AssemblyInformationalVersion("6.13+1f54814b9cb724c2d6bc1cd7614ccb494d8bbd75")] [assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")]
[assembly: AssemblyProduct("QuestPaths")] [assembly: AssemblyProduct("QuestPaths")]
[assembly: AssemblyTitle("QuestPaths")] [assembly: AssemblyTitle("QuestPaths")]
[assembly: AssemblyVersion("6.13.0.0")] [assembly: AssemblyVersion("6.14.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
Questionable.Model/Properties/AssemblyInfo.cs
View file

@ -5,9 +5,9 @@ using System.Runtime.Versioning;
[assembly: AssemblyCompany("Questionable.Model")] [assembly: AssemblyCompany("Questionable.Model")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.13.0.0")] [assembly: AssemblyFileVersion("6.14.0.0")]
[assembly: AssemblyInformationalVersion("6.13+1f54814b9cb724c2d6bc1cd7614ccb494d8bbd75")] [assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")]
[assembly: AssemblyProduct("Questionable.Model")] [assembly: AssemblyProduct("Questionable.Model")]
[assembly: AssemblyTitle("Questionable.Model")] [assembly: AssemblyTitle("Questionable.Model")]
[assembly: AssemblyVersion("6.13.0.0")] [assembly: AssemblyVersion("6.14.0.0")]
[module: RefSafetyRules(11)] [module: RefSafetyRules(11)]

6
Questionable/Properties/AssemblyInfo.cs
View file

@ -7,12 +7,12 @@ using System.Security.Permissions;
[assembly: AssemblyCompany("Questionable")] [assembly: AssemblyCompany("Questionable")]
[assembly: AssemblyConfiguration("Release")] [assembly: AssemblyConfiguration("Release")]
[assembly: AssemblyFileVersion("6.13.0.0")] [assembly: AssemblyFileVersion("6.14.0.0")]
[assembly: AssemblyInformationalVersion("6.13+1f54814b9cb724c2d6bc1cd7614ccb494d8bbd75")] [assembly: AssemblyInformationalVersion("6.14+47775848820b6b7dabd835e0661a48b7791f01c8")]
[assembly: AssemblyProduct("Questionable")] [assembly: AssemblyProduct("Questionable")]
[assembly: AssemblyTitle("Questionable")] [assembly: AssemblyTitle("Questionable")]
[assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")] [assembly: AssemblyMetadata("RepositoryUrl", "https://github.com/WigglyMuffin/Ambivalence")]
[assembly: TargetPlatform("Windows7.0")] [assembly: TargetPlatform("Windows7.0")]
[assembly: SupportedOSPlatform("Windows7.0")] [assembly: SupportedOSPlatform("Windows7.0")]
[assembly: AssemblyVersion("6.13.0.0")] [assembly: AssemblyVersion("6.14.0.0")]
[module: RefSafetyRules(11)] [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 != 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) if (_startedQuest.Quest.Info.IsRepeatable)
{ {
_logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id); _logger.LogInformation("Repeatable quest {QuestId} is no longer accepted, clearing started quest", _startedQuest.Quest.Id);
_startedQuest = null;
} }
else if (!_questFunctions.IsQuestComplete(_startedQuest.Quest.Id)) else if (!_questFunctions.IsQuestComplete(_startedQuest.Quest.Id))
{ {
@ -608,7 +616,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
if ((object)valueOrDefault2.Item1 != null) if ((object)valueOrDefault2.Item1 != null)
{ {
(elementId, b) = valueOrDefault2; (elementId, b) = valueOrDefault2;
goto IL_0813; goto IL_08b5;
} }
} }
Quest quest2 = ManualPriorityQuests.FirstOrDefault((Quest x) => _questFunctions.IsReadyToAcceptQuest(x.Id)); Quest quest2 = ManualPriorityQuests.FirstOrDefault((Quest x) => _questFunctions.IsReadyToAcceptQuest(x.Id));
@ -618,7 +626,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
SetNextQuest(quest2); SetNextQuest(quest2);
return; return;
} }
goto IL_0813; goto IL_08b5;
} }
questProgress = _startedQuest; questProgress = _startedQuest;
b = _startedQuest.Sequence; b = _startedQuest.Sequence;
@ -665,8 +673,8 @@ internal sealed class QuestController : MiniTaskController<QuestController>
} }
} }
} }
goto IL_0b43; goto IL_0be5;
IL_0b43: IL_0be5:
if (questProgress == null) if (questProgress == null)
{ {
DebugState = "No quest active"; DebugState = "No quest active";
@ -725,7 +733,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
DebugState = null; DebugState = null;
} }
return; return;
IL_0813: IL_08b5:
if (elementId == null || elementId.Value == 0) if (elementId == null || elementId.Value == 0)
{ {
if (_startedQuest != null) if (_startedQuest != null)
@ -785,7 +793,7 @@ internal sealed class QuestController : MiniTaskController<QuestController>
} }
questProgress = _startedQuest; questProgress = _startedQuest;
} }
goto IL_0b43; goto IL_0be5;
} }
} }

90
Solution.sln
View file

@ -2,15 +2,15 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.24720.0 VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{1954490C-FF01-433A-8B69-B0CC3C33D09C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QuestPaths", "QuestPaths\QuestPaths.csproj", "{8543D75D-1A2C-4045-9927-61FB7462F896}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{552A0564-0233-447E-AC1B-82757CB41CCC}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GatheringPaths", "GatheringPaths\GatheringPaths.csproj", "{6B22392B-ADAB-4D34-B7DD-7443345BEE26}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{22637734-9DB1-433D-873A-80889725EA55}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable", "Questionable\Questionable.csproj", "{4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Questionable.Model", "Questionable.Model\Questionable.Model.csproj", "{5C131661-EDC1-4590-AC47-C38B0A5BA139}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LLib", "LLib\LLib.csproj", "{CC748521-A62A-43A0-BB7B-90F96740C38E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -20,46 +20,46 @@ Global
Release|x64 = Release|x64 Release|x64 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Debug|x64.ActiveCfg = Debug|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|x64.ActiveCfg = Debug|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Debug|x64.Build.0 = Debug|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Debug|x64.Build.0 = Debug|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Release|AnyCPU.Build.0 = Release|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Release|AnyCPU.Build.0 = Release|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Release|x64.ActiveCfg = Release|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Release|x64.ActiveCfg = Release|AnyCPU
{1954490C-FF01-433A-8B69-B0CC3C33D09C}.Release|x64.Build.0 = Release|AnyCPU {8543D75D-1A2C-4045-9927-61FB7462F896}.Release|x64.Build.0 = Release|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Debug|x64.ActiveCfg = Debug|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|x64.ActiveCfg = Debug|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Debug|x64.Build.0 = Debug|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Debug|x64.Build.0 = Debug|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Release|AnyCPU.Build.0 = Release|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|AnyCPU.Build.0 = Release|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Release|x64.ActiveCfg = Release|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|x64.ActiveCfg = Release|AnyCPU
{552A0564-0233-447E-AC1B-82757CB41CCC}.Release|x64.Build.0 = Release|AnyCPU {6B22392B-ADAB-4D34-B7DD-7443345BEE26}.Release|x64.Build.0 = Release|AnyCPU
{22637734-9DB1-433D-873A-80889725EA55}.Debug|AnyCPU.ActiveCfg = Debug|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|AnyCPU.ActiveCfg = Debug|x64
{22637734-9DB1-433D-873A-80889725EA55}.Debug|AnyCPU.Build.0 = Debug|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|AnyCPU.Build.0 = Debug|x64
{22637734-9DB1-433D-873A-80889725EA55}.Debug|x64.ActiveCfg = Debug|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|x64.ActiveCfg = Debug|x64
{22637734-9DB1-433D-873A-80889725EA55}.Debug|x64.Build.0 = Debug|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Debug|x64.Build.0 = Debug|x64
{22637734-9DB1-433D-873A-80889725EA55}.Release|AnyCPU.ActiveCfg = Release|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|AnyCPU.ActiveCfg = Release|x64
{22637734-9DB1-433D-873A-80889725EA55}.Release|AnyCPU.Build.0 = Release|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|AnyCPU.Build.0 = Release|x64
{22637734-9DB1-433D-873A-80889725EA55}.Release|x64.ActiveCfg = Release|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|x64.ActiveCfg = Release|x64
{22637734-9DB1-433D-873A-80889725EA55}.Release|x64.Build.0 = Release|x64 {4C05BCC5-1221-4DAA-B897-52C8C3E2CD09}.Release|x64.Build.0 = Release|x64
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|AnyCPU.ActiveCfg = Debug|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Debug|AnyCPU.Build.0 = Debug|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|AnyCPU.Build.0 = Debug|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Debug|x64.ActiveCfg = Debug|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|x64.ActiveCfg = Debug|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Debug|x64.Build.0 = Debug|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Debug|x64.Build.0 = Debug|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Release|AnyCPU.ActiveCfg = Release|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|AnyCPU.ActiveCfg = Release|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Release|AnyCPU.Build.0 = Release|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|AnyCPU.Build.0 = Release|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Release|x64.ActiveCfg = Release|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|x64.ActiveCfg = Release|AnyCPU
{5BFCA116-AFB3-4CC0-9AA6-BF38AA873113}.Release|x64.Build.0 = Release|AnyCPU {5C131661-EDC1-4590-AC47-C38B0A5BA139}.Release|x64.Build.0 = Release|AnyCPU
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Debug|AnyCPU.ActiveCfg = Debug|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|AnyCPU.ActiveCfg = Debug|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Debug|AnyCPU.Build.0 = Debug|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|AnyCPU.Build.0 = Debug|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Debug|x64.ActiveCfg = Debug|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|x64.ActiveCfg = Debug|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Debug|x64.Build.0 = Debug|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Debug|x64.Build.0 = Debug|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Release|AnyCPU.ActiveCfg = Release|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|AnyCPU.ActiveCfg = Release|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Release|AnyCPU.Build.0 = Release|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|AnyCPU.Build.0 = Release|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Release|x64.ActiveCfg = Release|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|x64.ActiveCfg = Release|x64
{D25BDC58-3C06-4CC4-8C47-672EC22D21F4}.Release|x64.Build.0 = Release|x64 {CC748521-A62A-43A0-BB7B-90F96740C38E}.Release|x64.Build.0 = Release|x64
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE