From 5c63335da6fdf212dccdcf49e056c7a66cbf66c6 Mon Sep 17 00:00:00 2001 From: hamstar0 Date: Sat, 20 Jun 2020 06:07:19 -0700 Subject: [PATCH] v2.0.0.5 - Fixed default emitter and hologram color/alpha as 0 --- Emitters/Definitions/EmitterDefinition.cs | 4 ++-- Emitters/Definitions/HologramDefinition.cs | 13 ++++++++----- Emitters/build.txt | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Emitters/Definitions/EmitterDefinition.cs b/Emitters/Definitions/EmitterDefinition.cs index fd839bb..0295193 100644 --- a/Emitters/Definitions/EmitterDefinition.cs +++ b/Emitters/Definitions/EmitterDefinition.cs @@ -11,11 +11,11 @@ public partial class EmitterDefinition : BaseEmitterDefinition { public bool IsGoreMode { get; set; } public int Type { get; set; } - public float Scale { get; set; } + public float Scale { get; set; } = 1f; public int Delay { get; set; } public float SpeedX { get; set; } public float SpeedY { get; set; } - public Color Color { get; set; } + public Color Color { get; set; } = Color.White; public byte Transparency { get; set; } public float Scatter { get; set; } public bool HasGravity { get; set; } diff --git a/Emitters/Definitions/HologramDefinition.cs b/Emitters/Definitions/HologramDefinition.cs index 7a12585..f336116 100644 --- a/Emitters/Definitions/HologramDefinition.cs +++ b/Emitters/Definitions/HologramDefinition.cs @@ -75,13 +75,13 @@ public static int GetFrameCount( HologramMode mode, int type ) { public int Type { get; set; } - public float Scale { get; set; } + public float Scale { get; set; } = 1f; - public Color Color { get; set; } + public Color Color { get; set; } = Color.White; - public byte Alpha { get; set; } + public byte Alpha { get; set; } = 255; - public int Direction { get; set; } + public int Direction { get; set; } = 1; public float Rotation { get; set; } @@ -126,7 +126,10 @@ public bool CrtEffect { //////////////// - public HologramDefinition() { } + public HologramDefinition() { + this.Color = Color.White; + this.Alpha = 255; + } public HologramDefinition( HologramDefinition copy ) { this.Mode = copy.Mode; diff --git a/Emitters/build.txt b/Emitters/build.txt index d343abd..a05a1f5 100644 --- a/Emitters/build.txt +++ b/Emitters/build.txt @@ -1,6 +1,6 @@ displayName = Emitters author = hamstar -version = 2.0.0.4 +version = 2.0.0.5 modReferences = HamstarHelpers@5.8.1 buildIgnore = *.csproj, *.user, *.bat, obj\*, bin\*, .vs\*, .git\* homepage = https://forums.terraria.org/index.php?threads/emitters.87584/