From 619f18fde3572d35d11a57f688455fc362209f14 Mon Sep 17 00:00:00 2001 From: dukegoobler <76922012+vengefulcartographer@users.noreply.github.com> Date: Wed, 4 Jan 2023 18:48:09 -0700 Subject: [PATCH] mouse focus dialog new dialog choice buttons, mouse focus fix --- godot/addons/dialogic/Dialog.tscn | 1 - godot/addons/dialogic/Editor/Events/CloseDialog.tscn | 1 + godot/addons/dialogic/Nodes/DialogNode.tscn | 1 - godot/addons/dialogic/Nodes/TextBubble.tscn | 1 - godot/dialogic/definitions.json | 12 ++++++------ godot/dialogic/themes/default-theme.cfg | 8 ++++---- godot/dialogic/timelines/timeline-1667667789.json | 10 ++-------- godot/dialogic/timelines/timeline-1667671038.json | 4 ++++ godot/dialogic/timelines/timeline-1667671061.json | 8 ++++---- godot/player/CameraController.gd | 2 +- godot/player/player.gd | 3 --- 11 files changed, 22 insertions(+), 29 deletions(-) diff --git a/godot/addons/dialogic/Dialog.tscn b/godot/addons/dialogic/Dialog.tscn index c6e20d0..02720d5 100644 --- a/godot/addons/dialogic/Dialog.tscn +++ b/godot/addons/dialogic/Dialog.tscn @@ -6,7 +6,6 @@ [node name="Dialog" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -mouse_filter = 1 script = ExtResource( 2 ) __meta__ = { "_edit_use_anchors_": false diff --git a/godot/addons/dialogic/Editor/Events/CloseDialog.tscn b/godot/addons/dialogic/Editor/Events/CloseDialog.tscn index 2d181f3..e80cc2f 100644 --- a/godot/addons/dialogic/Editor/Events/CloseDialog.tscn +++ b/godot/addons/dialogic/Editor/Events/CloseDialog.tscn @@ -22,6 +22,7 @@ image = SubResource( 4 ) size = Vector2( 16, 16 ) [node name="CloseDialog" instance=ExtResource( 1 )] +mouse_filter = 0 event_name = "Close Dialog" event_data = { "event_id": "dialogic_022", diff --git a/godot/addons/dialogic/Nodes/DialogNode.tscn b/godot/addons/dialogic/Nodes/DialogNode.tscn index 993ec19..109a786 100644 --- a/godot/addons/dialogic/Nodes/DialogNode.tscn +++ b/godot/addons/dialogic/Nodes/DialogNode.tscn @@ -23,7 +23,6 @@ extents = Vector2( 1024, 600 ) [node name="DialogNode" type="Control"] anchor_right = 1.0 anchor_bottom = 1.0 -mouse_filter = 1 script = ExtResource( 6 ) [node name="Portraits" type="Control" parent="."] diff --git a/godot/addons/dialogic/Nodes/TextBubble.tscn b/godot/addons/dialogic/Nodes/TextBubble.tscn index 5ea81a5..17c4538 100644 --- a/godot/addons/dialogic/Nodes/TextBubble.tscn +++ b/godot/addons/dialogic/Nodes/TextBubble.tscn @@ -60,7 +60,6 @@ margin_left = -455.0 margin_top = 399.0 margin_right = 455.0 margin_bottom = 560.0 -mouse_filter = 1 script = ExtResource( 4 ) [node name="ColorRect" type="ColorRect" parent="."] diff --git a/godot/dialogic/definitions.json b/godot/dialogic/definitions.json index 72be499..1d58925 100644 --- a/godot/dialogic/definitions.json +++ b/godot/dialogic/definitions.json @@ -9,12 +9,6 @@ "type": 0, "value": "false" }, - { - "id": "1667711785-428", - "name": "won game", - "type": 0, - "value": "false" - }, { "id": "1667703692-648", "name": "seen intro", @@ -62,6 +56,12 @@ "name": "meat_creek_tutorial_given", "type": 0, "value": "false" + }, + { + "id": "1667711785-428", + "name": "won game", + "type": 0, + "value": "false" } ] } diff --git a/godot/dialogic/themes/default-theme.cfg b/godot/dialogic/themes/default-theme.cfg index fceab53..5f60ba1 100644 --- a/godot/dialogic/themes/default-theme.cfg +++ b/godot/dialogic/themes/default-theme.cfg @@ -12,10 +12,10 @@ shadow_offset=Vector2( 7, 2 ) [buttons] -normal=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -hover=[ true, Color( 0.717647, 0.717647, 0.717647, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -focus=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] -pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] +normal=[ true, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 0.764706, 0.764706, 0.764706, 1 ) ] +hover=[ true, Color( 0.717647, 0.717647, 0.717647, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 0.847059, 0.847059, 0.847059, 1 ) ] +focus=[ true, Color( 0.811765, 0.811765, 0.811765, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", true, Color( 1, 1, 1, 1 ) ] +pressed=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://assets/Button07.png", false, Color( 1, 1, 1, 1 ) ] disabled=[ false, Color( 1, 1, 1, 1 ), false, Color( 0, 0, 0, 1 ), true, "res://addons/dialogic/Example Assets/backgrounds/background-2.png", false, Color( 1, 1, 1, 1 ) ] layout=1 fixed=true diff --git a/godot/dialogic/timelines/timeline-1667667789.json b/godot/dialogic/timelines/timeline-1667667789.json index a7300e9..7689a3b 100644 --- a/godot/dialogic/timelines/timeline-1667667789.json +++ b/godot/dialogic/timelines/timeline-1667667789.json @@ -1,14 +1,8 @@ { "events": [ { - "call_node": { - "arguments": [ - "MOUSE_MODE_VISIBLE" - ], - "method_name": "set_mouse_mode", - "target_node_path": "Player" - }, - "event_id": "dialogic_042" + "emit_signal": "", + "event_id": "dialogic_040" }, { "event_id": "dialogic_024", diff --git a/godot/dialogic/timelines/timeline-1667671038.json b/godot/dialogic/timelines/timeline-1667671038.json index d5e986e..7dd1281 100644 --- a/godot/dialogic/timelines/timeline-1667671038.json +++ b/godot/dialogic/timelines/timeline-1667671038.json @@ -155,6 +155,10 @@ "portrait": "", "text": "(Manos falls limp) " }, + { + "emit_signal": "death", + "event_id": "dialogic_040" + }, { "character": "character-1667667675.json", "event_id": "dialogic_001", diff --git a/godot/dialogic/timelines/timeline-1667671061.json b/godot/dialogic/timelines/timeline-1667671061.json index 4d3e34e..cdc2c34 100644 --- a/godot/dialogic/timelines/timeline-1667671061.json +++ b/godot/dialogic/timelines/timeline-1667671061.json @@ -44,9 +44,9 @@ }, { "event_id": "dialogic_015", - "id": "anchor-1634488067", + "id": "anchor-1672883201", "index": 0, - "name": "voss_questions" + "name": "questions" }, { "character": "character-1667667711.json", @@ -101,7 +101,7 @@ "text": "[wave amp=50 freq=2]You wouldn’t want to anger Mother, would you John?[/wave]" }, { - "anchor_id": "anchor-1634488067", + "anchor_id": "anchor-1672883201", "event_id": "dialogic_016" }, { @@ -160,7 +160,7 @@ "text": "[wave amp=50 freq=2]Won’t you join us? Won’t you make Mother happy?[/wave]" }, { - "anchor_id": "anchor-1634488067", + "anchor_id": "anchor-1672883201", "event_id": "dialogic_016" }, { diff --git a/godot/player/CameraController.gd b/godot/player/CameraController.gd index 42cbab7..5627ca1 100644 --- a/godot/player/CameraController.gd +++ b/godot/player/CameraController.gd @@ -22,7 +22,7 @@ func _input(event): if Input.is_action_just_pressed("ui_cancel"): Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) else: - if event is InputEventMouseButton: + if event is InputEventMouseButton and Input.is_action_just_pressed("ui cancel"): Input.set_mouse_mode(Input.MOUSE_MODE_CAPTURED) var look_relative = Vector2( diff --git a/godot/player/player.gd b/godot/player/player.gd index e285421..8a0e4e2 100644 --- a/godot/player/player.gd +++ b/godot/player/player.gd @@ -43,9 +43,6 @@ func _process(_delta): $OnFootPhysics.can_glide = can_glide $OnFootPhysics.can_float = can_float -func set_mouse_mode(mode): - Input.set_mouse_mode(Input.mode) -