From b976f64fe7391273a45f22a44efc0e2805ba51dd Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Tue, 10 Jun 2025 00:04:02 +0200 Subject: [PATCH] neue sachen --- .../[inventory]/lusty94_smoking/shared/config.lua | 8 ++++---- .../data/code_for_bzzz_usableitems.lua | 0 .../data/code_for_dpemotes.lua | 0 .../data/images_for_inventory/bzzz_croissant.png | Bin .../data/images_for_inventory/bzzz_donut_a.png | Bin .../data/images_for_inventory/bzzz_donut_b.png | Bin .../data/images_for_inventory/bzzz_energy.png | Bin .../data/images_for_inventory/bzzz_peanuts.png | Bin .../data/images_for_inventory/bzzz_pepsiloca_a.png | Bin .../data/images_for_inventory/bzzz_pepsiloca_b.png | Bin .../data/images_for_inventory/bzzz_pretzels.png | Bin .../data/items_for_bzzz_usableitems.sql | 0 .../{bzzz_new_snackprops => }/data/ox_inventory.lua | 0 .../data/qb-smallresources.txt | 0 .../{bzzz_new_snackprops => }/fxmanifest.lua | 0 .../{bzzz_new_snackprops => }/images/1.png | Bin .../{bzzz_new_snackprops => }/images/2.png | Bin .../{bzzz_new_snackprops => }/images/3.png | Bin .../{bzzz_new_snackprops => }/readme.txt | 0 .../stream/bzzz_new_snacks_croissant_a.ydr | Bin .../stream/bzzz_new_snacks_donut_a.ydr | Bin .../stream/bzzz_new_snacks_donut_b.ydr | Bin .../stream/bzzz_new_snacks_energy_a.ydr | Bin .../stream/bzzz_new_snacks_package.ytyp | Bin .../stream/bzzz_new_snacks_peanuts_a.ydr | Bin .../stream/bzzz_new_snacks_pepsiloca_a.ydr | Bin .../stream/bzzz_new_snacks_pepsiloca_b.ydr | Bin .../stream/bzzz_new_snacks_pretzels_a.ydr | Bin 28 files changed, 4 insertions(+), 4 deletions(-) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/code_for_bzzz_usableitems.lua (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/code_for_dpemotes.lua (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_croissant.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_donut_a.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_donut_b.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_energy.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_peanuts.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_pepsiloca_a.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_pepsiloca_b.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/images_for_inventory/bzzz_pretzels.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/items_for_bzzz_usableitems.sql (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/ox_inventory.lua (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/data/qb-smallresources.txt (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/fxmanifest.lua (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/images/1.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/images/2.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/images/3.png (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/readme.txt (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_croissant_a.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_donut_a.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_donut_b.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_energy_a.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_package.ytyp (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_peanuts_a.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_pepsiloca_a.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_pepsiloca_b.ydr (100%) rename resources/[props]/bzzz_new_snackprops/{bzzz_new_snackprops => }/stream/bzzz_new_snacks_pretzels_a.ydr (100%) diff --git a/resources/[inventory]/lusty94_smoking/shared/config.lua b/resources/[inventory]/lusty94_smoking/shared/config.lua index 6bc8d197d..5945273fa 100644 --- a/resources/[inventory]/lusty94_smoking/shared/config.lua +++ b/resources/[inventory]/lusty94_smoking/shared/config.lua @@ -104,7 +104,7 @@ Config.Consumables = { dict = 'amb@prop_human_parking_meter@female@base', anim = 'base_female', flags = 49, - prop = 'bzzz_cigarpack_cig003', + prop = 'v_ret_ml_cigs', bone = 57005, pos = vec3(0.14, 0.01, -0.03), rot = vec3(2.0, 68.0, -32.0), @@ -112,8 +112,8 @@ Config.Consumables = { armour = 0, damageHealth = 0, }, - ["debonairepack"] = { - label = 'Opening debonaire pack', + ["mmorgenlicht"] = { + label = 'Packung öffnen', duration = 10, requiredItem = nil, requiredLabel = '', @@ -180,7 +180,7 @@ Config.Consumables = { dict = 'amb@world_human_aa_smoke@male@idle_a', anim = 'idle_c', flags = 49, - prop = 'prop_cs_ciggy_01', + prop = 'bzzz_cigarpack_cig003', bone = 28422, pos = vec3(0.0, 0.0, 0.0), rot = vec3(0.0, 0.0, 0.0), diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/code_for_bzzz_usableitems.lua b/resources/[props]/bzzz_new_snackprops/data/code_for_bzzz_usableitems.lua similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/code_for_bzzz_usableitems.lua rename to resources/[props]/bzzz_new_snackprops/data/code_for_bzzz_usableitems.lua diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/code_for_dpemotes.lua b/resources/[props]/bzzz_new_snackprops/data/code_for_dpemotes.lua similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/code_for_dpemotes.lua rename to resources/[props]/bzzz_new_snackprops/data/code_for_dpemotes.lua diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_croissant.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_croissant.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_croissant.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_croissant.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_a.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_a.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_a.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_a.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_b.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_b.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_b.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_donut_b.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_energy.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_energy.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_energy.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_energy.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_peanuts.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_peanuts.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_peanuts.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_peanuts.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_a.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_a.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_a.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_a.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_b.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_b.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_b.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pepsiloca_b.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pretzels.png b/resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pretzels.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/images_for_inventory/bzzz_pretzels.png rename to resources/[props]/bzzz_new_snackprops/data/images_for_inventory/bzzz_pretzels.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/items_for_bzzz_usableitems.sql b/resources/[props]/bzzz_new_snackprops/data/items_for_bzzz_usableitems.sql similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/items_for_bzzz_usableitems.sql rename to resources/[props]/bzzz_new_snackprops/data/items_for_bzzz_usableitems.sql diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/ox_inventory.lua b/resources/[props]/bzzz_new_snackprops/data/ox_inventory.lua similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/ox_inventory.lua rename to resources/[props]/bzzz_new_snackprops/data/ox_inventory.lua diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/qb-smallresources.txt b/resources/[props]/bzzz_new_snackprops/data/qb-smallresources.txt similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/data/qb-smallresources.txt rename to resources/[props]/bzzz_new_snackprops/data/qb-smallresources.txt diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/fxmanifest.lua b/resources/[props]/bzzz_new_snackprops/fxmanifest.lua similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/fxmanifest.lua rename to resources/[props]/bzzz_new_snackprops/fxmanifest.lua diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/1.png b/resources/[props]/bzzz_new_snackprops/images/1.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/1.png rename to resources/[props]/bzzz_new_snackprops/images/1.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/2.png b/resources/[props]/bzzz_new_snackprops/images/2.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/2.png rename to resources/[props]/bzzz_new_snackprops/images/2.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/3.png b/resources/[props]/bzzz_new_snackprops/images/3.png similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/images/3.png rename to resources/[props]/bzzz_new_snackprops/images/3.png diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/readme.txt b/resources/[props]/bzzz_new_snackprops/readme.txt similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/readme.txt rename to resources/[props]/bzzz_new_snackprops/readme.txt diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_croissant_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_croissant_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_croissant_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_croissant_a.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_a.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_b.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_b.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_b.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_donut_b.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_energy_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_energy_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_energy_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_energy_a.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_package.ytyp b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_package.ytyp similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_package.ytyp rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_package.ytyp diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_peanuts_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_peanuts_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_peanuts_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_peanuts_a.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_a.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_b.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_b.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_b.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pepsiloca_b.ydr diff --git a/resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pretzels_a.ydr b/resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pretzels_a.ydr similarity index 100% rename from resources/[props]/bzzz_new_snackprops/bzzz_new_snackprops/stream/bzzz_new_snacks_pretzels_a.ydr rename to resources/[props]/bzzz_new_snackprops/stream/bzzz_new_snacks_pretzels_a.ydr