Merge branch 'main' into feat/project-intro

not-blond-beard · Jun 5, 2024 · 57201b9 · 57201b9
2 parents ee64d7f + 4e42bc3
commit 57201b9
Show file tree

Hide file tree

Showing 154 changed files with 2,516 additions and 2,365 deletions.
diff --git a/backend/app/Savor22b/Action/RegisterTradeGoodAction.cs b/backend/app/Savor22b/Action/RegisterTradeGoodAction.cs
@@ -7,9 +7,9 @@ namespace Savor22b.Action;
 using Libplanet.Assets;
 using Libplanet.Headless.Extensions;
 using Libplanet.State;
+using Savor22b.Action.Exceptions;
 using Savor22b.States;
 using Savor22b.States.Trade;
-using Savor22b.Action.Exceptions;
 
 [ActionType(nameof(RegisterTradeGoodAction))]
 public class RegisterTradeGoodAction : SVRAction
@@ -53,16 +53,23 @@ public RegisterTradeGoodAction(FungibleAssetValue price, int dungeonId)
         {
             [nameof(Price)] = Price.ToBencodex(),
             [nameof(FoodStateId)] = FoodStateId.Serialize(),
-            [nameof(ItemStateIds)] = ItemStateIds is null ? Null.Value : (List)ItemStateIds.Select(i => i.Serialize()),
+            [nameof(ItemStateIds)] = ItemStateIds is null
+                ? Null.Value
+                : (List)ItemStateIds.Select(i => i.Serialize()),
             [nameof(DungeonId)] = DungeonId.Serialize(),
         }.ToImmutableDictionary();
 
     protected override void LoadPlainValueInternal(IImmutableDictionary<string, IValue> plainValue)
     {
         Price = plainValue[nameof(Price)].ToFungibleAssetValue();
         FoodStateId = plainValue[nameof(FoodStateId)].ToGuid();
-        ItemStateIds = plainValue[nameof(ItemStateIds)] is Null ? null : ((List)plainValue[nameof(ItemStateIds)]).Select(e => e.ToGuid()).ToImmutableList();
-        DungeonId = plainValue[nameof(DungeonId)].ToInteger();
+        ItemStateIds =
+            plainValue[nameof(ItemStateIds)] is Null
+                ? null
+                : ((List)plainValue[nameof(ItemStateIds)])
+                    .Select(e => e.ToGuid())
+                    .ToImmutableList();
+        DungeonId = plainValue[nameof(DungeonId)].ToNullableInteger();
     }
 
     public override IAccountStateDelta Execute(IActionContext ctx)
@@ -77,10 +84,12 @@ public override IAccountStateDelta Execute(IActionContext ctx)
         RootState rootState = states.GetState(ctx.Signer) is Dictionary rootStateEncoded
             ? new RootState(rootStateEncoded)
             : new RootState();
-        TradeInventoryState tradeInventoryState = states.GetState(TradeInventoryState.StateAddress) is Dictionary tradeInventoryStateEncoded
+        TradeInventoryState tradeInventoryState = states.GetState(TradeInventoryState.StateAddress)
+            is Dictionary tradeInventoryStateEncoded
             ? new TradeInventoryState(tradeInventoryStateEncoded)
             : new TradeInventoryState();
-        GlobalDungeonState globalDungeonState = states.GetState(GlobalDungeonState.StateAddress) is Dictionary globalDungeonStateEncoded
+        GlobalDungeonState globalDungeonState = states.GetState(GlobalDungeonState.StateAddress)
+            is Dictionary globalDungeonStateEncoded
             ? new GlobalDungeonState(globalDungeonStateEncoded)
             : new GlobalDungeonState();
 
@@ -89,7 +98,12 @@ public override IAccountStateDelta Execute(IActionContext ctx)
         if (FoodStateId is not null)
         {
             var foodState = inventoryState.GetRefrigeratorItem(FoodStateId.Value);
-            var foodGoodState = new FoodGoodState(ctx.Signer, ctx.Random.GenerateRandomGuid(), Price, foodState);
+            var foodGoodState = new FoodGoodState(
+                ctx.Signer,
+                ctx.Random.GenerateRandomGuid(),
+                Price,
+                foodState
+            );
             inventoryState = inventoryState.RemoveRefrigeratorItem(FoodStateId.Value);
             tradeInventoryState = tradeInventoryState.RegisterGood(foodGoodState);
         }
@@ -106,7 +120,8 @@ public override IAccountStateDelta Execute(IActionContext ctx)
                 ctx.Signer,
                 ctx.Random.GenerateRandomGuid(),
                 Price,
-                itemStates.ToImmutableList());
+                itemStates.ToImmutableList()
+            );
 
             tradeInventoryState = tradeInventoryState.RegisterGood(itemsGoodState);
         }
@@ -116,7 +131,8 @@ public override IAccountStateDelta Execute(IActionContext ctx)
                 ctx.Signer,
                 ctx.Random.GenerateRandomGuid(),
                 Price,
-                DungeonId.Value);
+                DungeonId.Value
+            );
 
             if (!globalDungeonState.IsDungeonConquestAddress(DungeonId.Value, ctx.Signer))
             {

diff --git a/...end/Savor-22b/scripts/global/inventory.gd → frontend/Savor-22b/global/inventory.gd b/...end/Savor-22b/scripts/global/inventory.gd → frontend/Savor-22b/global/inventory.gd
@@ -1,9 +1,9 @@
 extends Node
 
-const inventory_scene = preload("res://scenes/inventory/inventory.tscn");
+const inventory_scene = preload("res://scenes/inventory/inventory.tscn")
 
 func open_inventory(data: Dictionary):
 	var inventory_instance := inventory_scene.instantiate()
-	inventory_instance.data = data;
+	inventory_instance.data = data
 
 	get_tree().root.add_child(inventory_instance)
diff --git a/...Savor-22b/scripts/global/scene_context.gd → frontend/Savor-22b/global/scene_context.gd b/...Savor-22b/scripts/global/scene_context.gd → frontend/Savor-22b/global/scene_context.gd
@@ -1,42 +1,5 @@
 extends Node
 
-#var villages_json_string := """{
-	#"villages": [
-	  #{
-		#"id": 1,
-		#"name": "평범한 도시 1",
-		#"width": 3,
-		#"height": 11,
-		#"worldX": 5,
-		#"worldY": 1,
-		#"houses": [
-		  #{
-			#"x": 1,
-			#"y": 1,
-			#"owner": "0x53103C2D7875D2f5f02AeC3075155e268a6e3A94"
-		  #}
-		#]
-	  #},
-	  #{
-		#"id": 2,
-		#"name": "외로운 섬",
-		#"width": 7,
-		#"height": 13,
-		#"worldX": -2,
-		#"worldY": 7,
-		#"houses": []
-	  #},
-	  #{
-		#"id": 3,
-		#"name": "정글",
-		#"width": 3,
-		#"height": 5,
-		#"worldX": 1,
-		#"worldY": -3,
-		#"houses": []
-	  #}
-	#]
-  #}"""
 var villages: Array
 var selected_village_index := 0
 var user_state: Dictionary
@@ -56,7 +19,7 @@ var selected_field_index := 0
 var selected_item_index := 0
 var selected_item_name : String
 
-var selected_recipe_index := 0
+var selected_recipe_index := 1
 var selected_ingredients : Array
 var selected_tools : Array
 
@@ -66,14 +29,6 @@ var installed_tool_info : Array
 
 var block_index : Dictionary
 
-#func _ready():
-	#var json = JSON.new()
-	#var error = json.parse(villages_json_string)
-	#if error != OK:
-		#print(error)
-	#else:
-		#villages = json.data.villages
-
 func set_villages(query_data: Dictionary):
 	villages = query_data.data.villages
 

diff --git a/frontend/Savor-22b/scripts/sign/Signer.gd → frontend/Savor-22b/global/signer.gd b/frontend/Savor-22b/scripts/sign/Signer.gd → frontend/Savor-22b/global/signer.gd
@@ -1,4 +1,4 @@
-extends Node;
+extends Node
 
 var signer
 var signer_address

diff --git a/frontend/Savor-22b/gql/svr_gql_client_2.gd → ...vor-22b/global/svr_explorer_gql_client.gd b/frontend/Savor-22b/gql/svr_gql_client_2.gd → ...vor-22b/global/svr_explorer_gql_client.gd
@@ -1,9 +1,7 @@
 extends GQLClient
 
 func _ready():
-	print("client 2 ready")
-	#set_endpoint(false, "1.230.253.103", 38080, "/graphql")
-
+
 	set_endpoint(false, "localhost", 38080, "/graphql/explorer")
 
 

diff --git a/frontend/Savor-22b/gql/svr_gql_client.gd → frontend/Savor-22b/global/svr_gql_client.gd b/frontend/Savor-22b/gql/svr_gql_client.gd → frontend/Savor-22b/global/svr_gql_client.gd
@@ -1,8 +1,6 @@
 extends GQLClient
 
 func _ready():
-	print("client ready")
-	#set_endpoint(false, "1.230.253.103", 38080, "/graphql")
 
 	set_endpoint(false, "localhost", 38080, "/graphql")