Merge branch 'master' into Jibauni

Author: TheGiraffe3

.github/workflows/cd.yaml

@@ -28,7 +28,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev fuse
+          sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libfuse2
       - name: Setup sccache
         uses: ./.github/sccache
       - name: Adjust version strings

.github/workflows/cd_release.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev fuse
+          sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libfuse2
       - name: Setup sccache
         uses: ./.github/sccache
       - uses: lukka/get-cmake@latest

.github/workflows/ci.yml

@@ -56,7 +56,7 @@ jobs:
     - name: Install development dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libosmesa6 mesa-utils libglvnd-dev x11-utils
+        sudo apt-get install -y --no-install-recommends libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libgles2-mesa-dev libwayland-dev libxkbcommon-dev libegl1-mesa-dev libosmesa6 mesa-utils libglvnd-dev x11-utils catch2
     - name: Disable VM sound card
       run: |
         sudo sh -c 'echo "pcm.!default { type plug slave.pcm \"null\" }"  >> /etc/asound.conf'

CMakeLists.txt

@@ -14,8 +14,8 @@ cmake_dependent_option(ES_CREATE_BUNDLE "Create a Bundle instead of an executabl
 # Support Debug and Release configurations.
 set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" CACHE STRING "" FORCE)
 
-# Use C++17 without any compiler specific extensions.
-set(CMAKE_CXX_STANDARD 17 CACHE STRING "")
+# Use C++20 without any compiler specific extensions.
+set(CMAKE_CXX_STANDARD 20 CACHE STRING "")
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 # Use LTO for Release builds only.
@@ -109,6 +109,16 @@ add_subdirectory(source)
 add_library(ExternalLibraries INTERFACE)
 target_link_libraries(EndlessSkyLib PUBLIC ExternalLibraries)
 
+# Enable sanitizers on debug builds, depending on platform support.
+if(NOT WIN32)
+	set(SANITIZER_OPTS "-g" "-fsanitize=address,undefined,pointer-compare,pointer-subtract,unreachable,builtin,integer-divide-by-zero,vla-bound,null,return,signed-integer-overflow,bounds,alignment,bool,enum,pointer-overflow")
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+		list(APPEND SANITIZER_OPTS "-fno-omit-frame-pointer" "-fsanitize=leak,vptr")
+	endif()
+endif()
+target_compile_options(EndlessSkyLib PUBLIC $<$<CONFIG:Debug>:${SANITIZER_OPTS}>)
+target_link_options(EndlessSkyLib PUBLIC $<$<CONFIG:Debug>:${SANITIZER_OPTS}>)
+
 # The 'mingw32' lib needs to be linked first.
 if(MINGW)
 	target_link_libraries(ExternalLibraries INTERFACE mingw32)

SConstruct

@@ -60,7 +60,7 @@ Help(opts.GenerateHelpText(env))
 #   $ CXXFLAGS=-msse3 scons
 #   $ CXXFLAGS=-march=native scons
 # or modify the `flags` variable:
-flags = ["-std=c++17", "-Wall", "-pedantic-errors", "-Wold-style-cast", "-fno-rtti"]
+flags = ["-std=c++20", "-Wall", "-pedantic-errors", "-Wold-style-cast", "-fno-rtti"]
 if env["mode"] != "debug":
 	flags += ["-Werror", "-O3", "-flto"]
 	env.Append(LINKFLAGS = ["-O3", "-flto"])

copyright

@@ -2769,12 +2769,15 @@ Comment: Derived from works by Michael Zahniser (under the same license).
 Files:
  images/_menu/haze-dark-nebula*
  images/effect/incipias?flare/*
+ images/effect/horizon?grappler*
  images/effect/plasma?exhaust*
  images/effect/plasma?particle*
  images/effect/stagnation?beam?impact*
  images/effect/star?tail*
+ images/hardpoint/horizon?grappler*
  images/hardpoint/stagnation?beam*
  images/outfit/gas?class?shield*
+ images/outfit/horizon?grappler*
  images/outfit/liquid?class?shield*
  images/outfit/metallic?hydrogen?cell*
  images/outfit/mh?*

data/_ui/tooltips.txt

@@ -1303,6 +1303,9 @@ tip "Fleet: Gather around me"
 	`Command your fleet to gather around your flagship. If only some escorts are selected, only sends the command to those escorts. You can also command escorts to gather around another ship by right clicking on a friendly ship.`
 	`With <shift>, change the formation pattern in your fleet.`
 
+tip "Fleet: Toggle hold fire"
+	`Command your fleet to stop firing except if they are given a specific target to shoot at afterwards. If only some escorts are selected, only sends the command to those escorts.`
+
 tip "Fleet: Hold position"
 	`Command your fleet to hold its current position. If only some escorts are selected, only sends the command to those escorts. This command can also be sent by right clicking on empty space.`
 

data/gamerules.txt

@@ -24,9 +24,9 @@ gamerules
 	"universal ramscoop" true
 
 	# An attempt to spawn a person ship happens on average every this many frames.
-	# DEFAULT: 36000 frames (ten minutes)
+	# DEFAULT: 72000 frames (twenty minutes)
 	# ALLOWABLE VALUES: any integer >= 1
-	"person spawn period" 36000
+	"person spawn period" 72000
 
 	# While an attempt to spawn a person ship is made on average every number of frames specified
 	# above, a person ship may still not spawn. Each person ship has a "weight" associated with them

data/gegno/gegno I corroboration.txt

@@ -249,6 +249,7 @@ mission "Battle over Zydee"
 			`	However, a few moments later, the Scin suddenly start scurrying to their ships. Based on your experiences so far, you haven't gotten close enough to alarm them. They begin taking off one by one in a hurried fashion, but not toward you - the <ship>'s sensors suddenly begin picking up a large Gegno Vi fleet entering the system. It appears that this place is turning into a battlefield, and getting caught up in the middle of it is likely something you should avoid.`
 				accept
 	on enter "Kneirc"
+		event "gegno: vi occupy zydee" 1 3
 		fail
 
 	npc
@@ -313,6 +314,21 @@ mission "Battle over Zydee"
 				"Coesite" 4
 				"Halite" 6
 
+# Zydee becomes occupied by the Vi even if the player doesn't find the above mission.
+mission "Vi Occupy Zydee"
+	invisible
+	landing
+	to offer
+		or
+			has "Gegno Anticipation: offered"
+			has "Gegno Apprehension: offered"
+		not "event: gegno: vi occupy zydee"
+		not "Gegno Genocide Defense: offered"
+	to complete
+		never
+	on offer
+		fail
+		event "gegno: vi occupy zydee" 1 3
 
 mission "Curious Civilians"
 	invisible
@@ -420,7 +436,7 @@ mission "Gegno Suspicions"
 				decline
 
 	on decline
-		event "gegno: quarg talks" 11
+		event "gegno: quarg talks" 8
 
 
 mission "Under the Nose"
@@ -548,7 +564,6 @@ mission "Return to Giaru Gegno"
 		not "Gegno Genocide Defense: offered"
 	on enter
 		dialog `Upon departure from <origin>, you receive an incoming message. "Greetings, human <first> <last>. This message is from Adrauni. Return to <planet> at the first opportunity given to you."`
-			accept
 	on complete
 		fail "Scin Surveillance"
 		fail "Veering Vi A"

data/gegno/gegno events.txt

@@ -29,6 +29,28 @@ event "gegno: quarg talks"
 event "gegno: apprehension"
 
 
+event "gegno: vi occupy zydee"
+	system "Vesvii"
+		fleet "Scin Warfleet" 2700
+		fleet "Vi Warfleet" 2400
+	system "Kneirc"
+		government "Gegno Vi"
+		attributes "gegno" "vi"
+		fleet "Small Vi" 1400
+		fleet "Vi Warfleet" 3300
+		fleet "Small Scin" 1900
+		fleet "Scin Warfleet" 3000
+	planet "Zydee"
+		attributes "gegno" "vi" "moon"
+		description `There is evidence that the nearby Gegno Scin have attempted to establish a presence on this barren moon in the form of several partially-constructed buildings and landing zones scattered about the surface. In recent times, however, the opposing Gegno Vi have fielded their own forces to take control of the system, and have begun a number of operations to convert existing infrastructure and set up posts of their own, claiming the moon in their name.`
+		spaceport `The Vi have made makeshift landing zones and outposts, such as this one, for the group of warriors they've distributed across the moon. Although their numbers are no more than than that of a small village, those who are present have accomplished a considerable amount during their time on the surface while the fleets above defend them.`
+		government "Gegno Vi"
+		"required reputation" 1
+	planet "Ghneoe"
+		description `Ghneoe's orbital period is dominated by a very long dry season due to the binary stars at the system's center. However, during a short portion of the year, Ghneoe experiences an intense water cycle that results in a boom of greenery and wildlife activity, developing a short-lived but flourishing ecosystem. Much of the flora and fauna have adapted to such drastic shifts in climate, and return to a dormant state once the intense heat cycle returns.`
+		description `	Unlike its moon, Ghneoe sees little to no colonization efforts from either the Gegno Vi or Scin, perhaps due to the abnormal weather cycles, continued system warfare, or a combination of both.`
+
+
 event "gegno: unified defense"
 	government "Gegno Vi"
 		"attitude toward"