From 0340087599cad69d64d3a3147247353c6127b349 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 27 Jun 2023 20:40:29 -0400 Subject: [PATCH] at wonderville --- namedropper/Assets/CardDataDrawer.cs | 26 +++- .../Assets/Prefabs/Category Prefab.prefab | 5 +- .../Assets/Resources/shapes/diamond.png | Bin 24265 -> 6147 bytes namedropper/Assets/Resources/shapes/wild.png | Bin 0 -> 4046 bytes .../Assets/Resources/shapes/wild.png.meta | 123 ++++++++++++++++++ namedropper/Assets/Scenes/Game.unity | 28 +++- namedropper/Assets/Scripts/CardData.cs | 17 ++- namedropper/Assets/Scripts/Category.cs | 18 ++- namedropper/Assets/Scripts/GameOverScreen.cs | 3 + namedropper/Assets/Scripts/Level.cs | 15 ++- namedropper/Assets/Scripts/Player.cs | 8 +- 11 files changed, 222 insertions(+), 21 deletions(-) create mode 100644 namedropper/Assets/Resources/shapes/wild.png create mode 100644 namedropper/Assets/Resources/shapes/wild.png.meta diff --git a/namedropper/Assets/CardDataDrawer.cs b/namedropper/Assets/CardDataDrawer.cs index c7ff233..143daae 100644 --- a/namedropper/Assets/CardDataDrawer.cs +++ b/namedropper/Assets/CardDataDrawer.cs @@ -7,6 +7,8 @@ public class CardDataDrawer : MonoBehaviour { [SerializeField] GameObject[] _shapeSprites; public CardData _cardData; + [SerializeField] bool _generateStars = false; + public int _numStarGenerators; // Start is called before the first frame update void Start() @@ -25,9 +27,31 @@ public class CardDataDrawer : MonoBehaviour public void Redraw() { + _numStarGenerators = 0; + + foreach (Category category in GameObject.FindObjectsOfType()) + { + if (category.IsStarGenerator() && category._color == GetComponent()?._team && _generateStars) + _numStarGenerators++; + } + + for (int i = 0; i < _shapeSprites.Length; i++) { - _shapeSprites[i].GetComponent().sprite = _cardData.GetSprite(i); + Sprite sprite; + if (i < _numStarGenerators) + { + string filename = "shapes/wild"; + sprite = Resources.Load(filename); + _shapeSprites[i].GetComponent().color = Color.yellow; + } + else + { + _shapeSprites[i].GetComponent().color = Color.white; + sprite = _cardData.GetSprite(i); + } + + _shapeSprites[i].GetComponent().sprite = sprite; if (_cardData._shapes[i] == CardData.Shape.NONE) _shapeSprites[i].SetActive(false); diff --git a/namedropper/Assets/Prefabs/Category Prefab.prefab b/namedropper/Assets/Prefabs/Category Prefab.prefab index 1a83b80..589ed89 100644 --- a/namedropper/Assets/Prefabs/Category Prefab.prefab +++ b/namedropper/Assets/Prefabs/Category Prefab.prefab @@ -227,6 +227,7 @@ MonoBehaviour: _feedbackBad: {fileID: 3551932467328341787} _streak: {fileID: 1565607471538169626} _shieldsText: {fileID: 3173673145629268070} + _color: 2 --- !u!61 &1085594869219034861 BoxCollider2D: m_ObjectHideFlags: 0 @@ -269,6 +270,8 @@ MonoBehaviour: - {fileID: 4698135363407727744} - {fileID: 1925658209779528050} - {fileID: 7294958316878599169} + _generateStars: 0 + _numStarGenerators: 0 --- !u!1 &1499098757547953155 GameObject: m_ObjectHideFlags: 0 @@ -449,7 +452,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1499098758628412651 Transform: m_ObjectHideFlags: 0 diff --git a/namedropper/Assets/Resources/shapes/diamond.png b/namedropper/Assets/Resources/shapes/diamond.png index fe1dcbe3adb94db553c3ea7e6a4318c4309ff331..966891d6dd892b48c833c01cd4bd3895fb308325 100644 GIT binary patch delta 5296 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

^`M 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 Q0DQo53$3SFtZp6le_L^=2><{9 diff --git a/namedropper/Assets/Resources/shapes/wild.png b/namedropper/Assets/Resources/shapes/wild.png new file mode 100644 index 0000000000000000000000000000000000000000..c493d5c72e484271a5cad7391d556e5d7d23eed5 GIT binary patch literal 4046 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 literal 0 HcmV?d00001 diff --git a/namedropper/Assets/Resources/shapes/wild.png.meta b/namedropper/Assets/Resources/shapes/wild.png.meta new file mode 100644 index 0000000..30bb393 --- /dev/null +++ b/namedropper/Assets/Resources/shapes/wild.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a9a84387ccd6bba4aa1bee072bcd3127 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/namedropper/Assets/Scenes/Game.unity b/namedropper/Assets/Scenes/Game.unity index e58b51a..058ec89 100644 --- a/namedropper/Assets/Scenes/Game.unity +++ b/namedropper/Assets/Scenes/Game.unity @@ -140,7 +140,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &23665175 RectTransform: m_ObjectHideFlags: 0 @@ -360,6 +360,10 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: 8866676399730726846, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: _generateStars + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text value: Josh @@ -1238,6 +1242,10 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4278190080 objectReference: {fileID: 0} + - target: {fileID: 8866676399730726846, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: _generateStars + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team value: 0 @@ -2086,7 +2094,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1499098758628412650, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1499098758628412651, guid: f3f23d9506e39c54cbd07779c62329a3, type: 3} propertyPath: m_LocalScale.x @@ -3184,9 +3192,11 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: D&D Monsters + m_Text: 'match as many + + sas psdsd' --- !u!222 &1415156233 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3231,7 +3241,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.026343895, g: 0.09431403, b: 0.1509434, a: 0} + m_BackGroundColor: {r: 0.103773594, g: 0.103773594, b: 0.103773594, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 @@ -4653,6 +4663,10 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4294967295 objectReference: {fileID: 0} + - target: {fileID: 8866676399730726846, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: _generateStars + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9049015333299688696, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: m_Text value: Josh @@ -5098,6 +5112,10 @@ PrefabInstance: propertyPath: m_fontColor32.rgba value: 4278190080 objectReference: {fileID: 0} + - target: {fileID: 8866676399730726846, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} + propertyPath: _generateStars + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9049015333349338377, guid: 56b5ab1b6ee02794ab9664e282d1930a, type: 3} propertyPath: _team value: 1 diff --git a/namedropper/Assets/Scripts/CardData.cs b/namedropper/Assets/Scripts/CardData.cs index ce7eb82..23db09d 100644 --- a/namedropper/Assets/Scripts/CardData.cs +++ b/namedropper/Assets/Scripts/CardData.cs @@ -14,16 +14,16 @@ public class CardData DIAMOND, //HEART, HOURGLASS, - //SPADE, + SPADE, //SQUARE, - STAR, + //STAR, TRIANGLE, X } public Shape[] _shapes; - public int CompareMatches(CardData otherCardData) + public int CompareMatches(int numStars, CardData otherCardData) { int score = 0; Shape[] tempOtherShapes = new Shape[otherCardData._shapes.Length]; @@ -37,6 +37,12 @@ public class CardData { for (int j = 0; j < tempOtherShapes.Length; j++) { + if (i < numStars) + { + score++; + break; + } + if (_shapes[i] == tempOtherShapes[j]) { score++; @@ -51,6 +57,7 @@ public class CardData public void Randomize(int count) { + _shapes = new Shape[count]; var rnd = new System.Random(Guid.NewGuid().GetHashCode()); @@ -58,10 +65,12 @@ public class CardData { do { - _shapes[i] = (Shape)rnd.Next(Enum.GetNames(typeof(Shape)).Length); + _shapes[i] = (Shape)rnd.Next(Enum.GetNames(typeof(Shape)).Length); } while (_shapes[i] == Shape.NONE); } + + } public Sprite GetSprite(int i) diff --git a/namedropper/Assets/Scripts/Category.cs b/namedropper/Assets/Scripts/Category.cs index b3e51a4..b2ee1b2 100644 --- a/namedropper/Assets/Scripts/Category.cs +++ b/namedropper/Assets/Scripts/Category.cs @@ -16,8 +16,9 @@ public class Category : MonoBehaviour [SerializeField] GameObject _streak; [SerializeField] TMPro.TMP_Text _shieldsText; - Player.Team _color = Player.Team.NEUTRAL; + public Player.Team _color = Player.Team.NEUTRAL; int _shields = 0; + const int NUM_SHIELDS_FOR_GENERATOR = 4; private void Awake() { @@ -60,6 +61,11 @@ public class Category : MonoBehaviour return 0; } + public bool IsStarGenerator() + { + return _shields >= NUM_SHIELDS_FOR_GENERATOR; + } + public void AddScore(int score, Player.Team team) { if (score <= 0) @@ -86,6 +92,16 @@ public class Category : MonoBehaviour _shieldsText.text += "O"; } + if (IsStarGenerator()) + { + _shieldsText.text = "STAR "; + + for (int i = 0; i < _shields - NUM_SHIELDS_FOR_GENERATOR; i++) + { + _shieldsText.text += "O"; + } + } + Color newColor = Color.white; if (_color == Player.Team.GREEN) { diff --git a/namedropper/Assets/Scripts/GameOverScreen.cs b/namedropper/Assets/Scripts/GameOverScreen.cs index d339fd3..21226c5 100644 --- a/namedropper/Assets/Scripts/GameOverScreen.cs +++ b/namedropper/Assets/Scripts/GameOverScreen.cs @@ -10,6 +10,9 @@ public class GameOverScreen : Level void Start() { + _gameOverMessage.text = "GAME OVER\n\nPress R\nto play again"; + return; + if (GameManager.Instance.NumTeams == 1) { int score = GameManager.Instance.Score1 + GameManager.Instance.Score2 + GameManager.Instance.Score3 + GameManager.Instance.Score4; diff --git a/namedropper/Assets/Scripts/Level.cs b/namedropper/Assets/Scripts/Level.cs index 1bb55db..f970301 100644 --- a/namedropper/Assets/Scripts/Level.cs +++ b/namedropper/Assets/Scripts/Level.cs @@ -56,13 +56,18 @@ public class Level : MonoBehaviour IEnumerator StartupProcess() { ActivatePlayers(false); + Topic.color = Color.white; + RoundNumber.color = Color.blue; if (Topic != null) Topic.gameObject.SetActive(false); yield return new WaitForSeconds(1f); - //if (Topic != null) - //Topic.gameObject.SetActive(true); - //yield return new WaitForSeconds(2f); - RoundNumber.text = ""; + if (Topic != null) + Topic.gameObject.SetActive(true); + + Topic.text = "Match as many shapes\nas you can!"; + yield return new WaitForSeconds(2f); + if (RoundNumber != null) + RoundNumber.text = ""; if (Topic != null) { Topic.text = "GO!"; @@ -111,7 +116,7 @@ public class Level : MonoBehaviour if (GameManager.Instance.PlayerJoined[player.GetComponent()._playerNumber] == true || SceneManager.GetActiveScene().name == "Title" || SceneManager.GetActiveScene().name == "Ontology" || - SceneManager.GetActiveScene().name == "Game" + SceneManager.GetActiveScene().name == "GameX" ) { player.SetActive(true); diff --git a/namedropper/Assets/Scripts/Player.cs b/namedropper/Assets/Scripts/Player.cs index 759c811..33866e4 100644 --- a/namedropper/Assets/Scripts/Player.cs +++ b/namedropper/Assets/Scripts/Player.cs @@ -13,7 +13,7 @@ public class Player : MonoBehaviour [SerializeField] KeyCode _keyRight; [SerializeField] KeyCode _keyDown; [SerializeField] KeyCode _keyDrop; - [SerializeField] Team _team; + public Team _team; [SerializeField] TMPro.TextMeshProUGUI _text; [SerializeField] List _longFonts = new List(); [SerializeField] List _shortFonts = new List(); @@ -254,7 +254,7 @@ public class Player : MonoBehaviour return; } - CardData categoryCardData = collision.gameObject.GetComponent()._cardData; + CardData categoryCardData = collision.gameObject.GetComponent()?._cardData; if (categoryCardData != null) @@ -262,7 +262,7 @@ public class Player : MonoBehaviour int score = 0; string message = ""; CardData myCardData = GetComponent()._cardData; - score = myCardData.CompareMatches(categoryCardData); + score = myCardData.CompareMatches(GetComponent()._numStarGenerators, categoryCardData); collision.gameObject.GetComponent().Redraw(); /* if (categoryCardData._shape == myCardData._shape) { @@ -288,7 +288,7 @@ public class Player : MonoBehaviour category.AddScore(score, _team); this.gameObject.SetActive(false); - Invoke("Respawn", 1f); + Invoke("Respawn", 1.5f); } /*