From 4058a64d484295cf60828256643f4e1b438d6c2a Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sun, 6 Jan 2019 08:26:36 +0000 Subject: Change default keybindings to match Emacs conventions Signed-off-by: Sean Whitton --- NEWS.md | 3 +++ README.md | 12 ++++++------ org-d20.el | 12 ++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NEWS.md b/NEWS.md index f20c572..82f5f19 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,11 +2,14 @@ ---------------- - Bug fix: off-by-one error in call to `random` +- Change default keybindings to match Emacs conventions + - `org-d20-roll` shows the results on each dice rolled - New defcustom, `org-d20-letter-monsters` - New defcustom, `org-d20-continue-monster-numbering` - You can now specify a dice expression for the number of a type of monster/NPC + - Improve README for new users - Autoload some more functions users might want to bind - Refactoring/cleanup diff --git a/README.md b/README.md index 2c1a84c..8b22be4 100644 --- a/README.md +++ b/README.md @@ -56,14 +56,14 @@ confirm that the value for org-d20-party that you've supplied is safe. The following bindings should then be available: -- <f9> -- start a combat, or advance the turn/round counter +- C-c , i -- start a combat, or advance the turn/round counter for an existing combat, depending on point -- S-<f9> -- add new monsters to an existing combat -- <f10> -- apply damage to the monster at point -- S-<f10> -- evaluate the dice expression (e.g. `4d10`) at +- C-c , a -- add new monsters to an existing combat +- C-c , d -- apply damage to the monster at point +- C-c , r -- prompt for dice expression and evaluate it +- <f10> -- evaluate the dice expression (e.g. `4d10`) at point -- <f11> -- prompt for dice expression and evaluate it -- S-<f11> -- roll the last dice expression again +- <f11> -- roll the last dice expression again - <f12> -- roll d20, with advantage and disadvantage shown - S-<f12> -- roll percentile dice diff --git a/org-d20.el b/org-d20.el index a40bd49..b8b79d9 100644 --- a/org-d20.el +++ b/org-d20.el @@ -79,12 +79,12 @@ Rather than starting again for each type." (defvar org-d20-mode-map (let ((map (make-sparse-keymap))) - (define-key map (kbd "") #'org-d20-initiative-dwim) - (define-key map (kbd "S-") #'org-d20-initiative-add) - (define-key map (kbd "") #'org-d20-damage) - (define-key map (kbd "S-") #'org-d20-roll-at-point) - (define-key map (kbd "") #'org-d20-roll) - (define-key map (kbd "S-") #'org-d20-roll-last) + (define-key map (kbd "C-c , i") #'org-d20-initiative-dwim) + (define-key map (kbd "C-c , a") #'org-d20-initiative-add) + (define-key map (kbd "C-c , d") #'org-d20-damage) + (define-key map (kbd "C-c , r") #'org-d20-roll) + (define-key map (kbd "") #'org-d20-roll-at-point) + (define-key map (kbd "") #'org-d20-roll-last) (define-key map (kbd "") #'org-d20-d20) (define-key map (kbd "S-") #'org-d20-d%) map) -- cgit v1.2.3