From a8b8b94298b404c6e66df391b139450e648e9fcc Mon Sep 17 00:00:00 2001 From: Seaswimmer Date: Tue, 23 Jul 2024 19:29:37 -0400 Subject: [PATCH] Version bump to 0.2.4-2 **This update BREAKS all existing guns!** Renamed all of the guns in the pack to match their english localization files --- ...animation.json => emx_ares.animation.json} | 0 ...mation.json => emx_artemis.animation.json} | 86 +++++++++--------- ...nimation.json => emx_atlas.animation.json} | 0 ...tion.json => emx_boomstick.animation.json} | 0 ...imation.json => emx_charon.animation.json} | 0 ...imation.json => emx_helios.animation.json} | 0 ...mation.json => emx_helios1.animation.json} | 0 ...imation.json => emx_kronos.animation.json} | 0 ...ation.json => emx_kronosex.animation.json} | 0 ...ation.json => emx_posideon.animation.json} | 0 ...ion.json => emx_prometheus.animation.json} | 0 ...n.json => emx_typhonx2_geo.animation.json} | 0 ...animation.json => emx_zeus.animation.json} | 0 ..._pmg90e_data.json => emx_apollo_data.json} | 0 ...emx_rivet_data.json => emx_ares_data.json} | 0 ..._pmg90_data.json => emx_artemis_data.json} | 0 ...mx_umx32_data.json => emx_atlas_data.json} | 0 ...aves_data.json => emx_boomstick_data.json} | 0 ...nforcer_data.json => emx_charon_data.json} | 0 ...aftsman_data.json => emx_helios_data.json} | 0 ..._kund50_data.json => emx_kronos_data.json} | 0 ...d50ex_data.json => emx_kronosex_data.json} | 0 ..._mg90_data.json => emx_posideon_data.json} | 0 ...x57_data.json => emx_prometheus_data.json} | 0 ...x_pulse_data.json => emx_typhon_data.json} | 0 ...lsex2_data.json => emx_typhonx2_data.json} | 0 ...{emx_mg57_data.json => emx_zeus_data.json} | 0 ...e_display.json => emx_apollo_display.json} | 18 ++-- ...vet_display.json => emx_ares_display.json} | 32 +++---- ..._display.json => emx_artemis_display.json} | 18 ++-- ...32_display.json => emx_atlas_display.json} | 20 ++-- .../guns/display/emx_boomstick_display.json | 42 +++++++++ emxarms/guns/display/emx_chaos_display.json | 20 ++-- emxarms/guns/display/emx_charon_display.json | 45 +++++++++ .../guns/display/emx_enforcer_display.json | 45 --------- ...n_display.json => emx_helios_display.json} | 28 +++--- ...0_display.json => emx_kronos_display.json} | 30 +++--- ...display.json => emx_kronosex_display.json} | 32 +++---- ...display.json => emx_posideon_display.json} | 28 +++--- ...splay.json => emx_prometheus_display.json} | 20 ++-- .../guns/display/emx_scgraves_display.json | 42 --------- ...e_display.json => emx_typhon_display.json} | 28 +++--- ...display.json => emx_typhonx2_display.json} | 30 +++--- ...g57_display.json => emx_zeus_display.json} | 28 +++--- .../{emx_pmg90e.json => emx_apollo.json} | 6 +- emxarms/guns/index/emx_ares.json | 7 ++ .../{emx_pmg90.json => emx_artemis.json} | 8 +- .../index/{emx_umx32.json => emx_atlas.json} | 8 +- .../{emx_scgraves.json => emx_boomstick.json} | 8 +- emxarms/guns/index/emx_charon.json | 6 ++ emxarms/guns/index/emx_enforcer.json | 6 -- .../{emx_draftsman.json => emx_helios.json} | 8 +- emxarms/guns/index/emx_kronos.json | 6 ++ emxarms/guns/index/emx_kronosex.json | 7 ++ emxarms/guns/index/emx_kund50.json | 6 -- emxarms/guns/index/emx_kund50ex.json | 7 -- emxarms/guns/index/emx_mg57.json | 7 -- emxarms/guns/index/emx_mg90.json | 7 -- emxarms/guns/index/emx_posideon.json | 7 ++ .../{emx_umx57.json => emx_prometheus.json} | 8 +- emxarms/guns/index/emx_pulse.json | 6 -- emxarms/guns/index/emx_pulsex2.json | 6 -- emxarms/guns/index/emx_rivet.json | 7 -- emxarms/guns/index/emx_typhon.json | 6 ++ emxarms/guns/index/emx_typhonx2.json | 6 ++ emxarms/guns/index/emx_zeus.json | 7 ++ emxarms/lang/en_us.json | 32 +++---- emxarms/lang/zh_cn.json | 36 ++++---- emxarms/lang/zh_tw.json | 34 +++---- ...mx_pmg90e_geo.json => emx_apollo_geo.json} | 0 .../{emx_rivet_geo.json => emx_ares_geo.json} | 24 ++--- ...mx_pmg90_geo.json => emx_artemis_geo.json} | 0 ...{emx_umx32_geo.json => emx_atlas_geo.json} | 0 ...graves_geo.json => emx_boomstick_geo.json} | 0 ..._enforcer_geo.json => emx_charon_geo.json} | 0 ...draftsman_geo.json => emx_helios_geo.json} | 4 +- ...mx_kund50_geo.json => emx_kronos_geo.json} | 0 ...und50ex_geo.json => emx_kronosex_geo.json} | 0 ...mx_mg90_geo.json => emx_posideon_geo.json} | 0 ...umx57_geo.json => emx_prometheus_geo.json} | 0 ...emx_pulse_geo.json => emx_typhon_geo.json} | 0 ...pulsex2_geo.json => emx_typhonx2_geo.json} | 0 .../{emx_mg57_geo.json => emx_zeus_geo.json} | 0 ...und50ex_lod.json => emx_kronosex_lod.json} | 0 emxarms/pack.json | 2 +- emxarms/python/__init__.py | 0 .../__pycache__/__init__.cpython-312.pyc | Bin 0 -> 157 bytes .../python/__pycache__/temp.cpython-312.pyc | Bin 0 -> 893 bytes emxarms/python/temp.py | 15 +++ .../gun/{emx_pmg90e.json => emx_apollo.json} | 2 +- .../gun/{emx_rivet.json => emx_ares.json} | 4 +- .../gun/{emx_pmg90.json => emx_artemis.json} | 4 +- .../gun/{emx_umx32.json => emx_atlas.json} | 4 +- .../{emx_scgraves.json => emx_boomstick.json} | 4 +- .../{emx_enforcer.json => emx_charon.json} | 2 +- .../{emx_draftsman.json => emx_helios.json} | 4 +- .../gun/{emx_kund50.json => emx_kronos.json} | 4 +- .../{emx_kund50ex.json => emx_kronosex.json} | 4 +- .../gun/{emx_mg90.json => emx_posideon.json} | 4 +- .../{emx_umx57.json => emx_prometheus.json} | 4 +- .../gun/{emx_pulse.json => emx_typhon.json} | 4 +- .../{emx_pulsex2.json => emx_typhonx2.json} | 4 +- .../gun/{emx_mg57.json => emx_zeus.json} | 4 +- .../emx_ares_shoot.ogg} | Bin .../emx_ares_shoot_3p.ogg} | Bin .../{emx_rivet => emx_ares}/m4a1_draw.ogg | Bin .../{emx_rivet => emx_ares}/m4a1_inspect.ogg | Bin .../m4a1_inspect_empty.ogg | Bin .../{emx_rivet => emx_ares}/m4a1_put_away.ogg | Bin .../m4a1_reload_empty.ogg | Bin .../m4a1_reload_tactical.ogg | Bin .../{emx_rivet => emx_ares}/m4a1_shoot_3p.ogg | Bin .../{emx_rivet => emx_ares}/m4a1_silence.ogg | Bin .../m4a1_silence_3p.ogg | Bin .../{emx_pmg90 => emx_artemis}/cfreload_1.ogg | Bin .../{emx_pmg90 => emx_artemis}/cfreload_2.ogg | Bin .../{emx_pmg90 => emx_artemis}/cfreload_3.ogg | Bin .../{emx_pmg90 => emx_artemis}/dmr_mod_1.ogg | Bin .../{emx_pmg90 => emx_artemis}/dmr_mod_2.ogg | Bin .../emi_awp_reload.ogg | Bin .../emi_reload_1.ogg | Bin .../emi_reload_2.ogg | Bin .../emx_artemis_shoot.ogg} | Bin .../emx_artemis_shoot_3p.ogg} | Bin .../fs_reload_1.ogg | Bin .../fs_reload_2.ogg | Bin .../fs_reload_3.ogg | Bin .../p05_ar_schotel_branched_reload_magin.ogg | Bin .../p05_ar_schotel_inspect_boltback.ogg | Bin .../p05_ar_schotel_inspect_boltclose.ogg | Bin .../p05_ar_schotel_inspect_empty_boltback.ogg | Bin ...p05_ar_schotel_inspect_empty_boltback2.ogg | Bin ...p05_ar_schotel_inspect_empty_boltclose.ogg | Bin .../p05_ar_schotel_inspect_empty_charge.ogg | Bin .../p05_ar_schotel_inspect_empty_charge2.ogg | Bin .../p05_ar_schotel_inspect_end.ogg | Bin .../p05_ar_schotel_inspect_handling.ogg | Bin .../p05_ar_schotel_inspect_magout.ogg | Bin .../p05_ar_schotel_inspect_magrattle.ogg | Bin .../p05_ar_schotel_inspect_raise.ogg | Bin .../p05_ar_schotel_inspect_rotate.ogg | Bin .../p05_ar_schotel_reload_empty_charge.ogg | Bin .../p05_ar_schotel_reload_empty_end.ogg | Bin .../p05_ar_schotel_reload_empty_magin.ogg | Bin .../p05_ar_schotel_reload_empty_magout.ogg | Bin .../p05_ar_schotel_reload_empty_raise.ogg | Bin .../p05_ar_schotel_reload_end.ogg | Bin .../p05_ar_schotel_reload_raise.ogg | Bin .../p05_ar_schotel_reload_ubgl_magout.ogg | Bin .../p05_ar_schotel_ubgl_drop_rattle.ogg | Bin .../{emx_pmg90 => emx_artemis}/s09_shoot.ogg | Bin .../{emx_pmg90 => emx_artemis}/s09_shoot.xmp | 0 .../scar_h_silence.ogg | Bin .../scar_h_silence_3p.ogg | Bin .../{emx_pmg90 => emx_artemis}/te_mode_1.ogg | Bin .../terg_reload.ogg | Bin .../terg_reload_s.ogg | Bin emxarms/sounds/{emx_umx32 => emx_atlas}/1.ogg | Bin emxarms/sounds/{emx_umx32 => emx_atlas}/2.ogg | Bin .../atlas_shoot.ogg} | Bin .../emi_mamk5_shoot.ogg | Bin .../emi_mk5_shoot.ogg | Bin .../emx_prometheus.ogg} | Bin .../emx_umx_shoot.ogg | Bin .../{emx_umx32 => emx_atlas}/vector_shoot.ogg | Bin .../vector_shoot_3p.ogg | Bin .../vector_silence.ogg | Bin .../vector_silence_3p.ogg | Bin .../{emx_umx32 => emx_atlas}/victor_draw.ogg | Bin .../victor_inspect_boltpull.ogg | Bin .../victor_inspect_boltrelease.ogg | Bin .../victor_inspect_end.ogg | Bin .../victor_inspect_lower.ogg | Bin .../victor_inspect_maghit.ogg | Bin .../victor_inspect_magin.ogg | Bin .../victor_inspect_magout.ogg | Bin .../victor_inspect_moveclose.ogg | Bin .../victor_inspect_mvmnt.ogg | Bin .../victor_inspect_raise.ogg | Bin .../victor_inspect_rotate.ogg | Bin .../victor_put_away.ogg | Bin .../victor_reload_empty_charge.ogg | Bin .../victor_reload_empty_end.ogg | Bin .../victor_reload_empty_magin.ogg | Bin .../victor_reload_empty_magout.ogg | Bin .../victor_reload_empty_raise.ogg | Bin .../victor_reload_empty_rattle.ogg | Bin .../victor_reload_empty_shake.ogg | Bin .../victor_reload_end.ogg | Bin .../victor_reload_magin.ogg | Bin .../victor_reload_magout.ogg | Bin .../victor_reload_raise.ogg | Bin .../db_shoot.ogg | Bin .../db_shoot_3p.ogg | Bin .../db_short_draw.ogg | Bin .../db_short_inspect.ogg | Bin .../db_short_inspect_empty.ogg | Bin .../db_short_put_away.ogg | Bin .../db_short_reload_empty.ogg | Bin .../db_short_reload_tactical.ogg | Bin .../emx_boomstick.ogg} | Bin .../emx_charon.ogg} | Bin .../emx_charon.xmp} | 0 .../emx_charon1.ogg} | Bin .../emx_charon2.ogg} | Bin .../ak47_draw.ogg | Bin .../ak47_inspect.ogg | Bin .../ak47_inspect_empty.ogg | Bin .../ak47_put_away.ogg | Bin .../ak47_reload_empty.ogg | Bin .../ak47_reload_tactical.ogg | Bin .../ak47_shoot.ogg | Bin .../ak47_shoot_3p.ogg | Bin .../ak47_silence.ogg | Bin .../ak47_silence_3p.ogg | Bin .../emx_helios_shoo1t.ogg} | Bin .../emx_helios_shoot.ogg} | Bin .../emx_helios_shoot2.ogg} | Bin .../emx_helios_shoot3.ogg} | Bin .../emx_helios_shoot_3p.ogg} | Bin .../rpk_draw.ogg | Bin .../rpk_inspect.ogg | Bin .../rpk_inspect_empty.ogg | Bin .../rpk_put_away.ogg | Bin .../rpk_reload_empty.ogg | Bin .../rpk_reload_tactical.ogg | Bin .../rpk_shoot.ogg | Bin .../rpk_shoot_3p.ogg | Bin .../rpk_silence.ogg | Bin .../rpk_silence_3p.ogg | Bin .../deagle_draw.ogg | Bin .../deagle_inspect.ogg | Bin .../deagle_inspect_empty.ogg | Bin .../deagle_put_away.ogg | Bin .../deagle_reload_empty.ogg | Bin .../deagle_reload_tactical.ogg | Bin .../deagle_silence.ogg | Bin .../deagle_silence_3p.ogg | Bin .../emx_kronos_shoot.ogg} | Bin .../emx_kronos_shoot1.ogg} | Bin .../emx_kronos_shoot_3p.ogg} | Bin .../{emx_mg90 => emx_posideon}/aa12_draw.ogg | Bin .../aa12_inspect.ogg | Bin .../aa12_inspect_empty.ogg | Bin .../aa12_put_away.ogg | Bin .../aa12_reload.ogg | Bin .../aa12_reload_empty.ogg | Bin .../aa12_reload_tactical.ogg | Bin .../{emx_mg90 => emx_posideon}/aa12_shoot.ogg | Bin .../aa12_shoot_3p.ogg | Bin .../aa12_silence.ogg | Bin .../aa12_silence_3p.ogg | Bin .../emx_posideon_reload_empty.ogg} | Bin .../emx_posideon_reload_tactical.ogg} | Bin .../emx_posideon_shoot.ogg} | Bin .../nomad_shoot1.ogg | Bin .../nomad_shoot2.ogg | Bin .../nomad_shoot3.ogg | Bin .../nomad_shoot4.ogg | Bin .../nomad_shoot5.ogg | Bin .../nomad_shoot6.ogg | Bin .../nomad_shoot7.ogg | Bin .../nomad_shoot8.ogg | Bin .../{emx_mg90 => emx_posideon}/s09_shoot.ogg | Bin .../{emx_mg90 => emx_posideon}/s09_shoot.xmp | 0 .../emx_typhon_shoot.ogg} | Bin .../emx_typhon_shoot_3p.ogg} | Bin .../emx_typhon_shootx2.ogg} | Bin .../emx_typhonx2.ogg} | Bin .../emx_typhonx2_3p.ogg} | Bin .../glock17_draw.ogg | Bin .../glock17_inspect.ogg | Bin .../glock17_inspect_empty.ogg | Bin .../glock17_reload_empty.ogg | Bin .../glock17_reload_tactical.ogg | Bin .../glock17_silence.ogg | Bin .../glock17_silence_3p.ogg | Bin .../{emx_pmg90.json => emx_apollo.json} | 0 .../{emx_rivet.json => emx_ares.json} | 0 .../{emx_pmg90e.json => emx_artemis.json} | 0 .../{emx_umx32.json => emx_atlas.json} | 0 .../{emx_scgraves.json => emx_boomstick.json} | 0 .../{emx_enforcer.json => emx_charon.json} | 0 .../{emx_draftsman.json => emx_helios.json} | 0 .../{emx_kund50.json => emx_kronos.json} | 0 .../{emx_kund50ex.json => emx_kronosex.json} | 0 .../{emx_mg57.json => emx_posideon.json} | 0 .../{emx_umx57.json => emx_prometheus.json} | 0 .../{emx_pulse.json => emx_typhon.json} | 0 .../{emx_pulsex2.json => emx_typhonx2.json} | 0 .../{emx_mg90.json => emx_zeus.json} | 0 .../gun/hud/{emx_rivet.png => emx_ares.png} | Bin .../hud/{emx_pmg90.png => emx_artemis.png} | Bin .../gun/hud/{emx_umx32.png => emx_atlas.png} | Bin .../{emx_scgraves.png => emx_boomstick.png} | Bin .../hud/{emx_enforcer.png => emx_charon.png} | Bin .../hud/{emx_draftsman.png => emx_helios.png} | Bin .../hud/{emx_kund50.png => emx_kronos.png} | Bin .../{emx_kund50ex.png => emx_kronosex.png} | Bin .../hud/{emx_mg90.png => emx_posideon.png} | Bin .../hud/{emx_umx57.png => emx_prometheus.png} | Bin .../gun/hud/{emx_pulse.png => emx_typhon.png} | Bin .../hud/{emx_pulsex2.png => emx_typhonx2.png} | Bin .../gun/hud/{emx_mg57.png => emx_zeus.png} | Bin .../slot/{emx_pmg90e.png => emx_apollo.png} | Bin .../gun/slot/{emx_rivet.png => emx_ares.png} | Bin .../slot/{emx_pmg90.png => emx_artemis.png} | Bin .../gun/slot/{emx_umx32.png => emx_atlas.png} | Bin .../{emx_scgraves.png => emx_boomstick.png} | Bin .../slot/{emx_enforcer.png => emx_charon.png} | Bin .../{emx_draftsman.png => emx_helios.png} | Bin .../slot/{emx_kund50.png => emx_kronos.png} | Bin .../{emx_kund50ex.png => emx_kronosex.png} | Bin .../slot/{emx_mg90.png => emx_posideon.png} | Bin .../{emx_umx57.png => emx_prometheus.png} | Bin .../slot/{emx_pulse.png => emx_typhon.png} | Bin .../{emx_pulsex2.png => emx_typhonx2.png} | Bin .../gun/slot/{emx_mg57.png => emx_zeus.png} | Bin .../gun/uv/{emx_pmg90e.png => emx_apollo.png} | Bin .../gun/uv/{emx_rivet.png => emx_ares.png} | Bin .../uv/{emx_rivetemi.png => emx_aresemi.png} | Bin .../gun/uv/{emx_pmg90.png => emx_artemis.png} | Bin .../gun/uv/{emx_umx32.png => emx_atlas.png} | Bin .../{emx_scgraves.png => emx_boomstick.png} | Bin .../uv/{emx_enforcer.png => emx_charon.png} | Bin .../{emx_enforcer_s.png => emx_charon_s.png} | Bin .../uv/{emx_draftsman.png => emx_helios.png} | Bin .../gun/uv/{emx_kund50.png => emx_kronos.png} | Bin .../uv/{emx_kund50ex.png => emx_kronosex.png} | Bin ...{emx_kund50ex_s.png => emx_kronosex_s.png} | Bin .../gun/uv/{emx_mg90.png => emx_posideon.png} | Bin .../uv/{emx_umx57.png => emx_prometheus.png} | Bin .../gun/uv/{emx_pulse.png => emx_typhon.png} | Bin .../uv/{emx_pulsex2.png => emx_typhonx2.png} | Bin .../gun/uv/{emx_mg57.png => emx_zeus.png} | Bin .../{emx_draftsman_n.png => emx_helios_n.png} | Bin .../{emx_draftsman_s.png => emx_helios_s.png} | Bin 337 files changed, 478 insertions(+), 463 deletions(-) rename emxarms/animations/{emx_rivet.animation.json => emx_ares.animation.json} (100%) rename emxarms/animations/{emx_pmg90.animation.json => emx_artemis.animation.json} (97%) rename emxarms/animations/{emx_umx32.animation.json => emx_atlas.animation.json} (100%) rename emxarms/animations/{emx_scgraves.animation.json => emx_boomstick.animation.json} (100%) rename emxarms/animations/{emx_enforcer.animation.json => emx_charon.animation.json} (100%) rename emxarms/animations/{emx_draftsman.animation.json => emx_helios.animation.json} (100%) rename emxarms/animations/{emx_draftsman1.animation.json => emx_helios1.animation.json} (100%) rename emxarms/animations/{emx_kund50.animation.json => emx_kronos.animation.json} (100%) rename emxarms/animations/{emx_kund50ex.animation.json => emx_kronosex.animation.json} (100%) rename emxarms/animations/{emx_mg90.animation.json => emx_posideon.animation.json} (100%) rename emxarms/animations/{emx_umx57.animation.json => emx_prometheus.animation.json} (100%) rename emxarms/animations/{emx_pulsex2_geo.animation.json => emx_typhonx2_geo.animation.json} (100%) rename emxarms/animations/{emx_mg57.animation.json => emx_zeus.animation.json} (100%) rename emxarms/guns/data/{emx_pmg90e_data.json => emx_apollo_data.json} (100%) rename emxarms/guns/data/{emx_rivet_data.json => emx_ares_data.json} (100%) rename emxarms/guns/data/{emx_pmg90_data.json => emx_artemis_data.json} (100%) rename emxarms/guns/data/{emx_umx32_data.json => emx_atlas_data.json} (100%) rename emxarms/guns/data/{emx_scgraves_data.json => emx_boomstick_data.json} (100%) rename emxarms/guns/data/{emx_enforcer_data.json => emx_charon_data.json} (100%) rename emxarms/guns/data/{emx_draftsman_data.json => emx_helios_data.json} (100%) rename emxarms/guns/data/{emx_kund50_data.json => emx_kronos_data.json} (100%) rename emxarms/guns/data/{emx_kund50ex_data.json => emx_kronosex_data.json} (100%) rename emxarms/guns/data/{emx_mg90_data.json => emx_posideon_data.json} (100%) rename emxarms/guns/data/{emx_umx57_data.json => emx_prometheus_data.json} (100%) rename emxarms/guns/data/{emx_pulse_data.json => emx_typhon_data.json} (100%) rename emxarms/guns/data/{emx_pulsex2_data.json => emx_typhonx2_data.json} (100%) rename emxarms/guns/data/{emx_mg57_data.json => emx_zeus_data.json} (100%) rename emxarms/guns/display/{emx_pmg90e_display.json => emx_apollo_display.json} (69%) rename emxarms/guns/display/{emx_rivet_display.json => emx_ares_display.json} (70%) rename emxarms/guns/display/{emx_pmg90_display.json => emx_artemis_display.json} (87%) rename emxarms/guns/display/{emx_umx32_display.json => emx_atlas_display.json} (89%) create mode 100644 emxarms/guns/display/emx_boomstick_display.json create mode 100644 emxarms/guns/display/emx_charon_display.json delete mode 100644 emxarms/guns/display/emx_enforcer_display.json rename emxarms/guns/display/{emx_draftsman_display.json => emx_helios_display.json} (67%) rename emxarms/guns/display/{emx_kund50_display.json => emx_kronos_display.json} (79%) rename emxarms/guns/display/{emx_kund50ex_display.json => emx_kronosex_display.json} (66%) rename emxarms/guns/display/{emx_mg90_display.json => emx_posideon_display.json} (78%) rename emxarms/guns/display/{emx_umx57_display.json => emx_prometheus_display.json} (88%) delete mode 100644 emxarms/guns/display/emx_scgraves_display.json rename emxarms/guns/display/{emx_pulse_display.json => emx_typhon_display.json} (77%) rename emxarms/guns/display/{emx_pulsex2_display.json => emx_typhonx2_display.json} (76%) rename emxarms/guns/display/{emx_mg57_display.json => emx_zeus_display.json} (78%) rename emxarms/guns/index/{emx_pmg90e.json => emx_apollo.json} (57%) create mode 100644 emxarms/guns/index/emx_ares.json rename emxarms/guns/index/{emx_pmg90.json => emx_artemis.json} (57%) rename emxarms/guns/index/{emx_umx32.json => emx_atlas.json} (57%) rename emxarms/guns/index/{emx_scgraves.json => emx_boomstick.json} (54%) create mode 100644 emxarms/guns/index/emx_charon.json delete mode 100644 emxarms/guns/index/emx_enforcer.json rename emxarms/guns/index/{emx_draftsman.json => emx_helios.json} (75%) create mode 100644 emxarms/guns/index/emx_kronos.json create mode 100644 emxarms/guns/index/emx_kronosex.json delete mode 100644 emxarms/guns/index/emx_kund50.json delete mode 100644 emxarms/guns/index/emx_kund50ex.json delete mode 100644 emxarms/guns/index/emx_mg57.json delete mode 100644 emxarms/guns/index/emx_mg90.json create mode 100644 emxarms/guns/index/emx_posideon.json rename emxarms/guns/index/{emx_umx57.json => emx_prometheus.json} (55%) delete mode 100644 emxarms/guns/index/emx_pulse.json delete mode 100644 emxarms/guns/index/emx_pulsex2.json delete mode 100644 emxarms/guns/index/emx_rivet.json create mode 100644 emxarms/guns/index/emx_typhon.json create mode 100644 emxarms/guns/index/emx_typhonx2.json create mode 100644 emxarms/guns/index/emx_zeus.json rename emxarms/models/gun/{emx_pmg90e_geo.json => emx_apollo_geo.json} (100%) rename emxarms/models/gun/{emx_rivet_geo.json => emx_ares_geo.json} (99%) rename emxarms/models/gun/{emx_pmg90_geo.json => emx_artemis_geo.json} (100%) rename emxarms/models/gun/{emx_umx32_geo.json => emx_atlas_geo.json} (100%) rename emxarms/models/gun/{emx_scgraves_geo.json => emx_boomstick_geo.json} (100%) rename emxarms/models/gun/{emx_enforcer_geo.json => emx_charon_geo.json} (100%) rename emxarms/models/gun/{emx_draftsman_geo.json => emx_helios_geo.json} (99%) rename emxarms/models/gun/{emx_kund50_geo.json => emx_kronos_geo.json} (100%) rename emxarms/models/gun/{emx_kund50ex_geo.json => emx_kronosex_geo.json} (100%) rename emxarms/models/gun/{emx_mg90_geo.json => emx_posideon_geo.json} (100%) rename emxarms/models/gun/{emx_umx57_geo.json => emx_prometheus_geo.json} (100%) rename emxarms/models/gun/{emx_pulse_geo.json => emx_typhon_geo.json} (100%) rename emxarms/models/gun/{emx_pulsex2_geo.json => emx_typhonx2_geo.json} (100%) rename emxarms/models/gun/{emx_mg57_geo.json => emx_zeus_geo.json} (100%) rename emxarms/models/gun/lod/{emx_kund50ex_lod.json => emx_kronosex_lod.json} (100%) create mode 100644 emxarms/python/__init__.py create mode 100644 emxarms/python/__pycache__/__init__.cpython-312.pyc create mode 100644 emxarms/python/__pycache__/temp.cpython-312.pyc create mode 100644 emxarms/python/temp.py rename emxarms/recipes/gun/{emx_pmg90e.json => emx_apollo.json} (89%) rename emxarms/recipes/gun/{emx_rivet.json => emx_ares.json} (88%) rename emxarms/recipes/gun/{emx_pmg90.json => emx_artemis.json} (89%) rename emxarms/recipes/gun/{emx_umx32.json => emx_atlas.json} (88%) rename emxarms/recipes/gun/{emx_scgraves.json => emx_boomstick.json} (86%) rename emxarms/recipes/gun/{emx_enforcer.json => emx_charon.json} (88%) rename emxarms/recipes/gun/{emx_draftsman.json => emx_helios.json} (89%) rename emxarms/recipes/gun/{emx_kund50.json => emx_kronos.json} (88%) rename emxarms/recipes/gun/{emx_kund50ex.json => emx_kronosex.json} (85%) rename emxarms/recipes/gun/{emx_mg90.json => emx_posideon.json} (89%) rename emxarms/recipes/gun/{emx_umx57.json => emx_prometheus.json} (88%) rename emxarms/recipes/gun/{emx_pulse.json => emx_typhon.json} (87%) rename emxarms/recipes/gun/{emx_pulsex2.json => emx_typhonx2.json} (89%) rename emxarms/recipes/gun/{emx_mg57.json => emx_zeus.json} (89%) rename emxarms/sounds/{emx_rivet/emx_rivet_shoot.ogg => emx_ares/emx_ares_shoot.ogg} (100%) rename emxarms/sounds/{emx_rivet/emx_rivet_shoot_3p.ogg => emx_ares/emx_ares_shoot_3p.ogg} (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_draw.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_inspect.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_put_away.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_reload_empty.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_silence.ogg (100%) rename emxarms/sounds/{emx_rivet => emx_ares}/m4a1_silence_3p.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/cfreload_1.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/cfreload_2.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/cfreload_3.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/dmr_mod_1.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/dmr_mod_2.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/emi_awp_reload.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/emi_reload_1.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/emi_reload_2.ogg (100%) rename emxarms/sounds/{emx_pmg90/emx_pmg90_shoot.ogg => emx_artemis/emx_artemis_shoot.ogg} (100%) rename emxarms/sounds/{emx_pmg90/emx_pmg90_shoot_3p.ogg => emx_artemis/emx_artemis_shoot_3p.ogg} (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/fs_reload_1.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/fs_reload_2.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/fs_reload_3.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_branched_reload_magin.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_boltback.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_boltclose.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_empty_boltback.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_empty_boltback2.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_empty_boltclose.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_empty_charge.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_empty_charge2.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_end.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_handling.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_magout.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_magrattle.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_raise.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_inspect_rotate.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_empty_charge.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_empty_end.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_empty_magin.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_empty_magout.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_empty_raise.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_end.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_raise.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_reload_ubgl_magout.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/p05_ar_schotel_ubgl_drop_rattle.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/s09_shoot.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/s09_shoot.xmp (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/scar_h_silence.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/scar_h_silence_3p.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/te_mode_1.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/terg_reload.ogg (100%) rename emxarms/sounds/{emx_pmg90 => emx_artemis}/terg_reload_s.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/1.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/2.ogg (100%) rename emxarms/sounds/{emx_umx32/umx32_shoot.ogg => emx_atlas/atlas_shoot.ogg} (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/emi_mamk5_shoot.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/emi_mk5_shoot.ogg (100%) rename emxarms/sounds/{emx_umx32/emx_umx57.ogg => emx_atlas/emx_prometheus.ogg} (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/emx_umx_shoot.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/vector_shoot.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/vector_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/vector_silence.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/vector_silence_3p.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_draw.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_boltpull.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_boltrelease.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_end.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_lower.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_maghit.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_magin.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_magout.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_moveclose.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_mvmnt.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_raise.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_inspect_rotate.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_put_away.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_charge.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_end.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_magin.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_magout.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_raise.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_rattle.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_empty_shake.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_end.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_magin.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_magout.ogg (100%) rename emxarms/sounds/{emx_umx32 => emx_atlas}/victor_reload_raise.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_shoot.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_draw.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_inspect.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_put_away.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_reload_empty.ogg (100%) rename emxarms/sounds/{emx_scgraves => emx_boomstick}/db_short_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_scgraves/emx_scgraves.ogg => emx_boomstick/emx_boomstick.ogg} (100%) rename emxarms/sounds/{emx_scgraves/emx_enforcer.ogg => emx_boomstick/emx_charon.ogg} (100%) rename emxarms/sounds/{emx_scgraves/emx_enforcer.xmp => emx_boomstick/emx_charon.xmp} (100%) rename emxarms/sounds/{emx_scgraves/emx_enforcer1.ogg => emx_boomstick/emx_charon1.ogg} (100%) rename emxarms/sounds/{emx_scgraves/emx_enforcer2.ogg => emx_boomstick/emx_charon2.ogg} (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_draw.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_inspect.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_put_away.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_reload_empty.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_shoot.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_silence.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/ak47_silence_3p.ogg (100%) rename emxarms/sounds/{emx_draftsman/emx_draftsman_shoo1t.ogg => emx_helios/emx_helios_shoo1t.ogg} (100%) rename emxarms/sounds/{emx_draftsman/emx_draftsman_shoot.ogg => emx_helios/emx_helios_shoot.ogg} (100%) rename emxarms/sounds/{emx_draftsman/emx_draftsman_shoot2.ogg => emx_helios/emx_helios_shoot2.ogg} (100%) rename emxarms/sounds/{emx_draftsman/emx_draftsman_shoot3.ogg => emx_helios/emx_helios_shoot3.ogg} (100%) rename emxarms/sounds/{emx_draftsman/emx_draftsman_shoot_3p.ogg => emx_helios/emx_helios_shoot_3p.ogg} (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_draw.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_inspect.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_put_away.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_reload_empty.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_shoot.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_silence.ogg (100%) rename emxarms/sounds/{emx_draftsman => emx_helios}/rpk_silence_3p.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_draw.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_inspect.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_put_away.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_reload_empty.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_silence.ogg (100%) rename emxarms/sounds/{emx_kund50 => emx_kronos}/deagle_silence_3p.ogg (100%) rename emxarms/sounds/{emx_kund50/emx_kund50_shoot.ogg => emx_kronos/emx_kronos_shoot.ogg} (100%) rename emxarms/sounds/{emx_kund50/emx_kund50_shoot1.ogg => emx_kronos/emx_kronos_shoot1.ogg} (100%) rename emxarms/sounds/{emx_kund50/emx_kund50_shoot_3p.ogg => emx_kronos/emx_kronos_shoot_3p.ogg} (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_draw.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_inspect.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_put_away.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_reload.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_reload_empty.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_shoot.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_shoot_3p.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_silence.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/aa12_silence_3p.ogg (100%) rename emxarms/sounds/{emx_mg90/emx_mg90_reload_empty.ogg => emx_posideon/emx_posideon_reload_empty.ogg} (100%) rename emxarms/sounds/{emx_mg90/emx_mg90_reload_tactical.ogg => emx_posideon/emx_posideon_reload_tactical.ogg} (100%) rename emxarms/sounds/{emx_mg90/emx_mg90_shoot.ogg => emx_posideon/emx_posideon_shoot.ogg} (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot1.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot2.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot3.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot4.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot5.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot6.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot7.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/nomad_shoot8.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/s09_shoot.ogg (100%) rename emxarms/sounds/{emx_mg90 => emx_posideon}/s09_shoot.xmp (100%) rename emxarms/sounds/{emx_pulse/emx_pulse_shoot.ogg => emx_typhon/emx_typhon_shoot.ogg} (100%) rename emxarms/sounds/{emx_pulse/emx_pulse_shoot_3p.ogg => emx_typhon/emx_typhon_shoot_3p.ogg} (100%) rename emxarms/sounds/{emx_pulse/emx_pulse_shootx2.ogg => emx_typhon/emx_typhon_shootx2.ogg} (100%) rename emxarms/sounds/{emx_pulse/emx_pulsex2.ogg => emx_typhon/emx_typhonx2.ogg} (100%) rename emxarms/sounds/{emx_pulse/emx_pulsex2_3p.ogg => emx_typhon/emx_typhonx2_3p.ogg} (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_draw.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_inspect.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_inspect_empty.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_reload_empty.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_reload_tactical.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_silence.ogg (100%) rename emxarms/sounds/{emx_pulse => emx_typhon}/glock17_silence_3p.ogg (100%) rename emxarms/tags/attachments/allow_attachments/{emx_pmg90.json => emx_apollo.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_rivet.json => emx_ares.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_pmg90e.json => emx_artemis.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_umx32.json => emx_atlas.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_scgraves.json => emx_boomstick.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_enforcer.json => emx_charon.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_draftsman.json => emx_helios.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_kund50.json => emx_kronos.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_kund50ex.json => emx_kronosex.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_mg57.json => emx_posideon.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_umx57.json => emx_prometheus.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_pulse.json => emx_typhon.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_pulsex2.json => emx_typhonx2.json} (100%) rename emxarms/tags/attachments/allow_attachments/{emx_mg90.json => emx_zeus.json} (100%) rename emxarms/textures/gun/hud/{emx_rivet.png => emx_ares.png} (100%) rename emxarms/textures/gun/hud/{emx_pmg90.png => emx_artemis.png} (100%) rename emxarms/textures/gun/hud/{emx_umx32.png => emx_atlas.png} (100%) rename emxarms/textures/gun/hud/{emx_scgraves.png => emx_boomstick.png} (100%) rename emxarms/textures/gun/hud/{emx_enforcer.png => emx_charon.png} (100%) rename emxarms/textures/gun/hud/{emx_draftsman.png => emx_helios.png} (100%) rename emxarms/textures/gun/hud/{emx_kund50.png => emx_kronos.png} (100%) rename emxarms/textures/gun/hud/{emx_kund50ex.png => emx_kronosex.png} (100%) rename emxarms/textures/gun/hud/{emx_mg90.png => emx_posideon.png} (100%) rename emxarms/textures/gun/hud/{emx_umx57.png => emx_prometheus.png} (100%) rename emxarms/textures/gun/hud/{emx_pulse.png => emx_typhon.png} (100%) rename emxarms/textures/gun/hud/{emx_pulsex2.png => emx_typhonx2.png} (100%) rename emxarms/textures/gun/hud/{emx_mg57.png => emx_zeus.png} (100%) rename emxarms/textures/gun/slot/{emx_pmg90e.png => emx_apollo.png} (100%) rename emxarms/textures/gun/slot/{emx_rivet.png => emx_ares.png} (100%) rename emxarms/textures/gun/slot/{emx_pmg90.png => emx_artemis.png} (100%) rename emxarms/textures/gun/slot/{emx_umx32.png => emx_atlas.png} (100%) rename emxarms/textures/gun/slot/{emx_scgraves.png => emx_boomstick.png} (100%) rename emxarms/textures/gun/slot/{emx_enforcer.png => emx_charon.png} (100%) rename emxarms/textures/gun/slot/{emx_draftsman.png => emx_helios.png} (100%) rename emxarms/textures/gun/slot/{emx_kund50.png => emx_kronos.png} (100%) rename emxarms/textures/gun/slot/{emx_kund50ex.png => emx_kronosex.png} (100%) rename emxarms/textures/gun/slot/{emx_mg90.png => emx_posideon.png} (100%) rename emxarms/textures/gun/slot/{emx_umx57.png => emx_prometheus.png} (100%) rename emxarms/textures/gun/slot/{emx_pulse.png => emx_typhon.png} (100%) rename emxarms/textures/gun/slot/{emx_pulsex2.png => emx_typhonx2.png} (100%) rename emxarms/textures/gun/slot/{emx_mg57.png => emx_zeus.png} (100%) rename emxarms/textures/gun/uv/{emx_pmg90e.png => emx_apollo.png} (100%) rename emxarms/textures/gun/uv/{emx_rivet.png => emx_ares.png} (100%) rename emxarms/textures/gun/uv/{emx_rivetemi.png => emx_aresemi.png} (100%) rename emxarms/textures/gun/uv/{emx_pmg90.png => emx_artemis.png} (100%) rename emxarms/textures/gun/uv/{emx_umx32.png => emx_atlas.png} (100%) rename emxarms/textures/gun/uv/{emx_scgraves.png => emx_boomstick.png} (100%) rename emxarms/textures/gun/uv/{emx_enforcer.png => emx_charon.png} (100%) rename emxarms/textures/gun/uv/{emx_enforcer_s.png => emx_charon_s.png} (100%) rename emxarms/textures/gun/uv/{emx_draftsman.png => emx_helios.png} (100%) rename emxarms/textures/gun/uv/{emx_kund50.png => emx_kronos.png} (100%) rename emxarms/textures/gun/uv/{emx_kund50ex.png => emx_kronosex.png} (100%) rename emxarms/textures/gun/uv/{emx_kund50ex_s.png => emx_kronosex_s.png} (100%) rename emxarms/textures/gun/uv/{emx_mg90.png => emx_posideon.png} (100%) rename emxarms/textures/gun/uv/{emx_umx57.png => emx_prometheus.png} (100%) rename emxarms/textures/gun/uv/{emx_pulse.png => emx_typhon.png} (100%) rename emxarms/textures/gun/uv/{emx_pulsex2.png => emx_typhonx2.png} (100%) rename emxarms/textures/gun/uv/{emx_mg57.png => emx_zeus.png} (100%) rename emxarms/textures/gun/uv/fes/{emx_draftsman_n.png => emx_helios_n.png} (100%) rename emxarms/textures/gun/uv/fes/{emx_draftsman_s.png => emx_helios_s.png} (100%) diff --git a/emxarms/animations/emx_rivet.animation.json b/emxarms/animations/emx_ares.animation.json similarity index 100% rename from emxarms/animations/emx_rivet.animation.json rename to emxarms/animations/emx_ares.animation.json diff --git a/emxarms/animations/emx_pmg90.animation.json b/emxarms/animations/emx_artemis.animation.json similarity index 97% rename from emxarms/animations/emx_pmg90.animation.json rename to emxarms/animations/emx_artemis.animation.json index 16b79a5..ddc9a6d 100644 --- a/emxarms/animations/emx_pmg90.animation.json +++ b/emxarms/animations/emx_artemis.animation.json @@ -162,7 +162,7 @@ }, "sound_effects": { "0.0667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_raise" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_raise" } } }, @@ -293,7 +293,7 @@ }, "sound_effects": { "0.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_ubgl_drop_rattle" + "effect": "emxarms:emx_artemis/p05_ar_schotel_ubgl_drop_rattle" } } }, @@ -767,19 +767,19 @@ }, "sound_effects": { "0.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_raise" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_raise" }, "0.5333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_ubgl_magout" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_ubgl_magout" }, "0.8667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_branched_reload_magin" + "effect": "emxarms:emx_artemis/p05_ar_schotel_branched_reload_magin" }, "1.18": { - "effect": "emxarms:emx_pmg90/emi_reload_2" + "effect": "emxarms:emx_artemis/emi_reload_2" }, "1.3667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_end" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_end" } } }, @@ -1362,25 +1362,25 @@ }, "sound_effects": { "0.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_raise" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_raise" }, "0.0333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magout" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magout" }, "0.8667": { "effect": "tacz:mag_drop_sound/iw8_phys_mag_drop_ar_metal_dirt_04" }, "1.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin" }, "1.7667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_charge" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_charge" }, "2.14": { - "effect": "emxarms:emx_pmg90/emi_reload_1" + "effect": "emxarms:emx_artemis/emi_reload_1" }, "2.2": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_end" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_end" } } }, @@ -2111,46 +2111,46 @@ }, "sound_effects": { "0.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_raise" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_raise" }, "0.47": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback" }, "1.1": { - "effect": "emxarms:emx_pmg90/terg_reload" + "effect": "emxarms:emx_artemis/terg_reload" }, "1.97": { - "effect": "emxarms:emx_pmg90/cfreload_1" + "effect": "emxarms:emx_artemis/cfreload_1" }, "2.97": { - "effect": "emxarms:emx_pmg90/emi_awp_reload" + "effect": "emxarms:emx_artemis/emi_awp_reload" }, "1.4333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle" }, "2.7": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magout" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magout" }, "3.7667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin" }, "4.3": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_rotate" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_rotate" }, "4.4667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_boltback" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_boltback" }, "4.8": { - "effect": "emxarms:emx_pmg90/dmr_mod_2" + "effect": "emxarms:emx_artemis/dmr_mod_2" }, "5.6": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_boltclose" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_boltclose" }, "5.63": { - "effect": "emxarms:emx_pmg90/emi_reload_1" + "effect": "emxarms:emx_artemis/emi_reload_1" }, "5.7": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_end" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_end" } } }, @@ -3197,49 +3197,49 @@ }, "sound_effects": { "0.0": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_raise" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_raise" }, "1.4333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle" }, "2.7": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magout" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magout" }, "3.6667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_magrattle" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_magrattle" }, "4.4": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_charge" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_charge" }, "7.59": { - "effect": "emxarms:emx_pmg90/dmr_mod_1" + "effect": "emxarms:emx_artemis/dmr_mod_1" }, "4.7667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_charge2" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_charge2" }, "4.9333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback" }, "5.6667": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltclose" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltclose" }, "6.5": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_reload_empty_magin" + "effect": "emxarms:emx_artemis/p05_ar_schotel_reload_empty_magin" }, "7.0333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_rotate" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_rotate" }, "7.3": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_empty_boltback2" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_empty_boltback2" }, "7.5": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_handling" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_handling" }, "5.65": { - "effect": "emxarms:emx_pmg90/terg_reload_s" + "effect": "emxarms:emx_artemis/terg_reload_s" }, "8.9333": { - "effect": "emxarms:emx_pmg90/p05_ar_schotel_inspect_end" + "effect": "emxarms:emx_artemis/p05_ar_schotel_inspect_end" } } }, @@ -4080,4 +4080,4 @@ } } } -} \ No newline at end of file +} diff --git a/emxarms/animations/emx_umx32.animation.json b/emxarms/animations/emx_atlas.animation.json similarity index 100% rename from emxarms/animations/emx_umx32.animation.json rename to emxarms/animations/emx_atlas.animation.json diff --git a/emxarms/animations/emx_scgraves.animation.json b/emxarms/animations/emx_boomstick.animation.json similarity index 100% rename from emxarms/animations/emx_scgraves.animation.json rename to emxarms/animations/emx_boomstick.animation.json diff --git a/emxarms/animations/emx_enforcer.animation.json b/emxarms/animations/emx_charon.animation.json similarity index 100% rename from emxarms/animations/emx_enforcer.animation.json rename to emxarms/animations/emx_charon.animation.json diff --git a/emxarms/animations/emx_draftsman.animation.json b/emxarms/animations/emx_helios.animation.json similarity index 100% rename from emxarms/animations/emx_draftsman.animation.json rename to emxarms/animations/emx_helios.animation.json diff --git a/emxarms/animations/emx_draftsman1.animation.json b/emxarms/animations/emx_helios1.animation.json similarity index 100% rename from emxarms/animations/emx_draftsman1.animation.json rename to emxarms/animations/emx_helios1.animation.json diff --git a/emxarms/animations/emx_kund50.animation.json b/emxarms/animations/emx_kronos.animation.json similarity index 100% rename from emxarms/animations/emx_kund50.animation.json rename to emxarms/animations/emx_kronos.animation.json diff --git a/emxarms/animations/emx_kund50ex.animation.json b/emxarms/animations/emx_kronosex.animation.json similarity index 100% rename from emxarms/animations/emx_kund50ex.animation.json rename to emxarms/animations/emx_kronosex.animation.json diff --git a/emxarms/animations/emx_mg90.animation.json b/emxarms/animations/emx_posideon.animation.json similarity index 100% rename from emxarms/animations/emx_mg90.animation.json rename to emxarms/animations/emx_posideon.animation.json diff --git a/emxarms/animations/emx_umx57.animation.json b/emxarms/animations/emx_prometheus.animation.json similarity index 100% rename from emxarms/animations/emx_umx57.animation.json rename to emxarms/animations/emx_prometheus.animation.json diff --git a/emxarms/animations/emx_pulsex2_geo.animation.json b/emxarms/animations/emx_typhonx2_geo.animation.json similarity index 100% rename from emxarms/animations/emx_pulsex2_geo.animation.json rename to emxarms/animations/emx_typhonx2_geo.animation.json diff --git a/emxarms/animations/emx_mg57.animation.json b/emxarms/animations/emx_zeus.animation.json similarity index 100% rename from emxarms/animations/emx_mg57.animation.json rename to emxarms/animations/emx_zeus.animation.json diff --git a/emxarms/guns/data/emx_pmg90e_data.json b/emxarms/guns/data/emx_apollo_data.json similarity index 100% rename from emxarms/guns/data/emx_pmg90e_data.json rename to emxarms/guns/data/emx_apollo_data.json diff --git a/emxarms/guns/data/emx_rivet_data.json b/emxarms/guns/data/emx_ares_data.json similarity index 100% rename from emxarms/guns/data/emx_rivet_data.json rename to emxarms/guns/data/emx_ares_data.json diff --git a/emxarms/guns/data/emx_pmg90_data.json b/emxarms/guns/data/emx_artemis_data.json similarity index 100% rename from emxarms/guns/data/emx_pmg90_data.json rename to emxarms/guns/data/emx_artemis_data.json diff --git a/emxarms/guns/data/emx_umx32_data.json b/emxarms/guns/data/emx_atlas_data.json similarity index 100% rename from emxarms/guns/data/emx_umx32_data.json rename to emxarms/guns/data/emx_atlas_data.json diff --git a/emxarms/guns/data/emx_scgraves_data.json b/emxarms/guns/data/emx_boomstick_data.json similarity index 100% rename from emxarms/guns/data/emx_scgraves_data.json rename to emxarms/guns/data/emx_boomstick_data.json diff --git a/emxarms/guns/data/emx_enforcer_data.json b/emxarms/guns/data/emx_charon_data.json similarity index 100% rename from emxarms/guns/data/emx_enforcer_data.json rename to emxarms/guns/data/emx_charon_data.json diff --git a/emxarms/guns/data/emx_draftsman_data.json b/emxarms/guns/data/emx_helios_data.json similarity index 100% rename from emxarms/guns/data/emx_draftsman_data.json rename to emxarms/guns/data/emx_helios_data.json diff --git a/emxarms/guns/data/emx_kund50_data.json b/emxarms/guns/data/emx_kronos_data.json similarity index 100% rename from emxarms/guns/data/emx_kund50_data.json rename to emxarms/guns/data/emx_kronos_data.json diff --git a/emxarms/guns/data/emx_kund50ex_data.json b/emxarms/guns/data/emx_kronosex_data.json similarity index 100% rename from emxarms/guns/data/emx_kund50ex_data.json rename to emxarms/guns/data/emx_kronosex_data.json diff --git a/emxarms/guns/data/emx_mg90_data.json b/emxarms/guns/data/emx_posideon_data.json similarity index 100% rename from emxarms/guns/data/emx_mg90_data.json rename to emxarms/guns/data/emx_posideon_data.json diff --git a/emxarms/guns/data/emx_umx57_data.json b/emxarms/guns/data/emx_prometheus_data.json similarity index 100% rename from emxarms/guns/data/emx_umx57_data.json rename to emxarms/guns/data/emx_prometheus_data.json diff --git a/emxarms/guns/data/emx_pulse_data.json b/emxarms/guns/data/emx_typhon_data.json similarity index 100% rename from emxarms/guns/data/emx_pulse_data.json rename to emxarms/guns/data/emx_typhon_data.json diff --git a/emxarms/guns/data/emx_pulsex2_data.json b/emxarms/guns/data/emx_typhonx2_data.json similarity index 100% rename from emxarms/guns/data/emx_pulsex2_data.json rename to emxarms/guns/data/emx_typhonx2_data.json diff --git a/emxarms/guns/data/emx_mg57_data.json b/emxarms/guns/data/emx_zeus_data.json similarity index 100% rename from emxarms/guns/data/emx_mg57_data.json rename to emxarms/guns/data/emx_zeus_data.json diff --git a/emxarms/guns/display/emx_pmg90e_display.json b/emxarms/guns/display/emx_apollo_display.json similarity index 69% rename from emxarms/guns/display/emx_pmg90e_display.json rename to emxarms/guns/display/emx_apollo_display.json index 217bc80..e19aeb5 100644 --- a/emxarms/guns/display/emx_pmg90e_display.json +++ b/emxarms/guns/display/emx_apollo_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_pmg90e_geo", - "texture": "emxarms:gun/uv/emx_pmg90e", - "hud": "emxarms:gun/hud/emx_pmg90", - "slot": "emxarms:gun/slot/emx_pmg90e", - "animation": "emxarms:emx_pmg90", + "model": "emxarms:gun/emx_apollo_geo", + "texture": "emxarms:gun/uv/emx_apollo", + "hud": "emxarms:gun/hud/emx_artemis", + "slot": "emxarms:gun/slot/emx_apollo", + "animation": "emxarms:emx_artemis", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -26,10 +26,10 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_pmg90/emx_pmg90_shoot", - "shoot_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", - "silence": "emxarms:emx_pmg90/emx_pmg90_shoot", - "silence_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", + "shoot": "emxarms:emx_artemis/emx_artemis_shoot", + "shoot_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p", + "silence": "emxarms:emx_artemis/emx_artemis_shoot", + "silence_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "head_hit": "tacz:head_hit", diff --git a/emxarms/guns/display/emx_rivet_display.json b/emxarms/guns/display/emx_ares_display.json similarity index 70% rename from emxarms/guns/display/emx_rivet_display.json rename to emxarms/guns/display/emx_ares_display.json index 25f7a6a..18e387d 100644 --- a/emxarms/guns/display/emx_rivet_display.json +++ b/emxarms/guns/display/emx_ares_display.json @@ -1,13 +1,13 @@ { - "model": "emxarms:gun/emx_rivet_geo", - "texture": "emxarms:gun/uv/emx_rivet", + "model": "emxarms:gun/emx_ares_geo", + "texture": "emxarms:gun/uv/emx_ares", // "lod": { // "model": "tacz:gun/lod/m4a1", // "texture": "tacz:gun/lod/m4a1" // }, - "hud": "emxarms:gun/hud/emx_rivet", - "slot": "emxarms:gun/slot/emx_rivet", - "animation": "emxarms:emx_rivet", + "hud": "emxarms:gun/hud/emx_ares", + "slot": "emxarms:gun/slot/emx_ares", + "animation": "emxarms:emx_ares", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -29,16 +29,16 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_rivet/emx_rivet_shoot", - "shoot_3p": "emxarms:emx_rivet/emx_rivet_shoot_3p", - "reload_empty": "emxarms:emx_rivet/m4a1_reload_empty", - "reload_tactical": "emxarms:emx_rivet/m4a1_reload_tactical", - "inspect": "emxarms:emx_rivet/m4a1_inspect", - "inspect_empty": "emxarms:emx_rivet/m4a1_inspect_empty", - "draw": "emxarms:emx_rivet/m4a1_draw", - "put_away": "emxarms:emx_rivet/m4a1_put_away", - "silence": "emxarms:emx_rivet/m4a1_silence", - "silence_3p": "emxarms:emx_rivet/m4a1_silence_3p", + "shoot": "emxarms:emx_ares/emx_ares_shoot", + "shoot_3p": "emxarms:emx_ares/emx_ares_shoot_3p", + "reload_empty": "emxarms:emx_ares/m4a1_reload_empty", + "reload_tactical": "emxarms:emx_ares/m4a1_reload_tactical", + "inspect": "emxarms:emx_ares/m4a1_inspect", + "inspect_empty": "emxarms:emx_ares/m4a1_inspect_empty", + "draw": "emxarms:emx_ares/m4a1_draw", + "put_away": "emxarms:emx_ares/m4a1_put_away", + "silence": "emxarms:emx_ares/m4a1_silence", + "silence_3p": "emxarms:emx_ares/m4a1_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -88,4 +88,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_pmg90_display.json b/emxarms/guns/display/emx_artemis_display.json similarity index 87% rename from emxarms/guns/display/emx_pmg90_display.json rename to emxarms/guns/display/emx_artemis_display.json index 691d467..1a3d3d0 100644 --- a/emxarms/guns/display/emx_pmg90_display.json +++ b/emxarms/guns/display/emx_artemis_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_pmg90_geo", - "texture": "emxarms:gun/uv/emx_pmg90", - "hud": "emxarms:gun/hud/emx_pmg90", - "slot": "emxarms:gun/slot/emx_pmg90", - "animation": "emxarms:emx_pmg90", + "model": "emxarms:gun/emx_artemis_geo", + "texture": "emxarms:gun/uv/emx_artemis", + "hud": "emxarms:gun/hud/emx_artemis", + "slot": "emxarms:gun/slot/emx_artemis", + "animation": "emxarms:emx_artemis", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -26,10 +26,10 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_pmg90/emx_pmg90_shoot", - "shoot_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", - "silence": "emxarms:emx_pmg90/emx_pmg90_shoot", - "silence_3p": "emxarms:emx_pmg90/emx_pmg90_shoot_3p", + "shoot": "emxarms:emx_artemis/emx_artemis_shoot", + "shoot_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p", + "silence": "emxarms:emx_artemis/emx_artemis_shoot", + "silence_3p": "emxarms:emx_artemis/emx_artemis_shoot_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "head_hit": "tacz:head_hit", diff --git a/emxarms/guns/display/emx_umx32_display.json b/emxarms/guns/display/emx_atlas_display.json similarity index 89% rename from emxarms/guns/display/emx_umx32_display.json rename to emxarms/guns/display/emx_atlas_display.json index 4b74e48..929c509 100644 --- a/emxarms/guns/display/emx_umx32_display.json +++ b/emxarms/guns/display/emx_atlas_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_umx32_geo", - "texture": "emxarms:gun/uv/emx_umx32", - "hud": "emxarms:gun/hud/emx_umx32", - "slot": "emxarms:gun/slot/emx_umx32", - "animation": "emxarms:emx_umx32", + "model": "emxarms:gun/emx_atlas_geo", + "texture": "emxarms:gun/uv/emx_atlas", + "hud": "emxarms:gun/hud/emx_atlas", + "slot": "emxarms:gun/slot/emx_atlas", + "animation": "emxarms:emx_atlas", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -25,10 +25,10 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_umx32/umx32_shoot", - "shoot_3p": "emxarms:emx_umx32/vector_shoot_3p", - "silence": "emxarms:emx_umx32/vector_silence", - "silence_3p": "emxarms:emx_umx32/vector_silence_3p", + "shoot": "emxarms:emx_atlas/atlas_shoot", + "shoot_3p": "emxarms:emx_atlas/vector_shoot_3p", + "silence": "emxarms:emx_atlas/vector_silence", + "silence_3p": "emxarms:emx_atlas/vector_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -124,4 +124,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_boomstick_display.json b/emxarms/guns/display/emx_boomstick_display.json new file mode 100644 index 0000000..7d59a30 --- /dev/null +++ b/emxarms/guns/display/emx_boomstick_display.json @@ -0,0 +1,42 @@ +{ + "model": "emxarms:gun/emx_boomstick_geo", + "texture": "emxarms:gun/uv/emx_boomstick", + "hud": "emxarms:gun/hud/emx_boomstick", + "slot": "emxarms:gun/slot/emx_boomstick", + "animation": "emxarms:emx_boomstick", + "use_default_animation": "rifle", + "third_person_animation": "default", + "transform": { + "scale": { + "thirdperson": [0.6, 0.6, 0.6], + "ground": [0.6, 0.6, 0.6], + "fixed": [1.2, 1.2, 1.2] + } + }, + "muzzle_flash": { + "texture": "emxarms:flash/emx_muzzle_flash", + "scale": 0.85 + }, + "sounds": { + "reload_empty": "emxarms:emx_boomstick/db_short_reload_empty", + "reload_tactical": "emxarms:emx_boomstick/db_short_reload_tactical", + "inspect": "emxarms:emx_boomstick/db_short_inspect", + "inspect_empty": "emxarms:emx_boomstick/db_short_inspect_empty", + "draw": "emxarms:emx_boomstick/db_short_draw", + "put_away": "emxarms:emx_boomstick/db_short_put_away", + "shoot": "emxarms:emx_boomstick/emx_boomstick", + "shoot_3p": "emxarms:emx_boomstick/emx_boomstick" + }, + "offhand_show": { + "pos": [1, 22, 4], + "rotate": [0, 0, 60], + "scale": [0.5, 0.5, 0.5] + }, + "hotbar_show": { + "0": { + "pos": [-1, 22, 3], + "rotate": [-180, 0, 120], + "scale": [0.5, 0.5, 0.5] + } + } +} diff --git a/emxarms/guns/display/emx_chaos_display.json b/emxarms/guns/display/emx_chaos_display.json index 1bd217b..cc19ce8 100644 --- a/emxarms/guns/display/emx_chaos_display.json +++ b/emxarms/guns/display/emx_chaos_display.json @@ -1,7 +1,7 @@ { "model": "emxarms:gun/emx_chaos_geo", "texture": "emxarms:gun/uv/emx_chaos", - "hud": "emxarms:gun/hud/emx_pulse", + "hud": "emxarms:gun/hud/emx_typhon", "slot": "emxarms:gun/slot/emx_chaos", "animation": "emxarms:emx_chaos", "use_default_animation": "pistol", @@ -17,15 +17,15 @@ "scale": 0.4 }, "sounds": { - "reload_empty": "emxarms:emx_pulse/glock17_reload_empty", - "reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", - "inspect": "emxarms:emx_pulse/glock17_inspect", - "inspect_empty": "emxarms:emx_pulse/glock17_inspect_empty", - "draw": "emxarms:emx_pulse/glock17_draw", - "shoot": "emxarms:emx_pulse/emx_pulse_shoot", - "shoot_3p": "emxarms:emx_pulse/emx_pulse_shoot_3p", - "silence": "emxarms:emx_pulse/glock17_silence", - "silence_3p": "emxarms:emx_pulse/glock17_silence_3p", + "reload_empty": "emxarms:emx_typhon/glock17_reload_empty", + "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical", + "inspect": "emxarms:emx_typhon/glock17_inspect", + "inspect_empty": "emxarms:emx_typhon/glock17_inspect_empty", + "draw": "emxarms:emx_typhon/glock17_draw", + "shoot": "emxarms:emx_typhon/emx_typhon_shoot", + "shoot_3p": "emxarms:emx_typhon/emx_typhon_shoot_3p", + "silence": "emxarms:emx_typhon/glock17_silence", + "silence_3p": "emxarms:emx_typhon/glock17_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" diff --git a/emxarms/guns/display/emx_charon_display.json b/emxarms/guns/display/emx_charon_display.json new file mode 100644 index 0000000..3f8454e --- /dev/null +++ b/emxarms/guns/display/emx_charon_display.json @@ -0,0 +1,45 @@ +{ + "model": "emxarms:gun/emx_charon_geo", + "texture": "emxarms:gun/uv/emx_charon", + "hud": "emxarms:gun/hud/emx_charon", + "slot": "emxarms:gun/slot/emx_charon", + "animation": "emxarms:emx_charon", + "use_default_animation": "rifle", + "third_person_animation": "default", + "transform": { + "scale": { + "thirdperson": [0.6, 0.6, 0.6], + "ground": [0.6, 0.6, 0.6], + "fixed": [1.2, 1.2, 1.2] + } + }, + "muzzle_flash": { + "texture": "emxarms:flash/emx_muzzle_flash", + "scale": 0.85 + }, + "sounds": { + "reload_empty": "emxarms:emx_boomstick/db_short_reload_empty", + "reload_tactical": "emxarms:emx_boomstick/db_short_reload_tactical", + "inspect": "emxarms:emx_boomstick/db_short_inspect", + "inspect_empty": "emxarms:emx_boomstick/db_short_inspect_empty", + "draw": "emxarms:emx_boomstick/db_short_draw", + "put_away": "emxarms:emx_boomstick/db_short_put_away", + "shoot": "emxarms:emx_boomstick/emx_charon", + "shoot_3p": "emxarms:emx_boomstick/emx_charon", + "dry_fire": "emxarms:emx_dw", + "fire_select": "emxarms:emx_mode", + "kill": "emxarms:emx_hit1" + }, + "offhand_show": { + "pos": [1, 22, 4], + "rotate": [0, 0, 60], + "scale": [0.5, 0.5, 0.5] + }, + "hotbar_show": { + "0": { + "pos": [-1, 22, 3], + "rotate": [-180, 0, 120], + "scale": [0.5, 0.5, 0.5] + } + } +} diff --git a/emxarms/guns/display/emx_enforcer_display.json b/emxarms/guns/display/emx_enforcer_display.json deleted file mode 100644 index a55af04..0000000 --- a/emxarms/guns/display/emx_enforcer_display.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "model": "emxarms:gun/emx_enforcer_geo", - "texture": "emxarms:gun/uv/emx_enforcer", - "hud": "emxarms:gun/hud/emx_enforcer", - "slot": "emxarms:gun/slot/emx_enforcer", - "animation": "emxarms:emx_enforcer", - "use_default_animation": "rifle", - "third_person_animation": "default", - "transform": { - "scale": { - "thirdperson": [0.6, 0.6, 0.6], - "ground": [0.6, 0.6, 0.6], - "fixed": [1.2, 1.2, 1.2] - } - }, - "muzzle_flash": { - "texture": "emxarms:flash/emx_muzzle_flash", - "scale": 0.85 - }, - "sounds": { - "reload_empty": "emxarms:emx_scgraves/db_short_reload_empty", - "reload_tactical": "emxarms:emx_scgraves/db_short_reload_tactical", - "inspect": "emxarms:emx_scgraves/db_short_inspect", - "inspect_empty": "emxarms:emx_scgraves/db_short_inspect_empty", - "draw": "emxarms:emx_scgraves/db_short_draw", - "put_away": "emxarms:emx_scgraves/db_short_put_away", - "shoot": "emxarms:emx_scgraves/emx_enforcer", - "shoot_3p": "emxarms:emx_scgraves/emx_enforcer", - "dry_fire": "emxarms:emx_dw", - "fire_select": "emxarms:emx_mode", - "kill": "emxarms:emx_hit1" - }, - "offhand_show": { - "pos": [1, 22, 4], - "rotate": [0, 0, 60], - "scale": [0.5, 0.5, 0.5] - }, - "hotbar_show": { - "0": { - "pos": [-1, 22, 3], - "rotate": [-180, 0, 120], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/emxarms/guns/display/emx_draftsman_display.json b/emxarms/guns/display/emx_helios_display.json similarity index 67% rename from emxarms/guns/display/emx_draftsman_display.json rename to emxarms/guns/display/emx_helios_display.json index f35fdba..f21fc1f 100644 --- a/emxarms/guns/display/emx_draftsman_display.json +++ b/emxarms/guns/display/emx_helios_display.json @@ -1,8 +1,8 @@ { - "model": "emxarms:gun/emx_draftsman_geo", - "texture": "emxarms:gun/uv/emx_draftsman", - "hud": "emxarms:gun/hud/emx_draftsman", - "slot": "emxarms:gun/slot/emx_draftsman", + "model": "emxarms:gun/emx_helios_geo", + "texture": "emxarms:gun/uv/emx_helios", + "hud": "emxarms:gun/hud/emx_helios", + "slot": "emxarms:gun/slot/emx_helios", "animation": "emxarms:ak47", "use_default_animation": "rifle", "third_person_animation": "default", @@ -26,16 +26,16 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_draftsman/emx_draftsman_shoot", - "shoot_3p": "emxarms:emx_draftsman/ak47_shoot_3p", - "reload_empty": "emxarms:emx_draftsman/ak47_reload_empty", - "reload_tactical": "emxarms:emx_draftsman/ak47_reload_tactical", - "inspect": "emxarms:emx_draftsman/ak47_inspect", - "inspect_empty": "emxarms:emx_draftsman/ak47_inspect_empty", - "draw": "emxarms:emx_draftsman/ak47_draw", - "put_away": "emxarms:emx_draftsman/ak47_put_away", - "silence": "emxarms:emx_draftsman/ak47_silence", - "silence_3p": "emxarms:emx_draftsman/ak47_silence_3p", + "shoot": "emxarms:emx_helios/emx_helios_shoot", + "shoot_3p": "emxarms:emx_helios/ak47_shoot_3p", + "reload_empty": "emxarms:emx_helios/ak47_reload_empty", + "reload_tactical": "emxarms:emx_helios/ak47_reload_tactical", + "inspect": "emxarms:emx_helios/ak47_inspect", + "inspect_empty": "emxarms:emx_helios/ak47_inspect_empty", + "draw": "emxarms:emx_helios/ak47_draw", + "put_away": "emxarms:emx_helios/ak47_put_away", + "silence": "emxarms:emx_helios/ak47_silence", + "silence_3p": "emxarms:emx_helios/ak47_silence_3p", "dry_fire": "tacz:dry_fire", "fire_select": "tacz:fire_select", "head_hit": "tacz:head_hit", diff --git a/emxarms/guns/display/emx_kund50_display.json b/emxarms/guns/display/emx_kronos_display.json similarity index 79% rename from emxarms/guns/display/emx_kund50_display.json rename to emxarms/guns/display/emx_kronos_display.json index 58e1f20..9473cb9 100644 --- a/emxarms/guns/display/emx_kund50_display.json +++ b/emxarms/guns/display/emx_kronos_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_kund50_geo", - "texture": "emxarms:gun/uv/emx_kund50", - "hud": "emxarms:gun/hud/emx_kund50", - "slot": "emxarms:gun/slot/emx_kund50", - "animation": "emxarms:emx_kund50", + "model": "emxarms:gun/emx_kronos_geo", + "texture": "emxarms:gun/uv/emx_kronos", + "hud": "emxarms:gun/hud/emx_kronos", + "slot": "emxarms:gun/slot/emx_kronos", + "animation": "emxarms:emx_kronos", "use_default_animation": "pistol", "transform": { "scale": { @@ -24,15 +24,15 @@ "scale": 0.8 }, "sounds": { - "reload_empty": "emxarms:emx_kund50/deagle_reload_empty", - "reload_tactical": "emxarms:emx_kund50/deagle_reload_tactical", - "inspect": "emxarms:emx_kund50/deagle_inspect", - "inspect_empty": "emxarms:emx_kund50/deagle_inspect_empty", - "draw": "emxarms:emx_kund50/deagle_draw", - "shoot": "emxarms:emx_kund50/emx_kund50_shoot", - "shoot_3p": "emxarms:emx_kund50/emx_kund50_shoot_3p", - "silence": "emxarms:emx_kund50/deagle_silence", - "silence_3p": "emxarms:emx_kund50/deagle_silence_3p", + "reload_empty": "emxarms:emx_kronos/deagle_reload_empty", + "reload_tactical": "emxarms:emx_kronos/deagle_reload_tactical", + "inspect": "emxarms:emx_kronos/deagle_inspect", + "inspect_empty": "emxarms:emx_kronos/deagle_inspect_empty", + "draw": "emxarms:emx_kronos/deagle_draw", + "shoot": "emxarms:emx_kronos/emx_kronos_shoot", + "shoot_3p": "emxarms:emx_kronos/emx_kronos_shoot_3p", + "silence": "emxarms:emx_kronos/deagle_silence", + "silence_3p": "emxarms:emx_kronos/deagle_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -136,4 +136,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_kund50ex_display.json b/emxarms/guns/display/emx_kronosex_display.json similarity index 66% rename from emxarms/guns/display/emx_kund50ex_display.json rename to emxarms/guns/display/emx_kronosex_display.json index 62f0797..77c55df 100644 --- a/emxarms/guns/display/emx_kund50ex_display.json +++ b/emxarms/guns/display/emx_kronosex_display.json @@ -1,13 +1,13 @@ { - "model": "emxarms:gun/emx_kund50ex_geo", - "texture": "emxarms:gun/uv/emx_kund50ex", + "model": "emxarms:gun/emx_kronosex_geo", + "texture": "emxarms:gun/uv/emx_kronosex", "lod": { - "model": "emxarms:gun/lod/emx_kund50ex_lod", - "texture": "emxarms:gun/uv/emx_kund50ex" + "model": "emxarms:gun/lod/emx_kronosex_lod", + "texture": "emxarms:gun/uv/emx_kronosex" }, - "hud": "emxarms:gun/hud/emx_kund50ex", - "slot": "emxarms:gun/slot/emx_kund50ex", - "animation": "emxarms:emx_kund50ex", + "hud": "emxarms:gun/hud/emx_kronosex", + "slot": "emxarms:gun/slot/emx_kronosex", + "animation": "emxarms:emx_kronosex", "use_default_animation": "pistol", "transform": { "scale": { @@ -28,15 +28,15 @@ "scale": 0.8 }, "sounds": { - "reload_empty": "emxarms:emx_kund50/deagle_reload_empty", - "reload_tactical": "emxarms:emx_kund50/deagle_reload_tactical", - "inspect": "emxarms:emx_kund50/deagle_inspect", - "inspect_empty": "emxarms:emx_kund50/deagle_inspect_empty", - "draw": "emxarms:emx_kund50/deagle_draw", - "shoot": "emxarms:emx_kund50/emx_kund50_shoot", - "shoot_3p": "emxarms:emx_kund50/emx_kund50_shoot_3p", - "silence": "emxarms:emx_kund50/deagle_silence", - "silence_3p": "emxarms:emx_kund50/deagle_silence_3p", + "reload_empty": "emxarms:emx_kronos/deagle_reload_empty", + "reload_tactical": "emxarms:emx_kronos/deagle_reload_tactical", + "inspect": "emxarms:emx_kronos/deagle_inspect", + "inspect_empty": "emxarms:emx_kronos/deagle_inspect_empty", + "draw": "emxarms:emx_kronos/deagle_draw", + "shoot": "emxarms:emx_kronos/emx_kronos_shoot", + "shoot_3p": "emxarms:emx_kronos/emx_kronos_shoot_3p", + "silence": "emxarms:emx_kronos/deagle_silence", + "silence_3p": "emxarms:emx_kronos/deagle_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" diff --git a/emxarms/guns/display/emx_mg90_display.json b/emxarms/guns/display/emx_posideon_display.json similarity index 78% rename from emxarms/guns/display/emx_mg90_display.json rename to emxarms/guns/display/emx_posideon_display.json index a625702..e0d9fb4 100644 --- a/emxarms/guns/display/emx_mg90_display.json +++ b/emxarms/guns/display/emx_posideon_display.json @@ -1,13 +1,13 @@ { - "model": "emxarms:gun/emx_mg90_geo", - "texture": "emxarms:gun/uv/emx_mg90", + "model": "emxarms:gun/emx_posideon_geo", + "texture": "emxarms:gun/uv/emx_posideon", // "lod": { // "model": "tacz:gun/lod/m4a1", // "texture": "tacz:gun/lod/m4a1" // }, - "hud": "emxarms:gun/hud/emx_mg90", - "slot": "emxarms:gun/slot/emx_mg90", - "animation": "emxarms:emx_mg90", + "hud": "emxarms:gun/hud/emx_posideon", + "slot": "emxarms:gun/slot/emx_posideon", + "animation": "emxarms:emx_posideon", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -29,14 +29,14 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_mg90/nomad_shoot8", - "shoot_3p": "emxarms:emx_mg90/emx_mg90_shoot", - "silence": "emxarms:emx_mg90/aa12_silence", - "silence_3p": "emxarms:emx_mg90/aa12_silence_3p", - "reload_empty": "emxarms:emx_mg90/emx_mg90_reload_empty", - "reload_tactical": "emxarms:emx_mg90/emx_mg90_reload_tactical", - "draw": "emxarms:emx_mg90/aa12_draw", - "put_away": "emxarms:emx_mg90/aa12_put_away", + "shoot": "emxarms:emx_posideon/nomad_shoot8", + "shoot_3p": "emxarms:emx_posideon/emx_posideon_shoot", + "silence": "emxarms:emx_posideon/aa12_silence", + "silence_3p": "emxarms:emx_posideon/aa12_silence_3p", + "reload_empty": "emxarms:emx_posideon/emx_posideon_reload_empty", + "reload_tactical": "emxarms:emx_posideon/emx_posideon_reload_tactical", + "draw": "emxarms:emx_posideon/aa12_draw", + "put_away": "emxarms:emx_posideon/aa12_put_away", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -116,4 +116,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_umx57_display.json b/emxarms/guns/display/emx_prometheus_display.json similarity index 88% rename from emxarms/guns/display/emx_umx57_display.json rename to emxarms/guns/display/emx_prometheus_display.json index e0f1e56..e7acd10 100644 --- a/emxarms/guns/display/emx_umx57_display.json +++ b/emxarms/guns/display/emx_prometheus_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_umx57_geo", - "texture": "emxarms:gun/uv/emx_umx57", - "hud": "emxarms:gun/hud/emx_umx57", - "slot": "emxarms:gun/slot/emx_umx57", - "animation": "emxarms:emx_umx57", + "model": "emxarms:gun/emx_prometheus_geo", + "texture": "emxarms:gun/uv/emx_prometheus", + "hud": "emxarms:gun/hud/emx_prometheus", + "slot": "emxarms:gun/slot/emx_prometheus", + "animation": "emxarms:emx_prometheus", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -25,10 +25,10 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_umx32/emx_umx57", - "shoot_3p": "emxarms:emx_umx32/vector_shoot_3p", - "silence": "emxarms:emx_umx32/vector_silence", - "silence_3p": "emxarms:emx_umx32/vector_silence_3p", + "shoot": "emxarms:emx_atlas/emx_prometheus", + "shoot_3p": "emxarms:emx_atlas/vector_shoot_3p", + "silence": "emxarms:emx_atlas/vector_silence", + "silence_3p": "emxarms:emx_atlas/vector_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -124,4 +124,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_scgraves_display.json b/emxarms/guns/display/emx_scgraves_display.json deleted file mode 100644 index 554650d..0000000 --- a/emxarms/guns/display/emx_scgraves_display.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "model": "emxarms:gun/emx_scgraves_geo", - "texture": "emxarms:gun/uv/emx_scgraves", - "hud": "emxarms:gun/hud/emx_scgraves", - "slot": "emxarms:gun/slot/emx_scgraves", - "animation": "emxarms:emx_scgraves", - "use_default_animation": "rifle", - "third_person_animation": "default", - "transform": { - "scale": { - "thirdperson": [0.6, 0.6, 0.6], - "ground": [0.6, 0.6, 0.6], - "fixed": [1.2, 1.2, 1.2] - } - }, - "muzzle_flash": { - "texture": "emxarms:flash/emx_muzzle_flash", - "scale": 0.85 - }, - "sounds": { - "reload_empty": "emxarms:emx_scgraves/db_short_reload_empty", - "reload_tactical": "emxarms:emx_scgraves/db_short_reload_tactical", - "inspect": "emxarms:emx_scgraves/db_short_inspect", - "inspect_empty": "emxarms:emx_scgraves/db_short_inspect_empty", - "draw": "emxarms:emx_scgraves/db_short_draw", - "put_away": "emxarms:emx_scgraves/db_short_put_away", - "shoot": "emxarms:emx_scgraves/emx_scgraves", - "shoot_3p": "emxarms:emx_scgraves/emx_scgraves" - }, - "offhand_show": { - "pos": [1, 22, 4], - "rotate": [0, 0, 60], - "scale": [0.5, 0.5, 0.5] - }, - "hotbar_show": { - "0": { - "pos": [-1, 22, 3], - "rotate": [-180, 0, 120], - "scale": [0.5, 0.5, 0.5] - } - } -} \ No newline at end of file diff --git a/emxarms/guns/display/emx_pulse_display.json b/emxarms/guns/display/emx_typhon_display.json similarity index 77% rename from emxarms/guns/display/emx_pulse_display.json rename to emxarms/guns/display/emx_typhon_display.json index b463f2f..fc284d6 100644 --- a/emxarms/guns/display/emx_pulse_display.json +++ b/emxarms/guns/display/emx_typhon_display.json @@ -1,8 +1,8 @@ { - "model": "emxarms:gun/emx_pulse_geo", - "texture": "emxarms:gun/uv/emx_pulse", - "hud": "emxarms:gun/hud/emx_pulse", - "slot": "emxarms:gun/slot/emx_pulse", + "model": "emxarms:gun/emx_typhon_geo", + "texture": "emxarms:gun/uv/emx_typhon", + "hud": "emxarms:gun/hud/emx_typhon", + "slot": "emxarms:gun/slot/emx_typhon", "animation": "tacz:glock_17", "use_default_animation": "pistol", "transform": { @@ -17,15 +17,15 @@ "scale": 0.4 }, "sounds": { - "reload_empty": "emxarms:emx_pulse/glock17_reload_empty", - "reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", - "inspect": "emxarms:emx_pulse/glock17_inspect", - "inspect_empty": "emxarms:emx_pulse/glock17_inspect_empty", - "draw": "emxarms:emx_pulse/glock17_draw", - "shoot": "emxarms:emx_pulse/emx_pulse_shoot", - "shoot_3p": "emxarms:emx_pulse/emx_pulse_shoot_3p", - "silence": "emxarms:emx_pulse/glock17_silence", - "silence_3p": "emxarms:emx_pulse/glock17_silence_3p", + "reload_empty": "emxarms:emx_typhon/glock17_reload_empty", + "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical", + "inspect": "emxarms:emx_typhon/glock17_inspect", + "inspect_empty": "emxarms:emx_typhon/glock17_inspect_empty", + "draw": "emxarms:emx_typhon/glock17_draw", + "shoot": "emxarms:emx_typhon/emx_typhon_shoot", + "shoot_3p": "emxarms:emx_typhon/emx_typhon_shoot_3p", + "silence": "emxarms:emx_typhon/glock17_silence", + "silence_3p": "emxarms:emx_typhon/glock17_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -105,4 +105,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_pulsex2_display.json b/emxarms/guns/display/emx_typhonx2_display.json similarity index 76% rename from emxarms/guns/display/emx_pulsex2_display.json rename to emxarms/guns/display/emx_typhonx2_display.json index c4441db..83464ec 100644 --- a/emxarms/guns/display/emx_pulsex2_display.json +++ b/emxarms/guns/display/emx_typhonx2_display.json @@ -1,9 +1,9 @@ { - "model": "emxarms:gun/emx_pulsex2_geo", - "texture": "emxarms:gun/uv/emx_pulsex2", - "hud": "emxarms:gun/hud/emx_pulsex2", - "slot": "emxarms:gun/slot/emx_pulsex2", - "animation": "emxarms:emx_pulsex2_geo", + "model": "emxarms:gun/emx_typhonx2_geo", + "texture": "emxarms:gun/uv/emx_typhonx2", + "hud": "emxarms:gun/hud/emx_typhonx2", + "slot": "emxarms:gun/slot/emx_typhonx2", + "animation": "emxarms:emx_typhonx2_geo", "use_default_animation": "pistol", "transform": { "scale": { @@ -17,15 +17,15 @@ "scale": 0.4 }, "sounds": { - "reload_empty": "emxarms:emx_pulse/glock17_reload_empty", - "reload_tactical": "emxarms:emx_pulse/glock17_reload_tactical", - "inspect": "emxarms:emx_pulse/se_inspect", - "inspect_empty": "emxarms:emx_pulse/se_inspect_empty", - "draw": "emxarms:emx_pulse/glock17_draw", - "shoot": "emxarms:emx_pulse/emx_pulsex2", - "shoot_3p": "emxarms:emx_pulse/emx_pulsex2_3p", - "silence": "emxarms:emx_pulse/glock17_silence", - "silence_3p": "emxarms:emx_pulse/glock17_silence_3p", + "reload_empty": "emxarms:emx_typhon/glock17_reload_empty", + "reload_tactical": "emxarms:emx_typhon/glock17_reload_tactical", + "inspect": "emxarms:emx_typhon/se_inspect", + "inspect_empty": "emxarms:emx_typhon/se_inspect_empty", + "draw": "emxarms:emx_typhon/glock17_draw", + "shoot": "emxarms:emx_typhon/emx_typhonx2", + "shoot_3p": "emxarms:emx_typhon/emx_typhonx2_3p", + "silence": "emxarms:emx_typhon/glock17_silence", + "silence_3p": "emxarms:emx_typhon/glock17_silence_3p", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -105,4 +105,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/display/emx_mg57_display.json b/emxarms/guns/display/emx_zeus_display.json similarity index 78% rename from emxarms/guns/display/emx_mg57_display.json rename to emxarms/guns/display/emx_zeus_display.json index a55395c..8644179 100644 --- a/emxarms/guns/display/emx_mg57_display.json +++ b/emxarms/guns/display/emx_zeus_display.json @@ -1,13 +1,13 @@ { - "model": "emxarms:gun/emx_mg57_geo", - "texture": "emxarms:gun/uv/emx_mg57", + "model": "emxarms:gun/emx_zeus_geo", + "texture": "emxarms:gun/uv/emx_zeus", // "lod": { // "model": "tacz:gun/lod/m4a1", // "texture": "tacz:gun/lod/m4a1" // }, - "hud": "emxarms:gun/hud/emx_mg57", - "slot": "emxarms:gun/slot/emx_mg57", - "animation": "emxarms:emx_mg57", + "hud": "emxarms:gun/hud/emx_zeus", + "slot": "emxarms:gun/slot/emx_zeus", + "animation": "emxarms:emx_zeus", "use_default_animation": "rifle", "third_person_animation": "default", "transform": { @@ -29,14 +29,14 @@ "living_time": 1.0 }, "sounds": { - "shoot": "emxarms:emx_mg90/s09_shoot", - "shoot_3p": "emxarms:emx_mg90/emx_mg90_shoot", - "silence": "emxarms:emx_mg90/aa12_silence", - "silence_3p": "emxarms:emx_mg90/aa12_silence_3p", - "reload_empty": "emxarms:emx_mg90/emx_mg90_reload_empty", - "reload_tactical": "emxarms:emx_mg90/emx_mg90_reload_tactical", - "draw": "emxarms:emx_mg90/aa12_draw", - "put_away": "emxarms:emx_mg90/aa12_put_away", + "shoot": "emxarms:emx_posideon/s09_shoot", + "shoot_3p": "emxarms:emx_posideon/emx_posideon_shoot", + "silence": "emxarms:emx_posideon/aa12_silence", + "silence_3p": "emxarms:emx_posideon/aa12_silence_3p", + "reload_empty": "emxarms:emx_posideon/emx_posideon_reload_empty", + "reload_tactical": "emxarms:emx_posideon/emx_posideon_reload_tactical", + "draw": "emxarms:emx_posideon/aa12_draw", + "put_away": "emxarms:emx_posideon/aa12_put_away", "dry_fire": "emxarms:emx_dw", "fire_select": "emxarms:emx_mode", "kill": "emxarms:emx_hit1" @@ -116,4 +116,4 @@ "scale": [0.5, 0.5, 0.5] } } -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_pmg90e.json b/emxarms/guns/index/emx_apollo.json similarity index 57% rename from emxarms/guns/index/emx_pmg90e.json rename to emxarms/guns/index/emx_apollo.json index cb000fb..8590f04 100644 --- a/emxarms/guns/index/emx_pmg90e.json +++ b/emxarms/guns/index/emx_apollo.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_pmg90e.name", + "name": "emxarms.gun.emx_apollo.name", // 枪械效果文件 - "display": "emxarms:emx_pmg90e_display", + "display": "emxarms:emx_apollo_display", // 枪械参数文件 - "data": "emxarms:emx_pmg90e_data", + "data": "emxarms:emx_apollo_data", // 枪械种类，用于创造标签栏归类。 "type": "rpg" } diff --git a/emxarms/guns/index/emx_ares.json b/emxarms/guns/index/emx_ares.json new file mode 100644 index 0000000..368ef16 --- /dev/null +++ b/emxarms/guns/index/emx_ares.json @@ -0,0 +1,7 @@ +{ + "name": "emxarms.gun.emx_ares.name", + "display": "emxarms:emx_ares_display", + "data": "emxarms:emx_ares_data", + "type": "rifle", + "sort": 2 +} diff --git a/emxarms/guns/index/emx_pmg90.json b/emxarms/guns/index/emx_artemis.json similarity index 57% rename from emxarms/guns/index/emx_pmg90.json rename to emxarms/guns/index/emx_artemis.json index cfb7f55..520ed0d 100644 --- a/emxarms/guns/index/emx_pmg90.json +++ b/emxarms/guns/index/emx_artemis.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_pmg90.name", + "name": "emxarms.gun.emx_artemis.name", // 枪械效果文件 - "display": "emxarms:emx_pmg90_display", + "display": "emxarms:emx_artemis_display", // 枪械参数文件 - "data": "emxarms:emx_pmg90_data", + "data": "emxarms:emx_artemis_data", // 枪械种类，用于创造标签栏归类。 "type": "sniper" -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_umx32.json b/emxarms/guns/index/emx_atlas.json similarity index 57% rename from emxarms/guns/index/emx_umx32.json rename to emxarms/guns/index/emx_atlas.json index 4727da2..00f37b0 100644 --- a/emxarms/guns/index/emx_umx32.json +++ b/emxarms/guns/index/emx_atlas.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_umx32.name", + "name": "emxarms.gun.emx_atlas.name", // 枪械效果文件 - "display": "emxarms:emx_umx32_display", + "display": "emxarms:emx_atlas_display", // 枪械参数文件 - "data": "emxarms:emx_umx32_data", + "data": "emxarms:emx_atlas_data", // 枪械种类，用于创造标签栏归类。 "type": "smg" -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_scgraves.json b/emxarms/guns/index/emx_boomstick.json similarity index 54% rename from emxarms/guns/index/emx_scgraves.json rename to emxarms/guns/index/emx_boomstick.json index 53f3ba6..42d39ef 100644 --- a/emxarms/guns/index/emx_scgraves.json +++ b/emxarms/guns/index/emx_boomstick.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_scgraves.name", + "name": "emxarms.gun.emx_boomstick.name", // 枪械效果文件 - "display": "emxarms:emx_scgraves_display", + "display": "emxarms:emx_boomstick_display", // 枪械参数文件 - "data": "emxarms:emx_scgraves_data", + "data": "emxarms:emx_boomstick_data", // 枪械种类，用于创造标签栏归类。 "type": "shotgun" -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_charon.json b/emxarms/guns/index/emx_charon.json new file mode 100644 index 0000000..d0018cb --- /dev/null +++ b/emxarms/guns/index/emx_charon.json @@ -0,0 +1,6 @@ +{ + "name": "emxarms.gun.emx_charon.name", + "display": "emxarms:emx_charon_display", + "data": "emxarms:emx_charon_data", + "type": "shotgun" +} diff --git a/emxarms/guns/index/emx_enforcer.json b/emxarms/guns/index/emx_enforcer.json deleted file mode 100644 index da69095..0000000 --- a/emxarms/guns/index/emx_enforcer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "emxarms.gun.emx_enforcer.name", - "display": "emxarms:emx_enforcer_display", - "data": "emxarms:emx_enforcer_data", - "type": "shotgun" -} diff --git a/emxarms/guns/index/emx_draftsman.json b/emxarms/guns/index/emx_helios.json similarity index 75% rename from emxarms/guns/index/emx_draftsman.json rename to emxarms/guns/index/emx_helios.json index be0ec2c..c767c6c 100644 --- a/emxarms/guns/index/emx_draftsman.json +++ b/emxarms/guns/index/emx_helios.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_draftsman.name", + "name": "emxarms.gun.emx_helios.name", // 枪械效果文件 - "display": "emxarms:emx_draftsman_display", + "display": "emxarms:emx_helios_display", // 枪械参数文件 - "data": "emxarms:emx_draftsman_data", + "data": "emxarms:emx_helios_data", // 枪械种类，用于创造标签栏归类。 "type": "shotgun", // 枪械的物品类型，决定枪械的逻辑，如开火、装填等，默认是 modern_kinetic (现代动能枪械) @@ -12,4 +12,4 @@ // 排序数，决定了在创造模式标签页中的顺序 // 数字越小，优先级越高 "sort": 10 -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_kronos.json b/emxarms/guns/index/emx_kronos.json new file mode 100644 index 0000000..d19d40b --- /dev/null +++ b/emxarms/guns/index/emx_kronos.json @@ -0,0 +1,6 @@ +{ + "name": "emxarms.gun.emx_kronos.name", + "display": "emxarms:emx_kronos_display", + "data": "emxarms:emx_kronos_data", + "type": "pistol" +} diff --git a/emxarms/guns/index/emx_kronosex.json b/emxarms/guns/index/emx_kronosex.json new file mode 100644 index 0000000..a5d7615 --- /dev/null +++ b/emxarms/guns/index/emx_kronosex.json @@ -0,0 +1,7 @@ +{ + "name": "emxarms.gun.emx_kronosex.name", + "display": "emxarms:emx_kronosex_display", + "tooltip": "emxarms.gun.emx_kronosex.desc", + "data": "emxarms:emx_kronosex_data", + "type": "pistol" +} diff --git a/emxarms/guns/index/emx_kund50.json b/emxarms/guns/index/emx_kund50.json deleted file mode 100644 index 4541843..0000000 --- a/emxarms/guns/index/emx_kund50.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "emxarms.gun.emx_kund50.name", - "display": "emxarms:emx_kund50_display", - "data": "emxarms:emx_kund50_data", - "type": "pistol" -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_kund50ex.json b/emxarms/guns/index/emx_kund50ex.json deleted file mode 100644 index 0226158..0000000 --- a/emxarms/guns/index/emx_kund50ex.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "emxarms.gun.emx_kund50ex.name", - "display": "emxarms:emx_kund50ex_display", - "tooltip": "emxarms.gun.emx_kund50ex.desc", - "data": "emxarms:emx_kund50ex_data", - "type": "pistol" -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_mg57.json b/emxarms/guns/index/emx_mg57.json deleted file mode 100644 index c346675..0000000 --- a/emxarms/guns/index/emx_mg57.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "emxarms.gun.emx_mg57.name", - "display": "emxarms:emx_mg57_display", - "data": "emxarms:emx_mg57_data", - "type": "mg", - "sort": 2 -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_mg90.json b/emxarms/guns/index/emx_mg90.json deleted file mode 100644 index ce435bd..0000000 --- a/emxarms/guns/index/emx_mg90.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "emxarms.gun.emx_mg90.name", - "display": "emxarms:emx_mg90_display", - "data": "emxarms:emx_mg90_data", - "type": "mg", - "sort": 2 -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_posideon.json b/emxarms/guns/index/emx_posideon.json new file mode 100644 index 0000000..fd93162 --- /dev/null +++ b/emxarms/guns/index/emx_posideon.json @@ -0,0 +1,7 @@ +{ + "name": "emxarms.gun.emx_posideon.name", + "display": "emxarms:emx_posideon_display", + "data": "emxarms:emx_posideon_data", + "type": "mg", + "sort": 2 +} diff --git a/emxarms/guns/index/emx_umx57.json b/emxarms/guns/index/emx_prometheus.json similarity index 55% rename from emxarms/guns/index/emx_umx57.json rename to emxarms/guns/index/emx_prometheus.json index 7eb9b4a..6dad683 100644 --- a/emxarms/guns/index/emx_umx57.json +++ b/emxarms/guns/index/emx_prometheus.json @@ -1,10 +1,10 @@ { // 枪械的显示名称，支持本地化 - "name": "emxarms.gun.emx_umx57.name", + "name": "emxarms.gun.emx_prometheus.name", // 枪械效果文件 - "display": "emxarms:emx_umx57_display", + "display": "emxarms:emx_prometheus_display", // 枪械参数文件 - "data": "emxarms:emx_umx57_data", + "data": "emxarms:emx_prometheus_data", // 枪械种类，用于创造标签栏归类。 "type": "rifle" -} \ No newline at end of file +} diff --git a/emxarms/guns/index/emx_pulse.json b/emxarms/guns/index/emx_pulse.json deleted file mode 100644 index 607287a..0000000 --- a/emxarms/guns/index/emx_pulse.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "emxarms.gun.emx_pulse.name", - "display": "emxarms:emx_pulse_display", - "data": "emxarms:emx_pulse_data", - "type": "pistol" -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_pulsex2.json b/emxarms/guns/index/emx_pulsex2.json deleted file mode 100644 index 8178920..0000000 --- a/emxarms/guns/index/emx_pulsex2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "name": "emxarms.gun.emx_pulsex2.name", - "display": "emxarms:emx_pulsex2_display", - "data": "emxarms:emx_pulsex2_data", - "type": "pistol" -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_rivet.json b/emxarms/guns/index/emx_rivet.json deleted file mode 100644 index ac043ec..0000000 --- a/emxarms/guns/index/emx_rivet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "emxarms.gun.emx_rivet.name", - "display": "emxarms:emx_rivet_display", - "data": "emxarms:emx_rivet_data", - "type": "rifle", - "sort": 2 -} \ No newline at end of file diff --git a/emxarms/guns/index/emx_typhon.json b/emxarms/guns/index/emx_typhon.json new file mode 100644 index 0000000..383b6c8 --- /dev/null +++ b/emxarms/guns/index/emx_typhon.json @@ -0,0 +1,6 @@ +{ + "name": "emxarms.gun.emx_typhon.name", + "display": "emxarms:emx_typhon_display", + "data": "emxarms:emx_typhon_data", + "type": "pistol" +} diff --git a/emxarms/guns/index/emx_typhonx2.json b/emxarms/guns/index/emx_typhonx2.json new file mode 100644 index 0000000..865ef86 --- /dev/null +++ b/emxarms/guns/index/emx_typhonx2.json @@ -0,0 +1,6 @@ +{ + "name": "emxarms.gun.emx_typhonx2.name", + "display": "emxarms:emx_typhonx2_display", + "data": "emxarms:emx_typhonx2_data", + "type": "pistol" +} diff --git a/emxarms/guns/index/emx_zeus.json b/emxarms/guns/index/emx_zeus.json new file mode 100644 index 0000000..b6f8bf0 --- /dev/null +++ b/emxarms/guns/index/emx_zeus.json @@ -0,0 +1,7 @@ +{ + "name": "emxarms.gun.emx_zeus.name", + "display": "emxarms:emx_zeus_display", + "data": "emxarms:emx_zeus_data", + "type": "mg", + "sort": 2 +} diff --git a/emxarms/lang/en_us.json b/emxarms/lang/en_us.json index c080340..b351190 100644 --- a/emxarms/lang/en_us.json +++ b/emxarms/lang/en_us.json @@ -3,21 +3,21 @@ "pack.tacz.emx_arms_gun.desc": "§aElectro§cmagnetic §dArsenal\n§9Galactic§1Factory §8Edition", - "emxarms.gun.emx_rivet.name": "§aSK-217 “Ares”", - "emxarms.gun.emx_pulse.name": "§aXSP-31 “Typhon”", + "emxarms.gun.emx_ares.name": "§aSK-217 “Ares”", + "emxarms.gun.emx_typhon.name": "§aXSP-31 “Typhon”", "emxarms.gun.emx_chaos.name": "§dXSM-31 “Chaos”", - "emxarms.gun.emx_pulsex2.name": "§aXSP-31-X2 “Typhon”", - "emxarms.gun.emx_draftsman.name": "§aSAIG-24 “Helios”", - "emxarms.gun.emx_kund50.name": "§aMACH-50 “Kronos”", - "emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “Kronos”", - "emxarms.gun.emx_pmg90.name": "§aHAER-90 “Artemis”", - "emxarms.gun.emx_pmg90e.name" : "§cHAER-90-E “Apollo”", - "emxarms.gun.emx_umx32.name": "§aVXM-31 “Atlas”", - "emxarms.gun.emx_umx57.name": "§aVXM-57 “Prometheus”", - "emxarms.gun.emx_scgraves.name": "§aRevolutionary Boomstick", - "emxarms.gun.emx_mg90.name": "§aAPM-130 “Posideon”", - "emxarms.gun.emx_mg57.name": "§aHCMG-57 “Zeus”", - "emxarms.gun.emx_enforcer.name": "§aDBS-16 “Charon”", + "emxarms.gun.emx_typhonx2.name": "§aXSP-31-X2 “Typhon”", + "emxarms.gun.emx_helios.name": "§aSAIG-24 “Helios”", + "emxarms.gun.emx_kronos.name": "§aMACH-50 “Kronos”", + "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “Kronos”", + "emxarms.gun.emx_artemis.name": "§aHAER-90 “Artemis”", + "emxarms.gun.emx_apollo.name" : "§cHAER-90-E “Apollo”", + "emxarms.gun.emx_atlas.name": "§aVXM-31 “Atlas”", + "emxarms.gun.emx_prometheus.name": "§aVXM-57 “Prometheus”", + "emxarms.gun.emx_boomstick.name": "§aRevolutionary Boomstick", + "emxarms.gun.emx_posideon.name": "§aAPM-130 “Posideon”", + "emxarms.gun.emx_zeus.name": "§aHCMG-57 “Zeus”", + "emxarms.gun.emx_charon.name": "§aDBS-16 “Charon”", "emxarms.ammo.410x57ap.name": "§a4.10x57 AP Cartridge", "emxarms.ammo.339x57.name": "§a3.39x57 M.S. Cartridge", @@ -27,14 +27,14 @@ "emxarms.ammo.1045x103-E.name": "§c10.45x103 M.S. High Explosive Flechette", "emxarms.attachment.sight_emx_demo2.name": "§a“Volt” Holographic Sight", - "emxarms.attachment.sight_emx_demo2.tooltip": "The holographic sight that comes standard on the §aSK-217 Apollo§7.", + "emxarms.attachment.sight_emx_demo2.tooltip": "The holographic sight that comes standard on the §aSK-217 Ares§7.", "emxarms.attachment.sight_emx_array.name": "§a“Hermes” Array Vision Scope", "emxarms.attachment.sight_emx_array.tooltip": "An advanced scope design that allows for three levels of magnification.", "emxarms.attachment.sight_emx_char1.name": "§a“Hyperion” Holographic Sight", "emxarms.attachment.sight_emx_char1.tooltip": "A simple but sleek option for low magnification requirements.", "emxarms.attachment.sight_emx_char2.name": "§a“Theia” Holographic Sight", "emxarms.attachment.sight_emx_char2.tooltip": "A variation of the §aHyperion§7, with a slightly different design offering higher magnification.", - "emxarms.attachment.sight_emx_tanh.name": "§a“Ares” Combination Sight", + "emxarms.attachment.sight_emx_tanh.name": "§a“Oblivion” Combination Sight", "emxarms.attachment.sight_emx_tanh.tooltip": "The standard combination sight that comes standard on the §aHAER-90 Artemis §7and §cHAER-90-E Apollo.", "emxarms.attachment.sight_emx_integer.name": "§a“Hestia” Holographic Sight", "emxarms.attachment.sight_emx_integer.tooltip": "A wide open sight, which allows for a clearer sight picture.", diff --git a/emxarms/lang/zh_cn.json b/emxarms/lang/zh_cn.json index a2fef43..b057f3f 100644 --- a/emxarms/lang/zh_cn.json +++ b/emxarms/lang/zh_cn.json @@ -3,25 +3,25 @@ "pack.tacz.emx_arms_gun.desc": "于绝境中凋亡，在逆境中重生。", - "emxarms.gun.emx_rivet.name": "§aSK-217 “坚钉”", - "emxarms.gun.emx_pulse.name": "§aXSP-31 “脉冲”", - "emxarms.gun.emx_pulsex2.name": "§aXSP-31 “非法殉道者”§f(整活)", - "emxarms.gun.emx_draftsman.name": "§aSAIG-24 “绘图师”", - "emxarms.gun.emx_kund50.name": "§aMACH-50 “极地猎手”", - "emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “极地探索者”", - "emxarms.gun.emx_pmg90.name": "§aHAER-90 “巡弋者”", - "emxarms.gun.emx_umx32.name": "§aVXM-31 “袖剑”", - "emxarms.gun.emx_umx57.name": "§aVXM-57 “猎剑”", - "emxarms.gun.emx_scgraves.name": "§a拼装电磁枪 “革命者”", - "emxarms.gun.emx_mg90.name": "§aAPM-130 “厄兆”", - "emxarms.gun.emx_mg57.name": "§aHCMG-57 “重骑兵”", - + "emxarms.gun.emx_ares.name": "§aSK-217 “坚钉”", + "emxarms.gun.emx_typhon.name": "§aXSP-31 “脉冲”", + "emxarms.gun.emx_typhonx2.name": "§aXSP-31 “非法殉道者”§f(整活)", + "emxarms.gun.emx_helios.name": "§aSAIG-24 “绘图师”", + "emxarms.gun.emx_kronos.name": "§aMACH-50 “极地猎手”", + "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “极地探索者”", + "emxarms.gun.emx_artemis.name": "§aHAER-90 “巡弋者”", + "emxarms.gun.emx_atlas.name": "§aVXM-31 “袖剑”", + "emxarms.gun.emx_prometheus.name": "§aVXM-57 “猎剑”", + "emxarms.gun.emx_boomstick.name": "§a拼装电磁枪 “革命者”", + "emxarms.gun.emx_posideon.name": "§aAPM-130 “厄兆”", + "emxarms.gun.emx_zeus.name": "§aHCMG-57 “重骑兵”", + "emxarms.ammo.410x57ap.name": "§a4.10x57mm 磁钢重穿弹", "emxarms.ammo.339x57.name": "§a3.39x57mm 磁钢弹", "emxarms.ammo.x16sg.name": "§aX16 磁钢集束弹", "emxarms.ammo.402x31.name": "§a4.02x31mm 磁钢弹", "emxarms.ammo.1045x103.name": "§a10.45x103mm 磁钢箭形弹", - + "emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 战术镭射|全向握把", "emxarms.attachment.sight_emx_char1.name": "§a“字元”I型 视觉瞄准镜", "emxarms.attachment.sight_emx_char2.name": "§a“字元”II型 视觉瞄准镜", @@ -38,8 +38,8 @@ "emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字节” 近战|轻量化升级", "emxarms.attachment.sight_emx_tanh.name": "§a“双曲函数” 组合瞄准具", "emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 轻量化扩容弹匣", - - + + "emxarms.attachment.sight_emx_integer.name": "§a“整数” 全息瞄准具" - -} \ No newline at end of file + +} diff --git a/emxarms/lang/zh_tw.json b/emxarms/lang/zh_tw.json index 506201a..6b9d93f 100644 --- a/emxarms/lang/zh_tw.json +++ b/emxarms/lang/zh_tw.json @@ -3,25 +3,25 @@ "pack.tacz.emx_arms_gun.desc": "EMX電磁武器庫", - "emxarms.gun.emx_rivet.name": "§aSK-217 “堅釘”", - "emxarms.gun.emx_pulse.name": "§aXSP-31 “脈衝”", - "emxarms.gun.emx_pulsex2.name": "§aXSP-31 “私法制裁者”", - "emxarms.gun.emx_draftsman.name": "§aSAIG-24 “制圖師”", - "emxarms.gun.emx_kund50.name": "§aMACH-50 “極地獵手”", - "emxarms.gun.emx_kund50ex.name": "§aMACH-50EX “極地探索者”", - "emxarms.gun.emx_pmg90.name": "§aHAER-90 “阿爾忒彌斯”", - "emxarms.gun.emx_umx32.name": "§aVXM-31 “隱劍”", - "emxarms.gun.emx_umx57.name": "§aVXM-57 “獵劍”", - "emxarms.gun.emx_scgraves.name": "§a重櫻第一男槍 “安培切”", - "emxarms.gun.emx_mg90.name": "§aAPM-130 “厄兆”", - "emxarms.gun.emx_mg57.name": "§aHCMG-57 “重騎兵”", - + "emxarms.gun.emx_ares.name": "§aSK-217 “堅釘”", + "emxarms.gun.emx_typhon.name": "§aXSP-31 “脈衝”", + "emxarms.gun.emx_typhonx2.name": "§aXSP-31 “私法制裁者”", + "emxarms.gun.emx_helios.name": "§aSAIG-24 “制圖師”", + "emxarms.gun.emx_kronos.name": "§aMACH-50 “極地獵手”", + "emxarms.gun.emx_kronosex.name": "§aMACH-50EX “極地探索者”", + "emxarms.gun.emx_artemis.name": "§aHAER-90 “阿爾忒彌斯”", + "emxarms.gun.emx_atlas.name": "§aVXM-31 “隱劍”", + "emxarms.gun.emx_prometheus.name": "§aVXM-57 “獵劍”", + "emxarms.gun.emx_boomstick.name": "§a重櫻第一男槍 “安培切”", + "emxarms.gun.emx_posideon.name": "§aAPM-130 “厄兆”", + "emxarms.gun.emx_zeus.name": "§aHCMG-57 “重騎兵”", + "emxarms.ammo.410x57ap.name": "§a4.10x57mm 電磁穿甲彈", "emxarms.ammo.339x57.name": "§a3.39x57 電磁槍彈", "emxarms.ammo.x16sg.name": "§aX16 電磁霰彈", "emxarms.ammo.402x31.name": "§a4.02x31 電磁槍彈", "emxarms.ammo.1045x103.name": "§a10.45x103 電磁槍箭形彈", - + "emxarms.attachment.grip_emx_nested.name": "§a“嵌套式” 戰術鐳射|全向握把", "emxarms.attachment.sight_emx_char1.name": "§a“查爾”I型 視覺瞄準鏡", "emxarms.attachment.sight_emx_char2.name": "§a“查爾”II型 視覺瞄準鏡", @@ -38,8 +38,8 @@ "emxarms.attachment.bayonet_emx_lightupgrade.name": "§a“字節” 近戰|輕量化升級", "emxarms.attachment.sight_emx_tanh.name": "§a“雙曲函數” 組合瞄準具", "emxarms.attachment.emx_lightweight_mag_2.name": "§a“短整型” 輕量化擴容彈匣", - - + + "emxarms.attachment.sight_emx_integer.name": "§a“整數” 全息瞄準具" - + } diff --git a/emxarms/models/gun/emx_pmg90e_geo.json b/emxarms/models/gun/emx_apollo_geo.json similarity index 100% rename from emxarms/models/gun/emx_pmg90e_geo.json rename to emxarms/models/gun/emx_apollo_geo.json diff --git a/emxarms/models/gun/emx_rivet_geo.json b/emxarms/models/gun/emx_ares_geo.json similarity index 99% rename from emxarms/models/gun/emx_rivet_geo.json rename to emxarms/models/gun/emx_ares_geo.json index d1d7b4a..df96f41 100644 --- a/emxarms/models/gun/emx_rivet_geo.json +++ b/emxarms/models/gun/emx_ares_geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.emx_rivet_geo", + "identifier": "geometry.emx_ares_geo", "texture_width": 256, "texture_height": 256, "visible_bounds_width": 3, @@ -1555,13 +1555,13 @@ "pivot": [0, 8, -1.425] }, { - "name": "emx_rivet", + "name": "emx_ares", "parent": "gun_and_righthand", "pivot": [0, 6, -3] }, { "name": "display_illuminated", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8], "cubes": [ { @@ -1600,7 +1600,7 @@ }, { "name": "body", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8], "cubes": [ { @@ -5914,7 +5914,7 @@ }, { "name": "stock_default1", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8], "cubes": [ { @@ -6489,17 +6489,17 @@ }, { "name": "charge", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8] }, { "name": "mount", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8] }, { "name": "falkmuzzle_default", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 0, -8], "cubes": [ { @@ -7373,7 +7373,7 @@ }, { "name": "sight", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 8.32813, -12.5], "cubes": [ { @@ -7885,7 +7885,7 @@ }, { "name": "refit_pos", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 6, -3] }, { @@ -7915,7 +7915,7 @@ }, { "name": "constraint", - "parent": "emx_rivet", + "parent": "emx_ares", "pivot": [0, 11.5, -20] }, { @@ -8025,4 +8025,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/emxarms/models/gun/emx_pmg90_geo.json b/emxarms/models/gun/emx_artemis_geo.json similarity index 100% rename from emxarms/models/gun/emx_pmg90_geo.json rename to emxarms/models/gun/emx_artemis_geo.json diff --git a/emxarms/models/gun/emx_umx32_geo.json b/emxarms/models/gun/emx_atlas_geo.json similarity index 100% rename from emxarms/models/gun/emx_umx32_geo.json rename to emxarms/models/gun/emx_atlas_geo.json diff --git a/emxarms/models/gun/emx_scgraves_geo.json b/emxarms/models/gun/emx_boomstick_geo.json similarity index 100% rename from emxarms/models/gun/emx_scgraves_geo.json rename to emxarms/models/gun/emx_boomstick_geo.json diff --git a/emxarms/models/gun/emx_enforcer_geo.json b/emxarms/models/gun/emx_charon_geo.json similarity index 100% rename from emxarms/models/gun/emx_enforcer_geo.json rename to emxarms/models/gun/emx_charon_geo.json diff --git a/emxarms/models/gun/emx_draftsman_geo.json b/emxarms/models/gun/emx_helios_geo.json similarity index 99% rename from emxarms/models/gun/emx_draftsman_geo.json rename to emxarms/models/gun/emx_helios_geo.json index 717abc8..4c5372f 100644 --- a/emxarms/models/gun/emx_draftsman_geo.json +++ b/emxarms/models/gun/emx_helios_geo.json @@ -3,7 +3,7 @@ "minecraft:geometry": [ { "description": { - "identifier": "geometry.draftsman", + "identifier": "geometry.helios", "texture_width": 256, "texture_height": 256, "visible_bounds_width": 6, @@ -10700,4 +10700,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/emxarms/models/gun/emx_kund50_geo.json b/emxarms/models/gun/emx_kronos_geo.json similarity index 100% rename from emxarms/models/gun/emx_kund50_geo.json rename to emxarms/models/gun/emx_kronos_geo.json diff --git a/emxarms/models/gun/emx_kund50ex_geo.json b/emxarms/models/gun/emx_kronosex_geo.json similarity index 100% rename from emxarms/models/gun/emx_kund50ex_geo.json rename to emxarms/models/gun/emx_kronosex_geo.json diff --git a/emxarms/models/gun/emx_mg90_geo.json b/emxarms/models/gun/emx_posideon_geo.json similarity index 100% rename from emxarms/models/gun/emx_mg90_geo.json rename to emxarms/models/gun/emx_posideon_geo.json diff --git a/emxarms/models/gun/emx_umx57_geo.json b/emxarms/models/gun/emx_prometheus_geo.json similarity index 100% rename from emxarms/models/gun/emx_umx57_geo.json rename to emxarms/models/gun/emx_prometheus_geo.json diff --git a/emxarms/models/gun/emx_pulse_geo.json b/emxarms/models/gun/emx_typhon_geo.json similarity index 100% rename from emxarms/models/gun/emx_pulse_geo.json rename to emxarms/models/gun/emx_typhon_geo.json diff --git a/emxarms/models/gun/emx_pulsex2_geo.json b/emxarms/models/gun/emx_typhonx2_geo.json similarity index 100% rename from emxarms/models/gun/emx_pulsex2_geo.json rename to emxarms/models/gun/emx_typhonx2_geo.json diff --git a/emxarms/models/gun/emx_mg57_geo.json b/emxarms/models/gun/emx_zeus_geo.json similarity index 100% rename from emxarms/models/gun/emx_mg57_geo.json rename to emxarms/models/gun/emx_zeus_geo.json diff --git a/emxarms/models/gun/lod/emx_kund50ex_lod.json b/emxarms/models/gun/lod/emx_kronosex_lod.json similarity index 100% rename from emxarms/models/gun/lod/emx_kund50ex_lod.json rename to emxarms/models/gun/lod/emx_kronosex_lod.json diff --git a/emxarms/pack.json b/emxarms/pack.json index cf1be0f..d29e3fd 100644 --- a/emxarms/pack.json +++ b/emxarms/pack.json @@ -1,5 +1,5 @@ { - "version": "0.2.4-1", + "version": "0.2.4-2", "name": "pack.tacz.emx_arms_gun.name", "desc": "pack.tacz.emx_arms_gun.desc", "license": "CC BY-NC-ND 4.0", diff --git a/emxarms/python/__init__.py b/emxarms/python/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/emxarms/python/__pycache__/__init__.cpython-312.pyc b/emxarms/python/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..7ff4eadab9c99c0e63ca2d835733547b8109d3aa GIT binary patch literal 157 zcmX@j%ge<81n(>tq=D$iAOanHW&w&!XQ*V*Wb|9fP{ah}eFmxdWuu>wpPQ;*oSIl% zo|&7QTBILPl%JKFTvDv>>Kox$lv}Kynp=?wq6;cZGV=5E3E;5)PjND*L(K z>PH0diy6KIreHizK?f92kPgeB1YW~3s-qP5n*}TtxoI3zBK?>>zDu)pz@g_vG(Vf~ zpxT9<>HTeZ`Uc<$Wj47c-we7z>Ul-2kc-^V3$RfOJ2R%n&)^Jb!VJ!U%ekSQY2Bvq ze|(L-=!DRo0)Ad!H}PL@^=A4n$rW7e$0BgT{;h&sVUy0(#hdV+_veA2wZ=p1Ee~}_ zaZ3&Hfm)FbRmmqBe8MpkDS-q`oA5PRe@6JK?34(vndJ%*EVZi3MU{jsk3oV}t6XtX zBEgnvIx9-qB7&(aE4D*HMXgN$b$dxL1+0)w#MQFyWv~hMA;FBvEP@%8A)C!7;mgsD zbjdW-w5`f^t!x;omA-G8np$-1^qqT;3zlK0RpX`1bhYl3%u3o(jq0^(ot&98JV|OT z(5!5a>^42tV3fS_LD&`sc$mx`LMSNh;!Ep7JJ!wZ#V#B|P?Xje_vWJA_&D=+K~FfAU2HW+xUdvS8eD8pyzafBtqRG#bVEh|P%w%|7V R+kZHO&_0M`UO