[Story mode] Add optional challenges (#208)

* Add support for optional challenges.

* Add optional challenges

Author: NicEastvillage

rlbot_gui/gui/imgs/story/checkmark-outline-100px.png

@@ -1,4 +1,3 @@
-
 import StoryUpgrades from './story-upgrades.js';
 import StoryPickTeam from './story-pick-team.js';
 import StoryRecruitList from './story-recruit-list.js';
@@ -8,12 +7,14 @@ const DEBUG = false;
 const CITY_STATE = {
     'LOCKED': 0,
     'OPEN': 1,
-    'DONE': 2
+    'OPTIONALS_LEFT': 2,
+    'DONE': 3
 };
 
 const CITY_ICON_MAP = [
     'imgs/story/lock-100px.png', // LOCKED
-    '',
+    '', // OPEN
+    'imgs/story/checkmark-outline-100px.png', // OPTIONALS_LEFT
     'imgs/story/checkmark-100px.png' // DONE
 ];
 
@@ -193,7 +194,7 @@ export default {
                                 <b-button block
                                     @click="$refs.pickTeamPopup.show(challenge)"
                                     v-bind:variant="challengeCompleted(challenge.id)? 'outline-dark' : 'outline-primary' ">
-                                    {{challenge.display}}
+                                    {{!!challenge.optional ? "Optional: " + challenge.display : challenge.display}}
                                 </b-button>
                             </b-list-group-item>
                         </b-list-group>
@@ -273,7 +274,6 @@ export default {
             return result;
         },
         recruit_list: function () {
-            const completed = this.saveState.challenges_completed;
             let recruits = {};
 
             for (let city of Object.keys(this.challenges)) {
@@ -306,13 +306,17 @@ export default {
                 return;
             }
             else {
-                let open_cities = Object.keys(
-                    this.cityDisplayInfo).filter((city) =>
-                        this.getCityState(city) == CITY_STATE.OPEN);
-
-                let random = open_cities[Math.floor(Math.random() * open_cities.length)];
-                console.log(random);
-                this.selectedCityId = random;
+                let open_cities = Object.keys(this.cityDisplayInfo)
+                    .filter((city) => this.getCityState(city) == CITY_STATE.OPEN);
+                // Fall back to cities with optional challenges left
+                if (open_cities.length === 0)
+                    open_cities = Object.keys(this.cityDisplayInfo)
+                        .filter((city) => this.getCityState(city) == CITY_STATE.OPTIONALS_LEFT);
+                // Fall back to cur
+                if (open_cities.length === 0)
+                    this.selectedCityId = cur;
+                else
+                    this.selectedCityId = open_cities[Math.floor(Math.random() * open_cities.length)];
             }
         },
         challengeCompleted: function (id) {
@@ -325,6 +329,7 @@ export default {
             const suffix = [
                 'is still locked.',
                 'is open to challenge!',
+                'has optional challenges!',
                 'has been completed!'
             ];
             return displayName + ' ' + suffix[state];
@@ -341,13 +346,23 @@ export default {
             let state = CITY_STATE.LOCKED;
 
             let prereqs = this.cityDisplayInfo[city].prereqs;
-            if (prereqs.every(c => (this.getCityState(c) === CITY_STATE.DONE))) {
-                state = CITY_STATE.OPEN;
+            if (prereqs.every(c => [CITY_STATE.DONE, CITY_STATE.OPTIONALS_LEFT].includes(this.getCityState(c)))) {
+                let anyOptionalsLeft = false
+                let anyRequiredLeft = false
 
-                // only need to check completion of challenges if we are open
                 let cityChallenges = this.challenges[city];
-                if (cityChallenges.every(c => this.challengeCompleted(c.id))) {
-                    state = CITY_STATE.DONE;
+                for (const c of cityChallenges) {
+                    if (!this.challengeCompleted(c.id)) {
+                        if (!!c.optional) anyOptionalsLeft = true
+                        else anyRequiredLeft = true
+                    }
+                }
+                if (anyRequiredLeft) {
+                    state = CITY_STATE.OPEN
+                } else if (anyOptionalsLeft) {
+                    state = CITY_STATE.OPTIONALS_LEFT
+                } else {
+                    state = CITY_STATE.DONE
                 }
             }
             return state;

rlbot_gui/gui/js/story-challenges.js

@@ -94,6 +94,16 @@
         "type": "rlbot",
         "path": ["$RLBOTPACKROOT", "RLBotPack", "PhoenixCS", "phoenix.cfg"]
     },
+    "broccoli": {
+        "name": "BroccoliBot",
+        "type": "rlbot",
+        "path": ["$RLBOTPACKROOT", "RLBotPack", "BroccoliBot", "BroccoliBot.cfg"]
+    },
+    "bribble": {
+        "name": "Bribblebot",
+        "type": "rlbot",
+        "path": ["$RLBOTPACKROOT", "RLBotPack", "Bribblebot", "bot.cfg"]
+    },
     "atlas": {
         "name": "Atlas",
         "type": "rlbot",
@@ -119,6 +129,16 @@
         "type": "rlbot",
         "path": ["$RLBOTPACKROOT", "RLBotPack", "beastbot", "beastbot.cfg"]
     },
+    "noobbot": {
+        "name": "Noob Bot",
+        "type": "rlbot",
+        "path": ["$RLBOTPACKROOT", "RLBotPack", "Noob_Bot", "src", "bot.cfg"]
+    },
+    "monkey": {
+        "name": "Monkey",
+        "type": "rlbot",
+        "path": ["$RLBOTPACKROOT", "RLBotPack", "Monkey", "bot.cfg"]
+    },
     "cryo": {
         "name": "Codename Cryo",
         "type": "rlbot",

rlbot_gui/story/bots-base.json

@@ -15,6 +15,14 @@
                     "map": "BeckwithPark",
                     "disabledBoost": true,
                     "display": "Win something so we know you can drive"
+                },
+                {
+                    "id": "INTRO-2",
+                    "humanTeamSize": 1,
+                    "opponentBots": ["noobbot"],
+                    "optional": true,
+                    "map": "BeckwithPark_Dawn",
+                    "display": "A training partner challenges you"
                 }
             ]
         },
@@ -42,6 +50,14 @@
                     },
                     "map": "UrbanCentral_Dawn",
                     "display": "Upgrade your reputation by beating your opponents by 3 or more goals"
+                },
+                {
+                    "id": "TRYHARD-3",
+                    "humanTeamSize": 1,
+                    "opponentBots": ["monkey"],
+                    "optional": true,
+                    "map": "UrbanCentral_Dawn",
+                    "display": "A stranger is experimenting with their new ML tech."
                 }
             ]
         },
@@ -65,6 +81,18 @@
                     "opponentBots": ["rashbot", "stick", "leaf"],
                     "map": "Mannfield_Stormy",
                     "display": "2v3! Get through this storm of Marvin bots!"
+                },
+                {
+                    "id": "PBOOST-3",
+                    "humanTeamSize": 2,
+                    "opponentBots": ["broccoli", "molten", "phoenix"],
+                    "completionConditions": {
+                        "win": true,
+                        "scoreDifference": 3
+                    },
+                    "optional": true,
+                    "map": "DFHStadium_Stormy",
+                    "display": "Broccoli and bots on fire - this place is wild"
                 }
             ]
         },
@@ -96,6 +124,14 @@
                     },
                     "map": "Wasteland",
                     "display": "Win and get at least two demos"
+                },
+                {
+                    "id": "WASTELAND-3",
+                    "humanTeamSize": 3,
+                    "opponentBots": ["bribble", "bribble", "wildfire"],
+                    "map": "Wasteland_Night",
+                    "optional": true,
+                    "display": "These bot wants to show you what strategic demos are"
                 }
             ]
         },
@@ -134,19 +170,27 @@
                 "display": "There's something unnatural about these bots..."
             },
             {
-                "id": "CS-5",
+                "id": "CS-4",
                 "humanTeamSize": 1,
                 "opponentBots": ["snek", "peter"],
                 "max_score": "3 Goals",
                 "map": "NeoTokyo",
                 "display": "How does that car turn so fast?"
             },
             {
-                "id": "CS-4",
+                "id": "CS-5",
                 "humanTeamSize": 2,
                 "opponentBots": ["invisibot"],
                 "map": "NeoTokyo",
                 "display": "Wait where did that car go?"
+            },
+            {
+                "id": "CS-6",
+                "humanTeamSize": 1,
+                "opponentBots": ["snek", "snek", "snek"],
+                "map": "NeoTokyo",
+                "optional": true,
+                "display": "You find yourself in a game of Tron"
             }
             ]
         },
@@ -198,6 +242,22 @@
                     "opponentBots": ["nexto"],
                     "map": "ChampionsField_Day",
                     "display": "You made it to the top. Time to face the champion."
+                },
+                {
+                    "id": "CHAMP-7",
+                    "humanTeamSize": 1,
+                    "opponentBots": ["invisibot", "invisibot"],
+                    "map": "Mannfield_Night",
+                    "optional": true,
+                    "display": "A master does not have to see their opponents. Right?"
+                },
+                {
+                    "id": "CHAMP-8",
+                    "humanTeamSize": 1,
+                    "opponentBots": ["nexto", "nexto"],
+                    "map": "ChampionsField_Day",
+                    "optional": true,
+                    "display": "The ultimate champion challenge"
                 }
             ]
         }

rlbot_gui/story/story-default.json

@@ -27,13 +27,15 @@
             "challenges": [
                 {
                     "id": "TRYHARD-1",
+                    "optional": true,
                     "humanTeamSize": 2,
                     "opponentBots": ["nombot", "beast"],
                     "map": "UrbanCentral",
                     "display": "Beat local up-and-comers in a 2v2."
                 },
                 {
                     "id": "TRYHARD-2",
+                    "optional": true,
                     "humanTeamSize": 2,
                     "opponentBots": ["penguin", "beast"],
                     "completionConditions": {
@@ -175,7 +177,7 @@
                     "display": "This ML prodigy would like to have a word with you."
                 },
                 {
-                    "id": "CHAMP-4",
+                    "id": "CHAMP-5",
                     "humanTeamSize": 3,
                     "opponentBots": ["bumblebee", "bumblebee", "bumblebee"],
                     "map": "ChampionsField",