more fav things

namedropper/Assets/Resources/categories.yaml

@@ -1,4 +1,191 @@
 Topics:
+- Topic: Favorite Things
+  Categories:
+  - Category: Chris
+    Elements:
+    - Teaching
+    - Action meditation
+    - Creating experiences
+    - Connecting with people
+    - New York City
+    - Peaty whisky
+    - Biking
+    - Baked goods
+    - Competitive multiplayer games
+  - Category: Mike
+    Elements:
+    - All the pups
+    - The crack of a bat
+    - Smell of new leather
+    - Dungeon crawlers
+    - Opening day
+    - Life hacks
+    - Immersion tourism
+    - Game nights
+    - Costume parties
+    - Being near water
+  - Category: Sam
+    Elements:
+    - Cotton candy sunsets
+    - Bean & cheese burritos
+    - Red wine
+    - My fur babies
+    - Soy candles
+    - Slow Sunday mornings
+    - Jazz music
+    - Pastry stouts
+    - Summer bike rides
+    - 50 First Dates
+  - Category: Liam
+    Elements:
+    - popcorn
+    - outer wilds
+    - hollow knight
+    - water
+    - borderlands 2
+    - mango
+    - revenge
+  - Category: Mark
+    Elements:
+    - arcade games
+    - synthesizers
+    - pizza rolls
+    - riding a bike
+    - ramen noodles
+    - tracksuits
+    - calico cats
+    - baseball
+    - bourbon
+    - black coffee
+  - Category: Brian
+    Elements:
+    - tekken
+    - shrimp
+    - comedy
+    - countdown numbers gameshow
+    - the view
+    - karaoke
+    - cheese
+  - Category: Ezer
+    Elements:
+    - Jigsaw Puzzles
+    - Rabbit Holes
+    - Sleeping in Late
+    - Machining / Fabrication Vide-os
+    - Watching Playthroughs
+    - Watching Speed runs
+    - Well Told History
+    - Comics
+    - Eira (My Daughter)
+  - Category: Vinny
+    Elements:
+    - pizza
+    - ramen
+    - dumplings
+    - PS2
+    - jiujitsu
+    - cats
+  - Category: Mattia
+    Elements:
+    - Chocolate with hazelnuts
+    - Max Roach's drum beats
+    - Sheets of guitar noise
+    - Structural typing
+    - Essays by Rorty
+    - Lean RPGs
+  - Category: Harry
+    Elements:
+    - arcane knowledge
+    - wasp exoskeleton
+    - fresh snow at night
+    - Leon mischief giggles
+    - Sword canes
+    - heated jacket
+    - Strong water pressure
+    - nap
+    - caffeinated drawing
+    - Enter The Gungeon
+  - Category: Josh
+    Elements:
+    - Shopsin's
+    - Mangoes
+    - Lewis & Clark
+    - Backpack rap
+    - Jackie Brown
+    - Marvel Snap
+    - Jazz saxophone
+    - Crosswords
+    - My wife Amanda
+    - Bonne Maman jelly
+    - Bukowski
+    - Nabokov
+    - Broguelikes
+    - The Magnetic Fields
+  - Category: Yalan
+    Elements:
+    - Tea with milk
+    - silky bed sheet
+    - hot spring
+    - High ceiling
+    - furry dog
+  - Category: Mus
+    Elements:
+    - The Good, the Bad & the Ugly
+    - Dragon Ball Z
+    - One Piece
+    - Spider-man
+    - Killer Queen Arcade
+    - Sculpting
+    - Dawn
+    - Rainy days in
+    - Smash Bros Melee
+    - Action figures
+  - Category: Nik
+    Elements:
+    - Chicken Fried steak
+    - Black Sabbath
+    - The Kinks
+    - They Might be Giants
+    - Led Zeppelin
+    - Motown
+    - Disco
+    - Swimming
+    - Jiu Jitsu
+    - 70s Blaxploitation
+    - Quentin Tarantino
+    - Super Smash Brothers
+    - Scott Pilgrim
+    - The Legend of Zelda
+    - Hedwig & the Angry Inch
+    - Cappuccinos
+    - Philip K Dick
+    - Vector Displays
+    - Attack on Titan
+  - Category: Amanda
+    Elements:
+    - bourbon neat
+    - black coffee
+    - Hooded sweatshirts
+    - Books
+    - Campfires
+    - Tent camping
+    - Exploring new places
+    - L&B Spumoni Gardens
+    - Sausage, egg and cheese
+    - black pepper
+
+  - Category: Maria von Trapp
+    Elements:
+    - raindrops on roses
+    - whiskers on kittens
+    - bright copper kettles
+    - warm woolen mittens
+    - cream-colored ponies
+    - crisp apple strudels
+    - doorbells
+    - sleigh bells
+    - schnitzel with noodles
+
 - Topic: Contemporary TV
   Categories:
   - Category: White Lotus

namedropper/Assets/Resources/categories.yaml.bak

@@ -1,4 +1,203 @@
 Topics:
+- Topic: Favorite Things
+  Categories:
+  
+  Teaching
+Action meditation
+Creating experiences
+Connecting with people in a deep way
+New York City
+Peaty whisky
+Biking
+Baked goods
+Competitive multiplayer games
+
+  - Category: Chris
+    Elements:
+    - All the pups
+    - The crack of a bat
+    - Smell of new leather
+    - Dungeon crawlers
+    - Opening day
+    - Life hacks
+    - Immersion tourism
+    - Game nights
+    - Costume parties
+    - Being near water
+  - Category: Mike
+    Elements:
+    - All the pups
+    - The crack of a bat
+    - Smell of new leather
+    - Dungeon crawlers
+    - Opening day
+    - Life hacks
+    - Immersion tourism
+    - Game nights
+    - Costume parties
+    - Being near water
+  - Category: Sam
+    Elements:
+    - Cotton candy sunsets
+    - Bean & cheese burritos
+    - Red wine
+    - My fur babies
+    - Soy candles
+    - Slow Sunday mornings
+    - Jazz music
+    - Pastry stouts
+    - Summer bike rides
+    - 50 First Dates
+  - Category: Liam
+    Elements:
+    - popcorn
+    - outer wilds
+    - hollow knight
+    - water
+    - borderlands 2
+    - mango
+    - revenge
+  - Category: Mark
+    Elements:
+    - arcade games
+    - synthesizers
+    - pizza rolls
+    - riding a bike
+    - ramen noodles
+    - tracksuits
+    - calico cats
+    - baseball
+    - bourbon
+    - black coffee
+  - Category: Brian
+    Elements:
+    - tekken
+    - shrimp
+    - comedy
+    - countdown numbers gameshow
+    - the view
+    - karaoke
+    - cheese
+  - Category: Ezer
+    Elements:
+    - Jigsaw Puzzles
+    - Rabbit Holes
+    - Sleeping in Late
+    - Machining / Fabrication Vide-os
+    - Watching Playthroughs
+    - Watching Speed runs
+    - Well Told History
+    - Comics
+    - Eira (My Daughter)
+  - Category: Vinny
+    Elements:
+    - pizza
+    - ramen
+    - dumplings
+    - PS2
+    - jiujitsu
+    - cats
+  - Category: Mattia
+    Elements:
+    - Chocolate with hazelnuts
+    - Max Roach's drum beats
+    - Sheets of guitar noise
+    - Structural typing
+    - Essays by Rorty
+    - Lean RPGs
+  - Category: Harry
+    Elements:
+    - arcane knowledge
+    - wasp exoskeleton
+    - fresh snow at night
+    - Leon mischief giggles
+    - Sword canes
+    - heated jacket
+    - Strong water pressure
+    - nap
+    - caffeinated drawing
+    - Enter The Gungeon
+  - Category: Josh
+    Elements:
+    - Shopsin's
+    - Mangoes
+    - Lewis & Clark
+    - Backpack rap
+    - Jackie Brown
+    - Marvel Snap
+    - Jazz saxophone
+    - Crosswords
+    - My wife Amanda
+    - Bonne Maman jelly
+    - Bukowski
+    - Nabokov
+    - Broguelikes
+    - The Magnetic Fields
+  - Category: Yalan
+    Elements:
+    - Tea with milk
+    - silky bed sheet
+    - hot spring
+    - High ceiling
+    - furry dog
+  - Category: Mus
+    Elements:
+    - The Good, the Bad & the Ugly
+    - Dragon Ball Z
+    - One Piece
+    - Spider-man
+    - Killer Queen Arcade
+    - Sculpting
+    - Dawn
+    - Rainy days in
+    - Smash Bros Melee
+    - Action figures
+  - Category: Nik
+    Elements:
+    - Chicken Fried steak
+    - Black Sabbath
+    - The Kinks
+    - They Might be Giants
+    - Led Zeppelin
+    - Motown
+    - Disco
+    - Swimming
+    - Jiu Jitsu
+    - 70s Blaxploitation
+    - Quentin Tarantino
+    - Super Smash Brothers
+    - Scott Pilgrim
+    - The Legend of Zelda
+    - Hedwig & the Angry Inch
+    - Cappuccinos
+    - Philip K Dick
+    - Vector Displays
+    - Attack on Titan
+  - Category: Amanda
+    Elements:
+    - bourbon neat
+    - black coffee
+    - Hooded sweatshirts
+    - Books
+    - Campfires
+    - Tent camping
+    - Exploring new places
+    - L&B Spumoni Gardens
+    - Sausage, egg and cheese
+    - black pepper
+
+  - Category: Maria von Trapp
+    Elements:
+    - raindrops on roses
+    - whiskers on kittens
+    - bright copper kettles
+    - warm woolen mittens
+    - cream-colored ponies
+    - crisp apple strudels
+    - doorbells
+    - sleigh bells
+    - schnitzel with noodles
+
 - Topic: Contemporary TV
   Categories:
   - Category: White Lotus
@@ -1067,7 +1266,7 @@ Topics:
     - Spike Spiegel
     - Jet Black
     - Faye Valentine
-    - Edward
+    - Edward Wong
     - Vicious
     - Julia
     - Gren
@@ -1179,18 +1378,17 @@ Topics:
     - Liberty
     - Commander
     - Wagoneer
-  - Category: RAM
+  - Category: Dodge
     Elements:
-    - 1500
-    - 2500
-    - 3500
-    - ProMaster
-    - ProMaster City
+    - Durango
+    - Challenger
+    - Charger
+    - Ram
+    - Dart
     - Dakota
-    - 5500 Chassis Cab
-    - 4500 Chassis Cab
-    - 3500 Chassis Cab
-    - 2500 Chassis Cab
+    - Hornet
+    - Rumble Bee
+    - Rebel
   - Category: GMC
     Elements:
     - Sierra

namedropper/Assets/Scripts/ChallengingStage.cs

@@ -53,7 +53,7 @@ public class ChallengingStage : Level
     {
         if (Input.GetKeyDown(KeyCode.F12))
         {
-            SceneManager.LoadScene("TopicSelect");
+            SceneManager.LoadScene("RaceGame");
         }
     }
     IEnumerator Countdown()
@@ -75,7 +75,7 @@ public class ChallengingStage : Level
         Game.Paused = true;
         yield return new WaitForSeconds(2.5f);
         Game.Paused = false;
-        SceneManager.LoadScene("TopicSelect");
+        SceneManager.LoadScene("RaceGame");
 
     }
 

namedropper/Assets/Scripts/GameDataManager.cs

@@ -22,20 +22,34 @@ public class GameDataManager {
         _gameData = deserializer.Deserialize<GameData>(yamlText);
     }
 
-    public TopicData GetRandomTopicData()
+    public TopicData GetRandomTopicData(bool ignoreFirst=false)
     {
-        if (_gameData.Topics.Count == 0)
+        if (_gameData.Topics.Count == 0 || (ignoreFirst && _gameData.Topics.Count == 1))
         {
             Reset();
         }
 
         int topicIndex = Random.Range(0, _gameData.Topics.Count);
+        if (ignoreFirst && topicIndex == 0)
+            topicIndex = 1;
+
         TopicData topicData = _gameData.Topics[topicIndex];
         _gameData.Topics.RemoveAt(topicIndex);
 
         return topicData;
     }
 
+    public TopicData GetFirstTopicData()
+    {
+        if (_gameData.Topics.Count == 0)
+        {
+            Reset();
+        }
+
+        TopicData topicData = _gameData.Topics[0];
+        return topicData;
+    }
+
     public CategoryData GetRandomCategoryData(TopicData topicData, bool removeFromTopic = true)
     {
 

namedropper/Assets/Scripts/GameManager.cs

@@ -19,7 +19,7 @@ public class GameManager
     int _round = 1;
     public bool[] PlayerJoined = new bool[4];
 
-    public static bool MINIGAMES = true;
+    public static bool MINIGAMES = false;
     public static int PLAYER_SKIN = 5; //0 == puck, 1 == pancake, 2 == gummybear, 3==pig, 4==ball w/ bear, 5==pop
     public static int MAX_PLAYER_SKIN = 5;
     public static int MVP = -1;

namedropper/Assets/Scripts/JoinPlayer.cs

@@ -103,7 +103,7 @@ public class JoinPlayer : MonoBehaviour
         if (GameManager.MINIGAMES)
             SceneManager.LoadScene("Wheel Scene");
         else
-            SceneManager.LoadScene("TopicSelect");
+            SceneManager.LoadScene("RaceGame");
     }
 
     void Redo()

namedropper/Assets/Scripts/Level.cs

@@ -107,7 +107,9 @@ public class Level : MonoBehaviour
             {
                 if (GameManager.Instance.PlayerJoined[player.GetComponent<Player>()._playerNumber] == true ||
                     SceneManager.GetActiveScene().name == "Title" ||
-                    SceneManager.GetActiveScene().name == "Ontology"
+                    SceneManager.GetActiveScene().name == "Ontology" ||
+                    SceneManager.GetActiveScene().name == "RaceGame" ||
+                    SceneManager.GetActiveScene().name == "Game"
                     )
                 {
                     player.SetActive(true);
@@ -185,16 +187,17 @@ public class Level : MonoBehaviour
         {
             SceneManager.LoadScene("GameOver");
         }
-        else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false)
+       /* else if (GameManager.Instance.Round == 3 && GameManager.MINIGAMES == false)
         {
             SceneManager.LoadScene("ChallengingStage");
         }
+       */
         else
         {
             if (GameManager.MINIGAMES)
                 SceneManager.LoadScene("Wheel Scene");
             else
-                SceneManager.LoadScene("TopicSelect");
+                SceneManager.LoadScene("RaceGame");
         }
     }
 }

namedropper/Assets/Scripts/Player.cs

@@ -12,6 +12,7 @@ public class Player : MonoBehaviour
     [SerializeField] KeyCode _keyLeft;
     [SerializeField] KeyCode _keyRight;
     [SerializeField] KeyCode _keyDown;
+    [SerializeField] KeyCode _keyUp;
     [SerializeField] KeyCode _keyDrop;
     [SerializeField] Team _team;
     [SerializeField] TMPro.TextMeshProUGUI _text;
@@ -483,6 +484,10 @@ public class Player : MonoBehaviour
             {
                 AddVelocity(new Vector2(0f, _curSpeed * Time.deltaTime * -1f));
             }
+            if (Input.GetKey(_keyUp))
+            {
+                AddVelocity(new Vector2(0f, _curSpeed * Time.deltaTime * 1f));
+            }
         }
 
         if (Input.GetKey(_keyDrop) && ALLOW_DROP)

namedropper/Assets/Scripts/TopicSelect.cs

@@ -17,7 +17,7 @@ public class TopicSelect : Level
 
 
     public const bool WORST_PLAYER_PICKS = false;
-    public const bool WORST_TEAM_PICKS = true;
+    public const bool WORST_TEAM_PICKS = false;
     public const bool VOTE_ON_TOPIC = false;
 
 
@@ -244,9 +244,9 @@ public class TopicSelect : Level
             }
             }
 
-            _topic1Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
-        _topic2Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
-        _topic3Box.TopicData = GameDataManager.Instance.GetRandomTopicData();
+        _topic1Box.TopicData = GameDataManager.Instance.GetRandomTopicData(true);
+        _topic2Box.TopicData = GameDataManager.Instance.GetFirstTopicData();
+        _topic3Box.TopicData = GameDataManager.Instance.GetRandomTopicData(true);
         _topic1Box.Name = _topic1Box.TopicData.Topic;
         _topic2Box.Name = _topic2Box.TopicData.Topic;
         _topic3Box.Name = _topic3Box.TopicData.Topic;