diff --git a/Assets/Resources/neighborhood.gd b/Assets/Resources/neighborhood.gd index cae29e9..46bbe30 100644 --- a/Assets/Resources/neighborhood.gd +++ b/Assets/Resources/neighborhood.gd @@ -18,7 +18,7 @@ func _init() -> void: empty_byte_strings.fill(empty_byte_string) spawn_range = Vector2(1, 1) - stable_range = Vector2(0, 1) + stable_range = Vector2(1, 1) set_quadrant_strings(Quadrant.UPPER_LEFT, empty_byte_strings) set_quadrant_strings(Quadrant.UPPER_RIGHT, empty_byte_strings) diff --git a/Assets/Scenes/main.tscn b/Assets/Scenes/main.tscn index 631c85c..1c68d7e 100644 --- a/Assets/Scenes/main.tscn +++ b/Assets/Scenes/main.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=68 format=4 uid="uid://cfsgy7huubpok"] +[gd_scene load_steps=69 format=4 uid="uid://cfsgy7huubpok"] [ext_resource type="Script" uid="uid://drfxlavovcgta" path="res://Assets/Scripts/automata_compositor_effect.gd" id="1_vlji8"] [ext_resource type="Script" uid="uid://bjuwof03jt0ds" path="res://Assets/Scripts/draw_world_compositor_effect.gd" id="2_ttgh6"] @@ -47,6 +47,7 @@ [ext_resource type="Script" uid="uid://bgihnnx0yu44j" path="res://Assets/Scripts/UI/load_button.gd" id="43_3awfk"] [ext_resource type="Script" uid="uid://crq07m1x6lflo" path="res://Assets/Scripts/UI/previous_preset_button.gd" id="44_m1eu0"] [ext_resource type="Script" uid="uid://8a62se707mjg" path="res://Assets/Scripts/UI/next_preset_button.gd" id="44_vjyh1"] +[ext_resource type="Texture2D" uid="uid://dnpaqacivui48" path="res://Assets/Textures/UI/controls.png" id="47_1yq77"] [ext_resource type="Script" uid="uid://bnh23rc2uvlr2" path="res://Assets/Scripts/color_palette.gd" id="48_mje4x"] [ext_resource type="AudioStream" uid="uid://cnbqleijqb7hy" path="res://Assets/Audio/bgm5.mp3" id="48_sitla"] [ext_resource type="AudioStream" uid="uid://26ko7au7t7ed" path="res://Assets/Audio/left click 2.mp3" id="49_csh63"] @@ -1119,6 +1120,12 @@ offset_bottom = 624.0 mouse_default_cursor_shape = 2 script = ExtResource("17_tm25p") +[node name="Sprite2D" type="Sprite2D" parent="UI"] +texture_filter = 1 +position = Vector2(643.75, 540.75) +scale = Vector2(1.00128, 1.00299) +texture = ExtResource("47_1yq77") + [node name="CanvasLayer" type="CanvasLayer" parent="."] [node name="ColorRect" type="ColorRect" parent="CanvasLayer"] diff --git a/Assets/Scenes/tutorial.tscn b/Assets/Scenes/tutorial.tscn index 595a3ea..97300ca 100644 --- a/Assets/Scenes/tutorial.tscn +++ b/Assets/Scenes/tutorial.tscn @@ -33,7 +33,7 @@ [ext_resource type="Texture2D" uid="uid://cwchwinllsefv" path="res://Assets/Textures/Tutorial Slides/slide 6.png" id="27_ehy4s"] [ext_resource type="Texture2D" uid="uid://dj8gys728ndb3" path="res://Assets/Textures/Tutorial Slides/slide 7.png" id="28_a21j5"] [ext_resource type="Texture2D" uid="uid://f144ca7ncoiu" path="res://Assets/Textures/Tutorial Slides/slide 8.png" id="29_ioof4"] -[ext_resource type="Script" uid="uid://n1c7utg00au7" path="res://Assets/Scripts/UI/reseed_button.gd" id="31_n1iyd"] +[ext_resource type="Script" uid="uid://btl8fmfx1qtq" path="res://Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd" id="31_54pdg"] [ext_resource type="Texture2D" uid="uid://c4xfg8a07ddy4" path="res://Assets/Textures/UI/left slide button.png" id="32_xhr83"] [ext_resource type="Script" uid="uid://cglvstu26dupc" path="res://Assets/Scripts/UI/previous_button.gd" id="34_ssaki"] [ext_resource type="Script" uid="uid://vqe37s4t7tyf" path="res://Assets/Scripts/UI/next_button.gd" id="35_64lsc"] @@ -974,7 +974,7 @@ offset_top = 775.0 offset_right = 1639.0 offset_bottom = 837.0 mouse_default_cursor_shape = 2 -script = ExtResource("31_n1iyd") +script = ExtResource("31_54pdg") [node name="TextureRect8" type="TextureRect" parent="Slides"] visible = false diff --git a/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd b/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd new file mode 100644 index 0000000..07babe3 --- /dev/null +++ b/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd @@ -0,0 +1,4 @@ +extends AcerolaPanel + +func on_pressed() -> void: + GameMaster.queue_reseed() diff --git a/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd.uid b/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd.uid new file mode 100644 index 0000000..95b959c --- /dev/null +++ b/Assets/Scripts/UI/Tool Buttons/tutorial_play_button.gd.uid @@ -0,0 +1 @@ +uid://btl8fmfx1qtq diff --git a/Assets/Scripts/game_master.gd b/Assets/Scripts/game_master.gd index 407f38a..a578aa8 100644 --- a/Assets/Scripts/game_master.gd +++ b/Assets/Scripts/game_master.gd @@ -45,6 +45,7 @@ func _ready() -> void: preset_resources = ResourceLoader.list_directory(automaton_presets) for preset_resource in preset_resources: + print(preset_resource) automaton_cache.append(ResourceLoader.load(automaton_presets + "/" + preset_resource, "Automaton", ResourceLoader.CACHE_MODE_IGNORE) as Automaton) var automaton_dir = DirAccess.open(automaton_cache_path) @@ -195,6 +196,8 @@ func start_tutorial() -> void: func tutorial_setup() -> void: current_seed = 7566 + automaton_index = 4 + load_automaton_from_preset() @@ -241,3 +244,6 @@ func _input(event: InputEvent) -> void: if event.keycode == KEY_4: time_setting = 3 + + if event.keycode == KEY_ESCAPE: + get_tree().quit() diff --git a/Assets/Scripts/slideshow.gd b/Assets/Scripts/slideshow.gd index eca7b7b..0d0153a 100644 --- a/Assets/Scripts/slideshow.gd +++ b/Assets/Scripts/slideshow.gd @@ -42,3 +42,4 @@ func next_slide() -> void: if slide_index == 1: GameMaster.set_active_automaton(tutorial_automaton) + GameMaster.queue_reseed() diff --git a/Assets/Textures/UI/controls.png b/Assets/Textures/UI/controls.png new file mode 100644 index 0000000..4e9d7a9 Binary files /dev/null and b/Assets/Textures/UI/controls.png differ diff --git a/project.godot b/project.godot index adc109f..d449337 100644 --- a/project.godot +++ b/project.godot @@ -11,7 +11,7 @@ config_version=5 [application] config/name="god-machine" -run/main_scene="uid://cfsgy7huubpok" +run/main_scene="uid://50jykn4bwujk" config/features=PackedStringArray("4.4", "Forward Plus") config/icon="res://icon.svg" @@ -24,6 +24,14 @@ GameMaster="*res://Assets/Scripts/game_master.gd" window/size/viewport_width=1920 window/size/viewport_height=1080 +window/size/mode=3 +window/size/resizable=false +window/size/borderless=true +window/stretch/mode="viewport" + +[editor] + +export/convert_text_resources_to_binary=false [rendering]