Skip to content

Commit

Permalink
[PR] New Release
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
wolfcomp authored Aug 10, 2024
2 parents d73af20 + 41b6520 commit edfec7d
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion DeepDungeonDex/DeepDungeonDex.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="13.4.0">
<Private>false</Private>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions DeepDungeonDex/Hooks/AddonAgent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private void CheckDirector()

if (activeInstance != null)
{
ContentType = (ContentType)(1 << ((int)activeInstance->InstanceContentType - 1));
ContentType = (ContentType)(1 << ((int)activeInstance->InstanceContentType));
if (ContentType.HasFlag(ContentType.DeepDungeon))
{
Floor = ((InstanceContentDeepDungeon*)activeInstance)->Floor;
Expand All @@ -68,7 +68,7 @@ private void CheckDirector()
var activePublic = (PublicContentDirectorResearch*)_eventFramework->GetPublicContentDirector();
if (activePublic != null)
{
ContentType = (ContentType)(1 << (int)(activePublic->PublicContentDirectorType + 19));
ContentType = (ContentType)(1 << (int)(activePublic->PublicContentDirectorType + 20));
}
else
{
Expand Down
62 changes: 31 additions & 31 deletions DeepDungeonDex/Storage/MobData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -136,37 +136,37 @@ public enum Threat : byte
[Flags]
public enum ContentType : uint
{
None = 0,
Raid = 1,
Dungeon = 1 << 1,
GuildOrder = 1 << 2,
Trial = 1 << 3,
CrystallineConflict = 1 << 4,
Frontlines = 1 << 5,
QuestBattle = 1 << 6,
BeginnerTraining = 1 << 7,
DeepDungeon = 1 << 8,
TreasureHuntDungeon = 1 << 9,
SeasonalDungeon = 1 << 10,
RivalWing = 1 << 11,
MaskedCarnivale = 1 << 12,
Mahjong = 1 << 13,
GoldSaucer = 1 << 14,
OceanFishing = 1 << 15,
UnrealTrial = 1 << 16,
TripleTriad = 1 << 17,
VariantDungeon = 1 << 18,
CriterionDungeon = 1 << 19,
BondingCeremony = 1 << 20,
PublicTripleTriad = 1 << 21,
Eureka = 1 << 22,
CalamityRetold = 1 << 23, // seems to be only for the rising event in 2018
LeapOfFaith = 1 << 24,
Diadem = 1 << 25,
Bozja = 1 << 26,
Delubrum = 1 << 27,
IslandSanctuary = 1 << 28,
FallGuys = 1 << 29,
None = 1,
Raid = 1 << 1,
Dungeon = 1 << 2,
GuildOrder = 1 << 3,
Trial = 1 << 4,
CrystallineConflict = 1 << 5,
Frontlines = 1 << 6,
QuestBattle = 1 << 7,
BeginnerTraining = 1 << 8,
DeepDungeon = 1 << 9,
TreasureHuntDungeon = 1 << 10,
SeasonalDungeon = 1 << 11,
RivalWing = 1 << 12,
MaskedCarnivale = 1 << 13,
Mahjong = 1 << 14,
GoldSaucer = 1 << 15,
OceanFishing = 1 << 16,
UnrealTrial = 1 << 17,
TripleTriad = 1 << 18,
VariantDungeon = 1 << 19,
CriterionDungeon = 1 << 20,
BondingCeremony = 1 << 21,
PublicTripleTriad = 1 << 22,
Eureka = 1 << 23,
CalamityRetold = 1 << 24, // seems to be only for the rising event in 2018
LeapOfFaith = 1 << 25,
Diadem = 1 << 26,
Bozja = 1 << 27,
Delubrum = 1 << 28,
IslandSanctuary = 1 << 29,
FallGuys = 1 << 30,
}

[Flags]
Expand Down
12 changes: 6 additions & 6 deletions DeepDungeonDex/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"Microsoft.Extensions.DependencyInjection": {
"type": "Direct",
"requested": "[7.0.0, )",
"resolved": "7.0.0",
"contentHash": "elNeOmkeX3eDVG6pYVeV82p29hr+UKDaBhrZyWvWLw/EVZSYEkZlQdkp0V39k/Xehs2Qa0mvoCvkVj3eQxNQ1Q==",
"requested": "[8.0.0, )",
"resolved": "8.0.0",
"contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==",
"dependencies": {
"Microsoft.Extensions.DependencyInjection.Abstractions": "7.0.0"
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0"
}
},
"YamlDotNet": {
Expand All @@ -25,8 +25,8 @@
},
"Microsoft.Extensions.DependencyInjection.Abstractions": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "h3j/QfmFN4S0w4C2A6X7arXij/M/OVw3uQHSOFxnND4DyAzO1F9eMX7Eti7lU/OkSthEE0WzRsfT/Dmx86jzCw=="
"resolved": "8.0.0",
"contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg=="
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion DeepDungeonDexConsole/data
4 changes: 2 additions & 2 deletions scripts/gitPushPr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git commit --all -m "Updating ${PUBLIC_NAME}"
echo "> Pushing to origin"
git push --force --set-upstream origin "${PUBLIC_NAME}"
prRepo="goatcorp/DalamudPluginsD17"
prNumber=$(gh api repos/${prRepo}/pulls | jq ".[] | select(.head.ref == \"${INTERNAL_NAME}\") | .number")
prNumber=$(gh api repos/${prRepo}/pulls | jq ".[] | select(.head.ref == \"${PUBLIC_NAME}\") | .number")
if [[ ${MESSAGE} =~ .*"[TEST]".* ]]; then
prTitle="[Testing] ${PUBLIC_NAME} ${VERSION}"
else
Expand All @@ -17,5 +17,5 @@ if [ "${prNumber}" ]; then
gh api "repos/${prRepo}/pulls/${prNumber}" --silent --method PATCH -f "title=${prTitle}" -f "body=${prBody}" -f "state=open"
else
echo "> Creating PR"
gh pr create --repo "${prRepo}" --head "${GITHUB_REPOSITORY_OWNER}:${INTERNAL_NAME}" --base "main" --title "${prTitle}" --body "${prBody}"
gh pr create --repo "${prRepo}" --head "${GITHUB_REPOSITORY_OWNER}:${PUBLIC_NAME}" --base "main" --title "${prTitle}" --body "${prBody}"
fi

0 comments on commit edfec7d

Please sign in to comment.