Fixed various colouring bugs

.gut_editor_config.json

@@ -15,15 +15,15 @@
  "hide_orphans": false,
  "ignore_pause": true,
  "include_subdirs": false,
- "inner_class": "TestSelfCleaning",
+ "inner_class": "TestKeepInMindPlus",
  "junit_xml_file": "",
  "junit_xml_timestamp": false,
  "log_level": 3,
  "opacity": 68,
  "post_run_script": "",
  "pre_run_script": "",
  "prefix": "test_",
- "selected": "test_effects_special.gd",
+ "selected": "test_Vindictive.gd",
  "should_exit": false,
  "should_exit_on_success": false,
  "should_maximize": true,
@@ -33,7 +33,7 @@
  "tests": [
 
  ],
- "unit_test_name": "test_self_cleaning",
+ "unit_test_name": "test_card_results",
  "gut_on_top": true,
  "panel_options": {
   "font_name": "CourierPrime",

assets/archetypes/Rubber Chicken.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Rubber Chicken.jpg-a4d81a38ffd26e71cb8c0aad7dff7bc4.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/archetypes/Rubber Chicken.jpg"
+dest_files=[ "res://.import/Rubber Chicken.jpg-a4d81a38ffd26e71cb8c0aad7dff7bc4.stex" ]
+
+[params]
+
+compress/mode=1
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/cards/Nunclucks.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Nunclucks.jpg-6e4e3980a2669ddf6e600ce63076d73b.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/cards/Nunclucks.jpg"
+dest_files=[ "res://.import/Nunclucks.jpg-6e4e3980a2669ddf6e600ce63076d73b.stex" ]
+
+[params]
+
+compress/mode=1
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/cards/Rubber Eggs.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Rubber Eggs.jpg-d6aaea36f1da7d94cd244d87f44d63f8.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/cards/Rubber Eggs.jpg"
+dest_files=[ "res://.import/Rubber Eggs.jpg-d6aaea36f1da7d94cd244d87f44d63f8.stex" ]
+
+[params]
+
+compress/mode=1
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

assets/cards/Towering Presence.jpg.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Towering Presence.jpg-890c502a068f1b702a9fa07e2fab0a85.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/cards/Towering Presence.jpg"
+dest_files=[ "res://.import/Towering Presence.jpg-890c502a068f1b702a9fa07e2fab0a85.stex" ]
+
+[params]
+
+compress/mode=1
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=0
+flags/filter=true
+flags/mipmaps=false
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=true
+svg/scale=1.0

src/dreamscape/Archetypes.gd

@@ -274,7 +274,7 @@ const COWARD := {
 
 
 const RUBBER_CHICKEN := {
-#	"Icon": preload("res://icon.png"),
+	"Icon": preload("res://assets/archetypes/Rubber Chicken.jpg"),
 	"Tags": [
 		Terms.ACTIVE_EFFECTS.disempower.name,
 		Terms.ACTIVE_EFFECTS.buffer.name,

src/dreamscape/Board.gd

@@ -480,7 +480,7 @@ func _input(event):
 		globals.player.add_memory(MemoryDefinitions.RandomChaos.canonical_name)
 		# warning-ignore:return_value_discarded
 #		globals.player.add_memory(MemoryDefinitions.BufferSelf.canonical_name)
-#		dreamer.active_effects.mod_effect(Terms.ACTIVE_EFFECTS.poison.name, 6)
+		dreamer.active_effects.mod_effect(Terms.ACTIVE_EFFECTS.quicken.name, 6)
 #		dreamer.active_effects.mod_effect(Terms.ACTIVE_EFFECTS.thorns.name, 6)
 #		dreamer.active_effects.mod_effect(Terms.ACTIVE_EFFECTS.absurdity_unleashed.name, 1)
 #		dreamer.active_effects.mod_effect(Terms.ACTIVE_EFFECTS.creative_block.name, 1)
@@ -495,16 +495,7 @@ func _input(event):
 #			"Fowl Language",
 #			"A Thousand Squeaks",
 #			"Prejudice",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Dodge",
-			"Hand of Grudge",
-			"Hand of Grudge",
+			"Overview",
 		]:
 			var ce = CardEntry.new(c)
 			var card = ce.instance_self()
@@ -556,7 +547,7 @@ func _on_Debug_pressed() -> void:
 		entity.damage = 1
 	for c in [
 #		"Grit"
-#			"Confident Slap",
+			"Overview",
 #			"Confident Slap",
 #			"A Thousand Squeaks",
 	]:

src/dreamscape/CombatElements/CombatEffects/quicken.gd

@@ -9,9 +9,14 @@ func get_effect_alteration(
 		_sceng, 
 		is_source := false, 
 		_dry_run := true,
-		_subject: Node = null) -> int:
-	if not script.script_name == 'assign_defence'\
-			or not is_source or is_delayed:
+		subject: Node = null) -> int:
+	if not script.script_name == 'assign_defence':
+		return(0)
+	if not is_source:
+		return(0)
+	if subject != owning_entity:
+		return(0)
+	if is_delayed:
 		return(0)
 	var new_value = value + stacks
 	var alteration = new_value - value

src/dreamscape/Overworld/Journal.gd

@@ -23,8 +23,8 @@ const WORD_DEFINITIONS := {
 	"scar": "Will permanently degrade a card in a random manner",
 	"enhance": "Will permanently improve a card in a random manner",
 	"anxiety_up": "Will increase the dreamer's Anxiety. If this reaches the max, the dreamer will wake up and the game is over.",
-	"anxiety_down": "Will decrease the anxiety. This helps from losing the game.",
-	"anxiety": "Anxiety: When full, the dreamer wakes up and you lose the game.",
+	"anxiety_down": "Will decrease the anxiety. This avoids losing the game.",
+	"anxiety": "Max Anxiety: When your anxiety reaches this threshold, the dreamer wakes up and you lose the game.",
 }
 
 var pathos_infos := {}
@@ -583,11 +583,11 @@ func _input(event):
 		globals.player.pathos.modify_released_pathos(Terms.RUN_ACCUMULATION_NAMES.artifact, -1000)
 #		globals.player.damage = 85
 		var debug_encounters = [
-			EnemyEncounter.new(Act1.TheLaughingOnes, "hard"),
-#			EnemyEncounter.new(Act2.TrafficJam, "easy"),
+#			EnemyEncounter.new(Act1.TheLaughingOnes, "hard"),
+			EnemyEncounter.new(Act2.TrafficJam, "easy"),
 #			EnemyEncounter.new(Act3.HandsyAunt, "hard"),
 #			load("res://src/dreamscape/Run/NCE/AllActs/Recurrence.gd").new(),
-			load("res://src/dreamscape/Run/NCE/AllActs/EpicUpgrade.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/Act2/RiskyEvent4.gd").new(),
 #			load("res://src/dreamscape/Run/NCE/Act1/Spider.gd").new(),
@@ -598,7 +598,7 @@ func _input(event):
 #			EliteEncounter.new(Act2.IndescribableAbsurdity, "medium"),
 #			EliteEncounter.new(Act3.TheatrePlay, "medium"),
 #			load("res://src/dreamscape/Run/NCE/Shop.gd").new()
-#			load("res://src/dreamscape/Run/NCE/Rest.gd").new()
+			load("res://src/dreamscape/Run/NCE/Rest.gd").new()
 		]
 		for encounter in debug_encounters:
 			var journal_choice_scene = JOURNAL_ENCOUNTER_CHOICE_SCENE.instance()

src/dreamscape/Overworld/Journal.tscn

@@ -217,10 +217,10 @@ margin_bottom = 4.0
 custom_styles/panel = ExtResource( 11 )
 
 [node name="Label" type="RichTextLabel" parent="VBC/Journal/MetaDescription"]
-margin_left = 2.0
-margin_top = 2.0
-margin_right = 302.0
-margin_bottom = 22.0
+margin_left = 12.0
+margin_top = 12.0
+margin_right = 312.0
+margin_bottom = 32.0
 rect_min_size = Vector2( 300, 0 )
 bbcode_enabled = true
 fit_content_height = true

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

@@ -3,7 +3,7 @@
 extends NonCombatEncounter
 
 var secondary_choices := {
-		'accept': '[Accept]: Gain {gcolor{lowest_pathos_amount} {lowest_pathos}:}. {bcolor:Become {perturbation}:}.',
+		'accept': '[Accept]: Gain {gcolor:{lowest_pathos_amount} {lowest_pathos}:}. {bcolor:Become {perturbation}:}.',
 		'decline': '[Decline]: Nothing Happens.',
 	}
 var pathos_choice_payments := {}

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

@@ -6,7 +6,7 @@ var shader := load("res://shaders/Roscharch.shader")
 
 var secondary_choices := {
 		'tiger': '[A Tiger]: Gain some {gcolor:{released_nce}:}.',
-		'snake': '[A Snake]:  Gain some {gcolor{released_enemy}:}.',
+		'snake': '[A Snake]:  Gain some {gcolor:{released_enemy}:}.',
 		'owl': '[An Owl]: Gain some {gcolor:{released_shop}:}.',
 	}
 

src/dreamscape/Run/NCE/Act3/Cockroaches.gd

@@ -6,7 +6,7 @@ const STOMP_DAMAGE := 3
 
 var secondary_choices := {
 		'ignore': '[Ignore]:{gcolor:{relax} for {pct}% of your max {anxiety}:}. {bcolor:Become {infested}:}.',
-		'stomp': '[Stomp]: {bcolor:+{damage_amount} {anxiety_up}}.',
+		'stomp': '[Stomp]: {bcolor:+{damage_amount} {anxiety_up}:}.',
 	}
 
 var nce_result_fluff := {

src/dreamscape/Run/NCE/AllActs/EpicUpgrade.gd

@@ -5,9 +5,9 @@ const EPIC_AMOUNT = 4
 const GAMBLE_AMOUNT = 4
 
 var secondary_choices := {
-		'epic': '[Grow]: Lose {anxiety_loss} max {anxiety}. Choose a non-{concentration} card and [url={"definition": "enhance","meta_type": "definition"}]Enhance[/url] it {epic_amount} times.',
-		'gamble': '[Dance]: Choose a non-{concentration} card. Enhance it {gamble_amount} times then [url={"definition": "scar","meta_type": "definition"}]Scar[/url] it {gamble_amount} times.',
-		'skip': "[Skip]: Release a random card from your deck.",
+		'epic': '[Grow]: {bcolor:-{anxiety_loss} max {anxiety}:}. Choose a non-{concentration} card and {gcolor:[url={"definition": "enhance","meta_type": "definition"}]Enhance[/url] it:} {epic_amount} times.',
+		'gamble': '[Dance]: Choose a non-{concentration} card. {gcolor:[url={"definition": "enhance","meta_type": "definition"}]Enhance[/url] it {gamble_amount} times:} then {bcolor:[url={"definition": "scar","meta_type": "definition"}]Scar[/url] it:} {gamble_amount} times.',
+		'skip': "[Skip]: {bcolor:Release a random card from your deck:}.",
 	}
 
 var nce_result_fluff := {

src/dreamscape/Run/NCE/AllActs/OstrichEggs.gd

@@ -3,9 +3,9 @@ extends NonCombatEncounter
 const HUNGRY_AMOUNT = 2
 
 var secondary_choices := {
-		'scramble': "[Scrambled]: Enhance all basic {action} cards. Scar all basic {control} cards (Enhancing randomly improves a card. Scarring randomly degrades a card.)",
-		'omelette': "[Omelette]: Enhance all basic {control} cards. Scar all basic {action} cards",
-		'hungry': "[Hungry]: Scar {hungry_amount} random cards.",
+		'scramble': '[Scrambled]: {gcolor:[url={"definition": "enhance","meta_type": "definition"}]Enhance[/url]:} all basic {action} cards. {bcolor:[url={"definition": "scar","meta_type": "definition"}]Scar[/url]:} all basic {control} cards',
+		'omelette': '[Omelette]: {gcolor:[url={"definition": "enhance","meta_type": "definition"}]Enhance[/url]:} all basic {control} cards. {bcolor:[url={"definition": "scar","meta_type": "definition"}]Scar[/url]:} all basic {action} cards',
+		'hungry': '[Hungry]: {bcolor:[url={"definition": "scar","meta_type": "definition"}]Scar[/url]:} {hungry_amount} random cards.',
 	}
 
 var nce_result_fluff := {

src/dreamscape/Run/NCE/AllActs/PopPsychologist2.gd

@@ -5,9 +5,9 @@ extends NonCombatEncounter
 var shader := load("res://shaders/Roscharch.shader")
 
 var secondary_choices := {
-		'passion fruit': '[A Passion Fruit]: Gain some {released_artifact}.',
-		'orange': '[An Orange]:  Gain some {released_elite}.',
-		'banana': '[A Banana]: Gain some {released_rest}.',
+		'passion fruit': '[A Passion Fruit]: Gain some {gcolor:{released_artifact}:}.',
+		'orange': '[An Orange]:  Gain some {gcolor:{released_elite}:}.',
+		'banana': '[A Banana]: Gain some {gcolor:{released_rest}:}.',
 	}
 
 var nce_resul_fluff := "[i]I understand. You're {adjective} your {noun}.[/i]"

src/dreamscape/Run/NCE/AllActs/PottedPlant.gd

@@ -6,8 +6,8 @@ const MEMORY_UPGRADE := 3
 
 var secondary_choices := {
 		'remembered': "[Remembered]: Nothing happens.",
-		'forgot': "[Forgot]: Become {special_perturbation}. Upgrade your {existing_memory}.",
-		'what': "[Huh?]: Become {special_perturbation}. Gain {special_memory}.",
+		'forgot': "[Forgot]: Become {bcolor:{special_perturbation}:}. {gcolor:Upgrade:} your {existing_memory}.",
+		'what': "[Huh?]: Become {bcolor:{special_perturbation}:}. {gcolor:Gain {special_memory}:}.",
 	}
 
 var nce_result_fluff := {

src/dreamscape/Run/NCE/Rest.gd

@@ -6,16 +6,16 @@ var rest_amount : float = 0.25
 var progress_amount := 5
 
 var secondary_choices := {
-		'rest': '[Rest] Releases {anxiety} anxiety equal to 25% of the max ({healing_done}), from the Dreamer.',
-		'progress': '[Think] Choose and progress a card {progress_amount} times',
+		'rest': '[Rest] {gcolor:-{healing_done} {anxiety_down}:}.',
+		'progress': '[Think] {gcolor:Choose and progress a card:} {progress_amount} times',
 		'resist': '[Resist] Nothing happens.',
 	}
 
 var unlockable_choices := {
-	"strengthen_up": '[%s] Increase starting {strengthen} by 1.' % [ArtifactDefinitions.StrengthenUp.name],
-	"quicken_up": '[%s] Increase starting {quicken} by 1.' % [ArtifactDefinitions.QuickenUp.name],
-	"enhance": '[%s] [url={"definition": "enhance","meta_type": "definition"}]Enhance[/url] one card.' % [ArtifactDefinitions.EnhanceOnRest.name],
-	"upgrade_memories": '[%s] Upgrade all Memories.' % [ArtifactDefinitions.UpgradeMemoryOnRest.name],
+	"strengthen_up": '[%s] {gcolor:Increase starting {strengthen}:} by 1.' % [ArtifactDefinitions.StrengthenUp.name],
+	"quicken_up": '[%s] {gcolor:Increase starting {quicken}:} by 1.' % [ArtifactDefinitions.QuickenUp.name],
+	"enhance": '[%s] {gcolor:[url={"definition": "enhance","meta_type": "definition"}]Enhance[/url]:} one card.' % [ArtifactDefinitions.EnhanceOnRest.name],
+	"upgrade_memories": '[%s] {gcolor:Upgrade:} all Memories.' % [ArtifactDefinitions.UpgradeMemoryOnRest.name],
 }
 
 var reward_texts := {

src/dreamscape/cards/sets/ImageLibrary.gd

@@ -47,6 +47,9 @@ const CARD_IMAGES := {
 	"Keep in Mind": "res://assets/cards/Keep in Mind.jpg",
 	"Whirlwind": "res://assets/cards/whirlwind.jpg",
 	"Overview": "res://assets/cards/overview.jpg",
+	"Rubber Eggs": "res://assets/cards/Rubber Eggs.jpg",
+	"Towering Presence": "res://assets/cards/Towering Presence.jpg",
+	"Nunclucks": "res://assets/cards/Nunclucks.jpg",
 
 	# Reusing Journal Art. SHould eventually get proper illustrations
 	"Stuffed Toy": "res://assets/journal/torments/stuffed_toy.jpeg",