try fixing dialogue

The-Newman-Network-Hijackers · Jan 4, 2024 · e9dfd19 · e9dfd19
1 parent 0ffdfa0
commit e9dfd19
Show file tree

Hide file tree

Showing 60 changed files with 2,187 additions and 1,998 deletions.
diff --git a/.godot/editor/editor_layout.cfg b/.godot/editor/editor_layout.cfg
@@ -12,36 +12,36 @@ dock_floating={}
 dock_split_2=0
 dock_split_3=0
 dock_hsplit_1=0
-dock_hsplit_2=270
-dock_hsplit_3=-322
+dock_hsplit_2=244
+dock_hsplit_3=-282
 dock_hsplit_4=0
 dock_filesystem_split=0
 dock_filesystem_display_mode=0
 dock_filesystem_file_sort=0
 dock_filesystem_file_list_display_mode=1
 <<<<<<<Updatedupstreamdock_filesystem_selected_paths=PackedStringArray()
 <<<<<<<HEADdock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://scenes/", "res://scenes/level/", "res://scenes/level/vslice_demo/", "res://scenes/level/vslice_demo/bonus/", "res://data/", "res://data/props/", "res://asset/", "res://asset/level/", "res://asset/level/flyingfort/")
-dock_filesystem_selected_paths=PackedStringArray("res://scenes/level/vslice_demo/bonus/flying_fortress.tscn")
-dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://scenes/", "res://scenes/level/", "res://scenes/level/vslice_demo/", "res://scenes/level/vslice_demo/bonus/", "res://data/", "res://data/props/", "res://asset/", "res://asset/level/", "res://asset/level/flyingfort/")
+dock_filesystem_selected_paths=PackedStringArray("res://scenes/level/test/event/tevent_golden_jack.tscn")
+dock_filesystem_uncollapsed_paths=PackedStringArray("res://", "res://scenes/", "res://scenes/prefab/", "res://scenes/level/", "res://scenes/level/vslice_demo/", "res://scenes/level/vslice_demo/history/", "res://scenes/level/test/", "res://scenes/level/test/event/", "res://data/props/", "res://data/props/test_level/", "res://data/props/history_channel/", "res://audio/sfx/", "res://asset/entity/", "res://asset/entity/bomb/")
 dock_3="Scene,Import"
 dock_4="FileSystem"
 dock_5="Inspector,Node,History"
 
 [EditorNode]
 
-open_scenes=PackedStringArray("res://scenes/root.tscn", "res://scenes/prefab/flower_boss.tscn", "res://scenes/level/vslice_demo/history/area_hc_ruins_main.tscn", "res://scenes/level/vslice_demo/history/area_hc_ruins_arena.tscn", "res://scenes/level/test/event/tevent_golden_jack.tscn", "res://scenes/prefab/bouncing_jack.tscn", "res://scenes/prefab/crate.tscn", "res://scenes/level/vslice_demo/bonus/flying_fortress.tscn")
-current_scene="res://scenes/prefab/bouncing_jack.tscn"
-center_split_offset=0
-selected_bottom_panel_item=0
+open_scenes=PackedStringArray("res://scenes/root.tscn", "res://scenes/level/test/event/tevent_golden_jack.tscn")
+current_scene="res://scenes/level/test/event/tevent_golden_jack.tscn"
+center_split_offset=-216
+selected_bottom_panel_item=1
 selected_default_debugger_tab_idx=0
 selected_main_editor_idx=2
 
 [ScriptEditor]
 
-open_scripts=["res://scripts/button.gd", "res://scripts/cluster_spawner.gd", "res://scripts/crate.gd", "res://addons/dialogue_manager/dialogue_manager.gd", "res://scripts/entity.gd", "res://scripts/event_move.gd", "res://scripts/event_shard.gd", "res://scripts/level_script.gd", "res://scripts/level_selector.gd", "res://scripts/ls_level_preview.gd", "res://scripts/lut_shard.gd", "res://scripts/player_visual_managergd.gd", "res://scripts/root.gd", "res://scripts/state_machine.gd", "res://scripts/subarea.gd", "res://scripts/textbox.gd"]
-selected_script="res://scripts/event_shard.gd"
+open_scripts=["res://scripts/activation_group.gd", "res://scripts/bomb.gd", "res://scripts/button.gd", "res://scripts/cage.gd", "res://scripts/cluster_spawner.gd", "res://scripts/crate.gd", "res://scripts/demo_menu.gd", "res://addons/dialogue_manager/dialogue_label.gd", "res://scripts/entity.gd", "res://scripts/equipment_state_machine.gd", "res://scripts/event_shard.gd", "res://scripts/event_tree.gd", "res://export_presets.cfg", "res://scripts/gj_ball.gd", "res://scripts/golden_jack.gd", "res://scripts/grabbable.gd", "res://scripts/grabbable_crate.gd", "res://scripts/hurtbox.gd", "res://scripts/interactable.gd", "res://scripts/level_manager.gd", "res://scripts/level_script.gd", "res://scripts/level_selector.gd", "res://scripts/lut_shard.gd", "res://scripts/moving_platform.gd", "res://scripts/pause_manager.gd", "res://scripts/pcam_springarm.gd", "res://scripts/player.gd", "res://scripts/playerinteractradius.gd", "res://scripts/player_data_manager.gd", "res://scripts/player_equipment_manager.gd", "res://scripts/player_visual_managergd.gd", "res://addons/dialogue_manager/plugin.gd", "res://scripts/prop.gd", "res://scripts/prop_logger.gd", "res://res_inputprompt.gd", "res://scripts/root.gd", "res://scripts/shadow.gd", "res://scripts/soda.gd", "res://scripts/splash_manager.gd", "res://scripts/state_machine.gd", "res://scripts/subarea.gd", "res://scripts/textbox.gd", "res://scripts/trampoline.gd", "res://scripts/ui_customization.gd", "res://scripts/ui_manager.gd", "res://scripts/ui_options.gd"]
+selected_script="res://scripts/event_tree.gd"
 open_help=[]
-script_split_offset=70
+script_split_offset=52
 list_split_offset=0
 
 [ShaderEditor]