K9's Fixes, Blame Him

DATA/EQUIPMENT/market_misc.ini

@@ -683,7 +683,7 @@ MarketGood = li_n_gun05_mark01, 0, -0.20, 10, 10, 0, 0.5
 MarketGood = li_n_gun06_mark03, 0, -1, 10, 10, 0, 0.5
 MarketGood = li_n_gun06_mark04, 0, -0.25, 10, 10, 0, 0.5
 ; MarketGood = li_n_gun08_mark01, 0, -0.50, 10, 10, 0, 0.5
-MarketGood = li_cruiser_turret03, 0, -0.20, 10, 10, 0, 0.5
+MarketGood = pl_liberty_cruiser_turret01, 0, -0.20, 10, 10, 0, 0.5
 MarketGood = li_n_msl01_mk01, 0, -1, 10, 10, 0, 0.5
 MarketGood = li_n_msl01_mk01_ammo, 0, -1, 50, 50, 0, 2
 MarketGood = li_n_msl01_mk02, 0, -1, 10, 10, 0, 0.5
@@ -1424,6 +1424,7 @@ MarketGood = red_gun01_mark01, 0, 0, 10, 10, 0, 0.5
 MarketGood = red_gun01_mark02, 0, 0.10, 10, 10, 0, 0.5
 MarketGood = red_gun02_mark01, 0, 0, 10, 10, 0, 0.5
 MarketGood = red_gun02_mark02, 0, 0.10, 10, 10, 0, 0.5
+MarketGood = pl_hessian_gunship_turret01, 0, 0.8, 10, 10, 0, 1.5
 MarketGood = red_missile01_ammo, 2, 0.15, 50, 50, 0, 2
 MarketGood = red_missile02_ammo, 1, 0.05, 50, 50, 0, 2
 MarketGood = red_shield_mark01_lf, 0, 0, 10, 10, 0, 0.5
@@ -1445,6 +1446,7 @@ MarketGood = lr_gun01_mark01, 0, 0, 10, 10, 0, 0.5
 MarketGood = lr_gun01_mark02, 0, 0.10, 10, 10, 0, 0.5
 MarketGood = lr_gun02_mark01, 0, 0, 10, 10, 0, 0.5
 MarketGood = lr_gun02_mark02, 0, 0.10, 10, 10, 0, 0.5
+MarketGood = pl_rogue_gunship_turret01, 0, 0.8, 10, 10, 0, 1.5
 MarketGood = lr_missile01_ammo, 2, 0.15, 50, 50, 0, 2
 MarketGood = lr_missile02_ammo, 1, 0.05, 50, 50, 0, 2
 MarketGood = lr_shield_mark01_lf, 0, 0, 10, 10, 0, 0.5
@@ -1698,6 +1700,7 @@ MarketGood = rh_n_gun05_mark01, 0, -0.20, 10, 10, 0, 0.5
 MarketGood = rh_n_gun06_mark04, 0, -1, 10, 10, 0, 0.5
 MarketGood = rh_n_gun06_mark05, 0, -1, 10, 10, 0, 0.5
 MarketGood = rh_n_gun06_mark06, 0, -0.50, 10, 10, 0, 0.5
+MarketGood = pl_rheinland_gunboat_turret01, 0, -0.2, 10, 10, 0, 0.5
 MarketGood = rh_n_msl01_mk01, 0, -1, 10, 10, 0, 0.5
 MarketGood = rh_n_msl01_mk01_ammo, 0, -1, 50, 50, 0, 2
 MarketGood = rh_n_msl01_mk02, 0, -1, 10, 10, 0, 0.5

DATA/EQUIPMENT/weapon_equip.ini

@@ -1192,7 +1192,7 @@ time_to_lock         = 0
 seeker_range         = 2250
 seeker_fov_deg       = 100
 max_angular_velocity = 2.750000
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -1559,7 +1559,7 @@ time_to_lock         = 0
 seeker_range         = 2500
 seeker_fov_deg       = 135
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -1902,7 +1902,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -2137,7 +2137,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -2500,7 +2500,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -2789,7 +2789,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -2965,7 +2965,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -3328,7 +3328,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -3984,7 +3984,7 @@ time_to_lock         = 0
 seeker_range         = 2500
 seeker_fov_deg       = 90
 max_angular_velocity = 2.000000
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -4270,7 +4270,7 @@ time_to_lock         = 0
 seeker_range         = 2250
 seeker_fov_deg       = 110
 max_angular_velocity = 2.750000
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -4637,7 +4637,7 @@ time_to_lock         = 0
 seeker_range         = 2500
 seeker_fov_deg       = 90
 max_angular_velocity = 2.853330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -5000,7 +5000,7 @@ time_to_lock         = 0
 seeker_range         = 1500
 seeker_fov_deg       = 35
 max_angular_velocity = 2.903330
-cruise_disruptor     = true
+cruise_disruptor     = false
 DA_archetype         = equipment\models\weapons\li_rad_missile.3db
 material_library     = equipment\models\li_equip.mat
 mass                 = 1
@@ -8861,6 +8861,59 @@ LODranges = 0, 1700
 obj       = barrel
 LODranges = 0, 1200
 
+; [Munition]
+; nickname            = ku_large_station_turret01_mark02_ammo
+; hp_type             = hp_gun
+; requires_ammo       = false
+; hit_pts             = 2
+; hull_damage         = 2000
+; energy_damage       = 0
+; one_shot_sound      = fire_capship
+; munition_hit_effect = ku_capgun_01_impact
+; const_effect        = ku_capgun_01_proj
+; lifetime            = 2
+; force_gun_ori       = false
+; mass                = 1
+; volume              = 0.000100
+
+; [Gun]
+; nickname             = ku_large_station_turret01_mark02
+; ; !ku_large_station_turret01_mark02_name
+; ids_name             = 263568
+; ; !ku_large_station_turret01_mark02_info
+; ids_info             = 264568
+; DA_archetype         = equipment\models\turret\sp_turret02.cmp
+; material_library     = equipment\models\sp_turret.mat
+; HP_child             = HPConnect
+; hit_pts              = 12312
+; explosion_resistance = 0.750000
+; debris_type          = debris_turret_large
+; parent_impulse       = 20
+; child_impulse        = 80
+; volume               = 0.000000
+; mass                 = 10
+; damage_per_fire      = 0
+; power_usage          = 0
+; refire_delay         = 0.500000
+; muzzle_velocity      = 500
+; toughness            = 3.200000
+; flash_particle_name  = ku_capgun_01_flash
+; flash_radius         = 15
+; light_anim           = l_gun01_flash
+; projectile_archetype = ku_large_station_turret01_mark02_ammo
+; separation_explosion = sever_debris
+; auto_turret          = true
+; turn_rate            = 45
+; lootable             = false
+
+; [LOD]
+; obj       = Root
+; LODranges = 0, 1700
+
+; [LOD]
+; obj       = barrel
+; LODranges = 0, 1200
+
 [Munition]
 nickname            = ku_large_station_turret01_mark02_ammo
 hp_type             = hp_gun
@@ -8967,6 +9020,59 @@ LODranges = 0, 1700
 obj       = barrel
 LODranges = 0, 1200
 
+; [Munition]
+; nickname            = ku_large_station_turret01_mark03_ammo
+; hp_type             = hp_gun
+; requires_ammo       = false
+; hit_pts             = 2
+; hull_damage         = 3000
+; energy_damage       = 0
+; one_shot_sound      = fire_capship
+; munition_hit_effect = ku_capgun_01_impact
+; const_effect        = ku_capgun_01_proj
+; lifetime            = 2
+; force_gun_ori       = false
+; mass                = 1
+; volume              = 0.000100
+
+; [Gun]
+; nickname             = ku_large_station_turret01_mark03
+; ; !ku_large_station_turret01_mark03_name
+; ids_name             = 263570
+; ; !ku_large_station_turret01_mark03_info
+; ids_info             = 264570
+; DA_archetype         = equipment\models\turret\sp_turret02.cmp
+; material_library     = equipment\models\sp_turret.mat
+; HP_child             = HPConnect
+; hit_pts              = 23076
+; explosion_resistance = 0.750000
+; debris_type          = debris_turret_large
+; parent_impulse       = 20
+; child_impulse        = 80
+; volume               = 0.000000
+; mass                 = 10
+; damage_per_fire      = 0
+; power_usage          = 0
+; refire_delay         = 0.500000
+; muzzle_velocity      = 500
+; toughness            = 5.300000
+; flash_particle_name  = ku_capgun_01_flash
+; flash_radius         = 15
+; light_anim           = l_gun01_flash
+; projectile_archetype = ku_large_station_turret01_mark03_ammo
+; separation_explosion = sever_debris
+; auto_turret          = true
+; turn_rate            = 45
+; lootable             = false
+
+; [LOD]
+; obj       = Root
+; LODranges = 0, 1700
+
+; [LOD]
+; obj       = barrel
+; LODranges = 0, 1200
+; 
 [Munition]
 nickname            = ku_large_station_turret01_mark03_ammo
 hp_type             = hp_gun
@@ -17678,6 +17784,7 @@ lifetime            = 1.000000
 force_gun_ori       = false
 mass                = 1
 volume              = 0.000100
+weapon_type         = Pi_Antimatter01 
 
 [Gun]
 nickname             = fng_gun
@@ -24128,3 +24235,200 @@ units_per_container  = 25
 mass                 = 10
 volume               = 1.00000
 
+; ===================================
+; Player Red Hessian Gunship Turret
+; ===================================
+
+[Gun]
+nickname = pl_hessian_gunship_turret01
+ids_name = 459551; !pl_he_cruiser_turret01_info
+ids_info = 459552; !pl_li_cruiser_turret02_info
+DA_archetype = equipment\models\turret\br_gunboat_gun02.cmp
+material_library = equipment\models\br_turret.mat
+HP_child = HPConnect
+hit_pts = 25000
+explosion_resistance = 0.500000
+debris_type = debris_turret_med
+parent_impulse = 20
+child_impulse = 80
+volume = 100.000000
+mass = 10
+damage_per_fire = 0
+power_usage = 400
+refire_delay = 0.250000
+muzzle_velocity = 800
+toughness = 43.010370
+flash_particle_name = pi_capgun_01_flash
+flash_radius = 15
+light_anim = l_gun01_flash
+projectile_archetype = pl_hessian_gunship_turret01_ammo
+separation_explosion = sever_debris
+auto_turret = true
+turn_rate = 30
+lootable = true
+LODranges = 0, 20, 40, 80, 100
+hp_gun_type = hp_turret_special_10
+
+[Munition]
+nickname = pl_hessian_gunship_turret01_ammo
+hp_type = hp_gun
+requires_ammo = false
+hit_pts = 2
+hull_damage = 1250
+energy_damage = 125
+one_shot_sound = fire_capship
+munition_hit_effect = pi_capgun_01_impact
+const_effect = hessian_m_gunboat_proj
+weapon_type = W_Pi_Capship
+lifetime = 2.00000
+force_gun_ori = false
+mass = 1
+volume = 0.000100
+
+; ================================
+; Player Rogue Gunship Turret
+; ================================
+
+[Gun]
+nickname = pl_rogue_gunship_turret01
+ids_name = 459549; !pl_he_cruiser_turret01_info
+ids_info = 459550; !pl_li_cruiser_turret02_info
+DA_archetype = equipment\models\turret\ku_gunboat_gun01.cmp
+material_library = equipment\models\ku_turret.mat
+HP_child = HPConnect
+hit_pts = 25000
+explosion_resistance = 0.500000
+debris_type = debris_turret_med
+parent_impulse = 20
+child_impulse = 80
+volume = 100.000000
+mass = 10
+damage_per_fire = 0
+power_usage = 800
+refire_delay = 0.500000
+muzzle_velocity = 800
+toughness = 43.010370
+flash_particle_name = pi_capgun_01_flash
+flash_radius = 15
+light_anim = l_gun01_flash
+projectile_archetype = pl_rogue_gunship_turret01_ammo
+separation_explosion = sever_debris
+auto_turret = true
+turn_rate = 30 
+lootable = true
+LODranges = 0, 20, 40, 80, 100
+hp_gun_type = hp_turret_special_10
+
+[Munition]
+nickname = pl_rogue_gunship_turret01_ammo
+hp_type = hp_gun
+requires_ammo = false
+hit_pts = 2
+hull_damage = 2500
+energy_damage = 250
+one_shot_sound = fire_capship
+munition_hit_effect = pi_capgun_01_impact
+const_effect = rogue_m_gunboat_proj
+weapon_type = W_Pi_Capship
+lifetime = 2.00000
+force_gun_ori = false
+mass = 1
+volume = 0.000100
+
+; ================================
+; Player Liberty Cruiser Turret
+; ================================
+
+[Gun]
+nickname = pl_liberty_cruiser_turret01
+ids_name = 459553; !pl_he_cruiser_turret01_info
+ids_info = 459554; !pl_li_cruiser_turret02_info
+DA_archetype         = equipment\models\turret\li_turret05b.cmp
+material_library     = equipment\models\li_turret.mat
+HP_child             = HPConnect
+hit_pts              = 25000
+explosion_resistance = 0.500000
+debris_type          = debris_turret_med
+hp_gun_type          = hp_turret_special_10
+parent_impulse       = 20
+child_impulse        = 80
+volume               = 0.000000
+mass                 = 10
+damage_per_fire      = 0
+power_usage          = 400
+refire_delay         = 0.250000
+muzzle_velocity      = 1000
+toughness            = 43.010370
+flash_radius         = 15
+light_anim           = l_gun01_flash
+projectile_archetype = pl_liberty_cruiser_turret01_ammo
+separation_explosion = sever_debris
+auto_turret          = true
+turn_rate            = 30
+lootable             = false
+
+[Munition]
+nickname = pl_liberty_cruiser_turret01_ammo
+hp_type = hp_gun
+requires_ammo = false
+hit_pts = 2
+hull_damage = 2000
+energy_damage = 250
+one_shot_sound      = fire_capship
+munition_hit_effect = li_laser_01_impact
+const_effect        = li_capgun_01_proj
+weapon_type         = W_Li_Capship
+lifetime            = 2.000000
+force_gun_ori       = false
+mass                = 1
+volume              = 0.000100
+
+; ================================
+; Player Rheinland Gunboat Turret
+; ================================
+
+[Gun]
+nickname = pl_rheinland_gunboat_turret01
+ids_name = 459555
+ids_info = 459556
+DA_archetype         = equipment\models\turret\rh_gunboat_gun02.cmp
+material_library     = equipment\models\rh_turret.mat
+HP_child             = HPConnect
+hit_pts              = 25000
+explosion_resistance = 0.500000
+debris_type          = debris_turret_med
+hp_gun_type          = hp_turret_special_10
+parent_impulse       = 20
+child_impulse        = 80
+volume               = 0.000000
+mass                 = 10
+damage_per_fire      = 0
+power_usage          = 400
+refire_delay         = 0.50000
+muzzle_velocity      = 1000
+toughness            = 43.010370
+flash_particle_name  = rh_capgun_01_flash
+flash_radius         = 15
+light_anim           = l_gun01_flash
+projectile_archetype =  pl_rheinland_gunboat_turret01_ammo
+separation_explosion = sever_debris
+auto_turret          = true
+turn_rate            = 30
+lootable             = false
+
+[Munition]
+nickname =  pl_rheinland_gunboat_turret01_ammo
+hp_type = hp_gun
+requires_ammo = false
+hit_pts = 2
+hull_damage = 4000
+energy_damage = 500
+one_shot_sound      = fire_capship
+munition_hit_effect = rh_capgun_01_impact
+const_effect        = rh_gunboat_maingun
+weapon_type         = W_Rh_Capship
+lifetime            = 2.000000
+force_gun_ori       = false
+mass                = 1
+volume              = 0.000100
+

DATA/EQUIPMENT/weapon_good.ini

@@ -5731,3 +5731,51 @@ ids_name = 459497; !~admin_gun01_name
 ids_info = 459498; !~admin_gun01_info
 shop_archetype = equipment\models\weapons\ge_shredder_shotgun.cmp
 material_library = equipment\models\ge_equip.mat
+
+[Good]
+nickname = pl_hessian_gunship_turret01
+equipment = pl_hessian_gunship_turret01
+category = equipment
+price = 400000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_capturret.3db
+combinable = false
+ids_name = 459551
+ids_info = 459552
+DA_archetype = equipment\models\turret\li_turret05b.cmp
+material_library = equipment\models\li_turret.mat
+
+[Good]
+nickname = pl_rogue_gunship_turret01
+equipment = pl_rogue_gunship_turret01
+category = equipment
+price = 400000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_capturret.3db
+combinable = false
+ids_name = 459549
+ids_info = 459550
+DA_archetype = equipment\models\turret\ku_gunboat_gun01.cmp
+material_library = equipment\models\ku_turret.mat
+
+[Good]
+nickname = pl_liberty_cruiser_turret01
+equipment = pl_liberty_cruiser_turret01
+category = equipment
+price = 400000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_capturret.3db
+combinable = false
+ids_name = 459553
+ids_info = 459554
+DA_archetype = equipment\models\turret\li_turret05b.cmp
+material_library = equipment\models\li_turret.mat
+
+[Good]
+nickname = pl_rheinland_gunboat_turret01
+equipment = pl_rheinland_gunboat_turret01
+category = equipment
+price = 400000
+item_icon = equipment\models\commodities\nn_icons\EQUIPICON_capturret.3db
+combinable = false
+ids_name = 459555
+ids_info = 459556
+DA_archetype         = equipment\models\turret\rh_gunboat_gun02.cmp
+material_library     = equipment\models\rh_turret.mat

DATA/FX/beam_effects.ini

@@ -1421,3 +1421,44 @@ trail_brightness = 0.75
 head_texture = star
 trail_texture = thin
 flash_size = 1
+
+; =============================
+; Liberty Rogues Gunship Beam Effect
+; =============================
+
+[BeamSpear]
+nickname = rogue_m_gunboat_beam
+tip_length = 40
+tail_length = 30
+head_width = 4
+core_width = 5
+tip_color = 210, 80, 80
+core_color = 225, 20, 20
+outter_color = 225, 30, 30
+tail_color = 210, 100, 100
+head_brightness = 3
+trail_brightness = 0.8
+head_texture = ball
+trail_texture = thin
+flash_size = 4
+
+; =================================
+; Red Hessian Gunship Beam Effect
+; =================================
+
+[BeamSpear]
+nickname = hessian_m_gunboat_beam
+tip_length = 5
+tail_length = 5
+head_width = 3
+core_width = 7
+tip_color = 225, 35, 35
+core_color = 225, 30, 30
+outter_color = 225, 20, 20
+tail_color = 210, 25, 25
+head_brightness = 2
+trail_brightness = 0.8
+head_texture = ball
+trail_texture = thin
+flash_size = 4
+

DATA/FX/effects.ini

@@ -3477,3 +3477,17 @@ vis_beam = li_gun06_04_beam
 nickname = rs_gun_proj
 effect_type = EFT_WEAPON_PROJ
 vis_beam = rs_gun_beam
+
+; Pirate Gunship Weapon Effects
+
+[Effect]
+nickname = rogue_m_gunboat_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = xeno_gun01_mark02_beam
+vis_beam = rogue_m_gunboat_beam
+
+[Effect]
+nickname = hessian_m_gunboat_proj
+effect_type = EFT_WEAPON_PROJ
+vis_effect = pi_particle_02_proj
+vis_beam = hessian_m_gunboat_beam

DATA/MISSIONS/empathy.ini

@@ -52,7 +52,7 @@ empathy_rate = fc_uk_grp, 0
 empathy_rate = fc_n_grp, 0
 empathy_rate = fc_ln_grp, 0
 empathy_rate = fc_kn_grp, 0
-empathy_rate = fc_rn_grp, -0.0005
+empathy_rate = fc_rn_grp, -0.0010
 empathy_rate = fc_ouk_grp, 0
 empathy_rate = fc_q_grp, 0
 empathy_rate = gd_im_grp, 0
@@ -477,7 +477,7 @@ empathy_rate = fc_or_grp, 0
 empathy_rate = gd_gm_grp, 0
 empathy_rate = fc_uk_grp, 0
 empathy_rate = fc_n_grp, 0
-empathy_rate = fc_ln_grp, -0.0005
+empathy_rate = fc_ln_grp, -0.0010
 empathy_rate = fc_kn_grp, 0
 empathy_rate = fc_rn_grp, 0
 empathy_rate = fc_ouk_grp, 0

DATA/RANDOMMISSIONS/Diff2Money.ini

@@ -1,25 +1,5 @@
 [Diff2Money]
 Diff2Money = 0, 1015
-Diff2Money = 0.082100, 1350
-Diff2Money = 0.112380, 1650
-Diff2Money = 0.205130, 1991
-Diff2Money = 0.351000, 2414
-Diff2Money = 0.480490, 2939
-Diff2Money = 0.657740, 3594
-Diff2Money = 0.900380, 4415
-Diff2Money = 1.232530, 5448
-Diff2Money = 1.687200, 6751
-Diff2Money = 2.309610, 8401
-Diff2Money = 3.161630, 10495
-Diff2Money = 4.327960, 13163
-Diff2Money = 5.924540, 16570
-Diff2Money = 8.110100, 20928
-Diff2Money = 11.101920, 26517
-Diff2Money = 15.197410, 33696
-Diff2Money = 20.803740, 42935
-Diff2Money = 28.478239, 57246
-Diff2Money = 38.983860, 73118
-Diff2Money = 53.365002, 93597
-Diff2Money = 73.051361, 120051
-Diff2Money = 100.000000, 146192
+Diff2Money = 2.5, 2500
+Diff2Money = 100.000000, 150000
 

DATA/RANDOMMISSIONS/NpcRankToDiff.ini

@@ -1,27 +1,22 @@
 [RankAndFormationSizeToDifficulty]
-NpcRank = 1, 0.009850, 0.035690, 0.077540, 0.135390, 0.209230, 0.299080, 0.404930, 0.526770
-NpcRank = 2, 0.018450, 0.066880, 0.145300, 0.253700, 0.392080, 0.560440, 0.758790, 0.987120
-NpcRank = 3, 0.034570, 0.125330, 0.272280, 0.475400, 0.734710, 1.050210, 1.421880, 1.849740
-NpcRank = 4, 0.064790, 0.234860, 0.510210, 0.890850, 1.376770, 1.967970, 2.664450, 3.466210
-NpcRank = 5, 0.121410, 0.440100, 0.956080, 1.669350, 2.579900, 3.687750, 4.992870, 6.495290
-NpcRank = 6, 0.227500, 0.824700, 1.791590, 3.128170, 4.834450, 6.910420, 9.356080, 12.171400
-NpcRank = 7, 0.426320, 1.545400, 3.357240, 5.861840, 9.059210, 12.949300, 17.532200, 22.807899
-NpcRank = 8, 0.798870, 2.895900, 6.291090, 10.984400, 16.975901, 24.265600, 32.853401, 42.739399
-NpcRank = 9, 1.496990, 5.426580, 11.788700, 20.583500, 31.811001, 45.471001, 61.563599, 80.088799
-NpcRank = 10, 2.805190, 10.168800, 22.090799, 38.571301, 59.610199, 85.207497
-NpcRank = 11, 10.168800, 22.090799, 38.571301, 59.610199, 85.207497
-NpcRank = 12, 22.090799, 38.571301, 59.610199, 85.207497
-NpcRank = 13, 38.571301, 59.610199, 85.207497
-NpcRank = 14, 38.571301, 59.610199, 85.207497
-NpcRank = 15, 38.571301, 59.610199, 85.207497
-NpcRank = 16, 38.571301, 59.610199, 85.207497
-NpcRank = 17, 38.571301, 59.610199, 85.207497
-NpcRank = 18, 38.571301, 59.610199, 85.207497
-NpcRank = 19, 38.571301, 59.610199, 85.207497
-NpcRank = 20, 38.571301, 59.610199, 85.207497
-NpcRank = 21, 38.571301, 59.610199, 85.207497
-NpcRank = 22, 38.571301, 59.610199, 85.207497
-NpcRank = 23, 38.571301, 59.610199, 85.207497
-NpcRank = 24, 38.571301, 59.610199, 85.207497
-NpcRank = 25, 38.571301, 59.610199, 85.207497
-
+NpcRank = 1, 2.544, 2.544, 5.088, 7.632, 10.176, 12.720, 15.264, 17.808
+NpcRank = 2, 2.544, 2.544, 5.088, 7.632, 10.176, 12.720, 15.264, 17.808
+NpcRank = 3, 2.544, 2.544, 5.088, 7.632, 10.176, 12.720, 15.264, 17.808
+NpcRank = 4, 3.072, 3.072, 6.144, 9.216, 12.288, 15.360, 18.432, 21.504
+NpcRank = 5, 3.264, 3.264, 6.528, 9.792, 13.056, 16.320, 19.584, 22.848
+NpcRank = 6, 3.488, 3.488, 6.976, 10.464, 13.952, 17.440, 20.928, 24.416
+NpcRank = 7, 3.904, 3.904, 7.808, 11.712, 15.616, 19.520, 23.424, 27.328
+NpcRank = 8, 4.160, 4.160, 8.320, 12.480, 16.640, 20.800, 24.960, 29.120
+NpcRank = 9, 4.400, 4.400, 9.064, 13.096, 17.128, 22.160, 26.192, 30.224
+NpcRank = 10, 4.672, 4.672, 9.344, 14.016, 18.688, 23.360, 28.032, 32.704
+NpcRank = 11, 7.096, 7.096, 14.192, 21.288, 28.384, 35.480, 42.576, 49.672
+NpcRank = 12, 7.096, 7.096, 14.192, 21.288, 28.384, 35.480, 42.576, 49.672
+NpcRank = 13, 7.096, 7.096, 14.192, 21.288, 28.384, 35.480, 42.576, 49.672
+NpcRank = 14, 7.480, 7.480, 14.960, 22.440, 29.920, 37.400, 44.880, 52.360
+NpcRank = 15, 9.120, 9.120, 18.240, 27.360, 36.480, 45.600, 54.720, 63.840
+NpcRank = 16, 9.312, 9.312, 18.624, 27.936, 37.248, 46.560, 55.872, 65.184
+NpcRank = 17, 9.504, 9.504, 19.008, 28.512, 38.016, 47.520, 57.024, 66.528
+NpcRank = 18, 9.952, 9.952, 19.904, 29.856, 39.808, 49.760, 59.712, 69.664
+NpcRank = 19, 10.976, 10.976, 21.952, 32.928, 43.904, 54.880, 65.856, 76.832
+NpcRank = 20, 12.688, 12.688, 25.376, 38.064, 50.752, 63.440, 76.128, 88.816
+NpcRank = 21, 15.000, 15.000, 30.000, 50.000, 70.00

DATA/SCRIPTS/Vendor/li_commtrader_fidget.thn

@@ -1,436 +0,0 @@
-duration=95.711
-
-entities={
-	{
-		entity_name="Layer_li_commtrader_fidget",
-		type=SCENE,
-		template_name="",
-		lt_grp=0,
-		srt_grp=0,
-		usr_flg=0,
-		spatialprops={
-			pos={
-				0,
-				0,
-				0
-			},
-			orient={
-				{
-					1,
-					0,
-					0
-				},
-				{
-					0,
-					1,
-					0
-				},
-				{
-					0,
-					0,
-					1
-				}
-			}
-		},
-		up=Y_AXIS,
-		front=Z_AXIS,
-		ambient={
-			128,
-			128,
-			128
-		}
-	},
-	{
-		entity_name="Char_li_commtrader",
-		type=DEFORMABLE,
-		template_name="li_manhattan_commtrader",
-		lt_grp=0,
-		srt_grp=0,
-		usr_flg=0,
-		flags=LIT_DYNAMIC,
-		spatialprops={
-			pos={
-				0,
-				0,
-				0
-			},
-			orient={
-				{
-					1,
-					0,
-					0
-				},
-				{
-					0,
-					1,
-					0
-				},
-				{
-					0,
-					0,
-					1
-				}
-			}
-		},
-		compoundprops={
-			floor_height=0
-		},
-		userprops={
-			actor="li_commtrader",
-			category="Character"
-		}
-	},
-	{
-		entity_name="Special/A",
-		type=MARKER,
-		template_name="",
-		lt_grp=0,
-		srt_grp=0,
-		usr_flg=0,
-		spatialprops={
-			pos={
-				0,
-				0.972928,
-				0
-			},
-			orient={
-				{
-					1,
-					0,
-					0
-				},
-				{
-					0,
-					1,
-					0
-				},
-				{
-					0,
-					0,
-					1
-				}
-			}
-		}
-	}
-}
-
-events={
-	{
-		0,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLHAND_WALK_TALK_LEFT_CASL_000LV_XA_%",
-			duration=98.011,
-			time_scale=0.6,
-			weight=1,
-			heading=-1,
-			event_flags=2
-		}
-	},
-	{
-		0,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLHAND_WALK_TALK_RGHT_CASL_000LV_XA_%",
-			duration=98.011,
-			time_scale=0.6,
-			weight=1,
-			heading=-1,
-			event_flags=2
-		}
-	},
-	{
-		0,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			trans_time=1,
-			time_scale=1,
-			weight=1,
-			heading=-1,
-			event_flags=2
-		}
-	},
-	{
-		5.033,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_SHRG_SHLDRS_BIG_000LV_XA_03",
-			duration=3.333,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		8.366,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_LOOK_AROU_000LV_XA_09",
-			duration=13.809,
-			time_scale=0.7,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		22.175,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		27.208,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			trans_time=4,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		32.241,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_GESTR_COME_000LV_XA_02",
-			duration=2.266,
-			time_scale=0.8,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		34.507,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_GSTREXPN_SWPNG_LT2RT_000LV_XA_04",
-			duration=4.333,
-			trans_time=1,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		38.84,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		39.373,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_LOOK_WATC_IMPA_000LV_A_23",
-			duration=23.5,
-			trans_time=4,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		61.123,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			trans_time=2,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		66.15600000000001,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_TILT_HEAD_QUZZCLLY_000LV_XA_03",
-			duration=3.791,
-			time_scale=0.8,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		69.947,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_SHRG_SHLDRS_SMALL_000LV_XA_01",
-			duration=2,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		71.947,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		76.979,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_LOOK_AROU_CASL_000LV_XA_08",
-			duration=8.666,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		84.59999999999999,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLHAND_WALK_TALK_LEFT_CASL_000LV_XA_%",
-			duration=11.111,
-			trans_time=1,
-			time_scale=0.6,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		84.59999999999999,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLHAND_WALK_TALK_RGHT_CASL_000LV_XA_%",
-			duration=11.111,
-			trans_time=1,
-			time_scale=0.6,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		85.646,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.033,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		90.678,
-		START_MOTION,
-		{
-			"Char_li_commtrader"
-		},
-		{
-			animation="Sc_MLBODY_STND_IDLE_BIG_000LV_xa_05",
-			duration=5.032,
-			time_scale=1,
-			weight=1,
-			heading=-1
-		}
-	},
-	{
-		91.70999999999999,
-		START_SPATIAL_PROP_ANIM,
-		{
-			"Char_li_commtrader",
-			"Special/A"
-		},
-		{
-			duration=4,
-			target_part="",
-			target_type=ROOT,
-			spatialprops={
-				pos={
-					0,
-					0.972928,
-					0
-				},
-				q_orient={
-					1,
-					0,
-					0,
-					0
-				}
-			}
-		}
-	}
-}
-
-

DATA/SHIPS/shiparch.ini

@@ -2080,6 +2080,7 @@ HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 shield_link = b_freighter_shield01, HpMount, HpShield01
 hp_type = hp_turret_special_5, HpWeapon01, HpWeapon02, HpWeapon03, HpTurret01, HpTurret02, HpTurret03, HpTurret04, HpTurret05
+hp_type = hp_turret_special_10, HpTurret03
 hp_type = hp_fighter_shield_special_6, HpShield01
 hp_type = hp_elite_shield_special_6, HpShield01
 hp_type = hp_freighter_shield_special_6, HpShield01
@@ -3436,6 +3437,7 @@ HP_bay_surface = HpBayDoor01
 HP_bay_external = HpBayDoor02
 shield_link = k_freighter_shield01, HpMount, HpShield01
 hp_type = hp_turret_special_4, HpWeapon01, HpWeapon02, HpTurret01, HpTurret02, HpTurret03, HpTurret04, HpTurret05, HpTurret06
+hp_type = hp_turret_special_10, HpTurret06
 hp_type = hp_fighter_shield_special_7, HpShield01
 hp_type = hp_elite_shield_special_7, HpShield01
 hp_type = hp_freighter_shield_special_7, HpShield01
@@ -7573,14 +7575,14 @@ HP_bay_surface = HpBayDoor01
 HP_bay_external = HpBayDoor02
 shield_link = co_elite2_shield01, HpMount, HpShield01
 hp_type = hp_turret_special_6, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpTurret01, HpTorpedo01
-hp_type = hp_turret_special_7, HpWeapon01, HpWeapon02, HpTorpedo01
+hp_type = hp_turret_special_7, HpWeapon01, HpWeapon02, HpTorpedo01, HpWeapon05, HpWeapon06
 hp_type = hp_turret_special_8, HpWeapon01, HpWeapon02
 hp_type = hp_fighter_shield_special_3, HpShield01
 hp_type = hp_elite_shield_special_3, HpShield01
 hp_type = hp_freighter_shield_special_3, HpShield01
-hp_type = hp_thruster, HpThruster01
-hp_type = hp_mine_dropper, HpCM01, HpMine01
-hp_type = hp_countermeasure_dropper, HpCM01, HpMine01
+hp_type = hp_thruster, HpCM01, HpMine01
+hp_type = hp_mine_dropper, HpThruster01
+hp_type = hp_countermeasure_dropper, HpThruster01
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 3
 
@@ -7695,7 +7697,7 @@ HP_bay_surface = HpBayDoor01
 HP_bay_external = HpBayDoor02
 shield_link = co_elite2_shield01, HpMount, HpShield01
 hp_type = hp_turret_special_6, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpTurret01, HpTorpedo01
-hp_type = hp_turret_special_7, HpWeapon01, HpWeapon02, HpTorpedo01
+hp_type = hp_turret_special_7, HpWeapon01, HpWeapon02, HpTorpedo01, HpWeapon05, HpWeapon06
 hp_type = hp_turret_special_8, HpWeapon01, HpWeapon02
 hp_type = hp_fighter_shield_special_3, HpShield01
 hp_type = hp_elite_shield_special_3, HpShield01
@@ -7703,9 +7705,6 @@ hp_type = hp_freighter_shield_special_3, HpShield01
 hp_type = hp_thruster, HpCM01, HpMine01
 hp_type = hp_mine_dropper, HpThruster01
 hp_type = hp_countermeasure_dropper, HpThruster01
-;hp_type = hp_thruster, HpThruster01
-;hp_type = hp_mine_dropper, HpCM01, HpMine01
-;hp_type = hp_countermeasure_dropper, HpCM01, HpMine01
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
 
@@ -8633,16 +8632,16 @@ HP_bay_surface = HpBayDoor01
 HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
-shield_link = cv_fighter6_shield01, HpMount, HpShield01
-hp_type = hp_turret_special_1, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpTurret01, HpTorpedo01
+shield_link = cv_fighter6_shield01, HpMount, HpCloak01
+hp_type = hp_turret_special_1, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpShield01, HpTorpedo01
 hp_type = hp_turret_special_2, HpWeapon01, HpWeapon02, HpWeapon05, HpWeapon06, HpTorpedo01
 hp_type = hp_turret_special_3, HpWeapon01, HpWeapon02
-hp_type = hp_fighter_shield_special_1, HpShield01
-hp_type = hp_elite_shield_special_1, HpShield01
-hp_type = hp_freighter_shield_special_1, HpShield01
-hp_type = hp_thruster, HpThruster01
-hp_type = hp_mine_dropper, HpMine01, HpCM01
-hp_type = hp_countermeasure_dropper, HpCM01, HpMine01
+hp_type = hp_fighter_shield_special_1, HpCloak01
+hp_type = hp_elite_shield_special_1, HpCloak01
+hp_type = hp_freighter_shield_special_1, HpCloak01
+hp_type = hp_thruster, HpCM01, HpMine01
+hp_type = hp_mine_dropper, HpThruster01
+hp_type = hp_countermeasure_dropper, HpThruster01
 
 [CollisionGroup]
 obj = cv_port_wing_lod1
@@ -8755,19 +8754,16 @@ HP_bay_surface = HpBayDoor01
 HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source
 num_exhaust_nozzles = 2
-shield_link = cv_fighter6_shield01, HpMount, HpShield01
-hp_type = hp_turret_special_1, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpTurret01, HpTorpedo01
+shield_link = cv_fighter6_shield01, HpMount, HpCloak01
+hp_type = hp_turret_special_1, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04, HpWeapon05, HpWeapon06, HpShield01, HpTorpedo01
 hp_type = hp_turret_special_2, HpWeapon01, HpWeapon02, HpWeapon05, HpWeapon06, HpTorpedo01
 hp_type = hp_turret_special_3, HpWeapon01, HpWeapon02
-hp_type = hp_fighter_shield_special_1, HpShield01
-hp_type = hp_elite_shield_special_1, HpShield01
-hp_type = hp_freighter_shield_special_1, HpShield01
+hp_type = hp_fighter_shield_special_1, HpCloak01
+hp_type = hp_elite_shield_special_1, HpCloak01
+hp_type = hp_freighter_shield_special_1, HpCloak01
 hp_type = hp_thruster, HpCM01, HpMine01
 hp_type = hp_mine_dropper, HpThruster01
 hp_type = hp_countermeasure_dropper, HpThruster01
-;hp_type = hp_thruster, HpThruster01
-;hp_type = hp_mine_dropper, HpMine01, HpCM01
-;hp_type = hp_countermeasure_dropper, HpCM01, HpMine01
 
 [CollisionGroup]
 obj = cv_port_wing_lod1
@@ -9783,6 +9779,7 @@ shield_link = bw_freighter_shield01, HpMount, HpShield01
 hp_type = hp_turret_special_6, HpTurret01, HpTurret02, HpTurret03, HpTurret04, HpTurret05, HpWeapon01, HpWeapon02, HpWeapon03
 hp_type = hp_turret_special_7, HpWeapon01, HpWeapon02, HpWeapon03
 hp_type = hp_turret_special_8, HpWeapon01, HpWeapon02, HpWeapon03
+hp_type = hp_turret_special_10, HpTurret05
 hp_type = hp_fighter_shield_special_3, HpShield01
 hp_type = hp_elite_shield_special_3, HpShield01
 hp_type = hp_freighter_shield_special_3, HpShield01