Skip to content

Spell cancelling #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndrioCelos wants to merge 2 commits into
base: NetHack-3.7
Choose a base branch
from
Open

Spell cancelling #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c96524
Allow cancelling spells at the direction/target prompt
AndrioCelos Nov 10, 2020
a8d1f46
Unskilled fireball and cone of cold don't deal physical damage
AndrioCelos Nov 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/extern.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,8 +2523,8 @@ E void FDECL(book_disappears, (struct obj *));
E void FDECL(book_substitution, (struct obj *, struct obj *));
E void NDECL(age_spells);
E int NDECL(docast);
E int FDECL(docastspecial, (int, BOOLEAN_P));
E int FDECL(spell_skilltype, (int));
E int FDECL(spelleffects, (int, BOOLEAN_P));
E int FDECL(tport_spell, (int));
E void NDECL(losespells);
E int NDECL(dovspell);
Expand Down
9 changes: 4 additions & 5 deletions outdated/sys/msdos/SCHEMA35.MSC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ functions:0 _tty_dismiss_nhwindow _gender _genl_outrip _get_cost _get_free_room_
functions:0 _get_location _get_map _get_mleash
;
functions:1 _move_update _movebubbles _movecmd _movemon _moverock _movobj _mpickgold
functions:1 _doaltarobj _doapply _dobreathe _docall _docast
functions:1 _doaltarobj _doapply _dobreathe _docall _docast _docastspecial
;
functions:2 _do_vicinity_map
functions:3 _pcmain
Expand Down Expand Up @@ -240,19 +240,19 @@ functions:215 _shuffle_all _shuffle_tiles _simple_look _singular _sitoa _skill_a
functions:216 _skinback _sleep_monst _slept_monst _slip_or_trip _sliparm _slots_required _snuff_candle _snuff_light_source
functions:217 _snuff_lit _sobj_at _some_armor _somegold _somex _somexy _somey _sort_rooms
functions:218 _sort_valuables _sp_lev_shuffle _spec_ability _spec_abon _spec_applies _spec_dbon _spell_damage_bonus _spell_hit_bonus
functions:219 _spell_skilltype _spelleffects _spitmu _splatter_burning_oil _split_mon _split_rects _splitbill _splitobj
functions:219 _spell_skilltype _spelleffects _spellhunger _spitmu _splatter_burning_oil _split_mon _split_rects _splitbill _splitobj
functions:220 _spoteffects _squadmon _srandom _stackobj _standoutbeg _standoutend _start_corpse_timeout _start_eating
functions:221 _start_engulf _start_timer _start_tin _steal _steal_it _stealamulet _stealarm _stealgold
functions:223 _stop_timer _store_version _strange_feeling _strategy _string_for_env_opt _string_for_opt _strncmpi _strprepend
functions:224 _strstri _study_book _stumble_onto_mimic _sub_one_frombill _subfrombill _substitute_tiles _summon_minion _surface
functions:225 _swallow_to_glyph _swapin_file _swapout_oldest _switchar _t_warn
functions:226 _tabexpand _tactics _take_gold _take_off _tamedog _target_on _tele _tele_jump_ok
functions:226 _tabexpand _tactics _take_gold _take_off _tamedog _target_on _targetspell _tele _tele_jump_ok
functions:227 _tele_restrict _tele_trap _teleds _teleok _teleport_pet _temple_occupied _tended_shop _term_end_attr
functions:228 _term_end_color
functions:229 _The _this_type_only _thitm _thitmonst _thitu _throw_gold _throwing_weapon _throwit
functions:230 _thrwmu _tileview _timed_occupation _timer_is_local _timer_sanity_check _tinnable _title_to_mon _tmp_at
functions:231 _topl_putsym _topologize _topten _topten_print _topten_print_bold _toss_up _toss_wsegs _touch_artifact
functions:232 _touchfood _trap_detect _trickery _try_disarm _try_lift _trycall _tt_oname _tty_add_menu
functions:232 _touchfood _trap_detect _trickery _try_disarm _try_lift _trycall _tryspell _tt_oname _tty_add_menu
functions:233 _tty_askname _tty_clear_nhwindow _tty_cliparound
functions:234 _tty_display_file _tty_display_nhwindow _tty_doprev_message _tty_end_menu _tty_end_screen _tty_exit_nhwindows _tty_get_ext_cmd _tty_get_nh_event
functions:235 _tty_getlin _tty_init_nhwindows _tty_mark_synch _tty_message_menu _tty_nh_poskey _tty_nhbell _tty_nhgetch _tty_number_pad
Expand Down Expand Up @@ -517,4 +517,3 @@ functions:478 _zapsetup _zapwrapup _comp_times _directionname _fname_decode _fna
;functions:479 _free_edog _free_egd _free_emin _free_eshk _free_olong _free_saved_games
;functions:480 _genl_can_suspend_no _genl_getmsghistory _genl_message_menu _genl_putmsghistory
;functions:481 _get_saved_games _initstate _set_savepref _set_wc_option_mod_status _set_wc2_option_mod_status _setstate _uint_to_any

9 changes: 4 additions & 5 deletions outdated/sys/msdos/schema3.MSC
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ functions:0 _tty_dismiss_nhwindow _gender _genl_outrip _get_cost _get_free_room_
functions:0 _get_location _get_map _get_mleash
;
functions:1 _move_update _movebubbles _movecmd _movemon _moverock _movobj _mpickgold
functions:1 _doaltarobj _doapply _dobreathe _docall _docast
functions:1 _doaltarobj _doapply _dobreathe _docall _docast _docastspecial
;
functions:2 _do_vicinity_map
functions:3 _pcmain
Expand Down Expand Up @@ -240,19 +240,19 @@ functions:215 _shuffle_all _shuffle_tiles _simple_look _singular _sitoa _skill_a
functions:216 _skinback _sleep_monst _slept_monst _slip_or_trip _sliparm _slots_required _snuff_candle _snuff_light_source
functions:217 _snuff_lit _sobj_at _some_armor _somegold _somex _somexy _somey _sort_rooms
functions:218 _sort_valuables _sp_lev_shuffle _spec_ability _spec_abon _spec_applies _spec_dbon _spell_damage_bonus _spell_hit_bonus
functions:219 _spell_skilltype _spelleffects _spitmu _splatter_burning_oil _split_mon _split_rects _splitbill _splitobj
functions:219 _spell_skilltype _spelleffects _spellhunger _spitmu _splatter_burning_oil _split_mon _split_rects _splitbill _splitobj
functions:220 _spoteffects _squadmon _srandom _stackobj _standoutbeg _standoutend _start_corpse_timeout _start_eating
functions:221 _start_engulf _start_timer _start_tin _steal _steal_it _stealamulet _stealarm _stealgold
functions:223 _stop_timer _store_version _strange_feeling _strategy _string_for_env_opt _string_for_opt _strncmpi _strprepend
functions:224 _strstri _study_book _stumble_onto_mimic _sub_one_frombill _subfrombill _substitute_tiles _summon_minion _surface
functions:225 _swallow_to_glyph _swapin_file _swapout_oldest _switch_symbols _switchar _t_warn
functions:226 _tabexpand _tactics _take_gold _take_off _tamedog _target_on _tele _tele_jump_ok
functions:226 _tabexpand _tactics _take_gold _take_off _tamedog _target_on _targetspell _tele _tele_jump_ok
functions:227 _tele_restrict _tele_trap _teleds _teleok _teleport_pet _temple_occupied _tended_shop _term_end_attr
functions:228 _term_end_color
functions:229 _The _this_type_only _thitm _thitmonst _thitu _throw_gold _throwing_weapon _throwit
functions:230 _thrwmu _tileview _timed_occupation _timer_is_local _timer_sanity_check _tinnable _title_to_mon _tmp_at
functions:231 _topl_putsym _topologize _topten _topten_print _topten_print_bold _toss_up _toss_wsegs _touch_artifact
functions:232 _touchfood _trap_detect _trickery _try_disarm _try_lift _trycall _tt_oname _tty_add_menu
functions:232 _touchfood _trap_detect _trickery _try_disarm _try_lift _trycall _tryspell _tt_oname _tty_add_menu
functions:233 _tty_askname _tty_clear_nhwindow _tty_cliparound
functions:234 _tty_display_file _tty_display_nhwindow _tty_doprev_message _tty_end_menu _tty_end_screen _tty_exit_nhwindows _tty_get_ext_cmd _tty_get_nh_event
functions:235 _tty_getlin _tty_init_nhwindows _tty_mark_synch _tty_message_menu _tty_nh_poskey _tty_nhbell _tty_nhgetch _tty_number_pad
Expand Down Expand Up @@ -664,4 +664,3 @@ functions:626 _wiz_level_change _wiz_map_terrain _wiz_mon_polycontrol _wiz_panic
functions:627 _wiz_polyself _wiz_rumor_check _wiz_smell _worst_cursed_item
functions:628 _yn_function _yobjnam _Yobjnam2 _You_see
functions:629 _ysimple_name

2 changes: 1 addition & 1 deletion src/apply.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ int magic; /* 0=Physical, otherwise skill level */
if (g.spl_book[sp_no].sp_id == NO_SPELL)
break;
else if (g.spl_book[sp_no].sp_id == SPE_JUMPING)
return spelleffects(sp_no, FALSE);
return docastspecial(sp_no, FALSE);
}

if (!magic && (nolimbs(g.youmonst.data) || slithy(g.youmonst.data))) {
Expand Down
2 changes: 1 addition & 1 deletion src/pray.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,7 +1993,7 @@ doturn()
if (g.spl_book[sp_no].sp_id == NO_SPELL)
break;
else if (g.spl_book[sp_no].sp_id == SPE_TURN_UNDEAD)
return spelleffects(sp_no, FALSE);
return docastspecial(sp_no, TRUE);
}
You("don't know how to turn undead!");
return 0;
Expand Down
Loading