Merge pull request #644 from winterheart/credits-update

Add git-contributors.py to regenerate opensource contributors list

Descent3/credits.cpp

@@ -78,22 +78,21 @@
  */
 
 #include <cstring>
+#include <vector>
 
-#include "log.h"
-#include "pstypes.h"
-#include "crossplat.h"
-#include "ddio.h"
-#include "grtext.h"
-#include "renderer.h"
-#include "gamefont.h"
-#include "game.h"
 #include "bitmap.h"
-#include "descent.h"
-#include "mem.h"
+#include "crossplat.h"
 #include "d3music.h"
+#include "ddio.h"
+#include "descent.h"
+#include "game.h"
+#include "gamefont.h"
+#include "grtext.h"
 #include "hlsoundlib.h"
+#include "log.h"
 #include "pserror.h"
 #include "psrand.h"
+#include "renderer.h"
 
 /*
 $$TABLE_GAMEFILE "GameCredits.txt"
@@ -103,6 +102,11 @@ $$TABLE_GAMEFILE "credits.omf"
 // music regions for credits
 #define CREDITS1_MUSIC_REGION 0
 
+// Speed of scrolling
+#define CREDIT_PIXELS_PER_SECOND 22
+
+#define MAX_CREDIT_LEN 200
+
 // other stuff
 #define CLTYPE_HEADING 0
 #define CLTYPE_TEXT 1
@@ -110,25 +114,21 @@ $$TABLE_GAMEFILE "credits.omf"
 #define CLTYPE_BLANK 3
 
 struct creditline {
-  ddgr_color color;
-  uint8_t type;
-  char *text;
-  creditline *next;
-  uint16_t startx, starty, endx, endy;
-  float displaytime;
+  ddgr_color color{};
+  uint8_t type{};
+  std::string text;
+  uint16_t startx{};
+  uint16_t starty{};
+  uint16_t endx{};
+  uint16_t endy{};
+  float displaytime{};
 };
 
-static void Credits_Render(creditline *, float);
-static creditline Creditlines;
-
-static ddgr_color CreditTextColor, CreditHeadingColor;
-static int CreditStartX, CreditStartY, CreditEndX, CreditEndY;
-static float CreditDisplayTime;
 static chunked_bitmap Credits_bm;
 
-#define MAX_CREDIT_LEN 200
+void Credits_Render(std::vector<creditline>::iterator credit, std::vector<creditline>::iterator end, float pixels_in);
 
-static bool Credits_IsKeyPressed(void) {
+static bool Credits_IsKeyPressed() {
   if (ddio_KeyInKey())
     return true;
 
@@ -137,175 +137,107 @@ static bool Credits_IsKeyPressed(void) {
 
 // Parses a credit line
 // Returns 1 if new text was read, else 0
-static int Credits_ParseLine(char *line, creditline *credit) {
-  int line_len = strlen(line);
-  int new_text = 0;
-
-  if (line_len < 1) {
-    ASSERT(credit->next == NULL);
-    ASSERT(credit->text == NULL);
-
-    credit->text = NULL;
-
-    credit->type = CLTYPE_BLANK;
-    new_text = 1;
-
-  } else if (line[0] == ';') // Comment
-    return 0;
-  else if (line[0] == '*') // Movement data
-  {
-    int x1, x2, y1, y2;
-    float timedelay;
-
-    int num_found = sscanf(line, "*%d %d %d %d %f", &x1, &y1, &x2, &y2, &timedelay);
-    if (num_found != 5) {
-      LOG_WARNING.printf("Bad movement data in credit text (%s)", line);
-      return 0;
-    } else {
-      CreditStartX = x1;
-      CreditStartY = y1;
-      CreditEndX = x2;
-      CreditEndY = y2;
-      CreditDisplayTime = timedelay;
-    }
-
-  } else if (line[0] == '!') // Heading
-  {
-    ASSERT(credit->next == NULL);
-    ASSERT(credit->text == NULL);
-
-    credit->text = (char *)mem_malloc(line_len + 1);
-    ASSERT(credit->text);
-
-    strcpy(credit->text, &line[1]);
-    credit->startx = CreditStartX;
-    credit->starty = CreditStartY;
-    credit->endx = CreditEndX;
-    credit->endy = CreditEndY;
-    credit->displaytime = CreditDisplayTime;
-    LOG_DEBUG.printf("Read header %s", line);
-
-    credit->color = CreditHeadingColor;
-    credit->type = CLTYPE_HEADING;
-    new_text = 1;
-
-  } else if (line[0] == '$') // text color
-  {
-    int r, g, b;
-    int num_found = sscanf(line, "$%d %d %d", &r, &g, &b);
-    if (num_found != 3) {
-      LOG_WARNING.printf("Bad color in credit text (%s)", line);
-      return 0;
-    } else {
-      CreditTextColor = GR_RGB(r, g, b);
-    }
-
-  } else if (line[0] == '^') // heading color
-  {
-    int r, g, b;
-    int num_found = sscanf(line, "^%d %d %d", &r, &g, &b);
-    if (num_found != 3) {
-      LOG_WARNING.printf("Bad color in credit text (%s)", line);
-      return 0;
-    } else {
-      CreditHeadingColor = GR_RGB(r, g, b);
-    }
-
-  } else {
-    ASSERT(credit->next == NULL);
-    ASSERT(credit->text == NULL);
-
-    if (!strnicmp("Jason Leighton", line, 14) && (ps_rand() % 100) == 0) {
-      strcat(line, " (Hi mom!)");
-      line_len += 10;
-    }
-
-    credit->text = (char *)mem_malloc(line_len + 1);
-    ASSERT(credit->text);
-
-    strcpy(credit->text, line);
-    credit->color = CreditTextColor;
-    credit->type = CLTYPE_TEXT;
-    // mprintf(0,"Read textline %s\n",line);
-    new_text = 1;
-  }
-
-  return new_text;
-}
-
-// Given a filename, attempts to load that filename as credit text
-static bool Credits_LoadCredits(const char *filename) {
-  CFILE *infile;
+static bool Credits_LoadCredits(const char *filename, std::vector<creditline> &credit_lines) {
   char curline[MAX_CREDIT_LEN];
 
   // Reset our data
-  CreditTextColor = GR_RGB(0, 128, 255);
-  CreditHeadingColor = GR_RGB(255, 255, 255);
-  CreditStartX = CreditEndX = 320;
-  CreditStartY = CreditEndY = 50;
-  CreditDisplayTime = 10;
+  ddgr_color CreditTextColor = GR_RGB(0, 128, 255);
+  ddgr_color CreditHeadingColor = GR_RGB(255, 255, 255);
 
-  creditline *cur_credit = &Creditlines;
-  Creditlines.next = NULL;
-  Creditlines.text = NULL;
+  creditline cur_credit;
 
   // Open the file, bail on failure
-  infile = cfopen(filename, "rt");
+  CFILE *infile = cfopen(filename, "rt");
 
   if (!infile) {
     LOG_ERROR << "Couldn't open credit file to read credits!";
     return false;
   }
 
-  for (int i = 0; i < 27; i++) {
-    // Generate blank lines for the start
-    cur_credit->text = NULL;
-    cur_credit->type = CLTYPE_BLANK;
-    cur_credit->next = mem_rmalloc<creditline>();
-    ASSERT(cur_credit->next);
-    cur_credit = cur_credit->next;
-    cur_credit->next = NULL;
-    cur_credit->text = NULL;
-  }
-
   // Read in each line of the credit file, allocing memory and putting it into a correct category
-  int done = 0;
-  while (!done) {
-    if (cfeof(infile)) {
-      done = 1;
-      continue;
-    }
-
-    // Read a line and parse it
+  while (!cfeof(infile)) {
     cf_ReadString(curline, MAX_CREDIT_LEN, infile);
-    // mprintf(0,"Read string %s\n",curline);
-
-    if (!strnicmp("END", curline, 3)) {
-      done = 1;
-      continue;
+    if (strnicmp("END", curline, 3) == 0) {
+      // End of credits, don't parse file further.
+      break;
     }
 
-    if (Credits_ParseLine(curline, cur_credit)) {
-      // Make a new line
-      cur_credit->next = mem_rmalloc<creditline>();
-      ASSERT(cur_credit->next);
-      cur_credit = cur_credit->next;
-      cur_credit->next = NULL;
-      cur_credit->text = NULL;
+    size_t line_len = strlen(curline);
+
+    if (line_len < 1) {
+      cur_credit.type = CLTYPE_BLANK;
+      cur_credit.text = "";
+      credit_lines.push_back(cur_credit);
+    } else {
+      int num_found;
+      int r, g, b;
+      switch (curline[0]) {
+      case ';':
+        // Comment
+        break;
+      case '*':
+        // Movement data
+        int x1, x2, y1, y2;
+        float timedelay;
+
+        num_found = sscanf(curline, "*%d %d %d %d %f", &x1, &y1, &x2, &y2, &timedelay);
+        if (num_found != 5) {
+          LOG_WARNING.printf("Bad movement data in credit text (%s)", curline);
+          break;
+        } else {
+          cur_credit.startx = x1;
+          cur_credit.starty = y1;
+          cur_credit.endx = x2;
+          cur_credit.endy = y2;
+          cur_credit.displaytime = timedelay;
         }
+        break;
+      case '!':
+        // Heading
+        cur_credit.text = &curline[1];
+        LOG_DEBUG.printf("Read header %s", curline);
+        cur_credit.color = CreditHeadingColor;
+        cur_credit.type = CLTYPE_HEADING;
+        credit_lines.push_back(cur_credit);
+        break;
+      case '$':
+        // Text color
+        num_found = sscanf(curline, "$%d %d %d", &r, &g, &b);
+        if (num_found != 3) {
+          LOG_WARNING.printf("Bad color in credit text (%s)", curline);
+          break;
+        } else {
+          CreditTextColor = GR_RGB(r, g, b);
+        }
+        break;
+      case '^':
+        // Heading color
+        num_found = sscanf(curline, "^%d %d %d", &r, &g, &b);
+        if (num_found != 3) {
+          LOG_WARNING.printf("Bad color in credit text (%s)", curline);
+          break;
+        } else {
+          CreditHeadingColor = GR_RGB(r, g, b);
+        }
+        break;
+      default:
+        if (!strnicmp("Jason Leighton", curline, 14) && (ps_rand() % 100) == 0) {
+          strcat(curline, " (Hi mom!)");
         }
 
-  cur_credit->type = CLTYPE_END;
+        cur_credit.text = curline;
+        cur_credit.color = CreditTextColor;
+        cur_credit.type = CLTYPE_TEXT;
+        credit_lines.push_back(cur_credit);
+      }
+    }
+  }
 
   cfclose(infile);
   return true;
 }
 
-extern void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
-
-#define CREDIT_PIXELS_PER_SECOND 22
-
-void Credits_Display(void) {
+void Credits_Display() {
 #ifdef DEMO
   // ShowStaticScreen("democredits1.ogf");
   // ShowStaticScreen("democredits2.ogf");
@@ -331,35 +263,45 @@ void Credits_Display(void) {
 
   LOG_INFO << "Chillin in credits";
 
-  // Load our credits
-  if (!Credits_LoadCredits("GameCredits.txt")) {
-    LOG_WARNING << "There was an error loading game credits!";
-  } else {
-    // First count how many headers there are so we know how many to allocate
-    int count = 0;
-    int done = 0;
-    creditline *credit = &Creditlines;
+  std::vector<creditline> credit_lines;
 
-    while (!done) {
-      if (credit->type != CLTYPE_END)
-        count++;
-      credit = credit->next;
-      if (!credit || credit->type == CLTYPE_END)
-        done = 1;
+  // Generate blank lines for the start
+  creditline cur_credit;
+  cur_credit.type = CLTYPE_BLANK;
+  for (int i = 0; i < 27; i++) {
+    credit_lines.push_back(cur_credit);
   }
 
+  // Load our credits
+  if (!Credits_LoadCredits("gamecredits.txt", credit_lines) || !Credits_LoadCredits("oscredits.txt", credit_lines)) {
+    LOG_WARNING << "There was an error loading game credits!";
+    // Free bitmaps
+    bm_DestroyChunkedBitmap(&Credits_bm);
+
+    // end the music.
+    D3MusicStop();
+    ddio_KeyFlush();
+
+    return;
+  }
+
+  // End directive to be sure
+  cur_credit.type = CLTYPE_END;
+  cur_credit.text = "";
+  credit_lines.push_back(cur_credit);
+
+  auto credit = credit_lines.begin();
+
   int font_height = grfont_GetHeight(BIG_BRIEFING_FONT);
-    int cur_line = 0;
+
   float cur_pixel_count = 0;
   float last_time = timer_GetTime();
 
   // Now show these guys
-    done = 0;
-    credit = &Creditlines;
-    while (cur_line < count) {
+  while (credit != credit_lines.end()) {
     StartFrame(0, 0, Game_window_w, Game_window_h);
     rend_DrawChunkedBitmap(&Credits_bm, 0, 0, 255);
-      Credits_Render(credit, cur_pixel_count);
+    Credits_Render(credit, credit_lines.end(), cur_pixel_count);
     EndFrame();
     rend_Flip();
 
@@ -369,18 +311,16 @@ void Credits_Display(void) {
     cur_pixel_count += frametime * CREDIT_PIXELS_PER_SECOND;
 
     while (cur_pixel_count >= font_height) {
-        credit = credit->next;
-        cur_line++;
-        if (credit == NULL || credit->type == CLTYPE_END) {
+      credit++;
+      if (credit == credit_lines.end() || credit->type == CLTYPE_END) {
         cur_pixel_count = -1;
-          cur_line = count;
       } else {
         cur_pixel_count -= font_height;
       }
     }
 
     // Player music for this frame
-      tMusicSeqInfo music_info;
+    tMusicSeqInfo music_info{};
     Sound_system.BeginSoundFrame(false);
     music_info.frametime = frametime;
     music_info.player_dead = false;
@@ -391,25 +331,9 @@ void Credits_Display(void) {
     // Check for keys
     Descent->defer();
     if (Credits_IsKeyPressed()) {
-        cur_line = count;
+      break;
     }
   }
-  }
-
-  // Free credit text memory
-  creditline *cur_credit = &Creditlines;
-  while (cur_credit) {
-    if (cur_credit->text)
-      mem_free(cur_credit->text);
-
-    creditline *next_credit = cur_credit->next;
-
-    if (cur_credit != &Creditlines) {
-      mem_free(cur_credit);
-    }
-
-    cur_credit = next_credit;
-  }
 
   // Free bitmaps
   bm_DestroyChunkedBitmap(&Credits_bm);
@@ -417,14 +341,11 @@ void Credits_Display(void) {
   // end the music.
   D3MusicStop();
   ddio_KeyFlush();
-//	ddio_MouseReset();				// -mouse shouldn't be reset.   ui system gets hosed
-// unfortunately under NT.
 #endif
 }
 
-void Credits_Render(creditline *header, float pixels_in) {
+void Credits_Render(std::vector<creditline>::iterator credit, std::vector<creditline>::iterator end, float pixels_in) {
   bool done = false;
-  creditline *credit = header;
 
   grtext_Reset();
   grtext_SetFont(BIG_BRIEFING_FONT);
@@ -433,19 +354,16 @@ void Credits_Render(creditline *header, float pixels_in) {
 
   float pixels_this_frame = 0;
   int cur_pixel = -pixels_in;
-  int cur_line = 0;
+
   while ((pixels_this_frame < 480 + text_height) && !done) {
     if (credit->type == CLTYPE_BLANK) {
-      credit = credit->next;
-      cur_line++;
+      credit++;
 
       pixels_this_frame += text_height;
       cur_pixel += text_height;
 
-      if (credit == NULL)
-        done = 1;
-      else if (credit->type == CLTYPE_END)
-        done = 1;
+      if ((credit == end) || (credit->type == CLTYPE_END))
+        done = true;
 
       continue;
     }
@@ -453,27 +371,21 @@ void Credits_Render(creditline *header, float pixels_in) {
 
     // Figure out alpha
     if (cur_pixel < 0) {
-      float norm = 1.0 - ((-cur_pixel) / (float)text_height);
+      float norm = 1.0f - ((-cur_pixel) / (float)text_height);
       grtext_SetAlpha(norm * 255);
     } else if ((cur_pixel + text_height) > 480) {
-      float norm = 1.0 - (((cur_pixel + text_height) - 480) / (float)text_height);
+      float norm = 1.0f - (((cur_pixel + text_height) - 480) / (float)text_height);
       grtext_SetAlpha(norm * 255);
     } else
       grtext_SetAlpha(255);
 
-    // Figure out text placement
-    int texty = cur_pixel;
+    grtext_CenteredPrintf(0, cur_pixel, "%s", credit->text.c_str());
 
-    grtext_CenteredPrintf(0, texty, "%s", credit->text);
+    credit++;
 
-    credit = credit->next;
+    if ((credit == end) || (credit->type == CLTYPE_END))
+      done = true;
 
-    if (credit == NULL)
-      done = 1;
-    else if (credit->type == CLTYPE_END)
-      done = 1;
-
-    cur_line++;
     pixels_this_frame += text_height;
     cur_pixel += text_height;
   }

Descent3/credits.h

@@ -32,4 +32,4 @@
  * $NoKeywords: $
  */
 
-void Credits_Display(void);
+void Credits_Display();

Descent3/descent.cpp

@@ -381,7 +381,6 @@
  * $NoKeywords: $
  */
 
-#include <algorithm>
 #include <cstdlib>
 #include <filesystem>
 #include <vector>
@@ -408,6 +407,7 @@
 #include "args.h"
 #include "multi_dll_mgr.h"
 #include "localization.h"
+#include "uisys.h"
 
 //	---------------------------------------------------------------------------
 //	Variables
@@ -434,10 +434,6 @@ std::filesystem::path Descent3_temp_directory; // temp directory to put temp fil
 //	---------------------------------------------------------------------------
 // #define BETA
 
-#if (defined(OEM) || defined(DEMO))
-void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
-#endif
-
 char Proxy_server[200] = "";
 int16_t Proxy_port = 80;
 
@@ -597,10 +593,8 @@ void MainLoop() {
   SetScreenMode(SM_NULL);
 }
 
-#if (defined(OEM) || defined(DEMO) || defined(RELEASE))
 // Shows a fullscreen static bitmap
-void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
-  extern void ui_SetScreenMode(int w, int h);
+void ShowStaticScreen(const char *bitmap_filename, bool timed, float delay_time) {
   chunked_bitmap splash_bm;
 
   // do splash screen on release
@@ -615,7 +609,7 @@ void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
 
     bm_FreeBitmap(bm_handle);
     float start_time = timer_GetTime();
-    while (1) {
+    while (true) {
       StartFrame();
 
       rend_DrawChunkedBitmap(&splash_bm, 0, 0, 255);
@@ -646,7 +640,6 @@ void ShowStaticScreen(char *bitmap_filename, bool timed, float delay_time) {
 
   ui_SetScreenMode(Max_window_w, Max_window_h);
 }
-#endif
 
 //	---------------------------------------------------------------------------
 //	Accessor functions

Descent3/descent.h

@@ -212,6 +212,9 @@ void D3DeferHandler(bool is_active);
 void SetFunctionMode(function_mode mode);
 function_mode GetFunctionMode();
 
+// Shows a fullscreen static bitmap
+void ShowStaticScreen(const char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
+
 #ifndef RELEASE
 //	this is called when you hit a debug break!
 void D3DebugStopHandler();

Descent3/init.cpp

@@ -1722,9 +1722,6 @@ void InitMessage(const char *c, float progress) {
 }
 
 //////////////////////////////////////////////////////////////////////////////
-#if (defined(OEM) || defined(DEMO) || defined(RELEASE))
-void ShowStaticScreen(char *bitmap_filename, bool timed = false, float delay_time = 0.0f);
-#endif
 
 void IntroScreen() {
 // #if (defined(OEM) || defined(DEMO) )

scripts/data/fullhog/d3-linux-fullhog.txt

@@ -54,6 +54,7 @@ LEVELS2.str
 pxomain.ogf
 pxogame.ogf
 gamecredits.txt
+oscredits.txt
 loki.ogf
 aigame2.so
 AIGame3.so

scripts/data/fullhog/d3-osx-fullhog.txt

@@ -54,6 +54,7 @@ LEVELS2.str
 pxomain.ogf
 pxogame.ogf
 gamecredits.txt
+oscredits.txt
 loki.ogf
 aigame2.dylib
 AIGame3.dylib

scripts/data/fullhog/d3-win-fullhog.txt

@@ -54,6 +54,7 @@ LEVELS2.str
 pxomain.ogf
 pxogame.ogf
 gamecredits.txt
+oscredits.txt
 loki.ogf
 aigame2.dll
 AIGame3.dll

scripts/data/fullhog/oscredits.txt

@@ -0,0 +1,48 @@
+; This file was autogenerated by git-contributors.py
+
+
+*320 100 320 100 8
+!OPEN SOURCE CONTRIBUTORS
+
+https://github.com/DescentDevelopers/Descent3
+
+Andrew Grigorev
+Azamat H. Hackimov
+Bernhard M. Wiedemann
+Bryan Perris
+C.W. "Madd The Sane" Betts
+Chris Sarbora
+Christian Baumann
+Dan Raviv
+Daniel Gibson
+Edu Garcia
+Eric Slutz
+GravisZro
+InsanityBringer
+Jacob Coby
+Jan Engelhardt
+Jason Yundt
+Jeff Slutter
+JeodC
+Kevin Bentley
+Kevin Caccamo
+Kreeblah
+Louis Gombert
+Martin
+Matt Stephenson
+Oskar Strengbohm
+Peter Simard
+Phil Ashby
+Ryan C. Gordon
+Sebastian Holtermann
+Taylor Richards
+Thomas Otto
+Thomas Ross	
+bperris
+scivision
+sirken
+thfrwn
+vlohacks
+ziplantil
+
+END

tools/git-contributors/README.md

@@ -0,0 +1,24 @@
+# git-contributors.py
+
+**git-contributors.py** - script to generate contributors list from git history.
+
+## Requirements
+
+* Recent python (3.12+)
+* GitPython package (https://pypi.org/project/GitPython/)
+
+## Usage
+
+Just run `git-contributors.py`, review and commit `scripts/data/fullhog/oscredits.txt`.
+You're now awesome.
+
+**Remember regenerate file before releasing new version!**
+
+## Customization
+
+Tool provides two ways of customization:
+
+* Exclude particular name from list of contributors (file `no-add.txt`,
+  one name per line, comments begins with `#`).
+* Replace name in list of contributors with other one (file `map-names.txt`,
+  one entry per line in format `git_name:replace_name`, comments begins with `#`).

tools/git-contributors/git-contributors.py

@@ -0,0 +1,83 @@
+#!/usr/bin/python3
+
+# Descent 3
+# Copyright (C) 2024 Descent Developers
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from git import Repo
+import argparse
+import re
+
+
+def strip_comments(code):
+    code = str(code)
+    return re.sub(r'(#.*)?\n?', '', code)
+
+
+def main():
+    parser = argparse.ArgumentParser(
+        prog="git-contributors.py",
+        description="Script to generate contributors list from git history.",
+    )
+    parser.add_argument(
+        "--output", "-o",
+        required=False,
+        default="../../scripts/data/fullhog/oscredits.txt",
+        help="output file",
+    )
+    args = parser.parse_args()
+
+    noadds = list()
+    name_maps = dict()
+    with open("no-add.txt") as noadd_file:
+        for line in noadd_file:
+            name = strip_comments(line)
+            noadds.append(name.strip())
+    with open("map-names.txt") as map_file:
+        for line in map_file:
+            (git_name, replace_name) = strip_comments(line.strip()).split(":")
+            name_maps.update({git_name: replace_name})
+
+    repo = Repo(search_parent_directories=True)
+    commits = list(repo.iter_commits("main"))
+    authors = set()
+
+    for commit in commits:
+        if commit.author.name not in noadds:
+            if commit.author.name in name_maps.keys():
+                authors.add(name_maps[commit.author.name])
+            else:
+                authors.add(commit.author.name)
+
+    with open(args.output, "w") as result_file:
+        result_file.write("; This file was autogenerated by git-contributors.py\n")
+        result_file.write("\n")
+        result_file.write("\n")
+        result_file.write("*320 100 320 100 8\n")
+        result_file.write("!OPEN SOURCE CONTRIBUTORS\n")
+        result_file.write("\n")
+        result_file.write("https://github.com/DescentDevelopers/Descent3\n")
+        result_file.write("\n")
+
+        for author in sorted(authors):
+            result_file.write(f"{author}\n")
+
+        result_file.write("\n")
+        result_file.write("END\n")
+    print("All done!")
+
+
+if __name__ == "__main__":
+    main()

tools/git-contributors/map-names.txt

@@ -0,0 +1,2 @@
+C.W. Betts:C.W. "Madd The Sane" Betts
+Thomas Roß:Thomas Ross	# No ß in current font

tools/git-contributors/no-add.txt

@@ -0,0 +1,2 @@
+Edu García # Superseded by 'Edu Garcia'
+Jeod # Superseded by 'JeodC'