diff options
| author | Haru <haru@dotalux.com> | 2018-07-28 03:21:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-28 03:21:42 +0200 |
| commit | 621611e6e90af0c5551b4daca75ba1267d8e8478 (patch) | |
| tree | 92ca087267778474df4c3589e22ec801f4c34622 /src/map/pet.c | |
| parent | 164e79976b926da35612ce28cf84ebd9c2ac3d3e (diff) | |
| parent | 7f5b041efd88bae052c98e1bd1c5e28676c73272 (diff) | |
| download | hercules-621611e6e90af0c5551b4daca75ba1267d8e8478.tar.gz hercules-621611e6e90af0c5551b4daca75ba1267d8e8478.tar.bz2 hercules-621611e6e90af0c5551b4daca75ba1267d8e8478.tar.xz hercules-621611e6e90af0c5551b4daca75ba1267d8e8478.zip | |
Merge pull request #2067 from dastgirp/1-achievement
Implemented Achievement System and Title System
Diffstat (limited to 'src/map/pet.c')
| -rw-r--r-- | src/map/pet.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/map/pet.c b/src/map/pet.c index d1d8a5a33..cfb3e8253 100644 --- a/src/map/pet.c +++ b/src/map/pet.c @@ -23,6 +23,7 @@ #include "config/core.h" // DBPATH #include "pet.h" +#include "map/achievement.h" #include "map/atcommand.h" // msg_txt() #include "map/battle.h" #include "map/chrif.h" @@ -582,8 +583,8 @@ static int pet_catch_process2(struct map_session_data *sd, int target_id) pet_catch_rate = (pet->db[i].capture + (sd->status.base_level - md->level)*30 + sd->battle_status.luk*20)*(200 - get_percentage(md->status.hp, md->status.max_hp))/100; if(pet_catch_rate < 1) pet_catch_rate = 1; - if(battle_config.pet_catch_rate != 100) - pet_catch_rate = (pet_catch_rate*battle_config.pet_catch_rate)/100; + if(battle->bc->pet_catch_rate != 100) + pet_catch_rate = (pet_catch_rate*battle->bc->pet_catch_rate)/100; if(rnd()%10000 < pet_catch_rate) { @@ -592,6 +593,8 @@ static int pet_catch_process2(struct map_session_data *sd, int target_id) clif->pet_roulette(sd,1); intif->create_pet(sd->status.account_id,sd->status.char_id,pet->db[i].class_,mob->db(pet->db[i].class_)->lv, pet->db[i].EggID,0,pet->db[i].intimate,100,0,1,pet->db[i].jname); + + achievement->validate_taming(sd, pet->db[i].class_); } else { |