bug fixes + new map

Robosturm · Dec 15, 2023 · 038b89b · 038b89b
1 parent bad26c2
commit 038b89b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/maps/2_player/Where Giants Have Fallen.map b/maps/2_player/Where Giants Have Fallen.map
diff --git a/objects/mapselection.cpp b/objects/mapselection.cpp
@@ -306,6 +306,10 @@ void MapSelection::updateSelection()
                         m_Items[i]->setHtmlText(headerInfo.m_mapName + mapNameEnding);
                     }
                 }
+                else
+                {
+                    CONSOLE_PRINT("Filtered out map: " + fullFilename, GameConsole::eDEBUG);
+                }
             }
         }
     }

diff --git a/objects/playerselection.cpp b/objects/playerselection.cpp
@@ -1155,7 +1155,9 @@ void PlayerSelection::showSelectCOPerks(qint32 player)
 
 void PlayerSelection::selectPlayerAi(qint32 player, GameEnums::AiTypes eAiType)
 {
-    if (player >= 0 && player < m_pMap->getPlayerCount())
+    if (m_pMap != nullptr &&
+        player >= 0 &&
+        player < m_pMap->getPlayerCount())
     {
         CONSOLE_PRINT("PlayerSelection::selectPlayerAi for player " + QString::number(player) + " with control type " + QString::number(eAiType), GameConsole::eDEBUG);
         m_pMap->getPlayer(player)->setControlType(eAiType);

diff --git a/resources/scripts/weapons/weapon_bomb.js b/resources/scripts/weapons/weapon_bomb.js
@@ -19,8 +19,8 @@ var Constructor = function()
                         ["RECON", 105],
 
                         // tanks
-                        ["FLAK", 55],
-                        ["HOVERFLAK", 55],
+                        ["FLAK", 85],
+                        ["HOVERFLAK", 85],
                         ["LIGHT_TANK", 105],
                         ["HOVERCRAFT", 105],
 

diff --git a/resources/scripts/weapons/weapon_vulcan_cannon.js b/resources/scripts/weapons/weapon_vulcan_cannon.js
@@ -40,8 +40,8 @@ var Constructor = function()
 
                         //air
                         ["DUSTER", 75],
-                        ["FIGHTER", 75],
-                        ["BOMBER", 75],
+                        ["FIGHTER", 70],
+                        ["BOMBER", 70],
                         ["STEALTHBOMBER", 75],
                         ["TRANSPORTPLANE", 75],
                         ["BLACK_BOMB", 75],
-Original file line number
+Diff line change
@@ Expand Up / @@ -306,6 +306,10 @@ void MapSelection::updateSelection() @@
                             m_Items[i]->setHtmlText(headerInfo.m_mapName + mapNameEnding);
                         }
                     }
+                    else
+                    {
+                        CONSOLE_PRINT("Filtered out map: " + fullFilename, GameConsole::eDEBUG);
+                    }
                 }
             }
         }
@@ Expand Down @@