diff --git a/project.godot b/project.godot index 956ba9c..3c60d1d 100644 --- a/project.godot +++ b/project.godot @@ -13,7 +13,7 @@ config_version=5 config/name="Epikale" config/description="As part of one of the longest (and cutest) lineage of kale farmers, it's your time to prove yourself as a legendary giant-kale caretaker, but how big is too big? only you and your tiny tools can show the world the true size of... ...an EPIC... a MEGA... an S-KALE!" -config/version="0.2.0" +config/version="0.2.1" run/main_scene="res://scenes/main.tscn" config/features=PackedStringArray("4.3", "Forward Plus") run/max_fps=60 diff --git a/scenes/levels/sandbox.tscn b/scenes/levels/sandbox.tscn index 1a2accb..5d621ea 100644 --- a/scenes/levels/sandbox.tscn +++ b/scenes/levels/sandbox.tscn @@ -1,7 +1,7 @@ -[gd_scene load_steps=8 format=3 uid="uid://vw37xvmq31p2"] +[gd_scene load_steps=10 format=3 uid="uid://vw37xvmq31p2"] [ext_resource type="PackedScene" uid="uid://dtq401eqrs2xm" path="res://scenes/objects/shovel.tscn" id="1_bkrsc"] -[ext_resource type="PackedScene" path="res://scenes/manure.tscn" id="1_jtr7i"] +[ext_resource type="PackedScene" uid="uid://bn6ahprue2v3c" path="res://scenes/manure.tscn" id="1_jtr7i"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_j8a0q"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -21,6 +21,11 @@ glow_enabled = true [sub_resource type="PlaneMesh" id="PlaneMesh_ipmml"] size = Vector2(100, 100) +[sub_resource type="BoxShape3D" id="BoxShape3D_h4xer"] +size = Vector3(2.8927, 1.6084, 2.50195) + +[sub_resource type="BoxMesh" id="BoxMesh_o6vjn"] + [node name="Sandbox" type="Node3D"] [node name="Manure" parent="." instance=ExtResource("1_jtr7i")] @@ -59,3 +64,13 @@ input_ray_pickable = false [node name="CollisionShape3D" type="CollisionShape3D" parent="World/ShovelPlane"] shape = SubResource("WorldBoundaryShape3D_iwqth") + +[node name="StaticBody3D" type="StaticBody3D" parent="." groups=["Kale"]] + +[node name="CollisionShape3D" type="CollisionShape3D" parent="StaticBody3D" groups=["Kale"]] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.118726, 0, -1.91531) +shape = SubResource("BoxShape3D_h4xer") + +[node name="MeshInstance3D" type="MeshInstance3D" parent="StaticBody3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.196501, 0, -1.36716) +mesh = SubResource("BoxMesh_o6vjn") diff --git a/scenes/levels/world.tscn b/scenes/levels/world.tscn index cff1b11..bbd3ac2 100644 --- a/scenes/levels/world.tscn +++ b/scenes/levels/world.tscn @@ -25,9 +25,9 @@ [ext_resource type="PackedScene" uid="uid://touox4x6ip7l" path="res://assets/models/city/city.glb" id="17_rp11v"] [ext_resource type="PackedScene" path="res://scenes/props/tree.tscn" id="22_dqnln"] [ext_resource type="PackedScene" uid="uid://dqxhamrsiplmr" path="res://assets/models/barrel/Empty Barrel.glb" id="25_rrnhn"] -[ext_resource type="PackedScene" uid="uid://dtq401eqrs2xm" path="res://scenes/objects/shovel.tscn" id="26_y47rk"] -[ext_resource type="PackedScene" path="res://scenes/manure.tscn" id="27_4j008"] [ext_resource type="PackedScene" uid="uid://btnpd8nq3wmio" path="res://scenes/objects/sprinkler.tscn" id="26_scyh7"] +[ext_resource type="PackedScene" uid="uid://dtq401eqrs2xm" path="res://scenes/objects/shovel.tscn" id="26_y47rk"] +[ext_resource type="PackedScene" uid="uid://bn6ahprue2v3c" path="res://scenes/manure.tscn" id="27_4j008"] [sub_resource type="ProceduralSkyMaterial" id="ProceduralSkyMaterial_ngwyh"] sky_horizon_color = Color(0.64625, 0.65575, 0.67075, 1) @@ -440,7 +440,7 @@ collision_mask = 0 shape = SubResource("WorldBoundaryShape3D_m3dr5") [node name="ShovelPlane" type="StaticBody3D" parent="ObjectPlanes"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.12729, 0) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.572123, 0) collision_layer = 4096 input_ray_pickable = false @@ -450,13 +450,13 @@ shape = SubResource("WorldBoundaryShape3D_uwc1y") [node name="Interactable" type="Node" parent="."] [node name="Pipette" parent="Interactable" instance=ExtResource("9_r1hjq")] -transform = Transform3D(-0.987675, 0, 0.156521, 0, 1, 0, -0.156521, 0, -0.987675, 0.581766, 0.236194, -1.1054) +transform = Transform3D(-0.778408, 0, -0.627759, 0, 1, 0, 0.627759, 0, -0.778408, -0.205276, 0.236194, -0.373292) [node name="WateringCan" parent="Interactable" instance=ExtResource("10_y5i48")] -transform = Transform3D(-0.751966, 0, 0.659201, 0, 1, 0, -0.659201, 0, -0.751966, 1.79877, 0.118958, -0.286781) +transform = Transform3D(-0.751966, 0, 0.659201, 0, 1, 0, -0.659201, 0, -0.751966, 1.20239, 0.118958, -2.96514) [node name="WateringCan2" parent="Interactable" instance=ExtResource("10_y5i48")] -transform = Transform3D(-0.666129, 0, -0.745836, 0, 1, 0, 0.745836, 0, -0.666129, -2.29801, 0.224026, -2.40271) +transform = Transform3D(-0.748261, 0, 0.663404, 0, 1, 0, -0.663404, 0, -0.748261, 5.9987, 0.224026, -1.91923) [node name="Manhole" parent="Interactable" instance=ExtResource("7_cfvaw")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 12.4659, -0.046853, 6.10257) @@ -465,10 +465,10 @@ force = 12.0 interval = 0.25 [node name="Ladybug2" parent="Interactable" instance=ExtResource("11_nn7mv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.515731, 0.209344, 0.12833) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.26068, 0.0554067, -2.21788) [node name="Ladybug3" parent="Interactable" instance=ExtResource("11_nn7mv")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.79712, 0.129633, 0.904169) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.84947, 0.0153904, 0.17115) [node name="GrowthRayTower" parent="Interactable" instance=ExtResource("14_c6jl4")] transform = Transform3D(0.557644, 0, 0.83008, 0, 1, 0, -0.83008, 0, 0.557644, -44.1898, -0.233345, -29.6615) @@ -478,7 +478,10 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -46.292, -0.21523, -21.3979) ray_tower = NodePath("../GrowthRayTower") [node name="Fertilizer" parent="Interactable" instance=ExtResource("15_gugyc")] -transform = Transform3D(-0.560176, 0, -0.828373, 0, 1, 0, 0.828373, 0, -0.560176, -0.833586, 0, -1.17428) +transform = Transform3D(-0.560176, 0, -0.828373, 0, 1, 0, 0.828373, 0, -0.560176, -2.31501, 0, -0.096647) + +[node name="Fertilizer2" parent="Interactable" instance=ExtResource("15_gugyc")] +transform = Transform3D(-0.740073, 0.25656, 0.621045, -1.48954e-08, 0.923883, -0.381665, -0.671952, -0.282569, -0.684005, 6.74473, 0.103924, -0.258117) [node name="FlatHouse" parent="Interactable" instance=ExtResource("22_dqnln")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.67826, 0, 0) @@ -488,10 +491,17 @@ pixel_size = 0.08 transform = Transform3D(6.47824, -0.00842768, 6.70653, -6.11579e-10, 9.32444, 0.0117174, -6.70654, -0.00814079, 6.47823, -90.0538, -0.735255, -61.1986) [node name="Shovel_RigidBody" parent="Interactable" instance=ExtResource("26_y47rk")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.43683, 0.447091, -5.41675) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -5.58024, 0.447091, -2.11409) + +[node name="Shovel_RigidBody2" parent="Interactable" instance=ExtResource("26_y47rk")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.32689, 0.447091, 3.81455) [node name="Manure" parent="Interactable" instance=ExtResource("27_4j008")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.53843, 0, -10.0521) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.27845, 2.38419e-07, -3.18291) + +[node name="Manure2" parent="Interactable" instance=ExtResource("27_4j008")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -7.89795, 4.76837e-07, 5.45547) + [node name="Sprinkler" parent="Interactable" instance=ExtResource("26_scyh7")] transform = Transform3D(-0.840784, 0, -0.541371, 0, 1, 0, 0.541371, 0, -0.840784, 2.68783, 0, 3.91572) nutrient_volume = 0.002 diff --git a/scenes/ui/main_menu.tscn b/scenes/ui/main_menu.tscn index 1d4a896..3f37db9 100644 --- a/scenes/ui/main_menu.tscn +++ b/scenes/ui/main_menu.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=8 format=3 uid="uid://la0lgyyjggxx"] +[gd_scene load_steps=9 format=3 uid="uid://la0lgyyjggxx"] [ext_resource type="Script" path="res://scripts/ui/main_menu.gd" id="1_dm2b5"] [ext_resource type="Texture2D" uid="uid://bn8e4y04ra4f1" path="res://assets/sprites/ui/buttons_ui.png" id="2_6cthj"] +[ext_resource type="Texture2D" uid="uid://del3nrkuq0s44" path="res://assets/textures/grass_tex_1.png" id="2_vlxcu"] [sub_resource type="LabelSettings" id="LabelSettings_70pm1"] font_size = 120 @@ -35,14 +36,28 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_dm2b5") -[node name="ColorRect" type="ColorRect" parent="."] +[node name="ColorRect" type="TextureRect" parent="."] +layout_direction = 2 layout_mode = 1 -anchors_preset = 15 +anchors_preset = -1 +anchor_right = 0.555 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 0 +texture = ExtResource("2_vlxcu") +stretch_mode = 5 + +[node name="ColorRect2" type="TextureRect" parent="."] +layout_direction = 2 +layout_mode = 1 +anchors_preset = -1 +anchor_left = 0.441 anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 -grow_vertical = 2 -color = Color(0.635294, 0.662745, 0.278431, 1) +grow_vertical = 0 +texture = ExtResource("2_vlxcu") +stretch_mode = 5 [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 @@ -83,10 +98,10 @@ size_flags_vertical = 0 [node name="CreditsText" type="Label" parent="MarginContainer/Credits"] layout_mode = 2 text = "Made for GMTK Game Jam 2024 by: -Beniamin Dudek (Xkonti) Carme -D4Devil (Damian Moreno)" +Beniamin \"Xkonti\" Dudek +Damian \"D4Devil\" Moreno" label_settings = SubResource("LabelSettings_63ilv") -horizontal_alignment = 2 +horizontal_alignment = 1 [connection signal="button_up" from="MarginContainer/CenterContainer/VBoxContainer/TextureButton" to="." method="_on_start_button_pressed"] diff --git a/scenes/ui/ui.tscn b/scenes/ui/ui.tscn index 89e93c2..b35716a 100644 --- a/scenes/ui/ui.tscn +++ b/scenes/ui/ui.tscn @@ -45,3 +45,4 @@ categories = Array[ExtResource("7_jnb54")]([SubResource("Resource_l7dn0"), SubRe participants_per_category = 6 [node name="DebugUI" parent="." instance=ExtResource("7_g877c")] +visible = false diff --git a/scripts/objects/shovel.gd b/scripts/objects/shovel.gd index 8774457..ce9505a 100644 --- a/scripts/objects/shovel.gd +++ b/scripts/objects/shovel.gd @@ -1,6 +1,7 @@ class_name Shovel extends RigidBody3D +@export var fertilization_value : float = 2 @onready var poo_scene = preload("res://scenes/objects/poo_scoop.tscn") @onready var anchor = $PooAnchor @@ -19,7 +20,9 @@ func _init(): func on_used(use: bool) -> void: if use and _current_poo: + _current_poo.reparent(get_parent()) _current_poo.freeze = false + _current_poo.linear_velocity = linear_velocity _current_poo = null if not _in_manure or not use: @@ -30,15 +33,15 @@ func on_used(use: bool) -> void: ## this line throws errors, but, if i remove it then the _current_poo ## is freed befor checks and that throws exeption, ergo brakes the game - poo.global_position = global_position - - get_tree().root.add_child(poo) + add_child(poo) + poo.configure(Vector3.ZERO, self, self, fertilization_value, Nutrient.Nutrients.Fertilizer) poo.freeze = true _current_poo = poo func _process(_delta) -> void: if _current_poo and not _current_poo.is_queued_for_deletion(): + print(linear_velocity) _current_poo.global_basis = anchor.global_basis _current_poo.global_position = global_position