Fix research xp generation

docs/gyms/tiny_sword/buildings/farm/farm_generator.tres

@@ -1,5 +1,6 @@
 [gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://d08h51y0pnsnf"]
 
+[ext_resource type="Resource" uid="uid://50yq2hl3wfwq" path="res://docs/gyms/tiny_sword/research/farm_research.tres" id="2_hprai"]
 [ext_resource type="Resource" uid="uid://dfxk30o34qe2s" path="res://docs/gyms/tiny_sword/currencies/worker.tres" id="3_bbypn"]
 [ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://core/generator/currency_generator_data.gd" id="4_0kvfm"]
 [ext_resource type="Resource" uid="uid://cts0407h130d6" path="res://docs/gyms/tiny_sword/goals/gold_total_1300_goal.tres" id="5_qiy1b"]
@@ -16,4 +17,5 @@ unlock_goal = ExtResource("5_qiy1b")
 initial_cost = 1.0
 coefficient = 1.0
 initial_productivity = 20.0
+research_data = ExtResource("2_hprai")
 metadata/_custom_type_script = "uid://b00tqsuhxdy0d"

docs/gyms/tiny_sword/buildings/forestry/forestry.gd

@@ -0,0 +1,13 @@
+extends Node2D
+
+@onready var _generator_container: GeneratorPanel = $GeneratorContainer
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	_generator_container.visible = false
+
+func _on_area_2d_mouse_entered() -> void:
+	_generator_container.visible = true
+
+func _on_area_2d_mouse_exited() -> void:
+	_generator_container.visible = false

docs/gyms/tiny_sword/buildings/forestry/forestry.gd.uid

@@ -0,0 +1 @@
+uid://cckf4nacd4qcr

docs/gyms/tiny_sword/buildings/forestry/forestry.tscn

@@ -1,6 +1,7 @@
 [gd_scene format=3 uid="uid://cf01wvy3f17i"]
 
 [ext_resource type="PackedScene" uid="uid://jeoiinukrrsp" path="res://core/generator/currency_generator.tscn" id="1_7j1xc"]
+[ext_resource type="Script" uid="uid://cckf4nacd4qcr" path="res://docs/gyms/tiny_sword/buildings/forestry/forestry.gd" id="1_l4bxt"]
 [ext_resource type="Resource" uid="uid://bgsk8h4w80h45" path="res://docs/gyms/tiny_sword/currencies/wood.tres" id="2_23x2t"]
 [ext_resource type="Resource" uid="uid://v6hjoa2vky5k" path="res://docs/gyms/tiny_sword/buildings/forestry/forestry_generator.tres" id="3_pby1g"]
 [ext_resource type="Texture2D" uid="uid://doxauaa3vn3lm" path="res://docs/gyms/tiny_sword/buildings/forestry/House3.png" id="4_5yp33"]
@@ -10,6 +11,7 @@
 size = Vector2(123, 157)
 
 [node name="Forestry" type="Node2D" unique_id=726284577]
+script = ExtResource("1_l4bxt")
 
 [node name="CurrencyGenerator" parent="." unique_id=967969064 node_paths=PackedStringArray("info_generator_container") instance=ExtResource("1_7j1xc")]
 currency = ExtResource("2_23x2t")
@@ -27,8 +29,12 @@ position = Vector2(0.5, -2.5)
 shape = SubResource("RectangleShape2D_v4aq3")
 
 [node name="GeneratorContainer" parent="." unique_id=1451609580 node_paths=PackedStringArray("_generator") instance=ExtResource("5_rh3m6")]
+visible = false
 offset_left = 128.0
 offset_top = -100.0
 offset_right = 392.0
 offset_bottom = 110.0
 _generator = NodePath("../CurrencyGenerator")
+
+[connection signal="mouse_entered" from="Area2D" to="." method="_on_area_2d_mouse_entered"]
+[connection signal="mouse_exited" from="Area2D" to="." method="_on_area_2d_mouse_exited"]

docs/gyms/tiny_sword/buildings/forestry/forestry_generator.tres

@@ -1,6 +1,7 @@
 [gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://v6hjoa2vky5k"]
 
 [ext_resource type="Resource" uid="uid://dfxk30o34qe2s" path="res://docs/gyms/tiny_sword/currencies/worker.tres" id="2_fs80u"]
+[ext_resource type="Resource" uid="uid://cvow4sj6a5h23" path="res://docs/gyms/tiny_sword/research/forestry_research.tres" id="2_n4bxc"]
 [ext_resource type="Resource" uid="uid://bo463s6jt0ep7" path="res://docs/gyms/tiny_sword/goals/gold_total_13k_goal.tres" id="4_mgk3v"]
 [ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://core/generator/currency_generator_data.gd" id="4_rij12"]
 
@@ -16,4 +17,5 @@ unlock_goal = ExtResource("4_mgk3v")
 initial_cost = 1.0
 coefficient = 1.0
 initial_productivity = 20.0
+research_data = ExtResource("2_n4bxc")
 metadata/_custom_type_script = "uid://b00tqsuhxdy0d"

docs/gyms/tiny_sword/buildings/monastery/Monastery.png.import

@@ -0,0 +1,40 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dlmjd2berkb6v"
+path="res://.godot/imported/Monastery.png-5f49b9547f0b0c767155d570a4d6cc55.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://docs/gyms/tiny_sword/buildings/monastery/Monastery.png"
+dest_files=["res://.godot/imported/Monastery.png-5f49b9547f0b0c767155d570a4d6cc55.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/uastc_level=0
+compress/rdo_quality_loss=0.0
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/channel_remap/red=0
+process/channel_remap/green=1
+process/channel_remap/blue=2
+process/channel_remap/alpha=3
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1

docs/gyms/tiny_sword/buildings/monastery/monastery.gd

@@ -0,0 +1,14 @@
+extends Node2D
+
+@onready var _research_panel: ResearchPanel = $ResearchPanel
+
+# Called when the node enters the scene tree for the first time.
+func _ready() -> void:
+	_research_panel.visible = false
+
+func _on_area_2d_mouse_entered() -> void:
+	_research_panel.visible = true
+
+
+func _on_area_2d_mouse_exited() -> void:
+	_research_panel.visible = false

docs/gyms/tiny_sword/buildings/monastery/monastery.gd.uid

@@ -0,0 +1 @@
+uid://cj0sxoceqqyrm

docs/gyms/tiny_sword/buildings/monastery/monastery.tscn

@@ -0,0 +1,30 @@
+[gd_scene format=3 uid="uid://bf8lqbexvnx6e"]
+
+[ext_resource type="Script" uid="uid://cj0sxoceqqyrm" path="res://docs/gyms/tiny_sword/buildings/monastery/monastery.gd" id="1_e17qd"]
+[ext_resource type="Texture2D" uid="uid://dlmjd2berkb6v" path="res://docs/gyms/tiny_sword/buildings/monastery/Monastery.png" id="1_yyw6r"]
+[ext_resource type="PackedScene" uid="uid://dd8roif0mqirl" path="res://core/research/research_panel.tscn" id="3_c6gi6"]
+
+[sub_resource type="RectangleShape2D" id="RectangleShape2D_yyw6r"]
+size = Vector2(160, 254)
+
+[node name="Monastery" type="Node2D" unique_id=1545930496]
+script = ExtResource("1_e17qd")
+
+[node name="Sprite2D" type="Sprite2D" parent="." unique_id=2097167417]
+texture = ExtResource("1_yyw6r")
+
+[node name="Area2D" type="Area2D" parent="." unique_id=926221537]
+
+[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D" unique_id=1198096629]
+position = Vector2(1, 16)
+shape = SubResource("RectangleShape2D_yyw6r")
+
+[node name="ResearchPanel" parent="." unique_id=1105274967 instance=ExtResource("3_c6gi6")]
+visible = false
+offset_left = 78.0
+offset_top = -98.0
+offset_right = 478.0
+offset_bottom = 128.0
+
+[connection signal="mouse_entered" from="Area2D" to="." method="_on_area_2d_mouse_entered"]
+[connection signal="mouse_exited" from="Area2D" to="." method="_on_area_2d_mouse_exited"]

docs/gyms/tiny_sword/buildings/monastery/monastery_generator.tres

@@ -0,0 +1,7 @@
+[gd_resource type="Resource" script_class="CurrencyGeneratorData" format=3 uid="uid://56bnik1oe3ao"]
+
+[ext_resource type="Script" uid="uid://b00tqsuhxdy0d" path="res://core/generator/currency_generator_data.gd" id="1_mnd3i"]
+
+[resource]
+script = ExtResource("1_mnd3i")
+metadata/_custom_type_script = "uid://b00tqsuhxdy0d"

docs/gyms/tiny_sword/research/farm_research.tres

@@ -0,0 +1,13 @@
+[gd_resource type="Resource" script_class="ResearchData" format=3 uid="uid://50yq2hl3wfwq"]
+
+[ext_resource type="Texture2D" uid="uid://bgtt3wu43tajh" path="res://icon.svg" id="1_supp3"]
+[ext_resource type="Script" uid="uid://m7baywrfnpn0" path="res://core/research/research_data.gd" id="2_rgx73"]
+
+[resource]
+script = ExtResource("2_rgx73")
+id = &"farm_research"
+generator_id = &"farm"
+name = "Farm Research"
+description = "Research that improves farm production"
+icon = ExtResource("1_supp3")
+metadata/_custom_type_script = "uid://m7baywrfnpn0"

docs/gyms/tiny_sword/research/forestry_research.tres

@@ -0,0 +1,13 @@
+[gd_resource type="Resource" script_class="ResearchData" format=3 uid="uid://cvow4sj6a5h23"]
+
+[ext_resource type="Texture2D" uid="uid://bgtt3wu43tajh" path="res://icon.svg" id="1_qvnpw"]
+[ext_resource type="Script" uid="uid://m7baywrfnpn0" path="res://core/research/research_data.gd" id="2_6lndp"]
+
+[resource]
+script = ExtResource("2_6lndp")
+id = &"forestry_research"
+generator_id = &"forestry"
+name = "Forestry Research"
+description = "Research that improves forestry production"
+icon = ExtResource("1_qvnpw")
+metadata/_custom_type_script = "uid://m7baywrfnpn0"

docs/gyms/tiny_sword/research/gold_mine_research.tres

@@ -5,14 +5,9 @@
 
 [resource]
 script = ExtResource("1_yn72k")
-id = &"gold_research"
+id = &"gold_mine_research"
 generator_id = &"goldmine"
 name = "Gold Mine Research"
 description = "Research that improves gold mine production"
 icon = ExtResource("1_2tci1")
-xp_per_currency_produced = 0.01
-base_xp_required = 100.0
-xp_growth_multiplier = 1.5
-base_multiplier = 1.0
-multiplier_per_level = 0.1
 metadata/_custom_type_script = "uid://m7baywrfnpn0"

docs/gyms/tiny_sword/research/ts_research_catalogue.tres

@@ -3,8 +3,10 @@
 [ext_resource type="Script" uid="uid://m7baywrfnpn0" path="res://core/research/research_data.gd" id="1_wscpr"]
 [ext_resource type="Resource" uid="uid://dif6w6kesmw6u" path="res://docs/gyms/tiny_sword/research/gold_mine_research.tres" id="2_migxn"]
 [ext_resource type="Script" uid="uid://d2v6t6w2todfy" path="res://core/research/research_catalogue.gd" id="2_yh8dx"]
+[ext_resource type="Resource" uid="uid://50yq2hl3wfwq" path="res://docs/gyms/tiny_sword/research/farm_research.tres" id="3_pdfmu"]
+[ext_resource type="Resource" uid="uid://cvow4sj6a5h23" path="res://docs/gyms/tiny_sword/research/forestry_research.tres" id="4_jnaqq"]
 
 [resource]
 script = ExtResource("2_yh8dx")
-research_entries = Array[ExtResource("1_wscpr")]([ExtResource("2_migxn")])
+research_entries = Array[ExtResource("1_wscpr")]([ExtResource("2_migxn"), ExtResource("3_pdfmu"), ExtResource("4_jnaqq")])
 metadata/_custom_type_script = "uid://d2v6t6w2todfy"

docs/gyms/tiny_sword/tiny_sword.tscn

@@ -10,6 +10,7 @@
 [ext_resource type="Script" uid="uid://srkiu4qe8s2m" path="res://core/prestige/prestige_manager.gd" id="5_x77df"]
 [ext_resource type="Resource" uid="uid://dwmfvmusfskk6" path="res://docs/gyms/tiny_sword/prestige/primary_prestige.tres" id="6_xnhlc"]
 [ext_resource type="PackedScene" uid="uid://btkxru2gdjsgc" path="res://currency_tile.tscn" id="7_0cs5o"]
+[ext_resource type="Script" uid="uid://bv3a4utlnn2fg" path="res://core/research/research_xp_tracker.gd" id="8_no27p"]
 [ext_resource type="Resource" uid="uid://w4u1hddplb4e" path="res://docs/gyms/tiny_sword/currencies/gold.tres" id="9_1363k"]
 [ext_resource type="PackedScene" uid="uid://djedqovgngrx5" path="res://docs/gyms/tiny_sword/buildings/farm/farm.tscn" id="10_1lv5i"]
 [ext_resource type="Resource" uid="uid://dfxk30o34qe2s" path="res://docs/gyms/tiny_sword/currencies/worker.tres" id="10_i1cck"]
@@ -17,9 +18,9 @@
 [ext_resource type="Resource" uid="uid://bxg2au0ijp242" path="res://docs/gyms/tiny_sword/currencies/food.tres" id="11_hskcg"]
 [ext_resource type="PackedScene" uid="uid://cf01wvy3f17i" path="res://docs/gyms/tiny_sword/buildings/forestry/forestry.tscn" id="11_pyqyw"]
 [ext_resource type="Resource" uid="uid://bgsk8h4w80h45" path="res://docs/gyms/tiny_sword/currencies/wood.tres" id="12_l6a68"]
+[ext_resource type="PackedScene" uid="uid://bf8lqbexvnx6e" path="res://docs/gyms/tiny_sword/buildings/monastery/monastery.tscn" id="13_no27p"]
 [ext_resource type="PackedScene" uid="uid://rejxvjwybkll" path="res://sandbox/tiny_swords/Terrain/Resources/Wood/Trees/tree_1.tscn" id="14_0cs5o"]
 [ext_resource type="Resource" uid="uid://bfrb0ayrljac2" path="res://docs/gyms/tiny_sword/currencies/ascension.tres" id="15_ascension"]
-[ext_resource type="PackedScene" uid="uid://dd8roif0mqirl" path="res://core/research/research_panel.tscn" id="21_no27p"]
 
 [node name="TinySwords" type="Node" unique_id=498237642]
 
@@ -36,6 +37,10 @@ script = ExtResource("5_x77df")
 config = ExtResource("6_xnhlc")
 game_state = NodePath("..")
 
+[node name="ResearchXpTracker" type="Node" parent="LevelGameState" unique_id=229654635 node_paths=PackedStringArray("game_state")]
+script = ExtResource("8_no27p")
+game_state = NodePath("..")
+
 [node name="World" type="Node2D" parent="LevelGameState" unique_id=2118297724]
 
 [node name="ForestProps" type="Node2D" parent="LevelGameState/World" unique_id=649424542]
@@ -82,6 +87,9 @@ position = Vector2(380, 684)
 [node name="Forestry" parent="LevelGameState/World" unique_id=726284577 instance=ExtResource("11_pyqyw")]
 position = Vector2(825, 915)
 
+[node name="Monastery" parent="LevelGameState/World" unique_id=1545930496 instance=ExtResource("13_no27p")]
+position = Vector2(105, 920)
+
 [node name="UI" type="Control" parent="LevelGameState" unique_id=1299828389]
 layout_mode = 3
 anchors_preset = 0
@@ -133,15 +141,3 @@ offset_left = 1275.0
 offset_top = 4.0
 offset_right = 1913.0
 offset_bottom = 263.0
-
-[node name="ResearchPanel" parent="LevelGameState/UI" unique_id=2145420920 instance=ExtResource("21_no27p")]
-custom_minimum_size = Vector2(350, 100)
-layout_mode = 1
-anchors_preset = -1
-anchor_left = 7.4500003
-anchor_right = 16.2
-anchor_bottom = 3.1750002
-offset_right = 0.0
-offset_bottom = -7.6293945e-06
-grow_horizontal = 2
-grow_vertical = 2