From 408b95decc80bcf0af822c8216339613028bdf3e Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 11 Jan 2023 17:33:41 -0500 Subject: [PATCH] 2 categories --- namedropper/Assets/Resources/categories.yaml | 94 ++++++++++++++++++-- namedropper/Assets/Scripts/Category.cs | 2 +- namedropper/Assets/Scripts/Game.cs | 8 +- 3 files changed, 94 insertions(+), 10 deletions(-) diff --git a/namedropper/Assets/Resources/categories.yaml b/namedropper/Assets/Resources/categories.yaml index a67ea74..63e63f1 100644 --- a/namedropper/Assets/Resources/categories.yaml +++ b/namedropper/Assets/Resources/categories.yaml @@ -1,5 +1,5 @@ Topics: -- Topic: TV +- Topic: Contemporary TV Categories: - Category: White Lotus Elements: @@ -70,13 +70,93 @@ Topics: - Gomez Addams - Pugsley Addams - Larissa Weems -- Topic: Hip Hop +- Topic: 90's Hip-Hop Categories: - - Category: Biggie + - Category: The Notorious B.I.G. Elements: - - Ready to Die + - Hypnotize + - Big Poppa - Juicy - - Category: Pac + - Mo Money Mo Problems + - Gimme The Loot + - Notorious Thugs + - Things Done Changed + - Ready To Die + - One More Chance + - Everyday Struggle + - Ten Crack Commandments + - Category: 2Pac Elements: - - All Eyez - - HIt Em Up + - Hit 'Em Up + - California Love + - All Eyez On Me + - Ambitionz Az A Ridah + - Changes + - Hail Mary + - Dear Mama + - Keep Ya Head Up + - Category: Nas + Elements: + - N.Y. State of Mind + - If I Ruled the World (Imagine That) + - The World Is Yours + - I Aint' Hard To Tell + - The Message + - Represent + - Nas Is Like + - I Can + - Category: Jay-Z + Elements: + - Izzo (H.O.V.A) + - Blueprint (Momma Loves Me) + - Big Pimpin' + - Hard Knock Life (Ghetto Anthem) + - Can I Get A... + - Empire State of Mind #actually 2009 + - Dirt Off Your Shoulder + - Moment of Clarity + - 99 Problems + - Change Clothes + - Category: Outkast + Elements: + - ATLeins + - Ms. Jackson + - So Fresh, So Clean + - B.O.B - Bombs Over Baghdad + - Stankonia (Stanklove) + - GhettoMusick + - The Way You Move + - Bowtie + - Where Are My Panties + - Hey Ya! + - Roses + - Category: Snoop Dogg + Elements: + - Still D.R.E. + - Gin And Juice + - Nuthin' But A "G" Thang + - Doggfather + - Who Am I?(What's My Name?) + - Still A G Thang + - Doggy Dogg World + - Woof! + - Category: Wu-Tang Clan + Elements: + - C.R.E.A.M. + - Protect Ya Neck + - Method Man + - Can It Be All So Simple + - Bring Da Ruckus + - Wu-Tang Clain Ain't Nuthing Ta F' Wit + - Triumph + - Category: Lauryn Hill + Elements: + - Guantanamera + - Turn Your Lights Down Low + - To Zion + - Lost Ones + - The Miseducation of Lauryn Hill + - Doo Wop (That Thing)) + - Everything is Everything + - When It Hurts So Bad + - Every Ghotto, Every City diff --git a/namedropper/Assets/Scripts/Category.cs b/namedropper/Assets/Scripts/Category.cs index d21d213..2a7109d 100644 --- a/namedropper/Assets/Scripts/Category.cs +++ b/namedropper/Assets/Scripts/Category.cs @@ -44,7 +44,7 @@ public class Category : MonoBehaviour ShowFeedback(_feedbackBad, false); } - void ResetElements() + public void ResetElements() { WorkingElements.Clear(); foreach (string element in Elements) diff --git a/namedropper/Assets/Scripts/Game.cs b/namedropper/Assets/Scripts/Game.cs index 5748329..08609b0 100644 --- a/namedropper/Assets/Scripts/Game.cs +++ b/namedropper/Assets/Scripts/Game.cs @@ -3,6 +3,7 @@ using UnityEngine.UI; using System.IO; using YamlDotNet.Serialization; using YamlDotNet.Serialization.NamingConventions; +using UnityEngine.SceneManagement; public class Game : MonoBehaviour { @@ -26,7 +27,6 @@ public class Game : MonoBehaviour _categories = FindObjectsOfType(); int topicIndex = Random.Range(0, _gameData.Topics.Count); - topicIndex = 0; TopicData topicData = _gameData.Topics[topicIndex]; _gameData.Topics.RemoveAt(topicIndex); @@ -38,6 +38,7 @@ public class Game : MonoBehaviour category.Name = categoryData.Category; category.Elements = categoryData.Elements; + category.ResetElements(); } } @@ -130,6 +131,9 @@ public class Game : MonoBehaviour // Update is called once per frame void Update() { - + if (Input.GetKeyDown(KeyCode.R)) + { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } } }