plural skills have an @ in the name

Lamby777 · Jul 11, 2024 · 34542b4 · 34542b4
1 parent 6e6fd94
commit 34542b4
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 12 deletions.
diff --git a/pets-gd/assets/skillregistries/psi.json b/pets-gd/assets/skillregistries/psi.json
@@ -7,12 +7,30 @@
         "plural": false,
         "status_effect": null
     },
+    "Caustics @A": {
+        "type": "AttackSkill",
+        "tr_key": "SKILL_ATTACK_FIRE_DMG_NAME",
+        "element": "Fire",
+        "power": 1,
+        "plural": true,
+        "status_effect": null
+    },
     "Caustics B": {
         "type": "AttackSkill",
         "tr_key": "SKILL_ATTACK_FIRE_DMG_NAME",
         "element": "Fire",
         "power": 2,
         "plural": false,
         "status_effect": null
+    },
+    "Recovery A": {
+        "type": "RecoverySkill",
+        "power": 1,
+        "recovery": {
+            "HPAmount": {
+                "amount": 50
+            }
+        },
+        "plural": false
     }
 }
diff --git a/pets-gd/i18n/translations.csv b/pets-gd/i18n/translations.csv
@@ -46,6 +46,7 @@ ELEMENT_ADJ_Whip,Whip
 ,
 SKILL_PSI_FLUX_NAME,PSI Flux
 SKILL_PSI_FLUX_DESC,Warps time in your favor for {seconds} seconds.
+SKILL_RECOVERY_COMBINED,{family} {power}
 SKILL_RECOVERY_HP_AMOUNT_NAME,Recover
 SKILL_RECOVERY_HP_AMOUNT_DESC,Heals {amount} of the target's HP.
 SKILL_RECOVERY_HP_PERCENT_NAME,Renew
@@ -69,11 +70,12 @@ SKILL_ATTACK_SPIRIT_FX_NAME,Curse
 SKILL_ATTACK_FUZZ_NAME,PK Fuzz
 SKILL_ATTACK_WHIP_NAME,PK Whip
 ,
-SKILL_ATTACK_TIER_1,A
-SKILL_ATTACK_TIER_2,B
-SKILL_ATTACK_TIER_3,C
-SKILL_ATTACK_TIER_4,D
-SKILL_ATTACK_TIER_5,E
+SKILL_TIER_1,A
+SKILL_TIER_2,B
+SKILL_TIER_3,C
+SKILL_TIER_4,D
+SKILL_TIER_5,E
+SKILL_POWER_PLURAL,@{power}
 ,
 SKILL_ATTACK_NAME_COMBINED,{family} {power}
 SKILL_ATTACK_DESCRIBE_COMBINED,{dmg} {fx}

diff --git a/pets-lib/src/battle/skills/attack.rs b/pets-lib/src/battle/skills/attack.rs
@@ -60,7 +60,7 @@ impl AttackSkill {
 impl Skill for AttackSkill {
     fn name(&self) -> String {
         let family = tr!("{}", self.tr_key.clone());
-        let power = self.power.map(|p| tr(&format!("SKILL_ATTACK_TIER_{}", p)));
+        let power = self.power.map(|p| power_to_letter_pl(p, self.plural));
 
         match power {
             Some(power) => tr_replace! {

diff --git a/pets-lib/src/battle/skills/mod.rs b/pets-lib/src/battle/skills/mod.rs
@@ -21,9 +21,22 @@ mod shields;
 pub(crate) use attack::AttackSkill;
 pub(crate) use buffs::BuffSkill;
 pub(crate) use other::PSIFluxSkill;
-pub(crate) use recovery::RecoverySkill;
+pub(crate) use recovery::{RecoverySkill, RecoveryType};
 pub(crate) use shields::ShieldSkill;
 
+fn power_to_letter(power: u8) -> GString {
+    tr(&format!("SKILL_TIER_{}", power))
+}
+
+fn power_to_letter_pl(power: u8, plural: bool) -> GString {
+    let power = power_to_letter(power);
+
+    match plural {
+        true => tr_replace!("SKILL_POWER_PLURAL"; power).into(),
+        false => power,
+    }
+}
+
 #[typetag::serde(tag = "type")]
 pub trait Skill: Debug + Sync + Send {
     fn name(&self) -> String;

diff --git a/pets-lib/src/battle/skills/recovery.rs b/pets-lib/src/battle/skills/recovery.rs
@@ -2,8 +2,9 @@ use super::*;
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct RecoverySkill {
-    pub name: String,
+    pub power: u8,
     pub recovery: RecoveryType,
+    pub plural: bool,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -16,7 +17,15 @@ pub enum RecoveryType {
 #[typetag::serde]
 impl Skill for RecoverySkill {
     fn name(&self) -> String {
-        self.name.clone()
+        let family = match self.recovery {
+            RecoveryType::HPAmount { .. } => "SKILL_RECOVERY_HP_AMOUNT",
+            RecoveryType::HPPercent { .. } => "SKILL_RECOVERY_HP_PERCENT",
+            RecoveryType::Status { .. } => "SKILL_RECOVERY_STATUS",
+        };
+
+        let power = power_to_letter_pl(self.power, self.plural);
+
+        tr_replace!("SKILL_RECOVERY_COMBINED"; family, power)
     }
 
     fn description(&self) -> String {

diff --git a/pets-lib/src/stats/autoload.rs b/pets-lib/src/stats/autoload.rs
@@ -5,7 +5,7 @@
 use godot::global::randomize;
 use godot::prelude::*;
 
-use crate::battle::skills::{load_skill_registry, SKILL_REGISTRY};
+use crate::battle::skills::load_skill_registry;
 use crate::prelude::*;
 
 #[derive(GodotClass)]
@@ -70,6 +70,15 @@ impl IObject for StatsInterface {
 /// put stuff like serialization testing in here temporarily to mess around
 /// it'll run when the game starts
 fn print_debug_crap() {
-    let ser = SKILL_REGISTRY.get().unwrap().get("Caustics A").unwrap();
-    godot_print!("{:?}", ser);
+    // use crate::battle::skills::*;
+    //
+    // let ser = SKILL_REGISTRY.get().unwrap().get("Caustics A").unwrap();
+    // let skill = RecoverySkill {
+    //     power: 2,
+    //     recovery: RecoveryType::HPAmount { amount: 10 },
+    //     plural: false,
+    // };
+    //
+    // let ser = serde_json::to_string(&skill);
+    // godot_print!("{:?}", ser);
 }