From 77fed13c4e214954cc1704e0f07bff7d791cc40f Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Mon, 5 Feb 2024 17:28:38 -0800 Subject: [PATCH] Really fix new weapons loading incorrectly Required some fixes from Pluto for raw weapon loading New weapons and attachmentuniques do not need to be built with OAT --- attachmentunique/{ => zm}/au_sa58_none | 0 attachmentunique/{ => zm}/au_sa58_sf | 0 attachmentunique/{ => zm}/au_sig556_gl | 0 attachmentunique/{ => zm}/au_sig556_none | 0 attachmentunique/{ => zm}/au_vector_none | 0 attachmentunique/{ => zm}/au_vector_steadyaim | 0 weapons/{ => zm}/fnp45_upgraded_zm | 0 weapons/{ => zm}/fnp45_zm | 0 weapons/{ => zm}/fnp45lh_upgraded_zm | 0 weapons/{ => zm}/gl_sig556_zm | 0 weapons/{ => zm}/held_bowie_knife_zm | 0 weapons/{ => zm}/held_knife_zm | 0 weapons/{ => zm}/held_knife_zm_alcatraz | 0 weapons/{ => zm}/held_one_inch_punch_air_zm | 0 weapons/{ => zm}/held_one_inch_punch_fire_zm | 0 weapons/{ => zm}/held_one_inch_punch_ice_zm | 0 .../{ => zm}/held_one_inch_punch_lightning_zm | 0 .../{ => zm}/held_one_inch_punch_upgraded_zm | 0 weapons/{ => zm}/held_one_inch_punch_zm | 0 weapons/{ => zm}/held_spoon_zm_alcatraz | 0 weapons/{ => zm}/held_spork_zm_alcatraz | 0 weapons/{ => zm}/held_tazer_knuckles_zm | 0 .../{ => zm}/held_tazer_knuckles_zm_offhand | 0 weapons/{ => zm}/insas_upgraded_zm | 0 weapons/{ => zm}/insas_zm | 0 weapons/{ => zm}/sa58_upgraded_zm | 0 weapons/{ => zm}/sa58_zm | 0 weapons/{ => zm}/sf_sa58_upgraded_zm | 0 weapons/{ => zm}/sig556_upgraded_zm | 0 weapons/{ => zm}/sig556_zm | 0 weapons/{ => zm}/vector_extclip_upgraded_zm | 0 weapons/{ => zm}/vector_extclip_zm | 0 weapons/{ => zm}/vector_upgraded_zm | 0 weapons/{ => zm}/vector_zm | 0 zone_source/includes/attachmentunique.zone | 6 ---- zone_source/includes/weapons.zone | 35 ------------------- zone_source/mod.zone | 2 -- 37 files changed, 43 deletions(-) rename attachmentunique/{ => zm}/au_sa58_none (100%) rename attachmentunique/{ => zm}/au_sa58_sf (100%) rename attachmentunique/{ => zm}/au_sig556_gl (100%) rename attachmentunique/{ => zm}/au_sig556_none (100%) rename attachmentunique/{ => zm}/au_vector_none (100%) rename attachmentunique/{ => zm}/au_vector_steadyaim (100%) rename weapons/{ => zm}/fnp45_upgraded_zm (100%) rename weapons/{ => zm}/fnp45_zm (100%) rename weapons/{ => zm}/fnp45lh_upgraded_zm (100%) rename weapons/{ => zm}/gl_sig556_zm (100%) rename weapons/{ => zm}/held_bowie_knife_zm (100%) rename weapons/{ => zm}/held_knife_zm (100%) rename weapons/{ => zm}/held_knife_zm_alcatraz (100%) rename weapons/{ => zm}/held_one_inch_punch_air_zm (100%) rename weapons/{ => zm}/held_one_inch_punch_fire_zm (100%) rename weapons/{ => zm}/held_one_inch_punch_ice_zm (100%) rename weapons/{ => zm}/held_one_inch_punch_lightning_zm (100%) rename weapons/{ => zm}/held_one_inch_punch_upgraded_zm (100%) rename weapons/{ => zm}/held_one_inch_punch_zm (100%) rename weapons/{ => zm}/held_spoon_zm_alcatraz (100%) rename weapons/{ => zm}/held_spork_zm_alcatraz (100%) rename weapons/{ => zm}/held_tazer_knuckles_zm (100%) rename weapons/{ => zm}/held_tazer_knuckles_zm_offhand (100%) rename weapons/{ => zm}/insas_upgraded_zm (100%) rename weapons/{ => zm}/insas_zm (100%) rename weapons/{ => zm}/sa58_upgraded_zm (100%) rename weapons/{ => zm}/sa58_zm (100%) rename weapons/{ => zm}/sf_sa58_upgraded_zm (100%) rename weapons/{ => zm}/sig556_upgraded_zm (100%) rename weapons/{ => zm}/sig556_zm (100%) rename weapons/{ => zm}/vector_extclip_upgraded_zm (100%) rename weapons/{ => zm}/vector_extclip_zm (100%) rename weapons/{ => zm}/vector_upgraded_zm (100%) rename weapons/{ => zm}/vector_zm (100%) delete mode 100644 zone_source/includes/attachmentunique.zone delete mode 100644 zone_source/includes/weapons.zone diff --git a/attachmentunique/au_sa58_none b/attachmentunique/zm/au_sa58_none similarity index 100% rename from attachmentunique/au_sa58_none rename to attachmentunique/zm/au_sa58_none diff --git a/attachmentunique/au_sa58_sf b/attachmentunique/zm/au_sa58_sf similarity index 100% rename from attachmentunique/au_sa58_sf rename to attachmentunique/zm/au_sa58_sf diff --git a/attachmentunique/au_sig556_gl b/attachmentunique/zm/au_sig556_gl similarity index 100% rename from attachmentunique/au_sig556_gl rename to attachmentunique/zm/au_sig556_gl diff --git a/attachmentunique/au_sig556_none b/attachmentunique/zm/au_sig556_none similarity index 100% rename from attachmentunique/au_sig556_none rename to attachmentunique/zm/au_sig556_none diff --git a/attachmentunique/au_vector_none b/attachmentunique/zm/au_vector_none similarity index 100% rename from attachmentunique/au_vector_none rename to attachmentunique/zm/au_vector_none diff --git a/attachmentunique/au_vector_steadyaim b/attachmentunique/zm/au_vector_steadyaim similarity index 100% rename from attachmentunique/au_vector_steadyaim rename to attachmentunique/zm/au_vector_steadyaim diff --git a/weapons/fnp45_upgraded_zm b/weapons/zm/fnp45_upgraded_zm similarity index 100% rename from weapons/fnp45_upgraded_zm rename to weapons/zm/fnp45_upgraded_zm diff --git a/weapons/fnp45_zm b/weapons/zm/fnp45_zm similarity index 100% rename from weapons/fnp45_zm rename to weapons/zm/fnp45_zm diff --git a/weapons/fnp45lh_upgraded_zm b/weapons/zm/fnp45lh_upgraded_zm similarity index 100% rename from weapons/fnp45lh_upgraded_zm rename to weapons/zm/fnp45lh_upgraded_zm diff --git a/weapons/gl_sig556_zm b/weapons/zm/gl_sig556_zm similarity index 100% rename from weapons/gl_sig556_zm rename to weapons/zm/gl_sig556_zm diff --git a/weapons/held_bowie_knife_zm b/weapons/zm/held_bowie_knife_zm similarity index 100% rename from weapons/held_bowie_knife_zm rename to weapons/zm/held_bowie_knife_zm diff --git a/weapons/held_knife_zm b/weapons/zm/held_knife_zm similarity index 100% rename from weapons/held_knife_zm rename to weapons/zm/held_knife_zm diff --git a/weapons/held_knife_zm_alcatraz b/weapons/zm/held_knife_zm_alcatraz similarity index 100% rename from weapons/held_knife_zm_alcatraz rename to weapons/zm/held_knife_zm_alcatraz diff --git a/weapons/held_one_inch_punch_air_zm b/weapons/zm/held_one_inch_punch_air_zm similarity index 100% rename from weapons/held_one_inch_punch_air_zm rename to weapons/zm/held_one_inch_punch_air_zm diff --git a/weapons/held_one_inch_punch_fire_zm b/weapons/zm/held_one_inch_punch_fire_zm similarity index 100% rename from weapons/held_one_inch_punch_fire_zm rename to weapons/zm/held_one_inch_punch_fire_zm diff --git a/weapons/held_one_inch_punch_ice_zm b/weapons/zm/held_one_inch_punch_ice_zm similarity index 100% rename from weapons/held_one_inch_punch_ice_zm rename to weapons/zm/held_one_inch_punch_ice_zm diff --git a/weapons/held_one_inch_punch_lightning_zm b/weapons/zm/held_one_inch_punch_lightning_zm similarity index 100% rename from weapons/held_one_inch_punch_lightning_zm rename to weapons/zm/held_one_inch_punch_lightning_zm diff --git a/weapons/held_one_inch_punch_upgraded_zm b/weapons/zm/held_one_inch_punch_upgraded_zm similarity index 100% rename from weapons/held_one_inch_punch_upgraded_zm rename to weapons/zm/held_one_inch_punch_upgraded_zm diff --git a/weapons/held_one_inch_punch_zm b/weapons/zm/held_one_inch_punch_zm similarity index 100% rename from weapons/held_one_inch_punch_zm rename to weapons/zm/held_one_inch_punch_zm diff --git a/weapons/held_spoon_zm_alcatraz b/weapons/zm/held_spoon_zm_alcatraz similarity index 100% rename from weapons/held_spoon_zm_alcatraz rename to weapons/zm/held_spoon_zm_alcatraz diff --git a/weapons/held_spork_zm_alcatraz b/weapons/zm/held_spork_zm_alcatraz similarity index 100% rename from weapons/held_spork_zm_alcatraz rename to weapons/zm/held_spork_zm_alcatraz diff --git a/weapons/held_tazer_knuckles_zm b/weapons/zm/held_tazer_knuckles_zm similarity index 100% rename from weapons/held_tazer_knuckles_zm rename to weapons/zm/held_tazer_knuckles_zm diff --git a/weapons/held_tazer_knuckles_zm_offhand b/weapons/zm/held_tazer_knuckles_zm_offhand similarity index 100% rename from weapons/held_tazer_knuckles_zm_offhand rename to weapons/zm/held_tazer_knuckles_zm_offhand diff --git a/weapons/insas_upgraded_zm b/weapons/zm/insas_upgraded_zm similarity index 100% rename from weapons/insas_upgraded_zm rename to weapons/zm/insas_upgraded_zm diff --git a/weapons/insas_zm b/weapons/zm/insas_zm similarity index 100% rename from weapons/insas_zm rename to weapons/zm/insas_zm diff --git a/weapons/sa58_upgraded_zm b/weapons/zm/sa58_upgraded_zm similarity index 100% rename from weapons/sa58_upgraded_zm rename to weapons/zm/sa58_upgraded_zm diff --git a/weapons/sa58_zm b/weapons/zm/sa58_zm similarity index 100% rename from weapons/sa58_zm rename to weapons/zm/sa58_zm diff --git a/weapons/sf_sa58_upgraded_zm b/weapons/zm/sf_sa58_upgraded_zm similarity index 100% rename from weapons/sf_sa58_upgraded_zm rename to weapons/zm/sf_sa58_upgraded_zm diff --git a/weapons/sig556_upgraded_zm b/weapons/zm/sig556_upgraded_zm similarity index 100% rename from weapons/sig556_upgraded_zm rename to weapons/zm/sig556_upgraded_zm diff --git a/weapons/sig556_zm b/weapons/zm/sig556_zm similarity index 100% rename from weapons/sig556_zm rename to weapons/zm/sig556_zm diff --git a/weapons/vector_extclip_upgraded_zm b/weapons/zm/vector_extclip_upgraded_zm similarity index 100% rename from weapons/vector_extclip_upgraded_zm rename to weapons/zm/vector_extclip_upgraded_zm diff --git a/weapons/vector_extclip_zm b/weapons/zm/vector_extclip_zm similarity index 100% rename from weapons/vector_extclip_zm rename to weapons/zm/vector_extclip_zm diff --git a/weapons/vector_upgraded_zm b/weapons/zm/vector_upgraded_zm similarity index 100% rename from weapons/vector_upgraded_zm rename to weapons/zm/vector_upgraded_zm diff --git a/weapons/vector_zm b/weapons/zm/vector_zm similarity index 100% rename from weapons/vector_zm rename to weapons/zm/vector_zm diff --git a/zone_source/includes/attachmentunique.zone b/zone_source/includes/attachmentunique.zone deleted file mode 100644 index 9487808a..00000000 --- a/zone_source/includes/attachmentunique.zone +++ /dev/null @@ -1,6 +0,0 @@ -attachmentunique,au_vector_none -attachmentunique,au_vector_steadyaim -attachmentunique,au_sig556_none -attachmentunique,au_sig556_gl -attachmentunique,au_sa58_none -attachmentunique,au_sa58_sf \ No newline at end of file diff --git a/zone_source/includes/weapons.zone b/zone_source/includes/weapons.zone deleted file mode 100644 index 397f1b32..00000000 --- a/zone_source/includes/weapons.zone +++ /dev/null @@ -1,35 +0,0 @@ -weapon,held_knife_zm -weapon,held_bowie_knife_zm -weapon,held_tazer_knuckles_zm -weapon,held_tazer_knuckles_zm_offhand - -weapon,held_knife_zm_alcatraz -weapon,held_spoon_zm_alcatraz -weapon,held_spork_zm_alcatraz - -weapon,held_one_inch_punch_zm -weapon,held_one_inch_punch_upgraded_zm -weapon,held_one_inch_punch_air_zm -weapon,held_one_inch_punch_fire_zm -weapon,held_one_inch_punch_ice_zm -weapon,held_one_inch_punch_lightning_zm - -weapon,fnp45_zm -weapon,fnp45_upgraded_zm -weapon,fnp45lh_upgraded_zm - -weapon,insas_zm -weapon,insas_upgraded_zm - -weapon,vector_zm -weapon,vector_upgraded_zm -weapon,vector_extclip_zm -weapon,vector_extclip_upgraded_zm - -weapon,sig556_zm -weapon,sig556_upgraded_zm -weapon,gl_sig556_zm - -weapon,sa58_zm -weapon,sa58_upgraded_zm -weapon,sf_sa58_upgraded_zm \ No newline at end of file diff --git a/zone_source/mod.zone b/zone_source/mod.zone index 9e1a4ca1..1fbf3b02 100644 --- a/zone_source/mod.zone +++ b/zone_source/mod.zone @@ -13,8 +13,6 @@ include,zm_tomb include,includes/clientscripts include,includes/images -include,includes/attachmentunique -include,includes/weapons include,includes/rawfile include,includes/stringtable