Merge branch 'dev'

This commit is contained in:
Allanis 2014-04-16 19:22:17 +01:00
commit 8068573fa6

View File

@ -13,7 +13,8 @@
<specific type="bolt"> <specific type="bolt">
<gfx>ripper</gfx> <gfx>ripper</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>700</delay> <delay>700</delay>
<speed>700</speed> <speed>700</speed>
<range>400</range> <range>400</range>
@ -34,7 +35,8 @@
<specific type="bolt"> <specific type="bolt">
<gfx>laserred</gfx> <gfx>laserred</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>500</delay> <delay>500</delay>
<speed>550</speed> <speed>550</speed>
<range>300</range> <range>300</range>
@ -56,7 +58,8 @@
<specific type="turret bolt"> <specific type="turret bolt">
<gfx>laserred</gfx> <gfx>laserred</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>300</delay> <delay>300</delay>
<speed>550</speed> <speed>550</speed>
<range>300</range> <range>300</range>
@ -77,7 +80,8 @@
<specific type="bolt"> <specific type="bolt">
<gfx>plasma</gfx> <gfx>plasma</gfx>
<sound>laser</sound> <sound>laser</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>450</speed> <speed>450</speed>
<range>250</range> <range>250</range>
@ -99,7 +103,8 @@
<specific type="bolt"> <specific type="bolt">
<gfx>ion</gfx> <gfx>ion</gfx>
<sound>ion</sound> <sound>ion</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>800</delay> <delay>800</delay>
<speed>500</speed> <speed>500</speed>
<range>400</range> <range>400</range>
@ -121,7 +126,8 @@
<specific type="turret bolt"> <specific type="turret bolt">
<gfx>ion</gfx> <gfx>ion</gfx>
<sound>ion</sound> <sound>ion</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>500</speed> <speed>500</speed>
<range>400</range> <range>400</range>
@ -143,7 +149,8 @@
<specific type="bolt" secondary="1"> <specific type="bolt" secondary="1">
<gfx>mass</gfx> <gfx>mass</gfx>
<sound>mass</sound> <sound>mass</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>1100</delay> <delay>1100</delay>
<speed>650</speed> <speed>650</speed>
<range>500</range> <range>500</range>
@ -168,7 +175,8 @@
<range>300</range> <range>300</range>
<energy>70</energy> <energy>70</energy>
<damage type="energy">40</damage> <damage type="energy">40</damage>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<gfx>beam_orion</gfx> <gfx>beam_orion</gfx>
<sound>beam0</sound> <sound>beam0</sound>
<sound_off>beam_off0</sound_off> <sound_off>beam_off0</sound_off>
@ -190,7 +198,8 @@
<turn>50</turn> <turn>50</turn>
<energy>130</energy> <energy>130</energy>
<damage type="energy">100</damage> <damage type="energy">100</damage>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<gfx>beam_ragnarok</gfx> <gfx>beam_ragnarok</gfx>
<sound>beam0</sound> <sound>beam0</sound>
<sound_off>beam_off0</sound_off> <sound_off>beam_off0</sound_off>
@ -222,7 +231,8 @@
<specific type="missile seek ammo"> <specific type="missile seek ammo">
<gfx>missile</gfx> <gfx>missile</gfx>
<sound>missile</sound> <sound>missile</sound>
<spfx>ExpM</spfx> <spfx_shield>ExpM</spfx_shield>
<spfx_armour>ExpM</spfx_armour>
<duration>5</duration> <duration>5</duration>
<lockon>1</lockon> <lockon>1</lockon>
<thrust>400</thrust> <thrust>400</thrust>
@ -259,7 +269,8 @@
<specific type="missile smart ammo"> <specific type="missile smart ammo">
<gfx>headhunter</gfx> <gfx>headhunter</gfx>
<sound>missile</sound> <sound>missile</sound>
<spfx>ExpM</spfx> <spfx_shield>ExpM</spfx_shield>
<spfx_armour>ExpM</spfx_armour>
<duration>7</duration> <duration>7</duration>
<lockon>0.5</lockon> <lockon>0.5</lockon>
<resist>5</resist> <resist>5</resist>
@ -281,7 +292,8 @@
<specific type="bolt"> <specific type="bolt">
<gfx>neutron</gfx> <gfx>neutron</gfx>
<sound>neutron</sound> <sound>neutron</sound>
<spfx>ExpS</spfx> <spfx_shield>ExpS</spfx_shield>
<spfx_armour>ExpS</spfx_armour>
<delay>400</delay> <delay>400</delay>
<speed>650</speed> <speed>650</speed>
<range>275</range> <range>275</range>
@ -535,7 +547,8 @@
<specific type="missile dumb ammo"> <specific type="missile dumb ammo">
<gfx>mace</gfx> <gfx>mace</gfx>
<sound>missile</sound> <sound>missile</sound>
<spfx>ExpM</spfx> <spfx_shield>ExpM</spfx_shield>
<spfx_armour>ExpM</spfx_armour>
<duration>5</duration> <duration>5</duration>
<thrust>600</thrust> <thrust>600</thrust>
<speed>1000</speed> <speed>1000</speed>