Add Dummy NPC

Add ast_interior_base
2025-05-09 20:46:30 +02:00 · 2025-05-07 23:08:19 +02:00
268 changed files with 2372 additions and 9525 deletions
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt05/ast_rock_mt05_asteroid.3db
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt05/ast_rock_mt05_asteroid.3db
--- a/DATA/COCKPITS/NOMAD/MODELS/no2_cockpit.cmp
+++ b/DATA/COCKPITS/NOMAD/MODELS/no2_cockpit.cmp
--- a/DATA/COCKPITS/NOMAD/no2_fighter.ini
+++ b/DATA/COCKPITS/NOMAD/no2_fighter.ini
@@ -1,13 +0,0 @@
 [Cockpit]
 mesh = cockpits\nomad\models\no2_cockpit.cmp
 int_brightness = 0.5
 head_turn = 50, 40
 [CockpitCamera]
 [TurretCamera]
 tether = 0, 9.536, 33.491
 yaw_rotate_speed = 2
 pitch_rotate_speed = 1.5
 accel_speed = 5
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_consumer.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_consumer.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_consumer.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_consumer.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_contraband.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_contraband.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_contraband.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_contraband.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_electronics.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_electronics.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_electronics.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_electronics.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_hightech.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_hightech.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_hightech.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_hightech.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_industrial.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_industrial.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_industrial.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_industrial.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_machines.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_machines.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_machines.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_machines.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_medical.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_medical.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_medical.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_medical.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_munitions.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_munitions.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_munitions.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_munitions.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_rawmats.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_rawmats.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_rawmats.sur
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/CRATES/pod_rawmats.sur
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_battleship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_battleship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_destroyer.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_destroyer.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_gunship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/br_gunship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_battleship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_battleship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_destroyer.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_destroyer.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_gunship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/ku_gunship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/li_cruiser.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/li_cruiser.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/li_dreadnought.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/li_dreadnought.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_battleship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_battleship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_cruiser.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_cruiser.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_gunship.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/rh_gunship.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_athena_orb.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_athena_orb.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_chronos_relic.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_chronos_relic.3db
--- a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_hellios_shard.3db
+++ b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/sm_hellios_shard.3db
--- a/DATA/EQUIPMENT/engine_equip.ini
+++ b/DATA/EQUIPMENT/engine_equip.ini
@@ -1201,7 +1201,7 @@ ids_name = 263887
 ids_info = 264887
 volume = 0
 mass = 10
-max_force = 1200000
+max_force = 300000
 linear_drag = 10000
 reverse_fraction = 0.1
 flame_effect = gf_li_largeengine01_fire
--- a/DATA/EQUIPMENT/fx_equip.ini
+++ b/DATA/EQUIPMENT/fx_equip.ini
@@ -1,38 +0,0 @@
 ; Attached FX
 [AttachedFX]
 nickname = fx_dsy_no2_tentacle_very_large
 particles = dsy_no2_tentacle_very_large
 use_throttle = true
 [AttachedFX]
 nickname = fx_dsy_no2_tentacle_large
 particles = dsy_no2_tentacle_large
 use_throttle = true
 [AttachedFX]
 nickname = fx_dsy_no2_tentacle_medium
 particles = dsy_no2_tentacle_medium
 use_throttle = true
 [AttachedFX]
 nickname = fx_dsy_no2_tentacle_small
 particles = dsy_no2_tentacle_small
 use_throttle = true
 [AttachedFX]
 nickname = fx_dsy_no2_tentacle_small_special
 particles = dsy_no2_tentacle_small_special
 use_throttle = true
 [AttachedFX]
 nickname = fx_dsy_no2_boss_engine
 particles = dsy_no2_bossengine01
 [AttachedFX]
 nickname = fx_dsy_no2_boss_claw
 particles = dsy_no2_bossengine01_claw
 [AttachedFX]
 nickname = fx_dsy_no2_boss_wing
 particles = dsy_no2_bossengine01_wing
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -2830,31 +2830,6 @@ category = equipment
 price = 3000
 combinable = false
 ; Mission Items
 [Good]
 nickname = chronos_relic
 equipment = chronos_relic
 item_icon = Equipment\models\commodities\nn_icons\sm_chronos_relic.3db
 category = equipment
 price = 3000
 combinable = false
 [Good]
 nickname = hellios_shard
 equipment = hellios_shard
 item_icon = Equipment\models\commodities\nn_icons\sm_hellios_shard.3db
 category = equipment
 price = 3000
 combinable = false
 [Good]
 nickname = athena_orb
 equipment = athena_orb
 item_icon = Equipment\models\commodities\nn_icons\sm_athena_orb.3db
 category = equipment
 price = 3000
 combinable = false
 ;; bh_elite3
--- a/DATA/EQUIPMENT/market_misc.ini
+++ b/DATA/EQUIPMENT/market_misc.ini
--- a/DATA/EQUIPMENT/market_ships.ini
+++ b/DATA/EQUIPMENT/market_ships.ini
@@ -1,5 +1,3 @@
 ; New London
 [BaseGood]
 base = Br01_01_base
 marketgood = bf_package, 6, -1, 1, 1, 0, 1, 1
@@ -106,75 +104,49 @@ marketgood = bhe_package, 13, -1, 1, 1, 0, 1, 1
 base = Iw04_02_base
 marketgood = pe_package, 13, -1, 1, 1, 0, 1, 1
 ; New Tokyo
 [BaseGood]
 base = Ku01_01_base
 marketgood = kf_package, 10, -1, 1, 1, 0, 1, 1
 marketgood = kfr_package, 10, -1, 1, 1, 0, 1, 1
 marketgood = bhe_package, 13, -1, 1, 1, 0, 1, 1
 ; Yokohama Shipyard
 [BaseGood]
 base = Ku01_03_base
 marketgood = kugu_package, 16, -1, 1, 1, 0, 1, 1
 ; Myoko
 [BaseGood]
 base = Ku02_02_base
 marketgood = ke_package, 13, -1, 1, 1, 0, 1, 1
 ; Junyo
 [BaseGood]
 base = Ku02_04_base
 marketgood = kfr_package, 10, -1, 1, 1, 0, 1, 1
 ; Kyushu
 [BaseGood]
 base = Ku03_01_base
 marketgood = gf4_package, 13, -1, 1, 1, 0, 1, 1
 marketgood = kf_package, 10, -1, 1, 1, 0, 1, 1
 marketgood = bhe_package, 13, -1, 1, 1, 0, 1, 1
 ; Nagumo
 [BaseGood]
 base = Ku03_03_base
 marketgood = ke_package, 13, -1, 1, 1, 0, 1, 1
 ; Honshu
 [BaseGood]
 base = Ku04_01_base
 marketgood = gf4_package, 13, -1, 1, 1, 0, 1, 1
 marketgood = kf_package, 10, -1, 1, 1, 0, 1, 1
 marketgood = bhe_package, 13, -1, 1, 1, 0, 1, 1
 ; Yukawa Shipyard
 [BaseGood]
 base = Ku04_03_base
-;marketgood = kugu_package, 16, -1, 1, 1, 0, 1, 1
+marketgood = kugu_package, 16, -1, 1, 1, 0, 1, 1
 ; Matsumoto
 [BaseGood]
 base = Ku05_01_base
 marketgood = ke_package, 13, -1, 1, 1, 0, 1, 1
 ; Kyoto
 [BaseGood]
 base = Ku06_01_base
 marketgood = gf4_package, 13, -1, 1, 1, 0, 1, 1
 marketgood = kubd_package, 13, -1, 1,10, 0, 1, 1
 ; Manhattan
 [BaseGood]
 base = Li01_01_base
 marketgood = gf2_package, 4, -1, 1, 1, 0, 1, 1
@@ -186,8 +158,6 @@ base = Li01_02_base
 marketgood = lfr_package, 1, -1, 1, 1, 0, 1, 1
 ; marketgood = cv02_heavy_fighter_package, 1, -1, 1, 1, 0, 1, 1
 ; Battleship Missouri
 [BaseGood]
 base = Li01_03_base
 marketgood = le_package, 2, -1, 1, 1, 0, 1, 1
@@ -200,8 +170,6 @@ marketgood = bwf_package, 4, -1, 1, 1, 0, 1, 1
 base = Li01_13_base
 marketgood = pf_package, 2, -1, 1, 1, 0, 1, 1
 ; Baltimore Shipyard
 [BaseGood]
 base = Li01_14_base
 marketgood = heavylifter_package, 1, -1, 1, 1, 0, 1, 1
@@ -288,26 +256,18 @@ 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
 ; Baden-Baden
 [BaseGood]
 base = Rh03_02_base
 marketgood = gf5_package, 24, -1, 1, 1, 0, 1, 1
 ; Holstein
 [BaseGood]
 base = Rh04_01_base
 marketgood = rfr_package, 20, -1, 1, 1, 0, 1, 1
 ; Bruchsal
 [BaseGood]
 base = Rh04_05_base
 marketgood = bwe_package, 20, -1, 1, 1, 0, 1, 1
 ; Vogtland
 [BaseGood]
 base = Rh05_04_base
 marketgood = bwe2_package, 30, -1, 1, 1, 0, 1, 1
@@ -325,8 +285,6 @@ marketgood = oe_package, 16, -1, 1, 1, 0, 1, 1
 base = St02_01_base
 marketgood = oe_package, 16, -1, 1, 1, 0, 1, 1
 ; REM Liner
 [BaseGood]
 base = Hi02_REM_LINER_Base
 marketgood = package_bh_elite3, 1, -1, 1, 1, 0, 1, 1
--- a/DATA/EQUIPMENT/misc_equip.ini
+++ b/DATA/EQUIPMENT/misc_equip.ini
@@ -90,8 +90,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
+capacity = 1800
-charge_rate = 213
+charge_rate = 183
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
@@ -230,8 +230,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
+capacity = 1300
-charge_rate = 213
+charge_rate = 126
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
@@ -398,8 +398,8 @@ volume = 0
 mass = 10
 DA_archetype = equipment\models\hardware\li_fusion_reactor.3db
 material_library = equipment\models\hardware.mat
-capacity = 2100
+capacity = 1500
-charge_rate = 213
+charge_rate = 157
 thrust_capacity = 1000
 thrust_charge_rate = 100
 lootable = false
--- a/DATA/EQUIPMENT/misc_good.ini
+++ b/DATA/EQUIPMENT/misc_good.ini
@@ -90,7 +90,7 @@ ids_info = 264748
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01 
+nickname = mod_s_tractor_01 
 equipment = ge_s_tractor_01
 category = equipment
 price = 10
@@ -101,7 +101,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_red
+nickname = mod_s_tractor_01_red
 equipment = ge_s_tractor_01_red
 category = equipment
 price = 10
@@ -112,7 +112,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_yellow
+nickname = mod_s_tractor_01_yellow
 equipment = ge_s_tractor_01_yellow
 category = equipment
 price = 10
@@ -123,7 +123,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_blue
+nickname = mod_s_tractor_01_blue
 equipment = ge_s_tractor_01_blue
 category = equipment
 price = 10
@@ -134,7 +134,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_cyan
+nickname = mod_s_tractor_01_cyan
 equipment = ge_s_tractor_01_cyan
 category = equipment
 price = 10
@@ -145,7 +145,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_purple
+nickname = mod_s_tractor_01_purple
 equipment = ge_s_tractor_01_purple
 category = equipment
 price = 10
@@ -156,7 +156,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_pink
+nickname = mod_s_tractor_01_pink
 equipment = ge_s_tractor_01_pink
 category = equipment
 price = 10
@@ -167,7 +167,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_green
+nickname = mod_s_tractor_01_green
 equipment = ge_s_tractor_01_green
 category = equipment
 price = 10
@@ -178,7 +178,7 @@ ids_info = 264744
 shop_archetype = equipment\models\commodities\crates\crate_grey.3db
 [Good]
-nickname = ge_s_tractor_01_orange
+nickname = mod_s_tractor_01_orange
 equipment = ge_s_tractor_01_orange
 category = equipment
 price = 10
--- a/DATA/EQUIPMENT/select_equip.ini
+++ b/DATA/EQUIPMENT/select_equip.ini
@@ -2297,45 +2297,6 @@ decay_per_second = 0
 volume = 0
 hit_pts = 250
 ; Mission Items
 ; Chronos Relic
 [Commodity]
 nickname = chronos_relic
 ids_name = 329900
 ids_info = 329900
 units_per_container = 1
 pod_appearance = cargopod_blue
 loot_appearance = lootcrate_blue
 decay_per_second = 0
 volume = 0
 hit_pts = 250
 ; Hellios Shard
 [Commodity]
 nickname = hellios_shard
 ids_name = 329901
 ids_info = 329901
 units_per_container = 1
 pod_appearance = cargopod_blue
 loot_appearance = lootcrate_blue
 decay_per_second = 0
 volume = 0
 hit_pts = 250
 [Commodity]
 nickname = athena_orb
 ids_name = 329902
 ids_info = 329902
 units_per_container = 1
 pod_appearance = cargopod_blue
 loot_appearance = lootcrate_blue
 decay_per_second = 0
 volume = 0
 hit_pts = 250
 [TradeLane]
 nickname = basic_trade_lane_eq
 tl_ship_enter = basic_tl_ship_enter
@@ -2967,33 +2928,6 @@ explosion_arch = explosion_oxygen_bw09
 debris_type = debris_vanish
 ; Track Guide
 [CargoPod]
 nickname = track_guide_red01
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_guide_red.3db
 material_library = solar\TRACK_MISC\track_guide_red.3db
 hit_pts = 1e36
 mass = 1e10
 HP_child = HpConnect
 parent_impulse = 0.010000
 child_impulse = 0.010000
 debris_type = debris_vanish
 [CargoPod]
 nickname = track_guide_red02
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_guide_red02.3db
 material_library = solar\TRACK_MISC\track_guide_red02.3db
 hit_pts = 1e36
 mass = 1e10
 HP_child = HpConnect
 parent_impulse = 0.010000
 child_impulse = 0.010000
 debris_type = debris_vanish
@@ -4166,17 +4100,6 @@ mass = 2000
 explosion_arch = explosion_asteroid_lava1_medium_shatter
 debris_type = debris_vanish
 [CargoPod]
 nickname = base_door_b
 DA_archetype = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\ast_ice_block_mt01_base_door_b.3db
 material_library = solar\asteroids\models\mining_tunnel\ast_ice_block_mt01\ast_ice_block_mt01_base_door_b.3db
 LODranges = 0, 20000
 HP_child = HpConnect
 hit_pts = 1e36
 mass = 2000
 explosion_arch = explosion_asteroid_lava1_medium_shatter
 debris_type = debris_vanish
 [CargoPod]
 nickname = ast_ice_block_mt01_base01
--- a/DATA/FONTS/rich_fonts.ini
+++ b/DATA/FONTS/rich_fonts.ini
@@ -130,10 +130,3 @@ italic = false
 underline = false
 color = 0, 255, 0
 [Style]
 name = STYLE_EXTERNAL
 font = 0
 bold = false
 italic = false
 underline = false
 color = 255, 255, 255
--- a/DATA/FX/explosions.ini
+++ b/DATA/FX/explosions.ini
@@ -346,13 +346,6 @@ lifetime = 0, 0.15
 process = disappear
 debris_impulse = 500000
 ;[explosion]
 ;nickname = explosion_no_cruiser
 ;lifetime = 0.000000, 0.150000
 ;process = disappear
 ;debris_impulse = 500000
 ;effect = cruiser_explosion_nomad
 [explosion]
 nickname = explosion_no_battleship
 lifetime = 0, 0.15
--- a/DATA/FX/fuse_no2_cruiser.ini
+++ b/DATA/FX/fuse_no2_cruiser.ini
@@ -1,223 +0,0 @@
 [fuse]
 name = fuse_no2_cruiser_death
 lifetime = 6
 death_fuse = true
 ;; Core Section
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpWeapon01
 fate = disappear
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpWeapon01
 at_t = 0.0
 pos_offset = 0, 0, 15
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0
 hardpoint = HpTurret07
 fate = debris
 [destroy_hp_attachment]
 at_t = 0
 hardpoint = HpTurret08
 fate = debris
 [destroy_hp_attachment]
 at_t = 0
 hardpoint = HpTurret09
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpWeapon01
 at_t = 0.1, 0.6
 pos_offset = 18, 32, 50
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpWeapon01
 at_t = 0.1, 0.6
 pos_offset = -18, 32, 50
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpWeapon01
 at_t = 0.1, 0.6
 pos_offset = -18, -32, 50
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpWeapon01
 at_t = 0.1, 0.6
 pos_offset = 18, 32, 50
 ori_offset = 0, 0, 0
 attached = true
 ;; Front Section
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpWeapon01
 at_t = 0.2
 pos_offset = 0, 0, -20
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpWeapon01
 at_t = 0.3
 pos_offset = 0, 0, -40
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpTurret01
 hardpoint = HpTurret02
 at_t = 0.4, 0.5
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret01
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret02
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpTurret03
 hardpoint = HpTurret04
 at_t = 0.4, 0.5
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret03
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret04
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpTurret05
 hardpoint = HpTurret06
 at_t = 0.4, 0.5
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret05
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret06
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpTorpedo
 at_t = 0.75
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.75
 hardpoint = HpTorpedo01
 fate = disappear
 [start_effect]
 effect = gf_explosion_no_battleship_neotokyobig
 hardpoint = HpWeapon01
 at_t = 0.8
 pos_offset = 0, 0, -60
 ori_offset = 0, 0, 0
 attached = true
 ;; Rear Section
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpWeapon01
 at_t = 0.2
 pos_offset = 0, 0, 28
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpTurret10
 at_t = 0.4, 0.5
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret10
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpTurret11
 hardpoint = HpTurret12
 at_t = 0.4, 0.5
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret11
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.45
 hardpoint = HpTurret12
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpEngine01
 at_t = 0.7
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_neotokyobig
 hardpoint = HpWeapon01
 at_t = 0.9
 pos_offset = 0, 0, 70
 ori_offset = 0, 0, 0
 attached = true
 [destroy_root]
 at_t = 1.0
--- a/DATA/FX/fuse_no2_gunboat.ini
+++ b/DATA/FX/fuse_no2_gunboat.ini
@@ -1,102 +0,0 @@
 [fuse]
 name = fuse_no2_gunboat_death
 lifetime = 2.5
 death_fuse = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpEngine01
 at_t = 0.0
 pos_offset = 0, 0, -70
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpWeapon01
 fate = disappear
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTorpedo01
 fate = disappear
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret01
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret02
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret03
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret04
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret05
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret06
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.3
 pos_offset = 0, 0, -50
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpEngine01
 at_t = 0.6
 pos_offset = 0, 0, -25
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.6
 hardpoint = HpTurret07
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.6
 hardpoint = HpTurret08
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.6
 hardpoint = HpTurret09
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpEngine01
 at_t = 0.9
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_verybig
 hardpoint = HpEngine01
 at_t = 0.95
 pos_offset = 0, 0, -75
 ori_offset = 0, 0, 0
 attached = true
 [destroy_root]
 at_t = 1.0
--- a/DATA/FX/fuse_no2_gunship.ini
+++ b/DATA/FX/fuse_no2_gunship.ini
@@ -1,116 +0,0 @@
 [fuse]
 name = fuse_no2_gunship_death
 lifetime = 2.5
 death_fuse = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.0
 pos_offset = 0, 0, -29
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.0
 pos_offset = 0, 0, -29
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret01
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret02
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret03
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.0
 hardpoint = HpTurret04
 fate = debris
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpEngine01
 at_t = 0.2
 pos_offset = 0, 16, -35
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.4
 pos_offset = 13.5, -8, -35
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.6
 pos_offset = -13.5, -8, -35
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship
 hardpoint = HpEngine01
 at_t = 0.7
 pos_offset = 0, 0, -21
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpEngine01
 at_t = 0.8
 pos_offset = 0, 0, 0
 ori_offset = 0, 0, 0
 attached = true
 [start_effect]
 effect = gf_explosion_no_battleship_big
 hardpoint = HpEngine01
 at_t = 0.9
 pos_offset = 0, 0, -44
 ori_offset = 0, 0, 0
 attached = true
 [destroy_hp_attachment]
 at_t = 0.9
 hardpoint = HpTorpedo01
 fate = disappear
 [destroy_hp_attachment]
 at_t = 0.9
 hardpoint = HpTurret05
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.9
 hardpoint = HpTurret06
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.9
 hardpoint = HpTurret07
 fate = debris
 [destroy_hp_attachment]
 at_t = 0.9
 hardpoint = HpTurret08
 fate = debris
 [destroy_root]
 at_t = 1.0
--- a/DATA/INTERFACE/NEURONET/MISSIONVENDOR/missionvendor.txm
+++ b/DATA/INTERFACE/NEURONET/MISSIONVENDOR/missionvendor.txm
--- a/DATA/INTERFACE/keylist.ini
+++ b/DATA/INTERFACE/keylist.ini
@@ -300,6 +300,10 @@ id = USER_ASSIGN_WEAPON_GROUP5
 [key]
 id = USER_ASSIGN_WEAPON_GROUP6
 [Group]
 group_num = 2
 name = 1504
 [key]
 id = USER_CHAT
@@ -315,8 +319,3 @@ id = USER_GROUP_INVITE
 [key]
 id = USER_TRADE_REQUEST
 [Group]
 group_num = 2
 name = 1504
--- a/DATA/MISSIONS/mbases.ini
+++ b/DATA/MISSIONS/mbases.ini
@@ -23543,17 +23543,6 @@ rumor = base_0_rank, mission_end, 2, 132953
 rumor = base_0_rank, mission_end, 1, 132954
 rumor_type2 = mission_07_loaded, freetime_07_08, 1, 393647
 [GF_NPC]
 nickname = ku0103_fix_ship
 body = sh_male3_body
 head = ku_sales_head
 lefthand = benchmark_male_hand_left
 righthand = benchmark_male_hand_right
 individual_name = 460059
 affiliation = co_shi_grp
 voice = rvp101
 [MRoom]
 nickname = bar
 character_density = 4
@@ -23565,11 +23554,6 @@ character_density = 2
 fixture = ku0103_fix_trader, Zs/NPC/Trader/01/A/Stand, scripts\vendors\li_commtrader_fidget.thn, trader
 fixture = ku0103_fix_weaponsdealer, Zs/NPC/Equipment/01/A/Stand, scripts\vendors\li_equipdealer_fidget.thn, Equipment
 [MRoom]
 nickname = ShipDealer
 character_density = 2
 fixture = ku0103_fix_ship, Zs/NPC/Shipdealer/01/A/Stand, scripts\vendors\li_shipdealer_fidget.thn, ShipDealer
 [MBase]
 nickname = Ku01_04_Base
 local_faction = co_ic_grp
--- a/DATA/MISSIONS/npcships.ini
+++ b/DATA/MISSIONS/npcships.ini
@@ -3654,7 +3654,7 @@ npc_class = unlawful, fighter, d1, d2, d3, d4, d5, d6, d7, d8, d9, d10, d11, d12
 [NPCShipArch]
 nickname = no_fighter_pimped_d21
-loadout = no_fighter_loadout03_npc
+loadout = no_fighter_loadout03
 level = d21
 ship_archetype = no_fighter
 pilot = pilot_uber
--- a/DATA/SCRIPTS/BASES/li_01_bar_event.thn
+++ b/DATA/SCRIPTS/BASES/li_01_bar_event.thn
--- a/DATA/SCRIPTS/BASES/li_01_cityscape_land_01.thn
+++ b/DATA/SCRIPTS/BASES/li_01_cityscape_land_01.thn
--- a/DATA/SCRIPTS/BASES/li_08_deck_hardpoint_01_asteroid.thn
+++ b/DATA/SCRIPTS/BASES/li_08_deck_hardpoint_01_asteroid.thn
--- a/DATA/SCRIPTS/BASES/npc_test.thn
+++ b/DATA/SCRIPTS/BASES/npc_test.thn
--- a/DATA/SCRIPTS/HELPERS/convert.lua
+++ b/DATA/SCRIPTS/HELPERS/convert.lua
@@ -1,63 +0,0 @@
 Convert = {}
 Convert["QuatToMatrix"] = function(quat)
 	local x = quat[1]
 	local y = quat[2]
 	local z = quat[3]
 	local w = quat[4]
 	local x2 = x + x
 	local y2 = y + y
 	local z2 = z + z
 	local xx = x * x2
 	local yx = y * x2
 	local yy = y * y2
 	local zx = z * x2
 	local zy = z * y2
 	local zz = z * z2
 	local wx = w * x2
 	local wy = w * y2
 	local wz = w * z2
 	local result = {
 		{ 1 - yy - zz, yx + wz, zx - wy },
 		{ yx - wz, 1 - xx - zz, zy + wx },
 		{ zx + wy, zy - wx, 1 - xx - yy }
 	}
 	return result
 end
 Convert["EulerToQuat"] = function (x, y, z)
    local b = y * 0.5;
    local c = x * 0.5;
    local d = z * 0.5;
    local sp = sin(b)
    local cp = cos(b)
    local sy = sin(c)
    local cy = cos(c)
    local sr = sin(d) 
    local cr = cos(d)
    local a0 = sp * cy * cr
    local b0 = cp * sy * sr
    local a1 = cp * sy * cr
    local b1 = sp * cy * sr
    local a2 = cp * cy * sr
    local b2 = sp * sy * cr
    local a3 = cp * cy * cr
    local b3 = sp * sy * sr
    local result = { Math.round(a0 + b0, 5), Math.round(a1 - b1, 5), Math.round(a2 + b2, 5), Math.round(a3 - b3, 5) }
    return result
 end
 -- Should be called in place of orient like this: orient  =  Convert.EulerToMatrix(x, y, z),
 Convert["EulerToMatrix"] = function (x, y, z)
 	local q = Convert.EulerToQuat(y, x, z)
 	local m = Convert.QuatToMatrix(q)
 	return m
 end
--- a/DATA/SCRIPTS/HELPERS/math.lua
+++ b/DATA/SCRIPTS/HELPERS/math.lua
@@ -1,47 +0,0 @@
 Math = {}
 Math["round"] = function (num, numDecimalPlaces)
    local mult = 10^(numDecimalPlaces or 0)
    return floor(num * mult + 0.5) / mult
 end
 function sphereCollision(a, b)
    local ax = a.center[1]
    local ay = a.center[2]
    local az = a.center[3]
    local bx = b.center[1]
    local by = b.center[2]
    local bz = b.center[2]
    local threshold = (a.radius + b.radius) * (a.radius + b.radius)
    local dx = bx - ax
    local dy = by - ay
    local dz = bz - az
    local distSq = dx * dx + dy * dy + dz * dz
    return distSq < threshold
 end
 -- Default functions
 Math["abs"] = abs
 Math["asin"] = asin
 Math["atan"] = atan
 Math["atan2"] = atan2
 Math["ceil"] = ceil
 Math["cos"] = cos
 Math["sin"] = sin
 Math["tan"] = tan
 Math["deg"] = deg
 Math["floor"] = floor
 Math["log"] = log
 Math["log10"] = log10
 Math["max"] = max
 Math["min"] = min
 Math["mod"] = mod
 Math["sqrt"] = sqrt
 Math["frexp"] = frexp
 Math["ldexp"] = ldexp
 Math["random"] = random
 Math["randomseed"] = randomseed
--- a/DATA/SCRIPTS/HELPERS/utils.lua
+++ b/DATA/SCRIPTS/HELPERS/utils.lua
@@ -1,14 +0,0 @@
 Utils = {}
 Utils["writeVariables"] = function()
    filename = "lua.variables.log"
    remove(filename)
 	local LogVars
    LogVars = function(x, y)
        local file = appendto(filename)
        write(file, tostring(x).." ( "..tostring(y).." )\n")
        flush(file)
        closefile(file)
    end
    foreachvar(LogVars)
 	filename = nil
 end
--- a/DATA/SCRIPTS/helpers.lua
+++ b/DATA/SCRIPTS/helpers.lua
@@ -1,3 +0,0 @@
 dofile('..\\DATA\\SCRIPTS\\HELPERS\\math.lua')
 dofile('..\\DATA\\SCRIPTS\\HELPERS\\convert.lua')
 dofile('..\\DATA\\SCRIPTS\\HELPERS\\utils.lua')
--- a/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db
+++ b/DATA/SHIPS/NOMAD2/NO2_FIGHTER/no2_fighter.3db
--- a/DATA/SHIPS/loadouts.ini
+++ b/DATA/SHIPS/loadouts.ini
@@ -10363,12 +10363,10 @@ equip = bw_fighter_power01, internal
 equip = ge_bwf_engine_01, internal
 equip = ge_s_scanner_01, internal
 equip = ge_s_tractor_01, internal
-equip = shield01_mark04_lf, HpShield01
+equip = shield01_mark02_lf, HpShield01
 equip = ge_s_thruster_01, HpThruster01
-equip = fc_lr_gun01_mark02, HpWeapon01
+equip = fc_ou_gun02_mark01, HpWeapon01
-equip = fc_lr_gun01_mark02, HpWeapon02
+equip = fc_ou_gun02_mark01, HpWeapon02
 equip = fc_ou_gun02_mark01, HpWeapon03
 equip = fc_ou_gun02_mark01, HpWeapon04
 equip = fc_ou_turret01_mark01, HpTurret01
 equip = ge_s_cm_01, HpCM01
 cargo = ge_s_cm_01_ammo, 20
@@ -10510,11 +10508,11 @@ equip = pi_fighter_power01, internal
 equip = ge_pf_engine_01, internal
 equip = ge_s_scanner_01, internal
 equip = ge_s_tractor_01, internal
-equip = shield01_mark03_lf, HpShield01
+equip = shield01_mark02_lf, HpShield01
 equip = ge_s_thruster_01, HpThruster01
-equip = fc_g_gun01_mark01, HpWeapon01
+equip = fc_m_gun01_mark01, HpWeapon01
-equip = fc_g_gun01_mark01, HpWeapon02
+equip = fc_m_gun01_mark02, HpWeapon02
-equip = fc_lh_turret01_mark01, HpTurret01
+equip = fc_m_turret01_mark01, HpTurret01
 equip = cruise_disruptor01_mark01, HpTorpedo01
 cargo = cruise_disruptor01_mark01_ammo, 5
 equip = mine01_mark01, HpMine01
@@ -10634,68 +10632,4 @@ equip = armor_scale_9
 equip = nomad_gun01_mark03, HpWeapon01
 equip = nomad_gun01_mark03, HpWeapon02
 equip = nomad_gun01_mark03, HpWeapon03
-cargo = commodity_halloween, 1
+cargo = commodity_halloween, 1
 ; Anomalie Wreckages
 [Loadout]
 nickname = SECRET_ou_bw_elite2_anomalie01
 archetype = bw_elite2
 equip = special_gun04, HpWeapon01
 equip = special_gun05, HpWeapon02
 equip = mine02_mark05, HpMine01
 cargo = mine02_mark05_ammo, 5
 cargo = ge_s_battery_01, 10
 cargo = ge_s_repair_01, 10
 cargo = special_gun06, 1
 cargo = special_gun07, 1
 [Loadout]
 nickname = SECRET_no_fighter_anomalie01
 archetype = suprise_no_fighter
 equip = special_nomad_gun01, HpWeapon01
 equip = special_nomad_gun01, HpWeapon02
 cargo = ge_s_battery_01, 10
 cargo = ge_s_repair_01, 10
 cargo = commodity_nomad_power_regulator, 1
 cargo = special_nomad_gun01, 1
 [Loadout]
 nickname = SECRET_no_fighter_anomalie02
 archetype = suprise_no_fighter
 equip = special_nomad_gun02, HpWeapon01
 equip = special_nomad_gun02, HpWeapon02
 cargo = ge_s_battery_01, 10
 cargo = ge_s_repair_01, 10
 cargo = special_nomad_gun02, 1
 [Loadout]
 nickname = SECRET_ge_csv_anomalie01
 archetype = suprise_ge_csv
 equip = fc_h_gun01_mark01, HpWeapon01
 equip = fc_h_gun01_mark01, HpWeapon02
 cargo = ge_s_battery_01, 10
 cargo = ge_s_repair_01, 10
 cargo = commodity_encoded_shield_data, 1
 cargo = commodity_tractor_beam_schematic, 1
 [Loadout]
 nickname = SECRET_ge_armored_anomalie01
 archetype = suprise_ge_armored
 equip = fc_h_gun01_mark01, HpWeapon01
 equip = fc_h_gun01_mark01, HpWeapon02
 cargo = ge_s_repair_01, 20
 cargo = commodity_encoded_armor_data, 1
 cargo = commodity_tractor_beam_schematic, 1
 [Loadout]
 nickname = SECRET_ge_train_anomalie01
 archetype = suprise_ge_train
 cargo = commodity_armor_schematic, 1
 cargo = commodity_ship_hull_panels, 25
 [Loadout]
 nickname = SECRET_transport_large_anomalie01
 archetype = suprise_transport_large
 cargo = commodity_shield_schematic, 1
--- a/DATA/SHIPS/loadouts_special.ini
+++ b/DATA/SHIPS/loadouts_special.ini
@@ -1941,9 +1941,9 @@ equip = cruise_disruptor01_mark01, HpTorpedo01
 equip = contrail01, HpContrail01
 equip = contrail01, HpContrail02
 equip = contrail01, HpContrail03
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 cargo = special_nomad_gun01, 1
 cargo = special_nomad_gun02, 1
@@ -1968,9 +1968,9 @@ equip = nomad_gun01_mark01, HpWeapon09
 equip = nomad_gun01_mark01, HpWeapon10
 equip = contrail01, HpContrail01
 equip = contrail01, HpContrail02
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 cargo = special_nomad_gun01, 1
 cargo = special_nomad_gun02, 1
@@ -1994,9 +1994,9 @@ equip = nomad_torpedo01_player, HpTorpedo02
 equip = contrail01, HpContrail01
 equip = contrail01, HpContrail02
 equip = contrail01, HpContrail03
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 cargo = special_nomad_gun01, 2
 cargo = special_nomad_gun02, 2
@@ -2018,9 +2018,9 @@ equip = nomad02_turret01_mark01, HpTurret06
 equip = nomad02_turret01_mark01, HpTurret07
 equip = nomad02_turret01_mark01, HpTurret08
 equip = nomad02_turret01_mark01, HpTurret09
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 equip = NomadMediumLight, HpHeadLight01
 equip = NomadMediumLight, HpHeadLight02
 equip = NomadMediumLight, HpHeadLight03
@@ -2051,9 +2051,9 @@ equip = nomad02_turret01_mark01, HpTurret06
 equip = nomad02_turret01_mark01, HpTurret07
 equip = nomad02_turret01_mark01, HpTurret08
 equip = nomad02_turret01_mark01, HpTurret09
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 equip = NomadMediumLight, HpHeadLight01
 equip = NomadMediumLight, HpHeadLight02
 equip = NomadMediumLight, HpHeadLight03
@@ -2088,9 +2088,9 @@ equip = nomad02_turret01_mark01, HpTurret09
 equip = nomad02_turret01_mark01, HpTurret10
 equip = nomad02_turret01_mark01, HpTurret11
 equip = nomad02_turret01_mark01, HpTurret12
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
 equip = NomadMediumLight, HpHeadLight01
 equip = NomadMediumLight, HpHeadLight02
 equip = NomadMediumLight, HpHeadLight03
@@ -2133,15 +2133,15 @@ equip = nomad02_turret01_mark01, HpTurret15
 equip = nomad02_turret01_mark01, HpTurret16
 equip = nomad02_turret01_mark01, HpTurret17
 equip = nomad02_turret01_mark01, HpTurret18
-equip = fx_dsy_no2_tentacle_small, HpFx01
+equip = dsy_no2_tentacle_small, HpFx01
-equip = fx_dsy_no2_tentacle_small, HpFx02
+equip = dsy_no2_tentacle_small, HpFx02
-equip = fx_dsy_no2_tentacle_small, HpFx03
+equip = dsy_no2_tentacle_small, HpFx03
-equip = fx_dsy_no2_tentacle_small, HpFx04
+equip = dsy_no2_tentacle_small, HpFx04
-equip = fx_dsy_no2_tentacle_small, HpFx05
+equip = dsy_no2_tentacle_small, HpFx05
-equip = fx_dsy_no2_tentacle_small, HpFx06
+equip = dsy_no2_tentacle_small, HpFx06
-equip = fx_dsy_no2_tentacle_small, HpFx07
+equip = dsy_no2_tentacle_small, HpFx07
-equip = fx_dsy_no2_tentacle_small, HpFx08
+equip = dsy_no2_tentacle_small, HpFx08
-equip = fx_dsy_no2_tentacle_small, HpFx09
+equip = dsy_no2_tentacle_small, HpFx09
 equip = NomadMediumLight, HpHeadLight01
 equip = NomadMediumLight, HpHeadLight02
 equip = NomadMediumLight, HpHeadLight03
@@ -2189,12 +2189,12 @@ equip = nomad02_turret01_mark01, HpTurret12
 equip = nomad02_turret01_mark01, HpTurret13
 equip = nomad02_turret01_mark01, HpTurret14
 equip = nomad02_turret01_mark01, HpTurret15
-equip = fx_dsy_no2_tentacle_large, HpFx01
+equip = dsy_no2_tentacle_large, HpFx01
-equip = fx_dsy_no2_tentacle_large, HpFx02
+equip = dsy_no2_tentacle_large, HpFx02
-equip = fx_dsy_no2_tentacle_large, HpFx03
+equip = dsy_no2_tentacle_large, HpFx03
-equip = fx_dsy_no2_tentacle_large, HpFx04
+equip = dsy_no2_tentacle_large, HpFx04
-equip = fx_dsy_no2_tentacle_large, HpFx05
+equip = dsy_no2_tentacle_large, HpFx05
-equip = fx_dsy_no2_tentacle_large, HpFx06
+equip = dsy_no2_tentacle_large, HpFx06
 equip = NomadLargeLight, HpHeadLight01
 equip = NomadLargeLight, HpHeadLight02
 equip = NomadMediumLight, HpHeadLight03
--- a/DATA/SHIPS/shiparch.ini
+++ b/DATA/SHIPS/shiparch.ini
@@ -5,8 +5,6 @@ material_library = Equipment\models\pilots.mat
 LODranges = 0, 999999
 MinSpecLOD = 2
 ; Patriot
 [Ship]
 ids_name = 237034
 ids_info = 66570
@@ -46,7 +44,7 @@ explosion_arch = explosion_li_fighter
 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 = 25000, 25000, 58000
+steering_torque = 24000, 24000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -120,8 +118,6 @@ material_library = ships\liberty\li_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Defender
 [Ship]
 ids_name = 237033
 ids_info = 66567
@@ -160,8 +156,8 @@ explosion_arch = explosion_li_elite
 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 = 44000, 44000, 183000
+steering_torque = 50000, 50000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 40000, 40000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -980,8 +976,6 @@ mass = 10
 hit_pts = 200
 LODranges = 0, 999999
 ; Cavalier
 [Ship]
 ids_name = 237008
 ids_info = 66508
@@ -1044,7 +1038,7 @@ hp_type = hp_thruster, HpThruster01
 hp_type = hp_mine_dropper, HpMine01
 hp_type = hp_countermeasure_dropper, HpCM01
 hp_type = hp_torpedo_special_2, HpTorpedo01
-steering_torque = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
@@ -1069,8 +1063,6 @@ material_library = ships\bretonia\br_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Crusader
 [Ship]
 ids_name = 237007
 ids_info = 66505
@@ -1135,8 +1127,8 @@ hp_type = hp_mine_dropper, HpMine01
 hp_type = hp_countermeasure_dropper, HpCM01
 hp_type = hp_torpedo_special_1, HpTorpedo01
 hp_type = hp_torpedo_special_2, HpTorpedo01
-steering_torque = 44000, 44000, 183000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 [CollisionGroup]
@@ -1832,8 +1824,6 @@ hit_pts = 200
 material_library = ships\bretonia\br_capships.mat
 LODranges = 0, 999999
 ; Drake
 [Ship]
 ids_name = 237028
 ids_info = 66558
@@ -2119,8 +2109,6 @@ material_library = ships\kusari\ku_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Dragon Player
 [Ship]
 ids_name = 237027
 ids_info = 66555
@@ -2157,8 +2145,8 @@ explosion_arch = explosion_ku_elite
 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 = 44000, 44000, 183000
+steering_torque = 43000, 43000, 183000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -2955,8 +2943,6 @@ material_library = ships\kusari\ku_capships.mat
 mass = 1000
 LODranges = 0, 999999
 ; Banshee
 [Ship]
 ids_name = 237052
 ids_info = 66601
@@ -2994,7 +2980,7 @@ explosion_arch = explosion_rh_fighter
 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 = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -3069,8 +3055,6 @@ material_library = ships\rheinland\rh_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Valkyrie
 [Ship]
 ids_name = 237051
 ids_info = 66598
@@ -3109,8 +3093,8 @@ explosion_arch = explosion_rh_elite
 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 = 44000, 44000, 183000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -3752,8 +3736,6 @@ material_library = ships\rheinland\rh_capships.mat
 mass = 1000
 LODranges = 0, 999999
 ; Piranha
 [Ship]
 ids_name = 237004
 ids_info = 66500
@@ -3791,7 +3773,7 @@ explosion_arch = explosion_li_fighter
 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 = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -3874,8 +3856,6 @@ material_library = ships\liberty\li_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Barracuda
 [Ship]
 ids_name = 237002
 ids_info = 66497
@@ -3914,8 +3894,8 @@ explosion_arch = explosion_li_elite
 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 = 44000, 44000, 230000
+steering_torque = 55000, 55000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -4143,8 +4123,6 @@ type = Starboard_Wing
 hit_pts = 1317
 root_health_proxy = true
 ; Blood Hound
 [Ship]
 ids_name = 237045
 ids_info = 66588
@@ -4183,7 +4161,7 @@ explosion_arch = explosion_co_fighter
 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 = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -4238,8 +4216,6 @@ type = Top_Fin
 hit_pts = 188
 root_health_proxy = true
 ; Wolfshound
 [Ship]
 ids_name = 237044
 ids_info = 66585
@@ -4278,8 +4254,8 @@ explosion_arch = explosion_co_elite
 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 = 44000, 44000, 230000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -4467,8 +4443,6 @@ type = Top_Fin
 hit_pts = 183
 root_health_proxy = true
 ; Legionare
 [Ship]
 ids_name = 237022
 ids_info = 66548
@@ -4507,7 +4481,7 @@ explosion_arch = explosion_co_fighter
 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 = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -4620,8 +4594,6 @@ material_library = ships\kusari\ku_playerships.mat
 mass = 5
 LODranges = 0, 999999
 ; Centurio
 [Ship]
 ids_name = 237020
 ids_info = 66545
@@ -4660,8 +4632,8 @@ explosion_arch = explosion_co_elite
 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 = 44000, 44000, 230000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -4754,8 +4726,6 @@ type = Fin
 hit_pts = 575
 root_health_proxy = true
 ; Titan
 [Ship]
 ids_name = 237021
 ids_info = 66542
@@ -4794,8 +4764,8 @@ explosion_arch = explosion_co_elite
 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 = 51000, 51000, 143000
+steering_torque = 43000, 43000, 143000
-angular_drag = 40000, 40000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -5802,7 +5772,7 @@ hit_pts = 619
 root_health_proxy = true
-; Dagger
+
 [Ship]
 ids_name = 237013
@@ -5841,7 +5811,7 @@ explosion_arch = explosion_li_fighter
 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 = 25000, 25000, 58000
+steering_torque = 18000, 18000, 58000
 angular_drag = 15000, 15000, 35000
 rotation_inertia = 2800, 2800, 1000
 nudge_force = 30000
@@ -5900,8 +5870,6 @@ type = Starboard_Wing
 hit_pts = 300
 root_health_proxy = true
 ; Stiletto
 [Ship]
 ids_name = 237011
 ids_info = 66518
@@ -5940,8 +5908,8 @@ explosion_arch = explosion_li_elite
 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 = 44000, 44000, 230000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -6072,8 +6040,6 @@ material_library = ships\border_world\bw_ships.mat
 mass = 5
 LODranges = 0, 999999
 ; Sabre
 [Ship]
 ids_name = 237012
 ids_info = 66515
@@ -6112,11 +6078,11 @@ explosion_arch = explosion_li_elite
 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, 50000, 63000
+steering_torque = 43000, 43000, 63000
-angular_drag = 40000, 40000, 41000
+angular_drag = 41000, 41000, 41000
 rotation_inertia = 8400, 8400, 2400
 nudge_force = 30000
-strafe_force = 25000
+strafe_force = 20000
 strafe_power_usage = 2
 bay_door_anim = Sc_open baydoor
 bay_doors_open_snd = cargo_doors_open
@@ -6333,8 +6299,6 @@ material_library = ships\border_world\bw_ships.mat
 mass = 5
 LODranges = 0, 999999
 ; Anubis
 [Ship]
 ids_name = 237041
 ids_info = 66581
@@ -6373,8 +6337,8 @@ explosion_arch = explosion_li_elite
 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 = 44000, 44000, 230000
+steering_torque = 43000, 43000, 230000
-angular_drag = 32000, 32000, 141000
+angular_drag = 41000, 41000, 141000
 rotation_inertia = 8400, 8400, 8400
 nudge_force = 30000
 strafe_force = 20000
@@ -6855,8 +6819,6 @@ mass = 10
 hit_pts = 200
 LODranges = 0, 999999
 ; Nomad Fighter
 [Ship]
 ids_name = 237039
 ids_info = 66579
@@ -6866,7 +6828,7 @@ type = FIGHTER
 DA_archetype = ships\nomad\no_fighter\no_fighter.3db
 material_library = ships\nomad\nomad_fx.txm
 nomad = true
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\liberty\l_elite.ini
 mass = 150
 hold_size = 800
 linear_drag = 1
@@ -6882,8 +6844,6 @@ HP_tractor_source = HpMount
 num_exhaust_nozzles = 1
 hit_pts = 4000
 ; Nomad Gunboat
 [Ship]
 ids_name = 237040
 ids_info = 66580
@@ -6893,7 +6853,6 @@ type = GUNBOAT
 DA_archetype = ships\nomad\no_gunship\no_gunship.3db
 material_library = ships\nomad\nomad_fx.txm
 nomad = true
 cockpit = cockpits\nomad\no2_fighter.ini
 mass = 1000
 hold_size = 800
 explosion_arch = explosion_no_gunboat
@@ -6910,8 +6869,6 @@ HP_tractor_source = HpMount
 num_exhaust_nozzles = 1
 hit_pts = 10000
 ; Nomad Battleship
 [Ship]
 ids_name = 237038
 ids_info = 66578
@@ -6921,7 +6878,6 @@ type = CAPITAL
 DA_archetype = ships\nomad\no_battleship\no_battleship.3db
 material_library = ships\nomad\nomad_fx.txm
 nomad = true
 cockpit = cockpits\nomad\no2_fighter.ini
 hold_size = 800
 explosion_arch = explosion_no_battleship
 fuse = fuse_no_battleship_death, 0, 1
@@ -8936,12 +8892,12 @@ camera_horizontal_turn_angle = 17
 camera_vertical_turn_up_angle = 5
 camera_vertical_turn_down_angle = 25
 camera_turn_look_ahead_slerp_amount = 1.000000
-hit_pts = 9600
+hit_pts = 9000
 explosion_arch = explosion_li_elite
 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 = 52000.000000, 52000.000000, 230000.000000
+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
@@ -9224,7 +9180,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 12000
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\liberty\l_elite.ini
 camera_offset = 10, 45
 camera_angular_acceleration = 0.05
 camera_horizontal_turn_angle = 17
@@ -9270,7 +9226,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 15000
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\liberty\l_elite.ini
 camera_offset = 12, 50
 camera_angular_acceleration = 0.05
 camera_horizontal_turn_angle = 17
@@ -9316,7 +9272,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 22000
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\liberty\l_elite.ini
 camera_offset = 12, 50
 camera_angular_acceleration = 0.05
 camera_horizontal_turn_angle = 17
@@ -9363,7 +9319,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 65300
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\rheinland\r_gunboat.ini
 camera_offset = 35, 150
 camera_angular_acceleration = 0.010000
 camera_horizontal_turn_angle = 10
@@ -9410,7 +9366,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 65300
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\rheinland\r_gunboat.ini
 camera_offset = 35, 150
 camera_angular_acceleration = 0.010000
 camera_horizontal_turn_angle = 10
@@ -9442,7 +9398,7 @@ hold_size = 0
 nanobot_limit = 0
 shield_battery_limit = 0
 linear_drag = 1
-explosion_arch = explosion_no_gunboat
+explosion_arch = explosion_no_cruiser
 fuse = fuse_no2_cruiser_death, 0, 1
 max_bank_angle = 20
 surface_hit_effects = 0, nomad_hull_hit_01, nomad_hull_hit_02, nomad_hull_hit_03
@@ -9457,7 +9413,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 65300
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\rheinland\r_cruiser.ini
 camera_offset = 50, 280
 camera_angular_acceleration = 0.01
 camera_horizontal_turn_angle = 15
@@ -9502,7 +9458,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 120300
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\liberty\l_dreadnought.ini
 camera_offset = 60, 750
 camera_angular_acceleration = 0.005
 camera_horizontal_turn_angle = 10
@@ -9546,7 +9502,7 @@ HP_bay_external = HpBayDoor02
 HP_tractor_source = HpTractor_Source01
 num_exhaust_nozzles = 1
 hit_pts = 120300
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\rheinland\r_battleship.ini
 camera_offset = 130, 1500
 camera_angular_acceleration = 0.005
 camera_horizontal_turn_angle = 10
@@ -9591,7 +9547,7 @@ HP_bay_external = HpMount
 HP_tractor_source = HpMount
 num_exhaust_nozzles = 1
 hit_pts = 1000000
-cockpit = cockpits\nomad\no2_fighter.ini
+cockpit = cockpits\rheinland\r_battleship.ini
 camera_offset = 1500, 7000
 camera_angular_acceleration = 0.005
 camera_horizontal_turn_angle = 10
--- a/DATA/SOLAR/ASTEROIDS/MODELS/ast_ring/ast_rock_ring.3db
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/ast_ring/ast_rock_ring.3db
--- a/DATA/SOLAR/ASTEROIDS/MODELS/ast_ring/ast_rock_ring.sur
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/ast_ring/ast_rock_ring.sur
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/ast_ice_block_mt01_base_door_b.3db
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/ast_ice_block_mt01_base_door_b.3db
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/ast_ice_block_mt01_base_door_b.sur
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/ast_ice_block_mt01_base_door_b.sur
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/endgame_turret_platform.3db
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_ice_block_mt01/endgame_turret_platform.3db
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt04/ast_rock_mt04_asteroid.3db
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt04/ast_rock_mt04_asteroid.3db
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt04/ast_rock_mt04_asteroid.sur
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt04/ast_rock_mt04_asteroid.sur
--- a/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt05/ast_rock_mt05_asteroid.sur
+++ b/DATA/SOLAR/ASTEROIDS/MODELS/mining_tunnel/ast_rock_mt05/ast_rock_mt05_asteroid.sur
--- a/DATA/SOLAR/TRACK_MISC/mod_rings.cmp
+++ b/DATA/SOLAR/TRACK_MISC/mod_rings.cmp
--- a/DATA/SOLAR/TRACK_MISC/mod_rings.sur
+++ b/DATA/SOLAR/TRACK_MISC/mod_rings.sur
--- a/DATA/SOLAR/TRACK_MISC/track_curve_guide.3db
+++ b/DATA/SOLAR/TRACK_MISC/track_curve_guide.3db
--- a/DATA/SOLAR/TRACK_MISC/track_curve_guide.sur
+++ b/DATA/SOLAR/TRACK_MISC/track_curve_guide.sur
--- a/DATA/SOLAR/TRACK_MISC/track_guide_red.3db
+++ b/DATA/SOLAR/TRACK_MISC/track_guide_red.3db
--- a/DATA/SOLAR/TRACK_MISC/track_guide_red02.3db
+++ b/DATA/SOLAR/TRACK_MISC/track_guide_red02.3db
--- a/DATA/SOLAR/TRACK_MISC/track_spiral_guide.3db
+++ b/DATA/SOLAR/TRACK_MISC/track_spiral_guide.3db
--- a/DATA/SOLAR/TRACK_MISC/track_spiral_guide.sur
+++ b/DATA/SOLAR/TRACK_MISC/track_spiral_guide.sur
--- a/DATA/SOLAR/TRACK_MISC/track_straight_guide.3db
+++ b/DATA/SOLAR/TRACK_MISC/track_straight_guide.3db
--- a/DATA/SOLAR/TRACK_MISC/track_straight_guide.sur
+++ b/DATA/SOLAR/TRACK_MISC/track_straight_guide.sur
--- a/DATA/SOLAR/loadouts.ini
+++ b/DATA/SOLAR/loadouts.ini
@@ -5052,7 +5052,7 @@ equip = infinite_power
 equip = ge_s_scanner_02
 equip = endgame_turret, HpTurret
 equip = armor_scale_17
-cargo = commodity_anti_blasting_composites, 1, HpCargo01
+cargo = commodity_anti_blasting_composites, 1, HpTurret
 [Loadout]
 nickname = pirate_weapon_platform_pi_05
@@ -7533,11 +7533,6 @@ equip = ast_nomad01_mt03_asteroid33, HpAsteroid01
 equip = ast_nomad01_mt03_asteroid34, HpAsteroid01
 equip = ast_nomad01_mt03_asteroid35, HpAsteroid01
 [Loadout]
 nickname = alien_structure01_load
 cargo = commodity_alien_artifacts, 25
 cargo = nomad_torpedo01_player, 1
 cargo = commodity_nomad_prototyp_schematic, 2
 [Loadout]
 nickname = alien_structure02_load
@@ -7545,7 +7540,6 @@ cargo = commodity_alien_artifacts, 25
 cargo = nomad_torpedo01_player, 1
 cargo = special_nomad_gun03, 2
 [Loadout]
 nickname = ast_rock_mt02_asteroid_crystal_load
 equip = ast_rock_mt02_asteroid01, HpAsteroid01
@@ -12872,7 +12866,6 @@ equip = ast_ice_block_mt01_base05, HpAsteroid
 equip = ast_ice_block_mt01_base_sec, HpAsteroid
 equip = base_door_sec, HpAsteroid
 equip = base_door_a, HpAsteroid
 equip = base_door_b, HpAsteroid
 equip = ast_crystal_destroyable, HpMineral01
 cargo = commodity_diamonds, 25, HpMineral01
 cargo = commodity_bluecrystal, 1, HpMineral01
@@ -13117,32 +13110,3 @@ equip = first_level_display_denied, HpPanel01
 nickname = first_level_display_granted_load
 equip = first_level_display_granted, HpPanel01
 [Loadout]
 nickname = ast_rock_mt05_track_guide_red
 equip = track_guide_red01, HpTrackGuide
 [Loadout]
 nickname = ast_rock_mt05_track_guide_red02
 equip = track_guide_red02, HpTrackGuide
 ; Toledo Wreckage
 [Loadout]
 nickname = SECRET_ou_bw_elite2_st01
 archetype = bw_elite2
 equip = special_gun04, HpWeapon01
 equip = special_gun05, HpWeapon02
 equip = mine02_mark05, HpMine01
 cargo = mine02_mark05_ammo, 5
 cargo = ge_s_battery_01, 10
 cargo = ge_s_repair_01, 10
 cargo = commodity_nomad_prototyp_schematic, 1
 cargo = commodity_tractor_beam_schematic, 2
 cargo = nomad_torpedo01_player, 1
 ; Billboard Loadout
 [Loadout]
 nickname = billboard_load
--- a/DATA/SOLAR/solararch.ini
+++ b/DATA/SOLAR/solararch.ini
@@ -7642,7 +7642,6 @@ shape_name = NNM_SM_COMMUNICATIONS
 nickname = alien_structure01
 LODranges = 0, 6000, 10000
 type = NON_TARGETABLE
 loadout = alien_structure01_load
 DA_archetype = solar\asteroids\models\alien_structure\alien_structure01.3db
 material_library = solar\asteroids\models\alien_structure\alien_structure01.3db
 mass = 1e10
@@ -8534,28 +8533,6 @@ hit_pts = 1e36
 solar_radius = 20000
 shape_name = NNM_SM_COMMUNICATIONS
 [Solar]
 nickname = ast_rock_mt04_asteroid
 LODranges = 0, 20000, 40000
 type = NON_TARGETABLE
 DA_archetype = solar\asteroids\models\mining_tunnel\ast_rock_mt04\ast_rock_mt04_asteroid.3db
 material_library = solar\asteroids\models\mining_tunnel\ast_rock_mt04\ast_rock_mt04_asteroid.3db
 mass = 1e10
 hit_pts = 1e36
 solar_radius = 20000
 shape_name = NNM_SM_COMMUNICATIONS
 [Solar]
 nickname = ast_rock_mt05_asteroid
 LODranges = 0, 20000, 40000
 type = NON_TARGETABLE
 DA_archetype = solar\asteroids\models\mining_tunnel\ast_rock_mt05\ast_rock_mt05_asteroid.3db
 material_library = solar\asteroids\models\mining_tunnel\ast_rock_mt05\ast_rock_mt05_asteroid.3db
 mass = 1e10
 hit_pts = 1e36
 solar_radius = 20000
 shape_name = NNM_SM_COMMUNICATIONS
 [Solar]
 nickname = ast_ice_block_mt01_base
 LODranges = 0, 20000
@@ -8568,84 +8545,6 @@ loadout = ast_ice_block_mt01_base_load
 solar_radius = 20000
 shape_name = NNM_SM_COMMUNICATIONS
 ; Race Track Miscs
 [Solar]
 type = NON_TARGETABLE
 nickname = track_guide_red
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_guide_red.3db
 material_library = solar\TRACK_MISC\track_guide_red.3db
 surface_hit_effects = 0, small_hull_hit
 mass = 100000
 solar_radius = 80000
 shape_name = NAV_surpriseX
 hit_pts = 1000000
 destructible = false
 [Solar]
 type = NON_TARGETABLE
 nickname = track_straight_guide
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_straight_guide.3db
 material_library = solar\TRACK_MISC\track_straight_guide.3db
 surface_hit_effects = 0, small_hull_hit
 mass = 100000
 solar_radius = 80000
 shape_name = NAV_surpriseX
 hit_pts = 1000000
 destructible = false
 [Solar]
 type = NON_TARGETABLE
 nickname = track_curve_guide
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_curve_guide.3db
 material_library = solar\TRACK_MISC\track_curve_guide.3db
 surface_hit_effects = 0, small_hull_hit
 mass = 100000
 solar_radius = 80000
 shape_name = NAV_surpriseX
 hit_pts = 1000000
 destructible = false
 [Solar]
 type = NON_TARGETABLE
 nickname = track_spiral_guide
 LODranges = 0
 DA_archetype = solar\TRACK_MISC\track_spiral_guide.3db
 material_library = solar\TRACK_MISC\track_spiral_guide.3db
 surface_hit_effects = 0, small_hull_hit
 mass = 100000
 solar_radius = 80000
 shape_name = NAV_surpriseX
 hit_pts = 1000000
 destructible = false
 [Solar]
 nickname = ast_rock_ring
 LODranges = 0, 20000, 40000
 type = NON_TARGETABLE
 DA_archetype = solar\asteroids\models\ast_ring\ast_rock_ring.3db
 material_library = solar\asteroids\models\ast_ring\ast_rock_ring.3db
 mass = 1e10
 hit_pts = 1e36
 solar_radius = 20000
 shape_name = NNM_SM_COMMUNICATIONS
 [Solar]
 type = NON_TARGETABLE
 nickname = mod_rings
 LODranges = 0, 20000, 40000
 DA_archetype = solar\TRACK_MISC\mod_rings.cmp
 material_library = solar\TRACK_MISC\mod_rings.cmp
 surface_hit_effects = 0, small_hull_hit
 mass = 100000
 solar_radius = 80000
 shape_name = NAV_surpriseX
 hit_pts = 1000000
 destructible = false
 ; Billboards
 [Solar]
@@ -9033,7 +8932,7 @@ hit_pts = 1e36
 [Solar]
 nickname = luxury_liner_wreckage_frnt
-type = NON_TARGETABLE
+type = STATION
 DA_archetype = Solar\REM_MISC\luxury_liner_wreckage_frnt.3db
 material_library = ships\utility\utility_liner.mat
 material_library = fx\envmapbasic.mat
--- a/DATA/UNIVERSE/SYSTEMS/BW06/bw06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/BW06/bw06.ini
@@ -1754,16 +1754,16 @@ archetype = debris_xlarge01
-;[Object]
+[Object]
-;nickname = dmkv_temple
+nickname = dmkv_temple
-;pos = -21000, -8350, 8603
+pos = -21000, -8350, 8603
-;rotate = 0, 25, 0
+rotate = 0, 25, 0
-;Archetype = dmkv_temple
+Archetype = dmkv_temple
-;loadout = dmkv_temple_load
+loadout = dmkv_temple_load
-;[Object]
+[Object]
-;nickname = nomadbase_dmkv01
+nickname = nomadbase_dmkv01
-;ids_name = 198012
+ids_name = 198012
-;pos = -21000, -8500, 8603
+pos = -21000, -8500, 8603
-;Archetype = nomadbase_dmkv
+Archetype = nomadbase_dmkv
--- a/DATA/UNIVERSE/SYSTEMS/BW10/bw10.ini
+++ b/DATA/UNIVERSE/SYSTEMS/BW10/bw10.ini
@@ -3298,16 +3298,16 @@ difficulty_level = 17
 archetype = second_level_display_hull_denied
 pilot = pilot_solar_hard
-;[Object]
+[Object]
-;nickname = Bw10_first_level_display_hull
+nickname = Bw10_first_level_display_hull
-;ids_name = 261154
+ids_name = 261154
-;pos = -35126, -822, -21055
+pos = -35126, -822, -21055
-;rotate = 0, 90, 0
+rotate = 0, 90, 0
-;ids_info = 66622
+ids_info = 66622
-;reputation = fc_ou_grp
+reputation = fc_ou_grp
-;behavior = NOTHING
+behavior = NOTHING
-;visit = 0
+visit = 0
-;difficulty_level = 17
+difficulty_level = 17
-;archetype = first_level_display_hull_denied
+archetype = first_level_display_hull_denied
 pilot = pilot_solar_hard
--- a/DATA/UNIVERSE/SYSTEMS/BW11/bw11.ini
+++ b/DATA/UNIVERSE/SYSTEMS/BW11/bw11.ini
@@ -1,525 +0,0 @@
 [SystemInfo]
 space_color = 0, 0, 0
 local_faction = li_p_grp
 [Ambient]
 color = 60, 80, 100
 [Background]
 basic_stars = solar\starsphere\starsphere_stars_basic.cmp
 complex_stars = solar\starsphere\starsphere_li01_stars.cmp
 nebulae = solar\starsphere\starsphere_li01.cmp
 [Music]
 space = music_li_space
 danger = music_li_danger
 battle = music_li_battle
 [LightSource]
 nickname = Bw11_system_light
 pos = -31, 0, -48
 color = 120, 250, 255
 range = 50000
 type = DIRECTIONAL
 atten_curve = DYNAMIC_DIRECTION
 [Object]
 nickname = Bw11_Sun1
 ids_name = 261037
 pos = 0, 0, 0
 ambient_color = 255, 255, 255
 Archetype = sun_1000
 star = Bw11_Sun1
 atmosphere_range = 5000
 ids_info = 66151
 [Object]
 nickname = Bw11_to_Li05_hole
 ids_name = 260932
 ;pos = 21917, 0, 12508
 pos = -33400, 110, -21000
 rotate = 0, 90, 0
 Archetype = jumphole_light
 msg_id_prefix = gcs_refer_system_Bw11
 ids_info = 66146
 jump_effect = jump_effect_hole
 visit = 0
 goto = Li05, Li05_to_Bw11_hole, gate_tunnel_bretonia
 [zone]
 nickname = Zone_Bw11_normal_drag_field
 ids_name = 261340
 pos = -4, 0, 298
 shape = ELLIPSOID
 size = 90000, 30000, 90000
 property_flags = 66
 interference = 0.1
 drag_modifier = 0.9
 edge_fraction = 0.3
 damage = 0.03
 visit = 32
 ids_info = 66224
 spacedust = asteroiddust
 spacedust_maxparticles = 40
 sort = 99
 Music = zone_field_asteroid_rock
 [zone]
 nickname = Zone_Bw11_decrease_field1
 ids_name = 261340
 pos = -37900, 750, -21150
 shape = ELLIPSOID
 size = 700,700,700
 property_flags = 66
 interference = 0.1
 drag_modifier = 0.95
 edge_fraction = 0.3
 damage = 0.03
 visit = 32
 ids_info = 66224
 spacedust = asteroiddust
 spacedust_maxparticles = 40
 sort = 99
 [zone]
 nickname = Zone_Bw11_decrease_field2
 ids_name = 261340
 pos = -37400, 120, -21000
 shape = ELLIPSOID
 size = 220,220,220
 property_flags = 66
 interference = 0.1
 drag_modifier = 0.95
 edge_fraction = 0.3
 damage = 0.03
 visit = 32
 ids_info = 66224
 spacedust = asteroiddust
 spacedust_maxparticles = 40
 sort = 99
 ;Please leave this the code alone and do not delete it!!! :D
 ;[Object]
 ;nickname = Bw06_02
 ;ids_name = 196706
 ;pos = 22374, 0, 10000
 ;archetype = depot
 ;ids_info = 65829
 ;base = Bw06_02_Base
 ;dock_with = Bw06_02_Base
 ;reputation = co_hsp_grp
 ;behavior = NOTHING
 ;visit = 0
 ;voice = atc_leg_f01
 ;space_costume = pl_female5_head, sc_female1_body
 ;difficulty_level = 13
 ;loadout = depot_co_03
 ;pilot = pilot_solar_hardest
 ;[Object]
 ;nickname = dmkv_temple
 ;pos = 20000, -8350, 1000
 ;rotate = 0, 25, 0
 ;Archetype = dmkv_temple
 ;loadout = dmkv_temple_load
 ;[Object]
 ;nickname = nomadbase_dmkv01
 ;ids_name = 198012
 ;pos = 20000, -8350, 1000
 ;Archetype = nomadbase_dmkv
 ; [Object]
 ; nickname = Bw05_01
 ; ids_name = 196702
 ; pos = -4675, 100, -12092
 ; Archetype = space_police01
 ; ids_info = 65823
 ; dock_with = Bw05_01_Base
 ; base = Bw05_01_Base
 ; reputation = gd_gm_grp
 ; behavior = NOTHING
 ; voice = atc_leg_m01
 ; space_costume = pl_male8_head, li_rockford_body
 ; difficulty_level = 12
 ; loadout = space_police01_co_01
 ; pilot = pilot_solar_hard
 ; [Object]
 ; nickname = Bw05_02
 ; ids_name = 196703
 ; pos = -9537, 0, 19442
 ; rotate = 0, -90, 0
 ; Archetype = space_mining01
 ; ids_info = 65825
 ; dock_with = Bw05_02_Base
 ; base = Bw05_02_Base
 ; reputation = co_alg_grp
 ; behavior = NOTHING
 ; voice = atc_leg_f01
 ; space_costume = rh_newscaster_head, rh_greunwald_body
 ; difficulty_level = 11
 ; loadout = space_mining01_co_02
 ; pilot = pilot_solar_easy
 ;[zone]
 ;nickname = Zone_Bw08_asteroid_field
 ;ids_name = 261340
 ;pos = -4, 0, 298
 ;shape = ELLIPSOID
 ;size = 90000, 30000, 90000
 ;property_flags = 66
 ;interference = 0.1
 ;drag_modifier = -1.4
 ;edge_fraction = 0.3
 ;damage = 0.03
 ;visit = 32
 ;ids_info = 66224
 ;spacedust = asteroiddust
 ;spacedust_maxparticles = 40
 ;sort = 99
 ;Music = zone_field_asteroid_rock
 [Dust]
 spacedust = Dust
 ;[Asteroids]
 ;file = solar\asteroids\Bw08_rock_asteroid_field.ini
 ;zone = Zone_Bw08_asteroid_field
 ; Race Track
 [Object]
 nickname = ast_rock_mt04_asteroid01
 pos = -36920, 120, -21400
 rotate = 0, 135, 0
 Archetype = ast_rock_mt04_asteroid
 [Object]
 nickname = ast_rock_mt05_asteroid01
 pos = -37400, 110, -21000
 rotate = 0, 135, 0
 Archetype = ast_rock_mt05_asteroid
 loadout = ast_rock_mt05_track_guide_red02
 ;[Object]
 ;nickname = track_guide_red01
 ;pos = -37400, 110, -20910
 ;rotate = 90, 75, 00
 ;Archetype = track_guide_red
 [Object]
 nickname = track_straight_guide01
 pos = -37020, 115, -21310
 rotate = -45, 0, -90
 Archetype = track_straight_guide
 [Object]
 nickname = track_ring00
 pos = -37710, 135, -21220
 rotate = 0, -48, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring01
 pos = -37920, 135, -21400
 rotate = 0, -48, 180
 Archetype = track_ring
 [Object]
 nickname = track_straight_guide02
 pos = -38340, 135, -21800
 rotate = 43, 0, -90
 Archetype = track_straight_guide
 [Object]
 nickname = track_ring02
 pos = -38785, 135, -22230
 rotate = 0, -48, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring03
 pos = -38985, 135, -22450
 rotate = 0, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide01
 pos = -39300, 135, -22840
 rotate = 43, 0, -90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring04
 pos = -39020, 135, -23350
 rotate = 0, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_straight_guide03
 pos = -38500, 135, -23850
 rotate = 135, 0, -90
 Archetype = track_straight_guide
 [Object]
 nickname = track_ring05
 pos = -38040, 135, -24300
 rotate = 0, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring06
 pos = -37710, 135, -24580
 rotate = 0, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide02
 pos = -37286, 135, -24892
 rotate = 135, 0, -90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring07
 pos = -36750, 135, -24640
 rotate = 180, -60, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring08
 pos = -36480, 200, -24500
 rotate = 180, -60, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring09
 pos = -36080, 135, -23900
 rotate = 180, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring10
 pos = -36250, 200, -24200
 rotate = 180,-30, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide03
 pos = -35765, 175, -23595
 rotate = 90, -135, 0
 Archetype = track_curve_guide
 [Object]
 nickname = track_curve_guide04
 pos = -35685, 775, -23515
 rotate = 0, -45, 180
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring11
 pos = -36080, 950, -23900
 rotate = 0, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring12
 pos = -36285, 950, -24125
 rotate = 0, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide05
 pos = -36625, 950, -24385
 rotate = 137, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring13
 pos = -37115, 950, -24125
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring14
 pos = -37300, 950, -23950
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = ast_rock_ring01
 pos = -37550,950, -23720
 rotate = 0, 45, 0
 Archetype = ast_rock_ring
 spin = 0.05, 0.05, 0
 [Object]
 nickname = track_ring15
 pos = -37830, 950, -23455
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring16
 pos = -38045, 950, -23250
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide06
 pos = -38400, 950, -22830
 rotate = -137, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring17
 pos = -38150, 950, -22300
 rotate = 180, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring18
 pos = -37950, 950, -22050
 rotate = 180, -45, 180
 Archetype = track_ring
 [Object]
 nickname = ast_rock_ring02
 pos = -37700, 950, -21775
 rotate = 0, 135, 0
 Archetype = ast_rock_ring
 spin = 0.05, 0.05, 0
 [Object]
 nickname = track_ring19
 pos = -37450, 950, -21450
 rotate = 180, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_sprial_guide01
 pos = -37900, 350, -21150
 rotate = 270, 0, 0
 Archetype = track_spiral_guide
 [Object]
 nickname = track_ring20
 pos = -37655, 300, -20700
 rotate = -185, -25, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring21
 pos = -37325, 275, -20400
 rotate = -185, -65, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring22
 pos = -36765, 200, -20400
 rotate = -185, -110, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring23
 pos = -36150,120, -20500
 rotate = 180, -130, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring24
 pos = -35725,120, -20850
 rotate = 0, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring25
 pos = -35375,120, -21275
 rotate = 0, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide07
 pos = -34900,120, -21760
 rotate = 37, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_curve_guide08
 pos = -35150,120, -22400
 rotate = 47, 0, -90
 Archetype = track_curve_guide
 [Object]
 nickname = track_curve_guide09
 pos = -34800,120, -22900
 rotate = 135, 0, -90
 Archetype = track_curve_guide
 [Object]
 nickname = track_curve_guide10
 pos = -34200,120, -22600
 rotate = 315, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_curve_guide11
 pos = -33690,120, -22960
 rotate = 45, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring26
 pos = -33950, 120, -23425
 rotate = 0, -45, 180
 Archetype = track_ring
 [Object]
 nickname = track_curve_guide12
 pos = -34320,120, -23690
 rotate = 135, 0, 90
 Archetype = track_curve_guide
 [Object]
 nickname = track_ring27
 pos = -34850,120, -23400
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring28
 pos = -35060,120, -23200
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring29
 pos = -35260,120, -23000
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring30
 pos = -35460,120, -22800
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = track_ring31
 pos = -35670,120, -22600
 rotate = 180, 45, 180
 Archetype = track_ring
 [Object]
 nickname = mod_ring01
 pos = -35670,120, -22600
 rotate = 180, 45, 180
 Archetype = mod_rings
 [Object]
 nickname = mplatform01
 pos = -36350,100, -24500
 rotate = 180, -45, 180
 Archetype = mplatform
--- a/DATA/UNIVERSE/SYSTEMS/EW06/ew06.ini
+++ b/DATA/UNIVERSE/SYSTEMS/EW06/ew06.ini
@@ -522,7 +522,7 @@ behavior = NOTHING
 ; base = Ew06_Nomad_Base
 reputation = fc_n_grp
 rotate = 0, 0, 0
-archetype = Roid_Miner
+archetype = Roid_Miner2
 ids_name = 0
 difficulty_level = 1
 visit = 128
@@ -562,4 +562,4 @@ pop_type = Background
 relief_time = 35
 faction_weight = fc_n_grp, 10
 encounter = capitalships_Nomads, 19, 0.400000
-faction = fc_n_grp, 1.000000
+faction = fc_n_grp, 1.000000
--- a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_shipdealer.ini
+++ b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ROOMS/ku01_03_shipdealer.ini
@@ -1,60 +0,0 @@
 [Room_Info]
 set_script = Scripts\Bases\ku_07_shipdealer_hardpoint_01.thn
 scene = all, ambient, Scripts\Bases\ku_07_Deck_ambi_int_01.thn
 animation = Sc_loop
 [Room_Sound]
 ambient = ambience_shipbuy
 [Spiels]
 ShipDealer = manhattan_ship_spiel
 [Camera]
 name = Camera_0
 [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
--- a/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ku01_03_base.ini
+++ b/DATA/UNIVERSE/SYSTEMS/KU01/BASES/ku01_03_base.ini
@@ -10,6 +10,3 @@ file = Universe\Systems\Ku01\Bases\Rooms\Ku01_03_Bar.ini
 nickname = Deck
 file = Universe\Systems\Ku01\Bases\Rooms\Ku01_03_Deck.ini
 [Room]
 nickname = ShipDealer
 file = Universe\Systems\Ku01\Bases\Rooms\Ku01_03_ShipDealer.ini
--- a/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_06_deck.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/BASES/ROOMS/li01_06_deck.ini
@@ -1,5 +1,7 @@
 [Room_Info]
-set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn
+; set_script = Scripts\Bases\Li_08_Deck_hardpoint_01.thn
 set_script = Scripts\Bases\li_08_deck_hardpoint_01_asteroid.thn
 scene = all, ambient, Scripts\Bases\npc_test.thn
 scene = all, ambient, Scripts\Bases\Li_08_Deck_ambi_int_01.thn
 animation = Sc_loop
--- a/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI01/li01.ini
@@ -10834,11 +10834,11 @@ pos = -35750, 120, -25450
 rotate = 0, 135, 0
 Archetype = ic_billboard
-;[Object]
+[Object]
-;nickname = manhattan_bar_billboard
+nickname = manhattan_bar_billboard
-;pos = -33267, 125, -28810
+pos = -33267, 125, -28810
-;rotate = 0, 0, 0
+rotate = 0, 0, 0
-;Archetype = manhattan_bar_billboard
+Archetype = manhattan_bar_billboard
 [Object]
 nickname = universal_shipping_billboard
@@ -10846,12 +10846,12 @@ pos = -30600, 110, -29680
 rotate = 0, 25, 0
 Archetype = universal_shipping_billboard
-;[Object]
+[Object]
-;nickname = tradehub_manhattan
+nickname = tradehub_manhattan
-;pos = -33600, 120, -28700
+pos = -33600, 120, -28700
-;spin = 1, 1, 1
+spin = 1, 1, 1
-;rotate = 45, 25, 45
+rotate = 45, 25, 45
-;Archetype = tradehub_manhattan
+Archetype = tradehub_manhattan
 ;[Object]
 ;nickname = westpoint_billboard
--- a/DATA/UNIVERSE/SYSTEMS/LI05/li05.ini
+++ b/DATA/UNIVERSE/SYSTEMS/LI05/li05.ini
@@ -59,20 +59,6 @@ reputation = fc_uk_grp
 behavior = NOTHING
 goto = Li01, Li01_to_Li05, gate_tunnel_bretonia
 ; New System JH
 [Object]
 nickname = Li05_to_Bw11_hole
 ids_name = 260933
 pos = 65917, 0,32508
 rotate = 0, 90, 0
 Archetype = jumphole_light
 msg_id_prefix = gcs_refer_system_Li01
 ids_info = 66146
 jump_effect = jump_effect_hole
 visit = 0
 goto = Bw11, Bw11_to_Li05_hole, gate_tunnel_bretonia
 [zone]
 nickname = Zone_Li05_nebula
 pos = 0, 0, 0
--- a/DATA/UNIVERSE/SYSTEMS/RH01/rh01.ini
+++ b/DATA/UNIVERSE/SYSTEMS/RH01/rh01.ini
@@ -6711,9 +6711,9 @@ pos = -43650, 350, 12200
 rotate = 0, 80, 0
 Archetype = ic_billboard
-;[Object]
+[Object]
-;nickname = waste_diposal_billboard
+nickname = waste_diposal_billboard
-;pos = -7280, 150, -48007
+pos = -7280, 150, -48007
-;rotate = 0, 90, 0
+rotate = 0, 90, 0
-;Archetype = waste_diposal_billboard
+Archetype = waste_diposal_billboard
--- a/DATA/UNIVERSE/SYSTEMS/RH02/rh02.ini
+++ b/DATA/UNIVERSE/SYSTEMS/RH02/rh02.ini
@@ -4162,288 +4162,288 @@ archetype = space_police_dmg
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_0
+nickname = hc_Trade_Lane_Ring_0
 tradelane_space_name = 196813
 ids_name = 260923
 pos = -23950, 0, -44568
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-next_ring = rem_Trade_Lane_Ring_1
+next_ring = hc_Trade_Lane_Ring_1
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_1
+nickname = hc_Trade_Lane_Ring_1
 ids_name = 260923
 pos = -24276, 0, -37076
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_0
+prev_ring = hc_Trade_Lane_Ring_0
-next_ring = rem_Trade_Lane_Ring_2
+next_ring = hc_Trade_Lane_Ring_2
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_2
+nickname = hc_Trade_Lane_Ring_2
 ids_name = 260923
 pos = -24602, 0, -29583
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_1
+prev_ring = hc_Trade_Lane_Ring_1
-next_ring = rem_Trade_Lane_Ring_3
+next_ring = hc_Trade_Lane_Ring_3
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_3
+nickname = hc_Trade_Lane_Ring_3
 ids_name = 260923
 pos = -24928, 0, -22090
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_2
+prev_ring = hc_Trade_Lane_Ring_2
-next_ring = rem_Trade_Lane_Ring_4
+next_ring = hc_Trade_Lane_Ring_4
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_4
+nickname = hc_Trade_Lane_Ring_4
 ids_name = 260923
 pos = -25254, 0, -14597
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_3
+prev_ring = hc_Trade_Lane_Ring_3
-next_ring = rem_Trade_Lane_Ring_5
+next_ring = hc_Trade_Lane_Ring_5
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_5
+nickname = hc_Trade_Lane_Ring_5
 ids_name = 260923
 pos = -25580, 0, -7104
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_4
+prev_ring = hc_Trade_Lane_Ring_4
-next_ring = rem_Trade_Lane_Ring_6
+next_ring = hc_Trade_Lane_Ring_6
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_6
+nickname = hc_Trade_Lane_Ring_6
 ids_name = 260923
 pos = -25906, 0, 389
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_5
+prev_ring = hc_Trade_Lane_Ring_5
-next_ring = rem_Trade_Lane_Ring_7
+next_ring = hc_Trade_Lane_Ring_7
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_7
+nickname = hc_Trade_Lane_Ring_7
 ids_name = 260923
 pos = -26232, 0, 7882
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_6
+prev_ring = hc_Trade_Lane_Ring_6
-next_ring = rem_Trade_Lane_Ring_8
+next_ring = hc_Trade_Lane_Ring_8
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_8
+nickname = hc_Trade_Lane_Ring_8
 ids_name = 260923
 pos = -26558, 0, 15375
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_7
+prev_ring = hc_Trade_Lane_Ring_7
-next_ring = rem_Trade_Lane_Ring_9
+next_ring = hc_Trade_Lane_Ring_9
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem_Trade_Lane_Ring_9
+nickname = hc_Trade_Lane_Ring_9
 tradelane_space_name = 458793
 ids_name = 260923
 pos = -26884, 0, 22868
 rotate = 0, 178, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem_Trade_Lane_Ring_8
+prev_ring = hc_Trade_Lane_Ring_8
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_0
+nickname = hhc_Trade_Lane_Ring_0
 tradelane_space_name = 196815
 ids_name = 260923
 pos = 31500, 0, 23543
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-next_ring = rem02_Trade_Lane_Ring_1
+next_ring = hhc_Trade_Lane_Ring_1
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_1
+nickname = hhc_Trade_Lane_Ring_1
 ids_name = 260923
 pos = 24011, 0, 23946
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_0
+prev_ring = hhc_Trade_Lane_Ring_0
-next_ring = rem02_Trade_Lane_Ring_2
+next_ring = hhc_Trade_Lane_Ring_2
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_2
+nickname = hhc_Trade_Lane_Ring_2
 ids_name = 260923
 pos = 16522, 0, 24349
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_1
+prev_ring = hhc_Trade_Lane_Ring_1
-next_ring = rem02_Trade_Lane_Ring_3
+next_ring = hhc_Trade_Lane_Ring_3
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_3
+nickname = hhc_Trade_Lane_Ring_3
 ids_name = 260923
 pos = 9032, 0, 24752
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_2
+prev_ring = hhc_Trade_Lane_Ring_2
-next_ring = rem02_Trade_Lane_Ring_4
+next_ring = hhc_Trade_Lane_Ring_4
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_4
+nickname = hhc_Trade_Lane_Ring_4
 ids_name = 260923
 pos = 1543, 0, 25154
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_3
+prev_ring = hhc_Trade_Lane_Ring_3
-next_ring = rem02_Trade_Lane_Ring_5
+next_ring = hhc_Trade_Lane_Ring_5
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_5
+nickname = hhc_Trade_Lane_Ring_5
 ids_name = 260923
 pos = -5946, 0, 25557
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_4
+prev_ring = hhc_Trade_Lane_Ring_4
-next_ring = rem02_Trade_Lane_Ring_6
+next_ring = hhc_Trade_Lane_Ring_6
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_6
+nickname = hhc_Trade_Lane_Ring_6
 ids_name = 260923
 pos = -13435, 0, 25960
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_5
+prev_ring = hhc_Trade_Lane_Ring_5
-next_ring = rem02_Trade_Lane_Ring_7
+next_ring = hhc_Trade_Lane_Ring_7
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
 [Object]
 visit = 1
-nickname = rem02_Trade_Lane_Ring_7
+nickname = hhc_Trade_Lane_Ring_7
 tradelane_space_name = 458793
 ids_name = 260923
 pos = -20924, 0, 26363
 rotate = 0, 93, 0
 Archetype = Trade_Lane_Ring
 ids_info = 66170
-prev_ring = rem02_Trade_Lane_Ring_6
+prev_ring = hhc_Trade_Lane_Ring_6
 behavior = Nothing
-reputation = rh_p_grp
+reputation = hc
 difficulty_level = 8
 loadout = trade_lane_ring
 pilot = pilot_solar_hard
--- a/DATA/UNIVERSE/SYSTEMS/ST03/st03.ini
+++ b/DATA/UNIVERSE/SYSTEMS/ST03/st03.ini
@@ -134,7 +134,7 @@ pilot = pilot_solar_easy
 dock_with = ST03_01_Base
 pos = 8600, 3500, 4440
 rotate = 0, -95, 0
-reputation = fc_or_grp
+reputation = fc_order_grp
 difficulty_level = 2
 space_costume = pl_male7_head, pi_pirate3_body
 voice = atc_leg_f01a
--- a/DATA/UNIVERSE/universe.ini
+++ b/DATA/UNIVERSE/universe.ini
@@ -1686,42 +1686,6 @@ BGCS_base_run_by = W02bF53
 ; file = Universe\Systems\Ew06\Bases\Nomad_Base.ini
 ; BGCS_base_run_by = W02bF53
 ; Cairo
 [Base]
 nickname = ST04_01_Base
 system = st04
 strid_name = 198000
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_01_Base.ini
 BGCS_base_run_by = W02bF35
 ; Menes
 [Base]
 nickname = ST04_02_Base
 system = st04
 strid_name = 198001
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_02_Base.ini
 BGCS_base_run_by = W02bF35
 ; Sinai
 [Base]
 nickname = ST04_03_Base
 system = st04
 strid_name = 198002
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_03_Base.ini
 BGCS_base_run_by = W02bF35
 ; OS Djoser
 ; [Base]
 ; nickname = ST04_04_Base
 ; system = st04
 ; strid_name = 198003
 ; file = UNIVERSE\SYSTEMS\ST04\Bases\St04_04_Base.ini
 ; BGCS_base_run_by = W02bF35
 [system]
 nickname = Li01
 file = Systems\Li01\Li01.ini
@@ -1730,7 +1694,6 @@ msg_id_prefix = gcs_refer_system_Li01
 visit = 1
 strid_name = 196609
 ids_info = 66106
 NavMapScale = 1.0
 [system]
 nickname = Li02
@@ -1740,7 +1703,6 @@ msg_id_prefix = gcs_refer_system_Li02
 visit = 0
 strid_name = 196610
 ids_info = 66084
 NavMapScale = 1.0
 [system]
 nickname = Li03
@@ -1750,7 +1712,6 @@ msg_id_prefix = gcs_refer_system_Li03
 visit = 0
 strid_name = 196611
 ids_info = 66087
 NavMapScale = 1.0
 [system]
 nickname = Li04
@@ -1760,7 +1721,6 @@ msg_id_prefix = gcs_refer_system_Li04
 visit = 0
 strid_name = 196612
 ids_info = 66126
 NavMapScale = 1.0
 [system]
 nickname = Li05
@@ -2100,16 +2060,6 @@ strid_name = 196642
 ids_info = 66124
 NavMapScale = 2
 [system]
 nickname = Bw11
 file = systems\Bw11\Bw11.ini
 pos = 10, 7
 msg_id_prefix = gcs_refer_system_Bw11
 visit = 0
 strid_name = 196608
 ids_info = 65538
 NavMapScale = 2
 [system]
 nickname = Ew01
 file = systems\Ew01\Ew01.ini
@@ -2243,6 +2193,44 @@ ids_info = 66115
 NavMapScale = 3
 ; Cairo
 [Base]
 nickname = ST04_01_Base
 system = st04
 strid_name = 198000
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_01_Base.ini
 BGCS_base_run_by = W02bF35
 ; Menes
 [Base]
 nickname = ST04_02_Base
 system = st04
 strid_name = 198001
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_02_Base.ini
 BGCS_base_run_by = W02bF35
 ; Sinai
 [Base]
 nickname = ST04_03_Base
 system = st04
 strid_name = 198002
 file = UNIVERSE\SYSTEMS\ST04\Bases\St04_03_Base.ini
 BGCS_base_run_by = W02bF35
 ; OS Djoser
 ; [Base]
 ; nickname = ST04_04_Base
 ; system = st04
 ; strid_name = 198003
 ; file = UNIVERSE\SYSTEMS\ST04\Bases\St04_04_Base.ini
 ; BGCS_base_run_by = W02bF35
 ; Omicron Lambda
 [system]
--- a/DATA/initialworld
+++ b/DATA/initialworld
--- a/DATA/petaldb.ini
+++ b/DATA/petaldb.ini
@@ -158,6 +158,7 @@ room = bw_02_equipment, bases\pirate\hi_havana_equip.cmp
 room = hi_01_madrid_cityscape, bases\pirate\hi_01_madrid_cityscape.cmp
 prop = hi_01_madrid_background, bases\pirate\hi_01_madrid_background.3db
 room = hi_02_cadiz_cityscape, bases\pirate\hi_02_cadiz_cityscape.cmp
 room = ast_interior_base, bases\generic\ast_interior_base.3db
 room = st_01_dig_site, bases\generic\cv_dig_site.cmp
 room = st_02_dig_site, bases\generic\cv_dig_site_spruage.cmp
 room = st_02_lab, bases\generic\cv_lab.cmp
--- a/DLLS/BIN/content
+++ b/DLLS/BIN/content
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
D4rkl1ght3r	a1ecaa00e7	Add Dummy NPC	2025-05-09 20:46:30 +02:00
D4rkl1ght3r	b191862aeb	Add ast_interior_base	2025-05-07 23:08:19 +02:00