diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini index 7fcdf0cc..bdf34faf 100644 --- a/DATA/EQUIPMENT/select_equip.ini +++ b/DATA/EQUIPMENT/select_equip.ini @@ -1131,8 +1131,8 @@ hit_pts = 250 [Commodity] nickname = commodity_halloween -ids_name = 50021 -ids_info = 50022 +ids_name = 48000 +ids_info = 48100 units_per_container = 18 pod_appearance = cargopod_blue loot_appearance = lootcrate_blue diff --git a/DATA/MISSIONS/faction_prop.ini b/DATA/MISSIONS/faction_prop.ini index 7a33e9f6..24f97c5f 100644 --- a/DATA/MISSIONS/faction_prop.ini +++ b/DATA/MISSIONS/faction_prop.ini @@ -2238,6 +2238,7 @@ nickname_plurality = plural msg_id_prefix = ignore jump_preference = jumpgate npc_ship = no_fighter_pimped_d1-20 +npc_ship = event_jack_o_lantern npc_ship = no_fighter_pimped_d21 npc_ship = fc_n_no_fighter_proto_d19 mc_costume = mc_fc diff --git a/DATA/MISSIONS/lootprops.ini b/DATA/MISSIONS/lootprops.ini index 44cdb998..5fb7b8b8 100644 --- a/DATA/MISSIONS/lootprops.ini +++ b/DATA/MISSIONS/lootprops.ini @@ -1734,6 +1734,10 @@ drop_properties = 25, 646965, 646965, 0, 2, 1 nickname = special_gun15 drop_properties = 25, 646965, 646965, 0, 2, 1 +[mLootProps] +nickname = commodity_halloween +drop_properties = 100, 0, 3333, 1, 150, 150 + [PhantomLoot] nickname = ge_s_repair_01 toughness_range = 0, 1 diff --git a/DATA/MISSIONS/npcships.ini b/DATA/MISSIONS/npcships.ini index 07440c5d..b64db555 100644 --- a/DATA/MISSIONS/npcships.ini +++ b/DATA/MISSIONS/npcships.ini @@ -3677,4 +3677,13 @@ level = d40 ship_archetype = no_battleship pilot = pilot_capitals state_graph = CRUISER -npc_class = unlawful, class_battleship, d19 \ No newline at end of file +npc_class = unlawful, class_battleship, d19 + +[NPCShipArch] +nickname = event_jack_o_lantern +loadout = event_jack_o'lantern_load +level = d19 +ship_archetype = jack_o_lantern +pilot = MSN13_Nomad_Fighter +state_graph = FIGHTER +npc_class = unlawful, FIGHTER, d19 \ No newline at end of file diff --git a/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db new file mode 100644 index 00000000..71588682 Binary files /dev/null and b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.3db differ diff --git a/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.sur b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.sur new file mode 100644 index 00000000..5227c9cb Binary files /dev/null and b/DATA/SHIPS/EVENT/HALLOWEEN/Jack_O'Lantern.sur differ diff --git a/DATA/SHIPS/loadouts.ini b/DATA/SHIPS/loadouts.ini index dfd2996b..cf8f7201 100644 --- a/DATA/SHIPS/loadouts.ini +++ b/DATA/SHIPS/loadouts.ini @@ -10617,4 +10617,19 @@ equip = nomad02_turret01_mark01, Hp_1_14 equip = nomad02_turret01_mark01, Hp_1_15 cargo = special_nomad_gun01, 3 cargo = special_nomad_gun02, 3 -cargo = commodity_nomad_power_cell, 1 \ No newline at end of file +cargo = commodity_nomad_power_cell, 1 + +; Jack O'Lantern Loadout + +[Loadout] +nickname = event_jack_o'lantern_load +archetype = jack_o_lantern +equip = ge_nf_engine_01 +equip = infinite_power +equip = ge_s_scanner_02 +equip = no_thruster, HpThruster01 +equip = armor_scale_9 +equip = nomad_gun01_mark03, HpWeapon01 +equip = nomad_gun01_mark03, HpWeapon02 +equip = nomad_gun01_mark03, HpWeapon03 +cargo = commodity_halloween, 1 \ No newline at end of file diff --git a/DATA/SHIPS/shiparch.ini b/DATA/SHIPS/shiparch.ini index f0064d7f..5fb8e4a1 100644 --- a/DATA/SHIPS/shiparch.ini +++ b/DATA/SHIPS/shiparch.ini @@ -9640,3 +9640,32 @@ hp_type = hp_turret_special_2, HpTurret01 hp_type = hp_turret_special_1, HpTurret01 hp_type = hp_torpedo_special_1, HpTorpedo01 hp_type = hp_torpedo_special_2, HpTorpedo01 + + +; HALLOWEEN JACK O'LANTERN NPC + +[Ship] +ids_name = 236001 +ids_info = 66620 +nickname = jack_o_lantern +LODranges = 0, 999999 +type = FIGHTER +DA_archetype = ships\EVENT\HALLOWEEN\Jack_O'Lantern.3db +material_library = ships\EVENT\HALLOWEEN\Jack_O'Lantern.3db +nomad = true +cockpit = cockpits\liberty\l_elite.ini +mass = 150 +hold_size = 800 +linear_drag = 1 +explosion_arch = explosion_no_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 = 43000, 43000, 58000 +angular_drag = 41000, 41000, 41000 +rotation_inertia = 8400, 8400, 8400 +nudge_force = 30000 +HP_tractor_source = HpMount +num_exhaust_nozzles = 1 +hit_pts = 4000 + diff --git a/EXE/infocards.dll b/EXE/infocards.dll index 61306e52..4d1bf9c4 100644 Binary files a/EXE/infocards.dll and b/EXE/infocards.dll differ diff --git a/EXE/nameresources.dll b/EXE/nameresources.dll index 2ef16448..b5996476 100644 Binary files a/EXE/nameresources.dll and b/EXE/nameresources.dll differ diff --git a/EXE/resources.dll b/EXE/resources.dll index a2b85adf..75686a8e 100644 Binary files a/EXE/resources.dll and b/EXE/resources.dll differ