From d4996d97c7414dd15071d8d4b54d92ad97ff989e Mon Sep 17 00:00:00 2001
From: yuexin <yuexin@kingsome.cn>
Date: Thu, 24 Dec 2020 16:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9B=BF=E6=8D=A2pet?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/rooms/logic/CfgMan.ts                | 12 +++++
 src/rooms/logic/Handler/BattleHandler.ts |  6 ++-
 src/rooms/logic/Handler/PlayerHandler.ts | 56 ++++++++++++++++++------
 3 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/src/rooms/logic/CfgMan.ts b/src/rooms/logic/CfgMan.ts
index 7539ab2..c396aaa 100644
--- a/src/rooms/logic/CfgMan.ts
+++ b/src/rooms/logic/CfgMan.ts
@@ -288,6 +288,18 @@ let CfgMan = {
             return minv;
         }
         return Math.round(Math.random() * maxv + minv);
+    },
+
+    hasSummonPetSkill(skillids: number[]){
+        let bok = false;
+        for(let i=0; i<skillids.length;i++){
+            let cfg = this.findSkillCfg(skillids[i]);
+            if(cfg && cfg.quoteunitid && cfg.tigger_typeid == 0){
+                bok = true;
+                break;
+            }
+        }
+        return bok;
     }
 };
 
diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts
index 2e5b750..4a281f4 100644
--- a/src/rooms/logic/Handler/BattleHandler.ts
+++ b/src/rooms/logic/Handler/BattleHandler.ts
@@ -401,7 +401,7 @@ export class BattleHandler {
 
         let ps = new SkillParam(obj.card, pt, obj.eff_cnt, ph, null, dstph, dstpt);
 
-        ph.useCard(ps);
+        ph.useCard(ps, obj.oldpos);
 
         this.onUseCardEnd(ps);
 
@@ -438,6 +438,10 @@ export class BattleHandler {
         return ph? ph.getTransEffCardRate(): 0;
     };
 
+    public replacePet(playerid: string, petpos: number, petid: string){
+
+    };
+
     /**
      * 吃牌/胡牌确认[暂不用]
      * @param aplayer : 玩家
diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts
index b3058aa..cf330df 100644
--- a/src/rooms/logic/Handler/PlayerHandler.ts
+++ b/src/rooms/logic/Handler/PlayerHandler.ts
@@ -88,9 +88,16 @@ export class PlayerHandler {
         return pr;
     };
 
-    public delPet(ph: PetHandler){
-        let idx = this._pets.indexOf(ph);
+    public delPet(pet: PetHandler){
+        if(!pet){
+            return;
+        }
+        this.onEMChanged(pet._enmagic);//删除法强
+        pet.clear();
+        let idx = this._pets.indexOf(pet);
         (idx >= 0) && this._pets.splice(idx, 1);
+
+        this._owner.onDelPetNotify(pet);
     };
 
     public getPet(pet: Pet): PetHandler{
@@ -99,6 +106,18 @@ export class PlayerHandler {
         });
     };
 
+    public findPet(pos: number): PetHandler{
+        if(pos < 0){
+            return null;
+        }
+        if(pos == 0){
+            return this._self;
+        }
+        return this._pets.find((item:PetHandler)=>{
+            return item._idx == pos;
+        })
+    };
+
     public exportAllPets(skill: Skill, param: SkillParam, expet: PetHandler, dst: SkillTarget[]): SkillTarget[]{
         if(!dst){
             return null;
@@ -130,14 +149,31 @@ export class PlayerHandler {
         return dst;
     };
 
-    public useCard(obj: SkillParam)
+    public useCard(obj: SkillParam, oldpos?: number)
     {
         let cfg = CfgMan.findEffCardCfg(obj.cardid);
         if(!cfg){
             return false;
         }
 
+        let lst = [];
+        cfg.quoteskill1id && lst.push(cfg.quoteskill1id);
+        cfg.quoteskill2id && lst.push(cfg.quoteskill2id);
+        cfg.quoteskill3id && lst.push(cfg.quoteskill3id);
+        cfg.quoteskill4id && lst.push(cfg.quoteskill4id);
+
+        let oldpet = this.findPet(oldpos);
+        if(oldpet == this._self){
+            oldpet = null;
+        }
+
         if(cfg.type_id == EffectCardType.NPC || cfg.type_id == EffectCardType.NPC_CUSTOM){
+            let exap = 0;
+            if(oldpet){
+                exap = oldpet.totalAP();
+                this.delPet(oldpet);
+            }
+
             let pet = this.newPet();
             if(!pet){
                 return false;
@@ -148,14 +184,11 @@ export class PlayerHandler {
                     obj.dstpet = pet;
                 }
             }
-            pet.loadData(cfg.stageunit_id, obj, 
-                [cfg.quoteskill1id, cfg.quoteskill2id, cfg.quoteskill3id, cfg.quoteskill4id]);
+            pet.loadData(cfg.stageunit_id, obj, lst, exap);
         }else if(cfg.type_id == EffectCardType.MAGIC){
-            let lst = [];
-            cfg.quoteskill1id && lst.push(cfg.quoteskill1id);
-            cfg.quoteskill2id && lst.push(cfg.quoteskill2id);
-            cfg.quoteskill3id && lst.push(cfg.quoteskill3id);
-            cfg.quoteskill4id && lst.push(cfg.quoteskill4id);
+            if(oldpet && CfgMan.hasSummonPetSkill(lst)){
+                this.delPet(oldpet);
+            }
             this.useSkills(lst, obj);
         }
     };
@@ -334,9 +367,6 @@ export class PlayerHandler {
         }
 
         if(apet.isDead()){
-            this.onEMChanged(-apet._enmagic);//删除法强
-            this._owner.onDelPetNotify(apet);
-            apet.clear();
             this.delPet(apet);
         }