Merge branch 'dev'

JujuAdams · Jan 29, 2021 · ba2bb85 · ba2bb85
2 parents e32618b + 8e92c8d
commit ba2bb85
Show file tree

Hide file tree

Showing 29 changed files with 587 additions and 73 deletions.
diff --git a/chatterbox.yyp b/chatterbox.yyp
diff --git a/datafiles/Yarn/testcase_negate_function.yarn b/datafiles/Yarn/testcase_negate_function.yarn
@@ -0,0 +1,14 @@
+title: Start
+tags: 
+section: Section1
+colorID: 0
+position: 534.5534057617188, 350.60845947265625
+---
+
+Hello
+<<if !visited("Start")>>
+Woah text
+<<endif>>
+Done!
+
+===
diff --git a/datafiles/Yarn/testcase_numeric_param.yarn b/datafiles/Yarn/testcase_numeric_param.yarn
@@ -0,0 +1,12 @@
+title: Start
+tags: 
+section: Section1
+colorID: 0
+position: 534.5534057617188, 350.60845947265625
+---
+
+Hello
+<<testcaseNumericParam(5)>>
+Done!
+
+===
diff --git a/objects/obj_testcase_negate_function/Create_0.gml b/objects/obj_testcase_negate_function/Create_0.gml
@@ -0,0 +1,3 @@
+chatterbox_load_from_file("testcase_negate_function.yarn");
+box = chatterbox_create();
+chatterbox_goto(box, "Start");
diff --git a/objects/obj_testcase_negate_function/Draw_0.gml b/objects/obj_testcase_negate_function/Draw_0.gml
@@ -0,0 +1,34 @@
+var _x = 10;
+var _y = 10;
+
+if (chatterbox_is_stopped(box))
+{
+    draw_text(_x, _y, "(Chatterbox stopped)");
+}
+else
+{
+    var _i = 0;
+    repeat(chatterbox_get_content_count(box))
+    {
+        draw_text(_x, _y, chatterbox_get_content(box, _i));
+        _y += 20;
+        ++_i;
+    }
+
+    _y += 20;
+
+    if (chatterbox_is_waiting(box))
+    {
+        draw_text(_x, _y, "(Press Space)");
+    }
+    else
+    {
+        var _i = 0;
+        repeat(chatterbox_get_option_count(box))
+        {
+            draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i));
+            _y += 20;
+            ++_i;
+        }
+    }
+}
diff --git a/objects/obj_testcase_negate_function/Step_0.gml b/objects/obj_testcase_negate_function/Step_0.gml
@@ -0,0 +1,13 @@
+if (chatterbox_is_waiting(box))
+{
+    if (keyboard_check_released(vk_space)) chatterbox_continue(box);
+}
+else
+{
+    var _index = undefined;
+    if (keyboard_check_released(ord("1"))) _index = 0;
+    if (keyboard_check_released(ord("2"))) _index = 1;
+    if (keyboard_check_released(ord("3"))) _index = 2;
+    if (keyboard_check_released(ord("4"))) _index = 3;
+    if (_index != undefined) chatterbox_select(box, _index);
+}
diff --git a/objects/obj_testcase_negate_function/obj_testcase_action.yy b/objects/obj_testcase_negate_function/obj_testcase_action.yy
diff --git a/objects/obj_testcase_negate_function/obj_testcase_negate_function.yy b/objects/obj_testcase_negate_function/obj_testcase_negate_function.yy
diff --git a/objects/obj_testcase_negate_function/obj_testcase_numeric_param.yy b/objects/obj_testcase_negate_function/obj_testcase_numeric_param.yy
diff --git a/objects/obj_testcase_negate_function/obj_testcase_option.yy b/objects/obj_testcase_negate_function/obj_testcase_option.yy
diff --git a/objects/obj_testcase_negate_function/obj_testcase_stop.yy b/objects/obj_testcase_negate_function/obj_testcase_stop.yy
diff --git a/objects/obj_testcase_numeric_param/Create_0.gml b/objects/obj_testcase_numeric_param/Create_0.gml
@@ -0,0 +1,3 @@
+chatterbox_load_from_file("testcase_numeric_param.yarn");
+box = chatterbox_create();
+chatterbox_goto(box, "Start");
diff --git a/objects/obj_testcase_numeric_param/Draw_0.gml b/objects/obj_testcase_numeric_param/Draw_0.gml
@@ -0,0 +1,34 @@
+var _x = 10;
+var _y = 10;
+
+if (chatterbox_is_stopped(box))
+{
+    draw_text(_x, _y, "(Chatterbox stopped)");
+}
+else
+{
+    var _i = 0;
+    repeat(chatterbox_get_content_count(box))
+    {
+        draw_text(_x, _y, chatterbox_get_content(box, _i));
+        _y += 20;
+        ++_i;
+    }
+
+    _y += 20;
+
+    if (chatterbox_is_waiting(box))
+    {
+        draw_text(_x, _y, "(Press Space)");
+    }
+    else
+    {
+        var _i = 0;
+        repeat(chatterbox_get_option_count(box))
+        {
+            draw_text(_x, _y, string(_i+1) + ") " + chatterbox_get_option(box, _i));
+            _y += 20;
+            ++_i;
+        }
+    }
+}
diff --git a/objects/obj_testcase_numeric_param/Step_0.gml b/objects/obj_testcase_numeric_param/Step_0.gml
@@ -0,0 +1,13 @@
+if (chatterbox_is_waiting(box))
+{
+    if (keyboard_check_released(vk_space)) chatterbox_continue(box);
+}
+else
+{
+    var _index = undefined;
+    if (keyboard_check_released(ord("1"))) _index = 0;
+    if (keyboard_check_released(ord("2"))) _index = 1;
+    if (keyboard_check_released(ord("3"))) _index = 2;
+    if (keyboard_check_released(ord("4"))) _index = 3;
+    if (_index != undefined) chatterbox_select(box, _index);
+}