diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_blue.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_blue.3db new file mode 100644 index 00000000..f05e25f5 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_blue.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_drab.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_drab.3db new file mode 100644 index 00000000..7c9ccdee Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_drab.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_green.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_green.3db new file mode 100644 index 00000000..f0056b0b Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_green.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_grey.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_grey.3db new file mode 100644 index 00000000..130861c9 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_grey.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_red.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_red.3db new file mode 100644 index 00000000..c0951111 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_red.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_white.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_white.3db new file mode 100644 index 00000000..1f86e776 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_white.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_yellow.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_yellow.3db new file mode 100644 index 00000000..606863d4 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/crate_yellow.3db differ diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini index 42f325aa..63debbf0 100644 --- a/DATA/EQUIPMENT/goods.ini +++ b/DATA/EQUIPMENT/goods.ini @@ -2362,7 +2362,7 @@ nickname = package_bh_elite3 category = ship hull = bh_elite3_hull addon = ge_bhe2_engine_01, internal, 1 -addon = bh_elite2_power01, internal, 1 +addon = ge_fighter6_power01, internal, 1 addon = ge_s_scanner_01, internal, 1 addon = ge_s_tractor_01, internal, 1 addon = shield01_mark07_hf, HpShield01, 1 @@ -2484,10 +2484,10 @@ addon = DockingLightRed, HpDockLight02, 1 addon = DockingLightRed, HpDockLight03, 1 addon = LargeWhiteSpecial, HpHeadLight01, 1 addon = LargeWhiteSpecial, HpHeadLight02, 1 -addon = cargopod_drab, HpCargo01, 1 -addon = cargopod_drab, HpCargo02, 1 -addon = cargopod_drab, HpCargo03, 1 -addon = cargopod_drab, HpCargo04, 1 +addon = rem_cargopod_drab, HpCargo01, 1 +addon = rem_cargopod_drab, HpCargo02, 1 +addon = rem_cargopod_drab, HpCargo03, 1 +addon = rem_cargopod_drab, HpCargo04, 1 addon = contrail01, HpContrail01, 1 addon = contrail01, HpContrail02, 1 @@ -2595,8 +2595,8 @@ addon = DockingLightRed, HpDockLight02, 1 addon = DockingLightRed, HpDockLight03, 1 addon = LargeWhiteSpecial, HpHeadLight01, 1 addon = LargeWhiteSpecial, HpHeadLight02, 1 -addon = cargopod_drab, HpCargo01, 1 -addon = cargopod_drab, HpCargo02, 1 +addon = rem_cargopod_drab, HpCargo01, 1 +addon = rem_cargopod_drab, HpCargo02, 1 ; Orca Freighter diff --git a/DATA/EQUIPMENT/st_equip.ini b/DATA/EQUIPMENT/st_equip.ini index 14d4e30a..2206a0b0 100644 --- a/DATA/EQUIPMENT/st_equip.ini +++ b/DATA/EQUIPMENT/st_equip.ini @@ -4063,3 +4063,241 @@ separation_explosion = sever_debris LODranges = 0, 999999 lootable = true +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_blue +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_blue.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_green +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_green.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_yellow +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_yellow.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_red +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_red.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_grey +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_grey.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_white +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_white.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + +;Cargopods +[ShieldGenerator] +nickname = rem_cargopod_drab +ids_name = 266756 +ids_info = 266756 +DA_archetype = Equipment\models\commodities\crates\pod_drab.3db +material_library = Equipment\models\cargo_pods.mat +HP_child = HpConnect +hit_pts = 8000 +mass = 2000 +explosion_resistance = 0.300000 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0.000000 +regeneration_rate = 0 +max_capacity = 0 +toughness = 0 +hp_type = hp_freighter_shield_special_1 +offline_rebuild_time = 0 +offline_threshold = 0.000000 +constant_power_draw = 0 +rebuild_power_draw = 0 +shield_type = S_Graviton01 +shield_collapse_sound = shield_offline +shield_rebuilt_sound = shield_rebuilt +shield_hit_effects = 0, gf_li_shield01 +shield_hit_effects = 100, gf_li_shield02 +shield_hit_effects = 500, gf_li_shield03 +separation_explosion = sever_debris +LODranges = 0, 1500 +lootable = true +phantom_physics = true + diff --git a/DATA/EQUIPMENT/st_good.ini b/DATA/EQUIPMENT/st_good.ini index 6132a4df..e3a6e263 100644 --- a/DATA/EQUIPMENT/st_good.ini +++ b/DATA/EQUIPMENT/st_good.ini @@ -1521,3 +1521,86 @@ ids_info = 264879 shop_archetype = equipment\models\st\li_refractor_shield.3db material_library = equipment\models\li_equip.mat +;Cargopods +[Good] +nickname = rem_cargopod_blue +equipment = rem_cargopod_blue +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_blue.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_green +equipment = rem_cargopod_green +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_green.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_yellow +equipment = rem_cargopod_yellow +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_yellow.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_red +equipment = rem_cargopod_red +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_red.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_grey +equipment = rem_cargopod_grey +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_grey.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_white +equipment = rem_cargopod_white +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_white.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db + +;Cargopods +[Good] +nickname = rem_cargopod_drab +equipment = rem_cargopod_drab +category = equipment +price = 30000 +item_icon = equipment\models\commodities\nn_icons\crate_drab.3db +combinable = false +ids_name = 266756 +ids_info = 266756 +shop_archetype = equipment\models\commodities\crates\crate_grey.3db \ No newline at end of file diff --git a/DATA/SHIPS/loadouts.ini b/DATA/SHIPS/loadouts.ini index 6c678f48..74d5e62e 100644 --- a/DATA/SHIPS/loadouts.ini +++ b/DATA/SHIPS/loadouts.ini @@ -10078,7 +10078,7 @@ equip = DockingLightRedSmall, HpDockLight02 nickname = MP_li_freighter archetype = li_freighter equip = ge_lfr_engine_01 -equip = shield01_mark01_fr, HpShield01 +equip = shield01_mark02_fr, HpShield01 equip = li_freighter_power01 equip = ge_s_scanner_01 equip = ge_s_tractor_01 diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini index b3e0d97d..3a419522 100644 --- a/DATA/SHIPS/shiparch.ini +++ b/DATA/SHIPS/shiparch.ini @@ -441,7 +441,6 @@ hp_type = hp_gun_special_2, HpWeapon01, HpWeapon02, HpWeapon03 hp_type = hp_gun_special_1, HpWeapon01, HpWeapon02, HpWeapon03 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -1254,7 +1253,6 @@ hp_type = hp_gun_special_1, HpWeapon01, HpWeapon02, HpWeapon03 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -2309,7 +2307,6 @@ hp_type = hp_freighter_shield_special_5, HpShield01 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -3264,7 +3261,6 @@ hp_type = hp_freighter_shield_special_5, HpShield01 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -4399,7 +4395,6 @@ hp_type = hp_gun_special_1, HpWeapon01, HpWeapon02, HpWeapon03, HpWeapon04 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -6247,7 +6242,6 @@ hp_type = hp_freighter_shield_special_5, HpShield01 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 @@ -8427,7 +8421,7 @@ explosion_arch = explosion_cap_ship1 surface_hit_effects = 0, small_hull_hit_light01, small_hull_hit_light02, small_hull_hit_light03 surface_hit_effects = 150, small_hull_hit_medium01, small_hull_hit_medium02, small_hull_hit_medium03 surface_hit_effects = 300, small_hull_hit_heavy01, small_hull_hit_heavy02, small_hull_hit_heavy03 -hp_type = hp_cargo_pod, HpCargo01, HpCargo02, HpCargo03, HpCargo04 +hp_type = hp_freighter_shield_special_1, HpCargo01, HpCargo02, HpCargo03, HpCargo04 steering_torque = 12300000, 12300000, 12300000 angular_drag = 64000000, 64000000, 64000000 rotation_inertia = 2000000, 18000000, 18000000 @@ -8484,7 +8478,6 @@ hp_type = hp_freighter_shield_special_5, HpShield01 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_countermeasure_dropper, HpCM01 hp_type = hp_gun_special_8, HpWeapon01, HpWeapon02 @@ -8716,14 +8709,13 @@ hp_type = hp_turret_special_7, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, H hp_type = hp_turret_special_8, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04, HpTurret_U3_01 hp_type = hp_turret_special_9, HpTurret_U1_01, HpTurret_U1_02, HpTurret_U1_03, HpTurret_U1_04 hp_type = hp_countermeasure_dropper, HpEngine01 -hp_type = hp_cargo_pod, HpCargo01, HpCargo02 +hp_type = hp_freighter_shield_special_1, HpCargo01, HpCargo02 steering_torque = 12300000, 12300000, 12300000 angular_drag = 64000000, 64000000, 64000000 rotation_inertia = 2000000, 18000000, 18000000 nudge_force = 30000.000000 strafe_force = 10000.000000 strafe_power_usage = 2 -hp_type = hp_cargo_pod, HpCargo01, HpCargo02 HP_bay_surface = HpRunningLight08 HP_bay_external = HpMount HP_tractor_source = HpTractor_Source @@ -8850,7 +8842,6 @@ hp_type = hp_freighter_shield_special_5, HpShield01 hp_type = hp_freighter_shield_special_4, HpShield01 hp_type = hp_freighter_shield_special_3, HpShield01 hp_type = hp_freighter_shield_special_2, HpShield01 -hp_type = hp_freighter_shield_special_1, HpShield01 hp_type = hp_thruster, HpThruster01 hp_type = hp_mine_dropper, HpMine01 hp_type = hp_countermeasure_dropper, HpCM01 diff --git a/EXE/equipresources.dll b/EXE/equipresources.dll index 375d2e87..a52ff216 100644 Binary files a/EXE/equipresources.dll and b/EXE/equipresources.dll differ diff --git a/EXE/resources.dll b/EXE/resources.dll index 188f40d8..fcc724b3 100644 Binary files a/EXE/resources.dll and b/EXE/resources.dll differ