Change project organization

.gitignore

@@ -1,3 +1,4 @@
 # Godot 4+ specific ignores
 .godot/
 /android/
+[Ss]andbox/

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 = {}

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] = []

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

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="."]
+[node name="MarginContainer" type="MarginContainer" parent="." unique_id=1582529872]
-layout_mode = 1
+layout_mode = 2
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 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

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="Script" uid="uid://dtbxopw6ulhl8" path="res://core/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://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_5tmvy"]
-[ext_resource type="Resource" uid="uid://co0mcc2kvcpo5" path="res://generator/primary_generator.tres" id="3_wx13b"]
+[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"]

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"]
 

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="PackedScene" uid="uid://jeoiinukrrsp" path="res://core/generator/currency_generator.tscn" id="1_6pne4"]
-[ext_resource type="Resource" uid="uid://04pmc034qupd" path="res://generator/secondary_generator.tres" id="3_dc82g"]
+[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_8qilt"]
-[ext_resource type="PackedScene" uid="uid://ckos7f22pnmyh" path="res://generator_container.tscn" id="3_pw2a0"]
+[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="3_x5lt1"]
+[ext_resource type="PackedScene" uid="uid://btkxru2gdjsgc" path="res://currency_tile.tscn" id="4_6ri4a"]
-[ext_resource type="PackedScene" path="res://generator-unlock-goals/goals_debug_ui.tscn" id="4_63gjq"]
+[ext_resource type="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="5_dl3gy"]
-[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="6_gemsc"]
+[ext_resource type="PackedScene" uid="uid://ckos7f22pnmyh" path="res://generator_container.tscn" id="6_miduw"]
-[ext_resource type="PackedScene" uid="uid://jeoiinukrrsp" path="res://generator/currency_generator.tscn" id="6_mhw8n"]
+[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")
+currency = ExtResource("2_8qilt")
-data = ExtResource("3_dc82g")
+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

generator/primary_generator.tres

@@ -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"

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_hk5d2"]
 
 [resource]
 script = ExtResource("1_4w6kt")

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="2_9xja7"]
 
 [resource]
 script = ExtResource("1_l4lhm")

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_j7l8a"]
-[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://currency/knowledge.tres" id="3_ynr4x"]
+[ext_resource type="Resource" uid="uid://bnhqk8b31mm4e" path="res://idles/currencies/knowledge.tres" id="3_ynr4x"]
 
 [resource]
 script = ExtResource("1_8ee3d")

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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="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")

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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="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")

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="Script" uid="uid://dnhocfsuvmeyb" path="res://core/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="Resource" uid="uid://brqaojindcxa5" path="res://idles/currencies/magic.tres" id="2_ea8w5"]
 
 [resource]
 script = ExtResource("1_fvte4")

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]

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]

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"

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="Script" uid="uid://b00tqsuhxdy0d" path="res://core/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" uid="uid://b4ne724qqo4d8" path="res://idles/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" uid="uid://l5a300wieavc" path="res://idles/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="Resource" uid="uid://dxljqpqhdfqn6" path="res://idles/buffs/knowledge_grant_program.tres" id="4_l77sg"]
 
 [resource]
 script = ExtResource("1_s3g28")

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]