Updated skill descriptions

MalitsPlus · Aug 3, 2021 · 5420271 · 5420271
1 parent fbd7933
commit 5420271
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 10 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.github.malitsplus.shizurunotes"
         minSdk 26
         targetSdk 30
-        versionCode 49
-        versionName "1.8.1"
+        versionCode 50
+        versionName "1.8.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/data/action/KnockAction.java b/app/src/main/java/com/github/malitsplus/shizurunotes/data/action/KnockAction.java
@@ -13,7 +13,8 @@ enum KnockType{
         back(3),
         moveTarget(4),
         moveTargetParaboric(5),
-        backLimited(6);
+        backLimited(6),
+        dragForwardCaster(8);
 
         private int value;
         KnockType(int value){
@@ -50,6 +51,8 @@ public String localizedDetail(int level, Property property) {
                     return I18N.getString(R.string.Knock_s1_away_d2, targetParameter.buildTargetClause(), (int)actionValue1.value);
                 else
                     return I18N.getString(R.string.Draw_s1_toward_self_d2, targetParameter.buildTargetClause(), (int)-actionValue1.value);
+            case dragForwardCaster:
+                return I18N.getString(R.string.drag_s1_to_a_position_s2_forward_of_the_caster, targetParameter.buildTargetClause(), (int)actionValue1.value);
             default:
                 return super.localizedDetail(level, property);
         }

diff --git a/app/src/main/java/com/github/malitsplus/shizurunotes/ui/charadetails/CharaDetailsFragment.kt b/app/src/main/java/com/github/malitsplus/shizurunotes/ui/charadetails/CharaDetailsFragment.kt
@@ -134,13 +134,10 @@ class CharaDetailsFragment : Fragment(), View.OnClickListener {
         }
 
         // 观察chara变化（1.0.0去掉rank下拉框后已经可以删掉了，留着备用）
-        detailsViewModel.mutableChara.observe(
-            viewLifecycleOwner,
-            Observer<Chara> { chara: Chara ->
+        detailsViewModel.mutableChara.observe(viewLifecycleOwner, { chara: Chara ->
                 binding.detailsVM = detailsViewModel
                 adapterSkill.update(chara.skills)
-            }
-        )
+        })
     }
 
     override fun onClick(v: View?) {

diff --git a/...src/main/java/com/github/malitsplus/shizurunotes/ui/charadetails/CharaDetailsViewModel.kt b/...src/main/java/com/github/malitsplus/shizurunotes/ui/charadetails/CharaDetailsViewModel.kt
@@ -19,12 +19,15 @@ class CharaDetailsViewModel(private val sharedViewModelChara: SharedViewModelCha
             skills.forEach {
                 it.setActionDescriptions(maxCharaLevel, charaProperty)
             }
+        }?.also {
+            mutableChara.value = it
         }
-        mutableChara.value = chara
     }
 
     fun setChara(chara: Chara?) {
-        mutableChara.value = chara
+        chara?.let {
+            mutableChara.value = it
+        }
     }
 
     fun getChara(): Chara?{

diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -672,4 +672,5 @@
     <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>
+    <string name="drag_s1_to_a_position_s2_forward_of_the_caster">将%1$s拉至自身前方 [%2$s] 的位置。</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -738,4 +738,5 @@
     <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>
+    <string name="drag_s1_to_a_position_s2_forward_of_the_caster">%1$sを自分の前 [%2$s] の位置に引き寄せる。</string>
 </resources>