walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Added EF_MUST_DISABLE, to replace EF_DISABLE.

This commit is contained in:
Steve 2015-11-16 16:24:57 +00:00
parent eb4db6028f
commit 5aa8e0280e
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
data/missions/temper/03 - pirate uprising #3.json
View File

@ -49,7 +49,7 @@
"side" : "SIDE_PIRATE", "side" : "SIDE_PIRATE",
"x" : 12, "x" : 12,
"y" : 25, "y" : 25,
"flags" : "EF_NO_KILL+EF_DISABLE+EF_MISSION_TARGET" "flags" : "EF_NO_KILL+EF_MUST_DISABLE+EF_MISSION_TARGET"
} }
], ],
"fighterGroups" : [ "fighterGroups" : [
@ -58,8 +58,9 @@
"types" : "TAF", "types" : "TAF",
"number" : 2, "number" : 2,
"side" : "SIDE_ALLIES", "side" : "SIDE_ALLIES",
"x" : 27, "x" : 25,
"y" : 25 "y" : 25,
"scatter" : 300
}, },
{ {
"name" : "Dart", "name" : "Dart",
@ -68,7 +69,7 @@
"side" : "SIDE_PIRATE", "side" : "SIDE_PIRATE",
"x" : 15, "x" : 15,
"y" : 25, "y" : 25,
"scatter" : 2000 "scatter" : 1000
} }
] ]
} }

2
src/battle/ai.c
View File

@ -221,7 +221,7 @@ static int canAttack(Entity *f)
{ {
self->selectedGunType = self->guns[0].type; self->selectedGunType = self->guns[0].type;
if (f->flags & EF_DISABLED) if (f->flags & EF_MUST_DISABLE)
{ {
if (f->systemPower > 0) if (f->systemPower > 0)
{ {

1
src/defs.h
View File

@ -74,6 +74,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define EF_HAS_ROPE (2 << 8) #define EF_HAS_ROPE (2 << 8)
#define EF_ALWAYS_FLEES (2 << 9) #define EF_ALWAYS_FLEES (2 << 9)
#define EF_COLLECTS_ITEMS (2 << 10) #define EF_COLLECTS_ITEMS (2 << 10)
#define EF_MUST_DISABLE (2 << 11)
/* player abilities */ /* player abilities */
#define BOOST_RECHARGE_TIME (FPS * 7) #define BOOST_RECHARGE_TIME (FPS * 7)

1
src/system/lookup.c
View File

@ -35,6 +35,7 @@ void initLookups(void)
addLookup("EF_NO_KILL", EF_NO_KILL); addLookup("EF_NO_KILL", EF_NO_KILL);
addLookup("EF_DISABLED", EF_DISABLED); addLookup("EF_DISABLED", EF_DISABLED);
addLookup("EF_MUST_DISABLE", EF_MUST_DISABLE);
addLookup("EF_IMMORTAL", EF_IMMORTAL); addLookup("EF_IMMORTAL", EF_IMMORTAL);
addLookup("EF_MISSION_TARGET", EF_MISSION_TARGET); addLookup("EF_MISSION_TARGET", EF_MISSION_TARGET);
addLookup("EF_FLEES", EF_FLEES); addLookup("EF_FLEES", EF_FLEES);