Use blocks and template extension

autopickup.rc

@@ -1,3 +1,4 @@
 OPTIONS=autopickup,pickup_types:$
+OPTIONS=pickup_burden=B
 autopickup_exception=">.*iron chain.*"
 autopickup_exception=">.*heavy iron ball.*"

hdf-37.rc

@@ -1,14 +1,18 @@
-{% include "main.rc" %}
+{% extends "main.rc" %}
 
-{% include "unicode_symbols.rc" %}
+{% block symbols %}
+{% include "unicode_symbols.rc" +%}
 
 {% include "color_glyphs.rc" %}
+{% endblock symbols %}
 
+{% block options %}
 OPTIONS=!tutorial,!safe_wait,!tips
 OPTIONS=showdamage
 OPTIONS=cond_held,cond_ice,cond_lava,cond_woundedlegs
 OPTIONS=paranoid_confirmation:pray Remove trap swim
+{% endblock options %}
 
+{% block bindings %}
 BIND=O:optionsfull
-
-{% include "pergame.rc" %}
+{% endblock bindings %}

hdf-tnnt.rc

@@ -1,9 +1,11 @@
-{% include "main.rc" %}
+{% extends "main.rc" %}
 
+{% block symbols %}
 {% include "basic_symbols.rc" %}
+{% endblock symbols %}
 
+{% block options %}
 OPTIONS=cond_held,cond_ice,cond_lava,cond_woundedlegs
 OPTIONS=paranoid_confirmation:pray trap A Remove
 OPTIONS=realtime:p,realtime_format:f
-
-{% include "pergame.rc" %}
+{% endblock options %}

main.rc

@@ -1,55 +1,52 @@
 # junethack karafruit
 
-OPTIONS=symset:Enhanced1,roguesymset:plain
+{% include "menucolor.rc" +%}
 
-OPTIONS=!force_invmenu
-OPTIONS=suppress_alert:3.3.1
-OPTIONS=map_mode:tiles,scroll_margin:10
+{% include "statusbar.rc" +%}
 
-OPTIONS=font_message:Consolas,font_size_message:14,align_message:top
-OPTIONS=font_menu:Consolas,font_size_menu:14
-OPTIONS=font_text:Courier New,font_size_text:14
-OPTIONS=font_status:Courier New,font_size_status:14
-OPTIONS=hilite_pet,hilite_pile,!toptenwin
-#OPTIONS=!splash_screen,player_selection:prompts
-
-AUTOCOMPLETE=twoweapon
-
-{% include "menucolor.rc" %}
-
-{% include "statusbar.rc" %}
-
-{% include "msgtypes.rc" %}
+{% include "msgtypes.rc" +%}
 
+{% block names %}
 OPTIONS=dogname:Athena
 OPTIONS=catname:Moldorm
 OPTIONS=horsename:Horse
 OPTIONS=fruit:word
+{% endblock names %}
 
-{% include "autopickup.rc" %}
-
-OPTIONS=scores:10 top/2 around/own
+{% include "autopickup.rc" +%}
 
+OPTIONS=!force_invmenu
+OPTIONS=suppress_alert:3.3.1
+OPTIONS=map_mode:tiles,scroll_margin:10
+OPTIONS=hilite_pet,hilite_pile,!toptenwin
 OPTIONS=time,showexp,number_pad:2,lit_corridor
-
 OPTIONS=msg_window:reversed,sortloot:full
 OPTIONS=autoquiver
 # OPTIONS=invweight,showdmg,showweight
 OPTIONS=!cmdassist
-OPTIONS=boulder:0,travel
+OPTIONS=travel
 OPTIONS=disclose:yi ya nv ng yc no
 OPTIONS=altmeta
 OPTIONS=!autodig
-OPTIONS=statuslines:3
-OPTIONS=pickup_burden=B
-OPTIONS=paranoid_confirmation:p t A s
-# OPTIONS=realtime:p,realtime_format:f
-
 OPTIONS=runmode:teleport
 OPTIONS=quick_farsight
 OPTIONS=whatis_coord:c
 OPTIONS=!implicit_uncursed
+{% block options %}
+{% endblock options %}
+
+AUTOCOMPLETE=twoweapon
 
 BIND=M-m:terrain
 BIND=C:conduct
 BIND=!:annotate
+BIND=%:ride
+{% block bindings %}
+{% endblock bindings %}
+
+OPTIONS=symset:Enhanced1,roguesymset:plain
+OPTIONS=boulder:0
+{% block symbols %}
+{% endblock symbols +%}
+
+{% include "pergame.rc" %}

menucolor.rc

@@ -1,6 +1,5 @@
 OPTIONS=menucolors,menu_objsyms
 
-### Item Status (BUC/worn)
 {% set unknown_buc = "white" %}
 {% set cursed = "red" %}
 {% set uncursed = "gray" %}
@@ -8,16 +7,14 @@ OPTIONS=menucolors,menu_objsyms
 {% set danger_item = "red" %}
 {% set valuable_item = "yellow" %}
 {% set bag_kaboom = "cyan" %}
-
+### Item Status (BUC/worn)
 MENUCOLOR=""={{ unknown_buc }}
 MENUCOLOR="gold pieces?"={{ valuable_item }}
 
 MENUCOLOR="[Bb]lessed"={{ blessed }}
 MENUCOLOR="[Hh]oly"={{ blessed }}
-
 MENUCOLOR="[Cc]ursed"={{ cursed }}
 MENUCOLOR="[Uu]nholy"={{ cursed }}
-
 MENUCOLOR="[Uu]ncursed"={{ uncursed }}
 
 MENUCOLOR=".*(being worn|\(wielded|weapon in|lit\)|\(on (left|right)|at the ready|in quiver)"={{ unknown_buc }}&inverse
@@ -68,14 +65,13 @@ MENUCOLOR="wand (of|called) cancellation"={{ bag_kaboom }}
 MENUCOLOR="bag (of|called) tricks"={{ bag_kaboom }}
 MENUCOLOR="bag (of|called) holding"={{ bag_kaboom }}
 
-## Overview
+### Overview
 MENUCOLOR="^\s*Level.*rust trap"=bright blue
 MENUCOLOR="^\s*Level.*You are here"=green
 
-## Branches
 {% set branch_header = "white&inverse" %}
 {% set branch_transition = "yellow" %}
-
+## Branches
 MENUCOLOR="The Tutorial:"={{ branch_header }}
 MENUCOLOR="The Dungeons of Doom:"={{ branch_header }}
 MENUCOLOR="The Gnomish Mines:"={{ branch_header }}

msgtypes.rc

@@ -1,5 +1,4 @@
 MSGTYPE=hide "Unknown command '.*'."
-
 MSGTYPE=hide "You swap places with .*"
 
 MSGTYPE=hide "attack passes harmlessly through the shade"
@@ -80,12 +79,9 @@ MSGTYPE=stop "Amulet of Yendor named"
 MSGTYPE=stop "You don't have anything to eat."
 MSGTYPE=stop "You cannot eat that"
 MSGTYPE=stop "You don't have that object"
-
 MSGTYPE=stop "won't move|still eating"
 MSGTYPE=stop "Closed for inventory"
-
 MSGTYPE=stop "You wrest .*"
-
 MSGTYPE=stop "You feel a strange vibration"
 
 ## Gremlin stealing your intrinsic at night

statusbar.rc

@@ -1,5 +1,4 @@
-OPTIONS=windowcolors:status white/#000000 message white/#000000 text white/#000000 menu white/#000000
-OPTIONS=vary_msgcount:4
+OPTIONS=statuslines:3
 
 # Status hilites
 OPTIONS=statushilites

unicode_symbols.rc

@@ -1,4 +1,4 @@
-SYMBOLS=S_magic_portal:U+058D
+SYMBOLS=S_magic_portal:U+20AA
 SYMBOLS=S_rust_trap:U+2020
 SYMBOLS=S_ghost:U+0262
 SYMBOLS=S_throne:U+1D8B