Merge pull request #3 from Pixel-Map/revamp-a-bit

Revamp a bit
Pixel-Map · Dec 29, 2022 · 9c8a29e · 9c8a29e
2 parents 1753a54 + c2b51d3
commit 9c8a29e
Show file tree

Hide file tree

Showing 16 changed files with 246 additions and 205 deletions.
diff --git a/.ysls.json b/.ysls.json
@@ -1,46 +1,47 @@
 {
     "Commands": [
         {
-            "YarnName": "AddGold",
-            "DefinitionName": "AddGold",
+            "YarnName": "add_gold",
+            "DefinitionName": "add_gold",
             "Documentation": "Adds X amount of gold to the player",
-            "Signature": "AddGold amount",
+            "Signature": "add_gold amount",
             "Language": "text",
             "Parameters": [
                 {
                     "Name": "amount",
                     "Type": "Number",
-                    "Documentation": "Any number, including negative, but then you should probably just use RemoveGold",
+                    "Documentation": "Any number, including negative, but then you should probably just use remove_gold",
                     "IsParamsArray": false
                 }
             ]
         },
         {
-            "YarnName": "AddItem",
-            "DefinitionName": "AddItem",
+            "YarnName": "add_item",
+            "DefinitionName": "add_item",
             "Documentation": "Gives the player x number of a given item.",
-            "Signature": "AddItem itemName quantity",
+            "Signature": "add_item itemName quantity",
             "Language": "text",
             "Parameters": [
                 {
                     "Name": "itemName",
                     "Type": "String",
-                    "Documentation": "ID of the item to give",
+                    "Documentation": "Name of the item to give",
                     "IsParamsArray": false
                 },
                 {
                     "Name": "quantity",
                     "Type": "Number",
                     "Documentation": "quantity",
-                    "IsParamsArray": false
+                    "IsParamsArray": false,
+                    "DefaultValue": "1"
                 }
             ]
         },
         {
-            "YarnName": "FadeIn",
-            "DefinitionName": "FadeIn",
-            "Documentation": "FadeIn to normal (from black screen or tint)",
-            "Signature": "FadeIn numberOfFrames",
+            "YarnName": "fade_in",
+            "DefinitionName": "fade_in",
+            "Documentation": "fade_in to normal (from black screen or tint)",
+            "Signature": "fade_in numberOfFrames",
             "Language": "text",
             "Parameters": [
                 {
@@ -53,10 +54,10 @@
             ]
         },
         {
-            "YarnName": "FadeOut",
-            "DefinitionName": "FadeOut",
-            "Documentation": "FadeOut to black screen (or tinted)",
-            "Signature": "FadeOut duration red green blue grey alpha",
+            "YarnName": "fade_out",
+            "DefinitionName": "fade_out",
+            "Documentation": "fade_out to black screen (or tinted)",
+            "Signature": "fade_out duration red green blue grey alpha",
             "Language": "text",
             "Parameters": [
                 {
@@ -104,10 +105,10 @@
             ]
         },
         {
-            "YarnName": "FlashScreen",
-            "DefinitionName": "FlashScreen",
-            "Documentation": "FlashScreen (optionally tinted)",
-            "Signature": "FlashScreen duration red green blue intensity",
+            "YarnName": "flash_screen",
+            "DefinitionName": "flash_screen",
+            "Documentation": "flash_screen (optionally tinted)",
+            "Signature": "flash_screen duration red green blue intensity",
             "Language": "text",
             "Parameters": [
                 {
@@ -148,10 +149,10 @@
             ]
         },
         {
-            "YarnName": "HideEntity",
-            "DefinitionName": "HideEntity",
+            "YarnName": "hide_entity",
+            "DefinitionName": "hide_entity",
             "Documentation": "Hides the entity (via passed in name).  If no entity specified, hides the calling entity",
-            "Signature": "HideEntity entityName",
+            "Signature": "hide_entity entityName",
             "Language": "text",
             "Parameters": [
                 {
@@ -164,10 +165,10 @@
             ]
         },
         {
-            "YarnName": "MoveEvent",
-            "DefinitionName": "MoveEvent",
+            "YarnName": "move_event",
+            "DefinitionName": "move_event",
             "Documentation": "Moves an Event",
-            "Signature": "MoveEvent direction distance speed eventName",
+            "Signature": "move_event direction distance speed eventName",
             "Language": "text",
             "Parameters": [
 
@@ -200,10 +201,10 @@
             ]
         },
         {
-            "YarnName": "PlayMusic",
-            "DefinitionName": "PlayMusic",
+            "YarnName": "play_music",
+            "DefinitionName": "play_music",
             "Documentation": "Play Music (use default unless specified)",
-            "Signature": "PlayMusic musicName",
+            "Signature": "play_music musicName",
             "Language": "text",
             "Parameters": [
                 {
@@ -215,10 +216,10 @@
             ]
         },
         {
-            "YarnName": "PlaySound",
-            "DefinitionName": "PlaySound",
+            "YarnName": "play_sound",
+            "DefinitionName": "play_sound",
             "Documentation": "Plays a sound effect at X volume (0-100).",
-            "Signature": "SetBackground name volume",
+            "Signature": "play_sound name volume",
             "Language": "text",
             "Parameters": [
                 {
@@ -236,10 +237,10 @@
             ]
         },
         {
-            "YarnName": "RemoveGold",
-            "DefinitionName": "RemoveGold",
+            "YarnName": "remove_gold",
+            "DefinitionName": "remove_gold",
             "Documentation": "Removes X amount of gold from the player",
-            "Signature": "RemoveGold amount",
+            "Signature": "remove_gold amount",
             "Language": "text",
             "Parameters": [
                 {
@@ -251,10 +252,10 @@
             ]
         },
         {
-            "YarnName": "RemoveItem",
-            "DefinitionName": "RemoveItem",
+            "YarnName": "remove_item",
+            "DefinitionName": "remove_item",
             "Documentation": "Removes x number of a given item from player.",
-            "Signature": "RemoveItem itemName quantity",
+            "Signature": "remove_item itemName quantity",
             "Language": "text",
             "Parameters": [
                 {
@@ -272,10 +273,10 @@
             ]
         },
         {
-            "YarnName": "SetBackground",
-            "DefinitionName": "SetBackground",
+            "YarnName": "set_background",
+            "DefinitionName": "set_background",
             "Documentation": "Set the message box background transparency level.",
-            "Signature": "SetBackground bgType",
+            "Signature": "set_background bgType",
             "Language": "text",
             "Parameters": [
                 {
@@ -287,10 +288,10 @@
             ]
         },
         {
-            "YarnName": "SetFacing",
-            "DefinitionName": "SetFacing",
+            "YarnName": "set_facing",
+            "DefinitionName": "set_facing",
             "Documentation": "Changes the direction the provided entity name is facing, or if just a direction is passed, assumes you meant the calling entity.",
-            "Signature": "SetFacing direction entityName",
+            "Signature": "set_facing direction entityName",
             "Language": "text",
             "Parameters": [
                 {
@@ -310,10 +311,10 @@
             ]
         },
         {
-            "YarnName": "ShowEntity",
-            "DefinitionName": "ShowEntity",
+            "YarnName": "show_entity",
+            "DefinitionName": "show_entity",
             "Documentation": "Shows the entity (via passed in name).  If no entity specified, shows the calling entity",
-            "Signature": "ShowEntity entityName",
+            "Signature": "show_entity entityName",
             "Language": "text",
             "Parameters": [
                 {
@@ -326,10 +327,10 @@
             ]
         },
         {
-            "YarnName": "StopMusic",
-            "DefinitionName": "StopMusic",
+            "YarnName": "stop_music",
+            "DefinitionName": "stop_music",
             "Documentation": "Stop music with optional fadeout",
-            "Signature": "FadeToBlackAndBack interval",
+            "Signature": "stop_music interval",
             "Language": "text",
             "Parameters": [
                 {
@@ -341,8 +342,8 @@
             ]
         },
         {
-            "YarnName": "Wait",
-            "DefinitionName": "Wait",
+            "YarnName": "wait",
+            "DefinitionName": "wait",
             "Documentation": "Wait the given number of ms",
             "Signature": "Wait time",
             "Language": "text",
@@ -357,6 +358,21 @@
         }
     ],
     "Functions": [
+        {
+            "YarnName": "has_item",
+            "DefinitionName": "has_item",
+            "Documentation": "If player has the named item",
+            "Signature": "has_item(itemName)",
+            "Language": "text",
+            "Parameters": [
+                {
+                    "Name": "itemName",
+                    "Type": "String",
+                    "Documentation": "Name of the Item (NOT the Item ID!)",
+                    "IsParamsArray": false
+                }
+            ]
+        },
         {
             "YarnName": "string",
             "DefinitionName": "string",

diff --git a/data/Map001.json b/data/Map001.json
@@ -10,6 +10,6 @@ null,
 {"id":5,"name":"Monster3","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Monster","direction":2,"pattern":1,"characterIndex":1},"list":[{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":10,"y":1},
 {"id":6,"name":"EV006","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"Evil","direction":2,"pattern":0,"characterIndex":0},"list":[{"code":357,"indent":0,"parameters":["pixelmapYarnSpinner","yarn","Yarn Dialog",{"Yarn File Path":"dialog/addStuff.yarn","Start At":"AddStuff"}]},{"code":657,"indent":0,"parameters":["Yarn File Path = dialog/addStuff.yarn"]},{"code":657,"indent":0,"parameters":["Start At = AddStuff"]},{"code":108,"indent":0,"parameters":["<Mini Label: Add Stuff>"]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":2,"y":9},
 {"id":7,"name":"EV007","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"SF_Actor1","direction":2,"pattern":2,"characterIndex":0},"list":[{"code":108,"indent":0,"parameters":["<Mini Label: Sprite Commands>"]},{"code":357,"indent":0,"parameters":["pixelmapYarnSpinner","yarn","Yarn Dialog",{"Yarn File Path":"dialog/spriteCommands.yarn","Start At":"SpriteCommands"}]},{"code":657,"indent":0,"parameters":["Yarn File Path = dialog/spriteCommands.yarn"]},{"code":657,"indent":0,"parameters":["Start At = SpriteCommands"]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":13,"y":6},
-null
+{"id":8,"name":"EV008","note":"","pages":[{"conditions":{"actorId":1,"actorValid":false,"itemId":1,"itemValid":false,"selfSwitchCh":"A","selfSwitchValid":false,"switch1Id":1,"switch1Valid":false,"switch2Id":1,"switch2Valid":false,"variableId":1,"variableValid":false,"variableValue":0},"directionFix":false,"image":{"tileId":0,"characterName":"SF_Monster","direction":2,"pattern":0,"characterIndex":4},"list":[{"code":108,"indent":0,"parameters":["<Mini Label: FunctionTester>"]},{"code":357,"indent":0,"parameters":["pixelmapYarnSpinner","yarn","Yarn Dialog",{"Yarn File Path":"dialog/functionTester.yarn","Start At":"Hello"}]},{"code":657,"indent":0,"parameters":["Yarn File Path = dialog/functionTester.yarn"]},{"code":657,"indent":0,"parameters":["Start At = Hello"]},{"code":0,"indent":0,"parameters":[]}],"moveFrequency":3,"moveRoute":{"list":[{"code":0,"parameters":[]}],"repeat":true,"skippable":false,"wait":false},"moveSpeed":3,"moveType":0,"priorityType":1,"stepAnime":false,"through":false,"trigger":0,"walkAnime":true}],"x":11,"y":9}
 ]
 }