Merge pull request planetarium#2226 from planetarium/2023q3-aura

2023q3 aura
moreal · Aug 31, 2023 · 7cea74b · 7cea74b
2 parents 3b12e0e + b660006
commit 7cea74b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/Lib9c b/Lib9c
diff --git a/NineChronicles.Headless.Tests/Common/Fixtures.cs b/NineChronicles.Headless.Tests/Common/Fixtures.cs
@@ -53,8 +53,11 @@ public static ShopState ShopStateFX()
             {
                 var row = TableSheetsFX.EquipmentItemSheet.OrderedList[index];
                 var equipment = ItemFactory.CreateItemUsable(row, Guid.Empty, 0);
-                var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX, equipment);
-                shopState.Register(shopItem);
+                if (equipment is ITradableItem tradableItem)
+                {
+                    var shopItem = new ShopItem(UserAddress, AvatarAddress, Guid.NewGuid(), index * CurrencyFX, tradableItem);
+                    shopState.Register(shopItem);
+                }
             }
 
             for (var i = 0; i < TableSheetsFX.CostumeItemSheet.OrderedList.Count; i++)

diff --git a/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs b/NineChronicles.Headless.Tests/GraphTypes/StandaloneSubscriptionTest.cs
@@ -75,7 +75,7 @@ public async Task SubscribeTx()
         {
             const string query = @"
             subscription {
-                tx (actionType: ""grinding"") {
+                tx (actionType: ""grinding2"") {
                     transaction { id }
                     txResult { blockIndex }
                 }

diff --git a/NineChronicles.Headless.Tests/GraphTypes/States/Models/ShopItemTypeTest.cs b/NineChronicles.Headless.Tests/GraphTypes/States/Models/ShopItemTypeTest.cs
@@ -44,7 +44,7 @@ Dictionary<string, object> costumeDict
             if (costume is null)
             {
                 shopItem = new ShopItem(Fixtures.UserAddress, Fixtures.AvatarAddress,
-                    new Guid("d3d9ac06-eb91-4cc4-863a-5b4769ad633e"), 100 * Fixtures.CurrencyFX, itemUsable);
+                    new Guid("d3d9ac06-eb91-4cc4-863a-5b4769ad633e"), 100 * Fixtures.CurrencyFX, (ITradableItem)itemUsable);
             }
             else
             {
+173 −0		.Lib9c.Tests/Action/AuraSummonTest.cs
+1 −1		.Lib9c.Tests/Action/Buy10Test.cs
+1 −1		.Lib9c.Tests/Action/Buy11Test.cs
+1 −1		.Lib9c.Tests/Action/Buy2Test.cs
+2 −2		.Lib9c.Tests/Action/Buy3Test.cs
+2 −2		.Lib9c.Tests/Action/Buy4Test.cs
+3 −3		.Lib9c.Tests/Action/Buy5Test.cs
+2 −2		.Lib9c.Tests/Action/Buy6Test.cs
+2 −2		.Lib9c.Tests/Action/Buy7Test.cs
+1 −1		.Lib9c.Tests/Action/Buy8Test.cs
+1 −1		.Lib9c.Tests/Action/Buy9Test.cs
+3 −3		.Lib9c.Tests/Action/BuyMultipleTest.cs
+1 −1		.Lib9c.Tests/Action/BuyProduct0Test.cs
+1 −1		.Lib9c.Tests/Action/BuyProductTest.cs
+1 −1		.Lib9c.Tests/Action/BuyTest.cs
+256 −0		.Lib9c.Tests/Action/Grinding0Test.cs
+1 −1		.Lib9c.Tests/Action/GrindingTest.cs
+2 −2		.Lib9c.Tests/Action/ItemEnhancement10Test.cs
+2 −2		.Lib9c.Tests/Action/ItemEnhancement9Test.cs
+76 −24		.Lib9c.Tests/Action/ItemEnhancementTest.cs
+1 −1		.Lib9c.Tests/Action/ReRegisterProduct0Test.cs
+1 −1		.Lib9c.Tests/Action/ReRegisterProductTest.cs
+2 −2		.Lib9c.Tests/Action/RegisterProduct0Test.cs
+2 −2		.Lib9c.Tests/Action/RegisterProductTest.cs
+73 −1		.Lib9c.Tests/Action/Scenario/AuraScenarioTest.cs
+11 −11		.Lib9c.Tests/Action/Scenario/MarketScenarioTest.cs
+2 −2		.Lib9c.Tests/Action/Sell10Test.cs
+2 −2		.Lib9c.Tests/Action/Sell11Test.cs
+1 −1		.Lib9c.Tests/Action/Sell4Test.cs
+5 −5		.Lib9c.Tests/Action/Sell5Test.cs
+7 −7		.Lib9c.Tests/Action/Sell6Test.cs
+2 −2		.Lib9c.Tests/Action/Sell7Test.cs
+2 −2		.Lib9c.Tests/Action/Sell8Test.cs
+2 −2		.Lib9c.Tests/Action/Sell9Test.cs
+1 −1		.Lib9c.Tests/Action/SellCancellation0Test.cs
+1 −1		.Lib9c.Tests/Action/SellCancellation2Test.cs
+2 −2		.Lib9c.Tests/Action/SellCancellation3Test.cs
+2 −2		.Lib9c.Tests/Action/SellCancellation4Test.cs
+4 −4		.Lib9c.Tests/Action/SellCancellation5Test.cs
+3 −3		.Lib9c.Tests/Action/SellCancellation6Test.cs
+4 −4		.Lib9c.Tests/Action/SellCancellation7Test.cs
+5 −5		.Lib9c.Tests/Action/SellCancellation8Test.cs
+5 −5		.Lib9c.Tests/Action/SellCancellationTest.cs
+2 −2		.Lib9c.Tests/Action/SellTest.cs
+1 −1		.Lib9c.Tests/Action/UpdateSell0Test.cs
+1 −1		.Lib9c.Tests/Action/UpdateSell2Test.cs
+1 −1		.Lib9c.Tests/Action/UpdateSell3Test.cs
+1 −1		.Lib9c.Tests/Action/UpdateSell4Test.cs
+1 −1		.Lib9c.Tests/Action/UpdateSellTest.cs
+3 −5		.Lib9c.Tests/Model/Item/EquipmentTest.cs
+2 −2		.Lib9c.Tests/Model/Item/InventoryTest.cs
+10 −10		.Lib9c.Tests/Model/Item/ShopItemTest.cs
+1 −1		.Lib9c.Tests/Model/Order/NonFungibleOrderTest.cs
+4 −4		.Lib9c.Tests/Model/Order/OrderFactoryTest.cs
+54 −0		.Lib9c.Tests/Model/PlayerTest.cs
+3 −0		.Lib9c.Tests/TableSheets.cs
+3 −3		.github/workflows/main.yml
+12 −0		Lib9c.Abstractions/IAuraSummonV1.cs
+196 −0		Lib9c/Action/AuraSummon.cs
+1 −1		Lib9c/Action/Buy6.cs
+1 −1		Lib9c/Action/Buy7.cs
+2 −2		Lib9c/Action/Grinding.cs
+197 −0		Lib9c/Action/Grinding0.cs
+14 −6		Lib9c/Action/ItemEnhancement.cs
+1 −1		Lib9c/Action/RegisterProduct.cs
+1 −1		Lib9c/Action/Sell0.cs
+1 −1		Lib9c/Action/Sell2.cs
+1 −1		Lib9c/Action/Sell3.cs
+1 −1		Lib9c/Action/Sell4.cs
+1 −1		Lib9c/Action/SellCancellation6.cs
+1 −1		Lib9c/Battle/CPHelper.cs
+37 −0		Lib9c/Helper/SummonHelper.cs
+3 −1		Lib9c/Model/Item/Armor.cs
+3 −1		Lib9c/Model/Item/Belt.cs
+3 −1		Lib9c/Model/Item/Consumable.cs
+1 −1		Lib9c/Model/Item/Costume.cs
+18 −4		Lib9c/Model/Item/Equipment.cs
+2 −1		Lib9c/Model/Item/INonFungibleItem.cs
+0 −1		Lib9c/Model/Item/ItemUsable.cs
+3 −1		Lib9c/Model/Item/Necklace.cs
+3 −1		Lib9c/Model/Item/Ring.cs
+3 −1		Lib9c/Model/Item/Weapon.cs
+1 −0		Lib9c/Model/Mail/IMail.cs
+1 −0		Lib9c/Model/Mail/Mail.cs
+33 −0		Lib9c/Model/Mail/SummonMail.cs
+2 −2		Lib9c/Model/Order/FungibleOrder.cs
+3 −3		Lib9c/Model/Order/NonFungibleOrder.cs
+2 −1		Lib9c/TableCSV/Crystal/CrystalEquipmentGrindingSheet.csv
+8 −1		Lib9c/TableCSV/Item/EquipmentItemRecipeSheet.csv
+8 −1		Lib9c/TableCSV/Item/EquipmentItemSheet.csv
+1 −0		Lib9c/TableCSV/Item/MaterialItemSheet.csv
+4 −0		Lib9c/TableCSV/Summon/AuraSummonSheet.csv
+76 −0		Lib9c/TableData/Summon/AuraSummonSheet.cs