From 82b6ebc78fe508fcd9cd19328e5e47dd1b1e03ff Mon Sep 17 00:00:00 2001
From: milesthenerd <lassiterm@netspec.us>
Date: Tue, 20 Apr 2021 17:07:18 -0500
Subject: [PATCH] Maybe fixed random alpha crash

---
 AM2R.project.gmx                            |  2 ++
 Configs/Default.config.gmx                  |  6 ++--
 objects/oControl.object.gmx                 |  6 ++--
 objects/oMAlpha.object.gmx                  |  4 +--
 sprites/sMultitroidMapIconMiepee.sprite.gmx | 40 +++++++++++++++++++++
 sprites/sPalMultitroidMiepeeNew.sprite.gmx  | 25 +++++++++++++
 6 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 sprites/sMultitroidMapIconMiepee.sprite.gmx
 create mode 100644 sprites/sPalMultitroidMiepeeNew.sprite.gmx

diff --git a/AM2R.project.gmx b/AM2R.project.gmx
index f5f78328..bdd97c61 100644
--- a/AM2R.project.gmx
+++ b/AM2R.project.gmx
@@ -5003,6 +5003,8 @@
       <sprite>sprites\sShirkTurnFrozen</sprite>
       <sprite>sprites\sMultitroidMapPlayerCountBox</sprite>
       <sprite>sprites\sMiepee</sprite>
+      <sprite>sprites\sPalMultitroidMiepeeNew</sprite>
+      <sprite>sprites\sMultitroidMapIconMiepee</sprite>
     </sprites>
   </sprites>
   <backgrounds name="background">
diff --git a/Configs/Default.config.gmx b/Configs/Default.config.gmx
index e86f38e7..70660892 100644
--- a/Configs/Default.config.gmx
+++ b/Configs/Default.config.gmx
@@ -25,7 +25,7 @@
     <option_android_build_version>2</option_android_build_version>
     <option_android_color_depth>1</option_android_color_depth>
     <option_android_compile_sdk_version>28</option_android_compile_sdk_version>
-    <option_android_display_name>Multitroid 1.3 Testing 2</option_android_display_name>
+    <option_android_display_name>Multitroid 1.3</option_android_display_name>
     <option_android_facebook_app_display_name></option_android_facebook_app_display_name>
     <option_android_facebook_appid></option_android_facebook_appid>
     <option_android_facebook_enable>0</option_android_facebook_enable>
@@ -220,7 +220,7 @@
     <option_changeresolution>false</option_changeresolution>
     <option_closeesc>true</option_closeesc>
     <option_colordepth>0</option_colordepth>
-    <option_display_name>AM2R Multitroid 1.3 Testing 2</option_display_name>
+    <option_display_name>AM2R Multitroid 1.3</option_display_name>
     <option_displayerrors>True</option_displayerrors>
     <option_ecma>0</option_ecma>
     <option_facebook_app_display_name></option_facebook_app_display_name>
@@ -362,7 +362,7 @@
     <option_ios_texture_page>1024</option_ios_texture_page>
     <option_ios_use_test_ads>false</option_ios_use_test_ads>
     <option_lastchanged></option_lastchanged>
-    <option_linux_display_name>AM2R Multitroid 1.3 Testing 2</option_linux_display_name>
+    <option_linux_display_name>AM2R Multitroid 1.3</option_linux_display_name>
     <option_linux_enable_steam>0</option_linux_enable_steam>
     <option_linux_fullscreen>0</option_linux_fullscreen>
     <option_linux_homepage>https://www.reddit.com/r/AM2R/</option_linux_homepage>
diff --git a/objects/oControl.object.gmx b/objects/oControl.object.gmx
index 3c33c90c..d6319054 100644
--- a/objects/oControl.object.gmx
+++ b/objects/oControl.object.gmx
@@ -490,13 +490,13 @@ MultitroidIconDefault = sMultitroidIcon;
 MultitroidIconDarkDefault = sDarkMultitroidPlayer;
 MultitroidMapIconDefault = sMultitroidMapIcon;
 
-MultitroidPaletteColor = sPalMultitroidNew;
+MultitroidPaletteColor = sPalMultitroidMiepeeNew;
 MultitroidPaletteFusionColor = sPalMultitroidFusion;
 SpiderballPaletteColor = sPalSpiderball;
 MultitroidBabyPaletteColor = sPalMultitroidBaby;
 MultitroidIconColor = sMultitroidIcon;
-MultitroidIconDarkColor = sDarkMultitroidPlayer;
-MultitroidMapIconColor = sMultitroidMapIcon;
+MultitroidIconDarkColor = sMultitroidIcon;
+MultitroidMapIconColor = sMultitroidMapIconMiepee;
 
 MultitroidPaletteCustom = sPalMultitroidNew;
 MultitroidPaletteFusionCustom = sPalMultitroidFusion;
diff --git a/objects/oMAlpha.object.gmx b/objects/oMAlpha.object.gmx
index 2745fe5b..80bca6da 100644
--- a/objects/oMAlpha.object.gmx
+++ b/objects/oMAlpha.object.gmx
@@ -283,7 +283,7 @@ if (state == 5 || dodging) alarm[2] = 3;
         if (chasing) {
             targetx = oCharacter.x;
             targety = oCharacter.y - 24;
-            if (shell.hitting &amp;&amp; hitandrun) {
+            if (instance_exists(shell) &amp;&amp; shell.hitting &amp;&amp; hitandrun) {
                 xVel = 0;
                 yVel = 0;
                 event_user(1);
@@ -475,7 +475,7 @@ if (state == 5 || dodging) alarm[2] = 3;
     moveTo(xVel, yVel);
 } // if (active == 1)
 if (state == 100) {
-    if (statetime == 1) {
+    if (statetime == 1 &amp;&amp; instance_exists(shell)) {
         damagedealt += shell.damagedealt;
         with (shell) instance_destroy();
     }
diff --git a/sprites/sMultitroidMapIconMiepee.sprite.gmx b/sprites/sMultitroidMapIconMiepee.sprite.gmx
new file mode 100644
index 00000000..e2ec187a
--- /dev/null
+++ b/sprites/sMultitroidMapIconMiepee.sprite.gmx
@@ -0,0 +1,40 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<sprite>
+  <type>0</type>
+  <xorig>0</xorig>
+  <yorigin>0</yorigin>
+  <colkind>1</colkind>
+  <coltolerance>0</coltolerance>
+  <sepmasks>0</sepmasks>
+  <bboxmode>0</bboxmode>
+  <bbox_left>0</bbox_left>
+  <bbox_right>7</bbox_right>
+  <bbox_top>0</bbox_top>
+  <bbox_bottom>7</bbox_bottom>
+  <HTile>0</HTile>
+  <VTile>0</VTile>
+  <TextureGroups>
+    <TextureGroup0>0</TextureGroup0>
+  </TextureGroups>
+  <For3D>0</For3D>
+  <width>8</width>
+  <height>8</height>
+  <frames>
+    <frame index="0">images\sMultitroidMapIconMiepee_0.png</frame>
+    <frame index="1">images\sMultitroidMapIconMiepee_1.png</frame>
+    <frame index="2">images\sMultitroidMapIconMiepee_2.png</frame>
+    <frame index="3">images\sMultitroidMapIconMiepee_3.png</frame>
+    <frame index="4">images\sMultitroidMapIconMiepee_4.png</frame>
+    <frame index="5">images\sMultitroidMapIconMiepee_5.png</frame>
+    <frame index="6">images\sMultitroidMapIconMiepee_6.png</frame>
+    <frame index="7">images\sMultitroidMapIconMiepee_7.png</frame>
+    <frame index="8">images\sMultitroidMapIconMiepee_8.png</frame>
+    <frame index="9">images\sMultitroidMapIconMiepee_9.png</frame>
+    <frame index="10">images\sMultitroidMapIconMiepee_10.png</frame>
+    <frame index="11">images\sMultitroidMapIconMiepee_11.png</frame>
+    <frame index="12">images\sMultitroidMapIconMiepee_12.png</frame>
+    <frame index="13">images\sMultitroidMapIconMiepee_13.png</frame>
+    <frame index="14">images\sMultitroidMapIconMiepee_14.png</frame>
+    <frame index="15">images\sMultitroidMapIconMiepee_15.png</frame>
+  </frames>
+</sprite>
diff --git a/sprites/sPalMultitroidMiepeeNew.sprite.gmx b/sprites/sPalMultitroidMiepeeNew.sprite.gmx
new file mode 100644
index 00000000..5475af76
--- /dev/null
+++ b/sprites/sPalMultitroidMiepeeNew.sprite.gmx
@@ -0,0 +1,25 @@
+<!--This Document is generated by GameMaker, if you edit it by hand then you do so at your own risk!-->
+<sprite>
+  <type>0</type>
+  <xorig>0</xorig>
+  <yorigin>0</yorigin>
+  <colkind>1</colkind>
+  <coltolerance>0</coltolerance>
+  <sepmasks>0</sepmasks>
+  <bboxmode>0</bboxmode>
+  <bbox_left>0</bbox_left>
+  <bbox_right>16</bbox_right>
+  <bbox_top>0</bbox_top>
+  <bbox_bottom>86</bbox_bottom>
+  <HTile>0</HTile>
+  <VTile>0</VTile>
+  <TextureGroups>
+    <TextureGroup0>0</TextureGroup0>
+  </TextureGroups>
+  <For3D>0</For3D>
+  <width>17</width>
+  <height>87</height>
+  <frames>
+    <frame index="0">images\sPalMultitroidMiepeeNew_0.png</frame>
+  </frames>
+</sprite>