Added an "else_if" action.

Espyo · Espyo · commit 326dbf61ed16 · 2025-11-15T15:17:46.000Z
diff --git a/game_data/base/mob_types/custom/crystal_nodule/script.txt b/game_data/base/mob_types/custom/crystal_nodule/script.txt
@@ -13,15 +13,11 @@ script {
             get_event_info msg message
             if $msg = be_carried
                 set_tangible false
-            else
-                if $msg = be_flung
-                    set_tangible true
-                    set_state flung
-                else
-                    if $msg = be_dropped
-                        set_tangible true
-                    end_if
-                end_if
+            else_if $msg = be_flung
+                set_tangible true
+                set_state flung
+            else_if $msg = be_dropped
+                set_tangible true
             end_if
         }
     }
diff --git a/game_data/base/mob_types/custom/logic_and_gate/script.txt b/game_data/base/mob_types/custom/logic_and_gate/script.txt
@@ -26,12 +26,10 @@ script {
 
             if $i1 = 0
                 send_message_to_links 0
+            else_if $i2 = 0
+                send_message_to_links 0
             else
-                if $i2 = 0
-                    send_message_to_links 0
-                else
-                    send_message_to_links 1
-                end_if
+                send_message_to_links 1
             end_if
         }
     }
diff --git a/game_data/base/mob_types/custom/pellet_posy_1/script.txt b/game_data/base/mob_types/custom/pellet_posy_1/script.txt
@@ -82,22 +82,14 @@ script {
             
             if $cur_color = red
                 set_var cur_color yellow
-            else
-                if $cur_color = yellow
-                    set_var cur_color blue
-                else
-                    if $cur_color = blue
-                        set_var cur_color rock
-                    else
-                        if $cur_color = rock
-                            set_var cur_color winged
-                        else
-                            if $cur_color = winged
-                                set_var cur_color red
-                            end_if
-                        end_if
-                    end_if
-                end_if
+            else_if $cur_color = yellow
+                set_var cur_color blue
+            else_if $cur_color = blue
+                set_var cur_color rock
+            else_if $cur_color = rock
+                set_var cur_color winged
+            else_if $cur_color = winged
+                set_var cur_color red
             end_if
             
             if $cur_color = red
diff --git a/game_data/base/mob_types/custom/pellet_posy_10/script.txt b/game_data/base/mob_types/custom/pellet_posy_10/script.txt
@@ -82,22 +82,14 @@ script {
             
             if $cur_color = red
                 set_var cur_color yellow
-            else
-                if $cur_color = yellow
-                    set_var cur_color blue
-                else
-                    if $cur_color = blue
-                        set_var cur_color rock
-                    else
-                        if $cur_color = rock
-                            set_var cur_color winged
-                        else
-                            if $cur_color = winged
-                                set_var cur_color red
-                            end_if
-                        end_if
-                    end_if
-                end_if
+            else_if $cur_color = yellow
+                set_var cur_color blue
+            else_if $cur_color = blue
+                set_var cur_color rock
+            else_if $cur_color = rock
+                set_var cur_color winged
+            else_if $cur_color = winged
+                set_var cur_color red
             end_if
             
             if $cur_color = red
diff --git a/game_data/base/mob_types/custom/pellet_posy_20/script.txt b/game_data/base/mob_types/custom/pellet_posy_20/script.txt
@@ -82,22 +82,14 @@ script {
             
             if $cur_color = red
                 set_var cur_color yellow
-            else
-                if $cur_color = yellow
-                    set_var cur_color blue
-                else
-                    if $cur_color = blue
-                        set_var cur_color rock
-                    else
-                        if $cur_color = rock
-                            set_var cur_color winged
-                        else
-                            if $cur_color = winged
-                                set_var cur_color red
-                            end_if
-                        end_if
-                    end_if
-                end_if
+            else_if $cur_color = yellow
+                set_var cur_color blue
+            else_if $cur_color = blue
+                set_var cur_color rock
+            else_if $cur_color = rock
+                set_var cur_color winged
+            else_if $cur_color = winged
+                set_var cur_color red
             end_if
             
             if $cur_color = red
diff --git a/game_data/base/mob_types/custom/pellet_posy_5/script.txt b/game_data/base/mob_types/custom/pellet_posy_5/script.txt
@@ -82,22 +82,14 @@ script {
             
             if $cur_color = red
                 set_var cur_color yellow
-            else
-                if $cur_color = yellow
-                    set_var cur_color blue
-                else
-                    if $cur_color = blue
-                        set_var cur_color rock
-                    else
-                        if $cur_color = rock
-                            set_var cur_color winged
-                        else
-                            if $cur_color = winged
-                                set_var cur_color red
-                            end_if
-                        end_if
-                    end_if
-                end_if
+            else_if $cur_color = yellow
+                set_var cur_color blue
+            else_if $cur_color = blue
+                set_var cur_color rock
+            else_if $cur_color = rock
+                set_var cur_color winged
+            else_if $cur_color = winged
+                set_var cur_color red
             end_if
             
             if $cur_color = red
diff --git a/game_data/base/mob_types/enemies/armored_cannon_beetle/script.txt b/game_data/base/mob_types/enemies/armored_cannon_beetle/script.txt
@@ -23,10 +23,8 @@ script {
             get_random_int idle_action 0 1
             if $idle_action = 0
                 set_state bored
-            else
-                if $idle_action = 1
-                    set_state exploring
-                end_if
+            else_if $idle_action = 1
+                set_state exploring
             end_if
             
             get_random_float t 1.5 2.5
diff --git a/game_data/base/mob_types/enemies/cyclopod/script.txt b/game_data/base/mob_types/enemies/cyclopod/script.txt
@@ -157,12 +157,10 @@ script {
                 if $underwater = true
                     play_sound slosh
                 end_if
+            else_if $underwater = true
+                start_particles bubble_placement_small
             else
-                if $underwater = true
-                    start_particles bubble_placement_small
-                else
-                    start_particles dust_explosion_small
-                end_if
+                start_particles dust_explosion_small
             end_if
         }
     }
@@ -204,12 +202,10 @@ script {
                 if $underwater = true
                     play_sound slosh
                 end_if
+            else_if $underwater = true
+                start_particles bubble_placement_small
             else
-                if $underwater = true
-                    start_particles bubble_placement_small
-                else
-                    start_particles dust_explosion_small
-                end_if
+                start_particles dust_explosion_small
             end_if
         }
         on_reach_destination {
diff --git a/game_data/base/mob_types/group_tasks/flukeweed/script.txt b/game_data/base/mob_types/group_tasks/flukeweed/script.txt
@@ -46,12 +46,10 @@ script {
             get_mob_info p self group_task_power
             if $p <= 3
                 set_timer 1.5
+            else_if $p = 4
+                set_timer 1.25
             else
-                if $p = 4
-                    set_timer 1.25
-                else
-                    set_timer 1
-                end_if
+                set_timer 1
             end_if
         }
         on_timer {
@@ -60,12 +58,10 @@ script {
             get_mob_info p self group_task_power
             if $p <= 3
                 set_timer 1.5
+            else_if $p = 4
+                set_timer 1.25
             else
-                if $p = 4
-                    set_timer 1.25
-                else
-                    set_timer 1
-                end_if
+                set_timer 1
             end_if
         }
         on_receive_message {
diff --git a/game_data/base/mob_types/interactables/button/script.txt b/game_data/base/mob_types/interactables/button/script.txt
@@ -11,10 +11,8 @@ script{
             get_event_info msg message
             if $msg = interact
                 set_state down
-            else
-                if $msg > 0
-                    set_state down
-                end_if
+            else_if $msg > 0
+                set_state down
             end_if
         }
         on_pikmin_land {
diff --git a/game_data/base/mob_types/interactables/lever/script.txt b/game_data/base/mob_types/interactables/lever/script.txt
@@ -16,10 +16,8 @@ script{
         on_receive_message {
             if $msg = interact
                 set_state flipping_on
-            else
-                if $msg > 0
-                    set_state flipping_on
-                end_if
+            else_if $msg > 0
+                set_state flipping_on
             end_if
         }
         on_pikmin_land {
@@ -45,10 +43,8 @@ script{
         on_receive_message {
             if $msg = interact
                 set_state flipping_off
-            else
-                if $msg > 0
-                    set_state flipping_off
-                end_if
+            else_if $msg > 0
+                set_state flipping_off
             end_if
         }
         on_pikmin_land {
diff --git a/game_data/base/mob_types/interactables/timed_lever/script.txt b/game_data/base/mob_types/interactables/timed_lever/script.txt
@@ -22,10 +22,8 @@ script{
         on_receive_message {
             if $msg = interact
                 set_state flipping_on
-            else
-                if $msg > 0
-                    set_state flipping_on
-                end_if
+            else_if $msg > 0
+                set_state flipping_on
             end_if
         }
         on_pikmin_land {
@@ -57,10 +55,8 @@ script{
         on_receive_message {
             if $msg = interact
                 set_state flipping_off
-            else
-                if $msg > 0
-                    set_state flipping_off
-                end_if
+            else_if $msg > 0
+                set_state flipping_off
             end_if
         }
         on_timer {
diff --git a/manual/content/changelog.html b/manual/content/changelog.html
@@ -52,6 +52,7 @@ <h3 id="1.1.0-making">Content-making changes</h3>
       <li><span class="cl-a">Added</span> an <a href="options.html">option</a> that makes it so using a <a href="maker_toolkit.html">maker tool</a> in normal gameplay throws a warning, and a confirmation for if the player really wants to use it. This helps with accidental activations of maker tools during what should be normal gameplay.</li>
       <li><span class="cl-a">Added</span> the "show reaches" <a href="maker_toolkit.html">maker tool</a>, which shows a mob's far and near reaches.</li>
       <li><span class="cl-a">Added</span> the <code>shake_camera</code> <a href="events_and_actions.html">script action</a>.</li>
+      <li><span class="cl-a">Added</span> the <code>else_if</code> <a href="events_and_actions.html">script action</a>.</li>
       <li><span class="cl-a">Added</span> the <code>difficulty</code> and <code>mission_mob</code> <a href="system_content_names.html">system content</a> images.</li>
       <li><span class="cl-a">Added</span> <a href="animation.html">animation editor</a> menus to quickly jump from a sprite to the animations that use it, and also from an animation's frame to the sprite it uses.</li>
       <li><span class="cl-a">Added</span> an optional buildup mechanic to <a href="status.html">statuses</a>.</li>
diff --git a/manual/content/events_and_actions.html b/manual/content/events_and_actions.html
@@ -199,6 +199,10 @@ <h3 id="actions-script-control">Script control</h3>
         <th><code>else</code></th>
         <td>If the corresponding <code><a href="#if">if</a></code> action's check ends up being false, the script will run the actions after this <code>else</code>, until it reaches the matching <code>end_if</code>.</td>
       </tr>
+      <tr id="else-if">
+        <th><code>else_if</code></th>
+        <td>Same as if you had an <code><a href="#else">else</a></code> action followed by an <code><a href="#if">if</a></code> action, except it doesn't enter a new level of depth. In order words, you only have one <code><a href="#end-if">end_if</a></code> for this sequence. So something like: <code>if ... else_if ... else_if ... else_if ... else ... end_if</code>. If you have an <code>else</code> in the sequence, it must come after any <code>else_if</code>.</td>
+      </tr>
       <tr id="end-if">
         <th><code>end_if</code></th>
         <td>Closes a condition sequence started by an <code><a href="#if">if</a></code> action.</td>
diff --git a/manual/content/history.html b/manual/content/history.html
@@ -42,6 +42,12 @@ <h2 id="roadmap">Roadmap</h2>
           <li>Ice Pikmin and Glow Pikmin</li>
         </ul>
       </li>
+      <li>
+        <b>Version 1.2</b>
+        <ul>
+          <li>Ice Pikmin and Glow Pikmin</li>
+        </ul>
+      </li>
       <li>
         <b>Version 2.0</b>
         <ul>
diff --git a/source/documents/todo.txt b/source/documents/todo.txt
@@ -576,7 +576,6 @@ Misc things (so I don't forget)
         A way to run actions on other mobs
             You can pick a mob's focused mob, you can pick a mob from the entire area that matches a certain filter of type/category/variable value, you can pick the mob's parent mob, etc.
         Global script variables
-        An else_if action
         An action that returns to the previous state. Useful for creating utility states that mimic functions
         More ideas of actions from Game Builder Garage's Nodon
         New events
diff --git a/source/source/content/other/mob_script.cpp b/source/source/content/other/mob_script.cpp
diff --git a/source/source/content/other/mob_script_action.cpp b/source/source/content/other/mob_script_action.cpp
diff --git a/source/source/content/other/mob_script_action.h b/source/source/content/other/mob_script_action.h
diff --git a/source/source/core/init.cpp b/source/source/core/init.cpp
diff --git a/source/source/game_state/editor.cpp b/source/source/game_state/editor.cpp
diff --git a/source/source/lib/easy_spat_nav/readme.md b/source/source/lib/easy_spat_nav/readme.md
