diff options
| -rw-r--r-- | client/map/items/grass.gd | 23 | ||||
| -rw-r--r-- | client/map/tiles/grass.tscn | 6 | ||||
| -rw-r--r-- | client/map/tiles/grass_generation.gd | 15 | ||||
| -rw-r--r-- | client/menu/overlay.tscn | 9 |
4 files changed, 28 insertions, 25 deletions
diff --git a/client/map/items/grass.gd b/client/map/items/grass.gd index d303f8c7..1222f767 100644 --- a/client/map/items/grass.gd +++ b/client/map/items/grass.gd @@ -1,23 +1,36 @@ # Undercooked - a game about cooking # Copyright 2024 nokoe -# +# Copyright 2024 tpart +# # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, version 3 of the License only. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU Affero General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. -# +# class_name Grass extends Tile +const GRASS_SIDE: PackedScene = preload("res://map/tiles/grass_side.tscn") +const GRASS_COUNT: int = 16 + func _init(rename: String, _neighbors: Array): super(rename, _neighbors) - var grass_tile = load("res://map/tiles/grass.tscn").instantiate() + var grass_tile = preload("res://map/tiles/grass.tscn").instantiate() grass_tile.position += Vector3(0.5, 0, 0.5) add_child(grass_tile) + + var random = RandomNumberGenerator.new() + random.seed = rename.hash() + + for _i in Global.settings["grass_amount"]["value"]: + var g: Node3D = GRASS_SIDE.instantiate() + grass_tile.add_child(g) + g.position = Vector3(random.randf_range(-.5, .5), 0, random.randf_range(-.5, .5)) + g.rotation = Vector3(0, random.randf_range(0, PI), 0) diff --git a/client/map/tiles/grass.tscn b/client/map/tiles/grass.tscn index dd0ef53c..31ff6a69 100644 --- a/client/map/tiles/grass.tscn +++ b/client/map/tiles/grass.tscn @@ -1,10 +1,8 @@ -[gd_scene load_steps=3 format=3 uid="uid://ce14cj7exkvas"] +[gd_scene load_steps=2 format=3 uid="uid://bi6o7lbvhunj1"] -[ext_resource type="ArrayMesh" uid="uid://dyu8iuolwqr5l" path="res://map/tiles/grass.res" id="1_pjjrj"] -[ext_resource type="Script" path="res://map/tiles/grass_generation.gd" id="1_u7p1u"] +[ext_resource type="ArrayMesh" path="res://map/tiles/grass.res" id="1_pjjrj"] [node name="Grass" type="Node3D"] -script = ExtResource("1_u7p1u") [node name="Mesh" type="MeshInstance3D" parent="."] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0) diff --git a/client/map/tiles/grass_generation.gd b/client/map/tiles/grass_generation.gd deleted file mode 100644 index 02f9bf83..00000000 --- a/client/map/tiles/grass_generation.gd +++ /dev/null @@ -1,15 +0,0 @@ -extends Node3D - -const GRASS_COUNT = 16 - -@onready var grass_side = preload("res://map/tiles/grass_side.tscn") - -func _ready(): - var random = RandomNumberGenerator.new() - random.randomize() - - for _i in Global.settings["grass_amount"]["value"]: - var g: Node3D = grass_side.instantiate() - add_child(g) - g.position = Vector3(random.randf_range(-.5, .5), 0, random.randf_range(-.5, .5)) - g.rotation = Vector3(0, random.randf_range(0, PI), 0) diff --git a/client/menu/overlay.tscn b/client/menu/overlay.tscn index d0f002db..66e2a9f3 100644 --- a/client/menu/overlay.tscn +++ b/client/menu/overlay.tscn @@ -1,7 +1,8 @@ -[gd_scene load_steps=7 format=3 uid="uid://bpikve6wlsjfl"] +[gd_scene load_steps=8 format=3 uid="uid://bpikve6wlsjfl"] [ext_resource type="Theme" uid="uid://b0qmvo504e457" path="res://menu/theme/theme.tres" id="1_4kujw"] [ext_resource type="Script" path="res://menu/overlay.gd" id="2_kbjds"] +[ext_resource type="FontFile" uid="uid://bo4vh5xkpvrh1" path="res://menu/theme/font-sansita-swashed.woff2" id="3_u54fv"] [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_04ujj"] bg_color = Color(0, 0, 0, 0) @@ -70,6 +71,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line1"] layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 25 text = "Completed" @@ -81,6 +83,7 @@ size_flags_horizontal = 3 custom_minimum_size = Vector2(100, 0) layout_mode = 2 theme_override_colors/font_color = Color(0, 0.278431, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 35 text = "0" horizontal_alignment = 1 @@ -91,6 +94,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line2"] layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 25 text = "Failed" @@ -102,6 +106,7 @@ size_flags_horizontal = 3 custom_minimum_size = Vector2(100, 0) layout_mode = 2 theme_override_colors/font_color = Color(0.505882, 0, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 35 text = "0" horizontal_alignment = 1 @@ -112,6 +117,7 @@ layout_mode = 2 [node name="Label" type="Label" parent="Control/Paper/Margin/Lines/Line3"] layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 35 text = "Points" @@ -123,6 +129,7 @@ size_flags_horizontal = 3 custom_minimum_size = Vector2(100, 0) layout_mode = 2 theme_override_colors/font_color = Color(0, 0, 0, 1) +theme_override_fonts/font = ExtResource("3_u54fv") theme_override_font_sizes/font_size = 45 text = "0" horizontal_alignment = 1 |