From aad22c753affa54217473601b94fa24fcb9ecd4b Mon Sep 17 00:00:00 2001 From: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com> Date: Wed, 1 Apr 2026 01:10:50 +0800 Subject: [PATCH] Opt: Mood control default to prevent_green_face --- config/template.json | 52 ++++++++++++++-------------- module/config/argument/args.json | 52 ++++++++++++++-------------- module/config/argument/argument.yaml | 4 +-- module/config/config_generated.py | 4 +-- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/config/template.json b/config/template.json index 41b2a2628..f6d7ff71e 100644 --- a/config/template.json +++ b/config/template.json @@ -125,12 +125,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -199,12 +199,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -273,12 +273,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -409,12 +409,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -483,12 +483,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -544,7 +544,7 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, @@ -629,7 +629,7 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, @@ -706,12 +706,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -784,12 +784,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -862,12 +862,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -940,12 +940,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -1018,12 +1018,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -1092,12 +1092,12 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, "Fleet2Record": "2020-01-01 00:00:00", - "Fleet2Control": "prevent_yellow_face", + "Fleet2Control": "prevent_green_face", "Fleet2Recover": "not_in_dormitory", "Fleet2Oath": false }, @@ -1152,7 +1152,7 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, @@ -1200,7 +1200,7 @@ "Mode": "calculate", "Fleet1Value": 119, "Fleet1Record": "2020-01-01 00:00:00", - "Fleet1Control": "prevent_yellow_face", + "Fleet1Control": "prevent_green_face", "Fleet1Recover": "not_in_dormitory", "Fleet1Oath": false, "Fleet2Value": 119, diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 1cec1d669..d74574082 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -694,7 +694,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -727,7 +727,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1073,7 +1073,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1106,7 +1106,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1452,7 +1452,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -1485,7 +1485,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2168,7 +2168,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2201,7 +2201,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2565,7 +2565,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2598,7 +2598,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -2848,7 +2848,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3267,7 +3267,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3884,7 +3884,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -3917,7 +3917,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4298,7 +4298,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4331,7 +4331,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4712,7 +4712,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -4745,7 +4745,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5126,7 +5126,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5159,7 +5159,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5540,7 +5540,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5573,7 +5573,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5945,7 +5945,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -5978,7 +5978,7 @@ }, "Fleet2Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6219,7 +6219,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", @@ -6466,7 +6466,7 @@ }, "Fleet1Control": { "type": "select", - "value": "prevent_yellow_face", + "value": "prevent_green_face", "option": [ "keep_exp_bonus", "prevent_green_face", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index bfc910a0f..024505e54 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -217,7 +217,7 @@ Emotion: value: 2020-01-01 00:00:00 display: disabled Fleet1Control: - value: prevent_yellow_face + value: prevent_green_face option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ] Fleet1Recover: value: not_in_dormitory @@ -228,7 +228,7 @@ Emotion: value: 2020-01-01 00:00:00 display: disabled Fleet2Control: - value: prevent_yellow_face + value: prevent_green_face option: [ keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face ] Fleet2Recover: value: not_in_dormitory diff --git a/module/config/config_generated.py b/module/config/config_generated.py index 8b0b1115d..64cac4bf5 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -111,12 +111,12 @@ class GeneratedConfig: Emotion_Mode = 'calculate' # calculate, ignore, calculate_ignore Emotion_Fleet1Value = 119 Emotion_Fleet1Record = datetime.datetime(2020, 1, 1, 0, 0) - Emotion_Fleet1Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face + Emotion_Fleet1Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face Emotion_Fleet1Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2 Emotion_Fleet1Oath = False Emotion_Fleet2Value = 119 Emotion_Fleet2Record = datetime.datetime(2020, 1, 1, 0, 0) - Emotion_Fleet2Control = 'prevent_yellow_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face + Emotion_Fleet2Control = 'prevent_green_face' # keep_exp_bonus, prevent_green_face, prevent_yellow_face, prevent_red_face Emotion_Fleet2Recover = 'not_in_dormitory' # not_in_dormitory, dormitory_floor_1, dormitory_floor_2 Emotion_Fleet2Oath = False