diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini index ec28b5d8..884f43e3 100644 --- a/DATA/EQUIPMENT/market_misc.ini +++ b/DATA/EQUIPMENT/market_misc.ini @@ -11586,13 +11586,15 @@ MarketGood = missile03_mark02_ammo, 1, -1, 50, 50, 0, 1 MarketGood = missile03_mark03_ammo, 1, -1, 50, 50, 0, 1 MarketGood = missile03_mark04_ammo, 1, -1, 50, 50, 0, 1 MarketGood = cruise_disruptor01_mark01, 2, -1, 10, 10, 0, 1 +MarketGood = cruise_disruptor01_mark02, 2, -1, 10, 10, 0, 1 MarketGood = cruise_disruptor01_mark01_ammo, 1, -1, 50, 50, 0, 1 MarketGood = cruise_disruptor01_mark02_ammo, 1, -1, 50, 50, 0, 1 ; MarketGood = nomad_cruise_disruptor01_ammo, 2, -1, 50, 50, 0, 1 -; MarketGood = nomad_torpedo01_rtc_ammo, 10, -1, 50, 50, 0, 1 MarketGood = torpedo01_mark01, 10, -1, 10, 10, 0, 1 MarketGood = torpedo01_mark01_ammo, 1, -1, 50, 50, 0, 1 MarketGood = torpedo01_mark02_ammo, 1, -1, 50, 50, 0, 1 +MarketGood = nomad_torpedo01_player_ammo, 1, -1, 50, 50, 0, 1 +; MarketGood = christmas_torpedo_ammo, 10, -1, 50, 50, 0, 1 MarketGood = mine01_mark01_ammo, 1, -1, 50, 50, 0, 1 MarketGood = mine01_mark02_ammo, 1, -1, 50, 50, 0, 1 MarketGood = mine01_mark03_ammo, 1, -1, 50, 50, 0, 1 @@ -11604,7 +11606,39 @@ MarketGood = mine02_mark03_ammo, 1, -1, 50, 50, 0, 1 MarketGood = mine02_mark04_ammo, 1, -1, 50, 50, 0, 1 MarketGood = mine02_mark05_ammo, 1, -1, 50, 50, 0, 1 MarketGood = ge_s_cm_01_ammo, 0, -1, 50, 50, 0, 1 +MarketGood = ge_s_cm_01, 6, -1, 10, 10, 0, 1 MarketGood = ge_s_cm_02_ammo, 2, -1, 50, 50, 0, 1 +MarketGood = ge_s_cm_02, 6, -1, 10, 10, 0, 1 MarketGood = ge_s_cm_03_ammo, 6, -1, 50, 50, 0, 1 -MarketGood = nomad_torpedo01_player_ammo, 10, -1, 50, 50, 0, 1 -; MarketGood = christmas_torpedo_ammo, 10, -1, 50, 50, 0, 1 \ No newline at end of file +MarketGood = ge_s_cm_03, 6, -1, 10, 10, 0, 1 +MarketGood = ge_s_battery_01, 0, -1, 100, 100, 0, 1 +MarketGood = ge_s_repair_01, 0, -1, 100, 100, 0, 1 +MarketGood = mine01_mark01, 2, -0.2, 10, 10, 0, 1 +MarketGood = mine02_mark01, 2, -0.2, 10, 10, 0, 1 +MarketGood = mine01_mark02, 2, -0.2, 10, 10, 0, 1 +MarketGood = mine02_mark02, 2, -0.2, 10, 10, 0, 1 +MarketGood = mine01_mark03, 2, -0.2, 10, 10, 0, 1 +MarketGood = mine02_mark03, 2, -0.2, 10, 10, 0, 1 +MarketGood = ge_s_thruster_01, 0, -1, 10, 10, 0, 1 +MarketGood = ge_s_thruster_02, 0, -1, 10, 10, 0, 1 +MarketGood = ge_s_thruster_03, 0, -1, 10, 10, 0, 1 +MarketGood = ge_s_thruster_04, 6, -1, 10, 10, 0, 1 +MarketGood = shield03_mark01_lf, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark02_lf, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark03_lf, 2, -1, 10, 10, 0, 1 +MarketGood = shield03_mark01_hf, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark02_hf, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark03_hf, 2, -1, 10, 10, 0, 1 +MarketGood = shield03_mark01_fr, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark02_fr, 0, -1, 10, 10, 0, 1 +MarketGood = shield03_mark03_fr, 2, -1, 10, 10, 0, 1 +MarketGood = li_gun01_mark02, 0, -0.2, 10, 10, 0, 1 +MarketGood = li_gun01_mark03, 2, 0.1, 10, 10, 0, 1 +MarketGood = li_gun02_mark02, 0, -0.2, 10, 10, 0, 1 +MarketGood = li_gun02_mark03, 2, 0.1, 10, 10, 0, 1 +MarketGood = li_turret01_mark02, 2, -0.2, 10, 10, 0, 1 +MarketGood = li_turret01_mark03, 10, 0.2, 10, 10, 0, 1 +MarketGood = li_turret02_mark02, 2, -0.2, 10, 10, 0, 1 +MarketGood = li_turret02_mark03, 10, 0.2, 10, 10, 0, 1 +MarketGood = missile01_mark01, 0, -1, 10, 10, 0, 1 +MarketGood = missile02_mark01, 0, -1, 10, 10, 0, 1 diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini index 21042b93..f336f845 100644 --- a/DATA/EQUIPMENT/weapon_equip.ini +++ b/DATA/EQUIPMENT/weapon_equip.ini @@ -27195,6 +27195,8 @@ impulse = 0 [Munition] nickname = nomad_torpedo01_player_ammo +ids_name = 263910 +ids_info = 264527 explosion_arch = torpedo01_mark01_explosion loot_appearance = ammo_crate units_per_container = 1 diff --git a/DATA/EQUIPMENT/weapon_good.ini b/DATA/EQUIPMENT/weapon_good.ini index bcef859c..434928b4 100644 --- a/DATA/EQUIPMENT/weapon_good.ini +++ b/DATA/EQUIPMENT/weapon_good.ini @@ -6572,6 +6572,7 @@ item_icon = equipment\models\commodities\nn_icons\EQUIPICON_torplauncher.3db combinable = false ids_name = 263527 ids_info = 264527 +free_ammo = nomad_torpedo01_player_ammo, 1 shop_archetype = equipment\models\torpedoes\ge_torpedo.3db diff --git a/EXE/equipresources.dll b/EXE/equipresources.dll index af591d49..91d8a729 100644 Binary files a/EXE/equipresources.dll and b/EXE/equipresources.dll differ