diff --git a/basic_symbols.rc b/basic_symbols.rc index 0590f1a..90b4608 100644 --- a/basic_symbols.rc +++ b/basic_symbols.rc @@ -1,5 +1,12 @@ -SYMBOLS=S_magic_portal:\x38 -SYMBOLS=S_rust_trap:\x38 +SYMBOLS=S_magic_portal:\xE0 +SYMBOLS=S_rust_trap:\xE6 SYMBOLS=S_water:\x7E SYMBOLS=S_pool:\x7E SYMBOLS=S_lava:\x7E +SYMBOLS=S_upladder:\xF9 +SYMBOLS=S_dnladder:\xFA +SYMBOLS=S_altar:\xFB +SYMBOLS=S_corr:\x23 +SYMBOLS=S_litcorr:\x23 +SYMBOLS=S_throne:\xFD +SYMBOLS=S_fountain:\xFD diff --git a/curses.rc b/curses.rc index 2b5df83..a19e4ac 100644 --- a/curses.rc +++ b/curses.rc @@ -3,6 +3,7 @@ {% endif %} OPTIONS=windowtype:curses +{% if base37 %} {% if comments %} # perminv_mode: determines what items to show in perm_invent window # none: behave as if perm_invent is false @@ -12,6 +13,8 @@ OPTIONS=windowtype:curses {% endif %} OPTIONS=perminv_mode:none +{% endif -%} + {% if comments %} # perm_invent: display your current inventory in a permanent window (only applicable in window interfaces that implement it) {% endif %} diff --git a/justfile b/justfile index e9822ec..e63bfdd 100644 --- a/justfile +++ b/justfile @@ -20,15 +20,15 @@ [group("upload")] @upload_v37 *FLAGS: - uv run render.py hdf-37.rc -hdf_variant nethack {{FLAGS}} + uv run render.py hdf-37.rc --hdf_variant nethack {{FLAGS}} [group("upload")] @upload_tnnt *FLAGS: - uv run render.py hdf-tnnt.rc -hdf_variant tnnt {{FLAGS}} + uv run render.py hdf-tnnt.rc --hdf_variant tnnt {{FLAGS}} -[group("show")] +[group("upload")] @upload_crecelle *FLAGS: - uv run render.py hdf-crecelle.rc -hdf_variant crecellehack {{FLAGS}} + uv run render.py hdf-crecelle.rc --hdf_variant crecellehack {{FLAGS}} [group("upload")] upload_all *FLAGS: (upload_v37 FLAGS) (upload_tnnt FLAGS) (upload_crecelle FLAGS) diff --git a/main.rc b/main.rc index 2e99e5f..a09404b 100644 --- a/main.rc +++ b/main.rc @@ -110,8 +110,6 @@ OPTIONS=autodig {% endif %} OPTIONS=runmode:teleport -OPTIONS=quick_farsight - {% if comments %} # whatis_coord: coordinates to display when looking around the map with the whatis or farlook commands # c: compass ('east' or '3s' or '2n,4w') @@ -148,6 +146,8 @@ OPTIONS=!tips {% endif %} OPTIONS=showdamage +OPTIONS=quick_farsight + OPTIONS=cond_held,cond_ice,cond_lava,cond_woundedlegs,cond_slip {% endif -%} diff --git a/menucolor.rc b/menucolor.rc index bc39686..8b6f726 100644 --- a/menucolor.rc +++ b/menucolor.rc @@ -25,7 +25,6 @@ OPTIONS=menucolors,menu_objsyms ### Item Status (BUC/worn) MENUCOLOR=""={{ basecolor }} -MENUCOLOR="gold pieces?"={{ valuable_item }} MENUCOLOR="[Bb]lessed"={{ blessed }} MENUCOLOR="[Hh]oly"={{ blessed }} @@ -38,6 +37,9 @@ MENUCOLOR="[Cc]ursed.*{{ equipped }}"={{ cursed }}&{{ equipped_item }} MENUCOLOR="[Uu]ncursed.*{{ equipped }}"={{ uncursed }}&{{ equipped_item }} MENUCOLOR="[Bb]lessed.*{{ equipped }}"={{ blessed }}&{{ equipped_item }} +MENUCOLOR="gold pieces?"={{ valuable_item }} +MENUCOLOR="gold pieces?.*{{ equipped }}"={{ valuable_item }}&{{ equipped_item }} + ### Items ## Gray Stones MENUCOLOR="luckstone|called luck"=bright blue @@ -114,9 +116,12 @@ MENUCOLOR="Stairs up to DevTeam Office"={{ branch_transition }} MENUCOLOR="Portal to Deathmatch Arena"={{ branch_transition }} ## Spells -MENUCOLOR=" 0%.*%"=green -MENUCOLOR="100%.*%"=red -MENUCOLOR="%.*\(gone\)"=orange +MENUCOLOR="%.*\(gone\)"=bright blue +MENUCOLOR="100% .*%"=red +MENUCOLOR=" [5-9][0-9]% .*%"=orange +MENUCOLOR=" [2-4][0-9]% .*%"=yellow +MENUCOLOR=" 1?[0-9]% .*%"=green +MENUCOLOR=" 0% .*%"=bright green ## Option menu entry contains "uncursed" so will display in wrong color unless we set it back MENUCOLOR="implicit_uncursed"={{ basecolor }} diff --git a/msgtypes.rc b/msgtypes.rc index dd01269..f4d9577 100644 --- a/msgtypes.rc +++ b/msgtypes.rc @@ -44,7 +44,7 @@ MSGTYPE=stop "disintegration" MSGTYPE=stop "wields .*Vorpal Blade" MSGTYPE=stop "swings .*Vorpal Blade" MSGTYPE=stop "zaps .* with wand of teleportation" -MSGTYPE=stop "You feel a malgnant aura surround you." +MSGTYPE=stop "You feel a malignant aura surround you." MSGTYPE=stop "(thoroughly|utterly|totally) digest" MSGTYPE=stop "(feel sad|have a (peculiarly)? (sad|melancholy) feeling) for a moment" MSGTYPE=stop ".* starves" @@ -82,6 +82,9 @@ MSGTYPE=stop "From the murky depths, a hand reaches up to bless the sword" ## Amulet of Yendor MSGTYPE=stop "Amulet of Yendor named" +## Rodney +MSGTYPE=stop "thou thought thou couldst" + MSGTYPE=stop "You don't have anything to eat." MSGTYPE=stop "You cannot eat that" MSGTYPE=stop "You don't have that object" @@ -103,6 +106,5 @@ MSGTYPE=stop "You feel paranoid." MSGTYPE=stop "You thought you saw something!" MSGTYPE=stop "You tawt you taw a puttie tat!" MSGTYPE=stop "You feel slower." -MSGTYPE=stop "You feel clumsy." MSGTYPE=stop "You feel vulnerable." MSGTYPE=stop "You feel less attractive."