Merge pull request #362 from db0/0581

Increase masteries received

src/dreamscape/CombatElements/Enemies/Enemies.gd

@@ -148,7 +148,7 @@ const BUTTERFLY:= {
 			"reshuffle": false,
 		},
 		{
-			"intent_scripts": ["Stress:1","Stress:1", "Buff:2:armor"],
+			"intent_scripts": ["Stress:1","Stress:1", "Buff:3:armor"],
 			"reshuffle": true,
 		},
 		{

src/dreamscape/Globals/Pathos/Pathos.gd

@@ -30,39 +30,40 @@ var pathos_setup := {
 		"progression": range(11,20),
 		"threshold": 1.3 - globals.difficulty.encounter_difficulty * 0.1,
 		"release_adjustment": 3.0,
-		"released_needed_for_level": 3.0,
+		"released_needed_for_level": 4.0,
+		"masterier_per_level": 2,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.rest: {
 		"repressed": 5.0,
 		"progression": range(3,5),
 		"threshold": 5.0 + globals.difficulty.encounter_difficulty * 0.5,
 		"release_adjustment": 2.0,
-		"released_needed_for_level": 20.0,
+		"released_needed_for_level": 15.0,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.nce: {
 		"repressed": 10.0,
 		"progression": range(7,11),
 		"threshold": 3.0 + globals.difficulty.encounter_difficulty * 0.5,
 		"release_adjustment": 1.5,
-		"released_needed_for_level": 10.0,
+		"released_needed_for_level": 9.0,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.shop: {
 		"repressed": 10.0,
 		"progression": range(5,7),
 		"threshold": 4.0 + globals.difficulty.encounter_difficulty * 0.5,
 		"release_adjustment": 1.5,
-		"released_needed_for_level": 15.0,
+		"released_needed_for_level": 13.0,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.elite: {
 		"progression": range(5,9),
 		"threshold": 5.3 - globals.difficulty.encounter_difficulty * 0.5,
-		"released_needed_for_level": 4.0,
-		"masterier_per_level": 2,
+		"released_needed_for_level": 5.0,
+		"masterier_per_level": 3,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.artifact: {
 		"progression": range(2,5),
 		"threshold": 6.0 + globals.difficulty.encounter_difficulty * 0.5,
-		"released_needed_for_level": 20.0,
+		"released_needed_for_level": 16.0,
 	},
 	Terms.RUN_ACCUMULATION_NAMES.boss: {
 		"progression": range(6,7),

src/dreamscape/Overworld/Journal.gd

@@ -546,46 +546,47 @@ func show_pathos_popup(description_text: String, pathos_dict: Dictionary) -> voi
 func _input(event):
 	### Debug ###
 	if event.is_action_pressed("init_debug_game"):
-		globals.player.deck.add_new_card("Guilt")
+		pass
+#		globals.player.deck.add_new_card("Guilt")
 		# Upgrade cards debug
 #		for c in globals.player.deck.get_progressing_cards():
 #			c.upgrade_progress = c.upgrade_threshold
 #			if c.card_name == "Noisy Whip":
 #				globals.player.deck.remove_card(c)
 #		_reveal_entry(upgrade_journal, true)
-		globals.player.deck.add_new_card("Guilt")
+#		globals.player.deck.add_new_card("Guilt")
 #		globals.player.deck.add_new_card("Catatonia")
-		globals.player.add_artifact(ArtifactDefinitions.CursedCurios.canonical_name)
+#		globals.player.add_artifact(ArtifactDefinitions.CursedCurios.canonical_name)
 #		globals.player.add_artifact(ArtifactDefinitions.EnhanceOnRest.canonical_name)
 #		globals.player.add_artifact(ArtifactDefinitions.IncreaseRandomDamage.canonical_name)
 #		globals.player.add_artifact(ArtifactDefinitions.BossDraft.canonical_name)
 #		globals.player.add_memory(MemoryDefinitions.DamageAll.canonical_name)
 #		globals.player.add_memory(MemoryDefinitions.HealSelf.canonical_name)
 		# warning-ignore:return_value_discarded
-		globals.player.add_memory(MemoryDefinitions.FreezeCard.canonical_name)
-		var card_entry = globals.player.deck.add_new_card("Towering Presence")
-		card_entry.upgrade_progress = card_entry.upgrade_threshold - 1
+#		globals.player.add_memory(MemoryDefinitions.FreezeCard.canonical_name)
+#		var card_entry = globals.player.deck.add_new_card("Towering Presence")
+#		card_entry.upgrade_progress = card_entry.upgrade_threshold - 1
 #		var new_card = globals.player.deck.add_new_card("Store in Mind")
 #		new_card.modify_property("_amounts", {"amount_key": "beneficial_integer", "amount_value": "+1"})
 #		globals.player.deck.add_new_card("A Fine Specimen")
 #		globals.player.deck.add_new_card("Chasm")
 #		globals.player.deck.add_new_card("Chasm")
 #		globals.player.deck.add_new_card("Prejudice")
 #		globals.player.damage += 20
-		globals.player.pathos.pathi[Terms.RUN_ACCUMULATION_NAMES.shop].released = 100
+#		globals.player.pathos.pathi[Terms.RUN_ACCUMULATION_NAMES.shop].released = 100
 #		globals.player.pathos.pathi[Terms.RUN_ACCUMULATION_NAMES.artifact].repressed = 100
 #		globals.player.damage = 85
-		globals.player.pathos.available_masteries += 6
+#		globals.player.pathos.available_masteries += 6
 		var debug_encounters = [
 #			EnemyEncounter.new(Act1.Squirrel, "hard"),
 #			EnemyEncounter.new(Act2.TrafficJam, "easy"),
 #			EnemyEncounter.new(Act3.Shamelings, "hard"),
-#			load("res://src/dreamscape/Run/NCE/AllActs/Recurrence.gd").new(),
+			load("res://src/dreamscape/Run/NCE/AllActs/Recurrence.gd").new(),
 #			load("res://src/dreamscape/Run/NCE/AllActs/OstrichEggs.gd").new(),
-			load("res://src/dreamscape/Run/NCE/Act3/UnderwaterCave.gd").new(),
+#			load("res://src/dreamscape/Run/NCE/Act3/UnderwaterCave.gd").new(),
 #			load("res://src/dreamscape/Run/NCE/Act2/RiskyEvent4.gd").new(),
 #			load("res://src/dreamscape/Run/NCE/Act1/Spider.gd").new(),
-			load("res://src/dreamscape/Run/NCE/Artifact.gd").new(),
+#			load("res://src/dreamscape/Run/NCE/Artifact.gd").new(),
 #			BossEncounter.new(Act2.BOSSES["Surreality"]),
 #			BossEncounter.new(Act3.BOSSES["Fear_and_Phobia"]),
 #			EliteEncounter.new(Act1.Bully, "medium"),

src/dreamscape/PathosEntryInfo.gd

@@ -3,25 +3,25 @@ extends MarginContainer
 const pathos_descriptions := {
 	"Header": "Mouse over any pathos below to have it explained.",
 	Terms.RUN_ACCUMULATION_NAMES.enemy: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.enemy].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.enemy].repressed]\
 			+ "Released: %s." % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.enemy].released],
 	Terms.RUN_ACCUMULATION_NAMES.nce: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.nce].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.nce].repressed]\
 			+ "Released: %s" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.nce].released],
 	Terms.RUN_ACCUMULATION_NAMES.shop: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.shop].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.shop].repressed]\
 			+ "Released: %s." % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.shop].released],
 	Terms.RUN_ACCUMULATION_NAMES.elite: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.elite].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.elite].repressed]\
 			+ "Released: %s." % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.elite].released],
 	Terms.RUN_ACCUMULATION_NAMES.artifact: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.artifact].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.artifact].repressed]\
 			+ "Released: %s." % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.artifact].released],
 	Terms.RUN_ACCUMULATION_NAMES.rest: "{pathos}\n"\
-			+ "Repressed: %s ({chance}).\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.rest].repressed]\
+			+ "Repressed: %s.\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.rest].repressed]\
 			+ "Released: %s." % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.rest].released],
 	Terms.RUN_ACCUMULATION_NAMES.boss: "{pathos}\n"\
-			+ "Repressed: %s .\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.boss].repressed]\
+			+ "Repressed: %s\n" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.boss].repressed]\
 			+ "Released: %s" % [Terms.PATHOS_DESCRIPTIONS[Terms.RUN_ACCUMULATION_NAMES.boss].released],
 }
 
@@ -40,10 +40,17 @@ func setup(_name: String, pathos_description: Label) -> void:
 	name = _name
 	pathos_type = globals.player.pathos.pathi[name]
 	description = pathos_description
+	if name == Terms.RUN_ACCUMULATION_NAMES.boss:
+		$HBC.modulate = Color(1,0,0)
 	update_labels()
-
+
+
 func update_labels() -> void:
-	var chance : int = globals.player.pathos.calculate_chance_for_encounter(name)
+	var chance : int
+	if name == Terms.RUN_ACCUMULATION_NAMES.boss:
+		chance = round(globals.player.pathos.pathi[name].repressed / globals.player.pathos.get_boss_threshold() * 100)
+	else:
+		chance = globals.player.pathos.calculate_chance_for_encounter(name)
 	chance_label.text = str(chance) + '%'
 	progress_bar.value = floor(pathos_type.get_progress_pct() * 100)
 	mastery_label.text = str(pathos_type.level)

src/dreamscape/PathosEntryInfo.tscn

@@ -9,7 +9,7 @@ margin_bottom = 32.0
 script = ExtResource( 1 )
 
 [node name="HBC" type="HBoxContainer" parent="."]
-margin_right = 246.0
+margin_right = 350.0
 margin_bottom = 14.0
 mouse_filter = 2
 __meta__ = {
@@ -26,7 +26,6 @@ __meta__ = {
 }
 
 [node name="Chance" type="Label" parent="HBC"]
-visible = false
 margin_left = 134.0
 margin_right = 234.0
 margin_bottom = 14.0
@@ -37,16 +36,16 @@ __meta__ = {
 }
 
 [node name="ProgressBar" type="ProgressBar" parent="HBC"]
-margin_left = 134.0
-margin_right = 234.0
+margin_left = 238.0
+margin_right = 338.0
 margin_bottom = 14.0
 rect_min_size = Vector2( 100, 0 )
 mouse_filter = 2
 step = 1.0
 
 [node name="Mastery" type="Label" parent="HBC"]
-margin_left = 238.0
-margin_right = 246.0
+margin_left = 342.0
+margin_right = 350.0
 margin_bottom = 14.0
 text = "0"
 __meta__ = {

src/dreamscape/PlayerInfo.tscn

@@ -225,7 +225,7 @@ custom_styles/panel = ExtResource( 14 )
 [node name="VBC" type="VBoxContainer" parent="PathosDetails"]
 margin_left = 2.0
 margin_top = 2.0
-margin_right = 301.0
+margin_right = 364.0
 margin_bottom = 47.0
 __meta__ = {
 "_edit_use_anchors_": false
@@ -251,13 +251,17 @@ margin_bottom = 21.0
 text = "Name"
 
 [node name="Chance" parent="PathosDetails/VBC/Header/HBC" index="1"]
-visible = true
+text = "Repressed"
+
+[node name="Released" type="Label" parent="PathosDetails/VBC/Header/HBC" index="2"]
+margin_right = 63.0
+margin_bottom = 21.0
 text = "Released"
 
-[node name="ProgressBar" parent="PathosDetails/VBC/Header/HBC" index="2"]
+[node name="ProgressBar" parent="PathosDetails/VBC/Header/HBC" index="3"]
 visible = false
 
-[node name="Mastery" parent="PathosDetails/VBC/Header/HBC" index="3"]
+[node name="Mastery" parent="PathosDetails/VBC/Header/HBC" index="4"]
 text = "Mastery"
 
 [node name="Description" type="Label" parent="PathosDetails/VBC"]

src/dreamscape/Run/NCE/Act1/Greed.gd

@@ -12,7 +12,7 @@ var pathos_choice_payments := {}
 
 func _init():
 	# TODO: Add story
-	description = "<Mastery for Perturbation - Story Fluff to be Done>. Select one Option...."
+	description = "<Greed - Story Fluff to be Done>. Select one Option...."
 
 func begin() -> void:
 	.begin()

src/dreamscape/Run/SurpriseCombatEncounter.gd

@@ -22,3 +22,7 @@ func end() -> void:
 	# Surprise Ordeals end via their parent NCE
 	finish_surpise_ordeal()
 	owner_nce.end()
+	# Because the NCE refers to this script, and this script refers to the NCE
+	# This causes a loop which prevents either reference from being freed
+	# By setting this to null, we allow both of them to be freed.
+	owner_nce = null

src/dreamscape/ScriptingEngine/ScriptingEngine.gd

@@ -479,6 +479,10 @@ func autoplay_card(script: ScriptTask) -> int:
 			# before cleaning out the temp properties/counters
 			if sceng is GDScriptFunctionState:
 				sceng = yield(sceng, "completed")
+			# If the card had a clause which prevents from being played (such as Utterly Ridiculous)
+			# We still want to discard it
+			if card.state == card.ExtendedCardState.AUTOPLAY_DISPLAY:
+				card.move_to(cfc.NMAP.discard, -1, null, ["scripted"])
 	return(retcode)
 
 

src/dreamscape/Shop/Shop.gd

@@ -346,7 +346,9 @@ func _on_ProgressCards_pressed() -> void:
 # further upgrade cards
 func _update_progress_cost() -> void:
 	# warning-ignore:narrowing_conversion
-	progress_cost = floor(progress_cost_multiplier + (globals.player.deck.get_upgrade_percentage() * 4.0))
+	progress_cost = floor(
+		progress_cost_multiplier
+		+ (globals.player.deck.get_upgrade_percentage() * 2.0))
 	var progress_text_format = {
 		"cost": str(progress_cost),
 		"pathos": card_progress_cost_type.capitalize(),

src/dreamscape/Terms.gd

@@ -55,7 +55,7 @@ const PATHOS_DESCRIPTIONS := {
 	RUN_ACCUMULATION_NAMES.enemy: {
 		"repressed": "Increases the chance that Torments will appear as encounters. "\
 			+ "If the repressed pathos gets too high, it also makes their ordeals harder",
-		"released": "Fill the bar to receive a pathos mastery to use in the shop."
+		"released": "Fill the bar to receive 2 pathos masteries to use in the shop."
 	},
 	RUN_ACCUMULATION_NAMES.nce: {
 		"repressed": "Increases the chance that Non-Ordeal encounters will appear. "\
@@ -69,7 +69,7 @@ const PATHOS_DESCRIPTIONS := {
 	RUN_ACCUMULATION_NAMES.elite: {
 		"repressed": "Increases the chance that Elite Torment will appear as encounters. "\
 			+ "If the repressed pathos gets too high, it also makes their ordeals harder",
-		"released": "Fill the bar to receive 2 pathos masteries to use in the shop."
+		"released": "Fill the bar to receive 3 pathos masteries to use in the shop."
 	},
 	RUN_ACCUMULATION_NAMES.artifact: {
 		"repressed": "Increases the chance that Curios will appear as encounters. "\

src/dreamscape/cards/CustomScripts.gd

@@ -172,7 +172,8 @@ func custom_script(script: ScriptObject, _snapshot_id:= 0) -> void:
 					owner.deck_card_entry.modify_property("_amounts", payload)
 		"Lethe":
 			var rnd_memory = globals.player.get_random_memory()
-			rnd_memory.lose_pathos(rnd_memory.pathos_threshold / 10.0)
+			if rnd_memory:
+				rnd_memory.lose_pathos(rnd_memory.pathos_threshold / 10.0)
 		"Cockroach Infestation":
 			var all_cards = cfc.get_tree().get_nodes_in_group("cards")
 			CFUtils.shuffle_array(all_cards)