Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v200230-data' into hardfork/batt…
Browse files Browse the repository at this point in the history 
…learena-arenasheet

# Conflicts:
#	Lib9c/TableCSV/Arena/ArenaSheet.csv
  • Loading branch information
@sonohoshi
sonohoshi committed Oct 8, 2024
2 parents 6f7a451 + ced981d commit cfd499e
Show file tree
Hide file tree
Showing 40 changed files with 2,568 additions and 1,231 deletions.
78 changes: 39 additions & 39 deletions .Lib9c.Tests/Action/CustomEquipmentCraft/CustomEquipmentCraftTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 78811,
MaxCp = 118133,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
10, null,
21600, null,
};

// Random Icon
Expand All @@ -129,13 +129,13 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 196780,
MaxCp = 236104,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
ElementalType = ElementalType.Water,
},
},
10, null, 8,
21600, null, 17,
};

// Move to next group with additional cost
Expand All @@ -150,13 +150,13 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 78811,
MaxCp = 118133,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
10, null,
21600, null,
};
yield return new object?[]
{
Expand All @@ -169,13 +169,13 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 9000,
MaxCp = 10000,
MinCp = 127372,
MaxCp = 166695,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
12, null,
21600 * 2, null,
};
yield return new object?[]
{
Expand All @@ -188,13 +188,13 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 90000,
MaxCp = 100000,
MinCp = 231654,
MaxCp = 270976,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
15, null,
21600 * 8, null,
};

// Multiple slots
Expand All @@ -210,20 +210,20 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 78811,
MaxCp = 118133,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
new ()
{
MinCp = 800,
MaxCp = 900,
MinCp = 196780,
MaxCp = 236104,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
10, null,
21600, null,
};
yield return new object?[]
{
Expand All @@ -236,20 +236,20 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 78811,
MaxCp = 118133,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
new ()
{
MinCp = 800,
MaxCp = 900,
MinCp = 196780,
MaxCp = 236104,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
},
10, null,
21600, null,
};
yield return new object?[]
{
Expand All @@ -264,34 +264,34 @@ public CustomEquipmentCraftTest()
{
new ()
{
MinCp = 500,
MaxCp = 600,
MinCp = 39487,
MaxCp = 78810,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Water,
ElementalType = ElementalType.Normal,
},
new ()
{
MinCp = 300,
MaxCp = 400,
MinCp = 78811,
MaxCp = 118133,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Wind,
},
new ()
{
MinCp = 100,
MaxCp = 200,
MinCp = 39487,
MaxCp = 78810,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Water,
ElementalType = ElementalType.Wind,
},
new ()
{
MinCp = 900,
MaxCp = 1000,
MinCp = 39487,
MaxCp = 78810,
ItemSubType = ItemSubType.Weapon,
ElementalType = ElementalType.Normal,
ElementalType = ElementalType.Fire,
},
},
10, null, 4,
21600, null, 22,
};
}

Expand Down Expand Up @@ -321,7 +321,7 @@ public CustomEquipmentCraftTest()
{
new List<CustomCraftData>
{
new () { RecipeId = 1, SlotIndex = 0, IconId = 10131001, },
new () { RecipeId = 1, SlotIndex = 0, IconId = 10140000, },
},
true, 0, false, new List<TestResult>(), 0, typeof(NotEnoughRelationshipException),
};
Expand Down
12 changes: 6 additions & 6 deletions .Lib9c.Tests/Action/GrindingTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -326,11 +326,11 @@ public void CalculateMaterialReward(int[] equipmentIds, Dictionary<int, int> exp
);

Assert.Equal(expected.Count, actual.Count);
foreach (var (material, count) in actual)
foreach (var (material, actualCount) in actual)
{
if (expected.TryGetValue(material.Id, out var actualCount))
if (expected.TryGetValue(material.Id, out var expectedCount))
{
Assert.Equal(count, actualCount);
Assert.Equal(expectedCount, actualCount);
}
else
{
Expand Down Expand Up @@ -422,9 +422,9 @@ private class CalculateMaterialRewardData : IEnumerable<object[]>
new[] { 10750008, 10760000, 20160000, 20160003 },
new Dictionary<int, int>
{
{ 306085, 15 },
{ 600401, 35 },
{ 600402, 21 },
{ 306085, 15 }, // 5 + 10 + 0 + 0
{ 600401, 12 }, // 0 + 0 + 2 + 10
{ 600402, 23 }, // 0 + 0 + 3 + 20
},
},
new object[]
Expand Down
40 changes: 36 additions & 4 deletions .github/workflows/publish-docs.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ name: publish docs

on:
push:
branches:
- main
branches-ignore:
- v*
tags-ignore:
- v*

jobs:
publish-docs:
Expand All @@ -17,18 +19,48 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
fetch-tags: true
- name: Dotnet Setup
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.400

- run: dotnet restore
- run: dotnet tool restore
- run: docfx docs/docfx.json
- run: dotnet docfx docs/docfx.json

- name: update index.html
run: |
set -ev
if [[ "${{ github.ref_name }}" =~ ^v ]]; then
echo "Prevent tags started with 'v'" >&2
exit
fi
mkdir -p /tmp/gh-pages-root
latest_version=$(git tag --sort -v:refname | grep -E -i '^[0-9]+\.[0-9]+\.[0-9]+' | head -n 1)
if [[ "$latest_version" = "${{ github.ref_name }}" ]]; then
index=$(cat docs/_site/index.html)
{
echo -n "${index%</title>*}</title>"
echo "<meta http-equiv=\"refresh\" content=\"0;${{ github.ref_name }}/\">"
echo "<base href=\"${{ github.ref_name }}/\">"
echo -n "${index#*</title>}"
} > /tmp/gh-pages-root/index.html
fi
if: github.ref_type == 'tag'
- name: deploy
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./docs/_site/
destination_dir: docs
destination_dir: ${{ github.ref_name }}
- name: deploy (index.html)
uses: peaceiris/actions-gh-pages@v4
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: /tmp/gh-pages-root
destination_dir: .
keep_files: true
if: github.ref_type == 'tag'
2 changes: 0 additions & 2 deletions Lib9c/Helper/CustomCraftHelper.cs
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Numerics;
using BTAI;
using Libplanet.Action;
using Nekoyume.Battle;
using Nekoyume.Model.Item;
Expand Down
18 changes: 9 additions & 9 deletions Lib9c/TableCSV/AdventureBoss/AdventureBossFloorFirstRewardSheet.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew
4,Material,600302,5,Rune,10033,5,,,
5,Material,600302,5,Rune,10034,5,,,
6,Material,600203,5,,,,,,
7,Material,600303,5,Material,600402,80,,,
7,Material,600303,5,Material,600402,50,,,
8,Material,600303,5,,,,,,
9,Material,600303,5,Rune,10033,5,,,
10,Material,600303,5,Rune,10034,5,,,
11,Material,600203,15,Material,600402,400,,,
11,Material,600203,15,Material,600402,150,,,
12,Material,600303,8,Material,600304,1,,,
13,Material,600303,8,Material,600304,1,,,
14,Material,600303,8,Rune,10033,10,,,
Expand All @@ -25,11 +25,11 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew
24,Material,600302,5,Rune,10033,5,,,
25,Material,600302,5,Rune,10034,5,,,
26,Material,600203,5,,,,,,
27,Material,600303,5,Material,600402,80,,,
27,Material,600303,5,Material,600402,50,,,
28,Material,600303,5,,,,,,
29,Material,600303,5,Rune,10033,5,,,
30,Material,600303,5,Rune,10034,5,,,
31,Material,600203,15,Material,600402,400,,,
31,Material,600203,15,Material,600402,150,,,
32,Material,600303,8,Material,600304,1,,,
33,Material,600303,8,Material,600304,1,,,
34,Material,600303,8,Rune,10033,10,,,
Expand All @@ -45,11 +45,11 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew
44,Material,600302,5,Rune,10033,5,,,
45,Material,600302,5,Rune,10034,5,,,
46,Material,600203,5,,,,,,
47,Material,600303,5,Material,600402,80,,,
47,Material,600303,5,Material,600402,50,,,
48,Material,600303,5,,,,,,
49,Material,600303,5,Rune,10033,5,,,
50,Material,600303,5,Rune,10034,5,,,
51,Material,600203,15,Material,600402,400,,,
51,Material,600203,15,Material,600402,150,,,
52,Material,600303,8,Material,600304,1,,,
53,Material,600303,8,Material,600304,1,,,
54,Material,600303,8,Rune,10033,10,,,
Expand All @@ -65,11 +65,11 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew
64,Material,600302,5,Rune,10033,5,,,
65,Material,600302,5,Rune,10034,5,,,
66,Material,600203,5,,,,,,
67,Material,600303,5,Material,600402,80,,,
67,Material,600303,5,Material,600402,50,,,
68,Material,600303,5,,,,,,
69,Material,600303,5,Rune,10033,5,,,
70,Material,600303,5,Rune,10034,5,,,
71,Material,600203,15,Material,600402,400,,,
71,Material,600203,15,Material,600402,150,,,
72,Material,600303,8,Material,600304,1,,,
73,Material,600303,8,Material,600304,1,,,
74,Material,600303,8,Rune,10033,10,,,
Expand All @@ -78,4 +78,4 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew
77,Material,600304,2,Rune,10033,20,,,
78,Material,600304,2,Rune,10034,20,,,
79,Material,600304,2,Material,600305,1,,,
80,Material,600304,5,Material,600305,3,,,
80,Material,600304,5,Material,600305,3,,,
Loading

0 comments on commit cfd499e

Please sign in to comment.