feat: improve Randomizer second step

fix #102

Author: Lincoln-Ab

assets/resources/levels/persistent_levels.tres

@@ -4,12 +4,12 @@
 [ext_resource type="Script" path="res://scripts/utility/cell_data.gd" id="2_08p0w"]
 [ext_resource type="Script" path="res://scripts/utility/slider_data.gd" id="3_cr51g"]
 [ext_resource type="Script" path="res://scripts/utility/level_container.gd" id="4_v7vmu"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/slider_tutorial.tres" id="5_w6l3t"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/symbols_tutorial.tres" id="6_dak7y"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/blocked_tile_tutorial.tres" id="7_k86s7"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/automatic_slider_tutorial.tres" id="8_www21"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/invert_slider_tutorial.tres" id="9_up8js"]
-[ext_resource type="Resource" path="res://assets/resources/tutorial/block_slider_tutorial.tres" id="10_fk02p"]
+[ext_resource type="Resource" uid="uid://g4xb4c18wx6d" path="res://assets/resources/tutorial/slider_tutorial.tres" id="5_w6l3t"]
+[ext_resource type="Resource" uid="uid://di7kanjcci6e6" path="res://assets/resources/tutorial/symbols_tutorial.tres" id="6_dak7y"]
+[ext_resource type="Resource" uid="uid://cexkhgb6rb2ip" path="res://assets/resources/tutorial/blocked_tile_tutorial.tres" id="7_k86s7"]
+[ext_resource type="Resource" uid="uid://df5xj4eoouci8" path="res://assets/resources/tutorial/automatic_slider_tutorial.tres" id="8_www21"]
+[ext_resource type="Resource" uid="uid://wor27ovpdofm" path="res://assets/resources/tutorial/invert_slider_tutorial.tres" id="9_up8js"]
+[ext_resource type="Resource" uid="uid://bh8t8odtplmtn" path="res://assets/resources/tutorial/block_slider_tutorial.tres" id="10_fk02p"]
 
 [sub_resource type="Resource" id="Resource_qujjk"]
 script = ExtResource("2_08p0w")

assets/resources/utility/randomizer_options.tres

@@ -28,7 +28,10 @@ extension_rules = {
 "RANDOM": 30
 }
 full_odd = 15
+full_odd_on_stop = 60
 block_full_odd = 50
+block_full_odd_on_stop = 80
+block_full_retract_odd = 80
 type_rules = {
 "ADD": 45,
 "BLOCK": 7,

scripts/utility/randomizer.gd

@@ -81,13 +81,17 @@ static func _add_sliders(data: LevelData, filtered: Dictionary) -> void:
 	var normal_sliders: Array[Vector2i]
 	var locked_cells: Array[CellData]
 	var receiver_cells: Dictionary
+	
+	var effect_slider_count := 0
 	for slider_coord: Vector2i in filtered.keys():
 		var slider_data := filtered.get(slider_coord) as RandomizerSlider
 		match _get_rule(OPTIONS.type_rules):
 			"ADD":
+				effect_slider_count += 1
 				slider_data.effect = GlobalConst.AreaEffect.ADD
 				normal_sliders.append(slider_coord)
 			"SUBTRACT":
+				effect_slider_count += 1
 				slider_data.effect = GlobalConst.AreaEffect.SUBTRACT
 				normal_sliders.append(slider_coord)
 			"CHANGE_SIGN":
@@ -96,6 +100,16 @@ static func _add_sliders(data: LevelData, filtered: Dictionary) -> void:
 			"BLOCK":
 				slider_data.effect = GlobalConst.AreaEffect.BLOCK
 				block_sliders.append(slider_coord)
+				
+	# check that at least one slider affects the grid 
+	if effect_slider_count == 0:
+		var slider_coord := filtered.keys()[0] as Vector2i
+		var slider_data := filtered.get(slider_coord) as RandomizerSlider
+		slider_data.effect = GlobalConst.AreaEffect.ADD
+		normal_sliders.append(slider_coord)
+		block_sliders.erase(slider_coord)
+		change_sliders.erase(slider_coord)
+	
 	# add slider-block
 	for slider_coord in block_sliders:
 		var slider := filtered.get(slider_coord) as RandomizerSlider
@@ -124,6 +138,7 @@ static func _add_sliders(data: LevelData, filtered: Dictionary) -> void:
 				emitter_sliders = receiver_cells.get(cell_coord)
 			emitter_sliders.append(slider_coord)
 			receiver_cells[cell_coord] = emitter_sliders
+			
 	# mix other sliders
 	if !change_sliders.is_empty():
 		normal_sliders.append_array(change_sliders)
@@ -154,6 +169,7 @@ static func _add_sliders(data: LevelData, filtered: Dictionary) -> void:
 				emitter_sliders = receiver_cells.get(cell_coord)
 			emitter_sliders.append(slider_coord)
 			receiver_cells[cell_coord] = emitter_sliders
+			
 	# use unfull slider-block for check behavior-full probability
 	for slider_coord: Vector2i in filtered.keys():
 		var slider := filtered.get(slider_coord) as RandomizerSlider
@@ -171,24 +187,56 @@ static func _add_sliders(data: LevelData, filtered: Dictionary) -> void:
 						continue
 			if _check_probability(OPTIONS.block_full_odd_on_stop):
 				slider.behavior = GlobalConst.AreaBehavior.FULL
-		#else:
-			## use stopped slider for check retractable slider-block
-			#if slider.is_stopped and slider.behavior == GlobalConst.AreaBehavior.FULL:
-				#if _check_probability(OPTIONS.block_full_retract_odd):
-					#var cell_coord := slider.reachable[slider.reached.size()] as Vector2i
-					#var emitter_slider := receiver_cells.get(cell_coord) as Array[Vector2i]
-					#var slider_data := filtered.get(emitter_slider[0]) as RandomizerSlider
-					#for coord in slider_data.reached:
-						#var cell_data := data.cells_list[coord] as CellData
-						#cell_data.is_blocked = false
-						#locked_cells.erase(cell_data)
+				
+	# use stopped slider for check retractable slider-block
+	var stopped_sliders: Dictionary
+	for slider_coord: Vector2i in filtered.keys():
+		var slider := filtered.get(slider_coord) as RandomizerSlider
+		if slider.effect == GlobalConst.AreaEffect.BLOCK:
+			continue
+		if slider.is_stopped:
+			stopped_sliders[slider_coord] = slider.reachable[slider.reached.size()]
+	if stopped_sliders.size() > 1:
+		for slider_coord in block_sliders:
+			var blocked_sliders: Array[Vector2i]
+			var slider_data := filtered.get(slider_coord) as RandomizerSlider
+			for cell_coord in slider_data.reached:
+				while true:
+					var coord = stopped_sliders.find_key(cell_coord)
+					if coord == null:
+						break
+					stopped_sliders.erase(coord)
+					blocked_sliders.append(coord)
+			if blocked_sliders.size() <= 1:
+				continue
+			if _check_probability(OPTIONS.block_full_retract_odd):
+				# retract slider-block
+				for coord in slider_data.reached:
+					var cell_data := data.cells_list[coord] as CellData
+					cell_data.is_blocked = false
+					locked_cells.erase(cell_data)
+				# extend other slider but last
+				for i in range(blocked_sliders.size()):
+					var slider := filtered.get(blocked_sliders[i]) as RandomizerSlider
+					if i == blocked_sliders.size() - 1:
+						# last slider blocked
+						slider.behavior = GlobalConst.AreaBehavior.FULL
+					else:
+						if slider.effect != GlobalConst.AreaEffect.CHANGE_SIGN:
+							for j in range(slider.reached.size(), slider.reachable.size()):
+								var cell := data.cells_list[slider.reachable[j]] as CellData
+								if cell.is_blocked:
+									break
+								_apply_slider_effect(cell, slider.effect)
+								
 	# add slider to level data
 	for slider_coord in filtered.keys():
 		var slider := filtered.get(slider_coord) as RandomizerSlider
 		var slider_data := SliderData.new()
 		slider_data.area_effect = slider.effect
 		slider_data.area_behavior = slider.behavior
 		data.slider_list[slider_coord] = slider_data
+		
 	# remove temporarily block
 	for cell_data in locked_cells:
 		cell_data.is_blocked = false
@@ -223,18 +271,25 @@ static func _get_filtered_sliders(possible: Dictionary) -> Dictionary:
 	filterd.shuffle()
 	filterd.resize(slider_count)
 	# calculate sliders extesion
+	var extended_count := 0
 	for slider_coord in filterd:
 		var slider_data := RandomizerSlider.new()
 		slider_data.reachable = possible.get(slider_coord) as Array[Vector2i]
 		var reached := possible.get(slider_coord).duplicate() as Array[Vector2i]
 		match _get_rule(OPTIONS.extension_rules):
+			"MAX":
+				extended_count += 1
 			"NONE":
 				reached.clear()
 			"RANDOM":
+				extended_count += 1
 				if reached.size() > 1:
 					reached.resize(randi_range(1, reached.size() - 1))
 		slider_data.reached = reached
 		result[slider_coord] = slider_data
+	if extended_count == 0:
+		var slider_data := result.get(result.keys()[0]) as RandomizerSlider
+		slider_data.reached = slider_data.reachable
 	return result
 
 
@@ -264,7 +319,7 @@ static func _is_opposite_slider(a: Vector2i, b: Vector2i) -> bool:
 		if a.x % 2 == b.x % 2:
 			return true
 	return false
-	
+
 
 static func _get_possible_sliders(data: LevelData) -> Dictionary:
 	var result: Dictionary

scripts/utility/randomizer_options.gd

@@ -26,12 +26,12 @@ class_name RandomizerOptions extends Resource
 ## Slider full probability
 @export var full_odd := 10
 ## Slider full probability when stopped by another block
-@export var full_odd_on_stop := 60
+@export var full_odd_on_stop := 30
 ## Slider block full probability
 @export var block_full_odd := 20
 ## Slider block full probability when stopped by another block
-@export var block_full_odd_on_stop := 80
+@export var block_full_odd_on_stop := 50
 ## Slider block retractable after stop other sliders
-@export var block_full_retract_odd := 80
+@export var block_full_retract_odd := 50
 ## Sliders type rules
 @export var type_rules := {"ADD": 45, "SUBTRACT": 45, "CHANGE_SIGN": 3, "BLOCK": 7}