fixes to nz content ratings

defaults/both/content_rating_nz.yml

@@ -46,9 +46,14 @@ dynamic_collections:
       - G
       - PG
       - M
-      - MA15+
-      - R18+
-      - X18+
+      - R13
+      - RP13
+      - R15
+      - R16
+      - RP16
+      - R18
+      - RP18
+      - R
     addons:
       G:
         - au/G
@@ -119,7 +124,12 @@ dynamic_collections:
         - PG-13 - Teens 13 or older
         - PG-13
         - no/15
-      MA15+:
+      R13:
+        - 13
+        - 14
+      RP13:
+        - 14
+      R15:
         - au/MA15+
         - de/16
         - no/16
@@ -130,7 +140,12 @@ dynamic_collections:
         - 16
         - 17
         - M/PG
-      R18+:
+      R16:
+        - 16
+        - 17
+      RP16:
+        - 17
+      R18:
         - au/R 18+
         - de/18
         - gb/18
@@ -145,7 +160,9 @@ dynamic_collections:
         - NC-17
         - R+ - Mild Nudity
         - Rx - Hentai
-      X18+:
+      RP18:
+        - 18
+      R:
         - au/X 18+
         - de/BPjM Restricted
         - BPjM Restricted

defaults/overlays/content_rating_nz.yml

@@ -60,8 +60,28 @@ overlays:
     template:
       - name: standard
       - {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
+  
+  r13:
+    template:
+      - name: standard
+      - {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
 
-  ma:
+  rp13:
+    template:
+      - name: standard
+      - {name: cr_nz, rating: "au/M, de/12, gb/12, 12, no/12, gb/15, gb/14+, TV-14, 12, 13, 14, 15, PG-13 - Teens 13 or older, PG-13, no/15"}
+
+  r15:
+    template:
+      - name: standard
+      - {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
+
+  r16:
+    template:
+      - name: standard
+      - {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
+
+  rp16:
     template:
       - name: standard
       - {name: cr_nz, rating: "au/MA15+, de/16, no/16, A-17, TVMA, TV-MA, R, 16, 17, M/PG"}
@@ -71,10 +91,16 @@ overlays:
       - name: standard
       - {name: cr_nz, rating: "au/R 18+, de/18, gb/18, M, 18, R - 17+ (violence & profanity), no/18, R18, gb/R18, gb/X, X, NC-17, R+ - Mild Nudity, Rx - Hentai"}
 
-  x:
+  r18:
     template:
       - name: standard
       - {name: cr_nz, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
+
+  rp18:
+    template:
+      - name: standard
+      - {name: cr_nz, rating: "au/X 18+, de/BPjM Restricted, BPjM Restricted"}
+
   nr:
     template:
       - {name: standard, key: nr}

docs/defaults/overlays/content_rating_nz.md

@@ -15,15 +15,20 @@ Rating.
 
 ## Supported Content Rating NZ
 
-| Rating | Key   |
-|:-------|:------|
-| G      | `g`   |
-| PG     | `pg`  |
-| M      | `m`   |
-| MA15+  | `ma`  |
-| R18+   | `r`   |
-| X18+   | `x`   |
-| NR     | `nr`  |
+| Rating | Key    |
+|:-------|:-------|
+| G      | `g`    |
+| PG     | `pg`   |
+| M      | `m`    |
+| R13    | `r13`  |
+| RP13   | `rp13` |
+| R15    | `r15`  |
+| R16    | `r16`  |
+| RP16   | `rp16` |
+| R18    | `R18`  |
+| RP18   | `rp18` |
+| R      | `r`    |
+| NR     | `nr`   |
 
 ## Config