Merge pull request #346 from LuqueDaniel/develop

Merge develop

Author: LuqueDaniel

.eslintrc.json

@@ -22,6 +22,7 @@
     "require-await": "warn",
     "camelcase": "error",
     "@typescript-eslint/no-var-requires": "warn",
-    "no-param-reassign": "warn" // Disable reassign, since this basically means you override the reference from the caller function with a new local version. (It doesn't do what you expect)
+    "no-param-reassign": "warn", // Disable reassign, since this basically means you override the reference from the caller function with a new local version. (It doesn't do what you expect)
+    "@typescript-eslint/no-namespace": "off"
   }
 }

.github/workflows/pr-check.yml

@@ -2,6 +2,7 @@ name: PR Check
 
 on:
   pull_request:
+    types: [synchronize, opened, reopened, edited]
     branches:
       - master
       - develop

.vscode/launch.json

@@ -15,7 +15,8 @@
         "${workspaceFolder}/examples" // open examples directory
       ],
       "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "npm: watch"
+      "preLaunchTask": "npm: watch",
+      "skipFiles": ["<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**", "**/node/extensionHostProcess.js"]
     },
     {
       "name": "Launch Extension (Release)",
@@ -27,7 +28,8 @@
         "${workspaceFolder}/examples" // open examples directory
       ],
       "outFiles": ["${workspaceFolder}/dist/**/*.js"],
-      "preLaunchTask": "npm: watch-release"
+      "preLaunchTask": "npm: watch-release",
+      "skipFiles": ["<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**"]
     },
     {
       "name": "Extension Tests",
@@ -36,7 +38,8 @@
       "runtimeExecutable": "${execPath}",
       "args": ["--extensionDevelopmentPath=${workspaceFolder}", "--extensionTestsPath=${workspaceFolder}/out/test"],
       "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-      "preLaunchTask": "npm: test-compile"
+      "preLaunchTask": "npm: test-compile",
+      "skipFiles": ["<node_internals>/**", "**/extensions/git*/**", "**/node_modules/prettier/**"]
     }
   ]
 }

TODO.md

@@ -3,7 +3,6 @@ Renpy Features List
 - Support launching the project through VSCode
 
 - Bugs to fix:
-  * Fix error on restart
   * Show color editor in tags (also check https://www.renpy.org/doc/html/color_class.html)
   * % can be escaped in strings
   * if line contains unclosed ( [ or { line is continued (see https://www.renpy.org/doc/html/language_basics.html#logical-lines)

examples/test_ren.py

@@ -0,0 +1,17 @@
+# This is not included in the game. It's here so that an editor knows
+# the type of strength.
+strength = 100
+
+"""renpy
+init python:
+"""
+
+class BoostStrength(Action):
+    """
+    Boosts the strength of the player by 10.
+    """
+
+    def __call__(self):
+        global strength
+        strength += 10
+        renpy.restart_interaction()

examples/tokenizer_tests.rpy

@@ -21,4 +21,13 @@ init python hide early in Namespace:
             self.items.append(item);
             return
 
+label start:
+    "Light Distraction\n{color=ff0000}{size=18}[distraction_percentages[0]]%% Chance{/size}{/color}"
+    
+    menu:    
+        "It's a video game.":
+            jump game
+
+        "It's an interactive book.":
+            jump book
 

examples/unit_test.rpy

@@ -1199,6 +1199,14 @@
         translate piglatin python:
             style.default.font = "stonecutter.ttf"
 
+            old "These two lines will be combined together to form a long line.\n\nThis line will be separate."
+            new _p("""
+                These two lines will be combined together
+                to form a long line. Bork bork bork.
+
+                This line will be separate. Bork bork bork.
+                """)
+
         frame:
             style_prefix "pref"
             has vbox
@@ -1214,13 +1222,7 @@
             This line will be separate.
             """)
 
-        old "These two lines will be combined together to form a long line.\n\nThis line will be separate."
-        new _p("""
-            These two lines will be combined together
-            to form a long line. Bork bork bork.
-
-            This line will be separate. Bork bork bork.
-            """)
+        
 
     #endregion Translation