openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Check Anama trait before Pacifist trait when casting mage spells

Browse Source
This commit is contained in:
Celtic Minstrel
2020-02-01 22:41:02 -05:00
parent 91da0ed4d0
commit 6ff18342ef
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/boe.party.cpp
View File

@@ -559,14 +559,14 @@ void do_mage_spell(short pc_num,eSpell spell_num,bool freebie) {
short target,r1,adj,store;
location where;
if(univ.party[pc_num].traits[eTrait::PACIFIST] && !(*spell_num).peaceful) {
add_string_to_buf("Cast: You're a pacifist!");
return;
}
if(univ.party[pc_num].traits[eTrait::ANAMA]) {
add_string_to_buf("Cast: You're an Anama!");
return;
}
if(univ.party[pc_num].traits[eTrait::PACIFIST] && !(*spell_num).peaceful) {
add_string_to_buf("Cast: You're a pacifist!");
return;
}
where = univ.party.town_loc;
play_sound(25);