From 3c8709c834b50bed1f3483d8a9d2a847aa234e69 Mon Sep 17 00:00:00 2001 From: Michele Rossi Date: Thu, 19 Mar 2026 22:18:34 +0100 Subject: [PATCH] Change project organization --- .gitignore | 1 + big_number.gd => core/big_number.gd | 0 big_number.gd.uid => core/big_number.gd.uid | 0 {currency => core/currency}/currency.gd | 0 {currency => core/currency}/currency.gd.uid | 0 {currency => core}/currency_database.gd | 2 +- {currency => core}/currency_database.gd.uid | 0 game_state.gd => core/game_state.gd | 0 game_state.gd.uid => core/game_state.gd.uid | 0 .../generator-unlock-goals}/TECH_SPEC.md | 0 .../generator_unlock_system.gd | 2 +- .../generator_unlock_system.gd.uid | 0 .../generator-unlock-goals}/goals_debug_ui.gd | 2 +- .../goals_debug_ui.gd.uid | 0 .../goals_debug_ui.tscn | 25 ++++++------- .../generator}/currency_generator.gd | 0 .../generator}/currency_generator.gd.uid | 0 .../generator}/currency_generator.tscn | 6 ++-- .../generator}/currency_generator_data.gd | 0 .../generator}/currency_generator_data.gd.uid | 0 .../generator}/generator_buff_data.gd | 0 .../generator}/generator_buff_data.gd.uid | 0 .../museums/big_number_museum.gd | 0 .../museums/big_number_museum.gd.uid | 0 .../museums/big_number_museum.tscn | 2 +- .../museums/generator_museum.tscn | 36 +++++++++---------- generator/primary_generator.tres | 15 -------- .../buffs/knowledge_auto_treatise.tres | 4 +-- .../buffs/knowledge_click_notes.tres | 4 +-- .../buffs/knowledge_grant_program.tres | 6 ++-- .../buffs/magic_auto_flux.tres | 5 +-- .../buffs/magic_click_focus.tres | 5 +-- .../buffs/magic_supply_cache.tres | 4 +-- {currency => idles/currencies}/knowledge.tres | 2 +- {currency => idles/currencies}/magic.tres | 2 +- .../generator_unlock_goals.json | 0 idles/generators/primary_generator.tres | 16 +++++++++ .../generators}/secondary_generator.tres | 8 ++--- project.godot | 2 +- 39 files changed, 74 insertions(+), 75 deletions(-) rename big_number.gd => core/big_number.gd (100%) rename big_number.gd.uid => core/big_number.gd.uid (100%) rename {currency => core/currency}/currency.gd (100%) rename {currency => core/currency}/currency.gd.uid (100%) rename {currency => core}/currency_database.gd (98%) rename {currency => core}/currency_database.gd.uid (100%) rename game_state.gd => core/game_state.gd (100%) rename game_state.gd.uid => core/game_state.gd.uid (100%) rename {generator-unlock-goals => core/generator-unlock-goals}/TECH_SPEC.md (100%) rename {generator-unlock-goals => core/generator-unlock-goals}/generator_unlock_system.gd (98%) rename {generator-unlock-goals => core/generator-unlock-goals}/generator_unlock_system.gd.uid (100%) rename {generator-unlock-goals => core/generator-unlock-goals}/goals_debug_ui.gd (99%) rename {generator-unlock-goals => core/generator-unlock-goals}/goals_debug_ui.gd.uid (100%) rename {generator-unlock-goals => core/generator-unlock-goals}/goals_debug_ui.tscn (63%) rename {generator => core/generator}/currency_generator.gd (100%) rename {generator => core/generator}/currency_generator.gd.uid (100%) rename {generator => core/generator}/currency_generator.tscn (87%) rename {generator => core/generator}/currency_generator_data.gd (100%) rename {generator => core/generator}/currency_generator_data.gd.uid (100%) rename {generator => core/generator}/generator_buff_data.gd (100%) rename {generator => core/generator}/generator_buff_data.gd.uid (100%) rename big_number_museum.gd => docs/museums/big_number_museum.gd (100%) rename big_number_museum.gd.uid => docs/museums/big_number_museum.gd.uid (100%) rename big_number_museum.tscn => docs/museums/big_number_museum.tscn (96%) rename generator_museum.tscn => docs/museums/generator_museum.tscn (70%) delete mode 100644 generator/primary_generator.tres rename {generator => idles}/buffs/knowledge_auto_treatise.tres (81%) rename {generator => idles}/buffs/knowledge_click_notes.tres (81%) rename {generator => idles}/buffs/knowledge_grant_program.tres (81%) rename {generator => idles}/buffs/magic_auto_flux.tres (74%) rename {generator => idles}/buffs/magic_click_focus.tres (75%) rename {generator => idles}/buffs/magic_supply_cache.tres (85%) rename {currency => idles/currencies}/knowledge.tres (89%) rename {currency => idles/currencies}/magic.tres (89%) rename {generator-unlock-goals => idles}/generator_unlock_goals.json (100%) create mode 100644 idles/generators/primary_generator.tres rename {generator => idles/generators}/secondary_generator.tres (54%) diff --git a/.gitignore b/.gitignore index 0af181c..834ce3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Godot 4+ specific ignores .godot/ /android/ +[Ss]andbox/ diff --git a/big_number.gd b/core/big_number.gd similarity index 100% rename from big_number.gd rename to core/big_number.gd diff --git a/big_number.gd.uid b/core/big_number.gd.uid similarity index 100% rename from big_number.gd.uid rename to core/big_number.gd.uid diff --git a/currency/currency.gd b/core/currency/currency.gd similarity index 100% rename from currency/currency.gd rename to core/currency/currency.gd diff --git a/currency/currency.gd.uid b/core/currency/currency.gd.uid similarity index 100% rename from currency/currency.gd.uid rename to core/currency/currency.gd.uid diff --git a/currency/currency_database.gd b/core/currency_database.gd similarity index 98% rename from currency/currency_database.gd rename to core/currency_database.gd index a59d2d4..e3647c5 100644 --- a/currency/currency_database.gd +++ b/core/currency_database.gd @@ -7,7 +7,7 @@ extends Node #1: GEMS_CURRENCY_ID, #} -const CURRENCY_DIRECTORY_PATH: String = "res://currency" +const CURRENCY_DIRECTORY_PATH: String = "res://idles/currencies" const CURRENCY_RESOURCE_EXTENSIONS: PackedStringArray = ["tres", "res"] var _currency_by_id: Dictionary = {} diff --git a/currency/currency_database.gd.uid b/core/currency_database.gd.uid similarity index 100% rename from currency/currency_database.gd.uid rename to core/currency_database.gd.uid diff --git a/game_state.gd b/core/game_state.gd similarity index 100% rename from game_state.gd rename to core/game_state.gd diff --git a/game_state.gd.uid b/core/game_state.gd.uid similarity index 100% rename from game_state.gd.uid rename to core/game_state.gd.uid diff --git a/generator-unlock-goals/TECH_SPEC.md b/core/generator-unlock-goals/TECH_SPEC.md similarity index 100% rename from generator-unlock-goals/TECH_SPEC.md rename to core/generator-unlock-goals/TECH_SPEC.md diff --git a/generator-unlock-goals/generator_unlock_system.gd b/core/generator-unlock-goals/generator_unlock_system.gd similarity index 98% rename from generator-unlock-goals/generator_unlock_system.gd rename to core/generator-unlock-goals/generator_unlock_system.gd index 6618628..32dbf10 100644 --- a/generator-unlock-goals/generator_unlock_system.gd +++ b/core/generator-unlock-goals/generator_unlock_system.gd @@ -18,7 +18,7 @@ class UnlockGoal extends RefCounted: target_generator_id = target_id requirements = goal_requirements -const GOALS_FILE_PATH: String = "res://generator-unlock-goals/generator_unlock_goals.json" +const GOALS_FILE_PATH: String = "res://idles/generator_unlock_goals.json" const SCHEMA_VERSION: int = 1 var _goals: Array[UnlockGoal] = [] diff --git a/generator-unlock-goals/generator_unlock_system.gd.uid b/core/generator-unlock-goals/generator_unlock_system.gd.uid similarity index 100% rename from generator-unlock-goals/generator_unlock_system.gd.uid rename to core/generator-unlock-goals/generator_unlock_system.gd.uid diff --git a/generator-unlock-goals/goals_debug_ui.gd b/core/generator-unlock-goals/goals_debug_ui.gd similarity index 99% rename from generator-unlock-goals/goals_debug_ui.gd rename to core/generator-unlock-goals/goals_debug_ui.gd index 6dbe624..3b9113a 100644 --- a/generator-unlock-goals/goals_debug_ui.gd +++ b/core/generator-unlock-goals/goals_debug_ui.gd @@ -30,7 +30,7 @@ class GoalRow extends RefCounted: requirements_label = requirements button = unlock_button -const GOALS_FILE_PATH: String = "res://generator-unlock-goals/generator_unlock_goals.json" +const GOALS_FILE_PATH: String = "res://idles/generator_unlock_goals.json" @onready var _summary_label: Label = $MarginContainer/VBoxContainer/SummaryLabel @onready var _goals_list: VBoxContainer = $MarginContainer/VBoxContainer/ScrollContainer/GoalsList diff --git a/generator-unlock-goals/goals_debug_ui.gd.uid b/core/generator-unlock-goals/goals_debug_ui.gd.uid similarity index 100% rename from generator-unlock-goals/goals_debug_ui.gd.uid rename to core/generator-unlock-goals/goals_debug_ui.gd.uid diff --git a/generator-unlock-goals/goals_debug_ui.tscn b/core/generator-unlock-goals/goals_debug_ui.tscn similarity index 63% rename from generator-unlock-goals/goals_debug_ui.tscn rename to core/generator-unlock-goals/goals_debug_ui.tscn index dfe28fe..2099cdb 100644 --- a/generator-unlock-goals/goals_debug_ui.tscn +++ b/core/generator-unlock-goals/goals_debug_ui.tscn @@ -1,44 +1,39 @@ -[gd_scene load_steps=2 format=3] +[gd_scene format=3 uid="uid://dirvi76rkoowf"] -[ext_resource type="Script" path="res://generator-unlock-goals/goals_debug_ui.gd" id="1_s7s8v"] +[ext_resource type="Script" uid="uid://bmrbaulftvvwm" path="res://core/generator-unlock-goals/goals_debug_ui.gd" id="1_s7s8v"] -[node name="GoalsDebugUI" type="PanelContainer"] +[node name="GoalsDebugUI" type="PanelContainer" unique_id=1494700185] offset_right = 640.0 offset_bottom = 260.0 script = ExtResource("1_s7s8v") -[node name="MarginContainer" type="MarginContainer" parent="."] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 +[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1582529872] +layout_mode = 2 theme_override_constants/margin_left = 8 theme_override_constants/margin_top = 8 theme_override_constants/margin_right = 8 theme_override_constants/margin_bottom = 8 -[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] +[node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer" unique_id=1555356181] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 theme_override_constants/separation = 6 -[node name="TitleLabel" type="Label" parent="MarginContainer/VBoxContainer"] +[node name="TitleLabel" type="Label" parent="MarginContainer/VBoxContainer" unique_id=811777252] layout_mode = 2 text = "Goals Debug" -[node name="SummaryLabel" type="Label" parent="MarginContainer/VBoxContainer"] +[node name="SummaryLabel" type="Label" parent="MarginContainer/VBoxContainer" unique_id=17196021] layout_mode = 2 text = "Goals: 0 | Ready: 0 | Unlocked: 0" -[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/VBoxContainer"] +[node name="ScrollContainer" type="ScrollContainer" parent="MarginContainer/VBoxContainer" unique_id=1105060075] custom_minimum_size = Vector2(0, 170) layout_mode = 2 size_flags_vertical = 3 -[node name="GoalsList" type="VBoxContainer" parent="MarginContainer/VBoxContainer/ScrollContainer"] +[node name="GoalsList" type="VBoxContainer" parent="MarginContainer/VBoxContainer/ScrollContainer" unique_id=1684633480] layout_mode = 2 size_flags_horizontal = 3 size_flags_vertical = 3 diff --git a/generator/currency_generator.gd b/core/generator/currency_generator.gd similarity index 100% rename from generator/currency_generator.gd rename to core/generator/currency_generator.gd diff --git a/generator/currency_generator.gd.uid b/core/generator/currency_generator.gd.uid similarity index 100% rename from generator/currency_generator.gd.uid rename to core/generator/currency_generator.gd.uid diff --git a/generator/currency_generator.tscn b/core/generator/currency_generator.tscn similarity index 87% rename from generator/currency_generator.tscn rename to core/generator/currency_generator.tscn index 279edb3..b27f256 100644 --- a/generator/currency_generator.tscn +++ b/core/generator/currency_generator.tscn @@ -1,8 +1,8 @@ [gd_scene format=3 uid="uid://jeoiinukrrsp"] -[ext_resource type="Script" uid="uid://dtbxopw6ulhl8" path="res://generator/currency_generator.gd" id="1_4n4ca"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_5tmvy"] -[ext_resource type="Resource" uid="uid://co0mcc2kvcpo5" path="res://generator/primary_generator.tres" id="3_wx13b"] +[ext_resource type="Script" uid="uid://dtbxopw6ulhl8" path="res://core/generator/currency_generator.gd" id="1_4n4ca"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_5tmvy"] +[ext_resource type="Resource" uid="uid://co0mcc2kvcpo5" path="res://idles/generators/primary_generator.tres" id="3_wx13b"] [ext_resource type="Texture2D" uid="uid://bgtt3wu43tajh" path="res://icon.svg" id="4_ruf1h"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_y5m1q"] diff --git a/generator/currency_generator_data.gd b/core/generator/currency_generator_data.gd similarity index 100% rename from generator/currency_generator_data.gd rename to core/generator/currency_generator_data.gd diff --git a/generator/currency_generator_data.gd.uid b/core/generator/currency_generator_data.gd.uid similarity index 100% rename from generator/currency_generator_data.gd.uid rename to core/generator/currency_generator_data.gd.uid diff --git a/generator/generator_buff_data.gd b/core/generator/generator_buff_data.gd similarity index 100% rename from generator/generator_buff_data.gd rename to core/generator/generator_buff_data.gd diff --git a/generator/generator_buff_data.gd.uid b/core/generator/generator_buff_data.gd.uid similarity index 100% rename from generator/generator_buff_data.gd.uid rename to core/generator/generator_buff_data.gd.uid diff --git a/big_number_museum.gd b/docs/museums/big_number_museum.gd similarity index 100% rename from big_number_museum.gd rename to docs/museums/big_number_museum.gd diff --git a/big_number_museum.gd.uid b/docs/museums/big_number_museum.gd.uid similarity index 100% rename from big_number_museum.gd.uid rename to docs/museums/big_number_museum.gd.uid diff --git a/big_number_museum.tscn b/docs/museums/big_number_museum.tscn similarity index 96% rename from big_number_museum.tscn rename to docs/museums/big_number_museum.tscn index 86f040c..f5ce5fe 100644 --- a/big_number_museum.tscn +++ b/docs/museums/big_number_museum.tscn @@ -1,6 +1,6 @@ [gd_scene format=3 uid="uid://b11eevc8qj18p"] -[ext_resource type="Script" uid="uid://coasop1lyw5rh" path="res://big_number_museum.gd" id="1_muwei"] +[ext_resource type="Script" uid="uid://coasop1lyw5rh" path="res://docs/museums/big_number_museum.gd" id="1_muwei"] [ext_resource type="PackedScene" uid="uid://btkxru2gdjsgc" path="res://currency_tile.tscn" id="2_a7k0t"] [ext_resource type="PackedScene" uid="uid://ckos7f22pnmyh" path="res://generator_container.tscn" id="2_h2bxk"] diff --git a/generator_museum.tscn b/docs/museums/generator_museum.tscn similarity index 70% rename from generator_museum.tscn rename to docs/museums/generator_museum.tscn index 8731dcc..3858319 100644 --- a/generator_museum.tscn +++ b/docs/museums/generator_museum.tscn @@ -1,23 +1,23 @@ [gd_scene format=3 uid="uid://cfryecxmcg8hw"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_bj0ey"] -[ext_resource type="Resource" uid="uid://04pmc034qupd" path="res://generator/secondary_generator.tres" id="3_dc82g"] -[ext_resource type="PackedScene" uid="uid://ckos7f22pnmyh" path="res://generator_container.tscn" id="3_pw2a0"] -[ext_resource type="PackedScene" uid="uid://btkxru2gdjsgc" path="res://currency_tile.tscn" id="3_x5lt1"] -[ext_resource type="PackedScene" path="res://generator-unlock-goals/goals_debug_ui.tscn" id="4_63gjq"] -[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="6_gemsc"] -[ext_resource type="PackedScene" uid="uid://jeoiinukrrsp" path="res://generator/currency_generator.tscn" id="6_mhw8n"] +[ext_resource type="PackedScene" uid="uid://jeoiinukrrsp" path="res://core/generator/currency_generator.tscn" id="1_6pne4"] +[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_8qilt"] +[ext_resource type="Resource" uid="uid://04pmc034qupd" path="res://idles/generators/secondary_generator.tres" id="3_4ly0e"] +[ext_resource type="PackedScene" uid="uid://btkxru2gdjsgc" path="res://currency_tile.tscn" id="4_6ri4a"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="5_dl3gy"] +[ext_resource type="PackedScene" uid="uid://ckos7f22pnmyh" path="res://generator_container.tscn" id="6_miduw"] +[ext_resource type="PackedScene" uid="uid://dirvi76rkoowf" path="res://core/generator-unlock-goals/goals_debug_ui.tscn" id="7_7i63j"] [node name="GeneratorMuseum" type="Node2D" unique_id=1219373683] -[node name="MagicGenerator" parent="." unique_id=967969064 instance=ExtResource("6_mhw8n")] +[node name="MagicGenerator" parent="." unique_id=967969064 instance=ExtResource("1_6pne4")] position = Vector2(580, 114) -[node name="KnowledgeGenerator" parent="." unique_id=2139088546 instance=ExtResource("6_mhw8n")] +[node name="KnowledgeGenerator" parent="." unique_id=2139088546 instance=ExtResource("1_6pne4")] visible = false position = Vector2(761, 342) -currency = ExtResource("6_gemsc") -data = ExtResource("3_dc82g") +currency = ExtResource("2_8qilt") +data = ExtResource("3_4ly0e") [node name="UI" type="Control" parent="." unique_id=452530906] layout_mode = 3 @@ -25,20 +25,20 @@ anchors_preset = 0 offset_right = 40.0 offset_bottom = 40.0 -[node name="GoldCurrencyTile" parent="UI" unique_id=1440583137 instance=ExtResource("3_x5lt1")] +[node name="GoldCurrencyTile" parent="UI" unique_id=1440583137 instance=ExtResource("4_6ri4a")] layout_mode = 0 offset_right = 160.0 offset_bottom = 31.0 -currency = ExtResource("2_bj0ey") +currency = ExtResource("5_dl3gy") -[node name="GemsCurrencyTile" parent="UI" unique_id=1977342362 instance=ExtResource("3_x5lt1")] +[node name="GemsCurrencyTile" parent="UI" unique_id=1977342362 instance=ExtResource("4_6ri4a")] layout_mode = 0 offset_top = 28.0 offset_right = 160.0 offset_bottom = 59.0 -currency = ExtResource("6_gemsc") +currency = ExtResource("2_8qilt") -[node name="MagicGeneratorContainer" parent="UI" unique_id=1129190041 node_paths=PackedStringArray("_generator") instance=ExtResource("3_pw2a0")] +[node name="MagicGeneratorContainer" parent="UI" unique_id=1129190041 node_paths=PackedStringArray("_generator") instance=ExtResource("6_miduw")] layout_mode = 1 offset_left = -19.0 offset_top = 50.5 @@ -46,7 +46,7 @@ offset_right = 422.0 offset_bottom = 316.0 _generator = NodePath("../../MagicGenerator") -[node name="KnowledgeGeneratorContainer" parent="UI" unique_id=1999544736 node_paths=PackedStringArray("_generator") instance=ExtResource("3_pw2a0")] +[node name="KnowledgeGeneratorContainer" parent="UI" unique_id=1999544736 node_paths=PackedStringArray("_generator") instance=ExtResource("6_miduw")] visible = false layout_mode = 1 offset_left = -16.0 @@ -55,7 +55,7 @@ offset_right = 417.0 offset_bottom = 626.0 _generator = NodePath("../../KnowledgeGenerator") -[node name="GoalsDebugUI" parent="UI" unique_id=4710697 instance=ExtResource("4_63gjq")] +[node name="GoalsDebugUI" parent="UI" unique_id=4710697 instance=ExtResource("7_7i63j")] layout_mode = 1 offset_left = 846.0 offset_top = 390.0 diff --git a/generator/primary_generator.tres b/generator/primary_generator.tres deleted file mode 100644 index 07500ae..0000000 --- a/generator/primary_generator.tres +++ /dev/null @@ -1,15 +0,0 @@ -[gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://co0mcc2kvcpo5"] - -[ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://generator/currency_generator_data.gd" id="1_c6y77"] -[ext_resource type="Resource" path="res://generator/buffs/magic_auto_flux.tres" id="2_x505b"] -[ext_resource type="Resource" path="res://generator/buffs/magic_click_focus.tres" id="3_fsxdm"] -[ext_resource type="Resource" path="res://generator/buffs/magic_supply_cache.tres" id="4_x2byu"] - -[resource] -script = ExtResource("1_c6y77") -id = &"Magic" -name = "Magic Orb" -initial_time = 0.6 -initial_productivity = 1.67 -buffs = [ExtResource("2_x505b"), ExtResource("3_fsxdm"), ExtResource("4_x2byu")] -metadata/_custom_type_script = "uid://b00tqsuhxdy0d" diff --git a/generator/buffs/knowledge_auto_treatise.tres b/idles/buffs/knowledge_auto_treatise.tres similarity index 81% rename from generator/buffs/knowledge_auto_treatise.tres rename to idles/buffs/knowledge_auto_treatise.tres index 8081c31..c9d0b3e 100644 --- a/generator/buffs/knowledge_auto_treatise.tres +++ b/idles/buffs/knowledge_auto_treatise.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://b4ne724qqo4d8"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_4w6kt"] -[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="2_hk5d2"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_4w6kt"] +[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_hk5d2"] [resource] script = ExtResource("1_4w6kt") diff --git a/generator/buffs/knowledge_click_notes.tres b/idles/buffs/knowledge_click_notes.tres similarity index 81% rename from generator/buffs/knowledge_click_notes.tres rename to idles/buffs/knowledge_click_notes.tres index a91f0ae..cc292c7 100644 --- a/generator/buffs/knowledge_click_notes.tres +++ b/idles/buffs/knowledge_click_notes.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://l5a300wieavc"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_l4lhm"] -[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="2_9xja7"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_l4lhm"] +[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_9xja7"] [resource] script = ExtResource("1_l4lhm") diff --git a/generator/buffs/knowledge_grant_program.tres b/idles/buffs/knowledge_grant_program.tres similarity index 81% rename from generator/buffs/knowledge_grant_program.tres rename to idles/buffs/knowledge_grant_program.tres index af519ce..dd1fc3f 100644 --- a/generator/buffs/knowledge_grant_program.tres +++ b/idles/buffs/knowledge_grant_program.tres @@ -1,8 +1,8 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://dxljqpqhdfqn6"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_8ee3d"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_j7l8a"] -[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="3_ynr4x"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_8ee3d"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_j7l8a"] +[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="3_ynr4x"] [resource] script = ExtResource("1_8ee3d") diff --git a/generator/buffs/magic_auto_flux.tres b/idles/buffs/magic_auto_flux.tres similarity index 74% rename from generator/buffs/magic_auto_flux.tres rename to idles/buffs/magic_auto_flux.tres index 69c24c4..123bf0f 100644 --- a/generator/buffs/magic_auto_flux.tres +++ b/idles/buffs/magic_auto_flux.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://ceugcxmassmpk"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_r7ak1"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_h3we5"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_r7ak1"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_h3we5"] [resource] script = ExtResource("1_r7ak1") @@ -12,3 +12,4 @@ effect_increment = 0.15 cost_currency = ExtResource("2_h3we5") base_cost_mantissa = 25.0 cost_multiplier = 1.7 +resource_target_currency = ExtResource("2_h3we5") diff --git a/generator/buffs/magic_click_focus.tres b/idles/buffs/magic_click_focus.tres similarity index 75% rename from generator/buffs/magic_click_focus.tres rename to idles/buffs/magic_click_focus.tres index ac53aa6..e95a027 100644 --- a/generator/buffs/magic_click_focus.tres +++ b/idles/buffs/magic_click_focus.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://6i3fcygusuqf"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_1wyaq"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_0j56j"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_1wyaq"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_0j56j"] [resource] script = ExtResource("1_1wyaq") @@ -13,3 +13,4 @@ effect_increment = 0.35 cost_currency = ExtResource("2_0j56j") base_cost_mantissa = 8.0 cost_multiplier = 1.55 +resource_target_currency = ExtResource("2_0j56j") diff --git a/generator/buffs/magic_supply_cache.tres b/idles/buffs/magic_supply_cache.tres similarity index 85% rename from generator/buffs/magic_supply_cache.tres rename to idles/buffs/magic_supply_cache.tres index 6daeeb6..882803e 100644 --- a/generator/buffs/magic_supply_cache.tres +++ b/idles/buffs/magic_supply_cache.tres @@ -1,7 +1,7 @@ [gd_resource type="Resource" script_class="GeneratorBuffData" format=3 uid="uid://cluds3cw1d65q"] -[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://generator/generator_buff_data.gd" id="1_fvte4"] -[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://currency/magic.tres" id="2_ea8w5"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_fvte4"] +[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_ea8w5"] [resource] script = ExtResource("1_fvte4") diff --git a/currency/knowledge.tres b/idles/currencies/knowledge.tres similarity index 89% rename from currency/knowledge.tres rename to idles/currencies/knowledge.tres index 60d7156..0164e38 100644 --- a/currency/knowledge.tres +++ b/idles/currencies/knowledge.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="Currency" format=3 uid="uid://bnhqk8b31mm4e"] -[ext_resource type="Script" uid="uid://dtgqjf3bl7pm8" path="res://currency/currency.gd" id="1_72iuq"] +[ext_resource type="Script" uid="uid://dtgqjf3bl7pm8" path="res://core/currency/currency.gd" id="1_72iuq"] [ext_resource type="Texture2D" uid="uid://bgtt3wu43tajh" path="res://icon.svg" id="2_x2h5x"] [resource] diff --git a/currency/magic.tres b/idles/currencies/magic.tres similarity index 89% rename from currency/magic.tres rename to idles/currencies/magic.tres index 0a27d86..5b7d307 100644 --- a/currency/magic.tres +++ b/idles/currencies/magic.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="Currency" format=3 uid="uid://brqaojindcxa5"] -[ext_resource type="Script" uid="uid://dtgqjf3bl7pm8" path="res://currency/currency.gd" id="1_x4uiu"] +[ext_resource type="Script" uid="uid://dtgqjf3bl7pm8" path="res://core/currency/currency.gd" id="1_x4uiu"] [ext_resource type="Texture2D" uid="uid://bgtt3wu43tajh" path="res://icon.svg" id="2_52ar0"] [resource] diff --git a/generator-unlock-goals/generator_unlock_goals.json b/idles/generator_unlock_goals.json similarity index 100% rename from generator-unlock-goals/generator_unlock_goals.json rename to idles/generator_unlock_goals.json diff --git a/idles/generators/primary_generator.tres b/idles/generators/primary_generator.tres new file mode 100644 index 0000000..5f0de65 --- /dev/null +++ b/idles/generators/primary_generator.tres @@ -0,0 +1,16 @@ +[gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://co0mcc2kvcpo5"] + +[ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://core/generator/currency_generator_data.gd" id="1_c6y77"] +[ext_resource type="Script" uid="uid://dnhocfsuvmeyb" path="res://core/generator/generator_buff_data.gd" id="1_t6lg0"] +[ext_resource type="Resource" uid="uid://ceugcxmassmpk" path="res://idles/buffs/magic_auto_flux.tres" id="2_x505b"] +[ext_resource type="Resource" uid="uid://6i3fcygusuqf" path="res://idles/buffs/magic_click_focus.tres" id="3_fsxdm"] +[ext_resource type="Resource" uid="uid://cluds3cw1d65q" path="res://idles/buffs/magic_supply_cache.tres" id="4_x2byu"] + +[resource] +script = ExtResource("1_c6y77") +id = &"Magic" +name = "Magic Orb" +initial_time = 0.6 +initial_productivity = 1.67 +buffs = Array[ExtResource("1_t6lg0")]([ExtResource("2_x505b"), ExtResource("3_fsxdm"), ExtResource("4_x2byu")]) +metadata/_custom_type_script = "uid://b00tqsuhxdy0d" diff --git a/generator/secondary_generator.tres b/idles/generators/secondary_generator.tres similarity index 54% rename from generator/secondary_generator.tres rename to idles/generators/secondary_generator.tres index 1315054..3e350d0 100644 --- a/generator/secondary_generator.tres +++ b/idles/generators/secondary_generator.tres @@ -1,9 +1,9 @@ [gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://04pmc034qupd"] -[ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://generator/currency_generator_data.gd" id="1_s3g28"] -[ext_resource type="Resource" path="res://generator/buffs/knowledge_auto_treatise.tres" id="2_kxvfc"] -[ext_resource type="Resource" path="res://generator/buffs/knowledge_click_notes.tres" id="3_q64x8"] -[ext_resource type="Resource" path="res://generator/buffs/knowledge_grant_program.tres" id="4_l77sg"] +[ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://core/generator/currency_generator_data.gd" id="1_s3g28"] +[ext_resource type="Resource" uid="uid://b4ne724qqo4d8" path="res://idles/buffs/knowledge_auto_treatise.tres" id="2_kxvfc"] +[ext_resource type="Resource" uid="uid://l5a300wieavc" path="res://idles/buffs/knowledge_click_notes.tres" id="3_q64x8"] +[ext_resource type="Resource" uid="uid://dxljqpqhdfqn6" path="res://idles/buffs/knowledge_grant_program.tres" id="4_l77sg"] [resource] script = ExtResource("1_s3g28") diff --git a/project.godot b/project.godot index f043559..63dd8a5 100644 --- a/project.godot +++ b/project.godot @@ -17,7 +17,7 @@ config/icon="res://icon.svg" [autoload] -CurrencyDatabase="*res://currency/currency_database.gd" +CurrencyDatabase="*res://core/currency_database.gd" GameState="*uid://d2j7tvlgxr2jp" [input]