From 638d4c214da72841948eb6bb4ff695baf84e8082 Mon Sep 17 00:00:00 2001 From: ThePurpleAnon <100617766+ThePurpleAnon@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:02:44 -0600 Subject: [PATCH] PR-ready-ified added a "WIP" to manzai's title, and commented out all the unfinished shit --- .../Prefabs/GameView/GameTex.renderTexture | 4 ++-- .../Prefabs/GameView/OverlayTex.renderTexture | 4 ++-- Assets/Scripts/Games/Manzai/Manzai.cs | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture index 70ff84385..0901ec838 100644 --- a/Assets/Resources/Prefabs/GameView/GameTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/GameTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1043 - m_Height: 587 + m_Width: 947 + m_Height: 533 m_AntiAliasing: 2 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture index 5a5647b97..3058e8cc8 100644 --- a/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture +++ b/Assets/Resources/Prefabs/GameView/OverlayTex.renderTexture @@ -14,8 +14,8 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 5 - m_Width: 1564 - m_Height: 880 + m_Width: 1420 + m_Height: 799 m_AntiAliasing: 1 m_MipCount: -1 m_DepthStencilFormat: 92 diff --git a/Assets/Scripts/Games/Manzai/Manzai.cs b/Assets/Scripts/Games/Manzai/Manzai.cs index ac829f0ba..6cd49f9a6 100644 --- a/Assets/Scripts/Games/Manzai/Manzai.cs +++ b/Assets/Scripts/Games/Manzai/Manzai.cs @@ -13,7 +13,7 @@ namespace HeavenStudio.Games.Loaders { public static Minigame AddGame(EventCaller eventCaller) { - return new Minigame("manzai", "Manzai", "72003D", false, false, new List() + return new Minigame("manzai", "(WIP) Manzai", "72003D", false, false, new List() { new GameAction("bop", "Bop") { @@ -43,13 +43,13 @@ namespace HeavenStudio.Games.Loaders parameters = new List() { new Param("boing", Manzai.BoingType.Normal, "Pun Type", "Will Kosuke mess up his pun?"), - new Param("random", true, "Random Voiceline", "Use a random pun?", new List() + /*new Param("random", true, "Random Voiceline", "Use a random pun?", new List() { new Param.CollapseParam((x, _) => !(bool)x, new string[] { "pun" }), new Param.CollapseParam((x, _) => (bool)x, new string[] { "unused" }) - }), + }),*/ new Param("pun", Manzai.Puns.FutongaFuttonda, "Which Pun?", "Which pun will Kosuke say?"), - new Param("unused", false, "Include Unused", "Will unused puns be picked?"), + //new Param("unused", false, "Include Unused", "Will unused puns be picked?"), new Param("pitch", true, "Pitch Voiceline", "Will the pun pitch with the tempo?"), } }, @@ -167,12 +167,12 @@ namespace HeavenStudio.Games public enum Puns { - AichiniAichinna, + /*AichiniAichinna, AmmeteAmena, ChainaniNichaina, - DenwariDenwa, //short animation + DenwariDenwa,*/ //short animation FutongaFuttonda, - HiromegaHirameida, + /*HiromegaHirameida, IkagariKatta, IkugawaIkura, //short animation (boing unused) KaeruBurikaeru, @@ -200,7 +200,7 @@ namespace HeavenStudio.Games ToiletNiIttoire, TonakaiyoOtonokoi, TorinikugaTorininkui, - UmetteUmena, + UmetteUmena,*/ Muted, }