diff options
| author | Robert Burnham <burnhamrobertp@gmail.com> | 2010-04-30 11:57:52 -0500 |
|---|---|---|
| committer | Robert Burnham <burnhamrobertp@gmail.com> | 2010-05-04 12:05:10 -0500 |
| commit | 5a59108b0370ed3aa353192bbec306f7249258b1 (patch) | |
| tree | 88eb94531c3581cec5d71b630d92e0b91b600e81 /crawl-ref/source/fight.h | |
| parent | 38b48859bbf4ce9527548828088c6707ec3dc3aa (diff) | |
| download | crawl-ref-5a59108b0370ed3aa353192bbec306f7249258b1.tar.gz crawl-ref-5a59108b0370ed3aa353192bbec306f7249258b1.zip | |
Rewrite player_aux_unarmed for maintainability
Also adds in monstrous code for DS monstrous mutation sets.
Diffstat (limited to 'crawl-ref/source/fight.h')
| -rw-r--r-- | crawl-ref/source/fight.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/crawl-ref/source/fight.h b/crawl-ref/source/fight.h index 301d23e0c1..43980d07a2 100644 --- a/crawl-ref/source/fight.h +++ b/crawl-ref/source/fight.h @@ -14,13 +14,27 @@ enum unarmed_attack_type { UNAT_NO_ATTACK, // 0 + UNAT_PUNCH, UNAT_KICK, UNAT_HEADBUTT, UNAT_TAILSLAP, - UNAT_PUNCH, UNAT_BITE, - UNAT_FIRST_ATTACK = UNAT_KICK, - UNAT_LAST_ATTACK = UNAT_BITE + UNAT_FIRST = UNAT_PUNCH, + UNAT_LAST = UNAT_BITE +}; + +struct unarmed_attack_data +{ + unarmed_attack_type uattack; + int damage_brand; + int base_damage; + int bonus_damage; + int noise_factor; + std::string attack_verb; + std::string miss_verb; + bool simple_miss_message; + bool uc_conditions; + bool uc_special_conditions; }; enum unchivalric_attack_type |