From f54109a3b329c972badab09fc7d7e0dd221f39cd Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Mon, 29 Jan 2024 18:50:32 +0900 Subject: [PATCH] Changed trigger Letter to Tag --- Core/DataObjects/PTMagicData.cs | 4 ++-- Core/Main/PTMagic.cs | 2 +- .../settings.analyzer.json | 14 +++++++------- _Development/DevSettings/settings.analyzer.json | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Core/DataObjects/PTMagicData.cs b/Core/DataObjects/PTMagicData.cs index 5969512..9aff623 100644 --- a/Core/DataObjects/PTMagicData.cs +++ b/Core/DataObjects/PTMagicData.cs @@ -201,7 +201,7 @@ namespace Core.Main.DataObjects.PTMagicData public class Trigger { [DefaultValue("")] - public string Letter { get; set; } = ""; + public string Tag { get; set; } = ""; [DefaultValue("")] public string MarketTrendName { get; set; } = ""; @@ -228,7 +228,7 @@ namespace Core.Main.DataObjects.PTMagicData public class OffTrigger { [DefaultValue("")] - public string Letter { get; set; } = ""; + public string Tag { get; set; } = ""; [DefaultValue("")] public string MarketTrendName { get; set; } = ""; diff --git a/Core/Main/PTMagic.cs b/Core/Main/PTMagic.cs index 3a06fcd..28b5b56 100644 --- a/Core/Main/PTMagic.cs +++ b/Core/Main/PTMagic.cs @@ -1344,7 +1344,7 @@ namespace Core.Main { double averageMarketTrendChange = this.AverageMarketTrendChanges[marketTrend.Name]; bool isTriggered = averageMarketTrendChange >= trigger.MinChange && averageMarketTrendChange < trigger.MaxChange; - triggerResults[trigger.Letter] = isTriggered; + triggerResults[trigger.Tag] = isTriggered; if (isTriggered) { diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json b/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json index dd544cf..33ed9ac 100644 --- a/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json +++ b/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json @@ -71,20 +71,20 @@ { "SettingName": "EndOfTheWorld", // ANY UNIQUE name of your setting "TriggerConnection": "AND", // Define if triggers will be connected by AND or OR. - //If you give each trigger a letter, then you can use more robust boolean logic, such as: (A && B) || (B && C) + //If you give each trigger a Tag, then you can use more robust boolean logic, such as: (A && B) || (B && C) "Triggers": [ // Your triggers for this setting. You can use any of your defined trends from above { - "Letter": "A", // OPTIONAL: Give your triggers letters, so you can use more robust boolean logic, such as: (A && B) || (C && D) + "Tag": "A", // OPTIONAL: Give your triggers Tags, so you can use more robust boolean logic, such as: (A && B) || (C && D) "MarketTrendName": "1h", // Reference to the market trend specified above "MaxChange": 0 // The maximum value for this trigger. (Any value below "0" will trigger this) }, { - "Letter": "B", + "Tag": "B", "MarketTrendName": "12h", "MaxChange": -2 }, { - "Letter": "C", + "Tag": "C", "MarketTrendName": "24h", "MaxChange": -5 } @@ -276,7 +276,7 @@ "TriggerConnection": "A || B || C", "Triggers": [ { - "Letter": "A", + "Tag": "A", "MarketTrendName": "1h", "MarketTrendRelation": "Relative", // The relation of the single market trend. Relative = The trend of the coin market // is compared to the average trend of all other coins in the market market. @@ -284,13 +284,13 @@ "MinChange": 8 }, { - "Letter": "B", + "Tag": "B", "MarketTrendName": "12h", "MarketTrendRelation": "Relative", "MinChange": 10 }, { - "Letter": "C", + "Tag": "C", "MarketTrendName": "24h", "MarketTrendRelation": "Relative", "MinChange": 12 diff --git a/_Development/DevSettings/settings.analyzer.json b/_Development/DevSettings/settings.analyzer.json index dd544cf..33ed9ac 100644 --- a/_Development/DevSettings/settings.analyzer.json +++ b/_Development/DevSettings/settings.analyzer.json @@ -71,20 +71,20 @@ { "SettingName": "EndOfTheWorld", // ANY UNIQUE name of your setting "TriggerConnection": "AND", // Define if triggers will be connected by AND or OR. - //If you give each trigger a letter, then you can use more robust boolean logic, such as: (A && B) || (B && C) + //If you give each trigger a Tag, then you can use more robust boolean logic, such as: (A && B) || (B && C) "Triggers": [ // Your triggers for this setting. You can use any of your defined trends from above { - "Letter": "A", // OPTIONAL: Give your triggers letters, so you can use more robust boolean logic, such as: (A && B) || (C && D) + "Tag": "A", // OPTIONAL: Give your triggers Tags, so you can use more robust boolean logic, such as: (A && B) || (C && D) "MarketTrendName": "1h", // Reference to the market trend specified above "MaxChange": 0 // The maximum value for this trigger. (Any value below "0" will trigger this) }, { - "Letter": "B", + "Tag": "B", "MarketTrendName": "12h", "MaxChange": -2 }, { - "Letter": "C", + "Tag": "C", "MarketTrendName": "24h", "MaxChange": -5 } @@ -276,7 +276,7 @@ "TriggerConnection": "A || B || C", "Triggers": [ { - "Letter": "A", + "Tag": "A", "MarketTrendName": "1h", "MarketTrendRelation": "Relative", // The relation of the single market trend. Relative = The trend of the coin market // is compared to the average trend of all other coins in the market market. @@ -284,13 +284,13 @@ "MinChange": 8 }, { - "Letter": "B", + "Tag": "B", "MarketTrendName": "12h", "MarketTrendRelation": "Relative", "MinChange": 10 }, { - "Letter": "C", + "Tag": "C", "MarketTrendName": "24h", "MarketTrendRelation": "Relative", "MinChange": 12