From 7ee54b52fbe8cd9dfb892bbf925c9948dc4aa79a Mon Sep 17 00:00:00 2001
From: Jeremy Rimpo <jrim@rimpo.org>
Date: Sat, 23 Dec 2023 01:05:56 -0600
Subject: [PATCH] Region tweaks for tussock and fungoida

---
 src/bio_scan/bio_data/regions.py          |  3 ++-
 src/bio_scan/bio_data/rulesets/tussock.py | 14 +++++++-------
 src/bio_scan/const.py                     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/bio_scan/bio_data/regions.py b/src/bio_scan/bio_data/regions.py
index 5ea7b34..a01190d 100644
--- a/src/bio_scan/bio_data/regions.py
+++ b/src/bio_scan/bio_data/regions.py
@@ -1,9 +1,10 @@
 region_map: dict[str, list[int]] = {
     'orion-cygnus': [1, 4, 7, 8, 16, 17, 18, 35],
     'orion-cygnus-1': [4, 7, 8, 16, 17, 18, 35],
-    'orion-cygnus-core': [4, 7, 8, 16, 17, 18, 35],
+    'orion-cygnus-core': [7, 8, 16, 17, 18, 35],
     'sagittarius-carina': [1, 4, 9, 18, 19, 20, 21, 22, 23, 40],
     'sagittarius-carina-core': [9, 18, 19, 20, 21, 22, 23, 40],
+    'sagittarius-carina-core-9': [18, 19, 20, 21, 22, 23, 40],
     'scutum-centaurus': [1, 4, 9, 10, 11, 12, 24, 25, 26, 42, 28],
     'scutum-centaurus-core': [9, 10, 11, 12, 24, 25, 26, 42, 28],
     'outer': [1, 2, 5, 6, 13, 14, 27, 29, 31, 41, 37],
diff --git a/src/bio_scan/bio_data/rulesets/tussock.py b/src/bio_scan/bio_data/rulesets/tussock.py
index 1cc3d9a..53a0ae2 100644
--- a/src/bio_scan/bio_data/rulesets/tussock.py
+++ b/src/bio_scan/bio_data/rulesets/tussock.py
@@ -15,7 +15,7 @@
                     'max_temperature': 154.0,
                     'min_pressure': 0.00289,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina-core', 'orion-cygnus-1', 'perseus-core']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -32,7 +32,7 @@
                     'max_temperature': 160.0,
                     'min_pressure': 0.00289,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina-core', 'orion-cygnus-1', 'perseus-core']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -49,7 +49,7 @@
                     'max_temperature': 170.0,
                     'min_pressure': 0.00289,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina', 'perseus']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -116,7 +116,7 @@
                     'min_pressure': 0.01,
                     'max_pressure': 0.071,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina-core', 'orion-cygnus-1', 'perseus-core']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -133,7 +133,7 @@
                     'max_temperature': 180.0,
                     'min_pressure': 0.016,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina', 'perseus']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -183,7 +183,7 @@
                     'max_temperature': 190.0,
                     'min_pressure': 0.0275,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina', 'perseus']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
@@ -200,7 +200,7 @@
                     'max_temperature': 196.0,
                     'min_pressure': 0.058,
                     'volcanism': 'None',
-                    'regions': ['sagittarius-carina-core', 'orion-cygnus-1', 'perseus-core']
+                    'regions': ['sagittarius-carina-core-9', 'perseus-core', 'orion-cygnus-core']
                 }
             ],
         },
diff --git a/src/bio_scan/const.py b/src/bio_scan/const.py
index af3c36b..c1bd762 100644
--- a/src/bio_scan/const.py
+++ b/src/bio_scan/const.py
@@ -1,3 +1,3 @@
 name = 'BioScan'
-version = '2.6.6'
+version = '2.6.7'
 db_version = 4