From 4dbdef95093eb28c2002467624363e08cd275b6f Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 14 Mar 2024 02:27:26 -0700 Subject: [PATCH] Organize zone_source includes into folders --- zone_source/common_mp.zone | 27 +++++++++---------- zone_source/common_zm.zone | 27 +------------------ zone_source/includes/images.zone | 4 --- .../so_zencounter_zm_buried.zone | 0 .../so_zencounter_zm_prison.zone | 0 zone_source/includes/{ => mp}/attachment.zone | 0 zone_source/includes/{ => mp}/camo.zone | 0 zone_source/includes/{ => mp}/materials.zone | 2 -- .../{ => perks}/specialty_divetonuke.zone | 0 .../{ => perks}/specialty_doubletap.zone | 0 .../{ => perks}/specialty_fastreload.zone | 0 .../{ => perks}/specialty_juggernaut.zone | 0 .../{ => perks}/specialty_marathon.zone | 0 .../{ => perks}/specialty_mulekick.zone | 0 .../{ => perks}/specialty_quickrevive.zone | 0 .../includes/{ => weapons}/as50_zm.zone | 0 .../includes/{ => weapons}/ballista_zm.zone | 0 .../{ => weapons}/bouncing_betty_zm.zone | 0 .../{ => weapons}/cymbal_monkey_zm.zone | 0 .../{ => weapons}/falling_hands_zm.zone | 0 .../includes/{ => weapons}/fnp45_zm.zone | 0 .../includes/{ => weapons}/hk416_zm.zone | 0 .../includes/{ => weapons}/insas_zm.zone | 0 .../includes/{ => weapons}/jetgun_zm.zone | 0 .../{ => weapons}/knife_ballistic_zm.zone | 0 .../includes/{ => weapons}/knife_zm.zone | 2 ++ .../includes/{ => weapons}/mk48_zm.zone | 0 .../{ => weapons}/one_inch_punch_zm.zone | 0 .../includes/{ => weapons}/ray_gun_zm.zone | 0 .../includes/{ => weapons}/sa58_zm.zone | 0 .../includes/{ => weapons}/saritch_zm.zone | 0 .../includes/{ => weapons}/scar_zm.zone | 0 .../includes/{ => weapons}/sig556_zm.zone | 0 .../{ => weapons}/sticky_grenade_zm.zone | 0 .../includes/{ => weapons}/vector_zm.zone | 0 zone_source/includes/zm/materials.zone | 26 ++++++++++++++++++ zone_source/mod.zone | 2 -- zone_source/zm_buried.zone | 8 +++--- zone_source/zm_nuked.zone | 2 +- zone_source/zm_prison.zone | 2 +- zone_source/zm_tomb.zone | 22 +++++++-------- zone_source/zm_transit.zone | 4 +-- 42 files changed, 61 insertions(+), 67 deletions(-) delete mode 100644 zone_source/includes/images.zone rename zone_source/includes/{ => mapents}/so_zencounter_zm_buried.zone (100%) rename zone_source/includes/{ => mapents}/so_zencounter_zm_prison.zone (100%) rename zone_source/includes/{ => mp}/attachment.zone (100%) rename zone_source/includes/{ => mp}/camo.zone (100%) rename zone_source/includes/{ => mp}/materials.zone (95%) rename zone_source/includes/{ => perks}/specialty_divetonuke.zone (100%) rename zone_source/includes/{ => perks}/specialty_doubletap.zone (100%) rename zone_source/includes/{ => perks}/specialty_fastreload.zone (100%) rename zone_source/includes/{ => perks}/specialty_juggernaut.zone (100%) rename zone_source/includes/{ => perks}/specialty_marathon.zone (100%) rename zone_source/includes/{ => perks}/specialty_mulekick.zone (100%) rename zone_source/includes/{ => perks}/specialty_quickrevive.zone (100%) rename zone_source/includes/{ => weapons}/as50_zm.zone (100%) rename zone_source/includes/{ => weapons}/ballista_zm.zone (100%) rename zone_source/includes/{ => weapons}/bouncing_betty_zm.zone (100%) rename zone_source/includes/{ => weapons}/cymbal_monkey_zm.zone (100%) rename zone_source/includes/{ => weapons}/falling_hands_zm.zone (100%) rename zone_source/includes/{ => weapons}/fnp45_zm.zone (100%) rename zone_source/includes/{ => weapons}/hk416_zm.zone (100%) rename zone_source/includes/{ => weapons}/insas_zm.zone (100%) rename zone_source/includes/{ => weapons}/jetgun_zm.zone (100%) rename zone_source/includes/{ => weapons}/knife_ballistic_zm.zone (100%) rename zone_source/includes/{ => weapons}/knife_zm.zone (96%) rename zone_source/includes/{ => weapons}/mk48_zm.zone (100%) rename zone_source/includes/{ => weapons}/one_inch_punch_zm.zone (100%) rename zone_source/includes/{ => weapons}/ray_gun_zm.zone (100%) rename zone_source/includes/{ => weapons}/sa58_zm.zone (100%) rename zone_source/includes/{ => weapons}/saritch_zm.zone (100%) rename zone_source/includes/{ => weapons}/scar_zm.zone (100%) rename zone_source/includes/{ => weapons}/sig556_zm.zone (100%) rename zone_source/includes/{ => weapons}/sticky_grenade_zm.zone (100%) rename zone_source/includes/{ => weapons}/vector_zm.zone (100%) create mode 100644 zone_source/includes/zm/materials.zone diff --git a/zone_source/common_mp.zone b/zone_source/common_mp.zone index b1d092be..f3826cac 100644 --- a/zone_source/common_mp.zone +++ b/zone_source/common_mp.zone @@ -5,18 +5,17 @@ >level.ipak_read,patch_mp >level.ipak_read,mp -include,includes/knife_zm -include,includes/knife_ballistic_zm +include,includes/weapons/knife_zm +include,includes/weapons/knife_ballistic_zm +include,includes/weapons/fnp45_zm +include,includes/weapons/insas_zm +include,includes/weapons/vector_zm +include,includes/weapons/sig556_zm +include,includes/weapons/sa58_zm +include,includes/weapons/mk48_zm +include,includes/weapons/as50_zm +include,includes/weapons/bouncing_betty_zm -include,includes/fnp45_zm -include,includes/insas_zm -include,includes/vector_zm -include,includes/sig556_zm -include,includes/sa58_zm -include,includes/mk48_zm -include,includes/as50_zm -include,includes/bouncing_betty_zm - -include,includes/attachment -include,includes/camo -include,includes/materials \ No newline at end of file +include,includes/mp/attachment +include,includes/mp/camo +include,includes/mp/materials \ No newline at end of file diff --git a/zone_source/common_zm.zone b/zone_source/common_zm.zone index e9ba1e75..c041bd8d 100644 --- a/zone_source/common_zm.zone +++ b/zone_source/common_zm.zone @@ -2,29 +2,4 @@ >type,fastfile >name,common_zm -material,menu_zm_transit_zclassic_transit -material,menu_zm_highrise_zclassic_rooftop -material,menu_zm_prison_zclassic_prison -material,menu_zm_buried_zclassic_processing -material,menu_zm_tomb_zclassic_tomb -material,menu_zm_transit_zsurvival_transit -material,menu_zm_transit_zencounter_diner -material,menu_zm_transit_zsurvival_farm -material,menu_zm_transit_zsurvival_town -material,menu_zm_nuked_zsurvival_nuked -material,menu_zm_prison_zencounter_cellblock -material,menu_zm_buried_zencounter_street -material,menu_zm_map_transit_blit_power -image,menu_zm_transit_zclassic_transit -image,menu_zm_highrise_zclassic_rooftop -image,menu_zm_prison_select_mob -image,menu_zm_buried_zclassic_processing -image,menu_zm_tomb_zclassic_tomb -image,menu_zm_transit_zsurvival_transit -image,menu_zm_transit_zsurvival_diner -image,menu_zm_transit_zsurvival_farm -image,menu_zm_transit_zsurvival_town -image,menu_zm_nuketown_select -image,menu_zm_prison_select_grief_cellblock -image,menu_zm_buried_zencounter_street -image,menu_zm_map_transit_blit_power \ No newline at end of file +include,includes/zm/materials \ No newline at end of file diff --git a/zone_source/includes/images.zone b/zone_source/includes/images.zone deleted file mode 100644 index 89b977ce..00000000 --- a/zone_source/includes/images.zone +++ /dev/null @@ -1,4 +0,0 @@ -image,fxt_zmb_wep_wallbuy_01 -image,fxt_zmb_wep_wallbuy_02 -image,fxt_zmb_wep_wallbuy_03 -image,fxt_zmb_wep_wallbuy_04 \ No newline at end of file diff --git a/zone_source/includes/so_zencounter_zm_buried.zone b/zone_source/includes/mapents/so_zencounter_zm_buried.zone similarity index 100% rename from zone_source/includes/so_zencounter_zm_buried.zone rename to zone_source/includes/mapents/so_zencounter_zm_buried.zone diff --git a/zone_source/includes/so_zencounter_zm_prison.zone b/zone_source/includes/mapents/so_zencounter_zm_prison.zone similarity index 100% rename from zone_source/includes/so_zencounter_zm_prison.zone rename to zone_source/includes/mapents/so_zencounter_zm_prison.zone diff --git a/zone_source/includes/attachment.zone b/zone_source/includes/mp/attachment.zone similarity index 100% rename from zone_source/includes/attachment.zone rename to zone_source/includes/mp/attachment.zone diff --git a/zone_source/includes/camo.zone b/zone_source/includes/mp/camo.zone similarity index 100% rename from zone_source/includes/camo.zone rename to zone_source/includes/mp/camo.zone diff --git a/zone_source/includes/materials.zone b/zone_source/includes/mp/materials.zone similarity index 95% rename from zone_source/includes/materials.zone rename to zone_source/includes/mp/materials.zone index 6ee0888e..b3eee066 100644 --- a/zone_source/includes/materials.zone +++ b/zone_source/includes/mp/materials.zone @@ -1,4 +1,3 @@ -material,cac_mods_tact_knife material,hud_obit_turret material,hud_obit_hk_drone material,hud_obit_rcbomb @@ -20,7 +19,6 @@ material,white_waypoint_contested material,white_waypoint_grab material,white_waypoint_escort material,white_waypoint_kill -image,cac_mods_tact_knife image,hud_obit_turret image,hud_obit_hk_drone image,hud_obit_rcbomb diff --git a/zone_source/includes/specialty_divetonuke.zone b/zone_source/includes/perks/specialty_divetonuke.zone similarity index 100% rename from zone_source/includes/specialty_divetonuke.zone rename to zone_source/includes/perks/specialty_divetonuke.zone diff --git a/zone_source/includes/specialty_doubletap.zone b/zone_source/includes/perks/specialty_doubletap.zone similarity index 100% rename from zone_source/includes/specialty_doubletap.zone rename to zone_source/includes/perks/specialty_doubletap.zone diff --git a/zone_source/includes/specialty_fastreload.zone b/zone_source/includes/perks/specialty_fastreload.zone similarity index 100% rename from zone_source/includes/specialty_fastreload.zone rename to zone_source/includes/perks/specialty_fastreload.zone diff --git a/zone_source/includes/specialty_juggernaut.zone b/zone_source/includes/perks/specialty_juggernaut.zone similarity index 100% rename from zone_source/includes/specialty_juggernaut.zone rename to zone_source/includes/perks/specialty_juggernaut.zone diff --git a/zone_source/includes/specialty_marathon.zone b/zone_source/includes/perks/specialty_marathon.zone similarity index 100% rename from zone_source/includes/specialty_marathon.zone rename to zone_source/includes/perks/specialty_marathon.zone diff --git a/zone_source/includes/specialty_mulekick.zone b/zone_source/includes/perks/specialty_mulekick.zone similarity index 100% rename from zone_source/includes/specialty_mulekick.zone rename to zone_source/includes/perks/specialty_mulekick.zone diff --git a/zone_source/includes/specialty_quickrevive.zone b/zone_source/includes/perks/specialty_quickrevive.zone similarity index 100% rename from zone_source/includes/specialty_quickrevive.zone rename to zone_source/includes/perks/specialty_quickrevive.zone diff --git a/zone_source/includes/as50_zm.zone b/zone_source/includes/weapons/as50_zm.zone similarity index 100% rename from zone_source/includes/as50_zm.zone rename to zone_source/includes/weapons/as50_zm.zone diff --git a/zone_source/includes/ballista_zm.zone b/zone_source/includes/weapons/ballista_zm.zone similarity index 100% rename from zone_source/includes/ballista_zm.zone rename to zone_source/includes/weapons/ballista_zm.zone diff --git a/zone_source/includes/bouncing_betty_zm.zone b/zone_source/includes/weapons/bouncing_betty_zm.zone similarity index 100% rename from zone_source/includes/bouncing_betty_zm.zone rename to zone_source/includes/weapons/bouncing_betty_zm.zone diff --git a/zone_source/includes/cymbal_monkey_zm.zone b/zone_source/includes/weapons/cymbal_monkey_zm.zone similarity index 100% rename from zone_source/includes/cymbal_monkey_zm.zone rename to zone_source/includes/weapons/cymbal_monkey_zm.zone diff --git a/zone_source/includes/falling_hands_zm.zone b/zone_source/includes/weapons/falling_hands_zm.zone similarity index 100% rename from zone_source/includes/falling_hands_zm.zone rename to zone_source/includes/weapons/falling_hands_zm.zone diff --git a/zone_source/includes/fnp45_zm.zone b/zone_source/includes/weapons/fnp45_zm.zone similarity index 100% rename from zone_source/includes/fnp45_zm.zone rename to zone_source/includes/weapons/fnp45_zm.zone diff --git a/zone_source/includes/hk416_zm.zone b/zone_source/includes/weapons/hk416_zm.zone similarity index 100% rename from zone_source/includes/hk416_zm.zone rename to zone_source/includes/weapons/hk416_zm.zone diff --git a/zone_source/includes/insas_zm.zone b/zone_source/includes/weapons/insas_zm.zone similarity index 100% rename from zone_source/includes/insas_zm.zone rename to zone_source/includes/weapons/insas_zm.zone diff --git a/zone_source/includes/jetgun_zm.zone b/zone_source/includes/weapons/jetgun_zm.zone similarity index 100% rename from zone_source/includes/jetgun_zm.zone rename to zone_source/includes/weapons/jetgun_zm.zone diff --git a/zone_source/includes/knife_ballistic_zm.zone b/zone_source/includes/weapons/knife_ballistic_zm.zone similarity index 100% rename from zone_source/includes/knife_ballistic_zm.zone rename to zone_source/includes/weapons/knife_ballistic_zm.zone diff --git a/zone_source/includes/knife_zm.zone b/zone_source/includes/weapons/knife_zm.zone similarity index 96% rename from zone_source/includes/knife_zm.zone rename to zone_source/includes/weapons/knife_zm.zone index be221d0f..8bebb313 100644 --- a/zone_source/includes/knife_zm.zone +++ b/zone_source/includes/weapons/knife_zm.zone @@ -4,6 +4,8 @@ xmodel,t6_wpn_knife_melee material,mc/mtl_t6_wpn_knife_base material,mc/mtl_t6_wpn_knife_base_camo2 image,~-gmtl_t6_wpn_knife_base_col +material,cac_mods_tact_knife +image,cac_mods_tact_knife xanim,viewmodel_strider_idle xanim,viewmodel_strider_melee_swipe xanim,viewmodel_strider_melee_charge diff --git a/zone_source/includes/mk48_zm.zone b/zone_source/includes/weapons/mk48_zm.zone similarity index 100% rename from zone_source/includes/mk48_zm.zone rename to zone_source/includes/weapons/mk48_zm.zone diff --git a/zone_source/includes/one_inch_punch_zm.zone b/zone_source/includes/weapons/one_inch_punch_zm.zone similarity index 100% rename from zone_source/includes/one_inch_punch_zm.zone rename to zone_source/includes/weapons/one_inch_punch_zm.zone diff --git a/zone_source/includes/ray_gun_zm.zone b/zone_source/includes/weapons/ray_gun_zm.zone similarity index 100% rename from zone_source/includes/ray_gun_zm.zone rename to zone_source/includes/weapons/ray_gun_zm.zone diff --git a/zone_source/includes/sa58_zm.zone b/zone_source/includes/weapons/sa58_zm.zone similarity index 100% rename from zone_source/includes/sa58_zm.zone rename to zone_source/includes/weapons/sa58_zm.zone diff --git a/zone_source/includes/saritch_zm.zone b/zone_source/includes/weapons/saritch_zm.zone similarity index 100% rename from zone_source/includes/saritch_zm.zone rename to zone_source/includes/weapons/saritch_zm.zone diff --git a/zone_source/includes/scar_zm.zone b/zone_source/includes/weapons/scar_zm.zone similarity index 100% rename from zone_source/includes/scar_zm.zone rename to zone_source/includes/weapons/scar_zm.zone diff --git a/zone_source/includes/sig556_zm.zone b/zone_source/includes/weapons/sig556_zm.zone similarity index 100% rename from zone_source/includes/sig556_zm.zone rename to zone_source/includes/weapons/sig556_zm.zone diff --git a/zone_source/includes/sticky_grenade_zm.zone b/zone_source/includes/weapons/sticky_grenade_zm.zone similarity index 100% rename from zone_source/includes/sticky_grenade_zm.zone rename to zone_source/includes/weapons/sticky_grenade_zm.zone diff --git a/zone_source/includes/vector_zm.zone b/zone_source/includes/weapons/vector_zm.zone similarity index 100% rename from zone_source/includes/vector_zm.zone rename to zone_source/includes/weapons/vector_zm.zone diff --git a/zone_source/includes/zm/materials.zone b/zone_source/includes/zm/materials.zone new file mode 100644 index 00000000..18ee02e8 --- /dev/null +++ b/zone_source/includes/zm/materials.zone @@ -0,0 +1,26 @@ +material,menu_zm_transit_zclassic_transit +material,menu_zm_highrise_zclassic_rooftop +material,menu_zm_prison_zclassic_prison +material,menu_zm_buried_zclassic_processing +material,menu_zm_tomb_zclassic_tomb +material,menu_zm_transit_zsurvival_transit +material,menu_zm_transit_zencounter_diner +material,menu_zm_transit_zsurvival_farm +material,menu_zm_transit_zsurvival_town +material,menu_zm_nuked_zsurvival_nuked +material,menu_zm_prison_zencounter_cellblock +material,menu_zm_buried_zencounter_street +material,menu_zm_map_transit_blit_power +image,menu_zm_transit_zclassic_transit +image,menu_zm_highrise_zclassic_rooftop +image,menu_zm_prison_select_mob +image,menu_zm_buried_zclassic_processing +image,menu_zm_tomb_zclassic_tomb +image,menu_zm_transit_zsurvival_transit +image,menu_zm_transit_zsurvival_diner +image,menu_zm_transit_zsurvival_farm +image,menu_zm_transit_zsurvival_town +image,menu_zm_nuketown_select +image,menu_zm_prison_select_grief_cellblock +image,menu_zm_buried_zencounter_street +image,menu_zm_map_transit_blit_power \ No newline at end of file diff --git a/zone_source/mod.zone b/zone_source/mod.zone index 38a0c5f0..19cea023 100644 --- a/zone_source/mod.zone +++ b/zone_source/mod.zone @@ -12,8 +12,6 @@ include,zm_buried include,zm_tomb include,includes/clientscripts -include,includes/images - include,includes/rawfile include,includes/stringtable diff --git a/zone_source/zm_buried.zone b/zone_source/zm_buried.zone index 7a7e4c72..c02db51a 100644 --- a/zone_source/zm_buried.zone +++ b/zone_source/zm_buried.zone @@ -2,11 +2,11 @@ >type,fastfile >name,zm_buried -include,includes/so_zencounter_zm_buried +include,includes/mapents/so_zencounter_zm_buried -include,includes/saritch_zm -include,includes/ray_gun_zm -include,includes/cymbal_monkey_zm +include,includes/weapons/saritch_zm +include,includes/weapons/ray_gun_zm +include,includes/weapons/cymbal_monkey_zm weapon,bowie_knife_zm weapon,tazer_knuckles_zm diff --git a/zone_source/zm_nuked.zone b/zone_source/zm_nuked.zone index a3f6a41a..697d0f59 100644 --- a/zone_source/zm_nuked.zone +++ b/zone_source/zm_nuked.zone @@ -2,4 +2,4 @@ >type,fastfile >name,zm_nuked -include,includes/hk416_zm \ No newline at end of file +include,includes/weapons/hk416_zm \ No newline at end of file diff --git a/zone_source/zm_prison.zone b/zone_source/zm_prison.zone index eeeafd9b..cc450e31 100644 --- a/zone_source/zm_prison.zone +++ b/zone_source/zm_prison.zone @@ -2,7 +2,7 @@ >type,fastfile >name,zm_prison -include,includes/so_zencounter_zm_prison +include,includes/mapents/so_zencounter_zm_prison weapon,knife_zm_alcatraz weapon,spoon_zm_alcatraz diff --git a/zone_source/zm_tomb.zone b/zone_source/zm_tomb.zone index de138c35..477a2002 100644 --- a/zone_source/zm_tomb.zone +++ b/zone_source/zm_tomb.zone @@ -2,15 +2,15 @@ >type,fastfile >name,zm_tomb -include,includes/ballista_zm -include,includes/scar_zm -include,includes/falling_hands_zm -include,includes/one_inch_punch_zm +include,includes/weapons/ballista_zm +include,includes/weapons/scar_zm +include,includes/weapons/falling_hands_zm +include,includes/weapons/one_inch_punch_zm -include,includes/specialty_juggernaut -include,includes/specialty_quickrevive -include,includes/specialty_fastreload -include,includes/specialty_doubletap -include,includes/specialty_marathon -include,includes/specialty_divetonuke -include,includes/specialty_mulekick \ No newline at end of file +include,includes/perks/specialty_juggernaut +include,includes/perks/specialty_quickrevive +include,includes/perks/specialty_fastreload +include,includes/perks/specialty_doubletap +include,includes/perks/specialty_marathon +include,includes/perks/specialty_divetonuke +include,includes/perks/specialty_mulekick \ No newline at end of file diff --git a/zone_source/zm_transit.zone b/zone_source/zm_transit.zone index 1181edb7..07694303 100644 --- a/zone_source/zm_transit.zone +++ b/zone_source/zm_transit.zone @@ -2,8 +2,8 @@ >type,fastfile >name,zm_transit -include,includes/jetgun_zm -include,includes/sticky_grenade_zm +include,includes/weapons/jetgun_zm +include,includes/weapons/sticky_grenade_zm material,hud_icon_40mm_grenade_mp image,hud_40mmgrenade