Feat/farm

backend/app/Savor22b.Tests/Action/PlaceUserHouseActionTests.cs

@@ -8,6 +8,7 @@ namespace Savor22b.Tests.Action;
 using Savor22b.Constants;
 using Libplanet.Assets;
 using Savor22b.Action.Exceptions;
+using System.Collections.Immutable;
 
 public class PlaceUserHouseActionTests : ActionTests
 {
@@ -54,6 +55,30 @@ is Bencodex.Types.Dictionary stateEncoded
             SignerAddress(),
             globalUserHouseState.UserHouse[$"{villageId},{targetX},{targetY}"]
         );
+
+        Assert.Equal(100, rootState.InventoryState.SeedStateList.Count);
+        Assert.All(
+            rootState.InventoryState.SeedStateList,
+            (seed) => Assert.True(seed.SeedID >= 1 && seed.SeedID <= 13)
+        );
+        Assert.Equal(
+            Enumerable.Repeat(10, 6).ToImmutableList(),
+            rootState.InventoryState.KitchenEquipmentStateList.Aggregate(
+                new Dictionary<int, int>(),
+                (dict, curr) =>
+                {
+                    if (!dict.ContainsKey(curr.KitchenEquipmentID))
+                    {
+                        dict.Add(curr.KitchenEquipmentID, 1);
+                    }
+                    else
+                    {
+                        dict[curr.KitchenEquipmentID]++;
+                    }
+                    return dict;
+                }
+            ).Values.ToImmutableList()
+        );
     }
 
     private IAccountStateDelta createStateForRelocationHouse()

backend/app/Savor22b/Action/PlaceUserHouseAction.cs

@@ -137,6 +137,32 @@ is Dictionary stateEncoded
         if (isInitialPlaceHouse)
         {
             PlaceInitialUserHouse(rootState);
+
+            var inventoryState = rootState.InventoryState;
+
+            for (int i = 0; i < 100; i++)
+            {
+                inventoryState = inventoryState.AddSeed(
+                    new SeedState(ctx.Random.GenerateRandomGuid(), ctx.Random.Next() % 13 + 1)
+                );
+            }
+
+            var kitchenEquipments = CsvDataHelper.GetKitchenEquipmentCSVData();
+            foreach (var k in kitchenEquipments)
+            {
+                for (int i = 0; i < 10; i++)
+                {
+                    inventoryState = inventoryState.AddKitchenEquipmentItem(
+                        new KitchenEquipmentState(
+                            ctx.Random.GenerateRandomGuid(),
+                            k.ID,
+                            k.KitchenEquipmentCategoryID
+                        )
+                    );
+                }
+            }
+
+            rootState.SetInventoryState(inventoryState);
         }
         else
         {

backend/app/Savor22b/GraphTypes/Query/Query.cs

@@ -49,6 +49,27 @@ public Query(BlockChain blockChain, Swarm? swarm = null)
             }
         );
 
+        Field<UserStateType>(
+            "userState",
+            description: "The specified address's user state",
+            arguments: new QueryArguments(
+                new QueryArgument<NonNullGraphType<StringGraphType>>
+                {
+                    Name = "address",
+                    Description = "The account holder's 40-hex address",
+                }
+            ),
+            resolve: context =>
+            {
+                var accountAddress = new Address(context.GetArgument<string>("address"));
+                var rootStateEncoded = blockChain.GetState(accountAddress);
+                RootState rootState = rootStateEncoded is Bencodex.Types.Dictionary bdict
+                    ? new RootState(bdict)
+                    : new RootState();
+                return rootState;
+            }
+        );
+
         // TODO: Move to Libplanet.Explorer or Node API.
         Field<StringGraphType>(
             "peerString",

frontend/Saver-22b-godot/scripts/scenes/intro.gd

@@ -41,6 +41,108 @@ func _query_user_state():
 	var query = GQLQuery.new("userState").set_args({
 		"signer_address": "address",
 	}).set_props([
+		GQLQuery.new("villageState").set_props([
+			GQLQuery.new("houseFieldStates").set_props([
+				"installedSeedGuid",
+				"seedID",
+				"installedBlock",
+				"totalBlock",
+				"lastWeedBlock",
+				"weedRemovalCount",
+				"seedName",
+				"isHarvested",
+				"weedRemovalAble",
+			]),
+			GQLQuery.new("houseState").set_props([
+				"villageId",
+				"positionX",
+				"positionY",
+				GQLQuery.new("kitchenState").set_props([
+					GQLQuery.new("firstApplianceSpace").set_props([
+						"spaceNumber",
+						GQLQuery.new("installedKitchenEquipment").set_props([
+							"stateId",
+							"equipmentId",
+							"equipmentName",
+							"blockTimeReductionPercent",
+							"equipmentCategoryId",
+							"equipmentCategoryName",
+							"equipmentCategoryType",
+							"isCooking",
+							"cookingEndBlockIndex",
+							GQLQuery.new("cookingFood").set_props([
+								"stateId",
+								"ingredientId",
+								"foodID",
+								"name",
+								"grade",
+								"hp",
+								"attack",
+								"defense",
+								"speed",
+								"isSuperFood",
+								"isAvailable",
+							]),
+						]),
+					]),
+					GQLQuery.new("secondApplianceSpace").set_props([
+						"spaceNumber",
+						GQLQuery.new("installedKitchenEquipment").set_props([
+							"stateId",
+							"equipmentId",
+							"equipmentName",
+							"blockTimeReductionPercent",
+							"equipmentCategoryId",
+							"equipmentCategoryName",
+							"equipmentCategoryType",
+							"isCooking",
+							"cookingEndBlockIndex",
+							GQLQuery.new("cookingFood").set_props([
+								"stateId",
+								"ingredientId",
+								"foodID",
+								"name",
+								"grade",
+								"hp",
+								"attack",
+								"defense",
+								"speed",
+								"isSuperFood",
+								"isAvailable",
+							]),
+						]),
+					]),
+					GQLQuery.new("thirdApplianceSpace").set_props([
+						"spaceNumber",
+						GQLQuery.new("installedKitchenEquipment").set_props([
+							"stateId",
+							"equipmentId",
+							"equipmentName",
+							"blockTimeReductionPercent",
+							"equipmentCategoryId",
+							"equipmentCategoryName",
+							"equipmentCategoryType",
+							"isCooking",
+							"cookingEndBlockIndex",
+							GQLQuery.new("cookingFood").set_props([
+								"stateId",
+								"ingredientId",
+								"foodID",
+								"name",
+								"grade",
+								"hp",
+								"attack",
+								"defense",
+								"speed",
+								"isSuperFood",
+								"isAvailable",
+							]),
+						]),
+					]),
+				]),
+				"villageName",
+			])
+		]),
 		GQLQuery.new("inventoryState").set_props([
 			GQLQuery.new("seedStateList").set_props([
 				"stateId",

frontend/Saver-22b-godot/scripts/scenes/select_village.gd

@@ -28,4 +28,3 @@ func _on_village_button_button_down(village_index):
 func _on_start_button_button_down():
 	print("start button down: %s" % SceneContext.selected_village_index)
 	get_tree().change_scene_to_file("res://village_view/VillageView.tscn")
-	#get_tree().change_scene_to_file("res://scenes/farm.tscn")

frontend/Saver-22b-godot/village_view/TemporaryView.gd

@@ -7,12 +7,5 @@ func _ready():
 	var village = SceneContext.get_selected_village()
 	var village_view_instance = village_view_node.instantiate()
 	village_view_instance.set_name("view")
-	#village_view_instance.initialize(
-		#1000,
-		#500,
-		#0,
-		#0,
-		#[Vector2(0,0),Vector2(1,0),Vector2(0,1),Vector2(1,1)])
-
 	add_child(village_view_instance)
 	village_view_instance.initialize_by_village(village)

frontend/Saver-22b-godot/village_view/VillageView.gd

@@ -26,7 +26,14 @@ func _input(event):
 	var mouse_event = event as InputEventMouseButton
 	if mouse_event != null and mouse_event.is_released() and mouse_event.button_index == MOUSE_BUTTON_LEFT and mouse_event.is_command_or_control_pressed():
 		print("Mouse Click/Unclick at: ", event.position)
-		build_house()
+		print("root pos: ", root_local_position)
+		var pos = bg.get_local_mouse_position()
+		print("mouse pos: ", pos)
+		var relative_pos = pos - root_local_position
+		relative_pos /= Coordinate_weight
+		relative_pos.x = roundi(relative_pos.x)
+		relative_pos.y = roundi(relative_pos.y)
+		build_house(relative_pos)
 
 func initialize_by_village(village: Dictionary):
 	initialize(
@@ -61,16 +68,14 @@ func instantiate_house(pos: Vector2):
 	bg.add_child(house)
 	house.set_size(Vector2(Coordinate_weight, Coordinate_weight))
 	house.set_global_position(pos * Coordinate_weight + root_position - Vector2(Coordinate_weight / 2, Coordinate_weight / 2))
+	house.button_down.connect(func(house_pos):
+		#var village = SceneContext.get_selected_village()
+		#village.houses.
+		get_tree().change_scene_to_file("res://scenes/farm.tscn")
+	)
 
-func build_house():
-	var pos = bg.get_local_mouse_position()
-	var relative_pos = pos - root_local_position
-	relative_pos /= Coordinate_weight
-	relative_pos.x = roundi(relative_pos.x)
-	relative_pos.y = roundi(relative_pos.y)
+func build_house(relative_pos: Vector2):
 	print("build house pos: ", relative_pos)
-	print("root pos: ", root_local_position)
-	print("mouse pos: ", pos)
 	print("public key: ", GlobalSigner.signer.GetPublicKey())
 	var gql_query = Gql_query.new()
 	var query_string = gql_query.place_house_query_format.format([

frontend/Saver-22b-godot/village_view/house_texture_rect.gd

@@ -0,0 +1,7 @@
+extends TextureRect
+
+signal button_down(position: Vector2)
+
+func _on_button_button_down():
+	print(position)
+	button_down.emit(position)

frontend/Saver-22b-godot/village_view/house_texture_rect.tscn

@@ -1,6 +1,7 @@
-[gd_scene load_steps=2 format=3 uid="uid://cjvcx7fit5avb"]
+[gd_scene load_steps=3 format=3 uid="uid://ccrlf3kfcisji"]
 
 [ext_resource type="Texture2D" uid="uid://dajunmx26gvr5" path="res://sprites/house.png" id="1_4yb37"]
+[ext_resource type="Script" path="res://village_view/house_texture_rect.gd" id="2_hemgv"]
 
 [node name="House_TextureRect" type="TextureRect"]
 anchors_preset = 8
@@ -17,3 +18,19 @@ grow_vertical = 2
 size_flags_horizontal = 4
 size_flags_vertical = 4
 texture = ExtResource("1_4yb37")
+script = ExtResource("2_hemgv")
+
+[node name="Button" type="Button" parent="."]
+layout_mode = 1
+anchors_preset = 12
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+offset_top = -6.0
+offset_bottom = 16.0
+grow_horizontal = 2
+grow_vertical = 0
+theme_override_font_sizes/font_size = 10
+text = "Enter"
+
+[connection signal="button_down" from="Button" to="." method="_on_button_button_down"]