Preparations for 1.1.0.

Author: Espyo

manual/content/changelog.html

@@ -502,6 +502,10 @@ <h2 id="S">S</h2>
       <dt>Spawn</dt>
       <dd>As a verb, it means "to make appear". When an object is created and placed into the game world, it is said that it has "spawned". As a noun, it refers to any object created by the current object.</dd>
     </dl>
+    <dl id="spatial-navigation">
+      <dt>Spatial navigation</dt>
+      <dd><a href="https://en.wikipedia.org/wiki/Spatial_navigation">Spatial navigation</a> is when the user navigates in a menu, by focusing onto different items by inputting directions, as opposed to using the mouse to go to the items directly.</dd>
+    </dl>
     <dl id="spike">
       <dt>Spike</dt>
       <dd>Spike damage is a special type of damage that only happens in retaliation. When an <a href="#object">object</a> is hurt, if it has spike damage configured, it will automatically hurt its attacker as well. Another type of spike damage happens when a Pikmin is swallowed; this allows White Pikmin to cause some damage to their predators.</dd>

manual/content/changelog_older.html

@@ -34,29 +34,23 @@ <h2 id="roadmap">Roadmap</h2>
     <p>Many more features, content, and tweaks are still planned, but the following is a general outline of what major things still need to be finished, as well as a rough idea of what versions will contain what.</p>
 
     <ul>
-      <li>
-        <b>Version 1.1</b>
-        <ul>
-          <li>GUI improvements</li>
-          <li>Controls improvements</li>
-          <li>Ice Pikmin and Glow Pikmin</li>
-        </ul>
-      </li>
       <li>
         <b>Version 1.2</b>
         <ul>
           <li>Ice Pikmin and Glow Pikmin</li>
+          <li>Puffstool and Mushroom Pikmin</li>
         </ul>
       </li>
       <li>
-        <b>Version 2.0</b>
+        <b>Version 1.3</b>
         <ul>
-          <li>Multiplayer</li>
+          <li>Mission logic rework</li>
         </ul>
       </li>
       <li>
         <b>Later</b>
         <ul>
+          <li>Multiplayer</li>
           <li>Caves</li>
           <li>More editors</li>
           <li>Story mode</li>

manual/content/glossary.html

@@ -460,16 +460,35 @@ Procedure for every version release
             Particularly the update's version number, release day, and nickname
             Double-check that it's organized, or if it could be sorted differently
             In order for the main changelog file to keep the most recent major/minor version (i.e. revisions are ignored for this count), move older versions to the older changelog document if needed
+    Final cleanup
+        Pass all code files through AStyle
+            for f in $(find . -type f | egrep '.+\.(cpp|h)'); do astyle --options=../documents/astyle.txt -n $f; done
+        Code cleanup
+            Confirm that no line goes over 80 characters
+                Use the helper tool, or run:
+                    grep -Enr --include="*.cpp" ^.\{81,\}$
+            Confirm that all function definitions are sorted alphabetically, and by namespace
+                Use the helper tool
+            Confirm that all includes are sorted alphabetically
+                Use the helper tool
+            Confirm that all functions have documentation, and that it has no missing/extra parameters
+                Use the helper tool
+            Confirm that all function definitions and blocks of includes have two empty lines of space before what comes next
+                Use the helper tool
+        Fix up all changed images since the last release
+            Use the helper tool to get the list, or run:
+                git diff --name-status $(git describe --abbrev=0 --tags) | grep -E '^[AM].*(png|jpg)'
+            Confirm that the most recent ground textures are a power of 2
+            PNGCrush the png files
+            This might help (make sure filelist.txt has LF linebreaks):
+                cat filelist.txt | while read line; do pngcrush -brute $line $line.new; done;
     Release candidate
         Compile it for Windows
             Use GitHub Actions
             Or use Visual Studio
-                Add all added source files, and remove removed source files, if needed
-                    Use the helper tool to get a list, or run:
-                        git diff --name-status $(git describe --abbrev=0 --tags) | grep ^\[AD\].source/source
                 Confirm that the subsystem option in the release build's linker options is set to Windows
                 Compile it on Windows with a release x64 target build
-                Point down all changes that were necessary for this to compile
+        Point down all changes that were necessary for it to compile
         Create a zip file (see below)
         Send it to beta testers so they can check for stuff that's immediately wrong
         After they're done, tell them to confirm that error_log.txt reported nothing
@@ -478,13 +497,6 @@ Procedure for every version release
             In-development is false, apply the correct release date
             Use the helper tool, or edit const.h and the *.rc files
         Update all area version numbers and engine version numbers
-        Fix up all changed images since the last release
-            Use the helper tool to get the list, or run:
-                git diff --name-status $(git describe --abbrev=0 --tags) | grep -E '^[AM].*(png|jpg)'
-            Confirm that the most recent ground textures are a power of 2
-            PNGCrush the png files
-            This might help (make sure filelist.txt has LF linebreaks):
-                cat filelist.txt | while read line; do pngcrush -brute $line $line.new; done;
         Update the Allegro version number on the Compiling page of the manual, if it changed
         Check any changes made on Windows in order to compile, and port them over
     Final build
@@ -505,8 +517,6 @@ Procedure for every version release
             Use the helper tool, or edit const.h and the *.rc files
         Add to the todo for the start of the next version:
             Update Dear ImGui, and try compiling with IMGUI_DISABLE_OBSOLETE_FUNCTIONS defined
-            Pass all code files through AStyle
-                for f in $(find . -type f | egrep '.+\.(cpp|h)'); do astyle --options=../documents/astyle.txt -n $f; done
             If this is a big release:
                 Compile with -Wall and correct all problems
                 Use cppcheck on the code and correct the problems
@@ -519,18 +529,6 @@ Procedure for every version release
                 Use Infer and correct problems
                     infer run -o ~/Desktop/infer-out --report-block-list-files-containing "lib/imgui" -- make -f source/gnu_make/makefile debug
                 Confirm that there are no superfluous #includes (how?)
-            Code cleanup
-                Confirm that no line goes over 80 characters
-                    Use the helper tool, or run:
-                        grep -Enr --include="*.cpp" ^.\{81,\}$
-                Confirm that all function definitions are sorted alphabetically, and by namespace
-                    Use the helper tool
-                Confirm that all includes are sorted alphabetically
-                    Use the helper tool
-                Confirm that all functions have documentation, and that it has no missing/extra parameters
-                    Use the helper tool
-                Confirm that all function definitions and blocks of includes have two empty lines of space before what comes next
-                    Use the helper tool
             Fix up all changed SVG files
                 Use the helper tool to get the list, or run:
                     git diff --name-status $(git describe --abbrev=0 --tags) | grep -E '^[AM].*svg'

manual/content/history.html

@@ -150,7 +150,7 @@ void Enemy::finishDyingClassSpecifics() {
 /**
  * @brief Returns how many mission points this mob is currently worth, or
  * 0 if not applicable.
- * 
+ *
  * @param applicableInThisMission If not nullptr, whether the points are
  * applicable in this mission or not is returned here.
  * @return The point amount.

source/documents/misc_info.txt

@@ -137,7 +137,7 @@ class Leader : public Mob {
 
     //Timer for the animation of the health wheel's caution ring.
     float healthWheelCautionTimer = 0.0f;
-
+    
     //Health wheel shaker for when the leader takes damage.
     Shaker healthWheelShaker;
 

source/source/content/mob/enemy.cpp

@@ -142,10 +142,10 @@ enum FRACTION_NR_VISIBILITY {
 
     //There is nothing to show.
     FRACTION_NR_VISIBILITY_NONE,
-
+    
     //There is info, but should stay hidden till the leader cursor is on it.
     FRACTION_NR_VISIBILITY_CURSOR,
-
+    
     //There is information that should be shown.
     FRACTION_NR_VISIBILITY_ALWAYS,
 

source/source/content/mob/leader.h

@@ -1031,6 +1031,49 @@ PikminNestType::~PikminNestType() {
 }
 
 
+/**
+ * @brief Creates a bitmap containing smoothed colors between the nest's
+ * types.
+ */
+void PikminNestType::createColormap() {
+    if(pikTypes.empty()) return;
+    
+    //Create a keyframe interpolator that smoothly transitions
+    //between each type's color.
+    KeyframeInterpolator<ALLEGRO_COLOR> ki(pikTypes[0]->mainColor);
+    float span = 1;
+    if(pikTypes.size() > 1) {
+        span = 1.0f / (pikTypes.size() - 1);
+    }
+    for(size_t i = 1; i < pikTypes.size(); i++) {
+        ki.add(span * i, pikTypes[i]->mainColor, EASE_METHOD_IN_OUT);
+    }
+    
+    //Add a darker variant for single-type Onions.
+    if(pikTypes.size() == 1) {
+        ALLEGRO_COLOR c =
+            al_map_rgb_f(
+                pikTypes[0]->mainColor.r * 0.4f,
+                pikTypes[0]->mainColor.g * 0.4f,
+                pikTypes[0]->mainColor.b * 0.4f
+            );
+        ki.add(1.0, c, EASE_METHOD_IN_OUT);
+    }
+    
+    //Create the texture.
+    ALLEGRO_BITMAP* oldTargetBmp = al_get_target_bitmap();
+    int oldBmpFlags = al_get_new_bitmap_flags();
+    al_set_new_bitmap_flags(0); //Prevents automatic smoothing -- leads to gaps.
+    menuColormap = al_create_bitmap(100, 1);
+    al_set_target_bitmap(menuColormap);
+    for(int i = 0; i < 100; i++) {
+        al_put_pixel(i, 0, ki.get(i / 100.0f));
+    }
+    al_set_target_bitmap(oldTargetBmp);
+    al_set_new_bitmap_flags(oldBmpFlags);
+}
+
+
 /**
  * @brief Loads nest-related properties from a data file.
  *
@@ -1086,50 +1129,6 @@ void PikminNestType::loadProperties(DataNode* file, MobType* mobType) {
 }
 
 
-/**
- * @brief Creates a bitmap containing smoothed colors between the nest's
- * types.
- *
- */
-void PikminNestType::createColormap() {
-    if(pikTypes.empty()) return;
-    
-    //Create a keyframe interpolator that smoothly transitions
-    //between each type's color.
-    KeyframeInterpolator<ALLEGRO_COLOR> ki(pikTypes[0]->mainColor);
-    float span = 1;
-    if(pikTypes.size() > 1) {
-        span = 1.0f / (pikTypes.size() - 1);
-    }
-    for(size_t i = 1; i < pikTypes.size(); i++) {
-        ki.add(span * i, pikTypes[i]->mainColor, EASE_METHOD_IN_OUT);
-    }
-    
-    //Add a darker variant for single-type Onions.
-    if(pikTypes.size() == 1) {
-        ALLEGRO_COLOR c =
-            al_map_rgb_f(
-                pikTypes[0]->mainColor.r * 0.4f,
-                pikTypes[0]->mainColor.g * 0.4f,
-                pikTypes[0]->mainColor.b * 0.4f
-            );
-        ki.add(1.0, c, EASE_METHOD_IN_OUT);
-    }
-    
-    //Create the texture.
-    ALLEGRO_BITMAP* oldTargetBmp = al_get_target_bitmap();
-    int oldBmpFlags = al_get_new_bitmap_flags();
-    al_set_new_bitmap_flags(0); //Prevents automatic smoothing -- leads to gaps.
-    menuColormap = al_create_bitmap(100, 1);
-    al_set_target_bitmap(menuColormap);
-    for(int i = 0; i < 100; i++) {
-        al_put_pixel(i, 0, ki.get(i / 100.0f));
-    }
-    al_set_target_bitmap(oldTargetBmp);
-    al_set_new_bitmap_flags(oldBmpFlags);
-}
-
-
 /**
  * @brief Constructs a new track ride info struct object.
  *

source/source/content/mob/mob_enums.h

@@ -84,7 +84,7 @@ FRACTION_NR_VISIBILITY Pile::getFractionNumbersInfo(
 /**
  * @brief Returns how many mission points this mob is currently worth, or
  * 0 if not applicable.
- * 
+ *
  * @param applicableInThisMission If not nullptr, whether the points are
  * applicable in this mission or not is returned here.
  * @return The point amount.