fix buff type

MalitsPlus · Jun 22, 2021 · e39a0ab · e39a0ab
1 parent 676ab50
commit e39a0ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/data/action/AuraAction.java b/app/src/main/java/com/github/malitsplus/shizurunotes/data/action/AuraAction.java
@@ -123,6 +123,7 @@ public static BreakType parse(int value){
     protected AuraActionType auraActionType;
     protected AuraType auraType;
     protected BreakType breakType;
+    protected boolean isConstant = false;
 
     @Override
     protected void childInit() {
@@ -132,6 +133,9 @@ protected void childInit() {
         auraActionType = AuraActionType.parse(actionDetail1);
         if (actionDetail1 == 1) {
             auraType = AuraType.maxHP;
+        } else if (actionDetail1 >= 1000){
+            auraType = AuraType.parse(actionDetail1 % 1000 / 10);
+            isConstant = true;
         } else {
             auraType = AuraType.parse(actionDetail1 / 10);
         }
@@ -159,7 +163,8 @@ public String localizedDetail(int level, Property property) {
                         r,
                         percentModifier.description(),
                         auraType.description(),
-                        buildExpression(level, durationValues, RoundingMode.UNNECESSARY, property));
+                        buildExpression(level, durationValues, RoundingMode.UNNECESSARY, property),
+                        isConstant ? I18N.getString(R.string.this_buff_is_constant) : "");
             }
         }
     }

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -355,7 +355,7 @@
     <string name="Raise">提高</string>
     <string name="Reduce">降低</string>
     <string name="s1_s2_s3_s4_s5_during_break">Break期间中，%1$s%2$s [%3$s%4$s] %5$s。</string>
-    <string name="s1_s2_s3_s4_s5_for_s6_sec">%1$s%2$s [%3$s%4$s] 的%5$s，持续时间 [%6$s] 秒。</string>
+    <string name="s1_s2_s3_s4_s5_for_s6_sec">%1$s%2$s [%3$s%4$s] 的%5$s，持续时间 [%6$s] 秒。%7$s</string>
     <string name="Charm_s1_with_s2_chance_for_s3_sec">以 [%2$s%%] 的概率使%1$s进入魅惑状态，持续时间 [%3$s] 秒。</string>
     <string name="Confuse_s1_with_s2_chance_for_s3_sec">以 [%2$s%%] 的概率使%1$s进入混乱状态，持续时间 [%3$s] 秒。</string>
     <string name="Change_attack_pattern_to_d1_for_s2_sec">切换至技能循环%1$d，持续时间 [%2$s] 秒。</string>
@@ -671,4 +671,5 @@
     <string name="no_effect">无效果。</string>
     <string name="damage">伤害</string>
     <string name="s1_will_be_applied_the_s2_once_they_take_any_actions_will_take_s3_damage_every_second_lasted_4s_seconds">每当%1$s行动时，使其受到 [%3$s] %2$s伤害，持续时间 [%4$s] 秒。</string>
+    <string name="this_buff_is_constant">此效果不会受到其他改变数值效果的影响（会受到驱散等直接解除效果的影响）。</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -542,7 +542,7 @@
     <string name="Raise">アップ</string>
     <string name="Reduce">ダウン</string>
     <string name="s1_s2_s3_s4_s5_during_break">Break期間中、%2$sの%5$sを [%3$s%4$s] %1$s。</string>
-    <string name="s1_s2_s3_s4_s5_for_s6_sec">%2$sの%5$sを [%3$s%4$s] %1$s、効果時間 [%6$s] 秒。</string>
+    <string name="s1_s2_s3_s4_s5_for_s6_sec">%2$sの%5$sを [%3$s%4$s] %1$s、効果時間 [%6$s] 秒。%7$s</string>
     <string name="Charm_s1_with_s2_chance_for_s3_sec">[%2$s%%] の確率で%1$sを魅了状態にする、効果時間 [%3$s] 秒。</string>
     <string name="Confuse_s1_with_s2_chance_for_s3_sec">[%2$s%%] の確率で%1$sを混乱状態にする、効果時間 [%3$s] 秒。</string>
     <string name="Change_attack_pattern_to_d1_for_s2_sec">行動パターンを%1$dに変化させる、効果時間 [%2$s] 秒。</string>
@@ -737,4 +737,5 @@
     <string name="no_effect">効果なし。</string>
     <string name="damage">ダメージ</string>
     <string name="s1_will_be_applied_the_s2_once_they_take_any_actions_will_take_s3_damage_every_second_lasted_4s_seconds">%1$sが行動する度、[%3$s] の%2$sダメージを与える、効果時間 [%4$s] 秒。</string>
+    <string name="this_buff_is_constant">この効果は他の値への効果の影響を受けない（ディスペルなど効果解除の影響は受ける）。</string>
 </resources>