diff --git a/DATA/COCKPITS/repairship.ini b/DATA/COCKPITS/repairship.ini new file mode 100644 index 00000000..846f97df --- /dev/null +++ b/DATA/COCKPITS/repairship.ini @@ -0,0 +1,16 @@ +[Cockpit] +mesh = cockpits\bretonia\models\br_elite_cockpit.cmp +int_brightness = 0.500000 +head_turn = 40, 50 + +[CockpitCamera] + + +[TurretCamera] +tether = 0.000000, 10, 67 +yaw_rotate_speed = 2.250000 +pitch_rotate_speed = 1.500000 +accel_speed = 5 + +[RearViewCamera] +view_position = 0, 10, 67 \ No newline at end of file diff --git a/DATA/EQUIPMENT/engine_equip.ini b/DATA/EQUIPMENT/engine_equip.ini index 992434fe..563a3e14 100644 --- a/DATA/EQUIPMENT/engine_equip.ini +++ b/DATA/EQUIPMENT/engine_equip.ini @@ -1546,13 +1546,16 @@ ids_name = 263903 ids_info = 264903 volume = 0 mass = 10 -max_force = 120000 -linear_drag = 3000 +max_force = 48000 +linear_drag = 599 +power_usage = 0 reverse_fraction = 0.1 flame_effect = gf_br_repair_engine01 cruise_charge_time = 5 cruise_power_usage = 20 rumble_sound = rumble_utility_small +rumble_atten_range = -5, 0 +rumble_pitch_range = -25, 25 cruise_start_sound = engine_ci_cruise_start cruise_loop_sound = engine_ci_cruise_loop cruise_stop_sound = engine_ci_cruise_stop @@ -1562,6 +1565,7 @@ indestructible = false outside_cone_attenuation = -3 inside_sound_cone = 90 outside_sound_cone = 270 +lootable = false [Engine] nickname = ge_nf_engine_01 diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini index daa9ec73..16728f64 100644 --- a/DATA/EQUIPMENT/goods.ini +++ b/DATA/EQUIPMENT/goods.ini @@ -2814,4 +2814,30 @@ addon = SlowMediumWhite, HpRunningLight08 addon = contrail01, HpContrail01, 1 addon = contrail01, HpContrail02, 1 addon = DockingLightRedSmall, HpDockLight01, 1 -addon = DockingLightRedSmall, HpDockLight02, 1 \ No newline at end of file +addon = DockingLightRedSmall, HpDockLight02, 1 + +;;Repair Ship +[Good] +nickname = repair_hull +category = shiphull +ship = ge_repair_player +price = 400000 +ids_name = 237048 +item_icon = Equipment\models\commodities\nn_icons\repair_ship.3db + + +[Good] +nickname = repair_package +category = ship +hull = repair_hull +addon = ge_rpr_engine_01, internal, 1 +addon = co_elite2_power01, internal, 1 +addon = ge_s_scanner_01, internal, 1 +addon = ge_s_tractor_01, internal, 1 +addon = LargeWhiteSpecial, HpHeadLight +addon = SlowMediumWhite, HpRunningLight01 +addon = SlowMediumWhite, HpRunningLight02 +addon = SlowMediumWhite, HpRunningLight03 +addon = SlowMediumWhite, HpRunningLight04 +addon = SlowMediumWhite, HpRunningLight05 +addon = SlowMediumWhite, HpRunningLight06 \ No newline at end of file diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini index fea4b032..1ccaa779 100644 --- a/DATA/EQUIPMENT/market_misc.ini +++ b/DATA/EQUIPMENT/market_misc.ini @@ -10743,6 +10743,7 @@ MarketGood = mod_s_tractor_01, 0, -1, 10, 10, 0, 1 [BaseGood] base = Rh01_03_base +MarketGood = rem_repair_turret01, 1, -1, 10, 10, 0, 1 MarketGood = co_gun01_mark03, 2, 0.1, 10, 10, 0, 1 MarketGood = co_gun01_mark04, 16, 0.4, 10, 10, 0, 1 MarketGood = co_gun02_mark02, 2, -0.2, 10, 10, 0, 1 diff --git a/DATA/EQUIPMENT/market_ships.ini b/DATA/EQUIPMENT/market_ships.ini index 31770493..87e9d383 100644 --- a/DATA/EQUIPMENT/market_ships.ini +++ b/DATA/EQUIPMENT/market_ships.ini @@ -220,6 +220,10 @@ marketgood = gf5_package, 24, -1, 1, 1, 0, 1, 1 marketgood = rf_package, 20, -1, 1, 1, 0, 1, 1 marketgood = rfr_package, 20, -1, 1, 1, 0, 1, 1 +[BaseGood] +base = Rh01_03_base +marketgood = repair_package, 24, -1, 1, 1, 0, 1, 1 + [BaseGood] base = Rh02_01_base marketgood = gf5_package, 24, -1, 1, 1, 0, 1, 1 diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini index 5334fa69..3a453f74 100644 --- a/DATA/EQUIPMENT/select_equip.ini +++ b/DATA/EQUIPMENT/select_equip.ini @@ -3884,4 +3884,10 @@ mass = 1e10 HP_child = HpConnect parent_impulse = 0.010000 child_impulse = 0.010000 -debris_type = debris_vanish \ No newline at end of file +debris_type = debris_vanish + +;RepairShip Shield +[Shield] +nickname = Repair_Ship_shield01 +DA_archetype = Ships\UTILITY\REPAIR\repair_shield.3db +HP_child = SpConnect \ No newline at end of file diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini index f8ea5293..107b26ef 100644 --- a/DATA/EQUIPMENT/weapon_equip.ini +++ b/DATA/EQUIPMENT/weapon_equip.ini @@ -31447,3 +31447,49 @@ auto_turret = false turn_rate = 90 lootable = true LODranges = 0, 999999 + +;RepTurret +[Munition] +nickname = rem_repair_turret01_ammo +hp_type = hp_gun +requires_ammo = false +hit_pts = 2 +hull_damage = 800 +energy_damage = -400 +one_shot_sound = fire_capship +munition_hit_effect = ci_capgun_01_impact +const_effect = ci_capgun_01_proj +lifetime = 1.2 +force_gun_ori = false +mass = 1 +volume = 0.0001 + +[Gun] +nickname = rem_repair_turret01 +ids_name = 263521 +ids_info = 264521 +DA_archetype = equipment\models\weapons\co_proton_cooker.cmp +material_library = equipment\models\ge_equip.mat +HP_child = HPConnect +hp_gun_type = hp_turret_special_10 +hit_pts = 9000 +explosion_resistance = 1 +debris_type = debris_turret_small +parent_impulse = 20 +child_impulse = 80 +volume = 0 +mass = 10 +damage_per_fire = 0 +power_usage = 150 +refire_delay = 0.25 +muzzle_velocity = 1000 +toughness = 2.5 +flash_particle_name = ci_capgun_01_flash +flash_radius = 15 +light_anim = l_gun01_flash +projectile_archetype = rem_repair_turret01_ammo +separation_explosion = sever_debris +auto_turret = true +turn_rate = 90 +lootable = true +LODranges = 0, 999999 diff --git a/DATA/EQUIPMENT/weapon_good.ini b/DATA/EQUIPMENT/weapon_good.ini index 19b5d01c..9dda630e 100644 --- a/DATA/EQUIPMENT/weapon_good.ini +++ b/DATA/EQUIPMENT/weapon_good.ini @@ -7651,3 +7651,17 @@ ids_name = 51356 ids_info = 51357 shop_archetype = equipment\models\weapons\co_proton_cooker.cmp material_library = equipment\models\ge_equip.mat + +;RepairTurret + +[Good] +nickname = rem_repair_turret01 +equipment = rem_repair_turret01 +category = equipment +price = 120000 +item_icon = equipment\models\commodities\nn_icons\EQUIPICON_turret.3db +combinable = false +ids_name = 263521 +ids_info = 264521 +shop_archetype = equipment\models\weapons\co_proton_cooker.cmp +material_library = equipment\models\ge_equip.mat diff --git a/DATA/MISSIONS/mbases.ini b/DATA/MISSIONS/mbases.ini index 4d8db2f8..54764f48 100644 --- a/DATA/MISSIONS/mbases.ini +++ b/DATA/MISSIONS/mbases.ini @@ -29096,6 +29096,16 @@ individual_name = 244919 affiliation = co_khc_grp voice = rvp146 +[GF_NPC] +nickname = rh0103_fix_ship +body = rh_shipdealer_body +head = rh_captain_head +lefthand = benchmark_male_hand_left +righthand = benchmark_male_hand_right +individual_name = 245204 +affiliation = co_khc_grp +voice = rvp151 + [GF_NPC] nickname = rh0103_republican_001_m body = rh_reichman_body @@ -29153,6 +29163,11 @@ character_density = 2 fixture = rh0103_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader fixture = rh0103_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment +[MRoom] +nickname = ShipDealer +character_density = 2 +fixture = rh0103_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer + [MBase] nickname = Rh01_04_Base local_faction = co_ic_grp diff --git a/DATA/SHIPS/UTILITY/REPAIR/repair.cmp b/DATA/SHIPS/UTILITY/REPAIR/repair.cmp index 32fc4e2c..ede2a9b0 100644 Binary files a/DATA/SHIPS/UTILITY/REPAIR/repair.cmp and b/DATA/SHIPS/UTILITY/REPAIR/repair.cmp differ diff --git a/DATA/SHIPS/UTILITY/REPAIR/repair_shield.3db b/DATA/SHIPS/UTILITY/REPAIR/repair_shield.3db new file mode 100644 index 00000000..d290c32a Binary files /dev/null and b/DATA/SHIPS/UTILITY/REPAIR/repair_shield.3db differ diff --git a/DATA/SHIPS/UTILITY/REPAIR/repair_shield.sur b/DATA/SHIPS/UTILITY/REPAIR/repair_shield.sur new file mode 100644 index 00000000..03996dbc Binary files /dev/null and b/DATA/SHIPS/UTILITY/REPAIR/repair_shield.sur differ diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini index 1df3155e..42f378cf 100644 --- a/DATA/SHIPS/shiparch.ini +++ b/DATA/SHIPS/shiparch.ini @@ -9043,4 +9043,99 @@ parent_impulse = 60 debris_type = debris_normal fuse = lifter_death_fuse, 0, 1 hit_pts = 400 -root_health_proxy = true \ No newline at end of file +root_health_proxy = true + +;RepairShip +[Ship] +ids_name = 237048 +ids_info = 67003 +ids_info1 = 66595 +ids_info2 = 66608 +ids_info3 = 67004 +ship_class = 2 +nickname = ge_repair_player +LODranges = 0, 999999 +msg_id_prefix = gcs_refer_shiparch_repair +mission_property = can_use_berths +type = FREIGHTER +DA_archetype = ships\utility\repair\repair.cmp +material_library = ships\utility\utility_ships.mat +material_library = fx\envmapbasic.mat +envmap_material = envmapbasic +cockpit = cockpits\repairship.ini +pilot_mesh = generic_pilot +nanobot_limit = 30 +shield_battery_limit = 30 +mass = 400.000000 +hold_size = 250 +linear_drag = 184 +fuse = lifter_death_fuse, 0, 1 +max_bank_angle = 30 +camera_offset = 12, 67 +camera_angular_acceleration = 0.05 +camera_horizontal_turn_angle = 20 +camera_vertical_turn_up_angle = 5 +camera_vertical_turn_down_angle = 20 +camera_turn_look_ahead_slerp_amount = 1 +hit_pts = 30000 +explosion_arch = shatter_utility_small +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 +steering_torque = 50000.000000, 50000.000000, 230000.000000 +angular_drag = 40000.000000, 40000.000000, 141000.000000 +rotation_inertia = 8400.000000, 8400.000000, 8400.000000 +nudge_force = 30000.000000 +strafe_force = 20000 +strafe_power_usage = 2 +bay_door_anim = Sc_open baydoor +bay_doors_open_snd = cargo_doors_open +bay_doors_close_snd = cargo_doors_close +HP_bay_surface = HpBayDoor01 +HP_bay_external = HpBayDoor02 +HP_tractor_source = HpTractor_Source +num_exhaust_nozzles = 2 +shield_link = Repair_Ship_shield01, HpMount, HpShield01 +hp_type = hp_turret_special_10, HpTurret04, HpTurret05 +hp_type = hp_turret_special_9, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_8, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_7, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_6, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_5, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_4, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_3, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_2, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_turret_special_1, HpTurret01, HpTurret02, HpTurret03 +hp_type = hp_freighter_shield_special_10, HpShield01 +hp_type = hp_freighter_shield_special_9, HpShield01 +hp_type = hp_freighter_shield_special_8, HpShield01 +hp_type = hp_freighter_shield_special_7, HpShield01 +hp_type = hp_freighter_shield_special_6, HpShield01 +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_thruster, HpThruster01 +hp_type = hp_countermeasure_dropper, HpCM01 + +[CollisionGroup] +obj = repair_portarm1_lod1 +separable = true +parent_impulse = 10 +child_impulse = 100 +debris_type = debris_vanish +mass = 25 +hit_pts = 26250 +root_health_proxy = false +type = Port_Arm + +[CollisionGroup] +obj = repair_star_arm_lod1 +separable = true +parent_impulse = 10 +child_impulse = 100 +debris_type = debris_vanish +mass = 25 +hit_pts = 26250 +root_health_proxy = false +type = Starboard_Arm \ No newline at end of file diff --git a/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_deck.ini b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_deck.ini index 8724616b..37c9ff90 100644 --- a/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_deck.ini +++ b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_deck.ini @@ -32,6 +32,11 @@ name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM behavior = VirtualRoom room_switch = Equipment +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER_ROOM +behavior = ExitDoor +room_switch = ShipDealer + [Hotspot] name = IDS_NN_REPAIR_YOUR_SHIP behavior = Repair diff --git a/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_shipdealer.ini b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_shipdealer.ini new file mode 100644 index 00000000..2be799cd --- /dev/null +++ b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/ROOMS/rh01_03_shipdealer.ini @@ -0,0 +1,62 @@ +[Room_Info] +set_script = Scripts\Bases\Rh_07_Deck_hardpoint_SDlr.thn +scene = all, ambient, Scripts\Bases\rh_07_Deck_ambi_int_01.thn + +[Spiels] +ShipDealer = manhattan_ship_spiel + +[Camera] +name = Camera_0 + +[Room_Sound] +ambient = ambience_shipbuy + +[CharacterPlacement] +name = Zg/PC/Player/01/A/Stand + +[ForSaleShipPlacement] +name = X/Shipcentre/01 + +[Hotspot] +name = IDS_HOTSPOT_DECK +behavior = ExitDoor +room_switch = Deck + +[Hotspot] +name = IDS_HOTSPOT_BAR +behavior = ExitDoor +room_switch = Bar + +[Hotspot] +name = IDS_HOTSPOT_COMMODITYTRADER_ROOM +behavior = ExitDoor +room_switch = Deck +set_virtual_room = Trader + +[Hotspot] +name = IDS_HOTSPOT_EQUIPMENTDEALER_ROOM +behavior = ExitDoor +room_switch = Deck +set_virtual_room = Equipment + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER_ROOM +behavior = ExitDoor +room_switch = ShipDealer + +[Hotspot] +name = IDS_NN_REPAIR_YOUR_SHIP +behavior = Repair + +[Hotspot] +name = IDS_DEALER_FRONT_DESK +behavior = FrontDesk +state_read = 1 +state_send = 2 + +[Hotspot] +name = IDS_HOTSPOT_SHIPDEALER +behavior = StartShipDealer +state_read = 2 +state_send = 1 + diff --git a/DATA/UNIVERSE/SYSTEMS/RH01/BASES/rh01_03_base.ini b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/rh01_03_base.ini index 921fc50c..a0d4e125 100644 --- a/DATA/UNIVERSE/SYSTEMS/RH01/BASES/rh01_03_base.ini +++ b/DATA/UNIVERSE/SYSTEMS/RH01/BASES/rh01_03_base.ini @@ -10,3 +10,7 @@ file = Universe\Systems\Rh01\Bases\Rooms\Rh01_03_Bar.ini nickname = Deck file = Universe\Systems\Rh01\Bases\Rooms\Rh01_03_Deck.ini +[Room] +nickname = ShipDealer +file = Universe\Systems\Rh01\Bases\Rooms\Rh01_03_ShipDealer.ini + diff --git a/EXE/infocards.dll b/EXE/infocards.dll index 7c0834fa..0990061e 100644 Binary files a/EXE/infocards.dll and b/EXE/infocards.dll differ diff --git a/EXE/nameresources.dll b/EXE/nameresources.dll index 7f0d552d..22e5472b 100644 Binary files a/EXE/nameresources.dll and b/EXE/nameresources.dll differ