Update README.md

this is the biggest refactor of my entire life

.github/workflows/cargo-build-test.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - uses: actions/checkout@v3

Cargo.toml

@@ -1,12 +1,11 @@
 [package]
 name = "rust-rl"
-version = "0.1.1"
+version = "0.1.4"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-rltk = { version = "^0.8.7", features = ["serde"] }
 bracket-lib = { git = "https://github.com/amethyst/bracket-lib.git", rev = "851f6f08675444fb6fa088b9e67bee9fd75554c6", features = ["serde"] }
 regex = "1.3.6"
 specs = { version = "0.16.1", features = ["serde"] }

README.md

@@ -1,17 +1,19 @@
-## a roguelike in rust, playable @ [llywelwyn.github.io](https://llywelwyn.github.io/)
+## a roguelike in rust, playable @ [llyw.co.uk/rl/](https://llyw.co.uk/rl/)
 
 #### using _rltk/bracket-lib_, and _specs_
 
-check out the page in the header for the wasm version, pick [a release of your choice](https://github.com/Llywelwyn/rust-rl/releases), or build manually with:
+[![Rust](https://github.com/Llywelwyn/rust-rl/actions/workflows/cargo-build-test.yml/badge.svg)](https://github.com/Llywelwyn/rust-rl/actions/workflows/cargo-build-test.yml)
+
+check out the page in the header for the wasm version, pick [a release](https://github.com/Llywelwyn/rust-rl/releases), or build manually with:
 
 `git clone https://github.com/Llywelwyn/rust-rl/ && cd rust-rl && cargo build --release`,
 
 ![image](https://github.com/Llywelwyn/rust-rl/assets/82828093/b05e4f0b-2062-4abe-9fee-c679f9ef420d)
 
-this year for roguelikedev does the complete tutorial, i followed along with thebracket's [_roguelike tutorial - in rust_](https://bfnightly.bracketproductions.com). the notes i made during the sprint are being kept below for posterity - further changes since then are noted in [changelog.txt](https://github.com/Llywelwyn/rust-rl/blob/9150ed39e45bee536060cdc769d274e639021012/changelog.txt), and in the release notes.
-
 ---
 
+<details>
+  <summary>boring details about the sprint where this project started</summary>
 <details>
 <summary>week 1</summary>
   
@@ -155,3 +157,4 @@ this year for roguelikedev does the complete tutorial, i followed along with the
     ![squares](https://github.com/Llywelwyn/rust-rl/assets/82828093/b752e1cb-340d-475d-84ae-68fdb4977a80)
 
 </details>
+</details>

benches/systems_benchmark.rs

@@ -1,5 +1,5 @@
 use criterion::{ black_box, criterion_group, criterion_main, Criterion };
-use rltk::RGB;
+use bracket_lib::prelude::*;
 
 /// Benchmarks methods from rltk used to desaturate non-visible tiles.
 // Greyscale is significantly faster, but generally looks worse - the

changelog.md

@@ -0,0 +1,20 @@
+## v0.1.4
+### added
+- **overmap**: bare, but exists. player now starts on the overworld, and can move to local maps (like the old starting town) via >. can leave local maps back to the overmap by walking out of the map boundaries.
+- **intrinsics**: speed, regeneration
+- **damage types**: immunities, weaknesses, and resistances
+- **full keyboard support**: examining and targeting can now be done via keyboard only
+- **a config file** read at runtime, unfortunately not compatible with WASM builds yet
+- **morgue files**: y/n prompt to write a morgue file on death to /morgue/foo.txt, or to the console for WASM builds
+- **dungeon features**: just the basics so far. a grassy, forested treant room, some barracks, etc.
+- **named maps**: "Town", "Dungeon"
+- **map messages/hints**: "You hear <...>."
+### changed
+- **colour offsets** are now per-tile (and per-theme) instead of +-% globally. i.e. varying fg/bg offset on a per-tiletype basis
+- **chatlog colours** are now consistent
+### fixed
+- negative starting mana
+- status effects only ticking if mob turn aligned with turnclock turn
+- map params not being saved on map transition
+- mob turns not awaiting the particle queue (mobs moving around mid-animation)
+- mobs not re-pathing if their path was blocked, causing traffic jams

changelog.txt

@@ -1,22 +0,0 @@
-2-September-2023
-- fixes:
-    - negative starting mana
-    - confusion/status effects only being run if mob turn aligned with turnclock turn
-
-30-August-2023
-- added dungeon features: grassy forest room, and barracks variants (bunks, squads of mobtypes)
-- added support for map messages: i.e. notifications for present dungeon features logged to chat every now and again
-
-Pre-29-August-2023
-- added overmap: bare, but exists. player now starts on the overworld, and can move to local maps (like the old starting town) via >. can leave local maps back to the overmap by walking out of the map boundaries.
-- mouse begone: support still there if wanted, but targeting/e(x)amining can now be done via keyboard only
-- added config.toml: non-wasm builds read from config.toml at runtime, or generate a new copy if not present in the exe dir. includes options for logging various details to the console, and visual choices like post-processing effects, all-black bgs vs. full-coloured, etc.
-- improved morgue files: y/n prompt to write a morgue file on death (or write to console in the case of wasm), containing a map of the floor the player died on, class/race/attribute/etc. details, a fully identified backpack, and a list of significant events that took place this run w/ turn number 
-- refactored colour offsets: now per-tile (and per-theme), instead of global. now can include varying fg/bg offset for every type of tile.
-- consistent chatlog colours: renderables for mobs, beatitude for items
-- dungeon features: framework
-- map identifiers (instead of displaying an incorrect depth) on ui: e.g. D1, D2, Town, Woods, etc.
-- fixes:
-    - map params are saved on map transition, instead of only at creation. now bloodstains, vision, etc. will persist when changing between floors
-    - mob turns await an empty particle queue - no longer will they move mid-fireball animations
-    - fixed traffic jams - 1. mobs will calc the best path to any tile within range of their target, instead of trying to path directly onto the target tile, and 2. if saved path is blocked to a waypoint, mobs will recalc a new path to the same point

docs/ascii_encyclopedia.txt

@@ -1,4 +1,4 @@
-a -             A -
+a - insects     A -
 b -             B -
 c - chickens    C -
 d - canines     D -

docs/combat_system.txt

@@ -49,3 +49,7 @@ Complex example, with negative AC:
 bloodstains: if starts on bloodied tile, remove blood + heal, gain xp, grow (little dog -> dog), etc.
 - You have negative AC, so you roll 1d14 for damage reduction, and get an 8.
 - The total damage is 6 - 8 = -2, but damage can't be negative, so you take 1 point of damage.
+
+tl;dr
+1. Lower AC is better
+2. Aim for 0 AC - it's an important breakpoint. Every point of AC before 0 counts for a lot.

raws/items.json

@@ -3,9 +3,10 @@
         "id": "potion_health",
         "name": { "name": "potion of health", "plural": "potions of health" },
         "renderable": { "glyph": "!", "fg": "#FF00FF", "bg": "#000000", "order": 2 },
+        "class": "potion",
         "weight": 1,
         "value": 50,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "heal": "4d4+2" },
         "magic": { "class": "uncommon", "naming": "potion" }
     },
@@ -13,9 +14,10 @@
         "id": "potion_health_weak",
         "name": { "name": "potion of lesser health", "plural": "potions of lesser health" },
         "renderable": { "glyph": "!", "fg": "#FF00FF", "bg": "#000000", "order": 2 },
+        "class": "potion",
         "weight": 1,
         "value": 25,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "heal": "2d4+2" },
         "magic": { "class": "uncommon", "naming": "potion" }
     },
@@ -23,27 +25,30 @@
         "id": "scroll_identify",
         "name": { "name": "scroll of identify", "plural": "scrolls of identify" },
         "renderable": { "glyph": "?", "fg": "#0FFFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 100,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "IDENTIFY"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE", "IDENTIFY"],
         "magic": { "class": "uncommon", "naming": "scroll" }
     },
     {
         "id": "scroll_removecurse",
         "name": { "name": "scroll of remove curse", "plural": "scrolls of remove curse" },
         "renderable": { "glyph": "?", "fg": "#0FFFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 200,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "REMOVE_CURSE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE", "REMOVE_CURSE"],
         "magic": { "class": "rare", "naming": "scroll" }
     },
     {
         "id": "scroll_health",
         "name": { "name": "scroll of healing word", "plural": "scrolls of healing word" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 50,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "particle_line": "*;-;#53f06d;75.0;#f9ff9f;100.0", "ranged": "12", "heal": "1d4+2" },
         "magic": { "class": "uncommon", "naming": "scroll" }
     },
@@ -51,9 +56,10 @@
         "id": "scroll_mass_health",
         "name": { "name": "scroll of mass healing word", "plural": "scrolls of mass healing word" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 200,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "particle": "*;#53f06d;200.0", "ranged": "12", "aoe": "3", "heal": "1d4+2" },
         "magic": { "class": "rare", "naming": "scroll" }
     },
@@ -61,33 +67,36 @@
         "id": "scroll_magicmissile",
         "name": { "name": "scroll of magic missile", "plural": "scrolls of magic missile" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 50,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
-        "effects": { "particle_line": "*;-;#00b7ff;75.0;#f4fc83;100.0", "ranged": "12", "damage": "3d4+3" },
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
+        "effects": { "particle_line": "*;-;#00b7ff;75.0;#f4fc83;100.0", "ranged": "12", "damage": "3d4+3;magic" },
         "magic": { "class": "uncommon", "naming": "scroll" }
     },
     {
         "id": "scroll_embers",
         "name": { "name": "scroll of embers", "plural": "scrolls of embers" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 100,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
-        "effects": { "particle": "*;#FFA500;200.0", "ranged": "10", "damage": "4d6", "aoe": "2" },
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
+        "effects": { "particle": "*;#FFA500;200.0", "ranged": "10", "damage": "4d6;fire", "aoe": "2" },
         "magic": { "class": "uncommon", "naming": "scroll" }
     },
     {
         "id": "scroll_fireball",
         "name": { "name": "scroll of fireball", "plural": "scrolls of fireball" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 200,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": {
             "particle_burst": "▓;*;~;#FFA500;#000000;500.0;#ffd381;60.0",
             "ranged": "10",
-            "damage": "8d6",
+            "damage": "8d6;fire",
             "aoe": "3"
         },
         "magic": { "class": "rare", "naming": "scroll" }
@@ -96,9 +105,10 @@
         "id": "scroll_confusion",
         "name": { "name": "scroll of confusion", "plural": "scrolls of confusion" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 100,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "particle_line": "*;-;#ad56a6;75.0;#cacaca;100.0", "ranged": "10", "confusion": "4" },
         "magic": { "class": "uncommon", "naming": "scroll" }
     },
@@ -106,9 +116,10 @@
         "id": "scroll_mass_confusion",
         "name": { "name": "scroll of mass confusion", "plural": "scrolls of mass confusion" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 200,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE"],
         "effects": { "particle": "*;#ad56a6;200.0", "ranged": "10", "aoe": "3", "confusion": "3" },
         "magic": { "class": "veryrare", "naming": "scroll" }
     },
@@ -116,9 +127,10 @@
         "id": "scroll_magicmap",
         "name": { "name": "scroll of magic mapping", "plural": "scrolls of magic mapping" },
         "renderable": { "glyph": "?", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "scroll",
         "weight": 0.5,
         "value": 50,
-        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "MAGICMAP"],
+        "flags": ["CONSUMABLE", "DESTRUCTIBLE", "STACKABLE", "MAGICMAP"],
         "effects": {},
         "magic": { "class": "common", "naming": "scroll" }
     },
@@ -126,6 +138,7 @@
         "id": "equip_dagger",
         "name": { "name": "dagger", "plural": "daggers" },
         "renderable": { "glyph": ")", "fg": "#808080", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 1,
         "value": 2,
         "flags": ["EQUIP_MELEE"],
@@ -135,6 +148,7 @@
         "id": "equip_shortsword",
         "name": { "name": "shortsword", "plural": "shortswords" },
         "renderable": { "glyph": ")", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 2,
         "value": 10,
         "flags": ["EQUIP_MELEE"],
@@ -144,6 +158,7 @@
         "id": "equip_rapier",
         "name": { "name": "rapier", "plural": "rapiers" },
         "renderable": { "glyph": ")", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 2,
         "value": 10,
         "flags": ["EQUIP_MELEE"],
@@ -153,6 +168,7 @@
         "id": "equip_pitchfork",
         "name": { "name": "pitchfork", "plural": "pitchforks" },
         "renderable": { "glyph": ")", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 2,
         "value": 5,
         "flags": ["EQUIP_MELEE"],
@@ -162,6 +178,7 @@
         "id": "equip_sickle",
         "name": { "name": "sickle", "plural": "sickles" },
         "renderable": { "glyph": ")", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 2,
         "value": 5,
         "flags": ["EQUIP_MELEE"],
@@ -171,6 +188,7 @@
         "id": "equip_handaxe",
         "name": { "name": "handaxe", "plural": "handaxes" },
         "renderable": { "glyph": ")", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 2,
         "value": 5,
         "flags": ["EQUIP_MELEE"],
@@ -180,6 +198,7 @@
         "id": "equip_longsword",
         "name": { "name": "longsword", "plural": "longswords" },
         "renderable": { "glyph": ")", "fg": "#FFF8DC", "bg": "#000000", "order": 2 },
+        "class": "weapon",
         "weight": 3,
         "value": 15,
         "flags": ["EQUIP_MELEE"],
@@ -189,6 +208,7 @@
         "id": "equip_smallshield",
         "name": { "name": "buckler", "plural": "bucklers" },
         "renderable": { "glyph": "[", "fg": "#808080", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 2,
         "value": 5,
         "flags": ["EQUIP_SHIELD"],
@@ -198,6 +218,7 @@
         "id": "equip_mediumshield",
         "name": { "name": "medium shield", "plural": "medium shields" },
         "renderable": { "glyph": "[", "fg": "#C0C0C0", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 6,
         "value": 10,
         "flags": ["EQUIP_SHIELD"],
@@ -207,6 +228,7 @@
         "id": "equip_largeshield",
         "name": { "name": "large shield", "plural": "large shields" },
         "renderable": { "glyph": "[", "fg": "#FFF8DC", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 12,
         "value": 35,
         "flags": ["EQUIP_SHIELD"],
@@ -216,6 +238,7 @@
         "id": "equip_body_weakleather",
         "name": { "name": "leather jacket", "plural": "leather jackets" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 8,
         "value": 5,
         "flags": ["EQUIP_BODY"],
@@ -225,6 +248,7 @@
         "id": "equip_body_leather",
         "name": { "name": "leather chestpiece", "plural": "leather chestpiece" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 10,
         "value": 10,
         "flags": ["EQUIP_BODY"],
@@ -234,6 +258,7 @@
         "id": "equip_body_studdedleather",
         "name": { "name": "studded leather chestpiece", "plural": "studded leather chestpieces" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 13,
         "value": 45,
         "flags": ["EQUIP_BODY"],
@@ -243,6 +268,7 @@
         "id": "equip_body_ringmail_o",
         "name": { "name": "orcish ring mail", "plural": "orcish ring mail" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 45,
         "value": 50,
         "flags": ["EQUIP_BODY"],
@@ -252,6 +278,7 @@
         "id": "equip_body_ringmail",
         "name": { "name": "ring mail", "plural": "ring mail" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 45,
         "value": 70,
         "flags": ["EQUIP_BODY"],
@@ -261,6 +288,7 @@
         "id": "equip_head_leather",
         "name": { "name": "leather cap", "plural": "leather caps" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 2,
         "value": 10,
         "flags": ["EQUIP_HEAD"],
@@ -270,6 +298,7 @@
         "id": "equip_head_elvish",
         "name": { "name": "elvish leather helm", "plural": "elvish leather helms" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 2,
         "value": 25,
         "flags": ["EQUIP_HEAD"],
@@ -279,6 +308,7 @@
         "id": "equip_head_o",
         "name": { "name": "orcish helm", "plural": "orcish helm" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 6,
         "value": 25,
         "flags": ["EQUIP_HEAD"],
@@ -288,6 +318,7 @@
         "id": "equip_head_iron",
         "name": { "name": "iron helm", "plural": "iron helm" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 10,
         "value": 45,
         "flags": ["EQUIP_HEAD"],
@@ -297,6 +328,7 @@
         "id": "equip_feet_leather",
         "name": { "name": "leather shoes", "plural": "leather shoes" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 2,
         "value": 10,
         "flags": ["EQUIP_FEET"]
@@ -305,6 +337,7 @@
         "id": "equip_feet_elvish",
         "name": { "name": "elvish leather shoes", "plural": "elvish leather shoes" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 2,
         "value": 25,
         "flags": ["EQUIP_FEET"],
@@ -314,6 +347,7 @@
         "id": "equip_feet_o",
         "name": { "name": "orcish boots", "plural": "orcish boots" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 6,
         "value": 25,
         "flags": ["EQUIP_FEET"],
@@ -323,6 +357,7 @@
         "id": "equip_feet_iron",
         "name": { "name": "iron boots", "plural": "iron boots" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 10,
         "value": 45,
         "flags": ["EQUIP_FEET"],
@@ -332,6 +367,7 @@
         "id": "equip_neck_protection",
         "name": { "name": "amulet of protection", "plural": "amulets of protection" },
         "renderable": { "glyph": "\"", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "amulet",
         "weight": 1,
         "value": 200,
         "flags": ["EQUIP_NECK"],
@@ -341,6 +377,7 @@
         "id": "equip_back_protection",
         "name": { "name": "cloak of protection", "plural": "cloaks of protection" },
         "renderable": { "glyph": "[", "fg": "#aa6000", "bg": "#000000", "order": 2 },
+        "class": "armour",
         "weight": 1,
         "value": 200,
         "flags": ["EQUIP_BACK"],
@@ -350,26 +387,29 @@
         "id": "wand_magicmissile",
         "name": { "name": "wand of magic missile", "plural": "wands of magic missile" },
         "renderable": { "glyph": "/", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "wand",
         "weight": 2,
         "value": 100,
         "flags": ["CHARGES"],
-        "effects": { "ranged": "12", "damage": "3d4+3" },
+        "effects": { "ranged": "12", "damage": "3d4+3;magic" },
         "magic": { "class": "uncommon", "naming": "wand" }
     },
     {
         "id": "wand_fireball",
         "name": { "name": "wand of fireball", "plural": "wands of fireball" },
         "renderable": { "glyph": "/", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "wand",
         "weight": 2,
         "value": 300,
         "flags": ["CHARGES"],
-        "effects": { "ranged": "10", "damage": "8d6", "aoe": "3" },
+        "effects": { "ranged": "10", "damage": "8d6;fire", "aoe": "3" },
         "magic": { "class": "rare", "naming": "wand" }
     },
     {
         "id": "wand_confusion",
         "name": { "name": "wand of confusion", "plural": "wands of confusion" },
         "renderable": { "glyph": "/", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "wand",
         "weight": 2,
         "value": 200,
         "flags": ["CHARGES"],
@@ -380,6 +420,7 @@
         "id": "wand_digging",
         "name": { "name": "wand of digging", "plural": "wands of digging" },
         "renderable": { "glyph": "/", "fg": "#00FFFF", "bg": "#000000", "order": 2 },
+        "class": "wand",
         "weight": 2,
         "value": 300,
         "flags": ["CHARGES", "DIGGER"],
@@ -390,16 +431,18 @@
         "id": "food_rations",
         "name": { "name": "rations", "plural": "rations" },
         "renderable": { "glyph": "%", "fg": "#FFA07A", "bg": "#000000", "order": 2 },
+        "class": "comestible",
         "weight": 1,
         "value": 1,
-        "flags": ["FOOD", "CONSUMABLE"]
+        "flags": ["FOOD", "CONSUMABLE", "STACKABLE"]
     },
     {
         "id": "food_apple",
         "name": { "name": "apple", "plural": "apples" },
         "renderable": { "glyph": "%", "fg": "#00FF00", "bg": "#000000", "order": 2 },
+        "class": "comestible",
         "weight": 0.5,
         "value": 1,
-        "flags": ["FOOD", "CONSUMABLE"]
+        "flags": ["FOOD", "CONSUMABLE", "STACKABLE"]
     }
 ]

raws/mobs.json

@@ -62,7 +62,6 @@
         "renderable": { "glyph": "@", "fg": "#034efc", "bg": "#000000", "order": 1 },
         "flags": ["NEUTRAL", "RANDOM_PATH", "IS_HUMAN"],
         "level": 2,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d8" }],
         "equipped": ["equip_shortsword", "equip_body_leather"],
         "quips": ["You wont catch me down the mine.", "Staying out of trouble?"]
@@ -73,7 +72,6 @@
         "renderable": { "glyph": "r", "fg": "#aa6000", "bg": "#000000", "order": 1 },
         "flags": [],
         "bac": 6,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d2" }],
         "loot": { "table": "food", "chance": 0.1 }
     },
@@ -83,7 +81,6 @@
         "renderable": { "glyph": "c", "fg": "#BB6000", "bg": "#000000", "order": 1 },
         "flags": ["HERBIVORE"],
         "bac": 8,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d3" }]
     },
     {
@@ -92,7 +89,6 @@
         "renderable": { "glyph": "q", "fg": "#a57037", "bg": "#000000", "order": 1 },
         "flags": ["HERBIVORE"],
         "bac": 8,
-        "vision_range": 16,
         "attacks": [{ "name": "kicks", "hit_bonus": 0, "damage": "1d2" }]
     },
     {
@@ -101,7 +97,6 @@
         "renderable": { "glyph": "q", "fg": "#e7e7e7", "bg": "#000000", "order": 1 },
         "flags": ["HERBIVORE", "SMALL_GROUP"],
         "bac": 10,
-        "vision_range": 16,
         "attacks": [{ "name": "kicks", "hit_bonus": 0, "damage": "1d2" }]
     },
     {
@@ -110,7 +105,6 @@
         "renderable": { "glyph": "c", "fg": "#fae478", "bg": "#000000", "order": 1 },
         "flags": ["HERBIVORE"],
         "bac": 10,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d2" }]
     },
     {
@@ -121,7 +115,6 @@
         "level": 3,
         "bac": 6,
         "speed": 16,
-        "vision_range": 16,
         "attacks": [
             { "name": "kicks", "hit_bonus": 0, "damage": "1d6" },
             { "name": "bites", "hit_bonus": 0, "damage": "1d2" }
@@ -136,7 +129,6 @@
         "level": 5,
         "bac": 5,
         "speed": 20,
-        "vision_range": 16,
         "attacks": [
             { "name": "kicks", "hit_bonus": 0, "damage": "1d8" },
             { "name": "bites", "hit_bonus": 0, "damage": "1d3" }
@@ -150,7 +142,6 @@
         "level": 7,
         "bac": 4,
         "speed": 24,
-        "vision_range": 16,
         "attacks": [
             { "name": "kicks", "hit_bonus": 0, "damage": "1d10" },
             { "name": "bites", "hit_bonus": 0, "damage": "1d4" }
@@ -163,7 +154,6 @@
         "flags": ["SMALL_GROUP"],
         "level": 1,
         "bac": 7,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d3" }],
         "loot": { "table": "scrolls", "chance": 0.05 }
     },
@@ -175,7 +165,6 @@
         "level": 2,
         "bac": 6,
         "speed": 18,
-        "vision_range": 16,
         "quips": ["<woof!>", "<bark!>", "<grrr..>"],
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d6" }]
     },
@@ -187,7 +176,6 @@
         "level": 4,
         "bac": 5,
         "speed": 16,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d6" }]
     },
     {
@@ -198,7 +186,6 @@
         "level": 6,
         "bac": 4,
         "speed": 15,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "2d4" }]
     },
     {
@@ -208,7 +195,6 @@
         "flags": ["SMALL_GROUP", "IS_GNOME"],
         "level": 1,
         "speed": 6,
-        "vision_range": 16,
         "attacks": [{ "name": "claws", "hit_bonus": 0, "damage": "1d6" }],
         "loot": { "table": "wands", "chance": 0.05 }
     },
@@ -230,7 +216,6 @@
         "flags": [],
         "level": 1,
         "speed": 9,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d4" }]
     },
     {
@@ -240,7 +225,6 @@
         "flags": [],
         "level": 1,
         "speed": 6,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d4" }],
         "loot": { "table": "food", "chance": 0.05 }
     },
@@ -286,7 +270,6 @@
         "level": 2,
         "bac": 10,
         "speed": 6,
-        "vision_range": 16,
         "attacks": [{ "name": "hacks", "hit_bonus": 0, "damage": "1d8" }],
         "equipped": ["equip_feet_iron"],
         "loot": { "table": "equipment", "chance": 0.05 }
@@ -322,17 +305,62 @@
         "level": 1,
         "bac": 3,
         "speed": 12,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d2" }],
         "loot": { "table": "scrolls", "chance": 0.05 }
     },
+    {
+        "id": "ant_worker",
+        "name": "worker ant",
+        "renderable": { "glyph": "a", "fg": "#ca7631", "bg": "#000000", "order": 1 },
+        "flags": ["SMALL_GROUP"],
+        "level": 2,
+        "bac": 3,
+        "speed": 18,
+        "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d4" }],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "ant_soldier",
+        "name": "soldier ant",
+        "renderable": { "glyph": "a", "fg": "#ca3f26", "bg": "#000000", "order": 1 },
+        "flags": ["SMALL_GROUP", "POISON_RES"],
+        "level": 3,
+        "bac": 3,
+        "speed": 18,
+        "attacks": [
+            { "name": "bites", "hit_bonus": 0, "damage": "2d4" },
+            { "name": "stings", "hit_bonus": 0, "damage": "3d4;poison" }
+        ],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "caterpillar_cave",
+        "name": "caterpillar",
+        "renderable": { "glyph": "a", "fg": "#6b6b6b", "bg": "#000000", "order": 1 },
+        "flags": ["SMALL_GROUP"],
+        "level": 1,
+        "bac": 3,
+        "speed": 9,
+        "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d3" }],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "caterpillar_giant",
+        "name": "giant caterpillar",
+        "renderable": { "glyph": "a", "fg": "#b9aeae", "bg": "#000000", "order": 1 },
+        "flags": ["SMALL_GROUP"],
+        "level": 2,
+        "bac": 7,
+        "speed": 9,
+        "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d6" }],
+        "loot": { "table": "food", "chance": 0.10 }
+    },
     {
         "id": "jackal",
         "name": "jackal",
         "renderable": { "glyph": "d", "fg": "#AA5500", "bg": "#000000", "order": 1 },
         "flags": ["CARNIVORE", "SMALL_GROUP"],
         "bac": 7,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d2" }]
     },
     {
@@ -341,7 +369,6 @@
         "renderable": { "glyph": "d", "fg": "#FF0000", "bg": "#000000", "order": 1 },
         "flags": ["CARNIVORE"],
         "bac": 7,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d3" }]
     },
     {
@@ -351,7 +378,6 @@
         "flags": ["CARNIVORE", "SMALL_GROUP"],
         "level": 1,
         "bac": 7,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "1d4" }]
     },
     {
@@ -361,7 +387,6 @@
         "flags": ["CARNIVORE"],
         "level": 5,
         "bac": 4,
-        "vision_range": 16,
         "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "2d4" }]
     },
     {
@@ -371,7 +396,6 @@
         "flags": [],
         "level": 2,
         "speed": 9,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d8" }],
         "loot": { "table": "wands", "chance": 0.05 }
     },
@@ -382,7 +406,6 @@
         "flags": ["SMALL_GROUP"],
         "level": 1,
         "speed": 9,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d6" }],
         "loot": { "table": "equipment", "chance": 0.05 }
     },
@@ -393,7 +416,6 @@
         "flags": ["LARGE_GROUP"],
         "level": 2,
         "speed": 9,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "1d6" }],
         "loot": { "table": "equipment", "chance": 0.05 }
     },
@@ -404,13 +426,68 @@
         "flags": ["MULTIATTACK"],
         "level": 5,
         "speed": 5,
-        "vision_range": 16,
         "attacks": [
             { "name": "hits", "hit_bonus": 0, "damage": "2d4" },
             { "name": "hits", "hit_bonus": 0, "damage": "2d4" }
         ],
         "loot": { "table": "equipment", "chance": 0.05 }
     },
+    {
+        "id": "warg",
+        "name": "warg",
+        "renderable": { "glyph": "d", "fg": "#8b7164", "bg": "#000000", "order": 1 },
+        "flags": ["SMALL_GROUP"],
+        "level": 7,
+        "bac": 4,
+        "speed": 12,
+        "attacks": [{ "name": "bites", "hit_bonus": 0, "damage": "2d6" }],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "jaguar",
+        "name": "jaguar",
+        "renderable": { "glyph": "f", "fg": "#d3b947", "bg": "#000000", "order": 1 },
+        "flags": ["MULTIATTACK"],
+        "level": 4,
+        "bac": 6,
+        "speed": 15,
+        "attacks": [
+            { "name": "claws", "hit_bonus": 0, "damage": "1d4" },
+            { "name": "claws", "hit_bonus": 0, "damage": "1d4" },
+            { "name": "bites", "hit_bonus": 0, "damage": "1d8" }
+        ],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "lynx",
+        "name": "lynx",
+        "renderable": { "glyph": "f", "fg": "#b5d347", "bg": "#000000", "order": 1 },
+        "flags": ["MULTIATTACK"],
+        "level": 5,
+        "bac": 6,
+        "speed": 15,
+        "attacks": [
+            { "name": "claws", "hit_bonus": 0, "damage": "1d4" },
+            { "name": "claws", "hit_bonus": 0, "damage": "1d4" },
+            { "name": "bites", "hit_bonus": 0, "damage": "1d10" }
+        ],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
+    {
+        "id": "panther",
+        "name": "panther",
+        "renderable": { "glyph": "f", "fg": "#58554e", "bg": "#000000", "order": 1 },
+        "flags": ["MULTIATTACK"],
+        "level": 5,
+        "bac": 6,
+        "speed": 15,
+        "attacks": [
+            { "name": "claws", "hit_bonus": 0, "damage": "1d6" },
+            { "name": "claws", "hit_bonus": 0, "damage": "1d6" },
+            { "name": "bites", "hit_bonus": 0, "damage": "1d10" }
+        ],
+        "loot": { "table": "food", "chance": 0.05 }
+    },
     {
         "id": "ogre",
         "name": "ogre",
@@ -419,7 +496,6 @@
         "level": 5,
         "bac": 5,
         "speed": 10,
-        "vision_range": 16,
         "attacks": [{ "name": "hits", "hit_bonus": 0, "damage": "2d5" }],
         "loot": { "table": "food", "chance": 0.05 }
     },
@@ -427,11 +503,10 @@
         "id": "treant_small",
         "name": "treant sapling",
         "renderable": { "glyph": "♠️", "fg": "#10570d", "bg": "#000000", "order": 1 },
-        "flags": ["LARGE_GROUP", "GREEN_BLOOD"],
+        "flags": ["LARGE_GROUP", "GREEN_BLOOD", "FIRE_WEAK"],
         "level": 2,
         "bac": 12,
         "speed": 3,
-        "vision_range": 16,
         "attacks": [{ "name": "lashes", "hit_bonus": 4, "damage": "1d8" }],
         "loot": { "table": "scrolls", "chance": 0.05 }
     }

raws/spawn_tables.json

@@ -91,6 +91,8 @@
             { "id": "kobold_large",             "weight": 1,    "difficulty": 2}, 
             { "id": "rat_giant",                "weight": 2,    "difficulty": 2}, 
             { "id": "coyote",                   "weight": 4,    "difficulty": 2},
+            { "id": "caterpillar_cave",         "weight": 2,    "difficulty": 2}, 
+            { "id": "caterpillar_giant",        "weight": 2,    "difficulty": 3},
             { "id": "zombie_orc",               "weight": 1,    "difficulty": 3},
             { "id": "zombie_dwarf",             "weight": 1,    "difficulty": 3},
             { "id": "gnome",                    "weight": 1,    "difficulty": 3},
@@ -102,12 +104,18 @@
             { "id": "dwarf",                    "weight": 3,    "difficulty": 4},
             { "id": "orc_hill",                 "weight": 1,    "difficulty": 4},
             { "id": "horse_little",             "weight": 2,    "difficulty": 4},
+            { "id": "ant_worker",               "weight": 3,    "difficulty": 4},
             { "id": "dog",                      "weight": 1,    "difficulty": 5}, 
             { "id": "wolf",                     "weight": 2,    "difficulty": 6},
+            { "id": "jaguar",                   "weight": 2,    "difficulty": 6},
+            { "id": "ant_soldier",              "weight": 2,    "difficulty": 6},
             { "id": "orc_captain",              "weight": 1,    "difficulty": 7},
             { "id": "dog_large",                "weight": 1,    "difficulty": 7},
+            { "id": "lynx",                     "weight": 1,    "difficulty": 7},
+            { "id": "panther",                  "weight": 1,    "difficulty": 7},
             { "id": "horse",                    "weight": 2,    "difficulty": 7},
             { "id": "ogre",                     "weight": 1,    "difficulty": 7},
+            { "id": "warg",                     "weight": 2,    "difficulty": 8},
             { "id": "horse_large",              "weight": 2,    "difficulty": 9}
         ]
     },

src/ai/approach_ai_system.rs

@@ -1,5 +1,5 @@
 use crate::{ EntityMoved, Map, Position, TakingTurn, Telepath, Viewshed, WantsToApproach };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub struct ApproachAI {}
@@ -7,7 +7,6 @@ pub struct ApproachAI {}
 impl<'a> System<'a> for ApproachAI {
     #[allow(clippy::type_complexity)]
     type SystemData = (
-        WriteExpect<'a, RandomNumberGenerator>,
         WriteStorage<'a, TakingTurn>,
         WriteStorage<'a, WantsToApproach>,
         WriteStorage<'a, Position>,
@@ -20,7 +19,6 @@ impl<'a> System<'a> for ApproachAI {
 
     fn run(&mut self, data: Self::SystemData) {
         let (
-            mut rng,
             mut turns,
             mut wants_to_approach,
             mut positions,
@@ -39,7 +37,9 @@ impl<'a> System<'a> for ApproachAI {
             &turns,
         ).join() {
             turn_done.push(entity);
-            let target_idxs = if let Some(paths) = get_adjacent_unblocked(&map, approach.idx as usize) {
+            let target_idxs = if
+                let Some(paths) = get_adjacent_unblocked(&map, approach.idx as usize)
+            {
                 paths
             } else {
                 continue;
@@ -47,9 +47,12 @@ impl<'a> System<'a> for ApproachAI {
             let mut path: Option<NavigationPath> = None;
             let idx = map.xy_idx(pos.x, pos.y);
             for tar_idx in target_idxs {
-                let potential_path = rltk::a_star_search(idx, tar_idx, &mut *map);
+                let potential_path = a_star_search(idx, tar_idx, &mut *map);
                 if potential_path.success && potential_path.steps.len() > 1 {
-                    if path.is_none() || potential_path.steps.len() < path.as_ref().unwrap().steps.len() {
+                    if
+                        path.is_none() ||
+                        potential_path.steps.len() < path.as_ref().unwrap().steps.len()
+                    {
                         path = Some(potential_path);
                     }
                 }

src/ai/chase_ai_system.rs

@@ -1,5 +1,5 @@
 use crate::{ Chasing, EntityMoved, Map, Position, TakingTurn, Telepath, Viewshed };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use std::collections::HashMap;
 use super::approach_ai_system::get_adjacent_unblocked;
@@ -26,8 +26,16 @@ impl<'a> System<'a> for ChaseAI {
     );
 
     fn run(&mut self, data: Self::SystemData) {
-        let (mut turns, mut chasing, mut positions, mut map, mut viewsheds, mut telepaths, mut entity_moved, entities) =
-            data;
+        let (
+            mut turns,
+            mut chasing,
+            mut positions,
+            mut map,
+            mut viewsheds,
+            mut telepaths,
+            mut entity_moved,
+            entities,
+        ) = data;
         let mut targets: HashMap<Entity, (i32, i32)> = HashMap::new();
         let mut end_chase: Vec<Entity> = Vec::new();
         // For every chasing entity with a turn, look for a valid target position,
@@ -67,9 +75,12 @@ impl<'a> System<'a> for ChaseAI {
             let mut path: Option<NavigationPath> = None;
             let idx = map.xy_idx(pos.x, pos.y);
             for tar_idx in target_idxs {
-                let potential_path = rltk::a_star_search(idx, tar_idx, &mut *map);
+                let potential_path = a_star_search(idx, tar_idx, &mut *map);
                 if potential_path.success && potential_path.steps.len() > 1 {
-                    if path.is_none() || potential_path.steps.len() < path.as_ref().unwrap().steps.len() {
+                    if
+                        path.is_none() ||
+                        potential_path.steps.len() < path.as_ref().unwrap().steps.len()
+                    {
                         path = Some(potential_path);
                     }
                 }

src/ai/default_move_system.rs

@@ -1,5 +1,16 @@
-use crate::{ tile_walkable, EntityMoved, Map, MoveMode, Movement, Position, TakingTurn, Telepath, Viewshed };
+use crate::{
+    tile_walkable,
+    EntityMoved,
+    Map,
+    MoveMode,
+    Movement,
+    Position,
+    TakingTurn,
+    Telepath,
+    Viewshed,
+};
 use specs::prelude::*;
+use bracket_lib::prelude::*;
 
 // Rolling a 1d8+x to decide where to move, where x are the number
 // of dice rolls in which they will remian stationary. i.e. If this
@@ -16,7 +27,7 @@ impl<'a> System<'a> for DefaultAI {
         WriteStorage<'a, Viewshed>,
         WriteStorage<'a, Telepath>,
         WriteStorage<'a, EntityMoved>,
-        WriteExpect<'a, rltk::RandomNumberGenerator>,
+        WriteExpect<'a, RandomNumberGenerator>,
         Entities<'a>,
     );
 
@@ -85,7 +96,9 @@ impl<'a> System<'a> for DefaultAI {
                             let idx = map.xy_idx(pos.x, pos.y);
                             pos.x = x;
                             pos.y = y;
-                            entity_moved.insert(entity, EntityMoved {}).expect("Unable to insert EntityMoved");
+                            entity_moved
+                                .insert(entity, EntityMoved {})
+                                .expect("Unable to insert EntityMoved");
                             crate::spatial::move_entity(entity, idx, dest_idx);
                             viewshed.dirty = true;
                             if let Some(is_telepath) = telepaths.get_mut(entity) {
@@ -102,7 +115,9 @@ impl<'a> System<'a> for DefaultAI {
                             if !crate::spatial::is_blocked(path[1] as usize) {
                                 pos.x = (path[1] as i32) % map.width;
                                 pos.y = (path[1] as i32) / map.width;
-                                entity_moved.insert(entity, EntityMoved {}).expect("Unable to insert EntityMoved");
+                                entity_moved
+                                    .insert(entity, EntityMoved {})
+                                    .expect("Unable to insert EntityMoved");
                                 let new_idx = map.xy_idx(pos.x, pos.y);
                                 crate::spatial::move_entity(entity, idx, new_idx);
                                 viewshed.dirty = true;
@@ -112,7 +127,7 @@ impl<'a> System<'a> for DefaultAI {
                                 path.remove(0);
                             } else {
                                 // If the path is blocked, recalculate a new path to the same waypoint.
-                                let path = rltk::a_star_search(
+                                let path = a_star_search(
                                     map.xy_idx(pos.x, pos.y) as i32,
                                     map.xy_idx(
                                         (path[path.len() - 1] as i32) % map.width,
@@ -121,7 +136,9 @@ impl<'a> System<'a> for DefaultAI {
                                     &mut *map
                                 );
                                 if path.success && path.steps.len() > 1 {
-                                    move_mode.mode = Movement::RandomWaypoint { path: Some(path.steps) };
+                                    move_mode.mode = Movement::RandomWaypoint {
+                                        path: Some(path.steps),
+                                    };
                                 }
                             }
                         } else {
@@ -132,7 +149,7 @@ impl<'a> System<'a> for DefaultAI {
                         let target_y = rng.roll_dice(1, map.height - 2);
                         let idx = map.xy_idx(target_x, target_y);
                         if tile_walkable(map.tiles[idx]) {
-                            let path = rltk::a_star_search(
+                            let path = a_star_search(
                                 map.xy_idx(pos.x, pos.y) as i32,
                                 map.xy_idx(target_x, target_y) as i32,
                                 &mut *map

src/ai/energy_system.rs

@@ -10,8 +10,9 @@ use crate::{
     Map,
     TakingTurn,
     Confusion,
+    Intrinsics,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use crate::config::CONFIG;
 use crate::data::events::*;
@@ -36,6 +37,7 @@ impl<'a> System<'a> for EnergySystem {
         ReadStorage<'a, Name>,
         ReadExpect<'a, Point>,
         ReadStorage<'a, Confusion>,
+        ReadStorage<'a, Intrinsics>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
@@ -53,6 +55,7 @@ impl<'a> System<'a> for EnergySystem {
             names,
             player_pos,
             confusion,
+            intrinsics,
         ) = data;
         // If not ticking, do nothing.
         if *runstate != RunState::Ticking {
@@ -68,7 +71,7 @@ impl<'a> System<'a> for EnergySystem {
                     .insert(entity, TakingTurn {})
                     .expect("Unable to insert turn for turn counter.");
                 energy.current -= TURN_COST;
-                crate::gamelog::record_event(EVENT::TURN(1));
+                crate::gamelog::record_event(EVENT::Turn(1));
                 // Handle spawning mobs each turn
                 if CONFIG.logging.log_ticks {
                     console::log(
@@ -87,20 +90,14 @@ impl<'a> System<'a> for EnergySystem {
             &positions,
             !&confusion,
         ).join() {
-            let burden_modifier = if let Some(burden) = burdens.get(entity) {
-                match burden.level {
-                    BurdenLevel::Burdened => SPEED_MOD_BURDENED,
-                    BurdenLevel::Strained => SPEED_MOD_STRAINED,
-                    BurdenLevel::Overloaded => SPEED_MOD_OVERLOADED,
-                }
-            } else {
-                1.0
-            };
-            let overmap_mod = if map.overmap { SPEED_MOD_OVERMAP_TRAVEL } else { 1.0 };
+            let burden_modifier = get_burden_modifier(&burdens, entity);
+            let overmap_mod = get_overmap_modifier(&map);
+            let intrinsic_speed = get_intrinsic_speed(&intrinsics, entity);
             // Every entity has a POTENTIAL equal to their speed.
             let mut energy_potential: i32 = ((energy.speed as f32) *
                 burden_modifier *
-                overmap_mod) as i32;
+                overmap_mod *
+                intrinsic_speed) as i32;
             // Increment current energy by NORMAL_SPEED for every
             // whole number of NORMAL_SPEEDS in their POTENTIAL.
             while energy_potential >= NORMAL_SPEED {
@@ -121,20 +118,12 @@ impl<'a> System<'a> for EnergySystem {
             // has enough energy, they take a turn and decrement their energy
             // by TURN_COST. If the current entity is the player, await input.
             if energy.current >= TURN_COST {
-                let mut my_turn = true;
                 energy.current -= TURN_COST;
                 if entity == *player {
                     *runstate = RunState::AwaitingInput;
-                } else {
-                    let distance = rltk::DistanceAlg::Pythagoras.distance2d(
-                        *player_pos,
-                        Point::new(pos.x, pos.y)
-                    );
-                    if distance > 20.0 {
-                        my_turn = false;
+                } else if cull_turn_by_distance(&player_pos, pos) {
+                    continue;
                 }
-                }
-                if my_turn {
                 turns.insert(entity, TakingTurn {}).expect("Unable to insert turn.");
                 if CONFIG.logging.log_ticks {
                     let name = if let Some(name) = names.get(entity) {
@@ -154,4 +143,36 @@ impl<'a> System<'a> for EnergySystem {
         }
     }
 }
+
+fn get_burden_modifier(burdens: &ReadStorage<Burden>, entity: Entity) -> f32 {
+    return if let Some(burden) = burdens.get(entity) {
+        match burden.level {
+            BurdenLevel::Burdened => SPEED_MOD_BURDENED,
+            BurdenLevel::Strained => SPEED_MOD_STRAINED,
+            BurdenLevel::Overloaded => SPEED_MOD_OVERLOADED,
+        }
+    } else {
+        1.0
+    };
+}
+
+fn get_overmap_modifier(map: &ReadExpect<Map>) -> f32 {
+    return if map.overmap { SPEED_MOD_OVERMAP_TRAVEL } else { 1.0 };
+}
+
+fn cull_turn_by_distance(player_pos: &Point, pos: &Position) -> bool {
+    let distance = DistanceAlg::Pythagoras.distance2d(*player_pos, Point::new(pos.x, pos.y));
+    if distance > 20.0 {
+        return true;
+    }
+    return false;
+}
+
+fn get_intrinsic_speed(intrinsics: &ReadStorage<Intrinsics>, entity: Entity) -> f32 {
+    if let Some(intrinsics) = intrinsics.get(entity) {
+        if intrinsics.list.contains(&crate::Intrinsic::Speed) {
+            return 4.0 / 3.0;
+        }
+    }
+    return 1.0;
 }

src/ai/flee_ai_system.rs

@@ -1,5 +1,5 @@
 use crate::{ EntityMoved, Map, Position, TakingTurn, Telepath, Viewshed, WantsToFlee };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub struct FleeAI {}
@@ -39,7 +39,13 @@ impl<'a> System<'a> for FleeAI {
             turn_done.push(entity);
             let my_idx = map.xy_idx(pos.x, pos.y);
             map.populate_blocked();
-            let flee_map = DijkstraMap::new(map.width as usize, map.height as usize, &fleeing.indices, &*map, 100.0);
+            let flee_map = DijkstraMap::new(
+                map.width as usize,
+                map.height as usize,
+                &fleeing.indices,
+                &*map,
+                100.0
+            );
             let flee_target = DijkstraMap::find_highest_exit(&flee_map, my_idx, &*map);
             if let Some(flee_target) = flee_target {
                 if !crate::spatial::is_blocked(flee_target as usize) {
@@ -50,7 +56,9 @@ impl<'a> System<'a> for FleeAI {
                     }
                     pos.x = (flee_target as i32) % map.width;
                     pos.y = (flee_target as i32) / map.width;
-                    entity_moved.insert(entity, EntityMoved {}).expect("Unable to insert EntityMoved");
+                    entity_moved
+                        .insert(entity, EntityMoved {})
+                        .expect("Unable to insert EntityMoved");
                 }
             }
         }

src/ai/quip_system.rs

@@ -1,5 +1,5 @@
 use crate::{ gamelog, gui::renderable_colour, Name, Quips, Renderable, TakingTurn, Viewshed };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub struct QuipSystem {}
@@ -19,8 +19,18 @@ impl<'a> System<'a> for QuipSystem {
 
     fn run(&mut self, data: Self::SystemData) {
         let (entities, mut quips, names, renderables, turns, player_pos, viewsheds, mut rng) = data;
-        for (entity, quip, name, viewshed, _turn) in (&entities, &mut quips, &names, &viewsheds, &turns).join() {
-            if !quip.available.is_empty() && viewshed.visible_tiles.contains(&player_pos) && rng.roll_dice(1, 6) == 1 {
+        for (entity, quip, name, viewshed, _turn) in (
+            &entities,
+            &mut quips,
+            &names,
+            &viewsheds,
+            &turns,
+        ).join() {
+            if
+                !quip.available.is_empty() &&
+                viewshed.visible_tiles.contains(&player_pos) &&
+                rng.roll_dice(1, 6) == 1
+            {
                 let quip_index = if quip.available.len() == 1 {
                     0
                 } else {

src/ai/regen_system.rs

@@ -9,6 +9,7 @@ use crate::{
     Position,
     RandomNumberGenerator,
     TakingTurn,
+    Intrinsics,
 };
 use specs::prelude::*;
 use crate::data::events::*;
@@ -36,10 +37,24 @@ impl<'a> System<'a> for RegenSystem {
         ReadStorage<'a, HasClass>,
         ReadStorage<'a, Attributes>,
         WriteExpect<'a, RandomNumberGenerator>,
+        ReadStorage<'a, Intrinsics>,
+        ReadExpect<'a, Entity>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
-        let (clock, entities, positions, mut pools, turns, player, classes, attributes, mut rng) = data;
+        let (
+            clock,
+            entities,
+            positions,
+            mut pools,
+            turns,
+            player,
+            classes,
+            attributes,
+            mut rng,
+            intrinsics,
+            player_entity,
+        ) = data;
         let mut clock_turn = false;
         for (_e, _c, _t) in (&entities, &clock, &turns).join() {
             clock_turn = true;
@@ -56,19 +71,29 @@ impl<'a> System<'a> for RegenSystem {
         }
         // Player HP regen
         let level = gamelog::get_event_count(EVENT::COUNT_LEVEL);
-        if current_turn % get_player_hp_regen_turn(level) == 0 {
+        if
+            current_turn % get_player_hp_regen_turn(level) == 0 ||
+            intrinsics.get(*player_entity).unwrap().list.contains(&crate::Intrinsic::Regeneration)
+        {
             for (_e, _p, pool, _player) in (&entities, &positions, &mut pools, &player).join() {
                 try_hp_regen_tick(pool, get_player_hp_regen_per_tick(level));
             }
         }
         // Both MP regen
         for (e, _p, pool) in (&entities, &positions, &mut pools).join() {
-            let is_wizard = if let Some(class) = classes.get(e) { class.name == Class::Wizard } else { false };
+            let is_wizard = if let Some(class) = classes.get(e) {
+                class.name == Class::Wizard
+            } else {
+                false
+            };
             let numerator = if is_wizard { WIZARD_MP_REGEN_MOD } else { NONWIZARD_MP_REGEN_MOD };
             let multiplier: f32 = (numerator as f32) / (MP_REGEN_DIVISOR as f32);
             let mp_regen_tick = (((MP_REGEN_BASE - pool.level) as f32) * multiplier) as i32;
             if current_turn % mp_regen_tick == 0 {
-                try_mana_regen_tick(pool, rng.roll_dice(1, get_mana_regen_per_tick(e, &attributes)));
+                try_mana_regen_tick(
+                    pool,
+                    rng.roll_dice(1, get_mana_regen_per_tick(e, &attributes))
+                );
             }
         }
     }

src/ai/turn_status_system.rs

@@ -10,7 +10,7 @@ use crate::{
     Item,
     Prop,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use crate::data::events::*;
 
@@ -65,9 +65,7 @@ impl<'a> System<'a> for TurnStatusSystem {
                 not_confused.push(entity);
                 if entity == *player_entity {
                     logger = logger
-                        .colour(renderable_colour(&renderables, entity))
                         .append("You")
-                        .colour(WHITE)
                         .append("snap out of it.");
                     log = true;
                 } else {
@@ -94,12 +92,10 @@ impl<'a> System<'a> for TurnStatusSystem {
                 not_my_turn.push(entity);
                 if entity == *player_entity {
                     logger = logger
-                        .colour(renderable_colour(&renderables, entity))
                         .append("You")
-                        .colour(WHITE)
                         .append("are confused!");
                     log = true;
-                    gamelog::record_event(EVENT::PLAYER_CONFUSED(1));
+                    gamelog::record_event(EVENT::PlayerConfused(1));
                 } else {
                     logger = logger
                         .append("The")

src/ai/visible_ai_system.rs

@@ -12,7 +12,7 @@ use crate::{
     WantsToApproach,
     WantsToFlee,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use std::collections::HashSet;
 
@@ -81,10 +81,16 @@ impl<'a> System<'a> for VisibleAI {
             }
             reactions.sort_by(|(a, _, _), (b, _, _)| {
                 let (a_x, a_y) = (a % (map.width as usize), a / (map.width as usize));
-                let dist_a = DistanceAlg::PythagorasSquared.distance2d(Point::new(a_x, a_y), Point::new(pos.x, pos.y));
+                let dist_a = DistanceAlg::PythagorasSquared.distance2d(
+                    Point::new(a_x, a_y),
+                    Point::new(pos.x, pos.y)
+                );
                 let dist_a_estimate = dist_a as i32;
                 let (b_x, b_y) = (b % (map.width as usize), b / (map.width as usize));
-                let dist_b = DistanceAlg::PythagorasSquared.distance2d(Point::new(b_x, b_y), Point::new(pos.x, pos.y));
+                let dist_b = DistanceAlg::PythagorasSquared.distance2d(
+                    Point::new(b_x, b_y),
+                    Point::new(pos.x, pos.y)
+                );
                 let dist_b_estimate = dist_b as i32;
                 return dist_b_estimate.cmp(&dist_a_estimate);
             });
@@ -96,7 +102,9 @@ impl<'a> System<'a> for VisibleAI {
                             wants_to_approach
                                 .insert(entity, WantsToApproach { idx: reaction.0 as i32 })
                                 .expect("Error inserting WantsToApproach");
-                            chasing.insert(entity, Chasing { target: reaction.2 }).expect("Unable to insert Chasing");
+                            chasing
+                                .insert(entity, Chasing { target: reaction.2 })
+                                .expect("Unable to insert Chasing");
                             continue;
                         }
                     }
@@ -108,7 +116,9 @@ impl<'a> System<'a> for VisibleAI {
                 }
             }
             if !flee.is_empty() {
-                wants_to_flee.insert(entity, WantsToFlee { indices: flee }).expect("Unable to insert");
+                wants_to_flee
+                    .insert(entity, WantsToFlee { indices: flee })
+                    .expect("Unable to insert");
             }
         }
     }

src/camera.rs

@@ -1,11 +1,11 @@
 use super::{ Hidden, Map, Mind, Position, Prop, Renderable };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use std::ops::Mul;
 
 const SHOW_BOUNDARIES: bool = false;
 
-pub fn get_screen_bounds(ecs: &World, _ctx: &mut Rltk) -> (i32, i32, i32, i32, i32, i32) {
+pub fn get_screen_bounds(ecs: &World, _ctx: &mut BTerm) -> (i32, i32, i32, i32, i32, i32) {
     let player_pos = ecs.fetch::<Point>();
     let map = ecs.fetch::<Map>();
     let (x_chars, y_chars, mut x_offset, mut y_offset) = (69, 41, 1, 10);
@@ -31,7 +31,7 @@ pub fn get_screen_bounds(ecs: &World, _ctx: &mut Rltk) -> (i32, i32, i32, i32, i
     (min_x, max_x, min_y, max_y, x_offset, y_offset)
 }
 
-pub fn render_camera(ecs: &World, ctx: &mut Rltk) {
+pub fn render_camera(ecs: &World, ctx: &mut BTerm) {
     let map = ecs.fetch::<Map>();
     let (min_x, max_x, min_y, max_y, x_offset, y_offset) = get_screen_bounds(ecs, ctx);
 
@@ -52,7 +52,13 @@ pub fn render_camera(ecs: &World, ctx: &mut Rltk) {
                     ctx.set(x + x_offset, y + y_offset, fg, bg, glyph);
                 }
             } else if SHOW_BOUNDARIES {
-                ctx.set(x + x_offset, y + y_offset, RGB::named(DARKSLATEGRAY), RGB::named(BLACK), rltk::to_cp437('#'));
+                ctx.set(
+                    x + x_offset,
+                    y + y_offset,
+                    RGB::named(DARKSLATEGRAY),
+                    RGB::named(BLACK),
+                    to_cp437('#')
+                );
             }
             x += 1;
         }
@@ -112,14 +118,20 @@ pub fn render_camera(ecs: &World, ctx: &mut Rltk) {
                     }
                 }
                 if draw {
-                    ctx.set(entity_offset_x + x_offset, entity_offset_y + y_offset, fg, bg, render.glyph);
+                    ctx.set(
+                        entity_offset_x + x_offset,
+                        entity_offset_y + y_offset,
+                        fg,
+                        bg,
+                        render.glyph
+                    );
                 }
             }
         }
     }
 }
 
-pub fn render_debug_map(map: &Map, ctx: &mut Rltk) {
+pub fn render_debug_map(map: &Map, ctx: &mut BTerm) {
     let player_pos = Point::new(map.width / 2, map.height / 2);
     let (x_chars, y_chars) = ctx.get_char_size();
 
@@ -141,11 +153,16 @@ pub fn render_debug_map(map: &Map, ctx: &mut Rltk) {
             if tx >= 0 && tx < map_width && ty >= 0 && ty < map_height {
                 let idx = map.xy_idx(tx, ty);
                 if map.revealed_tiles[idx] {
-                    let (glyph, fg, bg) = crate::map::themes::get_tile_renderables_for_id(idx, &*map, None, None);
+                    let (glyph, fg, bg) = crate::map::themes::get_tile_renderables_for_id(
+                        idx,
+                        &*map,
+                        None,
+                        None
+                    );
                     ctx.set(x, y, fg, bg, glyph);
                 }
             } else if SHOW_BOUNDARIES {
-                ctx.set(x, y, RGB::named(rltk::GRAY), RGB::named(rltk::BLACK), rltk::to_cp437('·'));
+                ctx.set(x, y, RGB::named(GRAY), RGB::named(BLACK), to_cp437('·'));
             }
             x += 1;
         }

src/components.rs

@@ -1,12 +1,12 @@
 use crate::gui::Ancestry;
 use crate::gui::Class;
-use rltk::RGB;
+use bracket_lib::prelude::*;
 use serde::{ Deserialize, Serialize };
 use specs::error::NoError;
 use specs::prelude::*;
 use specs::saveload::{ ConvertSaveload, Marker };
 use specs_derive::*;
-use std::collections::HashMap;
+use std::collections::{ HashMap, HashSet };
 
 // Serialization helper code. We need to implement ConvertSaveload for each type that contains an
 // Entity.
@@ -40,7 +40,7 @@ pub struct OtherLevelPosition {
 
 #[derive(Component, ConvertSaveload, Clone)]
 pub struct Renderable {
-    pub glyph: rltk::FontCharType,
+    pub glyph: FontCharType,
     pub fg: RGB,
     pub bg: RGB,
     pub render_order: i32,
@@ -104,14 +104,14 @@ pub struct Mind {}
 
 #[derive(Component, ConvertSaveload, Clone)]
 pub struct Viewshed {
-    pub visible_tiles: Vec<rltk::Point>,
+    pub visible_tiles: Vec<Point>,
     pub range: i32,
     pub dirty: bool,
 }
 
 #[derive(Component, ConvertSaveload, Clone)]
 pub struct Telepath {
-    pub telepath_tiles: Vec<rltk::Point>,
+    pub telepath_tiles: Vec<Point>,
     pub range: i32,
     pub dirty: bool,
 }
@@ -243,16 +243,55 @@ pub enum BUC {
     Blessed,
 }
 
+impl BUC {
+    pub fn noncursed(&self) -> bool {
+        match self {
+            BUC::Cursed => false,
+            _ => true,
+        }
+    }
+}
+
 #[derive(Component, Debug, Serialize, Deserialize, Eq, PartialEq, Hash, Clone)]
 pub struct Beatitude {
     pub buc: BUC,
     pub known: bool,
 }
 
+#[derive(Debug, Serialize, Deserialize, Copy, Clone, PartialEq, Eq)]
+pub enum ItemType {
+    Amulet,
+    Weapon,
+    Armour,
+    Comestible,
+    Scroll,
+    Spellbook,
+    Potion,
+    Ring,
+    Wand,
+}
+
+impl ItemType {
+    pub fn string(&self) -> &str {
+        match self {
+            ItemType::Amulet => "Amulets",
+            ItemType::Weapon => "Weapons",
+            ItemType::Armour => "Armour",
+            ItemType::Comestible => "Comestibles",
+            ItemType::Scroll => "Scrolls",
+            ItemType::Spellbook => "Spellbooks",
+            ItemType::Potion => "Potions",
+            ItemType::Ring => "Rings",
+            ItemType::Wand => "Wands",
+        }
+    }
+}
+
 #[derive(Component, Debug, Serialize, Deserialize, Clone)]
 pub struct Item {
     pub weight: f32, // in lbs
     pub value: f32, // base
+    pub category: ItemType,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, Hash)]
@@ -316,6 +355,7 @@ pub enum WeaponAttribute {
 
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct MeleeWeapon {
+    pub damage_type: DamageType,
     pub attribute: WeaponAttribute,
     pub damage_n_dice: i32,
     pub damage_die_type: i32,
@@ -326,6 +366,7 @@ pub struct MeleeWeapon {
 #[derive(Serialize, Deserialize, Clone)]
 pub struct NaturalAttack {
     pub name: String,
+    pub damage_type: DamageType,
     pub damage_n_dice: i32,
     pub damage_die_type: i32,
     pub damage_bonus: i32,
@@ -365,8 +406,108 @@ pub struct ProvidesHealing {
     pub modifier: i32,
 }
 
+#[derive(Debug, PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)]
+pub enum DamageType {
+    Physical,
+    Magic, // e.g. magic missiles, silvered weapons
+    Fire, // e.g. fireball
+    Cold, // e.g. cone of cold
+    Poison, // e.g. poison gas
+    Forced, // Bypasses any immunities. e.g. Hunger ticks.
+}
+
+impl DamageType {
+    pub fn is_magic(&self) -> bool {
+        match self {
+            DamageType::Magic | DamageType::Fire | DamageType::Cold => true,
+            _ => false,
+        }
+    }
+}
+
+#[derive(Debug, PartialEq, Copy, Clone, Serialize, Deserialize)]
+pub enum DamageModifier {
+    None,
+    Weakness,
+    Resistance,
+    Immune,
+}
+
+impl DamageModifier {
+    const NONE_MOD: f32 = 1.0;
+    const WEAK_MOD: f32 = 2.0;
+    const RESIST_MOD: f32 = 0.5;
+    const IMMUNE_MOD: f32 = 0.0;
+
+    pub fn multiplier(&self) -> f32 {
+        match self {
+            DamageModifier::None => Self::NONE_MOD,
+            DamageModifier::Weakness => Self::WEAK_MOD,
+            DamageModifier::Resistance => Self::RESIST_MOD,
+            DamageModifier::Immune => Self::IMMUNE_MOD,
+        }
+    }
+}
+
+#[derive(Component, Serialize, Deserialize, Debug, Clone)]
+pub struct HasDamageModifiers {
+    pub modifiers: HashMap<DamageType, DamageModifier>,
+}
+
+impl HasDamageModifiers {
+    pub fn modifier(&self, damage_type: &DamageType) -> &DamageModifier {
+        self.modifiers.get(damage_type).unwrap_or(&DamageModifier::None)
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
+pub enum Intrinsic {
+    Regeneration, // Regenerate 1 HP on every tick
+    Speed, // 4/3x speed multiplier
+}
+
+impl Intrinsic {
+    pub fn describe(&self) -> &str {
+        match self {
+            Intrinsic::Regeneration => "regenerates health",
+            Intrinsic::Speed => "is hasted",
+        }
+    }
+}
+
+#[derive(Component, Serialize, Deserialize, Debug, Clone)]
+pub struct Intrinsics {
+    pub list: HashSet<Intrinsic>,
+}
+
+impl Intrinsics {
+    pub fn describe(&self) -> String {
+        let mut descriptions = Vec::new();
+        for intrinsic in &self.list {
+            descriptions.push(intrinsic.describe());
+        }
+        match descriptions.len() {
+            0 =>
+                unreachable!("describe() should never be called on an empty Intrinsics component."),
+            1 => format!("It {}.", descriptions[0]),
+            _ => {
+                let last = descriptions.pop().unwrap();
+                let joined = descriptions.join(", ");
+                format!("It {}, and {}.", joined, last)
+            }
+        }
+    }
+}
+
+#[derive(Component, Serialize, Deserialize, Debug, Clone)]
+pub struct IntrinsicChanged {
+    pub gained: HashSet<Intrinsic>,
+    pub lost: HashSet<Intrinsic>,
+}
+
 #[derive(Component, Debug, ConvertSaveload, Clone)]
 pub struct InflictsDamage {
+    pub damage_type: DamageType,
     pub n_dice: i32,
     pub sides: i32,
     pub modifier: i32,
@@ -417,7 +558,7 @@ pub struct WantsToRemoveItem {
 #[derive(Component, Debug, ConvertSaveload)]
 pub struct WantsToUseItem {
     pub item: Entity,
-    pub target: Option<rltk::Point>,
+    pub target: Option<Point>,
 }
 
 #[derive(Component, Debug, Serialize, Deserialize, Clone)]
@@ -446,8 +587,8 @@ pub struct Charges {
 
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct SpawnParticleLine {
-    pub glyph: rltk::FontCharType,
-    pub tail_glyph: rltk::FontCharType,
+    pub glyph: FontCharType,
+    pub tail_glyph: FontCharType,
     pub colour: RGB,
     pub lifetime_ms: f32,
     pub trail_colour: RGB,
@@ -456,16 +597,16 @@ pub struct SpawnParticleLine {
 
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct SpawnParticleSimple {
-    pub glyph: rltk::FontCharType,
+    pub glyph: FontCharType,
     pub colour: RGB,
     pub lifetime_ms: f32,
 }
 
 #[derive(Component, Serialize, Deserialize, Clone)]
 pub struct SpawnParticleBurst {
-    pub glyph: rltk::FontCharType,
-    pub head_glyph: rltk::FontCharType,
-    pub tail_glyph: rltk::FontCharType,
+    pub glyph: FontCharType,
+    pub head_glyph: FontCharType,
+    pub tail_glyph: FontCharType,
     pub colour: RGB,
     pub lerp: RGB,
     pub lifetime_ms: f32,
@@ -507,3 +648,20 @@ pub struct EntityMoved {}
 
 #[derive(Component, Debug, Serialize, Deserialize, Clone)]
 pub struct MultiAttack {}
+
+#[derive(Component, Debug, Serialize, Deserialize, Clone)]
+pub struct Stackable {}
+
+#[derive(Component, Debug, Serialize, Deserialize, Clone)]
+pub struct WantsToRemoveKey {}
+
+#[derive(Component, Debug, Serialize, Deserialize, Clone)]
+pub struct WantsToDelete {}
+
+#[derive(Component, Debug, Serialize, Deserialize, Clone)]
+pub struct Key {
+    pub idx: usize,
+}
+
+#[derive(Component, Debug, Serialize, Deserialize, Clone)]
+pub struct WantsToAssignKey {}

src/config/mod.rs

@@ -1,4 +1,4 @@
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use toml::Value;
 use serde::{ Serialize, Deserialize };
 

src/damage_system.rs

@@ -11,8 +11,10 @@ use super::{
     Position,
     Renderable,
     RunState,
+    WantsToRemoveKey,
+    WantsToDelete,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use crate::data::events;
 
@@ -40,7 +42,7 @@ pub fn delete_the_dead(ecs: &mut World) {
                                     .append("The")
                                     .colour(renderable_colour(&renderables, entity))
                                     .append(&victim_name.name)
-                                    .colour(rltk::WHITE)
+                                    .colour(WHITE)
                                     .append("is destroyed!")
                                     .log();
                             } else {
@@ -49,7 +51,7 @@ pub fn delete_the_dead(ecs: &mut World) {
                                     .append("The")
                                     .colour(renderable_colour(&renderables, entity))
                                     .append(&victim_name.name)
-                                    .colour(rltk::WHITE)
+                                    .colour(WHITE)
                                     .append("dies!")
                                     .log();
                             }
@@ -65,7 +67,17 @@ pub fn delete_the_dead(ecs: &mut World) {
             }
         }
     }
-    let (items_to_delete, loot_to_spawn) = handle_dead_entity_items(ecs, &dead);
+    let (mut items_to_delete, loot_to_spawn) = handle_dead_entity_items(ecs, &dead);
+    {
+        let entities = ecs.entities();
+        let removekeys = ecs.read_storage::<WantsToRemoveKey>();
+        let delete = ecs.read_storage::<WantsToDelete>();
+        // Add items marked for deletion to the list, but only if they've already had their
+        // key assignments handled, to ensurew we don't leave any dangling references behind.
+        for (e, _d, _r) in (&entities, &delete, !&removekeys).join() {
+            items_to_delete.push(e);
+        }
+    }
     for loot in loot_to_spawn {
         crate::raws::spawn_named_entity(
             &crate::raws::RAWS.lock().unwrap(),
@@ -81,12 +93,16 @@ pub fn delete_the_dead(ecs: &mut World) {
     }
     // For everything that died, increment the event log, and delete.
     for victim in dead {
-        gamelog::record_event(events::EVENT::TURN(1));
+        gamelog::record_event(events::EVENT::Turn(1));
+        // TODO: Delete stuff from inventory? This should be handled elsewhere.
         ecs.delete_entity(victim).expect("Unable to delete.");
     }
 }
 
-fn handle_dead_entity_items(ecs: &mut World, dead: &Vec<Entity>) -> (Vec<Entity>, Vec<(String, Position)>) {
+fn handle_dead_entity_items(
+    ecs: &mut World,
+    dead: &Vec<Entity>
+) -> (Vec<Entity>, Vec<(String, Position)>) {
     let mut to_drop: Vec<(Entity, Position)> = Vec::new();
     let mut to_spawn: Vec<(String, Position)> = Vec::new();
     let entities = ecs.entities();

src/data/events.rs

@@ -2,17 +2,17 @@ use serde::{ Deserialize, Serialize };
 
 #[derive(Serialize, Deserialize, Clone)]
 pub enum EVENT {
-    TURN(i32),
-    LEVEL(i32),
-    CHANGED_FLOOR(String),
-    PLAYER_CONFUSED(i32),
-    KICKED_SOMETHING(i32),
-    BROKE_DOOR(i32),
-    LOOKED_FOR_HELP(i32),
-    KILLED(String),
-    PLAYER_DIED(String),
-    DISCOVERED(String),
-    IDENTIFIED(String),
+    Turn(i32),
+    Level(i32),
+    ChangedFloor(String),
+    PlayerConfused(i32),
+    KickedSomething(i32),
+    BrokeDoor(i32),
+    LookedForHelp(i32),
+    Killed(String),
+    PlayerDied(String),
+    Discovered(String),
+    Identified(String),
 }
 
 impl EVENT {
@@ -20,8 +20,8 @@ impl EVENT {
     pub const COUNT_KILLED: &str = "killed";
     pub const COUNT_LEVEL: &str = "level";
     pub const COUNT_CHANGED_FLOOR: &str = "changed_floor";
-    pub const COUNT_BROKE_DOOR: &str = "broke_door";
-    pub const COUNT_PLAYER_CONFUSED: &str = "player_confused";
+    pub const COUNT_BROKE_DOOR: &str = "BrokeDoor";
+    pub const COUNT_PLAYER_CONFUSED: &str = "PlayerConfused";
     pub const COUNT_KICK: &str = "kick";
-    pub const COUNT_LOOKED_FOR_HELP: &str = "looked_for_help";
+    pub const COUNT_LOOKED_FOR_HELP: &str = "LookedForHelp";
 }

src/data/ids.rs

@@ -1,6 +1,6 @@
 use super::names::*;
 use super::visuals::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 pub const ID_OVERMAP: i32 = 1;
 

src/data/messages.rs

@@ -25,6 +25,7 @@ pub const NUTRITION_BLESSED: &str = "Delicious";
 
 pub const LEVELUP_PLAYER: &str = "Welcome to experience level";
 pub const YOU_PICKUP_ITEM: &str = "You pick up the";
+pub const NO_MORE_KEYS: &str = "Your backpack cannot accomodate any more items";
 pub const YOU_DROP_ITEM: &str = "You drop the";
 pub const YOU_EQUIP_ITEM: &str = "You equip the";
 pub const YOU_REMOVE_ITEM: &str = "You unequip your";
@@ -32,7 +33,7 @@ pub const YOU_REMOVE_ITEM_CURSED: &str = "You can't remove the";
 
 /// Prefixes death message.
 pub const PLAYER_DIED: &str = "You died!";
-/// Death message specifiers. Appended after PLAYER_DIED.
+/// Death message specifiers. Appended after PlayerDied.
 pub const PLAYER_DIED_SUICIDE: &str = "You killed yourself";
 pub const PLAYER_DIED_NAMED_ATTACKER: &str = "You were killed by";
 pub const PLAYER_DIED_UNKNOWN: &str = "You were killed"; // Ultimately, this should never be used. Slowly include specific messages for any death.

src/data/visuals.rs

@@ -1,3 +1,5 @@
+use bracket_lib::prelude::*;
+
 // POST-PROCESSING
 pub const WITH_DARKEN_BY_DISTANCE: bool = true; // If further away tiles should get darkened, instead of a harsh transition to non-visible.
 
@@ -15,8 +17,8 @@ pub const SHORT_PARTICLE_LIFETIME: f32 = 100.0; // in ms
 pub const DEFAULT_PARTICLE_LIFETIME: f32 = 200.0;
 pub const LONG_PARTICLE_LIFETIME: f32 = 300.0;
 
-pub const TARGETING_CURSOR_COL: (u8, u8, u8) = rltk::GOLDENROD;
-pub const TARGETING_LINE_COL: (u8, u8, u8) = rltk::LIGHTGOLDENROD;
+pub const TARGETING_CURSOR_COL: (u8, u8, u8) = GOLDENROD;
+pub const TARGETING_LINE_COL: (u8, u8, u8) = LIGHTGOLDENROD;
 pub const TARGETING_AOE_COL: (u8, u8, u8) = (20, 20, 20);
 pub const TARGETING_VALID_COL: (u8, u8, u8) = (10, 10, 10);
 

src/effects/damage.rs

@@ -14,21 +14,29 @@ use crate::{
     HungerClock,
     HungerState,
     Bleeds,
+    HasDamageModifiers,
 };
 use crate::gui::with_article;
 use crate::data::visuals::{ DEFAULT_PARTICLE_LIFETIME, LONG_PARTICLE_LIFETIME };
 use crate::data::messages::LEVELUP_PLAYER;
 use crate::data::events::*;
 use crate::data::messages::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub fn inflict_damage(ecs: &mut World, damage: &EffectSpawner, target: Entity) {
     let mut pools = ecs.write_storage::<Pools>();
     if let Some(target_pool) = pools.get_mut(target) {
         if !target_pool.god {
-            if let EffectType::Damage { amount } = damage.effect_type {
-                target_pool.hit_points.current -= amount;
+            if let EffectType::Damage { amount, damage_type } = damage.effect_type {
+                let mult = if
+                    let Some(modifiers) = ecs.read_storage::<HasDamageModifiers>().get(target)
+                {
+                    modifiers.modifier(&damage_type).multiplier()
+                } else {
+                    1.0
+                };
+                target_pool.hit_points.current -= ((amount as f32) * mult) as i32;
                 let bleeders = ecs.read_storage::<Bleeds>();
                 if let Some(bleeds) = bleeders.get(target) {
                     add_effect(
@@ -221,12 +229,12 @@ pub fn entity_death(ecs: &mut World, effect: &EffectSpawner, target: Entity) {
     if let Some(source) = effect.source {
         // If the target was the player, game over, and record source of death.
         if target == *player {
-            gamelog::record_event(EVENT::PLAYER_DIED(get_death_message(ecs, source)));
+            gamelog::record_event(EVENT::PlayerDied(get_death_message(ecs, source)));
             return;
         } else {
             // If the player was the source, record the kill.
             if let Some(tar_name) = names.get(target) {
-                gamelog::record_event(EVENT::KILLED(tar_name.name.clone()));
+                gamelog::record_event(EVENT::Killed(tar_name.name.clone()));
             }
         }
         // Calc XP value of target.
@@ -246,7 +254,7 @@ pub fn entity_death(ecs: &mut World, effect: &EffectSpawner, target: Entity) {
                 source_pools.level += 1;
                 // If it was the PLAYER that levelled up:
                 if ecs.read_storage::<Player>().get(source).is_some() {
-                    gamelog::record_event(EVENT::LEVEL(1));
+                    gamelog::record_event(EVENT::Level(1));
                     gamelog::Logger
                         ::new()
                         .append(LEVELUP_PLAYER)
@@ -328,11 +336,11 @@ pub fn entity_death(ecs: &mut World, effect: &EffectSpawner, target: Entity) {
         if target == *player {
             if let Some(hc) = ecs.read_storage::<HungerClock>().get(target) {
                 if hc.state == HungerState::Starving {
-                    gamelog::record_event(EVENT::PLAYER_DIED("You starved to death!".to_string()));
+                    gamelog::record_event(EVENT::PlayerDied("You starved to death!".to_string()));
                 }
             } else {
                 gamelog::record_event(
-                    EVENT::PLAYER_DIED("You died from unknown causes!".to_string())
+                    EVENT::PlayerDied("You died from unknown causes!".to_string())
                 );
             }
         }

src/effects/intrinsics.rs

@@ -0,0 +1,11 @@
+use super::{ EffectSpawner, EffectType };
+use specs::prelude::*;
+
+pub fn add_intrinsic(ecs: &mut World, effect: &EffectSpawner, target: Entity) {
+    let intrinsic = if let EffectType::AddIntrinsic { intrinsic } = &effect.effect_type {
+        intrinsic
+    } else {
+        unreachable!("add_intrinsic() called with the wrong EffectType")
+    };
+    add_intr!(ecs, target, *intrinsic);
+}

src/effects/mod.rs

@@ -1,15 +1,17 @@
 use super::BUC;
 use crate::spatial;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use std::collections::VecDeque;
 use std::sync::Mutex;
+use crate::components::*;
 
 mod damage;
 mod hunger;
 mod particles;
 mod targeting;
 mod triggers;
+mod intrinsics;
 
 pub use targeting::aoe_tiles;
 
@@ -24,6 +26,7 @@ lazy_static! {
 pub enum EffectType {
     Damage {
         amount: i32,
+        damage_type: DamageType,
     },
     Healing {
         amount: i32,
@@ -49,6 +52,9 @@ pub enum EffectType {
     ModifyNutrition {
         amount: i32,
     },
+    AddIntrinsic {
+        intrinsic: Intrinsic,
+    },
     TriggerFire {
         trigger: Entity,
     },
@@ -151,6 +157,7 @@ fn tile_effect_hits_entities(effect: &EffectType) -> bool {
         EffectType::Healing { .. } => true,
         EffectType::ModifyNutrition { .. } => true,
         EffectType::Confusion { .. } => true,
+        EffectType::AddIntrinsic { .. } => true,
         _ => false,
     }
 }
@@ -173,6 +180,7 @@ fn affect_entity(ecs: &mut World, effect: &EffectSpawner, target: Entity) {
         }
         EffectType::EntityDeath => damage::entity_death(ecs, effect, target),
         EffectType::ModifyNutrition { .. } => hunger::modify_nutrition(ecs, effect, target),
+        EffectType::AddIntrinsic { .. } => intrinsics::add_intrinsic(ecs, effect, target),
         _ => {}
     }
 }

src/effects/particles.rs

@@ -1,6 +1,6 @@
 use super::{ add_effect, targeting, EffectSpawner, EffectType, Targets };
 use crate::{ Map, ParticleBuilder, SpawnParticleBurst, SpawnParticleLine, SpawnParticleSimple };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub fn particle_to_tile(ecs: &mut World, target: i32, effect: &EffectSpawner) {
@@ -8,9 +8,24 @@ pub fn particle_to_tile(ecs: &mut World, target: i32, effect: &EffectSpawner) {
         let map = ecs.fetch::<Map>();
         let mut particle_builder = ecs.fetch_mut::<ParticleBuilder>();
         if delay <= 0.0 {
-            particle_builder.request(target % map.width, target / map.width, fg, bg, glyph, lifespan);
+            particle_builder.request(
+                target % map.width,
+                target / map.width,
+                fg,
+                bg,
+                glyph,
+                lifespan
+            );
         } else {
-            particle_builder.delay(target % map.width, target / map.width, fg, bg, glyph, lifespan, delay);
+            particle_builder.delay(
+                target % map.width,
+                target / map.width,
+                fg,
+                bg,
+                glyph,
+                lifespan,
+                delay
+            );
         }
     }
 }
@@ -113,9 +128,14 @@ pub fn handle_line_particles(ecs: &World, entity: Entity, target: &Targets) {
     if let Some(part) = ecs.read_storage::<SpawnParticleLine>().get(entity) {
         if let Some(start_pos) = targeting::find_item_position(ecs, entity) {
             match target {
-                Targets::Tile { target } => spawn_line_particles(ecs, start_pos, *target as i32, part),
+                Targets::Tile { target } =>
+                    spawn_line_particles(ecs, start_pos, *target as i32, part),
                 Targets::TileList { targets } => {
-                    targets.iter().for_each(|target| spawn_line_particles(ecs, start_pos, *target as i32, part))
+                    targets
+                        .iter()
+                        .for_each(|target|
+                            spawn_line_particles(ecs, start_pos, *target as i32, part)
+                        )
                 }
                 Targets::Entity { target } => {
                     if let Some(end_pos) = targeting::entity_position(ecs, *target) {

src/effects/targeting.rs

@@ -1,5 +1,5 @@
 use crate::{ Equipped, InBackpack, Map, Position };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 pub fn entity_position(ecs: &World, target: Entity) -> Option<usize> {
@@ -10,8 +10,8 @@ pub fn entity_position(ecs: &World, target: Entity) -> Option<usize> {
     return None;
 }
 
-pub fn aoe_tiles(map: &Map, target: rltk::Point, radius: i32) -> Vec<usize> {
-    let mut blast_tiles = rltk::field_of_view(target, radius, &*map);
+pub fn aoe_tiles(map: &Map, target: Point, radius: i32) -> Vec<usize> {
+    let mut blast_tiles = field_of_view(target, radius, &*map);
     blast_tiles.retain(|p| p.x > 0 && p.x < map.width - 1 && p.y > 0 && p.y < map.height - 1);
     let mut result = Vec::new();
     for t in blast_tiles.iter() {

src/effects/triggers.rs

@@ -1,4 +1,4 @@
-use super::{ add_effect, get_noncursed, particles, spatial, EffectType, Entity, Targets, World };
+use super::{ add_effect, particles, spatial, EffectType, Entity, Targets, World };
 use crate::{
     gamelog,
     gui::item_colour_ecs,
@@ -30,13 +30,14 @@ use crate::{
     SingleActivation,
     BUC,
     GrantsSpell,
-    KnownSpell,
     KnownSpells,
     Position,
     Viewshed,
+    WantsToRemoveKey,
+    WantsToDelete,
 };
 use crate::data::messages::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 pub fn item_trigger(source: Option<Entity>, item: Entity, target: &Targets, ecs: &mut World) {
     // Check if the item has charges, etc.
@@ -47,8 +48,10 @@ pub fn item_trigger(source: Option<Entity>, item: Entity, target: &Targets, ecs:
                 gamelog::Logger::new().append(NOCHARGES_DIDNOTHING).log();
                 return;
             }
-            gamelog::Logger::new().colour(rltk::YELLOW).append(NOCHARGES_WREST);
-            ecs.write_storage::<Consumable>().insert(item, Consumable {}).expect("Could not insert consumable");
+            gamelog::Logger::new().colour(YELLOW).append(NOCHARGES_WREST);
+            ecs.write_storage::<Consumable>()
+                .insert(item, Consumable {})
+                .expect("Could not insert consumable");
         }
         has_charges.uses -= 1;
     }
@@ -56,7 +59,10 @@ pub fn item_trigger(source: Option<Entity>, item: Entity, target: &Targets, ecs:
     let did_something = event_trigger(source, item, target, ecs);
     // If it's a consumable, delete it
     if did_something && ecs.read_storage::<Consumable>().get(item).is_some() {
-        ecs.entities().delete(item).expect("Failed to delete item");
+        let mut removekey = ecs.write_storage::<WantsToRemoveKey>();
+        removekey.insert(item, WantsToRemoveKey {}).expect("Unable to insert WantsToRemoveKey");
+        let mut delete = ecs.write_storage::<WantsToDelete>();
+        delete.insert(item, WantsToDelete {}).expect("Unable to insert WantsToDelete");
     }
 }
 
@@ -83,7 +89,12 @@ struct EventInfo {
 //       It does almost no sanity-checking to make sure the logs only appear if the effect is taking
 //       place on the player -- once monsters can use an item, their item usage will make logs for
 //       the player saying they were the one who used the item. This will need refactoring then.
-fn event_trigger(source: Option<Entity>, entity: Entity, target: &Targets, ecs: &mut World) -> bool {
+fn event_trigger(
+    source: Option<Entity>,
+    entity: Entity,
+    target: &Targets,
+    ecs: &mut World
+) -> bool {
     let buc = if let Some(beatitude) = ecs.read_storage::<Beatitude>().get(entity) {
         beatitude.buc.clone()
     } else {
@@ -147,7 +158,11 @@ fn handle_restore_nutrition(
     return (logger, false);
 }
 
-fn handle_magic_mapper(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_magic_mapper(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if ecs.read_storage::<MagicMapper>().get(event.entity).is_some() {
         let mut runstate = ecs.fetch_mut::<RunState>();
         let cursed = if event.buc == BUC::Cursed { true } else { false };
@@ -159,9 +174,17 @@ fn handle_magic_mapper(ecs: &mut World, event: &mut EventInfo, mut logger: gamel
     return (logger, false);
 }
 
-fn handle_grant_spell(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
-    if let Some(granted_spell) = ecs.read_storage::<GrantsSpell>().get(event.entity) {
-        if let Some(known_spells) = ecs.write_storage::<KnownSpells>().get_mut(event.source.unwrap()) {
+fn handle_grant_spell(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
+    if let Some(_granted_spell) = ecs.read_storage::<GrantsSpell>().get(event.entity) {
+        if
+            let Some(_known_spells) = ecs
+                .write_storage::<KnownSpells>()
+                .get_mut(event.source.unwrap())
+        {
             // TODO: Check if the player knows *this* spell, and add it if not.
         } else {
             // TODO: Grant the KnownSpells component, and then add the spell.
@@ -170,7 +193,11 @@ fn handle_grant_spell(ecs: &mut World, event: &mut EventInfo, mut logger: gamelo
     return (logger, false);
 }
 
-fn handle_healing(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_healing(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if let Some(healing_item) = ecs.read_storage::<ProvidesHealing>().get(event.entity) {
         let mut rng = ecs.write_resource::<RandomNumberGenerator>();
         let buc_mod = match event.buc {
@@ -178,22 +205,25 @@ fn handle_healing(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::L
             BUC::Cursed => -1,
             _ => 0,
         };
-        let roll = rng.roll_dice(healing_item.n_dice + buc_mod, healing_item.sides) + healing_item.modifier;
+        let roll =
+            rng.roll_dice(healing_item.n_dice + buc_mod, healing_item.sides) +
+            healing_item.modifier;
         add_effect(
             event.source,
-            EffectType::Healing { amount: roll, increment_max: get_noncursed(&event.buc) },
+            EffectType::Healing { amount: roll, increment_max: event.buc.noncursed() },
             event.target.clone()
         );
         for target in get_entity_targets(&event.target) {
-            if ecs.read_storage::<Prop>().get(target).is_some() || ecs.read_storage::<Item>().get(target).is_some() {
+            if
+                ecs.read_storage::<Prop>().get(target).is_some() ||
+                ecs.read_storage::<Item>().get(target).is_some()
+            {
                 continue;
             }
             let renderables = ecs.read_storage::<Renderable>();
             if ecs.read_storage::<Player>().get(target).is_some() {
                 logger = logger
-                    .colour(renderable_colour(&renderables, target))
                     .append("You")
-                    .colour(WHITE)
                     .append(HEAL_PLAYER_HIT)
                     .buc(event.buc.clone(), None, Some(HEAL_PLAYER_HIT_BLESSED));
             } else {
@@ -211,11 +241,19 @@ fn handle_healing(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::L
     return (logger, false);
 }
 
-fn handle_damage(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_damage(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if let Some(damage_item) = ecs.read_storage::<InflictsDamage>().get(event.entity) {
         let mut rng = ecs.write_resource::<RandomNumberGenerator>();
         let roll = rng.roll_dice(damage_item.n_dice, damage_item.sides) + damage_item.modifier;
-        add_effect(event.source, EffectType::Damage { amount: roll }, event.target.clone());
+        add_effect(
+            event.source,
+            EffectType::Damage { amount: roll, damage_type: damage_item.damage_type },
+            event.target.clone()
+        );
         for target in get_entity_targets(&event.target) {
             if ecs.read_storage::<Prop>().get(target).is_some() {
                 continue;
@@ -227,12 +265,12 @@ fn handle_damage(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Lo
             let player_viewshed = viewsheds.get(*ecs.fetch::<Entity>()).unwrap();
             if ecs.read_storage::<Player>().get(target).is_some() {
                 logger = logger
-                    .colour(renderable_colour(&renderables, target))
                     .append("You")
-                    .colour(WHITE)
                     .append(DAMAGE_PLAYER_HIT);
                 event.log = true;
-            } else if player_viewshed.visible_tiles.contains(&Point::new(target_pos.x, target_pos.y)) {
+            } else if
+                player_viewshed.visible_tiles.contains(&Point::new(target_pos.x, target_pos.y))
+            {
                 if ecs.read_storage::<Item>().get(target).is_some() {
                     if ecs.read_storage::<Destructible>().get(target).is_some() {
                         logger = logger
@@ -259,9 +297,17 @@ fn handle_damage(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Lo
 }
 
 #[allow(unused_mut)]
-fn handle_confusion(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_confusion(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if let Some(confusion) = ecs.read_storage::<Confusion>().get(event.entity) {
-        add_effect(event.source, EffectType::Confusion { turns: confusion.turns }, event.target.clone());
+        add_effect(
+            event.source,
+            EffectType::Confusion { turns: confusion.turns },
+            event.target.clone()
+        );
         return (logger, true);
     }
     return (logger, false);
@@ -272,7 +318,11 @@ fn select_single(ecs: &World, runstate: RunState) {
     *new_runstate = runstate;
 }
 
-fn handle_identify(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_identify(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if let Some(_i) = ecs.read_storage::<ProvidesIdentify>().get(event.entity) {
         let mut rng = ecs.write_resource::<RandomNumberGenerator>();
         let mut dm = ecs.fetch_mut::<MasterDungeonMap>();
@@ -303,7 +353,10 @@ fn handle_identify(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::
                     .get(event.source.unwrap())
                     .map(|b| b.known)
                     .unwrap_or(true);
-                return in_this_backpack && (has_obfuscated_name || !already_identified || !known_beatitude);
+                let result =
+                    in_this_backpack &&
+                    (has_obfuscated_name || !already_identified || !known_beatitude);
+                return result;
             }) {
             to_identify.push((e, name.name.clone()));
         }
@@ -313,14 +366,20 @@ fn handle_identify(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::
                 beatitude.known = true;
             }
         }
-        logger = logger.append(IDENTIFY_ALL).buc(event.buc.clone(), None, Some(IDENTIFY_ALL_BLESSED));
+        logger = logger
+            .append(IDENTIFY_ALL)
+            .buc(event.buc.clone(), None, Some(IDENTIFY_ALL_BLESSED));
         event.log = true;
         return (logger, true);
     }
     return (logger, false);
 }
 
-fn handle_remove_curse(ecs: &mut World, event: &mut EventInfo, mut logger: gamelog::Logger) -> (gamelog::Logger, bool) {
+fn handle_remove_curse(
+    ecs: &mut World,
+    event: &mut EventInfo,
+    mut logger: gamelog::Logger
+) -> (gamelog::Logger, bool) {
     if let Some(_r) = ecs.read_storage::<ProvidesRemoveCurse>().get(event.entity) {
         let mut to_decurse: Vec<Entity> = Vec::new();
         match event.buc {
@@ -338,7 +397,9 @@ fn handle_remove_curse(ecs: &mut World, event: &mut EventInfo, mut logger: gamel
                     &ecs.read_storage::<Beatitude>(),
                 )
                     .join()
-                    .filter(|(_e, _i, bp, b)| bp.owner == event.source.unwrap() && b.buc == BUC::Cursed) {
+                    .filter(
+                        |(_e, _i, bp, b)| bp.owner == event.source.unwrap() && b.buc == BUC::Cursed
+                    ) {
                     to_decurse.push(entity);
                 }
             }
@@ -367,7 +428,9 @@ fn handle_remove_curse(ecs: &mut World, event: &mut EventInfo, mut logger: gamel
         }
         let mut beatitudes = ecs.write_storage::<Beatitude>();
         for e in to_decurse {
-            beatitudes.insert(e, Beatitude { buc: BUC::Uncursed, known: true }).expect("Unable to insert beatitude");
+            beatitudes
+                .insert(e, Beatitude { buc: BUC::Uncursed, known: true })
+                .expect("Unable to insert beatitude");
         }
         logger = logger.append(REMOVECURSE).buc(event.buc.clone(), None, Some(REMOVECURSE_BLESSED));
         event.log = true;

src/gamelog/builder.rs

@@ -1,6 +1,6 @@
 use super::{ append_entry, LogFragment };
 use crate::BUC;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 pub struct Logger {
     current_colour: RGB,
@@ -10,7 +10,7 @@ pub struct Logger {
 impl Logger {
     /// Creates a blank builder for making message log entries.
     pub fn new() -> Self {
-        Logger { current_colour: RGB::named(rltk::WHITE), fragments: Vec::new() }
+        Logger { current_colour: RGB::named(WHITE), fragments: Vec::new() }
     }
 
     /// Sets the colour of the current message logger.
@@ -42,11 +42,23 @@ impl Logger {
 
     pub fn buc<T: ToString>(mut self, buc: BUC, cursed: Option<T>, blessed: Option<T>) -> Self {
         if buc == BUC::Cursed && cursed.is_some() {
-            self.fragments.push(LogFragment { colour: RGB::named(SALMON), text: cursed.unwrap().to_string() });
-            self.fragments.push(LogFragment { colour: self.current_colour, text: ". ".to_string() });
+            self.fragments.push(LogFragment {
+                colour: RGB::named(SALMON),
+                text: cursed.unwrap().to_string(),
+            });
+            self.fragments.push(LogFragment {
+                colour: self.current_colour,
+                text: ". ".to_string(),
+            });
         } else if buc == BUC::Blessed && blessed.is_some() {
-            self.fragments.push(LogFragment { colour: RGB::named(CYAN), text: blessed.unwrap().to_string() });
-            self.fragments.push(LogFragment { colour: self.current_colour, text: ". ".to_string() });
+            self.fragments.push(LogFragment {
+                colour: RGB::named(CYAN),
+                text: blessed.unwrap().to_string(),
+            });
+            self.fragments.push(LogFragment {
+                colour: self.current_colour,
+                text: ". ".to_string(),
+            });
         }
         return self;
     }

src/gamelog/events.rs

@@ -5,7 +5,7 @@ use crate::data::names::*;
 
 lazy_static! {
     /// A count of each event that has happened over the run. i.e. "turns", "descended", "ascended"
-    static ref EVENT_COUNTER: Mutex<HashMap<String, i32>> = Mutex::new(HashMap::new());
+    pub static ref EVENT_COUNTER: Mutex<HashMap<String, i32>> = Mutex::new(HashMap::new());
     // A record of events that happened on a given turn. i.e. "Advanced to level 2".
     pub static ref EVENTS: Mutex<HashMap<u32, Vec<String>>> = Mutex::new(HashMap::new());
     // A record of floors visited, and monsters killed. Used to determine if an event is significant.
@@ -41,8 +41,9 @@ pub fn restore_events(events: HashMap<u32, Vec<String>>) {
 }
 /// Wipes all events - for starting a new game.
 pub fn clear_events() {
-    EVENT_COUNTER.lock().unwrap().clear();
-    EVENTS.lock().unwrap().clear();
+    let (mut events, mut event_counts) = (EVENTS.lock().unwrap(), EVENT_COUNTER.lock().unwrap());
+    events.clear();
+    event_counts.clear();
 }
 
 #[allow(unused_mut)]
@@ -73,12 +74,12 @@ pub fn record_event(event: EVENT) {
     let mut new_event: String = "unknown event".to_string();
     let mut significant_event = true;
     match event {
-        EVENT::TURN(n) => {
+        EVENT::Turn(n) => {
             modify_event_count(EVENT::COUNT_TURN, n);
             significant_event = false;
         }
         // If de-levelling is ever implemented, this needs refactoring (along with a lot of stuff).
-        EVENT::LEVEL(n) => {
+        EVENT::Level(n) => {
             modify_event_count(EVENT::COUNT_LEVEL, n);
             let new_lvl = get_event_count(EVENT::COUNT_LEVEL);
             if new_lvl == 1 {
@@ -87,7 +88,7 @@ pub fn record_event(event: EVENT) {
                 new_event = format!("Advanced to level {}", new_lvl);
             }
         }
-        EVENT::CHANGED_FLOOR(n) => {
+        EVENT::ChangedFloor(n) => {
             modify_event_count(EVENT::COUNT_CHANGED_FLOOR, 1);
             if VISITED.lock().unwrap().contains(&n) {
                 significant_event = false;
@@ -96,23 +97,23 @@ pub fn record_event(event: EVENT) {
                 new_event = format!("Visited {} for the first time", n);
             }
         }
-        EVENT::KICKED_SOMETHING(n) => {
+        EVENT::KickedSomething(n) => {
             modify_event_count(EVENT::COUNT_KICK, n);
             significant_event = false;
         }
-        EVENT::BROKE_DOOR(n) => {
+        EVENT::BrokeDoor(n) => {
             modify_event_count(EVENT::COUNT_BROKE_DOOR, n);
             significant_event = false;
         }
-        EVENT::PLAYER_CONFUSED(n) => {
+        EVENT::PlayerConfused(n) => {
             modify_event_count(EVENT::COUNT_PLAYER_CONFUSED, n);
             significant_event = false;
         }
-        EVENT::LOOKED_FOR_HELP(n) => {
+        EVENT::LookedForHelp(n) => {
             modify_event_count(EVENT::COUNT_LOOKED_FOR_HELP, n);
             significant_event = false;
         }
-        EVENT::KILLED(name) => {
+        EVENT::Killed(name) => {
             modify_event_count(EVENT::COUNT_KILLED, 1);
             if KILLED.lock().unwrap().contains(&name) {
                 significant_event = false;
@@ -121,13 +122,13 @@ pub fn record_event(event: EVENT) {
                 new_event = format!("Killed your first {}", name);
             }
         }
-        EVENT::DISCOVERED(name) => {
+        EVENT::Discovered(name) => {
             new_event = format!("Discovered {}", name);
         }
-        EVENT::IDENTIFIED(name) => {
-            new_event = format!("Identified {}", name);
+        EVENT::Identified(name) => {
+            new_event = format!("Identified {}", crate::gui::with_article(name));
         }
-        EVENT::PLAYER_DIED(str) => {
+        EVENT::PlayerDied(str) => {
             // Generating the String is handled in the death effect, to avoid passing the ecs here.
             new_event = format!("{}", str);
         }

src/gamelog/logstore.rs

@@ -1,5 +1,5 @@
 use super::{ events, LogFragment, Logger };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use std::sync::Mutex;
 
 lazy_static! {
@@ -19,7 +19,13 @@ pub fn clear_log() {
     LOG.lock().unwrap().clear();
 }
 
-pub fn print_log(console: &mut Box<dyn Console>, pos: Point, _descending: bool, len: usize, maximum_len: i32) {
+pub fn print_log(
+    console: &mut Box<dyn Console>,
+    pos: Point,
+    _descending: bool,
+    len: usize,
+    maximum_len: i32
+) {
     let mut y = pos.y;
     let mut x = pos.x;
     // Reverse the log, take the number we want to show, and iterate through them
@@ -61,7 +67,13 @@ pub fn print_log(console: &mut Box<dyn Console>, pos: Point, _descending: bool,
                     }
                     // Stay within bounds
                     if y > pos.y - (len as i32) {
-                        console.print_color(x, y, frag.colour.into(), RGB::named(rltk::BLACK).into(), part);
+                        console.print_color(
+                            x,
+                            y,
+                            frag.colour.into(),
+                            RGB::named(BLACK).into(),
+                            part
+                        );
                     }
                     x += part.len() as i32;
                 }
@@ -80,7 +92,7 @@ pub fn setup_log() {
 
     Logger::new()
         .append("Welcome!")
-        .colour(rltk::CYAN)
+        .colour(CYAN)
         .append_n("Press [?] at any time to view controls")
         .period()
         .log();

src/gamelog/mod.rs

@@ -7,7 +7,7 @@ mod events;
 pub use events::*;
 
 use serde::{ Deserialize, Serialize };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 #[derive(Serialize, Deserialize, Clone)]
 pub struct LogFragment {
     pub colour: RGB,

src/gamesystem.rs

@@ -2,7 +2,7 @@ use super::{ Skill, Skills };
 use crate::gui::{ Ancestry, Class };
 use crate::data::entity;
 use crate::data::char_create::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use std::cmp::max;
 
 /// Returns the attribute bonus for a given attribute score, where every 2 points above
@@ -12,13 +12,13 @@ pub fn attr_bonus(value: i32) -> i32 {
 }
 
 /// Returns the number of HP gained per level for a given constitution score.
-pub fn hp_per_level(rng: &mut rltk::RandomNumberGenerator, constitution: i32) -> i32 {
+pub fn hp_per_level(rng: &mut RandomNumberGenerator, constitution: i32) -> i32 {
     return max(rng.roll_dice(1, entity::STANDARD_HIT_DIE) + attr_bonus(constitution), 1);
 }
 
 #[allow(dead_code)]
 /// Returns a total HP roll for a player, based on a given constitution score and level.
-pub fn player_hp_at_level(rng: &mut rltk::RandomNumberGenerator, constitution: i32, level: i32) -> i32 {
+pub fn player_hp_at_level(rng: &mut RandomNumberGenerator, constitution: i32, level: i32) -> i32 {
     let mut total = entity::STANDARD_HIT_DIE + attr_bonus(constitution);
     for _i in 0..level {
         total += hp_per_level(rng, constitution);
@@ -27,7 +27,7 @@ pub fn player_hp_at_level(rng: &mut rltk::RandomNumberGenerator, constitution: i
 }
 
 /// Returns a total HP roll for an NPC, based on a given constitution score and level.
-pub fn npc_hp_at_level(rng: &mut rltk::RandomNumberGenerator, constitution: i32, level: i32) -> i32 {
+pub fn npc_hp_at_level(rng: &mut RandomNumberGenerator, constitution: i32, level: i32) -> i32 {
     if level == 0 {
         return rng.roll_dice(1, entity::STANDARD_HIT_DIE_0);
     }
@@ -39,12 +39,12 @@ pub fn npc_hp_at_level(rng: &mut rltk::RandomNumberGenerator, constitution: i32,
 }
 
 /// Returns the number of mana gained per level for a given intelligence score.
-pub fn mana_per_level(rng: &mut rltk::RandomNumberGenerator, intelligence: i32) -> i32 {
+pub fn mana_per_level(rng: &mut RandomNumberGenerator, intelligence: i32) -> i32 {
     return max(rng.roll_dice(1, entity::STANDARD_MANA_DIE) + attr_bonus(intelligence), 1);
 }
 
 /// Returns the number of mana gained per level for a given intelligence score.
-pub fn mana_at_level(rng: &mut rltk::RandomNumberGenerator, intelligence: i32, level: i32) -> i32 {
+pub fn mana_at_level(rng: &mut RandomNumberGenerator, intelligence: i32, level: i32) -> i32 {
     let mut total = entity::MINIMUM_MANA;
     for _i in 0..level {
         total += mana_per_level(rng, intelligence);
@@ -63,7 +63,7 @@ pub fn skill_bonus(skill: Skill, skills: &Skills) -> i32 {
 
 /// Roll 4d6 and drop the lowest, for rolling d20-style stats
 #[allow(unused)]
-pub fn roll_4d6(rng: &mut rltk::RandomNumberGenerator) -> i32 {
+pub fn roll_4d6(rng: &mut RandomNumberGenerator) -> i32 {
     let mut rolls: Vec<i32> = Vec::new();
     for _i in 0..4 {
         rolls.push(rng.roll_dice(1, 6));

src/gui/character_creation.rs

@@ -24,7 +24,7 @@ use crate::{
     Telepath,
     BUC,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use serde::{ Deserialize, Serialize };
 use specs::prelude::*;
 use std::collections::HashMap;
@@ -111,14 +111,14 @@ pub enum CharCreateResult {
 }
 
 /// Handles the player character creation screen.
-pub fn character_creation(gs: &mut State, ctx: &mut Rltk) -> CharCreateResult {
+pub fn character_creation(gs: &mut State, ctx: &mut BTerm) -> CharCreateResult {
     let runstate = gs.ecs.fetch::<RunState>();
 
     let mut x = 2;
     let mut y = 11;
     let column_width = 20;
 
-    ctx.print_color(x, y, RGB::named(rltk::WHITE), RGB::named(rltk::BLACK), CHAR_CREATE_HEADER);
+    ctx.print_color(x, y, RGB::named(WHITE), RGB::named(BLACK), CHAR_CREATE_HEADER);
     y += 2;
 
     if let RunState::CharacterCreation { ancestry, class } = *runstate {
@@ -269,9 +269,9 @@ pub fn setup_player_ancestry(ecs: &mut World, ancestry: Ancestry) {
         Ancestry::Dwarf => {
             renderables
                 .insert(*player, Renderable {
-                    glyph: rltk::to_cp437(DWARF_GLYPH),
+                    glyph: to_cp437(DWARF_GLYPH),
                     fg: RGB::named(DWARF_COLOUR),
-                    bg: RGB::named(rltk::BLACK),
+                    bg: RGB::named(BLACK),
                     render_order: 0,
                 })
                 .expect("Unable to insert renderable component");
@@ -280,9 +280,9 @@ pub fn setup_player_ancestry(ecs: &mut World, ancestry: Ancestry) {
         Ancestry::Elf => {
             renderables
                 .insert(*player, Renderable {
-                    glyph: rltk::to_cp437(ELF_GLYPH),
+                    glyph: to_cp437(ELF_GLYPH),
                     fg: RGB::named(ELF_COLOUR),
-                    bg: RGB::named(rltk::BLACK),
+                    bg: RGB::named(BLACK),
                     render_order: 0,
                 })
                 .expect("Unable to insert renderable component");
@@ -305,9 +305,9 @@ pub fn setup_player_ancestry(ecs: &mut World, ancestry: Ancestry) {
         Ancestry::Catfolk => {
             renderables
                 .insert(*player, Renderable {
-                    glyph: rltk::to_cp437(CATFOLK_GLYPH),
+                    glyph: to_cp437(CATFOLK_GLYPH),
                     fg: RGB::named(CATFOLK_COLOUR),
-                    bg: RGB::named(rltk::BLACK),
+                    bg: RGB::named(BLACK),
                     render_order: 0,
                 })
                 .expect("Unable to insert renderable component");
@@ -451,11 +451,11 @@ fn pick_random_table_item(
     rng: &mut RandomNumberGenerator,
     push_to: &mut Vec<String>,
     table: &'static str,
-    dice: &'static str,
+    dice_str: &'static str,
     difficulty: Option<i32>
 ) {
-    let (n, d, m) = raws::parse_dice_string(dice);
-    for _i in 0..rng.roll_dice(n, d) + m {
+    let dice = parse_dice_string(dice_str).expect("Error parsing dice");
+    for _i in 0..rng.roll_dice(dice.n_dice, dice.die_type) + dice.bonus {
         push_to.push(raws::table_by_name(&raws::RAWS.lock().unwrap(), table, difficulty).roll(rng));
     }
 }

src/gui/cheat_menu.rs

@@ -1,5 +1,5 @@
 use super::State;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 #[derive(PartialEq, Copy, Clone)]
 pub enum CheatMenuResult {
@@ -12,13 +12,13 @@ pub enum CheatMenuResult {
     GodMode,
 }
 
-pub fn show_cheat_menu(_gs: &mut State, ctx: &mut Rltk) -> CheatMenuResult {
+pub fn show_cheat_menu(_gs: &mut State, ctx: &mut BTerm) -> CheatMenuResult {
     let (x_offset, y_offset) = (1, 10);
     ctx.print_color(
         1 + x_offset,
         1 + y_offset,
-        RGB::named(rltk::RED),
-        RGB::named(rltk::BLACK),
+        RGB::named(RED),
+        RGB::named(BLACK),
         "DEBUG MENU! [aA-zZ][Esc.]"
     );
     let x = 1 + x_offset;
@@ -26,26 +26,26 @@ pub fn show_cheat_menu(_gs: &mut State, ctx: &mut Rltk) -> CheatMenuResult {
     let count = 5;
     let width = 19;
 
-    ctx.draw_box(x, y, width, (count + 1) as i32, RGB::named(rltk::RED), RGB::named(rltk::BLACK));
+    ctx.draw_box(x, y, width, (count + 1) as i32, RGB::named(RED), RGB::named(BLACK));
     y += 1;
     // Asc
-    ctx.set(x_offset + 2, y, RGB::named(rltk::YELLOW), RGB::named(rltk::BLACK), rltk::to_cp437('a'));
+    ctx.set(x_offset + 2, y, RGB::named(YELLOW), RGB::named(BLACK), to_cp437('a'));
     ctx.print(x_offset + 4, y, "ASCEND A FLOOR");
     y += 1;
     // Desc
-    ctx.set(x_offset + 2, y, RGB::named(rltk::YELLOW), RGB::named(rltk::BLACK), rltk::to_cp437('d'));
+    ctx.set(x_offset + 2, y, RGB::named(YELLOW), RGB::named(BLACK), to_cp437('d'));
     ctx.print(x_offset + 4, y, "DESCEND A FLOOR");
     y += 1;
     // Heal
-    ctx.set(x_offset + 2, y, RGB::named(rltk::YELLOW), RGB::named(rltk::BLACK), rltk::to_cp437('h'));
+    ctx.set(x_offset + 2, y, RGB::named(YELLOW), RGB::named(BLACK), to_cp437('h'));
     ctx.print(x_offset + 4, y, "HEAL TO FULL");
     y += 1;
     // Reveal map
-    ctx.set(x_offset + 2, y, RGB::named(rltk::YELLOW), RGB::named(rltk::BLACK), rltk::to_cp437('m'));
+    ctx.set(x_offset + 2, y, RGB::named(YELLOW), RGB::named(BLACK), to_cp437('m'));
     ctx.print(x_offset + 4, y, "MAGIC MAP REVEAL");
     y += 1;
     // Godmode
-    ctx.set(x_offset + 2, y, RGB::named(rltk::YELLOW), RGB::named(rltk::BLACK), rltk::to_cp437('g'));
+    ctx.set(x_offset + 2, y, RGB::named(YELLOW), RGB::named(BLACK), to_cp437('g'));
     ctx.print(x_offset + 4, y, "GOD MODE");
     // Match keys
     match ctx.key {

src/gui/farlook.rs

@@ -1,5 +1,5 @@
 use super::{ State, RunState, tooltip::draw_tooltips, camera::get_screen_bounds };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 #[derive(PartialEq, Copy, Clone)]
 pub enum FarlookResult {
@@ -10,7 +10,7 @@ pub enum FarlookResult {
     Cancel,
 }
 
-pub fn show_farlook(gs: &mut State, ctx: &mut Rltk) -> FarlookResult {
+pub fn show_farlook(gs: &mut State, ctx: &mut BTerm) -> FarlookResult {
     let runstate = gs.ecs.fetch::<RunState>();
     let (_min_x, _max_x, _min_y, _max_y, x_offset, y_offset) = get_screen_bounds(&gs.ecs, ctx);
 
@@ -27,7 +27,7 @@ pub fn show_farlook(gs: &mut State, ctx: &mut Rltk) -> FarlookResult {
         let x = x.clamp(x_offset, x_offset - 1 + (screen_x as i32));
         let y = y.clamp(y_offset, y_offset - 1 + (screen_y as i32));
 
-        ctx.set(x, y, RGB::named(WHITE), RGB::named(BLACK), rltk::to_cp437('X'));
+        ctx.set(x, y, RGB::named(WHITE), RGB::named(BLACK), to_cp437('X'));
         draw_tooltips(&gs.ecs, ctx, Some((x, y)));
 
         return match ctx.key {

src/gui/identify_menu.rs

@@ -3,10 +3,10 @@ use super::{
     item_colour_ecs,
     obfuscate_name_ecs,
     print_options,
-    renderable_colour,
+    unique_ecs,
+    check_key,
+    letter_to_option,
     ItemMenuResult,
-    UniqueInventoryItem,
-    BUC,
 };
 use crate::{
     gamelog,
@@ -19,14 +19,15 @@ use crate::{
     Name,
     ObfuscatedName,
     Renderable,
+    Key,
     states::state::*,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
-use std::collections::BTreeMap;
+use std::collections::HashMap;
 
 /// Handles the Identify menu.
-pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entity>) {
+pub fn identify(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<Entity>) {
     let player_entity = gs.ecs.fetch::<Entity>();
     let equipped = gs.ecs.read_storage::<Equipped>();
     let backpack = gs.ecs.read_storage::<InBackpack>();
@@ -37,9 +38,12 @@ pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entit
     let names = gs.ecs.read_storage::<Name>();
     let renderables = gs.ecs.read_storage::<Renderable>();
     let beatitudes = gs.ecs.read_storage::<Beatitude>();
+    let keys = gs.ecs.read_storage::<Key>();
 
     let build_identify_iterator = || {
-        (&entities, &items, &renderables, &names).join().filter(|(item_entity, _i, _r, n)| {
+        (&entities, &items, &renderables, &names, &keys)
+            .join()
+            .filter(|(item_entity, _i, _r, n, _k)| {
                 // If not owned by the player, return false.
                 let mut keep = false;
                 if let Some(bp) = backpack.get(*item_entity) {
@@ -58,7 +62,8 @@ pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entit
                 }
                 // If not obfuscated, or already identified, return false.
                 if
-                (!obfuscated.get(*item_entity).is_some() || dm.identified_items.contains(&n.name)) &&
+                    (!obfuscated.get(*item_entity).is_some() ||
+                        dm.identified_items.contains(&n.name)) &&
                     beatitudes
                         .get(*item_entity)
                         .map(|beatitude| beatitude.known)
@@ -90,32 +95,15 @@ pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entit
             .log();
         return (ItemMenuResult::Selected, Some(build_identify_iterator().nth(0).unwrap().0));
     }
-    let mut player_inventory: super::PlayerInventory = BTreeMap::new();
-    for (entity, _i, renderable, name) in build_identify_iterator() {
-        let (singular, plural) = obfuscate_name_ecs(&gs.ecs, entity);
-        let beatitude_status = if let Some(beatitude) = gs.ecs.read_storage::<Beatitude>().get(entity) {
-            match beatitude.buc {
-                BUC::Blessed => 1,
-                BUC::Uncursed => 2,
-                BUC::Cursed => 3,
-            }
-        } else {
-            0
-        };
-        let unique_item = UniqueInventoryItem {
-            display_name: super::DisplayName { singular: singular.clone(), plural: plural.clone() },
-            rgb: item_colour_ecs(&gs.ecs, entity),
-            renderables: renderable_colour(&renderables, entity),
-            glyph: renderable.glyph,
-            beatitude_status: beatitude_status,
-            name: name.name.clone(),
-        };
+    let mut player_inventory: super::PlayerInventory = HashMap::new();
+    for (entity, _i, _r, _n, key) in build_identify_iterator() {
+        let unique_item = unique_ecs(&gs.ecs, entity);
         player_inventory
             .entry(unique_item)
-            .and_modify(|(_e, count)| {
-                *count += 1;
+            .and_modify(|slot| {
+                slot.count += 1;
             })
-            .or_insert((entity, 1));
+            .or_insert(super::InventorySlot { item: entity, count: 1, idx: key.idx });
     }
     // Get display args
     let width = get_max_inventory_width(&player_inventory);
@@ -125,12 +113,12 @@ pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entit
     ctx.print_color(
         1 + x_offset,
         1 + y_offset,
-        RGB::named(rltk::WHITE),
-        RGB::named(rltk::BLACK),
+        RGB::named(WHITE),
+        RGB::named(BLACK),
         "Identify which item? [aA-zZ][Esc.]"
     );
     ctx.draw_box(x, y, width + 2, count + 1, RGB::named(WHITE), RGB::named(BLACK));
-    print_options(&player_inventory, x + 1, y + 1, ctx);
+    print_options(&gs.ecs, &player_inventory, x + 1, y + 1, ctx);
     // Input
     match ctx.key {
         None => (ItemMenuResult::NoResponse, None),
@@ -138,21 +126,17 @@ pub fn identify(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entit
             match key {
                 VirtualKeyCode::Escape => (ItemMenuResult::Cancel, None),
                 _ => {
-                    let selection = rltk::letter_to_option(key);
-                    if selection > -1 && selection < (count as i32) {
-                        let item = player_inventory
-                            .iter()
-                            .nth(selection as usize)
-                            .unwrap().1.0;
-                        gamelog::Logger
-                            ::new()
-                            .append("You identify the")
-                            .colour(item_colour_ecs(&gs.ecs, item))
-                            .append_n(obfuscate_name_ecs(&gs.ecs, item).0)
-                            .colour(WHITE)
-                            .append("!")
-                            .log();
-                        return (ItemMenuResult::Selected, Some(item));
+                    let selection = letter_to_option::letter_to_option(key, ctx.shift);
+                    if selection != -1 && check_key(selection as usize) {
+                        // Get the first entity with a Key {} component that has an idx matching "selection".
+                        let entities = gs.ecs.entities();
+                        let keyed_items = gs.ecs.read_storage::<Key>();
+                        let backpack = gs.ecs.read_storage::<InBackpack>();
+                        for (e, key, _b) in (&entities, &keyed_items, &backpack).join() {
+                            if key.idx == (selection as usize) {
+                                return (ItemMenuResult::Selected, Some(e));
+                            }
+                        }
                     }
                     (ItemMenuResult::NoResponse, None)
                 }

src/gui/letter_to_option.rs

@@ -1,4 +1,4 @@
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 pub fn letter_to_option(key: VirtualKeyCode, shift: bool) -> i32 {
     if shift {

src/gui/remove_curse_menu.rs

@@ -3,17 +3,31 @@ use super::{
     item_colour_ecs,
     obfuscate_name_ecs,
     print_options,
-    renderable_colour,
+    unique_ecs,
+    check_key,
+    letter_to_option,
     ItemMenuResult,
-    UniqueInventoryItem,
+    InventorySlot,
 };
-use crate::{ gamelog, Beatitude, Entity, Equipped, InBackpack, Item, Name, Renderable, states::state::*, BUC };
-use rltk::prelude::*;
+use crate::{
+    gamelog,
+    Beatitude,
+    Entity,
+    Equipped,
+    InBackpack,
+    Item,
+    Name,
+    Renderable,
+    states::state::*,
+    BUC,
+    Key,
+};
+use bracket_lib::prelude::*;
 use specs::prelude::*;
-use std::collections::BTreeMap;
+use std::collections::HashMap;
 
 /// Handles the Remove Curse menu.
-pub fn remove_curse(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<Entity>) {
+pub fn remove_curse(gs: &mut State, ctx: &mut BTerm) -> (ItemMenuResult, Option<Entity>) {
     let player_entity = gs.ecs.fetch::<Entity>();
     let equipped = gs.ecs.read_storage::<Equipped>();
     let backpack = gs.ecs.read_storage::<InBackpack>();
@@ -22,9 +36,12 @@ pub fn remove_curse(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<E
     let beatitudes = gs.ecs.read_storage::<Beatitude>();
     let names = gs.ecs.read_storage::<Name>();
     let renderables = gs.ecs.read_storage::<Renderable>();
+    let keys = gs.ecs.read_storage::<Key>();
 
     let build_cursed_iterator = || {
-        (&entities, &items, &beatitudes, &renderables, &names).join().filter(|(item_entity, _i, b, _r, _n)| {
+        (&entities, &items, &beatitudes, &renderables, &names, &keys)
+            .join()
+            .filter(|(item_entity, _i, b, _r, _n, _k)| {
                 // Set all items to FALSE initially.
                 let mut keep = false;
                 // If found in the player's backpack, set to TRUE
@@ -73,32 +90,19 @@ pub fn remove_curse(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<E
             .log();
         return (ItemMenuResult::Selected, Some(item));
     }
-    let mut player_inventory: super::PlayerInventory = BTreeMap::new();
-    for (entity, _i, _b, renderable, name) in build_cursed_iterator() {
-        let (singular, plural) = obfuscate_name_ecs(&gs.ecs, entity);
-        let beatitude_status = if let Some(beatitude) = gs.ecs.read_storage::<Beatitude>().get(entity) {
-            match beatitude.buc {
-                BUC::Blessed => 1,
-                BUC::Uncursed => 2,
-                BUC::Cursed => 3,
-            }
-        } else {
-            0
-        };
-        let unique_item = UniqueInventoryItem {
-            display_name: super::DisplayName { singular: singular.clone(), plural: plural.clone() },
-            rgb: item_colour_ecs(&gs.ecs, entity),
-            renderables: renderable_colour(&renderables, entity),
-            glyph: renderable.glyph,
-            beatitude_status: beatitude_status,
-            name: name.name.clone(),
-        };
+    let mut player_inventory: super::PlayerInventory = HashMap::new();
+    for (entity, _i, _b, _r, _n, key) in build_cursed_iterator() {
+        let unique_item = unique_ecs(&gs.ecs, entity);
         player_inventory
             .entry(unique_item)
-            .and_modify(|(_e, count)| {
-                *count += 1;
+            .and_modify(|slot| {
+                slot.count += 1;
             })
-            .or_insert((entity, 1));
+            .or_insert(InventorySlot {
+                item: entity,
+                count: 1,
+                idx: key.idx,
+            });
     }
     // Get display args
     let width = get_max_inventory_width(&player_inventory);
@@ -108,12 +112,12 @@ pub fn remove_curse(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<E
     ctx.print_color(
         1 + x_offset,
         1 + y_offset,
-        RGB::named(rltk::WHITE),
-        RGB::named(rltk::BLACK),
+        RGB::named(WHITE),
+        RGB::named(BLACK),
         "Decurse which item? [aA-zZ][Esc.]"
     );
     ctx.draw_box(x, y, width + 2, count + 1, RGB::named(WHITE), RGB::named(BLACK));
-    print_options(&player_inventory, x + 1, y + 1, ctx);
+    print_options(&gs.ecs, &player_inventory, x + 1, y + 1, ctx);
     // Input
     match ctx.key {
         None => (ItemMenuResult::NoResponse, None),
@@ -121,21 +125,17 @@ pub fn remove_curse(gs: &mut State, ctx: &mut Rltk) -> (ItemMenuResult, Option<E
             match key {
                 VirtualKeyCode::Escape => (ItemMenuResult::Cancel, None),
                 _ => {
-                    let selection = rltk::letter_to_option(key);
-                    if selection > -1 && selection < (count as i32) {
-                        let item = player_inventory
-                            .iter()
-                            .nth(selection as usize)
-                            .unwrap().1.0;
-                        gamelog::Logger
-                            ::new()
-                            .append("You decurse the")
-                            .colour(item_colour_ecs(&gs.ecs, item))
-                            .append_n(obfuscate_name_ecs(&gs.ecs, item).0)
-                            .colour(WHITE)
-                            .append("!")
-                            .log();
-                        return (ItemMenuResult::Selected, Some(item));
+                    let selection = letter_to_option::letter_to_option(key, ctx.shift);
+                    if selection != -1 && check_key(selection as usize) {
+                        // Get the first entity with a Key {} component that has an idx matching "selection".
+                        let entities = gs.ecs.entities();
+                        let keyed_items = gs.ecs.read_storage::<Key>();
+                        let backpack = gs.ecs.read_storage::<InBackpack>();
+                        for (e, key, _b) in (&entities, &keyed_items, &backpack).join() {
+                            if key.idx == (selection as usize) {
+                                return (ItemMenuResult::Selected, Some(e));
+                            }
+                        }
                     }
                     (ItemMenuResult::NoResponse, None)
                 }

src/gui/tooltip.rs

@@ -1,7 +1,18 @@
-use super::{ camera::get_screen_bounds, Attributes, Hidden, Map, Name, Pools, Position, Renderable, Rltk, World, RGB };
+use super::{
+    camera::get_screen_bounds,
+    Attributes,
+    Hidden,
+    Map,
+    Name,
+    Pools,
+    Position,
+    Renderable,
+    World,
+    RGB,
+};
 use crate::TileType;
 use crate::data::ids::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 
 struct Tooltip {
@@ -33,8 +44,15 @@ impl Tooltip {
     fn height(&self) -> i32 {
         return (self.lines.len() as i32) + 2i32;
     }
-    fn render(&self, ctx: &mut Rltk, x: i32, y: i32) {
-        ctx.draw_box(x, y, self.width() - 1, self.height() - 1, RGB::named(WHITE), RGB::named(BLACK));
+    fn render(&self, ctx: &mut BTerm, x: i32, y: i32) {
+        ctx.draw_box(
+            x,
+            y,
+            self.width() - 1,
+            self.height() - 1,
+            RGB::named(WHITE),
+            RGB::named(BLACK)
+        );
         for (i, s) in self.lines.iter().enumerate() {
             ctx.print_color(x + 1, y + (i as i32) + 1, s.1, RGB::named(BLACK), &s.0);
         }
@@ -42,7 +60,7 @@ impl Tooltip {
 }
 
 #[rustfmt::skip]
-pub fn draw_tooltips(ecs: &World, ctx: &mut Rltk, xy: Option<(i32, i32)>) {
+pub fn draw_tooltips(ecs: &World, ctx: &mut BTerm, xy: Option<(i32, i32)>) {
     let (min_x, _max_x, min_y, _max_y, x_offset, y_offset) = get_screen_bounds(ecs, ctx);
     let map = ecs.fetch::<Map>();
     let names = ecs.read_storage::<Name>();
@@ -93,6 +111,12 @@ pub fn draw_tooltips(ecs: &World, ctx: &mut Rltk, xy: Option<(i32, i32)>) {
         if position.x == mouse_pos_adjusted.0 && position.y == mouse_pos_adjusted.1 {
             let mut tip = Tooltip::new();
             tip.add(crate::gui::obfuscate_name_ecs(ecs, entity).0, renderable.fg);
+            let intrinsics = ecs.read_storage::<crate::components::Intrinsics>();
+            if let Some(intrinsics) = intrinsics.get(entity) {
+                if !intrinsics.list.is_empty() {
+                    tip.add(intrinsics.describe(), RGB::named(WHITE));
+                }
+            }
             // Attributes
             let attr = attributes.get(entity);
             if let Some(a) = attr {
@@ -143,7 +167,7 @@ pub fn draw_tooltips(ecs: &World, ctx: &mut Rltk, xy: Option<(i32, i32)>) {
 
     if tooltips.is_empty() { return ; }
 
-    let white = RGB::named(rltk::WHITE);
+    let white = RGB::named(WHITE);
 
     let arrow;
     let arrow_x;
@@ -157,7 +181,7 @@ pub fn draw_tooltips(ecs: &World, ctx: &mut Rltk, xy: Option<(i32, i32)>) {
         arrow = to_cp437('←');
         arrow_x = mouse_pos.0 + 1;
     }
-    ctx.set(arrow_x, arrow_y, white, RGB::named(rltk::BLACK), arrow);
+    ctx.set(arrow_x, arrow_y, white, RGB::named(BLACK), arrow);
 
     let mut total_height = 0;
     for t in tooltips.iter() {

src/hunger_system.rs

@@ -1,5 +1,14 @@
-use super::{ effects::{ add_effect, EffectType, Targets }, gamelog, Clock, HungerClock, HungerState, TakingTurn };
-use rltk::prelude::*;
+use super::{
+    effects::{ add_effect, EffectType, Targets },
+    gamelog,
+    Clock,
+    HungerClock,
+    HungerState,
+    TakingTurn,
+    DamageType,
+    Intrinsics,
+};
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use crate::config::CONFIG;
 
@@ -45,10 +54,11 @@ impl<'a> System<'a> for HungerSystem {
         ReadExpect<'a, Entity>,
         ReadStorage<'a, Clock>,
         ReadStorage<'a, TakingTurn>,
+        ReadStorage<'a, Intrinsics>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
-        let (entities, mut hunger_clock, player_entity, turn_clock, turns) = data;
+        let (entities, mut hunger_clock, player_entity, turn_clock, turns, intrinsics) = data;
 
         // If the turn clock isn't taking a turn this tick, don't bother ticking hunger.
         let mut ticked = false;
@@ -64,16 +74,32 @@ impl<'a> System<'a> for HungerSystem {
             if hunger_clock.duration >= MAX_SATIATION {
                 hunger_clock.duration = MAX_SATIATION;
             } else {
-                hunger_clock.duration -= BASE_CLOCK_DECREMENT_PER_TURN;
+                let mut modifier = 0;
+                let intrinsic_regen = if let Some(i) = intrinsics.get(entity) {
+                    i.list.contains(&crate::Intrinsic::Regeneration)
+                } else {
+                    false
+                };
+                if intrinsic_regen {
+                    modifier += 1;
+                }
+                hunger_clock.duration -= BASE_CLOCK_DECREMENT_PER_TURN + modifier;
             }
             let initial_state = hunger_clock.state;
             hunger_clock.state = get_hunger_state(hunger_clock.duration);
             if hunger_clock.state == HungerState::Starving {
-                add_effect(None, EffectType::Damage { amount: 1 }, Targets::Entity { target: entity });
+                add_effect(
+                    None,
+                    EffectType::Damage { amount: 1, damage_type: DamageType::Forced },
+                    Targets::Entity { target: entity }
+                );
             }
             if CONFIG.logging.log_ticks && entity == *player_entity {
-                rltk::console::log(
-                    format!("HUNGER SYSTEM: Ticked for player entity. [clock: {}]", hunger_clock.duration)
+                console::log(
+                    format!(
+                        "HUNGER SYSTEM: Ticked for player entity. [clock: {}]",
+                        hunger_clock.duration
+                    )
                 );
             }
             if hunger_clock.state == initial_state {

src/inventory/collection_system.rs

@@ -12,10 +12,11 @@ use crate::{
     ObfuscatedName,
     Position,
     WantsToPickupItem,
-    Renderable,
+    WantsToAssignKey,
 };
 use specs::prelude::*;
 use crate::data::messages;
+use bracket_lib::prelude::*;
 
 pub struct ItemCollectionSystem {}
 
@@ -33,6 +34,7 @@ impl<'a> System<'a> for ItemCollectionSystem {
         ReadStorage<'a, Beatitude>,
         ReadExpect<'a, MasterDungeonMap>,
         ReadStorage<'a, Charges>,
+        ReadStorage<'a, WantsToAssignKey>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
@@ -48,15 +50,11 @@ impl<'a> System<'a> for ItemCollectionSystem {
             beatitudes,
             dm,
             wands,
+            wants_key,
         ) = data;
-
-        for pickup in wants_pickup.join() {
-            positions.remove(pickup.item);
-            backpack.insert(pickup.item, InBackpack { owner: pickup.collected_by }).expect("Unable to pickup item.");
-            equipment_changed
-                .insert(pickup.collected_by, EquipmentChanged {})
-                .expect("Unable to insert EquipmentChanged.");
-
+        let mut to_remove: Vec<Entity> = Vec::new();
+        // For every item that wants to be picked up that *isn't* waiting on a key assignment.
+        for (pickup, _key) in (&wants_pickup, !&wants_key).join() {
             if pickup.collected_by == *player_entity {
                 gamelog::Logger
                     ::new()
@@ -76,12 +74,21 @@ impl<'a> System<'a> for ItemCollectionSystem {
                             ).0
                         )
                     )
-                    .colour(rltk::WHITE)
+                    .colour(WHITE)
                     .period()
                     .log();
             }
+            positions.remove(pickup.item);
+            backpack
+                .insert(pickup.item, InBackpack { owner: pickup.collected_by })
+                .expect("Unable to pickup item");
+            equipment_changed
+                .insert(pickup.collected_by, EquipmentChanged {})
+                .expect("Unable to insert EquipmentChanged");
+            to_remove.push(pickup.collected_by);
+        }
+        for item in to_remove.iter() {
+            wants_pickup.remove(*item);
         }
-
-        wants_pickup.clear();
     }
 }

src/inventory/drop_system.rs

@@ -12,9 +12,11 @@ use crate::{
     ObfuscatedName,
     Position,
     WantsToDropItem,
+    WantsToRemoveKey,
 };
 use specs::prelude::*;
 use crate::data::messages;
+use bracket_lib::prelude::*;
 
 pub struct ItemDropSystem {}
 
@@ -33,6 +35,7 @@ impl<'a> System<'a> for ItemDropSystem {
         ReadStorage<'a, ObfuscatedName>,
         ReadExpect<'a, MasterDungeonMap>,
         ReadStorage<'a, Charges>,
+        WriteStorage<'a, WantsToRemoveKey>,
     );
 
     fn run(&mut self, data: Self::SystemData) {
@@ -49,10 +52,13 @@ impl<'a> System<'a> for ItemDropSystem {
             obfuscated_names,
             dm,
             wands,
+            mut keys,
         ) = data;
 
         for (entity, to_drop) in (&entities, &wants_drop).join() {
-            equipment_changed.insert(entity, EquipmentChanged {}).expect("Unable to insert EquipmentChanged.");
+            equipment_changed
+                .insert(entity, EquipmentChanged {})
+                .expect("Unable to insert EquipmentChanged.");
             let mut dropper_pos: Position = Position { x: 0, y: 0 };
             {
                 let dropped_pos = positions.get(entity).unwrap();
@@ -65,6 +71,9 @@ impl<'a> System<'a> for ItemDropSystem {
             backpack.remove(to_drop.item);
 
             if entity == *player_entity {
+                keys.insert(to_drop.item, WantsToRemoveKey {}).expect(
+                    "Unable to insert WantsToRemoveKey"
+                );
                 gamelog::Logger
                     ::new()
                     .append(messages::YOU_DROP_ITEM)
@@ -83,7 +92,7 @@ impl<'a> System<'a> for ItemDropSystem {
                             ).0
                         )
                     )
-                    .colour(rltk::WHITE)
+                    .colour(WHITE)
                     .period()
                     .log();
             }

src/inventory/equip_system.rs

@@ -17,6 +17,7 @@ use crate::{
 };
 use specs::prelude::*;
 use crate::data::messages;
+use bracket_lib::prelude::*;
 
 pub struct ItemEquipSystem {}
 
@@ -66,7 +67,11 @@ impl<'a> System<'a> for ItemEquipSystem {
                 // Remove any items target has in item's slot
                 let mut can_equip = true;
                 let mut to_unequip: Vec<Entity> = Vec::new();
-                for (item_entity, already_equipped, _name) in (&entities, &equipped, &names).join() {
+                for (item_entity, already_equipped, _name) in (
+                    &entities,
+                    &equipped,
+                    &names,
+                ).join() {
                     if already_equipped.owner == target && already_equipped.slot == target_slot {
                         if let Some(beatitude) = beatitudes.get(item_entity) {
                             if beatitude.buc == BUC::Cursed {
@@ -85,7 +90,7 @@ impl<'a> System<'a> for ItemEquipSystem {
                                             None
                                         ).0
                                     )
-                                    .colour(rltk::WHITE)
+                                    .colour(WHITE)
                                     .append("!");
                                 identified_beatitude
                                     .insert(item_entity, IdentifiedBeatitude {})
@@ -101,15 +106,25 @@ impl<'a> System<'a> for ItemEquipSystem {
                 }
                 for item in to_unequip.iter() {
                     equipped.remove(*item);
-                    backpack.insert(*item, InBackpack { owner: target }).expect("Unable to insert backpack");
+                    backpack
+                        .insert(*item, InBackpack { owner: target })
+                        .expect("Unable to insert backpack");
                     if target == *player_entity {
                         logger = logger
                             .append(messages::YOU_REMOVE_ITEM)
                             .colour(item_colour(*item, &beatitudes))
                             .append_n(
-                                obfuscate_name(*item, &names, &magic_items, &obfuscated_names, &beatitudes, &dm, None).0
+                                obfuscate_name(
+                                    *item,
+                                    &names,
+                                    &magic_items,
+                                    &obfuscated_names,
+                                    &beatitudes,
+                                    &dm,
+                                    None
+                                ).0
                             )
-                            .colour(rltk::WHITE)
+                            .colour(WHITE)
                             .period();
                     }
                 }
@@ -134,7 +149,7 @@ impl<'a> System<'a> for ItemEquipSystem {
                                 None
                             ).0
                         )
-                        .colour(rltk::WHITE)
+                        .colour(WHITE)
                         .period();
                     logger.log();
                     identified_items

src/inventory/identification_system.rs

@@ -1,4 +1,13 @@
-use crate::{ Beatitude, IdentifiedBeatitude, IdentifiedItem, Item, MasterDungeonMap, Name, ObfuscatedName, Player };
+use crate::{
+    Beatitude,
+    IdentifiedBeatitude,
+    IdentifiedItem,
+    Item,
+    MasterDungeonMap,
+    Name,
+    ObfuscatedName,
+    Player,
+};
 use specs::prelude::*;
 use crate::data::events::*;
 use crate::gamelog;
@@ -35,7 +44,7 @@ impl<'a> System<'a> for ItemIdentificationSystem {
             let tag = crate::raws::get_id_from_name(id.name.clone());
             if !dm.identified_items.contains(&id.name) && crate::raws::is_tag_magic(&tag) {
                 if gamelog::get_event_count(EVENT::COUNT_TURN) != 1 {
-                    gamelog::record_event(EVENT::IDENTIFIED(id.name.clone()));
+                    gamelog::record_event(EVENT::Identified(id.name.clone()));
                 }
                 dm.identified_items.insert(id.name.clone());
                 for (entity, _item, name) in (&entities, &items, &names).join() {

src/inventory/keyhandling.rs

@@ -0,0 +1,153 @@
+use crate::{
+    gamelog,
+    gui::unique,
+    Beatitude,
+    Charges,
+    MagicItem,
+    MasterDungeonMap,
+    Name,
+    ObfuscatedName,
+    Stackable,
+    Renderable,
+    WantsToAssignKey,
+    WantsToRemoveKey,
+    Key,
+};
+use specs::prelude::*;
+use crate::data::messages;
+use bracket_lib::prelude::*;
+use crate::invkeys::*;
+
+pub struct KeyHandling {}
+
+const DEBUG_KEYHANDLING: bool = true;
+
+impl<'a> System<'a> for KeyHandling {
+    #[allow(clippy::type_complexity)]
+    type SystemData = (
+        Entities<'a>,
+        WriteStorage<'a, WantsToAssignKey>,
+        WriteStorage<'a, WantsToRemoveKey>,
+        WriteStorage<'a, Key>,
+        ReadStorage<'a, Stackable>,
+        ReadStorage<'a, Name>,
+        ReadStorage<'a, ObfuscatedName>,
+        ReadStorage<'a, Renderable>,
+        ReadStorage<'a, Beatitude>,
+        ReadStorage<'a, MagicItem>,
+        ReadStorage<'a, Charges>,
+        ReadExpect<'a, MasterDungeonMap>,
+    );
+
+    fn run(&mut self, data: Self::SystemData) {
+        let (
+            entities,
+            mut wants_keys,
+            mut wants_removekey,
+            mut keys,
+            stackable,
+            names,
+            obfuscated_names,
+            renderables,
+            beatitudes,
+            magic_items,
+            wands,
+            dm,
+        ) = data;
+
+        // For every entity that wants to be picked up, that still needs a key assigned.
+        for (e, _wants_key) in (&entities, &wants_keys).join() {
+            if DEBUG_KEYHANDLING {
+                console::log(&format!("KEYHANDLING: Assigning key to {:?}", e));
+            }
+            let (stacks, mut handled, unique) = (
+                if let Some(_) = stackable.get(e) { true } else { false },
+                false,
+                unique(
+                    e,
+                    &names,
+                    &obfuscated_names,
+                    &renderables,
+                    &beatitudes,
+                    &magic_items,
+                    Some(&wands),
+                    &dm
+                ),
+            );
+            if stacks {
+                console::log(&format!("KEYHANDLING: Item is stackable."));
+                let maybe_key = item_exists(&unique);
+                if maybe_key.is_some() {
+                    console::log(&format!("KEYHANDLING: Existing stack found for this item."));
+                    let key = maybe_key.unwrap();
+                    keys.insert(e, Key { idx: key }).expect("Unable to insert Key.");
+                    console::log(&format!("KEYHANDLING: Assigned key idx {} to item.", key));
+                    handled = true;
+                }
+            }
+            if !handled {
+                console::log(
+                    &format!("KEYHANDLING: Item is not stackable, or no existing stack found.")
+                );
+                if let Some(idx) = assign_next_available() {
+                    console::log(
+                        &format!("KEYHANDLING: Assigned next available index {} to item.", idx)
+                    );
+                    keys.insert(e, Key { idx }).expect("Unable to insert Key.");
+                    register_stackable(stacks, unique, idx);
+                } else {
+                    console::log(&format!("KEYHANDLING: No more keys available."));
+                    gamelog::Logger
+                        ::new()
+                        .append(messages::NO_MORE_KEYS)
+                        .colour(WHITE)
+                        .period()
+                        .log();
+                }
+            }
+        }
+        for (e, _wants_key) in (&entities, &wants_removekey).join() {
+            let idx = keys.get(e).unwrap().idx;
+            if DEBUG_KEYHANDLING {
+                console::log(&format!("KEYHANDLING: Removing key from {:?}", e));
+            }
+            // If the item is *not* stackable, then we can just remove the key and clear the index.
+            if let None = stackable.get(e) {
+                console::log(
+                    &format!("KEYHANDLING: Item is not stackable, clearing index {}.", idx)
+                );
+                clear_idx(idx);
+                keys.remove(e);
+                continue;
+            }
+            // If the item *is* stackable, then we need to check if there are any other items that
+            // share this key assignment, before clearing the index.
+            console::log(
+                &format!(
+                    "KEYHANDLING: Item is stackable, checking if any other items share this key."
+                )
+            );
+            let mut sole_item_with_key = true;
+            for (entity, key) in (&entities, &keys).join() {
+                if entity != e && key.idx == idx {
+                    console::log(&format!("KEYHANDLING: Another item shares index {}", idx));
+                    sole_item_with_key = false;
+                    break;
+                }
+            }
+            // If no other items shared this key, free up the index.
+            if sole_item_with_key {
+                console::log(
+                    &format!("KEYHANDLING: No other items found, clearing index {}.", idx)
+                );
+                clear_idx(idx);
+            }
+            // Either way, remove the key component from this item, because we're dropping it.
+            console::log(&format!("KEYHANDLING: Removing key component from item."));
+            keys.remove(e);
+        }
+
+        wants_removekey.clear();
+        wants_keys.clear();
+    }
+}

src/inventory/mod.rs

@@ -4,6 +4,7 @@ mod equip_system;
 mod identification_system;
 mod remove_system;
 mod use_system;
+mod keyhandling;
 
 pub use self::{
     collection_system::ItemCollectionSystem,
@@ -12,4 +13,5 @@ pub use self::{
     identification_system::ItemIdentificationSystem,
     remove_system::ItemRemoveSystem,
     use_system::ItemUseSystem,
+    keyhandling::KeyHandling,
 };

src/inventory/remove_system.rs

@@ -11,7 +11,7 @@ use crate::{
     WantsToRemoveItem,
     BUC,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use crate::data::messages;
 
@@ -99,7 +99,9 @@ impl<'a> System<'a> for ItemRemoveSystem {
                         .log();
                 }
             }
-            backpack.insert(to_remove.item, InBackpack { owner: entity }).expect("Unable to insert backpack");
+            backpack
+                .insert(to_remove.item, InBackpack { owner: entity })
+                .expect("Unable to insert backpack");
         }
 
         wants_remove.clear();

src/invkeys.rs

@@ -0,0 +1,59 @@
+use std::sync::Mutex;
+use std::collections::HashMap;
+use crate::gui::UniqueInventoryItem;
+
+lazy_static! {
+    pub static ref INVKEYS: Mutex<HashMap<UniqueInventoryItem, usize>> = Mutex::new(HashMap::new());
+    pub static ref ASSIGNEDKEYS: Mutex<Vec<bool>> = Mutex::new(vec![false; 52]);
+}
+
+/// For (de)serialization.
+pub fn clone_invkeys() -> HashMap<UniqueInventoryItem, usize> {
+    let invkeys = INVKEYS.lock().unwrap();
+    invkeys.clone()
+}
+pub fn restore_invkeys(invkeys: HashMap<UniqueInventoryItem, usize>) {
+    INVKEYS.lock().unwrap().clear();
+    INVKEYS.lock().unwrap().extend(invkeys);
+}
+
+pub fn check_key(idx: usize) -> bool {
+    let lock = ASSIGNEDKEYS.lock().unwrap();
+    lock[idx]
+}
+
+pub fn item_exists(item: &UniqueInventoryItem) -> Option<usize> {
+    let invkeys = INVKEYS.lock().unwrap();
+    use bracket_lib::prelude::*;
+    console::log(&format!("{:?}", item));
+    if invkeys.contains_key(item) {
+        Some(*invkeys.get(item).unwrap())
+    } else {
+        None
+    }
+}
+
+pub fn assign_next_available() -> Option<usize> {
+    let mut lock = ASSIGNEDKEYS.lock().unwrap();
+    for (i, key) in lock.iter_mut().enumerate() {
+        if !*key {
+            *key = true;
+            return Some(i);
+        }
+    }
+    None
+}
+
+pub fn register_stackable(stacks: bool, item: UniqueInventoryItem, idx: usize) {
+    if stacks {
+        let mut invkeys = INVKEYS.lock().unwrap();
+        invkeys.insert(item, idx);
+    }
+}
+
+pub fn clear_idx(idx: usize) {
+    let mut lock = ASSIGNEDKEYS.lock().unwrap();
+    lock[idx] = false;
+    let mut invkeys = INVKEYS.lock().unwrap();
+    invkeys.retain(|_k, v| *v != idx);
+}

src/lib.rs

@@ -1,13 +1,16 @@
 // src/lib.rs
 // 31-Aug-2023
 
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 extern crate serde;
 
 #[macro_use]
 extern crate lazy_static;
 
+#[macro_use]
+pub mod macros;
+
 pub mod camera;
 pub mod components;
 pub mod raws;
@@ -35,6 +38,7 @@ pub mod rex_assets;
 pub mod spatial;
 pub mod morgue;
 pub mod states;
+pub mod invkeys;
 
 pub use components::*;
 use particle_system::ParticleBuilder;

src/macros/mod.rs

@@ -0,0 +1,93 @@
+// macros/mod.rs
+
+#[macro_export]
+/// Used to check if the player has a given component.
+macro_rules! player_has_component {
+    ($ecs:expr, $component:ty) => {
+        {
+            let player = $ecs.fetch::<Entity>();
+            let component = $ecs.read_storage::<$component>();
+            if let Some(player_component) = component.get(*player) {
+                true
+            } else {
+                false
+            }
+        }
+    };
+}
+
+#[macro_export]
+/// Used to check if a given entity has a given Intrinsic.
+macro_rules! has {
+    ($ecs:expr, $entity:expr, $intrinsic:expr) => {
+        {
+            let intrinsics = $ecs.read_storage::<crate::Intrinsics>();
+            if let Some(has_intrinsics) = intrinsics.get($entity) {
+                has_intrinsics.list.contains(&$intrinsic)
+            } else {
+                false
+            }
+        }
+    };
+}
+
+#[macro_export]
+/// Used to check if the player has a given Intrinsic.
+macro_rules! player_has {
+    ($ecs:expr, $intrinsic:expr) => {
+        {
+            let player = $ecs.fetch::<Entity>();
+            let intrinsics = $ecs.read_storage::<crate::Intrinsics>();
+            if let Some(player_intrinsics) = intrinsics.get(*player) {
+                player_intrinsics.list.contains(&$intrinsic)
+            } else {
+                false
+            }
+        }
+    };
+}
+
+#[macro_export]
+/// Handles adding an Intrinsic to the player, and adding it to the IntrinsicChanged component.
+macro_rules! add_intr {
+    ($ecs:expr, $entity:expr, $intrinsic:expr) => {
+        {
+            let mut intrinsics = $ecs.write_storage::<crate::Intrinsics>();
+            if let Some(player_intrinsics) = intrinsics.get_mut($entity) {
+                if !player_intrinsics.list.contains(&$intrinsic) {
+                    player_intrinsics.list.insert($intrinsic);
+                    let mut intrinsic_changed = $ecs.write_storage::<crate::IntrinsicChanged>();
+                    if let Some(this_intrinsic_changed) = intrinsic_changed.get_mut($entity) {
+                        this_intrinsic_changed.gained.insert($intrinsic);
+                    } else {
+                        intrinsic_changed.insert($entity, crate::IntrinsicChanged {
+                            gained: {
+                                let mut m = std::collections::HashSet::new();
+                                m.insert($intrinsic);
+                                m
+                            },
+                            lost: std::collections::HashSet::new()
+                        }).expect("Failed to insert IntrinsicChanged component.");
+                    }
+                }
+            } else {
+                intrinsics.insert($entity, crate::Intrinsics {
+                    list: {
+                        let mut m = std::collections::HashSet::new();
+                        m.insert($intrinsic);
+                        m
+                    }
+                }).expect("Failed to insert Intrinsics component.");
+                let mut intrinsic_changed = $ecs.write_storage::<crate::IntrinsicChanged>();
+                intrinsic_changed.insert($entity, crate::IntrinsicChanged {
+                    gained: {
+                        let mut m = std::collections::HashSet::new();
+                        m.insert($intrinsic);
+                        m
+                    },
+                    lost: std::collections::HashSet::new()
+                }).expect("Failed to insert IntrinsicChanged component.");
+            }
+        }
+    };
+}

src/main.rs

@@ -1,19 +1,19 @@
 use rust_rl::*;
 use specs::prelude::*;
 use specs::saveload::{ SimpleMarker, SimpleMarkerAllocator };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 const DISPLAYWIDTH: i32 = 105;
 const DISPLAYHEIGHT: i32 = 56;
 
-fn main() -> rltk::BError {
+fn main() -> BError {
     // Embedded resources for use in wasm build
     const CURSES_14_16_BYTES: &[u8] = include_bytes!("../resources/curses14x16.png");
-    rltk::embedding::EMBED.lock().add_resource("resources/curses14x16.png".to_string(), CURSES_14_16_BYTES);
+    EMBED.lock().add_resource("resources/curses14x16.png".to_string(), CURSES_14_16_BYTES);
 
-    //rltk::link_resource!(CURSES14X16, "../resources/curses_14x16.png");
+    //link_resource!(CURSES14X16, "../resources/curses_14x16.png");
 
-    let mut context = RltkBuilder::new()
+    let mut context = BTermBuilder::new()
         .with_title("rust-rl")
         .with_dimensions(DISPLAYWIDTH, DISPLAYHEIGHT)
         .with_font("curses14x16.png", 14, 16)
@@ -26,7 +26,9 @@ fn main() -> rltk::BError {
 
     let mut gs = State {
         ecs: World::new(),
-        mapgen_next_state: Some(RunState::MainMenu { menu_selection: gui::MainMenuSelection::NewGame }),
+        mapgen_next_state: Some(RunState::MainMenu {
+            menu_selection: gui::MainMenuSelection::NewGame,
+        }),
         mapgen_index: 0,
         mapgen_history: Vec::new(),
         mapgen_timer: 0.0,
@@ -107,6 +109,14 @@ fn main() -> rltk::BError {
     gs.ecs.register::<SpawnParticleSimple>();
     gs.ecs.register::<SpawnParticleBurst>();
     gs.ecs.register::<SpawnParticleLine>();
+    gs.ecs.register::<HasDamageModifiers>();
+    gs.ecs.register::<Intrinsics>();
+    gs.ecs.register::<IntrinsicChanged>();
+    gs.ecs.register::<Stackable>();
+    gs.ecs.register::<WantsToAssignKey>();
+    gs.ecs.register::<Key>();
+    gs.ecs.register::<WantsToRemoveKey>();
+    gs.ecs.register::<WantsToDelete>();
     gs.ecs.register::<SimpleMarker<SerializeMe>>();
     gs.ecs.register::<SerializationHelper>();
     gs.ecs.register::<DMSerializationHelper>();
@@ -115,11 +125,11 @@ fn main() -> rltk::BError {
     raws::load_raws();
 
     // Insert calls
-    gs.ecs.insert(rltk::RandomNumberGenerator::new());
+    gs.ecs.insert(RandomNumberGenerator::new());
     gs.ecs.insert(map::MasterDungeonMap::new()); // Master map list
     gs.ecs.insert(Map::new(true, 1, 64, 64, 0, "New Map", "N", 0)); // Map
     gs.ecs.insert(Point::new(0, 0)); // Player pos
-    gs.ecs.insert(gui::Ancestry::Dwarf); // ancestry
+    gs.ecs.insert(gui::Ancestry::Human); // ancestry
     let player_entity = spawner::player(&mut gs.ecs, 0, 0);
     gs.ecs.insert(player_entity); // Player entity
     gs.ecs.insert(RunState::MapGeneration {}); // RunState
@@ -127,8 +137,8 @@ fn main() -> rltk::BError {
     gs.ecs.insert(rex_assets::RexAssets::new());
 
     gamelog::setup_log();
-    gamelog::record_event(data::events::EVENT::LEVEL(1));
+    gamelog::record_event(data::events::EVENT::Level(1));
     gs.generate_world_map(1, TileType::Floor);
 
-    rltk::main_loop(context, gs)
+    main_loop(context, gs)
 }

src/map/dungeon.rs

@@ -1,6 +1,6 @@
 use super::{ Map, TileType };
 use crate::{ gamelog, map_builders, OtherLevelPosition, Position, Telepath, Viewshed };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use serde::{ Deserialize, Serialize };
 use specs::prelude::*;
 use std::collections::{ HashMap, HashSet };
@@ -61,7 +61,11 @@ impl MasterDungeonMap {
 
 fn make_scroll_name(rng: &mut RandomNumberGenerator) -> String {
     let len = 4 + rng.roll_dice(1, 6);
-    let space_at_i = if len > 6 && rng.roll_dice(1, 2) == 1 { rng.roll_dice(1, len - 6) + 3 } else { -1 };
+    let space_at_i = if len > 6 && rng.roll_dice(1, 2) == 1 {
+        rng.roll_dice(1, len - 6) + 3
+    } else {
+        -1
+    };
     let offset = rng.roll_dice(1, 2) - 1;
     let mut name = "".to_string();
     for i in 0..len {
@@ -142,7 +146,9 @@ const POTION_ADJECTIVES: &[&str] = &[
 fn make_potion_name(rng: &mut RandomNumberGenerator, used_names: &mut HashSet<String>) -> String {
     loop {
         let mut name: String =
-            POTION_ADJECTIVES[(rng.roll_dice(1, POTION_ADJECTIVES.len() as i32) as usize) - 1].to_string();
+            POTION_ADJECTIVES[
+                (rng.roll_dice(1, POTION_ADJECTIVES.len() as i32) as usize) - 1
+            ].to_string();
         name += " ";
         name += POTION_COLOURS[(rng.roll_dice(1, POTION_COLOURS.len() as i32) as usize) - 1];
         name += " potion";
@@ -178,7 +184,8 @@ const WAND_TYPES: &[&str] = &[
 
 fn make_wand_name(rng: &mut RandomNumberGenerator, used_names: &mut HashSet<String>) -> String {
     loop {
-        let mut name: String = WAND_TYPES[(rng.roll_dice(1, WAND_TYPES.len() as i32) as usize) - 1].to_string();
+        let mut name: String =
+            WAND_TYPES[(rng.roll_dice(1, WAND_TYPES.len() as i32) as usize) - 1].to_string();
         name += " wand";
 
         if !used_names.contains(&name) {
@@ -227,8 +234,9 @@ fn transition_to_existing_map(ecs: &mut World, new_id: i32, dest_tile: TileType)
         }
         possible_destinations.push(((map.width * map.height) as usize) / 2); // Centre of map
     }
-    let mut rng = ecs.write_resource::<rltk::RandomNumberGenerator>();
-    let idx = possible_destinations[(rng.roll_dice(1, possible_destinations.len() as i32) as usize) - 1];
+    let mut rng = ecs.write_resource::<RandomNumberGenerator>();
+    let idx =
+        possible_destinations[(rng.roll_dice(1, possible_destinations.len() as i32) as usize) - 1];
     let mut player_position = ecs.write_resource::<Point>();
     *player_position = Point::new((idx as i32) % w, (idx as i32) / w);
     let mut position_components = ecs.write_storage::<Position>();
@@ -253,7 +261,7 @@ fn transition_to_existing_map(ecs: &mut World, new_id: i32, dest_tile: TileType)
 }
 
 fn transition_to_new_map(ecs: &mut World, new_id: i32, _dest_tile: TileType) -> Vec<Map> {
-    let mut rng = ecs.write_resource::<rltk::RandomNumberGenerator>();
+    let mut rng = ecs.write_resource::<RandomNumberGenerator>();
     // Might need this to fallback to 1, but if player
     // level isn't found at all, there's a bigger concern
     // concern than just this function not working.
@@ -346,7 +354,9 @@ pub fn thaw_entities(ecs: &mut World) {
     let mut pos_to_delete: Vec<Entity> = Vec::new();
     for (entity, pos) in (&entities, &other_positions).join() {
         if entity != *player_entity && pos.id == map_id {
-            positions.insert(entity, Position { x: pos.x, y: pos.y }).expect("Failed to insert OtherLevelPosition");
+            positions
+                .insert(entity, Position { x: pos.x, y: pos.y })
+                .expect("Failed to insert OtherLevelPosition");
             pos_to_delete.push(entity);
         }
     }

src/map/interval_spawning_system.rs

@@ -1,5 +1,15 @@
-use crate::{ config::CONFIG, gamelog, raws, spawner, Clock, Map, RandomNumberGenerator, TakingTurn };
+use crate::{
+    config::CONFIG,
+    gamelog,
+    raws,
+    spawner,
+    Clock,
+    Map,
+    RandomNumberGenerator,
+    TakingTurn,
+};
 use specs::prelude::*;
+use bracket_lib::prelude::*;
 use crate::data::events::*;
 
 const TRY_SPAWN_CHANCE: i32 = 70;
@@ -15,7 +25,7 @@ pub fn maybe_map_message(ecs: &mut World) {
     {
         let clock = ecs.read_storage::<Clock>();
         let turns = ecs.read_storage::<TakingTurn>();
-        let mut rng = ecs.write_resource::<rltk::RandomNumberGenerator>();
+        let mut rng = ecs.write_resource::<RandomNumberGenerator>();
         for (_c, _t) in (&clock, &turns).join() {
             if rng.roll_dice(1, FEATURE_MESSAGE_CHANCE) == 1 {
                 maybe_message = true;
@@ -42,7 +52,7 @@ pub fn try_spawn_interval(ecs: &mut World) {
         }
         let clock = ecs.read_storage::<Clock>();
         let turns = ecs.read_storage::<TakingTurn>();
-        let mut rng = ecs.write_resource::<rltk::RandomNumberGenerator>();
+        let mut rng = ecs.write_resource::<RandomNumberGenerator>();
         for (_c, _t) in (&clock, &turns).join() {
             if rng.roll_dice(1, TRY_SPAWN_CHANCE) == 1 {
                 try_spawn = true;
@@ -51,7 +61,7 @@ pub fn try_spawn_interval(ecs: &mut World) {
     }
     if try_spawn {
         if CONFIG.logging.log_spawning {
-            rltk::console::log("SPAWNINFO: Trying spawn.");
+            console::log("SPAWNINFO: Trying spawn.");
         }
         spawn_random_mob_in_free_nonvisible_tile(ecs);
     }
@@ -61,11 +71,11 @@ fn spawn_random_mob_in_free_nonvisible_tile(ecs: &mut World) {
     let map = ecs.fetch::<Map>();
     let mut available_tiles = populate_unblocked_nonvisible(&map);
     let player_level = gamelog::get_event_count(EVENT::COUNT_LEVEL);
-    rltk::console::log(player_level);
+    console::log(player_level);
     let difficulty = (map.difficulty + player_level) / 2;
     if available_tiles.len() == 0 {
         if CONFIG.logging.log_spawning {
-            rltk::console::log("SPAWNINFO: No free tiles; not spawning anything..");
+            console::log("SPAWNINFO: No free tiles; not spawning anything..");
         }
         return;
     }
@@ -84,7 +94,7 @@ fn spawn_random_mob_in_free_nonvisible_tile(ecs: &mut World) {
     // For every idx in the spawn list, spawn mob.
     for idx in spawn_locations {
         if CONFIG.logging.log_spawning {
-            rltk::console::log(format!("SPAWNINFO: Spawning {} at {}, {}.", key, idx.0, idx.1));
+            console::log(format!("SPAWNINFO: Spawning {} at {}, {}.", key, idx.0, idx.1));
         }
         raws::spawn_named_entity(
             &raws::RAWS.lock().unwrap(),
@@ -109,8 +119,12 @@ fn populate_unblocked_nonvisible(map: &Map) -> Vec<usize> {
 }
 
 /// Picks a random index from a vector of indexes, and removes it from the vector.
-fn get_random_idx_from_tiles(rng: &mut rltk::RandomNumberGenerator, area: &mut Vec<usize>) -> usize {
-    let idx = if area.len() == 1 { 0usize } else { (rng.roll_dice(1, area.len() as i32) - 1) as usize };
+fn get_random_idx_from_tiles(rng: &mut RandomNumberGenerator, area: &mut Vec<usize>) -> usize {
+    let idx = if area.len() == 1 {
+        0usize
+    } else {
+        (rng.roll_dice(1, area.len() as i32) - 1) as usize
+    };
     area.remove(idx);
     return area[idx];
 }

src/map/mod.rs

@@ -1,4 +1,4 @@
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use serde::{ Deserialize, Serialize };
 use std::collections::{ HashSet, HashMap };
 mod tiletype;
@@ -8,7 +8,11 @@ pub use interval_spawning_system::{ maybe_map_message, try_spawn_interval };
 pub mod dungeon;
 pub use dungeon::{ level_transition, MasterDungeonMap };
 pub mod themes;
-use super::data::visuals::{ BRIGHTEN_FG_COLOUR_BY, GLOBAL_OFFSET_MIN_CLAMP, GLOBAL_OFFSET_MAX_CLAMP };
+use super::data::visuals::{
+    BRIGHTEN_FG_COLOUR_BY,
+    GLOBAL_OFFSET_MIN_CLAMP,
+    GLOBAL_OFFSET_MAX_CLAMP,
+};
 
 // FIXME: If the map size gets too small, entities stop being rendered starting from the right.
 // i.e. on a map size of 40*40, only entities to the left of the player are rendered.
@@ -63,7 +67,7 @@ impl Map {
             lit_tiles: vec![true; map_tile_count], // NYI: Light sources. Once those exist, we can set this to false.
             telepath_tiles: vec![false; map_tile_count],
             colour_offset: vec![((0.0, 0.0, 0.0), (0.0, 0.0, 0.0)); map_tile_count],
-            additional_fg_offset: rltk::RGB::from_u8(
+            additional_fg_offset: RGB::from_u8(
                 BRIGHTEN_FG_COLOUR_BY as u8,
                 BRIGHTEN_FG_COLOUR_BY as u8,
                 BRIGHTEN_FG_COLOUR_BY as u8
@@ -78,7 +82,7 @@ impl Map {
             view_blocked: HashSet::new(),
         };
 
-        let mut rng = rltk::RandomNumberGenerator::new();
+        let mut rng = RandomNumberGenerator::new();
 
         for idx in 0..map.colour_offset.len() {
             map.colour_offset[idx].0 = (
@@ -134,12 +138,12 @@ impl BaseMap for Map {
         let w = self.width as usize;
         let p1 = Point::new(idx1 % w, idx1 / w);
         let p2 = Point::new(idx2 % w, idx2 / w);
-        rltk::DistanceAlg::Pythagoras.distance2d(p1, p2)
+        DistanceAlg::Pythagoras.distance2d(p1, p2)
     }
 
     /// Evaluate every possible exit from a given tile in a cardinal direction, and return it as a vector.
-    fn get_available_exits(&self, idx: usize) -> rltk::SmallVec<[(usize, f32); 10]> {
-        let mut exits = rltk::SmallVec::new();
+    fn get_available_exits(&self, idx: usize) -> SmallVec<[(usize, f32); 10]> {
+        let mut exits = SmallVec::new();
         let x = (idx as i32) % self.width;
         let y = (idx as i32) / self.width;
         let w = self.width as usize;

src/map/themes.rs

@@ -2,7 +2,7 @@ use super::{ Map, Point, TileType };
 use crate::data::visuals::*;
 use crate::config::CONFIG;
 use crate::data::ids::*;
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use std::ops::{ Add, Mul };
 
 /// Gets the renderables for a tile, with darkening/offset/post-processing/etc. Passing a val for "debug" will ignore viewshed.
@@ -11,7 +11,7 @@ pub fn get_tile_renderables_for_id(
     map: &Map,
     other_pos: Option<Point>,
     debug: Option<bool>
-) -> (rltk::FontCharType, RGB, RGB) {
+) -> (FontCharType, RGB, RGB) {
     let coloured_bg = CONFIG.visuals.use_coloured_tile_bg;
 
     let (glyph, mut fg, mut bg, fg_offset, bg_offset) = match map.id {
@@ -78,8 +78,8 @@ pub fn get_tile_renderables_for_id(
 }
 
 #[rustfmt::skip]
-pub fn get_default_theme_renderables(idx: usize, map: &Map, debug: Option<bool>) -> (rltk::FontCharType, RGB, RGB, (i32, i32, i32), (i32, i32, i32)) {
-    let glyph: rltk::FontCharType;
+pub fn get_default_theme_renderables(idx: usize, map: &Map, debug: Option<bool>) -> (FontCharType, RGB, RGB, (i32, i32, i32), (i32, i32, i32)) {
+    let glyph: FontCharType;
     #[allow(unused_assignments)]
     let mut fg: RGB = RGB::new();
     #[allow(unused_assignments)]
@@ -88,25 +88,25 @@ pub fn get_default_theme_renderables(idx: usize, map: &Map, debug: Option<bool>)
     let mut bg_offsets: (i32, i32, i32) = (-1, -1, -1);
 
     match map.tiles[idx] {
-        TileType::Floor => { glyph = rltk::to_cp437(FLOOR_GLYPH); fg = RGB::named(FLOOR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = FLOOR_OFFSETS; }
-        TileType::WoodFloor => { glyph = rltk::to_cp437(WOOD_FLOOR_GLYPH); bg = RGB::named(WOOD_FLOOR_COLOUR); offsets = WOOD_FLOOR_OFFSETS; }
-        TileType::Fence => { glyph = rltk::to_cp437(FENCE_GLYPH); fg = RGB::named(FENCE_FG_COLOUR); bg = RGB::named(FENCE_COLOUR); offsets = FENCE_OFFSETS; }
+        TileType::Floor => { glyph = to_cp437(FLOOR_GLYPH); fg = RGB::named(FLOOR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = FLOOR_OFFSETS; }
+        TileType::WoodFloor => { glyph = to_cp437(WOOD_FLOOR_GLYPH); bg = RGB::named(WOOD_FLOOR_COLOUR); offsets = WOOD_FLOOR_OFFSETS; }
+        TileType::Fence => { glyph = to_cp437(FENCE_GLYPH); fg = RGB::named(FENCE_FG_COLOUR); bg = RGB::named(FENCE_COLOUR); offsets = FENCE_OFFSETS; }
         TileType::Wall => { let x = idx as i32 % map.width; let y = idx as i32 / map.width; glyph = wall_glyph(&*map, x, y, debug); fg = RGB::named(WALL_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = WALL_OFFSETS; bg_offsets = DEFAULT_BG_OFFSETS }
-        TileType::DownStair => { glyph = rltk::to_cp437(DOWN_STAIR_GLYPH); fg = RGB::named(STAIR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = STAIR_OFFSETS;}
-        TileType::UpStair => { glyph = rltk::to_cp437(UP_STAIR_GLYPH); fg = RGB::named(STAIR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = STAIR_OFFSETS; }
-        TileType::Bridge => { glyph = rltk::to_cp437(BRIDGE_GLYPH); bg = RGB::named(BRIDGE_COLOUR); offsets = BRIDGE_OFFSETS; }
-        TileType::Gravel => { glyph = rltk::to_cp437(GRAVEL_GLYPH); bg = RGB::named(GRAVEL_COLOUR); offsets = GRAVEL_OFFSETS;}
-        TileType::Road => { glyph = rltk::to_cp437(ROAD_GLYPH); bg = RGB::named(ROAD_COLOUR); offsets = ROAD_OFFSETS;}
-        TileType::Grass => { glyph = rltk::to_cp437(GRASS_GLYPH); bg = RGB::named(GRASS_COLOUR); offsets = GRASS_OFFSETS; }
-        TileType::Foliage => { glyph = rltk::to_cp437(FOLIAGE_GLYPH); bg = RGB::named(FOLIAGE_COLOUR); offsets = FOLIAGE_OFFSETS; }
-        TileType::HeavyFoliage => { glyph = rltk::to_cp437(HEAVY_FOLIAGE_GLYPH); bg = RGB::named(HEAVY_FOLIAGE_COLOUR); offsets = HEAVY_FOLIAGE_OFFSETS; }
-        TileType::Sand => { glyph = rltk::to_cp437(SAND_GLYPH); bg = RGB::named(SAND_COLOUR); offsets = SAND_OFFSETS; }
-        TileType::ShallowWater => { glyph = rltk::to_cp437(SHALLOW_WATER_GLYPH); bg = RGB::named(SHALLOW_WATER_COLOUR); offsets = SHALLOW_WATER_OFFSETS; }
-        TileType::DeepWater => { glyph = rltk::to_cp437(DEEP_WATER_GLYPH); bg = RGB::named(DEEP_WATER_COLOUR); offsets = DEEP_WATER_OFFSETS; }
-        TileType::Bars => { glyph = rltk::to_cp437(BARS_GLYPH); fg = RGB::named(BARS_COLOUR); bg = RGB::named(FLOOR_COLOUR); }
-        TileType::ImpassableMountain => { glyph = rltk::to_cp437(IMPASSABLE_MOUNTAIN_GLYPH); bg = RGB::named(IMPASSABLE_MOUNTAIN_COLOUR); offsets = IMPASSABLE_MOUNTAIN_OFFSETS }
-        TileType::ToOvermap(_) => { glyph = rltk::to_cp437(TO_OVERMAP_GLYPH); fg = RGB::named(TO_OVERMAP_COLOUR); bg = RGB::named(GRASS_COLOUR); }
-        TileType::ToLocal(_) => { glyph = rltk::to_cp437(TO_TOWN_GLYPH); fg = RGB::named(TO_TOWN_COLOUR); bg = RGB::named(GRASS_COLOUR); }
+        TileType::DownStair => { glyph = to_cp437(DOWN_STAIR_GLYPH); fg = RGB::named(STAIR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = STAIR_OFFSETS;}
+        TileType::UpStair => { glyph = to_cp437(UP_STAIR_GLYPH); fg = RGB::named(STAIR_COLOUR); bg = RGB::named(DEFAULT_BG_COLOUR); offsets = STAIR_OFFSETS; }
+        TileType::Bridge => { glyph = to_cp437(BRIDGE_GLYPH); bg = RGB::named(BRIDGE_COLOUR); offsets = BRIDGE_OFFSETS; }
+        TileType::Gravel => { glyph = to_cp437(GRAVEL_GLYPH); bg = RGB::named(GRAVEL_COLOUR); offsets = GRAVEL_OFFSETS;}
+        TileType::Road => { glyph = to_cp437(ROAD_GLYPH); bg = RGB::named(ROAD_COLOUR); offsets = ROAD_OFFSETS;}
+        TileType::Grass => { glyph = to_cp437(GRASS_GLYPH); bg = RGB::named(GRASS_COLOUR); offsets = GRASS_OFFSETS; }
+        TileType::Foliage => { glyph = to_cp437(FOLIAGE_GLYPH); bg = RGB::named(FOLIAGE_COLOUR); offsets = FOLIAGE_OFFSETS; }
+        TileType::HeavyFoliage => { glyph = to_cp437(HEAVY_FOLIAGE_GLYPH); bg = RGB::named(HEAVY_FOLIAGE_COLOUR); offsets = HEAVY_FOLIAGE_OFFSETS; }
+        TileType::Sand => { glyph = to_cp437(SAND_GLYPH); bg = RGB::named(SAND_COLOUR); offsets = SAND_OFFSETS; }
+        TileType::ShallowWater => { glyph = to_cp437(SHALLOW_WATER_GLYPH); bg = RGB::named(SHALLOW_WATER_COLOUR); offsets = SHALLOW_WATER_OFFSETS; }
+        TileType::DeepWater => { glyph = to_cp437(DEEP_WATER_GLYPH); bg = RGB::named(DEEP_WATER_COLOUR); offsets = DEEP_WATER_OFFSETS; }
+        TileType::Bars => { glyph = to_cp437(BARS_GLYPH); fg = RGB::named(BARS_COLOUR); bg = RGB::named(FLOOR_COLOUR); }
+        TileType::ImpassableMountain => { glyph = to_cp437(IMPASSABLE_MOUNTAIN_GLYPH); bg = RGB::named(IMPASSABLE_MOUNTAIN_COLOUR); offsets = IMPASSABLE_MOUNTAIN_OFFSETS }
+        TileType::ToOvermap(_) => { glyph = to_cp437(TO_OVERMAP_GLYPH); fg = RGB::named(TO_OVERMAP_COLOUR); bg = RGB::named(GRASS_COLOUR); }
+        TileType::ToLocal(_) => { glyph = to_cp437(TO_TOWN_GLYPH); fg = RGB::named(TO_TOWN_COLOUR); bg = RGB::named(GRASS_COLOUR); }
     }
     if bg_offsets == (-1, -1, -1) {
         bg_offsets = offsets;
@@ -115,7 +115,7 @@ pub fn get_default_theme_renderables(idx: usize, map: &Map, debug: Option<bool>)
 }
 
 #[rustfmt::skip]
-fn get_forest_theme_renderables(idx:usize, map: &Map, debug: Option<bool>) -> (rltk::FontCharType, RGB, RGB, (i32, i32, i32), (i32, i32, i32)) {
+fn get_forest_theme_renderables(idx:usize, map: &Map, debug: Option<bool>) -> (FontCharType, RGB, RGB, (i32, i32, i32), (i32, i32, i32)) {
     let glyph;
     #[allow(unused_assignments)]
     let mut fg = RGB::new();
@@ -125,9 +125,9 @@ fn get_forest_theme_renderables(idx:usize, map: &Map, debug: Option<bool>) -> (r
     let mut bg_offsets: (i32, i32, i32) = (-1, -1, -1);
 
     match map.tiles[idx] {
-        TileType::Wall => { glyph = rltk::to_cp437(FOREST_WALL_GLYPH); fg = RGB::named(FOREST_WALL_COLOUR); bg = RGB::named(GRASS_COLOUR); offsets = GRASS_OFFSETS; }
-        TileType::Road => { glyph = rltk::to_cp437(ROAD_GLYPH); bg = RGB::named(ROAD_COLOUR); }
-        TileType::ShallowWater => { glyph = rltk::to_cp437(SHALLOW_WATER_GLYPH); bg = RGB::named(SHALLOW_WATER_COLOUR); offsets = SHALLOW_WATER_OFFSETS; }
+        TileType::Wall => { glyph = to_cp437(FOREST_WALL_GLYPH); fg = RGB::named(FOREST_WALL_COLOUR); bg = RGB::named(GRASS_COLOUR); offsets = GRASS_OFFSETS; }
+        TileType::Road => { glyph = to_cp437(ROAD_GLYPH); bg = RGB::named(ROAD_COLOUR); }
+        TileType::ShallowWater => { glyph = to_cp437(SHALLOW_WATER_GLYPH); bg = RGB::named(SHALLOW_WATER_COLOUR); offsets = SHALLOW_WATER_OFFSETS; }
         _ => { (glyph, fg, _, offsets, _) = get_default_theme_renderables(idx, map, debug); bg = RGB::named(GRASS_COLOUR); bg_offsets = GRASS_OFFSETS; }
     }
     if bg_offsets == (-1, -1, -1) {
@@ -142,7 +142,7 @@ fn is_revealed_and_wall(map: &Map, x: i32, y: i32, debug: Option<bool>) -> bool
         (if debug.is_none() { map.revealed_tiles[idx] } else { true })
 }
 
-fn wall_glyph(map: &Map, x: i32, y: i32, debug: Option<bool>) -> rltk::FontCharType {
+fn wall_glyph(map: &Map, x: i32, y: i32, debug: Option<bool>) -> FontCharType {
     if
         x < 1 ||
         x > map.width - 2 ||
@@ -315,15 +315,15 @@ pub fn add_i32_offsets(rgb: RGB, offsets: (f32, f32, f32)) -> RGB {
     let g = rgb.g + (offsets.1 as f32) / 255.0;
     let b = rgb.b + (offsets.2 as f32) / 255.0;
 
-    return rltk::RGB::from_f32(r, g, b);
+    return RGB::from_f32(r, g, b);
 }
 
-pub fn multiply_by_float(rgb: rltk::RGB, offsets: (f32, f32, f32)) -> RGB {
+pub fn multiply_by_float(rgb: RGB, offsets: (f32, f32, f32)) -> RGB {
     let r = rgb.r * offsets.0;
     let g = rgb.g * offsets.1;
     let b = rgb.b * offsets.2;
 
-    return rltk::RGB::from_f32(r, g, b);
+    return RGB::from_f32(r, g, b);
 }
 
 fn darken_by_distance(pos: Point, other_pos: Point) -> f32 {

src/map_builders/area_starting_points.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, MetaMapBuilder, Position };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 #[allow(dead_code)]
 pub enum XStart {
@@ -21,7 +21,7 @@ pub struct AreaStartingPosition {
 }
 
 impl MetaMapBuilder for AreaStartingPosition {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -64,15 +64,18 @@ impl AreaStartingPosition {
             if crate::tile_walkable(*tiletype) {
                 available_floors.push((
                     idx,
-                    rltk::DistanceAlg::PythagorasSquared.distance2d(
-                        rltk::Point::new((idx as i32) % build_data.map.width, (idx as i32) / build_data.map.width),
-                        rltk::Point::new(seed_x, seed_y)
+                    DistanceAlg::PythagorasSquared.distance2d(
+                        Point::new(
+                            (idx as i32) % build_data.map.width,
+                            (idx as i32) / build_data.map.width
+                        ),
+                        Point::new(seed_x, seed_y)
                     ),
                 ));
             }
         }
         if available_floors.is_empty() {
-            panic!("No valid floors to start on");
+            unreachable!("No valid floors to start on.");
         }
 
         available_floors.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap());

src/map_builders/bsp_dungeon.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, InitialMapBuilder, Rect, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct BspDungeonBuilder {
     rects: Vec<Rect>,
@@ -7,7 +7,7 @@ pub struct BspDungeonBuilder {
 
 impl InitialMapBuilder for BspDungeonBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }

src/map_builders/bsp_interior.rs

@@ -1,5 +1,5 @@
 use super::{ draw_corridor, BuilderMap, InitialMapBuilder, Rect, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 const MIN_ROOM_SIZE: i32 = 8;
 
@@ -9,7 +9,7 @@ pub struct BspInteriorBuilder {
 
 impl InitialMapBuilder for BspInteriorBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }

src/map_builders/cellular_automata.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, InitialMapBuilder, MetaMapBuilder, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct CellularAutomataBuilder {
     floor_tile: TileType,
@@ -7,14 +7,14 @@ pub struct CellularAutomataBuilder {
 
 impl InitialMapBuilder for CellularAutomataBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
 
 impl MetaMapBuilder for CellularAutomataBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, _rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, _rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.apply_iteration(build_data);
     }
 }
@@ -69,16 +69,28 @@ impl CellularAutomataBuilder {
                 if build_data.map.tiles[idx + (build_data.map.width as usize)] == TileType::Wall {
                     neighbors += 1;
                 }
-                if build_data.map.tiles[idx - ((build_data.map.width as usize) - 1)] == TileType::Wall {
+                if
+                    build_data.map.tiles[idx - ((build_data.map.width as usize) - 1)] ==
+                    TileType::Wall
+                {
                     neighbors += 1;
                 }
-                if build_data.map.tiles[idx - ((build_data.map.width as usize) + 1)] == TileType::Wall {
+                if
+                    build_data.map.tiles[idx - ((build_data.map.width as usize) + 1)] ==
+                    TileType::Wall
+                {
                     neighbors += 1;
                 }
-                if build_data.map.tiles[idx + ((build_data.map.width as usize) - 1)] == TileType::Wall {
+                if
+                    build_data.map.tiles[idx + ((build_data.map.width as usize) - 1)] ==
+                    TileType::Wall
+                {
                     neighbors += 1;
                 }
-                if build_data.map.tiles[idx + ((build_data.map.width as usize) + 1)] == TileType::Wall {
+                if
+                    build_data.map.tiles[idx + ((build_data.map.width as usize) + 1)] ==
+                    TileType::Wall
+                {
                     neighbors += 1;
                 }
 

src/map_builders/cull_unreachable.rs

@@ -1,11 +1,11 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
 use crate::tile_walkable;
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct CullUnreachable {}
 
 impl MetaMapBuilder for CullUnreachable {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -21,7 +21,7 @@ impl CullUnreachable {
         let start_idx = build_data.map.xy_idx(starting_pos.x, starting_pos.y);
         build_data.map.populate_blocked();
         let map_starts: Vec<usize> = vec![start_idx];
-        let dijkstra_map = rltk::DijkstraMap::new(
+        let dijkstra_map = DijkstraMap::new(
             build_data.map.width as usize,
             build_data.map.height as usize,
             &map_starts,

src/map_builders/distant_exit.rs

@@ -1,11 +1,11 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
 use crate::tile_walkable;
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct DistantExit {}
 
 impl MetaMapBuilder for DistantExit {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -21,7 +21,7 @@ impl DistantExit {
         let start_idx = build_data.map.xy_idx(starting_pos.x, starting_pos.y);
         build_data.map.populate_blocked();
         let map_starts: Vec<usize> = vec![start_idx];
-        let dijkstra_map = rltk::DijkstraMap::new(
+        let dijkstra_map = DijkstraMap::new(
             build_data.map.width as usize,
             build_data.map.height as usize,
             &map_starts,

src/map_builders/dla.rs

@@ -1,5 +1,5 @@
 use super::{ paint, BuilderMap, InitialMapBuilder, MetaMapBuilder, Position, Symmetry, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 #[derive(PartialEq, Copy, Clone)]
 #[allow(dead_code)]
@@ -18,14 +18,14 @@ pub struct DLABuilder {
 
 impl InitialMapBuilder for DLABuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
 
 impl MetaMapBuilder for DLABuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -94,7 +94,10 @@ impl DLABuilder {
     #[allow(clippy::map_entry)]
     fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         // Carve a starting seed
-        let starting_position = Position { x: build_data.map.width / 2, y: build_data.map.height / 2 };
+        let starting_position = Position {
+            x: build_data.map.width / 2,
+            y: build_data.map.height / 2,
+        };
         let start_idx = build_data.map.xy_idx(starting_position.x, starting_position.y);
         build_data.take_snapshot();
         build_data.map.tiles[start_idx] = TileType::Floor;
@@ -189,10 +192,10 @@ impl DLABuilder {
                     let mut prev_y = digger_y;
                     let mut digger_idx = build_data.map.xy_idx(digger_x, digger_y);
 
-                    let mut path = rltk::line2d(
-                        rltk::LineAlg::Bresenham,
-                        rltk::Point::new(digger_x, digger_y),
-                        rltk::Point::new(starting_position.x, starting_position.y)
+                    let mut path = line2d(
+                        LineAlg::Bresenham,
+                        Point::new(digger_x, digger_y),
+                        Point::new(starting_position.x, starting_position.y)
                     );
 
                     while build_data.map.tiles[digger_idx] == TileType::Wall && !path.is_empty() {

src/map_builders/door_placement.rs

@@ -1,11 +1,11 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct DoorPlacement {}
 
 impl MetaMapBuilder for DoorPlacement {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.doors(rng, build_data);
     }
 }
@@ -30,7 +30,11 @@ impl DoorPlacement {
             // There are no corridors - scan for possible places
             let tiles = build_data.map.tiles.clone();
             for (i, tile) in tiles.iter().enumerate() {
-                if *tile == TileType::Floor && self.door_possible(build_data, i) && rng.roll_dice(1, 6) == 1 {
+                if
+                    *tile == TileType::Floor &&
+                    self.door_possible(build_data, i) &&
+                    rng.roll_dice(1, 6) == 1
+                {
                     build_data.spawn_list.push((i, "door".to_string()));
                 }
             }

src/map_builders/drunkard.rs

@@ -1,5 +1,5 @@
 use super::{ paint, BuilderMap, InitialMapBuilder, MetaMapBuilder, Position, Symmetry, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 #[derive(PartialEq, Copy, Clone)]
 #[allow(dead_code)]
@@ -22,14 +22,14 @@ pub struct DrunkardsWalkBuilder {
 
 impl InitialMapBuilder for DrunkardsWalkBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
 
 impl MetaMapBuilder for DrunkardsWalkBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -107,7 +107,10 @@ impl DrunkardsWalkBuilder {
 
     fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         // Set a central starting point
-        let starting_position = Position { x: build_data.map.width / 2, y: build_data.map.height / 2 };
+        let starting_position = Position {
+            x: build_data.map.width / 2,
+            y: build_data.map.height / 2,
+        };
         let start_idx = build_data.map.xy_idx(starting_position.x, starting_position.y);
         build_data.map.tiles[start_idx] = TileType::Floor;
 
@@ -144,7 +147,13 @@ impl DrunkardsWalkBuilder {
                 if build_data.map.tiles[drunk_idx] == TileType::Wall {
                     did_something = true;
                 }
-                paint(&mut build_data.map, self.settings.symmetry, self.settings.brush_size, drunk_x, drunk_y);
+                paint(
+                    &mut build_data.map,
+                    self.settings.symmetry,
+                    self.settings.brush_size,
+                    drunk_x,
+                    drunk_y
+                );
                 build_data.map.tiles[drunk_idx] = TileType::DownStair;
 
                 let stagger_direction = rng.roll_dice(1, 4);

src/map_builders/fill_edges.rs

@@ -1,6 +1,6 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
 use crate::tile_walkable;
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct FillEdges {
     fill_with: TileType,
@@ -9,7 +9,7 @@ pub struct FillEdges {
 
 impl MetaMapBuilder for FillEdges {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.fill_edges(rng, build_data);
     }
 }

src/map_builders/foliage.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct Foliage {
     start_tile: TileType,
@@ -8,7 +8,7 @@ pub struct Foliage {
 
 impl MetaMapBuilder for Foliage {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.apply(rng, build_data);
     }
 }

src/map_builders/forest.rs

@@ -11,12 +11,12 @@ use super::{
     YStart,
     Foliage,
 };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 use crate::data::names::*;
 
 pub fn forest_builder(
     new_id: i32,
-    _rng: &mut rltk::RandomNumberGenerator,
+    _rng: &mut RandomNumberGenerator,
     width: i32,
     height: i32,
     difficulty: i32,
@@ -76,7 +76,7 @@ impl RoadExit {
             }
         }
         if available_floors.is_empty() {
-            panic!("No valid floors to start on.");
+            unreachable!("No valid floors to start on.");
         }
         available_floors.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap());
         let end_x = (available_floors[0].0 as i32) % build_data.map.width;

src/map_builders/maze.rs

@@ -1,11 +1,11 @@
 use super::{ BuilderMap, InitialMapBuilder, Map, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct MazeBuilder {}
 
 impl InitialMapBuilder for MazeBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -75,7 +75,14 @@ struct Grid<'a> {
 
 impl<'a> Grid<'a> {
     fn new(width: i32, height: i32, rng: &mut RandomNumberGenerator) -> Grid {
-        let mut grid = Grid { width, height, cells: Vec::new(), backtrace: Vec::new(), current: 0, rng };
+        let mut grid = Grid {
+            width,
+            height,
+            cells: Vec::new(),
+            backtrace: Vec::new(),
+            current: 0,
+            rng,
+        };
 
         for row in 0..height {
             for column in 0..width {
@@ -122,7 +129,9 @@ impl<'a> Grid<'a> {
             if neighbors.len() == 1 {
                 return Some(neighbors[0]);
             } else {
-                return Some(neighbors[(self.rng.roll_dice(1, neighbors.len() as i32) - 1) as usize]);
+                return Some(
+                    neighbors[(self.rng.roll_dice(1, neighbors.len() as i32) - 1) as usize]
+                );
             }
         }
         None
@@ -141,7 +150,9 @@ impl<'a> Grid<'a> {
                     //   __lower_part__      __higher_part_
                     //   /            \      /            \
                     // --------cell1------ | cell2-----------
-                    let (lower_part, higher_part) = self.cells.split_at_mut(std::cmp::max(self.current, next));
+                    let (lower_part, higher_part) = self.cells.split_at_mut(
+                        std::cmp::max(self.current, next)
+                    );
                     let cell1 = &mut lower_part[std::cmp::min(self.current, next)];
                     let cell2 = &mut higher_part[0];
                     cell1.remove_walls(cell2);

src/map_builders/mod.rs

@@ -1,4 +1,6 @@
 use super::{ spawner, Map, Position, Rect, TileType };
+use bracket_lib::prelude::*;
+
 mod bsp_dungeon;
 use bsp_dungeon::BspDungeonBuilder;
 mod bsp_interior;
@@ -68,7 +70,7 @@ use forest::forest_builder;
 mod foliage;
 use foliage::Foliage;
 mod room_themer;
-use room_themer::{ Theme, ThemeRooms };
+use room_themer::ThemeRooms;
 
 // Shared data to be passed around build chain
 pub struct BuilderMap {
@@ -135,7 +137,7 @@ impl BuilderChain {
             None => {
                 self.starter = Some(starter);
             }
-            Some(_) => panic!("You can only have one starting builder."),
+            Some(_) => unreachable!("You can only have one starting builder."),
         };
     }
 
@@ -143,9 +145,9 @@ impl BuilderChain {
         self.builders.push(metabuilder);
     }
 
-    pub fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator) {
+    pub fn build_map(&mut self, rng: &mut RandomNumberGenerator) {
         match &mut self.starter {
-            None => panic!("Cannot run a map builder chain without a starting build system"),
+            None => unreachable!("Cannot run a map builder chain without a starting build system"),
             Some(starter) => {
                 // Build the starting map
                 starter.build_map(rng, &mut self.build_data);
@@ -165,20 +167,20 @@ impl BuilderChain {
             spawner::spawn_entity(ecs, &(&entity.0, &entity.1));
         }
         if CONFIG.logging.log_spawning {
-            rltk::console::log(format!("DEBUGINFO: SPAWNED ENTITIES = {:?}", spawned_entities));
+            console::log(format!("DEBUGINFO: SPAWNED ENTITIES = {:?}", spawned_entities));
         }
     }
 }
 
 pub trait InitialMapBuilder {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap);
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap);
 }
 
 pub trait MetaMapBuilder {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap);
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap);
 }
 
-fn random_start_position(rng: &mut rltk::RandomNumberGenerator) -> (XStart, YStart) {
+fn random_start_position(rng: &mut RandomNumberGenerator) -> (XStart, YStart) {
     let x;
     let xroll = rng.roll_dice(1, 3);
     match xroll {
@@ -210,11 +212,7 @@ fn random_start_position(rng: &mut rltk::RandomNumberGenerator) -> (XStart, YSta
     (x, y)
 }
 
-fn random_room_builder(
-    rng: &mut rltk::RandomNumberGenerator,
-    builder: &mut BuilderChain,
-    end: bool
-) {
+fn random_room_builder(rng: &mut RandomNumberGenerator, builder: &mut BuilderChain, end: bool) {
     let build_roll = rng.roll_dice(1, 3);
     // Start with a room builder.
     match build_roll {
@@ -296,7 +294,7 @@ fn random_room_builder(
 }
 
 fn random_shape_builder(
-    rng: &mut rltk::RandomNumberGenerator,
+    rng: &mut RandomNumberGenerator,
     builder: &mut BuilderChain,
     end: bool
 ) -> bool {
@@ -368,7 +366,7 @@ pub enum BuildType {
 
 pub fn random_builder(
     new_id: i32,
-    rng: &mut rltk::RandomNumberGenerator,
+    rng: &mut RandomNumberGenerator,
     width: i32,
     height: i32,
     difficulty: i32,
@@ -377,7 +375,7 @@ pub fn random_builder(
     end: bool,
     build_type: BuildType
 ) -> BuilderChain {
-    rltk::console::log(format!("DEBUGINFO: Building random (ID:{}, DIFF:{})", new_id, difficulty));
+    console::log(format!("DEBUGINFO: Building random (ID:{}, DIFF:{})", new_id, difficulty));
     let mut builder = BuilderChain::new(
         false,
         new_id,
@@ -440,21 +438,19 @@ pub fn random_builder(
 }
 
 pub fn level_builder(
-    new_id: i32,
-    rng: &mut rltk::RandomNumberGenerator,
+    id: i32,
+    rng: &mut RandomNumberGenerator,
     width: i32,
     height: i32,
     initial_player_level: i32
 ) -> BuilderChain {
-    // TODO: With difficulty and ID/depth decoupled, this can be used for branches later.
-    let difficulty = new_id;
-    match new_id {
+    match id {
         ID_OVERMAP => overmap_builder(),
-        ID_TOWN => town_builder(new_id, rng, width, height, 0, initial_player_level),
-        ID_TOWN2 => forest_builder(new_id, rng, width, height, 1, initial_player_level),
+        ID_TOWN => town_builder(id, rng, width, height, 0, initial_player_level),
+        ID_TOWN2 => forest_builder(id, rng, width, height, 1, initial_player_level),
         ID_TOWN3 =>
             random_builder(
-                new_id,
+                id,
                 rng,
                 width,
                 height,
@@ -464,25 +460,25 @@ pub fn level_builder(
                 true,
                 BuildType::Room
             ),
-        _ if new_id >= ID_INFINITE =>
+        _ if id >= ID_INFINITE =>
             random_builder(
-                new_id,
+                id,
                 rng,
                 width,
                 height,
-                difficulty,
-                new_id - ID_INFINITE + 1,
+                4 + diff(ID_INFINITE, id),
+                1 + diff(ID_INFINITE, id),
                 initial_player_level,
                 false,
                 BuildType::Room
             ),
-        _ =>
+        _ => // This should be unreachable!() eventually. Right now it's reachable with the debug/cheat menu. It should not be in normal gameplay.
             random_builder(
-                new_id,
+                id,
                 rng,
                 width,
                 height,
-                difficulty,
+                1,
                 404,
                 initial_player_level,
                 false,
@@ -490,3 +486,7 @@ pub fn level_builder(
             ),
     }
 }
+
+fn diff(branch_id: i32, lvl_id: i32) -> i32 {
+    return lvl_id - branch_id;
+}

src/map_builders/prefab_builder/mod.rs

@@ -1,5 +1,5 @@
 use super::{ spawner, BuilderMap, InitialMapBuilder, MetaMapBuilder, Position, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 pub mod prefab_levels;
 pub mod prefab_sections;
 pub mod prefab_vaults;
@@ -25,14 +25,14 @@ pub struct PrefabBuilder {
 }
 
 impl MetaMapBuilder for PrefabBuilder {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
 
 impl InitialMapBuilder for PrefabBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -65,7 +65,8 @@ impl PrefabBuilder {
 
     fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         match self.mode {
-            PrefabMode::Overmap => self.load_ascii_map(&prefab_levels::OVERMAP, rng, build_data, true),
+            PrefabMode::Overmap =>
+                self.load_ascii_map(&prefab_levels::OVERMAP, rng, build_data, true),
             PrefabMode::Constant { level } => self.load_ascii_map(&level, rng, build_data, false),
             PrefabMode::Sectional { section } => self.apply_sectional(&section, rng, build_data),
             PrefabMode::RoomVaults => self.apply_room_vaults(rng, build_data),
@@ -73,7 +74,13 @@ impl PrefabBuilder {
         build_data.take_snapshot();
     }
 
-    fn char_to_map(&mut self, ch: char, idx: usize, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn char_to_map(
+        &mut self,
+        ch: char,
+        idx: usize,
+        rng: &mut RandomNumberGenerator,
+        build_data: &mut BuilderMap
+    ) {
         let difficulty = (build_data.map.difficulty + build_data.initial_player_level) / 2;
         match ch {
             ' ' => {
@@ -123,7 +130,10 @@ impl PrefabBuilder {
             }
             '!' => {
                 build_data.map.tiles[idx] = TileType::Floor;
-                build_data.spawn_list.push((idx, spawner::potion_table(Some(difficulty)).roll(rng)));
+                build_data.spawn_list.push((
+                    idx,
+                    spawner::potion_table(Some(difficulty)).roll(rng),
+                ));
             }
             '/' => {
                 build_data.map.tiles[idx] = TileType::Floor;
@@ -131,14 +141,20 @@ impl PrefabBuilder {
             }
             '?' => {
                 build_data.map.tiles[idx] = TileType::Floor;
-                build_data.spawn_list.push((idx, spawner::scroll_table(Some(difficulty)).roll(rng)));
+                build_data.spawn_list.push((
+                    idx,
+                    spawner::scroll_table(Some(difficulty)).roll(rng),
+                ));
             }
             ')' => {
                 build_data.map.tiles[idx] = TileType::Floor;
-                build_data.spawn_list.push((idx, spawner::equipment_table(Some(difficulty)).roll(rng)));
+                build_data.spawn_list.push((
+                    idx,
+                    spawner::equipment_table(Some(difficulty)).roll(rng),
+                ));
             }
             _ => {
-                rltk::console::log(format!("Unknown glyph '{}' when loading prefab", ch as u8 as char));
+                console::log(format!("Unknown glyph '{}' when loading prefab", ch as u8 as char));
             }
         }
     }
@@ -185,14 +201,19 @@ impl PrefabBuilder {
                 build_data.map.tiles[idx] = TileType::ToLocal(ID_INFINITE);
             }
             _ => {
-                rltk::console::log(format!("Unknown glyph '{}' when loading overmap", ch as u8 as char));
+                console::log(format!("Unknown glyph '{}' when loading overmap", ch as u8 as char));
             }
         }
     }
 
     #[allow(dead_code)]
-    fn load_rex_map(&mut self, path: &str, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
-        let xp_file = rltk::rex::XpFile::from_resource(path).unwrap();
+    fn load_rex_map(
+        &mut self,
+        path: &str,
+        rng: &mut RandomNumberGenerator,
+        build_data: &mut BuilderMap
+    ) {
+        let xp_file = rex::XpFile::from_resource(path).unwrap();
 
         for layer in &xp_file.layers {
             for y in 0..layer.height {

src/map_builders/room_based_spawner.rs

@@ -1,10 +1,10 @@
 use super::{ spawner, BuilderMap, MetaMapBuilder };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct RoomBasedSpawner {}
 
 impl MetaMapBuilder for RoomBasedSpawner {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -27,7 +27,7 @@ impl RoomBasedSpawner {
                 );
             }
         } else {
-            panic!("RoomBasedSpawner only works after rooms have been created");
+            unreachable!("RoomBasedSpawner tried to run without any rooms.");
         }
     }
 }

src/map_builders/room_based_stairs.rs

@@ -1,10 +1,10 @@
 use super::{ BuilderMap, MetaMapBuilder, TileType };
-use rltk::prelude::*;
+use bracket_lib::prelude::*;
 
 pub struct RoomBasedStairs {}
 
 impl MetaMapBuilder for RoomBasedStairs {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -22,7 +22,7 @@ impl RoomBasedStairs {
             build_data.map.tiles[stairs_idx] = TileType::DownStair;
             build_data.take_snapshot();
         } else {
-            panic!("RoomBasedStairs only works after rooms have been created");
+            unreachable!("RoomBasedStairs tried to run without any rooms.");
         }
     }
 }

src/map_builders/room_based_starting_position.rs

@@ -1,10 +1,10 @@
 use super::{ BuilderMap, MetaMapBuilder, Position };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct RoomBasedStartingPosition {}
 
 impl MetaMapBuilder for RoomBasedStartingPosition {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -20,7 +20,7 @@ impl RoomBasedStartingPosition {
             let start_pos = rooms[0].center();
             build_data.starting_position = Some(Position { x: start_pos.x, y: start_pos.y });
         } else {
-            panic!("RoomBasedStartingPosition only works after rooms have been created");
+            unreachable!("RoomBasedStartingPosition tried to run without any rooms.");
         }
     }
 }

src/map_builders/room_corner_rounding.rs

@@ -1,10 +1,10 @@
 use super::{ BuilderMap, MetaMapBuilder, Rect, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct RoomCornerRounder {}
 
 impl MetaMapBuilder for RoomCornerRounder {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -42,7 +42,7 @@ impl RoomCornerRounder {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("RoomCornerRounding requires a builder with rooms.");
+            unreachable!("RoomCornerRounding tried to run without any rooms.");
         }
 
         for room in rooms.iter() {

src/map_builders/room_draw.rs

@@ -1,10 +1,10 @@
 use super::{ BuilderMap, MetaMapBuilder, Rect, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct RoomDrawer {}
 
 impl MetaMapBuilder for RoomDrawer {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -29,14 +29,11 @@ impl RoomDrawer {
     fn circle(&mut self, build_data: &mut BuilderMap, room: &Rect) {
         let radius = (i32::min(room.x2 - room.x1, room.y2 - room.y1) as f32) / 2.0;
         let center = room.center();
-        let center_pt = rltk::Point::new(center.x, center.y);
+        let center_pt = Point::new(center.x, center.y);
         for y in room.y1..=room.y2 {
             for x in room.x1..=room.x2 {
                 let idx = build_data.map.xy_idx(x, y);
-                let distance = rltk::DistanceAlg::Pythagoras.distance2d(
-                    center_pt,
-                    rltk::Point::new(x, y)
-                );
+                let distance = DistanceAlg::Pythagoras.distance2d(center_pt, Point::new(x, y));
                 if
                     idx > 0 &&
                     idx < ((build_data.map.width * build_data.map.height - 1) as usize) &&
@@ -53,7 +50,7 @@ impl RoomDrawer {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("RoomDrawer require a builder with rooms");
+            unreachable!("RoomDrawer tried to run without any rooms.");
         }
 
         for room in rooms.iter() {

src/map_builders/room_exploder.rs

@@ -1,10 +1,10 @@
 use super::{ paint, BuilderMap, MetaMapBuilder, Rect, Symmetry, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct RoomExploder {}
 
 impl MetaMapBuilder for RoomExploder {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -20,7 +20,7 @@ impl RoomExploder {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("RoomExploder requires a builder with rooms.");
+            unreachable!("RoomExploder tried to run without any rooms.");
         }
         for room in rooms.iter() {
             let start = room.center();

src/map_builders/room_sorter.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, MetaMapBuilder, Rect };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 #[allow(dead_code)]
 pub enum RoomSort {
@@ -16,7 +16,7 @@ pub struct RoomSorter {
 
 impl MetaMapBuilder for RoomSorter {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.sorter(rng, build_data);
     }
 }
@@ -50,21 +50,18 @@ impl RoomSorter {
                     .unwrap()
                     .sort_by(|a, b| b.y2.cmp(&a.y2)),
             RoomSort::CENTRAL => {
-                let map_centre = rltk::Point::new(
-                    build_data.map.width / 2,
-                    build_data.map.height / 2
-                );
+                let map_centre = Point::new(build_data.map.width / 2, build_data.map.height / 2);
                 build_data.rooms
                     .as_mut()
                     .unwrap()
                     .sort_by(|a: &Rect, b: &Rect| {
-                        let a_centre_pt = rltk::Point::new(a.center().x, a.center().y);
-                        let b_centre_pt = rltk::Point::new(b.center().x, b.center().y);
-                        let distance_a = rltk::DistanceAlg::Pythagoras.distance2d(
+                        let a_centre_pt = Point::new(a.center().x, a.center().y);
+                        let b_centre_pt = Point::new(b.center().x, b.center().y);
+                        let distance_a = DistanceAlg::Pythagoras.distance2d(
                             a_centre_pt,
                             map_centre
                         );
-                        let distance_b = rltk::DistanceAlg::Pythagoras.distance2d(
+                        let distance_b = DistanceAlg::Pythagoras.distance2d(
                             b_centre_pt,
                             map_centre
                         );

src/map_builders/room_themer.rs

@@ -7,7 +7,7 @@ use crate::data::messages::{
     FEATURE_BARRACKS_ORC,
 };
 use crate::raws;
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 use std::collections::HashSet;
 
 pub enum Theme {
@@ -22,7 +22,7 @@ pub struct ThemeRooms {
 }
 
 impl MetaMapBuilder for ThemeRooms {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -141,7 +141,7 @@ impl ThemeRooms {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("RoomCornerRounding requires a builder with rooms.");
+            unreachable!("RoomCornerRounding tried to run without any rooms.");
         }
 
         let count = roll_until_fail(rng, self.percent);
@@ -173,7 +173,7 @@ fn roll_until_fail(rng: &mut RandomNumberGenerator, target: i32) -> i32 {
     loop {
         if rng.roll_dice(1, 100) <= target - accumulator {
             accumulator += 1;
-            rltk::console::log(accumulator);
+            console::log(accumulator);
         } else {
             break;
         }

src/map_builders/rooms_corridors_bresenham.rs

@@ -1,12 +1,12 @@
 use super::{ BuilderMap, MetaMapBuilder, Rect, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 use std::collections::HashSet;
 
 pub struct BresenhamCorridors {}
 
 impl MetaMapBuilder for BresenhamCorridors {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.corridors(rng, build_data);
     }
 }
@@ -22,7 +22,7 @@ impl BresenhamCorridors {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("BresenhamCorridors require a builder with room structures");
+            unreachable!("BresenhamCorridors tried to run without any rooms.");
         }
 
         let mut connected: HashSet<usize> = HashSet::new();
@@ -30,12 +30,12 @@ impl BresenhamCorridors {
         for (i, room) in rooms.iter().enumerate() {
             let mut room_distance: Vec<(usize, f32)> = Vec::new();
             let room_centre = room.center();
-            let room_centre_pt = rltk::Point::new(room_centre.x, room_centre.y);
+            let room_centre_pt = Point::new(room_centre.x, room_centre.y);
             for (j, other_room) in rooms.iter().enumerate() {
                 if i != j && !connected.contains(&j) {
                     let other_centre = other_room.center();
-                    let other_centre_pt = rltk::Point::new(other_centre.x, other_centre.y);
-                    let distance = rltk::DistanceAlg::Pythagoras.distance2d(
+                    let other_centre_pt = Point::new(other_centre.x, other_centre.y);
+                    let distance = DistanceAlg::Pythagoras.distance2d(
                         room_centre_pt,
                         other_centre_pt
                     );
@@ -46,10 +46,10 @@ impl BresenhamCorridors {
             if !room_distance.is_empty() {
                 room_distance.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap());
                 let dest_centre = rooms[room_distance[0].0].center();
-                let line = rltk::line2d(
-                    rltk::LineAlg::Bresenham,
+                let line = line2d(
+                    LineAlg::Bresenham,
                     room_centre_pt,
-                    rltk::Point::new(dest_centre.x, dest_centre.y)
+                    Point::new(dest_centre.x, dest_centre.y)
                 );
                 let mut corridor = Vec::new();
                 for cell in line.iter() {

src/map_builders/rooms_corridors_bsp.rs

@@ -1,11 +1,11 @@
 use super::{ draw_corridor, BuilderMap, MetaMapBuilder, Rect };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct BspCorridors {}
 
 impl MetaMapBuilder for BspCorridors {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.corridors(rng, build_data);
     }
 }
@@ -21,7 +21,7 @@ impl BspCorridors {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("BSP Corridors require a builder with room structures");
+            unreachable!("BSP Corridors tried to run without any rooms.");
         }
 
         let mut corridors: Vec<Vec<usize>> = Vec::new();
@@ -30,8 +30,10 @@ impl BspCorridors {
             let next_room = rooms[i + 1];
             let start_x = room.x1 + (rng.roll_dice(1, i32::abs(room.x1 - room.x2)) - 1);
             let start_y = room.y1 + (rng.roll_dice(1, i32::abs(room.y1 - room.y2)) - 1);
-            let end_x = next_room.x1 + (rng.roll_dice(1, i32::abs(next_room.x1 - next_room.x2)) - 1);
-            let end_y = next_room.y1 + (rng.roll_dice(1, i32::abs(next_room.y1 - next_room.y2)) - 1);
+            let end_x =
+                next_room.x1 + (rng.roll_dice(1, i32::abs(next_room.x1 - next_room.x2)) - 1);
+            let end_y =
+                next_room.y1 + (rng.roll_dice(1, i32::abs(next_room.y1 - next_room.y2)) - 1);
             let corridor = draw_corridor(&mut build_data.map, start_x, start_y, end_x, end_y);
             corridors.push(corridor);
             build_data.take_snapshot();

src/map_builders/rooms_corridors_dogleg.rs

@@ -1,11 +1,11 @@
 use super::{ apply_horizontal_tunnel, apply_vertical_tunnel, BuilderMap, MetaMapBuilder, Rect };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct DoglegCorridors {}
 
 impl MetaMapBuilder for DoglegCorridors {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.corridors(rng, build_data);
     }
 }
@@ -21,7 +21,7 @@ impl DoglegCorridors {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("DoglegCorridors require a builder with rooms.");
+            unreachable!("DoglegCorridors tried to run without any rooms.");
         }
 
         let mut corridors: Vec<Vec<usize>> = Vec::new();

src/map_builders/rooms_corridors_nearest.rs

@@ -1,12 +1,12 @@
 use super::{ draw_corridor, BuilderMap, MetaMapBuilder, Rect };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 use std::collections::HashSet;
 
 pub struct NearestCorridors {}
 
 impl MetaMapBuilder for NearestCorridors {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.corridors(rng, build_data);
     }
 }
@@ -22,7 +22,7 @@ impl NearestCorridors {
         if let Some(rooms_builder) = &build_data.rooms {
             rooms = rooms_builder.clone();
         } else {
-            panic!("NearestCorridors requires a builder with rooms");
+            unreachable!("NearestCorridors tried to run without any rooms.");
         }
 
         let mut connected: HashSet<usize> = HashSet::new();
@@ -30,12 +30,12 @@ impl NearestCorridors {
         for (i, room) in rooms.iter().enumerate() {
             let mut room_distance: Vec<(usize, f32)> = Vec::new();
             let room_centre = room.center();
-            let room_centre_pt = rltk::Point::new(room_centre.x, room_centre.y);
+            let room_centre_pt = Point::new(room_centre.x, room_centre.y);
             for (j, other_room) in rooms.iter().enumerate() {
                 if i != j && !connected.contains(&j) {
                     let other_centre = other_room.center();
-                    let other_centre_pt = rltk::Point::new(other_centre.x, other_centre.y);
-                    let distance = rltk::DistanceAlg::Pythagoras.distance2d(
+                    let other_centre_pt = Point::new(other_centre.x, other_centre.y);
+                    let distance = DistanceAlg::Pythagoras.distance2d(
                         room_centre_pt,
                         other_centre_pt
                     );

src/map_builders/rooms_corridors_spawner.rs

@@ -1,10 +1,10 @@
 use super::{ spawner, BuilderMap, MetaMapBuilder };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct CorridorSpawner {}
 
 impl MetaMapBuilder for CorridorSpawner {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -27,7 +27,7 @@ impl CorridorSpawner {
                 );
             }
         } else {
-            panic!("CorridorSpawner only works after corridors have been created");
+            unreachable!("CorridorSpawner tried to run without any corridors.");
         }
     }
 }

src/map_builders/scaffold.txt

@@ -2,7 +2,7 @@ use super::{
     generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, spawner, Map, MapBuilder,
     Position, TileType, SHOW_MAPGEN,
 };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 use specs::prelude::*;
 use std::collections::HashMap;
 

src/map_builders/simple_map.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, InitialMapBuilder, Rect };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 pub struct SimpleMapBuilder {
     room_params: (i32, i32, i32),
@@ -7,7 +7,7 @@ pub struct SimpleMapBuilder {
 
 impl InitialMapBuilder for SimpleMapBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build_rooms(rng, build_data);
     }
 }

src/map_builders/town.rs

@@ -1,16 +1,17 @@
 use super::{ BuilderChain, BuilderMap, InitialMapBuilder, Position, TileType, FillEdges };
 use std::collections::HashSet;
 use crate::data::names::*;
+use bracket_lib::prelude::*;
 
 pub fn town_builder(
     new_id: i32,
-    _rng: &mut rltk::RandomNumberGenerator,
+    _rng: &mut RandomNumberGenerator,
     width: i32,
     height: i32,
     difficulty: i32,
     initial_player_level: i32
 ) -> BuilderChain {
-    rltk::console::log(format!("DEBUGINFO: Building town (ID:{}, DIFF:{})", new_id, difficulty));
+    console::log(format!("DEBUGINFO: Building town (ID:{}, DIFF:{})", new_id, difficulty));
     let mut chain = BuilderChain::new(
         false,
         new_id,
@@ -32,7 +33,7 @@ pub struct TownBuilder {}
 
 impl InitialMapBuilder for TownBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build_map(rng, build_data);
     }
 }
@@ -52,7 +53,7 @@ impl TownBuilder {
         return Box::new(TownBuilder {});
     }
 
-    pub fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    pub fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         // Make visible for snapshot
         for t in build_data.map.visible_tiles.iter_mut() {
             *t = true;
@@ -64,8 +65,20 @@ impl TownBuilder {
         let (mut available_building_tiles, wall_gap_y) = self.town_walls(rng, build_data);
         let mut buildings = self.buildings(rng, build_data, &mut available_building_tiles);
         let doors = self.add_doors(rng, build_data, &mut buildings, wall_gap_y);
-        self.path_from_tiles_to_nearest_tiletype(build_data, &doors, TileType::Road, TileType::Road, true);
-        self.path_from_tiles_to_nearest_tiletype(build_data, &piers, TileType::Road, TileType::Road, false);
+        self.path_from_tiles_to_nearest_tiletype(
+            build_data,
+            &doors,
+            TileType::Road,
+            TileType::Road,
+            true
+        );
+        self.path_from_tiles_to_nearest_tiletype(
+            build_data,
+            &piers,
+            TileType::Road,
+            TileType::Road,
+            false
+        );
 
         // Spawn entities
         let building_size = self.sort_buildings(&buildings);
@@ -81,7 +94,10 @@ impl TownBuilder {
         build_data.take_snapshot();
     }
 
-    fn sort_buildings(&mut self, buildings: &[(i32, i32, i32, i32)]) -> Vec<(usize, i32, BuildingTag)> {
+    fn sort_buildings(
+        &mut self,
+        buildings: &[(i32, i32, i32, i32)]
+    ) -> Vec<(usize, i32, BuildingTag)> {
         // Sort buildings by size, defaulting them to Unassigned buildings
         let mut building_size: Vec<(usize, i32, BuildingTag)> = Vec::new();
         for (i, building) in buildings.iter().enumerate() {
@@ -105,7 +121,7 @@ impl TownBuilder {
 
     fn building_factory(
         &mut self,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         build_data: &mut BuilderMap,
         buildings: &[(i32, i32, i32, i32)],
         building_index: &[(usize, i32, BuildingTag)]
@@ -124,7 +140,7 @@ impl TownBuilder {
         }
     }
 
-    fn spawn_dockers(&mut self, build_data: &mut BuilderMap, rng: &mut rltk::RandomNumberGenerator) {
+    fn spawn_dockers(&mut self, build_data: &mut BuilderMap, rng: &mut RandomNumberGenerator) {
         for (idx, tt) in build_data.map.tiles.iter().enumerate() {
             if *tt == TileType::Bridge && rng.roll_dice(1, 20) == 1 {
                 let roll = rng.roll_dice(1, 2);
@@ -139,7 +155,7 @@ impl TownBuilder {
     fn spawn_townsfolk(
         &mut self,
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         available_building_tiles: &mut HashSet<usize>
     ) {
         for idx in available_building_tiles.iter() {
@@ -176,7 +192,7 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         to_place: &mut Vec<&str>,
         avoid_tile: usize
     ) {
@@ -201,9 +217,12 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
-        let player_idx = build_data.map.xy_idx(building.0 + building.2 / 2, building.1 + building.3 / 2);
+        let player_idx = build_data.map.xy_idx(
+            building.0 + building.2 / 2,
+            building.1 + building.3 / 2
+        );
 
         // Place other items
         let mut to_place: Vec<&str> = vec![
@@ -224,7 +243,7 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
         let mut to_place: Vec<&str> = vec![
             "npc_priest",
@@ -244,10 +263,13 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
         // Place exit
-        let exit_idx = build_data.map.xy_idx(building.0 + building.2 / 2, building.1 + building.3 / 2);
+        let exit_idx = build_data.map.xy_idx(
+            building.0 + building.2 / 2,
+            building.1 + building.3 / 2
+        );
         build_data.map.tiles[exit_idx] = TileType::DownStair;
         let mut to_place: Vec<&str> = vec!["npc_miner", "npc_miner", "npc_guard", "prop_chair"];
         self.random_building_spawn(building, build_data, rng, &mut to_place, exit_idx)
@@ -257,9 +279,15 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
-        let mut to_place: Vec<&str> = vec!["prop_bed", "prop_table", "dog_little", "prop_chair", "prop_chair"];
+        let mut to_place: Vec<&str> = vec![
+            "prop_bed",
+            "prop_table",
+            "dog_little",
+            "prop_chair",
+            "prop_chair"
+        ];
         self.random_building_spawn(building, build_data, rng, &mut to_place, 0);
     }
 
@@ -267,9 +295,14 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
-        let mut to_place: Vec<&str> = vec!["npc_townsperson", "prop_bed", "prop_table", "prop_chair"];
+        let mut to_place: Vec<&str> = vec![
+            "npc_townsperson",
+            "prop_bed",
+            "prop_table",
+            "prop_chair"
+        ];
         self.random_building_spawn(building, build_data, rng, &mut to_place, 0);
     }
 
@@ -277,7 +310,7 @@ impl TownBuilder {
         &mut self,
         building: &(i32, i32, i32, i32),
         build_data: &mut BuilderMap,
-        rng: &mut rltk::RandomNumberGenerator
+        rng: &mut RandomNumberGenerator
     ) {
         let mut to_place: Vec<&str> = vec!["rat", "rat", "rat", "prop_table", "prop_chair"];
         self.random_building_spawn(building, build_data, rng, &mut to_place, 0);
@@ -291,7 +324,11 @@ impl TownBuilder {
         build_data.take_snapshot();
     }
 
-    fn water_and_piers(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) -> Vec<usize> {
+    fn water_and_piers(
+        &mut self,
+        rng: &mut RandomNumberGenerator,
+        build_data: &mut BuilderMap
+    ) -> Vec<usize> {
         let mut n = (rng.roll_dice(1, 65535) as f32) / 65535f32;
         let mut water_width: Vec<i32> = Vec::new();
         let variance = 5;
@@ -300,7 +337,8 @@ impl TownBuilder {
         let sand_width = shallow_width + 4;
 
         for y in 0..build_data.height {
-            let n_water = ((f32::sin(n) * (variance as f32)) as i32) + minimum_width + rng.roll_dice(1, 2);
+            let n_water =
+                ((f32::sin(n) * (variance as f32)) as i32) + minimum_width + rng.roll_dice(1, 2);
             water_width.push(n_water);
             n += 0.1;
             for x in 0..n_water {
@@ -374,7 +412,7 @@ impl TownBuilder {
 
     fn town_walls(
         &mut self,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         build_data: &mut BuilderMap
     ) -> (HashSet<usize>, i32) {
         let mut available_building_tiles: HashSet<usize> = HashSet::new();
@@ -385,7 +423,10 @@ impl TownBuilder {
         const HALF_PATH_THICKNESS: i32 = 3;
 
         let wall_gap_y =
-            build_data.height / 2 + rng.roll_dice(1, PATH_OFFSET_FROM_CENTRE * 2) - 1 - PATH_OFFSET_FROM_CENTRE;
+            build_data.height / 2 +
+            rng.roll_dice(1, PATH_OFFSET_FROM_CENTRE * 2) -
+            1 -
+            PATH_OFFSET_FROM_CENTRE;
 
         for y in BORDER..build_data.height - BORDER {
             if !(y > wall_gap_y - HALF_PATH_THICKNESS && y < wall_gap_y + HALF_PATH_THICKNESS) {
@@ -438,7 +479,7 @@ impl TownBuilder {
 
     fn buildings(
         &mut self,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         build_data: &mut BuilderMap,
         available_building_tiles: &mut HashSet<usize>
     ) -> Vec<(i32, i32, i32, i32)> {
@@ -452,7 +493,9 @@ impl TownBuilder {
         const MAX_BUILDING_SIZE: i32 = 10;
 
         while n_buildings < REQUIRED_BUILDINGS {
-            let bx = rng.roll_dice(1, build_data.map.width - OFFSET_FROM_LEFT - BORDER) + OFFSET_FROM_LEFT;
+            let bx =
+                rng.roll_dice(1, build_data.map.width - OFFSET_FROM_LEFT - BORDER) +
+                OFFSET_FROM_LEFT;
             let by = rng.roll_dice(1, build_data.map.height) - BORDER;
             let bw = rng.roll_dice(1, MAX_BUILDING_SIZE - MIN_BUILDING_SIZE) + MIN_BUILDING_SIZE;
             let bh = rng.roll_dice(1, MAX_BUILDING_SIZE - MIN_BUILDING_SIZE) + MIN_BUILDING_SIZE;
@@ -500,10 +543,16 @@ impl TownBuilder {
                     if build_data.map.tiles[idx + 1] != TileType::WoodFloor {
                         neighbours += 1;
                     }
-                    if build_data.map.tiles[idx - (build_data.width as usize)] != TileType::WoodFloor {
+                    if
+                        build_data.map.tiles[idx - (build_data.width as usize)] !=
+                        TileType::WoodFloor
+                    {
                         neighbours += 1;
                     }
-                    if build_data.map.tiles[idx + (build_data.width as usize)] != TileType::WoodFloor {
+                    if
+                        build_data.map.tiles[idx + (build_data.width as usize)] !=
+                        TileType::WoodFloor
+                    {
                         neighbours += 1;
                     }
                     if neighbours > 0 {
@@ -520,7 +569,7 @@ impl TownBuilder {
 
     fn add_doors(
         &mut self,
-        rng: &mut rltk::RandomNumberGenerator,
+        rng: &mut RandomNumberGenerator,
         build_data: &mut BuilderMap,
         buildings: &mut Vec<(i32, i32, i32, i32)>,
         wall_gap_y: i32
@@ -556,23 +605,26 @@ impl TownBuilder {
         build_data.map.populate_blocked();
         for tile_idx in tiles.iter() {
             let mut nearest_tiletype: Vec<(usize, f32)> = Vec::new();
-            let tile_pt = rltk::Point::new(
+            let tile_pt = Point::new(
                 (*tile_idx as i32) % (build_data.map.width as i32),
                 (*tile_idx as i32) / (build_data.map.width as i32)
             );
             for r in roads.iter() {
                 nearest_tiletype.push((
                     *r,
-                    rltk::DistanceAlg::Manhattan.distance2d(
+                    DistanceAlg::Manhattan.distance2d(
                         tile_pt,
-                        rltk::Point::new((*r as i32) % build_data.map.width, (*r as i32) / build_data.map.width)
+                        Point::new(
+                            (*r as i32) % build_data.map.width,
+                            (*r as i32) / build_data.map.width
+                        )
                     ),
                 ));
             }
             nearest_tiletype.sort_by(|a, b| a.1.partial_cmp(&b.1).unwrap());
 
             let destination = nearest_tiletype[0].0;
-            let path = rltk::a_star_search(*tile_idx, destination, &mut build_data.map);
+            let path = a_star_search(*tile_idx, destination, &mut build_data.map);
             if path.success {
                 for step in path.steps.iter() {
                     let idx = *step as usize;

src/map_builders/voronoi.rs

@@ -1,5 +1,5 @@
 use super::{ BuilderMap, InitialMapBuilder, TileType };
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 
 #[derive(PartialEq, Copy, Clone)]
 #[allow(dead_code)]
@@ -16,7 +16,7 @@ pub struct VoronoiBuilder {
 
 impl InitialMapBuilder for VoronoiBuilder {
     #[allow(dead_code)]
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -40,20 +40,21 @@ impl VoronoiBuilder {
     #[allow(clippy::map_entry)]
     fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         // Make a Voronoi diagram. We'll do this the hard way to learn about the technique!
-        let mut voronoi_seeds: Vec<(usize, rltk::Point)> = Vec::new();
+        let mut voronoi_seeds: Vec<(usize, Point)> = Vec::new();
 
         while voronoi_seeds.len() < self.n_seeds {
             let vx = rng.roll_dice(1, build_data.map.width - 1);
             let vy = rng.roll_dice(1, build_data.map.height - 1);
             let vidx = build_data.map.xy_idx(vx, vy);
-            let candidate = (vidx, rltk::Point::new(vx, vy));
+            let candidate = (vidx, Point::new(vx, vy));
             if !voronoi_seeds.contains(&candidate) {
                 voronoi_seeds.push(candidate);
             }
         }
 
         let mut voronoi_distance = vec![(0, 0.0f32); self.n_seeds];
-        let mut voronoi_membership: Vec<i32> = vec![0; build_data.map.width as usize * build_data.map.height as usize];
+        let mut voronoi_membership: Vec<i32> =
+            vec![0; build_data.map.width as usize * build_data.map.height as usize];
         for (i, vid) in voronoi_membership.iter_mut().enumerate() {
             let x = (i as i32) % build_data.map.width;
             let y = (i as i32) / build_data.map.width;
@@ -62,13 +63,16 @@ impl VoronoiBuilder {
                 let distance;
                 match self.distance_algorithm {
                     DistanceAlgorithm::Pythagoras => {
-                        distance = rltk::DistanceAlg::PythagorasSquared.distance2d(rltk::Point::new(x, y), pos.1);
+                        distance = DistanceAlg::PythagorasSquared.distance2d(
+                            Point::new(x, y),
+                            pos.1
+                        );
                     }
                     DistanceAlgorithm::Manhattan => {
-                        distance = rltk::DistanceAlg::Manhattan.distance2d(rltk::Point::new(x, y), pos.1);
+                        distance = DistanceAlg::Manhattan.distance2d(Point::new(x, y), pos.1);
                     }
                     DistanceAlgorithm::Chebyshev => {
-                        distance = rltk::DistanceAlg::Chebyshev.distance2d(rltk::Point::new(x, y), pos.1);
+                        distance = DistanceAlg::Chebyshev.distance2d(Point::new(x, y), pos.1);
                     }
                 }
                 voronoi_distance[seed] = (seed, distance);

src/map_builders/voronoi_spawning.rs

@@ -1,12 +1,12 @@
-use super::{ spawner, BuilderMap, MetaMapBuilder, TileType };
+use super::{ spawner, BuilderMap, MetaMapBuilder };
 use crate::tile_walkable;
-use rltk::RandomNumberGenerator;
+use bracket_lib::prelude::*;
 use std::collections::HashMap;
 
 pub struct VoronoiSpawning {}
 
 impl MetaMapBuilder for VoronoiSpawning {
-    fn build_map(&mut self, rng: &mut rltk::RandomNumberGenerator, build_data: &mut BuilderMap) {
+    fn build_map(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         self.build(rng, build_data);
     }
 }
@@ -20,10 +20,10 @@ impl VoronoiSpawning {
     #[allow(clippy::map_entry)]
     fn build(&mut self, rng: &mut RandomNumberGenerator, build_data: &mut BuilderMap) {
         let mut noise_areas: HashMap<i32, Vec<usize>> = HashMap::new();
-        let mut noise = rltk::FastNoise::seeded(rng.roll_dice(1, 65536) as u64);
-        noise.set_noise_type(rltk::NoiseType::Cellular);
+        let mut noise = FastNoise::seeded(rng.roll_dice(1, 65536) as u64);
+        noise.set_noise_type(NoiseType::Cellular);
         noise.set_frequency(0.08);
-        noise.set_cellular_distance_function(rltk::CellularDistanceFunction::Manhattan);
+        noise.set_cellular_distance_function(CellularDistanceFunction::Manhattan);
 
         for y in 1..build_data.map.height - 1 {
             for x in 1..build_data.map.width - 1 {