From 876a821bdc5ab016e7a9b7ddb89e4d0009c78841 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Wed, 25 Sep 2024 20:38:23 +0900 Subject: [PATCH 01/27] add grindig test for custom equipment --- .Lib9c.Tests/Action/GrindingTest.cs | 188 +++++++++++++++++++++++++++- 1 file changed, 187 insertions(+), 1 deletion(-) diff --git a/.Lib9c.Tests/Action/GrindingTest.cs b/.Lib9c.Tests/Action/GrindingTest.cs index ef136afcb7..07ac33ce0d 100644 --- a/.Lib9c.Tests/Action/GrindingTest.cs +++ b/.Lib9c.Tests/Action/GrindingTest.cs @@ -13,6 +13,7 @@ namespace Lib9c.Tests.Action using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; + using Nekoyume.Model.Market; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; @@ -307,6 +308,41 @@ public void Execute_Throw_Equipment_Exception(bool equipmentExist, long required Execute(state, _agentAddress, _avatarAddress, 1, false, _random, 0, 0, _tableSheets.MaterialItemSheet)); } + [Theory] + // Todo : Update Test Equipment + [ClassData(typeof(ExecuteWithCustomEquipmentData))] + public void Execute_Success_With_Custom_Equipment(int[] equipmentIds, (int, int)[] expected) + { + var state = _initialState + .SetAgentState(_agentAddress, _agentState) + .SetAvatarState(_avatarAddress, _avatarState) + .SetActionPoint(_avatarAddress, 120); + Assert.Equal(0 * _crystalCurrency, state.GetBalance(_avatarAddress, _crystalCurrency)); + + state = Execute_Grinding_With_Custom_Equipment( + state, + _agentAddress, + _avatarAddress, + _random, + equipmentIds, + _tableSheets.EquipmentItemSheet + ); + var expectedAsset = equipmentIds.Length * _crystalCurrency; + Assert.Equal(expectedAsset, state.GetBalance(_agentAddress, _crystalCurrency)); + Assert.Equal(115, state.GetActionPoint(_avatarAddress)); + + state = Execute_RegisterProduct_With_Custom_Equipment( + state, + _agentAddress, + _avatarAddress, + _random, + expected, + _tableSheets.WorldSheet, + _tableSheets.WorldUnlockSheet, + _tableSheets.MaterialItemSheet + ); + } + [Theory] [ClassData(typeof(CalculateMaterialRewardData))] public void CalculateMaterialReward(int[] equipmentIds, Dictionary expected) @@ -394,7 +430,157 @@ private static IWorld Execute( return nextState; } - // Todo : Fill more test cases + private static IWorld Execute_Grinding_With_Custom_Equipment( + IWorld state, + Address agentAddress, + Address avatarAddress, + IRandom random, + int[] equipmentRowIds, + EquipmentItemSheet equipmentItemSheet) + { + var avatarState = state.GetAvatarState(avatarAddress); + + var testRandom = new TestRandom(); + // Create equipment with ItemFactory + var equipmentList = new List(); + foreach (var equipmentItemId in equipmentRowIds) + { + var equipment = (Equipment)ItemFactory.CreateItemUsable( + equipmentItemSheet[equipmentItemId], + testRandom.GenerateRandomGuid(), + 1); + equipment.ByCustomCraft = true; + equipmentList.Add(equipment); + } + + foreach (var equipment in equipmentList) + { + avatarState.inventory.AddItem(equipment); + } + + state = state.SetInventory(avatarAddress, avatarState.inventory); + + var grinding = new Grinding + { + AvatarAddress = avatarAddress, + EquipmentIds = equipmentList.Select(e => e.ItemId).ToList(), + ChargeAp = false, + }; + var nextState = grinding.Execute(new ActionContext + { + PreviousState = state, + Signer = agentAddress, + BlockIndex = 1, + RandomSeed = random.Seed, + }); + + return nextState; + } + + private static IWorld Execute_RegisterProduct_With_Custom_Equipment( + IWorld state, + Address agentAddress, + Address avatarAddress, + IRandom random, + (int id, int count)[] expectedReward, + WorldSheet worldSheet, + WorldUnlockSheet worldUnlockSheet, + MaterialItemSheet materialItemSheet) + { + var avatarState = state.GetAvatarState(avatarAddress); + var price = 1 * Currency.Legacy("NCG", 2, minters: null); + var registerInfos = expectedReward.Select(expected => + { + materialItemSheet.TryGetValue(expected.id, out var materialRow); + Assert.NotNull(materialRow); + Assert.True(materialRow.ItemSubType is ItemSubType.Circle or ItemSubType.Scroll); + avatarState.inventory.TryGetFungibleItems(materialRow.ItemId, out var items); + Assert.Single(items); + var item = items.First(); + + Assert.Equal(expected.count, item.count); + Assert.IsAssignableFrom(item.item); + return new RegisterInfo + { + AvatarAddress = avatarAddress, + Price = price, + TradableId = ((ITradableFungibleItem)item.item).TradableId, + ItemCount = item.count, + Type = ProductType.Fungible, + }; + }); + + for (int i = 0; i < GameConfig.RequireClearedStageLevel.ActionsInShop; i++) + { + avatarState.worldInformation.ClearStage(1, i + 1, 0, worldSheet, worldUnlockSheet); + } + + state = state.SetWorldInformation(avatarAddress, avatarState.worldInformation); + + var register = new RegisterProduct + { + AvatarAddress = avatarAddress, + RegisterInfos = registerInfos, + ChargeAp = false, + }; + var nextState = register.Execute(new ActionContext + { + PreviousState = state, + Signer = agentAddress, + BlockIndex = 2, + RandomSeed = random.Seed, + }); + + return nextState; + } + + private class ExecuteWithCustomEquipmentData : IEnumerable + { + private readonly List _data = new () + { + new object[] + { + new[] { 20160000, 20160001, 20160002 }, + new[] + { + (600401, 35), + (600402, 21), + }, + }, + new object[] + { + new[] { 20160000, 20260000, 20360000, 20460000, 20560000 }, + new[] + { + (600401, 25), + (600402, 15), + }, + }, + new object[] + { + new[] { 20160003, 20260000, 20360001, 20360001, 20460001 }, + new[] + { + (600401, 65), + (600402, 39), + }, + }, + new object[] + { + new[] { 20560003, 20560003, 20560003 }, + new[] + { + (600401, 90), + (600402, 54), + }, + }, + }; + + public IEnumerator GetEnumerator() => _data.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => _data.GetEnumerator(); + } + private class CalculateMaterialRewardData : IEnumerable { private readonly List _data = new List From c62f95fe210dea51b4866191afdcf26af7259892 Mon Sep 17 00:00:00 2001 From: Syu Date: Mon, 30 Sep 2024 15:08:40 +0900 Subject: [PATCH 02/27] Update v200230 Data Add --- .../AdventureBossFloorFirstRewardSheet.csv | 36 +- Lib9c/TableCSV/Arena/ArenaSheet.csv | 38 +- Lib9c/TableCSV/CollectionSheet.csv | 1 + .../Crystal/CrystalEquipmentGrindingSheet.csv | 40 +- .../CustomEquipmentCraftIconSheet.csv | 294 ++--- .../CustomEquipmentCraftOptionSheet.csv | 95 +- .../CustomEquipmentCraftRecipeSheet.csv | 10 +- .../CustomEquipmentCraftRecipeSkillSheet.csv | 368 +++++- .../CustomEquipmentCraftRelationshipSheet.csv | 12 +- Lib9c/TableCSV/GameConfigSheet.csv | 2 +- Lib9c/TableCSV/Item/CostumeStatSheet.csv | 11 +- .../Item/EquipmentItemOptionSheet.csv | 213 +++- .../Item/EquipmentItemRecipeSheet.csv | 348 +++--- Lib9c/TableCSV/Item/EquipmentItemSheet.csv | 120 +- .../Item/EquipmentItemSubRecipeSheetV2.csv | 1086 ++++++++--------- Lib9c/TableCSV/Item/ItemRequirementSheet.csv | 27 +- Lib9c/TableCSV/Item/MaterialItemSheet.csv | 2 +- .../Item/UnlockCombinationSlotCostSheet.csv | 8 +- Lib9c/TableCSV/Skill/ActionBuffSheet.csv | 2 + Lib9c/TableCSV/Skill/SkillActionBuffSheet.csv | 4 +- Lib9c/TableCSV/Skill/SkillBuffSheet.csv | 132 +- Lib9c/TableCSV/Skill/SkillSheet.csv | 205 +++- Lib9c/TableCSV/Skill/StatBuffSheet.csv | 71 +- Lib9c/TableCSV/Stake/StakePolicySheet.csv | 2 +- Lib9c/TableCSV/StakeRegularRewardSheet_V8.csv | 65 + .../WorldBoss/WorldBossBattleRewardSheet.csv | 26 +- .../WorldBoss/WorldBossKillRewardSheet.csv | 26 +- .../WorldBoss/WorldBossRankRewardSheet.csv | 22 +- 28 files changed, 2150 insertions(+), 1116 deletions(-) create mode 100644 Lib9c/TableCSV/StakeRegularRewardSheet_V8.csv diff --git a/Lib9c/TableCSV/AdventureBoss/AdventureBossFloorFirstRewardSheet.csv b/Lib9c/TableCSV/AdventureBoss/AdventureBossFloorFirstRewardSheet.csv index be6b5aa095..e9c04e7b9c 100644 --- a/Lib9c/TableCSV/AdventureBoss/AdventureBossFloorFirstRewardSheet.csv +++ b/Lib9c/TableCSV/AdventureBoss/AdventureBossFloorFirstRewardSheet.csv @@ -1,15 +1,15 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,reward_2_amount,reward_3_type,reward_3_id,reward_3_amount 1,Material,600302,10,,,,,, -2,Material,600302,5,Material,600303,2,,, +2,Material,600303,2,Material,600402,10,,, 3,Material,600302,5,Material,600303,2,,, 4,Material,600302,5,Rune,10033,5,,, 5,Material,600302,5,Rune,10034,5,,, 6,Material,600203,5,,,,,, -7,Material,600303,5,,,,,, +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,,,,,, +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,,, @@ -18,18 +18,18 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew 17,Material,600304,2,Rune,10033,20,,, 18,Material,600304,2,Rune,10034,20,,, 19,Material,600304,2,Material,600305,1,,, -20,Material,600304,5,Material,600305,3,Material,600203,100 +20,Material,600304,5,Material,600305,3,,, 21,Material,600302,10,,,,,, -22,Material,600302,5,Material,600303,2,,, +22,Material,600303,2,Material,600402,10,,, 23,Material,600302,5,Material,600303,2,,, 24,Material,600302,5,Rune,10033,5,,, 25,Material,600302,5,Rune,10034,5,,, 26,Material,600203,5,,,,,, -27,Material,600303,5,,,,,, +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,,,,,, +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,,, @@ -38,38 +38,38 @@ floor_id,reward_1_type,reward_1_id,reward_1_amount,reward_2_type,reward_2_id,rew 37,Material,600304,2,Rune,10033,20,,, 38,Material,600304,2,Rune,10034,20,,, 39,Material,600304,2,Material,600305,1,,, -40,Material,600304,5,Material,600305,3,Material,600203,100 +40,Material,600304,5,Material,600305,3,,, 41,Material,600302,10,,,,,, -42,Material,600302,5,Material,600303,2,,, +42,Material,600303,2,Material,600402,10,,, 43,Material,600302,5,Material,600303,2,,, 44,Material,600302,5,Rune,10033,5,,, 45,Material,600302,5,Rune,10034,5,,, 46,Material,600203,5,,,,,, -47,Material,600303,5,,,,,, +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,,,,,, +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,,, 55,Material,600303,8,Rune,10034,10,,, 56,Material,600203,20,,,,,, -57,Material,600304,2,Material,10033,20,,, -58,Material,600304,2,Material,10034,20,,, +57,Material,600304,2,Rune,10033,20,,, +58,Material,600304,2,Rune,10034,20,,, 59,Material,600304,2,Material,600305,1,,, -60,Material,600304,5,Material,600305,3,Material,600203,100 +60,Material,600304,5,Material,600305,3,,, 61,Material,600302,10,,,,,, -62,Material,600302,5,Material,600303,2,,, +62,Material,600303,2,Material,600402,10,,, 63,Material,600302,5,Material,600303,2,,, 64,Material,600302,5,Rune,10033,5,,, 65,Material,600302,5,Rune,10034,5,,, 66,Material,600203,5,,,,,, -67,Material,600303,5,,,,,, +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,,,,,, +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,,, @@ -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,Material,600203,100 \ No newline at end of file +80,Material,600304,5,Material,600305,3,,, \ No newline at end of file diff --git a/Lib9c/TableCSV/Arena/ArenaSheet.csv b/Lib9c/TableCSV/Arena/ArenaSheet.csv index 80df99292f..be4777d52b 100644 --- a/Lib9c/TableCSV/Arena/ArenaSheet.csv +++ b/Lib9c/TableCSV/Arena/ArenaSheet.csv @@ -62,4 +62,40 @@ id,round,arena_type,start_block_index,end_block_index,required_medal_count,entra 10,3,OffSeason,11584901,11736100,0,0,5,2,40,8 10,4,Season,11736101,11887300,0,1,50,20,40,8 10,5,OffSeason,11887301,12038500,0,0,5,2,40,8 -10,6,Championship,12038501,12189700,160,2,100,40,40,8 \ No newline at end of file +10,6,Championship,12038501,12189700,160,2,100,40,40,8 +11,1,OffSeason,12189701,12340900,0,0,5,2,40,8 +11,2,Season,12340901,12492100,0,1,50,20,40,8 +11,3,OffSeason,12492101,12643300,0,0,5,2,40,8 +11,4,Season,12643301,12794500,0,1,50,20,40,8 +11,5,OffSeason,12794501,12945700,0,0,5,2,40,8 +11,6,Championship,12945701,13096900,160,2,100,40,40,8 +12,1,OffSeason,13096901,13248100,0,0,5,2,40,8 +12,2,Season,13248101,13399300,0,1,50,20,40,8 +12,3,OffSeason,13399301,13550500,0,0,5,2,40,8 +12,4,Season,13550501,13701700,0,1,50,20,40,8 +12,5,OffSeason,13701701,13852900,0,0,5,2,40,8 +12,6,Championship,13852901,14004100,160,2,100,40,40,8 +13,1,OffSeason,14004101,14155300,0,0,5,2,40,8 +13,2,Season,14155301,14306500,0,1,50,20,40,8 +13,3,OffSeason,14306501,14457700,0,0,5,2,40,8 +13,4,Season,14457701,14608900,0,1,50,20,40,8 +13,5,OffSeason,14608901,14760100,0,0,5,2,40,8 +13,6,Championship,14760101,14911300,160,2,100,40,40,8 +14,1,OffSeason,14911301,15062500,0,0,5,2,40,8 +14,2,Season,15062501,15213700,0,1,50,20,40,8 +14,3,OffSeason,15213701,15364900,0,0,5,2,40,8 +14,4,Season,15364901,15516100,0,1,50,20,40,8 +14,5,OffSeason,15516101,15667300,0,0,5,2,40,8 +14,6,Championship,15667301,15818500,160,2,100,40,40,8 +15,1,OffSeason,15818501,15969700,0,0,5,2,40,8 +15,2,Season,15969701,16120900,0,1,50,20,40,8 +15,3,OffSeason,16120901,16272100,0,0,5,2,40,8 +15,4,Season,16272101,16423300,0,1,50,20,40,8 +15,5,OffSeason,16423301,16574500,0,0,5,2,40,8 +15,6,Championship,16574501,16725700,160,2,100,40,40,8 +16,1,OffSeason,16725701,16876900,0,0,5,2,40,8 +16,2,Season,16876901,17028100,0,1,50,20,40,8 +16,3,OffSeason,17028101,17179300,0,0,5,2,40,8 +16,4,Season,17179301,17330500,0,1,50,20,40,8 +16,5,OffSeason,17330501,17481700,0,0,5,2,40,8 +16,6,Championship,17481701,17632900,160,2,100,40,40,8 \ No newline at end of file diff --git a/Lib9c/TableCSV/CollectionSheet.csv b/Lib9c/TableCSV/CollectionSheet.csv index 015067aeb4..e985a40fe2 100644 --- a/Lib9c/TableCSV/CollectionSheet.csv +++ b/Lib9c/TableCSV/CollectionSheet.csv @@ -502,6 +502,7 @@ id,item_id1,count1,level1,skill1,item_id2,count2,level2,skill2,item_id3,count3,l 300007,49900018,1,,FALSE,,,,,,,,,,,,,,,,,,,,,HP,Add,13111,SPD,Add,5969,,, 300008,49900019,1,,FALSE,,,,,,,,,,,,,,,,,,,,,SPD,Add,6998,ATK,Add,1173,,, 300009,49900020,1,,FALSE,,,,,,,,,,,,,,,,,,,,,ATK,Add,3130,HP,Add,10726,,, +300010,49900021,1,,FALSE,,,,,,,,,,,,,,,,,,,,,HP,Add,28605,DEF,Add,2312,,, 1000101,500000,10,,FALSE,,,,,,,,,,,,,,,,,,,,,DEF,Add,309,,,,,, 1000102,500000,100,,FALSE,,,,,,,,,,,,,,,,,,,,,DEF,Add,588,,,,,, 1000103,500000,300,,FALSE,,,,,,,,,,,,,,,,,,,,,DEF,Add,1185,,,,,, diff --git a/Lib9c/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv b/Lib9c/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv index 3170c0746e..844da3ed03 100644 --- a/Lib9c/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv +++ b/Lib9c/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv @@ -247,23 +247,23 @@ id,enchant_base_id,gain_crystal,reward_material1,count1,reward_material2,count2 10760006,10100000,100000000,306085,10,, 10760007,10100000,100000000,306085,10,, 10760008,10100000,100000000,306085,10,, -20160000,20160000,1,600401,5,600402,3 -20160001,20160000,1,600401,10,600402,6 -20160002,20160000,1,600401,20,600402,12 -20160003,20160000,1,600401,30,600402,18 -20260000,20260000,1,600401,5,600402,3 -20260001,20260000,1,600401,10,600402,6 -20260002,20260000,1,600401,20,600402,12 -20260003,20260000,1,600401,30,600402,18 -20360000,20360000,1,600401,5,600402,3 -20360001,20360000,1,600401,10,600402,6 -20360002,20360000,1,600401,20,600402,12 -20360003,20360000,1,600401,30,600402,18 -20460000,20460000,1,600401,5,600402,3 -20460001,20460000,1,600401,10,600402,6 -20460002,20460000,1,600401,20,600402,12 -20460003,20460000,1,600401,30,600402,18 -20560000,20560000,1,600401,5,600402,3 -20560001,20560000,1,600401,10,600402,6 -20560002,20560000,1,600401,20,600402,12 -20560003,20560000,1,600401,30,600402,18 \ No newline at end of file +20160000,20160000,1,600401,2,600402,3 +20160001,20160000,1,600401,4,600402,8 +20160002,20160000,1,600401,8,600402,10 +20160003,20160000,1,600401,10,600402,20 +20260000,20260000,1,600401,2,600402,3 +20260001,20260000,1,600401,4,600402,8 +20260002,20260000,1,600401,8,600402,10 +20260003,20260000,1,600401,10,600402,20 +20360000,20360000,1,600401,2,600402,3 +20360001,20360000,1,600401,4,600402,8 +20360002,20360000,1,600401,8,600402,10 +20360003,20360000,1,600401,10,600402,20 +20460000,20460000,1,600401,2,600402,3 +20460001,20460000,1,600401,4,600402,8 +20460002,20460000,1,600401,8,600402,10 +20460003,20460000,1,600401,10,600402,20 +20560000,20560000,1,600401,2,600402,3 +20560001,20560000,1,600401,4,600402,8 +20560002,20560000,1,600401,8,600402,10 +20560003,20560000,1,600401,10,600402,20 \ No newline at end of file diff --git a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftIconSheet.csv b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftIconSheet.csv index ae485a24e3..da75692079 100644 --- a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftIconSheet.csv +++ b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftIconSheet.csv @@ -1,171 +1,143 @@ id,item_sub_type,icon_id,required_relationship,random_only,ratio -1,Weapon,10110000,0,TRUE,14 +1,Weapon,10110000,0,FALSE,24 2,Weapon,10111000,0,FALSE,24 3,Weapon,10112000,0,FALSE,24 4,Weapon,10113000,0,FALSE,24 -5,Weapon,10114000,0,TRUE,14 -6,Weapon,10120000,0,TRUE,14 -7,Weapon,10121000,0,FALSE,24 -8,Weapon,10122000,0,FALSE,24 -9,Weapon,10123000,0,FALSE,24 -10,Weapon,10124000,0,TRUE,14 -11,Weapon,10130000,0,TRUE,14 +5,Weapon,10114000,0,FALSE,24 +11,Weapon,10130000,0,FALSE,24 12,Weapon,10131000,0,FALSE,24 13,Weapon,10132000,0,FALSE,24 14,Weapon,10133000,0,FALSE,24 -15,Weapon,10134000,0,TRUE,14 -16,Weapon,10130001,50,TRUE,14 -17,Weapon,10131001,50,FALSE,24 -18,Weapon,10132001,50,FALSE,24 -19,Weapon,10133001,50,FALSE,24 -20,Weapon,10134001,50,TRUE,14 -21,Weapon,10140000,100,TRUE,14 -22,Weapon,10141000,100,FALSE,24 -23,Weapon,10142000,100,FALSE,24 -24,Weapon,10143000,100,FALSE,24 -25,Weapon,10144000,100,TRUE,14 -26,Weapon,10150000,250,TRUE,14 -27,Weapon,10151000,250,FALSE,24 -28,Weapon,10152000,250,FALSE,24 -29,Weapon,10153000,250,FALSE,24 -30,Weapon,10154000,250,TRUE,14 -31,Weapon,10150001,500,TRUE,14 +15,Weapon,10134000,0,FALSE,24 +16,Weapon,10130001,0,FALSE,24 +17,Weapon,10131001,0,FALSE,24 +18,Weapon,10132001,0,FALSE,24 +19,Weapon,10133001,0,FALSE,24 +20,Weapon,10134001,0,FALSE,24 +21,Weapon,10140000,50,FALSE,24 +22,Weapon,10141000,50,FALSE,24 +23,Weapon,10142000,50,FALSE,24 +24,Weapon,10143000,50,FALSE,24 +25,Weapon,10144000,50,FALSE,24 +26,Weapon,10150000,200,FALSE,24 +27,Weapon,10151000,200,FALSE,24 +28,Weapon,10152000,200,FALSE,24 +29,Weapon,10153000,200,FALSE,24 +30,Weapon,10154000,200,FALSE,24 +31,Weapon,10150001,500,FALSE,24 32,Weapon,10151001,500,FALSE,24 33,Weapon,10152001,500,FALSE,24 34,Weapon,10153001,500,FALSE,24 -35,Weapon,10154001,500,TRUE,14 -36,Armor,10210000,0,TRUE,14 -37,Armor,10211000,0,FALSE,24 -38,Armor,10212000,0,FALSE,24 -39,Armor,10213000,0,FALSE,24 -40,Armor,10214000,0,TRUE,14 -41,Armor,10220000,0,TRUE,14 -42,Armor,10221000,0,FALSE,24 -43,Armor,10222000,0,FALSE,24 -44,Armor,10223000,0,FALSE,24 -45,Armor,10224000,0,TRUE,14 -46,Armor,10230000,0,TRUE,14 -47,Armor,10231000,0,FALSE,24 -48,Armor,10232000,0,FALSE,24 -49,Armor,10233000,0,FALSE,24 -50,Armor,10234000,0,TRUE,14 -51,Armor,10230001,50,TRUE,14 -52,Armor,10231001,50,FALSE,24 -53,Armor,10232001,50,FALSE,24 -54,Armor,10233001,50,FALSE,24 -55,Armor,10234001,50,TRUE,14 -56,Armor,10240000,100,TRUE,14 -57,Armor,10241000,100,FALSE,24 -58,Armor,10242000,100,FALSE,24 -59,Armor,10243000,100,FALSE,24 -60,Armor,10244000,100,TRUE,14 -61,Armor,10250001,250,TRUE,14 -62,Armor,10251001,250,FALSE,24 -63,Armor,10252001,250,FALSE,24 -64,Armor,10253001,250,FALSE,24 -65,Armor,10254001,250,TRUE,14 -66,Armor,10250000,500,TRUE,14 -67,Armor,10251000,500,FALSE,24 -68,Armor,10252000,500,FALSE,24 -69,Armor,10253000,500,FALSE,24 -70,Armor,10254000,500,TRUE,14 -71,Belt,10310000,0,TRUE,14 -72,Belt,10311000,0,FALSE,24 -73,Belt,10312000,0,FALSE,24 -74,Belt,10313000,0,FALSE,24 -75,Belt,10314000,0,TRUE,14 -76,Belt,10320000,0,TRUE,14 -77,Belt,10321000,0,FALSE,24 -78,Belt,10322000,0,FALSE,24 -79,Belt,10323000,0,FALSE,24 -80,Belt,10324000,0,TRUE,14 -81,Belt,10330000,0,TRUE,14 -82,Belt,10331000,0,FALSE,24 -83,Belt,10332000,0,FALSE,24 -84,Belt,10333000,0,FALSE,24 -85,Belt,10334000,0,TRUE,14 -86,Belt,10340000,50,TRUE,14 -87,Belt,10341000,50,FALSE,24 -88,Belt,10342000,50,FALSE,24 -89,Belt,10343000,50,FALSE,24 -90,Belt,10344000,50,TRUE,14 -91,Belt,10350000,100,TRUE,14 -92,Belt,10351000,100,FALSE,24 -93,Belt,10352000,100,FALSE,24 -94,Belt,10353000,100,FALSE,24 -95,Belt,10354000,100,TRUE,14 -96,Belt,10350001,250,TRUE,14 -97,Belt,10351001,250,FALSE,24 -98,Belt,10352001,250,FALSE,24 -99,Belt,10353001,250,FALSE,24 -100,Belt,10354001,250,TRUE,14 -101,Belt,10350002,500,TRUE,14 -102,Belt,10351002,500,FALSE,24 -103,Belt,10352002,500,FALSE,24 -104,Belt,10353002,500,FALSE,24 -105,Belt,10354002,500,TRUE,14 -106,Necklace,10410000,0,TRUE,14 -107,Necklace,10411000,0,FALSE,24 -108,Necklace,10412000,0,FALSE,24 -109,Necklace,10413000,0,FALSE,24 -110,Necklace,10414000,0,TRUE,14 -111,Necklace,10420000,0,TRUE,14 -112,Necklace,10421000,0,FALSE,24 -113,Necklace,10422000,0,FALSE,24 -114,Necklace,10423000,0,FALSE,24 -115,Necklace,10424000,0,TRUE,14 -116,Necklace,10430000,0,TRUE,14 -117,Necklace,10431000,0,FALSE,24 -118,Necklace,10432000,0,FALSE,24 -119,Necklace,10433000,0,FALSE,24 -120,Necklace,10434000,0,TRUE,14 -121,Necklace,10440000,50,TRUE,14 -122,Necklace,10441000,50,FALSE,24 -123,Necklace,10442000,50,FALSE,24 -124,Necklace,10443000,50,FALSE,24 -125,Necklace,10444000,50,TRUE,14 -126,Necklace,10450000,100,TRUE,14 -127,Necklace,10451000,100,FALSE,24 -128,Necklace,10452000,100,FALSE,24 -129,Necklace,10453000,100,FALSE,24 -130,Necklace,10454000,100,TRUE,14 -131,Necklace,10450001,250,TRUE,14 -132,Necklace,10451001,250,FALSE,24 -133,Necklace,10452001,250,FALSE,24 -134,Necklace,10453001,250,FALSE,24 -135,Necklace,10454001,250,TRUE,14 -136,Necklace,10450002,500,TRUE,14 -137,Necklace,10451002,500,FALSE,24 -138,Necklace,10452002,500,FALSE,24 -139,Necklace,10453002,500,FALSE,24 -140,Necklace,10454002,500,TRUE,14 -141,Ring,10510000,0,TRUE,14 -142,Ring,10511000,0,FALSE,24 -143,Ring,10512000,0,FALSE,24 -144,Ring,10513000,0,FALSE,24 -145,Ring,10514000,0,TRUE,14 -146,Ring,10520000,0,TRUE,14 -147,Ring,10521000,0,FALSE,24 -148,Ring,10522000,0,FALSE,24 -149,Ring,10523000,0,FALSE,24 -150,Ring,10524000,0,TRUE,14 -151,Ring,10530000,50,TRUE,14 -152,Ring,10531000,50,FALSE,24 -153,Ring,10532000,50,FALSE,24 -154,Ring,10533000,50,FALSE,24 -155,Ring,10534000,50,TRUE,14 -156,Ring,10540000,100,TRUE,14 -157,Ring,10541000,100,FALSE,24 -158,Ring,10542000,100,FALSE,24 -159,Ring,10543000,100,FALSE,24 -160,Ring,10544000,100,TRUE,14 -161,Ring,10550000,250,TRUE,14 -162,Ring,10551000,250,FALSE,24 -163,Ring,10552000,250,FALSE,24 -164,Ring,10553000,250,FALSE,24 -165,Ring,10554000,250,TRUE,14 -166,Ring,10550001,500,TRUE,14 -167,Ring,10551001,500,FALSE,24 -168,Ring,10552001,500,FALSE,24 -169,Ring,10553001,500,FALSE,24 -170,Ring,10554001,500,TRUE,14 +35,Weapon,10154001,500,FALSE,24 +36,Weapon,20161000,50,FALSE,8 +37,Weapon,20161001,50,FALSE,8 +38,Weapon,20161002,50,FALSE,8 +39,Weapon,20161003,50,FALSE,8 +40,Weapon,20161004,50,FALSE,8 +41,Weapon,20161005,200,FALSE,8 +42,Weapon,20161006,200,FALSE,8 +43,Weapon,20161007,200,FALSE,8 +44,Weapon,20161008,200,FALSE,8 +45,Weapon,20161009,200,FALSE,8 +46,Weapon,20161010,50,FALSE,8 +47,Weapon,20161011,50,FALSE,8 +48,Weapon,20161012,50,FALSE,8 +49,Weapon,20161013,50,FALSE,8 +50,Weapon,20161014,50,FALSE,8 +51,Weapon,20161015,500,FALSE,8 +52,Weapon,20161016,500,FALSE,8 +53,Weapon,20161017,500,FALSE,8 +54,Weapon,20161018,500,FALSE,8 +55,Weapon,20161019,500,FALSE,8 +56,Weapon,20161020,50,FALSE,8 +57,Weapon,20161021,0,TRUE,8 +58,Weapon,20161022,0,TRUE,8 +59,Weapon,20161023,200,FALSE,8 +60,Weapon,20161024,200,TRUE,8 +61,Weapon,20161025,100,FALSE,8 +62,Weapon,20161026,100,TRUE,8 +63,Necklace,10410000,0,FALSE,24 +64,Necklace,10411000,0,FALSE,24 +65,Necklace,10412000,0,FALSE,24 +66,Necklace,10413000,0,FALSE,24 +67,Necklace,10414000,0,FALSE,24 +73,Necklace,10430000,0,FALSE,24 +74,Necklace,10431000,0,FALSE,24 +75,Necklace,10432000,0,FALSE,24 +76,Necklace,10433000,0,FALSE,24 +77,Necklace,10434000,0,FALSE,24 +78,Necklace,10440000,50,FALSE,24 +79,Necklace,10441000,50,FALSE,24 +80,Necklace,10442000,50,FALSE,24 +81,Necklace,10443000,50,FALSE,24 +82,Necklace,10444000,50,FALSE,24 +83,Necklace,10450000,20,FALSE,24 +84,Necklace,10451000,20,FALSE,24 +85,Necklace,10452000,50,FALSE,24 +86,Necklace,10453000,50,FALSE,24 +87,Necklace,10454000,50,FALSE,24 +88,Necklace,10450001,200,FALSE,24 +89,Necklace,10451001,200,FALSE,24 +90,Necklace,10452001,200,FALSE,24 +91,Necklace,10453001,200,FALSE,24 +92,Necklace,10454001,200,FALSE,24 +93,Necklace,10450002,500,FALSE,24 +94,Necklace,10451002,500,FALSE,24 +95,Necklace,10452002,500,FALSE,24 +96,Necklace,10453002,500,FALSE,24 +97,Necklace,10454002,500,FALSE,24 +98,Necklace,20461000,50,FALSE,24 +99,Necklace,20461001,50,FALSE,24 +100,Necklace,20461002,50,FALSE,24 +101,Necklace,20461003,50,FALSE,24 +102,Necklace,20461004,50,FALSE,24 +103,Necklace,20461005,200,FALSE,24 +104,Necklace,20461006,200,FALSE,24 +105,Necklace,20461007,200,FALSE,24 +106,Necklace,20461008,200,FALSE,24 +107,Necklace,20461009,200,FALSE,24 +108,Necklace,20461010,0,TRUE,24 +109,Necklace,20461011,200,TRUE,24 +110,Necklace,20461012,200,TRUE,24 +111,Necklace,20461013,100,TRUE,24 +112,Necklace,20461014,50,FALSE,24 +113,Ring,10510000,0,FALSE,24 +114,Ring,10511000,0,FALSE,24 +115,Ring,10512000,0,FALSE,24 +116,Ring,10513000,0,FALSE,24 +117,Ring,10514000,0,FALSE,24 +118,Ring,10530000,0,FALSE,24 +119,Ring,10531000,0,FALSE,24 +120,Ring,10532000,0,FALSE,24 +121,Ring,10533000,0,FALSE,24 +122,Ring,10534000,0,FALSE,24 +123,Ring,10540000,50,FALSE,24 +124,Ring,10541000,50,FALSE,24 +125,Ring,10542000,50,FALSE,24 +126,Ring,10543000,50,FALSE,24 +127,Ring,10544000,50,FALSE,24 +128,Ring,10550000,200,FALSE,24 +129,Ring,10551000,200,FALSE,24 +130,Ring,10552000,200,FALSE,24 +131,Ring,10553000,200,FALSE,24 +132,Ring,10554000,200,FALSE,24 +133,Ring,10550001,500,FALSE,24 +134,Ring,10551001,500,FALSE,24 +135,Ring,10552001,500,FALSE,24 +136,Ring,10553001,500,FALSE,24 +137,Ring,10554001,500,FALSE,24 +138,Ring,20561000,50,FALSE,8 +139,Ring,20561001,50,FALSE,8 +140,Ring,20561002,50,FALSE,8 +141,Ring,20561003,50,FALSE,8 +142,Ring,20561004,50,FALSE,8 +143,Ring,20561005,200,FALSE,8 +144,Ring,20561006,200,FALSE,8 +145,Ring,20561007,200,FALSE,8 +146,Ring,20561008,200,FALSE,8 +147,Ring,20561009,200,FALSE,8 +148,Ring,20561010,0,TRUE,8 +149,Ring,20561011,200,TRUE,8 +150,Ring,20561012,200,TRUE,8 +151,Ring,20561013,100,TRUE,8 +152,Ring,20561014,50,FALSE,8 \ No newline at end of file diff --git a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftOptionSheet.csv b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftOptionSheet.csv index 268a8d211e..9d65139ea8 100644 --- a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftOptionSheet.csv +++ b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftOptionSheet.csv @@ -1,21 +1,76 @@ id,item_sub_type,ratio,hp_ratio,atk_ratio,def_ratio,cri_ratio,hit_ratio,spd_ratio,drv_ratio,drr_ratio,cdmg_ratio,ap_ratio,thorn_ratio -1,Weapon,25,,100,,,,,,,,, -2,Weapon,25,,70,,,30,,,,,, -3,Weapon,25,,70,,,,30,,,,, -4,Weapon,25,,40,,,30,30,,,,, -5,Armor,25,100,,,,,,,,,, -6,Armor,25,70,,30,,,,,,,, -7,Armor,25,70,,,,30,,,,,, -8,Armor,25,40,,30,,30,,,,,, -9,Belt,25,,,,,,100,,,,, -10,Belt,25,,30,,,,70,,,,, -11,Belt,25,,,30,,,70,,,,, -12,Belt,25,,30,30,,,40,,,,, -13,Necklace,25,,,,,100,,,,,, -14,Necklace,25,30,,,,70,,,,,, -15,Necklace,25,,,,,70,30,,,,, -16,Necklace,25,30,,,,40,30,,,,, -17,Ring,25,,,100,,,,,,,, -18,Ring,25,,30,70,,,,,,,, -19,Ring,25,30,,70,,,,,,,, -20,Ring,25,30,30,40,,,,,,,, +1,Weapon,9,,100,,,,,,,,, +2,Weapon,9,30,70,,,,,,,,, +3,Weapon,9,,70,30,,,,,,,, +4,Weapon,9,,70,,,30,,,,,, +5,Weapon,9,,70,,,,30,,,,, +6,Weapon,9,30,40,30,,,,,,,, +7,Weapon,9,30,40,,,30,,,,,, +8,Weapon,9,30,40,,,,30,,,,, +9,Weapon,9,,40,30,,30,,,,,, +10,Weapon,9,,40,30,,,30,,,,, +11,Weapon,9,,40,,,30,30,,,,, +12,Weapon,9,60,40,,,,,,,,, +13,Weapon,9,,40,60,,,,,,,, +14,Weapon,9,,40,,,60,,,,,, +15,Weapon,9,,40,,,,60,,,,, +16,Armor,9,100,,,,,,,,,, +17,Armor,9,70,30,,,,,,,,, +18,Armor,9,70,,30,,,,,,,, +19,Armor,9,70,,,,30,,,,,, +20,Armor,9,70,,,,,30,,,,, +21,Armor,9,40,30,30,,,,,,,, +22,Armor,9,40,30,,,30,,,,,, +23,Armor,9,40,30,,,,30,,,,, +24,Armor,9,40,,30,,30,,,,,, +25,Armor,9,40,,30,,,30,,,,, +26,Armor,9,40,,,,30,30,,,,, +27,Armor,9,40,60,,,,,,,,, +28,Armor,9,40,,60,,,,,,,, +29,Armor,9,40,,,,60,,,,,, +30,Armor,9,40,,,,,60,,,,, +31,Belt,9,,,,,,100,,,,, +32,Belt,9,30,,,,,70,,,,, +33,Belt,9,,30,,,,70,,,,, +34,Belt,9,,,30,,,70,,,,, +35,Belt,9,,,,,30,70,,,,, +36,Belt,9,30,30,,,,40,,,,, +37,Belt,9,30,,30,,,40,,,,, +38,Belt,9,30,,,,30,40,,,,, +39,Belt,9,,30,30,,,40,,,,, +40,Belt,9,,30,,,30,40,,,,, +41,Belt,9,,,30,,30,40,,,,, +42,Belt,9,60,,,,,40,,,,, +43,Belt,9,,60,,,,40,,,,, +44,Belt,9,,,60,,,40,,,,, +45,Belt,9,,,,,60,40,,,,, +46,Necklace,9,,,,,100,,,,,, +47,Necklace,9,30,,,,70,,,,,, +48,Necklace,9,,30,,,70,,,,,, +49,Necklace,9,,,30,,70,,,,,, +50,Necklace,9,,,,,70,30,,,,, +51,Necklace,9,30,30,,,40,,,,,, +52,Necklace,9,30,,30,,40,,,,,, +53,Necklace,9,30,,,,40,30,,,,, +54,Necklace,9,,30,30,,40,,,,,, +55,Necklace,9,,30,,,40,30,,,,, +56,Necklace,9,,,30,,40,30,,,,, +57,Necklace,9,60,,,,40,,,,,, +58,Necklace,9,,60,,,40,,,,,, +59,Necklace,9,,,60,,40,,,,,, +60,Necklace,9,,,,,40,60,,,,, +61,Ring,9,,,100,,,,,,,, +62,Ring,9,30,,70,,,,,,,, +63,Ring,9,,30,70,,,,,,,, +64,Ring,9,,,70,,30,,,,,, +65,Ring,9,,,70,,,30,,,,, +66,Ring,9,30,30,40,,,,,,,, +67,Ring,9,30,,40,,30,,,,,, +68,Ring,9,30,,40,,,30,,,,, +69,Ring,9,,30,40,,30,,,,,, +70,Ring,9,,30,40,,,30,,,,, +71,Ring,9,,,40,,30,30,,,,, +72,Ring,9,60,,40,,,,,,,, +73,Ring,9,,60,40,,,,,,,, +74,Ring,9,,,40,,60,,,,,, +75,Ring,9,,,40,,,60,,,,, \ No newline at end of file diff --git a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSheet.csv b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSheet.csv index fb6be075d8..1cf1337588 100644 --- a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSheet.csv +++ b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSheet.csv @@ -1,6 +1,6 @@ id,item_sub_type,scroll_amount,circle_amount,required_block -1,Weapon,1,1,10 -2,Armor,1,1,10 -3,Belt,1,1,10 -4,Necklace,1,1,10 -5,Ring,1,1,10 +1,Weapon,10,10,21600 +2,Armor,10,10,21600 +3,Belt,10,10,21600 +4,Necklace,10,10,21600 +5,Ring,10,10,21600 \ No newline at end of file diff --git a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSkillSheet.csv b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSkillSheet.csv index e035de2a65..5fd66c324d 100644 --- a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSkillSheet.csv +++ b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRecipeSkillSheet.csv @@ -1,11 +1,359 @@ id,item_sub_type,item_option_id,ratio -1,Weapon,2016000001,50 -2,Weapon,2016000002,50 -3,Armor,2026000001,50 -4,Armor,2026000002,50 -5,Belt,2036000001,50 -6,Belt,2036000002,50 -7,Necklace,2046000001,50 -8,Necklace,2046000002,50 -9,Ring,2056000001,50 -10,Ring,2056000002,50 +1,Weapon,2016000002,1 +2,Weapon,2016000003,1 +3,Weapon,2016000005,2 +4,Weapon,2016000006,2 +5,Weapon,2016000011,2 +6,Weapon,2016000012,3 +7,Weapon,2016000013,4 +8,Weapon,2016000014,5 +9,Weapon,2016000019,3 +10,Weapon,2016000020,4 +11,Weapon,2016000021,5 +12,Weapon,2016000022,6 +13,Weapon,2016000023,3 +14,Weapon,2016000024,4 +15,Weapon,2016000025,5 +16,Weapon,2016000026,6 +17,Weapon,2066000001,3 +18,Weapon,2066000002,3 +19,Weapon,2066000003,3 +20,Weapon,2066000004,3 +21,Weapon,2066000005,3 +22,Weapon,2066000007,3 +23,Weapon,2066000008,3 +24,Weapon,2066000010,3 +25,Weapon,2066000012,3 +26,Weapon,2066000013,3 +27,Weapon,2066000014,3 +28,Weapon,2066000016,4 +29,Weapon,2066000017,4 +30,Weapon,2066000018,5 +31,Weapon,2066000019,5 +32,Weapon,2066000020,5 +33,Weapon,2066000021,5 +34,Weapon,2066000022,5 +35,Weapon,2066000023,5 +36,Weapon,2066000024,5 +37,Weapon,2066000025,5 +38,Weapon,2066000026,4 +39,Weapon,2066000027,5 +40,Weapon,2066000028,6 +41,Weapon,2066000029,7 +42,Weapon,2066000030,4 +43,Weapon,2066000031,5 +44,Weapon,2066000032,6 +45,Weapon,2066000033,7 +46,Weapon,2066000034,4 +47,Weapon,2066000035,5 +48,Weapon,2066000036,6 +49,Weapon,2066000037,7 +50,Weapon,2066000038,4 +51,Weapon,2066000039,5 +52,Weapon,2066000040,6 +53,Weapon,2066000041,7 +54,Weapon,2066000042,4 +55,Weapon,2066000043,5 +56,Weapon,2066000044,6 +57,Weapon,2066000045,7 +58,Weapon,2066000050,4 +59,Weapon,2066000051,5 +60,Weapon,2066000052,6 +61,Weapon,2066000053,7 +62,Weapon,2066000054,4 +63,Weapon,2066000055,5 +64,Weapon,2066000056,6 +65,Weapon,2066000057,7 +66,Weapon,2066000062,4 +67,Weapon,2066000063,5 +68,Weapon,2066000064,6 +69,Weapon,2066000065,7 +70,Weapon,2066000070,4 +71,Weapon,2066000071,5 +72,Weapon,2066000072,6 +73,Weapon,2066000073,7 +74,Weapon,2066000074,4 +75,Weapon,2066000075,5 +76,Weapon,2066000076,6 +77,Weapon,2066000077,7 +78,Weapon,2066000078,4 +79,Weapon,2066000079,5 +80,Weapon,2066000080,6 +81,Weapon,2066000081,7 +82,Weapon,2066000086,5 +83,Weapon,2066000087,6 +84,Weapon,2066000088,7 +85,Weapon,2066000089,8 +86,Weapon,2066000090,5 +87,Weapon,2066000091,6 +88,Weapon,2066000092,7 +89,Weapon,2066000093,8 +90,Weapon,2066000094,6 +91,Weapon,2066000095,7 +92,Weapon,2066000096,8 +93,Weapon,2066000097,9 +94,Weapon,2066000098,6 +95,Weapon,2066000099,7 +96,Weapon,2066000100,8 +97,Weapon,2066000101,9 +98,Weapon,2066000102,6 +99,Weapon,2066000103,7 +100,Weapon,2066000104,8 +101,Weapon,2066000105,9 +102,Weapon,2066000106,6 +103,Weapon,2066000107,7 +104,Weapon,2066000108,8 +105,Weapon,2066000109,9 +106,Weapon,2066000110,6 +107,Weapon,2066000111,7 +108,Weapon,2066000112,8 +109,Weapon,2066000113,9 +110,Weapon,2066000114,6 +111,Weapon,2066000115,7 +112,Weapon,2066000116,8 +113,Weapon,2066000117,9 +114,Weapon,2066000118,6 +115,Weapon,2066000119,7 +116,Weapon,2066000120,8 +117,Weapon,2066000121,9 +118,Weapon,2066000122,6 +119,Weapon,2066000123,7 +120,Weapon,2066000124,8 +121,Weapon,2066000125,9 +122,Necklace,2046000003,1 +123,Necklace,2046000005,1 +124,Necklace,2046000014,2 +125,Necklace,2046000015,3 +126,Necklace,2046000016,4 +127,Necklace,2046000017,5 +128,Necklace,2066000001,3 +129,Necklace,2066000002,3 +130,Necklace,2066000003,3 +131,Necklace,2066000004,3 +132,Necklace,2066000005,3 +133,Necklace,2066000007,3 +134,Necklace,2066000008,3 +135,Necklace,2066000010,3 +136,Necklace,2066000012,3 +137,Necklace,2066000013,3 +138,Necklace,2066000014,3 +139,Necklace,2066000016,4 +140,Necklace,2066000017,4 +141,Necklace,2066000018,5 +142,Necklace,2066000019,5 +143,Necklace,2066000020,5 +144,Necklace,2066000021,5 +145,Necklace,2066000022,5 +146,Necklace,2066000023,5 +147,Necklace,2066000024,5 +148,Necklace,2066000025,5 +149,Necklace,2066000026,4 +150,Necklace,2066000027,5 +151,Necklace,2066000028,6 +152,Necklace,2066000029,7 +153,Necklace,2066000030,4 +154,Necklace,2066000031,5 +155,Necklace,2066000032,6 +156,Necklace,2066000033,7 +157,Necklace,2066000034,4 +158,Necklace,2066000035,5 +159,Necklace,2066000036,6 +160,Necklace,2066000037,7 +161,Necklace,2066000038,4 +162,Necklace,2066000039,5 +163,Necklace,2066000040,6 +164,Necklace,2066000041,7 +165,Necklace,2066000042,4 +166,Necklace,2066000043,5 +167,Necklace,2066000044,6 +168,Necklace,2066000045,7 +169,Necklace,2066000050,4 +170,Necklace,2066000051,5 +171,Necklace,2066000052,6 +172,Necklace,2066000053,7 +173,Necklace,2066000054,4 +174,Necklace,2066000055,5 +175,Necklace,2066000056,6 +176,Necklace,2066000057,7 +177,Necklace,2066000062,4 +178,Necklace,2066000063,5 +179,Necklace,2066000064,6 +180,Necklace,2066000065,7 +181,Necklace,2066000070,4 +182,Necklace,2066000071,5 +183,Necklace,2066000072,6 +184,Necklace,2066000073,7 +185,Necklace,2066000074,4 +186,Necklace,2066000075,5 +187,Necklace,2066000076,6 +188,Necklace,2066000077,7 +189,Necklace,2066000078,4 +190,Necklace,2066000079,5 +191,Necklace,2066000080,6 +192,Necklace,2066000081,7 +193,Necklace,2066000086,5 +194,Necklace,2066000087,6 +195,Necklace,2066000088,7 +196,Necklace,2066000089,8 +197,Necklace,2066000090,5 +198,Necklace,2066000091,6 +199,Necklace,2066000092,7 +200,Necklace,2066000093,8 +201,Necklace,2066000094,6 +202,Necklace,2066000095,7 +203,Necklace,2066000096,8 +204,Necklace,2066000097,9 +205,Necklace,2066000098,6 +206,Necklace,2066000099,7 +207,Necklace,2066000100,8 +208,Necklace,2066000101,9 +209,Necklace,2066000102,6 +210,Necklace,2066000103,7 +211,Necklace,2066000104,8 +212,Necklace,2066000105,9 +213,Necklace,2066000106,6 +214,Necklace,2066000107,7 +215,Necklace,2066000108,8 +216,Necklace,2066000109,9 +217,Necklace,2066000110,6 +218,Necklace,2066000111,7 +219,Necklace,2066000112,8 +220,Necklace,2066000113,9 +221,Necklace,2066000114,6 +222,Necklace,2066000115,7 +223,Necklace,2066000116,8 +224,Necklace,2066000117,9 +225,Necklace,2066000118,6 +226,Necklace,2066000119,7 +227,Necklace,2066000120,8 +228,Necklace,2066000121,9 +229,Necklace,2066000122,6 +230,Necklace,2066000123,7 +231,Necklace,2066000124,8 +232,Necklace,2066000125,9 +233,Ring,2056000001,1 +234,Ring,2056000003,3 +235,Ring,2056000004,3 +236,Ring,2056000006,3 +237,Ring,2056000007,3 +238,Ring,2056000012,4 +239,Ring,2056000013,5 +240,Ring,2056000014,6 +241,Ring,2056000015,7 +242,Ring,2056000016,4 +243,Ring,2056000017,5 +244,Ring,2056000018,6 +245,Ring,2056000019,7 +246,Ring,2056000024,4 +247,Ring,2056000025,5 +248,Ring,2056000026,6 +249,Ring,2056000027,7 +250,Ring,2056000028,4 +251,Ring,2056000029,5 +252,Ring,2056000030,6 +253,Ring,2056000031,7 +254,Ring,2066000001,3 +255,Ring,2066000002,3 +256,Ring,2066000003,3 +257,Ring,2066000004,3 +258,Ring,2066000005,3 +259,Ring,2066000007,3 +260,Ring,2066000008,3 +261,Ring,2066000010,3 +262,Ring,2066000012,3 +263,Ring,2066000013,3 +264,Ring,2066000014,3 +265,Ring,2066000016,4 +266,Ring,2066000017,4 +267,Ring,2066000018,5 +268,Ring,2066000019,5 +269,Ring,2066000020,5 +270,Ring,2066000021,5 +271,Ring,2066000022,5 +272,Ring,2066000023,5 +273,Ring,2066000024,5 +274,Ring,2066000025,5 +275,Ring,2066000026,4 +276,Ring,2066000027,5 +277,Ring,2066000028,6 +278,Ring,2066000029,7 +279,Ring,2066000030,4 +280,Ring,2066000031,5 +281,Ring,2066000032,6 +282,Ring,2066000033,7 +283,Ring,2066000034,4 +284,Ring,2066000035,5 +285,Ring,2066000036,6 +286,Ring,2066000037,7 +287,Ring,2066000038,4 +288,Ring,2066000039,5 +289,Ring,2066000040,6 +290,Ring,2066000041,7 +291,Ring,2066000042,4 +292,Ring,2066000043,5 +293,Ring,2066000044,6 +294,Ring,2066000045,7 +295,Ring,2066000050,4 +296,Ring,2066000051,5 +297,Ring,2066000052,6 +298,Ring,2066000053,7 +299,Ring,2066000054,4 +300,Ring,2066000055,5 +301,Ring,2066000056,6 +302,Ring,2066000057,7 +303,Ring,2066000062,4 +304,Ring,2066000063,5 +305,Ring,2066000064,6 +306,Ring,2066000065,7 +307,Ring,2066000070,4 +308,Ring,2066000071,5 +309,Ring,2066000072,6 +310,Ring,2066000073,7 +311,Ring,2066000074,4 +312,Ring,2066000075,5 +313,Ring,2066000076,6 +314,Ring,2066000077,7 +315,Ring,2066000078,4 +316,Ring,2066000079,5 +317,Ring,2066000080,6 +318,Ring,2066000081,7 +319,Ring,2066000086,5 +320,Ring,2066000087,6 +321,Ring,2066000088,7 +322,Ring,2066000089,8 +323,Ring,2066000090,5 +324,Ring,2066000091,6 +325,Ring,2066000092,7 +326,Ring,2066000093,8 +327,Ring,2066000094,6 +328,Ring,2066000095,7 +329,Ring,2066000096,8 +330,Ring,2066000097,9 +331,Ring,2066000098,6 +332,Ring,2066000099,7 +333,Ring,2066000100,8 +334,Ring,2066000101,9 +335,Ring,2066000102,6 +336,Ring,2066000103,7 +337,Ring,2066000104,8 +338,Ring,2066000105,9 +339,Ring,2066000106,6 +340,Ring,2066000107,7 +341,Ring,2066000108,8 +342,Ring,2066000109,9 +343,Ring,2066000110,6 +344,Ring,2066000111,7 +345,Ring,2066000112,8 +346,Ring,2066000113,9 +347,Ring,2066000114,6 +348,Ring,2066000115,7 +349,Ring,2066000116,8 +350,Ring,2066000117,9 +351,Ring,2066000118,6 +352,Ring,2066000119,7 +353,Ring,2066000120,8 +354,Ring,2066000121,9 +355,Ring,2066000122,6 +356,Ring,2066000123,7 +357,Ring,2066000124,8 +358,Ring,2066000125,9 \ No newline at end of file diff --git a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRelationshipSheet.csv b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRelationshipSheet.csv index 5f51e5c8bb..32e81583e8 100644 --- a/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRelationshipSheet.csv +++ b/Lib9c/TableCSV/CustomEquipmentCraft/CustomEquipmentCraftRelationshipSheet.csv @@ -1,5 +1,7 @@ -relationship,cost_multiplier,required_block_multiplier,min_cp,max_cp,weapon_item_id,armor_item_id,belt_item_id,necklace_item_id,ring_item_id -10,10000,10000,100,1000,20160000,20260000,20360000,20460000,20560000 -100,12000,12000,100,1000,20160001,20260001,20360001,20460001,20560001 -1000,15000,15000,1000,10000,20160002,20260002,20360002,20460002,20560002 -2147483646,20000,20000,10000,100000,20160003,20260003,20360003,20460003,20560003 +relationship,cost_multiplier,required_block_multiplier,min_cp_1,max_cp_1,ratio_1,min_cp_2,max_cp_2,ratio_2,min_cp_3,max_cp_3,ratio_3,min_cp_4,max_cp_4,ratio_4,min_cp_5,max_cp_5,ratio_5,min_cp_6,max_cp_6,ratio_6,min_cp_7,max_cp_7,ratio_7,min_cp_8,max_cp_8,ratio_8,min_cp_9,max_cp_9,ratio_9,min_cp_10,max_cp_10,ratio_10,weapon_item_id,armor_item_id,belt_item_id,necklace_item_id,ring_item_id,gold_amount,material_1_id,material_1_amount,material_2_id,material_2_amount +0,10000,10000,39487,78810,40,78811,118133,30,118134,157456,20,157457,196779,8,196780,236104,2,,,,,,,,,,,,,,,,20160000,20260000,20360000,20460000,20560000,0,,,, +51,20000,20000,63606,127372,40,127373,166695,30,166696,206018,20,206019,245341,8,245342,382439,2,,,,,,,,,,,,,,,,20160001,20260001,20360001,20460001,20560001,5,600201,10,, +201,40000,40000,87726,159265,40,159266,198588,30,198589,237911,20,237912,277234,8,277235,445422,2,,,,,,,,,,,,,,,,20160002,20260002,20360002,20460002,20560002,5,600201,50,, +501,80000,80000,94695,231653,40,231654,270976,30,270977,310299,20,310300,349622,8,349623,779488,2,,,,,,,,,,,,,,,,20160003,20260003,20360003,20460003,20560003,5,600202,10,, +1501,100000,100000,101665,283998,40,283999,323321,30,323322,362644,20,362645,401967,8,401968,1013334,2,,,,,,,,,,,,,,,,20160004,20260004,20360004,20460004,20560004,5,600202,50,, +10001,200000,200000,202689,434972,40,434973,474295,30,474296,513618,20,513619,552941,8,552942,1364104,2,,,,,,,,,,,,,,,,20160004,20260004,20360004,20460004,20560004,5,600201,500,, \ No newline at end of file diff --git a/Lib9c/TableCSV/GameConfigSheet.csv b/Lib9c/TableCSV/GameConfigSheet.csv index b42c80f6f6..df46a7c6e8 100644 --- a/Lib9c/TableCSV/GameConfigSheet.csv +++ b/Lib9c/TableCSV/GameConfigSheet.csv @@ -45,4 +45,4 @@ adventure_boss_ncg_ap_ratio,0.4 adventure_boss_active_interval,1800 adventure_boss_inactive_interval,10800 adventure_boss_claim_interval,75600 -custom_equipment_craft_icon_cost_multiplier,15000 +custom_equipment_craft_icon_cost_multiplier,10000 \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/CostumeStatSheet.csv b/Lib9c/TableCSV/Item/CostumeStatSheet.csv index 8cdfc03ec2..143a6eb8d8 100644 --- a/Lib9c/TableCSV/Item/CostumeStatSheet.csv +++ b/Lib9c/TableCSV/Item/CostumeStatSheet.csv @@ -84,8 +84,9 @@ id,costume_id,stat_type,stat 83,40100012,HP,84731 84,40100036,HP,107268 85,40100036,DEF,4730 -86,49900023,HP,57115 -87,49900024,HP,57115 -88,49900025,HP,57115 -89,49900026,HP,57115 -90,49900027,HP,57115 \ No newline at end of file +86,49900023,SPD,100033 +87,49900023,HP,281716 +88,49900024,HP,57115 +89,49900025,HP,57115 +90,49900026,HP,57115 +91,49900027,HP,57115 \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv b/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv index 9a1b7a26d5..b8cea16800 100644 --- a/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv +++ b/Lib9c/TableCSV/Item/EquipmentItemOptionSheet.csv @@ -2194,13 +2194,206 @@ id,stat_type,stat_min,stat_max,skill_id,skill_damage_min,skill_damage_max,skill_ 1076000614,ATK,11858,22456,,,,,,,, 1076000714,DEF,8759,26278,,,,,,,, 1076000814,SPD,12475,37426,,,,,,,, -2016000001,,,,210000,,,8,8,,, -2016000002,,,,210003,,,8,8,,, -2026000001,,,,220000,,,8,8,,, -2026000002,,,,220003,,,8,8,,, -2036000001,,,,250000,,,8,8,,, -2036000002,,,,250003,,,8,8,,, -2046000001,,,,240000,,,8,8,,, -2046000002,,,,240003,,,8,8,,, -2056000001,,,,110006,0,0,9,9,16000,32000,ATK -2056000002,,,,110007,0,0,9,9,27500,55000,DEF +2016000001,,,,800006,102000,289000,28,28,,, +2016000002,,,,800007,,,28,28,7500,10000,ATK +2016000003,,,,800008,,,28,28,12500,15000,DEF +2016000004,,,,800009,,,28,28,3500,6000,SPD +2016000005,,,,800010,,,20,20,,, +2016000006,,,,800011,,,20,20,,, +2016000007,,,,800060,,,28,28,6800,8000,ATK +2016000008,,,,800061,,,28,28,5440,6400,ATK +2016000009,,,,800062,,,28,28,4352,5120,ATK +2016000010,,,,800063,,,28,28,3481,4096,ATK +2016000011,,,,800064,,,28,28,10200,12000,DEF +2016000012,,,,800065,,,28,28,8160,9600,DEF +2016000013,,,,800066,,,28,28,6528,7680,DEF +2016000014,,,,800067,,,28,28,5222,6144,DEF +2016000015,,,,800068,,,28,28,4080,4800,SPD +2016000016,,,,800069,,,28,28,3264,3840,SPD +2016000017,,,,800070,,,28,28,2611,3072,SPD +2016000018,,,,800071,,,28,28,2088,2457,SPD +2016000019,,,,800072,,,20,20,,, +2016000020,,,,800073,,,20,20,,, +2016000021,,,,800074,,,20,20,,, +2016000022,,,,800075,,,20,20,,, +2016000023,,,,800076,,,20,20,,, +2016000024,,,,800077,,,20,20,,, +2016000025,,,,800078,,,20,20,,, +2016000026,,,,800079,,,20,20,,, +2046000001,,,,800002,,,30,30,1000,3000,ATK +2046000002,,,,800003,,,30,30,1500,4400,DEF +2046000003,,,,800004,,,30,30,550,1900,HIT +2046000004,,,,800005,,,30,30,500,1700,SPD +2046000005,,,,800012,0,0,12,12,,, +2046000006,,,,800044,,,30,30,2040,2400,ATK +2046000007,,,,800045,,,30,30,1632,1920,ATK +2046000008,,,,800046,,,30,30,1305,1536,ATK +2046000009,,,,800047,,,30,30,1044,1228,ATK +2046000010,,,,800048,,,30,30,2992,3520,DEF +2046000011,,,,800049,,,30,30,2393,2816,DEF +2046000012,,,,800050,,,30,30,1914,2252,DEF +2046000013,,,,800051,,,30,30,1531,1801,DEF +2046000014,,,,800052,,,30,30,1292,1520,HIT +2046000015,,,,800053,,,30,30,1033,1216,HIT +2046000016,,,,800054,,,30,30,826,972,HIT +2046000017,,,,800055,,,30,30,660,777,HIT +2046000018,,,,800056,,,30,30,1156,1360,SPD +2046000019,,,,800057,,,30,30,924,1088,SPD +2046000020,,,,800058,,,30,30,739,870,SPD +2046000021,,,,800059,,,30,30,591,696,SPD +2056000001,,,,800001,0,0,12,12,,, +2056000002,,,,800023,53544,62993,9,9,,, +2056000003,,,,800024,0,0,9,9,27200,32000,ATK +2056000004,,,,800025,0,0,9,9,46750,55000,DEF +2056000005,,,,800026,53544,62993,9,9,,, +2056000006,,,,800027,0,0,9,9,27200,32000,ATK +2056000007,,,,800028,0,0,9,9,46750,55000,DEF +2056000008,,,,800196,42835,50394,9,9,,, +2056000009,,,,800197,34268,40315,9,9,,, +2056000010,,,,800198,27414,32252,9,9,,, +2056000011,,,,800199,21931,25801,9,9,,, +2056000012,,,,800120,,,9,9,21760,25600,ATK +2056000013,,,,800121,,,9,9,17408,20480,ATK +2056000014,,,,800122,,,9,9,13926,16384,ATK +2056000015,,,,800123,,,9,9,11140,13107,ATK +2056000016,,,,800124,,,9,9,37400,44000,DEF +2056000017,,,,800125,,,9,9,29920,35200,DEF +2056000018,,,,800126,,,9,9,23936,28160,DEF +2056000019,,,,800127,,,9,9,19148,22528,DEF +2056000020,,,,800200,42835,50394,9,9,,, +2056000021,,,,800201,34268,40315,9,9,,, +2056000022,,,,800202,27414,32252,9,9,,, +2056000023,,,,800203,21931,25801,9,9,,, +2056000024,,,,800128,,,9,9,21760,25600,ATK +2056000025,,,,800129,,,9,9,17408,20480,ATK +2056000026,,,,800130,,,9,9,13926,16384,ATK +2056000027,,,,800131,,,9,9,11140,13107,ATK +2056000028,,,,800132,,,9,9,37400,44000,DEF +2056000029,,,,800133,,,9,9,29920,35200,DEF +2056000030,,,,800134,,,9,9,23936,28160,DEF +2056000031,,,,800135,,,9,9,19148,22528,DEF +2066000001,,,,800013,,,8,8,,, +2066000002,,,,800014,0,0,8,8,6800,8000,DEF +2066000003,,,,800015,,,8,8,,, +2066000004,,,,800016,0,0,8,8,6800,8000,DEF +2066000005,,,,800017,,,12,12,,, +2066000006,,,,800018,0,0,12,12,8925,10500,DEF +2066000007,,,,800019,0,0,12,12,2125,2500,HIT +2066000008,,,,800020,,,12,12,,, +2066000009,,,,800021,0,0,12,12,13387,15750,DEF +2066000010,,,,800022,0,0,12,12,3187,3750,HIT +2066000011,,,,800029,0,0,8,8,467,550,HP +2066000012,,,,800030,0,0,8,8,5610,6600,ATK +2066000013,,,,800031,0,0,8,8,11220,13200,DEF +2066000014,,,,800032,0,0,8,8,4250,5000,HIT +2066000015,,,,800033,0,0,8,8,6375,7500,SPD +2066000016,,,,800034,,,8,8,,, +2066000017,,,,800035,,,8,8,,, +2066000018,,,,800036,,,8,8,,, +2066000019,,,,800037,0,0,8,8,4250,5000,ATK +2066000020,,,,800038,,,8,8,,, +2066000021,,,,800039,0,0,8,8,4250,5000,ATK +2066000022,,,,800040,,,8,8,,, +2066000023,,,,800041,0,0,28,28,2550,3000,SPD +2066000024,,,,800042,,,8,8,,, +2066000025,,,,800043,0,0,28,28,2550,3000,SPD +2066000026,,,,800080,,,8,8,,, +2066000027,,,,800081,,,8,8,,, +2066000028,,,,800082,,,8,8,,, +2066000029,,,,800083,,,8,8,,, +2066000030,,,,800084,0,0,8,8,5440,6400,DEF +2066000031,,,,800085,0,0,8,8,4352,5120,DEF +2066000032,,,,800086,0,0,8,8,3481,4096,DEF +2066000033,,,,800087,0,0,8,8,2784,3276,DEF +2066000034,,,,800088,,,8,8,,, +2066000035,,,,800089,,,8,8,,, +2066000036,,,,800090,,,8,8,,, +2066000037,,,,800091,,,8,8,,, +2066000038,,,,800092,0,0,8,8,5440,6400,DEF +2066000039,,,,800093,0,0,8,8,4352,5120,DEF +2066000040,,,,800094,0,0,8,8,3481,4096,DEF +2066000041,,,,800095,0,0,8,8,2784,3276,DEF +2066000042,,,,800096,,,12,12,,, +2066000043,,,,800097,,,12,12,,, +2066000044,,,,800098,,,12,12,,, +2066000045,,,,800099,,,12,12,,, +2066000046,,,,800100,0,0,12,12,10709,12600,DEF +2066000047,,,,800101,0,0,12,12,8567,10080,DEF +2066000048,,,,800102,0,0,12,12,6853,8064,DEF +2066000049,,,,800103,0,0,12,12,5482,6451,DEF +2066000050,,,,800104,0,0,12,12,2549,3000,HIT +2066000051,,,,800105,0,0,12,12,2039,2400,HIT +2066000052,,,,800106,0,0,12,12,1631,1920,HIT +2066000053,,,,800107,0,0,12,12,1304,1536,HIT +2066000054,,,,800108,,,12,12,,, +2066000055,,,,800109,,,12,12,,, +2066000056,,,,800110,,,12,12,,, +2066000057,,,,800111,,,12,12,,, +2066000058,,,,800112,0,0,12,12,7140,8400,DEF +2066000059,,,,800113,0,0,12,12,5712,6720,DEF +2066000060,,,,800114,0,0,12,12,4569,5376,DEF +2066000061,,,,800115,0,0,12,12,3655,4300,DEF +2066000062,,,,800116,0,0,12,12,1700,2000,HIT +2066000063,,,,800117,0,0,12,12,1360,1600,HIT +2066000064,,,,800118,0,0,12,12,1088,1280,HIT +2066000065,,,,800119,0,0,12,12,870,1024,HIT +2066000066,,,,800136,0,0,8,8,373,440,HP +2066000067,,,,800137,0,0,8,8,298,352,HP +2066000068,,,,800138,0,0,8,8,238,281,HP +2066000069,,,,800139,0,0,8,8,190,224,HP +2066000070,,,,800140,0,0,8,8,4488,5280,ATK +2066000071,,,,800141,0,0,8,8,3590,4224,ATK +2066000072,,,,800142,0,0,8,8,2872,3379,ATK +2066000073,,,,800143,0,0,8,8,2297,2703,ATK +2066000074,,,,800144,0,0,8,8,8976,10560,DEF +2066000075,,,,800145,0,0,8,8,7180,8448,DEF +2066000076,,,,800146,0,0,8,8,5744,6758,DEF +2066000077,,,,800147,0,0,8,8,4595,5406,DEF +2066000078,,,,800148,0,0,8,8,3400,4000,HIT +2066000079,,,,800149,0,0,8,8,2720,3200,HIT +2066000080,,,,800150,0,0,8,8,2176,2560,HIT +2066000081,,,,800151,0,0,8,8,1740,2048,HIT +2066000082,,,,800152,0,0,8,8,5100,6000,SPD +2066000083,,,,800153,0,0,8,8,4080,4800,SPD +2066000084,,,,800154,0,0,8,8,3264,3840,SPD +2066000085,,,,800155,0,0,8,8,2611,3072,SPD +2066000086,,,,800156,,,8,8,,, +2066000087,,,,800157,,,8,8,,, +2066000088,,,,800158,,,8,8,,, +2066000089,,,,800159,,,8,8,,, +2066000090,,,,800160,,,8,8,,, +2066000091,,,,800161,,,8,8,,, +2066000092,,,,800162,,,8,8,,, +2066000093,,,,800163,,,8,8,,, +2066000094,,,,800164,,,8,8,,, +2066000095,,,,800165,,,8,8,,, +2066000096,,,,800166,,,8,8,,, +2066000097,,,,800167,,,8,8,,, +2066000098,,,,800168,0,0,8,8,3400,4000,ATK +2066000099,,,,800169,0,0,8,8,2720,3200,ATK +2066000100,,,,800170,0,0,8,8,2176,2560,ATK +2066000101,,,,800171,0,0,8,8,1740,2048,ATK +2066000102,,,,800172,,,8,8,,, +2066000103,,,,800173,,,8,8,,, +2066000104,,,,800174,,,8,8,,, +2066000105,,,,800175,,,8,8,,, +2066000106,,,,800176,0,0,8,8,3400,4000,ATK +2066000107,,,,800177,0,0,8,8,2720,3200,ATK +2066000108,,,,800178,0,0,8,8,2176,2560,ATK +2066000109,,,,800179,0,0,8,8,1740,2048,ATK +2066000110,,,,800180,,,8,8,,, +2066000111,,,,800181,,,8,8,,, +2066000112,,,,800182,,,8,8,,, +2066000113,,,,800183,,,8,8,,, +2066000114,,,,800184,0,0,28,28,2040,2400,SPD +2066000115,,,,800185,0,0,28,28,1632,1920,SPD +2066000116,,,,800186,0,0,28,28,1305,1536,SPD +2066000117,,,,800187,0,0,28,28,1044,1228,SPD +2066000118,,,,800188,,,8,8,,, +2066000119,,,,800189,,,8,8,,, +2066000120,,,,800190,,,8,8,,, +2066000121,,,,800191,,,8,8,,, +2066000122,,,,800192,0,0,28,28,2040,2400,SPD +2066000123,,,,800193,0,0,28,28,1632,1920,SPD +2066000124,,,,800194,0,0,28,28,1305,1536,SPD +2066000125,,,,800195,0,0,28,28,1044,1228,SPD \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/EquipmentItemRecipeSheet.csv b/Lib9c/TableCSV/Item/EquipmentItemRecipeSheet.csv index 3c8114d3ac..de2feadcf8 100644 --- a/Lib9c/TableCSV/Item/EquipmentItemRecipeSheet.csv +++ b/Lib9c/TableCSV/Item/EquipmentItemRecipeSheet.csv @@ -1,175 +1,175 @@ id,result_equipment_id,material_id,material_count,required_action_point,required_gold,required_block_index,unlock_stage,sub_recipe_id,sub_recipe_id_2,sub_recipe_id_3,required_crystal,item_sub_type -1,10110000,303000,2,0,0,5,3,373,374,,0,Weapon -5,10114000,303000,12,0,0,477,99,10,11,,64,Weapon -6,10120000,303001,4,0,0,37,27,376,377,,8,Weapon -10,10124000,303001,24,0,0,4000,174,22,23,,22560,Weapon -14,10133000,303002,27,0,0,4000,190,31,32,,41040,Weapon -15,10134000,303002,47,0,0,5000,204,34,35,,167040,Weapon -18,10132001,303002,21,0,0,4000,154,40,41,,32040,Weapon -19,10133001,303002,61,0,0,5000,220,43,44,,216180,Weapon -20,10134001,303002,73,0,0,5000,236,46,47,,495900,Weapon -21,10140000,303003,100,0,0,6000,299,101400001,101400002,,500000,Weapon -22,10141000,303003,60,0,0,6000,255,101410001,101410002,,500000,Weapon -23,10142000,303003,60,0,0,6000,265,101420001,101420002,,500000,Weapon -24,10143000,303003,80,0,0,6000,277,101430001,101430002,,500000,Weapon -25,10144000,303003,80,0,0,6000,290,101440001,101440002,,500000,Weapon -26,10150000,303004,120,0,0,6000,330,101500001,101500002,,500000,Weapon -27,10151000,303004,120,0,0,6000,305,101510001,101510002,,500000,Weapon -28,10152000,303004,120,0,0,6000,305,101520001,101520002,101520003,500000,Weapon -29,10153000,303004,120,0,0,6000,330,101530001,101530002,,500000,Weapon -30,10154000,303004,120,0,0,6000,330,101540001,101540002,101540003,500000,Weapon -43,10211000,303100,2,0,0,5,13,97,98,,2,Armor -46,10214000,303100,14,0,0,1076,108,106,107,,742,Armor -49,10222000,303101,7,0,0,120,45,112,113,,11,Armor -51,10224000,303101,26,0,0,4000,182,118,119,,23920,Armor -55,10233000,303102,40,0,0,5000,201,127,128,,140400,Armor -56,10234000,303102,52,0,0,5000,208,130,131,,182520,Armor -57,10230001,303102,20,0,0,1824,146,409,410,,9600,Armor -58,10231001,303102,22,0,0,4000,158,133,134,,33000,Armor -59,10232001,303102,23,0,0,4000,166,136,137,,35040,Armor -60,10233001,303102,67,0,0,5000,228,139,140,,455400,Armor -62,10240000,303103,100,0,0,6000,294,102400001,102400002,,500000,Armor -63,10241000,303103,60,0,0,6000,261,102410001,102410002,,500000,Armor -64,10242000,303103,60,0,0,6000,270,102420001,102420002,,500000,Armor -65,10243000,303103,80,0,0,6000,280,102430001,102430002,,500000,Armor -66,10244000,303103,80,0,0,6000,287,102440001,102440002,,500000,Armor -67,10250001,303104,120,0,0,6000,335,102500011,102500012,,500000,Armor -68,10251001,303104,120,0,0,6000,315,102510011,102510012,,500000,Armor -69,10252001,303104,120,0,0,6000,315,102520011,102520012,102520013,1000000,Armor -70,10253001,303104,120,0,0,6000,335,102530011,102530012,,1000000,Armor -71,10254001,303104,120,0,0,6000,335,102540011,102540012,102540013,1000000,Armor -87,10314000,303200,18,0,0,1560,134,202,203,,954,Belt -91,10323000,303201,22,0,0,4000,162,211,212,,2992,Belt -92,10324000,303201,45,0,0,5000,203,214,215,,122220,Belt -94,10331000,303202,11,0,0,410,90,217,218,,387,Belt -97,10334000,303202,150,0,0,5000,251,226,227,,737100,Belt -101,10343000,303203,76,0,0,5000,240,235,236,,1128600,Belt -103,10350000,303203,100,0,0,6000,296,103500001,103500002,,500000,Belt -104,10351000,303203,60,0,0,6000,260,103510001,103510002,,500000,Belt -105,10352000,303203,60,0,0,6000,269,103520001,103520002,,500000,Belt -106,10353000,303203,80,0,0,6000,278,103530001,103530002,,500000,Belt -107,10354000,303203,80,0,0,6000,287,103540001,103540002,,500000,Belt -111,10413000,303300,15,0,0,368,84,259,260,,32,Necklace -116,10423000,303301,25,0,0,4000,178,271,272,,3472,Necklace -117,10424000,303301,150,0,0,5000,202,274,275,,116880,Necklace -121,10433000,303302,55,0,0,5000,212,283,284,,195120,Necklace -122,10434000,303302,70,0,0,5000,232,286,287,,472500,Necklace -123,10440000,303303,77,0,0,5000,249,451,452,,729000,Necklace -128,10450000,303303,100,0,0,6000,293,104500001,104500002,,500000,Necklace -129,10451000,303303,60,0,0,6000,255,104510001,104510002,,500000,Necklace -130,10452000,303303,60,0,0,6000,264,104520001,104520002,,500000,Necklace -131,10453000,303303,80,0,0,6000,274,104530001,104530002,,500000,Necklace -132,10454000,303303,80,0,0,6000,284,104540001,104540002,,500000,Necklace -133,10510000,303400,2,0,0,5,17,457,458,,1,Ring -137,10514000,303400,24,0,0,4000,170,322,323,,2544,Ring -139,10521000,303401,9,0,0,195,57,325,326,,22,Ring -141,10523000,303401,28,0,0,4000,198,331,332,,3808,Ring -142,10524000,303401,49,0,0,5000,205,334,335,,132900,Ring -144,10531000,303402,16,0,0,1278,120,337,338,,5568,Ring -146,10533000,303402,64,0,0,5000,224,343,344,,748800,Ring -147,10534000,303402,76,0,0,5000,243,346,347,,889200,Ring -148,10540000,303403,100,0,0,6000,298,105400001,105400002,,500000,Ring -149,10541000,303403,60,0,0,6000,258,105410001,105410002,,500000,Ring -150,10542000,303403,60,0,0,6000,268,105420001,105420002,,500000,Ring -151,10543000,303403,80,0,0,6000,275,105430001,105430002,,500000,Ring -152,10544000,303403,80,0,0,6000,285,105440001,105440002,,500000,Ring -153,10550000,303404,120,0,0,6000,340,105500001,105500002,,500000,Ring -154,10551000,303404,120,0,0,6000,325,105510001,105510002,,500000,Ring -155,10552000,303404,120,0,0,6000,325,105520001,105520002,105520003,1000000,Ring -156,10553000,303404,120,0,0,6000,340,105530001,105530002,,1000000,Ring -157,10554000,303404,120,0,0,6000,340,105540001,105540002,105540003,1000000,Ring -158,12001001,600101,100,0,0,10,999,120010011,120010012,,0,Belt -159,12001002,600101,100,0,0,10,999,120010021,120010022,,0,Necklace -160,12001003,600101,50,0,0,10,999,120010031,120010032,,0,Ring -161,10350001,303204,120,0,0,6000,330,103500011,103500012,,500000,Belt -162,10351001,303204,120,0,0,6000,310,103510011,103510012,,500000,Belt -163,10352001,303204,120,0,0,6000,310,103520011,103520012,103520013,1000000,Belt -164,10353001,303204,120,0,0,6000,330,103530011,103530012,,1000000,Belt -165,10354001,303204,120,0,0,6000,330,103540011,103540012,103540013,1000000,Belt -166,10450001,303304,120,0,0,6000,335,104500011,104500012,,500000,Necklace -167,10451001,303304,120,0,0,6000,320,104510011,104510012,,500000,Necklace -168,10452001,303304,120,0,0,6000,320,104520011,104520012,104520013,1000000,Necklace -169,10453001,303304,120,0,0,6000,335,104530011,104530012,,1000000,Necklace -170,10454001,303304,120,0,0,6000,335,104540011,104540012,104540013,1000000,Necklace -171,10610000,0,0,0,0,10000000,999,106100001,,,0,Aura -172,10620000,0,0,0,0,10000000,999,106200001,,,0,Aura -173,10630000,0,0,0,0,10000000,999,106300001,,,0,Aura -174,10620001,0,0,0,0,10000000,999,106200011,,,0,Aura -175,10630001,0,0,0,0,10000000,999,106300011,,,0,Aura -176,10640001,0,0,0,0,10000000,999,106400011,,,0,Aura -177,10650001,0,0,0,0,10000000,999,106500011,,,0,Aura -178,10650002,0,0,0,0,10000000,999,106500021,,,0,Aura -179,10620002,0,0,0,0,10000000,999,106200021,,,0,Aura -180,10630002,0,0,0,0,10000000,999,106300021,,,0,Aura -181,10640002,0,0,0,0,10000000,999,106400021,,,0,Aura -182,10650003,0,0,0,0,10000000,999,106500031,,,0,Aura -183,10650004,0,0,0,0,10000000,999,106500041,,,0,Aura -184,10620003,0,0,0,0,10000000,999,106200031,,,0,Aura -185,10630003,0,0,0,0,10000000,999,106300031,,,0,Aura -186,10640003,0,0,0,0,10000000,999,106400031,,,0,Aura -187,10650005,0,0,0,0,10000000,999,106500051,,,0,Aura -188,10650006,0,0,0,0,10000000,999,106500061,,,0,Aura -189,10150001,303005,150,0,0,10800,380,101500011,101500012,,2000000,Weapon -190,10151001,303005,150,0,0,10800,355,101510011,101510012,,2000000,Weapon -191,10152001,303005,150,0,0,10800,355,101520011,101520012,101520013,2000000,Weapon -192,10153001,303005,150,0,0,10800,380,101530011,101530012,,2000000,Weapon -193,10154001,303005,150,0,0,10800,400,101540011,101540012,101540013,2000000,Weapon -194,10250000,303105,150,0,0,10800,385,102500001,102500002,,2000000,Armor -195,10251000,303105,150,0,0,10800,365,102510001,102510002,,2000000,Armor -196,10252000,303105,150,0,0,10800,365,102520001,102520002,102520003,2000000,Armor -197,10253000,303105,150,0,0,10800,385,102530001,102530002,,2000000,Armor -198,10254000,303105,150,0,0,10800,398,102540001,102540002,102540003,2000000,Armor -199,10350002,303205,150,0,0,10800,380,103500021,103500022,,2000000,Belt -200,10351002,303205,150,0,0,10800,360,103510021,103510022,,2000000,Belt -201,10352002,303205,150,0,0,10800,360,103520021,103520022,103520023,2000000,Belt -202,10353002,303205,150,0,0,10800,380,103530021,103530022,,2000000,Belt -203,10354002,303205,150,0,0,10800,392,103540021,103540022,103540023,2000000,Belt -204,10450002,303305,150,0,0,10800,385,104500021,104500022,,2000000,Necklace -205,10451002,303305,150,0,0,10800,370,104510021,104510022,,2000000,Necklace -206,10452002,303305,150,0,0,10800,370,104520021,104520022,104520023,2000000,Necklace -207,10453002,303305,150,0,0,10800,385,104530021,104530022,,2000000,Necklace -208,10454002,303305,150,0,0,10800,394,104540021,104540022,104540023,2000000,Necklace -209,10550001,303405,150,0,0,10800,390,105500011,105500012,,2000000,Ring -210,10551001,303405,150,0,0,10800,375,105510011,105510012,,2000000,Ring -211,10552001,303405,150,0,0,10800,375,105520011,105520012,105520013,2000000,Ring -212,10553001,303405,150,0,0,10800,390,105530011,105530012,,2000000,Ring -213,10554001,303405,150,0,0,10800,396,105540011,105540012,105540013,2000000,Ring -214,10640004,0,0,0,0,10000000,999,106400041,,,0,Aura -215,10650007,0,0,0,0,10000000,999,106500071,,,0,Aura -216,10660000,0,0,0,0,10000000,999,106600001,,,0,Aura -217,10730000,0,0,0,0,10000000,999,107300001,,,0,Grimoire -218,10730001,0,0,0,0,10000000,999,107300011,,,0,Grimoire -219,10730002,0,0,0,0,10000000,999,107300021,,,0,Grimoire -220,10730003,0,0,0,0,10000000,999,107300031,,,0,Grimoire -221,10730004,0,0,0,0,10000000,999,107300041,,,0,Grimoire -222,10730005,0,0,0,0,10000000,999,107300051,,,0,Grimoire -223,10730006,0,0,0,0,10000000,999,107300061,,,0,Grimoire -224,10730007,0,0,0,0,10000000,999,107300071,,,0,Grimoire -225,10730008,0,0,0,0,10000000,999,107300081,,,0,Grimoire -226,10740000,0,0,0,0,10000000,999,107400001,,,0,Grimoire -227,10740001,0,0,0,0,10000000,999,107400011,,,0,Grimoire -228,10740002,0,0,0,0,10000000,999,107400021,,,0,Grimoire -229,10740003,0,0,0,0,10000000,999,107400031,,,0,Grimoire -230,10740004,0,0,0,0,10000000,999,107400041,,,0,Grimoire -231,10740005,0,0,0,0,10000000,999,107400051,,,0,Grimoire -232,10740006,0,0,0,0,10000000,999,107400061,,,0,Grimoire -233,10740007,0,0,0,0,10000000,999,107400071,,,0,Grimoire -234,10740008,0,0,0,0,10000000,999,107400081,,,0,Grimoire -235,10750000,0,0,0,0,10000000,999,107500001,,,0,Grimoire -236,10750001,0,0,0,0,10000000,999,107500011,,,0,Grimoire -237,10750002,0,0,0,0,10000000,999,107500021,,,0,Grimoire -238,10750003,0,0,0,0,10000000,999,107500031,,,0,Grimoire -239,10750004,0,0,0,0,10000000,999,107500041,,,0,Grimoire -240,10750005,0,0,0,0,10000000,999,107500051,,,0,Grimoire -241,10750006,0,0,0,0,10000000,999,107500061,,,0,Grimoire -242,10750007,0,0,0,0,10000000,999,107500071,,,0,Grimoire -243,10750008,0,0,0,0,10000000,999,107500081,,,0,Grimoire -244,10760000,0,0,0,0,10000000,999,107600001,,,0,Grimoire -245,10760001,0,0,0,0,10000000,999,107600011,,,0,Grimoire -246,10760002,0,0,0,0,10000000,999,107600021,,,0,Grimoire -247,10760003,0,0,0,0,10000000,999,107600031,,,0,Grimoire -248,10760004,0,0,0,0,10000000,999,107600041,,,0,Grimoire -249,10760005,0,0,0,0,10000000,999,107600051,,,0,Grimoire -250,10760006,0,0,0,0,10000000,999,107600061,,,0,Grimoire -251,10760007,0,0,0,0,10000000,999,107600071,,,0,Grimoire -252,10760008,0,0,0,0,10000000,999,107600081,,,0,Grimoire \ No newline at end of file +1,10110000,303000,2,0,0,4,3,373,374,,0,Weapon +5,10114000,303000,12,0,0,381,99,10,11,,64,Weapon +6,10120000,303001,4,0,0,29,27,376,377,,8,Weapon +10,10124000,303001,24,0,0,3200,174,22,23,,22560,Weapon +14,10133000,303002,27,0,0,3200,190,31,32,,41040,Weapon +15,10134000,303002,47,0,0,4000,204,34,35,,167040,Weapon +18,10132001,303002,21,0,0,3200,154,40,41,,32040,Weapon +19,10133001,303002,61,0,0,4000,220,43,44,,216180,Weapon +20,10134001,303002,73,0,0,4000,236,46,47,,495900,Weapon +21,10140000,303003,100,0,0,4800,299,101400001,101400002,,500000,Weapon +22,10141000,303003,60,0,0,4800,255,101410001,101410002,,500000,Weapon +23,10142000,303003,60,0,0,4800,265,101420001,101420002,,500000,Weapon +24,10143000,303003,80,0,0,4800,277,101430001,101430002,,500000,Weapon +25,10144000,303003,80,0,0,4800,290,101440001,101440002,,500000,Weapon +26,10150000,303004,120,0,0,4800,330,101500001,101500002,,500000,Weapon +27,10151000,303004,120,0,0,4800,305,101510001,101510002,,500000,Weapon +28,10152000,303004,120,0,0,4800,305,101520001,101520002,101520003,500000,Weapon +29,10153000,303004,120,0,0,4800,330,101530001,101530002,,500000,Weapon +30,10154000,303004,120,0,0,4800,330,101540001,101540002,101540003,500000,Weapon +43,10211000,303100,2,0,0,4,13,97,98,,2,Armor +46,10214000,303100,14,0,0,860,108,106,107,,742,Armor +49,10222000,303101,7,0,0,96,45,112,113,,11,Armor +51,10224000,303101,26,0,0,3200,182,118,119,,23920,Armor +55,10233000,303102,40,0,0,4000,201,127,128,,140400,Armor +56,10234000,303102,52,0,0,4000,208,130,131,,182520,Armor +57,10230001,303102,20,0,0,1459,146,409,410,,9600,Armor +58,10231001,303102,22,0,0,3200,158,133,134,,33000,Armor +59,10232001,303102,23,0,0,3200,166,136,137,,35040,Armor +60,10233001,303102,67,0,0,4000,228,139,140,,455400,Armor +62,10240000,303103,100,0,0,4800,294,102400001,102400002,,500000,Armor +63,10241000,303103,60,0,0,4800,261,102410001,102410002,,500000,Armor +64,10242000,303103,60,0,0,4800,270,102420001,102420002,,500000,Armor +65,10243000,303103,80,0,0,4800,280,102430001,102430002,,500000,Armor +66,10244000,303103,80,0,0,4800,287,102440001,102440002,,500000,Armor +67,10250001,303104,120,0,0,4800,335,102500011,102500012,,500000,Armor +68,10251001,303104,120,0,0,4800,315,102510011,102510012,,500000,Armor +69,10252001,303104,120,0,0,4800,315,102520011,102520012,102520013,1000000,Armor +70,10253001,303104,120,0,0,4800,335,102530011,102530012,,1000000,Armor +71,10254001,303104,120,0,0,4800,335,102540011,102540012,102540013,1000000,Armor +87,10314000,303200,18,0,0,1248,134,202,203,,954,Belt +91,10323000,303201,22,0,0,3200,162,211,212,,2992,Belt +92,10324000,303201,45,0,0,4000,203,214,215,,122220,Belt +94,10331000,303202,11,0,0,328,90,217,218,,387,Belt +97,10334000,303202,150,0,0,4000,251,226,227,,737100,Belt +101,10343000,303203,76,0,0,4000,240,235,236,,1128600,Belt +103,10350000,303203,100,0,0,4800,296,103500001,103500002,,500000,Belt +104,10351000,303203,60,0,0,4800,260,103510001,103510002,,500000,Belt +105,10352000,303203,60,0,0,4800,269,103520001,103520002,,500000,Belt +106,10353000,303203,80,0,0,4800,278,103530001,103530002,,500000,Belt +107,10354000,303203,80,0,0,4800,287,103540001,103540002,,500000,Belt +111,10413000,303300,15,0,0,294,84,259,260,,32,Necklace +116,10423000,303301,25,0,0,3200,178,271,272,,3472,Necklace +117,10424000,303301,150,0,0,4000,202,274,275,,116880,Necklace +121,10433000,303302,55,0,0,4000,212,283,284,,195120,Necklace +122,10434000,303302,70,0,0,4000,232,286,287,,472500,Necklace +123,10440000,303303,77,0,0,4000,249,451,452,,729000,Necklace +128,10450000,303303,100,0,0,4800,293,104500001,104500002,,500000,Necklace +129,10451000,303303,60,0,0,4800,255,104510001,104510002,,500000,Necklace +130,10452000,303303,60,0,0,4800,264,104520001,104520002,,500000,Necklace +131,10453000,303303,80,0,0,4800,274,104530001,104530002,,500000,Necklace +132,10454000,303303,80,0,0,4800,284,104540001,104540002,,500000,Necklace +133,10510000,303400,2,0,0,4,17,457,458,,1,Ring +137,10514000,303400,24,0,0,3200,170,322,323,,2544,Ring +139,10521000,303401,9,0,0,156,57,325,326,,22,Ring +141,10523000,303401,28,0,0,3200,198,331,332,,3808,Ring +142,10524000,303401,49,0,0,4000,205,334,335,,132900,Ring +144,10531000,303402,16,0,0,1022,120,337,338,,5568,Ring +146,10533000,303402,64,0,0,4000,224,343,344,,748800,Ring +147,10534000,303402,76,0,0,4000,243,346,347,,889200,Ring +148,10540000,303403,100,0,0,4800,298,105400001,105400002,,500000,Ring +149,10541000,303403,60,0,0,4800,258,105410001,105410002,,500000,Ring +150,10542000,303403,60,0,0,4800,268,105420001,105420002,,500000,Ring +151,10543000,303403,80,0,0,4800,275,105430001,105430002,,500000,Ring +152,10544000,303403,80,0,0,4800,285,105440001,105440002,,500000,Ring +153,10550000,303404,120,0,0,4800,340,105500001,105500002,,500000,Ring +154,10551000,303404,120,0,0,4800,325,105510001,105510002,,500000,Ring +155,10552000,303404,120,0,0,4800,325,105520001,105520002,105520003,1000000,Ring +156,10553000,303404,120,0,0,4800,340,105530001,105530002,,1000000,Ring +157,10554000,303404,120,0,0,4800,340,105540001,105540002,105540003,1000000,Ring +158,12001001,600101,100,0,0,8,999,120010011,120010012,,0,Belt +159,12001002,600101,100,0,0,8,999,120010021,120010022,,0,Necklace +160,12001003,600101,50,0,0,8,999,120010031,120010032,,0,Ring +161,10350001,303204,120,0,0,4800,330,103500011,103500012,,500000,Belt +162,10351001,303204,120,0,0,4800,310,103510011,103510012,,500000,Belt +163,10352001,303204,120,0,0,4800,310,103520011,103520012,103520013,1000000,Belt +164,10353001,303204,120,0,0,4800,330,103530011,103530012,,1000000,Belt +165,10354001,303204,120,0,0,4800,330,103540011,103540012,103540013,1000000,Belt +166,10450001,303304,120,0,0,4800,335,104500011,104500012,,500000,Necklace +167,10451001,303304,120,0,0,4800,320,104510011,104510012,,500000,Necklace +168,10452001,303304,120,0,0,4800,320,104520011,104520012,104520013,1000000,Necklace +169,10453001,303304,120,0,0,4800,335,104530011,104530012,,1000000,Necklace +170,10454001,303304,120,0,0,4800,335,104540011,104540012,104540013,1000000,Necklace +171,10610000,0,0,0,0,8000000,999,106100001,,,0,Aura +172,10620000,0,0,0,0,8000000,999,106200001,,,0,Aura +173,10630000,0,0,0,0,8000000,999,106300001,,,0,Aura +174,10620001,0,0,0,0,8000000,999,106200011,,,0,Aura +175,10630001,0,0,0,0,8000000,999,106300011,,,0,Aura +176,10640001,0,0,0,0,8000000,999,106400011,,,0,Aura +177,10650001,0,0,0,0,8000000,999,106500011,,,0,Aura +178,10650002,0,0,0,0,8000000,999,106500021,,,0,Aura +179,10620002,0,0,0,0,8000000,999,106200021,,,0,Aura +180,10630002,0,0,0,0,8000000,999,106300021,,,0,Aura +181,10640002,0,0,0,0,8000000,999,106400021,,,0,Aura +182,10650003,0,0,0,0,8000000,999,106500031,,,0,Aura +183,10650004,0,0,0,0,8000000,999,106500041,,,0,Aura +184,10620003,0,0,0,0,8000000,999,106200031,,,0,Aura +185,10630003,0,0,0,0,8000000,999,106300031,,,0,Aura +186,10640003,0,0,0,0,8000000,999,106400031,,,0,Aura +187,10650005,0,0,0,0,8000000,999,106500051,,,0,Aura +188,10650006,0,0,0,0,8000000,999,106500061,,,0,Aura +189,10150001,303005,150,0,0,8640,380,101500011,101500012,,2000000,Weapon +190,10151001,303005,150,0,0,8640,355,101510011,101510012,,2000000,Weapon +191,10152001,303005,150,0,0,8640,355,101520011,101520012,101520013,2000000,Weapon +192,10153001,303005,150,0,0,8640,380,101530011,101530012,,2000000,Weapon +193,10154001,303005,150,0,0,8640,400,101540011,101540012,101540013,2000000,Weapon +194,10250000,303105,150,0,0,8640,385,102500001,102500002,,2000000,Armor +195,10251000,303105,150,0,0,8640,365,102510001,102510002,,2000000,Armor +196,10252000,303105,150,0,0,8640,365,102520001,102520002,102520003,2000000,Armor +197,10253000,303105,150,0,0,8640,385,102530001,102530002,,2000000,Armor +198,10254000,303105,150,0,0,8640,398,102540001,102540002,102540003,2000000,Armor +199,10350002,303205,150,0,0,8640,380,103500021,103500022,,2000000,Belt +200,10351002,303205,150,0,0,8640,360,103510021,103510022,,2000000,Belt +201,10352002,303205,150,0,0,8640,360,103520021,103520022,103520023,2000000,Belt +202,10353002,303205,150,0,0,8640,380,103530021,103530022,,2000000,Belt +203,10354002,303205,150,0,0,8640,392,103540021,103540022,103540023,2000000,Belt +204,10450002,303305,150,0,0,8640,385,104500021,104500022,,2000000,Necklace +205,10451002,303305,150,0,0,8640,370,104510021,104510022,,2000000,Necklace +206,10452002,303305,150,0,0,8640,370,104520021,104520022,104520023,2000000,Necklace +207,10453002,303305,150,0,0,8640,385,104530021,104530022,,2000000,Necklace +208,10454002,303305,150,0,0,8640,394,104540021,104540022,104540023,2000000,Necklace +209,10550001,303405,150,0,0,8640,390,105500011,105500012,,2000000,Ring +210,10551001,303405,150,0,0,8640,375,105510011,105510012,,2000000,Ring +211,10552001,303405,150,0,0,8640,375,105520011,105520012,105520013,2000000,Ring +212,10553001,303405,150,0,0,8640,390,105530011,105530012,,2000000,Ring +213,10554001,303405,150,0,0,8640,396,105540011,105540012,105540013,2000000,Ring +214,10640004,0,0,0,0,8000000,999,106400041,,,0,Aura +215,10650007,0,0,0,0,8000000,999,106500071,,,0,Aura +216,10660000,0,0,0,0,8000000,999,106600001,,,0,Aura +217,10730000,0,0,0,0,8000000,999,107300001,,,0,Grimoire +218,10730001,0,0,0,0,8000000,999,107300011,,,0,Grimoire +219,10730002,0,0,0,0,8000000,999,107300021,,,0,Grimoire +220,10730003,0,0,0,0,8000000,999,107300031,,,0,Grimoire +221,10730004,0,0,0,0,8000000,999,107300041,,,0,Grimoire +222,10730005,0,0,0,0,8000000,999,107300051,,,0,Grimoire +223,10730006,0,0,0,0,8000000,999,107300061,,,0,Grimoire +224,10730007,0,0,0,0,8000000,999,107300071,,,0,Grimoire +225,10730008,0,0,0,0,8000000,999,107300081,,,0,Grimoire +226,10740000,0,0,0,0,8000000,999,107400001,,,0,Grimoire +227,10740001,0,0,0,0,8000000,999,107400011,,,0,Grimoire +228,10740002,0,0,0,0,8000000,999,107400021,,,0,Grimoire +229,10740003,0,0,0,0,8000000,999,107400031,,,0,Grimoire +230,10740004,0,0,0,0,8000000,999,107400041,,,0,Grimoire +231,10740005,0,0,0,0,8000000,999,107400051,,,0,Grimoire +232,10740006,0,0,0,0,8000000,999,107400061,,,0,Grimoire +233,10740007,0,0,0,0,8000000,999,107400071,,,0,Grimoire +234,10740008,0,0,0,0,8000000,999,107400081,,,0,Grimoire +235,10750000,0,0,0,0,8000000,999,107500001,,,0,Grimoire +236,10750001,0,0,0,0,8000000,999,107500011,,,0,Grimoire +237,10750002,0,0,0,0,8000000,999,107500021,,,0,Grimoire +238,10750003,0,0,0,0,8000000,999,107500031,,,0,Grimoire +239,10750004,0,0,0,0,8000000,999,107500041,,,0,Grimoire +240,10750005,0,0,0,0,8000000,999,107500051,,,0,Grimoire +241,10750006,0,0,0,0,8000000,999,107500061,,,0,Grimoire +242,10750007,0,0,0,0,8000000,999,107500071,,,0,Grimoire +243,10750008,0,0,0,0,8000000,999,107500081,,,0,Grimoire +244,10760000,0,0,0,0,8000000,999,107600001,,,0,Grimoire +245,10760001,0,0,0,0,8000000,999,107600011,,,0,Grimoire +246,10760002,0,0,0,0,8000000,999,107600021,,,0,Grimoire +247,10760003,0,0,0,0,8000000,999,107600031,,,0,Grimoire +248,10760004,0,0,0,0,8000000,999,107600041,,,0,Grimoire +249,10760005,0,0,0,0,8000000,999,107600051,,,0,Grimoire +250,10760006,0,0,0,0,8000000,999,107600061,,,0,Grimoire +251,10760007,0,0,0,0,8000000,999,107600071,,,0,Grimoire +252,10760008,0,0,0,0,8000000,999,107600081,,,0,Grimoire \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/EquipmentItemSheet.csv b/Lib9c/TableCSV/Item/EquipmentItemSheet.csv index a0db1d54e1..c3ef072b26 100644 --- a/Lib9c/TableCSV/Item/EquipmentItemSheet.csv +++ b/Lib9c/TableCSV/Item/EquipmentItemSheet.csv @@ -247,98 +247,28 @@ id,_name,item_sub_type,grade,elemental_type,set_id,stat_type,stat_value,attack_r 10760006,기능의 그리모어 (A),Grimoire,6,Normal,0,SPD,10,0,10760006,130000 10760007,기능의 그리모어 (D),Grimoire,6,Normal,0,SPD,10,0,10760007,130000 10760008,기능의 그리모어 (S),Grimoire,6,Normal,0,SPD,10,0,10760008,130000 -20160000,커스텀 장비 무기,Weapon,6,Normal,0,ATK,10,0,20160000,0 -20160001,커스텀 장비 무기,Weapon,6,Normal,0,ATK,100,0,20160000,0 -20160002,커스텀 장비 무기,Weapon,6,Normal,0,ATK,500,0,20160000,0 -20160003,커스텀 장비 무기,Weapon,6,Normal,0,ATK,800,0,20160000,0 -20260000,커스텀 장비 갑옷,Armor,6,Normal,0,HP,10,0,20260000,0 -20260001,커스텀 장비 갑옷,Armor,6,Normal,0,HP,100,0,20260000,0 -20260002,커스텀 장비 갑옷,Armor,6,Normal,0,HP,500,0,20260000,0 -20260003,커스텀 장비 갑옷,Armor,6,Normal,0,HP,800,0,20260000,0 -20360000,커스텀 장비 벨트,Belt,6,Normal,0,SPD,10,0,20360000,0 -20360001,커스텀 장비 벨트,Belt,6,Normal,0,SPD,100,0,20360000,0 -20360002,커스텀 장비 벨트,Belt,6,Normal,0,SPD,500,0,20360000,0 -20360003,커스텀 장비 벨트,Belt,6,Normal,0,SPD,800,0,20360000,0 -20460000,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20460001,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,100,0,20460000,0 -20460002,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,500,0,20460000,0 -20460003,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,800,0,20460000,0 -20560000,커스텀 장비 반지,Ring,6,Normal,0,DEF,10,0,20560000,0 -20560001,커스텀 장비 반지,Ring,6,Normal,0,DEF,100,0,20560000,0 -20560002,커스텀 장비 반지,Ring,6,Normal,0,DEF,500,0,20560000,0 -20560003,커스텀 장비 반지,Ring,6,Normal,0,DEF,800,0,20560000,0 -20161000,커스텀 장비 무기 외형,Weapon,6,Normal,0,ATK,10,0,20160000,0 -20161001,커스텀 장비 무기 외형,Weapon,6,Fire,0,ATK,10,0,20160000,0 -20161002,커스텀 장비 무기 외형,Weapon,6,Water,0,ATK,10,0,20160000,0 -20161003,커스텀 장비 무기 외형,Weapon,6,Land,0,ATK,10,0,20160000,0 -20161004,커스텀 장비 무기 외형,Weapon,6,Wind,0,ATK,10,0,20160000,0 -20161005,커스텀 장비 무기 외형,Weapon,6,Normal,0,ATK,10,0,20160000,0 -20161006,커스텀 장비 무기 외형,Weapon,6,Fire,0,ATK,10,0,20160000,0 -20161007,커스텀 장비 무기 외형,Weapon,6,Water,0,ATK,10,0,20160000,0 -20161008,커스텀 장비 무기 외형,Weapon,6,Land,0,ATK,10,0,20160000,0 -20161009,커스텀 장비 무기 외형,Weapon,6,Wind,0,ATK,10,0,20160000,0 -20161010,커스텀 장비 무기 외형,Weapon,6,Normal,0,ATK,10,0,20160000,0 -20161011,커스텀 장비 무기 외형,Weapon,6,Fire,0,ATK,10,0,20160000,0 -20161012,커스텀 장비 무기 외형,Weapon,6,Water,0,ATK,10,0,20160000,0 -20161013,커스텀 장비 무기 외형,Weapon,6,Land,0,ATK,10,0,20160000,0 -20161014,커스텀 장비 무기 외형,Weapon,6,Wind,0,ATK,10,0,20160000,0 -20261000,커스텀 장비 갑옷 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261001,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261002,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261003,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261004,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261005,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261006,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261007,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261008,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261009,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261010,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261011,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261012,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261013,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20261014,커스텀 장비 무기 외형,Armor,6,Normal,0,HP,10,0,20260000,0 -20361000,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361001,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361002,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361003,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361004,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361005,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361006,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361007,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361008,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361009,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361010,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361011,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361012,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361013,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20361014,커스텀 장비 벨트 외형,Belt,6,Normal,0,SPD,10,0,20360000,0 -20461000,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461001,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461002,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461003,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461004,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461005,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461006,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461007,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461008,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461009,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461010,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461011,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461012,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461013,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20461014,커스텀 장비 목걸이 외형,Necklace,6,Normal,0,HIT,10,0,20460000,0 -20561000,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561001,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561002,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561003,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561004,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561005,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561006,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561007,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561008,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561009,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561010,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561011,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561012,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561013,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 -20561014,커스텀 장비 반지 외형,Ring,6,Normal,0,DEF,10,0,20560000,0 +20160000,커스텀 장비 무기,Weapon,3,Normal,0,ATK,10,0,20160000,1 +20160001,커스텀 장비 무기,Weapon,4,Normal,0,ATK,100,0,20160000,2 +20160002,커스텀 장비 무기,Weapon,5,Normal,0,ATK,500,0,20160000,3 +20160003,커스텀 장비 무기,Weapon,6,Normal,0,ATK,800,0,20160000,4 +20160004,커스텀 장비 무기,Weapon,6,Normal,0,ATK,1200,0,20160000,5 +20260000,커스텀 장비 갑옷,Armor,3,Normal,0,HP,10,0,20260000,1 +20260001,커스텀 장비 갑옷,Armor,4,Normal,0,HP,100,0,20260000,2 +20260002,커스텀 장비 갑옷,Armor,5,Normal,0,HP,500,0,20260000,3 +20260003,커스텀 장비 갑옷,Armor,6,Normal,0,HP,800,0,20260000,4 +20260004,커스텀 장비 갑옷,Armor,6,Normal,0,HP,1200,0,20260000,5 +20360000,커스텀 장비 벨트,Belt,3,Normal,0,SPD,10,0,20360000,1 +20360001,커스텀 장비 벨트,Belt,4,Normal,0,SPD,100,0,20360000,2 +20360002,커스텀 장비 벨트,Belt,5,Normal,0,SPD,500,0,20360000,3 +20360003,커스텀 장비 벨트,Belt,6,Normal,0,SPD,800,0,20360000,4 +20360004,커스텀 장비 벨트,Belt,6,Normal,0,SPD,1200,0,20360000,5 +20460000,커스텀 장비 목걸이,Necklace,3,Normal,0,HIT,10,0,20460000,1 +20460001,커스텀 장비 목걸이,Necklace,4,Normal,0,HIT,100,0,20460000,2 +20460002,커스텀 장비 목걸이,Necklace,5,Normal,0,HIT,500,0,20460000,3 +20460003,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,800,0,20460000,4 +20460004,커스텀 장비 목걸이,Necklace,6,Normal,0,HIT,1200,0,20460000,5 +20560000,커스텀 장비 반지,Ring,3,Normal,0,DEF,10,0,20560000,1 +20560001,커스텀 장비 반지,Ring,4,Normal,0,DEF,100,0,20560000,2 +20560002,커스텀 장비 반지,Ring,5,Normal,0,DEF,500,0,20560000,3 +20560003,커스텀 장비 반지,Ring,6,Normal,0,DEF,800,0,20560000,4 +20560004,커스텀 장비 반지,Ring,6,Normal,0,DEF,1200,0,20560000,5 \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/EquipmentItemSubRecipeSheetV2.csv b/Lib9c/TableCSV/Item/EquipmentItemSubRecipeSheetV2.csv index f0ba87010c..045fb453eb 100644 --- a/Lib9c/TableCSV/Item/EquipmentItemSubRecipeSheetV2.csv +++ b/Lib9c/TableCSV/Item/EquipmentItemSubRecipeSheetV2.csv @@ -1,499 +1,499 @@ ID,required_action_point,required_gold,required_block_index,material_id,material_count,material_2_id,material_2_count,material_3_id,material_3_count,option_id,option_ratio,option_1_required_block_index,option_2_id,option_2_ratio,option_2_required_block_index,option_3_id,option_3_ratio,option_3_required_block_index,option_4_id,option_4_ratio,option_4_required_block_index,is_mimisbrunnr_sub_recipe,reward_hammer_point 373,0,0,0,,,,,,,1365,10000,0,1366,2800,0,1367,1200,0,,,,FALSE,1 -374,0,0,2,306023,2,306025,2,306002,1,1368,10000,0,1369,8400,0,1370,3200,1,1371,1500,2,FALSE,2 +374,0,0,2,306023,2,306025,2,306002,1,1368,10000,0,1369,8400,0,1370,3200,0,1371,1500,1,FALSE,2 375,0,450,0,301000,10,,,,,1372,10000,0,1373,8000,0,1374,6000,0,1375,900,0,TRUE,2 1,0,0,0,306025,1,306023,1,306024,1,1,10000,0,2,3000,0,3,1100,0,,,,FALSE,1 -2,0,0,2,306023,3,306025,2,306024,2,4,10000,0,5,6000,0,6,4200,1,7,1600,2,FALSE,2 -3,0,450,4000,306056,18,306061,20,306068,14,8,10000,0,9,8000,560,10,6000,1120,11,900,1680,TRUE,2 +2,0,0,2,306023,3,306025,2,306024,2,4,10000,0,5,6000,0,6,4200,0,7,1600,1,FALSE,2 +3,0,450,4000,306056,18,306061,20,306068,14,8,10000,0,9,8000,448,10,6000,896,11,900,1344,TRUE,2 4,0,0,0,306000,1,306002,1,306001,1,12,10000,0,13,2800,0,14,1200,0,,,,FALSE,1 -5,0,0,2,306002,3,306000,2,306001,2,15,10000,0,16,9000,0,17,2800,1,18,1600,2,FALSE,2 +5,0,0,2,306002,3,306000,2,306001,2,15,10000,0,16,9000,0,17,2800,0,18,1600,1,FALSE,2 6,0,450,0,301000,10,,,,,19,10000,0,20,8000,0,21,6000,0,22,900,0,TRUE,2 -7,0,0,0,306011,6,306010,3,306009,3,23,10000,0,24,3400,10,25,1000,32,,,,FALSE,1 -8,0,0,77,306010,16,306009,11,306011,11,26,10000,0,27,7900,23,28,3400,48,29,1500,72,FALSE,2 -9,0,450,0,301000,10,,,,,30,10000,0,31,8000,10,32,6000,21,33,900,32,TRUE,2 -10,0,0,0,306050,12,306052,6,306040,6,34,10000,0,35,10000,32,39,10000,0,36,10000,100,FALSE,1 -11,0,0,238,306050,36,306051,24,306042,6,37,10000,0,38,6000,74,39,4200,149,40,1600,224,FALSE,2 -12,0,450,0,301000,10,,,,,41,10000,0,42,8000,32,43,6000,66,44,900,100,TRUE,2 -376,0,0,0,,,,,,,1376,10000,0,1377,10000,2,1381,10000,0,1378,10000,7,FALSE,1 -377,0,0,18,306023,5,306002,4,306024,3,1379,10000,0,1380,8400,5,1381,3200,11,1382,1500,16,FALSE,2 -378,0,450,0,301000,10,,,,,1383,10000,0,1384,8000,2,1385,6000,4,1386,900,7,TRUE,2 -13,0,0,0,306023,3,306025,2,306024,2,45,10000,0,46,3000,2,47,1100,9,,,,FALSE,1 -14,0,0,22,306025,8,306024,5,306023,5,48,10000,0,49,6000,7,50,4200,14,51,1600,21,FALSE,2 -15,0,450,0,301000,10,,,,,52,10000,0,53,8000,2,54,6000,6,55,900,9,TRUE,2 -16,0,0,0,306001,4,306000,2,306002,2,56,10000,0,57,2800,5,58,1200,18,,,,FALSE,1 -17,0,0,44,306001,11,306000,7,306002,7,59,10000,0,60,9000,13,61,2800,27,62,1600,41,FALSE,2 -18,0,450,0,301000,10,,,,,63,10000,0,64,8000,5,65,6000,11,66,900,18,TRUE,2 -19,0,0,0,306013,15,306014,8,306040,8,67,10000,0,68,3400,81,69,1000,245,,,,FALSE,1 -20,0,0,583,306014,43,306013,29,306043,8,70,10000,0,71,7900,183,72,3400,367,73,1500,550,FALSE,2 -21,0,450,0,301000,10,,,,,74,10000,0,75,8000,81,76,6000,163,77,900,245,TRUE,2 -22,0,0,0,306055,24,306054,12,306035,12,78,10000,0,79,3000,500,80,1100,1502,,,,FALSE,1 -23,0,0,1778,306053,36,306054,24,306037,12,81,10000,0,82,6000,563,83,4200,1127,84,1600,1690,FALSE,2 -24,0,450,0,301000,10,,,,,85,10000,0,86,8000,500,87,6000,1001,88,900,1502,TRUE,2 -379,0,0,0,306040,4,,,,,1387,10000,0,1388,2800,16,1389,1200,50,,,,FALSE,1 -380,0,0,120,306003,14,306040,7,306044,4,1390,10000,0,1391,8400,37,1392,3200,75,1393,1500,113,FALSE,2 -381,0,450,0,301000,10,,,,,1394,10000,0,1395,8000,16,1396,6000,33,1397,900,50,TRUE,2 -25,0,0,0,306027,8,306028,4,306040,4,89,10000,0,90,3000,17,91,1100,53,,,,FALSE,1 -26,0,0,128,306026,22,306028,15,306041,4,92,10000,0,93,6000,39,94,4200,80,95,1600,121,FALSE,2 -27,0,450,0,301000,10,,,,,96,10000,0,97,8000,17,98,6000,35,99,900,53,TRUE,2 -28,0,0,0,306004,9,306003,5,306040,5,100,10000,0,101,2800,22,102,1200,68,,,,FALSE,1 -29,0,0,164,306005,27,306004,18,306044,5,103,10000,0,104,9000,51,105,2800,102,106,1600,154,FALSE,2 -30,0,450,0,301000,10,,,,,107,10000,0,108,8000,22,109,6000,45,110,900,68,TRUE,2 -31,0,0,0,306015,27,306016,14,306035,14,111,10000,0,112,3400,686,113,1000,2059,,,,FALSE,1 -32,0,0,2000,306017,40,306016,27,306038,14,114,10000,0,115,7900,777,116,3400,1400,117,1500,2316,FALSE,2 -33,0,450,0,301000,10,,,,,118,10000,0,119,8000,686,120,6000,1372,121,900,2059,TRUE,2 -34,0,0,0,306055,47,306054,24,306045,24,122,10000,0,123,3000,1510,124,1100,2800,,,,FALSE,1 -35,0,0,2000,306055,46,306045,23,306047,12,125,10000,0,126,6000,1700,127,4200,1400,128,1600,4200,FALSE,2 -36,0,450,0,301000,10,,,,,129,10000,0,130,8000,1510,131,6000,2800,132,900,4532,TRUE,2 -382,0,0,0,306035,9,,,,,1398,10000,0,1399,2800,103,1400,1200,310,,,,FALSE,1 -383,0,0,741,306053,51,306006,34,306039,9,1401,10000,0,1402,8400,233,1403,3200,466,1404,1500,700,FALSE,2 -384,0,450,0,301000,10,,,,,1405,10000,0,1406,8000,103,1407,6000,207,1408,900,310,TRUE,2 -37,0,0,0,306029,19,306030,10,306035,10,133,10000,0,134,3000,114,135,1100,344,,,,FALSE,1 -38,0,0,821,306029,37,306035,19,306036,10,136,10000,0,137,6000,258,138,4200,517,139,1600,775,FALSE,2 -39,0,450,0,301000,10,,,,,140,10000,0,141,8000,114,142,6000,229,143,900,344,TRUE,2 -40,0,0,0,306006,21,306008,11,306035,11,144,10000,0,145,2800,363,146,1200,1089,,,,FALSE,1 -41,0,0,1250,306006,41,306035,21,306039,11,147,10000,0,148,9000,408,149,2800,817,150,1600,1226,FALSE,2 -42,0,450,0,301000,10,,,,,151,10000,0,152,8000,363,153,6000,726,154,900,1089,TRUE,2 -43,0,0,0,306015,61,306016,31,306045,31,155,10000,0,156,3400,1963,157,1000,2800,,,,FALSE,1 -44,0,0,2000,306015,60,306045,30,306048,15,158,10000,0,159,7900,1750,160,3400,1400,161,1500,4200,FALSE,2 -45,0,450,0,301000,10,,,,,162,10000,0,163,8000,1963,164,6000,2800,165,900,5890,TRUE,2 -46,0,0,0,306055,60,306053,30,306045,10,166,10000,0,167,3000,2401,168,1100,2800,,,,FALSE,1 -47,0,0,2000,306054,80,306045,21,306047,15,169,10000,0,170,6000,1750,171,4200,1400,172,1600,4200,FALSE,2 -48,0,450,0,301000,10,,,,,173,10000,0,174,8000,2401,175,6000,2800,176,900,7203,TRUE,2 -388,0,0,0,306045,43,,,,,1420,10000,0,1421,2800,3500,1422,1200,2800,,,,FALSE,1 -389,0,0,4000,306029,169,306045,85,306046,43,1423,10000,0,1424,8400,3500,1425,3200,2800,1426,1500,8400,FALSE,2 -390,0,450,0,301000,10,,,,,1427,10000,0,1428,8000,3500,1429,6000,2800,1430,900,8400,TRUE,2 -61,0,0,0,306030,85,306029,43,306045,43,221,10000,0,222,3000,3500,223,1100,2800,,,,FALSE,1 -62,0,0,4000,306029,170,306045,85,306046,43,224,10000,0,225,6000,3500,226,4200,2800,227,1600,8400,FALSE,2 -63,0,450,0,301000,10,,,,,228,10000,0,229,8000,3500,230,6000,2800,231,900,8400,TRUE,2 -64,0,0,0,306030,86,306029,43,306045,43,232,10000,0,233,2800,3500,234,1200,2800,,,,FALSE,1 -65,0,0,4000,306029,171,306045,86,306046,43,235,10000,0,236,9000,3500,237,2800,2800,238,1600,8400,FALSE,2 -66,0,450,0,301000,10,,,,,239,10000,0,240,8000,3500,241,6000,2800,242,900,8400,TRUE,2 -67,0,0,0,306030,86,306029,43,306045,43,243,10000,0,244,3400,3500,245,1000,2800,,,,FALSE,1 -68,0,0,4000,306029,172,306045,86,306046,43,246,10000,0,247,7900,3500,248,3400,2800,249,1500,8400,FALSE,2 -69,0,450,0,301000,10,,,,,250,10000,0,251,8000,3500,252,6000,2800,253,900,8400,TRUE,2 -70,0,0,0,306030,87,306029,44,306045,44,254,10000,0,255,3000,3500,256,1100,2800,,,,FALSE,1 -71,0,0,4000,306029,173,306045,87,306046,44,257,10000,0,258,6000,3500,259,4200,2800,260,1600,8400,FALSE,2 -72,0,450,0,301000,10,,,,,261,10000,0,262,8000,3500,263,6000,2800,264,900,8400,TRUE,2 -394,0,0,0,306045,59,,,,,1442,10000,0,1443,2800,3500,1444,1200,2800,,,,FALSE,1 -395,0,0,4000,306029,233,306045,117,306046,59,1445,10000,0,1446,8400,3500,1447,3200,2800,1448,1500,8400,FALSE,2 -396,0,450,0,301000,10,,,,,1449,10000,0,1450,8000,3500,1451,6000,2800,1452,900,8400,TRUE,2 -85,0,0,0,306030,118,306029,59,306045,59,309,10000,0,310,3000,3500,311,1100,2800,,,,FALSE,1 -86,0,0,4000,306029,236,306045,118,306046,59,312,10000,0,313,6000,3500,314,4200,2800,315,1600,8400,FALSE,2 -87,0,450,0,301000,10,,,,,316,10000,0,317,8000,3500,318,6000,2800,319,900,8400,TRUE,2 -88,0,0,0,306030,119,306029,60,306045,60,320,10000,0,321,2800,3500,322,1200,2800,,,,FALSE,1 -89,0,0,4000,306029,238,306045,119,306046,60,323,10000,0,324,9000,3500,325,2800,2800,326,1600,8400,FALSE,2 -90,0,450,0,301000,10,,,,,327,10000,0,328,8000,3500,329,6000,2800,330,900,8400,TRUE,2 -91,0,0,0,306030,121,306029,61,306045,61,331,10000,0,332,3400,3500,333,1000,2800,,,,FALSE,1 -92,0,0,4000,306029,241,306045,121,306046,61,334,10000,0,335,7900,3500,336,3400,2800,337,1500,8400,FALSE,2 -93,0,450,0,301000,10,,,,,338,10000,0,339,8000,3500,340,6000,2800,341,900,8400,TRUE,2 -94,0,0,0,306030,122,306029,61,306045,61,342,10000,0,343,3000,3500,344,1100,2800,,,,FALSE,1 -95,0,0,4000,306029,243,306045,122,306046,61,345,10000,0,346,6000,3500,347,4200,2800,348,1600,8400,FALSE,2 -96,0,450,0,301000,10,,,,,349,10000,0,350,8000,3500,351,6000,2800,352,900,8400,TRUE,2 -397,0,0,0,306045,63,,,,,1453,10000,0,1454,2800,3500,1455,1200,2800,,,,FALSE,1 -398,0,0,4000,306029,249,306045,125,306046,63,1456,10000,0,1457,8400,3500,1458,3200,2800,1459,1500,8400,FALSE,2 -399,0,450,0,301000,10,,,,,1460,10000,0,1461,8000,3500,1462,6000,2800,1463,900,8400,TRUE,2 +7,0,0,0,306011,6,306010,3,306009,3,23,10000,0,24,3400,8,25,1000,25,,,,FALSE,1 +8,0,0,77,306010,16,306009,11,306011,11,26,10000,0,27,7900,18,28,3400,38,29,1500,57,FALSE,2 +9,0,450,0,301000,10,,,,,30,10000,0,31,8000,8,32,6000,16,33,900,25,TRUE,2 +10,0,0,0,306050,12,306052,6,306040,6,34,10000,0,35,10000,25,39,10000,0,36,10000,80,FALSE,1 +11,0,0,238,306050,36,306051,24,306042,6,37,10000,0,38,6000,59,39,4200,119,40,1600,179,FALSE,2 +12,0,450,0,301000,10,,,,,41,10000,0,42,8000,25,43,6000,52,44,900,80,TRUE,2 +376,0,0,0,,,,,,,1376,10000,0,1377,10000,1,1381,10000,0,1378,10000,5,FALSE,1 +377,0,0,18,306023,5,306002,4,306024,3,1379,10000,0,1380,8400,4,1381,3200,8,1382,1500,12,FALSE,2 +378,0,450,0,301000,10,,,,,1383,10000,0,1384,8000,1,1385,6000,3,1386,900,5,TRUE,2 +13,0,0,0,306023,3,306025,2,306024,2,45,10000,0,46,3000,1,47,1100,7,,,,FALSE,1 +14,0,0,22,306025,8,306024,5,306023,5,48,10000,0,49,6000,5,50,4200,11,51,1600,16,FALSE,2 +15,0,450,0,301000,10,,,,,52,10000,0,53,8000,1,54,6000,4,55,900,7,TRUE,2 +16,0,0,0,306001,4,306000,2,306002,2,56,10000,0,57,2800,4,58,1200,14,,,,FALSE,1 +17,0,0,44,306001,11,306000,7,306002,7,59,10000,0,60,9000,10,61,2800,21,62,1600,32,FALSE,2 +18,0,450,0,301000,10,,,,,63,10000,0,64,8000,4,65,6000,8,66,900,14,TRUE,2 +19,0,0,0,306013,15,306014,8,306040,8,67,10000,0,68,3400,64,69,1000,196,,,,FALSE,1 +20,0,0,583,306014,43,306013,29,306043,8,70,10000,0,71,7900,146,72,3400,293,73,1500,440,FALSE,2 +21,0,450,0,301000,10,,,,,74,10000,0,75,8000,64,76,6000,130,77,900,196,TRUE,2 +22,0,0,0,306055,24,306054,12,306035,12,78,10000,0,79,3000,400,80,1100,1201,,,,FALSE,1 +23,0,0,1778,306053,36,306054,24,306037,12,81,10000,0,82,6000,450,83,4200,901,84,1600,1352,FALSE,2 +24,0,450,0,301000,10,,,,,85,10000,0,86,8000,400,87,6000,800,88,900,1201,TRUE,2 +379,0,0,0,306040,4,,,,,1387,10000,0,1388,2800,12,1389,1200,40,,,,FALSE,1 +380,0,0,120,306003,14,306040,7,306044,4,1390,10000,0,1391,8400,29,1392,3200,60,1393,1500,90,FALSE,2 +381,0,450,0,301000,10,,,,,1394,10000,0,1395,8000,12,1396,6000,26,1397,900,40,TRUE,2 +25,0,0,0,306027,8,306028,4,306040,4,89,10000,0,90,3000,13,91,1100,42,,,,FALSE,1 +26,0,0,128,306026,22,306028,15,306041,4,92,10000,0,93,6000,31,94,4200,64,95,1600,96,FALSE,2 +27,0,450,0,301000,10,,,,,96,10000,0,97,8000,13,98,6000,28,99,900,42,TRUE,2 +28,0,0,0,306004,9,306003,5,306040,5,100,10000,0,101,2800,17,102,1200,54,,,,FALSE,1 +29,0,0,164,306005,27,306004,18,306044,5,103,10000,0,104,9000,40,105,2800,81,106,1600,123,FALSE,2 +30,0,450,0,301000,10,,,,,107,10000,0,108,8000,17,109,6000,36,110,900,54,TRUE,2 +31,0,0,0,306015,27,306016,14,306035,14,111,10000,0,112,3400,548,113,1000,1647,,,,FALSE,1 +32,0,0,2000,306017,40,306016,27,306038,14,114,10000,0,115,7900,621,116,3400,1120,117,1500,1852,FALSE,2 +33,0,450,0,301000,10,,,,,118,10000,0,119,8000,548,120,6000,1097,121,900,1647,TRUE,2 +34,0,0,0,306055,47,306054,24,306045,24,122,10000,0,123,3000,1208,124,1100,2240,,,,FALSE,1 +35,0,0,2000,306055,46,306045,23,306047,12,125,10000,0,126,6000,1360,127,4200,1120,128,1600,3360,FALSE,2 +36,0,450,0,301000,10,,,,,129,10000,0,130,8000,1208,131,6000,2240,132,900,3625,TRUE,2 +382,0,0,0,306035,9,,,,,1398,10000,0,1399,2800,82,1400,1200,248,,,,FALSE,1 +383,0,0,741,306053,51,306006,34,306039,9,1401,10000,0,1402,8400,186,1403,3200,372,1404,1500,560,FALSE,2 +384,0,450,0,301000,10,,,,,1405,10000,0,1406,8000,82,1407,6000,165,1408,900,248,TRUE,2 +37,0,0,0,306029,19,306030,10,306035,10,133,10000,0,134,3000,91,135,1100,275,,,,FALSE,1 +38,0,0,821,306029,37,306035,19,306036,10,136,10000,0,137,6000,206,138,4200,413,139,1600,620,FALSE,2 +39,0,450,0,301000,10,,,,,140,10000,0,141,8000,91,142,6000,183,143,900,275,TRUE,2 +40,0,0,0,306006,21,306008,11,306035,11,144,10000,0,145,2800,290,146,1200,871,,,,FALSE,1 +41,0,0,1250,306006,41,306035,21,306039,11,147,10000,0,148,9000,326,149,2800,653,150,1600,980,FALSE,2 +42,0,450,0,301000,10,,,,,151,10000,0,152,8000,290,153,6000,580,154,900,871,TRUE,2 +43,0,0,0,306015,61,306016,31,306045,31,155,10000,0,156,3400,1570,157,1000,2240,,,,FALSE,1 +44,0,0,2000,306015,60,306045,30,306048,15,158,10000,0,159,7900,1400,160,3400,1120,161,1500,3360,FALSE,2 +45,0,450,0,301000,10,,,,,162,10000,0,163,8000,1570,164,6000,2240,165,900,4712,TRUE,2 +46,0,0,0,306055,60,306053,30,306045,10,166,10000,0,167,3000,1920,168,1100,2240,,,,FALSE,1 +47,0,0,2000,306054,80,306045,21,306047,15,169,10000,0,170,6000,1400,171,4200,1120,172,1600,3360,FALSE,2 +48,0,450,0,301000,10,,,,,173,10000,0,174,8000,1920,175,6000,2240,176,900,5762,TRUE,2 +388,0,0,0,306045,43,,,,,1420,10000,0,1421,2800,2800,1422,1200,2240,,,,FALSE,1 +389,0,0,4000,306029,169,306045,85,306046,43,1423,10000,0,1424,8400,2800,1425,3200,2240,1426,1500,6720,FALSE,2 +390,0,450,0,301000,10,,,,,1427,10000,0,1428,8000,2800,1429,6000,2240,1430,900,6720,TRUE,2 +61,0,0,0,306030,85,306029,43,306045,43,221,10000,0,222,3000,2800,223,1100,2240,,,,FALSE,1 +62,0,0,4000,306029,170,306045,85,306046,43,224,10000,0,225,6000,2800,226,4200,2240,227,1600,6720,FALSE,2 +63,0,450,0,301000,10,,,,,228,10000,0,229,8000,2800,230,6000,2240,231,900,6720,TRUE,2 +64,0,0,0,306030,86,306029,43,306045,43,232,10000,0,233,2800,2800,234,1200,2240,,,,FALSE,1 +65,0,0,4000,306029,171,306045,86,306046,43,235,10000,0,236,9000,2800,237,2800,2240,238,1600,6720,FALSE,2 +66,0,450,0,301000,10,,,,,239,10000,0,240,8000,2800,241,6000,2240,242,900,6720,TRUE,2 +67,0,0,0,306030,86,306029,43,306045,43,243,10000,0,244,3400,2800,245,1000,2240,,,,FALSE,1 +68,0,0,4000,306029,172,306045,86,306046,43,246,10000,0,247,7900,2800,248,3400,2240,249,1500,6720,FALSE,2 +69,0,450,0,301000,10,,,,,250,10000,0,251,8000,2800,252,6000,2240,253,900,6720,TRUE,2 +70,0,0,0,306030,87,306029,44,306045,44,254,10000,0,255,3000,2800,256,1100,2240,,,,FALSE,1 +71,0,0,4000,306029,173,306045,87,306046,44,257,10000,0,258,6000,2800,259,4200,2240,260,1600,6720,FALSE,2 +72,0,450,0,301000,10,,,,,261,10000,0,262,8000,2800,263,6000,2240,264,900,6720,TRUE,2 +394,0,0,0,306045,59,,,,,1442,10000,0,1443,2800,2800,1444,1200,2240,,,,FALSE,1 +395,0,0,4000,306029,233,306045,117,306046,59,1445,10000,0,1446,8400,2800,1447,3200,2240,1448,1500,6720,FALSE,2 +396,0,450,0,301000,10,,,,,1449,10000,0,1450,8000,2800,1451,6000,2240,1452,900,6720,TRUE,2 +85,0,0,0,306030,118,306029,59,306045,59,309,10000,0,310,3000,2800,311,1100,2240,,,,FALSE,1 +86,0,0,4000,306029,236,306045,118,306046,59,312,10000,0,313,6000,2800,314,4200,2240,315,1600,6720,FALSE,2 +87,0,450,0,301000,10,,,,,316,10000,0,317,8000,2800,318,6000,2240,319,900,6720,TRUE,2 +88,0,0,0,306030,119,306029,60,306045,60,320,10000,0,321,2800,2800,322,1200,2240,,,,FALSE,1 +89,0,0,4000,306029,238,306045,119,306046,60,323,10000,0,324,9000,2800,325,2800,2240,326,1600,6720,FALSE,2 +90,0,450,0,301000,10,,,,,327,10000,0,328,8000,2800,329,6000,2240,330,900,6720,TRUE,2 +91,0,0,0,306030,121,306029,61,306045,61,331,10000,0,332,3400,2800,333,1000,2240,,,,FALSE,1 +92,0,0,4000,306029,241,306045,121,306046,61,334,10000,0,335,7900,2800,336,3400,2240,337,1500,6720,FALSE,2 +93,0,450,0,301000,10,,,,,338,10000,0,339,8000,2800,340,6000,2240,341,900,6720,TRUE,2 +94,0,0,0,306030,122,306029,61,306045,61,342,10000,0,343,3000,2800,344,1100,2240,,,,FALSE,1 +95,0,0,4000,306029,243,306045,122,306046,61,345,10000,0,346,6000,2800,347,4200,2240,348,1600,6720,FALSE,2 +96,0,450,0,301000,10,,,,,349,10000,0,350,8000,2800,351,6000,2240,352,900,6720,TRUE,2 +397,0,0,0,306045,63,,,,,1453,10000,0,1454,2800,2800,1455,1200,2240,,,,FALSE,1 +398,0,0,4000,306029,249,306045,125,306046,63,1456,10000,0,1457,8400,2800,1458,3200,2240,1459,1500,6720,FALSE,2 +399,0,450,0,301000,10,,,,,1460,10000,0,1461,8000,2800,1462,6000,2240,1463,900,6720,TRUE,2 400,0,0,0,,,,,,,1464,10000,0,1465,4800,0,1466,700,0,,,,FALSE,1 -401,0,0,2,306024,2,306002,2,306001,1,1467,10000,0,1468,9400,0,1469,5300,1,1470,800,2,FALSE,2 +401,0,0,2,306024,2,306002,2,306001,1,1467,10000,0,1468,9400,0,1469,5300,0,1470,800,1,FALSE,2 402,0,300,0,301000,10,,,,,1471,10000,0,1472,8000,0,1473,6000,0,1474,900,0,TRUE,2 97,0,0,0,306023,1,306024,1,306025,1,353,10000,0,354,4200,0,355,800,0,,,,FALSE,1 -98,0,0,2,306024,3,306025,2,306023,2,356,10000,0,357,7400,0,358,6000,1,359,900,2,FALSE,2 -99,0,300,4000,306056,15,306060,20,306066,20,360,10000,0,361,8000,350,362,6000,700,363,900,1050,TRUE,2 -100,0,0,0,306002,2,306001,1,306000,1,364,10000,0,365,5600,1,366,600,4,,,,FALSE,1 -101,0,0,11,306002,6,306000,4,306001,4,367,10000,0,368,7900,3,369,6300,7,370,800,10,FALSE,2 -102,0,300,0,301000,10,,,,,371,10000,0,372,8000,1,373,6000,2,374,900,4,TRUE,2 -103,0,0,0,306011,7,306009,4,306010,4,375,10000,0,376,5600,14,377,600,44,,,,FALSE,1 -104,0,0,105,306011,19,306010,13,306009,13,378,10000,0,379,9000,32,380,5600,65,381,800,98,FALSE,2 -105,0,300,0,301000,10,,,,,382,10000,0,383,8000,14,384,6000,29,385,900,44,TRUE,2 -106,0,0,0,306051,14,306052,7,306040,7,386,10000,0,387,4800,74,388,700,225,,,,FALSE,1 -107,0,0,538,306052,40,306050,27,306042,7,389,10000,0,390,7400,169,391,6000,338,392,900,508,FALSE,2 -108,0,300,0,301000,10,,,,,393,10000,0,394,8000,74,395,6000,150,396,900,225,TRUE,2 -403,0,0,0,,,,,,,1475,10000,0,1476,4800,4,1477,700,14,,,,FALSE,1 -404,0,0,35,306023,7,306000,5,306001,4,1478,10000,0,1479,9400,10,1480,5300,21,1481,800,32,FALSE,2 -405,0,300,0,301000,10,,,,,1482,10000,0,1483,8000,4,1484,6000,9,1485,900,14,TRUE,2 -109,0,0,0,306025,4,306023,2,306024,2,397,10000,0,398,4200,4,399,800,16,,,,FALSE,1 -110,0,0,39,306025,10,306023,7,306024,7,400,10000,0,401,7400,11,402,6000,24,403,900,37,FALSE,2 -111,0,300,0,301000,10,,,,,404,10000,0,405,8000,4,406,6000,10,407,900,16,TRUE,2 -112,0,0,0,306000,5,306002,3,306001,3,408,10000,0,409,5600,8,410,600,25,,,,FALSE,1 -113,0,0,60,306002,13,306000,9,306001,9,411,10000,0,412,7900,18,413,6300,37,414,800,56,FALSE,2 -114,0,300,0,301000,10,,,,,415,10000,0,416,8000,8,417,6000,16,418,900,25,TRUE,2 -115,0,0,0,306013,16,306014,8,306040,8,419,10000,0,420,5600,93,421,600,281,,,,FALSE,1 -116,0,0,670,306014,32,306040,16,306043,8,422,10000,0,423,9000,210,424,5600,422,425,800,632,FALSE,2 -117,0,300,0,301000,10,,,,,426,10000,0,427,8000,93,428,6000,187,429,900,281,TRUE,2 -118,0,0,0,306053,26,306055,13,306035,13,430,10000,0,431,4800,585,432,700,1755,,,,FALSE,1 -119,0,0,4000,306054,51,306035,26,306037,13,433,10000,0,434,7400,1316,435,6000,2633,436,900,3950,FALSE,2 -120,0,300,0,301000,10,,,,,437,10000,0,438,8000,585,439,6000,1170,440,900,1755,TRUE,2 -406,0,0,0,306040,5,,,,,1486,10000,0,1487,4800,21,1488,700,65,,,,FALSE,1 -407,0,0,155,306005,26,306026,17,306043,5,1489,10000,0,1490,9400,48,1491,5300,97,1492,800,146,FALSE,2 -408,0,300,0,301000,10,,,,,1493,10000,0,1494,8000,21,1495,6000,43,1496,900,65,TRUE,2 -121,0,0,0,306027,10,306028,5,306040,5,441,10000,0,442,4200,23,443,800,72,,,,FALSE,1 -122,0,0,174,306026,19,306040,10,306041,5,444,10000,0,445,7400,54,446,6000,109,447,900,163,FALSE,2 -123,0,300,0,301000,10,,,,,448,10000,0,449,8000,23,450,6000,48,451,900,72,TRUE,2 -124,0,0,0,306003,11,306004,6,306040,6,452,10000,0,453,5600,30,454,600,90,,,,FALSE,1 -125,0,0,216,306004,22,306040,11,306044,6,455,10000,0,456,7900,67,457,6300,135,458,800,203,FALSE,2 -126,0,300,0,301000,10,,,,,459,10000,0,460,8000,30,461,6000,60,462,900,90,TRUE,2 -127,0,0,0,306016,40,306017,20,306045,20,463,10000,0,464,5600,1289,465,600,2800,,,,FALSE,1 -128,0,0,2000,306016,40,306045,20,306048,20,466,10000,0,467,9000,1450,468,5600,1400,469,800,4200,FALSE,2 -129,0,300,0,301000,10,,,,,470,10000,0,471,8000,1289,472,6000,2579,473,900,3868,TRUE,2 -130,0,0,0,306054,52,306055,26,306045,26,474,10000,0,475,4800,1679,476,700,2800,,,,FALSE,1 -131,0,0,2000,306053,77,306054,52,306047,13,477,10000,0,478,7400,1750,479,6000,1400,480,900,4200,FALSE,2 -132,0,300,0,301000,10,,,,,481,10000,0,482,8000,1679,483,6000,2800,484,900,5037,TRUE,2 -409,0,0,0,306035,10,,,,,1497,10000,0,1498,4800,127,1499,700,382,,,,FALSE,1 -410,0,0,912,306030,58,306053,39,306036,10,1500,10000,0,1501,9400,287,1502,5300,574,1503,800,861,FALSE,2 -411,0,300,0,301000,10,,,,,1504,10000,0,1505,8000,127,1506,6000,254,1507,900,382,TRUE,2 -133,0,0,0,306031,22,306030,11,306035,11,485,10000,0,486,4200,382,487,800,1146,,,,FALSE,1 -134,0,0,2731,306029,64,306030,43,306036,11,488,10000,0,489,7400,860,490,6000,1720,491,900,2580,FALSE,2 -135,0,300,0,301000,10,,,,,492,10000,0,493,8000,382,494,6000,764,495,900,1146,TRUE,2 -136,0,0,0,306008,23,306006,12,306035,12,496,10000,0,497,5600,432,498,600,1299,,,,FALSE,1 -137,0,0,3094,306007,45,306035,23,306039,12,499,10000,0,500,7900,974,501,6300,1948,502,800,2923,FALSE,2 -138,0,300,0,301000,10,,,,,503,10000,0,504,8000,432,505,6000,865,506,900,1299,TRUE,2 -139,0,0,0,306015,30,306016,15,306045,20,507,10000,0,508,5600,2173,509,600,2800,,,,FALSE,1 -140,0,0,2000,306017,80,306016,20,306048,20,510,10000,0,511,9000,1750,512,5600,1400,513,800,4200,FALSE,2 -141,0,300,0,301000,10,,,,,514,10000,0,515,8000,2173,516,6000,2800,517,900,6521,TRUE,2 -142,0,0,0,306055,760,306054,380,306045,57,518,10000,0,519,4800,2533,520,700,2800,,,,FALSE,1 -143,0,0,4000,306053,1368,306055,152,306047,38,521,10000,0,522,7400,3500,523,6000,2800,524,900,8400,FALSE,2 -144,0,300,0,301000,10,,,,,525,10000,0,526,8000,2533,527,6000,2800,528,900,7600,TRUE,2 -415,0,0,0,306035,41,,,,,1519,10000,0,1520,4800,3500,1521,700,2800,,,,FALSE,1 -416,0,0,4000,306029,163,306035,82,306036,41,1522,10000,0,1523,9400,3500,1524,5300,2800,1525,800,8400,FALSE,2 -417,0,300,0,301000,10,,,,,1526,10000,0,1527,8000,3500,1528,6000,2800,1529,900,8400,TRUE,2 -157,0,0,0,306030,82,306029,41,306035,41,573,10000,0,574,4200,3500,575,800,2800,,,,FALSE,1 -158,0,0,4000,306029,164,306035,82,306036,41,576,10000,0,577,7400,3500,578,6000,2800,579,900,8400,FALSE,2 -159,0,300,0,301000,10,,,,,580,10000,0,581,8000,3500,582,6000,2800,583,900,8400,TRUE,2 -160,0,0,0,306030,83,306029,42,306035,42,584,10000,0,585,5600,3500,586,600,2800,,,,FALSE,1 -161,0,0,4000,306029,165,306035,83,306036,42,587,10000,0,588,7900,3500,589,6300,2800,590,800,8400,FALSE,2 -162,0,300,0,301000,10,,,,,591,10000,0,592,8000,3500,593,6000,2800,594,900,8400,TRUE,2 -163,0,0,0,306030,83,306029,42,306035,42,595,10000,0,596,5600,3500,597,600,2800,,,,FALSE,1 -164,0,0,4000,306029,166,306035,83,306036,42,598,10000,0,599,9000,3500,600,5600,2800,601,800,8400,FALSE,2 -165,0,300,0,301000,10,,,,,602,10000,0,603,8000,3500,604,6000,2800,605,900,8400,TRUE,2 -166,0,0,0,306030,84,306029,42,306035,42,606,10000,0,607,4800,3500,608,700,2800,,,,FALSE,1 -167,0,0,4000,306029,167,306035,84,306036,42,609,10000,0,610,7400,3500,611,6000,2800,612,900,8400,FALSE,2 -168,0,300,0,301000,10,,,,,613,10000,0,614,8000,3500,615,6000,2800,616,900,8400,TRUE,2 -418,0,0,0,306035,44,,,,,1530,10000,0,1531,4800,3500,1532,700,2800,,,,FALSE,1 -419,0,0,4000,306029,175,306035,88,306036,44,1533,10000,0,1534,9400,3500,1535,5300,2800,1536,800,8400,FALSE,2 -420,0,300,0,301000,10,,,,,1537,10000,0,1538,8000,3500,1539,6000,2800,1540,900,8400,TRUE,2 -169,0,0,0,306030,88,306029,44,306035,44,617,10000,0,618,4200,3500,619,800,2800,,,,FALSE,1 -170,0,0,4000,306029,176,306035,88,306036,44,620,10000,0,621,7400,3500,622,6000,2800,623,900,8400,FALSE,2 -171,0,300,0,301000,10,,,,,624,10000,0,625,8000,3500,626,6000,2800,627,900,8400,TRUE,2 -172,0,0,0,306030,89,306029,45,306035,45,628,10000,0,629,5600,3500,630,600,2800,,,,FALSE,1 -173,0,0,4000,306029,178,306035,89,306036,45,631,10000,0,632,7900,3500,633,6300,2800,634,800,8400,FALSE,2 -174,0,300,0,301000,10,,,,,635,10000,0,636,8000,3500,637,6000,2800,638,900,8400,TRUE,2 -175,0,0,0,306030,90,306029,45,306035,45,639,10000,0,640,5600,3500,641,600,2800,,,,FALSE,1 -176,0,0,4000,306029,179,306035,90,306036,45,642,10000,0,643,9000,3500,644,5600,2800,645,800,8400,FALSE,2 -177,0,300,0,301000,10,,,,,646,10000,0,647,8000,3500,648,6000,2800,649,900,8400,TRUE,2 -178,0,0,0,306030,90,306029,45,306045,45,650,10000,0,651,4800,3500,652,700,2800,,,,FALSE,1 -179,0,0,4000,306029,180,306045,90,306046,45,653,10000,0,654,7400,3500,655,6000,2800,656,900,8400,FALSE,2 -180,0,300,0,301000,10,,,,,657,10000,0,658,8000,3500,659,6000,2800,660,900,8400,TRUE,2 -424,0,0,0,306035,62,,,,,1552,10000,0,1553,4800,3500,1554,700,2800,,,,FALSE,1 -425,0,0,4000,306029,246,306035,123,306036,62,1555,10000,0,1556,9400,3500,1557,5300,2800,1558,800,8400,FALSE,2 -426,0,300,0,301000,10,,,,,1559,10000,0,1560,8000,3500,1561,6000,2800,1562,900,8400,TRUE,2 +98,0,0,2,306024,3,306025,2,306023,2,356,10000,0,357,7400,0,358,6000,0,359,900,1,FALSE,2 +99,0,300,4000,306056,15,306060,20,306066,20,360,10000,0,361,8000,280,362,6000,560,363,900,840,TRUE,2 +100,0,0,0,306002,2,306001,1,306000,1,364,10000,0,365,5600,0,366,600,3,,,,FALSE,1 +101,0,0,11,306002,6,306000,4,306001,4,367,10000,0,368,7900,2,369,6300,5,370,800,8,FALSE,2 +102,0,300,0,301000,10,,,,,371,10000,0,372,8000,0,373,6000,1,374,900,3,TRUE,2 +103,0,0,0,306011,7,306009,4,306010,4,375,10000,0,376,5600,11,377,600,35,,,,FALSE,1 +104,0,0,105,306011,19,306010,13,306009,13,378,10000,0,379,9000,25,380,5600,52,381,800,78,FALSE,2 +105,0,300,0,301000,10,,,,,382,10000,0,383,8000,11,384,6000,23,385,900,35,TRUE,2 +106,0,0,0,306051,14,306052,7,306040,7,386,10000,0,387,4800,59,388,700,180,,,,FALSE,1 +107,0,0,538,306052,40,306050,27,306042,7,389,10000,0,390,7400,135,391,6000,270,392,900,406,FALSE,2 +108,0,300,0,301000,10,,,,,393,10000,0,394,8000,59,395,6000,120,396,900,180,TRUE,2 +403,0,0,0,,,,,,,1475,10000,0,1476,4800,3,1477,700,11,,,,FALSE,1 +404,0,0,35,306023,7,306000,5,306001,4,1478,10000,0,1479,9400,8,1480,5300,16,1481,800,25,FALSE,2 +405,0,300,0,301000,10,,,,,1482,10000,0,1483,8000,3,1484,6000,7,1485,900,11,TRUE,2 +109,0,0,0,306025,4,306023,2,306024,2,397,10000,0,398,4200,3,399,800,12,,,,FALSE,1 +110,0,0,39,306025,10,306023,7,306024,7,400,10000,0,401,7400,8,402,6000,19,403,900,29,FALSE,2 +111,0,300,0,301000,10,,,,,404,10000,0,405,8000,3,406,6000,8,407,900,12,TRUE,2 +112,0,0,0,306000,5,306002,3,306001,3,408,10000,0,409,5600,6,410,600,20,,,,FALSE,1 +113,0,0,60,306002,13,306000,9,306001,9,411,10000,0,412,7900,14,413,6300,29,414,800,44,FALSE,2 +114,0,300,0,301000,10,,,,,415,10000,0,416,8000,6,417,6000,12,418,900,20,TRUE,2 +115,0,0,0,306013,16,306014,8,306040,8,419,10000,0,420,5600,74,421,600,224,,,,FALSE,1 +116,0,0,670,306014,32,306040,16,306043,8,422,10000,0,423,9000,168,424,5600,337,425,800,505,FALSE,2 +117,0,300,0,301000,10,,,,,426,10000,0,427,8000,74,428,6000,149,429,900,224,TRUE,2 +118,0,0,0,306053,26,306055,13,306035,13,430,10000,0,431,4800,468,432,700,1404,,,,FALSE,1 +119,0,0,4000,306054,51,306035,26,306037,13,433,10000,0,434,7400,1052,435,6000,2106,436,900,3160,FALSE,2 +120,0,300,0,301000,10,,,,,437,10000,0,438,8000,468,439,6000,936,440,900,1404,TRUE,2 +406,0,0,0,306040,5,,,,,1486,10000,0,1487,4800,16,1488,700,52,,,,FALSE,1 +407,0,0,155,306005,26,306026,17,306043,5,1489,10000,0,1490,9400,38,1491,5300,77,1492,800,116,FALSE,2 +408,0,300,0,301000,10,,,,,1493,10000,0,1494,8000,16,1495,6000,34,1496,900,52,TRUE,2 +121,0,0,0,306027,10,306028,5,306040,5,441,10000,0,442,4200,18,443,800,57,,,,FALSE,1 +122,0,0,174,306026,19,306040,10,306041,5,444,10000,0,445,7400,43,446,6000,87,447,900,130,FALSE,2 +123,0,300,0,301000,10,,,,,448,10000,0,449,8000,18,450,6000,38,451,900,57,TRUE,2 +124,0,0,0,306003,11,306004,6,306040,6,452,10000,0,453,5600,24,454,600,72,,,,FALSE,1 +125,0,0,216,306004,22,306040,11,306044,6,455,10000,0,456,7900,53,457,6300,108,458,800,162,FALSE,2 +126,0,300,0,301000,10,,,,,459,10000,0,460,8000,24,461,6000,48,462,900,72,TRUE,2 +127,0,0,0,306016,40,306017,20,306045,20,463,10000,0,464,5600,1031,465,600,2240,,,,FALSE,1 +128,0,0,2000,306016,40,306045,20,306048,20,466,10000,0,467,9000,1160,468,5600,1120,469,800,3360,FALSE,2 +129,0,300,0,301000,10,,,,,470,10000,0,471,8000,1031,472,6000,2063,473,900,3094,TRUE,2 +130,0,0,0,306054,52,306055,26,306045,26,474,10000,0,475,4800,1343,476,700,2240,,,,FALSE,1 +131,0,0,2000,306053,77,306054,52,306047,13,477,10000,0,478,7400,1400,479,6000,1120,480,900,3360,FALSE,2 +132,0,300,0,301000,10,,,,,481,10000,0,482,8000,1343,483,6000,2240,484,900,4029,TRUE,2 +409,0,0,0,306035,10,,,,,1497,10000,0,1498,4800,101,1499,700,305,,,,FALSE,1 +410,0,0,912,306030,58,306053,39,306036,10,1500,10000,0,1501,9400,229,1502,5300,459,1503,800,688,FALSE,2 +411,0,300,0,301000,10,,,,,1504,10000,0,1505,8000,101,1506,6000,203,1507,900,305,TRUE,2 +133,0,0,0,306031,22,306030,11,306035,11,485,10000,0,486,4200,305,487,800,916,,,,FALSE,1 +134,0,0,2731,306029,64,306030,43,306036,11,488,10000,0,489,7400,688,490,6000,1376,491,900,2064,FALSE,2 +135,0,300,0,301000,10,,,,,492,10000,0,493,8000,305,494,6000,611,495,900,916,TRUE,2 +136,0,0,0,306008,23,306006,12,306035,12,496,10000,0,497,5600,345,498,600,1039,,,,FALSE,1 +137,0,0,3094,306007,45,306035,23,306039,12,499,10000,0,500,7900,779,501,6300,1558,502,800,2338,FALSE,2 +138,0,300,0,301000,10,,,,,503,10000,0,504,8000,345,505,6000,692,506,900,1039,TRUE,2 +139,0,0,0,306015,30,306016,15,306045,20,507,10000,0,508,5600,1738,509,600,2240,,,,FALSE,1 +140,0,0,2000,306017,80,306016,20,306048,20,510,10000,0,511,9000,1400,512,5600,1120,513,800,3360,FALSE,2 +141,0,300,0,301000,10,,,,,514,10000,0,515,8000,1738,516,6000,2240,517,900,5216,TRUE,2 +142,0,0,0,306055,760,306054,380,306045,57,518,10000,0,519,4800,2026,520,700,2240,,,,FALSE,1 +143,0,0,4000,306053,1368,306055,152,306047,38,521,10000,0,522,7400,2800,523,6000,2240,524,900,6720,FALSE,2 +144,0,300,0,301000,10,,,,,525,10000,0,526,8000,2026,527,6000,2240,528,900,6080,TRUE,2 +415,0,0,0,306035,41,,,,,1519,10000,0,1520,4800,2800,1521,700,2240,,,,FALSE,1 +416,0,0,4000,306029,163,306035,82,306036,41,1522,10000,0,1523,9400,2800,1524,5300,2240,1525,800,6720,FALSE,2 +417,0,300,0,301000,10,,,,,1526,10000,0,1527,8000,2800,1528,6000,2240,1529,900,6720,TRUE,2 +157,0,0,0,306030,82,306029,41,306035,41,573,10000,0,574,4200,2800,575,800,2240,,,,FALSE,1 +158,0,0,4000,306029,164,306035,82,306036,41,576,10000,0,577,7400,2800,578,6000,2240,579,900,6720,FALSE,2 +159,0,300,0,301000,10,,,,,580,10000,0,581,8000,2800,582,6000,2240,583,900,6720,TRUE,2 +160,0,0,0,306030,83,306029,42,306035,42,584,10000,0,585,5600,2800,586,600,2240,,,,FALSE,1 +161,0,0,4000,306029,165,306035,83,306036,42,587,10000,0,588,7900,2800,589,6300,2240,590,800,6720,FALSE,2 +162,0,300,0,301000,10,,,,,591,10000,0,592,8000,2800,593,6000,2240,594,900,6720,TRUE,2 +163,0,0,0,306030,83,306029,42,306035,42,595,10000,0,596,5600,2800,597,600,2240,,,,FALSE,1 +164,0,0,4000,306029,166,306035,83,306036,42,598,10000,0,599,9000,2800,600,5600,2240,601,800,6720,FALSE,2 +165,0,300,0,301000,10,,,,,602,10000,0,603,8000,2800,604,6000,2240,605,900,6720,TRUE,2 +166,0,0,0,306030,84,306029,42,306035,42,606,10000,0,607,4800,2800,608,700,2240,,,,FALSE,1 +167,0,0,4000,306029,167,306035,84,306036,42,609,10000,0,610,7400,2800,611,6000,2240,612,900,6720,FALSE,2 +168,0,300,0,301000,10,,,,,613,10000,0,614,8000,2800,615,6000,2240,616,900,6720,TRUE,2 +418,0,0,0,306035,44,,,,,1530,10000,0,1531,4800,2800,1532,700,2240,,,,FALSE,1 +419,0,0,4000,306029,175,306035,88,306036,44,1533,10000,0,1534,9400,2800,1535,5300,2240,1536,800,6720,FALSE,2 +420,0,300,0,301000,10,,,,,1537,10000,0,1538,8000,2800,1539,6000,2240,1540,900,6720,TRUE,2 +169,0,0,0,306030,88,306029,44,306035,44,617,10000,0,618,4200,2800,619,800,2240,,,,FALSE,1 +170,0,0,4000,306029,176,306035,88,306036,44,620,10000,0,621,7400,2800,622,6000,2240,623,900,6720,FALSE,2 +171,0,300,0,301000,10,,,,,624,10000,0,625,8000,2800,626,6000,2240,627,900,6720,TRUE,2 +172,0,0,0,306030,89,306029,45,306035,45,628,10000,0,629,5600,2800,630,600,2240,,,,FALSE,1 +173,0,0,4000,306029,178,306035,89,306036,45,631,10000,0,632,7900,2800,633,6300,2240,634,800,6720,FALSE,2 +174,0,300,0,301000,10,,,,,635,10000,0,636,8000,2800,637,6000,2240,638,900,6720,TRUE,2 +175,0,0,0,306030,90,306029,45,306035,45,639,10000,0,640,5600,2800,641,600,2240,,,,FALSE,1 +176,0,0,4000,306029,179,306035,90,306036,45,642,10000,0,643,9000,2800,644,5600,2240,645,800,6720,FALSE,2 +177,0,300,0,301000,10,,,,,646,10000,0,647,8000,2800,648,6000,2240,649,900,6720,TRUE,2 +178,0,0,0,306030,90,306029,45,306045,45,650,10000,0,651,4800,2800,652,700,2240,,,,FALSE,1 +179,0,0,4000,306029,180,306045,90,306046,45,653,10000,0,654,7400,2800,655,6000,2240,656,900,6720,FALSE,2 +180,0,300,0,301000,10,,,,,657,10000,0,658,8000,2800,659,6000,2240,660,900,6720,TRUE,2 +424,0,0,0,306035,62,,,,,1552,10000,0,1553,4800,2800,1554,700,2240,,,,FALSE,1 +425,0,0,4000,306029,246,306035,123,306036,62,1555,10000,0,1556,9400,2800,1557,5300,2240,1558,800,6720,FALSE,2 +426,0,300,0,301000,10,,,,,1559,10000,0,1560,8000,2800,1561,6000,2240,1562,900,6720,TRUE,2 427,0,0,0,,,,,,,1563,10000,0,1564,4800,0,1565,700,0,,,,FALSE,1 -428,0,0,2,306023,2,306001,2,306000,1,1566,10000,0,1567,8500,0,1568,5900,1,1569,800,2,FALSE,2 +428,0,0,2,306023,2,306001,2,306000,1,1566,10000,0,1567,8500,0,1568,5900,0,1569,800,1,FALSE,2 429,0,300,0,301000,10,,,,,1570,10000,0,1571,8000,0,1572,6000,0,1573,900,0,TRUE,2 193,0,0,0,306025,1,306023,1,306024,1,705,10000,0,706,5600,0,707,600,0,,,,FALSE,1 -194,0,0,2,306025,3,306023,2,306024,2,708,10000,0,709,9500,0,710,6000,1,711,700,2,FALSE,2 -195,0,300,995,306058,20,306064,16,306065,8,712,10000,0,713,8000,70,714,6000,140,715,900,210,TRUE,2 -196,0,0,0,306000,3,306002,2,306001,2,716,10000,0,717,4800,2,718,700,6,,,,FALSE,1 -197,0,0,15,306001,7,306002,5,306000,5,719,10000,0,720,8400,4,721,6000,9,722,800,14,FALSE,2 -198,0,300,0,301000,10,,,,,723,10000,0,724,8000,2,725,6000,4,726,900,6,TRUE,2 -199,0,0,0,306009,8,306011,4,306010,4,727,10000,0,728,5600,18,729,600,57,,,,FALSE,1 -200,0,0,137,306010,23,306009,16,306011,16,730,10000,0,731,7600,42,732,6600,86,733,800,128,FALSE,2 -201,0,300,0,301000,10,,,,,734,10000,0,735,8000,18,736,6000,37,737,900,57,TRUE,2 -202,0,0,0,306052,18,306051,9,306040,9,738,10000,0,739,5600,109,740,600,327,,,,FALSE,1 -203,0,0,780,306051,53,306050,35,306042,9,741,10000,0,742,8800,245,743,5700,491,744,800,737,FALSE,2 -204,0,300,0,301000,10,,,,,745,10000,0,746,8000,109,747,6000,218,748,900,327,TRUE,2 -430,0,0,0,,,,,,,1574,10000,0,1575,4800,6,1576,700,20,,,,FALSE,1 -431,0,0,49,306024,8,306001,6,306023,4,1577,10000,0,1578,8500,15,1579,5900,30,1580,800,46,FALSE,2 -432,0,300,0,301000,10,,,,,1581,10000,0,1582,8000,6,1583,6000,13,1584,900,20,TRUE,2 -205,0,0,0,306025,4,306023,2,306024,2,749,10000,0,750,5600,7,751,600,22,,,,FALSE,1 -206,0,0,54,306025,12,306024,8,306023,8,752,10000,0,753,9500,16,754,6000,33,755,700,51,FALSE,2 -207,0,300,0,301000,10,,,,,756,10000,0,757,8000,7,758,6000,14,759,900,22,TRUE,2 -208,0,0,0,306001,6,306002,3,306000,3,760,10000,0,761,4800,12,762,700,37,,,,FALSE,1 -209,0,0,90,306002,17,306001,12,306000,12,763,10000,0,764,8400,28,765,6000,56,766,800,84,FALSE,2 -210,0,300,0,301000,10,,,,,767,10000,0,768,8000,12,769,6000,25,770,900,37,TRUE,2 -211,0,0,0,306014,22,306013,11,306040,11,771,10000,0,772,5600,405,773,600,1216,,,,FALSE,1 -212,0,0,2898,306013,66,306014,44,306043,11,774,10000,0,775,7600,912,776,6600,1825,777,800,2738,FALSE,2 -213,0,300,0,301000,10,,,,,778,10000,0,779,8000,405,780,6000,811,781,900,1216,TRUE,2 -214,0,0,0,306054,45,306055,23,306045,23,782,10000,0,783,5600,1432,784,600,2800,,,,FALSE,1 -215,0,0,2000,306053,67,306054,44,306047,23,785,10000,0,786,8800,1607,787,5700,1400,788,800,4200,FALSE,2 -216,0,300,0,301000,10,,,,,789,10000,0,790,8000,1432,791,6000,2800,792,900,4298,TRUE,2 -433,0,0,0,306040,5,,,,,1585,10000,0,1586,4800,26,1587,700,81,,,,FALSE,1 -434,0,0,194,306004,20,306040,10,306043,5,1588,10000,0,1589,8500,60,1590,5900,121,1591,800,183,FALSE,2 -435,0,300,0,301000,10,,,,,1592,10000,0,1593,8000,26,1594,6000,53,1595,900,81,TRUE,2 -217,0,0,0,306028,11,306026,6,306040,6,793,10000,0,794,5600,28,795,600,86,,,,FALSE,1 -218,0,0,205,306028,21,306040,11,306041,6,796,10000,0,797,9500,64,798,6000,128,799,700,193,FALSE,2 -219,0,300,0,301000,10,,,,,800,10000,0,801,8000,28,802,6000,57,803,900,86,TRUE,2 -220,0,0,0,306005,14,306003,7,306040,7,804,10000,0,805,4800,77,806,700,234,,,,FALSE,1 -221,0,0,559,306005,42,306004,28,306044,7,807,10000,0,808,8400,175,809,6000,352,810,800,528,FALSE,2 -222,0,300,0,301000,10,,,,,811,10000,0,812,8000,77,813,6000,156,814,900,234,TRUE,2 -223,0,0,0,306015,58,306017,29,306045,29,815,10000,0,816,5600,1864,817,600,2800,,,,FALSE,1 -224,0,0,4000,306015,172,306016,115,306048,29,818,10000,0,819,7600,3500,820,6600,2800,821,800,8400,FALSE,2 -225,0,300,0,301000,10,,,,,822,10000,0,823,8000,1864,824,6000,2800,825,900,5593,TRUE,2 -436,0,0,0,306035,13,,,,,1596,10000,0,1597,4800,633,1598,700,1901,,,,FALSE,1 -437,0,0,4000,306030,78,306007,52,306037,13,1599,10000,0,1600,8500,1425,1601,5900,2800,1602,800,4277,FALSE,2 -438,0,300,0,301000,10,,,,,1603,10000,0,1604,8000,633,1605,6000,1267,1606,900,1901,TRUE,2 -229,0,0,0,306029,28,306031,14,306035,14,837,10000,0,838,5600,743,839,600,2230,,,,FALSE,1 -230,0,0,4000,306029,82,306031,55,306036,14,840,10000,0,841,9500,1672,842,6000,2800,843,700,5017,FALSE,2 -231,0,300,0,301000,10,,,,,844,10000,0,845,8000,743,846,6000,1486,847,900,2230,TRUE,2 -232,0,0,0,306007,380,306008,190,306045,38,848,10000,0,849,4800,2520,850,700,2800,,,,FALSE,1 -233,0,0,4000,306007,1140,306006,760,306049,38,851,10000,0,852,8400,3500,853,6000,2800,854,800,8400,FALSE,2 -234,0,300,0,301000,10,,,,,855,10000,0,856,8000,2520,857,6000,2800,858,900,7562,TRUE,2 -235,0,0,0,306016,60,306015,36,306045,10,859,10000,0,860,5600,2520,861,1200,2800,,,,FALSE,1 -236,0,0,2000,306015,90,306017,70,306048,20,862,10000,0,863,7600,1750,864,6600,1400,865,1400,4200,FALSE,2 -237,0,300,0,301000,10,,,,,866,10000,0,867,8000,2520,868,6000,2800,869,900,7562,TRUE,2 -238,0,0,0,306053,380,306055,190,306045,38,870,10000,0,871,5600,2520,872,600,2800,,,,FALSE,1 -239,0,0,4000,306053,1140,306054,760,306047,38,873,10000,0,874,8800,3500,875,5700,2800,876,800,8400,FALSE,2 -240,0,300,0,301000,10,,,,,877,10000,0,878,8000,2520,879,6000,2800,880,900,7562,TRUE,2 +194,0,0,2,306025,3,306023,2,306024,2,708,10000,0,709,9500,0,710,6000,0,711,700,1,FALSE,2 +195,0,300,995,306058,20,306064,16,306065,8,712,10000,0,713,8000,56,714,6000,112,715,900,168,TRUE,2 +196,0,0,0,306000,3,306002,2,306001,2,716,10000,0,717,4800,1,718,700,4,,,,FALSE,1 +197,0,0,15,306001,7,306002,5,306000,5,719,10000,0,720,8400,3,721,6000,7,722,800,11,FALSE,2 +198,0,300,0,301000,10,,,,,723,10000,0,724,8000,1,725,6000,3,726,900,4,TRUE,2 +199,0,0,0,306009,8,306011,4,306010,4,727,10000,0,728,5600,14,729,600,45,,,,FALSE,1 +200,0,0,137,306010,23,306009,16,306011,16,730,10000,0,731,7600,33,732,6600,68,733,800,102,FALSE,2 +201,0,300,0,301000,10,,,,,734,10000,0,735,8000,14,736,6000,29,737,900,45,TRUE,2 +202,0,0,0,306052,18,306051,9,306040,9,738,10000,0,739,5600,87,740,600,261,,,,FALSE,1 +203,0,0,780,306051,53,306050,35,306042,9,741,10000,0,742,8800,196,743,5700,392,744,800,589,FALSE,2 +204,0,300,0,301000,10,,,,,745,10000,0,746,8000,87,747,6000,174,748,900,261,TRUE,2 +430,0,0,0,,,,,,,1574,10000,0,1575,4800,4,1576,700,16,,,,FALSE,1 +431,0,0,49,306024,8,306001,6,306023,4,1577,10000,0,1578,8500,12,1579,5900,24,1580,800,36,FALSE,2 +432,0,300,0,301000,10,,,,,1581,10000,0,1582,8000,4,1583,6000,10,1584,900,16,TRUE,2 +205,0,0,0,306025,4,306023,2,306024,2,749,10000,0,750,5600,5,751,600,17,,,,FALSE,1 +206,0,0,54,306025,12,306024,8,306023,8,752,10000,0,753,9500,12,754,6000,26,755,700,40,FALSE,2 +207,0,300,0,301000,10,,,,,756,10000,0,757,8000,5,758,6000,11,759,900,17,TRUE,2 +208,0,0,0,306001,6,306002,3,306000,3,760,10000,0,761,4800,9,762,700,29,,,,FALSE,1 +209,0,0,90,306002,17,306001,12,306000,12,763,10000,0,764,8400,22,765,6000,44,766,800,67,FALSE,2 +210,0,300,0,301000,10,,,,,767,10000,0,768,8000,9,769,6000,20,770,900,29,TRUE,2 +211,0,0,0,306014,22,306013,11,306040,11,771,10000,0,772,5600,324,773,600,972,,,,FALSE,1 +212,0,0,2898,306013,66,306014,44,306043,11,774,10000,0,775,7600,729,776,6600,1460,777,800,2190,FALSE,2 +213,0,300,0,301000,10,,,,,778,10000,0,779,8000,324,780,6000,648,781,900,972,TRUE,2 +214,0,0,0,306054,45,306055,23,306045,23,782,10000,0,783,5600,1145,784,600,2240,,,,FALSE,1 +215,0,0,2000,306053,67,306054,44,306047,23,785,10000,0,786,8800,1285,787,5700,1120,788,800,3360,FALSE,2 +216,0,300,0,301000,10,,,,,789,10000,0,790,8000,1145,791,6000,2240,792,900,3438,TRUE,2 +433,0,0,0,306040,5,,,,,1585,10000,0,1586,4800,20,1587,700,64,,,,FALSE,1 +434,0,0,194,306004,20,306040,10,306043,5,1588,10000,0,1589,8500,48,1590,5900,96,1591,800,146,FALSE,2 +435,0,300,0,301000,10,,,,,1592,10000,0,1593,8000,20,1594,6000,42,1595,900,64,TRUE,2 +217,0,0,0,306028,11,306026,6,306040,6,793,10000,0,794,5600,22,795,600,68,,,,FALSE,1 +218,0,0,205,306028,21,306040,11,306041,6,796,10000,0,797,9500,51,798,6000,102,799,700,154,FALSE,2 +219,0,300,0,301000,10,,,,,800,10000,0,801,8000,22,802,6000,45,803,900,68,TRUE,2 +220,0,0,0,306005,14,306003,7,306040,7,804,10000,0,805,4800,61,806,700,187,,,,FALSE,1 +221,0,0,559,306005,42,306004,28,306044,7,807,10000,0,808,8400,140,809,6000,281,810,800,422,FALSE,2 +222,0,300,0,301000,10,,,,,811,10000,0,812,8000,61,813,6000,124,814,900,187,TRUE,2 +223,0,0,0,306015,58,306017,29,306045,29,815,10000,0,816,5600,1491,817,600,2240,,,,FALSE,1 +224,0,0,4000,306015,172,306016,115,306048,29,818,10000,0,819,7600,2800,820,6600,2240,821,800,6720,FALSE,2 +225,0,300,0,301000,10,,,,,822,10000,0,823,8000,1491,824,6000,2240,825,900,4474,TRUE,2 +436,0,0,0,306035,13,,,,,1596,10000,0,1597,4800,506,1598,700,1520,,,,FALSE,1 +437,0,0,4000,306030,78,306007,52,306037,13,1599,10000,0,1600,8500,1140,1601,5900,2240,1602,800,3421,FALSE,2 +438,0,300,0,301000,10,,,,,1603,10000,0,1604,8000,506,1605,6000,1013,1606,900,1520,TRUE,2 +229,0,0,0,306029,28,306031,14,306035,14,837,10000,0,838,5600,594,839,600,1784,,,,FALSE,1 +230,0,0,4000,306029,82,306031,55,306036,14,840,10000,0,841,9500,1337,842,6000,2240,843,700,4013,FALSE,2 +231,0,300,0,301000,10,,,,,844,10000,0,845,8000,594,846,6000,1188,847,900,1784,TRUE,2 +232,0,0,0,306007,380,306008,190,306045,38,848,10000,0,849,4800,2016,850,700,2240,,,,FALSE,1 +233,0,0,4000,306007,1140,306006,760,306049,38,851,10000,0,852,8400,2800,853,6000,2240,854,800,6720,FALSE,2 +234,0,300,0,301000,10,,,,,855,10000,0,856,8000,2016,857,6000,2240,858,900,6049,TRUE,2 +235,0,0,0,306016,60,306015,36,306045,10,859,10000,0,860,5600,2016,861,1200,2240,,,,FALSE,1 +236,0,0,2000,306015,90,306017,70,306048,20,862,10000,0,863,7600,1400,864,6600,1120,865,1400,3360,FALSE,2 +237,0,300,0,301000,10,,,,,866,10000,0,867,8000,2016,868,6000,2240,869,900,6049,TRUE,2 +238,0,0,0,306053,380,306055,190,306045,38,870,10000,0,871,5600,2016,872,600,2240,,,,FALSE,1 +239,0,0,4000,306053,1140,306054,760,306047,38,873,10000,0,874,8800,2800,875,5700,2240,876,800,6720,FALSE,2 +240,0,300,0,301000,10,,,,,877,10000,0,878,8000,2016,879,6000,2240,880,900,6049,TRUE,2 442,0,0,0,,,,,,,1618,10000,0,1619,3000,0,1620,1100,0,,,,FALSE,1 -443,0,0,2,306024,2,306002,2,306000,1,1621,10000,0,1622,6300,0,1623,5300,1,1624,1200,2,FALSE,2 +443,0,0,2,306024,2,306002,2,306000,1,1621,10000,0,1622,6300,0,1623,5300,0,1624,1200,1,FALSE,2 444,0,300,0,301000,10,,,,,1625,10000,0,1626,8000,0,1627,6000,0,1628,900,0,TRUE,2 -253,0,0,0,306025,1,306023,1,306024,1,925,10000,0,926,3700,0,927,900,2,,,,FALSE,1 -254,0,0,5,306025,3,306024,2,306023,2,928,10000,0,929,7500,1,930,4800,2,931,1100,4,FALSE,2 -255,0,300,2995,306062,8,306059,22,306063,10,932,10000,0,933,8000,210,934,6000,420,935,900,630,TRUE,2 -256,0,0,0,306001,3,306000,2,306002,2,936,10000,0,937,3700,3,938,900,10,,,,FALSE,1 -257,0,0,26,306001,8,306000,6,306002,6,939,10000,0,940,8000,7,941,5000,16,942,1000,24,FALSE,2 -258,0,300,0,301000,10,,,,,943,10000,0,944,8000,3,945,6000,7,946,900,10,TRUE,2 -259,0,0,0,306010,10,306009,5,306011,5,947,10000,0,948,3400,25,949,1000,77,,,,FALSE,1 -260,0,0,184,306010,29,306011,20,306009,20,950,10000,0,951,9100,57,952,4000,115,953,1100,173,FALSE,2 -261,0,300,0,301000,10,,,,,954,10000,0,955,8000,25,956,6000,51,957,900,77,TRUE,2 -262,0,0,0,306050,20,306051,10,306040,10,958,10000,0,959,3400,347,960,1000,1045,,,,FALSE,1 -263,0,0,2488,306051,40,306040,20,306042,10,961,10000,0,962,7300,783,963,4600,1567,964,1200,2351,FALSE,2 -264,0,300,0,301000,10,,,,,965,10000,0,966,8000,347,967,6000,696,968,900,1045,TRUE,2 -445,0,0,0,,,,,,,1629,10000,0,1630,3000,9,1631,1100,27,,,,FALSE,1 -446,0,0,65,306024,9,306023,7,306000,5,1632,10000,0,1633,6300,20,1634,5300,40,1635,1200,61,FALSE,2 -447,0,300,0,301000,10,,,,,1636,10000,0,1637,8000,9,1638,6000,18,1639,900,27,TRUE,2 -265,0,0,0,306024,5,306025,3,306023,3,969,10000,0,970,3700,9,971,900,29,,,,FALSE,1 -266,0,0,71,306025,15,306023,10,306024,10,972,10000,0,973,7500,22,974,4800,44,975,1100,67,FALSE,2 -267,0,300,0,301000,10,,,,,976,10000,0,977,8000,9,978,6000,19,979,900,29,TRUE,2 -268,0,0,0,306000,7,306001,4,306002,4,980,10000,0,981,3700,15,982,900,46,,,,FALSE,1 -269,0,0,112,306001,20,306000,14,306002,14,983,10000,0,984,8000,35,985,5000,70,986,1000,105,FALSE,2 -270,0,300,0,301000,10,,,,,987,10000,0,988,8000,15,989,6000,31,990,900,46,TRUE,2 -271,0,0,0,306012,25,306013,13,306040,13,991,10000,0,992,3400,540,993,1000,1622,,,,FALSE,1 -272,0,0,3864,306014,49,306040,25,306043,13,994,10000,0,995,9100,1216,996,4000,2433,997,1100,3651,FALSE,2 -273,0,300,0,301000,10,,,,,998,10000,0,999,8000,540,1000,6000,1081,1001,900,1622,TRUE,2 -274,0,0,0,306055,43,306053,22,306045,22,1002,10000,0,1003,3400,1358,1004,1000,2800,,,,FALSE,1 -275,0,0,2000,306053,63,306054,43,306047,22,1005,10000,0,1006,7300,1529,1007,4600,1400,1008,1200,4200,FALSE,2 -276,0,300,0,301000,10,,,,,1009,10000,0,1010,8000,1358,1011,6000,2718,1012,900,4077,TRUE,2 -448,0,0,0,306040,7,,,,,1640,10000,0,1641,3000,70,1642,1100,210,,,,FALSE,1 -449,0,0,502,306012,37,306027,25,306041,7,1643,10000,0,1644,6300,158,1645,5300,316,1646,1200,474,FALSE,2 -450,0,300,0,301000,10,,,,,1647,10000,0,1648,8000,70,1649,6000,140,1650,900,210,TRUE,2 -277,0,0,0,306027,13,306028,7,306040,7,1013,10000,0,1014,3700,72,1015,900,217,,,,FALSE,1 -278,0,0,519,306026,39,306028,26,306041,7,1016,10000,0,1017,7500,163,1018,4800,326,1019,1100,490,FALSE,2 -279,0,300,0,301000,10,,,,,1020,10000,0,1021,8000,72,1022,6000,144,1023,900,217,TRUE,2 -280,0,0,0,306005,17,306003,9,306040,9,1024,10000,0,1025,3700,98,1026,900,295,,,,FALSE,1 -281,0,0,704,306003,33,306040,17,306044,9,1027,10000,0,1028,8000,221,1029,5000,443,1030,1000,665,FALSE,2 -282,0,300,0,301000,10,,,,,1031,10000,0,1032,8000,98,1033,6000,196,1034,900,295,TRUE,2 -283,0,0,0,306015,55,306017,28,306045,28,1035,10000,0,1036,3400,1769,1037,1000,2800,,,,FALSE,1 -284,0,0,2000,306016,54,306045,28,306048,28,1038,10000,0,1039,9100,1750,1040,4000,1400,1041,1100,4200,FALSE,2 -285,0,300,0,301000,10,,,,,1042,10000,0,1043,8000,1769,1044,6000,2800,1045,900,5309,TRUE,2 -286,0,0,0,306055,70,306053,28,306045,10,1046,10000,0,1047,3400,2284,1048,1000,2800,,,,FALSE,1 -287,0,0,2000,306054,100,306045,30,306047,20,1049,10000,0,1050,7300,1750,1051,4600,1400,1052,1200,4200,FALSE,2 -288,0,300,0,301000,10,,,,,1053,10000,0,1054,8000,2284,1055,6000,2800,1056,900,6855,TRUE,2 -451,0,0,0,306045,30,,,,,1651,10000,0,1652,3000,636,1653,1700,1908,,,,FALSE,1 -452,0,0,2000,306007,80,306016,20,306048,20,1654,10000,0,1655,6300,1432,1656,5300,1400,1657,1800,4200,FALSE,2 -453,0,300,0,301000,10,,,,,1658,10000,0,1659,8000,636,1660,6000,1272,1661,900,1908,TRUE,2 -289,0,0,0,306029,770,306031,390,306045,58,1057,10000,0,1058,3700,2545,1059,900,2800,,,,FALSE,1 -290,0,0,4000,306030,918,306045,77,306046,39,1060,10000,0,1061,7500,3500,1062,4800,2800,1063,1100,8400,FALSE,2 -291,0,300,0,301000,10,,,,,1064,10000,0,1065,8000,2545,1066,6000,2800,1067,900,7638,TRUE,2 -292,0,0,0,306006,770,306007,390,306045,58,1068,10000,0,1069,3700,2545,1070,900,2800,,,,FALSE,1 -293,0,0,4000,306008,918,306045,77,306049,39,1071,10000,0,1072,8000,3500,1073,5000,2800,1074,1000,8400,FALSE,2 -294,0,300,0,301000,10,,,,,1075,10000,0,1076,8000,2545,1077,6000,2800,1078,900,7638,TRUE,2 -295,0,0,0,306016,770,306015,390,306045,58,1079,10000,0,1080,3400,2545,1081,1000,2800,,,,FALSE,1 -296,0,0,4000,306016,918,306045,77,306048,39,1082,10000,0,1083,9100,3500,1084,4000,2800,1085,1100,8400,FALSE,2 -297,0,300,0,301000,10,,,,,1086,10000,0,1087,8000,2545,1088,6000,2800,1089,900,7638,TRUE,2 -298,0,0,0,306053,770,306054,390,306045,58,1090,10000,0,1091,3400,2545,1092,1000,2800,,,,FALSE,1 -299,0,0,4000,306054,918,306045,77,306047,39,1093,10000,0,1094,7300,3500,1095,4600,2800,1096,1200,8400,FALSE,2 -300,0,300,0,301000,10,,,,,1097,10000,0,1098,8000,2545,1099,6000,2800,1100,900,7638,TRUE,2 +253,0,0,0,306025,1,306023,1,306024,1,925,10000,0,926,3700,0,927,900,1,,,,FALSE,1 +254,0,0,5,306025,3,306024,2,306023,2,928,10000,0,929,7500,0,930,4800,1,931,1100,3,FALSE,2 +255,0,300,2995,306062,8,306059,22,306063,10,932,10000,0,933,8000,168,934,6000,336,935,900,504,TRUE,2 +256,0,0,0,306001,3,306000,2,306002,2,936,10000,0,937,3700,2,938,900,8,,,,FALSE,1 +257,0,0,26,306001,8,306000,6,306002,6,939,10000,0,940,8000,5,941,5000,12,942,1000,19,FALSE,2 +258,0,300,0,301000,10,,,,,943,10000,0,944,8000,2,945,6000,5,946,900,8,TRUE,2 +259,0,0,0,306010,10,306009,5,306011,5,947,10000,0,948,3400,20,949,1000,61,,,,FALSE,1 +260,0,0,184,306010,29,306011,20,306009,20,950,10000,0,951,9100,45,952,4000,92,953,1100,138,FALSE,2 +261,0,300,0,301000,10,,,,,954,10000,0,955,8000,20,956,6000,40,957,900,61,TRUE,2 +262,0,0,0,306050,20,306051,10,306040,10,958,10000,0,959,3400,277,960,1000,836,,,,FALSE,1 +263,0,0,2488,306051,40,306040,20,306042,10,961,10000,0,962,7300,626,963,4600,1253,964,1200,1880,FALSE,2 +264,0,300,0,301000,10,,,,,965,10000,0,966,8000,277,967,6000,556,968,900,836,TRUE,2 +445,0,0,0,,,,,,,1629,10000,0,1630,3000,7,1631,1100,21,,,,FALSE,1 +446,0,0,65,306024,9,306023,7,306000,5,1632,10000,0,1633,6300,16,1634,5300,32,1635,1200,48,FALSE,2 +447,0,300,0,301000,10,,,,,1636,10000,0,1637,8000,7,1638,6000,14,1639,900,21,TRUE,2 +265,0,0,0,306024,5,306025,3,306023,3,969,10000,0,970,3700,7,971,900,23,,,,FALSE,1 +266,0,0,71,306025,15,306023,10,306024,10,972,10000,0,973,7500,17,974,4800,35,975,1100,53,FALSE,2 +267,0,300,0,301000,10,,,,,976,10000,0,977,8000,7,978,6000,15,979,900,23,TRUE,2 +268,0,0,0,306000,7,306001,4,306002,4,980,10000,0,981,3700,12,982,900,36,,,,FALSE,1 +269,0,0,112,306001,20,306000,14,306002,14,983,10000,0,984,8000,28,985,5000,56,986,1000,84,FALSE,2 +270,0,300,0,301000,10,,,,,987,10000,0,988,8000,12,989,6000,24,990,900,36,TRUE,2 +271,0,0,0,306012,25,306013,13,306040,13,991,10000,0,992,3400,432,993,1000,1297,,,,FALSE,1 +272,0,0,3864,306014,49,306040,25,306043,13,994,10000,0,995,9100,972,996,4000,1946,997,1100,2920,FALSE,2 +273,0,300,0,301000,10,,,,,998,10000,0,999,8000,432,1000,6000,864,1001,900,1297,TRUE,2 +274,0,0,0,306055,43,306053,22,306045,22,1002,10000,0,1003,3400,1086,1004,1000,2240,,,,FALSE,1 +275,0,0,2000,306053,63,306054,43,306047,22,1005,10000,0,1006,7300,1223,1007,4600,1120,1008,1200,3360,FALSE,2 +276,0,300,0,301000,10,,,,,1009,10000,0,1010,8000,1086,1011,6000,2174,1012,900,3261,TRUE,2 +448,0,0,0,306040,7,,,,,1640,10000,0,1641,3000,56,1642,1100,168,,,,FALSE,1 +449,0,0,502,306012,37,306027,25,306041,7,1643,10000,0,1644,6300,126,1645,5300,252,1646,1200,379,FALSE,2 +450,0,300,0,301000,10,,,,,1647,10000,0,1648,8000,56,1649,6000,112,1650,900,168,TRUE,2 +277,0,0,0,306027,13,306028,7,306040,7,1013,10000,0,1014,3700,57,1015,900,173,,,,FALSE,1 +278,0,0,519,306026,39,306028,26,306041,7,1016,10000,0,1017,7500,130,1018,4800,260,1019,1100,392,FALSE,2 +279,0,300,0,301000,10,,,,,1020,10000,0,1021,8000,57,1022,6000,115,1023,900,173,TRUE,2 +280,0,0,0,306005,17,306003,9,306040,9,1024,10000,0,1025,3700,78,1026,900,236,,,,FALSE,1 +281,0,0,704,306003,33,306040,17,306044,9,1027,10000,0,1028,8000,176,1029,5000,354,1030,1000,532,FALSE,2 +282,0,300,0,301000,10,,,,,1031,10000,0,1032,8000,78,1033,6000,156,1034,900,236,TRUE,2 +283,0,0,0,306015,55,306017,28,306045,28,1035,10000,0,1036,3400,1415,1037,1000,2240,,,,FALSE,1 +284,0,0,2000,306016,54,306045,28,306048,28,1038,10000,0,1039,9100,1400,1040,4000,1120,1041,1100,3360,FALSE,2 +285,0,300,0,301000,10,,,,,1042,10000,0,1043,8000,1415,1044,6000,2240,1045,900,4247,TRUE,2 +286,0,0,0,306055,70,306053,28,306045,10,1046,10000,0,1047,3400,1827,1048,1000,2240,,,,FALSE,1 +287,0,0,2000,306054,100,306045,30,306047,20,1049,10000,0,1050,7300,1400,1051,4600,1120,1052,1200,3360,FALSE,2 +288,0,300,0,301000,10,,,,,1053,10000,0,1054,8000,1827,1055,6000,2240,1056,900,5484,TRUE,2 +451,0,0,0,306045,30,,,,,1651,10000,0,1652,3000,508,1653,1700,1526,,,,FALSE,1 +452,0,0,2000,306007,80,306016,20,306048,20,1654,10000,0,1655,6300,1145,1656,5300,1120,1657,1800,3360,FALSE,2 +453,0,300,0,301000,10,,,,,1658,10000,0,1659,8000,508,1660,6000,1017,1661,900,1526,TRUE,2 +289,0,0,0,306029,770,306031,390,306045,58,1057,10000,0,1058,3700,2036,1059,900,2240,,,,FALSE,1 +290,0,0,4000,306030,918,306045,77,306046,39,1060,10000,0,1061,7500,2800,1062,4800,2240,1063,1100,6720,FALSE,2 +291,0,300,0,301000,10,,,,,1064,10000,0,1065,8000,2036,1066,6000,2240,1067,900,6110,TRUE,2 +292,0,0,0,306006,770,306007,390,306045,58,1068,10000,0,1069,3700,2036,1070,900,2240,,,,FALSE,1 +293,0,0,4000,306008,918,306045,77,306049,39,1071,10000,0,1072,8000,2800,1073,5000,2240,1074,1000,6720,FALSE,2 +294,0,300,0,301000,10,,,,,1075,10000,0,1076,8000,2036,1077,6000,2240,1078,900,6110,TRUE,2 +295,0,0,0,306016,770,306015,390,306045,58,1079,10000,0,1080,3400,2036,1081,1000,2240,,,,FALSE,1 +296,0,0,4000,306016,918,306045,77,306048,39,1082,10000,0,1083,9100,2800,1084,4000,2240,1085,1100,6720,FALSE,2 +297,0,300,0,301000,10,,,,,1086,10000,0,1087,8000,2036,1088,6000,2240,1089,900,6110,TRUE,2 +298,0,0,0,306053,770,306054,390,306045,58,1090,10000,0,1091,3400,2036,1092,1000,2240,,,,FALSE,1 +299,0,0,4000,306054,918,306045,77,306047,39,1093,10000,0,1094,7300,2800,1095,4600,2240,1096,1200,6720,FALSE,2 +300,0,300,0,301000,10,,,,,1097,10000,0,1098,8000,2036,1099,6000,2240,1100,900,6110,TRUE,2 457,0,0,0,,,,,,,1673,10000,0,1674,6800,0,1675,500,0,,,,FALSE,1 -458,0,0,2,306001,2,306002,2,306023,1,1676,10000,0,1677,8900,0,1678,7500,1,1679,600,2,FALSE,2 +458,0,0,2,306001,2,306002,2,306023,1,1676,10000,0,1677,8900,0,1678,7500,0,1679,600,1,FALSE,2 459,0,300,0,301000,10,,,,,1680,10000,0,1681,8000,0,1682,6000,0,1683,500,0,TRUE,2 -313,0,0,0,306023,1,306025,1,306024,1,1145,10000,0,1146,8500,0,1147,400,3,,,,FALSE,1 -314,0,0,8,306025,3,306024,2,306023,2,1148,10000,0,1149,9600,2,1150,8300,4,1151,500,7,FALSE,2 -315,0,300,4000,306056,20,306067,20,306069,14,1152,10000,0,1153,8000,1258,1154,6000,2517,1155,500,3775,TRUE,2 -316,0,0,0,306002,3,306001,2,306000,2,1156,10000,0,1157,6800,4,1158,500,12,,,,FALSE,1 -317,0,0,30,306002,9,306001,6,306000,6,1159,10000,0,1160,8400,9,1161,7900,18,1162,600,28,FALSE,2 -318,0,300,0,301000,10,,,,,1163,10000,0,1164,8000,4,1165,6000,8,1166,500,12,TRUE,2 -319,0,0,0,306010,12,306011,6,306009,6,1167,10000,0,1168,8500,31,1169,400,95,,,,FALSE,1 -320,0,0,227,306010,34,306009,23,306011,23,1170,10000,0,1171,9000,71,1172,8900,142,1173,500,214,FALSE,2 -321,0,300,0,301000,10,,,,,1174,10000,0,1175,8000,31,1176,6000,63,1177,500,95,TRUE,2 -322,0,0,0,306052,24,306050,12,306040,12,1178,10000,0,1179,8500,464,1180,400,1394,,,,FALSE,1 -323,0,0,3321,306051,70,306050,47,306042,12,1181,10000,0,1182,9000,1045,1183,8900,2091,1184,500,3138,FALSE,2 -324,0,300,0,301000,10,,,,,1185,10000,0,1186,8000,464,1187,6000,929,1188,500,1394,TRUE,2 -460,0,0,0,,,,,,,1684,10000,0,1685,6800,11,1686,500,35,,,,FALSE,1 -461,0,0,84,306023,11,306002,8,306024,6,1687,10000,0,1688,8900,25,1689,7500,52,1690,600,79,FALSE,2 -462,0,300,0,301000,10,,,,,1691,10000,0,1692,8000,11,1693,6000,23,1694,500,35,TRUE,2 -325,0,0,0,306024,6,306023,3,306025,3,1189,10000,0,1190,10000,13,1194,10000,0,1191,10000,40,FALSE,1 -326,0,0,97,306025,18,306023,12,306024,12,1192,10000,0,1193,9600,30,1194,8300,60,1195,500,91,FALSE,2 -327,0,300,0,301000,10,,,,,1196,10000,0,1197,8000,13,1198,6000,27,1199,500,40,TRUE,2 -328,0,0,0,306002,8,306001,4,306000,4,1200,10000,0,1201,6800,20,1202,500,60,,,,FALSE,1 -329,0,0,146,306001,24,306002,16,306000,16,1203,10000,0,1204,8400,45,1205,7900,91,1206,600,137,FALSE,2 -330,0,300,0,301000,10,,,,,1207,10000,0,1208,8000,20,1209,6000,40,1210,500,60,TRUE,2 -331,0,0,0,306014,28,306013,14,306040,14,1211,10000,0,1212,8500,1224,1213,400,2800,,,,FALSE,1 -332,0,0,4373,306013,56,306040,28,306043,14,1214,10000,0,1215,9000,1377,1216,8900,1400,1217,500,4132,FALSE,2 -333,0,300,0,301000,10,,,,,1218,10000,0,1219,8000,1224,1220,6000,2448,1221,500,3672,TRUE,2 -334,0,0,0,306054,49,306055,25,306045,25,1222,10000,0,1223,8500,1592,1224,400,2800,,,,FALSE,1 -335,0,0,2000,306053,97,306045,49,306047,25,1225,10000,0,1226,9000,1750,1227,8900,1400,1228,500,4200,FALSE,2 -336,0,300,0,301000,10,,,,,1229,10000,0,1230,8000,1592,1231,6000,2800,1232,500,4778,TRUE,2 -463,0,0,0,306040,8,,,,,1695,10000,0,1696,6800,85,1697,500,256,,,,FALSE,1 -464,0,0,610,306004,45,306050,30,306042,8,1698,10000,0,1699,8900,191,1700,7500,384,1701,600,576,FALSE,2 -465,0,300,0,301000,10,,,,,1702,10000,0,1703,8000,85,1704,6000,170,1705,500,256,TRUE,2 -337,0,0,0,306028,16,306026,8,306040,8,1233,10000,0,1234,10000,88,1238,10000,0,1235,10000,268,FALSE,1 -338,0,0,639,306027,31,306040,16,306041,8,1236,10000,0,1237,9600,200,1238,8300,402,1239,500,603,FALSE,2 -339,0,300,0,301000,10,,,,,1240,10000,0,1241,8000,88,1242,6000,178,1243,500,268,TRUE,2 -340,0,0,0,306004,19,306003,10,306040,10,1244,10000,0,1245,6800,121,1246,500,363,,,,FALSE,1 -341,0,0,865,306003,56,306005,38,306044,10,1247,10000,0,1248,8400,272,1249,7900,544,1250,600,817,FALSE,2 -342,0,300,0,301000,10,,,,,1251,10000,0,1252,8000,121,1253,6000,242,1254,500,363,TRUE,2 -343,0,0,0,306017,60,306016,30,306045,20,1255,10000,0,1256,8500,2066,1257,400,2800,,,,FALSE,1 -344,0,0,2000,306017,70,306045,30,306048,20,1258,10000,0,1259,9000,1750,1260,8900,1400,1261,500,4200,FALSE,2 -345,0,300,0,301000,10,,,,,1262,10000,0,1263,8000,2066,1264,6000,2800,1265,500,6199,TRUE,2 -346,0,0,0,306053,70,306054,30,306045,20,1266,10000,0,1267,8500,2524,1268,400,2800,,,,FALSE,1 -347,0,0,2000,306055,80,306053,30,306047,20,1269,10000,0,1270,9000,1750,1271,8900,1400,1272,500,4200,FALSE,2 -348,0,300,0,301000,10,,,,,1273,10000,0,1274,8000,2524,1275,6000,2800,1276,500,7575,TRUE,2 -101400001,0,0,0,306045,60,,,,,1014000011,10000,0,1014000012,2800,2450,1014000013,1800,2100,,,,FALSE,1 -101400002,0,0,5000,306046,20,306049,20,306048,20,1014000021,10000,0,1014000022,8400,1750,1014000023,3200,2100,1014000024,2100,4200,FALSE,2 -101400003,0,450000,0,301000,10,,,,,1014000031,10000,0,1014000032,8000,1450,1014000033,6000,2100,1014000034,900,4200,TRUE,2 -101410001,0,0,0,306045,20,306046,10,,,1014100011,10000,0,1014100012,3000,2450,1014100013,1700,2100,,,,FALSE,1 -101410002,0,0,2500,306030,80,306045,30,306046,20,1014100021,10000,0,1014100022,6000,1750,1014100023,4200,2100,1014100024,2200,4200,FALSE,2 -101410003,0,450000,0,301000,10,,,,,1014100031,10000,0,1014100032,8000,1450,1014100033,6000,2100,1014100034,900,4200,TRUE,2 -101420001,0,0,0,306045,20,306049,10,,,1014200011,10000,0,1014200012,2800,2450,1014200013,1800,2100,,,,FALSE,1 -101420002,0,0,5000,306008,80,306045,30,306049,20,1014200021,10000,0,1014200022,9000,1750,1014200023,2800,2100,1014200024,2200,4200,FALSE,2 -101420003,0,450000,0,301000,10,,,,,1014200031,10000,0,1014200032,8000,1500,1014200033,6000,2100,1014200034,900,4200,TRUE,2 -101430001,0,0,0,306045,20,306048,20,,,1014300011,10000,0,1014300012,3400,2450,1014300013,1600,2100,,,,FALSE,1 -101430002,0,0,5000,306016,100,306045,40,306048,30,1014300021,10000,0,1014300022,7900,1750,1014300023,3400,2100,1014300024,2100,4200,FALSE,2 -101430003,0,450000,0,301000,10,,,,20,1014300031,10000,0,1014300032,8000,1500,1014300033,6000,2100,1014300034,900,4200,TRUE,2 -101440001,0,0,0,306045,20,306047,30,,,1014400011,10000,0,1014400012,3000,2450,1014400013,1700,2100,,,,FALSE,1 -101440002,0,0,5000,306054,100,306045,40,306047,30,1014400021,10000,0,1014400022,6000,1750,1014400023,4200,2100,1014400024,2200,4200,FALSE,2 -101440003,0,450000,0,301000,10,,,,,1014400031,10000,0,1014400032,8000,1580,1014400033,6000,2100,1014400034,900,4200,TRUE,2 -102400001,0,0,0,306045,60,,,,,1024000011,10000,0,1024000012,4800,2450,1024000013,1300,2100,,,,FALSE,1 -102400002,0,0,5000,306046,20,306049,20,306048,20,1024000021,10000,0,1024000022,9400,1750,1024000023,5300,2100,1024000024,1400,4200,FALSE,2 -102400003,0,450000,0,301000,10,,,,,1024000031,10000,0,1024000032,8000,2450,1024000033,6000,2100,1024000034,900,4200,TRUE,2 -102410001,0,0,0,306045,20,306046,10,,,1024100011,10000,0,1024100012,4200,2450,1024100013,1400,2100,,,,FALSE,1 -102410002,0,0,5000,306031,80,306045,30,306046,20,1024100021,10000,0,1024100022,7400,1750,1024100023,6000,2100,1024100024,1500,4200,FALSE,2 -102410003,0,450000,0,301000,10,,,,,1024100031,10000,0,1024100032,8000,1430,1024100033,6000,2100,1024100034,900,4200,TRUE,2 -102420001,0,0,0,306045,20,306049,10,,,1024200011,10000,0,1024200012,5600,2450,1024200013,1200,2100,,,,FALSE,1 -102420002,0,0,5000,306006,80,306045,30,306049,80,1024200021,10000,0,1024200022,7900,1750,1024200023,6300,2100,1024200024,1400,4200,FALSE,2 -102420003,0,450000,0,301000,10,,,,,1024200031,10000,0,1024200032,8000,1562,1024200033,6000,2100,1024200034,900,4200,TRUE,2 -102430001,0,0,0,306045,20,306048,10,,,1024300011,10000,0,1024300012,5600,2450,1024300013,1200,2100,,,,FALSE,1 -102430002,0,0,5000,306015,100,306045,40,306048,30,1024300021,10000,0,1024300022,9000,1750,1024300023,5600,2100,1024300024,1400,4200,FALSE,2 -102430003,0,450000,0,301000,10,,,,,1024300031,10000,0,1024300032,8000,1540,1024300033,6000,2100,1024300034,900,4200,TRUE,2 -102440001,0,0,0,306045,20,306047,10,,,1024400011,10000,0,1024400012,4800,2450,1024400013,1300,2100,,,,FALSE,1 -102440002,0,0,5000,306053,100,306045,40,306047,30,1024400021,10000,0,1024400022,7400,1750,1024400023,6000,2100,1024400024,1500,4200,FALSE,2 -102440003,0,450000,0,301000,10,,,,,1024400031,10000,0,1024400032,8000,1580,1024400033,6000,2100,1024400034,900,4200,TRUE,2 -226,0,0,0,306053,50,306045,20,,,826,10000,0,827,5600,3500,828,600,2100,,,,FALSE,1 -227,0,0,5000,306055,50,306045,30,306047,20,829,10000,0,830,8800,3500,831,5700,2100,832,800,4200,FALSE,2 -228,0,450000,0,301000,10,,,,,833,10000,0,834,8000,12957,835,6000,2100,836,900,4200,TRUE,2 -103500001,0,0,0,306045,60,,,,,1035000011,10000,0,1035000012,4800,4900,1035000013,1300,4200,,,,FALSE,1 -103500002,0,0,5000,306046,20,306049,20,306048,20,1035000021,10000,0,1035000022,8500,3500,1035000023,5900,4200,1035000024,1400,8400,FALSE,2 -103500003,0,450000,0,301000,10,,,,,1035000031,10000,0,1035000032,8000,2902,1035000033,6000,4200,1035000034,900,8400,TRUE,2 -103510001,0,0,0,306045,20,306046,10,,,1035100011,10000,0,1035100012,5600,4900,1035100013,1200,4200,,,,FALSE,1 -103510002,0,0,5000,306029,80,306045,40,306046,30,1035100021,10000,0,1035100022,9500,3500,1035100023,6000,4200,1035100024,1300,8400,FALSE,2 -103510003,0,450000,0,301000,10,,,,,1035100031,10000,0,1035100032,8000,2961,1035100033,6000,4200,1035100034,900,8400,TRUE,2 -103520001,0,0,0,306045,20,306049,10,,,1035200011,10000,0,1035200012,4800,4900,1035200013,1300,4200,,,,FALSE,1 -103520002,0,0,5000,306007,80,306045,40,306049,30,1035200021,10000,0,1035200022,8400,3500,1035200023,6000,4200,1035200024,1400,8400,FALSE,2 -103520003,0,450000,0,301000,10,,,,,1035200031,10000,0,1035200032,8000,3024,1035200033,6000,4200,1035200034,900,8400,TRUE,2 -103530001,0,0,0,306045,30,306048,20,,,1035300011,10000,0,1035300012,5600,4900,1035300013,1200,4200,,,,FALSE,1 -103530002,0,0,5000,306017,100,306045,40,306048,30,1035300021,10000,0,1035300022,7600,3500,1035300023,6600,4200,1035300024,1400,8400,FALSE,2 -103530003,0,450000,0,301000,10,,,,,1035300031,10000,0,1035300032,8000,3091,1035300033,6000,4200,1035300034,900,8400,TRUE,2 -103540001,0,0,0,306045,30,306047,20,,,1035400011,10000,0,1035400012,5600,4900,1035400013,1200,4200,,,,FALSE,1 -103540002,0,0,5000,306055,100,306045,40,306047,30,1035400021,10000,0,1035400022,8800,3500,1035400023,5700,4200,1035400024,1400,8400,FALSE,2 -103540003,0,450000,0,301000,10,,,,,1035400031,10000,0,1035400032,8000,3163,1035400033,6000,4200,1035400034,900,8400,TRUE,2 -104500001,0,0,0,306045,60,,,,,1045000011,10000,0,1045000012,3000,4900,1045000013,1700,4200,,,,FALSE,1 -104500002,0,0,5000,306046,20,306049,20,306048,20,1045000021,10000,0,1045000022,6300,3500,1045000023,5300,4200,1045000024,1800,8400,FALSE,2 -104500003,0,450000,0,301000,10,,,,,1045000031,10000,0,1045000032,8000,2902,1045000033,6000,4200,1045000034,900,8400,TRUE,2 -104510001,0,0,0,306045,30,306046,10,,,1045100011,10000,0,1045100012,3700,4900,1045100013,1500,4200,,,,FALSE,1 -104510002,0,0,5000,306030,80,306045,30,306046,20,1045100021,10000,0,1045100022,7500,3500,1045100023,4800,4200,1045100024,1700,8400,FALSE,2 -104510003,0,450000,0,301000,10,,,,,1045100031,10000,0,1045100032,8000,2961,1045100033,6000,4200,1045100034,900,8400,TRUE,2 -104520001,0,0,0,306045,30,306049,10,,,1045200011,10000,0,1045200012,3700,4900,1045200013,1500,4200,,,,FALSE,1 -104520002,0,0,5000,306008,80,306045,30,306049,20,1045200021,10000,0,1045200022,8000,3500,1045200023,5000,4200,1045200024,1600,8400,FALSE,2 -104520003,0,450000,0,301000,10,,,,,1045200031,10000,0,1045200032,8000,3024,1045200033,6000,4200,1045200034,900,8400,TRUE,2 -104530001,0,0,0,306045,30,306048,30,,,1045300011,10000,0,1045300012,3400,4900,1045300013,1600,4200,,,,FALSE,1 -104530002,0,0,5000,306015,100,306045,40,306048,30,1045300021,10000,0,1045300022,9100,3500,1045300023,4000,4200,1045300024,1700,8400,FALSE,2 -104530003,0,450000,0,301000,10,,,,,1045300031,10000,0,1045300032,8000,3091,1045300033,6000,4200,1045300034,900,8400,TRUE,2 -104540001,0,0,0,306045,30,306047,30,,,1045400011,10000,0,1045400012,3400,4900,1045400013,1600,4200,,,,FALSE,1 -104540002,0,0,5000,306054,100,306045,40,306047,30,1045400021,10000,0,1045400022,7300,3500,1045400023,4600,4200,1045400024,1800,8400,FALSE,2 -104540003,0,450000,0,301000,10,,,,,1045400031,10000,0,1045400032,8000,3163,1045400033,6000,4200,1045400034,900,8400,TRUE,2 -105400001,0,0,0,306045,60,,,,,1054000011,10000,0,1054000012,6800,4900,1054000013,1100,4200,,,,FALSE,1 -105400002,0,0,5000,306046,20,306049,20,306048,20,1054000021,10000,0,1054000022,8900,3500,1054000023,7500,4200,1054000024,1200,8400,FALSE,2 -105400003,0,450000,0,301000,10,,,,,1054000031,10000,0,1054000032,8000,2902,1054000033,6000,4200,1054000034,500,8400,TRUE,2 -105410001,0,0,0,306045,30,306046,10,,,1054100011,10000,0,1054100012,8500,4900,1054100013,1000,4200,,,,FALSE,1 -105410002,0,0,5000,306029,80,306045,30,306046,20,1054100021,10000,0,1054100022,9600,3500,1054100023,8300,4200,1054100024,1100,8400,FALSE,2 -105410003,0,450000,0,301000,10,,,,,1054100031,10000,0,1054100032,8000,2961,1054100033,6000,4200,1054100034,500,8400,TRUE,2 -105420001,0,0,0,306045,30,306049,10,,,1054200011,10000,0,1054200012,6800,4900,1054200013,1100,4200,,,,FALSE,1 -105420002,0,0,5000,306006,80,306045,30,306049,20,1054200021,10000,0,1054200022,8400,3500,1054200023,7900,4200,1054200024,1200,8400,FALSE,2 -105420003,0,450000,0,301000,10,,,,,1054200031,10000,0,1054200032,8000,3024,1054200033,6000,4200,1054200034,500,8400,TRUE,2 -105430001,0,0,0,306045,30,306048,30,,,1054300011,10000,0,1054300012,8500,4900,1054300013,1000,4200,,,,FALSE,1 -105430002,0,0,5000,306016,100,306045,40,306048,30,1054300021,10000,0,1054300022,9000,3500,1054300023,8900,4200,1054300024,1100,8400,FALSE,2 -105430003,0,450000,0,301000,10,,,,,1054300031,10000,0,1054300032,8000,3091,1054300033,6000,4200,1054300034,500,8400,TRUE,2 -105440001,0,0,0,306045,30,306047,30,,,1054400011,10000,0,1054400012,8500,4900,1054400013,1000,4200,,,,FALSE,1 -105440002,0,0,5000,306055,100,306045,40,306047,30,1054400021,10000,0,1054400022,9000,3500,1054400023,8900,4200,1054400024,1100,8400,FALSE,2 -105440003,0,450000,0,301000,10,,,,,1054400031,10000,0,1054400032,8000,3163,1054400033,6000,4200,1054400034,500,8400,TRUE,2 -120010011,0,0,0,600102,40,,,,,1200100111,10000,0,,,,,,,,,,FALSE,1 -120010012,0,0,0,600102,40,,,,,1200100121,10000,0,,,,,,,,,,FALSE,1 -120010013,0,0,0,600102,40,,,,,1200100131,10000,0,,,,,,,,,,FALSE,1 -120010021,0,0,0,600102,100,600103,40,,,1200100211,10000,0,,,,,,,,,,FALSE,1 -120010022,0,0,0,600102,100,600103,40,,,1200100221,10000,0,,,,,,,,,,FALSE,1 -120010023,0,0,0,600102,100,600103,40,,,1200100231,10000,0,,,,,,,,,,FALSE,1 -120010031,0,0,0,600102,50,600103,20,600104,10,1200100311,10000,0,,,,,,,,,,FALSE,1 -120010032,0,0,0,600102,50,600103,20,600104,10,1200100321,10000,0,,,,,,,,,,FALSE,1 -120010033,0,0,0,600102,50,600103,20,600104,10,1200100331,10000,0,,,,,,,,,,FALSE,1 -101500001,0,0,0,306080,160,306070,90,,,1015000011,10000,0,1015000012,6000,5400,1015000013,1100,10800,1015000014,1000,21600,FALSE,1 -101500002,0,0,0,306080,160,306070,90,,,1015000021,10000,0,1015000022,6000,5400,1015000023,1100,10800,1015000024,1000,21600,FALSE,1 -101510001,0,0,0,306075,120,306070,30,306071,20,1015100011,10000,0,1015100012,6000,5400,1015100013,1100,10800,1015100014,1000,21600,FALSE,1 -101510002,0,0,0,306075,120,306070,30,306071,20,1015100021,10000,0,1015100022,6000,5400,1015100023,1100,10800,1015100024,1000,21600,FALSE,1 -101520001,0,0,0,306075,120,306070,30,306074,20,1015200011,10000,0,1015200012,6000,5400,1015200013,1100,10800,1015200014,1000,21600,FALSE,1 -101520002,0,0,0,306075,120,306070,30,306074,20,1015200021,10000,0,1015200022,6000,5400,1015200023,1100,10800,1015200024,1000,21600,FALSE,1 -101520003,0,0,0,306075,120,306070,30,306074,20,1015200031,10000,0,1015200032,6000,5400,1015200033,1100,10800,1015200034,1000,21600,FALSE,1 -101530001,0,0,0,306080,160,306070,50,306073,30,1015300011,10000,0,1015300012,6000,5400,1015300013,1100,10800,1015300014,1000,21600,FALSE,1 -101530002,0,0,0,306080,160,306070,50,306073,30,1015300021,10000,0,1015300022,6000,5400,1015300023,1100,10800,1015300024,1000,21600,FALSE,1 -101540001,0,0,0,306080,160,306070,50,306072,30,1015400011,10000,0,1015400012,6000,5400,1015400013,1100,10800,1015400014,1000,21600,FALSE,1 -101540002,0,0,0,306080,160,306070,50,306072,30,1015400021,10000,0,1015400022,6000,5400,1015400023,1100,10800,1015400024,1000,21600,FALSE,1 -101540003,0,0,0,306080,160,306070,50,306072,30,1015400031,10000,0,1015400032,6000,5400,1015400033,1100,10800,1015400034,1000,21600,FALSE,1 -102500011,0,0,0,306082,160,306070,90,,,1025000111,10000,0,1025000112,6000,5400,1025000113,1100,10800,1025000114,1000,21600,FALSE,1 -102500012,0,0,0,306082,160,306070,90,,,1025000121,10000,0,1025000122,6000,5400,1025000123,1100,10800,1025000124,1000,21600,FALSE,1 -102510011,0,0,0,306077,120,306070,30,306071,20,1025100111,10000,0,1025100112,6000,5400,1025100113,1100,10800,1025100114,1000,21600,FALSE,1 -102510012,0,0,0,306077,120,306070,30,306071,20,1025100121,10000,0,1025100122,6000,5400,1025100123,1100,10800,1025100124,1000,21600,FALSE,1 -102520011,0,0,0,306077,120,306070,30,306074,20,1025200111,10000,0,1025200112,6000,5400,1025200113,1100,10800,1025200114,1000,21600,FALSE,1 -102520012,0,0,0,306077,120,306070,30,306074,20,1025200121,10000,0,1025200122,6000,5400,1025200123,1100,10800,1025200124,1000,21600,FALSE,1 -102520013,0,0,0,306077,120,306070,30,306074,20,1025200131,10000,0,1025200132,6000,5400,1025200133,1100,10800,1025200134,1000,21600,FALSE,1 -102530011,0,0,0,306082,160,306070,50,306073,30,1025300111,10000,0,1025300112,6000,5400,1025300113,1100,10800,1025300114,1000,21600,FALSE,1 -102530012,0,0,0,306082,160,306070,50,306073,30,1025300121,10000,0,1025300122,6000,5400,1025300123,1100,10800,1025300124,1000,21600,FALSE,1 -102540011,0,0,0,306082,160,306070,50,306072,30,1025400111,10000,0,1025400112,6000,5400,1025400113,1100,10800,1025400114,1000,21600,FALSE,1 -102540012,0,0,0,306082,160,306070,50,306072,30,1025400121,10000,0,1025400122,6000,5400,1025400123,1100,10800,1025400124,1000,21600,FALSE,1 -102540013,0,0,0,306082,160,306070,50,306072,30,1025400131,10000,0,1025400132,6000,5400,1025400133,1100,10800,1025400134,1000,21600,FALSE,1 -103500011,0,0,0,306081,160,306070,90,,,1035000111,10000,0,1035000112,6000,5400,1035000113,1100,10800,1035000114,1000,21600,FALSE,1 -103500012,0,0,0,306081,160,306070,90,,,1035000121,10000,0,1035000122,6000,5400,1035000123,1100,10800,1035000124,1000,21600,FALSE,1 -103510011,0,0,0,306076,120,306070,30,306071,20,1035100111,10000,0,1035100112,6000,5400,1035100113,1100,10800,1035100114,1000,21600,FALSE,1 -103510012,0,0,0,306076,120,306070,30,306071,20,1035100121,10000,0,1035100122,6000,5400,1035100123,1100,10800,1035100124,1000,21600,FALSE,1 -103520011,0,0,0,306076,120,306070,30,306074,20,1035200111,10000,0,1035200112,6000,5400,1035200113,1100,10800,1035200114,1000,21600,FALSE,1 -103520012,0,0,0,306076,120,306070,30,306074,20,1035200121,10000,0,1035200122,6000,5400,1035200123,1100,10800,1035200124,1000,21600,FALSE,1 -103520013,0,0,0,306076,120,306070,30,306074,20,1035200131,10000,0,1035200132,6000,5400,1035200133,1100,10800,1035200134,1000,21600,FALSE,1 -103530011,0,0,0,306081,160,306070,50,306073,30,1035300111,10000,0,1035300112,6000,5400,1035300113,1100,10800,1035300114,1000,21600,FALSE,1 -103530012,0,0,0,306081,160,306070,50,306073,30,1035300121,10000,0,1035300122,6000,5400,1035300123,1100,10800,1035300124,1000,21600,FALSE,1 -103540011,0,0,0,306081,160,306070,50,306072,30,1035400111,10000,0,1035400112,6000,5400,1035400113,1100,10800,1035400114,1000,21600,FALSE,1 -103540012,0,0,0,306081,160,306070,50,306072,30,1035400121,10000,0,1035400122,6000,5400,1035400123,1100,10800,1035400124,1000,21600,FALSE,1 -103540013,0,0,0,306081,160,306070,50,306072,30,1035400131,10000,0,1035400132,6000,5400,1035400133,1100,10800,1035400134,1000,21600,FALSE,1 -104500011,0,0,0,306083,160,306070,90,,,1045000111,10000,0,1045000112,6000,5400,1045000113,1100,10800,1045000114,1000,21600,FALSE,1 -104500012,0,0,0,306083,160,306070,90,,,1045000121,10000,0,1045000122,6000,5400,1045000123,1100,10800,1045000124,1000,21600,FALSE,1 -104510011,0,0,0,306078,120,306070,30,306071,20,1045100111,10000,0,1045100112,6000,5400,1045100113,1100,10800,1045100114,1000,21600,FALSE,1 -104510012,0,0,0,306078,120,306070,30,306071,20,1045100121,10000,0,1045100122,6000,5400,1045100123,1100,10800,1045100124,1000,21600,FALSE,1 -104520011,0,0,0,306078,120,306070,30,306074,20,1045200111,10000,0,1045200112,6000,5400,1045200113,1100,10800,1045200114,1000,21600,FALSE,1 -104520012,0,0,0,306078,120,306070,30,306074,20,1045200121,10000,0,1045200122,6000,5400,1045200123,1100,10800,1045200124,1000,21600,FALSE,1 -104520013,0,0,0,306078,120,306070,30,306074,20,1045200131,10000,0,1045200132,6000,5400,1045200133,1100,10800,1045200134,1000,21600,FALSE,1 -104530011,0,0,0,306083,160,306070,50,306073,30,1045300111,10000,0,1045300112,6000,5400,1045300113,1100,10800,1045300114,1000,21600,FALSE,1 -104530012,0,0,0,306083,160,306070,50,306073,30,1045300121,10000,0,1045300122,6000,5400,1045300123,1100,10800,1045300124,1000,21600,FALSE,1 -104540011,0,0,0,306083,160,306070,50,306072,30,1045400111,10000,0,1045400112,6000,5400,1045400113,1100,10800,1045400114,1000,21600,FALSE,1 -104540012,0,0,0,306083,160,306070,50,306072,30,1045400121,10000,0,1045400122,6000,5400,1045400123,1100,10800,1045400124,1000,21600,FALSE,1 -104540013,0,0,0,306083,160,306070,50,306072,30,1045400131,10000,0,1045400132,6000,5400,1045400133,1100,10800,1045400134,1000,21600,FALSE,1 -105500001,0,0,0,306084,160,306070,90,,,1055000011,10000,0,1055000012,6000,5400,1055000013,1100,10800,1055000014,1000,21600,FALSE,1 -105500002,0,0,0,306084,160,306070,90,,,1055000021,10000,0,1055000022,6000,5400,1055000023,1100,10800,1055000024,1000,21600,FALSE,1 -105510001,0,0,0,306079,120,306070,30,306071,20,1055100011,10000,0,1055100012,6000,5400,1055100013,1100,10800,1055100014,1000,21600,FALSE,1 -105510002,0,0,0,306079,120,306070,30,306071,20,1055100021,10000,0,1055100022,6000,5400,1055100023,1100,10800,1055100024,1000,21600,FALSE,1 -105520001,0,0,0,306079,120,306070,30,306074,20,1055200011,10000,0,1055200012,6000,5400,1055200013,1100,10800,1055200014,1000,21600,FALSE,1 -105520002,0,0,0,306079,120,306070,30,306074,20,1055200021,10000,0,1055200022,6000,5400,1055200023,1100,10800,1055200024,1000,21600,FALSE,1 -105520003,0,0,0,306079,120,306070,30,306074,20,1055200031,10000,0,1055200032,6000,5400,1055200033,1100,10800,1055200034,1000,21600,FALSE,1 -105530001,0,0,0,306084,160,306070,50,306073,30,1055300011,10000,0,1055300012,6000,5400,1055300013,1100,10800,1055300014,1000,21600,FALSE,1 -105530002,0,0,0,306084,160,306070,50,306073,30,1055300021,10000,0,1055300022,6000,5400,1055300023,1100,10800,1055300024,1000,21600,FALSE,1 -105540001,0,0,0,306084,160,306070,50,306072,30,1055400011,10000,0,1055400012,6000,5400,1055400013,1100,10800,1055400014,1000,21600,FALSE,1 -105540002,0,0,0,306084,160,306070,50,306072,30,1055400021,10000,0,1055400022,6000,5400,1055400023,1100,10800,1055400024,1000,21600,FALSE,1 -105540003,0,0,0,306084,160,306070,50,306072,30,1055400031,10000,0,1055400032,6000,5400,1055400033,1100,10800,1055400034,1000,21600,FALSE,1 +313,0,0,0,306023,1,306025,1,306024,1,1145,10000,0,1146,8500,0,1147,400,2,,,,FALSE,1 +314,0,0,8,306025,3,306024,2,306023,2,1148,10000,0,1149,9600,1,1150,8300,3,1151,500,5,FALSE,2 +315,0,300,4000,306056,20,306067,20,306069,14,1152,10000,0,1153,8000,1006,1154,6000,2013,1155,500,3020,TRUE,2 +316,0,0,0,306002,3,306001,2,306000,2,1156,10000,0,1157,6800,3,1158,500,9,,,,FALSE,1 +317,0,0,30,306002,9,306001,6,306000,6,1159,10000,0,1160,8400,7,1161,7900,14,1162,600,22,FALSE,2 +318,0,300,0,301000,10,,,,,1163,10000,0,1164,8000,3,1165,6000,6,1166,500,9,TRUE,2 +319,0,0,0,306010,12,306011,6,306009,6,1167,10000,0,1168,8500,24,1169,400,76,,,,FALSE,1 +320,0,0,227,306010,34,306009,23,306011,23,1170,10000,0,1171,9000,56,1172,8900,113,1173,500,171,FALSE,2 +321,0,300,0,301000,10,,,,,1174,10000,0,1175,8000,24,1176,6000,50,1177,500,76,TRUE,2 +322,0,0,0,306052,24,306050,12,306040,12,1178,10000,0,1179,8500,371,1180,400,1115,,,,FALSE,1 +323,0,0,3321,306051,70,306050,47,306042,12,1181,10000,0,1182,9000,836,1183,8900,1672,1184,500,2510,FALSE,2 +324,0,300,0,301000,10,,,,,1185,10000,0,1186,8000,371,1187,6000,743,1188,500,1115,TRUE,2 +460,0,0,0,,,,,,,1684,10000,0,1685,6800,8,1686,500,28,,,,FALSE,1 +461,0,0,84,306023,11,306002,8,306024,6,1687,10000,0,1688,8900,20,1689,7500,41,1690,600,63,FALSE,2 +462,0,300,0,301000,10,,,,,1691,10000,0,1692,8000,8,1693,6000,18,1694,500,28,TRUE,2 +325,0,0,0,306024,6,306023,3,306025,3,1189,10000,0,1190,10000,10,1194,10000,0,1191,10000,32,FALSE,1 +326,0,0,97,306025,18,306023,12,306024,12,1192,10000,0,1193,9600,24,1194,8300,48,1195,500,72,FALSE,2 +327,0,300,0,301000,10,,,,,1196,10000,0,1197,8000,10,1198,6000,21,1199,500,32,TRUE,2 +328,0,0,0,306002,8,306001,4,306000,4,1200,10000,0,1201,6800,16,1202,500,48,,,,FALSE,1 +329,0,0,146,306001,24,306002,16,306000,16,1203,10000,0,1204,8400,36,1205,7900,72,1206,600,109,FALSE,2 +330,0,300,0,301000,10,,,,,1207,10000,0,1208,8000,16,1209,6000,32,1210,500,48,TRUE,2 +331,0,0,0,306014,28,306013,14,306040,14,1211,10000,0,1212,8500,979,1213,400,2240,,,,FALSE,1 +332,0,0,4373,306013,56,306040,28,306043,14,1214,10000,0,1215,9000,1101,1216,8900,1120,1217,500,3305,FALSE,2 +333,0,300,0,301000,10,,,,,1218,10000,0,1219,8000,979,1220,6000,1958,1221,500,2937,TRUE,2 +334,0,0,0,306054,49,306055,25,306045,25,1222,10000,0,1223,8500,1273,1224,400,2240,,,,FALSE,1 +335,0,0,2000,306053,97,306045,49,306047,25,1225,10000,0,1226,9000,1400,1227,8900,1120,1228,500,3360,FALSE,2 +336,0,300,0,301000,10,,,,,1229,10000,0,1230,8000,1273,1231,6000,2240,1232,500,3822,TRUE,2 +463,0,0,0,306040,8,,,,,1695,10000,0,1696,6800,68,1697,500,204,,,,FALSE,1 +464,0,0,610,306004,45,306050,30,306042,8,1698,10000,0,1699,8900,152,1700,7500,307,1701,600,460,FALSE,2 +465,0,300,0,301000,10,,,,,1702,10000,0,1703,8000,68,1704,6000,136,1705,500,204,TRUE,2 +337,0,0,0,306028,16,306026,8,306040,8,1233,10000,0,1234,10000,70,1238,10000,0,1235,10000,214,FALSE,1 +338,0,0,639,306027,31,306040,16,306041,8,1236,10000,0,1237,9600,160,1238,8300,321,1239,500,482,FALSE,2 +339,0,300,0,301000,10,,,,,1240,10000,0,1241,8000,70,1242,6000,142,1243,500,214,TRUE,2 +340,0,0,0,306004,19,306003,10,306040,10,1244,10000,0,1245,6800,96,1246,500,290,,,,FALSE,1 +341,0,0,865,306003,56,306005,38,306044,10,1247,10000,0,1248,8400,217,1249,7900,435,1250,600,653,FALSE,2 +342,0,300,0,301000,10,,,,,1251,10000,0,1252,8000,96,1253,6000,193,1254,500,290,TRUE,2 +343,0,0,0,306017,60,306016,30,306045,20,1255,10000,0,1256,8500,1652,1257,400,2240,,,,FALSE,1 +344,0,0,2000,306017,70,306045,30,306048,20,1258,10000,0,1259,9000,1400,1260,8900,1120,1261,500,3360,FALSE,2 +345,0,300,0,301000,10,,,,,1262,10000,0,1263,8000,1652,1264,6000,2240,1265,500,4959,TRUE,2 +346,0,0,0,306053,70,306054,30,306045,20,1266,10000,0,1267,8500,2019,1268,400,2240,,,,FALSE,1 +347,0,0,2000,306055,80,306053,30,306047,20,1269,10000,0,1270,9000,1400,1271,8900,1120,1272,500,3360,FALSE,2 +348,0,300,0,301000,10,,,,,1273,10000,0,1274,8000,2019,1275,6000,2240,1276,500,6060,TRUE,2 +101400001,0,0,0,306045,60,,,,,1014000011,10000,0,1014000012,2800,1960,1014000013,1800,1680,,,,FALSE,1 +101400002,0,0,5000,306046,20,306049,20,306048,20,1014000021,10000,0,1014000022,8400,1400,1014000023,3200,1680,1014000024,2100,3360,FALSE,2 +101400003,0,450000,0,301000,10,,,,,1014000031,10000,0,1014000032,8000,1160,1014000033,6000,1680,1014000034,900,3360,TRUE,2 +101410001,0,0,0,306045,20,306046,10,,,1014100011,10000,0,1014100012,3000,1960,1014100013,1700,1680,,,,FALSE,1 +101410002,0,0,2500,306030,80,306045,30,306046,20,1014100021,10000,0,1014100022,6000,1400,1014100023,4200,1680,1014100024,2200,3360,FALSE,2 +101410003,0,450000,0,301000,10,,,,,1014100031,10000,0,1014100032,8000,1160,1014100033,6000,1680,1014100034,900,3360,TRUE,2 +101420001,0,0,0,306045,20,306049,10,,,1014200011,10000,0,1014200012,2800,1960,1014200013,1800,1680,,,,FALSE,1 +101420002,0,0,5000,306008,80,306045,30,306049,20,1014200021,10000,0,1014200022,9000,1400,1014200023,2800,1680,1014200024,2200,3360,FALSE,2 +101420003,0,450000,0,301000,10,,,,,1014200031,10000,0,1014200032,8000,1200,1014200033,6000,1680,1014200034,900,3360,TRUE,2 +101430001,0,0,0,306045,20,306048,20,,,1014300011,10000,0,1014300012,3400,1960,1014300013,1600,1680,,,,FALSE,1 +101430002,0,0,5000,306016,100,306045,40,306048,30,1014300021,10000,0,1014300022,7900,1400,1014300023,3400,1680,1014300024,2100,3360,FALSE,2 +101430003,0,450000,0,301000,10,,,,20,1014300031,10000,0,1014300032,8000,1200,1014300033,6000,1680,1014300034,900,3360,TRUE,2 +101440001,0,0,0,306045,20,306047,30,,,1014400011,10000,0,1014400012,3000,1960,1014400013,1700,1680,,,,FALSE,1 +101440002,0,0,5000,306054,100,306045,40,306047,30,1014400021,10000,0,1014400022,6000,1400,1014400023,4200,1680,1014400024,2200,3360,FALSE,2 +101440003,0,450000,0,301000,10,,,,,1014400031,10000,0,1014400032,8000,1264,1014400033,6000,1680,1014400034,900,3360,TRUE,2 +102400001,0,0,0,306045,60,,,,,1024000011,10000,0,1024000012,4800,1960,1024000013,1300,1680,,,,FALSE,1 +102400002,0,0,5000,306046,20,306049,20,306048,20,1024000021,10000,0,1024000022,9400,1400,1024000023,5300,1680,1024000024,1400,3360,FALSE,2 +102400003,0,450000,0,301000,10,,,,,1024000031,10000,0,1024000032,8000,1960,1024000033,6000,1680,1024000034,900,3360,TRUE,2 +102410001,0,0,0,306045,20,306046,10,,,1024100011,10000,0,1024100012,4200,1960,1024100013,1400,1680,,,,FALSE,1 +102410002,0,0,5000,306031,80,306045,30,306046,20,1024100021,10000,0,1024100022,7400,1400,1024100023,6000,1680,1024100024,1500,3360,FALSE,2 +102410003,0,450000,0,301000,10,,,,,1024100031,10000,0,1024100032,8000,1144,1024100033,6000,1680,1024100034,900,3360,TRUE,2 +102420001,0,0,0,306045,20,306049,10,,,1024200011,10000,0,1024200012,5600,1960,1024200013,1200,1680,,,,FALSE,1 +102420002,0,0,5000,306006,80,306045,30,306049,80,1024200021,10000,0,1024200022,7900,1400,1024200023,6300,1680,1024200024,1400,3360,FALSE,2 +102420003,0,450000,0,301000,10,,,,,1024200031,10000,0,1024200032,8000,1249,1024200033,6000,1680,1024200034,900,3360,TRUE,2 +102430001,0,0,0,306045,20,306048,10,,,1024300011,10000,0,1024300012,5600,1960,1024300013,1200,1680,,,,FALSE,1 +102430002,0,0,5000,306015,100,306045,40,306048,30,1024300021,10000,0,1024300022,9000,1400,1024300023,5600,1680,1024300024,1400,3360,FALSE,2 +102430003,0,450000,0,301000,10,,,,,1024300031,10000,0,1024300032,8000,1232,1024300033,6000,1680,1024300034,900,3360,TRUE,2 +102440001,0,0,0,306045,20,306047,10,,,1024400011,10000,0,1024400012,4800,1960,1024400013,1300,1680,,,,FALSE,1 +102440002,0,0,5000,306053,100,306045,40,306047,30,1024400021,10000,0,1024400022,7400,1400,1024400023,6000,1680,1024400024,1500,3360,FALSE,2 +102440003,0,450000,0,301000,10,,,,,1024400031,10000,0,1024400032,8000,1264,1024400033,6000,1680,1024400034,900,3360,TRUE,2 +226,0,0,0,306053,50,306045,20,,,826,10000,0,827,5600,2800,828,600,1680,,,,FALSE,1 +227,0,0,5000,306055,50,306045,30,306047,20,829,10000,0,830,8800,2800,831,5700,1680,832,800,3360,FALSE,2 +228,0,450000,0,301000,10,,,,,833,10000,0,834,8000,10365,835,6000,1680,836,900,3360,TRUE,2 +103500001,0,0,0,306045,60,,,,,1035000011,10000,0,1035000012,4800,3920,1035000013,1300,3360,,,,FALSE,1 +103500002,0,0,5000,306046,20,306049,20,306048,20,1035000021,10000,0,1035000022,8500,2800,1035000023,5900,3360,1035000024,1400,6720,FALSE,2 +103500003,0,450000,0,301000,10,,,,,1035000031,10000,0,1035000032,8000,2321,1035000033,6000,3360,1035000034,900,6720,TRUE,2 +103510001,0,0,0,306045,20,306046,10,,,1035100011,10000,0,1035100012,5600,3920,1035100013,1200,3360,,,,FALSE,1 +103510002,0,0,5000,306029,80,306045,40,306046,30,1035100021,10000,0,1035100022,9500,2800,1035100023,6000,3360,1035100024,1300,6720,FALSE,2 +103510003,0,450000,0,301000,10,,,,,1035100031,10000,0,1035100032,8000,2368,1035100033,6000,3360,1035100034,900,6720,TRUE,2 +103520001,0,0,0,306045,20,306049,10,,,1035200011,10000,0,1035200012,4800,3920,1035200013,1300,3360,,,,FALSE,1 +103520002,0,0,5000,306007,80,306045,40,306049,30,1035200021,10000,0,1035200022,8400,2800,1035200023,6000,3360,1035200024,1400,6720,FALSE,2 +103520003,0,450000,0,301000,10,,,,,1035200031,10000,0,1035200032,8000,2419,1035200033,6000,3360,1035200034,900,6720,TRUE,2 +103530001,0,0,0,306045,30,306048,20,,,1035300011,10000,0,1035300012,5600,3920,1035300013,1200,3360,,,,FALSE,1 +103530002,0,0,5000,306017,100,306045,40,306048,30,1035300021,10000,0,1035300022,7600,2800,1035300023,6600,3360,1035300024,1400,6720,FALSE,2 +103530003,0,450000,0,301000,10,,,,,1035300031,10000,0,1035300032,8000,2472,1035300033,6000,3360,1035300034,900,6720,TRUE,2 +103540001,0,0,0,306045,30,306047,20,,,1035400011,10000,0,1035400012,5600,3920,1035400013,1200,3360,,,,FALSE,1 +103540002,0,0,5000,306055,100,306045,40,306047,30,1035400021,10000,0,1035400022,8800,2800,1035400023,5700,3360,1035400024,1400,6720,FALSE,2 +103540003,0,450000,0,301000,10,,,,,1035400031,10000,0,1035400032,8000,2530,1035400033,6000,3360,1035400034,900,6720,TRUE,2 +104500001,0,0,0,306045,60,,,,,1045000011,10000,0,1045000012,3000,3920,1045000013,1700,3360,,,,FALSE,1 +104500002,0,0,5000,306046,20,306049,20,306048,20,1045000021,10000,0,1045000022,6300,2800,1045000023,5300,3360,1045000024,1800,6720,FALSE,2 +104500003,0,450000,0,301000,10,,,,,1045000031,10000,0,1045000032,8000,2321,1045000033,6000,3360,1045000034,900,6720,TRUE,2 +104510001,0,0,0,306045,30,306046,10,,,1045100011,10000,0,1045100012,3700,3920,1045100013,1500,3360,,,,FALSE,1 +104510002,0,0,5000,306030,80,306045,30,306046,20,1045100021,10000,0,1045100022,7500,2800,1045100023,4800,3360,1045100024,1700,6720,FALSE,2 +104510003,0,450000,0,301000,10,,,,,1045100031,10000,0,1045100032,8000,2368,1045100033,6000,3360,1045100034,900,6720,TRUE,2 +104520001,0,0,0,306045,30,306049,10,,,1045200011,10000,0,1045200012,3700,3920,1045200013,1500,3360,,,,FALSE,1 +104520002,0,0,5000,306008,80,306045,30,306049,20,1045200021,10000,0,1045200022,8000,2800,1045200023,5000,3360,1045200024,1600,6720,FALSE,2 +104520003,0,450000,0,301000,10,,,,,1045200031,10000,0,1045200032,8000,2419,1045200033,6000,3360,1045200034,900,6720,TRUE,2 +104530001,0,0,0,306045,30,306048,30,,,1045300011,10000,0,1045300012,3400,3920,1045300013,1600,3360,,,,FALSE,1 +104530002,0,0,5000,306015,100,306045,40,306048,30,1045300021,10000,0,1045300022,9100,2800,1045300023,4000,3360,1045300024,1700,6720,FALSE,2 +104530003,0,450000,0,301000,10,,,,,1045300031,10000,0,1045300032,8000,2472,1045300033,6000,3360,1045300034,900,6720,TRUE,2 +104540001,0,0,0,306045,30,306047,30,,,1045400011,10000,0,1045400012,3400,3920,1045400013,1600,3360,,,,FALSE,1 +104540002,0,0,5000,306054,100,306045,40,306047,30,1045400021,10000,0,1045400022,7300,2800,1045400023,4600,3360,1045400024,1800,6720,FALSE,2 +104540003,0,450000,0,301000,10,,,,,1045400031,10000,0,1045400032,8000,2530,1045400033,6000,3360,1045400034,900,6720,TRUE,2 +105400001,0,0,0,306045,60,,,,,1054000011,10000,0,1054000012,6800,3920,1054000013,1100,3360,,,,FALSE,1 +105400002,0,0,5000,306046,20,306049,20,306048,20,1054000021,10000,0,1054000022,8900,2800,1054000023,7500,3360,1054000024,1200,6720,FALSE,2 +105400003,0,450000,0,301000,10,,,,,1054000031,10000,0,1054000032,8000,2321,1054000033,6000,3360,1054000034,500,6720,TRUE,2 +105410001,0,0,0,306045,30,306046,10,,,1054100011,10000,0,1054100012,8500,3920,1054100013,1000,3360,,,,FALSE,1 +105410002,0,0,5000,306029,80,306045,30,306046,20,1054100021,10000,0,1054100022,9600,2800,1054100023,8300,3360,1054100024,1100,6720,FALSE,2 +105410003,0,450000,0,301000,10,,,,,1054100031,10000,0,1054100032,8000,2368,1054100033,6000,3360,1054100034,500,6720,TRUE,2 +105420001,0,0,0,306045,30,306049,10,,,1054200011,10000,0,1054200012,6800,3920,1054200013,1100,3360,,,,FALSE,1 +105420002,0,0,5000,306006,80,306045,30,306049,20,1054200021,10000,0,1054200022,8400,2800,1054200023,7900,3360,1054200024,1200,6720,FALSE,2 +105420003,0,450000,0,301000,10,,,,,1054200031,10000,0,1054200032,8000,2419,1054200033,6000,3360,1054200034,500,6720,TRUE,2 +105430001,0,0,0,306045,30,306048,30,,,1054300011,10000,0,1054300012,8500,3920,1054300013,1000,3360,,,,FALSE,1 +105430002,0,0,5000,306016,100,306045,40,306048,30,1054300021,10000,0,1054300022,9000,2800,1054300023,8900,3360,1054300024,1100,6720,FALSE,2 +105430003,0,450000,0,301000,10,,,,,1054300031,10000,0,1054300032,8000,2472,1054300033,6000,3360,1054300034,500,6720,TRUE,2 +105440001,0,0,0,306045,30,306047,30,,,1054400011,10000,0,1054400012,8500,3920,1054400013,1000,3360,,,,FALSE,1 +105440002,0,0,5000,306055,100,306045,40,306047,30,1054400021,10000,0,1054400022,9000,2800,1054400023,8900,3360,1054400024,1100,6720,FALSE,2 +105440003,0,450000,0,301000,10,,,,,1054400031,10000,0,1054400032,8000,2530,1054400033,6000,3360,1054400034,500,6720,TRUE,2 +120010011,0,0,0,600102,40,,,,,1200100111,10000,0,,,0,,,0,,,,FALSE,1 +120010012,0,0,0,600102,40,,,,,1200100121,10000,0,,,0,,,0,,,,FALSE,1 +120010013,0,0,0,600102,40,,,,,1200100131,10000,0,,,0,,,0,,,,FALSE,1 +120010021,0,0,0,600102,100,600103,40,,,1200100211,10000,0,,,0,,,0,,,,FALSE,1 +120010022,0,0,0,600102,100,600103,40,,,1200100221,10000,0,,,0,,,0,,,,FALSE,1 +120010023,0,0,0,600102,100,600103,40,,,1200100231,10000,0,,,0,,,0,,,,FALSE,1 +120010031,0,0,0,600102,50,600103,20,600104,10,1200100311,10000,0,,,0,,,0,,,,FALSE,1 +120010032,0,0,0,600102,50,600103,20,600104,10,1200100321,10000,0,,,0,,,0,,,,FALSE,1 +120010033,0,0,0,600102,50,600103,20,600104,10,1200100331,10000,0,,,0,,,0,,,,FALSE,1 +101500001,0,0,0,306080,160,306070,90,,,1015000011,10000,0,1015000012,6000,4320,1015000013,1100,8640,1015000014,1000,17280,FALSE,1 +101500002,0,0,0,306080,160,306070,90,,,1015000021,10000,0,1015000022,6000,4320,1015000023,1100,8640,1015000024,1000,17280,FALSE,1 +101510001,0,0,0,306075,120,306070,30,306071,20,1015100011,10000,0,1015100012,6000,4320,1015100013,1100,8640,1015100014,1000,17280,FALSE,1 +101510002,0,0,0,306075,120,306070,30,306071,20,1015100021,10000,0,1015100022,6000,4320,1015100023,1100,8640,1015100024,1000,17280,FALSE,1 +101520001,0,0,0,306075,120,306070,30,306074,20,1015200011,10000,0,1015200012,6000,4320,1015200013,1100,8640,1015200014,1000,17280,FALSE,1 +101520002,0,0,0,306075,120,306070,30,306074,20,1015200021,10000,0,1015200022,6000,4320,1015200023,1100,8640,1015200024,1000,17280,FALSE,1 +101520003,0,0,0,306075,120,306070,30,306074,20,1015200031,10000,0,1015200032,6000,4320,1015200033,1100,8640,1015200034,1000,17280,FALSE,1 +101530001,0,0,0,306080,160,306070,50,306073,30,1015300011,10000,0,1015300012,6000,4320,1015300013,1100,8640,1015300014,1000,17280,FALSE,1 +101530002,0,0,0,306080,160,306070,50,306073,30,1015300021,10000,0,1015300022,6000,4320,1015300023,1100,8640,1015300024,1000,17280,FALSE,1 +101540001,0,0,0,306080,160,306070,50,306072,30,1015400011,10000,0,1015400012,6000,4320,1015400013,1100,8640,1015400014,1000,17280,FALSE,1 +101540002,0,0,0,306080,160,306070,50,306072,30,1015400021,10000,0,1015400022,6000,4320,1015400023,1100,8640,1015400024,1000,17280,FALSE,1 +101540003,0,0,0,306080,160,306070,50,306072,30,1015400031,10000,0,1015400032,6000,4320,1015400033,1100,8640,1015400034,1000,17280,FALSE,1 +102500011,0,0,0,306082,160,306070,90,,,1025000111,10000,0,1025000112,6000,4320,1025000113,1100,8640,1025000114,1000,17280,FALSE,1 +102500012,0,0,0,306082,160,306070,90,,,1025000121,10000,0,1025000122,6000,4320,1025000123,1100,8640,1025000124,1000,17280,FALSE,1 +102510011,0,0,0,306077,120,306070,30,306071,20,1025100111,10000,0,1025100112,6000,4320,1025100113,1100,8640,1025100114,1000,17280,FALSE,1 +102510012,0,0,0,306077,120,306070,30,306071,20,1025100121,10000,0,1025100122,6000,4320,1025100123,1100,8640,1025100124,1000,17280,FALSE,1 +102520011,0,0,0,306077,120,306070,30,306074,20,1025200111,10000,0,1025200112,6000,4320,1025200113,1100,8640,1025200114,1000,17280,FALSE,1 +102520012,0,0,0,306077,120,306070,30,306074,20,1025200121,10000,0,1025200122,6000,4320,1025200123,1100,8640,1025200124,1000,17280,FALSE,1 +102520013,0,0,0,306077,120,306070,30,306074,20,1025200131,10000,0,1025200132,6000,4320,1025200133,1100,8640,1025200134,1000,17280,FALSE,1 +102530011,0,0,0,306082,160,306070,50,306073,30,1025300111,10000,0,1025300112,6000,4320,1025300113,1100,8640,1025300114,1000,17280,FALSE,1 +102530012,0,0,0,306082,160,306070,50,306073,30,1025300121,10000,0,1025300122,6000,4320,1025300123,1100,8640,1025300124,1000,17280,FALSE,1 +102540011,0,0,0,306082,160,306070,50,306072,30,1025400111,10000,0,1025400112,6000,4320,1025400113,1100,8640,1025400114,1000,17280,FALSE,1 +102540012,0,0,0,306082,160,306070,50,306072,30,1025400121,10000,0,1025400122,6000,4320,1025400123,1100,8640,1025400124,1000,17280,FALSE,1 +102540013,0,0,0,306082,160,306070,50,306072,30,1025400131,10000,0,1025400132,6000,4320,1025400133,1100,8640,1025400134,1000,17280,FALSE,1 +103500011,0,0,0,306081,160,306070,90,,,1035000111,10000,0,1035000112,6000,4320,1035000113,1100,8640,1035000114,1000,17280,FALSE,1 +103500012,0,0,0,306081,160,306070,90,,,1035000121,10000,0,1035000122,6000,4320,1035000123,1100,8640,1035000124,1000,17280,FALSE,1 +103510011,0,0,0,306076,120,306070,30,306071,20,1035100111,10000,0,1035100112,6000,4320,1035100113,1100,8640,1035100114,1000,17280,FALSE,1 +103510012,0,0,0,306076,120,306070,30,306071,20,1035100121,10000,0,1035100122,6000,4320,1035100123,1100,8640,1035100124,1000,17280,FALSE,1 +103520011,0,0,0,306076,120,306070,30,306074,20,1035200111,10000,0,1035200112,6000,4320,1035200113,1100,8640,1035200114,1000,17280,FALSE,1 +103520012,0,0,0,306076,120,306070,30,306074,20,1035200121,10000,0,1035200122,6000,4320,1035200123,1100,8640,1035200124,1000,17280,FALSE,1 +103520013,0,0,0,306076,120,306070,30,306074,20,1035200131,10000,0,1035200132,6000,4320,1035200133,1100,8640,1035200134,1000,17280,FALSE,1 +103530011,0,0,0,306081,160,306070,50,306073,30,1035300111,10000,0,1035300112,6000,4320,1035300113,1100,8640,1035300114,1000,17280,FALSE,1 +103530012,0,0,0,306081,160,306070,50,306073,30,1035300121,10000,0,1035300122,6000,4320,1035300123,1100,8640,1035300124,1000,17280,FALSE,1 +103540011,0,0,0,306081,160,306070,50,306072,30,1035400111,10000,0,1035400112,6000,4320,1035400113,1100,8640,1035400114,1000,17280,FALSE,1 +103540012,0,0,0,306081,160,306070,50,306072,30,1035400121,10000,0,1035400122,6000,4320,1035400123,1100,8640,1035400124,1000,17280,FALSE,1 +103540013,0,0,0,306081,160,306070,50,306072,30,1035400131,10000,0,1035400132,6000,4320,1035400133,1100,8640,1035400134,1000,17280,FALSE,1 +104500011,0,0,0,306083,160,306070,90,,,1045000111,10000,0,1045000112,6000,4320,1045000113,1100,8640,1045000114,1000,17280,FALSE,1 +104500012,0,0,0,306083,160,306070,90,,,1045000121,10000,0,1045000122,6000,4320,1045000123,1100,8640,1045000124,1000,17280,FALSE,1 +104510011,0,0,0,306078,120,306070,30,306071,20,1045100111,10000,0,1045100112,6000,4320,1045100113,1100,8640,1045100114,1000,17280,FALSE,1 +104510012,0,0,0,306078,120,306070,30,306071,20,1045100121,10000,0,1045100122,6000,4320,1045100123,1100,8640,1045100124,1000,17280,FALSE,1 +104520011,0,0,0,306078,120,306070,30,306074,20,1045200111,10000,0,1045200112,6000,4320,1045200113,1100,8640,1045200114,1000,17280,FALSE,1 +104520012,0,0,0,306078,120,306070,30,306074,20,1045200121,10000,0,1045200122,6000,4320,1045200123,1100,8640,1045200124,1000,17280,FALSE,1 +104520013,0,0,0,306078,120,306070,30,306074,20,1045200131,10000,0,1045200132,6000,4320,1045200133,1100,8640,1045200134,1000,17280,FALSE,1 +104530011,0,0,0,306083,160,306070,50,306073,30,1045300111,10000,0,1045300112,6000,4320,1045300113,1100,8640,1045300114,1000,17280,FALSE,1 +104530012,0,0,0,306083,160,306070,50,306073,30,1045300121,10000,0,1045300122,6000,4320,1045300123,1100,8640,1045300124,1000,17280,FALSE,1 +104540011,0,0,0,306083,160,306070,50,306072,30,1045400111,10000,0,1045400112,6000,4320,1045400113,1100,8640,1045400114,1000,17280,FALSE,1 +104540012,0,0,0,306083,160,306070,50,306072,30,1045400121,10000,0,1045400122,6000,4320,1045400123,1100,8640,1045400124,1000,17280,FALSE,1 +104540013,0,0,0,306083,160,306070,50,306072,30,1045400131,10000,0,1045400132,6000,4320,1045400133,1100,8640,1045400134,1000,17280,FALSE,1 +105500001,0,0,0,306084,160,306070,90,,,1055000011,10000,0,1055000012,6000,4320,1055000013,1100,8640,1055000014,1000,17280,FALSE,1 +105500002,0,0,0,306084,160,306070,90,,,1055000021,10000,0,1055000022,6000,4320,1055000023,1100,8640,1055000024,1000,17280,FALSE,1 +105510001,0,0,0,306079,120,306070,30,306071,20,1055100011,10000,0,1055100012,6000,4320,1055100013,1100,8640,1055100014,1000,17280,FALSE,1 +105510002,0,0,0,306079,120,306070,30,306071,20,1055100021,10000,0,1055100022,6000,4320,1055100023,1100,8640,1055100024,1000,17280,FALSE,1 +105520001,0,0,0,306079,120,306070,30,306074,20,1055200011,10000,0,1055200012,6000,4320,1055200013,1100,8640,1055200014,1000,17280,FALSE,1 +105520002,0,0,0,306079,120,306070,30,306074,20,1055200021,10000,0,1055200022,6000,4320,1055200023,1100,8640,1055200024,1000,17280,FALSE,1 +105520003,0,0,0,306079,120,306070,30,306074,20,1055200031,10000,0,1055200032,6000,4320,1055200033,1100,8640,1055200034,1000,17280,FALSE,1 +105530001,0,0,0,306084,160,306070,50,306073,30,1055300011,10000,0,1055300012,6000,4320,1055300013,1100,8640,1055300014,1000,17280,FALSE,1 +105530002,0,0,0,306084,160,306070,50,306073,30,1055300021,10000,0,1055300022,6000,4320,1055300023,1100,8640,1055300024,1000,17280,FALSE,1 +105540001,0,0,0,306084,160,306070,50,306072,30,1055400011,10000,0,1055400012,6000,4320,1055400013,1100,8640,1055400014,1000,17280,FALSE,1 +105540002,0,0,0,306084,160,306070,50,306072,30,1055400021,10000,0,1055400022,6000,4320,1055400023,1100,8640,1055400024,1000,17280,FALSE,1 +105540003,0,0,0,306084,160,306070,50,306072,30,1055400031,10000,0,1055400032,6000,4320,1055400033,1100,8640,1055400034,1000,17280,FALSE,1 106100001,0,0,1,,,,,,,1061000011,10000,0,1061000012,10000,0,1061000013,10000,0,,,,FALSE,1 106200001,0,0,1,,,,,,,1062000011,10000,0,1062000012,10000,0,1062000013,10000,0,,,,FALSE,1 106300001,0,0,1,,,,,,,1063000011,10000,0,1063000012,10000,0,1063000013,10000,0,,,,FALSE,1 @@ -512,69 +512,69 @@ ID,required_action_point,required_gold,required_block_index,material_id,material 106400031,0,0,1,,,,,,,1064000311,10000,0,1064000312,10000,0,1064000313,10000,0,,,,FALSE,1 106500051,0,0,1,,,,,,,1065000511,10000,0,1065000512,10000,0,1065000513,10000,0,,,,FALSE,1 106500061,0,0,1,,,,,,,1065000611,10000,0,1065000612,10000,0,1065000613,10000,0,,,,FALSE,1 -101500011,0,0,0,306095,150,306085,30,,,1015000111,10000,0,1015000112,6000,5400,1015000113,1500,10800,1015000114,1300,21600,FALSE,1 -101500012,0,0,0,306095,150,306085,30,,,1015000121,10000,0,1015000122,6000,5400,1015000123,1500,10800,1015000124,1300,21600,FALSE,1 -101510011,0,0,0,306090,150,306086,30,,,1015100111,10000,0,1015100112,6000,5400,1015100113,1500,10800,1015100114,1300,21600,FALSE,1 -101510012,0,0,0,306090,150,306086,30,,,1015100121,10000,0,1015100122,6000,5400,1015100123,1500,10800,1015100124,1300,21600,FALSE,1 -101520011,0,0,0,306090,150,306087,30,,,1015200111,10000,0,1015200112,6000,5400,1015200113,1500,10800,1015200114,1300,21600,FALSE,1 -101520012,0,0,0,306090,150,306087,30,,,1015200121,10000,0,1015200122,6000,5400,1015200123,1500,10800,1015200124,1300,21600,FALSE,1 -101520013,0,0,0,306090,150,306087,30,,,1015200131,10000,0,1015200132,6000,5400,1015200133,1500,10800,1015200134,1300,21600,FALSE,1 -101530011,0,0,0,306095,150,306088,30,,,1015300111,10000,0,1015300112,6000,5400,1015300113,1500,10800,1015300114,1300,21600,FALSE,1 -101530012,0,0,0,306095,150,306088,30,,,1015300121,10000,0,1015300122,6000,5400,1015300123,1500,10800,1015300124,1300,21600,FALSE,1 -101540011,0,0,0,306090,150,306095,150,306089,40,1015400111,10000,0,1015400112,6000,5400,1015400113,1500,10800,1015400114,1300,21600,FALSE,1 -101540012,0,0,0,306090,150,306095,150,306089,40,1015400121,10000,0,1015400122,6000,5400,1015400123,1500,10800,1015400124,1300,21600,FALSE,1 -101540013,0,0,0,306090,150,306095,150,306089,40,1015400131,10000,0,1015400132,6000,5400,1015400133,1500,10800,1015400134,1300,21600,FALSE,1 -102500001,0,0,0,306097,150,306085,30,,,1025000011,10000,0,1025000012,6000,5400,1025000013,1500,10800,1025000014,1300,21600,FALSE,1 -102500002,0,0,0,306097,150,306085,30,,,1025000021,10000,0,1025000022,6000,5400,1025000023,1500,10800,1025000024,1300,21600,FALSE,1 -102510001,0,0,0,306091,150,306086,30,,,1025100011,10000,0,1025100012,6000,5400,1025100013,1500,10800,1025100014,1300,21600,FALSE,1 -102510002,0,0,0,306091,150,306086,30,,,1025100021,10000,0,1025100022,6000,5400,1025100023,1500,10800,1025100024,1300,21600,FALSE,1 -102520001,0,0,0,306091,150,306087,30,,,1025200011,10000,0,1025200012,6000,5400,1025200013,1500,10800,1025200014,1300,21600,FALSE,1 -102520002,0,0,0,306091,150,306087,30,,,1025200021,10000,0,1025200022,6000,5400,1025200023,1500,10800,1025200024,1300,21600,FALSE,1 -102520003,0,0,0,306091,150,306087,30,,,1025200031,10000,0,1025200032,6000,5400,1025200033,1500,10800,1025200034,1300,21600,FALSE,1 -102530001,0,0,0,306097,150,306088,30,,,1025300011,10000,0,1025300012,6000,5400,1025300013,1500,10800,1025300014,1300,21600,FALSE,1 -102530002,0,0,0,306097,150,306088,30,,,1025300021,10000,0,1025300022,6000,5400,1025300023,1500,10800,1025300024,1300,21600,FALSE,1 -102540001,0,0,0,306092,150,306097,150,306089,40,1025400011,10000,0,1025400012,6000,5400,1025400013,1500,10800,1025400014,1300,21600,FALSE,1 -102540002,0,0,0,306091,150,306097,150,306089,40,1025400021,10000,0,1025400022,6000,5400,1025400023,1500,10800,1025400024,1300,21600,FALSE,1 -102540003,0,0,0,306091,150,306097,150,306089,40,1025400031,10000,0,1025400032,6000,5400,1025400033,1500,10800,1025400034,1300,21600,FALSE,1 -103500021,0,0,0,306096,150,306085,30,,,1035000211,10000,0,1035000212,6000,5400,1035000213,1500,10800,1035000214,1300,21600,FALSE,1 -103500022,0,0,0,306096,150,306085,30,,,1035000221,10000,0,1035000222,6000,5400,1035000223,1500,10800,1035000224,1300,21600,FALSE,1 -103510021,0,0,0,306092,150,306086,30,,,1035100211,10000,0,1035100212,6000,5400,1035100213,1500,10800,1035100214,1300,21600,FALSE,1 -103510022,0,0,0,306092,150,306086,30,,,1035100221,10000,0,1035100222,6000,5400,1035100223,1500,10800,1035100224,1300,21600,FALSE,1 -103520021,0,0,0,306092,150,306087,30,,,1035200211,10000,0,1035200212,6000,5400,1035200213,1500,10800,1035200214,1300,21600,FALSE,1 -103520022,0,0,0,306092,150,306087,30,,,1035200221,10000,0,1035200222,6000,5400,1035200223,1500,10800,1035200224,1300,21600,FALSE,1 -103520023,0,0,0,306092,150,306087,30,,,1035200231,10000,0,1035200232,6000,5400,1035200233,1500,10800,1035200234,1300,21600,FALSE,1 -103530021,0,0,0,306096,150,306088,30,,,1035300211,10000,0,1035300212,6000,5400,1035300213,1500,10800,1035300214,1300,21600,FALSE,1 -103530022,0,0,0,306096,150,306088,30,,,1035300221,10000,0,1035300222,6000,5400,1035300223,1500,10800,1035300224,1300,21600,FALSE,1 -103540021,0,0,0,306092,150,306096,150,306089,40,1035400211,10000,0,1035400212,6000,5400,1035400213,1500,10800,1035400214,1300,21600,FALSE,1 -103540022,0,0,0,306092,150,306096,150,306089,40,1035400221,10000,0,1035400222,6000,5400,1035400223,1500,10800,1035400224,1300,21600,FALSE,1 -103540023,0,0,0,306092,150,306096,150,306089,40,1035400231,10000,0,1035400232,6000,5400,1035400233,1500,10800,1035400234,1300,21600,FALSE,1 -104500021,0,0,0,306098,150,306085,30,,,1045000211,10000,0,1045000212,6000,5400,1045000213,1500,10800,1045000214,1300,21600,FALSE,1 -104500022,0,0,0,306098,150,306085,30,,,1045000221,10000,0,1045000222,6000,5400,1045000223,1500,10800,1045000224,1300,21600,FALSE,1 -104510021,0,0,0,306093,150,306086,30,,,1045100211,10000,0,1045100212,6000,5400,1045100213,1500,10800,1045100214,1300,21600,FALSE,1 -104510022,0,0,0,306093,150,306086,30,,,1045100221,10000,0,1045100222,6000,5400,1045100223,1500,10800,1045100224,1300,21600,FALSE,1 -104520021,0,0,0,306093,150,306087,30,,,1045200211,10000,0,1045200212,6000,5400,1045200213,1500,10800,1045200214,1300,21600,FALSE,1 -104520022,0,0,0,306093,150,306087,30,,,1045200221,10000,0,1045200222,6000,5400,1045200223,1500,10800,1045200224,1300,21600,FALSE,1 -104520023,0,0,0,306093,150,306087,30,,,1045200231,10000,0,1045200232,6000,5400,1045200233,1500,10800,1045200234,1300,21600,FALSE,1 -104530021,0,0,0,306098,150,306088,30,,,1045300211,10000,0,1045300212,6000,5400,1045300213,1500,10800,1045300214,1300,21600,FALSE,1 -104530022,0,0,0,306098,150,306088,30,,,1045300221,10000,0,1045300222,6000,5400,1045300223,1500,10800,1045300224,1300,21600,FALSE,1 -104540021,0,0,0,306093,150,306098,150,306089,40,1045400211,10000,0,1045400212,6000,5400,1045400213,1500,10800,1045400214,1300,21600,FALSE,1 -104540022,0,0,0,306093,150,306098,150,306089,40,1045400221,10000,0,1045400222,6000,5400,1045400223,1500,10800,1045400224,1300,21600,FALSE,1 -104540023,0,0,0,306093,150,306098,150,306089,40,1045400231,10000,0,1045400232,6000,5400,1045400233,1500,10800,1045400234,1300,21600,FALSE,1 -105500011,0,0,0,306099,150,306085,30,,,1055000111,10000,0,1055000112,6000,5400,1055000113,1500,10800,1055000114,1300,21600,FALSE,1 -105500012,0,0,0,306099,150,306085,30,,,1055000121,10000,0,1055000122,6000,5400,1055000123,1500,10800,1055000124,1300,21600,FALSE,1 -105510011,0,0,0,306094,150,306086,30,,,1055100111,10000,0,1055100112,6000,5400,1055100113,1500,10800,1055100114,1300,21600,FALSE,1 -105510012,0,0,0,306094,150,306086,30,,,1055100121,10000,0,1055100122,6000,5400,1055100123,1500,10800,1055100124,1300,21600,FALSE,1 -105520011,0,0,0,306094,150,306087,30,,,1055200111,10000,0,1055200112,6000,5400,1055200113,1500,10800,1055200114,1300,21600,FALSE,1 -105520012,0,0,0,306094,150,306087,30,,,1055200121,10000,0,1055200122,6000,5400,1055200123,1500,10800,1055200124,1300,21600,FALSE,1 -105520013,0,0,0,306094,150,306087,30,,,1055200131,10000,0,1055200132,6000,5400,1055200133,1500,10800,1055200134,1300,21600,FALSE,1 -105530011,0,0,0,306099,150,306088,30,,,1055300111,10000,0,1055300112,6000,5400,1055300113,1500,10800,1055300114,1300,21600,FALSE,1 -105530012,0,0,0,306099,150,306088,30,,,1055300121,10000,0,1055300122,6000,5400,1055300123,1500,10800,1055300124,1300,21600,FALSE,1 -105540011,0,0,0,306094,150,306099,150,306089,40,1055400111,10000,0,1055400112,6000,5400,1055400113,1500,10800,1055400114,1300,21600,FALSE,1 -105540012,0,0,0,306094,150,306099,150,306089,40,1055400121,10000,0,1055400122,6000,5400,1055400123,1500,10800,1055400124,1300,21600,FALSE,1 -105540013,0,0,0,306094,150,306099,150,306089,40,1055400131,10000,0,1055400132,6000,5400,1055400133,1500,10800,1055400134,1300,21600,FALSE,1 -106400041,0,0,1,,,,,,,1064000411,10000,0,1064000412,10000,0,1064000413,10000,0,,,,FALSE,1 -106500071,0,0,1,,,,,,,1065000711,10000,0,1065000712,10000,0,1065000713,10000,0,,,,FALSE,1 -106600001,0,0,1,,,,,,,1066000011,10000,0,1066000012,10000,0,1066000013,10000,0,,,,FALSE,1 +101500011,0,0,0,306095,150,306085,30,,,1015000111,10000,0,1015000112,6000,4320,1015000113,1500,8640,1015000114,1300,17280,FALSE,1 +101500012,0,0,0,306095,150,306085,30,,,1015000121,10000,0,1015000122,6000,4320,1015000123,1500,8640,1015000124,1300,17280,FALSE,1 +101510011,0,0,0,306090,150,306086,30,,,1015100111,10000,0,1015100112,6000,4320,1015100113,1500,8640,1015100114,1300,17280,FALSE,1 +101510012,0,0,0,306090,150,306086,30,,,1015100121,10000,0,1015100122,6000,4320,1015100123,1500,8640,1015100124,1300,17280,FALSE,1 +101520011,0,0,0,306090,150,306087,30,,,1015200111,10000,0,1015200112,6000,4320,1015200113,1500,8640,1015200114,1300,17280,FALSE,1 +101520012,0,0,0,306090,150,306087,30,,,1015200121,10000,0,1015200122,6000,4320,1015200123,1500,8640,1015200124,1300,17280,FALSE,1 +101520013,0,0,0,306090,150,306087,30,,,1015200131,10000,0,1015200132,6000,4320,1015200133,1500,8640,1015200134,1300,17280,FALSE,1 +101530011,0,0,0,306095,150,306088,30,,,1015300111,10000,0,1015300112,6000,4320,1015300113,1500,8640,1015300114,1300,17280,FALSE,1 +101530012,0,0,0,306095,150,306088,30,,,1015300121,10000,0,1015300122,6000,4320,1015300123,1500,8640,1015300124,1300,17280,FALSE,1 +101540011,0,0,0,306090,150,306095,150,306089,40,1015400111,10000,0,1015400112,6000,4320,1015400113,1500,8640,1015400114,1300,17280,FALSE,1 +101540012,0,0,0,306090,150,306095,150,306089,40,1015400121,10000,0,1015400122,6000,4320,1015400123,1500,8640,1015400124,1300,17280,FALSE,1 +101540013,0,0,0,306090,150,306095,150,306089,40,1015400131,10000,0,1015400132,6000,4320,1015400133,1500,8640,1015400134,1300,17280,FALSE,1 +102500001,0,0,0,306097,150,306085,30,,,1025000011,10000,0,1025000012,6000,4320,1025000013,1500,8640,1025000014,1300,17280,FALSE,1 +102500002,0,0,0,306097,150,306085,30,,,1025000021,10000,0,1025000022,6000,4320,1025000023,1500,8640,1025000024,1300,17280,FALSE,1 +102510001,0,0,0,306091,150,306086,30,,,1025100011,10000,0,1025100012,6000,4320,1025100013,1500,8640,1025100014,1300,17280,FALSE,1 +102510002,0,0,0,306091,150,306086,30,,,1025100021,10000,0,1025100022,6000,4320,1025100023,1500,8640,1025100024,1300,17280,FALSE,1 +102520001,0,0,0,306091,150,306087,30,,,1025200011,10000,0,1025200012,6000,4320,1025200013,1500,8640,1025200014,1300,17280,FALSE,1 +102520002,0,0,0,306091,150,306087,30,,,1025200021,10000,0,1025200022,6000,4320,1025200023,1500,8640,1025200024,1300,17280,FALSE,1 +102520003,0,0,0,306091,150,306087,30,,,1025200031,10000,0,1025200032,6000,4320,1025200033,1500,8640,1025200034,1300,17280,FALSE,1 +102530001,0,0,0,306097,150,306088,30,,,1025300011,10000,0,1025300012,6000,4320,1025300013,1500,8640,1025300014,1300,17280,FALSE,1 +102530002,0,0,0,306097,150,306088,30,,,1025300021,10000,0,1025300022,6000,4320,1025300023,1500,8640,1025300024,1300,17280,FALSE,1 +102540001,0,0,0,306092,150,306097,150,306089,40,1025400011,10000,0,1025400012,6000,4320,1025400013,1500,8640,1025400014,1300,17280,FALSE,1 +102540002,0,0,0,306091,150,306097,150,306089,40,1025400021,10000,0,1025400022,6000,4320,1025400023,1500,8640,1025400024,1300,17280,FALSE,1 +102540003,0,0,0,306091,150,306097,150,306089,40,1025400031,10000,0,1025400032,6000,4320,1025400033,1500,8640,1025400034,1300,17280,FALSE,1 +103500021,0,0,0,306096,150,306085,30,,,1035000211,10000,0,1035000212,6000,4320,1035000213,1500,8640,1035000214,1300,17280,FALSE,1 +103500022,0,0,0,306096,150,306085,30,,,1035000221,10000,0,1035000222,6000,4320,1035000223,1500,8640,1035000224,1300,17280,FALSE,1 +103510021,0,0,0,306092,150,306086,30,,,1035100211,10000,0,1035100212,6000,4320,1035100213,1500,8640,1035100214,1300,17280,FALSE,1 +103510022,0,0,0,306092,150,306086,30,,,1035100221,10000,0,1035100222,6000,4320,1035100223,1500,8640,1035100224,1300,17280,FALSE,1 +103520021,0,0,0,306092,150,306087,30,,,1035200211,10000,0,1035200212,6000,4320,1035200213,1500,8640,1035200214,1300,17280,FALSE,1 +103520022,0,0,0,306092,150,306087,30,,,1035200221,10000,0,1035200222,6000,4320,1035200223,1500,8640,1035200224,1300,17280,FALSE,1 +103520023,0,0,0,306092,150,306087,30,,,1035200231,10000,0,1035200232,6000,4320,1035200233,1500,8640,1035200234,1300,17280,FALSE,1 +103530021,0,0,0,306096,150,306088,30,,,1035300211,10000,0,1035300212,6000,4320,1035300213,1500,8640,1035300214,1300,17280,FALSE,1 +103530022,0,0,0,306096,150,306088,30,,,1035300221,10000,0,1035300222,6000,4320,1035300223,1500,8640,1035300224,1300,17280,FALSE,1 +103540021,0,0,0,306092,150,306096,150,306089,40,1035400211,10000,0,1035400212,6000,4320,1035400213,1500,8640,1035400214,1300,17280,FALSE,1 +103540022,0,0,0,306092,150,306096,150,306089,40,1035400221,10000,0,1035400222,6000,4320,1035400223,1500,8640,1035400224,1300,17280,FALSE,1 +103540023,0,0,0,306092,150,306096,150,306089,40,1035400231,10000,0,1035400232,6000,4320,1035400233,1500,8640,1035400234,1300,17280,FALSE,1 +104500021,0,0,0,306098,150,306085,30,,,1045000211,10000,0,1045000212,6000,4320,1045000213,1500,8640,1045000214,1300,17280,FALSE,1 +104500022,0,0,0,306098,150,306085,30,,,1045000221,10000,0,1045000222,6000,4320,1045000223,1500,8640,1045000224,1300,17280,FALSE,1 +104510021,0,0,0,306093,150,306086,30,,,1045100211,10000,0,1045100212,6000,4320,1045100213,1500,8640,1045100214,1300,17280,FALSE,1 +104510022,0,0,0,306093,150,306086,30,,,1045100221,10000,0,1045100222,6000,4320,1045100223,1500,8640,1045100224,1300,17280,FALSE,1 +104520021,0,0,0,306093,150,306087,30,,,1045200211,10000,0,1045200212,6000,4320,1045200213,1500,8640,1045200214,1300,17280,FALSE,1 +104520022,0,0,0,306093,150,306087,30,,,1045200221,10000,0,1045200222,6000,4320,1045200223,1500,8640,1045200224,1300,17280,FALSE,1 +104520023,0,0,0,306093,150,306087,30,,,1045200231,10000,0,1045200232,6000,4320,1045200233,1500,8640,1045200234,1300,17280,FALSE,1 +104530021,0,0,0,306098,150,306088,30,,,1045300211,10000,0,1045300212,6000,4320,1045300213,1500,8640,1045300214,1300,17280,FALSE,1 +104530022,0,0,0,306098,150,306088,30,,,1045300221,10000,0,1045300222,6000,4320,1045300223,1500,8640,1045300224,1300,17280,FALSE,1 +104540021,0,0,0,306093,150,306098,150,306089,40,1045400211,10000,0,1045400212,6000,4320,1045400213,1500,8640,1045400214,1300,17280,FALSE,1 +104540022,0,0,0,306093,150,306098,150,306089,40,1045400221,10000,0,1045400222,6000,4320,1045400223,1500,8640,1045400224,1300,17280,FALSE,1 +104540023,0,0,0,306093,150,306098,150,306089,40,1045400231,10000,0,1045400232,6000,4320,1045400233,1500,8640,1045400234,1300,17280,FALSE,1 +105500011,0,0,0,306099,150,306085,30,,,1055000111,10000,0,1055000112,6000,4320,1055000113,1500,8640,1055000114,1300,17280,FALSE,1 +105500012,0,0,0,306099,150,306085,30,,,1055000121,10000,0,1055000122,6000,4320,1055000123,1500,8640,1055000124,1300,17280,FALSE,1 +105510011,0,0,0,306094,150,306086,30,,,1055100111,10000,0,1055100112,6000,4320,1055100113,1500,8640,1055100114,1300,17280,FALSE,1 +105510012,0,0,0,306094,150,306086,30,,,1055100121,10000,0,1055100122,6000,4320,1055100123,1500,8640,1055100124,1300,17280,FALSE,1 +105520011,0,0,0,306094,150,306087,30,,,1055200111,10000,0,1055200112,6000,4320,1055200113,1500,8640,1055200114,1300,17280,FALSE,1 +105520012,0,0,0,306094,150,306087,30,,,1055200121,10000,0,1055200122,6000,4320,1055200123,1500,8640,1055200124,1300,17280,FALSE,1 +105520013,0,0,0,306094,150,306087,30,,,1055200131,10000,0,1055200132,6000,4320,1055200133,1500,8640,1055200134,1300,17280,FALSE,1 +105530011,0,0,0,306099,150,306088,30,,,1055300111,10000,0,1055300112,6000,4320,1055300113,1500,8640,1055300114,1300,17280,FALSE,1 +105530012,0,0,0,306099,150,306088,30,,,1055300121,10000,0,1055300122,6000,4320,1055300123,1500,8640,1055300124,1300,17280,FALSE,1 +105540011,0,0,0,306094,150,306099,150,306089,40,1055400111,10000,0,1055400112,6000,4320,1055400113,1500,8640,1055400114,1300,17280,FALSE,1 +105540012,0,0,0,306094,150,306099,150,306089,40,1055400121,10000,0,1055400122,6000,4320,1055400123,1500,8640,1055400124,1300,17280,FALSE,1 +105540013,0,0,0,306094,150,306099,150,306089,40,1055400131,10000,0,1055400132,6000,4320,1055400133,1500,8640,1055400134,1300,17280,FALSE,1 +106400041,0,0,1,,,,,,,1064000411,10000,0,1064000412,10000,0,1064000413,10000,0,1064000414,10000,0,FALSE,1 +106500071,0,0,1,,,,,,,1065000711,10000,0,1065000712,10000,0,1065000713,10000,0,1065000714,10000,0,FALSE,1 +106600001,0,0,1,,,,,,,1066000011,10000,0,1066000012,10000,0,1066000013,10000,0,1066000014,10000,0,FALSE,1 107300001,0,0,1,,,,,,,1073000011,10000,0,1073000012,10000,0,1073000013,10000,0,1073000014,10000,0,FALSE,1 107300011,0,0,1,,,,,,,1073000011,10000,0,1073000012,10000,0,1073000013,10000,0,1073000114,10000,0,FALSE,1 107300021,0,0,1,,,,,,,1073000011,10000,0,1073000012,10000,0,1073000013,10000,0,1073000214,10000,0,FALSE,1 diff --git a/Lib9c/TableCSV/Item/ItemRequirementSheet.csv b/Lib9c/TableCSV/Item/ItemRequirementSheet.csv index af83339b53..b897a2f171 100644 --- a/Lib9c/TableCSV/Item/ItemRequirementSheet.csv +++ b/Lib9c/TableCSV/Item/ItemRequirementSheet.csv @@ -397,4 +397,29 @@ item_id,level,mimislevel 10760008,1,1 900110,1,1 900111,1,1 -900112,1,1 \ No newline at end of file +900112,1,1 +20160000,300,300 +20160001,300,300 +20160002,350,350 +20160003,400,400 +20160004,450,450 +20260000,300,300 +20260001,300,300 +20260002,350,350 +20260003,400,400 +20260004,450,450 +20360000,300,300 +20360001,300,300 +20360002,350,350 +20360003,400,400 +20360004,450,450 +20460000,300,300 +20460001,300,300 +20460002,350,350 +20460003,400,400 +20460004,450,450 +20560000,300,300 +20560001,300,300 +20560002,350,350 +20560003,400,400 +20560004,450,450 \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/MaterialItemSheet.csv b/Lib9c/TableCSV/Item/MaterialItemSheet.csv index b48535e29e..f3dc7421f0 100644 --- a/Lib9c/TableCSV/Item/MaterialItemSheet.csv +++ b/Lib9c/TableCSV/Item/MaterialItemSheet.csv @@ -249,4 +249,4 @@ id,_name,item_sub_type,grade,elemental_type 700906,챔피언 쉽 9 메달,NormalMaterial,5,Normal 701002,시즌 23 메달,NormalMaterial,5,Normal 701004,시즌 24 메달,NormalMaterial,5,Normal -701006,챔피언 쉽 10 메달,NormalMaterial,5,Normal +701006,챔피언 쉽 10 메달,NormalMaterial,5,Normal \ No newline at end of file diff --git a/Lib9c/TableCSV/Item/UnlockCombinationSlotCostSheet.csv b/Lib9c/TableCSV/Item/UnlockCombinationSlotCostSheet.csv index d5d70edbb4..7703d27c84 100644 --- a/Lib9c/TableCSV/Item/UnlockCombinationSlotCostSheet.csv +++ b/Lib9c/TableCSV/Item/UnlockCombinationSlotCostSheet.csv @@ -1,5 +1,5 @@ slot_id,crystal_price,golden_dust_price,ruby_dust_price,ncg_price -4,30,0,0,0 -5,0,30,0,0 -6,0,0,30,0 -7,0,0,0,30 \ No newline at end of file +4,20000000,0,0,0 +5,0,1000,0,0 +6,0,0,500,0 +7,0,0,0,200 \ No newline at end of file diff --git a/Lib9c/TableCSV/Skill/ActionBuffSheet.csv b/Lib9c/TableCSV/Skill/ActionBuffSheet.csv index 6c76e7df33..1fdeae0aaa 100644 --- a/Lib9c/TableCSV/Skill/ActionBuffSheet.csv +++ b/Lib9c/TableCSV/Skill/ActionBuffSheet.csv @@ -7,8 +7,10 @@ id,group,_name,chance,duration,target_type,buff_type,elemental_type,atk_power_ra 704001,704000,기절,100,0,Enemies,Stun,Normal,0 705000,705000,흡혈,100,0,Self,Vampiric,Normal,0 706000,706000,집중,100,10,Self,Focus,Normal,0 +706001,706001,집중 (커스텀 장비),100,10,Self,Focus,Normal,0 707000,707000,디버프 회피율,45,12,Self,Dispel,Normal,0 707001,707001,디버프 회피율 (Rune),55,0,Self,Dispel,Normal,0 +707002,707002,디버프 회피율 (커스텀 장비),40,10,Self,Dispel,Normal,0 708000,708000,얼음 방패 (유니크 아우라),100,10,Self,IceShield,Normal,0 708001,708000,얼음 방패 (레전더리 아우라),100,10,Self,IceShield,Normal,0 708002,708000,얼음 방패 (신성 아우라),100,10,Self,IceShield,Normal,0 \ No newline at end of file diff --git a/Lib9c/TableCSV/Skill/SkillActionBuffSheet.csv b/Lib9c/TableCSV/Skill/SkillActionBuffSheet.csv index da80f4c74e..70083b24a1 100644 --- a/Lib9c/TableCSV/Skill/SkillActionBuffSheet.csv +++ b/Lib9c/TableCSV/Skill/SkillActionBuffSheet.csv @@ -11,4 +11,6 @@ skill_id,buff_id 700011,707001 700012,708000 700013,708001 -700014,708002 \ No newline at end of file +700014,708002 +800001,706001 +800012,707002 \ No newline at end of file diff --git a/Lib9c/TableCSV/Skill/SkillBuffSheet.csv b/Lib9c/TableCSV/Skill/SkillBuffSheet.csv index 723ef33f6c..9b2242cd41 100644 --- a/Lib9c/TableCSV/Skill/SkillBuffSheet.csv +++ b/Lib9c/TableCSV/Skill/SkillBuffSheet.csv @@ -308,4 +308,134 @@ skill_id,buff_id 220011,103011 250008,106006 250009,106007 -250010,106008 \ No newline at end of file +250010,106008 +800002,702001 +800003,702001 +800004,702001 +800005,702001 +800010,703001 +800011,703006 +800013,102020 +800014,102021 +800015,202006 +800016,202007 +800017,106013 +800018,106014 +800019,106014 +800020,206003 +800021,206004 +800022,206004 +800034,104008 +800035,204004 +800036,103016 +800037,103017 +800038,203007 +800039,203008 +800040,105004 +800041,105005 +800042,205006 +800043,205007 +800044,702001 +800045,702001 +800046,702001 +800047,702001 +800048,702001 +800049,702001 +800050,702001 +800051,702001 +800052,702001 +800053,702001 +800054,702001 +800055,702001 +800056,702001 +800057,702001 +800058,702001 +800059,702001 +800072,703002 +800073,703003 +800074,703004 +800075,703005 +800076,703007 +800077,703008 +800078,703009 +800079,703010 +800080,102022 +800081,102023 +800082,102024 +800083,102025 +800084,102021 +800085,102021 +800086,102021 +800087,102021 +800088,202008 +800089,202009 +800090,202010 +800091,202011 +800092,202007 +800093,202007 +800094,202007 +800095,202007 +800096,106015 +800097,106016 +800098,106017 +800099,106018 +800100,106014 +800101,106014 +800102,106014 +800103,106014 +800104,106014 +800105,106014 +800106,106014 +800107,106014 +800108,206005 +800109,206006 +800110,206007 +800111,206008 +800112,206004 +800113,206004 +800114,206004 +800115,206004 +800116,206004 +800117,206004 +800118,206004 +800119,206004 +800156,104009 +800157,104010 +800158,104011 +800159,104012 +800160,204005 +800161,204006 +800162,204007 +800163,204008 +800164,103018 +800165,103019 +800166,103020 +800167,103021 +800168,103017 +800169,103017 +800170,103017 +800171,103017 +800172,203009 +800173,203010 +800174,203011 +800175,203012 +800176,203008 +800177,203008 +800178,203008 +800179,203008 +800180,105006 +800181,105007 +800182,105008 +800183,105009 +800184,105005 +800185,105005 +800186,105005 +800187,105005 +800188,205008 +800189,205009 +800190,205010 +800191,205011 +800192,205007 +800193,205007 +800194,205007 +800195,205007 \ No newline at end of file diff --git a/Lib9c/TableCSV/Skill/SkillSheet.csv b/Lib9c/TableCSV/Skill/SkillSheet.csv index 9e539acb5b..8a5e7a7444 100644 --- a/Lib9c/TableCSV/Skill/SkillSheet.csv +++ b/Lib9c/TableCSV/Skill/SkillSheet.csv @@ -206,4 +206,207 @@ _250001,속도 증가(전체),Normal,Buff,SpeedBuff,Ally,1,1 // 미구현, 700012,얼음 방패 (유니크 아우라),Normal,Buff,Buff,Self,1,20, 700013,얼음 방패 (레전더리 아우라),Normal,Buff,Buff,Self,1,20, 700014,얼음 방패 (신성 아우라),Normal,Buff,Buff,Self,1,20, -700015,모든 스텟 감소,Normal,Debuff,Buff,Enemies,1,15, \ No newline at end of file +700015,모든 스텟 감소,Normal,Debuff,Buff,Enemies,1,15, +800001,집중,Normal,Buff,Focus,Self,1,10, +800002,받는 피해 감소 (ATK),Normal,Buff,DamageReductionBuff,Self,1,16, +800003,받는 피해 감소 (DEF),Normal,Buff,DamageReductionBuff,Self,1,16, +800004,받는 피해 감소 (HIT),Normal,Buff,DamageReductionBuff,Self,1,16, +800005,받는 피해 감소 (SPD),Normal,Buff,DamageReductionBuff,Self,1,16, +800006,더블 어택,Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800007,더블 어택 (ATK 비례),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800008,더블 어택 (DEF 비례),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800009,더블 어택 (SPD 비례),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800010,치명 데미지 증가,Normal,Buff,CriticalDamageBuff,Self,1,14, +800011,치명 데미지 감소,Normal,Debuff,CriticalDamageBuff,Enemies,1,10, +800012,디스펠(디버프 해제),Normal,Buff,Dispel,Self,1,15, +800013,ATK 증가 (고정 수치),Normal,Buff,AttackBuff,Self,1,10, +800014,ATK 증가 (DEF 비례 증가),Normal,Buff,AttackBuff,Self,1,10, +800015,ATK 감소 (고정 수치),Normal,Debuff,AttackBuff,Enemies,1,8, +800016,ATK 감소 (DEF 비례 증가),Normal,Debuff,AttackBuff,Enemies,1,8, +800017,SPD 증가 (고정 수치),Normal,Buff,SpeedBuff,Self,1,10, +800018,SPD 증가 (DEF 비례 증가),Normal,Buff,SpeedBuff,Self,1,10, +800019,SPD 증가 (HIT 비례 증가),Normal,Buff,SpeedBuff,Self,1,10, +800020,SPD 감소 (고정 수치),Normal,Debuff,SpeedBuff,Enemies,1,8, +800021,SPD 감소 (DEF 비례 증가),Normal,Debuff,SpeedBuff,Enemies,1,8, +800022,SPD 감소 (HIT 비례 증가),Normal,Debuff,SpeedBuff,Enemies,1,8, +800023,범위 피해 1타 (고정 데미지),Wind,Attack,BlowAttack,Enemies,1,13, +800024,범위 피해 1타 (ATK 비례 데미지),Fire,Attack,BlowAttack,Enemies,1,13, +800025,범위 피해 1타 (DEF 비례 데미지),Water,Attack,BlowAttack,Enemies,1,13, +800026,범위 피해 5타 (고정 데미지),Wind,Attack,AreaAttack,Enemies,5,13, +800027,범위 피해 5타 (ATK 비례 데미지),Fire,Attack,AreaAttack,Enemies,5,13, +800028,범위 피해 5타 (DEF 비례 데미지),Water,Attack,AreaAttack,Enemies,5,13, +800029,회복 (HP 비례 데미지),Normal,Heal,Heal,Self,1,16, +800030,회복 (ATK 비례 데미지),Normal,Heal,Heal,Self,1,16, +800031,회복 (DEF 비례 데미지),Normal,Heal,Heal,Self,1,16, +800032,회복 (HIT 비례 데미지),Normal,Heal,Heal,Self,1,16, +800033,회복 (SPD 비례 데미지),Normal,Heal,Heal,Self,1,16, +800034,CRI 증가,Normal,Buff,CriticalBuff,Self,1,10, +800035,CRI 감소,Normal,Debuff,CriticalBuff,Enemy,1,10, +800036,DEF 증가 (고정 증가),Normal,Buff,DefenseBuff,Self,1,25, +800037,DEF 증가 (ATK 비례 증가),Normal,Buff,DefenseBuff,Self,1,25, +800038,DEF 감소 (고정 증가),Normal,Debuff,DefenseBuff,Enemy,1,10, +800039,DEF 감소 (ATK 비례 증가),Normal,Debuff,DefenseBuff,Enemy,1,10, +800040,HIT 증가 (고정 증가),Normal,Buff,HitBuff,Self,1,25, +800041,HIT 증가 (SPD 비례 증가),Normal,Buff,HitBuff,Self,1,25, +800042,HIT 감소 (고정 증가),Normal,Debuff,HitBuff,Enemy,1,10, +800043,HIT 감소 (SPD 비례 증가),Normal,Debuff,HitBuff,Enemy,1,10, +800044,받는 피해 감소 (AA),Normal,Buff,DamageReductionBuff,Self,1,16, +800045,받는 피해 감소 (BA),Normal,Buff,DamageReductionBuff,Self,1,16, +800046,받는 피해 감소 (CA),Normal,Buff,DamageReductionBuff,Self,1,16, +800047,받는 피해 감소 (DA),Normal,Buff,DamageReductionBuff,Self,1,16, +800048,받는 피해 감소 (AD),Normal,Buff,DamageReductionBuff,Self,1,16, +800049,받는 피해 감소 (BD),Normal,Buff,DamageReductionBuff,Self,1,16, +800050,받는 피해 감소 (CD),Normal,Buff,DamageReductionBuff,Self,1,16, +800051,받는 피해 감소 (DD),Normal,Buff,DamageReductionBuff,Self,1,16, +800052,받는 피해 감소 (AH),Normal,Buff,DamageReductionBuff,Self,1,16, +800053,받는 피해 감소 (BH),Normal,Buff,DamageReductionBuff,Self,1,16, +800054,받는 피해 감소 (CH),Normal,Buff,DamageReductionBuff,Self,1,16, +800055,받는 피해 감소 (DH),Normal,Buff,DamageReductionBuff,Self,1,16, +800056,받는 피해 감소 (AS),Normal,Buff,DamageReductionBuff,Self,1,16, +800057,받는 피해 감소 (BS),Normal,Buff,DamageReductionBuff,Self,1,16, +800058,받는 피해 감소 (CS),Normal,Buff,DamageReductionBuff,Self,1,16, +800059,받는 피해 감소 (DS),Normal,Buff,DamageReductionBuff,Self,1,16, +800060,더블 어택 (AA),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800061,더블 어택 (BA),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800062,더블 어택 (CA),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800063,더블 어택 (DA),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800064,더블 어택 (AD),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800065,더블 어택 (BD),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800066,더블 어택 (CD),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800067,더블 어택 (DD),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800068,더블 어택 (AS),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800069,더블 어택 (BS),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800070,더블 어택 (CS),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800071,더블 어택 (DS),Normal,Attack,DoubleAttack,Enemy,2,13,TRUE +800072,크리티컬 데미지 증가 (A),Normal,Buff,CriticalDamageBuff,Self,1,14, +800073,크리티컬 데미지 증가 (B),Normal,Buff,CriticalDamageBuff,Self,1,14, +800074,크리티컬 데미지 증가 (C),Normal,Buff,CriticalDamageBuff,Self,1,14, +800075,크리티컬 데미지 증가 (D),Normal,Buff,CriticalDamageBuff,Self,1,14, +800076,크리티컬 데미지 감소 (A),Normal,Debuff,CriticalDamageBuff,Enemies,1,10, +800077,크리티컬 데미지 감소 (B),Normal,Debuff,CriticalDamageBuff,Enemies,1,10, +800078,크리티컬 데미지 감소 (C),Normal,Debuff,CriticalDamageBuff,Enemies,1,10, +800079,크리티컬 데미지 감소 (D),Normal,Debuff,CriticalDamageBuff,Enemies,1,10, +800080,ATK 증가 (AN),Normal,Buff,AttackBuff,Self,1,10, +800081,ATK 증가 (BN),Normal,Buff,AttackBuff,Self,1,10, +800082,ATK 증가 (CN),Normal,Buff,AttackBuff,Self,1,10, +800083,ATK 증가 (DN),Normal,Buff,AttackBuff,Self,1,10, +800084,ATK 증가 (AD),Normal,Buff,AttackBuff,Self,1,10, +800085,ATK 증가 (BD),Normal,Buff,AttackBuff,Self,1,10, +800086,ATK 증가 (CD),Normal,Buff,AttackBuff,Self,1,10, +800087,ATK 증가 (DD),Normal,Buff,AttackBuff,Self,1,10, +800088,ATK 감소 (AN),Normal,Debuff,AttackBuff,Enemies,1,8, +800089,ATK 감소 (BN),Normal,Debuff,AttackBuff,Enemies,1,8, +800090,ATK 감소 (CN),Normal,Debuff,AttackBuff,Enemies,1,8, +800091,ATK 감소 (DN),Normal,Debuff,AttackBuff,Enemies,1,8, +800092,ATK 감소 (AD),Normal,Debuff,AttackBuff,Enemies,1,8, +800093,ATK 감소 (BD),Normal,Debuff,AttackBuff,Enemies,1,8, +800094,ATK 감소 (CD),Normal,Debuff,AttackBuff,Enemies,1,8, +800095,ATK 감소 (DD),Normal,Debuff,AttackBuff,Enemies,1,8, +800096,SPD 증가 (AN),Normal,Buff,SpeedBuff,Self,1,10, +800097,SPD 증가 (BN),Normal,Buff,SpeedBuff,Self,1,10, +800098,SPD 증가 (CN),Normal,Buff,SpeedBuff,Self,1,10, +800099,SPD 증가 (DN),Normal,Buff,SpeedBuff,Self,1,10, +800100,SPD 증가 (AD),Normal,Buff,SpeedBuff,Self,1,10, +800101,SPD 증가 (BD),Normal,Buff,SpeedBuff,Self,1,10, +800102,SPD 증가 (CD),Normal,Buff,SpeedBuff,Self,1,10, +800103,SPD 증가 (DD),Normal,Buff,SpeedBuff,Self,1,10, +800104,SPD 증가 (AH),Normal,Buff,SpeedBuff,Self,1,10, +800105,SPD 증가 (BH),Normal,Buff,SpeedBuff,Self,1,10, +800106,SPD 증가 (CH),Normal,Buff,SpeedBuff,Self,1,10, +800107,SPD 증가 (DH),Normal,Buff,SpeedBuff,Self,1,10, +800108,SPD 감소 (AN),Normal,Debuff,SpeedBuff,Enemies,1,8, +800109,SPD 감소 (BN),Normal,Debuff,SpeedBuff,Enemies,1,8, +800110,SPD 감소 (CN),Normal,Debuff,SpeedBuff,Enemies,1,8, +800111,SPD 감소 (DN),Normal,Debuff,SpeedBuff,Enemies,1,8, +800112,SPD 감소 (AD),Normal,Debuff,SpeedBuff,Enemies,1,8, +800113,SPD 감소 (BD),Normal,Debuff,SpeedBuff,Enemies,1,8, +800114,SPD 감소 (CD),Normal,Debuff,SpeedBuff,Enemies,1,8, +800115,SPD 감소 (DD),Normal,Debuff,SpeedBuff,Enemies,1,8, +800116,SPD 감소 (AH),Normal,Debuff,SpeedBuff,Enemies,1,8, +800117,SPD 감소 (BH),Normal,Debuff,SpeedBuff,Enemies,1,8, +800118,SPD 감소 (CH),Normal,Debuff,SpeedBuff,Enemies,1,8, +800119,SPD 감소 (DH),Normal,Debuff,SpeedBuff,Enemies,1,8, +800120,단일 전체 공격 (AA),Fire,Attack,BlowAttack,Enemies,1,13, +800121,단일 전체 공격 (BA),Fire,Attack,BlowAttack,Enemies,1,13, +800122,단일 전체 공격 (CA),Fire,Attack,BlowAttack,Enemies,1,13, +800123,단일 전체 공격 (DA),Fire,Attack,BlowAttack,Enemies,1,13, +800124,단일 전체 공격 (AD),Water,Attack,BlowAttack,Enemies,1,13, +800125,단일 전체 공격 (BD),Water,Attack,BlowAttack,Enemies,1,13, +800126,단일 전체 공격 (CD),Water,Attack,BlowAttack,Enemies,1,13, +800127,단일 전체 공격 (DD),Water,Attack,BlowAttack,Enemies,1,13, +800128,연속 전체 공격 (AA),Fire,Attack,AreaAttack,Enemies,5,13, +800129,연속 전체 공격 (BA),Fire,Attack,AreaAttack,Enemies,5,13, +800130,연속 전체 공격 (CA),Fire,Attack,AreaAttack,Enemies,5,13, +800131,연속 전체 공격 (DA),Fire,Attack,AreaAttack,Enemies,5,13, +800132,연속 전체 공격 (AD),Water,Attack,AreaAttack,Enemies,5,13, +800133,연속 전체 공격 (BD),Water,Attack,AreaAttack,Enemies,5,13, +800134,연속 전체 공격 (CD),Water,Attack,AreaAttack,Enemies,5,13, +800135,연속 전체 공격 (DD),Water,Attack,AreaAttack,Enemies,5,13, +800136,회복 (AH),Normal,Heal,Heal,Self,1,16, +800137,회복 (BH),Normal,Heal,Heal,Self,1,16, +800138,회복 (CH),Normal,Heal,Heal,Self,1,16, +800139,회복 (DH),Normal,Heal,Heal,Self,1,16, +800140,회복 (AA),Normal,Heal,Heal,Self,1,16, +800141,회복 (BA),Normal,Heal,Heal,Self,1,16, +800142,회복 (CA),Normal,Heal,Heal,Self,1,16, +800143,회복 (DA),Normal,Heal,Heal,Self,1,16, +800144,회복 (AD),Normal,Heal,Heal,Self,1,16, +800145,회복 (BD),Normal,Heal,Heal,Self,1,16, +800146,회복 (CD),Normal,Heal,Heal,Self,1,16, +800147,회복 (DD),Normal,Heal,Heal,Self,1,16, +800148,회복 (AH),Normal,Heal,Heal,Self,1,16, +800149,회복 (BH),Normal,Heal,Heal,Self,1,16, +800150,회복 (CH),Normal,Heal,Heal,Self,1,16, +800151,회복 (DH),Normal,Heal,Heal,Self,1,16, +800152,회복 (AS),Normal,Heal,Heal,Self,1,16, +800153,회복 (BS),Normal,Heal,Heal,Self,1,16, +800154,회복 (CS),Normal,Heal,Heal,Self,1,16, +800155,회복 (DS),Normal,Heal,Heal,Self,1,16, +800156,CRI 증가 (AN),Normal,Buff,CriticalBuff,Self,1,10, +800157,CRI 증가 (BN),Normal,Buff,CriticalBuff,Self,1,10, +800158,CRI 증가 (CN),Normal,Buff,CriticalBuff,Self,1,10, +800159,CRI 증가 (DN),Normal,Buff,CriticalBuff,Self,1,10, +800160,CRI 감소 (AN),Normal,Debuff,CriticalBuff,Enemy,1,10, +800161,CRI 감소 (BN),Normal,Debuff,CriticalBuff,Enemy,1,10, +800162,CRI 감소 (CN),Normal,Debuff,CriticalBuff,Enemy,1,10, +800163,CRI 감소 (DN),Normal,Debuff,CriticalBuff,Enemy,1,10, +800164,DEF 증가 (AN),Normal,Buff,DefenseBuff,Self,1,25, +800165,DEF 증가 (BN),Normal,Buff,DefenseBuff,Self,1,25, +800166,DEF 증가 (CN),Normal,Buff,DefenseBuff,Self,1,25, +800167,DEF 증가 (DN),Normal,Buff,DefenseBuff,Self,1,25, +800168,DEF 증가 (AA),Normal,Buff,DefenseBuff,Self,1,25, +800169,DEF 증가 (BA),Normal,Buff,DefenseBuff,Self,1,25, +800170,DEF 증가 (CA),Normal,Buff,DefenseBuff,Self,1,25, +800171,DEF 증가 (DA),Normal,Buff,DefenseBuff,Self,1,25, +800172,DEF 감소 (AN),Normal,Debuff,DefenseBuff,Enemy,1,10, +800173,DEF 감소 (BN),Normal,Debuff,DefenseBuff,Enemy,1,10, +800174,DEF 감소 (CN),Normal,Debuff,DefenseBuff,Enemy,1,10, +800175,DEF 감소 (DN),Normal,Debuff,DefenseBuff,Enemy,1,10, +800176,DEF 감소 (AA),Normal,Debuff,DefenseBuff,Enemy,1,10, +800177,DEF 감소 (BA),Normal,Debuff,DefenseBuff,Enemy,1,10, +800178,DEF 감소 (CA),Normal,Debuff,DefenseBuff,Enemy,1,10, +800179,DEF 감소 (DA),Normal,Debuff,DefenseBuff,Enemy,1,10, +800180,HIT 증가 (AN),Normal,Buff,HitBuff,Self,1,25, +800181,HIT 증가 (BN),Normal,Buff,HitBuff,Self,1,25, +800182,HIT 증가 (CN),Normal,Buff,HitBuff,Self,1,25, +800183,HIT 증가 (DN),Normal,Buff,HitBuff,Self,1,25, +800184,HIT 증가 (AS),Normal,Buff,HitBuff,Self,1,25, +800185,HIT 증가 (BS),Normal,Buff,HitBuff,Self,1,25, +800186,HIT 증가 (CS),Normal,Buff,HitBuff,Self,1,25, +800187,HIT 증가 (DS),Normal,Buff,HitBuff,Self,1,25, +800188,HIT 감소 (AN),Normal,Debuff,HitBuff,Enemy,1,10, +800189,HIT 감소 (BN),Normal,Debuff,HitBuff,Enemy,1,10, +800190,HIT 감소 (CN),Normal,Debuff,HitBuff,Enemy,1,10, +800191,HIT 감소 (DN),Normal,Debuff,HitBuff,Enemy,1,10, +800192,HIT 감소 (AS),Normal,Debuff,HitBuff,Enemy,1,10, +800193,HIT 감소 (BS),Normal,Debuff,HitBuff,Enemy,1,10, +800194,HIT 감소 (CS),Normal,Debuff,HitBuff,Enemy,1,10, +800195,HIT 감소 (DS),Normal,Debuff,HitBuff,Enemy,1,10, +800196,단일 전체 공격 (AN),Fire,Attack,BlowAttack,Enemies,1,13, +800197,단일 전체 공격 (BN),Fire,Attack,BlowAttack,Enemies,1,13, +800198,단일 전체 공격 (CN),Fire,Attack,BlowAttack,Enemies,1,13, +800199,단일 전체 공격 (DN),Fire,Attack,BlowAttack,Enemies,1,13, +800200,연속 전체 공격 (AN),Fire,Attack,AreaAttack,Enemies,5,13, +800201,연속 전체 공격 (BN),Fire,Attack,AreaAttack,Enemies,5,13, +800202,연속 전체 공격 (CN),Fire,Attack,AreaAttack,Enemies,5,13, +800203,연속 전체 공격 (DN),Fire,Attack,AreaAttack,Enemies,5,13, \ No newline at end of file diff --git a/Lib9c/TableCSV/Skill/StatBuffSheet.csv b/Lib9c/TableCSV/Skill/StatBuffSheet.csv index 39a4fcd65e..606825d24a 100644 --- a/Lib9c/TableCSV/Skill/StatBuffSheet.csv +++ b/Lib9c/TableCSV/Skill/StatBuffSheet.csv @@ -21,6 +21,12 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 102017,102005,요르문간드 헤라 (AdventureBoss Stage Buff),100,150,Enemies,ATK,Percentage,100,true, 102018,102005,요르문간드 헤라 (AdventureBoss Stage Buff),100,150,Enemies,ATK,Percentage,150,true, 102019,102005,요르문간드 헤라 (AdventureBoss Stage Buff),100,150,Enemies,ATK,Percentage,200,true, +102020,102020,ATK UP (Custom Item),100,10,Self,ATK,Percentage,50,true, +102021,102020,ATK UP (Custom Item Stat conversion),100,10,Self,ATK,Add,0,true, +102022,102020,ATK UP (Custom Item),100,10,Self,ATK,Percentage,40,true, +102023,102020,ATK UP (Custom Item),100,10,Self,ATK,Percentage,32,true, +102024,102020,ATK UP (Custom Item),100,10,Self,ATK,Percentage,25,true, +102025,102020,ATK UP (Custom Item),100,10,Self,ATK,Percentage,20,true, 103000,103000,방어 강화,20,10,Self,DEF,Percentage,25,true, 103001,103000,방어 강화,100,25,Self,DEF,Percentage,50,true, 103002,103000,방어 강화,100,10,Self,DEF,Percentage,25,true, @@ -37,6 +43,12 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 103013,103005,라우페이 (AdventureBoss Stage Buff),100,150,Enemies,DEF,Percentage,75,true, 103014,103005,라우페이 (AdventureBoss Stage Buff),100,150,Enemies,DEF,Percentage,100,true, 103015,103005,라우페이 (AdventureBoss Stage Buff),100,150,Enemies,DEF,Percentage,200,true, +103016,103016,DEF UP (Custom Item),100,25,Self,DEF,Percentage,50,true, +103017,103016,DEF UP (Custom Item Stat conversion),100,10,Self,DEF,Percentage,0,true, +103018,103016,DEF UP (Custom Item),100,25,Self,DEF,Percentage,40,true, +103019,103016,DEF UP (Custom Item),100,25,Self,DEF,Percentage,32,true, +103020,103016,DEF UP (Custom Item),100,25,Self,DEF,Percentage,25,true, +103021,103016,DEF UP (Custom Item),100,25,Self,DEF,Percentage,20,true, 104000,104000,치명 증가,20,10,Self,CRI,Percentage,50,true, 104001,104000,치명 증가,100,25,Self,CRI,Percentage,75,true, 104002,104000,치명 증가,100,10,Self,CRI,Percentage,25,true, @@ -45,10 +57,21 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 104005,104003,Frenzied CRI(Self) Lv3,100,20,Self,CRI,Percentage,0,true, 104006,104006,헤라 (AdventureBoss Stage Buff),100,150,Self,CRI,Percentage,50,true, 104007,104006,헤라 (AdventureBoss Stage Buff),100,150,Enemies,CRI,Percentage,50,true, +104008,104008,CRI UP (Custom Item),100,10,Self,CRI,Percentage,50,true, +104009,104008,CRI UP (Custom Item),100,10,Self,CRI,Percentage,40,true, +104010,104008,CRI UP (Custom Item),100,10,Self,CRI,Percentage,32,true, +104011,104008,CRI UP (Custom Item),100,10,Self,CRI,Percentage,25,true, +104012,104008,CRI UP (Custom Item),100,10,Self,CRI,Percentage,20,true, 105000,105000,회피 증가,20,10,Self,HIT,Percentage,50,true, 105001,105000,회피 증가,100,25,Self,HIT,Percentage,75,true, 105002,105000,회피 증가,100,10,Self,HIT,Percentage,25,true, 105003,105003,회피증가 (아우라),100,20,Self,HIT,Percentage,0,true, +105004,105004,HIT UP (Custom Item),100,25,Self,HIT,Percentage,75,true, +105005,105004,HIT UP (Custom Item Stat conversion),100,25,Self,HIT,Percentage,0,true, +105006,105004,HIT UP (Custom Item),100,25,Self,HIT,Percentage,60,true, +105007,105004,HIT UP (Custom Item),100,25,Self,HIT,Percentage,48,true, +105008,105004,HIT UP (Custom Item),100,25,Self,HIT,Percentage,38,true, +105009,105004,HIT UP (Custom Item),100,25,Self,HIT,Percentage,30,true, 106000,106000,속도 증가,20,10,Self,SPD,Percentage,50,true, 106001,106000,속도 증가,100,25,Self,SPD,Percentage,75,true, 106002,106000,속도 증가,100,10,Self,SPD,Percentage,25,true, @@ -62,6 +85,12 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 106010,106004,요르문간드 (AdventureBoss Stage Buff),100,150,Self,SPD,Percentage,75,true, 106011,106004,요르문간드 (AdventureBoss Stage Buff),100,150,Self,SPD,Percentage,100,true, 106012,106004,요르문간드 (AdventureBoss Stage Buff),100,150,Self,SPD,Percentage,200,true, +106013,106001,SPD UP (Custom Item),100,25,Self,SPD,Percentage,125,true, +106014,106001,SPD UP (Custom Item Stat conversion),100,10,Self,SPD,Add,0,true, +106015,106001,SPD UP (Custom Item),100,25,Self,SPD,Percentage,100,true, +106016,106001,SPD UP (Custom Item),100,25,Self,SPD,Percentage,80,true, +106017,106001,SPD UP (Custom Item),100,25,Self,SPD,Percentage,64,true, +106018,106001,SPD UP (Custom Item),100,25,Self,SPD,Percentage,51,true, 107000,107000,Armor Penetration (Stat conversion),100,10,Self,ArmorPenetration,Add,0,true, 108000,108000,Thorn (Stat conversion),100,10,Self,Thorn,Add,0,true, 109000,109000,헤라 (AdventureBoss Stage Buff),100,150,Self,CDMG,Add,15000,true, @@ -74,22 +103,51 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 202003,202000,ATK ALL Down (Stat conversion),100,6,Enemies,ATK,Add,0,true, 202004,202004,ATK Down (Aegis Aura),100,30,Enemy,ATK,Percentage,0,true, 202005,202005,ATK Down (Odin Rune),100,0,Enemies,ATK,Percentage,0,true, +202006,202006,ATK Down (Custom Item),100,10,Enemies,ATK,Percentage,-25,true, +202007,202006,ATK Down (Custom Item Stat conversion),100,10,Enemies,ATK,Add,0,true, +202008,202006,ATK Down (Custom Item),100,10,Enemies,ATK,Percentage,-20,true, +202009,202006,ATK Down (Custom Item),100,10,Enemies,ATK,Percentage,-16,true, +202010,202006,ATK Down (Custom Item),100,10,Enemies,ATK,Percentage,-13,true, +202011,202006,ATK Down (Custom Item),100,10,Enemies,ATK,Percentage,-11,true, 203001,203000,방어 약화,100,10,Enemy,DEF,Percentage,-25,true, 203002,203000,DEF Down (Stat conversion),100,10,Enemy,DEF,Add,0,true, 203003,203003,Double edged sword (DEF),100,20,Self,DEF,Percentage,-20,false, 203004,203004,DEF Down (Odin Rune),100,0,Enemies,DEF,Percentage,0,true, 203005,203005,헤라 (AdventureBoss Stage Buff),100,150,Self,DEF,Percentage,-100,true, 203006,203005,헤라 (AdventureBoss Stage Buff),100,150,Enemies,DEF,Percentage,-100,true, +203007,203007,DEF Down (Custom Item),100,10,Enemy,DEF,Percentage,-25,true, +203008,203007,DEF Down (Custom Item Stat conversion),100,10,Enemy,DEF,Add,0,true, +203009,203007,DEF Down (Custom Item),100,10,Enemy,DEF,Percentage,-20,true, +203010,203007,DEF Down (Custom Item),100,10,Enemy,DEF,Percentage,-16,true, +203011,203007,DEF Down (Custom Item),100,10,Enemy,DEF,Percentage,-13,true, +203012,203007,DEF Down (Custom Item),100,10,Enemy,DEF,Percentage,-11,true, 204001,204000,치명 감소,100,10,Enemy,CRI,Percentage,-25,true, 204002,204002,Frenzied CRI(Enemy) Lv1,100,20,Enemies,CRI,Percentage,-50,false, 204003,204002,Frenzied CRI(Enemy) Lv2_3,100,20,Enemies,CRI,Percentage,-500,false, +204004,204004,CRI Down (Custom Item),100,10,Enemy,CRI,Percentage,-25,true, +204005,204004,CRI Down (Custom Item),100,10,Enemy,CRI,Percentage,-20,true, +204006,204004,CRI Down (Custom Item),100,10,Enemy,CRI,Percentage,-16,true, +204007,204004,CRI Down (Custom Item),100,10,Enemy,CRI,Percentage,-13,true, +204008,204004,CRI Down (Custom Item),100,10,Enemy,CRI,Percentage,-11,true, 205001,205000,회피 감소,100,10,Enemy,HIT,Percentage,-25,true, 205002,205000,HIT Down (Stat conversion),100,10,Enemy,HIT,Add,0,true, 205003,205003,HIT Down (Odin Rune),100,0,Enemies,HIT,Percentage,0,true, 205004,205004,요르문간드 (AdventureBoss Stage Buff),100,150,Self,HIT,Percentage,-50,true, 205005,205004,요르문간드 (AdventureBoss Stage Buff),100,150,Enemies,HIT,Percentage,-50,true, +205006,205006,HIT Down (Custom Item),100,10,Enemy,HIT,Percentage,-25,true, +205007,205006,HIT Down (Custom Item Stat conversion),100,10,Enemy,HIT,Add,0,true, +205008,205006,HIT Down (Custom Item),100,10,Enemy,HIT,Percentage,-20,true, +205009,205006,HIT Down (Custom Item),100,10,Enemy,HIT,Percentage,-16,true, +205010,205006,HIT Down (Custom Item),100,10,Enemy,HIT,Percentage,-13,true, +205011,205006,HIT Down (Custom Item),100,10,Enemy,HIT,Percentage,-11,true, 206001,206000,속도 감소,100,10,Enemy,SPD,Percentage,-25,true, 206002,206000,SPD Down (Stat conversion),100,10,Enemy,SPD,Add,0,true, +206003,206003,SPD Down (Custom Item),100,10,Enemy,SPD,Percentage,-25,true, +206004,206003,SPD Down (Custom Item Stat conversion),100,10,Enemy,SPD,Add,0,true, +206005,206003,SPD Down (Custom Item),100,10,Enemy,SPD,Percentage,-20,true, +206006,206003,SPD Down (Custom Item),100,10,Enemy,SPD,Percentage,-16,true, +206007,206003,SPD Down (Custom Item),100,10,Enemy,SPD,Percentage,-13,true, +206008,206003,SPD Down (Custom Item),100,10,Enemy,SPD,Percentage,-11,true, 301000,301000,체력 강화 (10),100,150,Self,HP,Percentage,10,true, 302000,302000,공격 강화 (2),100,150,Self,ATK,Percentage,2,true, 302001,302000,공격 강화 (2),100,150,Self,ATK,Percentage,2,true, @@ -169,9 +227,20 @@ id,group,_name,chance,duration,target_type,stat_type,modify_type,modify_value,is 504009,504008,Serimnir Furious CDMG,100,5,Self,CDMG,Add,10000,true, 504010,504008,Serimnir Furious CDMG,100,5,Self,CDMG,Add,20000,true, 504011,504011,Serimnir Furious Enemy CDMG,100,8,Enemy,CDMG,Add,10000,true, -701000,701000,DRV (Rune),100,0,Self,DRV,Add,0,true, +701000,701000,DRV (미사용),100,0,Self,DRV,Add,0,true, 702000,701000,DRR (Rune),100,0,Self,DRR,Add,0,true, +702001,702001,DRR (커스텀 장비),100,12,Self,DRR,Add,0,true, 703000,703000,CDMG (Rune),100,0,Self,CDMG,Add,0,true, +703001,703001,CDMG 증가 (커스텀 장비),100,10,Self,CDMG,Percentage,500,true, +703002,703001,CDMG 증가 (커스텀 장비),100,10,Self,CDMG,Percentage,400,true, +703003,703001,CDMG 증가 (커스텀 장비),100,10,Self,CDMG,Percentage,320,true, +703004,703001,CDMG 증가 (커스텀 장비),100,10,Self,CDMG,Percentage,256,true, +703005,703001,CDMG 증가 (커스텀 장비),100,10,Self,CDMG,Percentage,204,true, +703006,703002,CDMG 감소 (커스텀 장비),100,10,Enemies,CDMG,Percentage,750,true, +703007,703002,CDMG 감소 (커스텀 장비),100,10,Enemies,CDMG,Percentage,600,true, +703008,703002,CDMG 감소 (커스텀 장비),100,10,Enemies,CDMG,Percentage,480,true, +703009,703002,CDMG 감소 (커스텀 장비),100,10,Enemies,CDMG,Percentage,384,true, +703010,703002,CDMG 감소 (커스텀 장비),100,10,Enemies,CDMG,Percentage,307,true, 709000,709000,Frostbite 1 (Aura),100,5,Enemy,SPD,Percentage,-3,true,5 709001,709000,Frostbite 2 (Aura),100,5,Enemy,SPD,Percentage,-7,true,5 709002,709000,Frostbite 3 (Aura),100,5,Enemy,SPD,Percentage,-10,true,5 \ No newline at end of file diff --git a/Lib9c/TableCSV/Stake/StakePolicySheet.csv b/Lib9c/TableCSV/Stake/StakePolicySheet.csv index 2f73e6b51a..17a6a64314 100644 --- a/Lib9c/TableCSV/Stake/StakePolicySheet.csv +++ b/Lib9c/TableCSV/Stake/StakePolicySheet.csv @@ -1,5 +1,5 @@ attr_name,value StakeRegularFixedRewardSheet,StakeRegularFixedRewardSheet_V3 -StakeRegularRewardSheet,StakeRegularRewardSheet_V7 +StakeRegularRewardSheet,StakeRegularRewardSheet_V8 RewardInterval,75600 LockupInterval,302400 \ No newline at end of file diff --git a/Lib9c/TableCSV/StakeRegularRewardSheet_V8.csv b/Lib9c/TableCSV/StakeRegularRewardSheet_V8.csv new file mode 100644 index 0000000000..97fad910b8 --- /dev/null +++ b/Lib9c/TableCSV/StakeRegularRewardSheet_V8.csv @@ -0,0 +1,65 @@ +level,required_gold,item_id,rate,type,currency_ticker,currency_decimal_places,decimal_rate,tradable +1,50,400000,,Item,,,10,TRUE +1,50,500000,,Item,,,800,TRUE +1,50,20001,,Rune,,,6000,TRUE +2,500,400000,,Item,,,4,TRUE +2,500,500000,,Item,,,600,TRUE +2,500,20001,,Rune,,,6000,TRUE +2,500,,,Currency,CRYSTAL,18,0.1,TRUE +2,500,600401,,Item,,,100,TRUE +3,5000,600401,,Item,,,100,TRUE +4,50000,600401,,Item,,,100,TRUE +5,500000,600401,,Item,,,100,TRUE +6,1000000,600401,,Item,,,100,TRUE +7,5000000,600401,,Item,,,100,TRUE +8,10000000,600401,,Item,,,100,TRUE +3,5000,400000,,Item,,,2,TRUE +3,5000,500000,,Item,,,400,TRUE +3,5000,20001,,Rune,,,5000,TRUE +3,5000,,,Currency,CRYSTAL,18,0.02,TRUE +3,5000,600201,,Item,,,500,FALSE +3,5000,800201,,Item,,,500,FALSE +3,5000,600202,,Item,,,5000,FALSE +4,50000,400000,,Item,,,2,TRUE +4,50000,500000,,Item,,,400,TRUE +4,50000,20001,,Rune,,,5000,TRUE +4,50000,,,Currency,CRYSTAL,18,0.02,TRUE +4,50000,600201,,Item,,,500,FALSE +4,50000,800201,,Item,,,500,FALSE +4,50000,800202,,Item,,,10000,FALSE +4,50000,600202,,Item,,,5000,FALSE +5,500000,400000,,Item,,,1,TRUE +5,500000,500000,,Item,,,200,TRUE +5,500000,20001,,Rune,,,3000,TRUE +5,500000,,,Currency,CRYSTAL,18,0.02,TRUE +5,500000,600201,,Item,,,357,FALSE +5,500000,800201,,Item,,,357,FALSE +5,500000,800202,,Item,,,10000,FALSE +5,500000,600202,,Item,,,3570,FALSE +6,1000000,400000,,Item,,,1,TRUE +6,1000000,500000,,Item,,,200,TRUE +6,1000000,20001,,Rune,,,3000,TRUE +6,1000000,,,Currency,CRYSTAL,18,0.02,TRUE +6,1000000,600201,,Item,,,200,FALSE +6,1000000,800201,,Item,,,200,FALSE +6,1000000,800202,,Item,,,10000,FALSE +6,1000000,,,Currency,GARAGE,18,10000,TRUE +6,1000000,600202,,Item,,,2000,FALSE +7,5000000,400000,,Item,,,1,TRUE +7,5000000,500000,,Item,,,200,TRUE +7,5000000,20001,,Rune,,,3000,TRUE +7,5000000,800201,,Item,,,100,FALSE +7,5000000,,,Currency,CRYSTAL,18,0.02,TRUE +7,5000000,600201,,Item,,,100,FALSE +7,5000000,800202,,Item,,,100,FALSE +7,5000000,,,Currency,GARAGE,18,500,TRUE +7,5000000,600202,,Item,,,1000,FALSE +8,10000000,400000,,Item,,,0.4,TRUE +8,10000000,500000,,Item,,,80,TRUE +8,10000000,20001,,Rune,,,1200,TRUE +8,10000000,600201,,Item,,,50,FALSE +8,10000000,800201,,Item,,,50,FALSE +8,10000000,,,Currency,GARAGE,18,100,TRUE +8,10000000,,,Currency,CRYSTAL,18,0.002,TRUE +8,10000000,800202,,Item,,,50,FALSE +8,10000000,600202,,Item,,,500,FALSE \ No newline at end of file diff --git a/Lib9c/TableCSV/WorldBoss/WorldBossBattleRewardSheet.csv b/Lib9c/TableCSV/WorldBoss/WorldBossBattleRewardSheet.csv index f5cb82c3b5..4c0a908f04 100644 --- a/Lib9c/TableCSV/WorldBoss/WorldBossBattleRewardSheet.csv +++ b/Lib9c/TableCSV/WorldBoss/WorldBossBattleRewardSheet.csv @@ -1,13 +1,13 @@ -id,boss_id,rank,rune_min,rune_max,crystal -1,900001,0,2,3,0 -2,900001,1,6,8,0 -3,900001,2,12,14,0 -4,900001,3,16,20,0 -5,900001,4,20,24,0 -6,900001,5,24,30,0 -7,900002,0,2,3,0 -8,900002,1,6,8,0 -9,900002,2,12,14,0 -10,900002,3,16,20,0 -11,900002,4,20,24,0 -12,900002,5,24,30,0 \ No newline at end of file +id,boss_id,rank,rune_min,rune_max,crystal,circle +1,900001,0,2,3,0,0 +2,900001,1,6,8,0,0 +3,900001,2,12,14,0,0 +4,900001,3,16,20,0,0 +5,900001,4,20,24,0,0 +6,900001,5,24,30,0,0 +7,900002,0,2,3,0,0 +8,900002,1,6,8,0,0 +9,900002,2,12,14,0,0 +10,900002,3,16,20,0,0 +11,900002,4,20,24,0,0 +12,900002,5,24,30,0,0 \ No newline at end of file diff --git a/Lib9c/TableCSV/WorldBoss/WorldBossKillRewardSheet.csv b/Lib9c/TableCSV/WorldBoss/WorldBossKillRewardSheet.csv index d8cb21da5a..56c0c41172 100644 --- a/Lib9c/TableCSV/WorldBoss/WorldBossKillRewardSheet.csv +++ b/Lib9c/TableCSV/WorldBoss/WorldBossKillRewardSheet.csv @@ -1,13 +1,13 @@ -id,boss_id,rank,rune_min,rune_max,crystal -1,900001,0,1,2,4000 -2,900001,1,4,7,32000 -3,900001,2,7,12,40000 -4,900001,3,11,17,48000 -5,900001,4,14,22,60000 -6,900001,5,18,28,120000 -7,900002,0,1,2,4000 -8,900002,1,4,7,32000 -9,900002,2,7,12,40000 -10,900002,3,11,17,48000 -11,900002,4,14,22,60000 -12,900002,5,18,28,120000 \ No newline at end of file +id,boss_id,rank,rune_min,rune_max,crystal,circle +1,900001,0,1,2,4000,0 +2,900001,1,4,7,32000,0 +3,900001,2,7,12,40000,0 +4,900001,3,11,17,48000,0 +5,900001,4,14,22,60000,0 +6,900001,5,18,28,120000,0 +7,900002,0,1,2,4000,0 +8,900002,1,4,7,32000,0 +9,900002,2,7,12,40000,0 +10,900002,3,11,17,48000,0 +11,900002,4,14,22,60000,0 +12,900002,5,18,28,120000,0 \ No newline at end of file diff --git a/Lib9c/TableCSV/WorldBoss/WorldBossRankRewardSheet.csv b/Lib9c/TableCSV/WorldBoss/WorldBossRankRewardSheet.csv index 118c72d666..695594dd59 100644 --- a/Lib9c/TableCSV/WorldBoss/WorldBossRankRewardSheet.csv +++ b/Lib9c/TableCSV/WorldBoss/WorldBossRankRewardSheet.csv @@ -1,11 +1,11 @@ -id,boss_id,rank,rune,crystal -1,900001,1,75,180000 -2,900001,2,150,450000 -3,900001,3,300,800000 -4,900001,4,450,1250000 -5,900001,5,750,1800000 -6,900002,1,75,180000 -7,900002,2,150,450000 -8,900002,3,300,800000 -9,900002,4,450,1250000 -10,900002,5,750,1800000 \ No newline at end of file +id,boss_id,rank,rune,crystal,circle +1,900001,1,75,180000,5 +2,900001,2,150,450000,15 +3,900001,3,300,800000,80 +4,900001,4,450,1250000,400 +5,900001,5,750,1800000,500 +6,900002,1,75,180000,5 +7,900002,2,150,450000,15 +8,900002,3,300,800000,80 +9,900002,4,450,1250000,400 +10,900002,5,750,1800000,500 \ No newline at end of file From af38c4d39746d585fe1ec8edc06994742e3ce7d4 Mon Sep 17 00:00:00 2001 From: Hyun Seungmin Date: Mon, 30 Sep 2024 18:47:41 +0900 Subject: [PATCH 03/27] introduce IRapidCombinationV2 --- Lib9c.Abstractions/IRapidCombinationV2.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 Lib9c.Abstractions/IRapidCombinationV2.cs diff --git a/Lib9c.Abstractions/IRapidCombinationV2.cs b/Lib9c.Abstractions/IRapidCombinationV2.cs new file mode 100644 index 0000000000..90e73825c7 --- /dev/null +++ b/Lib9c.Abstractions/IRapidCombinationV2.cs @@ -0,0 +1,13 @@ +#nullable enable + +using System.Collections.Generic; +using Libplanet.Crypto; + +namespace Lib9c.Abstractions +{ + public interface IRapidCombinationV2 + { + Address AvatarAddress { get; } + List SlotIndexList { get; } + } +} From f86b79053179aeb13e76b77b22e1eeb04c92931b Mon Sep 17 00:00:00 2001 From: Hyun Seungmin Date: Mon, 30 Sep 2024 18:47:59 +0900 Subject: [PATCH 04/27] apply IRapidCombinationV2 to RapidCombination --- Lib9c/Action/RapidCombination.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Lib9c/Action/RapidCombination.cs b/Lib9c/Action/RapidCombination.cs index 79bd363398..a5592c907f 100644 --- a/Lib9c/Action/RapidCombination.cs +++ b/Lib9c/Action/RapidCombination.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.Linq; using Bencodex.Types; +using Lib9c.Abstractions; using Libplanet.Action; using Libplanet.Action.State; using Libplanet.Crypto; @@ -22,11 +23,14 @@ namespace Nekoyume.Action /// [Serializable] [ActionType("rapid_combination10")] - public class RapidCombination : GameAction + public class RapidCombination : GameAction, IRapidCombinationV2 { public Address avatarAddress; public List slotIndexList = new List(); + Address IRapidCombinationV2.AvatarAddress => avatarAddress; + List IRapidCombinationV2.SlotIndexList => slotIndexList; + public override IWorld Execute(IActionContext context) { context.UseGas(1); From 31fd7594b350038212472d00d36e166212cf6e55 Mon Sep 17 00:00:00 2001 From: Yang Chun Ung Date: Wed, 2 Oct 2024 13:36:29 +0900 Subject: [PATCH 05/27] Add product info in cancel mail --- .../Action/CancelProductRegistrationTest.cs | 62 +++++++++++++++++++ Lib9c/Action/CancelProductRegistration.cs | 2 +- Lib9c/Model/Mail/ProductCancelMail.cs | 23 ++++++- 3 files changed, 83 insertions(+), 4 deletions(-) diff --git a/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs b/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs index 6ab1c35c77..69451e28c4 100644 --- a/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs +++ b/.Lib9c.Tests/Action/CancelProductRegistrationTest.cs @@ -11,9 +11,12 @@ namespace Lib9c.Tests.Action using Nekoyume.Action; using Nekoyume.Helper; using Nekoyume.Model; + using Nekoyume.Model.Item; + using Nekoyume.Model.Mail; using Nekoyume.Model.Market; using Nekoyume.Model.State; using Nekoyume.Module; + using Newtonsoft.Json.Serialization; using Serilog; using Xunit; using Xunit.Abstractions; @@ -210,5 +213,64 @@ public void Execute_Throw_ArgumentOutOfRangeException() Assert.Throws(() => action.Execute(new ActionContext())); } + + [Theory] + [InlineData(ProductType.FungibleAssetValue)] + [InlineData(ProductType.NonFungible)] + [InlineData(ProductType.Fungible)] + public void Mail_Serialize_BackwardCompatibility(ProductType productType) + { + Product product; + var gold = _goldCurrencyState.Currency; + switch (productType) + { + case ProductType.FungibleAssetValue: + product = new FavProduct + { + SellerAgentAddress = new PrivateKey().Address, + SellerAvatarAddress = new PrivateKey().Address, + Asset = 1 * RuneHelper.StakeRune, + RegisteredBlockIndex = 1L, + ProductId = Guid.NewGuid(), + Price = 1 * gold, + Type = ProductType.FungibleAssetValue, + }; + break; + case ProductType.Fungible: + case ProductType.NonFungible: + { + ITradableItem tradableItem = productType == ProductType.Fungible + ? ItemFactory.CreateTradableMaterial(_tableSheets.MaterialItemSheet.First) + : (ITradableItem)ItemFactory.CreateItemUsable(_tableSheets.EquipmentItemSheet.First, Guid.NewGuid(), 0L); + product = new ItemProduct + { + SellerAgentAddress = new PrivateKey().Address, + SellerAvatarAddress = new PrivateKey().Address, + RegisteredBlockIndex = 1L, + ProductId = Guid.NewGuid(), + Price = 1 * gold, + Type = ProductType.NonFungible, + ItemCount = 1, + TradableItem = tradableItem, + }; + break; + } + + default: + throw new ArgumentOutOfRangeException(nameof(productType), productType, null); + } + + var mail = new ProductCancelMail(2L, Guid.NewGuid(), 2L, product!.ProductId, product!); + var serialized = (Dictionary)mail.Serialize(); + var deserialized = new ProductCancelMail(serialized); + Assert.Equal(serialized, deserialized.Serialize()); + // serialized mail on v200220; + serialized = (Dictionary)serialized.Remove((Text)ProductCancelMail.ProductKey); + deserialized = new ProductCancelMail(serialized); + Assert.Equal(deserialized.ProductId, product.ProductId); + Assert.Null(deserialized.Product); + // check serialize not throw exception + deserialized.Serialize(); + } } } diff --git a/Lib9c/Action/CancelProductRegistration.cs b/Lib9c/Action/CancelProductRegistration.cs index a751ce25bd..a5cfbb5bae 100644 --- a/Lib9c/Action/CancelProductRegistration.cs +++ b/Lib9c/Action/CancelProductRegistration.cs @@ -179,7 +179,7 @@ public static IWorld Cancel( throw new ArgumentOutOfRangeException(nameof(product)); } - var mail = new ProductCancelMail(context.BlockIndex, productId, context.BlockIndex, productId); + var mail = new ProductCancelMail(context.BlockIndex, productId, context.BlockIndex, productId, product); avatarState.Update(mail); states = states.SetLegacyState(productAddress, Null.Value); return states; diff --git a/Lib9c/Model/Mail/ProductCancelMail.cs b/Lib9c/Model/Mail/ProductCancelMail.cs index 1a5652467c..8b32efd13d 100644 --- a/Lib9c/Model/Mail/ProductCancelMail.cs +++ b/Lib9c/Model/Mail/ProductCancelMail.cs @@ -1,5 +1,6 @@ using System; using Bencodex.Types; +using Nekoyume.Model.Market; using Nekoyume.Model.State; using static Lib9c.SerializeKeys; @@ -8,15 +9,22 @@ namespace Nekoyume.Model.Mail [Serializable] public class ProductCancelMail : Mail { + public const string ProductKey = "p"; public readonly Guid ProductId; - public ProductCancelMail(long blockIndex, Guid id, long requiredBlockIndex, Guid productId) : base(blockIndex, id, requiredBlockIndex) + public readonly Product Product; + public ProductCancelMail(long blockIndex, Guid id, long requiredBlockIndex, Guid productId, Product product) : base(blockIndex, id, requiredBlockIndex) { ProductId = productId; + Product = product; } public ProductCancelMail(Dictionary serialized) : base(serialized) { ProductId = serialized[ProductIdKey].ToGuid(); + if (serialized.ContainsKey(ProductKey)) + { + Product = ProductFactory.DeserializeProduct((List) serialized[ProductKey]); + } } public override void Read(IMail mail) @@ -27,7 +35,16 @@ public override void Read(IMail mail) public override MailType MailType => MailType.Auction; protected override string TypeId => nameof(ProductCancelMail); - public override IValue Serialize() => ((Dictionary)base.Serialize()) - .Add(ProductIdKey, ProductId.Serialize()); + public override IValue Serialize() + { + var dict = ((Dictionary) base.Serialize()) + .Add(ProductIdKey, ProductId.Serialize()); + if (Product is not null) + { + dict = dict.Add(ProductKey, Product.Serialize()); + } + + return dict; + } } } From 65d926c057e314542195543ebcd902123ef3c44e Mon Sep 17 00:00:00 2001 From: eugene-hong <58686228+eugene-doobu@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:40:03 +0900 Subject: [PATCH 06/27] refactor test --- .../Action/Scenario/ArenaScenarioTest.cs | 3 - .../AdditionalOptionRateByFixedValueTest.cs | 133 ------------------ .../Action/Scenario/Pet/CommonTest.cs | 1 - .../Pet/DiscountMaterialCostCrystalTest.cs | 1 - .../Pet/IncreaseBlockPerHourglassTest.cs | 4 +- .../Scenario/Pet/ReduceRequiredBlockTest.cs | 2 - 6 files changed, 1 insertion(+), 143 deletions(-) diff --git a/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs index 90e590aef3..b3adc6eadf 100644 --- a/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/ArenaScenarioTest.cs @@ -54,9 +54,6 @@ public ArenaScenarioTest(ITestOutputHelper outputHelper) #pragma warning restore CS0618 var goldCurrencyState = new GoldCurrencyState(_ncg); _rankingMapAddress = new PrivateKey().Address; - var clearStageId = Math.Max( - _tableSheets.StageSheet.First?.Id ?? 1, - GameConfig.RequireClearedStageLevel.ActionsInRankingBoard); _state = _state .SetLegacyState(Addresses.GoldCurrency, goldCurrencyState.Serialize()) diff --git a/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs index 256a6755dd..5564a6e9a2 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/AdditionalOptionRateByFixedValueTest.cs @@ -16,7 +16,6 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Nekoyume.TableData; using Nekoyume.TableData.Pet; using Xunit; - using static Lib9c.SerializeKeys; public class AdditionalOptionRateByFixedValueTest { @@ -34,125 +33,7 @@ public AdditionalOptionRateByFixedValueTest() { var sheets = TableSheetsImporter.ImportSheets(); sheets[nameof(PetOptionSheet)] = @"ID,_PET NAME,PetLevel,OptionType,OptionValue -1001,D:CC 블랙캣,1,ReduceRequiredBlock,5.5 -1001,D:CC 블랙캣,2,ReduceRequiredBlock,6 -1001,D:CC 블랙캣,3,ReduceRequiredBlock,6.5 -1001,D:CC 블랙캣,4,ReduceRequiredBlock,7 -1001,D:CC 블랙캣,5,ReduceRequiredBlock,7.5 -1001,D:CC 블랙캣,6,ReduceRequiredBlock,8 -1001,D:CC 블랙캣,7,ReduceRequiredBlock,8.5 -1001,D:CC 블랙캣,8,ReduceRequiredBlock,9 -1001,D:CC 블랙캣,9,ReduceRequiredBlock,9.5 -1001,D:CC 블랙캣,10,ReduceRequiredBlock,10 -1001,D:CC 블랙캣,11,ReduceRequiredBlock,10.5 -1001,D:CC 블랙캣,12,ReduceRequiredBlock,11 -1001,D:CC 블랙캣,13,ReduceRequiredBlock,11.5 -1001,D:CC 블랙캣,14,ReduceRequiredBlock,12 -1001,D:CC 블랙캣,15,ReduceRequiredBlock,12.5 -1001,D:CC 블랙캣,16,ReduceRequiredBlock,13 -1001,D:CC 블랙캣,17,ReduceRequiredBlock,13.5 -1001,D:CC 블랙캣,18,ReduceRequiredBlock,14 -1001,D:CC 블랙캣,19,ReduceRequiredBlock,14.5 -1001,D:CC 블랙캣,20,ReduceRequiredBlock,15 -1001,D:CC 블랙캣,21,ReduceRequiredBlock,15.5 -1001,D:CC 블랙캣,22,ReduceRequiredBlock,16 -1001,D:CC 블랙캣,23,ReduceRequiredBlock,16.5 -1001,D:CC 블랙캣,24,ReduceRequiredBlock,17 -1001,D:CC 블랙캣,25,ReduceRequiredBlock,17.5 -1001,D:CC 블랙캣,26,ReduceRequiredBlock,18 -1001,D:CC 블랙캣,27,ReduceRequiredBlock,18.5 -1001,D:CC 블랙캣,28,ReduceRequiredBlock,19 -1001,D:CC 블랙캣,29,ReduceRequiredBlock,19.5 -1001,D:CC 블랙캣,30,ReduceRequiredBlock,20 -1002,빨간 동글이,1,DiscountMaterialCostCrystal,2.5 -1002,빨간 동글이,2,DiscountMaterialCostCrystal,3 -1002,빨간 동글이,3,DiscountMaterialCostCrystal,3.5 -1002,빨간 동글이,4,DiscountMaterialCostCrystal,4 -1002,빨간 동글이,5,DiscountMaterialCostCrystal,4.5 -1002,빨간 동글이,6,DiscountMaterialCostCrystal,5 -1002,빨간 동글이,7,DiscountMaterialCostCrystal,5.5 -1002,빨간 동글이,8,DiscountMaterialCostCrystal,6 -1002,빨간 동글이,9,DiscountMaterialCostCrystal,6.5 -1002,빨간 동글이,10,DiscountMaterialCostCrystal,7 -1002,빨간 동글이,11,DiscountMaterialCostCrystal,7.5 -1002,빨간 동글이,12,DiscountMaterialCostCrystal,8 -1002,빨간 동글이,13,DiscountMaterialCostCrystal,8.5 -1002,빨간 동글이,14,DiscountMaterialCostCrystal,9 -1002,빨간 동글이,15,DiscountMaterialCostCrystal,9.5 -1002,빨간 동글이,16,DiscountMaterialCostCrystal,10 -1002,빨간 동글이,17,DiscountMaterialCostCrystal,10.5 -1002,빨간 동글이,18,DiscountMaterialCostCrystal,11 -1002,빨간 동글이,19,DiscountMaterialCostCrystal,11.5 -1002,빨간 동글이,20,DiscountMaterialCostCrystal,12 -1002,빨간 동글이,21,DiscountMaterialCostCrystal,12.5 -1002,빨간 동글이,22,DiscountMaterialCostCrystal,13 -1002,빨간 동글이,23,DiscountMaterialCostCrystal,13.5 -1002,빨간 동글이,24,DiscountMaterialCostCrystal,14 -1002,빨간 동글이,25,DiscountMaterialCostCrystal,14.5 -1002,빨간 동글이,26,DiscountMaterialCostCrystal,15 -1002,빨간 동글이,27,DiscountMaterialCostCrystal,15.5 -1002,빨간 동글이,28,DiscountMaterialCostCrystal,16 -1002,빨간 동글이,29,DiscountMaterialCostCrystal,16.5 -1002,빨간 동글이,30,DiscountMaterialCostCrystal,17 -1003,빛의 발키리,1,IncreaseBlockPerHourglass,1 -1003,빛의 발키리,2,IncreaseBlockPerHourglass,2 -1003,빛의 발키리,3,IncreaseBlockPerHourglass,3 -1003,빛의 발키리,4,IncreaseBlockPerHourglass,4 -1003,빛의 발키리,5,IncreaseBlockPerHourglass,5 -1003,빛의 발키리,6,IncreaseBlockPerHourglass,6 -1003,빛의 발키리,7,IncreaseBlockPerHourglass,7 -1003,빛의 발키리,8,IncreaseBlockPerHourglass,8 -1003,빛의 발키리,9,IncreaseBlockPerHourglass,9 -1003,빛의 발키리,10,IncreaseBlockPerHourglass,10 -1003,빛의 발키리,11,IncreaseBlockPerHourglass,11 -1003,빛의 발키리,12,IncreaseBlockPerHourglass,12 -1003,빛의 발키리,13,IncreaseBlockPerHourglass,13 -1003,빛의 발키리,14,IncreaseBlockPerHourglass,14 -1003,빛의 발키리,15,IncreaseBlockPerHourglass,15 -1003,빛의 발키리,16,IncreaseBlockPerHourglass,16 -1003,빛의 발키리,17,IncreaseBlockPerHourglass,17 -1003,빛의 발키리,18,IncreaseBlockPerHourglass,18 -1003,빛의 발키리,19,IncreaseBlockPerHourglass,19 -1003,빛의 발키리,20,IncreaseBlockPerHourglass,20 -1003,빛의 발키리,21,IncreaseBlockPerHourglass,21 -1003,빛의 발키리,22,IncreaseBlockPerHourglass,22 -1003,빛의 발키리,23,IncreaseBlockPerHourglass,23 -1003,빛의 발키리,24,IncreaseBlockPerHourglass,24 -1003,빛의 발키리,25,IncreaseBlockPerHourglass,25 -1003,빛의 발키리,26,IncreaseBlockPerHourglass,26 -1003,빛의 발키리,27,IncreaseBlockPerHourglass,27 -1003,빛의 발키리,28,IncreaseBlockPerHourglass,28 -1003,빛의 발키리,29,IncreaseBlockPerHourglass,29 -1003,빛의 발키리,30,IncreaseBlockPerHourglass,30 1004,꼬마 펜리르,1,AdditionalOptionRateByFixedValue,5.5 -1004,꼬마 펜리르,2,AdditionalOptionRateByFixedValue,6 -1004,꼬마 펜리르,3,AdditionalOptionRateByFixedValue,6.5 -1004,꼬마 펜리르,4,AdditionalOptionRateByFixedValue,7 -1004,꼬마 펜리르,5,AdditionalOptionRateByFixedValue,7.5 -1004,꼬마 펜리르,6,AdditionalOptionRateByFixedValue,8 -1004,꼬마 펜리르,7,AdditionalOptionRateByFixedValue,8.5 -1004,꼬마 펜리르,8,AdditionalOptionRateByFixedValue,9 -1004,꼬마 펜리르,9,AdditionalOptionRateByFixedValue,9.5 -1004,꼬마 펜리르,10,AdditionalOptionRateByFixedValue,10 -1004,꼬마 펜리르,11,AdditionalOptionRateByFixedValue,10.5 -1004,꼬마 펜리르,12,AdditionalOptionRateByFixedValue,11 -1004,꼬마 펜리르,13,AdditionalOptionRateByFixedValue,11.5 -1004,꼬마 펜리르,14,AdditionalOptionRateByFixedValue,12 -1004,꼬마 펜리르,15,AdditionalOptionRateByFixedValue,12.5 -1004,꼬마 펜리르,16,AdditionalOptionRateByFixedValue,13 -1004,꼬마 펜리르,17,AdditionalOptionRateByFixedValue,13.5 -1004,꼬마 펜리르,18,AdditionalOptionRateByFixedValue,14 -1004,꼬마 펜리르,19,AdditionalOptionRateByFixedValue,14.5 -1004,꼬마 펜리르,20,AdditionalOptionRateByFixedValue,15 -1004,꼬마 펜리르,21,AdditionalOptionRateByFixedValue,15.5 -1004,꼬마 펜리르,22,AdditionalOptionRateByFixedValue,16 -1004,꼬마 펜리르,23,AdditionalOptionRateByFixedValue,16.5 -1004,꼬마 펜리르,24,AdditionalOptionRateByFixedValue,17 -1004,꼬마 펜리르,25,AdditionalOptionRateByFixedValue,17.5 -1004,꼬마 펜리르,26,AdditionalOptionRateByFixedValue,18 -1004,꼬마 펜리르,27,AdditionalOptionRateByFixedValue,18.5 -1004,꼬마 펜리르,28,AdditionalOptionRateByFixedValue,19 -1004,꼬마 펜리르,29,AdditionalOptionRateByFixedValue,19.5 1004,꼬마 펜리르,30,AdditionalOptionRateByFixedValue,20"; (_tableSheets, _agentAddr, _avatarAddr, _initialStateV2) = InitializeUtil.InitializeStates(sheetsOverride: sheets); @@ -168,7 +49,6 @@ public void CombinationEquipmentTest( int petLevel ) { - var (beforeResult, afterResult) = (false, false); // Get Recipe var recipe = _tableSheets.EquipmentItemRecipeSheet.Values.First( recipe => recipe.ResultEquipmentId == targetItemId @@ -195,12 +75,6 @@ int petLevel ); var subRecipe = _tableSheets.EquipmentItemSubRecipeSheetV2[recipe.SubRecipeIds![1]]; - var (originalOption2Ratio, originalOption3Ratio, originalOption4Ratio) = - (subRecipe.Options[1].Ratio, subRecipe.Options[2].Ratio, - subRecipe.Options[3].Ratio); - var (expectedOption2Ratio, expectedOption3Ratio, expectedOption4Ratio) = - (originalOption2Ratio, originalOption3Ratio, originalOption4Ratio); - // Get pet var petRow = _tableSheets.PetOptionSheet.Values.First( pet => pet.LevelOptionMap[(int)petLevel!].OptionType == PetOptionType @@ -210,13 +84,6 @@ int petLevel PetState.DeriveAddress(_avatarAddr, (int)_petId), new List(_petId!.Serialize(), petLevel.Serialize(), 0L.Serialize()) ); - var increment = (int)petRow.LevelOptionMap[petLevel].OptionValue * 100; - (expectedOption2Ratio, expectedOption3Ratio, expectedOption4Ratio) = - ( - originalOption2Ratio + increment, - originalOption3Ratio + increment, - originalOption4Ratio + increment - ); // Prepare stateV2 = CraftUtil.PrepareCombinationSlot(stateV2, _avatarAddr); diff --git a/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs index 28fa0ea058..1505761a1a 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/CommonTest.cs @@ -11,7 +11,6 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Nekoyume.Module; using Nekoyume.TableData; using Xunit; - using static Lib9c.SerializeKeys; public class CommonTest { diff --git a/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs index b0426b14aa..ae8b5048b9 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/DiscountMaterialCostCrystalTest.cs @@ -16,7 +16,6 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Nekoyume.Module; using Nekoyume.TableData; using Xunit; - using static Lib9c.SerializeKeys; public class DiscountMaterialCostCrystalTest { diff --git a/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs index 0405f0e74b..613d5b4a87 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/IncreaseBlockPerHourglassTest.cs @@ -9,7 +9,6 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Lib9c.Tests.Util; using Libplanet.Action.State; using Libplanet.Crypto; - using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.Pet; @@ -17,7 +16,6 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Nekoyume.Module; using Nekoyume.TableData; using Xunit; - using static Lib9c.SerializeKeys; public class IncreaseBlockPerHourglassTest { @@ -69,7 +67,7 @@ public void RapidCombinationTest_Equipment( var recipe = _tableSheets.EquipmentItemRecipeSheet.Values.First( recipe => recipe.RequiredBlockIndex >= requiredBlock - ); + ); Assert.NotNull(recipe); // Get Materials and stages diff --git a/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs b/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs index 8d6cfade27..5a946bbc60 100644 --- a/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs +++ b/.Lib9c.Tests/Action/Scenario/Pet/ReduceRequiredBlockTest.cs @@ -10,14 +10,12 @@ namespace Lib9c.Tests.Action.Scenario.Pet using Lib9c.Tests.Util; using Libplanet.Action.State; using Libplanet.Crypto; - using Nekoyume; using Nekoyume.Action; using Nekoyume.Model.Pet; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; using Xunit; - using static Lib9c.SerializeKeys; public class ReduceRequiredBlockTest { From e2bf9433fb9101258dcfd758a47eeefcdc914c88 Mon Sep 17 00:00:00 2001 From: eugene-hong <58686228+eugene-doobu@users.noreply.github.com> Date: Fri, 4 Oct 2024 11:59:00 +0900 Subject: [PATCH 07/27] add temp value --- Lib9c/TableCSV/Pet/PetOptionSheet.csv | 1202 ++++++++++++++++++++++++- 1 file changed, 1201 insertions(+), 1 deletion(-) diff --git a/Lib9c/TableCSV/Pet/PetOptionSheet.csv b/Lib9c/TableCSV/Pet/PetOptionSheet.csv index 83d7019d08..27f1c12491 100644 --- a/Lib9c/TableCSV/Pet/PetOptionSheet.csv +++ b/Lib9c/TableCSV/Pet/PetOptionSheet.csv @@ -99,6 +99,306 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1001,D:CC BlackCat,98,IncreaseBlockPerHourglass,2.94 1001,D:CC BlackCat,99,IncreaseBlockPerHourglass,2.96 1001,D:CC BlackCat,100,IncreaseBlockPerHourglass,3 +1101,Icy D:CC BlackCat,1,IncreaseBlockPerHourglass,1.5 +1101,Icy D:CC BlackCat,2,IncreaseBlockPerHourglass,1.52 +1101,Icy D:CC BlackCat,3,IncreaseBlockPerHourglass,1.54 +1101,Icy D:CC BlackCat,4,IncreaseBlockPerHourglass,1.56 +1101,Icy D:CC BlackCat,5,IncreaseBlockPerHourglass,1.58 +1101,Icy D:CC BlackCat,6,IncreaseBlockPerHourglass,1.6 +1101,Icy D:CC BlackCat,7,IncreaseBlockPerHourglass,1.62 +1101,Icy D:CC BlackCat,8,IncreaseBlockPerHourglass,1.64 +1101,Icy D:CC BlackCat,9,IncreaseBlockPerHourglass,1.66 +1101,Icy D:CC BlackCat,10,IncreaseBlockPerHourglass,1.68 +1101,Icy D:CC BlackCat,11,IncreaseBlockPerHourglass,1.7 +1101,Icy D:CC BlackCat,12,IncreaseBlockPerHourglass,1.72 +1101,Icy D:CC BlackCat,13,IncreaseBlockPerHourglass,1.74 +1101,Icy D:CC BlackCat,14,IncreaseBlockPerHourglass,1.76 +1101,Icy D:CC BlackCat,15,IncreaseBlockPerHourglass,1.78 +1101,Icy D:CC BlackCat,16,IncreaseBlockPerHourglass,1.8 +1101,Icy D:CC BlackCat,17,IncreaseBlockPerHourglass,1.82 +1101,Icy D:CC BlackCat,18,IncreaseBlockPerHourglass,1.84 +1101,Icy D:CC BlackCat,19,IncreaseBlockPerHourglass,1.86 +1101,Icy D:CC BlackCat,20,IncreaseBlockPerHourglass,1.88 +1101,Icy D:CC BlackCat,21,IncreaseBlockPerHourglass,1.9 +1101,Icy D:CC BlackCat,22,IncreaseBlockPerHourglass,1.92 +1101,Icy D:CC BlackCat,23,IncreaseBlockPerHourglass,1.94 +1101,Icy D:CC BlackCat,24,IncreaseBlockPerHourglass,1.96 +1101,Icy D:CC BlackCat,25,IncreaseBlockPerHourglass,1.98 +1101,Icy D:CC BlackCat,26,IncreaseBlockPerHourglass,2.0 +1101,Icy D:CC BlackCat,27,IncreaseBlockPerHourglass,2.02 +1101,Icy D:CC BlackCat,28,IncreaseBlockPerHourglass,2.04 +1101,Icy D:CC BlackCat,29,IncreaseBlockPerHourglass,2.06 +1101,Icy D:CC BlackCat,30,IncreaseBlockPerHourglass,2.08 +1101,Icy D:CC BlackCat,31,IncreaseBlockPerHourglass,2.1 +1101,Icy D:CC BlackCat,32,IncreaseBlockPerHourglass,2.12 +1101,Icy D:CC BlackCat,33,IncreaseBlockPerHourglass,2.1399999999999997 +1101,Icy D:CC BlackCat,34,IncreaseBlockPerHourglass,2.16 +1101,Icy D:CC BlackCat,35,IncreaseBlockPerHourglass,2.1799999999999997 +1101,Icy D:CC BlackCat,36,IncreaseBlockPerHourglass,2.2 +1101,Icy D:CC BlackCat,37,IncreaseBlockPerHourglass,2.2199999999999998 +1101,Icy D:CC BlackCat,38,IncreaseBlockPerHourglass,2.24 +1101,Icy D:CC BlackCat,39,IncreaseBlockPerHourglass,2.26 +1101,Icy D:CC BlackCat,40,IncreaseBlockPerHourglass,2.2800000000000002 +1101,Icy D:CC BlackCat,41,IncreaseBlockPerHourglass,2.3 +1101,Icy D:CC BlackCat,42,IncreaseBlockPerHourglass,2.3200000000000003 +1101,Icy D:CC BlackCat,43,IncreaseBlockPerHourglass,2.34 +1101,Icy D:CC BlackCat,44,IncreaseBlockPerHourglass,2.3600000000000003 +1101,Icy D:CC BlackCat,45,IncreaseBlockPerHourglass,2.38 +1101,Icy D:CC BlackCat,46,IncreaseBlockPerHourglass,2.4 +1101,Icy D:CC BlackCat,47,IncreaseBlockPerHourglass,2.42 +1101,Icy D:CC BlackCat,48,IncreaseBlockPerHourglass,2.44 +1101,Icy D:CC BlackCat,49,IncreaseBlockPerHourglass,2.46 +1101,Icy D:CC BlackCat,50,IncreaseBlockPerHourglass,2.48 +1101,Icy D:CC BlackCat,51,IncreaseBlockPerHourglass,2.5 +1101,Icy D:CC BlackCat,52,IncreaseBlockPerHourglass,2.52 +1101,Icy D:CC BlackCat,53,IncreaseBlockPerHourglass,2.54 +1101,Icy D:CC BlackCat,54,IncreaseBlockPerHourglass,2.56 +1101,Icy D:CC BlackCat,55,IncreaseBlockPerHourglass,2.58 +1101,Icy D:CC BlackCat,56,IncreaseBlockPerHourglass,2.6 +1101,Icy D:CC BlackCat,57,IncreaseBlockPerHourglass,2.62 +1101,Icy D:CC BlackCat,58,IncreaseBlockPerHourglass,2.64 +1101,Icy D:CC BlackCat,59,IncreaseBlockPerHourglass,2.66 +1101,Icy D:CC BlackCat,60,IncreaseBlockPerHourglass,2.68 +1101,Icy D:CC BlackCat,61,IncreaseBlockPerHourglass,2.7 +1101,Icy D:CC BlackCat,62,IncreaseBlockPerHourglass,2.72 +1101,Icy D:CC BlackCat,63,IncreaseBlockPerHourglass,2.74 +1101,Icy D:CC BlackCat,64,IncreaseBlockPerHourglass,2.76 +1101,Icy D:CC BlackCat,65,IncreaseBlockPerHourglass,2.78 +1101,Icy D:CC BlackCat,66,IncreaseBlockPerHourglass,2.8 +1101,Icy D:CC BlackCat,67,IncreaseBlockPerHourglass,2.82 +1101,Icy D:CC BlackCat,68,IncreaseBlockPerHourglass,2.84 +1101,Icy D:CC BlackCat,69,IncreaseBlockPerHourglass,2.86 +1101,Icy D:CC BlackCat,70,IncreaseBlockPerHourglass,2.88 +1101,Icy D:CC BlackCat,71,IncreaseBlockPerHourglass,2.9 +1101,Icy D:CC BlackCat,72,IncreaseBlockPerHourglass,2.92 +1101,Icy D:CC BlackCat,73,IncreaseBlockPerHourglass,2.94 +1101,Icy D:CC BlackCat,74,IncreaseBlockPerHourglass,2.96 +1101,Icy D:CC BlackCat,75,IncreaseBlockPerHourglass,2.98 +1101,Icy D:CC BlackCat,76,IncreaseBlockPerHourglass,3.0 +1101,Icy D:CC BlackCat,77,IncreaseBlockPerHourglass,3.02 +1101,Icy D:CC BlackCat,78,IncreaseBlockPerHourglass,3.04 +1101,Icy D:CC BlackCat,79,IncreaseBlockPerHourglass,3.06 +1101,Icy D:CC BlackCat,80,IncreaseBlockPerHourglass,3.08 +1101,Icy D:CC BlackCat,81,IncreaseBlockPerHourglass,3.1 +1101,Icy D:CC BlackCat,82,IncreaseBlockPerHourglass,3.12 +1101,Icy D:CC BlackCat,83,IncreaseBlockPerHourglass,3.14 +1101,Icy D:CC BlackCat,84,IncreaseBlockPerHourglass,3.16 +1101,Icy D:CC BlackCat,85,IncreaseBlockPerHourglass,3.18 +1101,Icy D:CC BlackCat,86,IncreaseBlockPerHourglass,3.2 +1101,Icy D:CC BlackCat,87,IncreaseBlockPerHourglass,3.22 +1101,Icy D:CC BlackCat,88,IncreaseBlockPerHourglass,3.24 +1101,Icy D:CC BlackCat,89,IncreaseBlockPerHourglass,3.26 +1101,Icy D:CC BlackCat,90,IncreaseBlockPerHourglass,3.28 +1101,Icy D:CC BlackCat,91,IncreaseBlockPerHourglass,3.3 +1101,Icy D:CC BlackCat,92,IncreaseBlockPerHourglass,3.32 +1101,Icy D:CC BlackCat,93,IncreaseBlockPerHourglass,3.34 +1101,Icy D:CC BlackCat,94,IncreaseBlockPerHourglass,3.36 +1101,Icy D:CC BlackCat,95,IncreaseBlockPerHourglass,3.38 +1101,Icy D:CC BlackCat,96,IncreaseBlockPerHourglass,3.4 +1101,Icy D:CC BlackCat,97,IncreaseBlockPerHourglass,3.42 +1101,Icy D:CC BlackCat,98,IncreaseBlockPerHourglass,3.44 +1101,Icy D:CC BlackCat,99,IncreaseBlockPerHourglass,3.46 +1101,Icy D:CC BlackCat,100,IncreaseBlockPerHourglass,3.5 +1201,Magenta D:CC BlackCat,1,IncreaseBlockPerHourglass,2.0 +1201,Magenta D:CC BlackCat,2,IncreaseBlockPerHourglass,2.02 +1201,Magenta D:CC BlackCat,3,IncreaseBlockPerHourglass,2.04 +1201,Magenta D:CC BlackCat,4,IncreaseBlockPerHourglass,2.06 +1201,Magenta D:CC BlackCat,5,IncreaseBlockPerHourglass,2.08 +1201,Magenta D:CC BlackCat,6,IncreaseBlockPerHourglass,2.1 +1201,Magenta D:CC BlackCat,7,IncreaseBlockPerHourglass,2.12 +1201,Magenta D:CC BlackCat,8,IncreaseBlockPerHourglass,2.1399999999999997 +1201,Magenta D:CC BlackCat,9,IncreaseBlockPerHourglass,2.16 +1201,Magenta D:CC BlackCat,10,IncreaseBlockPerHourglass,2.1799999999999997 +1201,Magenta D:CC BlackCat,11,IncreaseBlockPerHourglass,2.2 +1201,Magenta D:CC BlackCat,12,IncreaseBlockPerHourglass,2.2199999999999998 +1201,Magenta D:CC BlackCat,13,IncreaseBlockPerHourglass,2.24 +1201,Magenta D:CC BlackCat,14,IncreaseBlockPerHourglass,2.26 +1201,Magenta D:CC BlackCat,15,IncreaseBlockPerHourglass,2.2800000000000002 +1201,Magenta D:CC BlackCat,16,IncreaseBlockPerHourglass,2.3 +1201,Magenta D:CC BlackCat,17,IncreaseBlockPerHourglass,2.3200000000000003 +1201,Magenta D:CC BlackCat,18,IncreaseBlockPerHourglass,2.34 +1201,Magenta D:CC BlackCat,19,IncreaseBlockPerHourglass,2.3600000000000003 +1201,Magenta D:CC BlackCat,20,IncreaseBlockPerHourglass,2.38 +1201,Magenta D:CC BlackCat,21,IncreaseBlockPerHourglass,2.4 +1201,Magenta D:CC BlackCat,22,IncreaseBlockPerHourglass,2.42 +1201,Magenta D:CC BlackCat,23,IncreaseBlockPerHourglass,2.44 +1201,Magenta D:CC BlackCat,24,IncreaseBlockPerHourglass,2.46 +1201,Magenta D:CC BlackCat,25,IncreaseBlockPerHourglass,2.48 +1201,Magenta D:CC BlackCat,26,IncreaseBlockPerHourglass,2.5 +1201,Magenta D:CC BlackCat,27,IncreaseBlockPerHourglass,2.52 +1201,Magenta D:CC BlackCat,28,IncreaseBlockPerHourglass,2.54 +1201,Magenta D:CC BlackCat,29,IncreaseBlockPerHourglass,2.56 +1201,Magenta D:CC BlackCat,30,IncreaseBlockPerHourglass,2.58 +1201,Magenta D:CC BlackCat,31,IncreaseBlockPerHourglass,2.6 +1201,Magenta D:CC BlackCat,32,IncreaseBlockPerHourglass,2.62 +1201,Magenta D:CC BlackCat,33,IncreaseBlockPerHourglass,2.6399999999999997 +1201,Magenta D:CC BlackCat,34,IncreaseBlockPerHourglass,2.66 +1201,Magenta D:CC BlackCat,35,IncreaseBlockPerHourglass,2.6799999999999997 +1201,Magenta D:CC BlackCat,36,IncreaseBlockPerHourglass,2.7 +1201,Magenta D:CC BlackCat,37,IncreaseBlockPerHourglass,2.7199999999999998 +1201,Magenta D:CC BlackCat,38,IncreaseBlockPerHourglass,2.74 +1201,Magenta D:CC BlackCat,39,IncreaseBlockPerHourglass,2.76 +1201,Magenta D:CC BlackCat,40,IncreaseBlockPerHourglass,2.7800000000000002 +1201,Magenta D:CC BlackCat,41,IncreaseBlockPerHourglass,2.8 +1201,Magenta D:CC BlackCat,42,IncreaseBlockPerHourglass,2.8200000000000003 +1201,Magenta D:CC BlackCat,43,IncreaseBlockPerHourglass,2.84 +1201,Magenta D:CC BlackCat,44,IncreaseBlockPerHourglass,2.8600000000000003 +1201,Magenta D:CC BlackCat,45,IncreaseBlockPerHourglass,2.88 +1201,Magenta D:CC BlackCat,46,IncreaseBlockPerHourglass,2.9 +1201,Magenta D:CC BlackCat,47,IncreaseBlockPerHourglass,2.92 +1201,Magenta D:CC BlackCat,48,IncreaseBlockPerHourglass,2.94 +1201,Magenta D:CC BlackCat,49,IncreaseBlockPerHourglass,2.96 +1201,Magenta D:CC BlackCat,50,IncreaseBlockPerHourglass,2.98 +1201,Magenta D:CC BlackCat,51,IncreaseBlockPerHourglass,3.0 +1201,Magenta D:CC BlackCat,52,IncreaseBlockPerHourglass,3.02 +1201,Magenta D:CC BlackCat,53,IncreaseBlockPerHourglass,3.04 +1201,Magenta D:CC BlackCat,54,IncreaseBlockPerHourglass,3.06 +1201,Magenta D:CC BlackCat,55,IncreaseBlockPerHourglass,3.08 +1201,Magenta D:CC BlackCat,56,IncreaseBlockPerHourglass,3.1 +1201,Magenta D:CC BlackCat,57,IncreaseBlockPerHourglass,3.12 +1201,Magenta D:CC BlackCat,58,IncreaseBlockPerHourglass,3.14 +1201,Magenta D:CC BlackCat,59,IncreaseBlockPerHourglass,3.16 +1201,Magenta D:CC BlackCat,60,IncreaseBlockPerHourglass,3.18 +1201,Magenta D:CC BlackCat,61,IncreaseBlockPerHourglass,3.2 +1201,Magenta D:CC BlackCat,62,IncreaseBlockPerHourglass,3.22 +1201,Magenta D:CC BlackCat,63,IncreaseBlockPerHourglass,3.24 +1201,Magenta D:CC BlackCat,64,IncreaseBlockPerHourglass,3.26 +1201,Magenta D:CC BlackCat,65,IncreaseBlockPerHourglass,3.28 +1201,Magenta D:CC BlackCat,66,IncreaseBlockPerHourglass,3.3 +1201,Magenta D:CC BlackCat,67,IncreaseBlockPerHourglass,3.32 +1201,Magenta D:CC BlackCat,68,IncreaseBlockPerHourglass,3.34 +1201,Magenta D:CC BlackCat,69,IncreaseBlockPerHourglass,3.36 +1201,Magenta D:CC BlackCat,70,IncreaseBlockPerHourglass,3.38 +1201,Magenta D:CC BlackCat,71,IncreaseBlockPerHourglass,3.4 +1201,Magenta D:CC BlackCat,72,IncreaseBlockPerHourglass,3.42 +1201,Magenta D:CC BlackCat,73,IncreaseBlockPerHourglass,3.44 +1201,Magenta D:CC BlackCat,74,IncreaseBlockPerHourglass,3.46 +1201,Magenta D:CC BlackCat,75,IncreaseBlockPerHourglass,3.48 +1201,Magenta D:CC BlackCat,76,IncreaseBlockPerHourglass,3.5 +1201,Magenta D:CC BlackCat,77,IncreaseBlockPerHourglass,3.52 +1201,Magenta D:CC BlackCat,78,IncreaseBlockPerHourglass,3.54 +1201,Magenta D:CC BlackCat,79,IncreaseBlockPerHourglass,3.56 +1201,Magenta D:CC BlackCat,80,IncreaseBlockPerHourglass,3.58 +1201,Magenta D:CC BlackCat,81,IncreaseBlockPerHourglass,3.6 +1201,Magenta D:CC BlackCat,82,IncreaseBlockPerHourglass,3.62 +1201,Magenta D:CC BlackCat,83,IncreaseBlockPerHourglass,3.64 +1201,Magenta D:CC BlackCat,84,IncreaseBlockPerHourglass,3.66 +1201,Magenta D:CC BlackCat,85,IncreaseBlockPerHourglass,3.68 +1201,Magenta D:CC BlackCat,86,IncreaseBlockPerHourglass,3.7 +1201,Magenta D:CC BlackCat,87,IncreaseBlockPerHourglass,3.72 +1201,Magenta D:CC BlackCat,88,IncreaseBlockPerHourglass,3.74 +1201,Magenta D:CC BlackCat,89,IncreaseBlockPerHourglass,3.76 +1201,Magenta D:CC BlackCat,90,IncreaseBlockPerHourglass,3.78 +1201,Magenta D:CC BlackCat,91,IncreaseBlockPerHourglass,3.8 +1201,Magenta D:CC BlackCat,92,IncreaseBlockPerHourglass,3.82 +1201,Magenta D:CC BlackCat,93,IncreaseBlockPerHourglass,3.84 +1201,Magenta D:CC BlackCat,94,IncreaseBlockPerHourglass,3.86 +1201,Magenta D:CC BlackCat,95,IncreaseBlockPerHourglass,3.88 +1201,Magenta D:CC BlackCat,96,IncreaseBlockPerHourglass,3.9 +1201,Magenta D:CC BlackCat,97,IncreaseBlockPerHourglass,3.92 +1201,Magenta D:CC BlackCat,98,IncreaseBlockPerHourglass,3.94 +1201,Magenta D:CC BlackCat,99,IncreaseBlockPerHourglass,3.96 +1201,Magenta D:CC BlackCat,100,IncreaseBlockPerHourglass,4.0 +1301,Yellow D:CC BlackCat,1,IncreaseBlockPerHourglass,2.5 +1301,Yellow D:CC BlackCat,2,IncreaseBlockPerHourglass,2.52 +1301,Yellow D:CC BlackCat,3,IncreaseBlockPerHourglass,2.54 +1301,Yellow D:CC BlackCat,4,IncreaseBlockPerHourglass,2.56 +1301,Yellow D:CC BlackCat,5,IncreaseBlockPerHourglass,2.58 +1301,Yellow D:CC BlackCat,6,IncreaseBlockPerHourglass,2.6 +1301,Yellow D:CC BlackCat,7,IncreaseBlockPerHourglass,2.62 +1301,Yellow D:CC BlackCat,8,IncreaseBlockPerHourglass,2.6399999999999997 +1301,Yellow D:CC BlackCat,9,IncreaseBlockPerHourglass,2.66 +1301,Yellow D:CC BlackCat,10,IncreaseBlockPerHourglass,2.6799999999999997 +1301,Yellow D:CC BlackCat,11,IncreaseBlockPerHourglass,2.7 +1301,Yellow D:CC BlackCat,12,IncreaseBlockPerHourglass,2.7199999999999998 +1301,Yellow D:CC BlackCat,13,IncreaseBlockPerHourglass,2.74 +1301,Yellow D:CC BlackCat,14,IncreaseBlockPerHourglass,2.76 +1301,Yellow D:CC BlackCat,15,IncreaseBlockPerHourglass,2.7800000000000002 +1301,Yellow D:CC BlackCat,16,IncreaseBlockPerHourglass,2.8 +1301,Yellow D:CC BlackCat,17,IncreaseBlockPerHourglass,2.8200000000000003 +1301,Yellow D:CC BlackCat,18,IncreaseBlockPerHourglass,2.84 +1301,Yellow D:CC BlackCat,19,IncreaseBlockPerHourglass,2.8600000000000003 +1301,Yellow D:CC BlackCat,20,IncreaseBlockPerHourglass,2.88 +1301,Yellow D:CC BlackCat,21,IncreaseBlockPerHourglass,2.9 +1301,Yellow D:CC BlackCat,22,IncreaseBlockPerHourglass,2.92 +1301,Yellow D:CC BlackCat,23,IncreaseBlockPerHourglass,2.94 +1301,Yellow D:CC BlackCat,24,IncreaseBlockPerHourglass,2.96 +1301,Yellow D:CC BlackCat,25,IncreaseBlockPerHourglass,2.98 +1301,Yellow D:CC BlackCat,26,IncreaseBlockPerHourglass,3.0 +1301,Yellow D:CC BlackCat,27,IncreaseBlockPerHourglass,3.02 +1301,Yellow D:CC BlackCat,28,IncreaseBlockPerHourglass,3.04 +1301,Yellow D:CC BlackCat,29,IncreaseBlockPerHourglass,3.06 +1301,Yellow D:CC BlackCat,30,IncreaseBlockPerHourglass,3.08 +1301,Yellow D:CC BlackCat,31,IncreaseBlockPerHourglass,3.1 +1301,Yellow D:CC BlackCat,32,IncreaseBlockPerHourglass,3.12 +1301,Yellow D:CC BlackCat,33,IncreaseBlockPerHourglass,3.1399999999999997 +1301,Yellow D:CC BlackCat,34,IncreaseBlockPerHourglass,3.16 +1301,Yellow D:CC BlackCat,35,IncreaseBlockPerHourglass,3.1799999999999997 +1301,Yellow D:CC BlackCat,36,IncreaseBlockPerHourglass,3.2 +1301,Yellow D:CC BlackCat,37,IncreaseBlockPerHourglass,3.2199999999999998 +1301,Yellow D:CC BlackCat,38,IncreaseBlockPerHourglass,3.24 +1301,Yellow D:CC BlackCat,39,IncreaseBlockPerHourglass,3.26 +1301,Yellow D:CC BlackCat,40,IncreaseBlockPerHourglass,3.2800000000000002 +1301,Yellow D:CC BlackCat,41,IncreaseBlockPerHourglass,3.3 +1301,Yellow D:CC BlackCat,42,IncreaseBlockPerHourglass,3.3200000000000003 +1301,Yellow D:CC BlackCat,43,IncreaseBlockPerHourglass,3.34 +1301,Yellow D:CC BlackCat,44,IncreaseBlockPerHourglass,3.3600000000000003 +1301,Yellow D:CC BlackCat,45,IncreaseBlockPerHourglass,3.38 +1301,Yellow D:CC BlackCat,46,IncreaseBlockPerHourglass,3.4 +1301,Yellow D:CC BlackCat,47,IncreaseBlockPerHourglass,3.42 +1301,Yellow D:CC BlackCat,48,IncreaseBlockPerHourglass,3.44 +1301,Yellow D:CC BlackCat,49,IncreaseBlockPerHourglass,3.46 +1301,Yellow D:CC BlackCat,50,IncreaseBlockPerHourglass,3.48 +1301,Yellow D:CC BlackCat,51,IncreaseBlockPerHourglass,3.5 +1301,Yellow D:CC BlackCat,52,IncreaseBlockPerHourglass,3.52 +1301,Yellow D:CC BlackCat,53,IncreaseBlockPerHourglass,3.54 +1301,Yellow D:CC BlackCat,54,IncreaseBlockPerHourglass,3.56 +1301,Yellow D:CC BlackCat,55,IncreaseBlockPerHourglass,3.58 +1301,Yellow D:CC BlackCat,56,IncreaseBlockPerHourglass,3.6 +1301,Yellow D:CC BlackCat,57,IncreaseBlockPerHourglass,3.62 +1301,Yellow D:CC BlackCat,58,IncreaseBlockPerHourglass,3.64 +1301,Yellow D:CC BlackCat,59,IncreaseBlockPerHourglass,3.66 +1301,Yellow D:CC BlackCat,60,IncreaseBlockPerHourglass,3.68 +1301,Yellow D:CC BlackCat,61,IncreaseBlockPerHourglass,3.7 +1301,Yellow D:CC BlackCat,62,IncreaseBlockPerHourglass,3.72 +1301,Yellow D:CC BlackCat,63,IncreaseBlockPerHourglass,3.74 +1301,Yellow D:CC BlackCat,64,IncreaseBlockPerHourglass,3.76 +1301,Yellow D:CC BlackCat,65,IncreaseBlockPerHourglass,3.78 +1301,Yellow D:CC BlackCat,66,IncreaseBlockPerHourglass,3.8 +1301,Yellow D:CC BlackCat,67,IncreaseBlockPerHourglass,3.82 +1301,Yellow D:CC BlackCat,68,IncreaseBlockPerHourglass,3.84 +1301,Yellow D:CC BlackCat,69,IncreaseBlockPerHourglass,3.86 +1301,Yellow D:CC BlackCat,70,IncreaseBlockPerHourglass,3.88 +1301,Yellow D:CC BlackCat,71,IncreaseBlockPerHourglass,3.9 +1301,Yellow D:CC BlackCat,72,IncreaseBlockPerHourglass,3.92 +1301,Yellow D:CC BlackCat,73,IncreaseBlockPerHourglass,3.94 +1301,Yellow D:CC BlackCat,74,IncreaseBlockPerHourglass,3.96 +1301,Yellow D:CC BlackCat,75,IncreaseBlockPerHourglass,3.98 +1301,Yellow D:CC BlackCat,76,IncreaseBlockPerHourglass,4.0 +1301,Yellow D:CC BlackCat,77,IncreaseBlockPerHourglass,4.02 +1301,Yellow D:CC BlackCat,78,IncreaseBlockPerHourglass,4.04 +1301,Yellow D:CC BlackCat,79,IncreaseBlockPerHourglass,4.0600000000000005 +1301,Yellow D:CC BlackCat,80,IncreaseBlockPerHourglass,4.08 +1301,Yellow D:CC BlackCat,81,IncreaseBlockPerHourglass,4.1 +1301,Yellow D:CC BlackCat,82,IncreaseBlockPerHourglass,4.12 +1301,Yellow D:CC BlackCat,83,IncreaseBlockPerHourglass,4.140000000000001 +1301,Yellow D:CC BlackCat,84,IncreaseBlockPerHourglass,4.16 +1301,Yellow D:CC BlackCat,85,IncreaseBlockPerHourglass,4.18 +1301,Yellow D:CC BlackCat,86,IncreaseBlockPerHourglass,4.2 +1301,Yellow D:CC BlackCat,87,IncreaseBlockPerHourglass,4.220000000000001 +1301,Yellow D:CC BlackCat,88,IncreaseBlockPerHourglass,4.24 +1301,Yellow D:CC BlackCat,89,IncreaseBlockPerHourglass,4.26 +1301,Yellow D:CC BlackCat,90,IncreaseBlockPerHourglass,4.279999999999999 +1301,Yellow D:CC BlackCat,91,IncreaseBlockPerHourglass,4.3 +1301,Yellow D:CC BlackCat,92,IncreaseBlockPerHourglass,4.32 +1301,Yellow D:CC BlackCat,93,IncreaseBlockPerHourglass,4.34 +1301,Yellow D:CC BlackCat,94,IncreaseBlockPerHourglass,4.359999999999999 +1301,Yellow D:CC BlackCat,95,IncreaseBlockPerHourglass,4.38 +1301,Yellow D:CC BlackCat,96,IncreaseBlockPerHourglass,4.4 +1301,Yellow D:CC BlackCat,97,IncreaseBlockPerHourglass,4.42 +1301,Yellow D:CC BlackCat,98,IncreaseBlockPerHourglass,4.4399999999999995 +1301,Yellow D:CC BlackCat,99,IncreaseBlockPerHourglass,4.46 +1301,Yellow D:CC BlackCat,100,IncreaseBlockPerHourglass,4.5 1002,Red Donguri,1,DiscountMaterialCostCrystal,20 1002,Red Donguri,2,DiscountMaterialCostCrystal,20.2 1002,Red Donguri,3,DiscountMaterialCostCrystal,20.4 @@ -199,6 +499,306 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1002,Red Donguri,98,DiscountMaterialCostCrystal,39.4 1002,Red Donguri,99,DiscountMaterialCostCrystal,39.6 1002,Red Donguri,100,DiscountMaterialCostCrystal,40 +1102,Icy Red Donguri,1,DiscountMaterialCostCrystal,25.0 +1102,Icy Red Donguri,2,DiscountMaterialCostCrystal,25.2 +1102,Icy Red Donguri,3,DiscountMaterialCostCrystal,25.4 +1102,Icy Red Donguri,4,DiscountMaterialCostCrystal,25.6 +1102,Icy Red Donguri,5,DiscountMaterialCostCrystal,25.8 +1102,Icy Red Donguri,6,DiscountMaterialCostCrystal,26.0 +1102,Icy Red Donguri,7,DiscountMaterialCostCrystal,26.2 +1102,Icy Red Donguri,8,DiscountMaterialCostCrystal,26.4 +1102,Icy Red Donguri,9,DiscountMaterialCostCrystal,26.6 +1102,Icy Red Donguri,10,DiscountMaterialCostCrystal,26.8 +1102,Icy Red Donguri,11,DiscountMaterialCostCrystal,27.0 +1102,Icy Red Donguri,12,DiscountMaterialCostCrystal,27.2 +1102,Icy Red Donguri,13,DiscountMaterialCostCrystal,27.4 +1102,Icy Red Donguri,14,DiscountMaterialCostCrystal,27.6 +1102,Icy Red Donguri,15,DiscountMaterialCostCrystal,27.8 +1102,Icy Red Donguri,16,DiscountMaterialCostCrystal,28.0 +1102,Icy Red Donguri,17,DiscountMaterialCostCrystal,28.2 +1102,Icy Red Donguri,18,DiscountMaterialCostCrystal,28.4 +1102,Icy Red Donguri,19,DiscountMaterialCostCrystal,28.6 +1102,Icy Red Donguri,20,DiscountMaterialCostCrystal,28.8 +1102,Icy Red Donguri,21,DiscountMaterialCostCrystal,29.0 +1102,Icy Red Donguri,22,DiscountMaterialCostCrystal,29.2 +1102,Icy Red Donguri,23,DiscountMaterialCostCrystal,29.4 +1102,Icy Red Donguri,24,DiscountMaterialCostCrystal,29.6 +1102,Icy Red Donguri,25,DiscountMaterialCostCrystal,29.8 +1102,Icy Red Donguri,26,DiscountMaterialCostCrystal,30.0 +1102,Icy Red Donguri,27,DiscountMaterialCostCrystal,30.2 +1102,Icy Red Donguri,28,DiscountMaterialCostCrystal,30.4 +1102,Icy Red Donguri,29,DiscountMaterialCostCrystal,30.6 +1102,Icy Red Donguri,30,DiscountMaterialCostCrystal,30.8 +1102,Icy Red Donguri,31,DiscountMaterialCostCrystal,31.0 +1102,Icy Red Donguri,32,DiscountMaterialCostCrystal,31.2 +1102,Icy Red Donguri,33,DiscountMaterialCostCrystal,31.4 +1102,Icy Red Donguri,34,DiscountMaterialCostCrystal,31.6 +1102,Icy Red Donguri,35,DiscountMaterialCostCrystal,31.8 +1102,Icy Red Donguri,36,DiscountMaterialCostCrystal,32.0 +1102,Icy Red Donguri,37,DiscountMaterialCostCrystal,32.2 +1102,Icy Red Donguri,38,DiscountMaterialCostCrystal,32.4 +1102,Icy Red Donguri,39,DiscountMaterialCostCrystal,32.6 +1102,Icy Red Donguri,40,DiscountMaterialCostCrystal,32.8 +1102,Icy Red Donguri,41,DiscountMaterialCostCrystal,33.0 +1102,Icy Red Donguri,42,DiscountMaterialCostCrystal,33.2 +1102,Icy Red Donguri,43,DiscountMaterialCostCrystal,33.4 +1102,Icy Red Donguri,44,DiscountMaterialCostCrystal,33.6 +1102,Icy Red Donguri,45,DiscountMaterialCostCrystal,33.8 +1102,Icy Red Donguri,46,DiscountMaterialCostCrystal,34.0 +1102,Icy Red Donguri,47,DiscountMaterialCostCrystal,34.2 +1102,Icy Red Donguri,48,DiscountMaterialCostCrystal,34.4 +1102,Icy Red Donguri,49,DiscountMaterialCostCrystal,34.6 +1102,Icy Red Donguri,50,DiscountMaterialCostCrystal,34.8 +1102,Icy Red Donguri,51,DiscountMaterialCostCrystal,35.0 +1102,Icy Red Donguri,52,DiscountMaterialCostCrystal,35.2 +1102,Icy Red Donguri,53,DiscountMaterialCostCrystal,35.4 +1102,Icy Red Donguri,54,DiscountMaterialCostCrystal,35.6 +1102,Icy Red Donguri,55,DiscountMaterialCostCrystal,35.8 +1102,Icy Red Donguri,56,DiscountMaterialCostCrystal,36.0 +1102,Icy Red Donguri,57,DiscountMaterialCostCrystal,36.2 +1102,Icy Red Donguri,58,DiscountMaterialCostCrystal,36.4 +1102,Icy Red Donguri,59,DiscountMaterialCostCrystal,36.6 +1102,Icy Red Donguri,60,DiscountMaterialCostCrystal,36.8 +1102,Icy Red Donguri,61,DiscountMaterialCostCrystal,37.0 +1102,Icy Red Donguri,62,DiscountMaterialCostCrystal,37.2 +1102,Icy Red Donguri,63,DiscountMaterialCostCrystal,37.4 +1102,Icy Red Donguri,64,DiscountMaterialCostCrystal,37.6 +1102,Icy Red Donguri,65,DiscountMaterialCostCrystal,37.8 +1102,Icy Red Donguri,66,DiscountMaterialCostCrystal,38.0 +1102,Icy Red Donguri,67,DiscountMaterialCostCrystal,38.2 +1102,Icy Red Donguri,68,DiscountMaterialCostCrystal,38.4 +1102,Icy Red Donguri,69,DiscountMaterialCostCrystal,38.6 +1102,Icy Red Donguri,70,DiscountMaterialCostCrystal,38.8 +1102,Icy Red Donguri,71,DiscountMaterialCostCrystal,39.0 +1102,Icy Red Donguri,72,DiscountMaterialCostCrystal,39.2 +1102,Icy Red Donguri,73,DiscountMaterialCostCrystal,39.4 +1102,Icy Red Donguri,74,DiscountMaterialCostCrystal,39.6 +1102,Icy Red Donguri,75,DiscountMaterialCostCrystal,39.8 +1102,Icy Red Donguri,76,DiscountMaterialCostCrystal,40.0 +1102,Icy Red Donguri,77,DiscountMaterialCostCrystal,40.2 +1102,Icy Red Donguri,78,DiscountMaterialCostCrystal,40.4 +1102,Icy Red Donguri,79,DiscountMaterialCostCrystal,40.6 +1102,Icy Red Donguri,80,DiscountMaterialCostCrystal,40.8 +1102,Icy Red Donguri,81,DiscountMaterialCostCrystal,41.0 +1102,Icy Red Donguri,82,DiscountMaterialCostCrystal,41.2 +1102,Icy Red Donguri,83,DiscountMaterialCostCrystal,41.4 +1102,Icy Red Donguri,84,DiscountMaterialCostCrystal,41.6 +1102,Icy Red Donguri,85,DiscountMaterialCostCrystal,41.8 +1102,Icy Red Donguri,86,DiscountMaterialCostCrystal,42.0 +1102,Icy Red Donguri,87,DiscountMaterialCostCrystal,42.2 +1102,Icy Red Donguri,88,DiscountMaterialCostCrystal,42.4 +1102,Icy Red Donguri,89,DiscountMaterialCostCrystal,42.6 +1102,Icy Red Donguri,90,DiscountMaterialCostCrystal,42.8 +1102,Icy Red Donguri,91,DiscountMaterialCostCrystal,43.0 +1102,Icy Red Donguri,92,DiscountMaterialCostCrystal,43.2 +1102,Icy Red Donguri,93,DiscountMaterialCostCrystal,43.4 +1102,Icy Red Donguri,94,DiscountMaterialCostCrystal,43.6 +1102,Icy Red Donguri,95,DiscountMaterialCostCrystal,43.8 +1102,Icy Red Donguri,96,DiscountMaterialCostCrystal,44.0 +1102,Icy Red Donguri,97,DiscountMaterialCostCrystal,44.2 +1102,Icy Red Donguri,98,DiscountMaterialCostCrystal,44.4 +1102,Icy Red Donguri,99,DiscountMaterialCostCrystal,44.6 +1102,Icy Red Donguri,100,DiscountMaterialCostCrystal,45.0 +1202,Magenta Red Donguri,1,DiscountMaterialCostCrystal,30.0 +1202,Magenta Red Donguri,2,DiscountMaterialCostCrystal,30.2 +1202,Magenta Red Donguri,3,DiscountMaterialCostCrystal,30.4 +1202,Magenta Red Donguri,4,DiscountMaterialCostCrystal,30.6 +1202,Magenta Red Donguri,5,DiscountMaterialCostCrystal,30.8 +1202,Magenta Red Donguri,6,DiscountMaterialCostCrystal,31.0 +1202,Magenta Red Donguri,7,DiscountMaterialCostCrystal,31.2 +1202,Magenta Red Donguri,8,DiscountMaterialCostCrystal,31.4 +1202,Magenta Red Donguri,9,DiscountMaterialCostCrystal,31.6 +1202,Magenta Red Donguri,10,DiscountMaterialCostCrystal,31.8 +1202,Magenta Red Donguri,11,DiscountMaterialCostCrystal,32.0 +1202,Magenta Red Donguri,12,DiscountMaterialCostCrystal,32.2 +1202,Magenta Red Donguri,13,DiscountMaterialCostCrystal,32.4 +1202,Magenta Red Donguri,14,DiscountMaterialCostCrystal,32.6 +1202,Magenta Red Donguri,15,DiscountMaterialCostCrystal,32.8 +1202,Magenta Red Donguri,16,DiscountMaterialCostCrystal,33.0 +1202,Magenta Red Donguri,17,DiscountMaterialCostCrystal,33.2 +1202,Magenta Red Donguri,18,DiscountMaterialCostCrystal,33.4 +1202,Magenta Red Donguri,19,DiscountMaterialCostCrystal,33.6 +1202,Magenta Red Donguri,20,DiscountMaterialCostCrystal,33.8 +1202,Magenta Red Donguri,21,DiscountMaterialCostCrystal,34.0 +1202,Magenta Red Donguri,22,DiscountMaterialCostCrystal,34.2 +1202,Magenta Red Donguri,23,DiscountMaterialCostCrystal,34.4 +1202,Magenta Red Donguri,24,DiscountMaterialCostCrystal,34.6 +1202,Magenta Red Donguri,25,DiscountMaterialCostCrystal,34.8 +1202,Magenta Red Donguri,26,DiscountMaterialCostCrystal,35.0 +1202,Magenta Red Donguri,27,DiscountMaterialCostCrystal,35.2 +1202,Magenta Red Donguri,28,DiscountMaterialCostCrystal,35.4 +1202,Magenta Red Donguri,29,DiscountMaterialCostCrystal,35.6 +1202,Magenta Red Donguri,30,DiscountMaterialCostCrystal,35.8 +1202,Magenta Red Donguri,31,DiscountMaterialCostCrystal,36.0 +1202,Magenta Red Donguri,32,DiscountMaterialCostCrystal,36.2 +1202,Magenta Red Donguri,33,DiscountMaterialCostCrystal,36.4 +1202,Magenta Red Donguri,34,DiscountMaterialCostCrystal,36.6 +1202,Magenta Red Donguri,35,DiscountMaterialCostCrystal,36.8 +1202,Magenta Red Donguri,36,DiscountMaterialCostCrystal,37.0 +1202,Magenta Red Donguri,37,DiscountMaterialCostCrystal,37.2 +1202,Magenta Red Donguri,38,DiscountMaterialCostCrystal,37.4 +1202,Magenta Red Donguri,39,DiscountMaterialCostCrystal,37.6 +1202,Magenta Red Donguri,40,DiscountMaterialCostCrystal,37.8 +1202,Magenta Red Donguri,41,DiscountMaterialCostCrystal,38.0 +1202,Magenta Red Donguri,42,DiscountMaterialCostCrystal,38.2 +1202,Magenta Red Donguri,43,DiscountMaterialCostCrystal,38.4 +1202,Magenta Red Donguri,44,DiscountMaterialCostCrystal,38.6 +1202,Magenta Red Donguri,45,DiscountMaterialCostCrystal,38.8 +1202,Magenta Red Donguri,46,DiscountMaterialCostCrystal,39.0 +1202,Magenta Red Donguri,47,DiscountMaterialCostCrystal,39.2 +1202,Magenta Red Donguri,48,DiscountMaterialCostCrystal,39.4 +1202,Magenta Red Donguri,49,DiscountMaterialCostCrystal,39.6 +1202,Magenta Red Donguri,50,DiscountMaterialCostCrystal,39.8 +1202,Magenta Red Donguri,51,DiscountMaterialCostCrystal,40.0 +1202,Magenta Red Donguri,52,DiscountMaterialCostCrystal,40.2 +1202,Magenta Red Donguri,53,DiscountMaterialCostCrystal,40.4 +1202,Magenta Red Donguri,54,DiscountMaterialCostCrystal,40.6 +1202,Magenta Red Donguri,55,DiscountMaterialCostCrystal,40.8 +1202,Magenta Red Donguri,56,DiscountMaterialCostCrystal,41.0 +1202,Magenta Red Donguri,57,DiscountMaterialCostCrystal,41.2 +1202,Magenta Red Donguri,58,DiscountMaterialCostCrystal,41.4 +1202,Magenta Red Donguri,59,DiscountMaterialCostCrystal,41.6 +1202,Magenta Red Donguri,60,DiscountMaterialCostCrystal,41.8 +1202,Magenta Red Donguri,61,DiscountMaterialCostCrystal,42.0 +1202,Magenta Red Donguri,62,DiscountMaterialCostCrystal,42.2 +1202,Magenta Red Donguri,63,DiscountMaterialCostCrystal,42.4 +1202,Magenta Red Donguri,64,DiscountMaterialCostCrystal,42.6 +1202,Magenta Red Donguri,65,DiscountMaterialCostCrystal,42.8 +1202,Magenta Red Donguri,66,DiscountMaterialCostCrystal,43.0 +1202,Magenta Red Donguri,67,DiscountMaterialCostCrystal,43.2 +1202,Magenta Red Donguri,68,DiscountMaterialCostCrystal,43.4 +1202,Magenta Red Donguri,69,DiscountMaterialCostCrystal,43.6 +1202,Magenta Red Donguri,70,DiscountMaterialCostCrystal,43.8 +1202,Magenta Red Donguri,71,DiscountMaterialCostCrystal,44.0 +1202,Magenta Red Donguri,72,DiscountMaterialCostCrystal,44.2 +1202,Magenta Red Donguri,73,DiscountMaterialCostCrystal,44.4 +1202,Magenta Red Donguri,74,DiscountMaterialCostCrystal,44.6 +1202,Magenta Red Donguri,75,DiscountMaterialCostCrystal,44.8 +1202,Magenta Red Donguri,76,DiscountMaterialCostCrystal,45.0 +1202,Magenta Red Donguri,77,DiscountMaterialCostCrystal,45.2 +1202,Magenta Red Donguri,78,DiscountMaterialCostCrystal,45.4 +1202,Magenta Red Donguri,79,DiscountMaterialCostCrystal,45.6 +1202,Magenta Red Donguri,80,DiscountMaterialCostCrystal,45.8 +1202,Magenta Red Donguri,81,DiscountMaterialCostCrystal,46.0 +1202,Magenta Red Donguri,82,DiscountMaterialCostCrystal,46.2 +1202,Magenta Red Donguri,83,DiscountMaterialCostCrystal,46.4 +1202,Magenta Red Donguri,84,DiscountMaterialCostCrystal,46.6 +1202,Magenta Red Donguri,85,DiscountMaterialCostCrystal,46.8 +1202,Magenta Red Donguri,86,DiscountMaterialCostCrystal,47.0 +1202,Magenta Red Donguri,87,DiscountMaterialCostCrystal,47.2 +1202,Magenta Red Donguri,88,DiscountMaterialCostCrystal,47.4 +1202,Magenta Red Donguri,89,DiscountMaterialCostCrystal,47.6 +1202,Magenta Red Donguri,90,DiscountMaterialCostCrystal,47.8 +1202,Magenta Red Donguri,91,DiscountMaterialCostCrystal,48.0 +1202,Magenta Red Donguri,92,DiscountMaterialCostCrystal,48.2 +1202,Magenta Red Donguri,93,DiscountMaterialCostCrystal,48.4 +1202,Magenta Red Donguri,94,DiscountMaterialCostCrystal,48.6 +1202,Magenta Red Donguri,95,DiscountMaterialCostCrystal,48.8 +1202,Magenta Red Donguri,96,DiscountMaterialCostCrystal,49.0 +1202,Magenta Red Donguri,97,DiscountMaterialCostCrystal,49.2 +1202,Magenta Red Donguri,98,DiscountMaterialCostCrystal,49.4 +1202,Magenta Red Donguri,99,DiscountMaterialCostCrystal,49.6 +1202,Magenta Red Donguri,100,DiscountMaterialCostCrystal,50.0 +1302,Yellow Red Donguri,1,DiscountMaterialCostCrystal,35.0 +1302,Yellow Red Donguri,2,DiscountMaterialCostCrystal,35.2 +1302,Yellow Red Donguri,3,DiscountMaterialCostCrystal,35.4 +1302,Yellow Red Donguri,4,DiscountMaterialCostCrystal,35.6 +1302,Yellow Red Donguri,5,DiscountMaterialCostCrystal,35.8 +1302,Yellow Red Donguri,6,DiscountMaterialCostCrystal,36.0 +1302,Yellow Red Donguri,7,DiscountMaterialCostCrystal,36.2 +1302,Yellow Red Donguri,8,DiscountMaterialCostCrystal,36.4 +1302,Yellow Red Donguri,9,DiscountMaterialCostCrystal,36.6 +1302,Yellow Red Donguri,10,DiscountMaterialCostCrystal,36.8 +1302,Yellow Red Donguri,11,DiscountMaterialCostCrystal,37.0 +1302,Yellow Red Donguri,12,DiscountMaterialCostCrystal,37.2 +1302,Yellow Red Donguri,13,DiscountMaterialCostCrystal,37.4 +1302,Yellow Red Donguri,14,DiscountMaterialCostCrystal,37.6 +1302,Yellow Red Donguri,15,DiscountMaterialCostCrystal,37.8 +1302,Yellow Red Donguri,16,DiscountMaterialCostCrystal,38.0 +1302,Yellow Red Donguri,17,DiscountMaterialCostCrystal,38.2 +1302,Yellow Red Donguri,18,DiscountMaterialCostCrystal,38.4 +1302,Yellow Red Donguri,19,DiscountMaterialCostCrystal,38.6 +1302,Yellow Red Donguri,20,DiscountMaterialCostCrystal,38.8 +1302,Yellow Red Donguri,21,DiscountMaterialCostCrystal,39.0 +1302,Yellow Red Donguri,22,DiscountMaterialCostCrystal,39.2 +1302,Yellow Red Donguri,23,DiscountMaterialCostCrystal,39.4 +1302,Yellow Red Donguri,24,DiscountMaterialCostCrystal,39.6 +1302,Yellow Red Donguri,25,DiscountMaterialCostCrystal,39.8 +1302,Yellow Red Donguri,26,DiscountMaterialCostCrystal,40.0 +1302,Yellow Red Donguri,27,DiscountMaterialCostCrystal,40.2 +1302,Yellow Red Donguri,28,DiscountMaterialCostCrystal,40.4 +1302,Yellow Red Donguri,29,DiscountMaterialCostCrystal,40.6 +1302,Yellow Red Donguri,30,DiscountMaterialCostCrystal,40.8 +1302,Yellow Red Donguri,31,DiscountMaterialCostCrystal,41.0 +1302,Yellow Red Donguri,32,DiscountMaterialCostCrystal,41.2 +1302,Yellow Red Donguri,33,DiscountMaterialCostCrystal,41.4 +1302,Yellow Red Donguri,34,DiscountMaterialCostCrystal,41.6 +1302,Yellow Red Donguri,35,DiscountMaterialCostCrystal,41.8 +1302,Yellow Red Donguri,36,DiscountMaterialCostCrystal,42.0 +1302,Yellow Red Donguri,37,DiscountMaterialCostCrystal,42.2 +1302,Yellow Red Donguri,38,DiscountMaterialCostCrystal,42.4 +1302,Yellow Red Donguri,39,DiscountMaterialCostCrystal,42.6 +1302,Yellow Red Donguri,40,DiscountMaterialCostCrystal,42.8 +1302,Yellow Red Donguri,41,DiscountMaterialCostCrystal,43.0 +1302,Yellow Red Donguri,42,DiscountMaterialCostCrystal,43.2 +1302,Yellow Red Donguri,43,DiscountMaterialCostCrystal,43.4 +1302,Yellow Red Donguri,44,DiscountMaterialCostCrystal,43.6 +1302,Yellow Red Donguri,45,DiscountMaterialCostCrystal,43.8 +1302,Yellow Red Donguri,46,DiscountMaterialCostCrystal,44.0 +1302,Yellow Red Donguri,47,DiscountMaterialCostCrystal,44.2 +1302,Yellow Red Donguri,48,DiscountMaterialCostCrystal,44.4 +1302,Yellow Red Donguri,49,DiscountMaterialCostCrystal,44.6 +1302,Yellow Red Donguri,50,DiscountMaterialCostCrystal,44.8 +1302,Yellow Red Donguri,51,DiscountMaterialCostCrystal,45.0 +1302,Yellow Red Donguri,52,DiscountMaterialCostCrystal,45.2 +1302,Yellow Red Donguri,53,DiscountMaterialCostCrystal,45.4 +1302,Yellow Red Donguri,54,DiscountMaterialCostCrystal,45.6 +1302,Yellow Red Donguri,55,DiscountMaterialCostCrystal,45.8 +1302,Yellow Red Donguri,56,DiscountMaterialCostCrystal,46.0 +1302,Yellow Red Donguri,57,DiscountMaterialCostCrystal,46.2 +1302,Yellow Red Donguri,58,DiscountMaterialCostCrystal,46.4 +1302,Yellow Red Donguri,59,DiscountMaterialCostCrystal,46.6 +1302,Yellow Red Donguri,60,DiscountMaterialCostCrystal,46.8 +1302,Yellow Red Donguri,61,DiscountMaterialCostCrystal,47.0 +1302,Yellow Red Donguri,62,DiscountMaterialCostCrystal,47.2 +1302,Yellow Red Donguri,63,DiscountMaterialCostCrystal,47.4 +1302,Yellow Red Donguri,64,DiscountMaterialCostCrystal,47.6 +1302,Yellow Red Donguri,65,DiscountMaterialCostCrystal,47.8 +1302,Yellow Red Donguri,66,DiscountMaterialCostCrystal,48.0 +1302,Yellow Red Donguri,67,DiscountMaterialCostCrystal,48.2 +1302,Yellow Red Donguri,68,DiscountMaterialCostCrystal,48.4 +1302,Yellow Red Donguri,69,DiscountMaterialCostCrystal,48.6 +1302,Yellow Red Donguri,70,DiscountMaterialCostCrystal,48.8 +1302,Yellow Red Donguri,71,DiscountMaterialCostCrystal,49.0 +1302,Yellow Red Donguri,72,DiscountMaterialCostCrystal,49.2 +1302,Yellow Red Donguri,73,DiscountMaterialCostCrystal,49.4 +1302,Yellow Red Donguri,74,DiscountMaterialCostCrystal,49.6 +1302,Yellow Red Donguri,75,DiscountMaterialCostCrystal,49.8 +1302,Yellow Red Donguri,76,DiscountMaterialCostCrystal,50.0 +1302,Yellow Red Donguri,77,DiscountMaterialCostCrystal,50.2 +1302,Yellow Red Donguri,78,DiscountMaterialCostCrystal,50.4 +1302,Yellow Red Donguri,79,DiscountMaterialCostCrystal,50.6 +1302,Yellow Red Donguri,80,DiscountMaterialCostCrystal,50.8 +1302,Yellow Red Donguri,81,DiscountMaterialCostCrystal,51.0 +1302,Yellow Red Donguri,82,DiscountMaterialCostCrystal,51.2 +1302,Yellow Red Donguri,83,DiscountMaterialCostCrystal,51.4 +1302,Yellow Red Donguri,84,DiscountMaterialCostCrystal,51.6 +1302,Yellow Red Donguri,85,DiscountMaterialCostCrystal,51.8 +1302,Yellow Red Donguri,86,DiscountMaterialCostCrystal,52.0 +1302,Yellow Red Donguri,87,DiscountMaterialCostCrystal,52.2 +1302,Yellow Red Donguri,88,DiscountMaterialCostCrystal,52.4 +1302,Yellow Red Donguri,89,DiscountMaterialCostCrystal,52.6 +1302,Yellow Red Donguri,90,DiscountMaterialCostCrystal,52.8 +1302,Yellow Red Donguri,91,DiscountMaterialCostCrystal,53.0 +1302,Yellow Red Donguri,92,DiscountMaterialCostCrystal,53.2 +1302,Yellow Red Donguri,93,DiscountMaterialCostCrystal,53.4 +1302,Yellow Red Donguri,94,DiscountMaterialCostCrystal,53.6 +1302,Yellow Red Donguri,95,DiscountMaterialCostCrystal,53.8 +1302,Yellow Red Donguri,96,DiscountMaterialCostCrystal,54.0 +1302,Yellow Red Donguri,97,DiscountMaterialCostCrystal,54.2 +1302,Yellow Red Donguri,98,DiscountMaterialCostCrystal,54.4 +1302,Yellow Red Donguri,99,DiscountMaterialCostCrystal,54.6 +1302,Yellow Red Donguri,100,DiscountMaterialCostCrystal,55.0 1003,Valkyrie,1,ReduceRequiredBlock,20 1003,Valkyrie,2,ReduceRequiredBlock,20.15 1003,Valkyrie,3,ReduceRequiredBlock,20.3 @@ -299,6 +899,306 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1003,Valkyrie,98,ReduceRequiredBlock,34.55 1003,Valkyrie,99,ReduceRequiredBlock,34.7 1003,Valkyrie,100,ReduceRequiredBlock,35 +1103,Icy Valkyrie,1,ReduceRequiredBlock,30.0 +1103,Icy Valkyrie,2,ReduceRequiredBlock,30.15 +1103,Icy Valkyrie,3,ReduceRequiredBlock,30.3 +1103,Icy Valkyrie,4,ReduceRequiredBlock,30.45 +1103,Icy Valkyrie,5,ReduceRequiredBlock,30.6 +1103,Icy Valkyrie,6,ReduceRequiredBlock,30.75 +1103,Icy Valkyrie,7,ReduceRequiredBlock,30.9 +1103,Icy Valkyrie,8,ReduceRequiredBlock,31.05 +1103,Icy Valkyrie,9,ReduceRequiredBlock,31.2 +1103,Icy Valkyrie,10,ReduceRequiredBlock,31.35 +1103,Icy Valkyrie,11,ReduceRequiredBlock,31.5 +1103,Icy Valkyrie,12,ReduceRequiredBlock,31.65 +1103,Icy Valkyrie,13,ReduceRequiredBlock,31.8 +1103,Icy Valkyrie,14,ReduceRequiredBlock,31.95 +1103,Icy Valkyrie,15,ReduceRequiredBlock,32.1 +1103,Icy Valkyrie,16,ReduceRequiredBlock,32.25 +1103,Icy Valkyrie,17,ReduceRequiredBlock,32.4 +1103,Icy Valkyrie,18,ReduceRequiredBlock,32.55 +1103,Icy Valkyrie,19,ReduceRequiredBlock,32.7 +1103,Icy Valkyrie,20,ReduceRequiredBlock,32.85 +1103,Icy Valkyrie,21,ReduceRequiredBlock,33.0 +1103,Icy Valkyrie,22,ReduceRequiredBlock,33.15 +1103,Icy Valkyrie,23,ReduceRequiredBlock,33.3 +1103,Icy Valkyrie,24,ReduceRequiredBlock,33.45 +1103,Icy Valkyrie,25,ReduceRequiredBlock,33.6 +1103,Icy Valkyrie,26,ReduceRequiredBlock,33.75 +1103,Icy Valkyrie,27,ReduceRequiredBlock,33.9 +1103,Icy Valkyrie,28,ReduceRequiredBlock,34.05 +1103,Icy Valkyrie,29,ReduceRequiredBlock,34.2 +1103,Icy Valkyrie,30,ReduceRequiredBlock,34.35 +1103,Icy Valkyrie,31,ReduceRequiredBlock,34.5 +1103,Icy Valkyrie,32,ReduceRequiredBlock,34.65 +1103,Icy Valkyrie,33,ReduceRequiredBlock,34.8 +1103,Icy Valkyrie,34,ReduceRequiredBlock,34.95 +1103,Icy Valkyrie,35,ReduceRequiredBlock,35.1 +1103,Icy Valkyrie,36,ReduceRequiredBlock,35.25 +1103,Icy Valkyrie,37,ReduceRequiredBlock,35.4 +1103,Icy Valkyrie,38,ReduceRequiredBlock,35.55 +1103,Icy Valkyrie,39,ReduceRequiredBlock,35.7 +1103,Icy Valkyrie,40,ReduceRequiredBlock,35.85 +1103,Icy Valkyrie,41,ReduceRequiredBlock,36.0 +1103,Icy Valkyrie,42,ReduceRequiredBlock,36.15 +1103,Icy Valkyrie,43,ReduceRequiredBlock,36.3 +1103,Icy Valkyrie,44,ReduceRequiredBlock,36.45 +1103,Icy Valkyrie,45,ReduceRequiredBlock,36.6 +1103,Icy Valkyrie,46,ReduceRequiredBlock,36.75 +1103,Icy Valkyrie,47,ReduceRequiredBlock,36.9 +1103,Icy Valkyrie,48,ReduceRequiredBlock,37.05 +1103,Icy Valkyrie,49,ReduceRequiredBlock,37.2 +1103,Icy Valkyrie,50,ReduceRequiredBlock,37.35 +1103,Icy Valkyrie,51,ReduceRequiredBlock,37.5 +1103,Icy Valkyrie,52,ReduceRequiredBlock,37.65 +1103,Icy Valkyrie,53,ReduceRequiredBlock,37.8 +1103,Icy Valkyrie,54,ReduceRequiredBlock,37.95 +1103,Icy Valkyrie,55,ReduceRequiredBlock,38.1 +1103,Icy Valkyrie,56,ReduceRequiredBlock,38.25 +1103,Icy Valkyrie,57,ReduceRequiredBlock,38.4 +1103,Icy Valkyrie,58,ReduceRequiredBlock,38.55 +1103,Icy Valkyrie,59,ReduceRequiredBlock,38.7 +1103,Icy Valkyrie,60,ReduceRequiredBlock,38.85 +1103,Icy Valkyrie,61,ReduceRequiredBlock,39.0 +1103,Icy Valkyrie,62,ReduceRequiredBlock,39.15 +1103,Icy Valkyrie,63,ReduceRequiredBlock,39.3 +1103,Icy Valkyrie,64,ReduceRequiredBlock,39.45 +1103,Icy Valkyrie,65,ReduceRequiredBlock,39.6 +1103,Icy Valkyrie,66,ReduceRequiredBlock,39.75 +1103,Icy Valkyrie,67,ReduceRequiredBlock,39.9 +1103,Icy Valkyrie,68,ReduceRequiredBlock,40.05 +1103,Icy Valkyrie,69,ReduceRequiredBlock,40.2 +1103,Icy Valkyrie,70,ReduceRequiredBlock,40.35 +1103,Icy Valkyrie,71,ReduceRequiredBlock,40.5 +1103,Icy Valkyrie,72,ReduceRequiredBlock,40.65 +1103,Icy Valkyrie,73,ReduceRequiredBlock,40.8 +1103,Icy Valkyrie,74,ReduceRequiredBlock,40.95 +1103,Icy Valkyrie,75,ReduceRequiredBlock,41.1 +1103,Icy Valkyrie,76,ReduceRequiredBlock,41.25 +1103,Icy Valkyrie,77,ReduceRequiredBlock,41.4 +1103,Icy Valkyrie,78,ReduceRequiredBlock,41.55 +1103,Icy Valkyrie,79,ReduceRequiredBlock,41.7 +1103,Icy Valkyrie,80,ReduceRequiredBlock,41.85 +1103,Icy Valkyrie,81,ReduceRequiredBlock,42.0 +1103,Icy Valkyrie,82,ReduceRequiredBlock,42.15 +1103,Icy Valkyrie,83,ReduceRequiredBlock,42.3 +1103,Icy Valkyrie,84,ReduceRequiredBlock,42.45 +1103,Icy Valkyrie,85,ReduceRequiredBlock,42.6 +1103,Icy Valkyrie,86,ReduceRequiredBlock,42.75 +1103,Icy Valkyrie,87,ReduceRequiredBlock,42.9 +1103,Icy Valkyrie,88,ReduceRequiredBlock,43.05 +1103,Icy Valkyrie,89,ReduceRequiredBlock,43.2 +1103,Icy Valkyrie,90,ReduceRequiredBlock,43.35 +1103,Icy Valkyrie,91,ReduceRequiredBlock,43.5 +1103,Icy Valkyrie,92,ReduceRequiredBlock,43.65 +1103,Icy Valkyrie,93,ReduceRequiredBlock,43.8 +1103,Icy Valkyrie,94,ReduceRequiredBlock,43.95 +1103,Icy Valkyrie,95,ReduceRequiredBlock,44.1 +1103,Icy Valkyrie,96,ReduceRequiredBlock,44.25 +1103,Icy Valkyrie,97,ReduceRequiredBlock,44.4 +1103,Icy Valkyrie,98,ReduceRequiredBlock,44.55 +1103,Icy Valkyrie,99,ReduceRequiredBlock,44.7 +1103,Icy Valkyrie,100,ReduceRequiredBlock,45.0 +1203,Magenta Valkyrie,1,ReduceRequiredBlock,40.0 +1203,Magenta Valkyrie,2,ReduceRequiredBlock,40.15 +1203,Magenta Valkyrie,3,ReduceRequiredBlock,40.3 +1203,Magenta Valkyrie,4,ReduceRequiredBlock,40.45 +1203,Magenta Valkyrie,5,ReduceRequiredBlock,40.6 +1203,Magenta Valkyrie,6,ReduceRequiredBlock,40.75 +1203,Magenta Valkyrie,7,ReduceRequiredBlock,40.9 +1203,Magenta Valkyrie,8,ReduceRequiredBlock,41.05 +1203,Magenta Valkyrie,9,ReduceRequiredBlock,41.2 +1203,Magenta Valkyrie,10,ReduceRequiredBlock,41.35 +1203,Magenta Valkyrie,11,ReduceRequiredBlock,41.5 +1203,Magenta Valkyrie,12,ReduceRequiredBlock,41.65 +1203,Magenta Valkyrie,13,ReduceRequiredBlock,41.8 +1203,Magenta Valkyrie,14,ReduceRequiredBlock,41.95 +1203,Magenta Valkyrie,15,ReduceRequiredBlock,42.1 +1203,Magenta Valkyrie,16,ReduceRequiredBlock,42.25 +1203,Magenta Valkyrie,17,ReduceRequiredBlock,42.4 +1203,Magenta Valkyrie,18,ReduceRequiredBlock,42.55 +1203,Magenta Valkyrie,19,ReduceRequiredBlock,42.7 +1203,Magenta Valkyrie,20,ReduceRequiredBlock,42.85 +1203,Magenta Valkyrie,21,ReduceRequiredBlock,43.0 +1203,Magenta Valkyrie,22,ReduceRequiredBlock,43.15 +1203,Magenta Valkyrie,23,ReduceRequiredBlock,43.3 +1203,Magenta Valkyrie,24,ReduceRequiredBlock,43.45 +1203,Magenta Valkyrie,25,ReduceRequiredBlock,43.6 +1203,Magenta Valkyrie,26,ReduceRequiredBlock,43.75 +1203,Magenta Valkyrie,27,ReduceRequiredBlock,43.9 +1203,Magenta Valkyrie,28,ReduceRequiredBlock,44.05 +1203,Magenta Valkyrie,29,ReduceRequiredBlock,44.2 +1203,Magenta Valkyrie,30,ReduceRequiredBlock,44.35 +1203,Magenta Valkyrie,31,ReduceRequiredBlock,44.5 +1203,Magenta Valkyrie,32,ReduceRequiredBlock,44.65 +1203,Magenta Valkyrie,33,ReduceRequiredBlock,44.8 +1203,Magenta Valkyrie,34,ReduceRequiredBlock,44.95 +1203,Magenta Valkyrie,35,ReduceRequiredBlock,45.1 +1203,Magenta Valkyrie,36,ReduceRequiredBlock,45.25 +1203,Magenta Valkyrie,37,ReduceRequiredBlock,45.4 +1203,Magenta Valkyrie,38,ReduceRequiredBlock,45.55 +1203,Magenta Valkyrie,39,ReduceRequiredBlock,45.7 +1203,Magenta Valkyrie,40,ReduceRequiredBlock,45.85 +1203,Magenta Valkyrie,41,ReduceRequiredBlock,46.0 +1203,Magenta Valkyrie,42,ReduceRequiredBlock,46.15 +1203,Magenta Valkyrie,43,ReduceRequiredBlock,46.3 +1203,Magenta Valkyrie,44,ReduceRequiredBlock,46.45 +1203,Magenta Valkyrie,45,ReduceRequiredBlock,46.6 +1203,Magenta Valkyrie,46,ReduceRequiredBlock,46.75 +1203,Magenta Valkyrie,47,ReduceRequiredBlock,46.9 +1203,Magenta Valkyrie,48,ReduceRequiredBlock,47.05 +1203,Magenta Valkyrie,49,ReduceRequiredBlock,47.2 +1203,Magenta Valkyrie,50,ReduceRequiredBlock,47.35 +1203,Magenta Valkyrie,51,ReduceRequiredBlock,47.5 +1203,Magenta Valkyrie,52,ReduceRequiredBlock,47.65 +1203,Magenta Valkyrie,53,ReduceRequiredBlock,47.8 +1203,Magenta Valkyrie,54,ReduceRequiredBlock,47.95 +1203,Magenta Valkyrie,55,ReduceRequiredBlock,48.1 +1203,Magenta Valkyrie,56,ReduceRequiredBlock,48.25 +1203,Magenta Valkyrie,57,ReduceRequiredBlock,48.4 +1203,Magenta Valkyrie,58,ReduceRequiredBlock,48.55 +1203,Magenta Valkyrie,59,ReduceRequiredBlock,48.7 +1203,Magenta Valkyrie,60,ReduceRequiredBlock,48.85 +1203,Magenta Valkyrie,61,ReduceRequiredBlock,49.0 +1203,Magenta Valkyrie,62,ReduceRequiredBlock,49.15 +1203,Magenta Valkyrie,63,ReduceRequiredBlock,49.3 +1203,Magenta Valkyrie,64,ReduceRequiredBlock,49.45 +1203,Magenta Valkyrie,65,ReduceRequiredBlock,49.6 +1203,Magenta Valkyrie,66,ReduceRequiredBlock,49.75 +1203,Magenta Valkyrie,67,ReduceRequiredBlock,49.9 +1203,Magenta Valkyrie,68,ReduceRequiredBlock,50.05 +1203,Magenta Valkyrie,69,ReduceRequiredBlock,50.2 +1203,Magenta Valkyrie,70,ReduceRequiredBlock,50.35 +1203,Magenta Valkyrie,71,ReduceRequiredBlock,50.5 +1203,Magenta Valkyrie,72,ReduceRequiredBlock,50.65 +1203,Magenta Valkyrie,73,ReduceRequiredBlock,50.8 +1203,Magenta Valkyrie,74,ReduceRequiredBlock,50.95 +1203,Magenta Valkyrie,75,ReduceRequiredBlock,51.1 +1203,Magenta Valkyrie,76,ReduceRequiredBlock,51.25 +1203,Magenta Valkyrie,77,ReduceRequiredBlock,51.4 +1203,Magenta Valkyrie,78,ReduceRequiredBlock,51.55 +1203,Magenta Valkyrie,79,ReduceRequiredBlock,51.7 +1203,Magenta Valkyrie,80,ReduceRequiredBlock,51.85 +1203,Magenta Valkyrie,81,ReduceRequiredBlock,52.0 +1203,Magenta Valkyrie,82,ReduceRequiredBlock,52.15 +1203,Magenta Valkyrie,83,ReduceRequiredBlock,52.3 +1203,Magenta Valkyrie,84,ReduceRequiredBlock,52.45 +1203,Magenta Valkyrie,85,ReduceRequiredBlock,52.6 +1203,Magenta Valkyrie,86,ReduceRequiredBlock,52.75 +1203,Magenta Valkyrie,87,ReduceRequiredBlock,52.9 +1203,Magenta Valkyrie,88,ReduceRequiredBlock,53.05 +1203,Magenta Valkyrie,89,ReduceRequiredBlock,53.2 +1203,Magenta Valkyrie,90,ReduceRequiredBlock,53.35 +1203,Magenta Valkyrie,91,ReduceRequiredBlock,53.5 +1203,Magenta Valkyrie,92,ReduceRequiredBlock,53.65 +1203,Magenta Valkyrie,93,ReduceRequiredBlock,53.8 +1203,Magenta Valkyrie,94,ReduceRequiredBlock,53.95 +1203,Magenta Valkyrie,95,ReduceRequiredBlock,54.1 +1203,Magenta Valkyrie,96,ReduceRequiredBlock,54.25 +1203,Magenta Valkyrie,97,ReduceRequiredBlock,54.4 +1203,Magenta Valkyrie,98,ReduceRequiredBlock,54.55 +1203,Magenta Valkyrie,99,ReduceRequiredBlock,54.7 +1203,Magenta Valkyrie,100,ReduceRequiredBlock,55.0 +1303,Yellow Valkyrie,1,ReduceRequiredBlock,50.0 +1303,Yellow Valkyrie,2,ReduceRequiredBlock,50.15 +1303,Yellow Valkyrie,3,ReduceRequiredBlock,50.3 +1303,Yellow Valkyrie,4,ReduceRequiredBlock,50.45 +1303,Yellow Valkyrie,5,ReduceRequiredBlock,50.6 +1303,Yellow Valkyrie,6,ReduceRequiredBlock,50.75 +1303,Yellow Valkyrie,7,ReduceRequiredBlock,50.9 +1303,Yellow Valkyrie,8,ReduceRequiredBlock,51.05 +1303,Yellow Valkyrie,9,ReduceRequiredBlock,51.2 +1303,Yellow Valkyrie,10,ReduceRequiredBlock,51.35 +1303,Yellow Valkyrie,11,ReduceRequiredBlock,51.5 +1303,Yellow Valkyrie,12,ReduceRequiredBlock,51.65 +1303,Yellow Valkyrie,13,ReduceRequiredBlock,51.8 +1303,Yellow Valkyrie,14,ReduceRequiredBlock,51.95 +1303,Yellow Valkyrie,15,ReduceRequiredBlock,52.1 +1303,Yellow Valkyrie,16,ReduceRequiredBlock,52.25 +1303,Yellow Valkyrie,17,ReduceRequiredBlock,52.4 +1303,Yellow Valkyrie,18,ReduceRequiredBlock,52.55 +1303,Yellow Valkyrie,19,ReduceRequiredBlock,52.7 +1303,Yellow Valkyrie,20,ReduceRequiredBlock,52.85 +1303,Yellow Valkyrie,21,ReduceRequiredBlock,53.0 +1303,Yellow Valkyrie,22,ReduceRequiredBlock,53.15 +1303,Yellow Valkyrie,23,ReduceRequiredBlock,53.3 +1303,Yellow Valkyrie,24,ReduceRequiredBlock,53.45 +1303,Yellow Valkyrie,25,ReduceRequiredBlock,53.6 +1303,Yellow Valkyrie,26,ReduceRequiredBlock,53.75 +1303,Yellow Valkyrie,27,ReduceRequiredBlock,53.9 +1303,Yellow Valkyrie,28,ReduceRequiredBlock,54.05 +1303,Yellow Valkyrie,29,ReduceRequiredBlock,54.2 +1303,Yellow Valkyrie,30,ReduceRequiredBlock,54.35 +1303,Yellow Valkyrie,31,ReduceRequiredBlock,54.5 +1303,Yellow Valkyrie,32,ReduceRequiredBlock,54.65 +1303,Yellow Valkyrie,33,ReduceRequiredBlock,54.8 +1303,Yellow Valkyrie,34,ReduceRequiredBlock,54.95 +1303,Yellow Valkyrie,35,ReduceRequiredBlock,55.1 +1303,Yellow Valkyrie,36,ReduceRequiredBlock,55.25 +1303,Yellow Valkyrie,37,ReduceRequiredBlock,55.4 +1303,Yellow Valkyrie,38,ReduceRequiredBlock,55.55 +1303,Yellow Valkyrie,39,ReduceRequiredBlock,55.7 +1303,Yellow Valkyrie,40,ReduceRequiredBlock,55.85 +1303,Yellow Valkyrie,41,ReduceRequiredBlock,56.0 +1303,Yellow Valkyrie,42,ReduceRequiredBlock,56.15 +1303,Yellow Valkyrie,43,ReduceRequiredBlock,56.3 +1303,Yellow Valkyrie,44,ReduceRequiredBlock,56.45 +1303,Yellow Valkyrie,45,ReduceRequiredBlock,56.6 +1303,Yellow Valkyrie,46,ReduceRequiredBlock,56.75 +1303,Yellow Valkyrie,47,ReduceRequiredBlock,56.9 +1303,Yellow Valkyrie,48,ReduceRequiredBlock,57.05 +1303,Yellow Valkyrie,49,ReduceRequiredBlock,57.2 +1303,Yellow Valkyrie,50,ReduceRequiredBlock,57.35 +1303,Yellow Valkyrie,51,ReduceRequiredBlock,57.5 +1303,Yellow Valkyrie,52,ReduceRequiredBlock,57.65 +1303,Yellow Valkyrie,53,ReduceRequiredBlock,57.8 +1303,Yellow Valkyrie,54,ReduceRequiredBlock,57.95 +1303,Yellow Valkyrie,55,ReduceRequiredBlock,58.1 +1303,Yellow Valkyrie,56,ReduceRequiredBlock,58.25 +1303,Yellow Valkyrie,57,ReduceRequiredBlock,58.4 +1303,Yellow Valkyrie,58,ReduceRequiredBlock,58.55 +1303,Yellow Valkyrie,59,ReduceRequiredBlock,58.7 +1303,Yellow Valkyrie,60,ReduceRequiredBlock,58.85 +1303,Yellow Valkyrie,61,ReduceRequiredBlock,59.0 +1303,Yellow Valkyrie,62,ReduceRequiredBlock,59.15 +1303,Yellow Valkyrie,63,ReduceRequiredBlock,59.3 +1303,Yellow Valkyrie,64,ReduceRequiredBlock,59.45 +1303,Yellow Valkyrie,65,ReduceRequiredBlock,59.6 +1303,Yellow Valkyrie,66,ReduceRequiredBlock,59.75 +1303,Yellow Valkyrie,67,ReduceRequiredBlock,59.9 +1303,Yellow Valkyrie,68,ReduceRequiredBlock,60.05 +1303,Yellow Valkyrie,69,ReduceRequiredBlock,60.2 +1303,Yellow Valkyrie,70,ReduceRequiredBlock,60.35 +1303,Yellow Valkyrie,71,ReduceRequiredBlock,60.5 +1303,Yellow Valkyrie,72,ReduceRequiredBlock,60.65 +1303,Yellow Valkyrie,73,ReduceRequiredBlock,60.8 +1303,Yellow Valkyrie,74,ReduceRequiredBlock,60.95 +1303,Yellow Valkyrie,75,ReduceRequiredBlock,61.1 +1303,Yellow Valkyrie,76,ReduceRequiredBlock,61.25 +1303,Yellow Valkyrie,77,ReduceRequiredBlock,61.4 +1303,Yellow Valkyrie,78,ReduceRequiredBlock,61.55 +1303,Yellow Valkyrie,79,ReduceRequiredBlock,61.7 +1303,Yellow Valkyrie,80,ReduceRequiredBlock,61.85 +1303,Yellow Valkyrie,81,ReduceRequiredBlock,62.0 +1303,Yellow Valkyrie,82,ReduceRequiredBlock,62.15 +1303,Yellow Valkyrie,83,ReduceRequiredBlock,62.3 +1303,Yellow Valkyrie,84,ReduceRequiredBlock,62.45 +1303,Yellow Valkyrie,85,ReduceRequiredBlock,62.6 +1303,Yellow Valkyrie,86,ReduceRequiredBlock,62.75 +1303,Yellow Valkyrie,87,ReduceRequiredBlock,62.9 +1303,Yellow Valkyrie,88,ReduceRequiredBlock,63.05 +1303,Yellow Valkyrie,89,ReduceRequiredBlock,63.2 +1303,Yellow Valkyrie,90,ReduceRequiredBlock,63.35 +1303,Yellow Valkyrie,91,ReduceRequiredBlock,63.5 +1303,Yellow Valkyrie,92,ReduceRequiredBlock,63.65 +1303,Yellow Valkyrie,93,ReduceRequiredBlock,63.8 +1303,Yellow Valkyrie,94,ReduceRequiredBlock,63.95 +1303,Yellow Valkyrie,95,ReduceRequiredBlock,64.1 +1303,Yellow Valkyrie,96,ReduceRequiredBlock,64.25 +1303,Yellow Valkyrie,97,ReduceRequiredBlock,64.4 +1303,Yellow Valkyrie,98,ReduceRequiredBlock,64.55 +1303,Yellow Valkyrie,99,ReduceRequiredBlock,64.7 +1303,Yellow Valkyrie,100,ReduceRequiredBlock,65.0 1004,lil fenrir,1,AdditionalOptionRate,50 1004,lil fenrir,2,AdditionalOptionRate,51 1004,lil fenrir,3,AdditionalOptionRate,52 @@ -398,4 +1298,304 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1004,lil fenrir,97,AdditionalOptionRate,146 1004,lil fenrir,98,AdditionalOptionRate,147 1004,lil fenrir,99,AdditionalOptionRate,148 -1004,lil fenrir,100,AdditionalOptionRate,150 \ No newline at end of file +1004,lil fenrir,100,AdditionalOptionRate,150 +1104,Icy lil fenrir,1,AdditionalOptionRate,100 +1104,Icy lil fenrir,2,AdditionalOptionRate,101 +1104,Icy lil fenrir,3,AdditionalOptionRate,102 +1104,Icy lil fenrir,4,AdditionalOptionRate,103 +1104,Icy lil fenrir,5,AdditionalOptionRate,104 +1104,Icy lil fenrir,6,AdditionalOptionRate,105 +1104,Icy lil fenrir,7,AdditionalOptionRate,106 +1104,Icy lil fenrir,8,AdditionalOptionRate,107 +1104,Icy lil fenrir,9,AdditionalOptionRate,108 +1104,Icy lil fenrir,10,AdditionalOptionRate,109 +1104,Icy lil fenrir,11,AdditionalOptionRate,110 +1104,Icy lil fenrir,12,AdditionalOptionRate,111 +1104,Icy lil fenrir,13,AdditionalOptionRate,112 +1104,Icy lil fenrir,14,AdditionalOptionRate,113 +1104,Icy lil fenrir,15,AdditionalOptionRate,114 +1104,Icy lil fenrir,16,AdditionalOptionRate,115 +1104,Icy lil fenrir,17,AdditionalOptionRate,116 +1104,Icy lil fenrir,18,AdditionalOptionRate,117 +1104,Icy lil fenrir,19,AdditionalOptionRate,118 +1104,Icy lil fenrir,20,AdditionalOptionRate,119 +1104,Icy lil fenrir,21,AdditionalOptionRate,120 +1104,Icy lil fenrir,22,AdditionalOptionRate,121 +1104,Icy lil fenrir,23,AdditionalOptionRate,122 +1104,Icy lil fenrir,24,AdditionalOptionRate,123 +1104,Icy lil fenrir,25,AdditionalOptionRate,124 +1104,Icy lil fenrir,26,AdditionalOptionRate,125 +1104,Icy lil fenrir,27,AdditionalOptionRate,126 +1104,Icy lil fenrir,28,AdditionalOptionRate,127 +1104,Icy lil fenrir,29,AdditionalOptionRate,128 +1104,Icy lil fenrir,30,AdditionalOptionRate,129 +1104,Icy lil fenrir,31,AdditionalOptionRate,130 +1104,Icy lil fenrir,32,AdditionalOptionRate,131 +1104,Icy lil fenrir,33,AdditionalOptionRate,132 +1104,Icy lil fenrir,34,AdditionalOptionRate,133 +1104,Icy lil fenrir,35,AdditionalOptionRate,134 +1104,Icy lil fenrir,36,AdditionalOptionRate,135 +1104,Icy lil fenrir,37,AdditionalOptionRate,136 +1104,Icy lil fenrir,38,AdditionalOptionRate,137 +1104,Icy lil fenrir,39,AdditionalOptionRate,138 +1104,Icy lil fenrir,40,AdditionalOptionRate,139 +1104,Icy lil fenrir,41,AdditionalOptionRate,140 +1104,Icy lil fenrir,42,AdditionalOptionRate,141 +1104,Icy lil fenrir,43,AdditionalOptionRate,142 +1104,Icy lil fenrir,44,AdditionalOptionRate,143 +1104,Icy lil fenrir,45,AdditionalOptionRate,144 +1104,Icy lil fenrir,46,AdditionalOptionRate,145 +1104,Icy lil fenrir,47,AdditionalOptionRate,146 +1104,Icy lil fenrir,48,AdditionalOptionRate,147 +1104,Icy lil fenrir,49,AdditionalOptionRate,148 +1104,Icy lil fenrir,50,AdditionalOptionRate,149 +1104,Icy lil fenrir,51,AdditionalOptionRate,150 +1104,Icy lil fenrir,52,AdditionalOptionRate,151 +1104,Icy lil fenrir,53,AdditionalOptionRate,152 +1104,Icy lil fenrir,54,AdditionalOptionRate,153 +1104,Icy lil fenrir,55,AdditionalOptionRate,154 +1104,Icy lil fenrir,56,AdditionalOptionRate,155 +1104,Icy lil fenrir,57,AdditionalOptionRate,156 +1104,Icy lil fenrir,58,AdditionalOptionRate,157 +1104,Icy lil fenrir,59,AdditionalOptionRate,158 +1104,Icy lil fenrir,60,AdditionalOptionRate,159 +1104,Icy lil fenrir,61,AdditionalOptionRate,160 +1104,Icy lil fenrir,62,AdditionalOptionRate,161 +1104,Icy lil fenrir,63,AdditionalOptionRate,162 +1104,Icy lil fenrir,64,AdditionalOptionRate,163 +1104,Icy lil fenrir,65,AdditionalOptionRate,164 +1104,Icy lil fenrir,66,AdditionalOptionRate,165 +1104,Icy lil fenrir,67,AdditionalOptionRate,166 +1104,Icy lil fenrir,68,AdditionalOptionRate,167 +1104,Icy lil fenrir,69,AdditionalOptionRate,168 +1104,Icy lil fenrir,70,AdditionalOptionRate,169 +1104,Icy lil fenrir,71,AdditionalOptionRate,170 +1104,Icy lil fenrir,72,AdditionalOptionRate,171 +1104,Icy lil fenrir,73,AdditionalOptionRate,172 +1104,Icy lil fenrir,74,AdditionalOptionRate,173 +1104,Icy lil fenrir,75,AdditionalOptionRate,174 +1104,Icy lil fenrir,76,AdditionalOptionRate,175 +1104,Icy lil fenrir,77,AdditionalOptionRate,176 +1104,Icy lil fenrir,78,AdditionalOptionRate,177 +1104,Icy lil fenrir,79,AdditionalOptionRate,178 +1104,Icy lil fenrir,80,AdditionalOptionRate,179 +1104,Icy lil fenrir,81,AdditionalOptionRate,180 +1104,Icy lil fenrir,82,AdditionalOptionRate,181 +1104,Icy lil fenrir,83,AdditionalOptionRate,182 +1104,Icy lil fenrir,84,AdditionalOptionRate,183 +1104,Icy lil fenrir,85,AdditionalOptionRate,184 +1104,Icy lil fenrir,86,AdditionalOptionRate,185 +1104,Icy lil fenrir,87,AdditionalOptionRate,186 +1104,Icy lil fenrir,88,AdditionalOptionRate,187 +1104,Icy lil fenrir,89,AdditionalOptionRate,188 +1104,Icy lil fenrir,90,AdditionalOptionRate,189 +1104,Icy lil fenrir,91,AdditionalOptionRate,190 +1104,Icy lil fenrir,92,AdditionalOptionRate,191 +1104,Icy lil fenrir,93,AdditionalOptionRate,192 +1104,Icy lil fenrir,94,AdditionalOptionRate,193 +1104,Icy lil fenrir,95,AdditionalOptionRate,194 +1104,Icy lil fenrir,96,AdditionalOptionRate,195 +1104,Icy lil fenrir,97,AdditionalOptionRate,196 +1104,Icy lil fenrir,98,AdditionalOptionRate,197 +1104,Icy lil fenrir,99,AdditionalOptionRate,198 +1104,Icy lil fenrir,100,AdditionalOptionRate,200 +1204,Magenta lil fenrir,1,AdditionalOptionRate,150 +1204,Magenta lil fenrir,2,AdditionalOptionRate,151 +1204,Magenta lil fenrir,3,AdditionalOptionRate,152 +1204,Magenta lil fenrir,4,AdditionalOptionRate,153 +1204,Magenta lil fenrir,5,AdditionalOptionRate,154 +1204,Magenta lil fenrir,6,AdditionalOptionRate,155 +1204,Magenta lil fenrir,7,AdditionalOptionRate,156 +1204,Magenta lil fenrir,8,AdditionalOptionRate,157 +1204,Magenta lil fenrir,9,AdditionalOptionRate,158 +1204,Magenta lil fenrir,10,AdditionalOptionRate,159 +1204,Magenta lil fenrir,11,AdditionalOptionRate,160 +1204,Magenta lil fenrir,12,AdditionalOptionRate,161 +1204,Magenta lil fenrir,13,AdditionalOptionRate,162 +1204,Magenta lil fenrir,14,AdditionalOptionRate,163 +1204,Magenta lil fenrir,15,AdditionalOptionRate,164 +1204,Magenta lil fenrir,16,AdditionalOptionRate,165 +1204,Magenta lil fenrir,17,AdditionalOptionRate,166 +1204,Magenta lil fenrir,18,AdditionalOptionRate,167 +1204,Magenta lil fenrir,19,AdditionalOptionRate,168 +1204,Magenta lil fenrir,20,AdditionalOptionRate,169 +1204,Magenta lil fenrir,21,AdditionalOptionRate,170 +1204,Magenta lil fenrir,22,AdditionalOptionRate,171 +1204,Magenta lil fenrir,23,AdditionalOptionRate,172 +1204,Magenta lil fenrir,24,AdditionalOptionRate,173 +1204,Magenta lil fenrir,25,AdditionalOptionRate,174 +1204,Magenta lil fenrir,26,AdditionalOptionRate,175 +1204,Magenta lil fenrir,27,AdditionalOptionRate,176 +1204,Magenta lil fenrir,28,AdditionalOptionRate,177 +1204,Magenta lil fenrir,29,AdditionalOptionRate,178 +1204,Magenta lil fenrir,30,AdditionalOptionRate,179 +1204,Magenta lil fenrir,31,AdditionalOptionRate,180 +1204,Magenta lil fenrir,32,AdditionalOptionRate,181 +1204,Magenta lil fenrir,33,AdditionalOptionRate,182 +1204,Magenta lil fenrir,34,AdditionalOptionRate,183 +1204,Magenta lil fenrir,35,AdditionalOptionRate,184 +1204,Magenta lil fenrir,36,AdditionalOptionRate,185 +1204,Magenta lil fenrir,37,AdditionalOptionRate,186 +1204,Magenta lil fenrir,38,AdditionalOptionRate,187 +1204,Magenta lil fenrir,39,AdditionalOptionRate,188 +1204,Magenta lil fenrir,40,AdditionalOptionRate,189 +1204,Magenta lil fenrir,41,AdditionalOptionRate,190 +1204,Magenta lil fenrir,42,AdditionalOptionRate,191 +1204,Magenta lil fenrir,43,AdditionalOptionRate,192 +1204,Magenta lil fenrir,44,AdditionalOptionRate,193 +1204,Magenta lil fenrir,45,AdditionalOptionRate,194 +1204,Magenta lil fenrir,46,AdditionalOptionRate,195 +1204,Magenta lil fenrir,47,AdditionalOptionRate,196 +1204,Magenta lil fenrir,48,AdditionalOptionRate,197 +1204,Magenta lil fenrir,49,AdditionalOptionRate,198 +1204,Magenta lil fenrir,50,AdditionalOptionRate,199 +1204,Magenta lil fenrir,51,AdditionalOptionRate,200 +1204,Magenta lil fenrir,52,AdditionalOptionRate,201 +1204,Magenta lil fenrir,53,AdditionalOptionRate,202 +1204,Magenta lil fenrir,54,AdditionalOptionRate,203 +1204,Magenta lil fenrir,55,AdditionalOptionRate,204 +1204,Magenta lil fenrir,56,AdditionalOptionRate,205 +1204,Magenta lil fenrir,57,AdditionalOptionRate,206 +1204,Magenta lil fenrir,58,AdditionalOptionRate,207 +1204,Magenta lil fenrir,59,AdditionalOptionRate,208 +1204,Magenta lil fenrir,60,AdditionalOptionRate,209 +1204,Magenta lil fenrir,61,AdditionalOptionRate,210 +1204,Magenta lil fenrir,62,AdditionalOptionRate,211 +1204,Magenta lil fenrir,63,AdditionalOptionRate,212 +1204,Magenta lil fenrir,64,AdditionalOptionRate,213 +1204,Magenta lil fenrir,65,AdditionalOptionRate,214 +1204,Magenta lil fenrir,66,AdditionalOptionRate,215 +1204,Magenta lil fenrir,67,AdditionalOptionRate,216 +1204,Magenta lil fenrir,68,AdditionalOptionRate,217 +1204,Magenta lil fenrir,69,AdditionalOptionRate,218 +1204,Magenta lil fenrir,70,AdditionalOptionRate,219 +1204,Magenta lil fenrir,71,AdditionalOptionRate,220 +1204,Magenta lil fenrir,72,AdditionalOptionRate,221 +1204,Magenta lil fenrir,73,AdditionalOptionRate,222 +1204,Magenta lil fenrir,74,AdditionalOptionRate,223 +1204,Magenta lil fenrir,75,AdditionalOptionRate,224 +1204,Magenta lil fenrir,76,AdditionalOptionRate,225 +1204,Magenta lil fenrir,77,AdditionalOptionRate,226 +1204,Magenta lil fenrir,78,AdditionalOptionRate,227 +1204,Magenta lil fenrir,79,AdditionalOptionRate,228 +1204,Magenta lil fenrir,80,AdditionalOptionRate,229 +1204,Magenta lil fenrir,81,AdditionalOptionRate,230 +1204,Magenta lil fenrir,82,AdditionalOptionRate,231 +1204,Magenta lil fenrir,83,AdditionalOptionRate,232 +1204,Magenta lil fenrir,84,AdditionalOptionRate,233 +1204,Magenta lil fenrir,85,AdditionalOptionRate,234 +1204,Magenta lil fenrir,86,AdditionalOptionRate,235 +1204,Magenta lil fenrir,87,AdditionalOptionRate,236 +1204,Magenta lil fenrir,88,AdditionalOptionRate,237 +1204,Magenta lil fenrir,89,AdditionalOptionRate,238 +1204,Magenta lil fenrir,90,AdditionalOptionRate,239 +1204,Magenta lil fenrir,91,AdditionalOptionRate,240 +1204,Magenta lil fenrir,92,AdditionalOptionRate,241 +1204,Magenta lil fenrir,93,AdditionalOptionRate,242 +1204,Magenta lil fenrir,94,AdditionalOptionRate,243 +1204,Magenta lil fenrir,95,AdditionalOptionRate,244 +1204,Magenta lil fenrir,96,AdditionalOptionRate,245 +1204,Magenta lil fenrir,97,AdditionalOptionRate,246 +1204,Magenta lil fenrir,98,AdditionalOptionRate,247 +1204,Magenta lil fenrir,99,AdditionalOptionRate,248 +1204,Magenta lil fenrir,100,AdditionalOptionRate,250 +1304,Yellow lil fenrir,1,AdditionalOptionRate,200 +1304,Yellow lil fenrir,2,AdditionalOptionRate,201 +1304,Yellow lil fenrir,3,AdditionalOptionRate,202 +1304,Yellow lil fenrir,4,AdditionalOptionRate,203 +1304,Yellow lil fenrir,5,AdditionalOptionRate,204 +1304,Yellow lil fenrir,6,AdditionalOptionRate,205 +1304,Yellow lil fenrir,7,AdditionalOptionRate,206 +1304,Yellow lil fenrir,8,AdditionalOptionRate,207 +1304,Yellow lil fenrir,9,AdditionalOptionRate,208 +1304,Yellow lil fenrir,10,AdditionalOptionRate,209 +1304,Yellow lil fenrir,11,AdditionalOptionRate,210 +1304,Yellow lil fenrir,12,AdditionalOptionRate,211 +1304,Yellow lil fenrir,13,AdditionalOptionRate,212 +1304,Yellow lil fenrir,14,AdditionalOptionRate,213 +1304,Yellow lil fenrir,15,AdditionalOptionRate,214 +1304,Yellow lil fenrir,16,AdditionalOptionRate,215 +1304,Yellow lil fenrir,17,AdditionalOptionRate,216 +1304,Yellow lil fenrir,18,AdditionalOptionRate,217 +1304,Yellow lil fenrir,19,AdditionalOptionRate,218 +1304,Yellow lil fenrir,20,AdditionalOptionRate,219 +1304,Yellow lil fenrir,21,AdditionalOptionRate,220 +1304,Yellow lil fenrir,22,AdditionalOptionRate,221 +1304,Yellow lil fenrir,23,AdditionalOptionRate,222 +1304,Yellow lil fenrir,24,AdditionalOptionRate,223 +1304,Yellow lil fenrir,25,AdditionalOptionRate,224 +1304,Yellow lil fenrir,26,AdditionalOptionRate,225 +1304,Yellow lil fenrir,27,AdditionalOptionRate,226 +1304,Yellow lil fenrir,28,AdditionalOptionRate,227 +1304,Yellow lil fenrir,29,AdditionalOptionRate,228 +1304,Yellow lil fenrir,30,AdditionalOptionRate,229 +1304,Yellow lil fenrir,31,AdditionalOptionRate,230 +1304,Yellow lil fenrir,32,AdditionalOptionRate,231 +1304,Yellow lil fenrir,33,AdditionalOptionRate,232 +1304,Yellow lil fenrir,34,AdditionalOptionRate,233 +1304,Yellow lil fenrir,35,AdditionalOptionRate,234 +1304,Yellow lil fenrir,36,AdditionalOptionRate,235 +1304,Yellow lil fenrir,37,AdditionalOptionRate,236 +1304,Yellow lil fenrir,38,AdditionalOptionRate,237 +1304,Yellow lil fenrir,39,AdditionalOptionRate,238 +1304,Yellow lil fenrir,40,AdditionalOptionRate,239 +1304,Yellow lil fenrir,41,AdditionalOptionRate,240 +1304,Yellow lil fenrir,42,AdditionalOptionRate,241 +1304,Yellow lil fenrir,43,AdditionalOptionRate,242 +1304,Yellow lil fenrir,44,AdditionalOptionRate,243 +1304,Yellow lil fenrir,45,AdditionalOptionRate,244 +1304,Yellow lil fenrir,46,AdditionalOptionRate,245 +1304,Yellow lil fenrir,47,AdditionalOptionRate,246 +1304,Yellow lil fenrir,48,AdditionalOptionRate,247 +1304,Yellow lil fenrir,49,AdditionalOptionRate,248 +1304,Yellow lil fenrir,50,AdditionalOptionRate,249 +1304,Yellow lil fenrir,51,AdditionalOptionRate,250 +1304,Yellow lil fenrir,52,AdditionalOptionRate,251 +1304,Yellow lil fenrir,53,AdditionalOptionRate,252 +1304,Yellow lil fenrir,54,AdditionalOptionRate,253 +1304,Yellow lil fenrir,55,AdditionalOptionRate,254 +1304,Yellow lil fenrir,56,AdditionalOptionRate,255 +1304,Yellow lil fenrir,57,AdditionalOptionRate,256 +1304,Yellow lil fenrir,58,AdditionalOptionRate,257 +1304,Yellow lil fenrir,59,AdditionalOptionRate,258 +1304,Yellow lil fenrir,60,AdditionalOptionRate,259 +1304,Yellow lil fenrir,61,AdditionalOptionRate,260 +1304,Yellow lil fenrir,62,AdditionalOptionRate,261 +1304,Yellow lil fenrir,63,AdditionalOptionRate,262 +1304,Yellow lil fenrir,64,AdditionalOptionRate,263 +1304,Yellow lil fenrir,65,AdditionalOptionRate,264 +1304,Yellow lil fenrir,66,AdditionalOptionRate,265 +1304,Yellow lil fenrir,67,AdditionalOptionRate,266 +1304,Yellow lil fenrir,68,AdditionalOptionRate,267 +1304,Yellow lil fenrir,69,AdditionalOptionRate,268 +1304,Yellow lil fenrir,70,AdditionalOptionRate,269 +1304,Yellow lil fenrir,71,AdditionalOptionRate,270 +1304,Yellow lil fenrir,72,AdditionalOptionRate,271 +1304,Yellow lil fenrir,73,AdditionalOptionRate,272 +1304,Yellow lil fenrir,74,AdditionalOptionRate,273 +1304,Yellow lil fenrir,75,AdditionalOptionRate,274 +1304,Yellow lil fenrir,76,AdditionalOptionRate,275 +1304,Yellow lil fenrir,77,AdditionalOptionRate,276 +1304,Yellow lil fenrir,78,AdditionalOptionRate,277 +1304,Yellow lil fenrir,79,AdditionalOptionRate,278 +1304,Yellow lil fenrir,80,AdditionalOptionRate,279 +1304,Yellow lil fenrir,81,AdditionalOptionRate,280 +1304,Yellow lil fenrir,82,AdditionalOptionRate,281 +1304,Yellow lil fenrir,83,AdditionalOptionRate,282 +1304,Yellow lil fenrir,84,AdditionalOptionRate,283 +1304,Yellow lil fenrir,85,AdditionalOptionRate,284 +1304,Yellow lil fenrir,86,AdditionalOptionRate,285 +1304,Yellow lil fenrir,87,AdditionalOptionRate,286 +1304,Yellow lil fenrir,88,AdditionalOptionRate,287 +1304,Yellow lil fenrir,89,AdditionalOptionRate,288 +1304,Yellow lil fenrir,90,AdditionalOptionRate,289 +1304,Yellow lil fenrir,91,AdditionalOptionRate,290 +1304,Yellow lil fenrir,92,AdditionalOptionRate,291 +1304,Yellow lil fenrir,93,AdditionalOptionRate,292 +1304,Yellow lil fenrir,94,AdditionalOptionRate,293 +1304,Yellow lil fenrir,95,AdditionalOptionRate,294 +1304,Yellow lil fenrir,96,AdditionalOptionRate,295 +1304,Yellow lil fenrir,97,AdditionalOptionRate,296 +1304,Yellow lil fenrir,98,AdditionalOptionRate,297 +1304,Yellow lil fenrir,99,AdditionalOptionRate,298 +1304,Yellow lil fenrir,100,AdditionalOptionRate,300 \ No newline at end of file From ced981dbbf77a280d3941b693f01fbb91b366e20 Mon Sep 17 00:00:00 2001 From: hyeon Date: Mon, 7 Oct 2024 18:58:35 +0900 Subject: [PATCH 08/27] Fix broken tests --- .../CustomEquipmentCraftTest.cs | 78 +++++++++---------- .Lib9c.Tests/Action/GrindingTest.cs | 12 +-- Lib9c/Helper/CustomCraftHelper.cs | 2 - 3 files changed, 45 insertions(+), 47 deletions(-) diff --git a/.Lib9c.Tests/Action/CustomEquipmentCraft/CustomEquipmentCraftTest.cs b/.Lib9c.Tests/Action/CustomEquipmentCraft/CustomEquipmentCraftTest.cs index f2cf3d3605..c136162a67 100644 --- a/.Lib9c.Tests/Action/CustomEquipmentCraft/CustomEquipmentCraftTest.cs +++ b/.Lib9c.Tests/Action/CustomEquipmentCraft/CustomEquipmentCraftTest.cs @@ -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 @@ -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 @@ -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?[] { @@ -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?[] { @@ -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 @@ -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?[] { @@ -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?[] { @@ -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, }; } @@ -321,7 +321,7 @@ public CustomEquipmentCraftTest() { new List { - new () { RecipeId = 1, SlotIndex = 0, IconId = 10131001, }, + new () { RecipeId = 1, SlotIndex = 0, IconId = 10140000, }, }, true, 0, false, new List(), 0, typeof(NotEnoughRelationshipException), }; diff --git a/.Lib9c.Tests/Action/GrindingTest.cs b/.Lib9c.Tests/Action/GrindingTest.cs index ef136afcb7..1a83299bb3 100644 --- a/.Lib9c.Tests/Action/GrindingTest.cs +++ b/.Lib9c.Tests/Action/GrindingTest.cs @@ -326,11 +326,11 @@ public void CalculateMaterialReward(int[] equipmentIds, Dictionary 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 { @@ -422,9 +422,9 @@ private class CalculateMaterialRewardData : IEnumerable new[] { 10750008, 10760000, 20160000, 20160003 }, new Dictionary { - { 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[] diff --git a/Lib9c/Helper/CustomCraftHelper.cs b/Lib9c/Helper/CustomCraftHelper.cs index 62a5367cf7..ebb6b2eff2 100644 --- a/Lib9c/Helper/CustomCraftHelper.cs +++ b/Lib9c/Helper/CustomCraftHelper.cs @@ -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; From 28006de6149751109128b640c1ae6e73ec6c82b4 Mon Sep 17 00:00:00 2001 From: "Kim sm." Date: Sun, 29 Sep 2024 17:07:24 +0900 Subject: [PATCH 09/27] add MedalId property to ArenaSheet --- Lib9c/TableData/ArenaSheet.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Lib9c/TableData/ArenaSheet.cs b/Lib9c/TableData/ArenaSheet.cs index 9012875fe0..33b72b4ec8 100644 --- a/Lib9c/TableData/ArenaSheet.cs +++ b/Lib9c/TableData/ArenaSheet.cs @@ -25,6 +25,7 @@ public class RoundData public long AdditionalTicketPrice { get; } public int MaxPurchaseCount { get; } public int MaxPurchaseCountWithInterval { get; } + public int MedalId { get; } public RoundData(int championshipId, int round, @@ -36,7 +37,8 @@ public RoundData(int championshipId, long ticketPrice, long additionalTicketPrice, int maxPurchaseCount, - int maxPurchaseCountWithInterval) + int maxPurchaseCountWithInterval, + int medalId = 0) { ChampionshipId = championshipId; Round = round; @@ -49,6 +51,7 @@ public RoundData(int championshipId, AdditionalTicketPrice = additionalTicketPrice; MaxPurchaseCount = maxPurchaseCount; MaxPurchaseCountWithInterval = maxPurchaseCountWithInterval; + MedalId = medalId; } public bool IsTheRoundOpened(long blockIndex) @@ -79,12 +82,18 @@ public override void Set(IReadOnlyList fields) var additionalTicketPrice = ParseLong(fields[8]); var maxPurchaseCount = 0; var maxPurchaseCountWithInterval = 0; + var medalId = 0; if (fields.Count > 9) { maxPurchaseCount = ParseInt(fields[9]); maxPurchaseCountWithInterval = ParseInt(fields[10]); } + if (fields.Count > 11) + { + medalId = ParseInt(fields[11]); + } + Round = new List { new RoundData(ChampionshipId, @@ -97,7 +106,8 @@ public override void Set(IReadOnlyList fields) ticketPrice, additionalTicketPrice, maxPurchaseCount, - maxPurchaseCountWithInterval) + maxPurchaseCountWithInterval, + medalId) }; } From 7e043d2c03e7d56eaa3ff6b93bcdc38745fc8021 Mon Sep 17 00:00:00 2001 From: "Kim sm." Date: Sun, 29 Sep 2024 17:07:40 +0900 Subject: [PATCH 10/27] use MedalId at BattleArena --- Lib9c/Action/BattleArena.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs index ffde30ca53..513f8b8781 100644 --- a/Lib9c/Action/BattleArena.cs +++ b/Lib9c/Action/BattleArena.cs @@ -164,7 +164,7 @@ public override IWorld Execute(IActionContext context) var runeListSheet = sheets.GetSheet(); myRuneSlotState.UpdateSlot(runeInfos, runeListSheet); states = states.SetLegacyState(myRuneSlotStateAddress, myRuneSlotState.Serialize()); - + // update my item slot var myItemSlotStateAddress = ItemSlotState.DeriveAddress(myAvatarAddress, BattleType.Arena); var myItemSlotState = states.TryGetLegacyState(myItemSlotStateAddress, out List rawItemSlotState) @@ -436,10 +436,19 @@ public override IWorld Execute(IActionContext context) if (roundData.ArenaType != ArenaType.OffSeason && winCount > 0) { var materialSheet = sheets.GetSheet(); - var medal = ArenaHelper.GetMedal( - roundData.ChampionshipId, - roundData.Round, - materialSheet); + Material medal; + if (roundData.MedalId != 0) + { + medal = ItemFactory.CreateMaterial(materialSheet, roundData.MedalId); + } + else + { + medal = ArenaHelper.GetMedal( + roundData.ChampionshipId, + roundData.Round, + materialSheet); + } + myAvatarState.inventory.AddItem(medal, count: winCount); } From 82ad6fb511f268d95fbf89643631f064f131572a Mon Sep 17 00:00:00 2001 From: "Kim sm." Date: Sun, 29 Sep 2024 17:21:47 +0900 Subject: [PATCH 11/27] fix test --- .Lib9c.Tests/Action/BattleArenaTest.cs | 4 +++- .Lib9c.Tests/TableData/ArenaSheetTest.cs | 6 +++++- Lib9c/TableCSV/Arena/ArenaSheet.csv | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.Lib9c.Tests/Action/BattleArenaTest.cs b/.Lib9c.Tests/Action/BattleArenaTest.cs index 702ff179b0..c7140a6f6c 100644 --- a/.Lib9c.Tests/Action/BattleArenaTest.cs +++ b/.Lib9c.Tests/Action/BattleArenaTest.cs @@ -1249,7 +1249,9 @@ private void Execute( var medalCount = 0; if (roundData.ArenaType != ArenaType.OffSeason) { - var medalId = ArenaHelper.GetMedalItemId(championshipId, round); + var medalId = roundData.MedalId == 0 + ? ArenaHelper.GetMedalItemId(championshipId, round) + : roundData.MedalId; myAvatarStateNext.inventory.TryGetItem(medalId, out var medal); if (myAfterInfoNext.Win > 0) { diff --git a/.Lib9c.Tests/TableData/ArenaSheetTest.cs b/.Lib9c.Tests/TableData/ArenaSheetTest.cs index 2c815f0b4e..cf805b22f8 100644 --- a/.Lib9c.Tests/TableData/ArenaSheetTest.cs +++ b/.Lib9c.Tests/TableData/ArenaSheetTest.cs @@ -28,7 +28,7 @@ public void SetToSheet() { const string content = @"id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price 1,1,OffSeason,1,2,0,0,5,2 -1,2,Season,3,4,0,100,50,20 +1,2,Season,3,4,0,100,50,20,1,1,1 1,3,OffSeason,5,1005284,0,0,5,2"; var sheet = new ArenaSheet(); @@ -46,6 +46,10 @@ public void SetToSheet() Assert.Equal(0, sheet.First.Round.First().EntranceFee); Assert.Equal(5, sheet.First.Round.First().TicketPrice); Assert.Equal(2, sheet.First.Round.First().AdditionalTicketPrice); + Assert.Equal(0, sheet.First.Round.First().MedalId); + + // 1,2,Season,3,4,0,100,50,20,1 + Assert.Equal(1, sheet.First.Round[1].MedalId); } [Fact] diff --git a/Lib9c/TableCSV/Arena/ArenaSheet.csv b/Lib9c/TableCSV/Arena/ArenaSheet.csv index be4777d52b..cd440d8226 100644 --- a/Lib9c/TableCSV/Arena/ArenaSheet.csv +++ b/Lib9c/TableCSV/Arena/ArenaSheet.csv @@ -98,4 +98,4 @@ id,round,arena_type,start_block_index,end_block_index,required_medal_count,entra 16,3,OffSeason,17028101,17179300,0,0,5,2,40,8 16,4,Season,17179301,17330500,0,1,50,20,40,8 16,5,OffSeason,17330501,17481700,0,0,5,2,40,8 -16,6,Championship,17481701,17632900,160,2,100,40,40,8 \ No newline at end of file +16,6,Championship,17481701,17632900,160,2,100,40,40,8 From 888abcdc65107eac2157d5c90aaa762ec8ff6414 Mon Sep 17 00:00:00 2001 From: sonohoshi Date: Mon, 7 Oct 2024 18:46:20 +0900 Subject: [PATCH 12/27] remove GetMedalItemId and GetMedal from ArenaHelper --- Lib9c/Arena/ArenaHelper.cs | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/Lib9c/Arena/ArenaHelper.cs b/Lib9c/Arena/ArenaHelper.cs index c485bcef13..ed177515c7 100644 --- a/Lib9c/Arena/ArenaHelper.cs +++ b/Lib9c/Arena/ArenaHelper.cs @@ -54,19 +54,6 @@ public static Address DeriveArenaAddress(int championshipId, int round) => { ArenaType.Championship, (200, -100) } }; - public static int GetMedalItemId(int championshipId, int round) => - 700_000 + (championshipId * 100) + round; - - public static Material GetMedal( - int championshipId, - int round, - MaterialItemSheet materialItemSheet) - { - var itemId = GetMedalItemId(championshipId, round); - var medal = ItemFactory.CreateMaterial(materialItemSheet, itemId); - return medal; - } - public static int GetMedalTotalCount(ArenaSheet.Row row, AvatarState avatarState) { var count = 0; @@ -77,7 +64,7 @@ public static int GetMedalTotalCount(ArenaSheet.Row row, AvatarState avatarState continue; } - var itemId = GetMedalItemId(data.ChampionshipId, data.Round); + var itemId = data.MedalId; if (avatarState.inventory.TryGetItem(itemId, out var item)) { count += item.count; From e2a8b295abcd8d9c0af13e286df0d816fedc254c Mon Sep 17 00:00:00 2001 From: sonohoshi Date: Mon, 7 Oct 2024 18:46:48 +0900 Subject: [PATCH 13/27] fix test about arena medal id --- .Lib9c.Tests/Action/BattleArenaTest.cs | 4 +--- .Lib9c.Tests/Action/JoinArena1Test.cs | 2 +- .Lib9c.Tests/Action/JoinArena3Test.cs | 2 +- .Lib9c.Tests/Action/JoinArenaTest.cs | 2 +- Lib9c/Action/BattleArena.cs | 16 +++++----------- 5 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.Lib9c.Tests/Action/BattleArenaTest.cs b/.Lib9c.Tests/Action/BattleArenaTest.cs index c7140a6f6c..2e41c55665 100644 --- a/.Lib9c.Tests/Action/BattleArenaTest.cs +++ b/.Lib9c.Tests/Action/BattleArenaTest.cs @@ -1249,9 +1249,7 @@ private void Execute( var medalCount = 0; if (roundData.ArenaType != ArenaType.OffSeason) { - var medalId = roundData.MedalId == 0 - ? ArenaHelper.GetMedalItemId(championshipId, round) - : roundData.MedalId; + var medalId = roundData.MedalId; myAvatarStateNext.inventory.TryGetItem(medalId, out var medal); if (myAfterInfoNext.Win > 0) { diff --git a/.Lib9c.Tests/Action/JoinArena1Test.cs b/.Lib9c.Tests/Action/JoinArena1Test.cs index 6f1e1d5cf8..0e5ad7690b 100644 --- a/.Lib9c.Tests/Action/JoinArena1Test.cs +++ b/.Lib9c.Tests/Action/JoinArena1Test.cs @@ -159,7 +159,7 @@ public AvatarState AddMedal(AvatarState avatarState, ArenaSheet.Row row, int cou continue; } - var itemId = ArenaHelper.GetMedalItemId(data.ChampionshipId, data.Round); + var itemId = data.MedalId; var material = ItemFactory.CreateMaterial(materialSheet, itemId); avatarState.inventory.AddItem(material, count); } diff --git a/.Lib9c.Tests/Action/JoinArena3Test.cs b/.Lib9c.Tests/Action/JoinArena3Test.cs index c1b633c195..d10ed47324 100644 --- a/.Lib9c.Tests/Action/JoinArena3Test.cs +++ b/.Lib9c.Tests/Action/JoinArena3Test.cs @@ -161,7 +161,7 @@ public AvatarState AddMedal(AvatarState avatarState, ArenaSheet.Row row, int cou continue; } - var itemId = ArenaHelper.GetMedalItemId(data.ChampionshipId, data.Round); + var itemId = data.MedalId; var material = ItemFactory.CreateMaterial(materialSheet, itemId); avatarState.inventory.AddItem(material, count); } diff --git a/.Lib9c.Tests/Action/JoinArenaTest.cs b/.Lib9c.Tests/Action/JoinArenaTest.cs index 12a8771868..19e66cfd6e 100644 --- a/.Lib9c.Tests/Action/JoinArenaTest.cs +++ b/.Lib9c.Tests/Action/JoinArenaTest.cs @@ -101,7 +101,7 @@ public void Execute_Championship_Success() _myAvatarState.level); var world = _world.MintAsset(new ActionContext(), _myAgentState.address, fee); var seasonRound = row.Round.First(e => e.ArenaType == ArenaType.Season); - var itemSheetId = ArenaHelper.GetMedalItemId(row.ChampionshipId, seasonRound.Round); + var itemSheetId = seasonRound.MedalId; Assert.True(_tableSheets.ItemSheet.TryGetValue(itemSheetId, out var itemRow)); var item = ItemFactory.CreateItem(itemRow, new TestRandom()); var inventory = _world.GetInventoryV2(_myAvatarState.address); diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs index 513f8b8781..72c59650fc 100644 --- a/Lib9c/Action/BattleArena.cs +++ b/Lib9c/Action/BattleArena.cs @@ -435,20 +435,14 @@ public override IWorld Execute(IActionContext context) // add medals if (roundData.ArenaType != ArenaType.OffSeason && winCount > 0) { - var materialSheet = sheets.GetSheet(); - Material medal; - if (roundData.MedalId != 0) - { - medal = ItemFactory.CreateMaterial(materialSheet, roundData.MedalId); - } - else + if (roundData.MedalId == 0) { - medal = ArenaHelper.GetMedal( - roundData.ChampionshipId, - roundData.Round, - materialSheet); + } + var materialSheet = sheets.GetSheet(); + var medal = ItemFactory.CreateMaterial(materialSheet, roundData.MedalId); + myAvatarState.inventory.AddItem(medal, count: winCount); } From e6a786237c2ed457791d5639a5553f0ee058baf4 Mon Sep 17 00:00:00 2001 From: sonohoshi Date: Tue, 8 Oct 2024 13:06:21 +0900 Subject: [PATCH 14/27] fix unit test about arena-medal id --- Lib9c/Action/BattleArena.cs | 2 +- Lib9c/Arena/ArenaHelper.cs | 7 +- Lib9c/Exceptions/MedalIdNotFoundException.cs | 41 ++++ Lib9c/TableCSV/Arena/ArenaSheet.csv | 202 +++++++++---------- 4 files changed, 149 insertions(+), 103 deletions(-) create mode 100644 Lib9c/Exceptions/MedalIdNotFoundException.cs diff --git a/Lib9c/Action/BattleArena.cs b/Lib9c/Action/BattleArena.cs index 72c59650fc..a802db8b61 100644 --- a/Lib9c/Action/BattleArena.cs +++ b/Lib9c/Action/BattleArena.cs @@ -437,7 +437,7 @@ public override IWorld Execute(IActionContext context) { if (roundData.MedalId == 0) { - + throw new MedalIdNotFoundException($"{addressesHex}{roundData.ChampionshipId}-{roundData.Round}.MedalId is zero. Need to set MedalId column at ArenaSheet."); } var materialSheet = sheets.GetSheet(); diff --git a/Lib9c/Arena/ArenaHelper.cs b/Lib9c/Arena/ArenaHelper.cs index ed177515c7..a65f40347b 100644 --- a/Lib9c/Arena/ArenaHelper.cs +++ b/Lib9c/Arena/ArenaHelper.cs @@ -59,12 +59,17 @@ public static int GetMedalTotalCount(ArenaSheet.Row row, AvatarState avatarState var count = 0; foreach (var data in row.Round) { + var itemId = data.MedalId; + if (data.MedalId == 0) + { + continue; + } + if (!data.ArenaType.Equals(ArenaType.Season)) { continue; } - var itemId = data.MedalId; if (avatarState.inventory.TryGetItem(itemId, out var item)) { count += item.count; diff --git a/Lib9c/Exceptions/MedalIdNotFoundException.cs b/Lib9c/Exceptions/MedalIdNotFoundException.cs new file mode 100644 index 0000000000..46797c0ce6 --- /dev/null +++ b/Lib9c/Exceptions/MedalIdNotFoundException.cs @@ -0,0 +1,41 @@ +using System; +using System.Runtime.Serialization; + +namespace Nekoyume.Exceptions +{ + [Serializable] + public class MedalIdNotFoundException : Exception + { + public MedalIdNotFoundException() + { + } + + public MedalIdNotFoundException(string message) + : base(message) + { + } + + public MedalIdNotFoundException( + string message, + Exception innerException) + : base(message, innerException) + { + } + + public MedalIdNotFoundException( + string actionType, + string addressesHex, + int requiredAmount, + int currentAmount) + : base($"[{actionType}][{addressesHex}] required({requiredAmount}), current({currentAmount})") + { + } + + protected MedalIdNotFoundException( + SerializationInfo info, + StreamingContext context) + : base(info, context) + { + } + } +} diff --git a/Lib9c/TableCSV/Arena/ArenaSheet.csv b/Lib9c/TableCSV/Arena/ArenaSheet.csv index cd440d8226..3b04ec2546 100644 --- a/Lib9c/TableCSV/Arena/ArenaSheet.csv +++ b/Lib9c/TableCSV/Arena/ArenaSheet.csv @@ -1,101 +1,101 @@ -id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price,max_purchase_count,max_purchase_count_during_interval -1,1,OffSeason,1,4440400,0,0,5,2,80,79 -1,2,Season,4440401,4541200,0,1,50,20,80,79 -1,3,OffSeason,4541201,4591600,0,0,5,2,80,79 -1,4,Season,4591601,4692400,0,1,50,20,80,79 -1,5,OffSeason,4692401,4793200,0,0,5,2,80,79 -1,6,Season,4793201,4843600,0,1,50,20,80,79 -1,7,OffSeason,4843601,4894000,0,0,5,2,80,79 -1,8,Championship,4894001,4994800,200,2,100,40,80,79 -2,1,OffSeason,4994801,5095600,0,0,5,2,80,79 -2,2,Season,5095601,5196400,0,1,50,20,80,79 -2,3,OffSeason,5196401,5246800,0,0,5,2,80,79 -2,4,Season,5246801,5347600,0,1,50,20,80,79 -2,5,OffSeason,5347601,5398000,0,0,5,2,80,79 -2,6,Championship,5398001,5498800,160,2,100,40,40,8 -2,7,OffSeason,5498801,5599600,0,0,5,2,40,8 -2,8,OffSeason,5599601,5700400,160,2,100,40,40,8 -3,1,OffSeason,5700401,5801200,0,0,5,2,80,8 -3,2,Season,5801201,5902000,0,1,50,20,80,8 -3,3,OffSeason,5902001,6002800,0,0,5,2,80,8 -3,4,Season,6002801,6103600,0,1,50,20,40,8 -3,5,OffSeason,6103601,6204400,0,0,5,2,40,8 -3,6,Championship,6204401,6305200,160,2,100,40,40,8 -4,1,OffSeason,6305201,6506800,0,0,5,2,40,8 -4,2,Season,6506801,6607600,0,1,50,20,40,8 -4,3,OffSeason,6607601,6708400,0,0,5,2,40,8 -4,4,Season,6708401,6809200,0,1,50,20,40,8 -4,5,OffSeason,6809201,6910000,0,0,5,2,40,8 -4,6,Championship,6910001,7010800,160,2,100,40,40,8 -5,1,OffSeason,7010801,7111600,0,0,5,2,40,8 -5,2,Season,7111601,7212400,0,1,50,20,40,8 -5,3,OffSeason,7212401,7313200,0,0,5,2,40,8 -5,4,Season,7313201,7414000,0,1,50,20,40,8 -5,5,OffSeason,7414001,7514800,0,0,5,2,40,8 -5,6,Championship,7514801,7615600,160,2,100,40,40,8 -6,1,OffSeason,7615601,7716400,0,0,5,2,40,8 -6,2,Season,7716401,7817200,0,1,50,20,40,8 -6,3,OffSeason,7817201,7918000,0,0,5,2,40,8 -6,4,Season,7918001,8018800,0,1,50,20,40,8 -6,5,OffSeason,8018801,8119600,0,0,5,2,40,8 -6,6,Championship,8119601,8220400,160,2,100,40,40,8 -7,1,OffSeason,8220401,8341360,0,0,5,2,40,8 -7,2,Season,8341361,8462320,0,1,50,20,40,8 -7,3,OffSeason,8462321,8613520,0,0,5,2,40,8 -7,4,Season,8613521,8764720,0,1,50,20,40,8 -7,5,OffSeason,8764721,8991520,0,0,5,2,40,8 -7,6,Championship,8991521,9142720,160,2,100,40,40,8 -8,1,OffSeason,9142721,9238200,0,0,5,2,40,8 -8,2,Season,9238201,9389400,0,1,50,20,40,8 -8,3,OffSeason,9389401,9540600,0,0,5,2,40,8 -8,4,Season,9540601,9691800,0,1,50,20,40,8 -8,5,OffSeason,9691801,9874418,0,0,5,2,40,8 -8,6,Championship,9874419,10025618,0,2,100,40,40,8 -9,1,OffSeason,10025619,10288900,0,0,5,2,40,8 -9,2,Season,10288901,10440100,0,1,50,20,40,8 -9,3,OffSeason,10440101,10720900,0,0,5,2,40,8 -9,4,Season,10720901,10872100,0,1,50,20,40,8 -9,5,OffSeason,10872101,11131300,0,0,5,2,40,8 -9,6,Championship,11131301,11282500,0,2,100,40,40,8 -10,1,OffSeason,11282501,11433700,0,0,5,2,40,8 -10,2,Season,11433701,11584900,0,1,50,20,40,8 -10,3,OffSeason,11584901,11736100,0,0,5,2,40,8 -10,4,Season,11736101,11887300,0,1,50,20,40,8 -10,5,OffSeason,11887301,12038500,0,0,5,2,40,8 -10,6,Championship,12038501,12189700,160,2,100,40,40,8 -11,1,OffSeason,12189701,12340900,0,0,5,2,40,8 -11,2,Season,12340901,12492100,0,1,50,20,40,8 -11,3,OffSeason,12492101,12643300,0,0,5,2,40,8 -11,4,Season,12643301,12794500,0,1,50,20,40,8 -11,5,OffSeason,12794501,12945700,0,0,5,2,40,8 -11,6,Championship,12945701,13096900,160,2,100,40,40,8 -12,1,OffSeason,13096901,13248100,0,0,5,2,40,8 -12,2,Season,13248101,13399300,0,1,50,20,40,8 -12,3,OffSeason,13399301,13550500,0,0,5,2,40,8 -12,4,Season,13550501,13701700,0,1,50,20,40,8 -12,5,OffSeason,13701701,13852900,0,0,5,2,40,8 -12,6,Championship,13852901,14004100,160,2,100,40,40,8 -13,1,OffSeason,14004101,14155300,0,0,5,2,40,8 -13,2,Season,14155301,14306500,0,1,50,20,40,8 -13,3,OffSeason,14306501,14457700,0,0,5,2,40,8 -13,4,Season,14457701,14608900,0,1,50,20,40,8 -13,5,OffSeason,14608901,14760100,0,0,5,2,40,8 -13,6,Championship,14760101,14911300,160,2,100,40,40,8 -14,1,OffSeason,14911301,15062500,0,0,5,2,40,8 -14,2,Season,15062501,15213700,0,1,50,20,40,8 -14,3,OffSeason,15213701,15364900,0,0,5,2,40,8 -14,4,Season,15364901,15516100,0,1,50,20,40,8 -14,5,OffSeason,15516101,15667300,0,0,5,2,40,8 -14,6,Championship,15667301,15818500,160,2,100,40,40,8 -15,1,OffSeason,15818501,15969700,0,0,5,2,40,8 -15,2,Season,15969701,16120900,0,1,50,20,40,8 -15,3,OffSeason,16120901,16272100,0,0,5,2,40,8 -15,4,Season,16272101,16423300,0,1,50,20,40,8 -15,5,OffSeason,16423301,16574500,0,0,5,2,40,8 -15,6,Championship,16574501,16725700,160,2,100,40,40,8 -16,1,OffSeason,16725701,16876900,0,0,5,2,40,8 -16,2,Season,16876901,17028100,0,1,50,20,40,8 -16,3,OffSeason,17028101,17179300,0,0,5,2,40,8 -16,4,Season,17179301,17330500,0,1,50,20,40,8 -16,5,OffSeason,17330501,17481700,0,0,5,2,40,8 -16,6,Championship,17481701,17632900,160,2,100,40,40,8 +id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price,max_purchase_count,max_purchase_count_during_interval,medal_id +1,1,OffSeason,1,4440400,0,0,5,2,80,79,0 +1,2,Season,4440401,4541200,0,1,50,20,80,79,700002 +1,3,OffSeason,4541201,4591600,0,0,5,2,80,79,0 +1,4,Season,4591601,4692400,0,1,50,20,80,79,700104 +1,5,OffSeason,4692401,4793200,0,0,5,2,80,79,0 +1,6,Season,4793201,4843600,0,1,50,20,80,79,700106 +1,7,OffSeason,4843601,4894000,0,0,5,2,80,79,0 +1,8,Championship,4894001,4994800,200,2,100,40,80,79,700108 +2,1,OffSeason,4994801,5095600,0,0,5,2,80,79,0 +2,2,Season,5095601,5196400,0,1,50,20,80,79,700204 +2,3,OffSeason,5196401,5246800,0,0,5,2,80,79,0 +2,4,Season,5246801,5347600,0,1,50,20,80,79,700206 +2,5,OffSeason,5347601,5398000,0,0,5,2,80,79,0 +2,6,Championship,5398001,5498800,160,2,100,40,40,8,700208 +2,7,OffSeason,5498801,5599600,0,0,5,2,40,8,0 +2,8,OffSeason,5599601,5700400,160,2,100,40,40,8,0 +3,1,OffSeason,5700401,5801200,0,0,5,2,80,8,0 +3,2,Season,5801201,5902000,0,1,50,20,80,8,700302 +3,3,OffSeason,5902001,6002800,0,0,5,2,80,8,0 +3,4,Season,6002801,6103600,0,1,50,20,40,8,700304 +3,5,OffSeason,6103601,6204400,0,0,5,2,40,8,0 +3,6,Championship,6204401,6305200,160,2,100,40,40,8,700306 +4,1,OffSeason,6305201,6506800,0,0,5,2,40,8,0 +4,2,Season,6506801,6607600,0,1,50,20,40,8,700402 +4,3,OffSeason,6607601,6708400,0,0,5,2,40,8,0 +4,4,Season,6708401,6809200,0,1,50,20,40,8,700404 +4,5,OffSeason,6809201,6910000,0,0,5,2,40,8,0 +4,6,Championship,6910001,7010800,160,2,100,40,40,8,700406 +5,1,OffSeason,7010801,7111600,0,0,5,2,40,8,0 +5,2,Season,7111601,7212400,0,1,50,20,40,8,700502 +5,3,OffSeason,7212401,7313200,0,0,5,2,40,8,0 +5,4,Season,7313201,7414000,0,1,50,20,40,8,700504 +5,5,OffSeason,7414001,7514800,0,0,5,2,40,8,0 +5,6,Championship,7514801,7615600,160,2,100,40,40,8,700506 +6,1,OffSeason,7615601,7716400,0,0,5,2,40,8,0 +6,2,Season,7716401,7817200,0,1,50,20,40,8,700602 +6,3,OffSeason,7817201,7918000,0,0,5,2,40,8,0 +6,4,Season,7918001,8018800,0,1,50,20,40,8,700604 +6,5,OffSeason,8018801,8119600,0,0,5,2,40,8,0 +6,6,Championship,8119601,8220400,160,2,100,40,40,8,700606 +7,1,OffSeason,8220401,8341360,0,0,5,2,40,8,0 +7,2,Season,8341361,8462320,0,1,50,20,40,8,700702 +7,3,OffSeason,8462321,8613520,0,0,5,2,40,8,0 +7,4,Season,8613521,8764720,0,1,50,20,40,8,700704 +7,5,OffSeason,8764721,8991520,0,0,5,2,40,8,0 +7,6,Championship,8991521,9142720,160,2,100,40,40,8,700706 +8,1,OffSeason,9142721,9238200,0,0,5,2,40,8,0 +8,2,Season,9238201,9389400,0,1,50,20,40,8,700802 +8,3,OffSeason,9389401,9540600,0,0,5,2,40,8,0 +8,4,Season,9540601,9691800,0,1,50,20,40,8,700804 +8,5,OffSeason,9691801,9874418,0,0,5,2,40,8,0 +8,6,Championship,9874419,10025618,0,2,100,40,40,8,700806 +9,1,OffSeason,10025619,10288900,0,0,5,2,40,8,0 +9,2,Season,10288901,10440100,0,1,50,20,40,8,700902 +9,3,OffSeason,10440101,10720900,0,0,5,2,40,8,0 +9,4,Season,10720901,10872100,0,1,50,20,40,8,700904 +9,5,OffSeason,10872101,11131300,0,0,5,2,40,8,0 +9,6,Championship,11131301,11282500,0,2,100,40,40,8,700906 +10,1,OffSeason,11282501,11433700,0,0,5,2,40,8,0 +10,2,Season,11433701,11584900,0,1,50,20,40,8,701002 +10,3,OffSeason,11584901,11736100,0,0,5,2,40,8,0 +10,4,Season,11736101,11887300,0,1,50,20,40,8,701004 +10,5,OffSeason,11887301,12038500,0,0,5,2,40,8,0 +10,6,Championship,12038501,12189700,160,2,100,40,40,8,701006 +11,1,OffSeason,12189701,12340900,0,0,5,2,40,8,0 +11,2,Season,12340901,12492100,0,1,50,20,40,8,701102 +11,3,OffSeason,12492101,12643300,0,0,5,2,40,8,0 +11,4,Season,12643301,12794500,0,1,50,20,40,8,701104 +11,5,OffSeason,12794501,12945700,0,0,5,2,40,8,0 +11,6,Championship,12945701,13096900,160,2,100,40,40,8,701106 +12,1,OffSeason,13096901,13248100,0,0,5,2,40,8,0 +12,2,Season,13248101,13399300,0,1,50,20,40,8,701202 +12,3,OffSeason,13399301,13550500,0,0,5,2,40,8,0 +12,4,Season,13550501,13701700,0,1,50,20,40,8,701204 +12,5,OffSeason,13701701,13852900,0,0,5,2,40,8,0 +12,6,Championship,13852901,14004100,160,2,100,40,40,8,701206 +13,1,OffSeason,14004101,14155300,0,0,5,2,40,8,0 +13,2,Season,14155301,14306500,0,1,50,20,40,8,701302 +13,3,OffSeason,14306501,14457700,0,0,5,2,40,8,0 +13,4,Season,14457701,14608900,0,1,50,20,40,8,701304 +13,5,OffSeason,14608901,14760100,0,0,5,2,40,8,0 +13,6,Championship,14760101,14911300,160,2,100,40,40,8,701306 +14,1,OffSeason,14911301,15062500,0,0,5,2,40,8,0 +14,2,Season,15062501,15213700,0,1,50,20,40,8,701402 +14,3,OffSeason,15213701,15364900,0,0,5,2,40,8,0 +14,4,Season,15364901,15516100,0,1,50,20,40,8,701404 +14,5,OffSeason,15516101,15667300,0,0,5,2,40,8,0 +14,6,Championship,15667301,15818500,160,2,100,40,40,8,701406 +15,1,OffSeason,15818501,15969700,0,0,5,2,40,8,0 +15,2,Season,15969701,16120900,0,1,50,20,40,8,701502 +15,3,OffSeason,16120901,16272100,0,0,5,2,40,8,0 +15,4,Season,16272101,16423300,0,1,50,20,40,8,701504 +15,5,OffSeason,16423301,16574500,0,0,5,2,40,8,0 +15,6,Championship,16574501,16725700,160,2,100,40,40,8,701506 +16,1,OffSeason,16725701,16876900,0,0,5,2,40,8,0 +16,2,Season,16876901,17028100,0,1,50,20,40,8,701602 +16,3,OffSeason,17028101,17179300,0,0,5,2,40,8,0 +16,4,Season,17179301,17330500,0,1,50,20,40,8,701604 +16,5,OffSeason,17330501,17481700,0,0,5,2,40,8,0 +16,6,Championship,17481701,17632900,160,2,100,40,40,8,701606 From 2050e1dc1f7daf576df0f023eb6cc121f3763ff5 Mon Sep 17 00:00:00 2001 From: sonohoshi Date: Tue, 8 Oct 2024 14:58:57 +0900 Subject: [PATCH 15/27] add Execute_MedalIdNotFoundException --- .Lib9c.Tests/Action/BattleArenaTest.cs | 52 ++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/.Lib9c.Tests/Action/BattleArenaTest.cs b/.Lib9c.Tests/Action/BattleArenaTest.cs index 2e41c55665..5f32742b15 100644 --- a/.Lib9c.Tests/Action/BattleArenaTest.cs +++ b/.Lib9c.Tests/Action/BattleArenaTest.cs @@ -12,6 +12,7 @@ namespace Lib9c.Tests.Action using Nekoyume; using Nekoyume.Action; using Nekoyume.Arena; + using Nekoyume.Exceptions; using Nekoyume.Model; using Nekoyume.Model.Arena; using Nekoyume.Model.EnumType; @@ -199,6 +200,57 @@ public void Execute_InvalidAddressException() })); } + [Fact] + public void Execute_MedalIdNotFoundException() + { + var prevState = _initialStates; + var context = new ActionContext + { + PreviousState = prevState, + Signer = _agent1Address, + RandomSeed = 0, + }; + prevState = prevState.SetLegacyState(Addresses.TableSheet.Derive("ArenaSheet"), @"id,round,arena_type,start_block_index,end_block_index,required_medal_count,entrance_fee,ticket_price,additional_ticket_price,max_purchase_count,max_purchase_count_during_interval,medal_id +1,1,Season,1,100,0,0,5,2,80,79".Serialize()); + prevState = JoinArena( + context, + prevState, + _agent1Address, + _avatar1Address, + 1, + 1, + 1, + new TestRandom()); + prevState = JoinArena( + context, + prevState, + _agent2Address, + _avatar2Address, + 1, + 1, + 1, + new TestRandom()); + + var action = new BattleArena + { + myAvatarAddress = _avatar1Address, + enemyAvatarAddress = _avatar2Address, + championshipId = 1, + round = 1, + ticket = 1, + costumes = new List(), + equipments = new List(), + runeInfos = new List(), + }; + Assert.Throws(() => action.Execute(new ActionContext + { + PreviousState = prevState, + Signer = _agent1Address, + RandomSeed = 0, + BlockIndex = 10, + })); + } + [Fact] public void Execute_FailedLoadStateException() { From 8f6f4f44165e1045e9e7c4ee6f345ca7dffc9e46 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 4 Oct 2024 15:23:58 +0900 Subject: [PATCH 16/27] fix stage simulator to create tradable material in circle --- Lib9c/Battle/Simulator.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Lib9c/Battle/Simulator.cs b/Lib9c/Battle/Simulator.cs index e8ce21421c..917541ba9a 100644 --- a/Lib9c/Battle/Simulator.cs +++ b/Lib9c/Battle/Simulator.cs @@ -164,15 +164,17 @@ MaterialItemSheet materialItemSheet try { var data = itemSelector.Select(1).First(); - if (materialItemSheet.TryGetValue(data.ItemId, out var itemData)) + if (materialItemSheet.TryGetValue(data.ItemId, out var materialRow)) { var count = random.Next(data.Min, data.Max + 1); for (var i = 0; i < count; i++) { - var item = ItemFactory.CreateMaterial(itemData); + var material = materialRow.ItemSubType is ItemSubType.Circle + ? ItemFactory.CreateTradableMaterial(materialRow) + : ItemFactory.CreateMaterial(materialRow); if (reward.Count < maxCount) { - reward.Add(item); + reward.Add(material); } else { From a080121e7706e7f34a0e22406bf8317ba8429d8f Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 4 Oct 2024 15:26:11 +0900 Subject: [PATCH 17/27] update test code and StageSheet to check tradable --- .Lib9c.Tests/Action/EventDungeonBattleTest.cs | 60 +++++++++++++++ .Lib9c.Tests/Action/HackAndSlashSweepTest.cs | 74 +++++++++++++++++++ .Lib9c.Tests/Action/HackAndSlashTest.cs | 14 +++- .../TableCSV/Event/EventDungeonStageSheet.csv | 2 +- Lib9c/TableCSV/WorldAndStage/StageSheet.csv | 10 +-- 5 files changed, 152 insertions(+), 8 deletions(-) diff --git a/.Lib9c.Tests/Action/EventDungeonBattleTest.cs b/.Lib9c.Tests/Action/EventDungeonBattleTest.cs index 9106b46ca2..2fec4ba2d6 100644 --- a/.Lib9c.Tests/Action/EventDungeonBattleTest.cs +++ b/.Lib9c.Tests/Action/EventDungeonBattleTest.cs @@ -13,6 +13,7 @@ namespace Lib9c.Tests.Action using Nekoyume.Exceptions; using Nekoyume.Extensions; using Nekoyume.Model.Event; + using Nekoyume.Model.Item; using Nekoyume.Model.Rune; using Nekoyume.Model.State; using Nekoyume.Module; @@ -427,6 +428,65 @@ public void Execute_V100301() eventDungeonInfo.RemainingTickets); } + [Theory] + [InlineData(1001, 10010001, 10010001)] + public void CheckRewardItems( + int eventScheduleId, + int eventDungeonId, + int eventDungeonStageId) + { + Assert.True(_tableSheets.EventScheduleSheet + .TryGetValue(eventScheduleId, out var scheduleRow)); + var contextBlockIndex = scheduleRow.StartBlockIndex; + + var avatarState = _initialStates.GetAvatarState(_avatarAddress); + var equipments = Doomfist.GetAllParts(_tableSheets, avatarState.level); + foreach (var equipment in equipments) + { + avatarState.inventory.AddItem(equipment); + } + + var state = _initialStates.SetAvatarState(_avatarAddress, avatarState); + var action = new EventDungeonBattle + { + AvatarAddress = _avatarAddress, + EventScheduleId = eventScheduleId, + EventDungeonId = eventDungeonId, + EventDungeonStageId = eventDungeonStageId, + Equipments = equipments + .Select(e => e.NonFungibleId) + .ToList(), + Costumes = new List(), + Foods = new List(), + RuneInfos = new List(), + BuyTicketIfNeeded = false, + }; + + var nextState = action.Execute(new ActionContext + { + PreviousState = state, + Signer = _agentAddress, + RandomSeed = 0, + BlockIndex = contextBlockIndex, + }); + var nextAvatar = nextState.GetAvatarState(_avatarAddress); + + var stageSheet = nextState.GetSheet(); + if (!stageSheet.TryGetValue(eventDungeonStageId, out var stageRow)) + { + throw new SheetRowNotFoundException(nameof(EventDungeonStageSheet), eventDungeonStageId); + } + + var materialItemSheet = nextState.GetSheet(); + var circleRow = materialItemSheet.Values.First(i => i.ItemSubType == ItemSubType.Circle); + var circleRewardData = stageRow.Rewards.FirstOrDefault(reward => reward.ItemId == circleRow.Id); + if (circleRewardData != null) + { + var circles = nextAvatar.inventory.Items.Where(x => x.item.Id == circleRow.Id); + Assert.All(circles, x => Assert.True(x.item is TradableMaterial)); + } + } + private IWorld Execute( IWorld previousStates, int eventScheduleId, diff --git a/.Lib9c.Tests/Action/HackAndSlashSweepTest.cs b/.Lib9c.Tests/Action/HackAndSlashSweepTest.cs index dbc7515b9e..d3d4a9d957 100644 --- a/.Lib9c.Tests/Action/HackAndSlashSweepTest.cs +++ b/.Lib9c.Tests/Action/HackAndSlashSweepTest.cs @@ -597,6 +597,80 @@ public void ExecuteWithStake(int stakingLevel) } } + [Theory] + [InlineData(1, 15)] + [InlineData(2, 55)] + [InlineData(3, 111)] + [InlineData(4, 189)] + [InlineData(4, 200)] + [InlineData(5, 250)] + [InlineData(6, 300)] + public void CheckRewardItems(int worldId, int stageId) + { + const int apStoneCount = 10; + var avatarState = AvatarState.Create( + _avatarAddress, + _agentAddress, + 0, + _initialState.GetAvatarSheets(), + _rankingMapAddress); + avatarState.level = 400; + avatarState.worldInformation = + new WorldInformation(0, _initialState.GetSheet(), stageId); + + var materialSheet = _initialState.GetSheet(); + var itemRow = materialSheet.Values.First(r => r.ItemSubType == ItemSubType.ApStone); + var apStone = ItemFactory.CreateTradableMaterial(itemRow); + avatarState.inventory.AddItem(apStone, apStoneCount); + + var equipments = Doomfist.GetAllParts(_tableSheets, avatarState.level); + foreach (var equipment in equipments) + { + avatarState.inventory.AddItem(equipment); + } + + var state = _initialState + .SetAvatarState(_avatarAddress, avatarState) + .SetLegacyState( + _avatarAddress.Derive("world_ids"), + Enumerable.Range(1, worldId).ToList().Select(i => i.Serialize()).Serialize()) + .SetActionPoint(_avatarAddress, 120); + var stageSheet = _initialState.GetSheet(); + if (!stageSheet.TryGetValue(stageId, out var stageRow)) + { + throw new SheetRowNotFoundException(nameof(StageSheet), stageId); + } + + var actionPoint = _initialState.GetActionPoint(_avatarAddress); + var action = new HackAndSlashSweep + { + costumes = new List(), + equipments = equipments.Select(e => e.NonFungibleId).ToList(), + runeInfos = new List(), + avatarAddress = _avatarAddress, + actionPoint = (int)actionPoint, + apStoneCount = apStoneCount, + worldId = worldId, + stageId = stageId, + }; + + var nextState = action.Execute(new ActionContext + { + PreviousState = state, + Signer = _agentAddress, + RandomSeed = 0, + }); + var nextAvatar = nextState.GetAvatarState(_avatarAddress); + + var circleRow = materialSheet.Values.First(i => i.ItemSubType == ItemSubType.Circle); + var circleRewardData = stageRow.Rewards.FirstOrDefault(reward => reward.ItemId == circleRow.Id); + if (circleRewardData != null) + { + var circles = nextAvatar.inventory.Items.Where(x => x.item.Id == circleRow.Id); + Assert.All(circles, x => Assert.True(x.item is TradableMaterial)); + } + } + [Theory] [InlineData(0, 30001, 1, 30001, typeof(DuplicatedRuneIdException))] [InlineData(1, 10002, 1, 30001, typeof(DuplicatedRuneSlotIndexException))] diff --git a/.Lib9c.Tests/Action/HackAndSlashTest.cs b/.Lib9c.Tests/Action/HackAndSlashTest.cs index 792495826c..9d61aab639 100644 --- a/.Lib9c.Tests/Action/HackAndSlashTest.cs +++ b/.Lib9c.Tests/Action/HackAndSlashTest.cs @@ -14,7 +14,6 @@ namespace Lib9c.Tests.Action using Nekoyume; using Nekoyume.Action; using Nekoyume.Battle; - using Nekoyume.Blockchain.Policy; using Nekoyume.Extensions; using Nekoyume.Model; using Nekoyume.Model.Item; @@ -26,7 +25,7 @@ namespace Lib9c.Tests.Action using Nekoyume.Module; using Nekoyume.TableData; using Xunit; - using static Lib9c.SerializeKeys; + using static SerializeKeys; public class HackAndSlashTest { @@ -984,6 +983,9 @@ public void ExecuteThrowNotEnoughMaterialException() [InlineData(2, 55)] [InlineData(3, 111)] [InlineData(4, 189)] + [InlineData(4, 200)] + [InlineData(5, 250)] + [InlineData(6, 300)] public void CheckRewardItems(int worldId, int stageId) { Assert.True(_tableSheets.WorldSheet.TryGetValue(worldId, out var worldRow)); @@ -1098,6 +1100,14 @@ x.item is IFungibleItem ownedFungibleItem && var totalMax = max * stageRow.DropItemMax + questSum; var totalCount = rewardItem.Sum(x => x.count); Assert.InRange(totalCount, totalMin, totalMax); + + var circleRow = materialItemSheet.Values.First(i => i.ItemSubType == ItemSubType.Circle); + var circleRewardData = stageRow.Rewards.FirstOrDefault(reward => reward.ItemId == circleRow.Id); + if (circleRewardData != null) + { + var circles = nextAvatarState.inventory.Items.Where(x => x.item.Id == circleRow.Id); + Assert.All(circles, x => Assert.True(x.item is TradableMaterial)); + } } [Theory] diff --git a/Lib9c/TableCSV/Event/EventDungeonStageSheet.csv b/Lib9c/TableCSV/Event/EventDungeonStageSheet.csv index 476085e721..e8977d575b 100644 --- a/Lib9c/TableCSV/Event/EventDungeonStageSheet.csv +++ b/Lib9c/TableCSV/Event/EventDungeonStageSheet.csv @@ -1,5 +1,5 @@ id,cost_ap,turn_limit,hp_option,atk_option,def_option,cri_option,hit_option,spd_option,background,bgm,item1,item1_ratio,item1_min,item1_max,item2,item2_ratio,item2_min,item2_max,item3,item3_ratio,item3_min,item3_max,item4,item4_ratio,item4_min,item4_max,item5,item5_ratio,item5_min,item5_max,item6,item6_ratio,item6_min,item6_max,item7,item7_ratio,item7_min,item7_max,item8,item8_ratio,item8_min,item8_max,item9,item9_ratio,item9_min,item9_max,item10,item10_ratio,item10_min,item10_max,min_drop,max_drop -10010001,5,150,60,60,60,0,60,60,EventDungeon_01_01,bgm_event_22summer_01,800101,0.2,1,1,800102,0.1,1,1,800104,0.1,1,1,400000,0.4,20,20,500000,0.1,1,1,800103,0.1,1,1,,,,,,,,,,,,,,,,,8,16 +10010001,5,150,60,60,60,0,60,60,EventDungeon_01_01,bgm_event_22summer_01,800101,0.2,1,1,800102,0.1,1,1,800104,0.1,1,1,400000,0.4,20,20,500000,0.1,1,1,800103,0.1,1,1,600402,1,1,1,,,,,,,,,,,,,8,16 10010002,5,150,60,60,60,0,60,60,EventDungeon_01_01,bgm_event_22summer_01,800101,0.2,1,1,800102,0.1,1,1,800104,0.1,1,1,400000,0.4,20,20,500000,0.1,1,1,800103,0.1,1,1,,,,,,,,,,,,,,,,,8,16 10010003,5,150,60,60,60,0,60,60,EventDungeon_01_01,bgm_event_22summer_01,800101,0.2,1,1,800102,0.1,1,1,800104,0.1,1,1,400000,0.4,20,20,500000,0.1,1,1,800103,0.1,1,1,,,,,,,,,,,,,,,,,8,16 10010004,5,150,60,60,60,0,60,60,EventDungeon_01_01,bgm_event_22summer_01,800101,0.2,1,2,800102,0.1,1,1,800104,0.1,1,2,400000,0.4,20,20,500000,0.1,1,1,800103,0.1,1,2,,,,,,,,,,,,,,,,,8,16 diff --git a/Lib9c/TableCSV/WorldAndStage/StageSheet.csv b/Lib9c/TableCSV/WorldAndStage/StageSheet.csv index 2fce781595..531150a366 100644 --- a/Lib9c/TableCSV/WorldAndStage/StageSheet.csv +++ b/Lib9c/TableCSV/WorldAndStage/StageSheet.csv @@ -198,7 +198,7 @@ id,cost_ap,turn_limit,hp_additional,atk_additional,def_additional,cri_additional 197,5,150,261,295,258,0,431,357,chapter_04_03,bgm_asgard_03,303002,0.1,1,2,303203,0.1,1,2,303402,0.1,1,2,306054,0.5,2,3,306035,0.12,1,2,306037,0.08,1,1,,,,,,,,,,,,,,,,,3,4 198,5,150,265,300,262,0,403,333,chapter_04_03,bgm_asgard_03,303203,0.1,1,2,303302,0.1,1,2,303402,0.1,1,2,306017,0.5,2,3,306035,0.12,1,2,306038,0.08,1,1,,,,,,,,,,,,,,,,,3,4 199,5,150,269,305,266,0,393,327,chapter_04_03,bgm_asgard_03,303203,0.1,1,2,303302,0.1,1,2,303402,0.1,1,2,306007,0.5,2,3,306035,0.12,1,2,306039,0.08,1,1,,,,,,,,,,,,,,,,,3,4 -200,5,150,273,310,270,0,437,364,chapter_04_03,bgm_asgard_03,600101,0.42,2,2,600102,0.41,2,2,600103,0.17,1,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4 +200,5,150,273,310,270,0,437,364,chapter_04_03,bgm_asgard_03,303002,0.1,1,2,303203,0.1,1,2,303302,0.1,1,2,306029,0.5,2,3,306035,0.12,1,2,306036,0.08,1,1,,,,,,,,,,,,,,,,,3,4 201,5,150,108,198,135,0,432,360,chapter_05_01,bgm_muspelheim_01,303002,0.223,1,1,303102,0.223,1,1,303201,0.223,1,1,306017,0.3,1,2,306045,0.024,1,1,306048,0.007,1,1,,,,,,,,,,,,,,,,,1,2 202,5,150,109,198,135,0,474,395,chapter_05_01,bgm_muspelheim_01,303102,0.223,1,1,303301,0.223,1,1,303401,0.223,1,1,306015,0.3,1,2,306045,0.024,1,1,306048,0.007,1,1,,,,,,,,,,,,,,,,,1,2 203,5,150,109,194,135,0,630,382,chapter_05_02,bgm_muspelheim_02,303102,0.223,1,1,303201,0.223,1,1,303301,0.223,1,1,306055,0.3,1,2,306045,0.024,1,1,306047,0.007,1,1,,,,,,,,,,,,,,,,,1,2 @@ -248,7 +248,7 @@ id,cost_ap,turn_limit,hp_additional,atk_additional,def_additional,cri_additional 247,5,150,989,858,669,0,1164,803,chapter_05_01,bgm_muspelheim_01,303002,0.215,1,1,303102,0.215,1,1,303303,0.215,1,1,306029,0.3,1,2,306045,0.042,1,1,306046,0.013,1,1,,,,,,,,,,,,,,,,,1,2 248,5,150,1019,902,686,0,1212,805,chapter_05_02,bgm_muspelheim_02,303002,0.215,1,1,303102,0.215,1,1,303303,0.215,1,1,306031,0.3,1,2,306045,0.042,1,1,306046,0.013,1,1,,,,,,,,,,,,,,,,,1,2 249,5,150,1050,946,703,0,1177,807,chapter_05_01,bgm_muspelheim_01,303002,0.215,1,1,303203,0.215,1,1,303303,0.215,1,1,306030,0.3,1,2,306045,0.042,1,1,306046,0.013,1,1,,,,,,,,,,,,,,,,,1,2 -250,5,150,1080,990,720,0,1260,809,chapter_05_03,bgm_muspelheim_03,600101,0.4,3,3,600102,0.38,3,3,600103,0.2,1,2,600104,0.02,1,1,,,,,,,,,,,,,,,,,,,,,,,,,3,3 +250,5,150,1080,990,720,0,1260,809,chapter_05_03,bgm_muspelheim_03,303002,0.214,1,1,303102,0.214,1,1,303203,0.214,1,1,306030,0.3,1,2,306045,0.044,1,1,306046,0.014,1,1,,,,,,,,,,,,,,,,,1,2 251,5,150,446,559,381,0,1248,1248,chapter_06_01,bgm_jotunheim_01,303202,1,3,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,3 252,5,150,453,527,383,0,1265,1265,chapter_06_01,bgm_jotunheim_01,303003,1,3,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,3 253,5,150,456,527,384,0,1283,1283,chapter_06_02,bgm_jotunheim_02,303003,0.43,1,2,306055,0.5,3,3,306045,0.05,1,1,306046,0.02,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 @@ -298,7 +298,7 @@ id,cost_ap,turn_limit,hp_additional,atk_additional,def_additional,cri_additional 297,5,150,2087,1494,1082,0,2046,2046,chapter_06_01,bgm_jotunheim_01,303403,0.43,1,2,306053,0.5,3,3,306045,0.05,1,1,306049,0.03,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 298,5,150,2106,1509,1086,0,1901,1901,chapter_06_02,bgm_jotunheim_02,303403,0.43,1,2,306054,0.5,3,3,306045,0.05,1,1,306048,0.03,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 299,5,150,2127,1524,1090,0,2028,2028,chapter_06_01,bgm_jotunheim_01,303003,0.43,1,2,306055,0.5,3,3,306045,0.05,1,1,306047,0.03,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 -300,5,150,2147,1539,1094,0,2046,2046,chapter_06_03,bgm_jotunheim_03,600101,0.4,3,3,600102,0.38,3,3,600103,0.2,1,2,600104,0.02,1,2,,,,,,,,,,,,,,,,,,,,,,,,,6,6 +300,5,150,2147,1539,1094,0,2046,2046,chapter_06_03,bgm_jotunheim_03,303003,0.75,3,3,306045,0.1,3,3,306046,0.05,1,1,306049,0.05,1,1,306048,0.05,1,1,600402,0.05,1,1,,,,,,,,,,,,,,,,,2,3 301,5,150,1101,875,129,0,2008,1800,chapter_07_01,bgm_niflheim_01,303004,1,4,4,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,4 302,5,150,1121,894,134,0,2073,1814,chapter_07_01,bgm_niflheim_01,303004,0.4,1,1,306075,0.45,2,3,306070,0.1,1,1,306071,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,2,3 303,5,150,1131,904,136,0,2138,1828,chapter_07_02,bgm_niflheim_02,303004,0.4,1,1,306075,0.45,2,3,306070,0.1,1,1,306071,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,2,3 @@ -348,7 +348,7 @@ id,cost_ap,turn_limit,hp_additional,atk_additional,def_additional,cri_additional 347,5,150,2609,2346,2210,0,9396,3110,chapter_07_01,bgm_niflheim_01,303104,0.4,2,3,306070,0.2,1,1,306071,0.1,1,1,306074,0.1,1,1,306073,0.1,1,1,306072,0.1,1,1,306072,0.1,1,1,,,,,,,,,,,,,2,3 348,5,150,2653,2482,2229,0,10044,3369,chapter_07_02,bgm_niflheim_02,303204,0.4,2,3,306070,0.2,1,1,306071,0.1,1,1,306074,0.1,1,1,306073,0.1,1,1,306072,0.1,1,1,306072,0.1,1,1,,,,,,,,,,,,,2,3 349,5,150,2697,2618,2248,0,10368,3628,chapter_07_01,bgm_niflheim_01,303304,0.4,2,3,306070,0.2,1,1,306071,0.1,1,1,306074,0.1,1,1,306073,0.1,1,1,306072,0.1,1,1,306072,0.1,1,1,,,,,,,,,,,,,2,3 -350,5,150,2741,2754,2268,0,10692,3888,chapter_07_03,bgm_niflheim_03,600101,0.39,3,3,600102,0.38,3,3,600103,0.2,2,2,600104,0.02,1,3,,,,,,,,,,,,,,,,,,,,,,,,,6,6 +350,5,150,2741,2754,2268,0,10692,3888,chapter_07_03,bgm_niflheim_03,303404,0.4,2,3,306070,0.2,1,1,306071,0.1,1,1,306074,0.1,1,1,306073,0.1,1,1,306072,0.1,1,1,306072,0.1,1,1,600402,0.1,1,1,,,,,,,,,6,6 351,5,150,1620,518,648,0,6868,2786,chapter_08_01,bgm_hel_01,303005,1,2,2,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,2 352,5,150,1620,518,648,0,6868,2786,chapter_08_01,bgm_hel_01,303005,0.4,1,1,306090,0.45,2,3,306086,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,2 353,5,150,1620,518,648,0,6868,2786,chapter_08_02,bgm_hel_02,303005,0.4,1,1,306090,0.45,2,3,306086,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,2 @@ -398,7 +398,7 @@ id,cost_ap,turn_limit,hp_additional,atk_additional,def_additional,cri_additional 397,5,150,14133,18760,12338,0,85374,12506,chapter_08_01,bgm_hel_01,303105,0.4,1,2,306091,0.3,1,2,306096,0.3,1,2,306089,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 398,5,150,14671,19245,12804,0,90396,13089,chapter_08_02,bgm_hel_02,303105,0.4,1,2,306091,0.3,1,2,306096,0.3,1,2,306089,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 399,5,150,15208,19732,13271,0,95418,13672,chapter_08_01,bgm_hel_01,303005,0.4,1,2,306090,0.3,1,2,306095,0.3,1,2,306089,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 -400,5,150,15746,20217,13737,0,100440,14256,chapter_08_03,bgm_hel_03,303005,0.4,1,2,306090,0.3,1,2,306095,0.3,1,2,306089,0.05,1,1,,,,,,,,,,,,,,,,,,,,,,,,,1,3 +400,5,150,15746,20217,13737,0,100440,14256,chapter_08_03,bgm_hel_03,303005,0.4,1,2,306090,0.3,1,2,306095,0.3,1,2,306089,0.05,1,1,600402,0.15,1,1,,,,,,,,,,,,,,,,,,,,,6,6 10000001,10,150,184,132,132,0,184,132,chapter_99_01,bgm_hard1,303200,0.15,1,1,306064,0.25,1,2,306065,0.1,1,2,306058,0.4,1,1,306059,0.1,1,1,,,,,,,,,,,,,,,,,,,,,4,4 10000002,10,150,228,163,163,0,228,163,chapter_99_01,bgm_hard2,303200,0.15,1,1,306064,0.25,1,2,306065,0.1,1,2,306058,0.4,1,1,306059,0.1,1,1,,,,,,,,,,,,,,,,,,,,,4,4 10000003,10,150,245,175,175,0,245,175,chapter_99_01,bgm_hard1,303200,0.15,1,1,306064,0.25,1,2,306065,0.1,1,2,306058,0.4,1,1,306059,0.1,1,1,,,,,,,,,,,,,,,,,,,,,4,4 From 24006d55a4b8fc6b561371d01b57640752aac4b7 Mon Sep 17 00:00:00 2001 From: eugene-hong <58686228+eugene-doobu@users.noreply.github.com> Date: Thu, 10 Oct 2024 18:11:04 +0900 Subject: [PATCH 18/27] update pet data --- Lib9c/TableCSV/Pet/PetCostSheet.csv | 802 +++++++++- Lib9c/TableCSV/Pet/PetOptionSheet.csv | 2000 ++++++++++--------------- Lib9c/TableCSV/Pet/PetSheet.csv | 10 +- 3 files changed, 1610 insertions(+), 1202 deletions(-) diff --git a/Lib9c/TableCSV/Pet/PetCostSheet.csv b/Lib9c/TableCSV/Pet/PetCostSheet.csv index 1667d09b8b..c7f2eb465f 100644 --- a/Lib9c/TableCSV/Pet/PetCostSheet.csv +++ b/Lib9c/TableCSV/Pet/PetCostSheet.csv @@ -398,4 +398,804 @@ ID,_PetName,PetLevel,SoulStoneQuantity,NcgQuantity 1004,lil fenrir,97,10,0 1004,lil fenrir,98,10,0 1004,lil fenrir,99,10,300 -1004,lil fenrir,100,10,0 \ No newline at end of file +1004,lil fenrir,100,10,0 +1011,Ribbon BlackCat,1,10,0 +1011,Ribbon BlackCat,2,10,0 +1011,Ribbon BlackCat,3,10,0 +1011,Ribbon BlackCat,4,10,0 +1011,Ribbon BlackCat,5,10,0 +1011,Ribbon BlackCat,6,10,0 +1011,Ribbon BlackCat,7,10,0 +1011,Ribbon BlackCat,8,10,0 +1011,Ribbon BlackCat,9,10,60 +1011,Ribbon BlackCat,10,10,0 +1011,Ribbon BlackCat,11,10,0 +1011,Ribbon BlackCat,12,10,0 +1011,Ribbon BlackCat,13,10,0 +1011,Ribbon BlackCat,14,10,0 +1011,Ribbon BlackCat,15,10,0 +1011,Ribbon BlackCat,16,10,0 +1011,Ribbon BlackCat,17,10,0 +1011,Ribbon BlackCat,18,10,0 +1011,Ribbon BlackCat,19,10,60 +1011,Ribbon BlackCat,20,10,0 +1011,Ribbon BlackCat,21,10,0 +1011,Ribbon BlackCat,22,10,0 +1011,Ribbon BlackCat,23,10,0 +1011,Ribbon BlackCat,24,10,0 +1011,Ribbon BlackCat,25,10,0 +1011,Ribbon BlackCat,26,10,0 +1011,Ribbon BlackCat,27,10,0 +1011,Ribbon BlackCat,28,10,0 +1011,Ribbon BlackCat,29,10,60 +1011,Ribbon BlackCat,30,10,0 +1011,Ribbon BlackCat,31,10,0 +1011,Ribbon BlackCat,32,10,0 +1011,Ribbon BlackCat,33,10,0 +1011,Ribbon BlackCat,34,10,0 +1011,Ribbon BlackCat,35,10,0 +1011,Ribbon BlackCat,36,10,0 +1011,Ribbon BlackCat,37,10,0 +1011,Ribbon BlackCat,38,10,0 +1011,Ribbon BlackCat,39,10,60 +1011,Ribbon BlackCat,40,10,0 +1011,Ribbon BlackCat,41,10,0 +1011,Ribbon BlackCat,42,10,0 +1011,Ribbon BlackCat,43,10,0 +1011,Ribbon BlackCat,44,10,0 +1011,Ribbon BlackCat,45,10,0 +1011,Ribbon BlackCat,46,10,0 +1011,Ribbon BlackCat,47,10,0 +1011,Ribbon BlackCat,48,10,0 +1011,Ribbon BlackCat,49,10,60 +1011,Ribbon BlackCat,50,10,0 +1011,Ribbon BlackCat,51,10,0 +1011,Ribbon BlackCat,52,10,0 +1011,Ribbon BlackCat,53,10,0 +1011,Ribbon BlackCat,54,10,0 +1011,Ribbon BlackCat,55,10,0 +1011,Ribbon BlackCat,56,10,0 +1011,Ribbon BlackCat,57,10,0 +1011,Ribbon BlackCat,58,10,0 +1011,Ribbon BlackCat,59,10,60 +1011,Ribbon BlackCat,60,10,0 +1011,Ribbon BlackCat,61,10,0 +1011,Ribbon BlackCat,62,10,0 +1011,Ribbon BlackCat,63,10,0 +1011,Ribbon BlackCat,64,10,0 +1011,Ribbon BlackCat,65,10,0 +1011,Ribbon BlackCat,66,10,0 +1011,Ribbon BlackCat,67,10,0 +1011,Ribbon BlackCat,68,10,0 +1011,Ribbon BlackCat,69,10,60 +1011,Ribbon BlackCat,70,10,0 +1011,Ribbon BlackCat,71,10,0 +1011,Ribbon BlackCat,72,10,0 +1011,Ribbon BlackCat,73,10,0 +1011,Ribbon BlackCat,74,10,0 +1011,Ribbon BlackCat,75,10,0 +1011,Ribbon BlackCat,76,10,0 +1011,Ribbon BlackCat,77,10,0 +1011,Ribbon BlackCat,78,10,0 +1011,Ribbon BlackCat,79,10,60 +1011,Ribbon BlackCat,80,10,0 +1011,Ribbon BlackCat,81,10,0 +1011,Ribbon BlackCat,82,10,0 +1011,Ribbon BlackCat,83,10,0 +1011,Ribbon BlackCat,84,10,0 +1011,Ribbon BlackCat,85,10,0 +1011,Ribbon BlackCat,86,10,0 +1011,Ribbon BlackCat,87,10,0 +1011,Ribbon BlackCat,88,10,0 +1011,Ribbon BlackCat,89,10,60 +1011,Ribbon BlackCat,90,10,0 +1011,Ribbon BlackCat,91,10,0 +1011,Ribbon BlackCat,92,10,0 +1011,Ribbon BlackCat,93,10,0 +1011,Ribbon BlackCat,94,10,0 +1011,Ribbon BlackCat,95,10,0 +1011,Ribbon BlackCat,96,10,0 +1011,Ribbon BlackCat,97,10,0 +1011,Ribbon BlackCat,98,10,0 +1011,Ribbon BlackCat,99,10,60 +1011,Ribbon BlackCat,100,10,0 +1012,Peach Dongle,1,10,0 +1012,Peach Dongle,2,10,0 +1012,Peach Dongle,3,10,0 +1012,Peach Dongle,4,10,0 +1012,Peach Dongle,5,10,0 +1012,Peach Dongle,6,10,0 +1012,Peach Dongle,7,10,0 +1012,Peach Dongle,8,10,0 +1012,Peach Dongle,9,10,100 +1012,Peach Dongle,10,10,0 +1012,Peach Dongle,11,10,0 +1012,Peach Dongle,12,10,0 +1012,Peach Dongle,13,10,0 +1012,Peach Dongle,14,10,0 +1012,Peach Dongle,15,10,0 +1012,Peach Dongle,16,10,0 +1012,Peach Dongle,17,10,0 +1012,Peach Dongle,18,10,0 +1012,Peach Dongle,19,10,100 +1012,Peach Dongle,20,10,0 +1012,Peach Dongle,21,10,0 +1012,Peach Dongle,22,10,0 +1012,Peach Dongle,23,10,0 +1012,Peach Dongle,24,10,0 +1012,Peach Dongle,25,10,0 +1012,Peach Dongle,26,10,0 +1012,Peach Dongle,27,10,0 +1012,Peach Dongle,28,10,0 +1012,Peach Dongle,29,10,100 +1012,Peach Dongle,30,10,0 +1012,Peach Dongle,31,10,0 +1012,Peach Dongle,32,10,0 +1012,Peach Dongle,33,10,0 +1012,Peach Dongle,34,10,0 +1012,Peach Dongle,35,10,0 +1012,Peach Dongle,36,10,0 +1012,Peach Dongle,37,10,0 +1012,Peach Dongle,38,10,0 +1012,Peach Dongle,39,10,100 +1012,Peach Dongle,40,10,0 +1012,Peach Dongle,41,10,0 +1012,Peach Dongle,42,10,0 +1012,Peach Dongle,43,10,0 +1012,Peach Dongle,44,10,0 +1012,Peach Dongle,45,10,0 +1012,Peach Dongle,46,10,0 +1012,Peach Dongle,47,10,0 +1012,Peach Dongle,48,10,0 +1012,Peach Dongle,49,10,100 +1012,Peach Dongle,50,10,0 +1012,Peach Dongle,51,10,0 +1012,Peach Dongle,52,10,0 +1012,Peach Dongle,53,10,0 +1012,Peach Dongle,54,10,0 +1012,Peach Dongle,55,10,0 +1012,Peach Dongle,56,10,0 +1012,Peach Dongle,57,10,0 +1012,Peach Dongle,58,10,0 +1012,Peach Dongle,59,10,100 +1012,Peach Dongle,60,10,0 +1012,Peach Dongle,61,10,0 +1012,Peach Dongle,62,10,0 +1012,Peach Dongle,63,10,0 +1012,Peach Dongle,64,10,0 +1012,Peach Dongle,65,10,0 +1012,Peach Dongle,66,10,0 +1012,Peach Dongle,67,10,0 +1012,Peach Dongle,68,10,0 +1012,Peach Dongle,69,10,100 +1012,Peach Dongle,70,10,0 +1012,Peach Dongle,71,10,0 +1012,Peach Dongle,72,10,0 +1012,Peach Dongle,73,10,0 +1012,Peach Dongle,74,10,0 +1012,Peach Dongle,75,10,0 +1012,Peach Dongle,76,10,0 +1012,Peach Dongle,77,10,0 +1012,Peach Dongle,78,10,0 +1012,Peach Dongle,79,10,100 +1012,Peach Dongle,80,10,0 +1012,Peach Dongle,81,10,0 +1012,Peach Dongle,82,10,0 +1012,Peach Dongle,83,10,0 +1012,Peach Dongle,84,10,0 +1012,Peach Dongle,85,10,0 +1012,Peach Dongle,86,10,0 +1012,Peach Dongle,87,10,0 +1012,Peach Dongle,88,10,0 +1012,Peach Dongle,89,10,100 +1012,Peach Dongle,90,10,0 +1012,Peach Dongle,91,10,0 +1012,Peach Dongle,92,10,0 +1012,Peach Dongle,93,10,0 +1012,Peach Dongle,94,10,0 +1012,Peach Dongle,95,10,0 +1012,Peach Dongle,96,10,0 +1012,Peach Dongle,97,10,0 +1012,Peach Dongle,98,10,0 +1012,Peach Dongle,99,10,100 +1012,Peach Dongle,100,10,0 +1013,Valkyrie of Blue Light,1,10,0 +1013,Valkyrie of Blue Light,2,10,0 +1013,Valkyrie of Blue Light,3,10,0 +1013,Valkyrie of Blue Light,4,10,0 +1013,Valkyrie of Blue Light,5,10,0 +1013,Valkyrie of Blue Light,6,10,0 +1013,Valkyrie of Blue Light,7,10,0 +1013,Valkyrie of Blue Light,8,10,0 +1013,Valkyrie of Blue Light,9,10,150 +1013,Valkyrie of Blue Light,10,10,0 +1013,Valkyrie of Blue Light,11,10,0 +1013,Valkyrie of Blue Light,12,10,0 +1013,Valkyrie of Blue Light,13,10,0 +1013,Valkyrie of Blue Light,14,10,0 +1013,Valkyrie of Blue Light,15,10,0 +1013,Valkyrie of Blue Light,16,10,0 +1013,Valkyrie of Blue Light,17,10,0 +1013,Valkyrie of Blue Light,18,10,0 +1013,Valkyrie of Blue Light,19,10,150 +1013,Valkyrie of Blue Light,20,10,0 +1013,Valkyrie of Blue Light,21,10,0 +1013,Valkyrie of Blue Light,22,10,0 +1013,Valkyrie of Blue Light,23,10,0 +1013,Valkyrie of Blue Light,24,10,0 +1013,Valkyrie of Blue Light,25,10,0 +1013,Valkyrie of Blue Light,26,10,0 +1013,Valkyrie of Blue Light,27,10,0 +1013,Valkyrie of Blue Light,28,10,0 +1013,Valkyrie of Blue Light,29,10,150 +1013,Valkyrie of Blue Light,30,10,0 +1013,Valkyrie of Blue Light,31,10,0 +1013,Valkyrie of Blue Light,32,10,0 +1013,Valkyrie of Blue Light,33,10,0 +1013,Valkyrie of Blue Light,34,10,0 +1013,Valkyrie of Blue Light,35,10,0 +1013,Valkyrie of Blue Light,36,10,0 +1013,Valkyrie of Blue Light,37,10,0 +1013,Valkyrie of Blue Light,38,10,0 +1013,Valkyrie of Blue Light,39,10,150 +1013,Valkyrie of Blue Light,40,10,0 +1013,Valkyrie of Blue Light,41,10,0 +1013,Valkyrie of Blue Light,42,10,0 +1013,Valkyrie of Blue Light,43,10,0 +1013,Valkyrie of Blue Light,44,10,0 +1013,Valkyrie of Blue Light,45,10,0 +1013,Valkyrie of Blue Light,46,10,0 +1013,Valkyrie of Blue Light,47,10,0 +1013,Valkyrie of Blue Light,48,10,0 +1013,Valkyrie of Blue Light,49,10,150 +1013,Valkyrie of Blue Light,50,10,0 +1013,Valkyrie of Blue Light,51,10,0 +1013,Valkyrie of Blue Light,52,10,0 +1013,Valkyrie of Blue Light,53,10,0 +1013,Valkyrie of Blue Light,54,10,0 +1013,Valkyrie of Blue Light,55,10,0 +1013,Valkyrie of Blue Light,56,10,0 +1013,Valkyrie of Blue Light,57,10,0 +1013,Valkyrie of Blue Light,58,10,0 +1013,Valkyrie of Blue Light,59,10,150 +1013,Valkyrie of Blue Light,60,10,0 +1013,Valkyrie of Blue Light,61,10,0 +1013,Valkyrie of Blue Light,62,10,0 +1013,Valkyrie of Blue Light,63,10,0 +1013,Valkyrie of Blue Light,64,10,0 +1013,Valkyrie of Blue Light,65,10,0 +1013,Valkyrie of Blue Light,66,10,0 +1013,Valkyrie of Blue Light,67,10,0 +1013,Valkyrie of Blue Light,68,10,0 +1013,Valkyrie of Blue Light,69,10,150 +1013,Valkyrie of Blue Light,70,10,0 +1013,Valkyrie of Blue Light,71,10,0 +1013,Valkyrie of Blue Light,72,10,0 +1013,Valkyrie of Blue Light,73,10,0 +1013,Valkyrie of Blue Light,74,10,0 +1013,Valkyrie of Blue Light,75,10,0 +1013,Valkyrie of Blue Light,76,10,0 +1013,Valkyrie of Blue Light,77,10,0 +1013,Valkyrie of Blue Light,78,10,0 +1013,Valkyrie of Blue Light,79,10,150 +1013,Valkyrie of Blue Light,80,10,0 +1013,Valkyrie of Blue Light,81,10,0 +1013,Valkyrie of Blue Light,82,10,0 +1013,Valkyrie of Blue Light,83,10,0 +1013,Valkyrie of Blue Light,84,10,0 +1013,Valkyrie of Blue Light,85,10,0 +1013,Valkyrie of Blue Light,86,10,0 +1013,Valkyrie of Blue Light,87,10,0 +1013,Valkyrie of Blue Light,88,10,0 +1013,Valkyrie of Blue Light,89,10,150 +1013,Valkyrie of Blue Light,90,10,0 +1013,Valkyrie of Blue Light,91,10,0 +1013,Valkyrie of Blue Light,92,10,0 +1013,Valkyrie of Blue Light,93,10,0 +1013,Valkyrie of Blue Light,94,10,0 +1013,Valkyrie of Blue Light,95,10,0 +1013,Valkyrie of Blue Light,96,10,0 +1013,Valkyrie of Blue Light,97,10,0 +1013,Valkyrie of Blue Light,98,10,0 +1013,Valkyrie of Blue Light,99,10,150 +1013,Valkyrie of Blue Light,100,10,0 +1014,Forest Lil' Fenrir,1,10,0 +1014,Forest Lil' Fenrir,2,10,0 +1014,Forest Lil' Fenrir,3,10,0 +1014,Forest Lil' Fenrir,4,10,0 +1014,Forest Lil' Fenrir,5,10,0 +1014,Forest Lil' Fenrir,6,10,0 +1014,Forest Lil' Fenrir,7,10,0 +1014,Forest Lil' Fenrir,8,10,0 +1014,Forest Lil' Fenrir,9,10,300 +1014,Forest Lil' Fenrir,10,10,0 +1014,Forest Lil' Fenrir,11,10,0 +1014,Forest Lil' Fenrir,12,10,0 +1014,Forest Lil' Fenrir,13,10,0 +1014,Forest Lil' Fenrir,14,10,0 +1014,Forest Lil' Fenrir,15,10,0 +1014,Forest Lil' Fenrir,16,10,0 +1014,Forest Lil' Fenrir,17,10,0 +1014,Forest Lil' Fenrir,18,10,0 +1014,Forest Lil' Fenrir,19,10,300 +1014,Forest Lil' Fenrir,20,10,0 +1014,Forest Lil' Fenrir,21,10,0 +1014,Forest Lil' Fenrir,22,10,0 +1014,Forest Lil' Fenrir,23,10,0 +1014,Forest Lil' Fenrir,24,10,0 +1014,Forest Lil' Fenrir,25,10,0 +1014,Forest Lil' Fenrir,26,10,0 +1014,Forest Lil' Fenrir,27,10,0 +1014,Forest Lil' Fenrir,28,10,0 +1014,Forest Lil' Fenrir,29,10,300 +1014,Forest Lil' Fenrir,30,10,0 +1014,Forest Lil' Fenrir,31,10,0 +1014,Forest Lil' Fenrir,32,10,0 +1014,Forest Lil' Fenrir,33,10,0 +1014,Forest Lil' Fenrir,34,10,0 +1014,Forest Lil' Fenrir,35,10,0 +1014,Forest Lil' Fenrir,36,10,0 +1014,Forest Lil' Fenrir,37,10,0 +1014,Forest Lil' Fenrir,38,10,0 +1014,Forest Lil' Fenrir,39,10,300 +1014,Forest Lil' Fenrir,40,10,0 +1014,Forest Lil' Fenrir,41,10,0 +1014,Forest Lil' Fenrir,42,10,0 +1014,Forest Lil' Fenrir,43,10,0 +1014,Forest Lil' Fenrir,44,10,0 +1014,Forest Lil' Fenrir,45,10,0 +1014,Forest Lil' Fenrir,46,10,0 +1014,Forest Lil' Fenrir,47,10,0 +1014,Forest Lil' Fenrir,48,10,0 +1014,Forest Lil' Fenrir,49,10,300 +1014,Forest Lil' Fenrir,50,10,0 +1014,Forest Lil' Fenrir,51,10,0 +1014,Forest Lil' Fenrir,52,10,0 +1014,Forest Lil' Fenrir,53,10,0 +1014,Forest Lil' Fenrir,54,10,0 +1014,Forest Lil' Fenrir,55,10,0 +1014,Forest Lil' Fenrir,56,10,0 +1014,Forest Lil' Fenrir,57,10,0 +1014,Forest Lil' Fenrir,58,10,0 +1014,Forest Lil' Fenrir,59,10,300 +1014,Forest Lil' Fenrir,60,10,0 +1014,Forest Lil' Fenrir,61,10,0 +1014,Forest Lil' Fenrir,62,10,0 +1014,Forest Lil' Fenrir,63,10,0 +1014,Forest Lil' Fenrir,64,10,0 +1014,Forest Lil' Fenrir,65,10,0 +1014,Forest Lil' Fenrir,66,10,0 +1014,Forest Lil' Fenrir,67,10,0 +1014,Forest Lil' Fenrir,68,10,0 +1014,Forest Lil' Fenrir,69,10,300 +1014,Forest Lil' Fenrir,70,10,0 +1014,Forest Lil' Fenrir,71,10,0 +1014,Forest Lil' Fenrir,72,10,0 +1014,Forest Lil' Fenrir,73,10,0 +1014,Forest Lil' Fenrir,74,10,0 +1014,Forest Lil' Fenrir,75,10,0 +1014,Forest Lil' Fenrir,76,10,0 +1014,Forest Lil' Fenrir,77,10,0 +1014,Forest Lil' Fenrir,78,10,0 +1014,Forest Lil' Fenrir,79,10,300 +1014,Forest Lil' Fenrir,80,10,0 +1014,Forest Lil' Fenrir,81,10,0 +1014,Forest Lil' Fenrir,82,10,0 +1014,Forest Lil' Fenrir,83,10,0 +1014,Forest Lil' Fenrir,84,10,0 +1014,Forest Lil' Fenrir,85,10,0 +1014,Forest Lil' Fenrir,86,10,0 +1014,Forest Lil' Fenrir,87,10,0 +1014,Forest Lil' Fenrir,88,10,0 +1014,Forest Lil' Fenrir,89,10,300 +1014,Forest Lil' Fenrir,90,10,0 +1014,Forest Lil' Fenrir,91,10,0 +1014,Forest Lil' Fenrir,92,10,0 +1014,Forest Lil' Fenrir,93,10,0 +1014,Forest Lil' Fenrir,94,10,0 +1014,Forest Lil' Fenrir,95,10,0 +1014,Forest Lil' Fenrir,96,10,0 +1014,Forest Lil' Fenrir,97,10,0 +1014,Forest Lil' Fenrir,98,10,0 +1014,Forest Lil' Fenrir,99,10,300 +1014,Forest Lil' Fenrir,100,10,0 +1021,Hurt BlackCat,1,10,0 +1021,Hurt BlackCat,2,10,0 +1021,Hurt BlackCat,3,10,0 +1021,Hurt BlackCat,4,10,0 +1021,Hurt BlackCat,5,10,0 +1021,Hurt BlackCat,6,10,0 +1021,Hurt BlackCat,7,10,0 +1021,Hurt BlackCat,8,10,0 +1021,Hurt BlackCat,9,10,60 +1021,Hurt BlackCat,10,10,0 +1021,Hurt BlackCat,11,10,0 +1021,Hurt BlackCat,12,10,0 +1021,Hurt BlackCat,13,10,0 +1021,Hurt BlackCat,14,10,0 +1021,Hurt BlackCat,15,10,0 +1021,Hurt BlackCat,16,10,0 +1021,Hurt BlackCat,17,10,0 +1021,Hurt BlackCat,18,10,0 +1021,Hurt BlackCat,19,10,60 +1021,Hurt BlackCat,20,10,0 +1021,Hurt BlackCat,21,10,0 +1021,Hurt BlackCat,22,10,0 +1021,Hurt BlackCat,23,10,0 +1021,Hurt BlackCat,24,10,0 +1021,Hurt BlackCat,25,10,0 +1021,Hurt BlackCat,26,10,0 +1021,Hurt BlackCat,27,10,0 +1021,Hurt BlackCat,28,10,0 +1021,Hurt BlackCat,29,10,60 +1021,Hurt BlackCat,30,10,0 +1021,Hurt BlackCat,31,10,0 +1021,Hurt BlackCat,32,10,0 +1021,Hurt BlackCat,33,10,0 +1021,Hurt BlackCat,34,10,0 +1021,Hurt BlackCat,35,10,0 +1021,Hurt BlackCat,36,10,0 +1021,Hurt BlackCat,37,10,0 +1021,Hurt BlackCat,38,10,0 +1021,Hurt BlackCat,39,10,60 +1021,Hurt BlackCat,40,10,0 +1021,Hurt BlackCat,41,10,0 +1021,Hurt BlackCat,42,10,0 +1021,Hurt BlackCat,43,10,0 +1021,Hurt BlackCat,44,10,0 +1021,Hurt BlackCat,45,10,0 +1021,Hurt BlackCat,46,10,0 +1021,Hurt BlackCat,47,10,0 +1021,Hurt BlackCat,48,10,0 +1021,Hurt BlackCat,49,10,60 +1021,Hurt BlackCat,50,10,0 +1021,Hurt BlackCat,51,10,0 +1021,Hurt BlackCat,52,10,0 +1021,Hurt BlackCat,53,10,0 +1021,Hurt BlackCat,54,10,0 +1021,Hurt BlackCat,55,10,0 +1021,Hurt BlackCat,56,10,0 +1021,Hurt BlackCat,57,10,0 +1021,Hurt BlackCat,58,10,0 +1021,Hurt BlackCat,59,10,60 +1021,Hurt BlackCat,60,10,0 +1021,Hurt BlackCat,61,10,0 +1021,Hurt BlackCat,62,10,0 +1021,Hurt BlackCat,63,10,0 +1021,Hurt BlackCat,64,10,0 +1021,Hurt BlackCat,65,10,0 +1021,Hurt BlackCat,66,10,0 +1021,Hurt BlackCat,67,10,0 +1021,Hurt BlackCat,68,10,0 +1021,Hurt BlackCat,69,10,60 +1021,Hurt BlackCat,70,10,0 +1021,Hurt BlackCat,71,10,0 +1021,Hurt BlackCat,72,10,0 +1021,Hurt BlackCat,73,10,0 +1021,Hurt BlackCat,74,10,0 +1021,Hurt BlackCat,75,10,0 +1021,Hurt BlackCat,76,10,0 +1021,Hurt BlackCat,77,10,0 +1021,Hurt BlackCat,78,10,0 +1021,Hurt BlackCat,79,10,60 +1021,Hurt BlackCat,80,10,0 +1021,Hurt BlackCat,81,10,0 +1021,Hurt BlackCat,82,10,0 +1021,Hurt BlackCat,83,10,0 +1021,Hurt BlackCat,84,10,0 +1021,Hurt BlackCat,85,10,0 +1021,Hurt BlackCat,86,10,0 +1021,Hurt BlackCat,87,10,0 +1021,Hurt BlackCat,88,10,0 +1021,Hurt BlackCat,89,10,60 +1021,Hurt BlackCat,90,10,0 +1021,Hurt BlackCat,91,10,0 +1021,Hurt BlackCat,92,10,0 +1021,Hurt BlackCat,93,10,0 +1021,Hurt BlackCat,94,10,0 +1021,Hurt BlackCat,95,10,0 +1021,Hurt BlackCat,96,10,0 +1021,Hurt BlackCat,97,10,0 +1021,Hurt BlackCat,98,10,0 +1021,Hurt BlackCat,99,10,60 +1021,Hurt BlackCat,100,10,0 +1022,Shine Muscat Dongle,1,10,0 +1022,Shine Muscat Dongle,2,10,0 +1022,Shine Muscat Dongle,3,10,0 +1022,Shine Muscat Dongle,4,10,0 +1022,Shine Muscat Dongle,5,10,0 +1022,Shine Muscat Dongle,6,10,0 +1022,Shine Muscat Dongle,7,10,0 +1022,Shine Muscat Dongle,8,10,0 +1022,Shine Muscat Dongle,9,10,100 +1022,Shine Muscat Dongle,10,10,0 +1022,Shine Muscat Dongle,11,10,0 +1022,Shine Muscat Dongle,12,10,0 +1022,Shine Muscat Dongle,13,10,0 +1022,Shine Muscat Dongle,14,10,0 +1022,Shine Muscat Dongle,15,10,0 +1022,Shine Muscat Dongle,16,10,0 +1022,Shine Muscat Dongle,17,10,0 +1022,Shine Muscat Dongle,18,10,0 +1022,Shine Muscat Dongle,19,10,100 +1022,Shine Muscat Dongle,20,10,0 +1022,Shine Muscat Dongle,21,10,0 +1022,Shine Muscat Dongle,22,10,0 +1022,Shine Muscat Dongle,23,10,0 +1022,Shine Muscat Dongle,24,10,0 +1022,Shine Muscat Dongle,25,10,0 +1022,Shine Muscat Dongle,26,10,0 +1022,Shine Muscat Dongle,27,10,0 +1022,Shine Muscat Dongle,28,10,0 +1022,Shine Muscat Dongle,29,10,100 +1022,Shine Muscat Dongle,30,10,0 +1022,Shine Muscat Dongle,31,10,0 +1022,Shine Muscat Dongle,32,10,0 +1022,Shine Muscat Dongle,33,10,0 +1022,Shine Muscat Dongle,34,10,0 +1022,Shine Muscat Dongle,35,10,0 +1022,Shine Muscat Dongle,36,10,0 +1022,Shine Muscat Dongle,37,10,0 +1022,Shine Muscat Dongle,38,10,0 +1022,Shine Muscat Dongle,39,10,100 +1022,Shine Muscat Dongle,40,10,0 +1022,Shine Muscat Dongle,41,10,0 +1022,Shine Muscat Dongle,42,10,0 +1022,Shine Muscat Dongle,43,10,0 +1022,Shine Muscat Dongle,44,10,0 +1022,Shine Muscat Dongle,45,10,0 +1022,Shine Muscat Dongle,46,10,0 +1022,Shine Muscat Dongle,47,10,0 +1022,Shine Muscat Dongle,48,10,0 +1022,Shine Muscat Dongle,49,10,100 +1022,Shine Muscat Dongle,50,10,0 +1022,Shine Muscat Dongle,51,10,0 +1022,Shine Muscat Dongle,52,10,0 +1022,Shine Muscat Dongle,53,10,0 +1022,Shine Muscat Dongle,54,10,0 +1022,Shine Muscat Dongle,55,10,0 +1022,Shine Muscat Dongle,56,10,0 +1022,Shine Muscat Dongle,57,10,0 +1022,Shine Muscat Dongle,58,10,0 +1022,Shine Muscat Dongle,59,10,100 +1022,Shine Muscat Dongle,60,10,0 +1022,Shine Muscat Dongle,61,10,0 +1022,Shine Muscat Dongle,62,10,0 +1022,Shine Muscat Dongle,63,10,0 +1022,Shine Muscat Dongle,64,10,0 +1022,Shine Muscat Dongle,65,10,0 +1022,Shine Muscat Dongle,66,10,0 +1022,Shine Muscat Dongle,67,10,0 +1022,Shine Muscat Dongle,68,10,0 +1022,Shine Muscat Dongle,69,10,100 +1022,Shine Muscat Dongle,70,10,0 +1022,Shine Muscat Dongle,71,10,0 +1022,Shine Muscat Dongle,72,10,0 +1022,Shine Muscat Dongle,73,10,0 +1022,Shine Muscat Dongle,74,10,0 +1022,Shine Muscat Dongle,75,10,0 +1022,Shine Muscat Dongle,76,10,0 +1022,Shine Muscat Dongle,77,10,0 +1022,Shine Muscat Dongle,78,10,0 +1022,Shine Muscat Dongle,79,10,100 +1022,Shine Muscat Dongle,80,10,0 +1022,Shine Muscat Dongle,81,10,0 +1022,Shine Muscat Dongle,82,10,0 +1022,Shine Muscat Dongle,83,10,0 +1022,Shine Muscat Dongle,84,10,0 +1022,Shine Muscat Dongle,85,10,0 +1022,Shine Muscat Dongle,86,10,0 +1022,Shine Muscat Dongle,87,10,0 +1022,Shine Muscat Dongle,88,10,0 +1022,Shine Muscat Dongle,89,10,100 +1022,Shine Muscat Dongle,90,10,0 +1022,Shine Muscat Dongle,91,10,0 +1022,Shine Muscat Dongle,92,10,0 +1022,Shine Muscat Dongle,93,10,0 +1022,Shine Muscat Dongle,94,10,0 +1022,Shine Muscat Dongle,95,10,0 +1022,Shine Muscat Dongle,96,10,0 +1022,Shine Muscat Dongle,97,10,0 +1022,Shine Muscat Dongle,98,10,0 +1022,Shine Muscat Dongle,99,10,100 +1022,Shine Muscat Dongle,100,10,0 +1023,Valkyrie of Red Light,1,10,0 +1023,Valkyrie of Red Light,2,10,0 +1023,Valkyrie of Red Light,3,10,0 +1023,Valkyrie of Red Light,4,10,0 +1023,Valkyrie of Red Light,5,10,0 +1023,Valkyrie of Red Light,6,10,0 +1023,Valkyrie of Red Light,7,10,0 +1023,Valkyrie of Red Light,8,10,0 +1023,Valkyrie of Red Light,9,10,150 +1023,Valkyrie of Red Light,10,10,0 +1023,Valkyrie of Red Light,11,10,0 +1023,Valkyrie of Red Light,12,10,0 +1023,Valkyrie of Red Light,13,10,0 +1023,Valkyrie of Red Light,14,10,0 +1023,Valkyrie of Red Light,15,10,0 +1023,Valkyrie of Red Light,16,10,0 +1023,Valkyrie of Red Light,17,10,0 +1023,Valkyrie of Red Light,18,10,0 +1023,Valkyrie of Red Light,19,10,150 +1023,Valkyrie of Red Light,20,10,0 +1023,Valkyrie of Red Light,21,10,0 +1023,Valkyrie of Red Light,22,10,0 +1023,Valkyrie of Red Light,23,10,0 +1023,Valkyrie of Red Light,24,10,0 +1023,Valkyrie of Red Light,25,10,0 +1023,Valkyrie of Red Light,26,10,0 +1023,Valkyrie of Red Light,27,10,0 +1023,Valkyrie of Red Light,28,10,0 +1023,Valkyrie of Red Light,29,10,150 +1023,Valkyrie of Red Light,30,10,0 +1023,Valkyrie of Red Light,31,10,0 +1023,Valkyrie of Red Light,32,10,0 +1023,Valkyrie of Red Light,33,10,0 +1023,Valkyrie of Red Light,34,10,0 +1023,Valkyrie of Red Light,35,10,0 +1023,Valkyrie of Red Light,36,10,0 +1023,Valkyrie of Red Light,37,10,0 +1023,Valkyrie of Red Light,38,10,0 +1023,Valkyrie of Red Light,39,10,150 +1023,Valkyrie of Red Light,40,10,0 +1023,Valkyrie of Red Light,41,10,0 +1023,Valkyrie of Red Light,42,10,0 +1023,Valkyrie of Red Light,43,10,0 +1023,Valkyrie of Red Light,44,10,0 +1023,Valkyrie of Red Light,45,10,0 +1023,Valkyrie of Red Light,46,10,0 +1023,Valkyrie of Red Light,47,10,0 +1023,Valkyrie of Red Light,48,10,0 +1023,Valkyrie of Red Light,49,10,150 +1023,Valkyrie of Red Light,50,10,0 +1023,Valkyrie of Red Light,51,10,0 +1023,Valkyrie of Red Light,52,10,0 +1023,Valkyrie of Red Light,53,10,0 +1023,Valkyrie of Red Light,54,10,0 +1023,Valkyrie of Red Light,55,10,0 +1023,Valkyrie of Red Light,56,10,0 +1023,Valkyrie of Red Light,57,10,0 +1023,Valkyrie of Red Light,58,10,0 +1023,Valkyrie of Red Light,59,10,150 +1023,Valkyrie of Red Light,60,10,0 +1023,Valkyrie of Red Light,61,10,0 +1023,Valkyrie of Red Light,62,10,0 +1023,Valkyrie of Red Light,63,10,0 +1023,Valkyrie of Red Light,64,10,0 +1023,Valkyrie of Red Light,65,10,0 +1023,Valkyrie of Red Light,66,10,0 +1023,Valkyrie of Red Light,67,10,0 +1023,Valkyrie of Red Light,68,10,0 +1023,Valkyrie of Red Light,69,10,150 +1023,Valkyrie of Red Light,70,10,0 +1023,Valkyrie of Red Light,71,10,0 +1023,Valkyrie of Red Light,72,10,0 +1023,Valkyrie of Red Light,73,10,0 +1023,Valkyrie of Red Light,74,10,0 +1023,Valkyrie of Red Light,75,10,0 +1023,Valkyrie of Red Light,76,10,0 +1023,Valkyrie of Red Light,77,10,0 +1023,Valkyrie of Red Light,78,10,0 +1023,Valkyrie of Red Light,79,10,150 +1023,Valkyrie of Red Light,80,10,0 +1023,Valkyrie of Red Light,81,10,0 +1023,Valkyrie of Red Light,82,10,0 +1023,Valkyrie of Red Light,83,10,0 +1023,Valkyrie of Red Light,84,10,0 +1023,Valkyrie of Red Light,85,10,0 +1023,Valkyrie of Red Light,86,10,0 +1023,Valkyrie of Red Light,87,10,0 +1023,Valkyrie of Red Light,88,10,0 +1023,Valkyrie of Red Light,89,10,150 +1023,Valkyrie of Red Light,90,10,0 +1023,Valkyrie of Red Light,91,10,0 +1023,Valkyrie of Red Light,92,10,0 +1023,Valkyrie of Red Light,93,10,0 +1023,Valkyrie of Red Light,94,10,0 +1023,Valkyrie of Red Light,95,10,0 +1023,Valkyrie of Red Light,96,10,0 +1023,Valkyrie of Red Light,97,10,0 +1023,Valkyrie of Red Light,98,10,0 +1023,Valkyrie of Red Light,99,10,150 +1023,Valkyrie of Red Light,100,10,0 +1024,Night Lil' Fenrir,1,10,0 +1024,Night Lil' Fenrir,2,10,0 +1024,Night Lil' Fenrir,3,10,0 +1024,Night Lil' Fenrir,4,10,0 +1024,Night Lil' Fenrir,5,10,0 +1024,Night Lil' Fenrir,6,10,0 +1024,Night Lil' Fenrir,7,10,0 +1024,Night Lil' Fenrir,8,10,0 +1024,Night Lil' Fenrir,9,10,300 +1024,Night Lil' Fenrir,10,10,0 +1024,Night Lil' Fenrir,11,10,0 +1024,Night Lil' Fenrir,12,10,0 +1024,Night Lil' Fenrir,13,10,0 +1024,Night Lil' Fenrir,14,10,0 +1024,Night Lil' Fenrir,15,10,0 +1024,Night Lil' Fenrir,16,10,0 +1024,Night Lil' Fenrir,17,10,0 +1024,Night Lil' Fenrir,18,10,0 +1024,Night Lil' Fenrir,19,10,300 +1024,Night Lil' Fenrir,20,10,0 +1024,Night Lil' Fenrir,21,10,0 +1024,Night Lil' Fenrir,22,10,0 +1024,Night Lil' Fenrir,23,10,0 +1024,Night Lil' Fenrir,24,10,0 +1024,Night Lil' Fenrir,25,10,0 +1024,Night Lil' Fenrir,26,10,0 +1024,Night Lil' Fenrir,27,10,0 +1024,Night Lil' Fenrir,28,10,0 +1024,Night Lil' Fenrir,29,10,300 +1024,Night Lil' Fenrir,30,10,0 +1024,Night Lil' Fenrir,31,10,0 +1024,Night Lil' Fenrir,32,10,0 +1024,Night Lil' Fenrir,33,10,0 +1024,Night Lil' Fenrir,34,10,0 +1024,Night Lil' Fenrir,35,10,0 +1024,Night Lil' Fenrir,36,10,0 +1024,Night Lil' Fenrir,37,10,0 +1024,Night Lil' Fenrir,38,10,0 +1024,Night Lil' Fenrir,39,10,300 +1024,Night Lil' Fenrir,40,10,0 +1024,Night Lil' Fenrir,41,10,0 +1024,Night Lil' Fenrir,42,10,0 +1024,Night Lil' Fenrir,43,10,0 +1024,Night Lil' Fenrir,44,10,0 +1024,Night Lil' Fenrir,45,10,0 +1024,Night Lil' Fenrir,46,10,0 +1024,Night Lil' Fenrir,47,10,0 +1024,Night Lil' Fenrir,48,10,0 +1024,Night Lil' Fenrir,49,10,300 +1024,Night Lil' Fenrir,50,10,0 +1024,Night Lil' Fenrir,51,10,0 +1024,Night Lil' Fenrir,52,10,0 +1024,Night Lil' Fenrir,53,10,0 +1024,Night Lil' Fenrir,54,10,0 +1024,Night Lil' Fenrir,55,10,0 +1024,Night Lil' Fenrir,56,10,0 +1024,Night Lil' Fenrir,57,10,0 +1024,Night Lil' Fenrir,58,10,0 +1024,Night Lil' Fenrir,59,10,300 +1024,Night Lil' Fenrir,60,10,0 +1024,Night Lil' Fenrir,61,10,0 +1024,Night Lil' Fenrir,62,10,0 +1024,Night Lil' Fenrir,63,10,0 +1024,Night Lil' Fenrir,64,10,0 +1024,Night Lil' Fenrir,65,10,0 +1024,Night Lil' Fenrir,66,10,0 +1024,Night Lil' Fenrir,67,10,0 +1024,Night Lil' Fenrir,68,10,0 +1024,Night Lil' Fenrir,69,10,300 +1024,Night Lil' Fenrir,70,10,0 +1024,Night Lil' Fenrir,71,10,0 +1024,Night Lil' Fenrir,72,10,0 +1024,Night Lil' Fenrir,73,10,0 +1024,Night Lil' Fenrir,74,10,0 +1024,Night Lil' Fenrir,75,10,0 +1024,Night Lil' Fenrir,76,10,0 +1024,Night Lil' Fenrir,77,10,0 +1024,Night Lil' Fenrir,78,10,0 +1024,Night Lil' Fenrir,79,10,300 +1024,Night Lil' Fenrir,80,10,0 +1024,Night Lil' Fenrir,81,10,0 +1024,Night Lil' Fenrir,82,10,0 +1024,Night Lil' Fenrir,83,10,0 +1024,Night Lil' Fenrir,84,10,0 +1024,Night Lil' Fenrir,85,10,0 +1024,Night Lil' Fenrir,86,10,0 +1024,Night Lil' Fenrir,87,10,0 +1024,Night Lil' Fenrir,88,10,0 +1024,Night Lil' Fenrir,89,10,300 +1024,Night Lil' Fenrir,90,10,0 +1024,Night Lil' Fenrir,91,10,0 +1024,Night Lil' Fenrir,92,10,0 +1024,Night Lil' Fenrir,93,10,0 +1024,Night Lil' Fenrir,94,10,0 +1024,Night Lil' Fenrir,95,10,0 +1024,Night Lil' Fenrir,96,10,0 +1024,Night Lil' Fenrir,97,10,0 +1024,Night Lil' Fenrir,98,10,0 +1024,Night Lil' Fenrir,99,10,300 +1024,Night Lil' Fenrir,100,10,0 \ No newline at end of file diff --git a/Lib9c/TableCSV/Pet/PetOptionSheet.csv b/Lib9c/TableCSV/Pet/PetOptionSheet.csv index 27f1c12491..13b9b84c5e 100644 --- a/Lib9c/TableCSV/Pet/PetOptionSheet.csv +++ b/Lib9c/TableCSV/Pet/PetOptionSheet.csv @@ -99,306 +99,6 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1001,D:CC BlackCat,98,IncreaseBlockPerHourglass,2.94 1001,D:CC BlackCat,99,IncreaseBlockPerHourglass,2.96 1001,D:CC BlackCat,100,IncreaseBlockPerHourglass,3 -1101,Icy D:CC BlackCat,1,IncreaseBlockPerHourglass,1.5 -1101,Icy D:CC BlackCat,2,IncreaseBlockPerHourglass,1.52 -1101,Icy D:CC BlackCat,3,IncreaseBlockPerHourglass,1.54 -1101,Icy D:CC BlackCat,4,IncreaseBlockPerHourglass,1.56 -1101,Icy D:CC BlackCat,5,IncreaseBlockPerHourglass,1.58 -1101,Icy D:CC BlackCat,6,IncreaseBlockPerHourglass,1.6 -1101,Icy D:CC BlackCat,7,IncreaseBlockPerHourglass,1.62 -1101,Icy D:CC BlackCat,8,IncreaseBlockPerHourglass,1.64 -1101,Icy D:CC BlackCat,9,IncreaseBlockPerHourglass,1.66 -1101,Icy D:CC BlackCat,10,IncreaseBlockPerHourglass,1.68 -1101,Icy D:CC BlackCat,11,IncreaseBlockPerHourglass,1.7 -1101,Icy D:CC BlackCat,12,IncreaseBlockPerHourglass,1.72 -1101,Icy D:CC BlackCat,13,IncreaseBlockPerHourglass,1.74 -1101,Icy D:CC BlackCat,14,IncreaseBlockPerHourglass,1.76 -1101,Icy D:CC BlackCat,15,IncreaseBlockPerHourglass,1.78 -1101,Icy D:CC BlackCat,16,IncreaseBlockPerHourglass,1.8 -1101,Icy D:CC BlackCat,17,IncreaseBlockPerHourglass,1.82 -1101,Icy D:CC BlackCat,18,IncreaseBlockPerHourglass,1.84 -1101,Icy D:CC BlackCat,19,IncreaseBlockPerHourglass,1.86 -1101,Icy D:CC BlackCat,20,IncreaseBlockPerHourglass,1.88 -1101,Icy D:CC BlackCat,21,IncreaseBlockPerHourglass,1.9 -1101,Icy D:CC BlackCat,22,IncreaseBlockPerHourglass,1.92 -1101,Icy D:CC BlackCat,23,IncreaseBlockPerHourglass,1.94 -1101,Icy D:CC BlackCat,24,IncreaseBlockPerHourglass,1.96 -1101,Icy D:CC BlackCat,25,IncreaseBlockPerHourglass,1.98 -1101,Icy D:CC BlackCat,26,IncreaseBlockPerHourglass,2.0 -1101,Icy D:CC BlackCat,27,IncreaseBlockPerHourglass,2.02 -1101,Icy D:CC BlackCat,28,IncreaseBlockPerHourglass,2.04 -1101,Icy D:CC BlackCat,29,IncreaseBlockPerHourglass,2.06 -1101,Icy D:CC BlackCat,30,IncreaseBlockPerHourglass,2.08 -1101,Icy D:CC BlackCat,31,IncreaseBlockPerHourglass,2.1 -1101,Icy D:CC BlackCat,32,IncreaseBlockPerHourglass,2.12 -1101,Icy D:CC BlackCat,33,IncreaseBlockPerHourglass,2.1399999999999997 -1101,Icy D:CC BlackCat,34,IncreaseBlockPerHourglass,2.16 -1101,Icy D:CC BlackCat,35,IncreaseBlockPerHourglass,2.1799999999999997 -1101,Icy D:CC BlackCat,36,IncreaseBlockPerHourglass,2.2 -1101,Icy D:CC BlackCat,37,IncreaseBlockPerHourglass,2.2199999999999998 -1101,Icy D:CC BlackCat,38,IncreaseBlockPerHourglass,2.24 -1101,Icy D:CC BlackCat,39,IncreaseBlockPerHourglass,2.26 -1101,Icy D:CC BlackCat,40,IncreaseBlockPerHourglass,2.2800000000000002 -1101,Icy D:CC BlackCat,41,IncreaseBlockPerHourglass,2.3 -1101,Icy D:CC BlackCat,42,IncreaseBlockPerHourglass,2.3200000000000003 -1101,Icy D:CC BlackCat,43,IncreaseBlockPerHourglass,2.34 -1101,Icy D:CC BlackCat,44,IncreaseBlockPerHourglass,2.3600000000000003 -1101,Icy D:CC BlackCat,45,IncreaseBlockPerHourglass,2.38 -1101,Icy D:CC BlackCat,46,IncreaseBlockPerHourglass,2.4 -1101,Icy D:CC BlackCat,47,IncreaseBlockPerHourglass,2.42 -1101,Icy D:CC BlackCat,48,IncreaseBlockPerHourglass,2.44 -1101,Icy D:CC BlackCat,49,IncreaseBlockPerHourglass,2.46 -1101,Icy D:CC BlackCat,50,IncreaseBlockPerHourglass,2.48 -1101,Icy D:CC BlackCat,51,IncreaseBlockPerHourglass,2.5 -1101,Icy D:CC BlackCat,52,IncreaseBlockPerHourglass,2.52 -1101,Icy D:CC BlackCat,53,IncreaseBlockPerHourglass,2.54 -1101,Icy D:CC BlackCat,54,IncreaseBlockPerHourglass,2.56 -1101,Icy D:CC BlackCat,55,IncreaseBlockPerHourglass,2.58 -1101,Icy D:CC BlackCat,56,IncreaseBlockPerHourglass,2.6 -1101,Icy D:CC BlackCat,57,IncreaseBlockPerHourglass,2.62 -1101,Icy D:CC BlackCat,58,IncreaseBlockPerHourglass,2.64 -1101,Icy D:CC BlackCat,59,IncreaseBlockPerHourglass,2.66 -1101,Icy D:CC BlackCat,60,IncreaseBlockPerHourglass,2.68 -1101,Icy D:CC BlackCat,61,IncreaseBlockPerHourglass,2.7 -1101,Icy D:CC BlackCat,62,IncreaseBlockPerHourglass,2.72 -1101,Icy D:CC BlackCat,63,IncreaseBlockPerHourglass,2.74 -1101,Icy D:CC BlackCat,64,IncreaseBlockPerHourglass,2.76 -1101,Icy D:CC BlackCat,65,IncreaseBlockPerHourglass,2.78 -1101,Icy D:CC BlackCat,66,IncreaseBlockPerHourglass,2.8 -1101,Icy D:CC BlackCat,67,IncreaseBlockPerHourglass,2.82 -1101,Icy D:CC BlackCat,68,IncreaseBlockPerHourglass,2.84 -1101,Icy D:CC BlackCat,69,IncreaseBlockPerHourglass,2.86 -1101,Icy D:CC BlackCat,70,IncreaseBlockPerHourglass,2.88 -1101,Icy D:CC BlackCat,71,IncreaseBlockPerHourglass,2.9 -1101,Icy D:CC BlackCat,72,IncreaseBlockPerHourglass,2.92 -1101,Icy D:CC BlackCat,73,IncreaseBlockPerHourglass,2.94 -1101,Icy D:CC BlackCat,74,IncreaseBlockPerHourglass,2.96 -1101,Icy D:CC BlackCat,75,IncreaseBlockPerHourglass,2.98 -1101,Icy D:CC BlackCat,76,IncreaseBlockPerHourglass,3.0 -1101,Icy D:CC BlackCat,77,IncreaseBlockPerHourglass,3.02 -1101,Icy D:CC BlackCat,78,IncreaseBlockPerHourglass,3.04 -1101,Icy D:CC BlackCat,79,IncreaseBlockPerHourglass,3.06 -1101,Icy D:CC BlackCat,80,IncreaseBlockPerHourglass,3.08 -1101,Icy D:CC BlackCat,81,IncreaseBlockPerHourglass,3.1 -1101,Icy D:CC BlackCat,82,IncreaseBlockPerHourglass,3.12 -1101,Icy D:CC BlackCat,83,IncreaseBlockPerHourglass,3.14 -1101,Icy D:CC BlackCat,84,IncreaseBlockPerHourglass,3.16 -1101,Icy D:CC BlackCat,85,IncreaseBlockPerHourglass,3.18 -1101,Icy D:CC BlackCat,86,IncreaseBlockPerHourglass,3.2 -1101,Icy D:CC BlackCat,87,IncreaseBlockPerHourglass,3.22 -1101,Icy D:CC BlackCat,88,IncreaseBlockPerHourglass,3.24 -1101,Icy D:CC BlackCat,89,IncreaseBlockPerHourglass,3.26 -1101,Icy D:CC BlackCat,90,IncreaseBlockPerHourglass,3.28 -1101,Icy D:CC BlackCat,91,IncreaseBlockPerHourglass,3.3 -1101,Icy D:CC BlackCat,92,IncreaseBlockPerHourglass,3.32 -1101,Icy D:CC BlackCat,93,IncreaseBlockPerHourglass,3.34 -1101,Icy D:CC BlackCat,94,IncreaseBlockPerHourglass,3.36 -1101,Icy D:CC BlackCat,95,IncreaseBlockPerHourglass,3.38 -1101,Icy D:CC BlackCat,96,IncreaseBlockPerHourglass,3.4 -1101,Icy D:CC BlackCat,97,IncreaseBlockPerHourglass,3.42 -1101,Icy D:CC BlackCat,98,IncreaseBlockPerHourglass,3.44 -1101,Icy D:CC BlackCat,99,IncreaseBlockPerHourglass,3.46 -1101,Icy D:CC BlackCat,100,IncreaseBlockPerHourglass,3.5 -1201,Magenta D:CC BlackCat,1,IncreaseBlockPerHourglass,2.0 -1201,Magenta D:CC BlackCat,2,IncreaseBlockPerHourglass,2.02 -1201,Magenta D:CC BlackCat,3,IncreaseBlockPerHourglass,2.04 -1201,Magenta D:CC BlackCat,4,IncreaseBlockPerHourglass,2.06 -1201,Magenta D:CC BlackCat,5,IncreaseBlockPerHourglass,2.08 -1201,Magenta D:CC BlackCat,6,IncreaseBlockPerHourglass,2.1 -1201,Magenta D:CC BlackCat,7,IncreaseBlockPerHourglass,2.12 -1201,Magenta D:CC BlackCat,8,IncreaseBlockPerHourglass,2.1399999999999997 -1201,Magenta D:CC BlackCat,9,IncreaseBlockPerHourglass,2.16 -1201,Magenta D:CC BlackCat,10,IncreaseBlockPerHourglass,2.1799999999999997 -1201,Magenta D:CC BlackCat,11,IncreaseBlockPerHourglass,2.2 -1201,Magenta D:CC BlackCat,12,IncreaseBlockPerHourglass,2.2199999999999998 -1201,Magenta D:CC BlackCat,13,IncreaseBlockPerHourglass,2.24 -1201,Magenta D:CC BlackCat,14,IncreaseBlockPerHourglass,2.26 -1201,Magenta D:CC BlackCat,15,IncreaseBlockPerHourglass,2.2800000000000002 -1201,Magenta D:CC BlackCat,16,IncreaseBlockPerHourglass,2.3 -1201,Magenta D:CC BlackCat,17,IncreaseBlockPerHourglass,2.3200000000000003 -1201,Magenta D:CC BlackCat,18,IncreaseBlockPerHourglass,2.34 -1201,Magenta D:CC BlackCat,19,IncreaseBlockPerHourglass,2.3600000000000003 -1201,Magenta D:CC BlackCat,20,IncreaseBlockPerHourglass,2.38 -1201,Magenta D:CC BlackCat,21,IncreaseBlockPerHourglass,2.4 -1201,Magenta D:CC BlackCat,22,IncreaseBlockPerHourglass,2.42 -1201,Magenta D:CC BlackCat,23,IncreaseBlockPerHourglass,2.44 -1201,Magenta D:CC BlackCat,24,IncreaseBlockPerHourglass,2.46 -1201,Magenta D:CC BlackCat,25,IncreaseBlockPerHourglass,2.48 -1201,Magenta D:CC BlackCat,26,IncreaseBlockPerHourglass,2.5 -1201,Magenta D:CC BlackCat,27,IncreaseBlockPerHourglass,2.52 -1201,Magenta D:CC BlackCat,28,IncreaseBlockPerHourglass,2.54 -1201,Magenta D:CC BlackCat,29,IncreaseBlockPerHourglass,2.56 -1201,Magenta D:CC BlackCat,30,IncreaseBlockPerHourglass,2.58 -1201,Magenta D:CC BlackCat,31,IncreaseBlockPerHourglass,2.6 -1201,Magenta D:CC BlackCat,32,IncreaseBlockPerHourglass,2.62 -1201,Magenta D:CC BlackCat,33,IncreaseBlockPerHourglass,2.6399999999999997 -1201,Magenta D:CC BlackCat,34,IncreaseBlockPerHourglass,2.66 -1201,Magenta D:CC BlackCat,35,IncreaseBlockPerHourglass,2.6799999999999997 -1201,Magenta D:CC BlackCat,36,IncreaseBlockPerHourglass,2.7 -1201,Magenta D:CC BlackCat,37,IncreaseBlockPerHourglass,2.7199999999999998 -1201,Magenta D:CC BlackCat,38,IncreaseBlockPerHourglass,2.74 -1201,Magenta D:CC BlackCat,39,IncreaseBlockPerHourglass,2.76 -1201,Magenta D:CC BlackCat,40,IncreaseBlockPerHourglass,2.7800000000000002 -1201,Magenta D:CC BlackCat,41,IncreaseBlockPerHourglass,2.8 -1201,Magenta D:CC BlackCat,42,IncreaseBlockPerHourglass,2.8200000000000003 -1201,Magenta D:CC BlackCat,43,IncreaseBlockPerHourglass,2.84 -1201,Magenta D:CC BlackCat,44,IncreaseBlockPerHourglass,2.8600000000000003 -1201,Magenta D:CC BlackCat,45,IncreaseBlockPerHourglass,2.88 -1201,Magenta D:CC BlackCat,46,IncreaseBlockPerHourglass,2.9 -1201,Magenta D:CC BlackCat,47,IncreaseBlockPerHourglass,2.92 -1201,Magenta D:CC BlackCat,48,IncreaseBlockPerHourglass,2.94 -1201,Magenta D:CC BlackCat,49,IncreaseBlockPerHourglass,2.96 -1201,Magenta D:CC BlackCat,50,IncreaseBlockPerHourglass,2.98 -1201,Magenta D:CC BlackCat,51,IncreaseBlockPerHourglass,3.0 -1201,Magenta D:CC BlackCat,52,IncreaseBlockPerHourglass,3.02 -1201,Magenta D:CC BlackCat,53,IncreaseBlockPerHourglass,3.04 -1201,Magenta D:CC BlackCat,54,IncreaseBlockPerHourglass,3.06 -1201,Magenta D:CC BlackCat,55,IncreaseBlockPerHourglass,3.08 -1201,Magenta D:CC BlackCat,56,IncreaseBlockPerHourglass,3.1 -1201,Magenta D:CC BlackCat,57,IncreaseBlockPerHourglass,3.12 -1201,Magenta D:CC BlackCat,58,IncreaseBlockPerHourglass,3.14 -1201,Magenta D:CC BlackCat,59,IncreaseBlockPerHourglass,3.16 -1201,Magenta D:CC BlackCat,60,IncreaseBlockPerHourglass,3.18 -1201,Magenta D:CC BlackCat,61,IncreaseBlockPerHourglass,3.2 -1201,Magenta D:CC BlackCat,62,IncreaseBlockPerHourglass,3.22 -1201,Magenta D:CC BlackCat,63,IncreaseBlockPerHourglass,3.24 -1201,Magenta D:CC BlackCat,64,IncreaseBlockPerHourglass,3.26 -1201,Magenta D:CC BlackCat,65,IncreaseBlockPerHourglass,3.28 -1201,Magenta D:CC BlackCat,66,IncreaseBlockPerHourglass,3.3 -1201,Magenta D:CC BlackCat,67,IncreaseBlockPerHourglass,3.32 -1201,Magenta D:CC BlackCat,68,IncreaseBlockPerHourglass,3.34 -1201,Magenta D:CC BlackCat,69,IncreaseBlockPerHourglass,3.36 -1201,Magenta D:CC BlackCat,70,IncreaseBlockPerHourglass,3.38 -1201,Magenta D:CC BlackCat,71,IncreaseBlockPerHourglass,3.4 -1201,Magenta D:CC BlackCat,72,IncreaseBlockPerHourglass,3.42 -1201,Magenta D:CC BlackCat,73,IncreaseBlockPerHourglass,3.44 -1201,Magenta D:CC BlackCat,74,IncreaseBlockPerHourglass,3.46 -1201,Magenta D:CC BlackCat,75,IncreaseBlockPerHourglass,3.48 -1201,Magenta D:CC BlackCat,76,IncreaseBlockPerHourglass,3.5 -1201,Magenta D:CC BlackCat,77,IncreaseBlockPerHourglass,3.52 -1201,Magenta D:CC BlackCat,78,IncreaseBlockPerHourglass,3.54 -1201,Magenta D:CC BlackCat,79,IncreaseBlockPerHourglass,3.56 -1201,Magenta D:CC BlackCat,80,IncreaseBlockPerHourglass,3.58 -1201,Magenta D:CC BlackCat,81,IncreaseBlockPerHourglass,3.6 -1201,Magenta D:CC BlackCat,82,IncreaseBlockPerHourglass,3.62 -1201,Magenta D:CC BlackCat,83,IncreaseBlockPerHourglass,3.64 -1201,Magenta D:CC BlackCat,84,IncreaseBlockPerHourglass,3.66 -1201,Magenta D:CC BlackCat,85,IncreaseBlockPerHourglass,3.68 -1201,Magenta D:CC BlackCat,86,IncreaseBlockPerHourglass,3.7 -1201,Magenta D:CC BlackCat,87,IncreaseBlockPerHourglass,3.72 -1201,Magenta D:CC BlackCat,88,IncreaseBlockPerHourglass,3.74 -1201,Magenta D:CC BlackCat,89,IncreaseBlockPerHourglass,3.76 -1201,Magenta D:CC BlackCat,90,IncreaseBlockPerHourglass,3.78 -1201,Magenta D:CC BlackCat,91,IncreaseBlockPerHourglass,3.8 -1201,Magenta D:CC BlackCat,92,IncreaseBlockPerHourglass,3.82 -1201,Magenta D:CC BlackCat,93,IncreaseBlockPerHourglass,3.84 -1201,Magenta D:CC BlackCat,94,IncreaseBlockPerHourglass,3.86 -1201,Magenta D:CC BlackCat,95,IncreaseBlockPerHourglass,3.88 -1201,Magenta D:CC BlackCat,96,IncreaseBlockPerHourglass,3.9 -1201,Magenta D:CC BlackCat,97,IncreaseBlockPerHourglass,3.92 -1201,Magenta D:CC BlackCat,98,IncreaseBlockPerHourglass,3.94 -1201,Magenta D:CC BlackCat,99,IncreaseBlockPerHourglass,3.96 -1201,Magenta D:CC BlackCat,100,IncreaseBlockPerHourglass,4.0 -1301,Yellow D:CC BlackCat,1,IncreaseBlockPerHourglass,2.5 -1301,Yellow D:CC BlackCat,2,IncreaseBlockPerHourglass,2.52 -1301,Yellow D:CC BlackCat,3,IncreaseBlockPerHourglass,2.54 -1301,Yellow D:CC BlackCat,4,IncreaseBlockPerHourglass,2.56 -1301,Yellow D:CC BlackCat,5,IncreaseBlockPerHourglass,2.58 -1301,Yellow D:CC BlackCat,6,IncreaseBlockPerHourglass,2.6 -1301,Yellow D:CC BlackCat,7,IncreaseBlockPerHourglass,2.62 -1301,Yellow D:CC BlackCat,8,IncreaseBlockPerHourglass,2.6399999999999997 -1301,Yellow D:CC BlackCat,9,IncreaseBlockPerHourglass,2.66 -1301,Yellow D:CC BlackCat,10,IncreaseBlockPerHourglass,2.6799999999999997 -1301,Yellow D:CC BlackCat,11,IncreaseBlockPerHourglass,2.7 -1301,Yellow D:CC BlackCat,12,IncreaseBlockPerHourglass,2.7199999999999998 -1301,Yellow D:CC BlackCat,13,IncreaseBlockPerHourglass,2.74 -1301,Yellow D:CC BlackCat,14,IncreaseBlockPerHourglass,2.76 -1301,Yellow D:CC BlackCat,15,IncreaseBlockPerHourglass,2.7800000000000002 -1301,Yellow D:CC BlackCat,16,IncreaseBlockPerHourglass,2.8 -1301,Yellow D:CC BlackCat,17,IncreaseBlockPerHourglass,2.8200000000000003 -1301,Yellow D:CC BlackCat,18,IncreaseBlockPerHourglass,2.84 -1301,Yellow D:CC BlackCat,19,IncreaseBlockPerHourglass,2.8600000000000003 -1301,Yellow D:CC BlackCat,20,IncreaseBlockPerHourglass,2.88 -1301,Yellow D:CC BlackCat,21,IncreaseBlockPerHourglass,2.9 -1301,Yellow D:CC BlackCat,22,IncreaseBlockPerHourglass,2.92 -1301,Yellow D:CC BlackCat,23,IncreaseBlockPerHourglass,2.94 -1301,Yellow D:CC BlackCat,24,IncreaseBlockPerHourglass,2.96 -1301,Yellow D:CC BlackCat,25,IncreaseBlockPerHourglass,2.98 -1301,Yellow D:CC BlackCat,26,IncreaseBlockPerHourglass,3.0 -1301,Yellow D:CC BlackCat,27,IncreaseBlockPerHourglass,3.02 -1301,Yellow D:CC BlackCat,28,IncreaseBlockPerHourglass,3.04 -1301,Yellow D:CC BlackCat,29,IncreaseBlockPerHourglass,3.06 -1301,Yellow D:CC BlackCat,30,IncreaseBlockPerHourglass,3.08 -1301,Yellow D:CC BlackCat,31,IncreaseBlockPerHourglass,3.1 -1301,Yellow D:CC BlackCat,32,IncreaseBlockPerHourglass,3.12 -1301,Yellow D:CC BlackCat,33,IncreaseBlockPerHourglass,3.1399999999999997 -1301,Yellow D:CC BlackCat,34,IncreaseBlockPerHourglass,3.16 -1301,Yellow D:CC BlackCat,35,IncreaseBlockPerHourglass,3.1799999999999997 -1301,Yellow D:CC BlackCat,36,IncreaseBlockPerHourglass,3.2 -1301,Yellow D:CC BlackCat,37,IncreaseBlockPerHourglass,3.2199999999999998 -1301,Yellow D:CC BlackCat,38,IncreaseBlockPerHourglass,3.24 -1301,Yellow D:CC BlackCat,39,IncreaseBlockPerHourglass,3.26 -1301,Yellow D:CC BlackCat,40,IncreaseBlockPerHourglass,3.2800000000000002 -1301,Yellow D:CC BlackCat,41,IncreaseBlockPerHourglass,3.3 -1301,Yellow D:CC BlackCat,42,IncreaseBlockPerHourglass,3.3200000000000003 -1301,Yellow D:CC BlackCat,43,IncreaseBlockPerHourglass,3.34 -1301,Yellow D:CC BlackCat,44,IncreaseBlockPerHourglass,3.3600000000000003 -1301,Yellow D:CC BlackCat,45,IncreaseBlockPerHourglass,3.38 -1301,Yellow D:CC BlackCat,46,IncreaseBlockPerHourglass,3.4 -1301,Yellow D:CC BlackCat,47,IncreaseBlockPerHourglass,3.42 -1301,Yellow D:CC BlackCat,48,IncreaseBlockPerHourglass,3.44 -1301,Yellow D:CC BlackCat,49,IncreaseBlockPerHourglass,3.46 -1301,Yellow D:CC BlackCat,50,IncreaseBlockPerHourglass,3.48 -1301,Yellow D:CC BlackCat,51,IncreaseBlockPerHourglass,3.5 -1301,Yellow D:CC BlackCat,52,IncreaseBlockPerHourglass,3.52 -1301,Yellow D:CC BlackCat,53,IncreaseBlockPerHourglass,3.54 -1301,Yellow D:CC BlackCat,54,IncreaseBlockPerHourglass,3.56 -1301,Yellow D:CC BlackCat,55,IncreaseBlockPerHourglass,3.58 -1301,Yellow D:CC BlackCat,56,IncreaseBlockPerHourglass,3.6 -1301,Yellow D:CC BlackCat,57,IncreaseBlockPerHourglass,3.62 -1301,Yellow D:CC BlackCat,58,IncreaseBlockPerHourglass,3.64 -1301,Yellow D:CC BlackCat,59,IncreaseBlockPerHourglass,3.66 -1301,Yellow D:CC BlackCat,60,IncreaseBlockPerHourglass,3.68 -1301,Yellow D:CC BlackCat,61,IncreaseBlockPerHourglass,3.7 -1301,Yellow D:CC BlackCat,62,IncreaseBlockPerHourglass,3.72 -1301,Yellow D:CC BlackCat,63,IncreaseBlockPerHourglass,3.74 -1301,Yellow D:CC BlackCat,64,IncreaseBlockPerHourglass,3.76 -1301,Yellow D:CC BlackCat,65,IncreaseBlockPerHourglass,3.78 -1301,Yellow D:CC BlackCat,66,IncreaseBlockPerHourglass,3.8 -1301,Yellow D:CC BlackCat,67,IncreaseBlockPerHourglass,3.82 -1301,Yellow D:CC BlackCat,68,IncreaseBlockPerHourglass,3.84 -1301,Yellow D:CC BlackCat,69,IncreaseBlockPerHourglass,3.86 -1301,Yellow D:CC BlackCat,70,IncreaseBlockPerHourglass,3.88 -1301,Yellow D:CC BlackCat,71,IncreaseBlockPerHourglass,3.9 -1301,Yellow D:CC BlackCat,72,IncreaseBlockPerHourglass,3.92 -1301,Yellow D:CC BlackCat,73,IncreaseBlockPerHourglass,3.94 -1301,Yellow D:CC BlackCat,74,IncreaseBlockPerHourglass,3.96 -1301,Yellow D:CC BlackCat,75,IncreaseBlockPerHourglass,3.98 -1301,Yellow D:CC BlackCat,76,IncreaseBlockPerHourglass,4.0 -1301,Yellow D:CC BlackCat,77,IncreaseBlockPerHourglass,4.02 -1301,Yellow D:CC BlackCat,78,IncreaseBlockPerHourglass,4.04 -1301,Yellow D:CC BlackCat,79,IncreaseBlockPerHourglass,4.0600000000000005 -1301,Yellow D:CC BlackCat,80,IncreaseBlockPerHourglass,4.08 -1301,Yellow D:CC BlackCat,81,IncreaseBlockPerHourglass,4.1 -1301,Yellow D:CC BlackCat,82,IncreaseBlockPerHourglass,4.12 -1301,Yellow D:CC BlackCat,83,IncreaseBlockPerHourglass,4.140000000000001 -1301,Yellow D:CC BlackCat,84,IncreaseBlockPerHourglass,4.16 -1301,Yellow D:CC BlackCat,85,IncreaseBlockPerHourglass,4.18 -1301,Yellow D:CC BlackCat,86,IncreaseBlockPerHourglass,4.2 -1301,Yellow D:CC BlackCat,87,IncreaseBlockPerHourglass,4.220000000000001 -1301,Yellow D:CC BlackCat,88,IncreaseBlockPerHourglass,4.24 -1301,Yellow D:CC BlackCat,89,IncreaseBlockPerHourglass,4.26 -1301,Yellow D:CC BlackCat,90,IncreaseBlockPerHourglass,4.279999999999999 -1301,Yellow D:CC BlackCat,91,IncreaseBlockPerHourglass,4.3 -1301,Yellow D:CC BlackCat,92,IncreaseBlockPerHourglass,4.32 -1301,Yellow D:CC BlackCat,93,IncreaseBlockPerHourglass,4.34 -1301,Yellow D:CC BlackCat,94,IncreaseBlockPerHourglass,4.359999999999999 -1301,Yellow D:CC BlackCat,95,IncreaseBlockPerHourglass,4.38 -1301,Yellow D:CC BlackCat,96,IncreaseBlockPerHourglass,4.4 -1301,Yellow D:CC BlackCat,97,IncreaseBlockPerHourglass,4.42 -1301,Yellow D:CC BlackCat,98,IncreaseBlockPerHourglass,4.4399999999999995 -1301,Yellow D:CC BlackCat,99,IncreaseBlockPerHourglass,4.46 -1301,Yellow D:CC BlackCat,100,IncreaseBlockPerHourglass,4.5 1002,Red Donguri,1,DiscountMaterialCostCrystal,20 1002,Red Donguri,2,DiscountMaterialCostCrystal,20.2 1002,Red Donguri,3,DiscountMaterialCostCrystal,20.4 @@ -499,306 +199,6 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1002,Red Donguri,98,DiscountMaterialCostCrystal,39.4 1002,Red Donguri,99,DiscountMaterialCostCrystal,39.6 1002,Red Donguri,100,DiscountMaterialCostCrystal,40 -1102,Icy Red Donguri,1,DiscountMaterialCostCrystal,25.0 -1102,Icy Red Donguri,2,DiscountMaterialCostCrystal,25.2 -1102,Icy Red Donguri,3,DiscountMaterialCostCrystal,25.4 -1102,Icy Red Donguri,4,DiscountMaterialCostCrystal,25.6 -1102,Icy Red Donguri,5,DiscountMaterialCostCrystal,25.8 -1102,Icy Red Donguri,6,DiscountMaterialCostCrystal,26.0 -1102,Icy Red Donguri,7,DiscountMaterialCostCrystal,26.2 -1102,Icy Red Donguri,8,DiscountMaterialCostCrystal,26.4 -1102,Icy Red Donguri,9,DiscountMaterialCostCrystal,26.6 -1102,Icy Red Donguri,10,DiscountMaterialCostCrystal,26.8 -1102,Icy Red Donguri,11,DiscountMaterialCostCrystal,27.0 -1102,Icy Red Donguri,12,DiscountMaterialCostCrystal,27.2 -1102,Icy Red Donguri,13,DiscountMaterialCostCrystal,27.4 -1102,Icy Red Donguri,14,DiscountMaterialCostCrystal,27.6 -1102,Icy Red Donguri,15,DiscountMaterialCostCrystal,27.8 -1102,Icy Red Donguri,16,DiscountMaterialCostCrystal,28.0 -1102,Icy Red Donguri,17,DiscountMaterialCostCrystal,28.2 -1102,Icy Red Donguri,18,DiscountMaterialCostCrystal,28.4 -1102,Icy Red Donguri,19,DiscountMaterialCostCrystal,28.6 -1102,Icy Red Donguri,20,DiscountMaterialCostCrystal,28.8 -1102,Icy Red Donguri,21,DiscountMaterialCostCrystal,29.0 -1102,Icy Red Donguri,22,DiscountMaterialCostCrystal,29.2 -1102,Icy Red Donguri,23,DiscountMaterialCostCrystal,29.4 -1102,Icy Red Donguri,24,DiscountMaterialCostCrystal,29.6 -1102,Icy Red Donguri,25,DiscountMaterialCostCrystal,29.8 -1102,Icy Red Donguri,26,DiscountMaterialCostCrystal,30.0 -1102,Icy Red Donguri,27,DiscountMaterialCostCrystal,30.2 -1102,Icy Red Donguri,28,DiscountMaterialCostCrystal,30.4 -1102,Icy Red Donguri,29,DiscountMaterialCostCrystal,30.6 -1102,Icy Red Donguri,30,DiscountMaterialCostCrystal,30.8 -1102,Icy Red Donguri,31,DiscountMaterialCostCrystal,31.0 -1102,Icy Red Donguri,32,DiscountMaterialCostCrystal,31.2 -1102,Icy Red Donguri,33,DiscountMaterialCostCrystal,31.4 -1102,Icy Red Donguri,34,DiscountMaterialCostCrystal,31.6 -1102,Icy Red Donguri,35,DiscountMaterialCostCrystal,31.8 -1102,Icy Red Donguri,36,DiscountMaterialCostCrystal,32.0 -1102,Icy Red Donguri,37,DiscountMaterialCostCrystal,32.2 -1102,Icy Red Donguri,38,DiscountMaterialCostCrystal,32.4 -1102,Icy Red Donguri,39,DiscountMaterialCostCrystal,32.6 -1102,Icy Red Donguri,40,DiscountMaterialCostCrystal,32.8 -1102,Icy Red Donguri,41,DiscountMaterialCostCrystal,33.0 -1102,Icy Red Donguri,42,DiscountMaterialCostCrystal,33.2 -1102,Icy Red Donguri,43,DiscountMaterialCostCrystal,33.4 -1102,Icy Red Donguri,44,DiscountMaterialCostCrystal,33.6 -1102,Icy Red Donguri,45,DiscountMaterialCostCrystal,33.8 -1102,Icy Red Donguri,46,DiscountMaterialCostCrystal,34.0 -1102,Icy Red Donguri,47,DiscountMaterialCostCrystal,34.2 -1102,Icy Red Donguri,48,DiscountMaterialCostCrystal,34.4 -1102,Icy Red Donguri,49,DiscountMaterialCostCrystal,34.6 -1102,Icy Red Donguri,50,DiscountMaterialCostCrystal,34.8 -1102,Icy Red Donguri,51,DiscountMaterialCostCrystal,35.0 -1102,Icy Red Donguri,52,DiscountMaterialCostCrystal,35.2 -1102,Icy Red Donguri,53,DiscountMaterialCostCrystal,35.4 -1102,Icy Red Donguri,54,DiscountMaterialCostCrystal,35.6 -1102,Icy Red Donguri,55,DiscountMaterialCostCrystal,35.8 -1102,Icy Red Donguri,56,DiscountMaterialCostCrystal,36.0 -1102,Icy Red Donguri,57,DiscountMaterialCostCrystal,36.2 -1102,Icy Red Donguri,58,DiscountMaterialCostCrystal,36.4 -1102,Icy Red Donguri,59,DiscountMaterialCostCrystal,36.6 -1102,Icy Red Donguri,60,DiscountMaterialCostCrystal,36.8 -1102,Icy Red Donguri,61,DiscountMaterialCostCrystal,37.0 -1102,Icy Red Donguri,62,DiscountMaterialCostCrystal,37.2 -1102,Icy Red Donguri,63,DiscountMaterialCostCrystal,37.4 -1102,Icy Red Donguri,64,DiscountMaterialCostCrystal,37.6 -1102,Icy Red Donguri,65,DiscountMaterialCostCrystal,37.8 -1102,Icy Red Donguri,66,DiscountMaterialCostCrystal,38.0 -1102,Icy Red Donguri,67,DiscountMaterialCostCrystal,38.2 -1102,Icy Red Donguri,68,DiscountMaterialCostCrystal,38.4 -1102,Icy Red Donguri,69,DiscountMaterialCostCrystal,38.6 -1102,Icy Red Donguri,70,DiscountMaterialCostCrystal,38.8 -1102,Icy Red Donguri,71,DiscountMaterialCostCrystal,39.0 -1102,Icy Red Donguri,72,DiscountMaterialCostCrystal,39.2 -1102,Icy Red Donguri,73,DiscountMaterialCostCrystal,39.4 -1102,Icy Red Donguri,74,DiscountMaterialCostCrystal,39.6 -1102,Icy Red Donguri,75,DiscountMaterialCostCrystal,39.8 -1102,Icy Red Donguri,76,DiscountMaterialCostCrystal,40.0 -1102,Icy Red Donguri,77,DiscountMaterialCostCrystal,40.2 -1102,Icy Red Donguri,78,DiscountMaterialCostCrystal,40.4 -1102,Icy Red Donguri,79,DiscountMaterialCostCrystal,40.6 -1102,Icy Red Donguri,80,DiscountMaterialCostCrystal,40.8 -1102,Icy Red Donguri,81,DiscountMaterialCostCrystal,41.0 -1102,Icy Red Donguri,82,DiscountMaterialCostCrystal,41.2 -1102,Icy Red Donguri,83,DiscountMaterialCostCrystal,41.4 -1102,Icy Red Donguri,84,DiscountMaterialCostCrystal,41.6 -1102,Icy Red Donguri,85,DiscountMaterialCostCrystal,41.8 -1102,Icy Red Donguri,86,DiscountMaterialCostCrystal,42.0 -1102,Icy Red Donguri,87,DiscountMaterialCostCrystal,42.2 -1102,Icy Red Donguri,88,DiscountMaterialCostCrystal,42.4 -1102,Icy Red Donguri,89,DiscountMaterialCostCrystal,42.6 -1102,Icy Red Donguri,90,DiscountMaterialCostCrystal,42.8 -1102,Icy Red Donguri,91,DiscountMaterialCostCrystal,43.0 -1102,Icy Red Donguri,92,DiscountMaterialCostCrystal,43.2 -1102,Icy Red Donguri,93,DiscountMaterialCostCrystal,43.4 -1102,Icy Red Donguri,94,DiscountMaterialCostCrystal,43.6 -1102,Icy Red Donguri,95,DiscountMaterialCostCrystal,43.8 -1102,Icy Red Donguri,96,DiscountMaterialCostCrystal,44.0 -1102,Icy Red Donguri,97,DiscountMaterialCostCrystal,44.2 -1102,Icy Red Donguri,98,DiscountMaterialCostCrystal,44.4 -1102,Icy Red Donguri,99,DiscountMaterialCostCrystal,44.6 -1102,Icy Red Donguri,100,DiscountMaterialCostCrystal,45.0 -1202,Magenta Red Donguri,1,DiscountMaterialCostCrystal,30.0 -1202,Magenta Red Donguri,2,DiscountMaterialCostCrystal,30.2 -1202,Magenta Red Donguri,3,DiscountMaterialCostCrystal,30.4 -1202,Magenta Red Donguri,4,DiscountMaterialCostCrystal,30.6 -1202,Magenta Red Donguri,5,DiscountMaterialCostCrystal,30.8 -1202,Magenta Red Donguri,6,DiscountMaterialCostCrystal,31.0 -1202,Magenta Red Donguri,7,DiscountMaterialCostCrystal,31.2 -1202,Magenta Red Donguri,8,DiscountMaterialCostCrystal,31.4 -1202,Magenta Red Donguri,9,DiscountMaterialCostCrystal,31.6 -1202,Magenta Red Donguri,10,DiscountMaterialCostCrystal,31.8 -1202,Magenta Red Donguri,11,DiscountMaterialCostCrystal,32.0 -1202,Magenta Red Donguri,12,DiscountMaterialCostCrystal,32.2 -1202,Magenta Red Donguri,13,DiscountMaterialCostCrystal,32.4 -1202,Magenta Red Donguri,14,DiscountMaterialCostCrystal,32.6 -1202,Magenta Red Donguri,15,DiscountMaterialCostCrystal,32.8 -1202,Magenta Red Donguri,16,DiscountMaterialCostCrystal,33.0 -1202,Magenta Red Donguri,17,DiscountMaterialCostCrystal,33.2 -1202,Magenta Red Donguri,18,DiscountMaterialCostCrystal,33.4 -1202,Magenta Red Donguri,19,DiscountMaterialCostCrystal,33.6 -1202,Magenta Red Donguri,20,DiscountMaterialCostCrystal,33.8 -1202,Magenta Red Donguri,21,DiscountMaterialCostCrystal,34.0 -1202,Magenta Red Donguri,22,DiscountMaterialCostCrystal,34.2 -1202,Magenta Red Donguri,23,DiscountMaterialCostCrystal,34.4 -1202,Magenta Red Donguri,24,DiscountMaterialCostCrystal,34.6 -1202,Magenta Red Donguri,25,DiscountMaterialCostCrystal,34.8 -1202,Magenta Red Donguri,26,DiscountMaterialCostCrystal,35.0 -1202,Magenta Red Donguri,27,DiscountMaterialCostCrystal,35.2 -1202,Magenta Red Donguri,28,DiscountMaterialCostCrystal,35.4 -1202,Magenta Red Donguri,29,DiscountMaterialCostCrystal,35.6 -1202,Magenta Red Donguri,30,DiscountMaterialCostCrystal,35.8 -1202,Magenta Red Donguri,31,DiscountMaterialCostCrystal,36.0 -1202,Magenta Red Donguri,32,DiscountMaterialCostCrystal,36.2 -1202,Magenta Red Donguri,33,DiscountMaterialCostCrystal,36.4 -1202,Magenta Red Donguri,34,DiscountMaterialCostCrystal,36.6 -1202,Magenta Red Donguri,35,DiscountMaterialCostCrystal,36.8 -1202,Magenta Red Donguri,36,DiscountMaterialCostCrystal,37.0 -1202,Magenta Red Donguri,37,DiscountMaterialCostCrystal,37.2 -1202,Magenta Red Donguri,38,DiscountMaterialCostCrystal,37.4 -1202,Magenta Red Donguri,39,DiscountMaterialCostCrystal,37.6 -1202,Magenta Red Donguri,40,DiscountMaterialCostCrystal,37.8 -1202,Magenta Red Donguri,41,DiscountMaterialCostCrystal,38.0 -1202,Magenta Red Donguri,42,DiscountMaterialCostCrystal,38.2 -1202,Magenta Red Donguri,43,DiscountMaterialCostCrystal,38.4 -1202,Magenta Red Donguri,44,DiscountMaterialCostCrystal,38.6 -1202,Magenta Red Donguri,45,DiscountMaterialCostCrystal,38.8 -1202,Magenta Red Donguri,46,DiscountMaterialCostCrystal,39.0 -1202,Magenta Red Donguri,47,DiscountMaterialCostCrystal,39.2 -1202,Magenta Red Donguri,48,DiscountMaterialCostCrystal,39.4 -1202,Magenta Red Donguri,49,DiscountMaterialCostCrystal,39.6 -1202,Magenta Red Donguri,50,DiscountMaterialCostCrystal,39.8 -1202,Magenta Red Donguri,51,DiscountMaterialCostCrystal,40.0 -1202,Magenta Red Donguri,52,DiscountMaterialCostCrystal,40.2 -1202,Magenta Red Donguri,53,DiscountMaterialCostCrystal,40.4 -1202,Magenta Red Donguri,54,DiscountMaterialCostCrystal,40.6 -1202,Magenta Red Donguri,55,DiscountMaterialCostCrystal,40.8 -1202,Magenta Red Donguri,56,DiscountMaterialCostCrystal,41.0 -1202,Magenta Red Donguri,57,DiscountMaterialCostCrystal,41.2 -1202,Magenta Red Donguri,58,DiscountMaterialCostCrystal,41.4 -1202,Magenta Red Donguri,59,DiscountMaterialCostCrystal,41.6 -1202,Magenta Red Donguri,60,DiscountMaterialCostCrystal,41.8 -1202,Magenta Red Donguri,61,DiscountMaterialCostCrystal,42.0 -1202,Magenta Red Donguri,62,DiscountMaterialCostCrystal,42.2 -1202,Magenta Red Donguri,63,DiscountMaterialCostCrystal,42.4 -1202,Magenta Red Donguri,64,DiscountMaterialCostCrystal,42.6 -1202,Magenta Red Donguri,65,DiscountMaterialCostCrystal,42.8 -1202,Magenta Red Donguri,66,DiscountMaterialCostCrystal,43.0 -1202,Magenta Red Donguri,67,DiscountMaterialCostCrystal,43.2 -1202,Magenta Red Donguri,68,DiscountMaterialCostCrystal,43.4 -1202,Magenta Red Donguri,69,DiscountMaterialCostCrystal,43.6 -1202,Magenta Red Donguri,70,DiscountMaterialCostCrystal,43.8 -1202,Magenta Red Donguri,71,DiscountMaterialCostCrystal,44.0 -1202,Magenta Red Donguri,72,DiscountMaterialCostCrystal,44.2 -1202,Magenta Red Donguri,73,DiscountMaterialCostCrystal,44.4 -1202,Magenta Red Donguri,74,DiscountMaterialCostCrystal,44.6 -1202,Magenta Red Donguri,75,DiscountMaterialCostCrystal,44.8 -1202,Magenta Red Donguri,76,DiscountMaterialCostCrystal,45.0 -1202,Magenta Red Donguri,77,DiscountMaterialCostCrystal,45.2 -1202,Magenta Red Donguri,78,DiscountMaterialCostCrystal,45.4 -1202,Magenta Red Donguri,79,DiscountMaterialCostCrystal,45.6 -1202,Magenta Red Donguri,80,DiscountMaterialCostCrystal,45.8 -1202,Magenta Red Donguri,81,DiscountMaterialCostCrystal,46.0 -1202,Magenta Red Donguri,82,DiscountMaterialCostCrystal,46.2 -1202,Magenta Red Donguri,83,DiscountMaterialCostCrystal,46.4 -1202,Magenta Red Donguri,84,DiscountMaterialCostCrystal,46.6 -1202,Magenta Red Donguri,85,DiscountMaterialCostCrystal,46.8 -1202,Magenta Red Donguri,86,DiscountMaterialCostCrystal,47.0 -1202,Magenta Red Donguri,87,DiscountMaterialCostCrystal,47.2 -1202,Magenta Red Donguri,88,DiscountMaterialCostCrystal,47.4 -1202,Magenta Red Donguri,89,DiscountMaterialCostCrystal,47.6 -1202,Magenta Red Donguri,90,DiscountMaterialCostCrystal,47.8 -1202,Magenta Red Donguri,91,DiscountMaterialCostCrystal,48.0 -1202,Magenta Red Donguri,92,DiscountMaterialCostCrystal,48.2 -1202,Magenta Red Donguri,93,DiscountMaterialCostCrystal,48.4 -1202,Magenta Red Donguri,94,DiscountMaterialCostCrystal,48.6 -1202,Magenta Red Donguri,95,DiscountMaterialCostCrystal,48.8 -1202,Magenta Red Donguri,96,DiscountMaterialCostCrystal,49.0 -1202,Magenta Red Donguri,97,DiscountMaterialCostCrystal,49.2 -1202,Magenta Red Donguri,98,DiscountMaterialCostCrystal,49.4 -1202,Magenta Red Donguri,99,DiscountMaterialCostCrystal,49.6 -1202,Magenta Red Donguri,100,DiscountMaterialCostCrystal,50.0 -1302,Yellow Red Donguri,1,DiscountMaterialCostCrystal,35.0 -1302,Yellow Red Donguri,2,DiscountMaterialCostCrystal,35.2 -1302,Yellow Red Donguri,3,DiscountMaterialCostCrystal,35.4 -1302,Yellow Red Donguri,4,DiscountMaterialCostCrystal,35.6 -1302,Yellow Red Donguri,5,DiscountMaterialCostCrystal,35.8 -1302,Yellow Red Donguri,6,DiscountMaterialCostCrystal,36.0 -1302,Yellow Red Donguri,7,DiscountMaterialCostCrystal,36.2 -1302,Yellow Red Donguri,8,DiscountMaterialCostCrystal,36.4 -1302,Yellow Red Donguri,9,DiscountMaterialCostCrystal,36.6 -1302,Yellow Red Donguri,10,DiscountMaterialCostCrystal,36.8 -1302,Yellow Red Donguri,11,DiscountMaterialCostCrystal,37.0 -1302,Yellow Red Donguri,12,DiscountMaterialCostCrystal,37.2 -1302,Yellow Red Donguri,13,DiscountMaterialCostCrystal,37.4 -1302,Yellow Red Donguri,14,DiscountMaterialCostCrystal,37.6 -1302,Yellow Red Donguri,15,DiscountMaterialCostCrystal,37.8 -1302,Yellow Red Donguri,16,DiscountMaterialCostCrystal,38.0 -1302,Yellow Red Donguri,17,DiscountMaterialCostCrystal,38.2 -1302,Yellow Red Donguri,18,DiscountMaterialCostCrystal,38.4 -1302,Yellow Red Donguri,19,DiscountMaterialCostCrystal,38.6 -1302,Yellow Red Donguri,20,DiscountMaterialCostCrystal,38.8 -1302,Yellow Red Donguri,21,DiscountMaterialCostCrystal,39.0 -1302,Yellow Red Donguri,22,DiscountMaterialCostCrystal,39.2 -1302,Yellow Red Donguri,23,DiscountMaterialCostCrystal,39.4 -1302,Yellow Red Donguri,24,DiscountMaterialCostCrystal,39.6 -1302,Yellow Red Donguri,25,DiscountMaterialCostCrystal,39.8 -1302,Yellow Red Donguri,26,DiscountMaterialCostCrystal,40.0 -1302,Yellow Red Donguri,27,DiscountMaterialCostCrystal,40.2 -1302,Yellow Red Donguri,28,DiscountMaterialCostCrystal,40.4 -1302,Yellow Red Donguri,29,DiscountMaterialCostCrystal,40.6 -1302,Yellow Red Donguri,30,DiscountMaterialCostCrystal,40.8 -1302,Yellow Red Donguri,31,DiscountMaterialCostCrystal,41.0 -1302,Yellow Red Donguri,32,DiscountMaterialCostCrystal,41.2 -1302,Yellow Red Donguri,33,DiscountMaterialCostCrystal,41.4 -1302,Yellow Red Donguri,34,DiscountMaterialCostCrystal,41.6 -1302,Yellow Red Donguri,35,DiscountMaterialCostCrystal,41.8 -1302,Yellow Red Donguri,36,DiscountMaterialCostCrystal,42.0 -1302,Yellow Red Donguri,37,DiscountMaterialCostCrystal,42.2 -1302,Yellow Red Donguri,38,DiscountMaterialCostCrystal,42.4 -1302,Yellow Red Donguri,39,DiscountMaterialCostCrystal,42.6 -1302,Yellow Red Donguri,40,DiscountMaterialCostCrystal,42.8 -1302,Yellow Red Donguri,41,DiscountMaterialCostCrystal,43.0 -1302,Yellow Red Donguri,42,DiscountMaterialCostCrystal,43.2 -1302,Yellow Red Donguri,43,DiscountMaterialCostCrystal,43.4 -1302,Yellow Red Donguri,44,DiscountMaterialCostCrystal,43.6 -1302,Yellow Red Donguri,45,DiscountMaterialCostCrystal,43.8 -1302,Yellow Red Donguri,46,DiscountMaterialCostCrystal,44.0 -1302,Yellow Red Donguri,47,DiscountMaterialCostCrystal,44.2 -1302,Yellow Red Donguri,48,DiscountMaterialCostCrystal,44.4 -1302,Yellow Red Donguri,49,DiscountMaterialCostCrystal,44.6 -1302,Yellow Red Donguri,50,DiscountMaterialCostCrystal,44.8 -1302,Yellow Red Donguri,51,DiscountMaterialCostCrystal,45.0 -1302,Yellow Red Donguri,52,DiscountMaterialCostCrystal,45.2 -1302,Yellow Red Donguri,53,DiscountMaterialCostCrystal,45.4 -1302,Yellow Red Donguri,54,DiscountMaterialCostCrystal,45.6 -1302,Yellow Red Donguri,55,DiscountMaterialCostCrystal,45.8 -1302,Yellow Red Donguri,56,DiscountMaterialCostCrystal,46.0 -1302,Yellow Red Donguri,57,DiscountMaterialCostCrystal,46.2 -1302,Yellow Red Donguri,58,DiscountMaterialCostCrystal,46.4 -1302,Yellow Red Donguri,59,DiscountMaterialCostCrystal,46.6 -1302,Yellow Red Donguri,60,DiscountMaterialCostCrystal,46.8 -1302,Yellow Red Donguri,61,DiscountMaterialCostCrystal,47.0 -1302,Yellow Red Donguri,62,DiscountMaterialCostCrystal,47.2 -1302,Yellow Red Donguri,63,DiscountMaterialCostCrystal,47.4 -1302,Yellow Red Donguri,64,DiscountMaterialCostCrystal,47.6 -1302,Yellow Red Donguri,65,DiscountMaterialCostCrystal,47.8 -1302,Yellow Red Donguri,66,DiscountMaterialCostCrystal,48.0 -1302,Yellow Red Donguri,67,DiscountMaterialCostCrystal,48.2 -1302,Yellow Red Donguri,68,DiscountMaterialCostCrystal,48.4 -1302,Yellow Red Donguri,69,DiscountMaterialCostCrystal,48.6 -1302,Yellow Red Donguri,70,DiscountMaterialCostCrystal,48.8 -1302,Yellow Red Donguri,71,DiscountMaterialCostCrystal,49.0 -1302,Yellow Red Donguri,72,DiscountMaterialCostCrystal,49.2 -1302,Yellow Red Donguri,73,DiscountMaterialCostCrystal,49.4 -1302,Yellow Red Donguri,74,DiscountMaterialCostCrystal,49.6 -1302,Yellow Red Donguri,75,DiscountMaterialCostCrystal,49.8 -1302,Yellow Red Donguri,76,DiscountMaterialCostCrystal,50.0 -1302,Yellow Red Donguri,77,DiscountMaterialCostCrystal,50.2 -1302,Yellow Red Donguri,78,DiscountMaterialCostCrystal,50.4 -1302,Yellow Red Donguri,79,DiscountMaterialCostCrystal,50.6 -1302,Yellow Red Donguri,80,DiscountMaterialCostCrystal,50.8 -1302,Yellow Red Donguri,81,DiscountMaterialCostCrystal,51.0 -1302,Yellow Red Donguri,82,DiscountMaterialCostCrystal,51.2 -1302,Yellow Red Donguri,83,DiscountMaterialCostCrystal,51.4 -1302,Yellow Red Donguri,84,DiscountMaterialCostCrystal,51.6 -1302,Yellow Red Donguri,85,DiscountMaterialCostCrystal,51.8 -1302,Yellow Red Donguri,86,DiscountMaterialCostCrystal,52.0 -1302,Yellow Red Donguri,87,DiscountMaterialCostCrystal,52.2 -1302,Yellow Red Donguri,88,DiscountMaterialCostCrystal,52.4 -1302,Yellow Red Donguri,89,DiscountMaterialCostCrystal,52.6 -1302,Yellow Red Donguri,90,DiscountMaterialCostCrystal,52.8 -1302,Yellow Red Donguri,91,DiscountMaterialCostCrystal,53.0 -1302,Yellow Red Donguri,92,DiscountMaterialCostCrystal,53.2 -1302,Yellow Red Donguri,93,DiscountMaterialCostCrystal,53.4 -1302,Yellow Red Donguri,94,DiscountMaterialCostCrystal,53.6 -1302,Yellow Red Donguri,95,DiscountMaterialCostCrystal,53.8 -1302,Yellow Red Donguri,96,DiscountMaterialCostCrystal,54.0 -1302,Yellow Red Donguri,97,DiscountMaterialCostCrystal,54.2 -1302,Yellow Red Donguri,98,DiscountMaterialCostCrystal,54.4 -1302,Yellow Red Donguri,99,DiscountMaterialCostCrystal,54.6 -1302,Yellow Red Donguri,100,DiscountMaterialCostCrystal,55.0 1003,Valkyrie,1,ReduceRequiredBlock,20 1003,Valkyrie,2,ReduceRequiredBlock,20.15 1003,Valkyrie,3,ReduceRequiredBlock,20.3 @@ -899,306 +299,6 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1003,Valkyrie,98,ReduceRequiredBlock,34.55 1003,Valkyrie,99,ReduceRequiredBlock,34.7 1003,Valkyrie,100,ReduceRequiredBlock,35 -1103,Icy Valkyrie,1,ReduceRequiredBlock,30.0 -1103,Icy Valkyrie,2,ReduceRequiredBlock,30.15 -1103,Icy Valkyrie,3,ReduceRequiredBlock,30.3 -1103,Icy Valkyrie,4,ReduceRequiredBlock,30.45 -1103,Icy Valkyrie,5,ReduceRequiredBlock,30.6 -1103,Icy Valkyrie,6,ReduceRequiredBlock,30.75 -1103,Icy Valkyrie,7,ReduceRequiredBlock,30.9 -1103,Icy Valkyrie,8,ReduceRequiredBlock,31.05 -1103,Icy Valkyrie,9,ReduceRequiredBlock,31.2 -1103,Icy Valkyrie,10,ReduceRequiredBlock,31.35 -1103,Icy Valkyrie,11,ReduceRequiredBlock,31.5 -1103,Icy Valkyrie,12,ReduceRequiredBlock,31.65 -1103,Icy Valkyrie,13,ReduceRequiredBlock,31.8 -1103,Icy Valkyrie,14,ReduceRequiredBlock,31.95 -1103,Icy Valkyrie,15,ReduceRequiredBlock,32.1 -1103,Icy Valkyrie,16,ReduceRequiredBlock,32.25 -1103,Icy Valkyrie,17,ReduceRequiredBlock,32.4 -1103,Icy Valkyrie,18,ReduceRequiredBlock,32.55 -1103,Icy Valkyrie,19,ReduceRequiredBlock,32.7 -1103,Icy Valkyrie,20,ReduceRequiredBlock,32.85 -1103,Icy Valkyrie,21,ReduceRequiredBlock,33.0 -1103,Icy Valkyrie,22,ReduceRequiredBlock,33.15 -1103,Icy Valkyrie,23,ReduceRequiredBlock,33.3 -1103,Icy Valkyrie,24,ReduceRequiredBlock,33.45 -1103,Icy Valkyrie,25,ReduceRequiredBlock,33.6 -1103,Icy Valkyrie,26,ReduceRequiredBlock,33.75 -1103,Icy Valkyrie,27,ReduceRequiredBlock,33.9 -1103,Icy Valkyrie,28,ReduceRequiredBlock,34.05 -1103,Icy Valkyrie,29,ReduceRequiredBlock,34.2 -1103,Icy Valkyrie,30,ReduceRequiredBlock,34.35 -1103,Icy Valkyrie,31,ReduceRequiredBlock,34.5 -1103,Icy Valkyrie,32,ReduceRequiredBlock,34.65 -1103,Icy Valkyrie,33,ReduceRequiredBlock,34.8 -1103,Icy Valkyrie,34,ReduceRequiredBlock,34.95 -1103,Icy Valkyrie,35,ReduceRequiredBlock,35.1 -1103,Icy Valkyrie,36,ReduceRequiredBlock,35.25 -1103,Icy Valkyrie,37,ReduceRequiredBlock,35.4 -1103,Icy Valkyrie,38,ReduceRequiredBlock,35.55 -1103,Icy Valkyrie,39,ReduceRequiredBlock,35.7 -1103,Icy Valkyrie,40,ReduceRequiredBlock,35.85 -1103,Icy Valkyrie,41,ReduceRequiredBlock,36.0 -1103,Icy Valkyrie,42,ReduceRequiredBlock,36.15 -1103,Icy Valkyrie,43,ReduceRequiredBlock,36.3 -1103,Icy Valkyrie,44,ReduceRequiredBlock,36.45 -1103,Icy Valkyrie,45,ReduceRequiredBlock,36.6 -1103,Icy Valkyrie,46,ReduceRequiredBlock,36.75 -1103,Icy Valkyrie,47,ReduceRequiredBlock,36.9 -1103,Icy Valkyrie,48,ReduceRequiredBlock,37.05 -1103,Icy Valkyrie,49,ReduceRequiredBlock,37.2 -1103,Icy Valkyrie,50,ReduceRequiredBlock,37.35 -1103,Icy Valkyrie,51,ReduceRequiredBlock,37.5 -1103,Icy Valkyrie,52,ReduceRequiredBlock,37.65 -1103,Icy Valkyrie,53,ReduceRequiredBlock,37.8 -1103,Icy Valkyrie,54,ReduceRequiredBlock,37.95 -1103,Icy Valkyrie,55,ReduceRequiredBlock,38.1 -1103,Icy Valkyrie,56,ReduceRequiredBlock,38.25 -1103,Icy Valkyrie,57,ReduceRequiredBlock,38.4 -1103,Icy Valkyrie,58,ReduceRequiredBlock,38.55 -1103,Icy Valkyrie,59,ReduceRequiredBlock,38.7 -1103,Icy Valkyrie,60,ReduceRequiredBlock,38.85 -1103,Icy Valkyrie,61,ReduceRequiredBlock,39.0 -1103,Icy Valkyrie,62,ReduceRequiredBlock,39.15 -1103,Icy Valkyrie,63,ReduceRequiredBlock,39.3 -1103,Icy Valkyrie,64,ReduceRequiredBlock,39.45 -1103,Icy Valkyrie,65,ReduceRequiredBlock,39.6 -1103,Icy Valkyrie,66,ReduceRequiredBlock,39.75 -1103,Icy Valkyrie,67,ReduceRequiredBlock,39.9 -1103,Icy Valkyrie,68,ReduceRequiredBlock,40.05 -1103,Icy Valkyrie,69,ReduceRequiredBlock,40.2 -1103,Icy Valkyrie,70,ReduceRequiredBlock,40.35 -1103,Icy Valkyrie,71,ReduceRequiredBlock,40.5 -1103,Icy Valkyrie,72,ReduceRequiredBlock,40.65 -1103,Icy Valkyrie,73,ReduceRequiredBlock,40.8 -1103,Icy Valkyrie,74,ReduceRequiredBlock,40.95 -1103,Icy Valkyrie,75,ReduceRequiredBlock,41.1 -1103,Icy Valkyrie,76,ReduceRequiredBlock,41.25 -1103,Icy Valkyrie,77,ReduceRequiredBlock,41.4 -1103,Icy Valkyrie,78,ReduceRequiredBlock,41.55 -1103,Icy Valkyrie,79,ReduceRequiredBlock,41.7 -1103,Icy Valkyrie,80,ReduceRequiredBlock,41.85 -1103,Icy Valkyrie,81,ReduceRequiredBlock,42.0 -1103,Icy Valkyrie,82,ReduceRequiredBlock,42.15 -1103,Icy Valkyrie,83,ReduceRequiredBlock,42.3 -1103,Icy Valkyrie,84,ReduceRequiredBlock,42.45 -1103,Icy Valkyrie,85,ReduceRequiredBlock,42.6 -1103,Icy Valkyrie,86,ReduceRequiredBlock,42.75 -1103,Icy Valkyrie,87,ReduceRequiredBlock,42.9 -1103,Icy Valkyrie,88,ReduceRequiredBlock,43.05 -1103,Icy Valkyrie,89,ReduceRequiredBlock,43.2 -1103,Icy Valkyrie,90,ReduceRequiredBlock,43.35 -1103,Icy Valkyrie,91,ReduceRequiredBlock,43.5 -1103,Icy Valkyrie,92,ReduceRequiredBlock,43.65 -1103,Icy Valkyrie,93,ReduceRequiredBlock,43.8 -1103,Icy Valkyrie,94,ReduceRequiredBlock,43.95 -1103,Icy Valkyrie,95,ReduceRequiredBlock,44.1 -1103,Icy Valkyrie,96,ReduceRequiredBlock,44.25 -1103,Icy Valkyrie,97,ReduceRequiredBlock,44.4 -1103,Icy Valkyrie,98,ReduceRequiredBlock,44.55 -1103,Icy Valkyrie,99,ReduceRequiredBlock,44.7 -1103,Icy Valkyrie,100,ReduceRequiredBlock,45.0 -1203,Magenta Valkyrie,1,ReduceRequiredBlock,40.0 -1203,Magenta Valkyrie,2,ReduceRequiredBlock,40.15 -1203,Magenta Valkyrie,3,ReduceRequiredBlock,40.3 -1203,Magenta Valkyrie,4,ReduceRequiredBlock,40.45 -1203,Magenta Valkyrie,5,ReduceRequiredBlock,40.6 -1203,Magenta Valkyrie,6,ReduceRequiredBlock,40.75 -1203,Magenta Valkyrie,7,ReduceRequiredBlock,40.9 -1203,Magenta Valkyrie,8,ReduceRequiredBlock,41.05 -1203,Magenta Valkyrie,9,ReduceRequiredBlock,41.2 -1203,Magenta Valkyrie,10,ReduceRequiredBlock,41.35 -1203,Magenta Valkyrie,11,ReduceRequiredBlock,41.5 -1203,Magenta Valkyrie,12,ReduceRequiredBlock,41.65 -1203,Magenta Valkyrie,13,ReduceRequiredBlock,41.8 -1203,Magenta Valkyrie,14,ReduceRequiredBlock,41.95 -1203,Magenta Valkyrie,15,ReduceRequiredBlock,42.1 -1203,Magenta Valkyrie,16,ReduceRequiredBlock,42.25 -1203,Magenta Valkyrie,17,ReduceRequiredBlock,42.4 -1203,Magenta Valkyrie,18,ReduceRequiredBlock,42.55 -1203,Magenta Valkyrie,19,ReduceRequiredBlock,42.7 -1203,Magenta Valkyrie,20,ReduceRequiredBlock,42.85 -1203,Magenta Valkyrie,21,ReduceRequiredBlock,43.0 -1203,Magenta Valkyrie,22,ReduceRequiredBlock,43.15 -1203,Magenta Valkyrie,23,ReduceRequiredBlock,43.3 -1203,Magenta Valkyrie,24,ReduceRequiredBlock,43.45 -1203,Magenta Valkyrie,25,ReduceRequiredBlock,43.6 -1203,Magenta Valkyrie,26,ReduceRequiredBlock,43.75 -1203,Magenta Valkyrie,27,ReduceRequiredBlock,43.9 -1203,Magenta Valkyrie,28,ReduceRequiredBlock,44.05 -1203,Magenta Valkyrie,29,ReduceRequiredBlock,44.2 -1203,Magenta Valkyrie,30,ReduceRequiredBlock,44.35 -1203,Magenta Valkyrie,31,ReduceRequiredBlock,44.5 -1203,Magenta Valkyrie,32,ReduceRequiredBlock,44.65 -1203,Magenta Valkyrie,33,ReduceRequiredBlock,44.8 -1203,Magenta Valkyrie,34,ReduceRequiredBlock,44.95 -1203,Magenta Valkyrie,35,ReduceRequiredBlock,45.1 -1203,Magenta Valkyrie,36,ReduceRequiredBlock,45.25 -1203,Magenta Valkyrie,37,ReduceRequiredBlock,45.4 -1203,Magenta Valkyrie,38,ReduceRequiredBlock,45.55 -1203,Magenta Valkyrie,39,ReduceRequiredBlock,45.7 -1203,Magenta Valkyrie,40,ReduceRequiredBlock,45.85 -1203,Magenta Valkyrie,41,ReduceRequiredBlock,46.0 -1203,Magenta Valkyrie,42,ReduceRequiredBlock,46.15 -1203,Magenta Valkyrie,43,ReduceRequiredBlock,46.3 -1203,Magenta Valkyrie,44,ReduceRequiredBlock,46.45 -1203,Magenta Valkyrie,45,ReduceRequiredBlock,46.6 -1203,Magenta Valkyrie,46,ReduceRequiredBlock,46.75 -1203,Magenta Valkyrie,47,ReduceRequiredBlock,46.9 -1203,Magenta Valkyrie,48,ReduceRequiredBlock,47.05 -1203,Magenta Valkyrie,49,ReduceRequiredBlock,47.2 -1203,Magenta Valkyrie,50,ReduceRequiredBlock,47.35 -1203,Magenta Valkyrie,51,ReduceRequiredBlock,47.5 -1203,Magenta Valkyrie,52,ReduceRequiredBlock,47.65 -1203,Magenta Valkyrie,53,ReduceRequiredBlock,47.8 -1203,Magenta Valkyrie,54,ReduceRequiredBlock,47.95 -1203,Magenta Valkyrie,55,ReduceRequiredBlock,48.1 -1203,Magenta Valkyrie,56,ReduceRequiredBlock,48.25 -1203,Magenta Valkyrie,57,ReduceRequiredBlock,48.4 -1203,Magenta Valkyrie,58,ReduceRequiredBlock,48.55 -1203,Magenta Valkyrie,59,ReduceRequiredBlock,48.7 -1203,Magenta Valkyrie,60,ReduceRequiredBlock,48.85 -1203,Magenta Valkyrie,61,ReduceRequiredBlock,49.0 -1203,Magenta Valkyrie,62,ReduceRequiredBlock,49.15 -1203,Magenta Valkyrie,63,ReduceRequiredBlock,49.3 -1203,Magenta Valkyrie,64,ReduceRequiredBlock,49.45 -1203,Magenta Valkyrie,65,ReduceRequiredBlock,49.6 -1203,Magenta Valkyrie,66,ReduceRequiredBlock,49.75 -1203,Magenta Valkyrie,67,ReduceRequiredBlock,49.9 -1203,Magenta Valkyrie,68,ReduceRequiredBlock,50.05 -1203,Magenta Valkyrie,69,ReduceRequiredBlock,50.2 -1203,Magenta Valkyrie,70,ReduceRequiredBlock,50.35 -1203,Magenta Valkyrie,71,ReduceRequiredBlock,50.5 -1203,Magenta Valkyrie,72,ReduceRequiredBlock,50.65 -1203,Magenta Valkyrie,73,ReduceRequiredBlock,50.8 -1203,Magenta Valkyrie,74,ReduceRequiredBlock,50.95 -1203,Magenta Valkyrie,75,ReduceRequiredBlock,51.1 -1203,Magenta Valkyrie,76,ReduceRequiredBlock,51.25 -1203,Magenta Valkyrie,77,ReduceRequiredBlock,51.4 -1203,Magenta Valkyrie,78,ReduceRequiredBlock,51.55 -1203,Magenta Valkyrie,79,ReduceRequiredBlock,51.7 -1203,Magenta Valkyrie,80,ReduceRequiredBlock,51.85 -1203,Magenta Valkyrie,81,ReduceRequiredBlock,52.0 -1203,Magenta Valkyrie,82,ReduceRequiredBlock,52.15 -1203,Magenta Valkyrie,83,ReduceRequiredBlock,52.3 -1203,Magenta Valkyrie,84,ReduceRequiredBlock,52.45 -1203,Magenta Valkyrie,85,ReduceRequiredBlock,52.6 -1203,Magenta Valkyrie,86,ReduceRequiredBlock,52.75 -1203,Magenta Valkyrie,87,ReduceRequiredBlock,52.9 -1203,Magenta Valkyrie,88,ReduceRequiredBlock,53.05 -1203,Magenta Valkyrie,89,ReduceRequiredBlock,53.2 -1203,Magenta Valkyrie,90,ReduceRequiredBlock,53.35 -1203,Magenta Valkyrie,91,ReduceRequiredBlock,53.5 -1203,Magenta Valkyrie,92,ReduceRequiredBlock,53.65 -1203,Magenta Valkyrie,93,ReduceRequiredBlock,53.8 -1203,Magenta Valkyrie,94,ReduceRequiredBlock,53.95 -1203,Magenta Valkyrie,95,ReduceRequiredBlock,54.1 -1203,Magenta Valkyrie,96,ReduceRequiredBlock,54.25 -1203,Magenta Valkyrie,97,ReduceRequiredBlock,54.4 -1203,Magenta Valkyrie,98,ReduceRequiredBlock,54.55 -1203,Magenta Valkyrie,99,ReduceRequiredBlock,54.7 -1203,Magenta Valkyrie,100,ReduceRequiredBlock,55.0 -1303,Yellow Valkyrie,1,ReduceRequiredBlock,50.0 -1303,Yellow Valkyrie,2,ReduceRequiredBlock,50.15 -1303,Yellow Valkyrie,3,ReduceRequiredBlock,50.3 -1303,Yellow Valkyrie,4,ReduceRequiredBlock,50.45 -1303,Yellow Valkyrie,5,ReduceRequiredBlock,50.6 -1303,Yellow Valkyrie,6,ReduceRequiredBlock,50.75 -1303,Yellow Valkyrie,7,ReduceRequiredBlock,50.9 -1303,Yellow Valkyrie,8,ReduceRequiredBlock,51.05 -1303,Yellow Valkyrie,9,ReduceRequiredBlock,51.2 -1303,Yellow Valkyrie,10,ReduceRequiredBlock,51.35 -1303,Yellow Valkyrie,11,ReduceRequiredBlock,51.5 -1303,Yellow Valkyrie,12,ReduceRequiredBlock,51.65 -1303,Yellow Valkyrie,13,ReduceRequiredBlock,51.8 -1303,Yellow Valkyrie,14,ReduceRequiredBlock,51.95 -1303,Yellow Valkyrie,15,ReduceRequiredBlock,52.1 -1303,Yellow Valkyrie,16,ReduceRequiredBlock,52.25 -1303,Yellow Valkyrie,17,ReduceRequiredBlock,52.4 -1303,Yellow Valkyrie,18,ReduceRequiredBlock,52.55 -1303,Yellow Valkyrie,19,ReduceRequiredBlock,52.7 -1303,Yellow Valkyrie,20,ReduceRequiredBlock,52.85 -1303,Yellow Valkyrie,21,ReduceRequiredBlock,53.0 -1303,Yellow Valkyrie,22,ReduceRequiredBlock,53.15 -1303,Yellow Valkyrie,23,ReduceRequiredBlock,53.3 -1303,Yellow Valkyrie,24,ReduceRequiredBlock,53.45 -1303,Yellow Valkyrie,25,ReduceRequiredBlock,53.6 -1303,Yellow Valkyrie,26,ReduceRequiredBlock,53.75 -1303,Yellow Valkyrie,27,ReduceRequiredBlock,53.9 -1303,Yellow Valkyrie,28,ReduceRequiredBlock,54.05 -1303,Yellow Valkyrie,29,ReduceRequiredBlock,54.2 -1303,Yellow Valkyrie,30,ReduceRequiredBlock,54.35 -1303,Yellow Valkyrie,31,ReduceRequiredBlock,54.5 -1303,Yellow Valkyrie,32,ReduceRequiredBlock,54.65 -1303,Yellow Valkyrie,33,ReduceRequiredBlock,54.8 -1303,Yellow Valkyrie,34,ReduceRequiredBlock,54.95 -1303,Yellow Valkyrie,35,ReduceRequiredBlock,55.1 -1303,Yellow Valkyrie,36,ReduceRequiredBlock,55.25 -1303,Yellow Valkyrie,37,ReduceRequiredBlock,55.4 -1303,Yellow Valkyrie,38,ReduceRequiredBlock,55.55 -1303,Yellow Valkyrie,39,ReduceRequiredBlock,55.7 -1303,Yellow Valkyrie,40,ReduceRequiredBlock,55.85 -1303,Yellow Valkyrie,41,ReduceRequiredBlock,56.0 -1303,Yellow Valkyrie,42,ReduceRequiredBlock,56.15 -1303,Yellow Valkyrie,43,ReduceRequiredBlock,56.3 -1303,Yellow Valkyrie,44,ReduceRequiredBlock,56.45 -1303,Yellow Valkyrie,45,ReduceRequiredBlock,56.6 -1303,Yellow Valkyrie,46,ReduceRequiredBlock,56.75 -1303,Yellow Valkyrie,47,ReduceRequiredBlock,56.9 -1303,Yellow Valkyrie,48,ReduceRequiredBlock,57.05 -1303,Yellow Valkyrie,49,ReduceRequiredBlock,57.2 -1303,Yellow Valkyrie,50,ReduceRequiredBlock,57.35 -1303,Yellow Valkyrie,51,ReduceRequiredBlock,57.5 -1303,Yellow Valkyrie,52,ReduceRequiredBlock,57.65 -1303,Yellow Valkyrie,53,ReduceRequiredBlock,57.8 -1303,Yellow Valkyrie,54,ReduceRequiredBlock,57.95 -1303,Yellow Valkyrie,55,ReduceRequiredBlock,58.1 -1303,Yellow Valkyrie,56,ReduceRequiredBlock,58.25 -1303,Yellow Valkyrie,57,ReduceRequiredBlock,58.4 -1303,Yellow Valkyrie,58,ReduceRequiredBlock,58.55 -1303,Yellow Valkyrie,59,ReduceRequiredBlock,58.7 -1303,Yellow Valkyrie,60,ReduceRequiredBlock,58.85 -1303,Yellow Valkyrie,61,ReduceRequiredBlock,59.0 -1303,Yellow Valkyrie,62,ReduceRequiredBlock,59.15 -1303,Yellow Valkyrie,63,ReduceRequiredBlock,59.3 -1303,Yellow Valkyrie,64,ReduceRequiredBlock,59.45 -1303,Yellow Valkyrie,65,ReduceRequiredBlock,59.6 -1303,Yellow Valkyrie,66,ReduceRequiredBlock,59.75 -1303,Yellow Valkyrie,67,ReduceRequiredBlock,59.9 -1303,Yellow Valkyrie,68,ReduceRequiredBlock,60.05 -1303,Yellow Valkyrie,69,ReduceRequiredBlock,60.2 -1303,Yellow Valkyrie,70,ReduceRequiredBlock,60.35 -1303,Yellow Valkyrie,71,ReduceRequiredBlock,60.5 -1303,Yellow Valkyrie,72,ReduceRequiredBlock,60.65 -1303,Yellow Valkyrie,73,ReduceRequiredBlock,60.8 -1303,Yellow Valkyrie,74,ReduceRequiredBlock,60.95 -1303,Yellow Valkyrie,75,ReduceRequiredBlock,61.1 -1303,Yellow Valkyrie,76,ReduceRequiredBlock,61.25 -1303,Yellow Valkyrie,77,ReduceRequiredBlock,61.4 -1303,Yellow Valkyrie,78,ReduceRequiredBlock,61.55 -1303,Yellow Valkyrie,79,ReduceRequiredBlock,61.7 -1303,Yellow Valkyrie,80,ReduceRequiredBlock,61.85 -1303,Yellow Valkyrie,81,ReduceRequiredBlock,62.0 -1303,Yellow Valkyrie,82,ReduceRequiredBlock,62.15 -1303,Yellow Valkyrie,83,ReduceRequiredBlock,62.3 -1303,Yellow Valkyrie,84,ReduceRequiredBlock,62.45 -1303,Yellow Valkyrie,85,ReduceRequiredBlock,62.6 -1303,Yellow Valkyrie,86,ReduceRequiredBlock,62.75 -1303,Yellow Valkyrie,87,ReduceRequiredBlock,62.9 -1303,Yellow Valkyrie,88,ReduceRequiredBlock,63.05 -1303,Yellow Valkyrie,89,ReduceRequiredBlock,63.2 -1303,Yellow Valkyrie,90,ReduceRequiredBlock,63.35 -1303,Yellow Valkyrie,91,ReduceRequiredBlock,63.5 -1303,Yellow Valkyrie,92,ReduceRequiredBlock,63.65 -1303,Yellow Valkyrie,93,ReduceRequiredBlock,63.8 -1303,Yellow Valkyrie,94,ReduceRequiredBlock,63.95 -1303,Yellow Valkyrie,95,ReduceRequiredBlock,64.1 -1303,Yellow Valkyrie,96,ReduceRequiredBlock,64.25 -1303,Yellow Valkyrie,97,ReduceRequiredBlock,64.4 -1303,Yellow Valkyrie,98,ReduceRequiredBlock,64.55 -1303,Yellow Valkyrie,99,ReduceRequiredBlock,64.7 -1303,Yellow Valkyrie,100,ReduceRequiredBlock,65.0 1004,lil fenrir,1,AdditionalOptionRate,50 1004,lil fenrir,2,AdditionalOptionRate,51 1004,lil fenrir,3,AdditionalOptionRate,52 @@ -1299,303 +399,803 @@ ID,_PetName,PetLevel,OptionType,OptionValue 1004,lil fenrir,98,AdditionalOptionRate,147 1004,lil fenrir,99,AdditionalOptionRate,148 1004,lil fenrir,100,AdditionalOptionRate,150 -1104,Icy lil fenrir,1,AdditionalOptionRate,100 -1104,Icy lil fenrir,2,AdditionalOptionRate,101 -1104,Icy lil fenrir,3,AdditionalOptionRate,102 -1104,Icy lil fenrir,4,AdditionalOptionRate,103 -1104,Icy lil fenrir,5,AdditionalOptionRate,104 -1104,Icy lil fenrir,6,AdditionalOptionRate,105 -1104,Icy lil fenrir,7,AdditionalOptionRate,106 -1104,Icy lil fenrir,8,AdditionalOptionRate,107 -1104,Icy lil fenrir,9,AdditionalOptionRate,108 -1104,Icy lil fenrir,10,AdditionalOptionRate,109 -1104,Icy lil fenrir,11,AdditionalOptionRate,110 -1104,Icy lil fenrir,12,AdditionalOptionRate,111 -1104,Icy lil fenrir,13,AdditionalOptionRate,112 -1104,Icy lil fenrir,14,AdditionalOptionRate,113 -1104,Icy lil fenrir,15,AdditionalOptionRate,114 -1104,Icy lil fenrir,16,AdditionalOptionRate,115 -1104,Icy lil fenrir,17,AdditionalOptionRate,116 -1104,Icy lil fenrir,18,AdditionalOptionRate,117 -1104,Icy lil fenrir,19,AdditionalOptionRate,118 -1104,Icy lil fenrir,20,AdditionalOptionRate,119 -1104,Icy lil fenrir,21,AdditionalOptionRate,120 -1104,Icy lil fenrir,22,AdditionalOptionRate,121 -1104,Icy lil fenrir,23,AdditionalOptionRate,122 -1104,Icy lil fenrir,24,AdditionalOptionRate,123 -1104,Icy lil fenrir,25,AdditionalOptionRate,124 -1104,Icy lil fenrir,26,AdditionalOptionRate,125 -1104,Icy lil fenrir,27,AdditionalOptionRate,126 -1104,Icy lil fenrir,28,AdditionalOptionRate,127 -1104,Icy lil fenrir,29,AdditionalOptionRate,128 -1104,Icy lil fenrir,30,AdditionalOptionRate,129 -1104,Icy lil fenrir,31,AdditionalOptionRate,130 -1104,Icy lil fenrir,32,AdditionalOptionRate,131 -1104,Icy lil fenrir,33,AdditionalOptionRate,132 -1104,Icy lil fenrir,34,AdditionalOptionRate,133 -1104,Icy lil fenrir,35,AdditionalOptionRate,134 -1104,Icy lil fenrir,36,AdditionalOptionRate,135 -1104,Icy lil fenrir,37,AdditionalOptionRate,136 -1104,Icy lil fenrir,38,AdditionalOptionRate,137 -1104,Icy lil fenrir,39,AdditionalOptionRate,138 -1104,Icy lil fenrir,40,AdditionalOptionRate,139 -1104,Icy lil fenrir,41,AdditionalOptionRate,140 -1104,Icy lil fenrir,42,AdditionalOptionRate,141 -1104,Icy lil fenrir,43,AdditionalOptionRate,142 -1104,Icy lil fenrir,44,AdditionalOptionRate,143 -1104,Icy lil fenrir,45,AdditionalOptionRate,144 -1104,Icy lil fenrir,46,AdditionalOptionRate,145 -1104,Icy lil fenrir,47,AdditionalOptionRate,146 -1104,Icy lil fenrir,48,AdditionalOptionRate,147 -1104,Icy lil fenrir,49,AdditionalOptionRate,148 -1104,Icy lil fenrir,50,AdditionalOptionRate,149 -1104,Icy lil fenrir,51,AdditionalOptionRate,150 -1104,Icy lil fenrir,52,AdditionalOptionRate,151 -1104,Icy lil fenrir,53,AdditionalOptionRate,152 -1104,Icy lil fenrir,54,AdditionalOptionRate,153 -1104,Icy lil fenrir,55,AdditionalOptionRate,154 -1104,Icy lil fenrir,56,AdditionalOptionRate,155 -1104,Icy lil fenrir,57,AdditionalOptionRate,156 -1104,Icy lil fenrir,58,AdditionalOptionRate,157 -1104,Icy lil fenrir,59,AdditionalOptionRate,158 -1104,Icy lil fenrir,60,AdditionalOptionRate,159 -1104,Icy lil fenrir,61,AdditionalOptionRate,160 -1104,Icy lil fenrir,62,AdditionalOptionRate,161 -1104,Icy lil fenrir,63,AdditionalOptionRate,162 -1104,Icy lil fenrir,64,AdditionalOptionRate,163 -1104,Icy lil fenrir,65,AdditionalOptionRate,164 -1104,Icy lil fenrir,66,AdditionalOptionRate,165 -1104,Icy lil fenrir,67,AdditionalOptionRate,166 -1104,Icy lil fenrir,68,AdditionalOptionRate,167 -1104,Icy lil fenrir,69,AdditionalOptionRate,168 -1104,Icy lil fenrir,70,AdditionalOptionRate,169 -1104,Icy lil fenrir,71,AdditionalOptionRate,170 -1104,Icy lil fenrir,72,AdditionalOptionRate,171 -1104,Icy lil fenrir,73,AdditionalOptionRate,172 -1104,Icy lil fenrir,74,AdditionalOptionRate,173 -1104,Icy lil fenrir,75,AdditionalOptionRate,174 -1104,Icy lil fenrir,76,AdditionalOptionRate,175 -1104,Icy lil fenrir,77,AdditionalOptionRate,176 -1104,Icy lil fenrir,78,AdditionalOptionRate,177 -1104,Icy lil fenrir,79,AdditionalOptionRate,178 -1104,Icy lil fenrir,80,AdditionalOptionRate,179 -1104,Icy lil fenrir,81,AdditionalOptionRate,180 -1104,Icy lil fenrir,82,AdditionalOptionRate,181 -1104,Icy lil fenrir,83,AdditionalOptionRate,182 -1104,Icy lil fenrir,84,AdditionalOptionRate,183 -1104,Icy lil fenrir,85,AdditionalOptionRate,184 -1104,Icy lil fenrir,86,AdditionalOptionRate,185 -1104,Icy lil fenrir,87,AdditionalOptionRate,186 -1104,Icy lil fenrir,88,AdditionalOptionRate,187 -1104,Icy lil fenrir,89,AdditionalOptionRate,188 -1104,Icy lil fenrir,90,AdditionalOptionRate,189 -1104,Icy lil fenrir,91,AdditionalOptionRate,190 -1104,Icy lil fenrir,92,AdditionalOptionRate,191 -1104,Icy lil fenrir,93,AdditionalOptionRate,192 -1104,Icy lil fenrir,94,AdditionalOptionRate,193 -1104,Icy lil fenrir,95,AdditionalOptionRate,194 -1104,Icy lil fenrir,96,AdditionalOptionRate,195 -1104,Icy lil fenrir,97,AdditionalOptionRate,196 -1104,Icy lil fenrir,98,AdditionalOptionRate,197 -1104,Icy lil fenrir,99,AdditionalOptionRate,198 -1104,Icy lil fenrir,100,AdditionalOptionRate,200 -1204,Magenta lil fenrir,1,AdditionalOptionRate,150 -1204,Magenta lil fenrir,2,AdditionalOptionRate,151 -1204,Magenta lil fenrir,3,AdditionalOptionRate,152 -1204,Magenta lil fenrir,4,AdditionalOptionRate,153 -1204,Magenta lil fenrir,5,AdditionalOptionRate,154 -1204,Magenta lil fenrir,6,AdditionalOptionRate,155 -1204,Magenta lil fenrir,7,AdditionalOptionRate,156 -1204,Magenta lil fenrir,8,AdditionalOptionRate,157 -1204,Magenta lil fenrir,9,AdditionalOptionRate,158 -1204,Magenta lil fenrir,10,AdditionalOptionRate,159 -1204,Magenta lil fenrir,11,AdditionalOptionRate,160 -1204,Magenta lil fenrir,12,AdditionalOptionRate,161 -1204,Magenta lil fenrir,13,AdditionalOptionRate,162 -1204,Magenta lil fenrir,14,AdditionalOptionRate,163 -1204,Magenta lil fenrir,15,AdditionalOptionRate,164 -1204,Magenta lil fenrir,16,AdditionalOptionRate,165 -1204,Magenta lil fenrir,17,AdditionalOptionRate,166 -1204,Magenta lil fenrir,18,AdditionalOptionRate,167 -1204,Magenta lil fenrir,19,AdditionalOptionRate,168 -1204,Magenta lil fenrir,20,AdditionalOptionRate,169 -1204,Magenta lil fenrir,21,AdditionalOptionRate,170 -1204,Magenta lil fenrir,22,AdditionalOptionRate,171 -1204,Magenta lil fenrir,23,AdditionalOptionRate,172 -1204,Magenta lil fenrir,24,AdditionalOptionRate,173 -1204,Magenta lil fenrir,25,AdditionalOptionRate,174 -1204,Magenta lil fenrir,26,AdditionalOptionRate,175 -1204,Magenta lil fenrir,27,AdditionalOptionRate,176 -1204,Magenta lil fenrir,28,AdditionalOptionRate,177 -1204,Magenta lil fenrir,29,AdditionalOptionRate,178 -1204,Magenta lil fenrir,30,AdditionalOptionRate,179 -1204,Magenta lil fenrir,31,AdditionalOptionRate,180 -1204,Magenta lil fenrir,32,AdditionalOptionRate,181 -1204,Magenta lil fenrir,33,AdditionalOptionRate,182 -1204,Magenta lil fenrir,34,AdditionalOptionRate,183 -1204,Magenta lil fenrir,35,AdditionalOptionRate,184 -1204,Magenta lil fenrir,36,AdditionalOptionRate,185 -1204,Magenta lil fenrir,37,AdditionalOptionRate,186 -1204,Magenta lil fenrir,38,AdditionalOptionRate,187 -1204,Magenta lil fenrir,39,AdditionalOptionRate,188 -1204,Magenta lil fenrir,40,AdditionalOptionRate,189 -1204,Magenta lil fenrir,41,AdditionalOptionRate,190 -1204,Magenta lil fenrir,42,AdditionalOptionRate,191 -1204,Magenta lil fenrir,43,AdditionalOptionRate,192 -1204,Magenta lil fenrir,44,AdditionalOptionRate,193 -1204,Magenta lil fenrir,45,AdditionalOptionRate,194 -1204,Magenta lil fenrir,46,AdditionalOptionRate,195 -1204,Magenta lil fenrir,47,AdditionalOptionRate,196 -1204,Magenta lil fenrir,48,AdditionalOptionRate,197 -1204,Magenta lil fenrir,49,AdditionalOptionRate,198 -1204,Magenta lil fenrir,50,AdditionalOptionRate,199 -1204,Magenta lil fenrir,51,AdditionalOptionRate,200 -1204,Magenta lil fenrir,52,AdditionalOptionRate,201 -1204,Magenta lil fenrir,53,AdditionalOptionRate,202 -1204,Magenta lil fenrir,54,AdditionalOptionRate,203 -1204,Magenta lil fenrir,55,AdditionalOptionRate,204 -1204,Magenta lil fenrir,56,AdditionalOptionRate,205 -1204,Magenta lil fenrir,57,AdditionalOptionRate,206 -1204,Magenta lil fenrir,58,AdditionalOptionRate,207 -1204,Magenta lil fenrir,59,AdditionalOptionRate,208 -1204,Magenta lil fenrir,60,AdditionalOptionRate,209 -1204,Magenta lil fenrir,61,AdditionalOptionRate,210 -1204,Magenta lil fenrir,62,AdditionalOptionRate,211 -1204,Magenta lil fenrir,63,AdditionalOptionRate,212 -1204,Magenta lil fenrir,64,AdditionalOptionRate,213 -1204,Magenta lil fenrir,65,AdditionalOptionRate,214 -1204,Magenta lil fenrir,66,AdditionalOptionRate,215 -1204,Magenta lil fenrir,67,AdditionalOptionRate,216 -1204,Magenta lil fenrir,68,AdditionalOptionRate,217 -1204,Magenta lil fenrir,69,AdditionalOptionRate,218 -1204,Magenta lil fenrir,70,AdditionalOptionRate,219 -1204,Magenta lil fenrir,71,AdditionalOptionRate,220 -1204,Magenta lil fenrir,72,AdditionalOptionRate,221 -1204,Magenta lil fenrir,73,AdditionalOptionRate,222 -1204,Magenta lil fenrir,74,AdditionalOptionRate,223 -1204,Magenta lil fenrir,75,AdditionalOptionRate,224 -1204,Magenta lil fenrir,76,AdditionalOptionRate,225 -1204,Magenta lil fenrir,77,AdditionalOptionRate,226 -1204,Magenta lil fenrir,78,AdditionalOptionRate,227 -1204,Magenta lil fenrir,79,AdditionalOptionRate,228 -1204,Magenta lil fenrir,80,AdditionalOptionRate,229 -1204,Magenta lil fenrir,81,AdditionalOptionRate,230 -1204,Magenta lil fenrir,82,AdditionalOptionRate,231 -1204,Magenta lil fenrir,83,AdditionalOptionRate,232 -1204,Magenta lil fenrir,84,AdditionalOptionRate,233 -1204,Magenta lil fenrir,85,AdditionalOptionRate,234 -1204,Magenta lil fenrir,86,AdditionalOptionRate,235 -1204,Magenta lil fenrir,87,AdditionalOptionRate,236 -1204,Magenta lil fenrir,88,AdditionalOptionRate,237 -1204,Magenta lil fenrir,89,AdditionalOptionRate,238 -1204,Magenta lil fenrir,90,AdditionalOptionRate,239 -1204,Magenta lil fenrir,91,AdditionalOptionRate,240 -1204,Magenta lil fenrir,92,AdditionalOptionRate,241 -1204,Magenta lil fenrir,93,AdditionalOptionRate,242 -1204,Magenta lil fenrir,94,AdditionalOptionRate,243 -1204,Magenta lil fenrir,95,AdditionalOptionRate,244 -1204,Magenta lil fenrir,96,AdditionalOptionRate,245 -1204,Magenta lil fenrir,97,AdditionalOptionRate,246 -1204,Magenta lil fenrir,98,AdditionalOptionRate,247 -1204,Magenta lil fenrir,99,AdditionalOptionRate,248 -1204,Magenta lil fenrir,100,AdditionalOptionRate,250 -1304,Yellow lil fenrir,1,AdditionalOptionRate,200 -1304,Yellow lil fenrir,2,AdditionalOptionRate,201 -1304,Yellow lil fenrir,3,AdditionalOptionRate,202 -1304,Yellow lil fenrir,4,AdditionalOptionRate,203 -1304,Yellow lil fenrir,5,AdditionalOptionRate,204 -1304,Yellow lil fenrir,6,AdditionalOptionRate,205 -1304,Yellow lil fenrir,7,AdditionalOptionRate,206 -1304,Yellow lil fenrir,8,AdditionalOptionRate,207 -1304,Yellow lil fenrir,9,AdditionalOptionRate,208 -1304,Yellow lil fenrir,10,AdditionalOptionRate,209 -1304,Yellow lil fenrir,11,AdditionalOptionRate,210 -1304,Yellow lil fenrir,12,AdditionalOptionRate,211 -1304,Yellow lil fenrir,13,AdditionalOptionRate,212 -1304,Yellow lil fenrir,14,AdditionalOptionRate,213 -1304,Yellow lil fenrir,15,AdditionalOptionRate,214 -1304,Yellow lil fenrir,16,AdditionalOptionRate,215 -1304,Yellow lil fenrir,17,AdditionalOptionRate,216 -1304,Yellow lil fenrir,18,AdditionalOptionRate,217 -1304,Yellow lil fenrir,19,AdditionalOptionRate,218 -1304,Yellow lil fenrir,20,AdditionalOptionRate,219 -1304,Yellow lil fenrir,21,AdditionalOptionRate,220 -1304,Yellow lil fenrir,22,AdditionalOptionRate,221 -1304,Yellow lil fenrir,23,AdditionalOptionRate,222 -1304,Yellow lil fenrir,24,AdditionalOptionRate,223 -1304,Yellow lil fenrir,25,AdditionalOptionRate,224 -1304,Yellow lil fenrir,26,AdditionalOptionRate,225 -1304,Yellow lil fenrir,27,AdditionalOptionRate,226 -1304,Yellow lil fenrir,28,AdditionalOptionRate,227 -1304,Yellow lil fenrir,29,AdditionalOptionRate,228 -1304,Yellow lil fenrir,30,AdditionalOptionRate,229 -1304,Yellow lil fenrir,31,AdditionalOptionRate,230 -1304,Yellow lil fenrir,32,AdditionalOptionRate,231 -1304,Yellow lil fenrir,33,AdditionalOptionRate,232 -1304,Yellow lil fenrir,34,AdditionalOptionRate,233 -1304,Yellow lil fenrir,35,AdditionalOptionRate,234 -1304,Yellow lil fenrir,36,AdditionalOptionRate,235 -1304,Yellow lil fenrir,37,AdditionalOptionRate,236 -1304,Yellow lil fenrir,38,AdditionalOptionRate,237 -1304,Yellow lil fenrir,39,AdditionalOptionRate,238 -1304,Yellow lil fenrir,40,AdditionalOptionRate,239 -1304,Yellow lil fenrir,41,AdditionalOptionRate,240 -1304,Yellow lil fenrir,42,AdditionalOptionRate,241 -1304,Yellow lil fenrir,43,AdditionalOptionRate,242 -1304,Yellow lil fenrir,44,AdditionalOptionRate,243 -1304,Yellow lil fenrir,45,AdditionalOptionRate,244 -1304,Yellow lil fenrir,46,AdditionalOptionRate,245 -1304,Yellow lil fenrir,47,AdditionalOptionRate,246 -1304,Yellow lil fenrir,48,AdditionalOptionRate,247 -1304,Yellow lil fenrir,49,AdditionalOptionRate,248 -1304,Yellow lil fenrir,50,AdditionalOptionRate,249 -1304,Yellow lil fenrir,51,AdditionalOptionRate,250 -1304,Yellow lil fenrir,52,AdditionalOptionRate,251 -1304,Yellow lil fenrir,53,AdditionalOptionRate,252 -1304,Yellow lil fenrir,54,AdditionalOptionRate,253 -1304,Yellow lil fenrir,55,AdditionalOptionRate,254 -1304,Yellow lil fenrir,56,AdditionalOptionRate,255 -1304,Yellow lil fenrir,57,AdditionalOptionRate,256 -1304,Yellow lil fenrir,58,AdditionalOptionRate,257 -1304,Yellow lil fenrir,59,AdditionalOptionRate,258 -1304,Yellow lil fenrir,60,AdditionalOptionRate,259 -1304,Yellow lil fenrir,61,AdditionalOptionRate,260 -1304,Yellow lil fenrir,62,AdditionalOptionRate,261 -1304,Yellow lil fenrir,63,AdditionalOptionRate,262 -1304,Yellow lil fenrir,64,AdditionalOptionRate,263 -1304,Yellow lil fenrir,65,AdditionalOptionRate,264 -1304,Yellow lil fenrir,66,AdditionalOptionRate,265 -1304,Yellow lil fenrir,67,AdditionalOptionRate,266 -1304,Yellow lil fenrir,68,AdditionalOptionRate,267 -1304,Yellow lil fenrir,69,AdditionalOptionRate,268 -1304,Yellow lil fenrir,70,AdditionalOptionRate,269 -1304,Yellow lil fenrir,71,AdditionalOptionRate,270 -1304,Yellow lil fenrir,72,AdditionalOptionRate,271 -1304,Yellow lil fenrir,73,AdditionalOptionRate,272 -1304,Yellow lil fenrir,74,AdditionalOptionRate,273 -1304,Yellow lil fenrir,75,AdditionalOptionRate,274 -1304,Yellow lil fenrir,76,AdditionalOptionRate,275 -1304,Yellow lil fenrir,77,AdditionalOptionRate,276 -1304,Yellow lil fenrir,78,AdditionalOptionRate,277 -1304,Yellow lil fenrir,79,AdditionalOptionRate,278 -1304,Yellow lil fenrir,80,AdditionalOptionRate,279 -1304,Yellow lil fenrir,81,AdditionalOptionRate,280 -1304,Yellow lil fenrir,82,AdditionalOptionRate,281 -1304,Yellow lil fenrir,83,AdditionalOptionRate,282 -1304,Yellow lil fenrir,84,AdditionalOptionRate,283 -1304,Yellow lil fenrir,85,AdditionalOptionRate,284 -1304,Yellow lil fenrir,86,AdditionalOptionRate,285 -1304,Yellow lil fenrir,87,AdditionalOptionRate,286 -1304,Yellow lil fenrir,88,AdditionalOptionRate,287 -1304,Yellow lil fenrir,89,AdditionalOptionRate,288 -1304,Yellow lil fenrir,90,AdditionalOptionRate,289 -1304,Yellow lil fenrir,91,AdditionalOptionRate,290 -1304,Yellow lil fenrir,92,AdditionalOptionRate,291 -1304,Yellow lil fenrir,93,AdditionalOptionRate,292 -1304,Yellow lil fenrir,94,AdditionalOptionRate,293 -1304,Yellow lil fenrir,95,AdditionalOptionRate,294 -1304,Yellow lil fenrir,96,AdditionalOptionRate,295 -1304,Yellow lil fenrir,97,AdditionalOptionRate,296 -1304,Yellow lil fenrir,98,AdditionalOptionRate,297 -1304,Yellow lil fenrir,99,AdditionalOptionRate,298 -1304,Yellow lil fenrir,100,AdditionalOptionRate,300 \ No newline at end of file +1011,Ribbon BlackCat,1,IncreaseBlockPerHourglass,1.5 +1011,Ribbon BlackCat,2,IncreaseBlockPerHourglass,1.53 +1011,Ribbon BlackCat,3,IncreaseBlockPerHourglass,1.56 +1011,Ribbon BlackCat,4,IncreaseBlockPerHourglass,1.59 +1011,Ribbon BlackCat,5,IncreaseBlockPerHourglass,1.62 +1011,Ribbon BlackCat,6,IncreaseBlockPerHourglass,1.6500000000000001 +1011,Ribbon BlackCat,7,IncreaseBlockPerHourglass,1.6800000000000002 +1011,Ribbon BlackCat,8,IncreaseBlockPerHourglass,1.71 +1011,Ribbon BlackCat,9,IncreaseBlockPerHourglass,1.7399999999999998 +1011,Ribbon BlackCat,10,IncreaseBlockPerHourglass,1.77 +1011,Ribbon BlackCat,11,IncreaseBlockPerHourglass,1.7999999999999998 +1011,Ribbon BlackCat,12,IncreaseBlockPerHourglass,1.83 +1011,Ribbon BlackCat,13,IncreaseBlockPerHourglass,1.8599999999999999 +1011,Ribbon BlackCat,14,IncreaseBlockPerHourglass,1.8900000000000001 +1011,Ribbon BlackCat,15,IncreaseBlockPerHourglass,1.92 +1011,Ribbon BlackCat,16,IncreaseBlockPerHourglass,1.9500000000000002 +1011,Ribbon BlackCat,17,IncreaseBlockPerHourglass,1.98 +1011,Ribbon BlackCat,18,IncreaseBlockPerHourglass,2.0100000000000002 +1011,Ribbon BlackCat,19,IncreaseBlockPerHourglass,2.04 +1011,Ribbon BlackCat,20,IncreaseBlockPerHourglass,2.07 +1011,Ribbon BlackCat,21,IncreaseBlockPerHourglass,2.0999999999999996 +1011,Ribbon BlackCat,22,IncreaseBlockPerHourglass,2.13 +1011,Ribbon BlackCat,23,IncreaseBlockPerHourglass,2.16 +1011,Ribbon BlackCat,24,IncreaseBlockPerHourglass,2.19 +1011,Ribbon BlackCat,25,IncreaseBlockPerHourglass,2.2199999999999998 +1011,Ribbon BlackCat,26,IncreaseBlockPerHourglass,2.25 +1011,Ribbon BlackCat,27,IncreaseBlockPerHourglass,2.2800000000000002 +1011,Ribbon BlackCat,28,IncreaseBlockPerHourglass,2.31 +1011,Ribbon BlackCat,29,IncreaseBlockPerHourglass,2.34 +1011,Ribbon BlackCat,30,IncreaseBlockPerHourglass,2.37 +1011,Ribbon BlackCat,31,IncreaseBlockPerHourglass,2.4000000000000004 +1011,Ribbon BlackCat,32,IncreaseBlockPerHourglass,2.43 +1011,Ribbon BlackCat,33,IncreaseBlockPerHourglass,2.46 +1011,Ribbon BlackCat,34,IncreaseBlockPerHourglass,2.4899999999999998 +1011,Ribbon BlackCat,35,IncreaseBlockPerHourglass,2.52 +1011,Ribbon BlackCat,36,IncreaseBlockPerHourglass,2.55 +1011,Ribbon BlackCat,37,IncreaseBlockPerHourglass,2.58 +1011,Ribbon BlackCat,38,IncreaseBlockPerHourglass,2.61 +1011,Ribbon BlackCat,39,IncreaseBlockPerHourglass,2.64 +1011,Ribbon BlackCat,40,IncreaseBlockPerHourglass,2.67 +1011,Ribbon BlackCat,41,IncreaseBlockPerHourglass,2.7 +1011,Ribbon BlackCat,42,IncreaseBlockPerHourglass,2.73 +1011,Ribbon BlackCat,43,IncreaseBlockPerHourglass,2.7600000000000002 +1011,Ribbon BlackCat,44,IncreaseBlockPerHourglass,2.79 +1011,Ribbon BlackCat,45,IncreaseBlockPerHourglass,2.82 +1011,Ribbon BlackCat,46,IncreaseBlockPerHourglass,2.8499999999999996 +1011,Ribbon BlackCat,47,IncreaseBlockPerHourglass,2.88 +1011,Ribbon BlackCat,48,IncreaseBlockPerHourglass,2.91 +1011,Ribbon BlackCat,49,IncreaseBlockPerHourglass,2.94 +1011,Ribbon BlackCat,50,IncreaseBlockPerHourglass,2.9699999999999998 +1011,Ribbon BlackCat,51,IncreaseBlockPerHourglass,3.0 +1011,Ribbon BlackCat,52,IncreaseBlockPerHourglass,3.0300000000000002 +1011,Ribbon BlackCat,53,IncreaseBlockPerHourglass,3.06 +1011,Ribbon BlackCat,54,IncreaseBlockPerHourglass,3.09 +1011,Ribbon BlackCat,55,IncreaseBlockPerHourglass,3.12 +1011,Ribbon BlackCat,56,IncreaseBlockPerHourglass,3.1500000000000004 +1011,Ribbon BlackCat,57,IncreaseBlockPerHourglass,3.18 +1011,Ribbon BlackCat,58,IncreaseBlockPerHourglass,3.21 +1011,Ribbon BlackCat,59,IncreaseBlockPerHourglass,3.24 +1011,Ribbon BlackCat,60,IncreaseBlockPerHourglass,3.2700000000000005 +1011,Ribbon BlackCat,61,IncreaseBlockPerHourglass,3.3000000000000003 +1011,Ribbon BlackCat,62,IncreaseBlockPerHourglass,3.33 +1011,Ribbon BlackCat,63,IncreaseBlockPerHourglass,3.3600000000000003 +1011,Ribbon BlackCat,64,IncreaseBlockPerHourglass,3.3899999999999997 +1011,Ribbon BlackCat,65,IncreaseBlockPerHourglass,3.42 +1011,Ribbon BlackCat,66,IncreaseBlockPerHourglass,3.4499999999999997 +1011,Ribbon BlackCat,67,IncreaseBlockPerHourglass,3.4799999999999995 +1011,Ribbon BlackCat,68,IncreaseBlockPerHourglass,3.51 +1011,Ribbon BlackCat,69,IncreaseBlockPerHourglass,3.54 +1011,Ribbon BlackCat,70,IncreaseBlockPerHourglass,3.57 +1011,Ribbon BlackCat,71,IncreaseBlockPerHourglass,3.5999999999999996 +1011,Ribbon BlackCat,72,IncreaseBlockPerHourglass,3.63 +1011,Ribbon BlackCat,73,IncreaseBlockPerHourglass,3.66 +1011,Ribbon BlackCat,74,IncreaseBlockPerHourglass,3.69 +1011,Ribbon BlackCat,75,IncreaseBlockPerHourglass,3.7199999999999998 +1011,Ribbon BlackCat,76,IncreaseBlockPerHourglass,3.75 +1011,Ribbon BlackCat,77,IncreaseBlockPerHourglass,3.7800000000000002 +1011,Ribbon BlackCat,78,IncreaseBlockPerHourglass,3.81 +1011,Ribbon BlackCat,79,IncreaseBlockPerHourglass,3.84 +1011,Ribbon BlackCat,80,IncreaseBlockPerHourglass,3.87 +1011,Ribbon BlackCat,81,IncreaseBlockPerHourglass,3.9000000000000004 +1011,Ribbon BlackCat,82,IncreaseBlockPerHourglass,3.93 +1011,Ribbon BlackCat,83,IncreaseBlockPerHourglass,3.96 +1011,Ribbon BlackCat,84,IncreaseBlockPerHourglass,3.99 +1011,Ribbon BlackCat,85,IncreaseBlockPerHourglass,4.0200000000000005 +1011,Ribbon BlackCat,86,IncreaseBlockPerHourglass,4.050000000000001 +1011,Ribbon BlackCat,87,IncreaseBlockPerHourglass,4.08 +1011,Ribbon BlackCat,88,IncreaseBlockPerHourglass,4.11 +1011,Ribbon BlackCat,89,IncreaseBlockPerHourglass,4.14 +1011,Ribbon BlackCat,90,IncreaseBlockPerHourglass,4.17 +1011,Ribbon BlackCat,91,IncreaseBlockPerHourglass,4.199999999999999 +1011,Ribbon BlackCat,92,IncreaseBlockPerHourglass,4.2299999999999995 +1011,Ribbon BlackCat,93,IncreaseBlockPerHourglass,4.26 +1011,Ribbon BlackCat,94,IncreaseBlockPerHourglass,4.29 +1011,Ribbon BlackCat,95,IncreaseBlockPerHourglass,4.32 +1011,Ribbon BlackCat,96,IncreaseBlockPerHourglass,4.35 +1011,Ribbon BlackCat,97,IncreaseBlockPerHourglass,4.38 +1011,Ribbon BlackCat,98,IncreaseBlockPerHourglass,4.41 +1011,Ribbon BlackCat,99,IncreaseBlockPerHourglass,4.4399999999999995 +1011,Ribbon BlackCat,100,IncreaseBlockPerHourglass,4.5 +1012,Peach Dongle,1,DiscountMaterialCostCrystal,30.0 +1012,Peach Dongle,2,DiscountMaterialCostCrystal,30.299999999999997 +1012,Peach Dongle,3,DiscountMaterialCostCrystal,30.599999999999998 +1012,Peach Dongle,4,DiscountMaterialCostCrystal,30.900000000000002 +1012,Peach Dongle,5,DiscountMaterialCostCrystal,31.200000000000003 +1012,Peach Dongle,6,DiscountMaterialCostCrystal,31.5 +1012,Peach Dongle,7,DiscountMaterialCostCrystal,31.799999999999997 +1012,Peach Dongle,8,DiscountMaterialCostCrystal,32.099999999999994 +1012,Peach Dongle,9,DiscountMaterialCostCrystal,32.400000000000006 +1012,Peach Dongle,10,DiscountMaterialCostCrystal,32.7 +1012,Peach Dongle,11,DiscountMaterialCostCrystal,33.0 +1012,Peach Dongle,12,DiscountMaterialCostCrystal,33.3 +1012,Peach Dongle,13,DiscountMaterialCostCrystal,33.599999999999994 +1012,Peach Dongle,14,DiscountMaterialCostCrystal,33.900000000000006 +1012,Peach Dongle,15,DiscountMaterialCostCrystal,34.2 +1012,Peach Dongle,16,DiscountMaterialCostCrystal,34.5 +1012,Peach Dongle,17,DiscountMaterialCostCrystal,34.8 +1012,Peach Dongle,18,DiscountMaterialCostCrystal,35.099999999999994 +1012,Peach Dongle,19,DiscountMaterialCostCrystal,35.400000000000006 +1012,Peach Dongle,20,DiscountMaterialCostCrystal,35.7 +1012,Peach Dongle,21,DiscountMaterialCostCrystal,36.0 +1012,Peach Dongle,22,DiscountMaterialCostCrystal,36.3 +1012,Peach Dongle,23,DiscountMaterialCostCrystal,36.599999999999994 +1012,Peach Dongle,24,DiscountMaterialCostCrystal,36.900000000000006 +1012,Peach Dongle,25,DiscountMaterialCostCrystal,37.2 +1012,Peach Dongle,26,DiscountMaterialCostCrystal,37.5 +1012,Peach Dongle,27,DiscountMaterialCostCrystal,37.8 +1012,Peach Dongle,28,DiscountMaterialCostCrystal,38.099999999999994 +1012,Peach Dongle,29,DiscountMaterialCostCrystal,38.400000000000006 +1012,Peach Dongle,30,DiscountMaterialCostCrystal,38.7 +1012,Peach Dongle,31,DiscountMaterialCostCrystal,39.0 +1012,Peach Dongle,32,DiscountMaterialCostCrystal,39.3 +1012,Peach Dongle,33,DiscountMaterialCostCrystal,39.599999999999994 +1012,Peach Dongle,34,DiscountMaterialCostCrystal,39.900000000000006 +1012,Peach Dongle,35,DiscountMaterialCostCrystal,40.2 +1012,Peach Dongle,36,DiscountMaterialCostCrystal,40.5 +1012,Peach Dongle,37,DiscountMaterialCostCrystal,40.8 +1012,Peach Dongle,38,DiscountMaterialCostCrystal,41.099999999999994 +1012,Peach Dongle,39,DiscountMaterialCostCrystal,41.400000000000006 +1012,Peach Dongle,40,DiscountMaterialCostCrystal,41.7 +1012,Peach Dongle,41,DiscountMaterialCostCrystal,42.0 +1012,Peach Dongle,42,DiscountMaterialCostCrystal,42.3 +1012,Peach Dongle,43,DiscountMaterialCostCrystal,42.599999999999994 +1012,Peach Dongle,44,DiscountMaterialCostCrystal,42.900000000000006 +1012,Peach Dongle,45,DiscountMaterialCostCrystal,43.2 +1012,Peach Dongle,46,DiscountMaterialCostCrystal,43.5 +1012,Peach Dongle,47,DiscountMaterialCostCrystal,43.8 +1012,Peach Dongle,48,DiscountMaterialCostCrystal,44.099999999999994 +1012,Peach Dongle,49,DiscountMaterialCostCrystal,44.400000000000006 +1012,Peach Dongle,50,DiscountMaterialCostCrystal,44.7 +1012,Peach Dongle,51,DiscountMaterialCostCrystal,45.0 +1012,Peach Dongle,52,DiscountMaterialCostCrystal,45.3 +1012,Peach Dongle,53,DiscountMaterialCostCrystal,45.599999999999994 +1012,Peach Dongle,54,DiscountMaterialCostCrystal,45.900000000000006 +1012,Peach Dongle,55,DiscountMaterialCostCrystal,46.2 +1012,Peach Dongle,56,DiscountMaterialCostCrystal,46.5 +1012,Peach Dongle,57,DiscountMaterialCostCrystal,46.8 +1012,Peach Dongle,58,DiscountMaterialCostCrystal,47.099999999999994 +1012,Peach Dongle,59,DiscountMaterialCostCrystal,47.400000000000006 +1012,Peach Dongle,60,DiscountMaterialCostCrystal,47.7 +1012,Peach Dongle,61,DiscountMaterialCostCrystal,48.0 +1012,Peach Dongle,62,DiscountMaterialCostCrystal,48.300000000000004 +1012,Peach Dongle,63,DiscountMaterialCostCrystal,48.599999999999994 +1012,Peach Dongle,64,DiscountMaterialCostCrystal,48.900000000000006 +1012,Peach Dongle,65,DiscountMaterialCostCrystal,49.199999999999996 +1012,Peach Dongle,66,DiscountMaterialCostCrystal,49.5 +1012,Peach Dongle,67,DiscountMaterialCostCrystal,49.800000000000004 +1012,Peach Dongle,68,DiscountMaterialCostCrystal,50.099999999999994 +1012,Peach Dongle,69,DiscountMaterialCostCrystal,50.400000000000006 +1012,Peach Dongle,70,DiscountMaterialCostCrystal,50.699999999999996 +1012,Peach Dongle,71,DiscountMaterialCostCrystal,51.0 +1012,Peach Dongle,72,DiscountMaterialCostCrystal,51.300000000000004 +1012,Peach Dongle,73,DiscountMaterialCostCrystal,51.599999999999994 +1012,Peach Dongle,74,DiscountMaterialCostCrystal,51.900000000000006 +1012,Peach Dongle,75,DiscountMaterialCostCrystal,52.199999999999996 +1012,Peach Dongle,76,DiscountMaterialCostCrystal,52.5 +1012,Peach Dongle,77,DiscountMaterialCostCrystal,52.800000000000004 +1012,Peach Dongle,78,DiscountMaterialCostCrystal,53.099999999999994 +1012,Peach Dongle,79,DiscountMaterialCostCrystal,53.400000000000006 +1012,Peach Dongle,80,DiscountMaterialCostCrystal,53.699999999999996 +1012,Peach Dongle,81,DiscountMaterialCostCrystal,54.0 +1012,Peach Dongle,82,DiscountMaterialCostCrystal,54.300000000000004 +1012,Peach Dongle,83,DiscountMaterialCostCrystal,54.599999999999994 +1012,Peach Dongle,84,DiscountMaterialCostCrystal,54.900000000000006 +1012,Peach Dongle,85,DiscountMaterialCostCrystal,55.199999999999996 +1012,Peach Dongle,86,DiscountMaterialCostCrystal,55.5 +1012,Peach Dongle,87,DiscountMaterialCostCrystal,55.800000000000004 +1012,Peach Dongle,88,DiscountMaterialCostCrystal,56.099999999999994 +1012,Peach Dongle,89,DiscountMaterialCostCrystal,56.400000000000006 +1012,Peach Dongle,90,DiscountMaterialCostCrystal,56.699999999999996 +1012,Peach Dongle,91,DiscountMaterialCostCrystal,57.0 +1012,Peach Dongle,92,DiscountMaterialCostCrystal,57.300000000000004 +1012,Peach Dongle,93,DiscountMaterialCostCrystal,57.599999999999994 +1012,Peach Dongle,94,DiscountMaterialCostCrystal,57.900000000000006 +1012,Peach Dongle,95,DiscountMaterialCostCrystal,58.199999999999996 +1012,Peach Dongle,96,DiscountMaterialCostCrystal,58.5 +1012,Peach Dongle,97,DiscountMaterialCostCrystal,58.800000000000004 +1012,Peach Dongle,98,DiscountMaterialCostCrystal,59.099999999999994 +1012,Peach Dongle,99,DiscountMaterialCostCrystal,59.400000000000006 +1012,Peach Dongle,100,DiscountMaterialCostCrystal,60.0 +1013,Valkyrie of Blue Light,1,ReduceRequiredBlock,30.0 +1013,Valkyrie of Blue Light,2,ReduceRequiredBlock,30.224999999999998 +1013,Valkyrie of Blue Light,3,ReduceRequiredBlock,30.450000000000003 +1013,Valkyrie of Blue Light,4,ReduceRequiredBlock,30.674999999999997 +1013,Valkyrie of Blue Light,5,ReduceRequiredBlock,30.900000000000002 +1013,Valkyrie of Blue Light,6,ReduceRequiredBlock,31.125 +1013,Valkyrie of Blue Light,7,ReduceRequiredBlock,31.349999999999998 +1013,Valkyrie of Blue Light,8,ReduceRequiredBlock,31.575000000000003 +1013,Valkyrie of Blue Light,9,ReduceRequiredBlock,31.799999999999997 +1013,Valkyrie of Blue Light,10,ReduceRequiredBlock,32.025000000000006 +1013,Valkyrie of Blue Light,11,ReduceRequiredBlock,32.25 +1013,Valkyrie of Blue Light,12,ReduceRequiredBlock,32.474999999999994 +1013,Valkyrie of Blue Light,13,ReduceRequiredBlock,32.7 +1013,Valkyrie of Blue Light,14,ReduceRequiredBlock,32.925 +1013,Valkyrie of Blue Light,15,ReduceRequiredBlock,33.150000000000006 +1013,Valkyrie of Blue Light,16,ReduceRequiredBlock,33.375 +1013,Valkyrie of Blue Light,17,ReduceRequiredBlock,33.599999999999994 +1013,Valkyrie of Blue Light,18,ReduceRequiredBlock,33.825 +1013,Valkyrie of Blue Light,19,ReduceRequiredBlock,34.05 +1013,Valkyrie of Blue Light,20,ReduceRequiredBlock,34.275000000000006 +1013,Valkyrie of Blue Light,21,ReduceRequiredBlock,34.5 +1013,Valkyrie of Blue Light,22,ReduceRequiredBlock,34.724999999999994 +1013,Valkyrie of Blue Light,23,ReduceRequiredBlock,34.95 +1013,Valkyrie of Blue Light,24,ReduceRequiredBlock,35.175 +1013,Valkyrie of Blue Light,25,ReduceRequiredBlock,35.400000000000006 +1013,Valkyrie of Blue Light,26,ReduceRequiredBlock,35.625 +1013,Valkyrie of Blue Light,27,ReduceRequiredBlock,35.849999999999994 +1013,Valkyrie of Blue Light,28,ReduceRequiredBlock,36.075 +1013,Valkyrie of Blue Light,29,ReduceRequiredBlock,36.3 +1013,Valkyrie of Blue Light,30,ReduceRequiredBlock,36.525000000000006 +1013,Valkyrie of Blue Light,31,ReduceRequiredBlock,36.75 +1013,Valkyrie of Blue Light,32,ReduceRequiredBlock,36.974999999999994 +1013,Valkyrie of Blue Light,33,ReduceRequiredBlock,37.2 +1013,Valkyrie of Blue Light,34,ReduceRequiredBlock,37.425 +1013,Valkyrie of Blue Light,35,ReduceRequiredBlock,37.650000000000006 +1013,Valkyrie of Blue Light,36,ReduceRequiredBlock,37.875 +1013,Valkyrie of Blue Light,37,ReduceRequiredBlock,38.099999999999994 +1013,Valkyrie of Blue Light,38,ReduceRequiredBlock,38.325 +1013,Valkyrie of Blue Light,39,ReduceRequiredBlock,38.55 +1013,Valkyrie of Blue Light,40,ReduceRequiredBlock,38.775000000000006 +1013,Valkyrie of Blue Light,41,ReduceRequiredBlock,39.0 +1013,Valkyrie of Blue Light,42,ReduceRequiredBlock,39.224999999999994 +1013,Valkyrie of Blue Light,43,ReduceRequiredBlock,39.45 +1013,Valkyrie of Blue Light,44,ReduceRequiredBlock,39.675 +1013,Valkyrie of Blue Light,45,ReduceRequiredBlock,39.900000000000006 +1013,Valkyrie of Blue Light,46,ReduceRequiredBlock,40.125 +1013,Valkyrie of Blue Light,47,ReduceRequiredBlock,40.349999999999994 +1013,Valkyrie of Blue Light,48,ReduceRequiredBlock,40.575 +1013,Valkyrie of Blue Light,49,ReduceRequiredBlock,40.8 +1013,Valkyrie of Blue Light,50,ReduceRequiredBlock,41.025000000000006 +1013,Valkyrie of Blue Light,51,ReduceRequiredBlock,41.25 +1013,Valkyrie of Blue Light,52,ReduceRequiredBlock,41.474999999999994 +1013,Valkyrie of Blue Light,53,ReduceRequiredBlock,41.7 +1013,Valkyrie of Blue Light,54,ReduceRequiredBlock,41.925 +1013,Valkyrie of Blue Light,55,ReduceRequiredBlock,42.150000000000006 +1013,Valkyrie of Blue Light,56,ReduceRequiredBlock,42.375 +1013,Valkyrie of Blue Light,57,ReduceRequiredBlock,42.599999999999994 +1013,Valkyrie of Blue Light,58,ReduceRequiredBlock,42.825 +1013,Valkyrie of Blue Light,59,ReduceRequiredBlock,43.05 +1013,Valkyrie of Blue Light,60,ReduceRequiredBlock,43.275000000000006 +1013,Valkyrie of Blue Light,61,ReduceRequiredBlock,43.5 +1013,Valkyrie of Blue Light,62,ReduceRequiredBlock,43.724999999999994 +1013,Valkyrie of Blue Light,63,ReduceRequiredBlock,43.95 +1013,Valkyrie of Blue Light,64,ReduceRequiredBlock,44.175 +1013,Valkyrie of Blue Light,65,ReduceRequiredBlock,44.400000000000006 +1013,Valkyrie of Blue Light,66,ReduceRequiredBlock,44.625 +1013,Valkyrie of Blue Light,67,ReduceRequiredBlock,44.849999999999994 +1013,Valkyrie of Blue Light,68,ReduceRequiredBlock,45.075 +1013,Valkyrie of Blue Light,69,ReduceRequiredBlock,45.3 +1013,Valkyrie of Blue Light,70,ReduceRequiredBlock,45.525000000000006 +1013,Valkyrie of Blue Light,71,ReduceRequiredBlock,45.75 +1013,Valkyrie of Blue Light,72,ReduceRequiredBlock,45.974999999999994 +1013,Valkyrie of Blue Light,73,ReduceRequiredBlock,46.2 +1013,Valkyrie of Blue Light,74,ReduceRequiredBlock,46.425 +1013,Valkyrie of Blue Light,75,ReduceRequiredBlock,46.650000000000006 +1013,Valkyrie of Blue Light,76,ReduceRequiredBlock,46.875 +1013,Valkyrie of Blue Light,77,ReduceRequiredBlock,47.099999999999994 +1013,Valkyrie of Blue Light,78,ReduceRequiredBlock,47.325 +1013,Valkyrie of Blue Light,79,ReduceRequiredBlock,47.55 +1013,Valkyrie of Blue Light,80,ReduceRequiredBlock,47.775000000000006 +1013,Valkyrie of Blue Light,81,ReduceRequiredBlock,48.0 +1013,Valkyrie of Blue Light,82,ReduceRequiredBlock,48.224999999999994 +1013,Valkyrie of Blue Light,83,ReduceRequiredBlock,48.449999999999996 +1013,Valkyrie of Blue Light,84,ReduceRequiredBlock,48.675000000000004 +1013,Valkyrie of Blue Light,85,ReduceRequiredBlock,48.900000000000006 +1013,Valkyrie of Blue Light,86,ReduceRequiredBlock,49.125 +1013,Valkyrie of Blue Light,87,ReduceRequiredBlock,49.349999999999994 +1013,Valkyrie of Blue Light,88,ReduceRequiredBlock,49.574999999999996 +1013,Valkyrie of Blue Light,89,ReduceRequiredBlock,49.800000000000004 +1013,Valkyrie of Blue Light,90,ReduceRequiredBlock,50.025000000000006 +1013,Valkyrie of Blue Light,91,ReduceRequiredBlock,50.25 +1013,Valkyrie of Blue Light,92,ReduceRequiredBlock,50.474999999999994 +1013,Valkyrie of Blue Light,93,ReduceRequiredBlock,50.699999999999996 +1013,Valkyrie of Blue Light,94,ReduceRequiredBlock,50.925000000000004 +1013,Valkyrie of Blue Light,95,ReduceRequiredBlock,51.150000000000006 +1013,Valkyrie of Blue Light,96,ReduceRequiredBlock,51.375 +1013,Valkyrie of Blue Light,97,ReduceRequiredBlock,51.599999999999994 +1013,Valkyrie of Blue Light,98,ReduceRequiredBlock,51.824999999999996 +1013,Valkyrie of Blue Light,99,ReduceRequiredBlock,52.050000000000004 +1013,Valkyrie of Blue Light,100,ReduceRequiredBlock,52.5 +1014,Forest Lil' Fenrir,1,AdditionalOptionRate,75.0 +1014,Forest Lil' Fenrir,2,AdditionalOptionRate,76.5 +1014,Forest Lil' Fenrir,3,AdditionalOptionRate,78.0 +1014,Forest Lil' Fenrir,4,AdditionalOptionRate,79.5 +1014,Forest Lil' Fenrir,5,AdditionalOptionRate,81.0 +1014,Forest Lil' Fenrir,6,AdditionalOptionRate,82.5 +1014,Forest Lil' Fenrir,7,AdditionalOptionRate,84.0 +1014,Forest Lil' Fenrir,8,AdditionalOptionRate,85.5 +1014,Forest Lil' Fenrir,9,AdditionalOptionRate,87.0 +1014,Forest Lil' Fenrir,10,AdditionalOptionRate,88.5 +1014,Forest Lil' Fenrir,11,AdditionalOptionRate,90.0 +1014,Forest Lil' Fenrir,12,AdditionalOptionRate,91.5 +1014,Forest Lil' Fenrir,13,AdditionalOptionRate,93.0 +1014,Forest Lil' Fenrir,14,AdditionalOptionRate,94.5 +1014,Forest Lil' Fenrir,15,AdditionalOptionRate,96.0 +1014,Forest Lil' Fenrir,16,AdditionalOptionRate,97.5 +1014,Forest Lil' Fenrir,17,AdditionalOptionRate,99.0 +1014,Forest Lil' Fenrir,18,AdditionalOptionRate,100.5 +1014,Forest Lil' Fenrir,19,AdditionalOptionRate,102.0 +1014,Forest Lil' Fenrir,20,AdditionalOptionRate,103.5 +1014,Forest Lil' Fenrir,21,AdditionalOptionRate,105.0 +1014,Forest Lil' Fenrir,22,AdditionalOptionRate,106.5 +1014,Forest Lil' Fenrir,23,AdditionalOptionRate,108.0 +1014,Forest Lil' Fenrir,24,AdditionalOptionRate,109.5 +1014,Forest Lil' Fenrir,25,AdditionalOptionRate,111.0 +1014,Forest Lil' Fenrir,26,AdditionalOptionRate,112.5 +1014,Forest Lil' Fenrir,27,AdditionalOptionRate,114.0 +1014,Forest Lil' Fenrir,28,AdditionalOptionRate,115.5 +1014,Forest Lil' Fenrir,29,AdditionalOptionRate,117.0 +1014,Forest Lil' Fenrir,30,AdditionalOptionRate,118.5 +1014,Forest Lil' Fenrir,31,AdditionalOptionRate,120.0 +1014,Forest Lil' Fenrir,32,AdditionalOptionRate,121.5 +1014,Forest Lil' Fenrir,33,AdditionalOptionRate,123.0 +1014,Forest Lil' Fenrir,34,AdditionalOptionRate,124.5 +1014,Forest Lil' Fenrir,35,AdditionalOptionRate,126.0 +1014,Forest Lil' Fenrir,36,AdditionalOptionRate,127.5 +1014,Forest Lil' Fenrir,37,AdditionalOptionRate,129.0 +1014,Forest Lil' Fenrir,38,AdditionalOptionRate,130.5 +1014,Forest Lil' Fenrir,39,AdditionalOptionRate,132.0 +1014,Forest Lil' Fenrir,40,AdditionalOptionRate,133.5 +1014,Forest Lil' Fenrir,41,AdditionalOptionRate,135.0 +1014,Forest Lil' Fenrir,42,AdditionalOptionRate,136.5 +1014,Forest Lil' Fenrir,43,AdditionalOptionRate,138.0 +1014,Forest Lil' Fenrir,44,AdditionalOptionRate,139.5 +1014,Forest Lil' Fenrir,45,AdditionalOptionRate,141.0 +1014,Forest Lil' Fenrir,46,AdditionalOptionRate,142.5 +1014,Forest Lil' Fenrir,47,AdditionalOptionRate,144.0 +1014,Forest Lil' Fenrir,48,AdditionalOptionRate,145.5 +1014,Forest Lil' Fenrir,49,AdditionalOptionRate,147.0 +1014,Forest Lil' Fenrir,50,AdditionalOptionRate,148.5 +1014,Forest Lil' Fenrir,51,AdditionalOptionRate,150.0 +1014,Forest Lil' Fenrir,52,AdditionalOptionRate,151.5 +1014,Forest Lil' Fenrir,53,AdditionalOptionRate,153.0 +1014,Forest Lil' Fenrir,54,AdditionalOptionRate,154.5 +1014,Forest Lil' Fenrir,55,AdditionalOptionRate,156.0 +1014,Forest Lil' Fenrir,56,AdditionalOptionRate,157.5 +1014,Forest Lil' Fenrir,57,AdditionalOptionRate,159.0 +1014,Forest Lil' Fenrir,58,AdditionalOptionRate,160.5 +1014,Forest Lil' Fenrir,59,AdditionalOptionRate,162.0 +1014,Forest Lil' Fenrir,60,AdditionalOptionRate,163.5 +1014,Forest Lil' Fenrir,61,AdditionalOptionRate,165.0 +1014,Forest Lil' Fenrir,62,AdditionalOptionRate,166.5 +1014,Forest Lil' Fenrir,63,AdditionalOptionRate,168.0 +1014,Forest Lil' Fenrir,64,AdditionalOptionRate,169.5 +1014,Forest Lil' Fenrir,65,AdditionalOptionRate,171.0 +1014,Forest Lil' Fenrir,66,AdditionalOptionRate,172.5 +1014,Forest Lil' Fenrir,67,AdditionalOptionRate,174.0 +1014,Forest Lil' Fenrir,68,AdditionalOptionRate,175.5 +1014,Forest Lil' Fenrir,69,AdditionalOptionRate,177.0 +1014,Forest Lil' Fenrir,70,AdditionalOptionRate,178.5 +1014,Forest Lil' Fenrir,71,AdditionalOptionRate,180.0 +1014,Forest Lil' Fenrir,72,AdditionalOptionRate,181.5 +1014,Forest Lil' Fenrir,73,AdditionalOptionRate,183.0 +1014,Forest Lil' Fenrir,74,AdditionalOptionRate,184.5 +1014,Forest Lil' Fenrir,75,AdditionalOptionRate,186.0 +1014,Forest Lil' Fenrir,76,AdditionalOptionRate,187.5 +1014,Forest Lil' Fenrir,77,AdditionalOptionRate,189.0 +1014,Forest Lil' Fenrir,78,AdditionalOptionRate,190.5 +1014,Forest Lil' Fenrir,79,AdditionalOptionRate,192.0 +1014,Forest Lil' Fenrir,80,AdditionalOptionRate,193.5 +1014,Forest Lil' Fenrir,81,AdditionalOptionRate,195.0 +1014,Forest Lil' Fenrir,82,AdditionalOptionRate,196.5 +1014,Forest Lil' Fenrir,83,AdditionalOptionRate,198.0 +1014,Forest Lil' Fenrir,84,AdditionalOptionRate,199.5 +1014,Forest Lil' Fenrir,85,AdditionalOptionRate,201.0 +1014,Forest Lil' Fenrir,86,AdditionalOptionRate,202.5 +1014,Forest Lil' Fenrir,87,AdditionalOptionRate,204.0 +1014,Forest Lil' Fenrir,88,AdditionalOptionRate,205.5 +1014,Forest Lil' Fenrir,89,AdditionalOptionRate,207.0 +1014,Forest Lil' Fenrir,90,AdditionalOptionRate,208.5 +1014,Forest Lil' Fenrir,91,AdditionalOptionRate,210.0 +1014,Forest Lil' Fenrir,92,AdditionalOptionRate,211.5 +1014,Forest Lil' Fenrir,93,AdditionalOptionRate,213.0 +1014,Forest Lil' Fenrir,94,AdditionalOptionRate,214.5 +1014,Forest Lil' Fenrir,95,AdditionalOptionRate,216.0 +1014,Forest Lil' Fenrir,96,AdditionalOptionRate,217.5 +1014,Forest Lil' Fenrir,97,AdditionalOptionRate,219.0 +1014,Forest Lil' Fenrir,98,AdditionalOptionRate,220.5 +1014,Forest Lil' Fenrir,99,AdditionalOptionRate,222.0 +1014,Forest Lil' Fenrir,100,AdditionalOptionRate,225.0 +1021,Hurt BlackCat,1,IncreaseBlockPerHourglass,2.0 +1021,Hurt BlackCat,2,IncreaseBlockPerHourglass,2.04 +1021,Hurt BlackCat,3,IncreaseBlockPerHourglass,2.08 +1021,Hurt BlackCat,4,IncreaseBlockPerHourglass,2.12 +1021,Hurt BlackCat,5,IncreaseBlockPerHourglass,2.16 +1021,Hurt BlackCat,6,IncreaseBlockPerHourglass,2.2 +1021,Hurt BlackCat,7,IncreaseBlockPerHourglass,2.24 +1021,Hurt BlackCat,8,IncreaseBlockPerHourglass,2.28 +1021,Hurt BlackCat,9,IncreaseBlockPerHourglass,2.32 +1021,Hurt BlackCat,10,IncreaseBlockPerHourglass,2.36 +1021,Hurt BlackCat,11,IncreaseBlockPerHourglass,2.4 +1021,Hurt BlackCat,12,IncreaseBlockPerHourglass,2.44 +1021,Hurt BlackCat,13,IncreaseBlockPerHourglass,2.48 +1021,Hurt BlackCat,14,IncreaseBlockPerHourglass,2.52 +1021,Hurt BlackCat,15,IncreaseBlockPerHourglass,2.56 +1021,Hurt BlackCat,16,IncreaseBlockPerHourglass,2.6 +1021,Hurt BlackCat,17,IncreaseBlockPerHourglass,2.64 +1021,Hurt BlackCat,18,IncreaseBlockPerHourglass,2.68 +1021,Hurt BlackCat,19,IncreaseBlockPerHourglass,2.72 +1021,Hurt BlackCat,20,IncreaseBlockPerHourglass,2.76 +1021,Hurt BlackCat,21,IncreaseBlockPerHourglass,2.8 +1021,Hurt BlackCat,22,IncreaseBlockPerHourglass,2.84 +1021,Hurt BlackCat,23,IncreaseBlockPerHourglass,2.88 +1021,Hurt BlackCat,24,IncreaseBlockPerHourglass,2.92 +1021,Hurt BlackCat,25,IncreaseBlockPerHourglass,2.96 +1021,Hurt BlackCat,26,IncreaseBlockPerHourglass,3.0 +1021,Hurt BlackCat,27,IncreaseBlockPerHourglass,3.04 +1021,Hurt BlackCat,28,IncreaseBlockPerHourglass,3.08 +1021,Hurt BlackCat,29,IncreaseBlockPerHourglass,3.12 +1021,Hurt BlackCat,30,IncreaseBlockPerHourglass,3.16 +1021,Hurt BlackCat,31,IncreaseBlockPerHourglass,3.2 +1021,Hurt BlackCat,32,IncreaseBlockPerHourglass,3.24 +1021,Hurt BlackCat,33,IncreaseBlockPerHourglass,3.28 +1021,Hurt BlackCat,34,IncreaseBlockPerHourglass,3.32 +1021,Hurt BlackCat,35,IncreaseBlockPerHourglass,3.36 +1021,Hurt BlackCat,36,IncreaseBlockPerHourglass,3.4 +1021,Hurt BlackCat,37,IncreaseBlockPerHourglass,3.44 +1021,Hurt BlackCat,38,IncreaseBlockPerHourglass,3.48 +1021,Hurt BlackCat,39,IncreaseBlockPerHourglass,3.52 +1021,Hurt BlackCat,40,IncreaseBlockPerHourglass,3.56 +1021,Hurt BlackCat,41,IncreaseBlockPerHourglass,3.6 +1021,Hurt BlackCat,42,IncreaseBlockPerHourglass,3.64 +1021,Hurt BlackCat,43,IncreaseBlockPerHourglass,3.68 +1021,Hurt BlackCat,44,IncreaseBlockPerHourglass,3.72 +1021,Hurt BlackCat,45,IncreaseBlockPerHourglass,3.76 +1021,Hurt BlackCat,46,IncreaseBlockPerHourglass,3.8 +1021,Hurt BlackCat,47,IncreaseBlockPerHourglass,3.84 +1021,Hurt BlackCat,48,IncreaseBlockPerHourglass,3.88 +1021,Hurt BlackCat,49,IncreaseBlockPerHourglass,3.92 +1021,Hurt BlackCat,50,IncreaseBlockPerHourglass,3.96 +1021,Hurt BlackCat,51,IncreaseBlockPerHourglass,4.0 +1021,Hurt BlackCat,52,IncreaseBlockPerHourglass,4.04 +1021,Hurt BlackCat,53,IncreaseBlockPerHourglass,4.08 +1021,Hurt BlackCat,54,IncreaseBlockPerHourglass,4.12 +1021,Hurt BlackCat,55,IncreaseBlockPerHourglass,4.16 +1021,Hurt BlackCat,56,IncreaseBlockPerHourglass,4.2 +1021,Hurt BlackCat,57,IncreaseBlockPerHourglass,4.24 +1021,Hurt BlackCat,58,IncreaseBlockPerHourglass,4.28 +1021,Hurt BlackCat,59,IncreaseBlockPerHourglass,4.32 +1021,Hurt BlackCat,60,IncreaseBlockPerHourglass,4.36 +1021,Hurt BlackCat,61,IncreaseBlockPerHourglass,4.4 +1021,Hurt BlackCat,62,IncreaseBlockPerHourglass,4.44 +1021,Hurt BlackCat,63,IncreaseBlockPerHourglass,4.48 +1021,Hurt BlackCat,64,IncreaseBlockPerHourglass,4.52 +1021,Hurt BlackCat,65,IncreaseBlockPerHourglass,4.56 +1021,Hurt BlackCat,66,IncreaseBlockPerHourglass,4.6 +1021,Hurt BlackCat,67,IncreaseBlockPerHourglass,4.64 +1021,Hurt BlackCat,68,IncreaseBlockPerHourglass,4.68 +1021,Hurt BlackCat,69,IncreaseBlockPerHourglass,4.72 +1021,Hurt BlackCat,70,IncreaseBlockPerHourglass,4.76 +1021,Hurt BlackCat,71,IncreaseBlockPerHourglass,4.8 +1021,Hurt BlackCat,72,IncreaseBlockPerHourglass,4.84 +1021,Hurt BlackCat,73,IncreaseBlockPerHourglass,4.88 +1021,Hurt BlackCat,74,IncreaseBlockPerHourglass,4.92 +1021,Hurt BlackCat,75,IncreaseBlockPerHourglass,4.96 +1021,Hurt BlackCat,76,IncreaseBlockPerHourglass,5.0 +1021,Hurt BlackCat,77,IncreaseBlockPerHourglass,5.04 +1021,Hurt BlackCat,78,IncreaseBlockPerHourglass,5.08 +1021,Hurt BlackCat,79,IncreaseBlockPerHourglass,5.12 +1021,Hurt BlackCat,80,IncreaseBlockPerHourglass,5.16 +1021,Hurt BlackCat,81,IncreaseBlockPerHourglass,5.2 +1021,Hurt BlackCat,82,IncreaseBlockPerHourglass,5.24 +1021,Hurt BlackCat,83,IncreaseBlockPerHourglass,5.28 +1021,Hurt BlackCat,84,IncreaseBlockPerHourglass,5.32 +1021,Hurt BlackCat,85,IncreaseBlockPerHourglass,5.36 +1021,Hurt BlackCat,86,IncreaseBlockPerHourglass,5.4 +1021,Hurt BlackCat,87,IncreaseBlockPerHourglass,5.44 +1021,Hurt BlackCat,88,IncreaseBlockPerHourglass,5.48 +1021,Hurt BlackCat,89,IncreaseBlockPerHourglass,5.52 +1021,Hurt BlackCat,90,IncreaseBlockPerHourglass,5.56 +1021,Hurt BlackCat,91,IncreaseBlockPerHourglass,5.6 +1021,Hurt BlackCat,92,IncreaseBlockPerHourglass,5.64 +1021,Hurt BlackCat,93,IncreaseBlockPerHourglass,5.68 +1021,Hurt BlackCat,94,IncreaseBlockPerHourglass,5.72 +1021,Hurt BlackCat,95,IncreaseBlockPerHourglass,5.76 +1021,Hurt BlackCat,96,IncreaseBlockPerHourglass,5.8 +1021,Hurt BlackCat,97,IncreaseBlockPerHourglass,5.84 +1021,Hurt BlackCat,98,IncreaseBlockPerHourglass,5.88 +1021,Hurt BlackCat,99,IncreaseBlockPerHourglass,5.92 +1021,Hurt BlackCat,100,IncreaseBlockPerHourglass,6.0 +1022,Shine Muscat Dongle,1,DiscountMaterialCostCrystal,40.0 +1022,Shine Muscat Dongle,2,DiscountMaterialCostCrystal,40.4 +1022,Shine Muscat Dongle,3,DiscountMaterialCostCrystal,40.8 +1022,Shine Muscat Dongle,4,DiscountMaterialCostCrystal,41.2 +1022,Shine Muscat Dongle,5,DiscountMaterialCostCrystal,41.6 +1022,Shine Muscat Dongle,6,DiscountMaterialCostCrystal,42.0 +1022,Shine Muscat Dongle,7,DiscountMaterialCostCrystal,42.4 +1022,Shine Muscat Dongle,8,DiscountMaterialCostCrystal,42.8 +1022,Shine Muscat Dongle,9,DiscountMaterialCostCrystal,43.2 +1022,Shine Muscat Dongle,10,DiscountMaterialCostCrystal,43.6 +1022,Shine Muscat Dongle,11,DiscountMaterialCostCrystal,44.0 +1022,Shine Muscat Dongle,12,DiscountMaterialCostCrystal,44.4 +1022,Shine Muscat Dongle,13,DiscountMaterialCostCrystal,44.8 +1022,Shine Muscat Dongle,14,DiscountMaterialCostCrystal,45.2 +1022,Shine Muscat Dongle,15,DiscountMaterialCostCrystal,45.6 +1022,Shine Muscat Dongle,16,DiscountMaterialCostCrystal,46.0 +1022,Shine Muscat Dongle,17,DiscountMaterialCostCrystal,46.4 +1022,Shine Muscat Dongle,18,DiscountMaterialCostCrystal,46.8 +1022,Shine Muscat Dongle,19,DiscountMaterialCostCrystal,47.2 +1022,Shine Muscat Dongle,20,DiscountMaterialCostCrystal,47.6 +1022,Shine Muscat Dongle,21,DiscountMaterialCostCrystal,48.0 +1022,Shine Muscat Dongle,22,DiscountMaterialCostCrystal,48.4 +1022,Shine Muscat Dongle,23,DiscountMaterialCostCrystal,48.8 +1022,Shine Muscat Dongle,24,DiscountMaterialCostCrystal,49.2 +1022,Shine Muscat Dongle,25,DiscountMaterialCostCrystal,49.6 +1022,Shine Muscat Dongle,26,DiscountMaterialCostCrystal,50.0 +1022,Shine Muscat Dongle,27,DiscountMaterialCostCrystal,50.4 +1022,Shine Muscat Dongle,28,DiscountMaterialCostCrystal,50.8 +1022,Shine Muscat Dongle,29,DiscountMaterialCostCrystal,51.2 +1022,Shine Muscat Dongle,30,DiscountMaterialCostCrystal,51.6 +1022,Shine Muscat Dongle,31,DiscountMaterialCostCrystal,52.0 +1022,Shine Muscat Dongle,32,DiscountMaterialCostCrystal,52.4 +1022,Shine Muscat Dongle,33,DiscountMaterialCostCrystal,52.8 +1022,Shine Muscat Dongle,34,DiscountMaterialCostCrystal,53.2 +1022,Shine Muscat Dongle,35,DiscountMaterialCostCrystal,53.6 +1022,Shine Muscat Dongle,36,DiscountMaterialCostCrystal,54.0 +1022,Shine Muscat Dongle,37,DiscountMaterialCostCrystal,54.4 +1022,Shine Muscat Dongle,38,DiscountMaterialCostCrystal,54.8 +1022,Shine Muscat Dongle,39,DiscountMaterialCostCrystal,55.2 +1022,Shine Muscat Dongle,40,DiscountMaterialCostCrystal,55.6 +1022,Shine Muscat Dongle,41,DiscountMaterialCostCrystal,56.0 +1022,Shine Muscat Dongle,42,DiscountMaterialCostCrystal,56.4 +1022,Shine Muscat Dongle,43,DiscountMaterialCostCrystal,56.8 +1022,Shine Muscat Dongle,44,DiscountMaterialCostCrystal,57.2 +1022,Shine Muscat Dongle,45,DiscountMaterialCostCrystal,57.6 +1022,Shine Muscat Dongle,46,DiscountMaterialCostCrystal,58.0 +1022,Shine Muscat Dongle,47,DiscountMaterialCostCrystal,58.4 +1022,Shine Muscat Dongle,48,DiscountMaterialCostCrystal,58.8 +1022,Shine Muscat Dongle,49,DiscountMaterialCostCrystal,59.2 +1022,Shine Muscat Dongle,50,DiscountMaterialCostCrystal,59.6 +1022,Shine Muscat Dongle,51,DiscountMaterialCostCrystal,60.0 +1022,Shine Muscat Dongle,52,DiscountMaterialCostCrystal,60.4 +1022,Shine Muscat Dongle,53,DiscountMaterialCostCrystal,60.8 +1022,Shine Muscat Dongle,54,DiscountMaterialCostCrystal,61.2 +1022,Shine Muscat Dongle,55,DiscountMaterialCostCrystal,61.6 +1022,Shine Muscat Dongle,56,DiscountMaterialCostCrystal,62.0 +1022,Shine Muscat Dongle,57,DiscountMaterialCostCrystal,62.4 +1022,Shine Muscat Dongle,58,DiscountMaterialCostCrystal,62.8 +1022,Shine Muscat Dongle,59,DiscountMaterialCostCrystal,63.2 +1022,Shine Muscat Dongle,60,DiscountMaterialCostCrystal,63.6 +1022,Shine Muscat Dongle,61,DiscountMaterialCostCrystal,64.0 +1022,Shine Muscat Dongle,62,DiscountMaterialCostCrystal,64.4 +1022,Shine Muscat Dongle,63,DiscountMaterialCostCrystal,64.8 +1022,Shine Muscat Dongle,64,DiscountMaterialCostCrystal,65.2 +1022,Shine Muscat Dongle,65,DiscountMaterialCostCrystal,65.6 +1022,Shine Muscat Dongle,66,DiscountMaterialCostCrystal,66.0 +1022,Shine Muscat Dongle,67,DiscountMaterialCostCrystal,66.4 +1022,Shine Muscat Dongle,68,DiscountMaterialCostCrystal,66.8 +1022,Shine Muscat Dongle,69,DiscountMaterialCostCrystal,67.2 +1022,Shine Muscat Dongle,70,DiscountMaterialCostCrystal,67.6 +1022,Shine Muscat Dongle,71,DiscountMaterialCostCrystal,68.0 +1022,Shine Muscat Dongle,72,DiscountMaterialCostCrystal,68.4 +1022,Shine Muscat Dongle,73,DiscountMaterialCostCrystal,68.8 +1022,Shine Muscat Dongle,74,DiscountMaterialCostCrystal,69.2 +1022,Shine Muscat Dongle,75,DiscountMaterialCostCrystal,69.6 +1022,Shine Muscat Dongle,76,DiscountMaterialCostCrystal,70.0 +1022,Shine Muscat Dongle,77,DiscountMaterialCostCrystal,70.4 +1022,Shine Muscat Dongle,78,DiscountMaterialCostCrystal,70.8 +1022,Shine Muscat Dongle,79,DiscountMaterialCostCrystal,71.2 +1022,Shine Muscat Dongle,80,DiscountMaterialCostCrystal,71.6 +1022,Shine Muscat Dongle,81,DiscountMaterialCostCrystal,72.0 +1022,Shine Muscat Dongle,82,DiscountMaterialCostCrystal,72.4 +1022,Shine Muscat Dongle,83,DiscountMaterialCostCrystal,72.8 +1022,Shine Muscat Dongle,84,DiscountMaterialCostCrystal,73.2 +1022,Shine Muscat Dongle,85,DiscountMaterialCostCrystal,73.6 +1022,Shine Muscat Dongle,86,DiscountMaterialCostCrystal,74.0 +1022,Shine Muscat Dongle,87,DiscountMaterialCostCrystal,74.4 +1022,Shine Muscat Dongle,88,DiscountMaterialCostCrystal,74.8 +1022,Shine Muscat Dongle,89,DiscountMaterialCostCrystal,75.2 +1022,Shine Muscat Dongle,90,DiscountMaterialCostCrystal,75.6 +1022,Shine Muscat Dongle,91,DiscountMaterialCostCrystal,76.0 +1022,Shine Muscat Dongle,92,DiscountMaterialCostCrystal,76.4 +1022,Shine Muscat Dongle,93,DiscountMaterialCostCrystal,76.8 +1022,Shine Muscat Dongle,94,DiscountMaterialCostCrystal,77.2 +1022,Shine Muscat Dongle,95,DiscountMaterialCostCrystal,77.6 +1022,Shine Muscat Dongle,96,DiscountMaterialCostCrystal,78.0 +1022,Shine Muscat Dongle,97,DiscountMaterialCostCrystal,78.4 +1022,Shine Muscat Dongle,98,DiscountMaterialCostCrystal,78.8 +1022,Shine Muscat Dongle,99,DiscountMaterialCostCrystal,79.2 +1022,Shine Muscat Dongle,100,DiscountMaterialCostCrystal,80.0 +1023,Valkyrie of Red Light,1,ReduceRequiredBlock,40.0 +1023,Valkyrie of Red Light,2,ReduceRequiredBlock,40.3 +1023,Valkyrie of Red Light,3,ReduceRequiredBlock,40.6 +1023,Valkyrie of Red Light,4,ReduceRequiredBlock,40.9 +1023,Valkyrie of Red Light,5,ReduceRequiredBlock,41.2 +1023,Valkyrie of Red Light,6,ReduceRequiredBlock,41.5 +1023,Valkyrie of Red Light,7,ReduceRequiredBlock,41.8 +1023,Valkyrie of Red Light,8,ReduceRequiredBlock,42.1 +1023,Valkyrie of Red Light,9,ReduceRequiredBlock,42.4 +1023,Valkyrie of Red Light,10,ReduceRequiredBlock,42.7 +1023,Valkyrie of Red Light,11,ReduceRequiredBlock,43.0 +1023,Valkyrie of Red Light,12,ReduceRequiredBlock,43.3 +1023,Valkyrie of Red Light,13,ReduceRequiredBlock,43.6 +1023,Valkyrie of Red Light,14,ReduceRequiredBlock,43.9 +1023,Valkyrie of Red Light,15,ReduceRequiredBlock,44.2 +1023,Valkyrie of Red Light,16,ReduceRequiredBlock,44.5 +1023,Valkyrie of Red Light,17,ReduceRequiredBlock,44.8 +1023,Valkyrie of Red Light,18,ReduceRequiredBlock,45.1 +1023,Valkyrie of Red Light,19,ReduceRequiredBlock,45.4 +1023,Valkyrie of Red Light,20,ReduceRequiredBlock,45.7 +1023,Valkyrie of Red Light,21,ReduceRequiredBlock,46.0 +1023,Valkyrie of Red Light,22,ReduceRequiredBlock,46.3 +1023,Valkyrie of Red Light,23,ReduceRequiredBlock,46.6 +1023,Valkyrie of Red Light,24,ReduceRequiredBlock,46.9 +1023,Valkyrie of Red Light,25,ReduceRequiredBlock,47.2 +1023,Valkyrie of Red Light,26,ReduceRequiredBlock,47.5 +1023,Valkyrie of Red Light,27,ReduceRequiredBlock,47.8 +1023,Valkyrie of Red Light,28,ReduceRequiredBlock,48.1 +1023,Valkyrie of Red Light,29,ReduceRequiredBlock,48.4 +1023,Valkyrie of Red Light,30,ReduceRequiredBlock,48.7 +1023,Valkyrie of Red Light,31,ReduceRequiredBlock,49.0 +1023,Valkyrie of Red Light,32,ReduceRequiredBlock,49.3 +1023,Valkyrie of Red Light,33,ReduceRequiredBlock,49.6 +1023,Valkyrie of Red Light,34,ReduceRequiredBlock,49.9 +1023,Valkyrie of Red Light,35,ReduceRequiredBlock,50.2 +1023,Valkyrie of Red Light,36,ReduceRequiredBlock,50.5 +1023,Valkyrie of Red Light,37,ReduceRequiredBlock,50.8 +1023,Valkyrie of Red Light,38,ReduceRequiredBlock,51.1 +1023,Valkyrie of Red Light,39,ReduceRequiredBlock,51.4 +1023,Valkyrie of Red Light,40,ReduceRequiredBlock,51.7 +1023,Valkyrie of Red Light,41,ReduceRequiredBlock,52.0 +1023,Valkyrie of Red Light,42,ReduceRequiredBlock,52.3 +1023,Valkyrie of Red Light,43,ReduceRequiredBlock,52.6 +1023,Valkyrie of Red Light,44,ReduceRequiredBlock,52.9 +1023,Valkyrie of Red Light,45,ReduceRequiredBlock,53.2 +1023,Valkyrie of Red Light,46,ReduceRequiredBlock,53.5 +1023,Valkyrie of Red Light,47,ReduceRequiredBlock,53.8 +1023,Valkyrie of Red Light,48,ReduceRequiredBlock,54.1 +1023,Valkyrie of Red Light,49,ReduceRequiredBlock,54.4 +1023,Valkyrie of Red Light,50,ReduceRequiredBlock,54.7 +1023,Valkyrie of Red Light,51,ReduceRequiredBlock,55.0 +1023,Valkyrie of Red Light,52,ReduceRequiredBlock,55.3 +1023,Valkyrie of Red Light,53,ReduceRequiredBlock,55.6 +1023,Valkyrie of Red Light,54,ReduceRequiredBlock,55.9 +1023,Valkyrie of Red Light,55,ReduceRequiredBlock,56.2 +1023,Valkyrie of Red Light,56,ReduceRequiredBlock,56.5 +1023,Valkyrie of Red Light,57,ReduceRequiredBlock,56.8 +1023,Valkyrie of Red Light,58,ReduceRequiredBlock,57.1 +1023,Valkyrie of Red Light,59,ReduceRequiredBlock,57.4 +1023,Valkyrie of Red Light,60,ReduceRequiredBlock,57.7 +1023,Valkyrie of Red Light,61,ReduceRequiredBlock,58.0 +1023,Valkyrie of Red Light,62,ReduceRequiredBlock,58.3 +1023,Valkyrie of Red Light,63,ReduceRequiredBlock,58.6 +1023,Valkyrie of Red Light,64,ReduceRequiredBlock,58.9 +1023,Valkyrie of Red Light,65,ReduceRequiredBlock,59.2 +1023,Valkyrie of Red Light,66,ReduceRequiredBlock,59.5 +1023,Valkyrie of Red Light,67,ReduceRequiredBlock,59.8 +1023,Valkyrie of Red Light,68,ReduceRequiredBlock,60.1 +1023,Valkyrie of Red Light,69,ReduceRequiredBlock,60.4 +1023,Valkyrie of Red Light,70,ReduceRequiredBlock,60.7 +1023,Valkyrie of Red Light,71,ReduceRequiredBlock,61.0 +1023,Valkyrie of Red Light,72,ReduceRequiredBlock,61.3 +1023,Valkyrie of Red Light,73,ReduceRequiredBlock,61.6 +1023,Valkyrie of Red Light,74,ReduceRequiredBlock,61.9 +1023,Valkyrie of Red Light,75,ReduceRequiredBlock,62.2 +1023,Valkyrie of Red Light,76,ReduceRequiredBlock,62.5 +1023,Valkyrie of Red Light,77,ReduceRequiredBlock,62.8 +1023,Valkyrie of Red Light,78,ReduceRequiredBlock,63.1 +1023,Valkyrie of Red Light,79,ReduceRequiredBlock,63.4 +1023,Valkyrie of Red Light,80,ReduceRequiredBlock,63.7 +1023,Valkyrie of Red Light,81,ReduceRequiredBlock,64.0 +1023,Valkyrie of Red Light,82,ReduceRequiredBlock,64.3 +1023,Valkyrie of Red Light,83,ReduceRequiredBlock,64.6 +1023,Valkyrie of Red Light,84,ReduceRequiredBlock,64.9 +1023,Valkyrie of Red Light,85,ReduceRequiredBlock,65.2 +1023,Valkyrie of Red Light,86,ReduceRequiredBlock,65.5 +1023,Valkyrie of Red Light,87,ReduceRequiredBlock,65.8 +1023,Valkyrie of Red Light,88,ReduceRequiredBlock,66.1 +1023,Valkyrie of Red Light,89,ReduceRequiredBlock,66.4 +1023,Valkyrie of Red Light,90,ReduceRequiredBlock,66.7 +1023,Valkyrie of Red Light,91,ReduceRequiredBlock,67.0 +1023,Valkyrie of Red Light,92,ReduceRequiredBlock,67.3 +1023,Valkyrie of Red Light,93,ReduceRequiredBlock,67.6 +1023,Valkyrie of Red Light,94,ReduceRequiredBlock,67.9 +1023,Valkyrie of Red Light,95,ReduceRequiredBlock,68.2 +1023,Valkyrie of Red Light,96,ReduceRequiredBlock,68.5 +1023,Valkyrie of Red Light,97,ReduceRequiredBlock,68.8 +1023,Valkyrie of Red Light,98,ReduceRequiredBlock,69.1 +1023,Valkyrie of Red Light,99,ReduceRequiredBlock,69.4 +1023,Valkyrie of Red Light,100,ReduceRequiredBlock,70.0 +1024,Night Lil' Fenrir,1,AdditionalOptionRate,100.0 +1024,Night Lil' Fenrir,2,AdditionalOptionRate,102.0 +1024,Night Lil' Fenrir,3,AdditionalOptionRate,104.0 +1024,Night Lil' Fenrir,4,AdditionalOptionRate,106.0 +1024,Night Lil' Fenrir,5,AdditionalOptionRate,108.0 +1024,Night Lil' Fenrir,6,AdditionalOptionRate,110.0 +1024,Night Lil' Fenrir,7,AdditionalOptionRate,112.0 +1024,Night Lil' Fenrir,8,AdditionalOptionRate,114.0 +1024,Night Lil' Fenrir,9,AdditionalOptionRate,116.0 +1024,Night Lil' Fenrir,10,AdditionalOptionRate,118.0 +1024,Night Lil' Fenrir,11,AdditionalOptionRate,120.0 +1024,Night Lil' Fenrir,12,AdditionalOptionRate,122.0 +1024,Night Lil' Fenrir,13,AdditionalOptionRate,124.0 +1024,Night Lil' Fenrir,14,AdditionalOptionRate,126.0 +1024,Night Lil' Fenrir,15,AdditionalOptionRate,128.0 +1024,Night Lil' Fenrir,16,AdditionalOptionRate,130.0 +1024,Night Lil' Fenrir,17,AdditionalOptionRate,132.0 +1024,Night Lil' Fenrir,18,AdditionalOptionRate,134.0 +1024,Night Lil' Fenrir,19,AdditionalOptionRate,136.0 +1024,Night Lil' Fenrir,20,AdditionalOptionRate,138.0 +1024,Night Lil' Fenrir,21,AdditionalOptionRate,140.0 +1024,Night Lil' Fenrir,22,AdditionalOptionRate,142.0 +1024,Night Lil' Fenrir,23,AdditionalOptionRate,144.0 +1024,Night Lil' Fenrir,24,AdditionalOptionRate,146.0 +1024,Night Lil' Fenrir,25,AdditionalOptionRate,148.0 +1024,Night Lil' Fenrir,26,AdditionalOptionRate,150.0 +1024,Night Lil' Fenrir,27,AdditionalOptionRate,152.0 +1024,Night Lil' Fenrir,28,AdditionalOptionRate,154.0 +1024,Night Lil' Fenrir,29,AdditionalOptionRate,156.0 +1024,Night Lil' Fenrir,30,AdditionalOptionRate,158.0 +1024,Night Lil' Fenrir,31,AdditionalOptionRate,160.0 +1024,Night Lil' Fenrir,32,AdditionalOptionRate,162.0 +1024,Night Lil' Fenrir,33,AdditionalOptionRate,164.0 +1024,Night Lil' Fenrir,34,AdditionalOptionRate,166.0 +1024,Night Lil' Fenrir,35,AdditionalOptionRate,168.0 +1024,Night Lil' Fenrir,36,AdditionalOptionRate,170.0 +1024,Night Lil' Fenrir,37,AdditionalOptionRate,172.0 +1024,Night Lil' Fenrir,38,AdditionalOptionRate,174.0 +1024,Night Lil' Fenrir,39,AdditionalOptionRate,176.0 +1024,Night Lil' Fenrir,40,AdditionalOptionRate,178.0 +1024,Night Lil' Fenrir,41,AdditionalOptionRate,180.0 +1024,Night Lil' Fenrir,42,AdditionalOptionRate,182.0 +1024,Night Lil' Fenrir,43,AdditionalOptionRate,184.0 +1024,Night Lil' Fenrir,44,AdditionalOptionRate,186.0 +1024,Night Lil' Fenrir,45,AdditionalOptionRate,188.0 +1024,Night Lil' Fenrir,46,AdditionalOptionRate,190.0 +1024,Night Lil' Fenrir,47,AdditionalOptionRate,192.0 +1024,Night Lil' Fenrir,48,AdditionalOptionRate,194.0 +1024,Night Lil' Fenrir,49,AdditionalOptionRate,196.0 +1024,Night Lil' Fenrir,50,AdditionalOptionRate,198.0 +1024,Night Lil' Fenrir,51,AdditionalOptionRate,200.0 +1024,Night Lil' Fenrir,52,AdditionalOptionRate,202.0 +1024,Night Lil' Fenrir,53,AdditionalOptionRate,204.0 +1024,Night Lil' Fenrir,54,AdditionalOptionRate,206.0 +1024,Night Lil' Fenrir,55,AdditionalOptionRate,208.0 +1024,Night Lil' Fenrir,56,AdditionalOptionRate,210.0 +1024,Night Lil' Fenrir,57,AdditionalOptionRate,212.0 +1024,Night Lil' Fenrir,58,AdditionalOptionRate,214.0 +1024,Night Lil' Fenrir,59,AdditionalOptionRate,216.0 +1024,Night Lil' Fenrir,60,AdditionalOptionRate,218.0 +1024,Night Lil' Fenrir,61,AdditionalOptionRate,220.0 +1024,Night Lil' Fenrir,62,AdditionalOptionRate,222.0 +1024,Night Lil' Fenrir,63,AdditionalOptionRate,224.0 +1024,Night Lil' Fenrir,64,AdditionalOptionRate,226.0 +1024,Night Lil' Fenrir,65,AdditionalOptionRate,228.0 +1024,Night Lil' Fenrir,66,AdditionalOptionRate,230.0 +1024,Night Lil' Fenrir,67,AdditionalOptionRate,232.0 +1024,Night Lil' Fenrir,68,AdditionalOptionRate,234.0 +1024,Night Lil' Fenrir,69,AdditionalOptionRate,236.0 +1024,Night Lil' Fenrir,70,AdditionalOptionRate,238.0 +1024,Night Lil' Fenrir,71,AdditionalOptionRate,240.0 +1024,Night Lil' Fenrir,72,AdditionalOptionRate,242.0 +1024,Night Lil' Fenrir,73,AdditionalOptionRate,244.0 +1024,Night Lil' Fenrir,74,AdditionalOptionRate,246.0 +1024,Night Lil' Fenrir,75,AdditionalOptionRate,248.0 +1024,Night Lil' Fenrir,76,AdditionalOptionRate,250.0 +1024,Night Lil' Fenrir,77,AdditionalOptionRate,252.0 +1024,Night Lil' Fenrir,78,AdditionalOptionRate,254.0 +1024,Night Lil' Fenrir,79,AdditionalOptionRate,256.0 +1024,Night Lil' Fenrir,80,AdditionalOptionRate,258.0 +1024,Night Lil' Fenrir,81,AdditionalOptionRate,260.0 +1024,Night Lil' Fenrir,82,AdditionalOptionRate,262.0 +1024,Night Lil' Fenrir,83,AdditionalOptionRate,264.0 +1024,Night Lil' Fenrir,84,AdditionalOptionRate,266.0 +1024,Night Lil' Fenrir,85,AdditionalOptionRate,268.0 +1024,Night Lil' Fenrir,86,AdditionalOptionRate,270.0 +1024,Night Lil' Fenrir,87,AdditionalOptionRate,272.0 +1024,Night Lil' Fenrir,88,AdditionalOptionRate,274.0 +1024,Night Lil' Fenrir,89,AdditionalOptionRate,276.0 +1024,Night Lil' Fenrir,90,AdditionalOptionRate,278.0 +1024,Night Lil' Fenrir,91,AdditionalOptionRate,280.0 +1024,Night Lil' Fenrir,92,AdditionalOptionRate,282.0 +1024,Night Lil' Fenrir,93,AdditionalOptionRate,284.0 +1024,Night Lil' Fenrir,94,AdditionalOptionRate,286.0 +1024,Night Lil' Fenrir,95,AdditionalOptionRate,288.0 +1024,Night Lil' Fenrir,96,AdditionalOptionRate,290.0 +1024,Night Lil' Fenrir,97,AdditionalOptionRate,292.0 +1024,Night Lil' Fenrir,98,AdditionalOptionRate,294.0 +1024,Night Lil' Fenrir,99,AdditionalOptionRate,296.0 +1024,Night Lil' Fenrir,100,AdditionalOptionRate,300.0 \ No newline at end of file diff --git a/Lib9c/TableCSV/Pet/PetSheet.csv b/Lib9c/TableCSV/Pet/PetSheet.csv index e0f102a575..352dd1a688 100644 --- a/Lib9c/TableCSV/Pet/PetSheet.csv +++ b/Lib9c/TableCSV/Pet/PetSheet.csv @@ -2,4 +2,12 @@ 1001,D:CC 블랙캣,D:CC Blackcat,1,SOULSTONE_1001 1002,빨간 동글이,Red Dongle,2,SOULSTONE_1002 1003,빛의 발키리,Valkyrie of Light,3,SOULSTONE_1003 -1004,꼬마 펜리르,Lil' Fenrir,3,SOULSTONE_1004 \ No newline at end of file +1004,꼬마 펜리르,Lil' Fenrir,3,SOULSTONE_1004 +1011,리본 블랙캣,Ribbon BlackCat,1,SOULSTONE_1001 +1012,복숭아 동글이,Peach Dongle,2,SOULSTONE_1002 +1013,파란 빛의 발키리,Valkyrie of Blue Light,3,SOULSTONE_1003 +1014,숲의 꼬마 펜리르,Forest Lil' Fenrir,3,SOULSTONE_1004 +1021,다친 블랙캣,D:CC Blackcat,1,SOULSTONE_1001 +1022,샤인 머스켓 동글이,Red Dongle,2,SOULSTONE_1002 +1023,붉은 빛의 발키리,Valkyrie of Light,3,SOULSTONE_1003 +1024,밤의 꼬마 펜리르,Lil' Fenrir,3,SOULSTONE_1004 \ No newline at end of file From 31a9011993f68bcf8012dff7de71211cf7db3d61 Mon Sep 17 00:00:00 2001 From: moreal Date: Thu, 10 Oct 2024 18:36:20 +0900 Subject: [PATCH 19/27] Prepare 1.19.0 --- Lib9c.Abstractions/Lib9c.Abstractions.csproj | 2 +- Lib9c.MessagePack/Lib9c.MessagePack.csproj | 2 +- Lib9c.Renderers/Lib9c.Renderers.csproj | 2 +- Lib9c/Lib9c.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib9c.Abstractions/Lib9c.Abstractions.csproj b/Lib9c.Abstractions/Lib9c.Abstractions.csproj index fa98de0bd1..672b543412 100644 --- a/Lib9c.Abstractions/Lib9c.Abstractions.csproj +++ b/Lib9c.Abstractions/Lib9c.Abstractions.csproj @@ -6,7 +6,7 @@ true .bin .obj - 1.18.0 + 1.19.0 diff --git a/Lib9c.MessagePack/Lib9c.MessagePack.csproj b/Lib9c.MessagePack/Lib9c.MessagePack.csproj index 13e0319c5c..de51061462 100644 --- a/Lib9c.MessagePack/Lib9c.MessagePack.csproj +++ b/Lib9c.MessagePack/Lib9c.MessagePack.csproj @@ -8,7 +8,7 @@ AnyCPU .bin .obj - 1.18.0 + 1.19.0 diff --git a/Lib9c.Renderers/Lib9c.Renderers.csproj b/Lib9c.Renderers/Lib9c.Renderers.csproj index 4b69341bd2..4333aa1094 100644 --- a/Lib9c.Renderers/Lib9c.Renderers.csproj +++ b/Lib9c.Renderers/Lib9c.Renderers.csproj @@ -6,7 +6,7 @@ enable .bin .obj - 1.18.0 + 1.19.0 Lib9c diff --git a/Lib9c/Lib9c.csproj b/Lib9c/Lib9c.csproj index 8a65fd3a81..9c745a7114 100644 --- a/Lib9c/Lib9c.csproj +++ b/Lib9c/Lib9c.csproj @@ -9,7 +9,7 @@ .obj Nekoyume 9 - 1.18.0 + 1.19.0 true Debug;Release AnyCPU From 1f53d2ed65300eb18448fc305379851038db1516 Mon Sep 17 00:00:00 2001 From: Kushagra Nigam <93257324+TheMarvelFan@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:07:46 +0530 Subject: [PATCH 20/27] Remove states instead setting `Null.Value` * Renamed all occurrances of "SetLegaceState(_, Null.Value)" to "RemoveLegaceState(_)" * Updated Test files to Assert Null instead of Null.Value --------- Co-authored-by: Lee Dogeon --- .../Action/CreateOrReplaceAvatarTest.cs | 2 +- .Lib9c.Tests/Action/ClaimStakeRewardTest.cs | 6 +++--- .Lib9c.Tests/Action/EndPledgeTest.cs | 2 +- .Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs | 2 +- .Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs | 2 +- .Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs | 6 +++--- .Lib9c.Tests/Action/Stake2Test.cs | 2 +- Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs | 2 +- Lib9c/Action/BuyProduct.cs | 2 +- Lib9c/Action/CancelProductRegistration.cs | 2 +- Lib9c/Action/EndPledge.cs | 2 +- Lib9c/Action/MigrateMonsterCollection.cs | 2 +- Lib9c/Action/Stake2.cs | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs index dc9317a961..bc324fe817 100644 --- a/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs +++ b/.Lib9c.DevExtensions.Tests/Action/CreateOrReplaceAvatarTest.cs @@ -562,7 +562,7 @@ private static void Execute( Addresses.GetSkillStateAddressFromAvatarAddress(avatarAddr.Value); if (action.CrystalRandomBuff is null) { - Assert.Equal(Null.Value, nextStates.GetLegacyState(crystalRandomSkillAddr)); + Assert.Null(nextStates.GetLegacyState(crystalRandomSkillAddr)); } else { diff --git a/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs b/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs index 0e0f0c0889..82ae98e4eb 100644 --- a/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs +++ b/.Lib9c.Tests/Action/ClaimStakeRewardTest.cs @@ -362,7 +362,7 @@ public void Execute_Throw_FailedLoadStateException_When_Staking_State_Null() 0)); var stakeAddr = StakeStateV2.DeriveAddress(AgentAddr); - var previousState = _initialState.SetLegacyState(stakeAddr, Null.Value); + var previousState = _initialState.RemoveLegacyState(stakeAddr); Assert.Throws(() => Execute( previousState, @@ -447,7 +447,7 @@ public void Execute_Throw_FailedLoadStateException_When_Sheet_Null() // NOTE: Set StakeRegularFixedRewardSheetTable to Null var sheetAddr = Addresses.GetSheetAddress( stakeStateV2.Contract.StakeRegularFixedRewardSheetTableName); - prevState = prevState.SetLegacyState(sheetAddr, Null.Value); + prevState = prevState.RemoveLegacyState(sheetAddr); Assert.Throws(() => Execute( prevState, @@ -462,7 +462,7 @@ public void Execute_Throw_FailedLoadStateException_When_Sheet_Null() // NOTE: Set StakeRegularRewardSheetTableName to Null sheetAddr = Addresses.GetSheetAddress( stakeStateV2.Contract.StakeRegularRewardSheetTableName); - prevState = prevState.SetLegacyState(sheetAddr, Null.Value); + prevState = prevState.RemoveLegacyState(sheetAddr); Assert.Throws(() => Execute( prevState, diff --git a/.Lib9c.Tests/Action/EndPledgeTest.cs b/.Lib9c.Tests/Action/EndPledgeTest.cs index 6f72fa720d..296c29ba3b 100644 --- a/.Lib9c.Tests/Action/EndPledgeTest.cs +++ b/.Lib9c.Tests/Action/EndPledgeTest.cs @@ -37,7 +37,7 @@ public void Execute(int balance) Signer = patron, PreviousState = states, }); - Assert.Equal(Null.Value, nextState.GetLegacyState(agent.GetPledgeAddress())); + Assert.Null(nextState.GetLegacyState(agent.GetPledgeAddress())); Assert.Equal(mead * 0, nextState.GetBalance(agent, mead)); if (balance > 0) { diff --git a/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs b/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs index 84fcc1e165..051e9ae9af 100644 --- a/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs +++ b/.Lib9c.Tests/Action/Garages/DeliverToOthersGaragesTest.cs @@ -243,7 +243,7 @@ public void Execute_Throws_Exception() SenderAgentAddr, fungibleId); var previousStatesWithNullGarageState = - _previousStates.SetLegacyState(garageAddr, Null.Value); + _previousStates.RemoveLegacyState(garageAddr); Assert.Throws(() => Execute( SenderAgentAddr, 0, diff --git a/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs b/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs index b951d59a24..4f31eafa59 100644 --- a/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs +++ b/.Lib9c.Tests/Action/Garages/UnloadFromMyGaragesTest.cs @@ -255,7 +255,7 @@ public void Execute_Throws_Exception() AgentAddr, fungibleId); var previousStatesWithNullGarageState = - _previousStates.SetLegacyState(garageAddr, Null.Value); + _previousStates.RemoveLegacyState(garageAddr); Assert.Throws(() => Execute( AgentAddr, 0, diff --git a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs index 9b84058ab4..5d70cce9dc 100644 --- a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs @@ -321,7 +321,7 @@ public void Register_And_Buy() var sellProductList = new ProductsState((List)latestState.GetLegacyState(ProductsState.DeriveAddress(productInfo.AvatarAddress))); var productId = productInfo.ProductId; Assert.Empty(sellProductList.ProductIds); - Assert.Equal(Null.Value, latestState.GetLegacyState(Product.DeriveAddress(productId))); + Assert.Null(latestState.GetLegacyState(Product.DeriveAddress(productId))); var product = ProductFactory.DeserializeProduct((List)nextState2.GetLegacyState(Product.DeriveAddress(productId))); switch (product) { @@ -508,7 +508,7 @@ public void Register_And_Cancel() foreach (var productAddress in action2.ProductInfos.Select(productInfo => Product.DeriveAddress(productInfo.ProductId))) { - Assert.Equal(Null.Value, latestState.GetLegacyState(productAddress)); + Assert.Null(latestState.GetLegacyState(productAddress)); var product = ProductFactory.DeserializeProduct((List)nextState.GetLegacyState(productAddress)); switch (product) { @@ -1097,7 +1097,7 @@ public void HardFork() var sellProductList = new ProductsState((List)tradedState.GetLegacyState(ProductsState.DeriveAddress(productInfo.AvatarAddress))); var productId = productInfo.ProductId; Assert.Empty(sellProductList.ProductIds); - Assert.Equal(Null.Value, tradedState.GetLegacyState(Product.DeriveAddress(productId))); + Assert.Null(tradedState.GetLegacyState(Product.DeriveAddress(productId))); var product = ProductFactory.DeserializeProduct((List)nextState.GetLegacyState(Product.DeriveAddress(productId))); switch (product) { diff --git a/.Lib9c.Tests/Action/Stake2Test.cs b/.Lib9c.Tests/Action/Stake2Test.cs index 0f052d7e14..c1e7958343 100644 --- a/.Lib9c.Tests/Action/Stake2Test.cs +++ b/.Lib9c.Tests/Action/Stake2Test.cs @@ -208,7 +208,7 @@ public void Execute() BlockIndex = StakeState.LockupInterval, }); - Assert.Equal(Null.Value, states.GetLegacyState(stakeState.address)); + Assert.Null(states.GetLegacyState(stakeState.address)); Assert.Equal(_currency * 0, states.GetBalance(stakeState.address, _currency)); Assert.Equal(_currency * 100, states.GetBalance(_signerAddress, _currency)); } diff --git a/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs b/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs index ce8d321297..8f4b5bf291 100644 --- a/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs +++ b/Lib9c.DevExtensions/Action/CreateOrReplaceAvatar.cs @@ -582,7 +582,7 @@ public IWorld Execute( Addresses.GetSkillStateAddressFromAvatarAddress(avatarAddr); if (CrystalRandomBuff is null) { - states = states.SetLegacyState(crystalRandomSkillAddr, Null.Value); + states = states.RemoveLegacyState(crystalRandomSkillAddr); } else { diff --git a/Lib9c/Action/BuyProduct.cs b/Lib9c/Action/BuyProduct.cs index 7f9489ae93..22e99249da 100644 --- a/Lib9c/Action/BuyProduct.cs +++ b/Lib9c/Action/BuyProduct.cs @@ -178,7 +178,7 @@ private IWorld Buy(IActionContext context, IProductInfo productInfo, Address sel var receipt = new ProductReceipt(productId, sellerAvatarAddress, buyerAvatarState.address, product.Price, context.BlockIndex); states = states - .SetLegacyState(productAddress, Null.Value) + .RemoveLegacyState(productAddress) .SetLegacyState(productsStateAddress, productsState.Serialize()) .SetAvatarState(sellerAvatarAddress, sellerAvatarState) .SetLegacyState(ProductReceipt.DeriveAddress(productId), receipt.Serialize()) diff --git a/Lib9c/Action/CancelProductRegistration.cs b/Lib9c/Action/CancelProductRegistration.cs index a5cfbb5bae..0687a81256 100644 --- a/Lib9c/Action/CancelProductRegistration.cs +++ b/Lib9c/Action/CancelProductRegistration.cs @@ -181,7 +181,7 @@ public static IWorld Cancel( var mail = new ProductCancelMail(context.BlockIndex, productId, context.BlockIndex, productId, product); avatarState.Update(mail); - states = states.SetLegacyState(productAddress, Null.Value); + states = states.RemoveLegacyState(productAddress); return states; } diff --git a/Lib9c/Action/EndPledge.cs b/Lib9c/Action/EndPledge.cs index 25a78a693a..c0197214e9 100644 --- a/Lib9c/Action/EndPledge.cs +++ b/Lib9c/Action/EndPledge.cs @@ -44,7 +44,7 @@ public override IWorld Execute(IActionContext context) { states = states.TransferAsset(context, AgentAddress, signer, balance); } - return states.SetLegacyState(contractAddress, Null.Value); + return states.RemoveLegacyState(contractAddress); } throw new FailedLoadStateException("failed to find pledge."); diff --git a/Lib9c/Action/MigrateMonsterCollection.cs b/Lib9c/Action/MigrateMonsterCollection.cs index 9f6f8e60f8..a79c0906b7 100644 --- a/Lib9c/Action/MigrateMonsterCollection.cs +++ b/Lib9c/Action/MigrateMonsterCollection.cs @@ -90,7 +90,7 @@ public override IWorld Execute(IActionContext context) var ended = DateTimeOffset.UtcNow; Log.Debug("{AddressesHex}MigrateMonsterCollection Total Executed Time: {Elapsed}", addressesHex, ended - started); - return states.SetLegacyState(monsterCollectionState.address, Null.Value) + return states.RemoveLegacyState(monsterCollectionState.address) .SetLegacyState(migratedStakeStateAddress, migratedStakeState.SerializeV2()) .TransferAsset( context, diff --git a/Lib9c/Action/Stake2.cs b/Lib9c/Action/Stake2.cs index 19b51f2ced..586a40d7db 100644 --- a/Lib9c/Action/Stake2.cs +++ b/Lib9c/Action/Stake2.cs @@ -122,7 +122,7 @@ public override IWorld Execute(IActionContext context) if (stakeState.IsCancellable(context.BlockIndex)) { return states - .SetLegacyState(stakeState.address, Null.Value) + .RemoveLegacyState(stakeState.address) .TransferAsset(context, stakeState.address, context.Signer, stakedBalance); } } From 02f2001bf2423501753e02aa09199dcad0c5be71 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 11 Oct 2024 15:39:46 +0900 Subject: [PATCH 21/27] move grinding and register test to MarketScenarioTest --- .Lib9c.Tests/Action/GrindingTest.cs | 187 ---------------- .../Action/Scenario/MarketScenarioTest.cs | 210 ++++++++++++++++++ 2 files changed, 210 insertions(+), 187 deletions(-) diff --git a/.Lib9c.Tests/Action/GrindingTest.cs b/.Lib9c.Tests/Action/GrindingTest.cs index 07ac33ce0d..9ea81cd9e7 100644 --- a/.Lib9c.Tests/Action/GrindingTest.cs +++ b/.Lib9c.Tests/Action/GrindingTest.cs @@ -13,7 +13,6 @@ namespace Lib9c.Tests.Action using Nekoyume.Action; using Nekoyume.Model.Item; using Nekoyume.Model.Mail; - using Nekoyume.Model.Market; using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; @@ -308,41 +307,6 @@ public void Execute_Throw_Equipment_Exception(bool equipmentExist, long required Execute(state, _agentAddress, _avatarAddress, 1, false, _random, 0, 0, _tableSheets.MaterialItemSheet)); } - [Theory] - // Todo : Update Test Equipment - [ClassData(typeof(ExecuteWithCustomEquipmentData))] - public void Execute_Success_With_Custom_Equipment(int[] equipmentIds, (int, int)[] expected) - { - var state = _initialState - .SetAgentState(_agentAddress, _agentState) - .SetAvatarState(_avatarAddress, _avatarState) - .SetActionPoint(_avatarAddress, 120); - Assert.Equal(0 * _crystalCurrency, state.GetBalance(_avatarAddress, _crystalCurrency)); - - state = Execute_Grinding_With_Custom_Equipment( - state, - _agentAddress, - _avatarAddress, - _random, - equipmentIds, - _tableSheets.EquipmentItemSheet - ); - var expectedAsset = equipmentIds.Length * _crystalCurrency; - Assert.Equal(expectedAsset, state.GetBalance(_agentAddress, _crystalCurrency)); - Assert.Equal(115, state.GetActionPoint(_avatarAddress)); - - state = Execute_RegisterProduct_With_Custom_Equipment( - state, - _agentAddress, - _avatarAddress, - _random, - expected, - _tableSheets.WorldSheet, - _tableSheets.WorldUnlockSheet, - _tableSheets.MaterialItemSheet - ); - } - [Theory] [ClassData(typeof(CalculateMaterialRewardData))] public void CalculateMaterialReward(int[] equipmentIds, Dictionary expected) @@ -430,157 +394,6 @@ private static IWorld Execute( return nextState; } - private static IWorld Execute_Grinding_With_Custom_Equipment( - IWorld state, - Address agentAddress, - Address avatarAddress, - IRandom random, - int[] equipmentRowIds, - EquipmentItemSheet equipmentItemSheet) - { - var avatarState = state.GetAvatarState(avatarAddress); - - var testRandom = new TestRandom(); - // Create equipment with ItemFactory - var equipmentList = new List(); - foreach (var equipmentItemId in equipmentRowIds) - { - var equipment = (Equipment)ItemFactory.CreateItemUsable( - equipmentItemSheet[equipmentItemId], - testRandom.GenerateRandomGuid(), - 1); - equipment.ByCustomCraft = true; - equipmentList.Add(equipment); - } - - foreach (var equipment in equipmentList) - { - avatarState.inventory.AddItem(equipment); - } - - state = state.SetInventory(avatarAddress, avatarState.inventory); - - var grinding = new Grinding - { - AvatarAddress = avatarAddress, - EquipmentIds = equipmentList.Select(e => e.ItemId).ToList(), - ChargeAp = false, - }; - var nextState = grinding.Execute(new ActionContext - { - PreviousState = state, - Signer = agentAddress, - BlockIndex = 1, - RandomSeed = random.Seed, - }); - - return nextState; - } - - private static IWorld Execute_RegisterProduct_With_Custom_Equipment( - IWorld state, - Address agentAddress, - Address avatarAddress, - IRandom random, - (int id, int count)[] expectedReward, - WorldSheet worldSheet, - WorldUnlockSheet worldUnlockSheet, - MaterialItemSheet materialItemSheet) - { - var avatarState = state.GetAvatarState(avatarAddress); - var price = 1 * Currency.Legacy("NCG", 2, minters: null); - var registerInfos = expectedReward.Select(expected => - { - materialItemSheet.TryGetValue(expected.id, out var materialRow); - Assert.NotNull(materialRow); - Assert.True(materialRow.ItemSubType is ItemSubType.Circle or ItemSubType.Scroll); - avatarState.inventory.TryGetFungibleItems(materialRow.ItemId, out var items); - Assert.Single(items); - var item = items.First(); - - Assert.Equal(expected.count, item.count); - Assert.IsAssignableFrom(item.item); - return new RegisterInfo - { - AvatarAddress = avatarAddress, - Price = price, - TradableId = ((ITradableFungibleItem)item.item).TradableId, - ItemCount = item.count, - Type = ProductType.Fungible, - }; - }); - - for (int i = 0; i < GameConfig.RequireClearedStageLevel.ActionsInShop; i++) - { - avatarState.worldInformation.ClearStage(1, i + 1, 0, worldSheet, worldUnlockSheet); - } - - state = state.SetWorldInformation(avatarAddress, avatarState.worldInformation); - - var register = new RegisterProduct - { - AvatarAddress = avatarAddress, - RegisterInfos = registerInfos, - ChargeAp = false, - }; - var nextState = register.Execute(new ActionContext - { - PreviousState = state, - Signer = agentAddress, - BlockIndex = 2, - RandomSeed = random.Seed, - }); - - return nextState; - } - - private class ExecuteWithCustomEquipmentData : IEnumerable - { - private readonly List _data = new () - { - new object[] - { - new[] { 20160000, 20160001, 20160002 }, - new[] - { - (600401, 35), - (600402, 21), - }, - }, - new object[] - { - new[] { 20160000, 20260000, 20360000, 20460000, 20560000 }, - new[] - { - (600401, 25), - (600402, 15), - }, - }, - new object[] - { - new[] { 20160003, 20260000, 20360001, 20360001, 20460001 }, - new[] - { - (600401, 65), - (600402, 39), - }, - }, - new object[] - { - new[] { 20560003, 20560003, 20560003 }, - new[] - { - (600401, 90), - (600402, 54), - }, - }, - }; - - public IEnumerator GetEnumerator() => _data.GetEnumerator(); - - IEnumerator IEnumerable.GetEnumerator() => _data.GetEnumerator(); - } - private class CalculateMaterialRewardData : IEnumerable { private readonly List _data = new List diff --git a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs index 9b84058ab4..58d0fa46d7 100644 --- a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs @@ -1,6 +1,7 @@ namespace Lib9c.Tests.Action.Scenario { using System; + using System.Collections; using System.Collections.Generic; using System.Linq; using Bencodex.Types; @@ -21,6 +22,7 @@ namespace Lib9c.Tests.Action.Scenario using Nekoyume.Model.State; using Nekoyume.Module; using Nekoyume.TableData; + using Nekoyume.TableData.Crystal; using Serilog; using Xunit; using Xunit.Abstractions; @@ -1124,5 +1126,213 @@ public void HardFork() Assert.Equal(0 * _currency, tradedState.GetBalance(_buyerAgentAddress, _currency)); Assert.Equal(totalTax, tradedState.GetBalance(feeStoreAddress, _currency)); } + + [Theory] + [ClassData(typeof(ExecuteWithCustomEquipmentData))] + public void Grinding_Custom_Equipment_And_Register(int[] equipmentIds, (int, int)[] expected) + { + var agentAddress = new PrivateKey().Address; + var avatarAddress = new PrivateKey().Address; + var agentState = new AgentState(agentAddress); + var avatarState = AvatarState.Create( + avatarAddress, + agentAddress, + 0, + _tableSheets.GetAvatarSheets(), + default); + var crystalCurrency = Currencies.Crystal; + var random = new TestRandom(); + var state = _initialState + .SetLegacyState( + Addresses.GetSheetAddress(), + _tableSheets.CrystalMonsterCollectionMultiplierSheet.Serialize()) + .SetLegacyState( + Addresses.GetSheetAddress(), + _tableSheets.CrystalEquipmentGrindingSheet.Serialize()) + .SetLegacyState( + Addresses.GetSheetAddress(), + _tableSheets.MaterialItemSheet.Serialize()) + .SetLegacyState( + Addresses.GetSheetAddress(), + _tableSheets.StakeRegularRewardSheet.Serialize()) + .SetAgentState(agentAddress, agentState) + .SetAvatarState(avatarAddress, avatarState) + .SetActionPoint(avatarAddress, 120); + Assert.Equal(0 * crystalCurrency, state.GetBalance(avatarAddress, crystalCurrency)); + + state = Execute_Grinding_Custom_Equipment( + state, + agentAddress, + avatarAddress, + random, + equipmentIds, + _tableSheets.EquipmentItemSheet + ); + var expectedAsset = equipmentIds.Length * crystalCurrency; + Assert.Equal(expectedAsset, state.GetBalance(agentAddress, crystalCurrency)); + Assert.Equal(115, state.GetActionPoint(avatarAddress)); + + state = Execute_Register_Custom_Equipment( + state, + agentAddress, + avatarAddress, + random, + expected, + _tableSheets.WorldSheet, + _tableSheets.WorldUnlockSheet, + _tableSheets.MaterialItemSheet + ); + } + + private static IWorld Execute_Grinding_Custom_Equipment( + IWorld state, + Address agentAddress, + Address avatarAddress, + IRandom random, + int[] equipmentRowIds, + EquipmentItemSheet equipmentItemSheet) + { + var avatarState = state.GetAvatarState(avatarAddress); + + var testRandom = new TestRandom(); + // Create equipment with ItemFactory + var equipmentList = new List(); + foreach (var equipmentItemId in equipmentRowIds) + { + var equipment = (Equipment)ItemFactory.CreateItemUsable( + equipmentItemSheet[equipmentItemId], + testRandom.GenerateRandomGuid(), + 1); + equipment.ByCustomCraft = true; + equipmentList.Add(equipment); + } + + foreach (var equipment in equipmentList) + { + avatarState.inventory.AddItem(equipment); + } + + state = state.SetInventory(avatarAddress, avatarState.inventory); + + var grinding = new Grinding + { + AvatarAddress = avatarAddress, + EquipmentIds = equipmentList.Select(e => e.ItemId).ToList(), + ChargeAp = false, + }; + var nextState = grinding.Execute(new ActionContext + { + PreviousState = state, + Signer = agentAddress, + BlockIndex = 1, + RandomSeed = random.Seed, + }); + + return nextState; + } + + private static IWorld Execute_Register_Custom_Equipment( + IWorld state, + Address agentAddress, + Address avatarAddress, + IRandom random, + (int id, int count)[] expectedReward, + WorldSheet worldSheet, + WorldUnlockSheet worldUnlockSheet, + MaterialItemSheet materialItemSheet) + { + var avatarState = state.GetAvatarState(avatarAddress); + var price = 1 * Currency.Legacy("NCG", 2, minters: null); + var registerInfos = expectedReward.Select(expected => + { + materialItemSheet.TryGetValue(expected.id, out var materialRow); + Assert.NotNull(materialRow); + Assert.True(materialRow.ItemSubType is ItemSubType.Circle or ItemSubType.Scroll); + avatarState.inventory.TryGetFungibleItems(materialRow.ItemId, out var items); + Assert.Single(items); + var item = items.First(); + + Assert.Equal(expected.count, item.count); + Assert.IsAssignableFrom(item.item); + return new RegisterInfo + { + AvatarAddress = avatarAddress, + Price = price, + TradableId = ((ITradableFungibleItem)item.item).TradableId, + ItemCount = item.count, + Type = ProductType.Fungible, + }; + }); + + for (int i = 0; i < GameConfig.RequireClearedStageLevel.ActionsInShop; i++) + { + avatarState.worldInformation.ClearStage(1, i + 1, 0, worldSheet, worldUnlockSheet); + } + + state = state.SetWorldInformation(avatarAddress, avatarState.worldInformation); + + var register = new RegisterProduct + { + AvatarAddress = avatarAddress, + RegisterInfos = registerInfos, + ChargeAp = false, + }; + var nextState = register.Execute(new ActionContext + { + PreviousState = state, + Signer = agentAddress, + BlockIndex = 2, + RandomSeed = random.Seed, + }); + + return nextState; + } + + private class ExecuteWithCustomEquipmentData : IEnumerable + { + private readonly List _data = new () + { + new object[] + { + new[] { 20160000, 20160001, 20160002 }, + new[] + { + (600401, 35), + (600402, 21), + }, + }, + new object[] + { + new[] { 20160000, 20260000, 20360000, 20460000, 20560000 }, + new[] + { + (600401, 25), + (600402, 15), + }, + }, + new object[] + { + new[] { 20160003, 20260000, 20360001, 20360001, 20460001 }, + new[] + { + (600401, 65), + (600402, 39), + }, + }, + new object[] + { + new[] { 20560003, 20560003, 20560003 }, + new[] + { + (600401, 90), + (600402, 54), + }, + }, + }; + + public IEnumerator GetEnumerator() => _data.GetEnumerator(); + + IEnumerator IEnumerable.GetEnumerator() => _data.GetEnumerator(); + } } } From 626fc3be17b8fa5a45115b8ffe2781c2dd12ce7b Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Tue, 8 Oct 2024 17:10:53 +0900 Subject: [PATCH 22/27] add column Materials in WorldBossRankingRewardSheet --- .../TableData/WorldBossRankingRewardSheet.cs | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/Lib9c/TableData/WorldBossRankingRewardSheet.cs b/Lib9c/TableData/WorldBossRankingRewardSheet.cs index 066e76379a..4671815ad3 100644 --- a/Lib9c/TableData/WorldBossRankingRewardSheet.cs +++ b/Lib9c/TableData/WorldBossRankingRewardSheet.cs @@ -3,6 +3,7 @@ using System.Linq; using Libplanet.Types.Assets; using Nekoyume.Helper; +using Nekoyume.Model.Item; using static Nekoyume.TableData.TableExtensions; namespace Nekoyume.TableData @@ -32,6 +33,7 @@ public RuneInfo(int id, int qty) public int RateMax; public List Runes; public int Crystal; + public List<(int itemId, int quantity)> Materials; public override int Key => Id; public override void Set(IReadOnlyList fields) { @@ -48,20 +50,42 @@ public override void Set(IReadOnlyList fields) Runes.Add(new RuneInfo(ParseInt(fields[6 + offset]), ParseInt(fields[7 + offset]))); } Crystal = ParseInt(fields[12]); + + if (fields.Count > 13) + { + Materials = new List<(int, int)>(); + for (int i = 0; i < 2; i++) + { + var offset = i * 2; + Materials.Add( + (ParseInt(fields[13 + offset]), ParseInt(fields[14 + offset]))); + } + } } - public List GetRewards(RuneSheet runeSheet) + public (List assets, Dictionary materials) GetRewards( + RuneSheet runeSheet, + MaterialItemSheet materialSheet) { - var result = new List + var assets = new List { Crystal * CrystalCalculator.CRYSTAL }; - result.AddRange(Runes + assets.AddRange(Runes .Where(runeInfo => runeInfo.RuneQty > 0) .Select(runeInfo => RuneHelper.ToFungibleAssetValue(runeSheet[runeInfo.RuneId], runeInfo.RuneQty))); - return result; + + var materials = new Dictionary(); + foreach (var (itemId, quantity) in Materials) + { + var materialRow = materialSheet.Values.First(r => r.Id == itemId); + var material = ItemFactory.CreateTradableMaterial(materialRow); + materials.TryAdd(material, 0); + materials[material] += quantity; + } + return (assets, materials); } } From 9c00932e5bd824effbb77267a884368cfc63e416 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Thu, 10 Oct 2024 18:25:32 +0900 Subject: [PATCH 23/27] update WorldBossRankingRewardSheet test code --- .../WorldBossRankingRewardSheetTest.cs | 51 ++++++++++--------- .../WorldBoss/WorldBossRankingRewardSheet.csv | 38 +++++++------- 2 files changed, 47 insertions(+), 42 deletions(-) diff --git a/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs b/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs index 5bd262d0b8..2c933a8c2e 100644 --- a/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs +++ b/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs @@ -7,25 +7,25 @@ namespace Lib9c.Tests.TableData public class WorldBossRankingRewardSheetTest { private const string Csv = - @"id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal -1,900001,1,1,0,0,10001,3500,10002,1200,10003,300,900000 -2,900001,2,2,0,0,10001,2200,10002,650,10003,150,625000 -3,900001,3,3,0,0,10001,1450,10002,450,10003,100,400000 -4,900001,4,10,0,0,10001,1000,10002,330,10003,70,250000 -5,900001,11,100,0,0,10001,560,10002,150,10003,40,150000 -6,900001,0,0,1,30,10001,370,10002,105,10003,25,100000 -7,900001,0,0,31,50,10001,230,10002,60,10003,10,50000 -8,900001,0,0,51,70,10001,75,10002,20,10003,5,25000 -9,900001,0,0,71,100,10001,40,10002,10,10003,0,15000 -10,900002,1,1,0,0,10011,3500,10012,1200,10013,300,1000000 -11,900002,2,2,0,0,10011,2200,10012,650,10013,150,750000 -12,900002,3,3,0,0,10011,1450,10012,450,10013,100,500000 -13,900002,4,10,0,0,10011,1000,10012,330,10013,70,250000 -14,900002,11,100,0,0,10011,560,10012,150,10013,40,150000 -15,900002,0,0,1,30,10011,370,10012,105,10013,25,100000 -16,900002,0,0,31,50,10011,230,10012,60,10013,10,50000 -17,900002,0,0,51,70,10011,75,10012,20,10013,5,25000 -18,900002,0,0,71,100,10011,40,10012,10,0,0,15000 + @"id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal,item_1_id,item_1_qty,item_2_id,item_2_qty +1,900001,1,1,0,0,10001,3500,10002,1200,10003,300,10000000,600201,100,500000,1000 +2,900001,2,2,0,0,10001,2200,10002,650,10003,150,7500000,600201,100,500000,1000 +3,900001,3,3,0,0,10001,1450,10002,450,10003,100,5000000,600201,100,500000,1000 +4,900001,4,10,0,0,10001,1000,10002,330,10003,70,2500000,600201,100,500000,1000 +5,900001,11,100,0,0,10001,560,10002,150,10003,40,1500000,600201,100,500000,1000 +6,900001,0,0,1,30,10001,370,10002,105,10003,25,500000,600201,50,500000,100 +7,900001,0,0,31,50,10001,230,10002,60,10003,10,250000,600201,50,500000,100 +8,900001,0,0,51,70,10001,75,10002,20,10003,5,125000,600201,50,500000,100 +9,900001,0,0,71,100,10001,40,10002,10,0,0,100000,600201,50,500000,100 +10,900002,1,1,0,0,10011,3500,10012,1200,10013,300,10000000,600201,100,500000,1000 +11,900002,2,2,0,0,10011,2200,10012,650,10013,150,7500000,600201,100,500000,1000 +12,900002,3,3,0,0,10011,1450,10012,450,10013,100,5000000,600201,100,500000,1000 +13,900002,4,10,0,0,10011,1000,10012,330,10013,70,2500000,600201,100,500000,1000 +14,900002,11,100,0,0,10011,560,10012,150,10013,40,1500000,600201,100,500000,1000 +15,900002,0,0,1,30,10011,370,10012,105,10013,25,500000,600201,50,500000,100 +16,900002,0,0,31,50,10011,230,10012,60,10013,10,250000,600201,50,500000,100 +17,900002,0,0,51,70,10011,75,10012,20,10013,5,125000,600201,50,500000,100 +18,900002,0,0,71,100,10011,40,10012,10,0,0,100000,600201,50,500000,100 "; [Fact] @@ -41,7 +41,11 @@ public void Set() Assert.Equal(0, row.RateMin); Assert.Equal(0, row.RateMax); Assert.Equal(3, row.Runes.Count); - Assert.Equal(900000, row.Crystal); + Assert.Equal(10000000, row.Crystal); + Assert.Equal(600201, row.Materials[0].itemId); + Assert.Equal(100, row.Materials[0].quantity); + Assert.Equal(500000, row.Materials[1].itemId); + Assert.Equal(1000, row.Materials[1].quantity); } [Theory] @@ -70,10 +74,11 @@ public void GetRewards() var sheet = new WorldBossRankingRewardSheet(); sheet.Set(Csv); var row = sheet.FindRow(900001, 1, 0); - var runeSheet = new TableSheets(TableSheetsImporter.ImportSheets()).RuneSheet; - var rewards = row.GetRewards(runeSheet); + var tableSheets = new TableSheets(TableSheetsImporter.ImportSheets()); + var rewards = row.GetRewards(tableSheets.RuneSheet, tableSheets.MaterialItemSheet); - Assert.Equal(4, rewards.Count); + Assert.Equal(4, rewards.assets.Count); + Assert.Equal(2, rewards.materials.Count); } } } diff --git a/Lib9c/TableCSV/WorldBoss/WorldBossRankingRewardSheet.csv b/Lib9c/TableCSV/WorldBoss/WorldBossRankingRewardSheet.csv index c1c3f3ac47..dcc4e698b4 100644 --- a/Lib9c/TableCSV/WorldBoss/WorldBossRankingRewardSheet.csv +++ b/Lib9c/TableCSV/WorldBoss/WorldBossRankingRewardSheet.csv @@ -1,19 +1,19 @@ -id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal -1,900001,1,1,0,0,10001,3500,10002,1200,10003,300,10000000 -2,900001,2,2,0,0,10001,2200,10002,650,10003,150,7500000 -3,900001,3,3,0,0,10001,1450,10002,450,10003,100,5000000 -4,900001,4,10,0,0,10001,1000,10002,330,10003,70,2500000 -5,900001,11,100,0,0,10001,560,10002,150,10003,40,1500000 -6,900001,0,0,1,30,10001,370,10002,105,10003,25,500000 -7,900001,0,0,31,50,10001,230,10002,60,10003,10,250000 -8,900001,0,0,51,70,10001,75,10002,20,10003,5,125000 -9,900001,0,0,71,100,10001,40,10002,10,0,0,100000 -10,900002,1,1,0,0,10011,3500,10012,1200,10013,300,10000000 -11,900002,2,2,0,0,10011,2200,10012,650,10013,150,7500000 -12,900002,3,3,0,0,10011,1450,10012,450,10013,100,5000000 -13,900002,4,10,0,0,10011,1000,10012,330,10013,70,2500000 -14,900002,11,100,0,0,10011,560,10012,150,10013,40,1500000 -15,900002,0,0,1,30,10011,370,10012,105,10013,25,500000 -16,900002,0,0,31,50,10011,230,10012,60,10013,10,250000 -17,900002,0,0,51,70,10011,75,10012,20,10013,5,125000 -18,900002,0,0,71,100,10011,40,10012,10,0,0,100000 \ No newline at end of file +id,boss_id,ranking_min,ranking_max,rate_min,rate_max,rune_1_id,rune_1_qty,rune_2_id,rune_2_qty,rune_3_id,rune_3_qty,crystal,item_1_id,item_1_qty,item_2_id,item_2_qty +1,900001,1,1,0,0,10001,3500,10002,1200,10003,300,10000000,600201,100,500000,1000 +2,900001,2,2,0,0,10001,2200,10002,650,10003,150,7500000,600201,100,500000,1000 +3,900001,3,3,0,0,10001,1450,10002,450,10003,100,5000000,600201,100,500000,1000 +4,900001,4,10,0,0,10001,1000,10002,330,10003,70,2500000,600201,100,500000,1000 +5,900001,11,100,0,0,10001,560,10002,150,10003,40,1500000,600201,100,500000,1000 +6,900001,0,0,1,30,10001,370,10002,105,10003,25,500000,600201,50,500000,100 +7,900001,0,0,31,50,10001,230,10002,60,10003,10,250000,600201,50,500000,100 +8,900001,0,0,51,70,10001,75,10002,20,10003,5,125000,600201,50,500000,100 +9,900001,0,0,71,100,10001,40,10002,10,0,0,100000,600201,50,500000,100 +10,900002,1,1,0,0,10011,3500,10012,1200,10013,300,10000000,600201,100,500000,1000 +11,900002,2,2,0,0,10011,2200,10012,650,10013,150,7500000,600201,100,500000,1000 +12,900002,3,3,0,0,10011,1450,10012,450,10013,100,5000000,600201,100,500000,1000 +13,900002,4,10,0,0,10011,1000,10012,330,10013,70,2500000,600201,100,500000,1000 +14,900002,11,100,0,0,10011,560,10012,150,10013,40,1500000,600201,100,500000,1000 +15,900002,0,0,1,30,10011,370,10012,105,10013,25,500000,600201,50,500000,100 +16,900002,0,0,31,50,10011,230,10012,60,10013,10,250000,600201,50,500000,100 +17,900002,0,0,51,70,10011,75,10012,20,10013,5,125000,600201,50,500000,100 +18,900002,0,0,71,100,10011,40,10012,10,0,0,100000,600201,50,500000,100 From dd2249fd34a7593a9198dbaea9b2da30a90249f6 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 11 Oct 2024 14:48:22 +0900 Subject: [PATCH 24/27] fix untradable --- Lib9c/TableData/WorldBossRankingRewardSheet.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib9c/TableData/WorldBossRankingRewardSheet.cs b/Lib9c/TableData/WorldBossRankingRewardSheet.cs index 4671815ad3..7698fa7244 100644 --- a/Lib9c/TableData/WorldBossRankingRewardSheet.cs +++ b/Lib9c/TableData/WorldBossRankingRewardSheet.cs @@ -63,7 +63,7 @@ public override void Set(IReadOnlyList fields) } } - public (List assets, Dictionary materials) GetRewards( + public (List assets, Dictionary materials) GetRewards( RuneSheet runeSheet, MaterialItemSheet materialSheet) { @@ -77,11 +77,11 @@ public override void Set(IReadOnlyList fields) RuneHelper.ToFungibleAssetValue(runeSheet[runeInfo.RuneId], runeInfo.RuneQty))); - var materials = new Dictionary(); + var materials = new Dictionary(); foreach (var (itemId, quantity) in Materials) { var materialRow = materialSheet.Values.First(r => r.Id == itemId); - var material = ItemFactory.CreateTradableMaterial(materialRow); + var material = ItemFactory.CreateMaterial(materialRow); materials.TryAdd(material, 0); materials[material] += quantity; } From cca6859b2a8ce5e605063f16dc1d505ae601a7a0 Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 11 Oct 2024 17:56:30 +0900 Subject: [PATCH 25/27] fix material item to FAV --- .../TableData/WorldBossRankingRewardSheet.cs | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Lib9c/TableData/WorldBossRankingRewardSheet.cs b/Lib9c/TableData/WorldBossRankingRewardSheet.cs index 7698fa7244..5e0b639fb4 100644 --- a/Lib9c/TableData/WorldBossRankingRewardSheet.cs +++ b/Lib9c/TableData/WorldBossRankingRewardSheet.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Lib9c; using Libplanet.Types.Assets; using Nekoyume.Helper; using Nekoyume.Model.Item; @@ -63,29 +64,29 @@ public override void Set(IReadOnlyList fields) } } - public (List assets, Dictionary materials) GetRewards( + public List GetRewards( RuneSheet runeSheet, MaterialItemSheet materialSheet) { - var assets = new List + var result = new List { Crystal * CrystalCalculator.CRYSTAL }; - assets.AddRange(Runes + result.AddRange(Runes .Where(runeInfo => runeInfo.RuneQty > 0) .Select(runeInfo => RuneHelper.ToFungibleAssetValue(runeSheet[runeInfo.RuneId], runeInfo.RuneQty))); - var materials = new Dictionary(); foreach (var (itemId, quantity) in Materials) { - var materialRow = materialSheet.Values.First(r => r.Id == itemId); - var material = ItemFactory.CreateMaterial(materialRow); - materials.TryAdd(material, 0); - materials[material] += quantity; + var isTradable = materialSheet[itemId].ItemSubType + is ItemSubType.Circle or ItemSubType.Scroll; + var currency = Currencies.GetItemCurrency(itemId, isTradable); + result.Add(currency * quantity); } - return (assets, materials); + + return result; } } From ca76985b2ce9e73ed898d63a463d06c99a3fc7fe Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 11 Oct 2024 18:04:45 +0900 Subject: [PATCH 26/27] fix sheet test --- .Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs b/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs index 2c933a8c2e..67e80f3e03 100644 --- a/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs +++ b/.Lib9c.Tests/TableData/WorldBossRankingRewardSheetTest.cs @@ -77,8 +77,7 @@ public void GetRewards() var tableSheets = new TableSheets(TableSheetsImporter.ImportSheets()); var rewards = row.GetRewards(tableSheets.RuneSheet, tableSheets.MaterialItemSheet); - Assert.Equal(4, rewards.assets.Count); - Assert.Equal(2, rewards.materials.Count); + Assert.Equal(6, rewards.Count); } } } From 79506792303c16c33e608a0bf8a40db1c7ce4f4f Mon Sep 17 00:00:00 2001 From: tyrosine1153 Date: Fri, 11 Oct 2024 18:37:01 +0900 Subject: [PATCH 27/27] fix test data for real data --- .Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs index 4305796da8..dd6c3f0b77 100644 --- a/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs +++ b/.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs @@ -1297,7 +1297,7 @@ private class ExecuteWithCustomEquipmentData : IEnumerable new[] { 20160000, 20160001, 20160002 }, new[] { - (600401, 35), + (600401, 14), (600402, 21), }, }, @@ -1306,7 +1306,7 @@ private class ExecuteWithCustomEquipmentData : IEnumerable new[] { 20160000, 20260000, 20360000, 20460000, 20560000 }, new[] { - (600401, 25), + (600401, 10), (600402, 15), }, }, @@ -1315,8 +1315,8 @@ private class ExecuteWithCustomEquipmentData : IEnumerable new[] { 20160003, 20260000, 20360001, 20360001, 20460001 }, new[] { - (600401, 65), - (600402, 39), + (600401, 24), // 10 + 2 + 4 + 4 + 4 = 24 + (600402, 47), // 20 + 3 + 8 + 8 + 8 = 47 }, }, new object[] @@ -1324,8 +1324,8 @@ private class ExecuteWithCustomEquipmentData : IEnumerable new[] { 20560003, 20560003, 20560003 }, new[] { - (600401, 90), - (600402, 54), + (600401, 30), // 10 + 10 + 10 = 30 + (600402, 60), // 20 + 20 + 20 = 60 }, }, };