Merge main into mercenary prologue (#30)

Co-authored-by: Loymdayddaud <145969603+TheGiraffe3@users.noreply.github.com>
Co-authored-by: ziproot <109186806+ziproot@users.noreply.github.com>

Author: 3 people

.github/workflows/check.yml

@@ -1,6 +1,9 @@
 name: Check
 on:
+  pull_request:
   push:
+    branches:
+      - main
   workflow_dispatch:
 
 concurrency:

.github/workflows/ci.yml

@@ -1,7 +1,10 @@
 name: Continuous Integration
 
 on:
+  pull_request:
   push:
+    branches:
+      - main
   workflow_dispatch:
 
 concurrency:

.github/workflows/content-style.yml

@@ -1,7 +1,10 @@
 name: Content Style
 
 on:
+  pull_request:
   push:
+    branches:
+      - main
   workflow_dispatch:
 
 concurrency:

data/governments.txt

@@ -0,0 +1,33 @@
+government "Bounty (FW Disguised)"
+	"display name" "Free Worlds"
+	swizzle 2
+	color "governments: Free"
+	"player reputation" -1
+	"attitude toward"
+		"Republic Mercantile (Escort)" -0.01
+		"Merchant" -0.1
+		"Syndicate" -0.001
+		"Republic" -0.001
+	"bribe" .1
+	"fine" 0
+	"friendly hail" "friendly fw pirate"
+	"friendly disabled hail" "friendly disabled"
+	"hostile hail" "hostile pirate"
+	"hostile disabled hail" "hostile disabled pirate"
+
+government "Republic Mercantile (Escort)"
+	"display name" "Republic Mercantile"
+	swizzle 13
+	"player reputation" 1
+	"attitude toward"
+		"Pirate" -0.2
+		"Bounty (FW Disguised)" -0.2
+		"Pirate (Devil-Run Gang)" -0.2
+		"Korath" -0.2
+		"Merchant" 1
+	"bribe" .1
+	"fine" 0
+	"friendly hail" "friendly civilian"
+	"friendly disabled hail" "friendly disabled"
+	"hostile hail" "hostile civilian"
+	"hostile disabled hail" "hostile disabled"

data/phrases.txt

@@ -0,0 +1,4 @@
+phrase "friendly fw pirate"
+	phrase
+		"friendly free worlds" 2
+		"friendly pirate"