From 223d15ecefd86fb6de5e5301593c79165127400b Mon Sep 17 00:00:00 2001
From: "NG (Graham)" <ngniusness@gmail.com>
Date: Sat, 28 Feb 2026 11:59:13 -0500
Subject: [PATCH] Update and add more project templates

---
 ISSUE_TEMPLATE/bug.yml         | 16 ++++------------
 ISSUE_TEMPLATE/config.yml      |  2 +-
 ISSUE_TEMPLATE/feature.yml     | 23 +++++++++++++++++++++++
 ISSUE_TEMPLATE/improvement.yml | 32 ++++++++++++++++++++++++++++++++
 PULL_REQUEST_TEMPLATE.yml      | 18 +++++-------------
 5 files changed, 65 insertions(+), 26 deletions(-)
 create mode 100644 ISSUE_TEMPLATE/feature.yml
 create mode 100644 ISSUE_TEMPLATE/improvement.yml

diff --git a/ISSUE_TEMPLATE/bug.yml b/ISSUE_TEMPLATE/bug.yml
index 7b153ef..2cc0b5f 100644
--- a/ISSUE_TEMPLATE/bug.yml
+++ b/ISSUE_TEMPLATE/bug.yml
@@ -1,6 +1,7 @@
 name: "Bug Report"
 description: "Report an issue"
 labels: "bug"
+projects: "HQ"
 body:
   - type: textarea
     id: buggy-behaviour
@@ -21,24 +22,15 @@ body:
         4. See error......
     validations:
       required: true
-  - type: dropdown
-    id: game
-    attributes:
-      label: Game
-      multiple: true
-      options:
-        - Cardlife
-        - Robocraft
-    validations:
-      required: true
   - type: textarea
     id: extras
     attributes:
       label: Anything else?
       description: |
         Screenshots? Operating System? Version?
-        Please include the log (in your Robocraft folder, `outputLog#.txt` where `#` is a digit 0 through 9).
+        Please include the client log (in your Robocraft folder, `outputLog#.txt` where `#` is a digit 0 through 9).
+        If you have access to the server logs, please also include any relevant service logs.
 
-        Tip: You can attach files by clicking this area to highlight it and then dragging them in.
+        Tip: You can attach files by clicking this area to highlight it and then dragging the files in.
     validations:
       required: false
diff --git a/ISSUE_TEMPLATE/config.yml b/ISSUE_TEMPLATE/config.yml
index 478757d..ec0b2f2 100644
--- a/ISSUE_TEMPLATE/config.yml
+++ b/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
   - name: NGram
-    url: https://git.ngram.ca/OpenJam/servers#contributing
+    url: https://git.ngram.ca/OpenJam/rc-servers#contributing
     about: Project leader
diff --git a/ISSUE_TEMPLATE/feature.yml b/ISSUE_TEMPLATE/feature.yml
new file mode 100644
index 0000000..416c98c
--- /dev/null
+++ b/ISSUE_TEMPLATE/feature.yml
@@ -0,0 +1,23 @@
+name: "Feature Request"
+description: "Request new functionality"
+labels: "feature"
+body:
+  - type: textarea
+    id: desired-behaviour
+    attributes:
+      label: What should be added?
+      description: A clear and concise description of the feature you'd like.
+      placeholder: |
+        E14 should be winning since Bang Bang Badger is backing them.
+    validations:
+      required: true
+  - type: textarea
+    id: extras
+    attributes:
+      label: Anything else?
+      description: |
+        Screenshots? Version? Miscellaneous thoughts? Motivation?
+
+        Tip: You can attach files by clicking this area to highlight it and then dragging them in.
+    validations:
+      required: false
diff --git a/ISSUE_TEMPLATE/improvement.yml b/ISSUE_TEMPLATE/improvement.yml
new file mode 100644
index 0000000..aa5a41c
--- /dev/null
+++ b/ISSUE_TEMPLATE/improvement.yml
@@ -0,0 +1,32 @@
+name: "Enhancement"
+description: "Request an improvement to existing functionality"
+labels: "enhancement"
+body:
+  - type: textarea
+    id: current-behaviour
+    attributes:
+      label: What currently happens?
+      description: A clear and concise description of what happens now.
+      placeholder: |
+        The CF-Alliance is winning the war.
+    validations:
+      required: true
+  - type: textarea
+    id: desired-behaviour
+    attributes:
+      label: What should happen instead?
+      description: A clear and concise description of the change you'd like made.
+      placeholder: |
+        E14 should be winning since Bang Bang Badger is backing them.
+    validations:
+      required: true
+  - type: textarea
+    id: extras
+    attributes:
+      label: Anything else?
+      description: |
+        Screenshots? Version? Miscellaneous thoughts? Motivation?
+
+        Tip: You can attach files by clicking this area to highlight it and then dragging them in.
+    validations:
+      required: false
diff --git a/PULL_REQUEST_TEMPLATE.yml b/PULL_REQUEST_TEMPLATE.yml
index ffcc88a..42c75d6 100644
--- a/PULL_REQUEST_TEMPLATE.yml
+++ b/PULL_REQUEST_TEMPLATE.yml
@@ -6,17 +6,7 @@ body:
     attributes:
       label: Description
       description: What does this change accomplish?
-      placeholder: 'This changes the sky from blue to red and fixes issue #42'
-    validations:
-      required: true
-  - type: dropdown
-    id: game
-    attributes:
-      label: Game
-      multiple: true
-      options:
-        - Cardlife
-        - Robocraft
+      placeholder: 'This changes the CF-Alliance to E14 and fixes issue #42'
     validations:
       required: true
   - type: checkboxes
@@ -24,9 +14,11 @@ body:
     attributes:
       label: Please confirm
       options:
-        - label: I am the legal owner or represent the owner of all work submitted
+        - label: I am the legal owner or represent the legal owner of all work submitted (including LLM-generated code, if any)
           required: true
-        - label: I consent to my submission being added to this FOSS project
+        - label: I consent to my changes being added to this FOSS project
+          required: true
+        - label: I have confirmed that this does not add new errors or warnings with `utils/clippy.sh`
           required: true
         - label: This PR used LLMs to generate some or all of the code changes
           required: false