From e4e576700761ab1c788806a76eb06e8d5d63c984 Mon Sep 17 00:00:00 2001
From: ThatZeoMan <67521686+ThatZeoMan@users.noreply.github.com>
Date: Thu, 4 Jan 2024 20:53:47 -0600
Subject: [PATCH] Blue Bear Text Update
---
.../materials/field/stand.png.meta | 17 +++++++++++-
Assets/Scripts/Games/BlueBear/BlueBear.cs | 26 +++++++++----------
2 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/Assets/Resources/Models/Games/RhythmRally/materials/field/stand.png.meta b/Assets/Resources/Models/Games/RhythmRally/materials/field/stand.png.meta
index 80da3e7b9..05f0492f6 100644
--- a/Assets/Resources/Models/Games/RhythmRally/materials/field/stand.png.meta
+++ b/Assets/Resources/Models/Games/RhythmRally/materials/field/stand.png.meta
@@ -3,7 +3,7 @@ guid: 0f640706f6e1ac240aeaef7d039c8f6a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
- serializedVersion: 11
+ serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 0
@@ -24,6 +24,7 @@ TextureImporter:
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
+ ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
@@ -62,6 +63,7 @@ TextureImporter:
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
+ cookieLightType: 1
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
@@ -99,6 +101,18 @@ TextureImporter:
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: []
@@ -112,6 +126,7 @@ TextureImporter:
edges: []
weights: []
secondaryTextures: []
+ nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
diff --git a/Assets/Scripts/Games/BlueBear/BlueBear.cs b/Assets/Scripts/Games/BlueBear/BlueBear.cs
index 0840f5dc7..544808da8 100644
--- a/Assets/Scripts/Games/BlueBear/BlueBear.cs
+++ b/Assets/Scripts/Games/BlueBear/BlueBear.cs
@@ -22,8 +22,8 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 3,
parameters = new()
{
- new("long", false, "Mouth Hold"),
- new("open", true, "Should Open Mouth")
+ new("long", false, "Mouth Hold", "Toggle if Beary should keep his mouth and neck extended after catching the treat."),
+ new("open", true, "Open Mouth", "Toggle if Beary should open his mouth in preparation for the treat.")
}
},
new GameAction("cake", "Cake")
@@ -33,8 +33,8 @@ namespace HeavenStudio.Games.Loaders
defaultLength = 4,
parameters = new()
{
- new("long", false, "Mouth Hold"),
- new("open", true, "Should Open Mouth")
+ new("long", false, "Mouth Hold", "Toggle if Beary should keep his mouth and neck extended after catching the treat."),
+ new("open", true, "Open Mouth", "Toggle if Beary should open his mouth in preparation for the treat.")
}
},
new GameAction("stretchEmotion", "Emotion")
@@ -44,11 +44,11 @@ namespace HeavenStudio.Games.Loaders
resizable = true,
parameters = new List()
{
- new Param("type", BlueBear.EmotionStretchType.NoEmotion, "Emotion", "Which emotion should the blue bear use?", new()
+ new Param("type", BlueBear.EmotionStretchType.NoEmotion, "Emotion", "Set the emotion animation Beary should play.", new()
{
new((x, _) => (int)x != (int)BlueBear.EmotionStretchType.NoEmotion, new string[] { "instant" })
}),
- new Param("instant", false, "Instant"),
+ new Param("instant", false, "Instant", "Toggle if the emotion should jump to it's end state. Making \"LookUp\" instant will cause Beary to keep his head down."),
}
},
new GameAction("wind", "Wind")
@@ -66,25 +66,25 @@ namespace HeavenStudio.Games.Loaders
function = delegate { BlueBear.instance.OpenMouth(); },
defaultLength = 0.5f
},
- new GameAction("story", "Story")
+ new GameAction("story", "Memory Drawing")
{
defaultLength = 4,
parameters = new List()
{
- new Param("story", BlueBear.StoryType.Date, "Story"),
- new Param("enter", true, "Enter")
+ new Param("story", BlueBear.StoryType.Date, "Memory", "Set the memory that should appear."),
+ new Param("enter", true, "Enter", "Toggle if the memory should enter or exit the scene.")
},
resizable = true
},
- new GameAction("crumb", "Set Crumb Threshold")
+ new GameAction("crumb", "Set Crumb Thresholds")
{
function = delegate { var e = eventCaller.currentEntity; BlueBear.instance.SetCrumbThreshold(e["right"], e["left"], e["reset"]); },
defaultLength = 0.5f,
parameters = new List()
{
- new Param("right", new EntityTypes.Integer(0, 500, 15), "Right Crumb", "How many treats should the bear eat before the right crumb can appear on his face?"),
- new Param("left", new EntityTypes.Integer(0, 500, 30), "Left Crumb", "How many treats should the bear eat before the left crumb can appear on his face?"),
- new Param("reset", false, "Reset Treats Eaten", "Should the numbers of treats eaten be reset?")
+ new Param("right", new EntityTypes.Integer(0, 500, 15), "Right Crumb", "Set how many treats Beary needs to eat for the right crumb to appear."),
+ new Param("left", new EntityTypes.Integer(0, 500, 30), "Left Crumb", "Set how many treats Beary needs to eat for the left crumb to appear."),
+ new Param("reset", false, "Reset Treats Eaten", "Toggle if the current amount of treats eaten (and crumbs) should be reset.")
}
}
},