mirror of
https://github.com/jimathy/jim-consumables.git
synced 2026-08-17 06:26:03 +01:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4e565268cd | ||
|
|
9e8dcc39f9 | ||
|
|
c2d902c813 | ||
|
|
4d83c8c612 |
17
.github/workflows/notify-discord.yml
vendored
Normal file
17
.github/workflows/notify-discord.yml
vendored
Normal file
@@ -0,0 +1,17 @@
|
||||
name: Discord Commit Notifier
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- '*' # triggers on all branches
|
||||
|
||||
jobs:
|
||||
notify:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Discord Commits
|
||||
uses: Sniddl/discord-commits@v1.6
|
||||
with:
|
||||
webhook: ${{ secrets.DISCORD_WEBHOOK }}
|
||||
template: "avatar-with-link"
|
||||
include-extras: true
|
||||
@@ -135,21 +135,7 @@ RegisterNetEvent(getScript()..':Consume', function(itemName)
|
||||
P7, P8, P9, P10, P11, P12 = table.unpack(emote.AnimationOptions.SecondPropPlacement)
|
||||
end
|
||||
end
|
||||
if type == "drink" or type == "alcohol" then
|
||||
string = "Drinking "
|
||||
notifType = "drinking"
|
||||
elseif type == "food" then
|
||||
string = "Eating "
|
||||
notifType = "eating"
|
||||
elseif type == "smoke" then
|
||||
string = "Smoking "
|
||||
notifType = "smoking"
|
||||
elseif type == "pack" then
|
||||
string = "Opening "
|
||||
notifType = "package"
|
||||
else string = "Using "
|
||||
notifType = "using"
|
||||
end
|
||||
|
||||
if consuming then
|
||||
cancelled = true
|
||||
debugPrint("^5Debug^7: ^3Consume^7: ^2Event already started^7, ^1Cancelling^7.")
|
||||
@@ -197,7 +183,7 @@ RegisterNetEvent(getScript()..':Consume', function(itemName)
|
||||
end
|
||||
end)
|
||||
else
|
||||
triggerNotify(nil, string..Items[itemName].label.."..", notifType)
|
||||
triggerNotify(nil, string..Items[itemName].label.."..", "success")
|
||||
end
|
||||
|
||||
consuming = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Config = {
|
||||
System = {
|
||||
Debug = true,
|
||||
Debug = false,
|
||||
EventDebug = false,
|
||||
|
||||
Menu = "qb", -- "qb", "ox"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name "Jim-Consumables"
|
||||
author "Jimathy"
|
||||
version "2.0"
|
||||
version "2.0.01"
|
||||
description "Consumables Script"
|
||||
fx_version "cerulean"
|
||||
game "gta5"
|
||||
|
||||
@@ -1 +1 @@
|
||||
2.0
|
||||
2.0.01
|
||||
Reference in New Issue
Block a user