From 0fddad173aaa74034791399957c274979238b21a Mon Sep 17 00:00:00 2001 From: Alexey 'Cluster' Avdyukhin Date: Sat, 12 Nov 2022 20:42:56 +0400 Subject: Refactoring --- tools_sources/CoolgirlCombiner/ClassicSorter.cs | 2 +- tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj | 7 +++++++ tools_sources/CoolgirlCombiner/Game.cs | 2 +- tools_sources/CoolgirlCombiner/GameFix.cs | 2 +- tools_sources/CoolgirlCombiner/Mapper.cs | 2 +- tools_sources/CoolgirlCombiner/Offsets.cs | 2 +- tools_sources/CoolgirlCombiner/Program.cs | 18 ++++++------------ 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/tools_sources/CoolgirlCombiner/ClassicSorter.cs b/tools_sources/CoolgirlCombiner/ClassicSorter.cs index 587786d..c6f3b11 100644 --- a/tools_sources/CoolgirlCombiner/ClassicSorter.cs +++ b/tools_sources/CoolgirlCombiner/ClassicSorter.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace com.clusterrr.Famicom.CoolGirl +namespace com.clusterrr.Tools { public class ClassicSorter : IComparer { diff --git a/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj b/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj index b48e517..298b503 100644 --- a/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj +++ b/tools_sources/CoolgirlCombiner/CoolgirlCombiner.csproj @@ -66,6 +66,13 @@ embedded enable + https://github.com/ClusterM/coolgirl-multirom-builder + git + 2.0.0 + 2.0.0 + 2.0.0 + en + Alexey 'Cluster' Avdyukhin diff --git a/tools_sources/CoolgirlCombiner/Game.cs b/tools_sources/CoolgirlCombiner/Game.cs index a4e25a3..9033db3 100644 --- a/tools_sources/CoolgirlCombiner/Game.cs +++ b/tools_sources/CoolgirlCombiner/Game.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Text.RegularExpressions; using System.Text.Json.Serialization; -namespace com.clusterrr.Famicom.CoolGirl +namespace com.clusterrr.Famicom.Multirom { class Game { diff --git a/tools_sources/CoolgirlCombiner/GameFix.cs b/tools_sources/CoolgirlCombiner/GameFix.cs index de7e8db..c1b20ee 100644 --- a/tools_sources/CoolgirlCombiner/GameFix.cs +++ b/tools_sources/CoolgirlCombiner/GameFix.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; using System.Text.Json.Serialization; using com.clusterrr.Famicom.Containers; -namespace com.clusterrr.Famicom.CoolGirl +namespace com.clusterrr.Famicom.Multirom { class GameFix { diff --git a/tools_sources/CoolgirlCombiner/Mapper.cs b/tools_sources/CoolgirlCombiner/Mapper.cs index 2975c89..eae6e0a 100644 --- a/tools_sources/CoolgirlCombiner/Mapper.cs +++ b/tools_sources/CoolgirlCombiner/Mapper.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace com.clusterrr.Famicom.CoolGirl +namespace com.clusterrr.Famicom.Multirom { class Mapper { diff --git a/tools_sources/CoolgirlCombiner/Offsets.cs b/tools_sources/CoolgirlCombiner/Offsets.cs index cc87fd9..437cc5c 100644 --- a/tools_sources/CoolgirlCombiner/Offsets.cs +++ b/tools_sources/CoolgirlCombiner/Offsets.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace com.clusterrr.Famicom.CoolGirl +namespace com.clusterrr.Famicom.Multirom { class Offsets { diff --git a/tools_sources/CoolgirlCombiner/Program.cs b/tools_sources/CoolgirlCombiner/Program.cs index e10b196..9d6bd86 100644 --- a/tools_sources/CoolgirlCombiner/Program.cs +++ b/tools_sources/CoolgirlCombiner/Program.cs @@ -1,4 +1,6 @@ using com.clusterrr.Famicom.Containers; +using com.clusterrr.Famicom.Multirom; +using com.clusterrr.Tools; using System; using System.Collections.Generic; using System.Diagnostics; @@ -749,9 +751,9 @@ namespace com.clusterrr.Famicom.CoolGirl foreach (var ex in ae.InnerExceptions) { #if DEBUG - Console.WriteLine($"Error: {ex.GetType()}: {ex.Message}{ex.StackTrace}"); + Console.WriteLine($"Error {ex.GetType()}: {ex.Message}{ex.StackTrace}"); #else - Console.WriteLine($"Error: {ex.GetType()}: {ex.Message}"); + Console.WriteLine($"Error {ex.GetType()}: {ex.Message}"); #endif } return 2; @@ -759,9 +761,9 @@ namespace com.clusterrr.Famicom.CoolGirl catch (Exception ex) { #if DEBUG - Console.WriteLine($"Error: {ex.GetType()}: {ex.Message}{ex.StackTrace}"); + Console.WriteLine($"Error {ex.GetType()}: {ex.Message}{ex.StackTrace}"); #else - Console.WriteLine($"Error: {ex.GetType()}: {ex.Message}"); + Console.WriteLine($"Error {ex.GetType()}: {ex.Message}"); #endif return 2; } @@ -823,13 +825,5 @@ namespace com.clusterrr.Famicom.CoolGirl if (string.IsNullOrEmpty(input)) return ""; return input.First().ToString().ToUpper() + input.Substring(1); } - - static void ArrayResizeFF(ref byte[] array, int newSize) - { - var oldSize = array.Length; - Array.Resize(ref array, newSize); - for (int i = oldSize; i < newSize; i++) - array[i] = 0xFF; - } } } -- cgit v1.2.3