diff --git a/SneakySalamander.json b/SneakySalamander.json index d31e5ed12d215d637522f4283b7bfbbf43097619..946afe229411c220fc37325b6604596069dba133 100644 --- a/SneakySalamander.json +++ b/SneakySalamander.json @@ -17053,11 +17053,11 @@ "angle": 0, "customSize": true, "depth": 0, - "height": 192, + "height": 256, "layer": "", "name": "SpikeDemon_Base", "persistentUuid": "a8c87da3-79f9-4ea6-8f08-8fed174629b0", - "width": 192, + "width": 256, "x": 12704, "y": 800, "zOrder": 92, @@ -17069,13 +17069,13 @@ "angle": 0, "customSize": true, "depth": 0, - "height": 192, + "height": 256, "layer": "", "name": "SpikeDemon_Base", "persistentUuid": "41fc5b2c-c1bc-42ca-9285-3f761a1ed253", - "width": 192, + "width": 256, "x": 11712, - "y": 800, + "y": 768, "zOrder": 92, "numberProperties": [], "stringProperties": [], @@ -17117,17 +17117,33 @@ "angle": 0, "customSize": true, "depth": 0, - "height": 192, + "height": 256, "layer": "", "name": "SpikeDemon_Base2", "persistentUuid": "6f8e8d53-fefe-4307-ad6e-451070ed2a3e", - "width": 192, + "width": 256, "x": 7488, - "y": 704, + "y": 672, "zOrder": 93, "numberProperties": [], "stringProperties": [], "initialVariables": [] + }, + { + "angle": 0, + "customSize": true, + "depth": 1, + "height": 256, + "layer": "", + "name": "SpikeDemon_Base", + "persistentUuid": "a60d0f60-5c13-4563-a73e-a1d3ef17f38e", + "width": 256, + "x": 352, + "y": 384, + "zOrder": 94, + "numberProperties": [], + "stringProperties": [], + "initialVariables": [] } ], "objects": [ @@ -38226,6 +38242,15 @@ "SpikeDemon_Spike", "" ] + }, + { + "type": { + "value": "Delete" + }, + "parameters": [ + "SpikeDemon_Spike", + "" + ] } ] } @@ -38516,6 +38541,15 @@ "SpikeDemon_Spike2", "" ] + }, + { + "type": { + "value": "Delete" + }, + "parameters": [ + "SpikeDemon_Spike2", + "" + ] } ] } @@ -38772,6 +38806,15 @@ "StalagtiteDemon_Spike", "" ] + }, + { + "type": { + "value": "Delete" + }, + "parameters": [ + "StalagtiteDemon_Spike", + "" + ] } ] } @@ -39003,6 +39046,15 @@ "StalagtiteDemon_Spike2", "" ] + }, + { + "type": { + "value": "Delete" + }, + "parameters": [ + "StalagtiteDemon_Spike2", + "" + ] } ] } @@ -79017,30 +79069,46 @@ "fullName": "CollideWithEnemy", "functionType": "Action", "name": "CollideWithEnemy", - "sentence": "Handle Player Collision Between _PARAM1_ _PARAM2_ and _PARAM3_", + "sentence": "Handle Player Collision Between _PARAM1_ and _PARAM3_", "events": [ { - "type": "BuiltinCommonInstructions::Comment", - "color": { - "b": 109, - "g": 230, - "r": 255, - "textB": 0, - "textG": 0, - "textR": 0 - }, - "comment": "We assume here that the enemy has standard variables: IsKillable tells us if we can kill it.\nIf we can, then we will update our lifeforce total by the amount it has.\nThen we tell it that it's dead." + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "ObjectVariableAsBoolean" + }, + "parameters": [ + "Enemy", + "IsKillable", + "False" + ] + } + ], + "actions": [ + { + "type": { + "value": "Player::TriggerDeath" + }, + "parameters": [ + "", + "Player", + "" + ] + } + ] }, { "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "value": "PlatformBehavior::IsFalling" + "value": "ObjectVariableAsBoolean" }, "parameters": [ - "Player", - "Parameter" + "Enemy", + "isKillable", + "True" ] } ], @@ -79051,12 +79119,11 @@ "conditions": [ { "type": { - "value": "ObjectVariableAsBoolean" + "value": "PlatformBehavior::IsFalling" }, "parameters": [ - "Enemy", - "IsKillable", - "True" + "Player", + "Parameter" ] } ], @@ -79082,69 +79149,64 @@ "" ] } + ], + "events": [ + { + "type": "BuiltinCommonInstructions::Comment", + "color": { + "b": 109, + "g": 230, + "r": 255, + "textB": 0, + "textG": 0, + "textR": 0 + }, + "comment": "Only get life force from enemies that have been killed since last checkpoint" + }, + { + "type": "BuiltinCommonInstructions::Standard", + "conditions": [ + { + "type": { + "value": "ObjectVariableAsBoolean" + }, + "parameters": [ + "Enemy", + "hasBeenReaped", + "False" + ] + } + ], + "actions": [ + { + "type": { + "value": "ModVarObjet" + }, + "parameters": [ + "Player", + "LifeForce", + "+", + "Enemy.Variable(LifeForce)" + ] + } + ] + } ] }, - { - "type": "BuiltinCommonInstructions::Comment", - "color": { - "b": 109, - "g": 230, - "r": 255, - "textB": 0, - "textG": 0, - "textR": 0 - }, - "comment": "Only get life force from enemies that have been killed since last checkpoint" - }, { "type": "BuiltinCommonInstructions::Standard", "conditions": [ { "type": { - "value": "ObjectVariableAsBoolean" - }, - "parameters": [ - "Enemy", - "hasBeenReaped", - "False" - ] - } - ], - "actions": [ - { - "type": { - "value": "ModVarObjet" + "inverted": true, + "value": "PlatformBehavior::IsFalling" }, "parameters": [ "Player", - "LifeForce", - "+", - "Enemy.Variable(LifeForce)" + "Parameter" ] } - ] - } - ] - }, - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [ - { - "type": { - "inverted": true, - "value": "PlatformBehavior::IsFalling" - }, - "parameters": [ - "Player", - "Parameter" - ] - } - ], - "actions": [], - "events": [ - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [], + ], "actions": [ { "type": { @@ -79159,34 +79221,6 @@ ] } ] - }, - { - "type": "BuiltinCommonInstructions::Standard", - "conditions": [ - { - "type": { - "inverted": true, - "value": "ObjectVariableAsBoolean" - }, - "parameters": [ - "Enemy", - "IsKillable", - "True" - ] - } - ], - "actions": [ - { - "type": { - "value": "Player::TriggerDeath" - }, - "parameters": [ - "", - "Player", - "" - ] - } - ] } ], "parameters": [