The player's death system has been implemented

fervi · Apr 22, 2019 · 0abf140 · 0abf140
1 parent 86b9342
commit 0abf140
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx
@@ -22,7 +22,7 @@
     <option_interpolate>false</option_interpolate>
     <option_scale>-1</option_scale>
     <option_closeesc>true</option_closeesc>
-    <option_lastchanged>43577.54025460648</option_lastchanged>
+    <option_lastchanged>43577.54255784722</option_lastchanged>
     <option_gameid>46769777</option_gameid>
     <option_gameguid>{8C4B3F95-0D72-B0DA-30C1-BD6BE9E980DA}</option_gameguid>
     <option_author/>

diff --git a/help.rtf b/help.rtf
@@ -18,6 +18,7 @@
 \par
 \par
 \par
+\par
 \i0\b0\ul0\par
 }
 
diff --git a/objects/obj_controller.object.gmx b/objects/obj_controller.object.gmx
@@ -89,8 +89,10 @@ alarm[1]=3*room_speed;</string>
         <arguments>
           <argument>
             <kind>1</kind>
-            <string>score=score+1;&#13;
-alarm[0]=room_speed;</string>
+            <string>if instance_number(obj_hero) = 1 {&#13;
+score=score+1;&#13;
+alarm[0]=room_speed;&#13;
+}</string>
           </argument>
         </arguments>
       </action>

diff --git a/objects/obj_hero.object.gmx b/objects/obj_hero.object.gmx
@@ -74,6 +74,28 @@
         </arguments>
       </action>
     </event>
+    <event ename="obj_demon" eventtype="4">
+      <action>
+        <libid>1</libid>
+        <id>603</id>
+        <kind>7</kind>
+        <userelative>0</userelative>
+        <useapplyto>-1</useapplyto>
+        <isquestion>0</isquestion>
+        <exetype>2</exetype>
+        <functionname/>
+        <codestring/>
+        <whoName>self</whoName>
+        <relative>0</relative>
+        <isnot>0</isnot>
+        <arguments>
+          <argument>
+            <kind>1</kind>
+            <string>instance_destroy();</string>
+          </argument>
+        </arguments>
+      </action>
+    </event>
     <event enumb="87" eventtype="5">
       <action>
         <libid>1</libid>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ @@
     \par
     \par
     \par
+    \par
     \i0\b0\ul0\par
     }