From fd029501f7b0bc2a91f9a39bcbad752b661ef508 Mon Sep 17 00:00:00 2001 From: D4rkl1ght3r <86805404+D4rkl1ght3r@users.noreply.github.com> Date: Sat, 30 Mar 2024 20:56:09 +0100 Subject: [PATCH] Fix Nomad Torpedo Infocard --- DATA/EQUIPMENT/market_misc.ini | 40 +++++++++++++++++++++++++++++--- DATA/EQUIPMENT/weapon_equip.ini | 2 ++ DATA/EQUIPMENT/weapon_good.ini | 1 + EXE/equipresources.dll | Bin 569856 -> 569856 bytes 4 files changed, 40 insertions(+), 3 deletions(-) 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 af591d49c7998920bcde656af06dccc4a8936bab..91d8a72931479d7290d964c03af81c470da4628f 100644 GIT binary patch delta 13221 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 F{{d2?2ABW< delta 13198 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