diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini index 758c39d4..3eadea03 100644 --- a/DATA/EQUIPMENT/goods.ini +++ b/DATA/EQUIPMENT/goods.ini @@ -709,6 +709,40 @@ shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db item_icon = Equipment\models\commodities\nn_icons\commod_weapon_secondary_blueprint.3db jump_dist = 2 +; ECLIPSE Blueprint + +[Good] +nickname = commodity_eclipse_blueprint +equipment = commodity_eclipse_blueprint +msg_id_prefix = gcs_gen_commodity_nemesis_blueprint +category = commodity +price = 75000 +combinable = false +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_weapon_primary_blueprint.3db +jump_dist = 2 + +; ECLIPSE Schematic + +[Good] +nickname = commodity_eclipse_schematic +equipment = commodity_eclipse_schematic +msg_id_prefix = gcs_gen_commodity_nemesis_schematics +category = commodity +price = 25000 +combinable = false +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_weapon_secondary_blueprint.3db +jump_dist = 2 + ; Tractor Beam Blueprint [Good] diff --git a/DATA/EQUIPMENT/market_misc.ini b/DATA/EQUIPMENT/market_misc.ini index a02fd5a1..5f0b8f25 100644 --- a/DATA/EQUIPMENT/market_misc.ini +++ b/DATA/EQUIPMENT/market_misc.ini @@ -13886,10 +13886,9 @@ 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 = or_gun01_mark05, 0, -0.2, 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 @@ -14048,6 +14047,7 @@ 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 = rh_gun01_mark04, 0, -0.2, 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 diff --git a/DATA/EQUIPMENT/select_equip.ini b/DATA/EQUIPMENT/select_equip.ini index ef24cbb3..c8918351 100644 --- a/DATA/EQUIPMENT/select_equip.ini +++ b/DATA/EQUIPMENT/select_equip.ini @@ -1016,6 +1016,32 @@ decay_per_second = 0 volume = 1 hit_pts = 250 +; ECLIPSE Blueprint + +[Commodity] +nickname = commodity_eclipse_blueprint +ids_name = 299816 +ids_info = 299817 +units_per_container = 1 +pod_appearance = cargopod_drab +loot_appearance = lootcrate_drab +decay_per_second = 0 +volume = 1 +hit_pts = 250 + +; ECLIPSE Schematic + +[Commodity] +nickname = commodity_eclipse_schematic +ids_name = 299818 +ids_info = 299819 +units_per_container = 1 +pod_appearance = cargopod_drab +loot_appearance = lootcrate_drab +decay_per_second = 0 +volume = 1 +hit_pts = 250 + ; Tractor Beam Blueprint [Commodity] diff --git a/DATA/EQUIPMENT/weapon_equip.ini b/DATA/EQUIPMENT/weapon_equip.ini index 63e63769..b1e7cc1c 100644 --- a/DATA/EQUIPMENT/weapon_equip.ini +++ b/DATA/EQUIPMENT/weapon_equip.ini @@ -21055,6 +21055,55 @@ turn_rate = 90 lootable = true LODranges = 0, 999999 +; Scythe + +[Munition] +nickname = or_gun01_mark05_ammo +hp_type = hp_gun +requires_ammo = false +hit_pts = 2 +hull_damage = 340.8 +energy_damage = 0 +weapon_type = W_Particle01 +one_shot_sound = fire_tachyon5 +munition_hit_effect = rh_tachyon_04_impact +const_effect = scythe_proj +lifetime = 1 +force_gun_ori = false +mass = 1 +volume = 0.0001 + +[Gun] +nickname = or_gun01_mark05 +ids_name = 299050 +ids_info = 299051 +DA_archetype = equipment\models\weapons\co_proton_cooker.cmp +material_library = equipment\models\ge_equip.mat +HP_child = HPConnect +hit_pts = 6752 +explosion_resistance = 1 +debris_type = debris_normal +parent_impulse = 20 +child_impulse = 80 +volume = 0 +mass = 10 +hp_gun_type = hp_gun_special_9 +damage_per_fire = 0 +power_usage = 82 +refire_delay = 0.17 +muzzle_velocity = 700 +use_animation = Sc_fire +toughness = 23.5 +flash_particle_name = sp_doomsday_02_flash +flash_radius = 15 +light_anim = l_gun01_flash +projectile_archetype = or_gun01_mark05_ammo +separation_explosion = sever_debris +auto_turret = false +turn_rate = 90 +lootable = true +LODranges = 0, 999999 + [Munition] nickname = small_station_turret_ammo hp_type = hp_gun diff --git a/DATA/EQUIPMENT/weapon_good.ini b/DATA/EQUIPMENT/weapon_good.ini index 3fe478e5..46b744f1 100644 --- a/DATA/EQUIPMENT/weapon_good.ini +++ b/DATA/EQUIPMENT/weapon_good.ini @@ -8256,4 +8256,18 @@ combinable = false ids_name = 299016 ids_info = 299017 shop_archetype = equipment\models\weapons\co_proton_cooker.cmp +material_library = equipment\models\ge_equip.mat + +; Scythe + +[Good] +nickname = or_gun01_mark05 +equipment = or_gun01_mark05 +category = equipment +price = 150000 +item_icon = equipment\models\commodities\nn_icons\EQUIPICON_gun.3db +combinable = false +ids_name = 299050 +ids_info = 299051 +shop_archetype = equipment\models\weapons\co_proton_cooker.cmp material_library = equipment\models\ge_equip.mat \ No newline at end of file diff --git a/DATA/FX/WEAPONS/customs/scythe.ale b/DATA/FX/WEAPONS/customs/scythe.ale new file mode 100644 index 00000000..196d864e Binary files /dev/null and b/DATA/FX/WEAPONS/customs/scythe.ale differ diff --git a/DATA/FX/WEAPONS/weapons_ale.ini b/DATA/FX/WEAPONS/weapons_ale.ini index 8f9d40e4..be4865fe 100644 --- a/DATA/FX/WEAPONS/weapons_ale.ini +++ b/DATA/FX/WEAPONS/weapons_ale.ini @@ -5222,4 +5222,13 @@ textures = fx\standardeffects.txm textures = fx\smoke.txm textures = fx\newglows.txm textures = fx\nomad.txm -textures = fx\hexagon.txm \ No newline at end of file +textures = fx\hexagon.txm + +; Scythe + +[VisEffect] +nickname = scythe_proj +alchemy = fx\weapons\customs\scythe.ale +effect_crc = -112767069 +textures = fx\planetflare.txm +textures = fx\efx.txm \ No newline at end of file diff --git a/DATA/FX/effects.ini b/DATA/FX/effects.ini index e2199e5b..2e4ec7a0 100644 --- a/DATA/FX/effects.ini +++ b/DATA/FX/effects.ini @@ -3744,4 +3744,12 @@ vis_effect = nemesis_impact nickname = nemesis_proj effect_type = EFT_WEAPON_PROJ vis_effect = nemesis_proj -vis_beam = nemesis_01_beam \ No newline at end of file +vis_beam = nemesis_01_beam + + +; Scythe +[Effect] +nickname = scythe_proj +effect_type = EFT_WEAPON_PROJ +vis_effect = scythe_proj +vis_generic = min_photon_01_proj \ No newline at end of file diff --git a/EXE/REM/Lua/Infocards.lua b/EXE/REM/Lua/Infocards.lua index b94d0943..5d96a744 100644 --- a/EXE/REM/Lua/Infocards.lua +++ b/EXE/REM/Lua/Infocards.lua @@ -343,6 +343,10 @@ rem.AddInfoCard(299014, "AVALON") rem.AddInfoCard(299015, [[Weapon Codename: AVALONINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]]) rem.AddInfoCard(299016, "NEMESIS") rem.AddInfoCard(299017, [[Weapon Codename: NEMESISINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]]) +rem.AddInfoCard(299018, "ECLIPSE") +rem.AddInfoCard(299019, [[Weapon Codename: ECLIPSEINFORMATION CLASSIFIEDThere is no information available on this weapon other than its project name.]]) +rem.AddInfoCard(299050, "Scythe Mk II") +rem.AddInfoCard(299051, [[GMG "Scythe Mk II"" Particle BlasterThis is a particle-based weapon which, though providing a high refire rate, requires enormous amounts of energy. This weapon is most effective against graviton shields and weakest against molecular shields. This weapon have an improved damage output and a decent refirerate but sacrifice range and high energy consumption. This is the best Particle Gun The Order has to offer.]]) -- Infocards Power @@ -367,6 +371,11 @@ rem.AddInfoCard(299813, [[NEMESIS Bluepri rem.AddInfoCard(299814, "NEMESIS Schematic") rem.AddInfoCard(299815, [[NEMESIS Schematics are limited cloned NEMESIS Blueprints which are usable for weapon crafting and trading purposes.]]) +rem.AddInfoCard(299816, "ECLIPSE Blueprint") +rem.AddInfoCard(299817, [[ECLIPSE Blueprints are lootable items from special enemies and locations. It must be cloned to a ECLIPSE Schematic to use this item for further limited crafting purposes.]]) +rem.AddInfoCard(299818, "ECLIPSE Schematic") +rem.AddInfoCard(299819, [[ECLIPSE Schematics are limited cloned ECLIPSE Blueprints which are usable for weapon crafting and trading purposes.]]) + -- Infocards Solars -- Pirate Transmitter