Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom task logic via extending InteractTask #300

Merged
merged 32 commits into from
Feb 26, 2021
Merged

Custom task logic via extending InteractTask #300

Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2ad950e
groundwork for networking + extending InteractTask
TheSecondReal0 Feb 12, 2021
094eb3b
Merge branch 'task-resource-despaghetti' into custom-task-logic
TheSecondReal0 Feb 12, 2021
12e0703
more work to allow custom interacttask scripts
TheSecondReal0 Feb 12, 2021
8ba4b5a
more virtual functions + comments
TheSecondReal0 Feb 12, 2021
343cde8
comment improvement
TheSecondReal0 Feb 12, 2021
b48705f
added transition logic and more comments
TheSecondReal0 Feb 13, 2021
b423739
updated task manager to work with resource transition logic
TheSecondReal0 Feb 13, 2021
ea0a2ee
began porting clockset task
TheSecondReal0 Feb 13, 2021
ea27f56
finished porting clockset task
TheSecondReal0 Feb 13, 2021
a6f6b07
improved networking
TheSecondReal0 Feb 16, 2021
7384d2e
reorganized interacttask.gd
TheSecondReal0 Feb 16, 2021
598a1d9
TaskManager overhaul
TheSecondReal0 Feb 19, 2021
a3957f3
updated clockset task and fleshed out some stuff
TheSecondReal0 Feb 19, 2021
385d531
cleaned up a bit
TheSecondReal0 Feb 19, 2021
4b3c8da
removed complete_task() from UI classes
TheSecondReal0 Feb 19, 2021
fca6bda
removed random numbers from InteractTask
TheSecondReal0 Feb 19, 2021
ee00d85
Revert "removed random numbers from InteractTask"
TheSecondReal0 Feb 19, 2021
9942ddc
removed random numbers from TaskInteract without updating resources
TheSecondReal0 Feb 19, 2021
2be12bd
updated resources to reflect random numbers removal
TheSecondReal0 Feb 19, 2021
3d0b83d
got resources figured out
TheSecondReal0 Feb 19, 2021
8f40ff2
added some comments
TheSecondReal0 Feb 19, 2021
8cbcf94
fixed bugs
TheSecondReal0 Feb 19, 2021
a1e1dfb
actually fixed the desync bug
TheSecondReal0 Feb 19, 2021
922036f
fixed crash that occurred with non-global tasks
TheSecondReal0 Feb 20, 2021
bee22dd
fixed weird bug where task would be completed over and over again
TheSecondReal0 Feb 20, 2021
2a508dc
working on personal task support
TheSecondReal0 Feb 22, 2021
ffe2c9d
general polishing
TheSecondReal0 Feb 22, 2021
66c2605
another check to prevent trying to complete a task twice
TheSecondReal0 Feb 23, 2021
9084397
delete binary
TheSecondReal0 Feb 23, 2021
5eb802c
improved task syncing
TheSecondReal0 Feb 24, 2021
d79c7d8
clockset map text updates more often
TheSecondReal0 Feb 24, 2021
161f71c
possible clockset times now include all intended values
TheSecondReal0 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/addons/opensusinteraction/opensusinteraction.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ func _enter_tree():
#add custom resources
add_custom_type("Interact", "Resource", interact_resource_script, object_icon)
add_custom_type("InteractMap", "Resource", interactmap_resource_script, object_icon)
add_custom_type("InteractTask", "Resource", task_resource_script, object_icon)
#add_custom_type("InteractTask", "Resource", task_resource_script, object_icon)
add_custom_type("InteractUI", "Resource", interactui_resource_script, object_icon)

func _exit_tree():
remove_custom_type("Interact")
remove_custom_type("InteractMap")
remove_custom_type("InteractTask")
#remove_custom_type("InteractTask")
remove_custom_type("InteractUI")
6 changes: 4 additions & 2 deletions src/addons/opensusinteraction/resources/interact/interact.tres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ interact_data = {
}
advanced/network_sync = false

[sub_resource type="Resource" id=2]
[sub_resource type="Resource" id=4]
resource_local_to_scene = true
resource_name = "InteractUI"
script = ExtResource( 4 )
Expand All @@ -33,8 +33,10 @@ resource_local_to_scene = true
resource_name = "InteractTask"
script = ExtResource( 5 )
task_text = ""
ui_resource = SubResource( 2 )
ui_resource = SubResource( 4 )
outputs/toggle_map_interactions = false
outputs/output_map_interactions = [ ]
is_task_global = false

[resource]
resource_local_to_scene = true
Expand Down
Loading