Nordi/Main
1
0
Fork 0
forked from Simnation/Main
Code Pull requests Activity

Merge branch 'master' of https://git.evolution-state-life.de/Evolution-State-Life/Main

Browse source
This commit is contained in:
Max 2025-06-15 03:45:26 +02:00
commit 7994e4a2d8
21 changed files with 3385 additions and 3328 deletions
Download patch file Download diff file Expand all files Collapse all files

197
resources/[inventory]/mr-consumables/config/sh_config.lua
View file

@ -79,6 +79,63 @@ Config = {
hunger = 10,
}
},
["tosti"] = {
PropModel = "prop_sandwich_01",
UsesAmount = 1, -- The Amount Of Times This Item Can Be Eaten / Drinked
Actions = {
Enter = { -- I Won't Recomenned Replacing The Animation Because Stuff Related To This Are Hardcoded (Will Be Support For Customs Soon)
Animation = {
Dict = "amb@world_human_stand_mobile@male@text@enter",
Anim = "enter",
flag = 49,
Speed = 1.0, -- Between 1.0 to 0.0
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Hold = {
Animation = {
Dict = "mp_player_inteat@burger",
Anim = "mp_player_int_eat_burger",
flag = 49,
Speed = 0.0, -- Between 1.0 to 0.0
},
Attachment = {
Bone = 18905,
Coords = { x = 0.13, y = 0.05, z = 0.02, xR = 120.0, yR = 16.0, zR = 60.0 },
},
},
Use = {
Animation = {
Dict = "mp_player_inteat@burger",
Anim = "mp_player_int_eat_burger",
flag = 49,
Speed = 1.0, -- Between 1.0 to 0.0
},
Attachment = {
Bone = 18905,
Coords = { x = 0.13, y = 0.05, z = 0.02, xR = 120.0, yR = 16.0, zR = 60.0 },
},
},
Exit = { -- I Won't Recomenned Replacing The Animation Because Stuff Related To This Are Hardcoded (Will Be Support For Customs Soon)
Animation = {
Dict = "amb@world_human_stand_mobile@male@text@exit",
Anim = "exit",
flag = 49,
Speed = 1.0, -- Between 1.0 to 0.0
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
},
Rewards = { -- The Reward Will Set Metadata And Will Be Set When Item Is Used (When Drinked Or Eaten Once)
hunger = 10,
}
},
["twerks_candy"] = {
PropModel = "prop_choc_ego",
UsesAmount = 1, -- The Amount Of Times This Item Can Be Eaten / Drinked
@ -1897,7 +1954,7 @@ Config = {
},
Attachment = {
Bone = 18905,
Coords = { x = 0.13, y = 0.07, z = 0.02, xR = 120.0, yR = 16.0, zR = 60.0 },
Coords = { x = 0.13, y = 0.07, z = 0.02, xR = 60.0, yR = 16.0, zR = 60.0 },
},
},
Use = {
@ -2044,7 +2101,7 @@ Config = {
}
},
["lahmacun"] = {
PropModel = "prop_taco_01",
PropModel = "bzzz_food_burrito_a",
UsesAmount = 2, -- The Amount Of Times This Item Can Be Eaten / Drinked
Actions = {
Enter = { -- I Won't Recomenned Replacing The Animation Because Stuff Related To This Are Hardcoded (Will Be Support For Customs Soon)
@ -2124,20 +2181,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -2238,20 +2295,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -2295,20 +2352,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -3549,20 +3606,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -3606,20 +3663,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -3664,20 +3721,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -3722,20 +3779,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -3780,20 +3837,20 @@ Config = {
Speed = 0.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Use = {
Animation = {
Dict = "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1",
Anim = "base_idle",
Dict = "bzzz@restaurant@eat",
Anim = "bzzz_restaurant_eat",
flag = 49,
Speed = 1.0,
},
Attachment = {
Bone = 60309,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Bone = 18905,
Coords = { x = 0.08, y = -0.04, z = 0.07, xR = -30.0, yR = 10.0, zR = 0.0 },
},
},
Exit = {
@ -6808,7 +6865,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Hold = {
@ -6819,7 +6876,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Use = {
@ -6831,7 +6888,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.12, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Exit = {
@ -6843,7 +6900,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Throw = {
@ -7760,7 +7817,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.6, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Hold = {
@ -7771,7 +7828,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.6, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Use = {
@ -7783,7 +7840,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.4, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Exit = {
@ -7795,7 +7852,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.10, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Throw = {
@ -7807,12 +7864,12 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = 0.0, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.10, xR = 0.0, yR = 0.0, zR = 0.0 },
},
}
},
Rewards = {
thirst = 20,
thirst = 10,
}
},
["sifs_golden-ale"] = {
@ -8904,8 +8961,8 @@ Config = {
}
},
["wine"] = {
PropModel = "prop_wine_rose",
UsesAmount = 4,
PropModel = "p_wine_glass_s",
UsesAmount = 2,
Actions = {
Enter = {
Animation = {
@ -8916,7 +8973,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Hold = {
@ -8927,7 +8984,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Use = {
@ -8939,7 +8996,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.12, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Exit = {
@ -8972,8 +9029,8 @@ Config = {
}
},
["wwine"] = {
PropModel = "prop_wine_white",
UsesAmount = 4,
PropModel = "p_wine_glass_s",
UsesAmount = 2,
Actions = {
Enter = {
Animation = {
@ -8984,7 +9041,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
}
},
Hold = {
@ -8995,7 +9052,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.20, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Use = {
@ -9007,7 +9064,7 @@ Config = {
},
Attachment = {
Bone = 28422,
Coords = { x = 0.0, y = 0.0, z = -0.07, xR = 0.0, yR = 0.0, zR = 0.0 },
Coords = { x = 0.0, y = 0.0, z = -0.12, xR = 0.0, yR = 0.0, zR = 0.0 },
},
},
Exit = {

BIN
resources/[inventory]/qs-inventory/html/images/Ecola.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 141 KiB

0
resources/[tools]/okokCrafting/.fxap → resources/[test]/okokCrafting/.fxap
View file

0
resources/[tools]/okokCrafting/README.md → resources/[test]/okokCrafting/README.md
View file

0
resources/[tools]/okokCrafting/cl_utils.lua → resources/[test]/okokCrafting/cl_utils.lua
View file

0
resources/[tools]/okokCrafting/client.lua → resources/[test]/okokCrafting/client.lua
View file

0
resources/[tools]/okokCrafting/config.lua → resources/[test]/okokCrafting/config.lua
View file

0
resources/[tools]/okokCrafting/fxmanifest.lua → resources/[test]/okokCrafting/fxmanifest.lua
View file

0
resources/[tools]/okokCrafting/locales/de.lua → resources/[test]/okokCrafting/locales/de.lua
View file

0
resources/[tools]/okokCrafting/locales/en.lua → resources/[test]/okokCrafting/locales/en.lua
View file

0
resources/[tools]/okokCrafting/locales/fr.lua → resources/[test]/okokCrafting/locales/fr.lua
View file

0
resources/[tools]/okokCrafting/locales/gr.lua → resources/[test]/okokCrafting/locales/gr.lua
View file

0
resources/[tools]/okokCrafting/locales/pt.lua → resources/[test]/okokCrafting/locales/pt.lua
View file

2
resources/[test]/okokCrafting/okokcrafting.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE players ADD COLUMN xp LONGTEXT NULL;
ALTER TABLE players ADD COLUMN okokcrafts LONGTEXT NULL;

0
resources/[tools]/okokCrafting/server.lua → resources/[test]/okokCrafting/server.lua
View file

0
resources/[tools]/okokCrafting/sv_utils.lua → resources/[test]/okokCrafting/sv_utils.lua
View file

0
resources/[tools]/okokCrafting/web/click.mp3 → resources/[test]/okokCrafting/web/click.mp3
View file

0
resources/[tools]/okokCrafting/web/scripts.js → resources/[test]/okokCrafting/web/scripts.js
View file

0
resources/[tools]/okokCrafting/web/styles.css → resources/[test]/okokCrafting/web/styles.css
View file

0
resources/[tools]/okokCrafting/web/ui.html → resources/[test]/okokCrafting/web/ui.html
View file

2
resources/[tools]/okokCrafting/okokcrafting.sql
View file

@ -1,2 +0,0 @@
ALTER TABLE players ADD COLUMN xp LONGTEXT NULL;
ALTER TABLE players ADD COLUMN okokcrafts LONGTEXT NULL;