diff --git a/resources/[inventory]/cfx-mxc-vendingmachines/[items]/images/soda/can_junk.png b/resources/[inventory]/cfx-mxc-vendingmachines/[items]/images/soda/junk_energy.png similarity index 100% rename from resources/[inventory]/cfx-mxc-vendingmachines/[items]/images/soda/can_junk.png rename to resources/[inventory]/cfx-mxc-vendingmachines/[items]/images/soda/junk_energy.png diff --git a/resources/[inventory]/cfx-mxc-vendingmachines/config.lua b/resources/[inventory]/cfx-mxc-vendingmachines/config.lua index 975023075..e7a526695 100644 --- a/resources/[inventory]/cfx-mxc-vendingmachines/config.lua +++ b/resources/[inventory]/cfx-mxc-vendingmachines/config.lua @@ -99,15 +99,15 @@ Config.Items = { model = "mxc_vend_prop_item_chips6", price = 100 }, - chocolate_meteorite = { - label = "Chocolate: Meteorite", - model = "mxc_vend_prop_item_chocolate1", - price = 100 - }, chocolate_captain = { - label = "Chocolate: Captain's Log", + label = "Ego Chaser Schockriegel", + model = "mxc_vend_prop_item_chocolate1", + price = 2 + }, + chocolate_meteorite = { + label = "EarthQuakes", model = "mxc_vend_prop_item_chocolate2", - price = 100 + price = 2 }, condom = { label = "Condom: Soth Lags", @@ -233,41 +233,41 @@ Config.Items = { price = 4 }, sprunk_zero_dose = { - label = "Sprunk Dose Zero", + label = "Sprunk Zero Dose", model = "mxc_vend_prop_item_cansoda4", price = 4 }, can_logger = { - label = "Logger Can", + label = "Logger dose", model = "mxc_vend_prop_item_canbeer1", price = 100 }, can_blarneys = { - label = "Blarneys Can", + label = "Blarneys Dose", model = "mxc_vend_prop_item_canbeer2", price = 100 }, can_hoplivion = { - label = "Hoplivion Can", + label = "Hoplivion Dose", model = "mxc_vend_prop_item_canbeer3", price = 100 }, can_cerbeza = { - label = "Cerbeza Can", + label = "Cerbeza Dose", model = "mxc_vend_prop_item_canbeer4", price = 100 }, --#endregion --#region svapo - sand_evapebox = { - label = "E-Vape Box", + droelfbar = { + label = "Drölfbar Döner Ice Explosion", model = "mxc_smoking_prop_evape_2a", - price = 100 + price = 20 }, - grey_evapebox = { - label = "E-Vape 2 Box", + droelfbar2 = { + label = "Drölfbar Pfirsich Minze Ice", model = "mxc_smoking_prop_evape_2f", - price = 100 + price = 20 }, pink_smokebox = { label = "Smoke Box", @@ -361,10 +361,10 @@ Config.Items = { }, --#endregion - cigs_redwood = { - label = "Cigarettes: Redwood", + redwoodpack = { + label = "Packung Redwood Zigaretten", model = "v_ret_ml_cigs", - price = 100 + price = 10 }, cigs_redwood2 = { label = "Cigarettes: Redwood2", @@ -478,18 +478,14 @@ Config.Vendings = { b2 = "chips_habanero", b3 = "chips_cheese", b4 = "chips_paprika", - c1 = "chocolate_meteorite", - c2 = "chocolate_captain", + c1 = "chocolate_captain", + c2 = "chocolate_meteorite", c3 = "condom", c4 = "candy_zebra", d1 = "candy_psqs", d2 = "gum_peppermint", d3 = "gum_cinnamon", d4 = "gum_spearmint", - e1 = "medicine_laxmax", - e2 = "medicine_alcopatch", - e3 = "medicine_mollis", - e4 = "medicine_betta", }, --#region Advanced @@ -676,7 +672,7 @@ Config.Vendings = { -- For this vending, this will only be used for the menu, it will not create any model exhibition = { - a1 = "cigs_redwood", + a1 = "redwoodpack", a2 = "cigs_redwood2", a3 = "cigs_estancia", a4 = "cigs_69brand", @@ -802,26 +798,26 @@ Config.Vendings = { }, exhibition = { - a1 = "sand_evapebox", - a2 = "grey_evapebox", - a3 = "pink_smokebox", - a4 = "red_smokebox", - b1 = "black_notankatomizer", - b2 = "grey_shortatomizer", - b3 = "pink_shortatomizer", - b4 = "red_shortatomizer", - c1 = "orange_stickevape", - c2 = "yellow_stickevape", - c3 = "blue_stickevape", - c4 = "green_stickevape", - d1 = "black_vaporglowvape", - d2 = "lightgrey_vaporglowvape", - d3 = "red_vaporglowvape", - d4 = "pink_vaporglowvape", - e1 = "orange_sumovape", - e2 = "green_sumovape", - e3 = "lightgrey_sumovape", - e4 = "blue_sumovape", + a1 = "droelfbar2", + a2 = "droelfbar2", + a3 = "droelfbar2", + a4 = "droelfbar2", + b1 = "droelfbar2", + b2 = "droelfbar2", + b3 = "droelfbar2", + b4 = "droelfbar2", + c1 = "droelfbar2", + c2 = "droelfbar2", + c3 = "droelfbar", + c4 = "droelfbar", + d1 = "droelfbar", + d2 = "droelfbar", + d3 = "droelfbar", + d4 = "droelfbar", + e1 = "droelfbar", + e2 = "droelfbar", + e3 = "droelfbar", + e4 = "droelfbar", }, }, } diff --git a/resources/[inventory]/inventory_images/images/can_blarneys.png b/resources/[inventory]/inventory_images/images/can_blarneys.png new file mode 100644 index 000000000..1265b3409 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/can_blarneys.png differ diff --git a/resources/[inventory]/inventory_images/images/can_cerbeza.png b/resources/[inventory]/inventory_images/images/can_cerbeza.png new file mode 100644 index 000000000..36fbf85c6 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/can_cerbeza.png differ diff --git a/resources/[inventory]/inventory_images/images/can_hoplivion.png b/resources/[inventory]/inventory_images/images/can_hoplivion.png new file mode 100644 index 000000000..5e22bd7a2 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/can_hoplivion.png differ diff --git a/resources/[inventory]/inventory_images/images/can_logger.png b/resources/[inventory]/inventory_images/images/can_logger.png new file mode 100644 index 000000000..3b5f99481 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/can_logger.png differ diff --git a/resources/[inventory]/inventory_images/images/candy_psqs.png b/resources/[inventory]/inventory_images/images/candy_psqs.png new file mode 100644 index 000000000..346bfa922 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/candy_psqs.png differ diff --git a/resources/[inventory]/inventory_images/images/candy_zebra.png b/resources/[inventory]/inventory_images/images/candy_zebra.png new file mode 100644 index 000000000..d6c91cc1c Binary files /dev/null and b/resources/[inventory]/inventory_images/images/candy_zebra.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_cheese.png b/resources/[inventory]/inventory_images/images/chips_cheese.png new file mode 100644 index 000000000..2f1666012 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_cheese.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_habanero.png b/resources/[inventory]/inventory_images/images/chips_habanero.png new file mode 100644 index 000000000..5ffe80746 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_habanero.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_paprika.png b/resources/[inventory]/inventory_images/images/chips_paprika.png new file mode 100644 index 000000000..882cc3f6e Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_paprika.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_ribs.png b/resources/[inventory]/inventory_images/images/chips_ribs.png new file mode 100644 index 000000000..683f4f1fb Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_ribs.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_salt.png b/resources/[inventory]/inventory_images/images/chips_salt.png new file mode 100644 index 000000000..45485240b Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_salt.png differ diff --git a/resources/[inventory]/inventory_images/images/chips_supersalt.png b/resources/[inventory]/inventory_images/images/chips_supersalt.png new file mode 100644 index 000000000..a4f47efb6 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chips_supersalt.png differ diff --git a/resources/[inventory]/inventory_images/images/chocolate_captain.png b/resources/[inventory]/inventory_images/images/chocolate_captain.png new file mode 100644 index 000000000..9c5158b92 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chocolate_captain.png differ diff --git a/resources/[inventory]/inventory_images/images/chocolate_meteorite.png b/resources/[inventory]/inventory_images/images/chocolate_meteorite.png new file mode 100644 index 000000000..8433ff847 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/chocolate_meteorite.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_69brands.png b/resources/[inventory]/inventory_images/images/cigs_69brands.png new file mode 100644 index 000000000..4cf90608a Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_69brands.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_cardiaque.png b/resources/[inventory]/inventory_images/images/cigs_cardiaque.png new file mode 100644 index 000000000..23d0f02de Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_cardiaque.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_cok.png b/resources/[inventory]/inventory_images/images/cigs_cok.png new file mode 100644 index 000000000..f222910a1 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_cok.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_debonaireb.png b/resources/[inventory]/inventory_images/images/cigs_debonaireb.png new file mode 100644 index 000000000..642ccaf77 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_debonaireb.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_debonaireg.png b/resources/[inventory]/inventory_images/images/cigs_debonaireg.png new file mode 100644 index 000000000..583b709e0 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_debonaireg.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_estancia.png b/resources/[inventory]/inventory_images/images/cigs_estancia.png new file mode 100644 index 000000000..4e919292b Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_estancia.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_redwood.png b/resources/[inventory]/inventory_images/images/cigs_redwood.png new file mode 100644 index 000000000..205e7db6c Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_redwood.png differ diff --git a/resources/[inventory]/inventory_images/images/cigs_redwood2.png b/resources/[inventory]/inventory_images/images/cigs_redwood2.png new file mode 100644 index 000000000..b56c5da51 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/cigs_redwood2.png differ diff --git a/resources/[inventory]/inventory_images/images/condom.png b/resources/[inventory]/inventory_images/images/condom.png new file mode 100644 index 000000000..040b858b4 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/condom.png differ diff --git a/resources/[inventory]/inventory_images/images/gum_cinnamon.png b/resources/[inventory]/inventory_images/images/gum_cinnamon.png new file mode 100644 index 000000000..3af9c2382 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/gum_cinnamon.png differ diff --git a/resources/[inventory]/inventory_images/images/gum_peppermint.png b/resources/[inventory]/inventory_images/images/gum_peppermint.png new file mode 100644 index 000000000..fd03d291e Binary files /dev/null and b/resources/[inventory]/inventory_images/images/gum_peppermint.png differ diff --git a/resources/[inventory]/inventory_images/images/gum_spearmint.png b/resources/[inventory]/inventory_images/images/gum_spearmint.png new file mode 100644 index 000000000..c940e559d Binary files /dev/null and b/resources/[inventory]/inventory_images/images/gum_spearmint.png differ diff --git a/resources/[inventory]/inventory_images/images/junk_energy.png b/resources/[inventory]/inventory_images/images/junk_energy.png index e7314c66b..e0f6d5f84 100644 Binary files a/resources/[inventory]/inventory_images/images/junk_energy.png and b/resources/[inventory]/inventory_images/images/junk_energy.png differ diff --git a/resources/[inventory]/inventory_images/images/medicine_alcopatch.png b/resources/[inventory]/inventory_images/images/medicine_alcopatch.png new file mode 100644 index 000000000..1f4955698 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/medicine_alcopatch.png differ diff --git a/resources/[inventory]/inventory_images/images/medicine_betta.png b/resources/[inventory]/inventory_images/images/medicine_betta.png new file mode 100644 index 000000000..5bc82eb7e Binary files /dev/null and b/resources/[inventory]/inventory_images/images/medicine_betta.png differ diff --git a/resources/[inventory]/inventory_images/images/medicine_laxmax.png b/resources/[inventory]/inventory_images/images/medicine_laxmax.png new file mode 100644 index 000000000..a69420766 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/medicine_laxmax.png differ diff --git a/resources/[inventory]/inventory_images/images/medicine_mollis.png b/resources/[inventory]/inventory_images/images/medicine_mollis.png new file mode 100644 index 000000000..405343203 Binary files /dev/null and b/resources/[inventory]/inventory_images/images/medicine_mollis.png differ diff --git a/resources/[inventory]/tgiann-inventory/items/items.lua b/resources/[inventory]/tgiann-inventory/items/items.lua index 6e32e7ab4..ad9a13c4c 100644 --- a/resources/[inventory]/tgiann-inventory/items/items.lua +++ b/resources/[inventory]/tgiann-inventory/items/items.lua @@ -11027,8 +11027,292 @@ itemsData = { image = 'gym_pass.png', name = 'gym_pass', }, - - + chips_cheese= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Cheese', + unique = true, + useable = true, + image = 'chips_cheese.png', + name = 'chips_cheese', + }, + chips_paprika= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Parika', + unique = true, + useable = true, + image = 'chips_paprika.png', + name = 'chips_cheese', + }, + chips_ribs= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Ribs', + unique = true, + useable = true, + image = 'chips_ribs.png', + name = 'chips_ribs', + }, + chips_salt= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Salt', + unique = true, + useable = true, + image = 'chips_salt.png', + name = 'chips_salt', + }, + chips_supersalt= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Supersalt', + unique = true,3 + useable = true, + image = 'chips_supersalt.png', + name = 'chips_supersalt', + }, + chips_habanero= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Chips Habanero', + unique = true,3 + useable = true, + image = 'chips_habanero.png', + name = 'chips_habanero', + }, + can_cerbeza= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Dose Cerveza Barracho', + unique = true, + useable = true, + image = 'can_cerbeza.png', + name = 'can_cerbeza', + }, + can_hoplivion= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Dose Hoblivion', + unique = true, + useable = true, + image = 'can_hoplivion.png', + name = 'can_hoplivion', + }, + can_logger= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Dose Logger', + unique = true, + useable = true, + image = 'can_logger.png', + name = 'can_logger', + }, + can_blarneys= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Dose Blarneys', + unique = true, + useable = true, + image = 'can_blarneys.png', + name = 'can_blarneys', + }, + bottle_tonic= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Flasche Tonicwater', + unique = true, + useable = true, + image = 'bottle_tonic.png', + name = 'bottle_tonic', + }, + gum_spearmint= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Kaugummi grüne Minze', + unique = true, + useable = true, + image = 'gum_spearmint.png', + name = 'gum_spearmint', + }, + gum_cinnamon= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Kaugummi Zimt', + unique = true, + useable = true, + image = 'gum_cinnamon.png', + name = 'gum_cinnamon', + }, + gum_peppermint= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Kaugummi Zimt', + unique = true, + useable = true, + image = 'gum_peppermint.png', + name = 'gum_peppermint', + }, + candy_psqs= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'P\'s & Q\'s', + unique = true, + useable = true, + image = 'candy_psqs.png', + name = 'candy_psqs', + }, + candy_zebra= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Zebrabar', + unique = true, + useable = true, + image = 'candy_zebra.png', + name = 'candy_zebra', + }, + condom= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Kondome', + unique = true, + useable = true, + image = 'condom.png', + name = 'condom', + }, + cigs_redwood2= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Redwood Old', + unique = true, + useable = true, + image = 'cigs_redwood2.png', + name = 'cigs_redwood2', + }, + cigs_debonaireb= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Debonaire Blue', + unique = true, + useable = true, + image = 'cigs_debonaireb.png', + name = 'cigs_debonaireb', + }, + cigs_debonaireg= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Debonaire Green', + unique = true, + useable = true, + image = 'cigs_debonaireg.png', + name = 'cigs_debonaireg', + }, + cigs_cardiaque= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Cardiaque', + unique = true, + useable = true, + image = 'cigs_cardiaque.png', + name = 'cigs_cardiaque', + }, + cigs_69brand= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung 69Brand', + unique = true, + useable = true, + image = 'cigs_69brand.png', + name = 'cigs_69brand', + }, + cigs_cok= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung CoK', + unique = true, + useable = true, + image = 'cigs_cok.png', + name = 'cigs_cok', + }, + cigs_estancia= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Packung Estancia Zigarren', + unique = true, + useable = true, + image = 'cigs_estancia.png', + name = 'cigs_estancia', + }, + chocolate_captain= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Captain Schockoriegel', + unique = true, + useable = true, + image = 'chocolate_captain.png', + name = 'chocolate_captain', + }, + chocolate_meteorite= { + shouldClose = true, + type = 'item', + description = '', + weight = 100, + label = 'Captain Meteoritel', + unique = true, + useable = true, + image = 'chocolate_meteorite.png', + name = 'chocolate_meteorite', + }, }