Merge branch 'develop' into trophies
This commit is contained in:
commit
f114ad7e7e
|
@ -10,56 +10,56 @@
|
|||
"texture" : "gfx/capitalShips/csnCorvette01/core.png",
|
||||
"x" : 0,
|
||||
"y" : -140,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component1.png",
|
||||
"x" : 0,
|
||||
"y" : -200,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
|
||||
"x" : -34,
|
||||
"y" : 25,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
|
||||
"x" : 34,
|
||||
"y" : 25,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
|
||||
"x" : -16,
|
||||
"y" : 25,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component2.png",
|
||||
"x" : 16,
|
||||
"y" : 25,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component3.png",
|
||||
"x" : -23,
|
||||
"y" : 242,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/component3.png",
|
||||
"x" : 23,
|
||||
"y" : 242,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"engines" : [
|
||||
|
@ -68,35 +68,35 @@
|
|||
"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
|
||||
"x" : -150,
|
||||
"y" : 293,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
|
||||
"x" : 150,
|
||||
"y" : 293,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
|
||||
"x" : -90,
|
||||
"y" : 293,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
|
||||
"x" : 90,
|
||||
"y" : 293,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette01/engine1.png",
|
||||
"x" : 0,
|
||||
"y" : 296,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -107,7 +107,7 @@
|
|||
"y" : 200,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -118,7 +118,7 @@
|
|||
"y" : 200,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -129,7 +129,7 @@
|
|||
"y" : 100,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -140,7 +140,7 @@
|
|||
"y" : 100,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -151,7 +151,7 @@
|
|||
"y" : -50,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -162,7 +162,7 @@
|
|||
"y" : 175,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
}
|
||||
|
|
|
@ -10,49 +10,49 @@
|
|||
"texture" : "gfx/capitalShips/csnCorvette02/core.png",
|
||||
"x" : 0,
|
||||
"y" : -140,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component1.png",
|
||||
"x" : -105,
|
||||
"y" : 195,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component1.png",
|
||||
"x" : 105,
|
||||
"y" : 195,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component2.png",
|
||||
"x" : -25,
|
||||
"y" : 18,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component3.png",
|
||||
"x" : 25,
|
||||
"y" : 18,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component4.png",
|
||||
"x" : -67,
|
||||
"y" : -117,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 100,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/component5.png",
|
||||
"x" : 67,
|
||||
"y" : -117,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"engines" : [
|
||||
|
@ -61,28 +61,28 @@
|
|||
"texture" : "gfx/capitalShips/csnCorvette02/engine1.png",
|
||||
"x" : -70,
|
||||
"y" : 253,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/engine2.png",
|
||||
"x" : -25,
|
||||
"y" : 247,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/engine2.png",
|
||||
"x" : 25,
|
||||
"y" : 247,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/csnCorvette02/engine1.png",
|
||||
"x" : 70,
|
||||
"y" : 253,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -93,7 +93,7 @@
|
|||
"y" : -225,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -104,7 +104,7 @@
|
|||
"y" : -60,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -115,7 +115,7 @@
|
|||
"y" : -60,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -126,7 +126,7 @@
|
|||
"y" : 70,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -137,7 +137,7 @@
|
|||
"y" : 110,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -148,7 +148,7 @@
|
|||
"y" : 110,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -159,7 +159,7 @@
|
|||
"y" : 240,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -170,7 +170,7 @@
|
|||
"y" : 240,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
}
|
||||
|
|
|
@ -10,56 +10,56 @@
|
|||
"texture" : "gfx/capitalShips/infCorvette01/component1.png",
|
||||
"x" : -27,
|
||||
"y" : 100,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component2.png",
|
||||
"x" : 27,
|
||||
"y" : 100,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component3.png",
|
||||
"x" : 20,
|
||||
"y" : -17,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component3.png",
|
||||
"x" : -20,
|
||||
"y" : -17,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component4.png",
|
||||
"x" : -21,
|
||||
"y" : -64,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component5.png",
|
||||
"x" : 21,
|
||||
"y" : -64,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component6.png",
|
||||
"x" : -22,
|
||||
"y" : -243,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/component6.png",
|
||||
"x" : 22,
|
||||
"y" : -243,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"engines" : [
|
||||
|
@ -68,21 +68,21 @@
|
|||
"texture" : "gfx/capitalShips/infCorvette01/engine1.png",
|
||||
"x" : -50,
|
||||
"y" : 285,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/engine1.png",
|
||||
"x" : 50,
|
||||
"y" : 285,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette01/engine2.png",
|
||||
"x" : 0,
|
||||
"y" : 280,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -93,7 +93,7 @@
|
|||
"y" : 170,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -104,7 +104,7 @@
|
|||
"y" : -150,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -115,7 +115,7 @@
|
|||
"y" : 50,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -125,7 +125,7 @@
|
|||
"y" : 50,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -135,7 +135,7 @@
|
|||
"y" : -60,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -145,7 +145,7 @@
|
|||
"y" : -60,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -10,63 +10,63 @@
|
|||
"texture" : "gfx/capitalShips/infCorvette02/core.png",
|
||||
"x" : 0,
|
||||
"y" : -80,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component1.png",
|
||||
"x" : -32,
|
||||
"y" : -75,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component1.png",
|
||||
"x" : 32,
|
||||
"y" : -75,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component2.png",
|
||||
"x" : -95,
|
||||
"y" : 195,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component2.png",
|
||||
"x" : 95,
|
||||
"y" : 195,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component3.png",
|
||||
"x" : -30,
|
||||
"y" : 210,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component3.png",
|
||||
"x" : 30,
|
||||
"y" : 210,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component4.png",
|
||||
"x" : -24,
|
||||
"y" : -20,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/component4.png",
|
||||
"x" : 24,
|
||||
"y" : -20,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -77,7 +77,7 @@
|
|||
"y" : 200,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -88,7 +88,7 @@
|
|||
"y" : 200,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -99,7 +99,7 @@
|
|||
"y" : 200,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -110,7 +110,7 @@
|
|||
"y" : 0,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -121,7 +121,7 @@
|
|||
"y" : 100,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -132,7 +132,7 @@
|
|||
"y" : -125,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -143,7 +143,7 @@
|
|||
"y" : -125,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
}
|
||||
|
@ -154,28 +154,28 @@
|
|||
"texture" : "gfx/capitalShips/infCorvette02/engine1.png",
|
||||
"x" : -75,
|
||||
"y" : 275,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/engine2.png",
|
||||
"x" : -20,
|
||||
"y" : 275,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/engine3.png",
|
||||
"x" : 20,
|
||||
"y" : 275,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/infCorvette02/engine4.png",
|
||||
"x" : 75,
|
||||
"y" : 275,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -10,63 +10,63 @@
|
|||
"texture" : "gfx/capitalShips/unfCorvette01/core.png",
|
||||
"x" : 0,
|
||||
"y" : -100,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component1.png",
|
||||
"x" : -42,
|
||||
"y" : -36,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component1.png",
|
||||
"x" : 42,
|
||||
"y" : -36,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component2.png",
|
||||
"x" : -40,
|
||||
"y" : -8,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component2.png",
|
||||
"x" : 40,
|
||||
"y" : -8,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component3.png",
|
||||
"x" : -40,
|
||||
"y" : 68,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component4.png",
|
||||
"x" : 40,
|
||||
"y" : 68,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component5.png",
|
||||
"x" : -40,
|
||||
"y" : 128,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/component5.png",
|
||||
"x" : 40,
|
||||
"y" : 128,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"engines" : [
|
||||
|
@ -75,28 +75,28 @@
|
|||
"texture" : "gfx/capitalShips/unfCorvette01/engine1.png",
|
||||
"x" : -112,
|
||||
"y" : 281,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/engine1.png",
|
||||
"x" : 112,
|
||||
"y" : 281,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/engine2.png",
|
||||
"x" : -34,
|
||||
"y" : 268,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette01/engine2.png",
|
||||
"x" : 34,
|
||||
"y" : 268,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -107,7 +107,7 @@
|
|||
"y" : -250,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -118,7 +118,7 @@
|
|||
"y" : -250,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -129,7 +129,7 @@
|
|||
"y" : 20,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -139,7 +139,7 @@
|
|||
"y" : 20,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -149,7 +149,7 @@
|
|||
"y" : 100,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -160,7 +160,7 @@
|
|||
"y" : 100,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -171,7 +171,7 @@
|
|||
"y" : 180,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -181,7 +181,7 @@
|
|||
"y" : 180,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -10,49 +10,49 @@
|
|||
"texture" : "gfx/capitalShips/unfCorvette01/core.png",
|
||||
"x" : 0,
|
||||
"y" : -100,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component1.png",
|
||||
"x" : -22,
|
||||
"y" : -24,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component1.png",
|
||||
"x" : 22,
|
||||
"y" : -24,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component2.png",
|
||||
"x" : -86,
|
||||
"y" : 188,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component2.png",
|
||||
"x" : 86,
|
||||
"y" : 188,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component3.png",
|
||||
"x" : -43,
|
||||
"y" : 151,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 50,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/component3.png",
|
||||
"x" : 43,
|
||||
"y" : 151,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"engines" : [
|
||||
|
@ -61,28 +61,28 @@
|
|||
"texture" : "gfx/capitalShips/unfCorvette02/engine1.png",
|
||||
"x" : -100,
|
||||
"y" : 286,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/engine1.png",
|
||||
"x" : 100,
|
||||
"y" : 286,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/engine2.png",
|
||||
"x" : -35,
|
||||
"y" : 289,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
},
|
||||
{
|
||||
"health" : 150,
|
||||
"texture" : "gfx/capitalShips/unfCorvette02/engine2.png",
|
||||
"x" : 35,
|
||||
"y" : 289,
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC"
|
||||
}
|
||||
],
|
||||
"guns" : [
|
||||
|
@ -93,7 +93,7 @@
|
|||
"y" : -250,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -104,7 +104,7 @@
|
|||
"y" : 30,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -115,7 +115,7 @@
|
|||
"y" : 30,
|
||||
"reloadTime" : 40,
|
||||
"type" : "BT_ROCKET",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_STATIC+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE",
|
||||
"missiles" : 9999
|
||||
},
|
||||
|
@ -126,7 +126,7 @@
|
|||
"y" : 30,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -136,7 +136,7 @@
|
|||
"y" : -70,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -146,7 +146,7 @@
|
|||
"y" : -70,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -156,7 +156,7 @@
|
|||
"y" : 170,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -166,7 +166,7 @@
|
|||
"y" : 210,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
},
|
||||
{
|
||||
|
@ -176,7 +176,7 @@
|
|||
"y" : 210,
|
||||
"reloadTime" : 10,
|
||||
"type" : "BT_PLASMA",
|
||||
"flags" : "EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"flags" : "EF_NO_MT_BOX+EF_NO_KILL_INC+EF_TAKES_DAMAGE+EF_SECONDARY_TARGET",
|
||||
"aiFlags" : "AIF_AGGRESSIVE+AIF_LONG_RANGE_FIRE"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -0,0 +1,29 @@
|
|||
{
|
||||
"name" : "Razor",
|
||||
"health" : 45,
|
||||
"shield" : 55,
|
||||
"speed" : 1.75,
|
||||
"reloadTime" : 22,
|
||||
"shieldRechargeRate" : 35,
|
||||
"texture" : "gfx/fighters/razor.png",
|
||||
"guns" : [
|
||||
{
|
||||
"type" : "BT_PARTICLE",
|
||||
"x" : 0,
|
||||
"y" : -4
|
||||
},
|
||||
{
|
||||
"type" : "BT_PLASMA",
|
||||
"x" : -12,
|
||||
"y" : -2
|
||||
},
|
||||
{
|
||||
"type" : "BT_PLASMA",
|
||||
"x" : 12,
|
||||
"y" : -2
|
||||
}
|
||||
],
|
||||
"combinedGuns" : 1,
|
||||
"missiles" : 4,
|
||||
"flags" : "EF_TAKES_DAMAGE"
|
||||
}
|
|
@ -0,0 +1,28 @@
|
|||
{
|
||||
"name" : "Shale",
|
||||
"health" : 50,
|
||||
"shield" : 50,
|
||||
"speed" : 2,
|
||||
"reloadTime" : 8,
|
||||
"shieldRechargeRate" : 20,
|
||||
"texture" : "gfx/fighters/shale.png",
|
||||
"guns" : [
|
||||
{
|
||||
"type" : "BT_PARTICLE",
|
||||
"x" : -12,
|
||||
"y" : -2
|
||||
},
|
||||
{
|
||||
"type" : "BT_PARTICLE",
|
||||
"x" : 0,
|
||||
"y" : -2
|
||||
},
|
||||
{
|
||||
"type" : "BT_PARTICLE",
|
||||
"x" : 12,
|
||||
"y" : -2
|
||||
}
|
||||
],
|
||||
"missiles" : 3,
|
||||
"flags" : "EF_TAKES_DAMAGE"
|
||||
}
|
|
@ -0,0 +1,119 @@
|
|||
{
|
||||
"name" : "Return to Aster",
|
||||
"description" : "",
|
||||
"requires" : 30,
|
||||
"background" : "gfx/backgrounds/background04.jpg",
|
||||
"planet" : "gfx/planets/bluePlanet.png",
|
||||
"music" : "music/battle/track-3.mp3",
|
||||
"manualComplete" : 1,
|
||||
"objectives" : [
|
||||
{
|
||||
"description" : "Protect CSN Florin",
|
||||
"targetName" : "CSN Florin",
|
||||
"targetValue" : 1,
|
||||
"targetType" : "TT_DESTROY",
|
||||
"isCondition" : 1
|
||||
},
|
||||
{
|
||||
"description" : "Destroy Pandoran shuttles and tugs",
|
||||
"targetName" : "ShuttleTug",
|
||||
"targetValue" : 12,
|
||||
"targetType" : "TT_DESTROY",
|
||||
"active" : 0
|
||||
},
|
||||
{
|
||||
"description" : "Defeat rebel forces",
|
||||
"targetName" : "Rebels",
|
||||
"targetValue" : 12,
|
||||
"targetType" : "TT_DESTROY",
|
||||
"active" : 0
|
||||
}
|
||||
],
|
||||
"player" : {
|
||||
"type" : "Rook",
|
||||
"side" : "SIDE_ALLIES",
|
||||
"pilot" : "Shaun Black",
|
||||
"squadron" : "Salty Wildcats",
|
||||
"x" : 5,
|
||||
"y" : 45
|
||||
},
|
||||
"fighters" : [
|
||||
{
|
||||
"types" : "TAF;Ray",
|
||||
"side" : "SIDE_ALLIES",
|
||||
"x" : 5,
|
||||
"y" : 45,
|
||||
"number" : 7,
|
||||
"scatter" : 350
|
||||
},
|
||||
{
|
||||
"groupName" : "ShuttleTug",
|
||||
"types" : "INF Tug",
|
||||
"side" : "SIDE_PANDORAN",
|
||||
"x" : 25,
|
||||
"y" : 25,
|
||||
"number" : 6,
|
||||
"aiFlags" : "+AIF_MOVES_TO_LEADER"
|
||||
},
|
||||
{
|
||||
"groupName" : "ShuttleTug",
|
||||
"types" : "Shuttle",
|
||||
"side" : "SIDE_PANDORAN",
|
||||
"x" : 25,
|
||||
"y" : 25,
|
||||
"number" : 6,
|
||||
"aiFlags" : "+AIF_MOVES_TO_LEADER"
|
||||
},
|
||||
{
|
||||
"types" : "Thunderhead;Jackal;Sphinx",
|
||||
"side" : "SIDE_PANDORAN",
|
||||
"x" : 25,
|
||||
"y" : 30,
|
||||
"number" : 4,
|
||||
"flags" : "+EF_AI_LEADER",
|
||||
"aiFlags" : "+AIF_UNLIMITED_RANGE"
|
||||
}
|
||||
],
|
||||
"capitalShips" : [
|
||||
{
|
||||
"name" : "CSN Florin",
|
||||
"types" : "CSN Corvette 01",
|
||||
"side" : "SIDE_ALLIES",
|
||||
"x" : 10,
|
||||
"y" : 40,
|
||||
"flags" : "+EF_AI_TARGET+EF_DISABLED+EF_MISSION_TARGET"
|
||||
}
|
||||
],
|
||||
"script" : [
|
||||
{
|
||||
"function" : "TIME 2",
|
||||
"lines" : [
|
||||
"MSG_BOX Black;Florin, this is Black of the Salty Wildcats, here to assist.",
|
||||
"MSG_BOX CSN Florin;Glad to see you, Wildcats. The Pandorans arrived shortly before you did. We've got tugs and shuttles incoming.",
|
||||
"MSG_BOX Black;Acknowledged, we'll secure the area while you get things up and running.",
|
||||
"WAIT_MSG_BOX",
|
||||
"ACTIVATE_OBJECTIVES Destroy Pandoran shuttles and tugs"
|
||||
]
|
||||
},
|
||||
{
|
||||
"function" : "ENEMIES_DESTROYED 16",
|
||||
"lines" : [
|
||||
"WAIT 2",
|
||||
"MSG_BOX Black;Florin, Pandoran vessels have been dealt with.",
|
||||
"MSG_BOX CSN Florin;Many thanks, Wildcats. We've identified the cause of the power outage. Should be no more than a few minutes before we can restart all systems.",
|
||||
"WAIT_MSG_BOX",
|
||||
"WAIT 10",
|
||||
"MSG_BOX CSN Florin;Wildcats, we're picking up an incoming squadron.",
|
||||
"MSG_BOX Black;More Pandoran tugs?",
|
||||
"MSG_BOX CSN Florin;Negative. These appear to be non-aligned forces, fighters and bombers.",
|
||||
"WAIT_MSG_BOX",
|
||||
"WAIT 5",
|
||||
"ACTIVATE_ENTITY_GROUP Rebels",
|
||||
"MSG_BOX CSN Florin;Incoming forces are on intercept vectors. We only need a few more minutes.",
|
||||
"MSG_BOX Black;On it.",
|
||||
"WAIT_MSG_BOX",
|
||||
"ACTIVATE_OBJECTIVES Defeat rebel forces"
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
|
@ -47,7 +47,7 @@
|
|||
},
|
||||
{
|
||||
"name" : "ALLIES",
|
||||
"types" : "Khepri",
|
||||
"types" : "Lynx",
|
||||
"side" : "SIDE_ALLIES",
|
||||
"x" : 45,
|
||||
"y" : 45,
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.9 KiB After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
|
@ -721,7 +721,7 @@ static int nearTowableCraft(void)
|
|||
|
||||
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
|
||||
{
|
||||
if ((e->flags & (EF_DISABLED|EF_MISSION_TARGET)) == (EF_DISABLED|EF_MISSION_TARGET) && (e->flags & EF_ROPED_ATTACHED) == 0)
|
||||
if (!e->owner && (e->flags & (EF_DISABLED|EF_MISSION_TARGET)) == (EF_DISABLED|EF_MISSION_TARGET) && (e->flags & EF_ROPED_ATTACHED) == 0)
|
||||
{
|
||||
dist = getDistance(self->x, self->y, e->x, e->y);
|
||||
|
||||
|
|
|
@ -24,6 +24,7 @@ static int steer(void);
|
|||
static void think(void);
|
||||
static void gunThink(void);
|
||||
static void gunDie(void);
|
||||
static void handleDisabled(void);
|
||||
static void componentDie(void);
|
||||
static void engineThink(void);
|
||||
static void engineDie(void);
|
||||
|
@ -80,6 +81,8 @@ void doCapitalShip(void)
|
|||
{
|
||||
if (self->alive == ALIVE_ALIVE)
|
||||
{
|
||||
handleDisabled();
|
||||
|
||||
if (self->health <= 0)
|
||||
{
|
||||
self->health = 0;
|
||||
|
@ -232,6 +235,8 @@ static int steer(void)
|
|||
|
||||
static void gunThink(void)
|
||||
{
|
||||
handleDisabled();
|
||||
|
||||
doAI();
|
||||
}
|
||||
|
||||
|
@ -260,6 +265,8 @@ static void gunDie(void)
|
|||
|
||||
static void engineThink(void)
|
||||
{
|
||||
handleDisabled();
|
||||
|
||||
addLargeEngineEffect();
|
||||
}
|
||||
|
||||
|
@ -314,6 +321,18 @@ static void die(void)
|
|||
updateObjective(self->groupName, TT_DESTROY);
|
||||
}
|
||||
|
||||
static void handleDisabled(void)
|
||||
{
|
||||
if (self->systemPower <= 0 || (self->flags & EF_DISABLED))
|
||||
{
|
||||
self->dx *= 0.99;
|
||||
self->dy *= 0.99;
|
||||
self->thrust = 0;
|
||||
self->shield = self->maxShield = 0;
|
||||
self->action = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void loadCapitalShipDefs(void)
|
||||
{
|
||||
char **filenames;
|
||||
|
@ -536,7 +555,7 @@ static void loadEngines(Entity *parent, cJSON *engines)
|
|||
}
|
||||
}
|
||||
|
||||
void updateCapitalShipComponentProperties(Entity *parent)
|
||||
void updateCapitalShipComponentProperties(Entity *parent, long flags, int addFlags)
|
||||
{
|
||||
Entity *e;
|
||||
|
||||
|
@ -560,6 +579,20 @@ void updateCapitalShipComponentProperties(Entity *parent)
|
|||
}
|
||||
|
||||
e->active = parent->active;
|
||||
|
||||
if (flags != -1)
|
||||
{
|
||||
if (addFlags)
|
||||
{
|
||||
e->flags |= flags;
|
||||
}
|
||||
else
|
||||
{
|
||||
e->flags = flags;
|
||||
|
||||
SDL_LogMessage(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN, "Flags for '%s' (%s) replaced", e->name, e->defName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -636,7 +669,7 @@ void loadCapitalShips(cJSON *node)
|
|||
}
|
||||
}
|
||||
|
||||
updateCapitalShipComponentProperties(e);
|
||||
updateCapitalShipComponentProperties(e, flags, addFlags);
|
||||
}
|
||||
|
||||
node = node->next;
|
||||
|
|
|
@ -31,7 +31,7 @@ void attachRope(void)
|
|||
|
||||
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
|
||||
{
|
||||
if ((e->flags & EF_DISABLED) && (e->flags & EF_ROPED_ATTACHED) == 0 && e->alive == ALIVE_ALIVE)
|
||||
if (!e->owner && (e->flags & EF_DISABLED) && (e->flags & EF_ROPED_ATTACHED) == 0 && e->alive == ALIVE_ALIVE)
|
||||
{
|
||||
distance = getDistance(e->x, e->y, self->x, self->y);
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ static SDL_Texture *pandoranWar;
|
|||
static SDL_Texture *earthTexture;
|
||||
static PointF earth;
|
||||
static Entity fighters[NUM_FIGHTERS];
|
||||
static const char *fighterTextures[] = {"gfx/fighters/firefly.png", "gfx/fighters/hammerhead.png", "gfx/fighters/hyena.png", "gfx/fighters/khepri.png", "gfx/fighters/kingfisher.png", "gfx/fighters/leopard.png", "gfx/fighters/nymph.png", "gfx/fighters/ray.png", "gfx/fighters/rook.png", "gfx/fighters/taf.png"};
|
||||
static const char *fighterTextures[] = {"gfx/fighters/firefly.png", "gfx/fighters/hammerhead.png", "gfx/fighters/hyena.png", "gfx/fighters/lynx.png", "gfx/fighters/kingfisher.png", "gfx/fighters/leopard.png", "gfx/fighters/nymph.png", "gfx/fighters/ray.png", "gfx/fighters/rook.png", "gfx/fighters/taf.png"};
|
||||
static int show;
|
||||
|
||||
void initTitle(void)
|
||||
|
|
|
@ -29,7 +29,7 @@ int main(int argc, char *argv[])
|
|||
long expireTextTimer;
|
||||
SDL_Event event;
|
||||
|
||||
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
|
||||
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_WARN);
|
||||
|
||||
memset(&app, 0, sizeof(App));
|
||||
memset(&dev, 0, sizeof(Dev));
|
||||
|
@ -173,6 +173,11 @@ static void handleArguments(int argc, char *argv[])
|
|||
|
||||
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_DEBUG);
|
||||
}
|
||||
|
||||
if (strcmp(argv[i], "-info") == 0)
|
||||
{
|
||||
SDL_LogSetPriority(SDL_LOG_CATEGORY_APPLICATION, SDL_LOG_PRIORITY_INFO);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -61,6 +61,7 @@ void initLookups(void)
|
|||
addLookup("EF_AI_TARGET", EF_AI_TARGET);
|
||||
addLookup("EF_AI_LEADER", EF_AI_LEADER);
|
||||
addLookup("EF_NO_KILL_INC", EF_NO_KILL_INC);
|
||||
addLookup("EF_NO_MT_BOX", EF_NO_MT_BOX);
|
||||
|
||||
addLookup("AIF_NONE", AIF_NONE);
|
||||
addLookup("AIF_MOVES_TO_PLAYER", AIF_MOVES_TO_PLAYER);
|
||||
|
|
Loading…
Reference in New Issue