diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini index 3365df3d..8cee9ded 100644 --- a/DATA/EQUIPMENT/weapon_equip.ini +++ b/DATA/EQUIPMENT/weapon_equip.ini @@ -4531,6 +4531,55 @@ turn_rate = 90 lootable = true LODranges = 0, 999999 +; Colada de Hispania + +[Munition] +nickname = fc_c_gun03_mark03_ammo +hp_type = hp_gun +requires_ammo = false +hit_pts = 2 +hull_damage = 40.8 +energy_damage = 1222.5 +weapon_type = W_Pulse01 +one_shot_sound = fire_pulse5 +munition_hit_effect = pi_pulse_04_impact +const_effect = pi_pulse_04_proj +lifetime = 1 +force_gun_ori = false +mass = 1 +volume = 0.0001 + +[Gun] +nickname = fc_c_gun03_mark03 +ids_name = 299750 +ids_info = 299751 +DA_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp +material_library = equipment\models\ge_equip.mat +HP_child = HPConnect +hit_pts = 6752 +explosion_resistance = 1 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0 +mass = 10 +hp_gun_type = hp_gun_special_9 +damage_per_fire = 0 +power_usage = 97.8 +refire_delay = 0.25 +muzzle_velocity = 600 +use_animation = Sc_fire +toughness = 1.6 +flash_particle_name = pi_laser_03_flash +flash_radius = 15 +light_anim = l_gun01_flash +projectile_archetype = fc_c_gun03_mark03_ammo +separation_explosion = sever_debris +auto_turret = false +turn_rate = 90 +lootable = true +LODranges = 0, 999999 + ; Angelito Turret Mk I [Munition] diff --git a/DATA/EQUIPMENT/weapon_good.ini b/DATA/EQUIPMENT/weapon_good.ini index f5e15430..2e902756 100644 --- a/DATA/EQUIPMENT/weapon_good.ini +++ b/DATA/EQUIPMENT/weapon_good.ini @@ -1217,6 +1217,20 @@ ids_info = 264213 shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp material_library = equipment\models\ge_equip.mat +; Colada de Hispania + +[Good] +nickname = fc_c_gun03_mark03 +equipment = fc_c_gun03_mark03 +category = equipment +price = 120480 +item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db +combinable = false +ids_name = 299750 +ids_info = 299751 +shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp +material_library = equipment\models\ge_equip.mat + ; Angelito Turret Mk I [Good] diff --git a/DATA/FX/WEAPONS/pi_pulse_04.ale b/DATA/FX/WEAPONS/pi_pulse_04.ale new file mode 100644 index 00000000..f54e6a48 Binary files /dev/null and b/DATA/FX/WEAPONS/pi_pulse_04.ale differ diff --git a/DATA/FX/WEAPONS/weapons_ale.ini b/DATA/FX/WEAPONS/weapons_ale.ini index 5bb437db..f10ac9a3 100644 --- a/DATA/FX/WEAPONS/weapons_ale.ini +++ b/DATA/FX/WEAPONS/weapons_ale.ini @@ -3970,6 +3970,22 @@ textures = fx\sarma.txm textures = fx\kioncannon.txm textures = fx\newglows.txm +[VisEffect] +nickname = pi_pulse_04_impact +alchemy = fx\weapons\pi_pulse_04.ale +effect_crc = 427405619 +textures = fx\sarma.txm +textures = fx\kioncannon.txm +textures = fx\newglows.txm + +[VisEffect] +nickname = pi_pulse_04_proj +alchemy = fx\weapons\pi_pulse_04.ale +effect_crc = 210300417 +textures = fx\sarma.txm +textures = fx\kioncannon.txm +textures = fx\newglows.txm + [VisEffect] nickname = pi_tachyon_01_flash alchemy = fx\weapons\pi_tachyon_01.ale diff --git a/DATA/FX/effects.ini b/DATA/FX/effects.ini index 6d3f2920..6fd3fc76 100644 --- a/DATA/FX/effects.ini +++ b/DATA/FX/effects.ini @@ -1495,6 +1495,17 @@ effect_type = EFT_WEAPON_PROJ vis_effect = pi_pulse_03_proj vis_generic = pi_pulse_03_proj +[Effect] +nickname = pi_pulse_04_impact +effect_type = EFT_WEAPON_IMPACT +vis_effect = pi_pulse_04_impact + +[Effect] +nickname = pi_pulse_04_proj +effect_type = EFT_WEAPON_PROJ +vis_effect = pi_pulse_04_proj +vis_generic = pi_pulse_04_proj + [Effect] nickname = pi_tachyon_01_flash effect_type = EFT_MUZZLE_FLASH diff --git a/EXE/equipresources.dll b/EXE/equipresources.dll index 0fe2a148..33e281ce 100644 Binary files a/EXE/equipresources.dll and b/EXE/equipresources.dll differ