Merge pull request #4 from GuardianDll/123123123123

111

.github/CODEOWNERS

@@ -7,7 +7,6 @@
 /data/mods/DinoMod/ @ephemeralstoryteller @damien @LyleSY
 /data/mods/Graphical_Overmap/ @Kilvoctu @Larwck
 /data/mods/MMA/ @Hymore246
-/data/mods/No_Fungi/ @I-am-Erk
 /data/mods/blazemod/ @SouP
 /data/mods/classic_zombies/ @I-am-Erk
 /data/mods/crt_expansion/ @Soupster89
@@ -20,15 +19,12 @@
 /data/mods/stats_through_kills/ @KorGgenT
 /data/mods/Dark-Skies-Above/ @ephemeralstoryteller
 /data/mods/No_Hope/ @Night-Pryanik
+/data/mods/innawood/ @Light-Wave
+/data/mods/MA/ @ZhilkinSerg
 
 magic*.cpp @KorGgenT
 magic*.h @KorGgenT
-/data/json/itemgroups/SUS/ @I-am-Erk
-/data/json/npcs/refugee_center/ @I-am-Erk
-/data/json/npcs/Backgrounds/ @I-am-Erk
-/data/json/snippets/ @I-am-Erk
-/gfx/ @I-am-Erk
 /tools/ @int-ua
 /lang/ @BrettDong
-widget.cpp @wapcaplet
-wiget.h @wapcaplet
+widget.cpp @wapcaplet @dseguin
+widget.h @wapcaplet @dseguin

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -1,5 +1,5 @@
 name: Feature Request ✨
-description: Suggest an idea or this project
+description: Suggest an idea for this project
 
 body:
   - type: markdown

.github/comment-commands.yml

@@ -0,0 +1,21 @@
+# https://github.com/rytswd/comvent
+trigger: specific
+
+# list of users allowed to use these commands, from labeling an issue in
+# a specific way to mark as duplicate, closing issues, the sky is the limit
+# TODO implement more commands, add more users
+users:
+  active:
+    - casswedson
+    - Maleclypse
+    - Termineitor244
+    - Faalagorn
+    - Ilysen
+    - Aerin-of-the-Toast
+    - anoobindisguise
+    - PatrikLundell
+    - TheShadowFerret
+
+keywords:
+  - name: confirm-bug
+    value: '^\/confirmed.*'

.github/issue-labels.yml

@@ -0,0 +1,10 @@
+version: v1
+
+labels:
+  - label: "(S1 - Need Confirmation)"
+    matcher:
+      body: "(\\s|^)### Describe the bug\\s*(\n|$)"
+
+  - label: "<Suggestion / Discussion>"
+    matcher:
+      body: "(\\s|^)### Is your feature request related to a problem.*\\s*(\n|$)"

.github/labeler.yml

@@ -0,0 +1,185 @@
+"[C++]":
+  - "**/*.cpp"
+  - "**/*.h"
+
+"[JSON]":
+  - "**/*.json"
+
+"[Markdown]":
+  - "**/*.md"
+
+"Game: Achievements / Conducts / Scores":
+  - "**/scores**"
+  - "**/statistics**"
+  - "**/achievements**"
+  - "**/conducts**"
+  - "**/event_statistics.*"
+
+"[Python]":
+  - "**/*.py"
+
+"<Documentation>":
+  - "**/*.md"
+  - doc/**/*
+  - doxygen_doc/**/*
+
+"Code: Tooling":
+  - tools/**/*
+  - .github/**/*
+  - utilities/**/*
+
+"Code: Tests":
+  - tests/**/*
+
+"Character / World Generation":
+  - src/newcharacter.cpp
+  - "**/worldfactory.*"
+
+"Code: Build":
+  - build-data/**/*
+  - build-scripts/**/*
+  - "**/Makefile"
+  - "**/CMakeLists.txt"
+  - "**/*.cmake"
+
+"Crafting / Construction / Recipes":
+  - "**/recipes/**/*"
+  - data/json/construction.json
+  - data/json/construction_category.json
+  - data/json/construction_group.json
+  - data/json/deconstruction.json
+
+"Fields / Furniture / Terrain / Traps":
+  - "**/furniture**"
+
+"Items: Food / Vitamins":
+  - "**/food**"
+  - "**/comestibles**"
+
+"NPC / Factions":
+  - "**/npc**"
+
+"Melee":
+  - "**/melee**"
+  - "**/**techniques**"
+
+"Info / User Interface":
+  - "**/ui/**/*"
+  - "src/**ui**"
+  - "**/widget/**/*"
+  - "src/list_view.*"
+  - "src/surroundings_menu.*"
+
+"Items: Armor / Clothing":
+  - "**/armor/**/*"
+
+"Items: Containers":
+  - "**/**containers**"
+
+"Appliance/Power Grid":
+  - "**/appliance**"
+
+"Monsters":
+  - "**/monsters/**/*"
+
+"Mutations / Traits / Professions/ Hobbies":
+  - "**/professions.json"
+  - "**mutations**"
+  - "**hobbies**"
+
+"Lore":
+  - data/json/npcs/BG_trait_groups.json
+  - data/json/npcs/Personality_trait_groups.json
+  - data/json/npcs/personality_traits.json
+  - "**/Backgrounds/**/*"
+  - "**/snippets/**/*"
+
+"Limbs":
+  - "src/bodypart.*"
+  - "data/json/limb_scores.json"
+
+"Spawn":
+  - "**/itemgroups/**/*"
+  - "**/monstergroups/**/*"
+
+"Bionics":
+  - "**/bionics.*"
+
+"Map / Mapgen":
+  - "**/mapgen/**/*"
+  - "**/mapgen_palettes/**/*"
+  - "**/overmap/**/*"
+  - "**/overmap**"
+
+"Martial Arts":
+  - "**/martialarts**"
+
+"Player Faction Base / Camp":
+  - "src/basecamp.*"
+  - "src/faction_camp.*"
+  - data/json/mapgen/basecamps/**/*
+
+"Items: Ammo / Guns":
+  - "**/gun/**/*"
+  - "**/ammo/**/*"
+
+"SDL: Tiles / Sound":
+  - gfx/**/*
+  - sound/**/*
+
+"Scenarios":
+  - "**/scenario**"
+
+"Translation":
+  - lang/**/*
+  - "src/translation.*"
+
+"Mods: Aftershock":
+  - data/mods/Aftershock/**/*
+  - data/mods/aftershock_exoplanet/**/*
+
+"Mods: Dark Days of the Dead":
+  - data/mods/classic_zombies/**/*
+
+"Mods: Dark Skies":
+  - data/mods/Dark-Skies-Above/**/*
+
+"Mods: DinoMod":
+  - data/mods/DinoMod/**/*
+
+"Mods: Generic Guns":
+  - data/mods/Generic_Guns/**/*
+
+"Mods: MA":
+  - data/mods/MA/**/*
+
+"Mods: MMA":
+  - data/mods/MMA/**/*
+
+"Mods: Magiclysm":
+  - data/mods/Magiclysm/**/*
+
+"Mods: Innawood 🌲":
+  - data/mods/innawood/**/*
+
+"Mods: No Hope":
+  - data/mods/No_Hope/**/*
+
+"Mods: TropiCataclysm 🌴":
+  - data/mods/TropiCataclysm/**/*
+
+"Mods: Tamable Wildlife":
+  - data/mods/Tamable_Wildlife/**/*
+
+"Mods":
+  - data/mods/**/*
+
+"Mechanics: Enchantments / Spells":
+  - "**/enchantments**"
+  - "**/spells**"
+
+"Mechanics: Weather":
+  - "**/weather**"
+
+"Vehicles":
+  - "**/vehicle**"

.github/pull_request_template.md

@@ -10,7 +10,9 @@ NOTE: Please grant permission for repository maintainers to edit your PR.  It is
 #### Summary
 Category "Brief description"
 <!-- This section should consist of exactly one line, edit the one above.
-Category must be one of these: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N. Or replace the whole line with just the word None for no changelog entry.
+1. Replace the word "Category" with one of these words: Features, Content, Interface, Mods, Balance, Bugfixes, Performance, Infrastructure, Build, I18N.
+2. Replace the text inside the quotes with a brief description of your changes.
+Or if you don't want a changelog entry, replace the whole line with just the word "None" (with no quotes).
 For more on the meaning of each category, see:
 https://github.com/CleverRaven/Cataclysm-DDA/blob/master/doc/CHANGELOG_GUIDELINES.md
 If approved and merged, your summary will be added to the project changelog:

.github/summary-labels.yml

@@ -0,0 +1,38 @@
+version: v1
+
+labels:
+  - label: "<Enhancement / Feature>"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Features +\".+\"\\s*(\n|$)"
+
+  - label: "Info / User Interface"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Interface +\".+\"\\s*(\n|$)"
+
+  - label: "Mods"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Mods +\".+\"\\s*(\n|$)"
+
+  - label: "Game: Balance"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Balance +\".+\"\\s*(\n|$)"
+
+  - label: "<Bugfix>"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Bugfixes +\".+\"\\s*(\n|$)"
+
+  - label: "Code: Performance"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Performance +\".+\"\\s*(\n|$)"
+
+  - label: "Code: Infrastructure / Style / Static Analysis"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Infrastructure +\".+\"\\s*(\n|$)"
+
+  - label: "Code: Build"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*Build +\".+\"\\s*(\n|$)"
+
+  - label: "Translation"
+    matcher:
+      body: "(\\s|^)#### Summary\\s*I18N +\".+\"\\s*(\n|$)"

.github/workflows/assign_mission_target_needs_om_special.yml

@@ -0,0 +1,12 @@
+name: Detect missions that are missing .start.assign_mission_target.om_special
+
+on: pull_request
+
+jobs:
+  run-the-tool:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+    - run: ./tools/json_tools/assign_mission_target_needs_om_special.bash 2>&1

.github/workflows/astyle.yml

@@ -41,5 +41,5 @@ jobs:
     - name: Display Corrections
       if: failure()
       run: |
-        make astyle
+        make astyle-fast
         git diff

.github/workflows/clang-tidy.yml

@@ -26,7 +26,7 @@ jobs:
         uses: fkirc/skip-duplicate-actions@master
         with:
           cancel_others: 'true'
-          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake" ]'
+          paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake", ".github/workflows/clang-tidy.yml" ]'
   build:
     needs: skip-duplicates
     if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' }}
@@ -54,6 +54,24 @@ jobs:
             gettext
     - name: prepare
       run: bash ./build-scripts/requirements.sh
+    - name: determine changed files
+      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/github-script@v5
+      with:
+        script: |
+          var fs = require('fs');
+          const response = await github.paginate(github.rest.pulls.listFiles,
+            {
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: context.issue.number,
+            }
+          );
+          const files = response.map(x => x.filename);
+          for (const path of files) {
+            console.log(path);
+          }
+          fs.writeFileSync("files_changed", files.join('\n'));
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: run clang-tidy
-      run: bash ./build-scripts/build.sh
+      run: bash ./build-scripts/clang-tidy.sh

.github/workflows/comment-commands.yml

@@ -0,0 +1,31 @@
+name: "Comment Commands"
+
+on:
+  issue_comment:
+    types:
+      - created
+
+env:
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  ISSUE_NUMBER: ${{ github.event.issue.number }}
+
+jobs:
+  confirm-bug:
+    name: Confirm bug - Comment command
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Set-up Comvent
+        uses: rytswd/[email protected]
+        id: comvent
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          config-path: .github/comment-commands.yml
+
+      - if: steps.comvent.outputs.confirm-bug != ''
+        name: Handle confirmed command - Label
+        run: |
+          gh issue edit "$ISSUE_NUMBER" --remove-label "(S1 - Need Confirmation)"
+          gh issue edit "$ISSUE_NUMBER" --add-label "(S2 - Confirmed)"