Skip to content

Commit 94823be

Browse files
committed
Revert 'Metafight shouldn't be so reliant on Base craft' commit.
In ceb1e77, some hardcoded references to "Base.rte" in MetaFight.lua were changed to use `MetaPlayer.NativeTechModule`. However, each of these references were intended as a fallback, in case the module's own craft were unable to carry passengers or cargo, and as such, really should be referencing "Base.rte" instead.
1 parent 1f67f87 commit 94823be

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

CHANGELOG.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

7+
## [Unreleased]
8+
9+
<details><summary><b>Changed</b></summary>
10+
11+
- Conquest activities will once again fall-back to using base dropships and rockets if a random selection of the selected tech's craft can't find one capable of carrying passengers and/or cargo.
12+
13+
</details>
14+
715
## [Release v6.2.2] - 2024/02/24
816

917
<details><summary><b>Added</b></summary>
@@ -26,7 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2634

2735
- Fixed the Conquest start game menu not letting you immediately start a game until you tweak some settings.
2836

29-
- Fixed potential issues with One Man Army (and Diggers Only) that could occur when the player is not assigned to the first team.
37+
- Fixed potential issues with One Man Army (and Diggers Only) that could occur when using a different player than player 1.
3038

3139
</details>
3240

Data/Base.rte/Activities/MetaFight.lua

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,9 +1368,9 @@ function MetaFight:PickCraft(MetaPlayer)
13681368
-- Use base crafts as a fall-back
13691369
if not Craft then
13701370
if math.random() < 0.5 then
1371-
Craft = RandomACDropShip("Craft", MetaPlayer.NativeTechModule);
1371+
Craft = RandomACDropShip("Craft", "Base.rte");
13721372
else
1373-
Craft = RandomACRocket("Craft", MetaPlayer.NativeTechModule);
1373+
Craft = RandomACRocket("Craft", "Base.rte");
13741374
end
13751375
end
13761376

@@ -1406,9 +1406,9 @@ function MetaFight:OrderHeavyLoadout(player, team)
14061406
craftMaxMass = math.huge;
14071407
elseif craftMaxMass < 1 then
14081408
if math.random() < 0.5 then
1409-
Craft = RandomACDropShip("Craft", MetaPlayer.NativeTechModule);
1409+
Craft = RandomACDropShip("Craft", "Base.rte");
14101410
else
1411-
Craft = RandomACRocket("Craft", MetaPlayer.NativeTechModule);
1411+
Craft = RandomACRocket("Craft", "Base.rte");
14121412
end
14131413
craftMaxMass = Craft.MaxInventoryMass;
14141414
end
@@ -1467,9 +1467,9 @@ function MetaFight:OrderMediumLoadout(player, team)
14671467
craftMaxMass = math.huge;
14681468
elseif craftMaxMass < 1 then
14691469
if math.random() < 0.5 then
1470-
Craft = RandomACDropShip("Craft", MetaPlayer.NativeTechModule);
1470+
Craft = RandomACDropShip("Craft", "Base.rte");
14711471
else
1472-
Craft = RandomACRocket("Craft", MetaPlayer.NativeTechModule);
1472+
Craft = RandomACRocket("Craft", "Base.rte");
14731473
end
14741474
craftMaxMass = Craft.MaxInventoryMass;
14751475
end
@@ -1528,9 +1528,9 @@ function MetaFight:OrderLightLoadout(player, team)
15281528
craftMaxMass = math.huge;
15291529
elseif craftMaxMass < 1 then
15301530
if math.random() < 0.5 then
1531-
Craft = RandomACDropShip("Craft", MetaPlayer.NativeTechModule);
1531+
Craft = RandomACDropShip("Craft", "Base.rte");
15321532
else
1533-
Craft = RandomACRocket("Craft", MetaPlayer.NativeTechModule);
1533+
Craft = RandomACRocket("Craft", "Base.rte");
15341534
end
15351535
craftMaxMass = Craft.MaxInventoryMass;
15361536
end
@@ -1583,9 +1583,9 @@ function MetaFight:OrderScoutLoadout(player, team)
15831583
craftMaxMass = math.huge;
15841584
elseif craftMaxMass < 1 then
15851585
if math.random() < 0.5 then
1586-
Craft = RandomACDropShip("Craft", MetaPlayer.NativeTechModule);
1586+
Craft = RandomACDropShip("Craft", "Base.rte");
15871587
else
1588-
Craft = RandomACRocket("Craft", MetaPlayer.NativeTechModule);
1588+
Craft = RandomACRocket("Craft", "Base.rte");
15891589
end
15901590
craftMaxMass = Craft.MaxInventoryMass;
15911591
end

0 commit comments

Comments
 (0)