Fix research xp generation

core/currency/README.md

@@ -108,4 +108,4 @@ The `CurrencyCatalogue` is a resource that holds all defined currencies and is a
 
 </content>
 <parameter=filePath>
-/home/mikymod/work/jmp/idle/core/currency/README.md
+/home/mikymod/work/jmp/idle/core/currency/README.md

core/generator/currency_generator.gd

@@ -149,12 +149,17 @@ func _grant_cycle_income(cycle_count: int) -> void:
 	production_tick.emit(produced, cycle_count, owned)
 	
 	if data != null and data.research_data != null:
+		if not _is_research_active(data.research_data.id):
+			return
+		
 		var amount_float: float = produced.mantissa * pow(10.0, float(produced.exponent))
 		var research_xp_amount: BigNumber = BigNumber.from_float(data.research_data.xp_per_currency_produced * amount_float)
 		if game_state != null and research_xp_amount.mantissa > 0.0:
 			var tracker: ResearchXPTracker = game_state.research_tracker as ResearchXPTracker
 			if tracker:
 				tracker.add_xp_with_buffs(data.research_data.id, research_xp_amount)
+			else:
+				game_state.add_research_xp(data.research_data.id, research_xp_amount)
 
 ## Convenience helper for the next single-unit purchase cost.
 func get_next_cost() -> BigNumber:
@@ -359,6 +364,29 @@ func get_research_multiplier() -> float:
 		return 1.0
 	return game_state.get_research_multiplier(data.research_data.id)
 
+func _is_research_active(research_id: StringName) -> bool:
+	if game_state == null:
+		return true
+	
+	var research_panel: Node = null
+	var parent: Node = get_parent()
+	while parent != null and parent != game_state.get_tree().root:
+		if parent.has_method("is_research_active"):
+			research_panel = parent
+			break
+		parent = parent.get_parent()
+	
+	if research_panel == null:
+		research_panel = game_state.find_child("ResearchPanel", true, false)
+	
+	if research_panel == null:
+		return true
+	
+	if research_panel.has_method("is_research_active"):
+		return research_panel.is_research_active(research_id)
+	
+	return true
+
 func reset_runtime_state_for_prestige() -> void:
 	_is_registered = false
 	_is_registering = false
@@ -405,17 +433,23 @@ func _try_grant_click_currency() -> void:
 
 	var click_value: BigNumber = _get_click_value()
 	_add_currency(click_value)
-	
+
+	_remaining_click_cooldown_seconds = _get_click_cooldown_seconds()
+
 	# Grant research XP for manual clicks
 	if data.research_data != null and click_value.mantissa > 0.0:
+		if not _is_research_active(data.research_data.id):
+			return
+		
 		var amount_float: float = click_value.mantissa * pow(10.0, float(click_value.exponent))
 		var research_xp_amount: BigNumber = BigNumber.from_float(data.research_data.xp_per_currency_produced * amount_float)
 		if game_state != null and research_xp_amount.mantissa > 0.0:
 			var tracker: ResearchXPTracker = game_state.research_tracker as ResearchXPTracker
 			if tracker:
 				tracker.add_xp_with_buffs(data.research_data.id, research_xp_amount)
+			else:
+				game_state.add_research_xp(data.research_data.id, research_xp_amount)
 	
-	_remaining_click_cooldown_seconds = _get_click_cooldown_seconds()
 
 ## Resolves click reward from data.
 func _get_click_value() -> BigNumber:

core/level_game_state.gd

@@ -440,14 +440,6 @@ func get_effective_multiplier(generator_id: StringName, kind: int) -> float:
 	return multiplier
 
 func _initialize_research() -> void:
-	research_tracker = Node.new()
-	research_tracker.set_script(load("res://core/research/research_xp_tracker.gd"))
-	add_child(research_tracker)
-	
-	var tracker: ResearchXPTracker = research_tracker as ResearchXPTracker
-	if tracker:
-		tracker.game_state = self
-	
 	if research_catalogue:
 		for research in research_catalogue.get_all_research():
 			register_research(research.id)

core/research/README.md

@@ -2,7 +2,9 @@
 
 ## Overview
 
-The `research/` subfolder implements a production-based research system where generator output earns research XP, automatically leveling up to provide production multipliers. Research tracks are tied to specific generators and can be enhanced with purchasable buffs that increase XP gain.
+The `research/` subfolder implements a production-based research system where generator output earns 
+research XP, automatically leveling up to provide production multipliers. Research tracks are tied to 
+specific generators and can be enhanced with purchasable buffs that increase XP gain.
 
 ## Files
 

core/research/research_panel.gd

@@ -8,6 +8,7 @@ const RESEARCH_ROW_SCENE: PackedScene = preload("res://core/research/research_ro
 
 var _game_state: LevelGameState
 var _research_rows: Dictionary = {}
+var _active_research_id: StringName = &""
 
 func _ready() -> void:
 	_game_state = find_parent("LevelGameState")
@@ -25,13 +26,17 @@ func _build_research_rows() -> void:
 	for child in _research_rows_container.get_children():
 		child.queue_free()
 	_research_rows.clear()
+	_active_research_id = &""
 	
 	if _game_state.research_catalogue:
 		for research in _game_state.research_catalogue.get_all_research():
 			var row: ResearchRow = RESEARCH_ROW_SCENE.instantiate()
 			_research_rows_container.add_child(row)
 			row.setup(research)
+			row.active_changed.connect(_on_research_active_changed.bind(research.id))
 			_research_rows[research.id] = row
+	
+	_load_active_research_state()
 
 func _refresh_all() -> void:
 	for row in _research_rows.values():
@@ -58,3 +63,49 @@ func _on_research_xp_changed(research_id: StringName, _new_xp: BigNumber) -> voi
 func _on_research_level_up(research_id: StringName, _old_level: int, _new_level: int) -> void:
 	if _research_rows.has(research_id):
 		_refresh_row(_research_rows[research_id])
+
+func _on_research_active_changed(is_active: bool, research_id: StringName) -> void:
+	if is_active:
+		if _active_research_id != &"" and _active_research_id != research_id:
+			var existing_row: ResearchRow = _research_rows.get(_active_research_id)
+			if existing_row != null:
+				existing_row.set_active(false, false)
+		_active_research_id = research_id
+		_save_active_research_state()
+	else:
+		if _active_research_id == research_id:
+			_active_research_id = &""
+			_save_active_research_state()
+
+func _load_active_research_state() -> void:
+	if _game_state == null:
+		return
+	
+	var save_data: Dictionary = _game_state.get_external_save_data("research_active")
+	if save_data.has("active_research_id"):
+		var loaded_id: String = String(save_data.get("active_research_id", ""))
+		if not loaded_id.is_empty():
+			_active_research_id = StringName(loaded_id)
+			var row: ResearchRow = _research_rows.get(_active_research_id)
+			if row != null:
+				row.set_active(true, false)
+
+func _save_active_research_state() -> void:
+	if _game_state == null:
+		return
+	
+	var save_data: Dictionary = {}
+	if _active_research_id != &"":
+		save_data["active_research_id"] = String(_active_research_id)
+	_game_state.set_external_save_data("research_active", save_data)
+
+func get_active_research_id() -> StringName:
+	return _active_research_id
+
+func is_research_active(research_id: StringName) -> bool:
+	return _active_research_id == research_id
+
+func activate_research(research_id: StringName) -> void:
+	if _research_rows.has(research_id):
+		var row: ResearchRow = _research_rows[research_id]
+		row.set_active(true)

core/research/research_row.gd

@@ -1,14 +1,18 @@
 class_name ResearchRow
 extends HBoxContainer
 
+signal active_changed(is_active: bool)
+
 @onready var _name_label: Label = $VBoxContainer/NameLabel
 @onready var _level_label: Label = $VBoxContainer/HBoxContainer/LevelLabel
 @onready var _progress_bar: ProgressBar = $VBoxContainer/HBoxContainer/ProgressBar
 @onready var _multiplier_label: Label = $VBoxContainer/HBoxContainer/MultiplierLabel
 @onready var _buff_label: Label = $VBoxContainer/HBoxContainer/BuffLabel
+@onready var _check_button: CheckButton = $CheckButton
 
 var _research: ResearchData
 var _game_state: LevelGameState
+var _is_active: bool = false
 
 func _ready() -> void:
 	_game_state = find_parent("LevelGameState")
@@ -18,6 +22,7 @@ func _ready() -> void:
 	
 	_game_state.research_xp_changed.connect(_on_research_xp_changed)
 	_game_state.research_level_up.connect(_on_research_level_up)
+	_check_button.toggled.connect(_on_check_button_toggled)
 
 func setup(research: ResearchData) -> void:
 	_research = research
@@ -72,3 +77,22 @@ func _update_from_state() -> void:
 	var xp_needed: BigNumber = _research.get_xp_required_for_level_big(level + 1)
 	
 	update_display(level, progress, multiplier, xp_current, xp_needed)
+
+func _on_check_button_toggled(toggled_on: bool) -> void:
+	if toggled_on != _is_active:
+		_is_active = toggled_on
+		active_changed.emit(_is_active)
+
+func set_active(is_active: bool, emit_signal: bool = true) -> void:
+	_is_active = is_active
+	_check_button.button_pressed = is_active
+	if emit_signal:
+		active_changed.emit(is_active)
+
+func is_research_active() -> bool:
+	return _is_active
+
+func get_research_id_public() -> StringName:
+	if _research == null:
+		return &""
+	return _research.id

core/research/research_row.tscn

@@ -36,3 +36,7 @@ text = "+0%"
 
 [node name="BuffLabel" type="Label" parent="VBoxContainer/HBoxContainer" unique_id=2124734446]
 layout_mode = 2
+
+[node name="CheckButton" type="CheckButton" parent="." unique_id=3456789012]
+layout_mode = 2
+text = "Active"

core/research/research_xp_tracker.gd

@@ -31,6 +31,9 @@ func _on_generator_produced(generator_id: StringName, _amount: Variant) -> void:
 	if research == null:
 		return
 	
+	if not _is_research_active(research.id):
+		return
+	
 	var amount_big: BigNumber = _amount
 	var amount_float: float = amount_big.mantissa * pow(10.0, float(amount_big.exponent))
 	if amount_float <= 0.0:
@@ -46,3 +49,24 @@ func _get_research_for_generator(generator_id: StringName) -> ResearchData:
 	if game_state == null or game_state.research_catalogue == null:
 		return null
 	return game_state.research_catalogue.get_research_by_generator_id(generator_id)
+
+func _is_research_active(research_id: StringName) -> bool:
+	if game_state == null:
+		return false
+	
+	var research_panel: Node = game_state.find_child("ResearchPanel", true, false)
+	if research_panel == null:
+		return true
+	
+	if research_panel.has_method("is_research_active"):
+		return research_panel.is_research_active(research_id)
+	
+	return true
+
+func activate_research(research_id: StringName) -> void:
+	if game_state == null:
+		return
+	
+	var research_panel: Node = game_state.find_child("ResearchPanel", true, false)
+	if research_panel != null and research_panel.has_method("activate_research"):
+		research_panel.activate_research(research_id)