diff --git a/project.godot b/project.godot index c4950fa..f96ce89 100644 --- a/project.godot +++ b/project.godot @@ -28,6 +28,7 @@ UI="*res://scenes/Singletons/UI.tscn" VN="*res://scripts/Singleton/VN.gd" LOAD="*res://scenes/Singletons/Load.tscn" EVENT="*res://scripts/Singleton/Event.gd" +RECIPE="*res://scenes/Singletons/Recipe.tscn" [display] diff --git a/scenes/Singletons/Recipe.tscn b/scenes/Singletons/Recipe.tscn new file mode 100644 index 0000000..51e772c --- /dev/null +++ b/scenes/Singletons/Recipe.tscn @@ -0,0 +1,13 @@ +[gd_scene load_steps=3 format=3 uid="uid://1l0tymk8cfxu"] + +[ext_resource type="Script" uid="uid://j87s6jrx8unn" path="res://scripts/Singleton/Recipe.gd" id="1_o4nv4"] +[ext_resource type="Script" uid="uid://dipvg4uwjv6p2" path="res://scripts/Cooking/Recipe.gd" id="2_f5akq"] + +[node name="RecipeSystem" type="Node"] +script = ExtResource("1_o4nv4") +metadata/_custom_type_script = "uid://j87s6jrx8unn" + +[node name="Ash-Baked Sweet Potato" type="Node" parent="."] +script = ExtResource("2_f5akq") +recipeName = "Ash-Baked Sweet Potato" +metadata/_custom_type_script = "uid://dipvg4uwjv6p2" diff --git a/scenes/Singletons/barrel.mtl b/scenes/Singletons/barrel.mtl new file mode 100644 index 0000000..832f740 --- /dev/null +++ b/scenes/Singletons/barrel.mtl @@ -0,0 +1,8 @@ +# Material for Barrel +newmtl BarrelTexture +Ka 1.000 1.000 1.000 +Kd 1.000 1.000 1.000 +Ks 0.000 0.000 0.000 +d 1.0 +illum 1 +map_Kd barrel.png \ No newline at end of file diff --git a/scripts/Cooking/CookingGame.gd b/scripts/Cooking/CookingGame.gd deleted file mode 100644 index 17b9aa3..0000000 --- a/scripts/Cooking/CookingGame.gd +++ /dev/null @@ -1,7 +0,0 @@ -class_name CookingGame -const VerticalSlice = preload("res://scripts/Cooking/Recipe/VerticalSlice.gd"); - -var recipe:CookingRecipe = null; - -func _init(recipe:CookingRecipe) -> void: - self.recipe = recipe; diff --git a/scripts/Cooking/CookingGame.gd.uid b/scripts/Cooking/CookingGame.gd.uid deleted file mode 100644 index 0c9aa25..0000000 --- a/scripts/Cooking/CookingGame.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://nsqcafdni4vc diff --git a/scripts/Cooking/Recipe.gd b/scripts/Cooking/Recipe.gd new file mode 100644 index 0000000..83d8f15 --- /dev/null +++ b/scripts/Cooking/Recipe.gd @@ -0,0 +1,8 @@ +@tool +class_name Recipe extends Node + +@export var recipeName:String = "" +@export var ingredients:Array[RecipeIngredient] = [] + +func test(): + print("test") \ No newline at end of file diff --git a/scripts/Cooking/Recipe.gd.uid b/scripts/Cooking/Recipe.gd.uid new file mode 100644 index 0000000..23472d9 --- /dev/null +++ b/scripts/Cooking/Recipe.gd.uid @@ -0,0 +1 @@ +uid://dipvg4uwjv6p2 diff --git a/scripts/Cooking/Recipe/CookingRecipe.gd b/scripts/Cooking/Recipe/CookingRecipe.gd deleted file mode 100644 index e8537f5..0000000 --- a/scripts/Cooking/Recipe/CookingRecipe.gd +++ /dev/null @@ -1,8 +0,0 @@ -class_name CookingRecipe -const ItemStack = preload("res://scripts/Item/ItemStack.gd") - -func _init() -> void: - pass - -func getIngredients() -> Array[ItemStack]: - return [] diff --git a/scripts/Cooking/Recipe/CookingRecipe.gd.uid b/scripts/Cooking/Recipe/CookingRecipe.gd.uid deleted file mode 100644 index 4e889cb..0000000 --- a/scripts/Cooking/Recipe/CookingRecipe.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://bqnancnrbmk5n diff --git a/scripts/Cooking/Recipe/VerticalSlice.gd b/scripts/Cooking/Recipe/VerticalSlice.gd deleted file mode 100644 index 8f9a965..0000000 --- a/scripts/Cooking/Recipe/VerticalSlice.gd +++ /dev/null @@ -1,9 +0,0 @@ -class_name VerticalSlice extends "res://scripts/Cooking/Recipe/CookingRecipe.gd" - -func _init() -> void: - super._init(); - -func getIngredients() -> Array[ItemStack]: - return [ - ItemStack.new(ITEM.ITEM_POTION, 1) - ]; diff --git a/scripts/Cooking/Recipe/VerticalSlice.gd.uid b/scripts/Cooking/Recipe/VerticalSlice.gd.uid deleted file mode 100644 index c1582ea..0000000 --- a/scripts/Cooking/Recipe/VerticalSlice.gd.uid +++ /dev/null @@ -1 +0,0 @@ -uid://c2x1lbdtbtd00 diff --git a/scripts/Cooking/RecipeIngredient.gd b/scripts/Cooking/RecipeIngredient.gd new file mode 100644 index 0000000..ee70d53 --- /dev/null +++ b/scripts/Cooking/RecipeIngredient.gd @@ -0,0 +1,4 @@ +class_name RecipeIngredient extends Resource + +@export var thing:int = 0 +@export var count:int = 1 \ No newline at end of file diff --git a/scripts/Cooking/RecipeIngredient.gd.uid b/scripts/Cooking/RecipeIngredient.gd.uid new file mode 100644 index 0000000..6c0891a --- /dev/null +++ b/scripts/Cooking/RecipeIngredient.gd.uid @@ -0,0 +1 @@ +uid://cy01crjsvohfc diff --git a/scripts/Singleton/Battle.gd b/scripts/Singleton/Battle.gd index 7220c7c..e96e348 100644 --- a/scripts/Singleton/Battle.gd +++ b/scripts/Singleton/Battle.gd @@ -6,4 +6,4 @@ var battle:Battle = null; func startBattle(battle:Battle) -> void: print("start battle"); - self.battle = battle; \ No newline at end of file + self.battle = battle; diff --git a/scripts/Singleton/Cooking.gd b/scripts/Singleton/Cooking.gd index 783115f..61679fd 100644 --- a/scripts/Singleton/Cooking.gd +++ b/scripts/Singleton/Cooking.gd @@ -1,5 +1 @@ -extends Node - -const CookingGame = preload("res://scripts/Cooking/CookingGame.gd"); - -var game:CookingGame = null; \ No newline at end of file +extends Node \ No newline at end of file diff --git a/scripts/Singleton/Recipe.gd b/scripts/Singleton/Recipe.gd new file mode 100644 index 0000000..d7056f3 --- /dev/null +++ b/scripts/Singleton/Recipe.gd @@ -0,0 +1 @@ +class_name RecipeSystem extends Node diff --git a/scripts/Singleton/Recipe.gd.uid b/scripts/Singleton/Recipe.gd.uid new file mode 100644 index 0000000..42171a5 --- /dev/null +++ b/scripts/Singleton/Recipe.gd.uid @@ -0,0 +1 @@ +uid://j87s6jrx8unn