Merge branch 'develop-4.x' into master.

(cherry picked from commit aa86a6e53b)

.github/workflows/verify_changelog_change.yml

@@ -1,32 +0,0 @@
-name: Verify Changelog.md update
-
-# Controls when the workflow will run
-on:
-  # Triggers the workflow on pull request events but only for the develop branch
-  pull_request:
-    branches: [ develop ]
-
-# A workflow run is made up of one or more jobs that can run sequentially or in parallel
-jobs:
-  # This workflow contains a single job called "confirm"
-  confirm-changelog-update:
-    # The type of runner that the job will run on
-    runs-on: ubuntu-latest
-    
-    name: Verify that the PR contains an update to changelog.md
-
-    # Steps represent a sequence of tasks that will be executed as part of the job
-    steps:
-      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
-
-      - name: Get changed files
-        id: changed-files
-        uses: tj-actions/changed-files@v8.4
-        with:
-          files: |
-            changelog.md
-          
-      - name: Fail if no change to changelog.md
-        if: steps.changed-files.outputs.any_changed != 'true'
-        run: exit 1

changelog.md

@@ -1,19 +1,3 @@
-# 5.0.0
-
-Saves from 3.x are not compatible with 5.0.
-
-## Features/Improvements
-
-## Fixes
-
-# 4.0.1
-
-Saves from 4.0.0 are compatible with 4.0.1.
-
-## Features/Improvements
-
-## Fixes
-
 # 4.0.0
 
 Saves from 3.x are not compatible with 4.0.

game/transfers.py

@@ -1,34 +1,3 @@
-"""Implements support for ground unit transfers between bases.
-
-Ground units can be transferred between bases via a number of transport methods, and
-doing so can take multiple turns.
-
-There are a few main concepts here:
-
-* A TransferOrder is a request to move units from one base to another. It is described
-  by its origin, destination, current position, and contents. TransferOrders persist
-  across turns, and if no Transport is available to move the units in a given turn it
-  will have no Transport assigned.
-* Transports: A Transport is the planned move of a group of units for a leg of the
-  journey *this turn*. A Transport has an assigned mode of transportation and has
-  vehicles assigned to move the units if needed. This might be a Convoy, a CargoShip, or
-  an Airlift.
-
-The TransportMap (more accurately, it's subtypes) is responsible for managing the
-transports moving from A to B for the turn. Transfers that are moving between A and B
-this turn will be added to the TransportMap, which will create a new transport if needed
-or add the units to an existing transport if one exists. This allows transfers from
-A->B->C and D->B->C to share a transport between B and C.
-
-AirLifts do not use TransportMap because no merging will take place between orders. It
-instead uses AirLiftPlanner to create transport packages.
-
-PendingTransfers manages all the incomplete transfer orders for the game. New transfer
-orders are registered with PendingTransfers and it is responsible for allocating
-transports and processing the turn's transit actions.
-
-Routing is handled by TransitNetwork.
-"""
 from __future__ import annotations
 
 import logging
@@ -59,7 +28,7 @@ from game.theater.transitnetwork import (
 )
 from game.utils import meters, nautical_miles
 from gen.ato import Package
-from gen.flights.ai_flight_planner_db import aircraft_for_task
+from gen.flights.ai_flight_planner_db import TRANSPORT_CAPABLE, aircraft_for_task
 from gen.flights.closestairfields import ObjectiveDistanceCache
 from gen.flights.flight import Flight, FlightType
 from gen.flights.flightplan import FlightPlanBuilder

game/version.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 
 def _build_version_string() -> str:
-    components = ["5.0.0"]
+    components = ["4.0.0"]
     build_number_path = Path("resources/buildnumber")
     if build_number_path.exists():
         with build_number_path.open("r") as build_number_file:

qt_ui/widgets/QTopPanel.py

@@ -121,7 +121,6 @@ class QTopPanel(QFrame):
             self.passTurnButton.setText("Pass Turn")
 
         if game and game.turn == 0:
-            self.passTurnButton.setText("Begin Campaign")
             self.proceedButton.setEnabled(False)
         else:
             self.proceedButton.setEnabled(True)