From 6cb4b71311b03f6231f6a4c8082377236829d518 Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:10:15 -0500 Subject: [PATCH 01/11] Add government --- data/governments.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/data/governments.txt b/data/governments.txt index ba5748daaea9..be4c8b97a829 100644 --- a/data/governments.txt +++ b/data/governments.txt @@ -264,6 +264,7 @@ government "Free Worlds" "player reputation" 1 "attitude toward" "Alpha" -.4 + "Free Worlds (Anti-Pug)" 1 "Free Worlds that won't enter wormhole" 1 "Merchant" .3 "Militia" .3 @@ -276,6 +277,27 @@ government "Free Worlds" "hostile hail" "hostile free worlds" raid "pirate raid" +government "Free Worlds (Anti-Pug)" + "display name" "Free Worlds" + swizzle 2 + color "governments: Free" + + "player reputation" 1 + "attitude toward" + "Free Worlds" 1 + "Free Worlds that won't enter wormhole" 1 + "Merchant" .3 + "Militia" .3 + "Pirate" -.4 + "Pirate (Devil-Run Gang)" -.4 + "Pug" -.01 + "Smuggler (Hai Trafficker)" .05 + "Neutral" .1 + "bribe" .1 + "friendly hail" "friendly free worlds" + "hostile hail" "hostile free worlds" + "raid" "pirate raid" + government "Free Worlds that won't enter wormhole" "display name" "Free Worlds" swizzle 2 @@ -284,6 +306,7 @@ government "Free Worlds that won't enter wormhole" "player reputation" 1 "attitude toward" "Free Worlds" 1 + "Free Worlds (Anti-Pug)" 1 "Merchant" .3 "Militia" .3 "Pirate" -.4 From b551613e9919f73b3db33e8c94e8c950b4c06a6a Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:12:45 -0500 Subject: [PATCH 02/11] Not yet --- data/governments.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/data/governments.txt b/data/governments.txt index be4c8b97a829..a950692febcb 100644 --- a/data/governments.txt +++ b/data/governments.txt @@ -290,7 +290,6 @@ government "Free Worlds (Anti-Pug)" "Militia" .3 "Pirate" -.4 "Pirate (Devil-Run Gang)" -.4 - "Pug" -.01 "Smuggler (Hai Trafficker)" .05 "Neutral" .1 "bribe" .1 From 52a25badbb87db3ca1fa757a1acdde1fc49ab5ca Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:21:51 -0500 Subject: [PATCH 03/11] Escort defence --- data/human/campaign events.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/data/human/campaign events.txt b/data/human/campaign events.txt index 2107cb1856a0..668adee1b368 100644 --- a/data/human/campaign events.txt +++ b/data/human/campaign events.txt @@ -2701,6 +2701,8 @@ event "fwc pug invasion" government "Pug" "attitude toward" "Free Worlds" -.01 + "Free Worlds (Anti-Pug)" -.01 + system "Zeta Aquilae" government "Pug" fleet "Small Southern Merchants" 1000 @@ -2786,12 +2788,16 @@ event "fwc pug peaceful" government "Pug" "attitude toward" "Free Worlds" 0 + "Free Worlds (Anti-Pug)" 0 event "fwc navy retakes cebalrai" unvisit "Cebalrai" unvisit "Menkent" + government "Free Worlds (Anti-Pug)" + "attitude toward" + "Pug" -.01 system "Cebalrai" government "Republic" fleet "Small Southern Merchants" 1000 @@ -2871,8 +2877,6 @@ event "fwc defend oblivion" "attitude toward" "Free Worlds" -.01 - - event "fwc battle for rasalhague" link "Rasalhague" "Cebalrai" system "Rasalhague" From d829907cfbd441513f44e88870798c2c95cd49e8 Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Mon, 22 Jan 2024 13:22:11 -0500 Subject: [PATCH 04/11] Switch government --- data/human/free worlds 3 checkmate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/human/free worlds 3 checkmate.txt b/data/human/free worlds 3 checkmate.txt index d4f6a4d021cf..bc2e168fb2a3 100644 --- a/data/human/free worlds 3 checkmate.txt +++ b/data/human/free worlds 3 checkmate.txt @@ -986,7 +986,7 @@ mission "FWC Checkmate Escorts" has "FWC Pug 4: done" npc kill - government "Free Worlds" + government "Free Worlds (Anti-Pug)" personality heroic escort disables fleet names "free worlds capital" From e46f3cf82c55da649ab8dddcef4759625bed39c1 Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:51:28 -0500 Subject: [PATCH 05/11] switch to escort government pt 1 --- data/human/campaign events.txt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/human/campaign events.txt b/data/human/campaign events.txt index 668adee1b368..0dec16fb9379 100644 --- a/data/human/campaign events.txt +++ b/data/human/campaign events.txt @@ -2700,9 +2700,7 @@ event "fwc pug invasion" "tribute: Furnace" /= 1200 government "Pug" "attitude toward" - "Free Worlds" -.01 - "Free Worlds (Anti-Pug)" -.01 - + "Free Worlds" -.01 system "Zeta Aquilae" government "Pug" fleet "Small Southern Merchants" 1000 @@ -2788,16 +2786,11 @@ event "fwc pug peaceful" government "Pug" "attitude toward" "Free Worlds" 0 - "Free Worlds (Anti-Pug)" 0 - event "fwc navy retakes cebalrai" unvisit "Cebalrai" unvisit "Menkent" - government "Free Worlds (Anti-Pug)" - "attitude toward" - "Pug" -.01 system "Cebalrai" government "Republic" fleet "Small Southern Merchants" 1000 From 2563581444cd6302b87f38d1f378c97dd353130d Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:52:23 -0500 Subject: [PATCH 06/11] more trailing whitespace --- data/human/campaign events.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/human/campaign events.txt b/data/human/campaign events.txt index 0dec16fb9379..8cb7c1ac2e8c 100644 --- a/data/human/campaign events.txt +++ b/data/human/campaign events.txt @@ -2700,7 +2700,7 @@ event "fwc pug invasion" "tribute: Furnace" /= 1200 government "Pug" "attitude toward" - "Free Worlds" -.01 + "Free Worlds" -.01 system "Zeta Aquilae" government "Pug" fleet "Small Southern Merchants" 1000 From b80ddb6265936a8b2235f82f575bd0177e2f82a5 Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:52:56 -0500 Subject: [PATCH 07/11] switch to escort government pt 2 --- data/governments.txt | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/data/governments.txt b/data/governments.txt index a950692febcb..c5cd982f0669 100644 --- a/data/governments.txt +++ b/data/governments.txt @@ -264,7 +264,6 @@ government "Free Worlds" "player reputation" 1 "attitude toward" "Alpha" -.4 - "Free Worlds (Anti-Pug)" 1 "Free Worlds that won't enter wormhole" 1 "Merchant" .3 "Militia" .3 @@ -277,26 +276,6 @@ government "Free Worlds" "hostile hail" "hostile free worlds" raid "pirate raid" -government "Free Worlds (Anti-Pug)" - "display name" "Free Worlds" - swizzle 2 - color "governments: Free" - - "player reputation" 1 - "attitude toward" - "Free Worlds" 1 - "Free Worlds that won't enter wormhole" 1 - "Merchant" .3 - "Militia" .3 - "Pirate" -.4 - "Pirate (Devil-Run Gang)" -.4 - "Smuggler (Hai Trafficker)" .05 - "Neutral" .1 - "bribe" .1 - "friendly hail" "friendly free worlds" - "hostile hail" "hostile free worlds" - "raid" "pirate raid" - government "Free Worlds that won't enter wormhole" "display name" "Free Worlds" swizzle 2 From bada96bfee7ac7b5f6d3f675d1bb3d89e1f3b021 Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:53:23 -0500 Subject: [PATCH 08/11] escort that won't enter wormhole --- data/governments.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/data/governments.txt b/data/governments.txt index c5cd982f0669..ba5748daaea9 100644 --- a/data/governments.txt +++ b/data/governments.txt @@ -284,7 +284,6 @@ government "Free Worlds that won't enter wormhole" "player reputation" 1 "attitude toward" "Free Worlds" 1 - "Free Worlds (Anti-Pug)" 1 "Merchant" .3 "Militia" .3 "Pirate" -.4 From c7d12a9965049e3e08db733b176131bf69846fbf Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:53:51 -0500 Subject: [PATCH 09/11] switch to escort government pt 3 --- data/human/free worlds 3 checkmate.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/human/free worlds 3 checkmate.txt b/data/human/free worlds 3 checkmate.txt index bc2e168fb2a3..801c0b01629d 100644 --- a/data/human/free worlds 3 checkmate.txt +++ b/data/human/free worlds 3 checkmate.txt @@ -986,7 +986,7 @@ mission "FWC Checkmate Escorts" has "FWC Pug 4: done" npc kill - government "Free Worlds (Anti-Pug)" + government "Escort" personality heroic escort disables fleet names "free worlds capital" From cc6edefedc8b13c427b02b9cf8e29800be74874b Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:54:23 -0500 Subject: [PATCH 10/11] preserve original newline count --- data/human/campaign events.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/human/campaign events.txt b/data/human/campaign events.txt index 8cb7c1ac2e8c..beb93e376dec 100644 --- a/data/human/campaign events.txt +++ b/data/human/campaign events.txt @@ -2788,6 +2788,7 @@ event "fwc pug peaceful" "Free Worlds" 0 + event "fwc navy retakes cebalrai" unvisit "Cebalrai" unvisit "Menkent" @@ -2881,6 +2882,8 @@ event "fwc battle for rasalhague" + + event "fwc liberation of rasalhague" "tribute: Oblivion" *= 500 system "Rasalhague" From 791df885c4747f4d51fba02308c3da20d5c340af Mon Sep 17 00:00:00 2001 From: ziproot <109186806+ziproot@users.noreply.github.com> Date: Tue, 23 Jan 2024 19:54:47 -0500 Subject: [PATCH 11/11] I said preserve original newline count --- data/human/campaign events.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/human/campaign events.txt b/data/human/campaign events.txt index beb93e376dec..2107cb1856a0 100644 --- a/data/human/campaign events.txt +++ b/data/human/campaign events.txt @@ -2871,6 +2871,8 @@ event "fwc defend oblivion" "attitude toward" "Free Worlds" -.01 + + event "fwc battle for rasalhague" link "Rasalhague" "Cebalrai" system "Rasalhague" @@ -2882,8 +2884,6 @@ event "fwc battle for rasalhague" - - event "fwc liberation of rasalhague" "tribute: Oblivion" *= 500 system "Rasalhague"