aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-01-06 08:26:36 +0000
committerSean Whitton <spwhitton@spwhitton.name>2019-01-06 08:26:36 +0000
commit4058a64d484295cf60828256643f4e1b438d6c2a (patch)
tree9d1cfa0fd8ff2eff0da772f831947f521f81d3cc
parent8d0db265d93f7fab2f34f6769da6ebc6bf3f2452 (diff)
downloadorg-d20-4058a64d484295cf60828256643f4e1b438d6c2a.tar.gz
Change default keybindings to match Emacs conventions
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--NEWS.md3
-rw-r--r--README.md12
-rw-r--r--org-d20.el12
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:
-- <kbd>&lt;f9></kbd> -- start a combat, or advance the turn/round counter
+- <kbd>C-c , i</kbd> -- start a combat, or advance the turn/round counter
for an existing combat, depending on point
-- <kbd>S-&lt;f9></kbd> -- add new monsters to an existing combat
-- <kbd>&lt;f10></kbd> -- apply damage to the monster at point
-- <kbd>S-&lt;f10></kbd> -- evaluate the dice expression (e.g. `4d10`) at
+- <kbd>C-c , a</kbd> -- add new monsters to an existing combat
+- <kbd>C-c , d</kbd> -- apply damage to the monster at point
+- <kbd>C-c , r</kbd> -- prompt for dice expression and evaluate it
+- <kbd>&lt;f10></kbd> -- evaluate the dice expression (e.g. `4d10`) at
point
-- <kbd>&lt;f11></kbd> -- prompt for dice expression and evaluate it
-- <kbd>S-&lt;f11></kbd> -- roll the last dice expression again
+- <kbd>&lt;f11></kbd> -- roll the last dice expression again
- <kbd>&lt;f12></kbd> -- roll d20, with advantage and disadvantage shown
- <kbd>S-&lt;f12></kbd> -- 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 "<f9>") #'org-d20-initiative-dwim)
- (define-key map (kbd "S-<f9>") #'org-d20-initiative-add)
- (define-key map (kbd "<f10>") #'org-d20-damage)
- (define-key map (kbd "S-<f10>") #'org-d20-roll-at-point)
- (define-key map (kbd "<f11>") #'org-d20-roll)
- (define-key map (kbd "S-<f11>") #'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 "<f10>") #'org-d20-roll-at-point)
+ (define-key map (kbd "<f11>") #'org-d20-roll-last)
(define-key map (kbd "<f12>") #'org-d20-d20)
(define-key map (kbd "S-<f12>") #'org-d20-d%)
map)