Add files via upload

Author: XCH-DEVCI

Connection.tscn

@@ -18,7 +18,6 @@ offset_bottom = 52.0
 theme_override_styles/panel = SubResource("StyleBoxEmpty_gipfx")
 
 [node name="Status" type="Label" parent="Status_BG"]
-z_index = 1
 texture_filter = 1
 layout_mode = 0
 offset_left = 1.0

Containers.tscn

@@ -18,4 +18,11 @@ placeholder_text = "Input something here....."
 alignment = 1
 keep_editing_on_text_submit = true
 
+[node name="Button" type="Button" parent="."]
+offset_right = 446.0
+offset_bottom = 32.0
+
+[connection signal="text_change_rejected" from="Command" to="." method="_on_command_text_change_rejected"]
+[connection signal="text_changed" from="Command" to="." method="_on_command_text_changed"]
 [connection signal="text_submitted" from="Command" to="." method="_on_command_text_submitted"]
+[connection signal="pressed" from="Button" to="." method="_on_button_pressed"]

Input.tscn

@@ -1,11 +1,12 @@
-[gd_scene load_steps=8 format=3 uid="uid://6wgctohcvfte"]
+[gd_scene load_steps=9 format=3 uid="uid://6wgctohcvfte"]
 
 [ext_resource type="Texture2D" uid="uid://c3fn1ppgdav4d" path="res://assets/backpack.png" id="1_2r1l1"]
 [ext_resource type="Script" uid="uid://cjyiwpvt3l6me" path="res://options.gd" id="1_p8250"]
 [ext_resource type="Texture2D" uid="uid://c30y87tpk5nvi" path="res://assets/status.png" id="2_bwr58"]
 [ext_resource type="Texture2D" uid="uid://db7d38mogv2yf" path="res://assets/skills.png" id="3_dfe3t"]
 [ext_resource type="Texture2D" uid="uid://c4nrcqenb1u7i" path="res://assets/spells.png" id="4_t1d33"]
 [ext_resource type="Texture2D" uid="uid://cirk3qabkxsfu" path="res://assets/exit.png" id="6_dfe3t"]
+[ext_resource type="Texture2D" uid="uid://cig85t7o0v7p2" path="res://assets/perception.png" id="6_t1d33"]
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5pjjr"]
 
@@ -52,6 +53,12 @@ layout_mode = 2
 texture_normal = ExtResource("4_t1d33")
 stretch_mode = 0
 
+[node name="look_button" type="TextureButton" parent="Buttons_BG/GridContainer"]
+texture_filter = 1
+layout_mode = 2
+texture_normal = ExtResource("6_t1d33")
+stretch_mode = 0
+
 [node name="exit_button" type="TextureButton" parent="Buttons_BG/GridContainer"]
 texture_filter = 1
 layout_mode = 2
@@ -62,4 +69,5 @@ stretch_mode = 0
 [connection signal="pressed" from="Buttons_BG/GridContainer/status_button" to="." method="_on_status_button_pressed"]
 [connection signal="pressed" from="Buttons_BG/GridContainer/skills_button" to="." method="_on_skills_button_pressed"]
 [connection signal="pressed" from="Buttons_BG/GridContainer/spells_button" to="." method="_on_spells_button_pressed"]
+[connection signal="pressed" from="Buttons_BG/GridContainer/look_button" to="." method="_on_look_button_pressed"]
 [connection signal="pressed" from="Buttons_BG/GridContainer/exit_button" to="." method="_on_exit_button_pressed"]

Options.tscn

@@ -1,33 +1,79 @@
 extends Node2D
 
+var _previous_cmd: Array = []
+var _cmd_index: int = -1
+var _input_editing: bool = false
+
 signal cmd_text_submitted(data: String)
 
-func _ready():
+func _ready() -> void:
 	$"../Options".connect("button_commands_submitted", Callable(self, "_on_button_command_text_submitted"))
+	$"../TextProcessor".connect("auto_commands_submitted", Callable(self, "_on_auto_commands_submitted"))
+	$Command.connect("focus_entered", Callable(self, "_on_focus_entered"))
+	$Command.connect("focus_exited", Callable(self, "_on_focus_exited"))
+
+func _on_auto_commands_submitted(cmd: String) -> void:
+	emit_signal("cmd_text_submitted", cmd)
+
+func _on_focus_entered() -> void:
+	_input_editing = true
+
+func _on_focus_exited() -> void:
+	_input_editing = false
 
 func _on_button_command_text_submitted(data: String) -> void:
-	if len(data) > 0:
+	if data.strip_edges() != "":
 		emit_signal("cmd_text_submitted", data)
-	
+
 func _on_command_text_submitted(data: String) -> void:
-	if len(data) > 0:
-		emit_signal("cmd_text_submitted", data)
-		$Command.clear()
+	data = data.strip_edges()
+	if data == "":
 		return
-	var new_text = $Command.text
-	emit_signal("cmd_text_submitted", new_text)
+	emit_signal("cmd_text_submitted", data)
+	if _previous_cmd.size() >= 10:
+		_previous_cmd.pop_front()
+	_previous_cmd.append(data)
+	_cmd_index = _previous_cmd.size()  # reset to latest
 	$Command.clear()
-	
-func _unhandled_input(event: InputEvent) -> void:
-	# Handle arrow key input globally (even when Command has focus)
-	if event is InputEventKey and event.pressed:
-		if event.keycode in [KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT]:
-			match event.keycode:
-				KEY_UP:
-					emit_signal("cmd_text_submitted", "n")
-				KEY_DOWN:
-					emit_signal("cmd_text_submitted", "s")
-				KEY_LEFT:
-					emit_signal("cmd_text_submitted", "w")
-				KEY_RIGHT:
-					emit_signal("cmd_text_submitted", "e")
+
+func _process(_delta: float) -> void:
+	if _input_editing:
+		# ESC to exit edit mode
+		if Input.is_action_just_pressed("ui_cancel"):
+			_input_editing = false
+			$Command.release_focus()
+			return
+
+		# Handle command history navigation
+		if Input.is_action_just_pressed("ui_up"):
+			if _previous_cmd.size() == 0:
+				return
+			_cmd_index = max(_cmd_index - 1, 0)
+			$Command.text = _previous_cmd[_cmd_index]
+			$Command.caret_column = $Command.text.length()
+		elif Input.is_action_just_pressed("ui_down"):
+			if _previous_cmd.size() == 0:
+				return
+			_cmd_index = min(_cmd_index + 1, _previous_cmd.size() - 1)
+			$Command.text = _previous_cmd[_cmd_index]
+			$Command.caret_column = $Command.text.length()
+
+	else:
+		if Input.is_action_just_pressed("ui_accept"):
+			_input_editing = true
+			$Command.grab_focus()
+			return
+			
+		# Handle directional movement when not typing
+		if Input.is_action_just_pressed("ui_up"):
+			emit_signal("cmd_text_submitted", "n")
+		elif Input.is_action_just_pressed("ui_down"):
+			emit_signal("cmd_text_submitted", "s")
+		elif Input.is_action_just_pressed("ui_left"):
+			emit_signal("cmd_text_submitted", "w")
+		elif Input.is_action_just_pressed("ui_right"):
+			emit_signal("cmd_text_submitted", "e")
+
+func _on_button_pressed() -> void:
+	_input_editing = true
+	$Command.grab_focus()

input.gd

@@ -43,7 +43,7 @@ func organize_exits(data: String) -> String:
 	for raw_line in data.split("\n", false):
 		var line := raw_line.rstrip("\r")
 		line = re_paren.sub(line, "", true)
-		print(i, line)
+		#print(i, line)
 		organized_exits.append(line + "\n")
 	var text = "".join(organized_exits)
 	return text

map.gd

@@ -16,3 +16,6 @@ func _on_spells_button_pressed() -> void:
 
 func _on_exit_button_pressed() -> void:
 	emit_signal("button_commands_submitted", "quit")
+
+func _on_look_button_pressed() -> void:
+	emit_signal("button_commands_submitted", "look")

options.gd

@@ -5,7 +5,7 @@ func _ready():
 	$Status_BG/TextDisplay.bbcode_enabled = true  # important
 
 func _on_status_text_received(bb_line: String) -> void:
-	print(bb_line)
+	#print(bb_line)
 	var n := bb_line.length()
 	if n >= 2:
 		bb_line = bb_line.substr(24, n -49)

status.gd

@@ -6,13 +6,16 @@ signal status_text(text: String)
 signal mobs_text(text: String)
 signal exits_text(text: String)
 signal container_request(data: Array)
+signal auto_commands_submitted(cmd: String)
 
 const _LEFT_CHARS  := {"╔": true, "║": true, "╚": true}
 const _RIGHT_CHARS := {"╗": true, "║": true, "╝": true}
 
 var _in_map := false
 var _cur_map: Array = []
 var _backpack_prohibit = false
+var _prevent_location_name = false
+var _prevent_location_desc = false
 
 # remember first line + left index to compute prefix
 var _first_line_raw := ""
@@ -279,30 +282,26 @@ func _process_one_bb_line(bb_chunk: String) -> void:
 
 	# After processing all lines in the chunk, append descriptions once
 	var descs_size = descs.size()
-	#print("Desc size = ", descs_size)
-	#print("Start to process desc.....")
-	
 	var text = ""
 
 	# one line message
 	if descs_size == 1:
-		#print("------------------------------")
-		#print("One line desc: ", descs)
-		#print("------------------------------")
 		if _visible_prefix(descs[0], 1) == "(":
 			# status text
 			emit_signal("status_text", str(descs[0]))
 			return
 		elif _visible_prefix(descs[0], 100) in ["TEXTMASK:false", "TEXTMASK:true"]:
 			return
 		else:
-			$TextDisplay.append_text(bb_chunk)
+			# classified as short msg
+			var short_msg = _visible_prefix(descs[0], 30)
+			if len(short_msg) > 3:
+				if short_msg not in ["look", "status", "equipment", "skills", "spells"]:
+					$TextDisplay.append_text(bb_chunk)
+					return
 
 	# two line message
 	if descs_size == 2:
-		#print("------------------------------")
-		#print("Two line desc: ", descs)
-		#print("------------------------------")
 		if _visible_prefix(descs[0], 5) == "Exits":
 			# exits
 			emit_signal("exits_text", bb_chunk)
@@ -311,6 +310,24 @@ func _process_one_bb_line(bb_chunk: String) -> void:
 			emit_signal("mobs_text", descs[0])
 		else:
 			$TextDisplay.append_text(bb_chunk)
+			# auto refresh the mobs
+			var l0_prefix_100 = _visible_prefix(descs[0], 100)
+			if contains_term(l0_prefix_100, "enters"):
+				_prevent_location_name = true
+				_prevent_location_desc = true
+				emit_signal("auto_commands_submitted", "look")
+			if contains_term(l0_prefix_100, "leaves"):
+				_prevent_location_name = true
+				_prevent_location_desc = true
+				emit_signal("auto_commands_submitted", "look")
+			if contains_term(l0_prefix_100, "died"):
+				_prevent_location_name = true
+				_prevent_location_desc = true
+				emit_signal("auto_commands_submitted", "look")
+			if contains_term(l0_prefix_100, "prepares"):
+				_prevent_location_name = true
+				_prevent_location_desc = true
+				emit_signal("auto_commands_submitted", "look")
 			return
 
 	# big message
@@ -348,7 +365,11 @@ func _process_one_bb_line(bb_chunk: String) -> void:
 			# location name
 			emit_signal("location_name", bb_chunk)
 			emit_signal("mobs_text", "")
-			$TextDisplay.append_text(bb_chunk)
+			if not _prevent_location_name:
+				$TextDisplay.append_text(bb_chunk)
+			else:
+				_prevent_location_name = false
+				return
 
 		elif l2_prefix_100 == "┌─ .:Info ──────────────────────┐ ┌─ .:Attributes ───────────────────────────┐":
 			# status table
@@ -382,8 +403,12 @@ func _process_one_bb_line(bb_chunk: String) -> void:
 			$TextDisplay.append_text(bb_chunk)
 
 		else:
-			$TextDisplay.append_text(text + "\n")
-		
+			if not _prevent_location_desc:
+				$TextDisplay.append_text(text + "\n")
+			else:
+				_prevent_location_desc = false
+				return
+
 # ---------------- helpers ----------------
 func _line_map_slice_indices(bb_line: String) -> Array:
 	var left := -1
@@ -474,3 +499,6 @@ func _closing_for_stack(stack: Array) -> String:
 		if String(stack[i]).begins_with("[color"):
 			s += "[/color]"
 	return s
+
+func contains_term(message: String, term: String) -> bool:
+	return message.find(term) != -1