Skip to content

Commit

Permalink
Version 0.1.8
Browse files Browse the repository at this point in the history 
* Fixed bug in copying options from one encounter to another. The copies were still pointing to the original encounter; now they correctly point to the encounter the option is copied to.
* Fixed bug in script editor involving deletion of operands from an operator.
* Improved storyworld validation tool, setting it up to detect when options, reactions, and effects are linked to the incorrect parent.
* Made various interface changes. Resized some windows and interface elements, added collapse and expand buttons to event selection interface, updated gui themes to improve readability of placeholder text, added VSplitContainer to encounter editing screen to allow authors to resize the options list and encounter main text display, added placeholder text to TextEdit boxes and removed two labels on encounter editing screen to free up space.
  • Loading branch information
@FrobozzWaxwing
FrobozzWaxwing committed Aug 20, 2024
1 parent da8acd5 commit e743eb8
Show file tree
Hide file tree
Showing 30 changed files with 560 additions and 411 deletions.
6 changes: 4 additions & 2 deletions godot/ErrorReport.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class_name ErrorReport
var reported_object = null
var reported_script = null
#enum sw_script_data_types {BOOLEAN, BNUMBER, STRING, VARIANT}
enum report_types {TEXT, ACCEPTABILITY, DESIRABILITY, VISIBILITY, PERFORMABILITY, EFFECT}
enum report_types {ITEM, TEXT, ACCEPTABILITY, DESIRABILITY, VISIBILITY, PERFORMABILITY, EFFECT}
var script_type = null
var error_summary = ""
var error_details = ""
Expand All @@ -17,7 +17,9 @@ func _init(in_reported_object, in_reported_script, in_script_type, in_error_summ
error_details = in_error_details

func set_script_type(in_script_type):
if (in_script_type.matchn("text")):
if (in_script_type.matchn("item")):
script_type = report_types.ITEM
elif (in_script_type.matchn("text")):
script_type = report_types.TEXT
elif (in_script_type.matchn("acceptability")):
script_type = report_types.ACCEPTABILITY
Expand Down
3 changes: 2 additions & 1 deletion godot/custom_resources/clarity.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ ItemList/styles/selected_focus = SubResource("31")
Label/colors/font_color = Color(0, 0, 0, 1)
LineEdit/colors/caret_color = Color(0.0392157, 0.0392157, 0.0392157, 0.941176)
LineEdit/colors/font_color = Color(0, 0, 0, 1)
LineEdit/colors/font_placeholder_color = Color(0.501961, 0.501961, 0.501961, 0.784314)
LineEdit/colors/font_placeholder_color = Color(0.470588, 0.470588, 0.470588, 0.784314)
LineEdit/colors/selection_color = Color(0.490196, 0.733333, 0.980392, 0.784314)
LineEdit/styles/normal = SubResource("6")
LineEdit/styles/read_only = SubResource("7")
Expand Down Expand Up @@ -603,6 +603,7 @@ TextEdit/colors/background_color = Color(0.980392, 0.980392, 0.980392, 1)
TextEdit/colors/caret_color = Color(0.0392157, 0.0392157, 0.0392157, 0.941176)
TextEdit/colors/current_line_color = Color(0.980392, 0.980392, 0.980392, 1)
TextEdit/colors/font_color = Color(0, 0, 0, 1)
TextEdit/colors/font_placeholder_color = Color(0.470588, 0.470588, 0.470588, 0.784314)
TextEdit/colors/function_color = Color(0, 0, 0, 1)
TextEdit/colors/member_variable_color = Color(0, 0, 0, 1)
TextEdit/colors/number_color = Color(0, 0, 0, 1)
Expand Down
2 changes: 2 additions & 0 deletions godot/custom_resources/lapis_lazuli.tres
View file
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,7 @@ HSlider/styles/slider = SubResource("14")
ItemList/styles/panel = SubResource("StyleBoxFlat_c4q0v")
ItemList/styles/selected = SubResource("StyleBoxFlat_0uko0")
ItemList/styles/selected_focus = SubResource("StyleBoxFlat_ucvff")
LineEdit/colors/font_placeholder_color = Color(0.875, 0.875, 0.875, 0.6)
LineEdit/colors/selection_color = Color(0, 0.490196, 0.980392, 1)
LineEdit/styles/normal = SubResource("6")
LineEdit/styles/read_only = SubResource("7")
Expand All @@ -510,6 +511,7 @@ TabContainer/styles/tab_selected = SubResource("StyleBoxFlat_wqhfd")
TabContainer/styles/tab_unselected = SubResource("StyleBoxFlat_3h7xj")
TextEdit/colors/background_color = Color(0.0666667, 0.141176, 0.207843, 1)
TextEdit/colors/current_line_color = Color(0.152941, 0.227451, 0.294118, 1)
TextEdit/colors/font_placeholder_color = Color(0.875, 0.875, 0.875, 0.6)
TextEdit/colors/function_color = Color(0.878431, 0.878431, 0.878431, 1)
TextEdit/colors/member_variable_color = Color(0.878431, 0.878431, 0.878431, 1)
TextEdit/colors/number_color = Color(0.878431, 0.878431, 0.878431, 1)
Expand Down
179 changes: 167 additions & 12 deletions godot/export_presets.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,27 @@
name="Windows Desktop"
platform="Windows Desktop"
runnable=true
advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter="*.html, *.json"
exclude_filter=""
export_path="../External_Build/0_1_7/SweepWeave_Win_0_1_7.exe"
export_path="../External_Build/0_1_8/SweepWeave_Win_0_1_8.exe"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_export_mode=2

[preset.0.options]

custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false
binary_format/architecture="x86_64"
codesign/enable=false
codesign/timestamp=true
Expand All @@ -43,6 +43,8 @@ application/file_description="SweepWeave"
application/copyright="MIT License, Sasha Fenn, 2020 - 2024"
application/trademarks=""
application/export_angle=0
application/export_d3d12=0
application/d3d12_agility_sdk_multiarch=true
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
Expand All @@ -60,35 +62,39 @@ Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorActi
ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debug -ErrorAction:SilentlyContinue
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
Remove-Item -Recurse -Force '{temp_dir}'"
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/64_bits=true
texture_format/no_bptc_fallbacks=true

[preset.1]

name="Linux/X11"
platform="Linux/X11"
platform="Linux"
runnable=true
advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter="*.html, *.json"
exclude_filter=""
export_path="../External_Build/0_1_7/SweepWeave_Linux_0_1_7.x86_64"
export_path="../External_Build/0_1_8/SweepWeave_Linux_0_1_8.x86_64"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_export_mode=2

[preset.1.options]

custom_template/debug=""
custom_template/release=""
debug/export_console_wrapper=1
binary_format/embed_pck=false
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
texture_format/s3tc_bptc=true
texture_format/etc2_astc=false
binary_format/architecture="x86_64"
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
Expand All @@ -102,6 +108,10 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
rm -rf \"{temp_dir}\""
texture_format/bptc=false
texture_format/s3tc=true
texture_format/etc=false
texture_format/etc2=false
binary_format/64_bits=true
texture_format/no_bptc_fallbacks=true

Expand All @@ -110,16 +120,18 @@ texture_format/no_bptc_fallbacks=true
name="macOS"
platform="macOS"
runnable=true
advanced_options=false
dedicated_server=false
custom_features=""
export_filter="all_resources"
include_filter="*.html, *.json"
exclude_filter=""
export_path="../External_Build/0_1_7/SweepWeave_Mac_0_1_7.zip"
export_path="../External_Build/0_1_8/SweepWeave_Mac_0_1_8.zip"
encryption_include_filters=""
encryption_exclude_filters=""
encrypt_pck=false
encrypt_directory=false
script_export_mode=2

[preset.2.options]

Expand All @@ -140,6 +152,7 @@ application/copyright_localized={}
application/min_macos_version="10.12"
application/export_angle=0
display/high_res=true
application/additional_plist_content=""
xcode/platform_build="14C18"
xcode/sdk_version="13.1"
xcode/sdk_build="22C55"
Expand Down Expand Up @@ -198,6 +211,148 @@ privacy/network_volumes_usage_description=""
privacy/network_volumes_usage_description_localized={}
privacy/removable_volumes_usage_description=""
privacy/removable_volumes_usage_description_localized={}
privacy/tracking_enabled=false
privacy/tracking_domains=PackedStringArray()
privacy/collected_data/name/collected=false
privacy/collected_data/name/linked_to_user=false
privacy/collected_data/name/used_for_tracking=false
privacy/collected_data/name/collection_purposes=0
privacy/collected_data/email_address/collected=false
privacy/collected_data/email_address/linked_to_user=false
privacy/collected_data/email_address/used_for_tracking=false
privacy/collected_data/email_address/collection_purposes=0
privacy/collected_data/phone_number/collected=false
privacy/collected_data/phone_number/linked_to_user=false
privacy/collected_data/phone_number/used_for_tracking=false
privacy/collected_data/phone_number/collection_purposes=0
privacy/collected_data/physical_address/collected=false
privacy/collected_data/physical_address/linked_to_user=false
privacy/collected_data/physical_address/used_for_tracking=false
privacy/collected_data/physical_address/collection_purposes=0
privacy/collected_data/other_contact_info/collected=false
privacy/collected_data/other_contact_info/linked_to_user=false
privacy/collected_data/other_contact_info/used_for_tracking=false
privacy/collected_data/other_contact_info/collection_purposes=0
privacy/collected_data/health/collected=false
privacy/collected_data/health/linked_to_user=false
privacy/collected_data/health/used_for_tracking=false
privacy/collected_data/health/collection_purposes=0
privacy/collected_data/fitness/collected=false
privacy/collected_data/fitness/linked_to_user=false
privacy/collected_data/fitness/used_for_tracking=false
privacy/collected_data/fitness/collection_purposes=0
privacy/collected_data/payment_info/collected=false
privacy/collected_data/payment_info/linked_to_user=false
privacy/collected_data/payment_info/used_for_tracking=false
privacy/collected_data/payment_info/collection_purposes=0
privacy/collected_data/credit_info/collected=false
privacy/collected_data/credit_info/linked_to_user=false
privacy/collected_data/credit_info/used_for_tracking=false
privacy/collected_data/credit_info/collection_purposes=0
privacy/collected_data/other_financial_info/collected=false
privacy/collected_data/other_financial_info/linked_to_user=false
privacy/collected_data/other_financial_info/used_for_tracking=false
privacy/collected_data/other_financial_info/collection_purposes=0
privacy/collected_data/precise_location/collected=false
privacy/collected_data/precise_location/linked_to_user=false
privacy/collected_data/precise_location/used_for_tracking=false
privacy/collected_data/precise_location/collection_purposes=0
privacy/collected_data/coarse_location/collected=false
privacy/collected_data/coarse_location/linked_to_user=false
privacy/collected_data/coarse_location/used_for_tracking=false
privacy/collected_data/coarse_location/collection_purposes=0
privacy/collected_data/sensitive_info/collected=false
privacy/collected_data/sensitive_info/linked_to_user=false
privacy/collected_data/sensitive_info/used_for_tracking=false
privacy/collected_data/sensitive_info/collection_purposes=0
privacy/collected_data/contacts/collected=false
privacy/collected_data/contacts/linked_to_user=false
privacy/collected_data/contacts/used_for_tracking=false
privacy/collected_data/contacts/collection_purposes=0
privacy/collected_data/emails_or_text_messages/collected=false
privacy/collected_data/emails_or_text_messages/linked_to_user=false
privacy/collected_data/emails_or_text_messages/used_for_tracking=false
privacy/collected_data/emails_or_text_messages/collection_purposes=0
privacy/collected_data/photos_or_videos/collected=false
privacy/collected_data/photos_or_videos/linked_to_user=false
privacy/collected_data/photos_or_videos/used_for_tracking=false
privacy/collected_data/photos_or_videos/collection_purposes=0
privacy/collected_data/audio_data/collected=false
privacy/collected_data/audio_data/linked_to_user=false
privacy/collected_data/audio_data/used_for_tracking=false
privacy/collected_data/audio_data/collection_purposes=0
privacy/collected_data/gameplay_content/collected=false
privacy/collected_data/gameplay_content/linked_to_user=false
privacy/collected_data/gameplay_content/used_for_tracking=false
privacy/collected_data/gameplay_content/collection_purposes=0
privacy/collected_data/customer_support/collected=false
privacy/collected_data/customer_support/linked_to_user=false
privacy/collected_data/customer_support/used_for_tracking=false
privacy/collected_data/customer_support/collection_purposes=0
privacy/collected_data/other_user_content/collected=false
privacy/collected_data/other_user_content/linked_to_user=false
privacy/collected_data/other_user_content/used_for_tracking=false
privacy/collected_data/other_user_content/collection_purposes=0
privacy/collected_data/browsing_history/collected=false
privacy/collected_data/browsing_history/linked_to_user=false
privacy/collected_data/browsing_history/used_for_tracking=false
privacy/collected_data/browsing_history/collection_purposes=0
privacy/collected_data/search_hhistory/collected=false
privacy/collected_data/search_hhistory/linked_to_user=false
privacy/collected_data/search_hhistory/used_for_tracking=false
privacy/collected_data/search_hhistory/collection_purposes=0
privacy/collected_data/user_id/collected=false
privacy/collected_data/user_id/linked_to_user=false
privacy/collected_data/user_id/used_for_tracking=false
privacy/collected_data/user_id/collection_purposes=0
privacy/collected_data/device_id/collected=false
privacy/collected_data/device_id/linked_to_user=false
privacy/collected_data/device_id/used_for_tracking=false
privacy/collected_data/device_id/collection_purposes=0
privacy/collected_data/purchase_history/collected=false
privacy/collected_data/purchase_history/linked_to_user=false
privacy/collected_data/purchase_history/used_for_tracking=false
privacy/collected_data/purchase_history/collection_purposes=0
privacy/collected_data/product_interaction/collected=false
privacy/collected_data/product_interaction/linked_to_user=false
privacy/collected_data/product_interaction/used_for_tracking=false
privacy/collected_data/product_interaction/collection_purposes=0
privacy/collected_data/advertising_data/collected=false
privacy/collected_data/advertising_data/linked_to_user=false
privacy/collected_data/advertising_data/used_for_tracking=false
privacy/collected_data/advertising_data/collection_purposes=0
privacy/collected_data/other_usage_data/collected=false
privacy/collected_data/other_usage_data/linked_to_user=false
privacy/collected_data/other_usage_data/used_for_tracking=false
privacy/collected_data/other_usage_data/collection_purposes=0
privacy/collected_data/crash_data/collected=false
privacy/collected_data/crash_data/linked_to_user=false
privacy/collected_data/crash_data/used_for_tracking=false
privacy/collected_data/crash_data/collection_purposes=0
privacy/collected_data/performance_data/collected=false
privacy/collected_data/performance_data/linked_to_user=false
privacy/collected_data/performance_data/used_for_tracking=false
privacy/collected_data/performance_data/collection_purposes=0
privacy/collected_data/other_diagnostic_data/collected=false
privacy/collected_data/other_diagnostic_data/linked_to_user=false
privacy/collected_data/other_diagnostic_data/used_for_tracking=false
privacy/collected_data/other_diagnostic_data/collection_purposes=0
privacy/collected_data/environment_scanning/collected=false
privacy/collected_data/environment_scanning/linked_to_user=false
privacy/collected_data/environment_scanning/used_for_tracking=false
privacy/collected_data/environment_scanning/collection_purposes=0
privacy/collected_data/hands/collected=false
privacy/collected_data/hands/linked_to_user=false
privacy/collected_data/hands/used_for_tracking=false
privacy/collected_data/hands/collection_purposes=0
privacy/collected_data/head/collected=false
privacy/collected_data/head/linked_to_user=false
privacy/collected_data/head/used_for_tracking=false
privacy/collected_data/head/collection_purposes=0
privacy/collected_data/other_data_types/collected=false
privacy/collected_data/other_data_types/linked_to_user=false
privacy/collected_data/other_data_types/used_for_tracking=false
privacy/collected_data/other_data_types/collection_purposes=0
ssh_remote_deploy/enabled=false
ssh_remote_deploy/host="user@host_ip"
ssh_remote_deploy/port="22"
Expand Down
1 change: 0 additions & 1 deletion godot/interface/AutomatedRehearsalScreen.gd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,4 +589,3 @@ func set_gui_theme(theme_name, _background_color):
"Lapis Lazuli":
light_mode = false
refresh_outcome_sort_icon()

7 changes: 5 additions & 2 deletions godot/interface/AutomatedRehearsalScreen.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,11 @@ layout_mode = 2
[node name="ReportTabs" type="TabContainer" parent="Panel/VBC"]
layout_mode = 2
size_flags_vertical = 3
current_tab = 0

[node name="EventIndex" type="VBoxContainer" parent="Panel/VBC/ReportTabs"]
layout_mode = 2
metadata/_tab_index = 0

[node name="HBC" type="HBoxContainer" parent="Panel/VBC/ReportTabs/EventIndex"]
layout_mode = 2
Expand All @@ -80,6 +82,7 @@ hide_root = true
[node name="CastVariablesIndex" type="VBoxContainer" parent="Panel/VBC/ReportTabs"]
visible = false
layout_mode = 2
metadata/_tab_index = 1

[node name="HBC" type="HBoxContainer" parent="Panel/VBC/ReportTabs/CastVariablesIndex"]
visible = false
Expand Down Expand Up @@ -107,6 +110,7 @@ layout_mode = 2
[node name="NotableOutcomeIndex" type="VBoxContainer" parent="Panel/VBC/ReportTabs"]
visible = false
layout_mode = 2
metadata/_tab_index = 2

[node name="HBC" type="HBoxContainer" parent="Panel/VBC/ReportTabs/NotableOutcomeIndex"]
layout_mode = 2
Expand All @@ -129,10 +133,9 @@ text = "Sort by:"

[node name="SortMenu" type="OptionButton" parent="Panel/VBC/ReportTabs/NotableOutcomeIndex/HBC"]
layout_mode = 2
item_count = 10
selected = 0
item_count = 10
popup/item_0/text = "Alphabetical"
popup/item_0/id = 0
popup/item_1/text = "Creation Time"
popup/item_1/id = 1
popup/item_2/text = "Modified Time"
Expand Down
Loading

0 comments on commit e743eb8

Please sign in to comment.