empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revise rules for cargo plane loads

Browse source 
There are three ways to fly cargo: transport (fly command with a
commodity argument), cargo drops (drop command that isn't a sea mine
drop), and paradrops.

A cargo flight can be either an airlift or an airdrop.  Airlifts carry
more cargo than airdrops.  A cargo drop or paradrop with a non-VTOL
plane is an airdrop.  Anything else is an airlift.

Before, paradrop always behaved like an airdrop, regardless of VTOL,
and drop always like an airlift.  This made little sense.

Effect of the change on the stock game: paradrop with tc carries twice
the punch, and np/tr/jt can drop less than they can fly.  In
particular, tr can't drop guns anymore, and jt can drop only one
instead of three.
This commit is contained in:
Markus Armbruster 2009-09-27 18:03:13 -04:00
parent b2107e5301
commit 7b7fe69c46
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/lib/subs/mission.c
View file

@ -908,16 +908,24 @@ mission_pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
itype = I_SHELL; itype = I_SHELL;
break; break;
case 't': /* transport */ case 't': /* transport */
case 'd': /* drop */
if (!(pcp->pl_flags & P_C) || !ip) if (!(pcp->pl_flags & P_C) || !ip)
break; break;
itype = ip->i_uid; itype = ip->i_uid;
load *= 2; load *= 2;
break; break;
case 'd': /* drop */
if (!(pcp->pl_flags & P_C) || CANT_HAPPEN(!ip))
break;
itype = ip->i_uid;
if (pcp->pl_flags & P_V)
load *= 2;
break;
case 'a': /* paradrop */ case 'a': /* paradrop */
if (!(pcp->pl_flags & P_P)) if (!(pcp->pl_flags & P_P))
break; break;
itype = I_MILIT; itype = I_MILIT;
if (pcp->pl_flags & P_V)
load *= 2;
break; break;
case 'i': /* missile interception */ case 'i': /* missile interception */
if (load) if (load)

10
src/lib/subs/plnsub.c
View file

@ -658,7 +658,6 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
itype = I_SHELL; itype = I_SHELL;
break; break;
case 't': /* transport */ case 't': /* transport */
case 'd': /* drop */
if (!(pcp->pl_flags & P_C) || !ip) if (!(pcp->pl_flags & P_C) || !ip)
break; break;
itype = ip->i_uid; itype = ip->i_uid;
@ -670,10 +669,19 @@ pln_equip(struct plist *plp, struct ichrstr *ip, char mission)
itype = I_SHELL; itype = I_SHELL;
load *= 2; load *= 2;
break; break;
case 'd': /* drop */
if (!(pcp->pl_flags & P_C) || CANT_HAPPEN(!ip))
break;
itype = ip->i_uid;
if (pcp->pl_flags & P_V)
load *= 2;
break;
case 'a': /* paradrop */ case 'a': /* paradrop */
if (!(pcp->pl_flags & P_P)) if (!(pcp->pl_flags & P_P))
break; break;
itype = I_MILIT; itype = I_MILIT;
if (pcp->pl_flags & P_V)
load *= 2;
break; break;
case 'r': /* reconnaissance */ case 'r': /* reconnaissance */
case 'e': /* escort */ case 'e': /* escort */