diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/prisoner.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/prisoner.3db new file mode 100644 index 00000000..2ee291c1 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/prisoner.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/slave.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/slave.3db new file mode 100644 index 00000000..4d962202 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/slave.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/soldier.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/soldier.3db new file mode 100644 index 00000000..72314648 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/soldier.3db differ diff --git a/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/vip.3db b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/vip.3db new file mode 100644 index 00000000..955079c5 Binary files /dev/null and b/DATA/EQUIPMENT/MODELS/COMMODITIES/NN_ICONS/vip.3db differ diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini index fec14355..a0ed6f3a 100644 --- a/DATA/EQUIPMENT/goods.ini +++ b/DATA/EQUIPMENT/goods.ini @@ -34,7 +34,7 @@ bad_buy_price = 8.2 bad_sell_price = 1 good_buy_price = 1 shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db -item_icon = Equipment\models\commodities\nn_icons\COMMOD_chemicals.3db +item_icon = Equipment\models\commodities\nn_icons\vip.3db jump_dist = 5 [Good] @@ -49,9 +49,40 @@ bad_buy_price = 8.2 bad_sell_price = 1 good_buy_price = 1 shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db -item_icon = Equipment\models\commodities\nn_icons\COMMOD_chemicals.3db +item_icon = Equipment\models\commodities\nn_icons\vip.3db jump_dist = 5 +[Good] +nickname = commodity_slaves +equipment = commodity_slaves +msg_id_prefix = gcs_gen_commodity_slaves +category = commodity +price = 400 +combinable = true +good_sell_price = 8.200000 +bad_buy_price = 8.200000 +bad_sell_price = 1 +good_buy_price = 1 +shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db +item_icon = Equipment\models\commodities\nn_icons\slave.3db +jump_dist = 5 + +[Good] +nickname = commodity_soldiers +equipment = commodity_soldiers +msg_id_prefix = gcs_gen_commodity_soldiers +category = commodity +price = 1200 +combinable = true +good_sell_price = 8.200000 +bad_buy_price = 8.200000 +bad_sell_price = 1 +good_buy_price = 1 +shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db +item_icon = Equipment\models\commodities\nn_icons\soldier.3db +jump_dist = 5 + + [Good] nickname = commodity_boron equipment = commodity_boron diff --git a/DATA/EQUIPMENT/market_commodities.ini b/DATA/EQUIPMENT/market_commodities.ini index ab185660..f5df63f1 100644 --- a/DATA/EQUIPMENT/market_commodities.ini +++ b/DATA/EQUIPMENT/market_commodities.ini @@ -2526,3 +2526,9 @@ MarketGood = commodity_high_temp_alloys, 0, -1, 0, 0, 1, 0.5 MarketGood = commodity_mining_machinery, 0, -1, 0, 0, 1, 6.6667 MarketGood = commodity_pharm, 0, -1, 0, 0, 1, 0.5263 + +; REM LINER + +[BaseGood] +base = Hi02_REM_LINER +MarketGood = commodity_slaves, 0, -1, 150, 500, 0, 1.000000 diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini index 98b7c6b8..1748545d 100644 --- a/DATA/EQUIPMENT/select_equip.ini +++ b/DATA/EQUIPMENT/select_equip.ini @@ -487,7 +487,7 @@ hit_pts = 250 [Commodity] nickname = commodity_vips ids_name = 261647 -ids_info = 65887 +ids_info = 221882 units_per_container = 5 pod_appearance = cargopod_drab loot_appearance = lootcrate_drab @@ -498,7 +498,7 @@ hit_pts = 250 [Commodity] nickname = commodity_prisoners ids_name = 261646 -ids_info = 65887 +ids_info = 221883 units_per_container = 5 pod_appearance = cargopod_drab loot_appearance = lootcrate_drab @@ -3399,3 +3399,24 @@ nickname = bh_elite3_shield01 DA_archetype = Ships\BOUNTY_HUNTER\BH_VHEAVY_FIGHTER2\bh_vheavy_fighter2_shield.3db HP_child = SpConnect +[Commodity] +nickname = commodity_slaves +ids_name = 221766 +ids_info = 221880 +units_per_container = 18 +pod_appearance = cargopod_blue +loot_appearance = lootcrate_blue +decay_per_second = 0 +volume = 1 +hit_pts = 250 + +[Commodity] +nickname = commodity_soldiers +ids_name = 221765 +ids_info = 221881 +units_per_container = 18 +pod_appearance = cargopod_blue +loot_appearance = lootcrate_blue +decay_per_second = 0 +volume = 1 +hit_pts = 250 diff --git a/EXE/infocards.dll b/EXE/infocards.dll index 4301d7d6..b366a7b0 100644 Binary files a/EXE/infocards.dll and b/EXE/infocards.dll differ diff --git a/EXE/nameresources.dll b/EXE/nameresources.dll index d27fa2a7..3a8b5bec 100644 Binary files a/EXE/nameresources.dll and b/EXE/nameresources.dll differ