Adjust pipeline to include base elemental mastery (#2545)

Author: Charlie-Zheng

pipeline/pkg/data/avatar/avatar.go

@@ -291,6 +291,7 @@ func (a *DataSource) parseBaseStats(c *model.AvatarData, err error) error {
 	c.Stats.BaseAtk = ad.AttackBase
 	c.Stats.BaseDef = ad.DefenseBase
 	c.Stats.BaseHp = ad.HpBase
+	c.Stats.ElementMastery = ad.ElementMastery
 
 	return err
 }

pipeline/pkg/data/dm/model.go

@@ -48,6 +48,7 @@ type AvatarExcel struct {
 	HpBase          float64         `json:"hpBase"`
 	AttackBase      float64         `json:"attackBase"`
 	DefenseBase     float64         `json:"defenseBase"`
+	ElementMastery  float64         `json:"elementMastery"`
 	PropGrowCurves  []PropGrowCurve `json:"propGrowCurves"`
 	ID              int32           `json:"id"`
 	NameTextMapHash int64           `json:"nameTextMapHash"`

pkg/core/player/character/basestat.go

@@ -76,6 +76,7 @@ func AvatarBaseStat(char info.CharacterBase, data *model.AvatarData) ([]float64,
 	res[attributes.BaseHP] = data.Stats.BaseHp * model.AvatarGrowCurveByLvl[lvl][data.Stats.HpCurve]
 	res[attributes.BaseATK] = data.Stats.BaseAtk * model.AvatarGrowCurveByLvl[lvl][data.Stats.AtkCurve]
 	res[attributes.BaseDEF] = data.Stats.BaseDef * model.AvatarGrowCurveByLvl[lvl][data.Stats.DefCruve]
+	res[attributes.EM] = data.Stats.ElementMastery
 	// default er/cr/cd
 	res[attributes.ER] += 1
 	res[attributes.CD] += 0.5

pkg/model/data.pb.go

@@ -34,6 +34,7 @@ message AvatarStatsData {
   AvatarCurveType atk_curve = 5 [ json_name = "atk_curve" ];
   AvatarCurveType def_cruve = 6 [ json_name = "def_cruve" ];
   repeated PromotionData promo_data = 7 [ json_name = "promo_data" ];
+  double element_mastery = 8 [ json_name = "element_mastery" ];
 }
 
 message AvatarSkillsData {

protos/model/data.proto

@@ -68,6 +68,7 @@ export interface AvatarStatsData {
   atk_curve?: AvatarCurveType | undefined;
   def_cruve?: AvatarCurveType | undefined;
   promo_data?: PromotionData[] | undefined;
+  element_mastery?: number | undefined;
 }
 
 export interface AvatarSkillsData {
@@ -594,7 +595,16 @@ export const AvatarData = {
 };
 
 function createBaseAvatarStatsData(): AvatarStatsData {
-  return { base_hp: 0, base_atk: 0, base_def: 0, hp_curve: 0, atk_curve: 0, def_cruve: 0, promo_data: [] };
+  return {
+    base_hp: 0,
+    base_atk: 0,
+    base_def: 0,
+    hp_curve: 0,
+    atk_curve: 0,
+    def_cruve: 0,
+    promo_data: [],
+    element_mastery: 0,
+  };
 }
 
 export const AvatarStatsData = {
@@ -622,6 +632,9 @@ export const AvatarStatsData = {
         PromotionData.encode(v!, writer.uint32(58).fork()).ldelim();
       }
     }
+    if (message.element_mastery !== undefined && message.element_mastery !== 0) {
+      writer.uint32(65).double(message.element_mastery);
+    }
     return writer;
   },
 
@@ -681,6 +694,13 @@ export const AvatarStatsData = {
 
           message.promo_data!.push(PromotionData.decode(reader, reader.uint32()));
           continue;
+        case 8:
+          if (tag !== 65) {
+            break;
+          }
+
+          message.element_mastery = reader.double();
+          continue;
       }
       if ((tag & 7) === 4 || tag === 0) {
         break;
@@ -701,6 +721,7 @@ export const AvatarStatsData = {
       promo_data: globalThis.Array.isArray(object?.promo_data)
         ? object.promo_data.map((e: any) => PromotionData.fromJSON(e))
         : [],
+      element_mastery: isSet(object.element_mastery) ? globalThis.Number(object.element_mastery) : 0,
     };
   },
 
@@ -727,6 +748,9 @@ export const AvatarStatsData = {
     if (message.promo_data?.length) {
       obj.promo_data = message.promo_data.map((e) => PromotionData.toJSON(e));
     }
+    if (message.element_mastery !== undefined && message.element_mastery !== 0) {
+      obj.element_mastery = message.element_mastery;
+    }
     return obj;
   },
 
@@ -742,6 +766,7 @@ export const AvatarStatsData = {
     message.atk_curve = object.atk_curve ?? 0;
     message.def_cruve = object.def_cruve ?? 0;
     message.promo_data = object.promo_data?.map((e) => PromotionData.fromPartial(e)) || [];
+    message.element_mastery = object.element_mastery ?? 0;
     return message;
   },
 };