Entities journal rework

This commit is contained in:
Maurane
2026-05-21 16:31:52 +02:00
parent 8bb5a68c47
commit 6f6d048f06
16 changed files with 210 additions and 74 deletions
+2
View File
@@ -27,6 +27,7 @@ var directives = "\n[center][font_size=22]INSTRUCTIONS[/font_size][/center]
var release_messages: Array[String]
var terminate_messages: Array[String]
var buttons_activated: bool = true
var entities = [] #Entities list for the journal
#Signals for screening desk
signal console_message
@@ -40,6 +41,7 @@ signal release_display
signal terminate_display
signal its_end
signal next_event
signal add_entity
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
+3 -10
View File
@@ -54,7 +54,7 @@ func _on_new_game_pressed():
#Setting/Resetting game parameters
Globals.day_count = 1
Globals.floor_count = -4
Globals.floor_count = -2
Globals.patient_count = 0
Globals.accurate_diagnoses = 0
Globals.diagnoses_quota = 4
@@ -63,11 +63,8 @@ func _on_new_game_pressed():
for i in range(len(Patient.patient_list)):
Patient.patient_list[i] = Patient.og_patient_list[i]
Patient.its_list = Patient.og_its_list
Patient.entities_list = Patient.og_entities_list
Patient.entities_current_floor.clear()
Patient.patients_seen.clear()
Patient.its_seen.clear()
Patient.entities_seen.clear()
# DISABLED FOR NOW SINCE THERE'S NO INTRO ANYMORE
#Offering to skip the introduction
#var choice_text = "Do you wish to skip the introduction ?"
@@ -126,12 +123,10 @@ func save_game(save_slot_number:int):
"patient_list": Patient.patient_list,
"its_list": Patient.its_list,
"ite_list": Patient.ite_list,
"entities_list": Patient.entities_list,
"patients_seen": Patient.patients_seen,
"its_seen": Patient.its_seen,
"ite_seen": Patient.ite_seen,
"entities_seen": Patient.entities_seen,
"entities_current_floor": Patient.entities_current_floor,
"journal_entities": $ScreeningDesk.journal_layer.journal.entities_page.text,
"save_date": Globals.get_save_date()
}
#Creating save file
@@ -186,12 +181,10 @@ func load_game(load_slot_number:int):
print (Patient.patient_list)
Patient.its_list = load_data["its_list"]
Patient.ite_list = load_data["ite_list"]
Patient.entities_list = load_data["entities_list"]
Patient.patients_seen = load_data["patients_seen"]
Patient.its_seen = load_data["its_seen"]
Patient.ite_seen = load_data["ite_seen"]
Patient.entities_seen = load_data["entities_seen"]
Patient.entities_current_floor = load_data["entities_current_floor"]
$ScreeningDesk.journal_layer.journal.entities_page.text = load_data["journal_entities"]
else:
print("Failed to parse Loading Data.")
+43 -21
View File
@@ -24,14 +24,6 @@ var symptoms_detailed: Array[Array] = [
"VISUAL HALLUCINATIONS\nFalse perceptions of visual stimuli"]
]
var its_entity_file : String = "[color=dark_red]IT THAT SMILES[/color]
CHARACTERISTICS
- Wide smile, dark-red mouth, lack of teeth
- Disguises as a human subject
RECOMMENDED COURSE OF ACTION
- As soon as it smiles, [color=red]TERMINATE[/color] It."
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
@@ -43,6 +35,7 @@ func _ready() -> void:
bookmarks.rules.pressed.connect(self._on_tab_rules_pressed)
bookmarks.symptoms.pressed.connect(self._on_tab_symptoms_pressed)
bookmarks.entities.pressed.connect(self._on_tab_entities_pressed)
Globals.add_entity.connect(self.add_entity)
hide() #Hiding at start
@@ -62,11 +55,20 @@ func update_symptoms(floor_count:int):
journal.symptoms_page.text = symptoms_page
func update_entities():
func add_entity(entity):
if Globals.entities.has(entity) == false:
Globals.entities.append(entity)
update_entities(Globals.entities)
func update_entities(entities):
journal.entities_page.text = ""
if Patient.entities_current_floor.is_empty():
Patient.pick_floor_entities() #Picking floor entities unless a save was just loaded
for entity in entities:
add_entity_to_journal(entity)
func add_entity_to_journal(entity: String):
var config := ConfigFile.new()
var entity_name: String = ""
@@ -74,23 +76,43 @@ func update_entities():
var entity_course_of_action: String = ""
var entity_text: String = ""
journal.entities_page.text += its_entity_file
config.load("res://Text Data/entities.cfg") #Loading Entity file
entity_name = config.get_value(entity, "entity_name")
entity_characteristics = config.get_value(entity, "entity_characteristics")
entity_course_of_action = config.get_value(entity, "entity_course_of_action")
entity_text = Globals.colorize(entity_name, "dark_red") + "\n\nCHARACTERISTICS" + entity_characteristics + "\nRECOMMENDED COURSE OF ACTION" + entity_course_of_action
journal.entities_page.text += "\n\n\n" + entity_text
#func update_entities(): Old function, to be deleted
for entity in Patient.entities_current_floor:
config.load("res://Dialogues/Entities/" + entity + "_file.cfg") #Loading Entity file
entity_name = config.get_value("", "entity_name")
entity_characteristics = config.get_value("", "entity_characteristics")
entity_course_of_action = config.get_value("", "entity_course_of_action")
entity_text = Globals.colorize(entity_name, "dark_red") + "\n\nCHARACTERISTICS" + entity_characteristics + "\nRECOMMENDED COURSE OF ACTION" + entity_course_of_action
journal.entities_page.text += "\n\n\n" + entity_text
#journal.entities_page.text = ""
#if Patient.entities_current_floor.is_empty():
# Patient.pick_floor_entities() #Picking floor entities unless a save was just loaded
#var config := ConfigFile.new()
#var entity_name: String = ""
#var entity_characteristics: String = ""
#var entity_course_of_action: String = ""
#var entity_text: String = ""
#journal.entities_page.text += its_entity_file
#for entity in Patient.entities_current_floor:
#config.load("res://Dialogues/Entities/" + entity + "_file.cfg") #Loading Entity file
#entity_name = config.get_value("", "entity_name")
#entity_characteristics = config.get_value("", "entity_characteristics")
#entity_course_of_action = config.get_value("", "entity_course_of_action")
#entity_text = Globals.colorize(entity_name, "dark_red") + "\n\nCHARACTERISTICS" + entity_characteristics + "\nRECOMMENDED COURSE OF ACTION" + entity_course_of_action
#journal.entities_page.text += "\n\n\n" + entity_text
#Resets to initial state
func reset():
hide()
update_symptoms(Globals.floor_count)
if Globals.floor_count <= -4:
update_entities()
update_entities(Globals.entities)
if Globals.floor_count <= -2:
bookmarks.entities.show()
else:
bookmarks.entities.hide()
-27
View File
@@ -33,12 +33,9 @@ var its_list = []
var og_ite_list = ["ite_01"]
var ite_list = []
var og_entities_list = ["entity_01"]
var entities_list = []
var entities_current_floor = []
var patients_seen = []
var its_seen = []
var ite_seen = []
var entities_seen = []
#Supervisor file path
@@ -56,7 +53,6 @@ func _ready() -> void:
patient_list.resize(len(symptoms_arrays))
its_list = og_its_list
ite_list = og_ite_list
entities_list = og_entities_list
original_color = texture.modulate #Saving original modulation color to reset it after modification
@@ -225,9 +221,6 @@ func generate_next_id(patient_type: String):
"ite":
next_id = ite_list.pick_random()
print("ITE selected: " + str(next_id))
"entity":
next_id = entities_current_floor.pick_random()
print("Entity selected: " + str(next_id))
return next_id
@@ -292,8 +285,6 @@ func next_patient_type():
type_list.append("ite")
_:
for i in range(int(Globals.diagnoses_quota)):
if len(entities_current_floor) > 0:
type_list.append("entity")
if len(its_list) > 0:
type_list.append("its")
if len(ite_list) > 0:
@@ -327,21 +318,3 @@ func update_list():
ite_seen.append(id)
ite_list.erase(id)
print("Updated ITE list: " + str(ite_list))
"entity":
entities_seen.append(id)
entities_list.erase(id)
entities_current_floor.erase(id)
print("Updated Entities list: " + str(entities_list))
print("Updated Entities current floor list: " + str(entities_current_floor))
#Randomly picks which entities will be present on the current floor
func pick_floor_entities():
var entity
for i in range(int(floor(Globals.diagnoses_quota/4))):
if len(entities_list) > 0:
entity = entities_list.pick_random()
entities_current_floor.append(entity)
print("Picked Entities current floor list: " + str(entities_current_floor))