Fix tags and story.choose_path_string + update blade-ink natives to v1.2.1

Author: bladecoder

bink/choices.py

@@ -40,7 +40,7 @@ def __getitem__(self, idx: int) -> str:
         if not isinstance(idx, int):
             raise TypeError
 
-        if idx < 0 or idx > self._len:
+        if idx < 0 or idx >= self._len:
             raise IndexError
 
         return self.get_text(idx)

bink/native/arm64/libbink.dylib

@@ -127,9 +127,8 @@ def get_current_tags(self) -> Tags:
 
     def choose_path_string(self, path: str):
         err_msg = ctypes.c_char_p()
-        story = ctypes.c_void_p()
-        ret = LIB.bink_story_new(
-            ctypes.byref(story),
+        ret = LIB.bink_story_choose_path_string(
+            self._story,
             path.encode('utf-8'),
             ctypes.byref(err_msg))
         if ret != BINK_OK:

bink/native/arm64/libbink.so

@@ -21,7 +21,7 @@ def __next__(self):
 
 class Tags:
     """Contains a list of tags."""
-    def __init__(self, tags, c_len):
+    def __init__(self, tags, c_len: int):
         self._tags = tags
         self._len = c_len
 
@@ -41,15 +41,15 @@ def __getitem__(self, idx: int) -> str:
         if not isinstance(idx, int):
             raise TypeError
 
-        if idx < 0 or idx > self._len:
+        if idx < 0 or idx >= self._len:
             raise IndexError
 
         return self.get(idx)
 
     def get(self, idx) -> str:
         """Returns the tag text."""
         tag = ctypes.c_char_p()
-        ret = LIB.bink_choices_get_text(self._tags, idx, ctypes.byref(tag))
+        ret = LIB.bink_tags_get(self._tags, idx, ctypes.byref(tag))
 
         if ret != BINK_OK:
             raise RuntimeError("Error getting tag, index out of bounds?")
@@ -60,4 +60,4 @@ def get(self, idx) -> str:
         return result
 
     def __del__(self):
-        LIB.bink_choices_free(self._tags)
+        LIB.bink_tags_free(self._tags)

bink/native/x86_64/bink.dll

@@ -0,0 +1,16 @@
+VAR x = 2 
+# author: Joe
+# title: My Great Story
+This is the content
+
+== knot ==
+# knot tag
+Knot content
+# end of knot tag
+-> END
+
+= stitch
+# stitch tag
+Stitch content
+# this tag is below some content so isn't included in the static tags for the stitch
+-> END

bink/native/x86_64/libbink.dylib

@@ -0,0 +1 @@
+{"inkVersion":21,"root":[["#","^author: Joe","/#","#","^title: My Great Story","/#","^This is the content","\n",["done",{"#n":"g-0"}],null],"done",{"knot":["#","^knot tag","/#","^Knot content","\n","#","^end of knot tag","/#","end",{"stitch":["#","^stitch tag","/#","^Stitch content","\n","#","^this tag is below some content so isn't included in the static tags for the stitch","/#","end",null]}],"global decl":["ev",2,{"VAR=":"x"},"/ev","end",null]}],"listDefs":{}}