Added Lotustus to Act2

Closes #382

.gut_editor_config.json

@@ -15,15 +15,15 @@
  "hide_orphans": false,
  "ignore_pause": true,
  "include_subdirs": false,
- "inner_class": "TestRandomForgottenCards",
+ "inner_class": "TestLotustus",
  "junit_xml_file": "",
  "junit_xml_timestamp": false,
  "log_level": 3,
  "opacity": 68,
  "post_run_script": "",
  "pre_run_script": "",
  "prefix": "test_",
- "selected": "test_ordeal_artifacts.gd",
+ "selected": "test_understandings.gd",
  "should_exit": false,
  "should_exit_on_success": false,
  "should_maximize": true,

assets/cards/Lotustus.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Lotustus.png-ae8b5a6df0d3203c8644c70bb7440dd2.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/cards/Lotustus.png"
+dest_files=[ "res://.import/Lotustus.png-ae8b5a6df0d3203c8644c70bb7440dd2.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/enemies/Lotustus.png.import

@@ -0,0 +1,35 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Lotustus.png-77728c77d1e76fac50a63ed9193de0ab.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/enemies/Lotustus.png"
+dest_files=[ "res://.import/Lotustus.png-77728c77d1e76fac50a63ed9193de0ab.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/core/CardTemplate.gd

@@ -2671,7 +2671,7 @@ func _process_card_state() -> void:
 				_tween.start()
 				yield(_tween, "tween_all_completed")
 				_tween_stuck_time = 0
-				move_to(spawn_destination)
+				move_to(spawn_destination, -1, null, ["Scripted", "Spawned"])
 				spawn_destination = null
 
 

src/core/CardViewer/CVPreviewPopup.gd

@@ -83,12 +83,11 @@ func get_preview_placement() -> Vector2:
 			and is_instance_valid(preview_card)\
 			and card_offscreen_y > get_viewport().size.y:
 		ret.y = get_viewport().size.y\
-				- card_size.y\
-				+ 30
+				- card_size.y
 	elif card_offscreen_y < focus_offscreen_y\
 			and focus_offscreen_y > get_viewport().size.y:
 		ret.y = get_viewport().size.y\
-				- focus_info.rect_size.y + 30
+				- focus_info.rect_size.y
 	else:
 		ret.y = get_global_mouse_position().y + 30
 #	print_debug(ret)

src/dreamscape/Artifacts/RandomForgottenCards.gd

@@ -11,6 +11,8 @@ func _on_signal_received(trigger_card, trigger, details) -> void:
 		return
 	if details.destination.to_lower() != "forgotten":
 		return
+	if "Spawned" in details.tags:
+		return
 	var script = [
 		{
 			"name": "spawn_card_to_container",

src/dreamscape/Board.gd

@@ -472,10 +472,10 @@ func _input(event):
 		var _torment2
 		var _torment3
 #		_torment1 = spawn_enemy(EnemyDefinitions.SHAMELING)
-		_torment1 = spawn_enemy(EnemyDefinitions.THE_CRITIC)
+		_torment1 = spawn_enemy(EnemyDefinitions.LOTUSTUS)
 #		_torment1 = spawn_enemy(EnemyDefinitions.VOID)
 #		_torment2 = spawn_enemy(EnemyDefinitions.SHAMELING)
-		_torment2 = spawn_enemy(EnemyDefinitions.GASLIGHTER)
+#		_torment2 = spawn_enemy(EnemyDefinitions.GASLIGHTER)
 #		_torment3 = spawn_enemy(EnemyDefinitions.CLOWN)
 #		_torment3 = spawn_enemy(EnemyDefinitions.THE_CRITIC)
 #		_torment3 = spawn_enemy(EnemyDefinitions.THE_LAUGHING_ONE)

src/dreamscape/Board.tscn

@@ -15,20 +15,20 @@
 [ext_resource path="res://src/dreamscape/IconAnims.gd" type="Script" id=15]
 
 [sub_resource type="GDScript" id=5]
-script/source = "extends Label
-
-
-func _ready():
-	hide()
-
-func _process(delta):
-	if visible:
-		text = 'FPS: ' + str(Engine.get_frames_per_second())
-
-func _input(event):
-	if event.is_action_pressed(\"Show FPS\"):
-		show()
-
+script/source = "extends Label
+
+
+func _ready():
+	hide()
+
+func _process(delta):
+	if visible:
+		text = 'FPS: ' + str(Engine.get_frames_per_second())
+
+func _input(event):
+	if event.is_action_pressed(\"Show FPS\"):
+		show()
+
 "
 
 [sub_resource type="StyleBoxFlat" id=4]

src/dreamscape/CombatElements/Enemies/Enemies.gd

@@ -912,3 +912,42 @@ const SHAMELING := {
 	"_character_art": "SkylarkGSH"
 }
 
+const LOTUSTUS := {
+	"Name": "Lotustus",
+	"Type": "Phobia",
+	"Health": 130,
+	"Intents": [
+		{
+			"intent_scripts": ["Stress: 2","Stress: 2","Stress: 1","Stress: 2","Stress: 2","Stress: 2"],
+			"reshuffle": true,
+			"max_in_a_row": 1,
+		},
+		{
+			"intent_scripts": ["Debuff:1:strengthen", "SpawnCard:Disgust:Deck","SpawnCard:Disgust:Discard","SpawnCard:Disgust:Forgotten", "Perplex:10"],
+			"reshuffle": false,
+			"sets_up_intent": "hives",
+		},
+		{
+			"id": "hives",
+			"intent_scripts": ["Buff:2:thorns","SpawnCard:Disgust:Deck", "Perplex:8"],
+			"reshuffle": true,
+			"max_in_a_row": 1,
+		},
+		{
+			"intent_scripts": ["Buff:1:quicken","Buff:2:thorns", "Perplex:13"],
+			"reshuffle": false,
+			"sets_up_intent": "hives",
+		},
+		{
+			"intent_scripts": ["Debuff:1:strengthen","Stress:30", "Perplex:10"],
+			"reshuffle": false,
+			"sets_up_intent": "hives",
+		},
+	],
+	"_health_variability": 8,
+	"_texture_size_x": "120",
+	"_texture_size_y": "120",
+	"_texture": "res://assets/enemies/Lotustus.png",
+	"_character_art": "SkylarkGSH"
+}
+

src/dreamscape/MainMenu/CreditLabel.gd

@@ -87,7 +87,7 @@ var game_designers := {
 	"Db0": "Lead Game Design",
 	"DioBal": "Game Design",
 	"QuestLion#8467": "Archetype Design",
-#	"SkylarkGSH": "Archetype Design",
+	"SkylarkGSH": "Miscellaneous Designs",
 }
 var developers := {
 	"Db0": "Programming Lead"

src/dreamscape/Overworld/Journal.gd

@@ -587,7 +587,7 @@ func _input(event):
 #		globals.player.pathos.available_masteries += 6
 		var debug_encounters = [
 #			EnemyEncounter.new(Act1.Clown, "hard"),
-#			EnemyEncounter.new(Act2.ENEMIES.GuiltyTreatment, "easy"),
+			EnemyEncounter.new(Act2.ENEMIES.Lotustus, "medium"),
 #			EnemyEncounter.new(Act3.Cringelord, "hard"),
 #			load(AllActs.NCE.risky.OstrichEggs).new(),
 #			load(Act1.NCE.risky.Spider).new(),

src/dreamscape/Run/Act2.gd

@@ -544,11 +544,12 @@ It was frustrating and upsetting, making me feel guilty and ashamed. I couldn't
 		],
 	},
 }
+
 const Void = {
 	"name": "Void",
 	"title": "A Black Hole in your mind",
 	"journal_description":\
-"""Initially I felt like my dreams were fading. But as the void of everything grew larger and more distinct, it occurred to me it was far worse. You see, what a dream that could never be repeated. An endless black space opens, coming together with your mind, reaching towards you like a powerful claw.
+"""Initially I felt like my dreams were fading. But as [url={torment_tag1}the void of everything[/url] grew larger and more distinct, it occurred to me it was far worse. You see, what a dream that could never be repeated. An endless black space opens, coming together with your mind, reaching towards you like a powerful claw.
 From your perspective, it feels cold, it stretches out, wants to penetrate you and capture you for eternity. Yet when you look down onto the threshold, what do you see?""",
 	"journal_reward":\
 """When you read these words now, there's going to be something else occupying the void inside of you; an invisible "you" staring back from deep within yourself... But that shouldn't matter. Right?""",
@@ -600,6 +601,49 @@ From your perspective, it feels cold, it stretches out, wants to penetrate you a
 		],
 	},
 }
+const Lotustus = {
+	"name": "Lotustus",
+	"title": "A dizzying array of holes",
+	"journal_description":\
+"""I remember my legs submerged in the murky water. I dredged through the endless misty swamp as my worry began to grow.
+Soon my vision cleated, and to my dismay I saw [url={torment_tag1}]thousands of holes[/url] (or were they tiny nests?), all around me. An endless pit of agitation.""",
+	"journal_reward":\
+"""Even though I could feel and see the irritating blood red pores across my skin, I had to reassure myself that it couldn't hurt me physically. I denied my primal subconcious assumptions within me, and stormed away from the hideous amalgamations before me, and continued my trek through the bog.""",
+#	"journal_art": "res://assets/journal/torments/The Void.jpg",
+	"ai_prompts": [
+		"My skin crawled as I beheld dozens on tiny holes arrayed",
+	],
+	"replacement_keywords": {
+		"torment_tag1": ["trypophobia","holes?"],
+	},
+	"enemies": {
+		"easy": [
+			{
+				"definition": EnemyDefinitions.LOTUSTUS,
+				"health_modifier": -30,
+			},
+		],
+		"medium": [
+			{
+				"definition": EnemyDefinitions.LOTUSTUS,
+			},
+		],
+		"hard": [
+			{
+				"definition": EnemyDefinitions.LOTUSTUS,
+				"rebalancing": {
+					"Perplex": +2,
+				},
+				"starting_effects": [
+					{
+						"name": Terms.ACTIVE_EFFECTS.thorns.name,
+						"stacks": 4
+					},
+				]
+			},
+		],
+	},
+}
 const ENEMIES = {
 	"TrafficJam": TrafficJam,
 	"Mouse": Mouse,
@@ -610,6 +654,7 @@ const ENEMIES = {
 	"ImpossibleConstruction": ImpossibleConstruction,
 	"GuiltyTreatment": GuiltyTreatment,
 	"Void":Void,
+	"Lotustus": Lotustus,
 }
 
 const IndescribableAbsurdity = {

src/dreamscape/cards/PerturbationFrontNew.tscn

@@ -3,8 +3,7 @@
 [ext_resource path="res://src/dreamscape/CardFrontNew.tscn" type="PackedScene" id=1]
 [ext_resource path="res://shaders/Dreambox.shader" type="Shader" id=2]
 
-[sub_resource type="StyleBoxFlat" id=2]
-bg_color = Color( 0, 0, 0, 1 )
+[sub_resource type="StyleBoxEmpty" id=2]
 
 [sub_resource type="ShaderMaterial" id=1]
 resource_local_to_scene = true

src/dreamscape/cards/sets/ImageLibrary.gd

@@ -232,6 +232,7 @@ const BETA_IMAGES := {
 	"Submerged": "res://assets/journal/torments/submerged.jpg",
 	"Influencer": "res://assets/enemies/influencer.jpg",
 	"Handsy Aunt": "res://assets/enemies/handsy_aunt.jpeg",
+	"Lotustus": "res://assets/cards/Lotustus.png",
 }
 
 static func get_multiple_art_option(card_name: String) -> String: