From bba34ad5309d69d16ee73e1795688eadf3586a0f Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Mon, 14 Jun 2021 23:43:48 -0600
Subject: [PATCH 1/7] bump to targetSdkVersion 30

---
 app/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c40b5625..b7f71704 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,12 +38,11 @@ ext {
 }
 
 android {
-    compileSdkVersion 28
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
     defaultConfig {
         applicationId "org.steavesea.adventuresmith"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode androidGitVersion.code()
         versionName androidGitVersion.name()
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

From f5ef805e8514297fad798f1a035df6757c0661a2 Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Mon, 14 Jun 2021 23:47:42 -0600
Subject: [PATCH 2/7] output of runGenerateDocs

---
 content_attribution.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/content_attribution.md b/content_attribution.md
index a2f33d1d..28f1afdf 100644
--- a/content_attribution.md
+++ b/content_attribution.md
@@ -13,6 +13,7 @@ publishers and copyright holders. See below for full listing.
 - [Fourth Page Games](#fourth_page)
 - [GameMaster's Apprentice](#gma)
 - [Hack & Slash](#hack_and_slash)
+- [Ironsworn](#ironsworn)
 - [Kaigaku](#kaigaku)
 - [Knave](#knave)
 - [Macchiato Monsters](#macchiato_monsters)
@@ -174,6 +175,18 @@ All text is © Courtney C. Campbell (2011).
 
 
 
+<a name="ironsworn"></a>
+## Ironsworn - Shawn Tomkin
+[https://www.ironswornrpg.com](https://www.ironswornrpg.com)
+
+<p>This work is based on <a href="https://www.ironswornrpg.com">Ironsworn</a>, created by
+Shawn Tomkin, and licensed for our use under the
+<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons
+Attribution-NonCommercial-ShareAlike 4.0 International</a> license.
+
+
+
+
 <a name="kaigaku"></a>
 ## Kaigaku - Jacob DC Ross / Thunderegg Productions
 [http://www.drivethrurpg.com/product/186267/Kaigaku-RPG](http://www.drivethrurpg.com/product/186267/Kaigaku-RPG)

From b5dc043247dd382f823b48c75e1e3229ac32e50c Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Tue, 15 Jun 2021 00:03:23 -0600
Subject: [PATCH 3/7] remove obsolete link to G+

---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d766c2d5..a18503ef 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,6 @@ are instructions on the [wiki](https://github.com/stevesea/Adventuresmith/wiki)
 
 Bugs? Feature Requests? You can provide feedback [here](https://github.com/stevesea/Adventuresmith/issues)
 
-Want to keep up with development? Here's the [G+ community](https://plus.google.com/communities/101389134352217517231)
-
 ## Screenshots
 
 ![alt text](https://github.com/stevesea/Adventuresmith/raw/master/docs/images/nav_drawer1.png "Sliding nav bar")
@@ -72,7 +70,7 @@ Attribution for each set of generators is also available within the app. When yo
 generators, click on the info button on the toolbar to be shown the attribution statement for the
 generators you're using.
 
-If you enjoy using Adventuresmith, follow the attribution links to the creators' blogs or to their
+If you enjoy using Adventuresmith, follow the attribution links to the creators' websites, or to their
 pages on [DriveThruRPG](http://www.drivethrurpg.com/). Give them reviews and other feedback; buy
 their products, and become a patron on Patreon.
 

From 1aff9fcc4ea2fa18819d7e035b8cd8fe6a4e599a Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Tue, 15 Jun 2021 01:49:17 -0600
Subject: [PATCH 4/7] rename trouble to clarify it's settlement-related

---
 .../adventuresmith/core/ironsworn/settlement_trouble.meta.yml   | 2 ++
 .../core/ironsworn/{trouble.yml => settlement_trouble.yml}      | 0
 .../org/stevesea/adventuresmith/core/ironsworn/trouble.meta.yml | 2 --
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.meta.yml
 rename adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/{trouble.yml => settlement_trouble.yml} (100%)
 delete mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.meta.yml

diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.meta.yml
new file mode 100644
index 00000000..b59d5d85
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.meta.yml
@@ -0,0 +1,2 @@
+---
+name: Settlement Trouble
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.yml
similarity index 100%
rename from adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.yml
rename to adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/settlement_trouble.yml
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.meta.yml
deleted file mode 100644
index 63c839df..00000000
--- a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/trouble.meta.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-name: Trouble

From eb78dc955fab17481ea9a1f920e1b04e64465def Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Tue, 15 Jun 2021 01:49:41 -0600
Subject: [PATCH 5/7] add region & costal

---
 .../core/ironsworn/coastal_waters.meta.yml    |  1 +
 .../core/ironsworn/coastal_waters.yml         | 23 +++++++++++++++++++
 .../core/ironsworn/region.meta.yml            |  1 +
 .../adventuresmith/core/ironsworn/region.yml  | 16 +++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.meta.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.meta.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.yml

diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.meta.yml
new file mode 100644
index 00000000..725c0393
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.meta.yml
@@ -0,0 +1 @@
+name: Coastal Waters
\ No newline at end of file
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.yml
new file mode 100644
index 00000000..00f9fd35
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/coastal_waters.yml
@@ -0,0 +1,23 @@
+---
+templates:
+  - "{{coastal_waters}}"
+
+tables:
+  coastal_waters:
+    - 1, Fleet
+    - 2, Sargassum
+    - 3, Flotsam
+    - 4, Mystical Site
+    - 5, Lair
+    - 6..10, Wreck
+    - 11..15, Harbor
+    - 16..23, Ship
+    - 24..30, Rocks
+    - 31..38, Fjord
+    - 39..46, Estuary
+    - 47..54, Cove
+    - 55..62, Bay
+    - 63..70, Ice
+    - 71..85, Island
+    - 86..99, Open Water
+    - 100, Anomaly
\ No newline at end of file
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.meta.yml
new file mode 100644
index 00000000..470f23fd
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.meta.yml
@@ -0,0 +1 @@
+name: Region
\ No newline at end of file
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.yml
new file mode 100644
index 00000000..4fd193f9
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/region.yml
@@ -0,0 +1,16 @@
+---
+templates:
+  - "{{region}}"
+
+tables:
+  region:
+    - 1..12, Barrier Islands
+    - 13..24, Ragged Coast
+    - 25..34, Deep Wilds
+    - 35..46, Flooded Lands
+    - 47..60, Havens
+    - 61..72, Hinterlands
+    - 73..84, Tempest Hills
+    - 85..94, Veiled Mountains
+    - 95..99, Shattered Wastes
+    - 100, Elsewhere

From fc762416239f06c53c116795ac923e5c0b2cb96f Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Tue, 15 Jun 2021 01:52:51 -0600
Subject: [PATCH 6/7] add ask oracle & challenge rank

---
 .../core/ironsworn/ask_the_oracle.meta.yml    | 15 +++++++++++++
 .../core/ironsworn/ask_the_oracle.yml         | 22 +++++++++++++++++++
 .../core/ironsworn/challenge_rank.meta.yml    |  1 +
 .../core/ironsworn/challenge_rank.yml         | 11 ++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.meta.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.meta.yml
 create mode 100644 adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.yml

diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.meta.yml
new file mode 100644
index 00000000..d9096f7a
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.meta.yml
@@ -0,0 +1,15 @@
+---
+name: Ask the Oracle
+input:
+  displayTemplate: "{{odds}}"
+  params:
+    - name: odds
+      uiName: Odds
+      helpText: Odds of a 'yes'
+      defaultValue: 50/50
+      values:
+        - Almost_Certain
+        - Likely
+        - 50/50
+        - Unlikely
+        - Small_Chance
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.yml
new file mode 100644
index 00000000..42e8094c
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/ask_the_oracle.yml
@@ -0,0 +1,22 @@
+---
+templates:
+  - |
+    %[[ask_oracle.{{input.odds}}]]%
+
+nested_tables:
+  ask_oracle:
+    Almost_Certain:
+      - 1..10, No
+      - 11..100, Yes
+    Likely:
+      - 1..25, No
+      - 26..100, Yes
+    50/50:
+      - 1..50, No
+      - 51..100, Yes
+    Unlikely:
+      - 1..75, No
+      - 76..100, Yes
+    Small_Chance:
+      - 1..90, No
+      - 91..100, Yes
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.meta.yml
new file mode 100644
index 00000000..243d9a75
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.meta.yml
@@ -0,0 +1 @@
+name: Challenge Rank
\ No newline at end of file
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.yml
new file mode 100644
index 00000000..f19f0c30
--- /dev/null
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/challenge_rank.yml
@@ -0,0 +1,11 @@
+---
+templates:
+  - "{{challenge_rank}}"
+
+tables:
+  challenge_rank:
+    - 1-20, Troublesome
+    - 21-55, Dangerous
+    - 56-80, Formidable
+    - 81-93, Extreme
+    - 94-100, Epic
\ No newline at end of file

From 31123b9e7485b5f543d3700b301eb0c5aa43fd29 Mon Sep 17 00:00:00 2001
From: Steve Christensen <stevec1973@gmail.com>
Date: Tue, 15 Jun 2021 01:57:01 -0600
Subject: [PATCH 7/7] add ironsworn subgroups

---
 .../core/ironsworn/collection.yml             | 36 +++++++++++--------
 .../adventuresmith/core/ironsworn/meta.yml    | 11 ++++++
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/collection.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/collection.yml
index 5f4bc456..d88f3f91 100644
--- a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/collection.yml
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/collection.yml
@@ -1,16 +1,24 @@
 ---
 id: ironsworn
-icon: cmd_terrain
-generators:
-  - action_theme
-  - location
-  - settlement
-  - trouble
-  - npc
-  - name
-  - harm
-  - stress
-  - paytheprice
-  - combataction
-  - mysticbacklash
-  - plottwist
+icon: cmd_sword
+
+groupedGenerators:
+  characters:
+    - npc
+    - name
+  locations:
+    - settlement
+    - settlement_trouble
+    - location
+    - region
+    - coastal_waters
+  narrative:
+    - ask_the_oracle
+    - action_theme
+    - plottwist
+    - challenge_rank
+    - paytheprice
+    - combataction
+    - mysticbacklash
+    - harm
+    - stress
\ No newline at end of file
diff --git a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/meta.yml b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/meta.yml
index d75a20fe..e7758320 100644
--- a/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/meta.yml
+++ b/adventuresmith-core/src/main/resources/org/stevesea/adventuresmith/core/ironsworn/meta.yml
@@ -8,3 +8,14 @@ attribution: |
   Shawn Tomkin, and licensed for our use under the
   <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/">Creative Commons
   Attribution-NonCommercial-ShareAlike 4.0 International</a> license.
+
+groups:
+  - name: characters
+    uiName: Characters
+    icon: cmd-account-multiple
+  - name: locations
+    uiName: Locations
+    icon: cmd_terrain
+  - name: narrative
+    uiName: Narrative & Combat
+    icon: cmd_account_alert
\ No newline at end of file