diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini index 4241889a..f6494b84 100644 --- a/DATA/EQUIPMENT/goods.ini +++ b/DATA/EQUIPMENT/goods.ini @@ -721,6 +721,40 @@ shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db item_icon = Equipment\models\commodities\nn_icons\COMMOD_halloween.3db jump_dist = 6 +;Christmas Presentbox + +[Good] +nickname = commodity_presentbox +msg_id_prefix = gcs_gen_commodity_presentbox +equipment = commodity_presentbox +category = commodity +price = 500 +combinable = true +good_sell_price = 1 +bad_buy_price = 1 +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_presentbox.3db +jump_dist = 6 + +;Candy Cane + +[Good] +nickname = commodity_candycane +msg_id_prefix = gcs_gen_commodity_candycane +equipment = commodity_candycane +category = commodity +price = 2412 +combinable = true +good_sell_price = 4 +bad_buy_price = 4 +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_candycane.3db +jump_dist = 2 + [Good] nickname = commodity_prisoners equipment = commodity_prisoners diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini index e9631945..74b63c94 100644 --- a/DATA/EQUIPMENT/select_equip.ini +++ b/DATA/EQUIPMENT/select_equip.ini @@ -454,6 +454,26 @@ hit_pts = 250 mass = 10 explosion_arch = debris_normal +; Present Box + +[LootCrate] +nickname = lootcrate_presentbox +DA_archetype = solar\asteroids\models\lootcrate_presentbox.3db +material_library = solar\asteroids\models\lootcrate_presentbox.3db +hit_pts = 250 +mass = 10 +explosion_arch = debris_normal + +; Jack O'Lantern + +[LootCrate] +nickname = lootcrate_pumpkin +DA_archetype = solar\asteroids\models\lootcrate_pumpkin.3db +material_library = solar\asteroids\models\lootcrate_pumpkin.3db +hit_pts = 250 +mass = 10 +explosion_arch = debris_normal + ; Mineral Dusts ; Viridian @@ -1135,7 +1155,33 @@ ids_name = 48000 ids_info = 48100 units_per_container = 18 pod_appearance = cargopod_blue -loot_appearance = lootcrate_blue +loot_appearance = lootcrate_pumpkin +decay_per_second = 0 +volume = 1 +hit_pts = 250 + +; Present Box + +[Commodity] +nickname = commodity_presentbox +ids_name = 48001 +ids_info = 48101 +units_per_container = 18 +pod_appearance = cargopod_blue +loot_appearance = lootcrate_presentbox +decay_per_second = 0 +volume = 1 +hit_pts = 250 + +; Candy Cane + +[Commodity] +nickname = commodity_candycane +ids_name = 48002 +ids_info = 48102 +units_per_container = 18 +pod_appearance = cargopod_blue +loot_appearance = lootcrate_presentbox decay_per_second = 0 volume = 1 hit_pts = 250 diff --git a/DATA/MISSIONS/lootprops.ini b/DATA/MISSIONS/lootprops.ini index 5fb7b8b8..75b57c32 100644 --- a/DATA/MISSIONS/lootprops.ini +++ b/DATA/MISSIONS/lootprops.ini @@ -1738,6 +1738,14 @@ drop_properties = 25, 646965, 646965, 0, 2, 1 nickname = commodity_halloween drop_properties = 100, 0, 3333, 1, 150, 150 +[mLootProps] +nickname = commodity_presentbox +drop_properties = 100, 0, 3333, 1, 150, 150 + +[mLootProps] +nickname = commodity_candycane +drop_properties = 100, 0, 3333, 1, 150, 150 + [PhantomLoot] nickname = ge_s_repair_01 toughness_range = 0, 1 diff --git a/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.3db b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.3db new file mode 100644 index 00000000..8d2b65e1 Binary files /dev/null and b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.3db differ diff --git a/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.sur b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.sur new file mode 100644 index 00000000..97d1c442 Binary files /dev/null and b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_presentbox.sur differ diff --git a/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.3db b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.3db new file mode 100644 index 00000000..39566f0d Binary files /dev/null and b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.3db differ diff --git a/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.sur b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.sur new file mode 100644 index 00000000..f316622f Binary files /dev/null and b/DATA/SOLAR/ASTEROIDS/MODELS/lootcrate_pumpkin.sur differ diff --git a/EXE/resources.dll b/EXE/resources.dll index 75686a8e..50754bd8 100644 Binary files a/EXE/resources.dll and b/EXE/resources.dll differ