Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve starting units #3331

Merged
merged 3 commits into from
Aug 5, 2023
Merged

Improve starting units #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaaf08f
Fix Commanders disappearing from transporter group too early
KJeff01 Jul 23, 2023
c15c9f4
Improve default units on Beta 1
KJeff01 Jul 23, 2023
14ac5ee
Improve default units on Gamma 1
KJeff01 Jul 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions data/base/script/campaign/cam2-a.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,18 @@ function sendPlayerTransporter()
return;
}

var droids = [];
var list = [cTempl.prhct, cTempl.prhct, cTempl.prhct, cTempl.prltat, cTempl.prltat, cTempl.npcybr, cTempl.prrept];
let droids = [];
let bodyList = ["Body11ABT", "Body11ABT", "Body12SUP"];
let propulsionList = ["tracked01", "tracked01", "tracked01", "hover01", "HalfTrack"];
let weaponList = ["Cannon375mmMk1", "Cannon375mmMk1", "Cannon375mmMk1", "Rocket-LtA-T", "Rocket-LtA-T", "Mortar2Mk1", "Rocket-MRL"];
let specialList = ["SensorTurret1Mk1", "CommandBrain01"];

for (let i = 0; i < 10; ++i)
{
droids.push(list[camRand(list.length)]);
let body = bodyList[camRand(bodyList.length)];
let weap = (!transporterIndex && (i < specialList.length)) ? specialList[i] : weaponList[camRand(weaponList.length)];
let prop = propulsionList[camRand(propulsionList.length - ((weap === "Cannon375mmMk1") ? 1 : 0))]; //Ignore halftracks for Heavy Cannon.
droids.push({ body: body, prop: prop, weap: weap });
}

camSendReinforcement(CAM_HUMAN_PLAYER, camMakePos("landingZone"), droids,
Expand Down Expand Up @@ -223,8 +229,8 @@ function cam2Setup()
function setUnitRank(transport)
{
const DROID_EXP = [128, 64, 32, 16];
var droids;
var mapRun = false;
let droids;
let mapRun = false;

if (transport)
{
Expand All @@ -239,10 +245,11 @@ function setUnitRank(transport)

for (let i = 0, len = droids.length; i < len; ++i)
{
var droid = droids[i];
if (!camIsSystemDroid(droid))
let droid = droids[i];
if (droid.droidType !== DROID_CONSTRUCT && droid.droidType !== DROID_REPAIR)
{
setDroidExperience(droid, DROID_EXP[mapRun ? 0 : (transporterIndex - 1)]);
let mod = (droid.droidType === DROID_COMMAND || droid.droidType === DROID_SENSOR) ? 2 : 1;
setDroidExperience(droid, mod * DROID_EXP[mapRun ? 0 : (transporterIndex - 1)]);
}
}
}
Expand Down
23 changes: 16 additions & 7 deletions data/base/script/campaign/cam3-a.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ camAreaEvent ("middleTrigger", function(droid)

function setUnitRank(transport)
{
const DROID_EXP = [1024, 128, 64, 32]; //Can make Hero Commanders if recycled.
const DROID_EXP = [1024, 256, 128, 64]; //Can make Hero Commanders if recycled.
var droids = enumCargo(transport);

for (let i = 0, len = droids.length; i < len; ++i)
{
var droid = droids[i];
if (!camIsSystemDroid(droid))
if (droid.droidType !== DROID_CONSTRUCT && droid.droidType !== DROID_REPAIR)
{
setDroidExperience(droid, DROID_EXP[transporterIndex - 1]);
}
Expand Down Expand Up @@ -136,13 +136,22 @@ function sendPlayerTransporter()
return;
}

var droids = [];
var list = [cTempl.prhasgnt, cTempl.prhhpvt, cTempl.prhaawwt, cTempl.prtruck];
let droids = [];
let bodyList = ["Body9REC", "Body9REC", "Body9REC", "Body11ABT", "Body12SUP"];
let propulsionList = ["tracked01", "tracked01", "hover01"];
let weaponList = ["Cannon5VulcanMk1", "Cannon5VulcanMk1", "Flame2", "Flame2", "MG4ROTARYMk1", "MG4ROTARYMk1", "Cannon4AUTOMk1", "Rocket-HvyA-T"];
let specialList = ["Spade1Mk1", "Spade1Mk1", "CommandBrain01", "CommandBrain01"];

// send 4 Assault Guns, 2 Hyper Velocity Cannons, 2 Whirlwind AA Turrets and 2 Trucks
for (let i = 0, d = list.length; i < 10; ++i)
for (let i = 0; i < 10; ++i)
{
droids.push(i < d * 2 ? list[i % 4] : list[0]);
let body = bodyList[camRand(bodyList.length)];
let weap = (!transporterIndex && (i < specialList.length)) ? specialList[i] : weaponList[camRand(weaponList.length)];
if (transporterIndex === 1 && i < 4)
{
weap = "QuadRotAAGun";
}
let prop = propulsionList[camRand(propulsionList.length)];
droids.push({ body: body, prop: prop, weap: weap });
}

camSendReinforcement(CAM_HUMAN_PLAYER, camMakePos("landingZone"), droids,
Expand Down
15 changes: 8 additions & 7 deletions src/mission.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1731,13 +1731,6 @@ void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, bool goingHome)
}
droidSetPosition(psDroid, world_coord(droidX), world_coord(droidY));
updateDroidOrientation(psDroid);
// a commander needs to get it's group back
if (psDroid->droidType == DROID_COMMAND)
{
psGroup = grpCreate();
psGroup->add(psDroid);
clearCommandDroidFactory(psDroid);
}

//reset droid orders
orderDroid(psDroid, DORDER_STOP, ModeImmediate);
Expand All @@ -1764,6 +1757,14 @@ void unloadTransporter(DROID *psTransporter, UDWORD x, UDWORD y, bool goingHome)
&& psDroid != psTransporter; psDroid = psNext)
{
psNext = psDroid->psGrpNext;
// a commander needs to get it's group back
if (psDroid->droidType == DROID_COMMAND)
{
psGroup = grpCreate();
psGroup->add(psDroid);
clearCommandDroidFactory(psDroid);
continue;
}
psTransporter->psGroup->remove(psDroid);
}
}
Expand Down
Loading