diff --git a/DiamondBlackjack/.gitignore b/.gitignore similarity index 100% rename from DiamondBlackjack/.gitignore rename to .gitignore diff --git a/LICENSE b/LICENSE deleted file mode 100644 index a9306f5..0000000 --- a/LICENSE +++ /dev/null @@ -1,3 +0,0 @@ -You may not distribute this code, this includes but not limited to making framework versions. -You may not sell this code in any form. -Private modification is fine, however I encourage you submit PRs \ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index 3f19ada..0000000 --- a/README.md +++ /dev/null @@ -1,36 +0,0 @@ -# DiamondBlackjack -Hello everyone! I've spent the past 2 months working on blackjack in a style as similar to GTA:O as possible and I've decided that all servers should enjoy this so I'm releasing it! - -[![N|Solid](https://i.gyazo.com/8d6087d72268cf1aebe5c8fec2218769.png)]() - -Features: -* All networked with up to 16 players playing at the same time -* Works with OneSync & OneSync Infinity -* All the juicy stuff you'd expect from blackjack -* Optional fancy teleporter to enter diamond casino -* Fancy menu showing how to play blackjack like GTA:O thanks to RageUI! -* Dynamically configurable, ability to make any blackjack table playable - -Notes: -* This is not linked to any framework and works natively, to add chips/money into your framework/gamemode complete the two functions named `tryTakeChips` and `giveChips` at the top of `sv_blackjack.lua` -* There is no splitting or double down at this time, may come in the future -* You will need the Diamond Casino interior - There might be one on the forums somewhere, I don't know if I'm allowed to link the one I used, but just search "diamond casino fivem" in youtube. The download link is in the description in the first video. - -Videos: -https://streamable.com/fb5sg -https://streamable.com/7gm49 - -How to install: -1. Ensure you have a compatible Diamond Casino interior. -2. Download/clone my forked modified version of RageUI [https://github.com/rubbertoe98/RageUI](https://github.com/rubbertoe98/RageUI) -3. Download/clone the main repo https://github.com/rubbertoe98/DiamondBlackjack -4. Copy DiamondBlackjack into your resources/ folder -5. Copy the src from the RageUI repo into the DiamondBlackjack folder -6. Start your resource and don't go over 21! - -Credits: -* Thank you to RageUI for allowing the easy creation of the instructions & teleport menu -* Rockstar for the decompiled scripts :heart: - -My personal dev discord -https://discord.gg/dnZTpUh diff --git a/DiamondBlackjack/audio/dlcvinewood_amp.dat10 b/audio/dlcvinewood_amp.dat10 similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_amp.dat10 rename to audio/dlcvinewood_amp.dat10 diff --git a/DiamondBlackjack/audio/dlcvinewood_amp.dat10.nametable b/audio/dlcvinewood_amp.dat10.nametable similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_amp.dat10.nametable rename to audio/dlcvinewood_amp.dat10.nametable diff --git a/DiamondBlackjack/audio/dlcvinewood_amp.dat10.rel b/audio/dlcvinewood_amp.dat10.rel similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_amp.dat10.rel rename to audio/dlcvinewood_amp.dat10.rel diff --git a/DiamondBlackjack/audio/dlcvinewood_game.dat151 b/audio/dlcvinewood_game.dat151 similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_game.dat151 rename to audio/dlcvinewood_game.dat151 diff --git a/DiamondBlackjack/audio/dlcvinewood_game.dat151.nametable b/audio/dlcvinewood_game.dat151.nametable similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_game.dat151.nametable rename to audio/dlcvinewood_game.dat151.nametable diff --git a/DiamondBlackjack/audio/dlcvinewood_game.dat151.rel b/audio/dlcvinewood_game.dat151.rel similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_game.dat151.rel rename to audio/dlcvinewood_game.dat151.rel diff --git a/DiamondBlackjack/audio/dlcvinewood_mix.dat15 b/audio/dlcvinewood_mix.dat15 similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_mix.dat15 rename to audio/dlcvinewood_mix.dat15 diff --git a/DiamondBlackjack/audio/dlcvinewood_mix.dat15.nametable b/audio/dlcvinewood_mix.dat15.nametable similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_mix.dat15.nametable rename to audio/dlcvinewood_mix.dat15.nametable diff --git a/DiamondBlackjack/audio/dlcvinewood_mix.dat15.rel b/audio/dlcvinewood_mix.dat15.rel similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_mix.dat15.rel rename to audio/dlcvinewood_mix.dat15.rel diff --git a/DiamondBlackjack/audio/dlcvinewood_sounds.dat54 b/audio/dlcvinewood_sounds.dat54 similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_sounds.dat54 rename to audio/dlcvinewood_sounds.dat54 diff --git a/DiamondBlackjack/audio/dlcvinewood_sounds.dat54.nametable b/audio/dlcvinewood_sounds.dat54.nametable similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_sounds.dat54.nametable rename to audio/dlcvinewood_sounds.dat54.nametable diff --git a/DiamondBlackjack/audio/dlcvinewood_sounds.dat54.rel b/audio/dlcvinewood_sounds.dat54.rel similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_sounds.dat54.rel rename to audio/dlcvinewood_sounds.dat54.rel diff --git a/DiamondBlackjack/audio/dlcvinewood_speech.dat4 b/audio/dlcvinewood_speech.dat4 similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_speech.dat4 rename to audio/dlcvinewood_speech.dat4 diff --git a/DiamondBlackjack/audio/dlcvinewood_speech.dat4.nametable b/audio/dlcvinewood_speech.dat4.nametable similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_speech.dat4.nametable rename to audio/dlcvinewood_speech.dat4.nametable diff --git a/DiamondBlackjack/audio/dlcvinewood_speech.dat4.rel b/audio/dlcvinewood_speech.dat4.rel similarity index 100% rename from DiamondBlackjack/audio/dlcvinewood_speech.dat4.rel rename to audio/dlcvinewood_speech.dat4.rel diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/casino_general.awc b/audio/sfx/dlc_vinewood/casino_general.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/casino_general.awc rename to audio/sfx/dlc_vinewood/casino_general.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/casino_interior_stems.awc b/audio/sfx/dlc_vinewood/casino_interior_stems.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/casino_interior_stems.awc rename to audio/sfx/dlc_vinewood/casino_interior_stems.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_01.awc b/audio/sfx/dlc_vinewood/casino_slot_machines_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_01.awc rename to audio/sfx/dlc_vinewood/casino_slot_machines_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_02.awc b/audio/sfx/dlc_vinewood/casino_slot_machines_02.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_02.awc rename to audio/sfx/dlc_vinewood/casino_slot_machines_02.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_03.awc b/audio/sfx/dlc_vinewood/casino_slot_machines_03.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/casino_slot_machines_03.awc rename to audio/sfx/dlc_vinewood/casino_slot_machines_03.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_01.awc b/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_01.awc rename to audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_02.awc b/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_02.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_02.awc rename to audio/sfx/dlc_vinewood/s_f_y_casino_01_asian_02.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_01.awc b/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_01.awc rename to audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_02.awc b/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_02.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_02.awc rename to audio/sfx/dlc_vinewood/s_f_y_casino_01_latina_02.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_01.awc b/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_01.awc rename to audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_02.awc b/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_02.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_02.awc rename to audio/sfx/dlc_vinewood/s_m_y_casino_01_asian_02.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_01.awc b/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_01.awc rename to audio/sfx/dlc_vinewood/s_m_y_casino_01_white_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_02.awc b/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_02.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/s_m_y_casino_01_white_02.awc rename to audio/sfx/dlc_vinewood/s_m_y_casino_01_white_02.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/u_f_m_casinocash_01.awc b/audio/sfx/dlc_vinewood/u_f_m_casinocash_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/u_f_m_casinocash_01.awc rename to audio/sfx/dlc_vinewood/u_f_m_casinocash_01.awc diff --git a/DiamondBlackjack/audio/sfx/dlc_vinewood/u_f_m_casinoshopkeeper_01.awc b/audio/sfx/dlc_vinewood/u_f_m_casinoshopkeeper_01.awc similarity index 100% rename from DiamondBlackjack/audio/sfx/dlc_vinewood/u_f_m_casinoshopkeeper_01.awc rename to audio/sfx/dlc_vinewood/u_f_m_casinoshopkeeper_01.awc diff --git a/DiamondBlackjack/cl_blackjack.lua b/cl_blackjack.lua similarity index 99% rename from DiamondBlackjack/cl_blackjack.lua rename to cl_blackjack.lua index a6eda92..f352f3b 100644 --- a/DiamondBlackjack/cl_blackjack.lua +++ b/cl_blackjack.lua @@ -77,7 +77,7 @@ cfg.blackjackTables = { } --Use this command to get the coords you need for setting up new tables. ---Some maps use the prop vw_prop_casino_blckjack_01 some use vw_prop_casino_blckjack_01b, so change accordingly. +--Some maps use the prop vw_prop_casino_blckjack_01 some use vw_prop_casino blckjack_01b, so change accordingly. RegisterCommand("getcasinotable",function() local playerCoords = GetEntityCoords(PlayerPedId()) local blackjackTable = GetClosestObjectOfType(playerCoords.x,playerCoords.y,playerCoords.z,3.0,GetHashKey("vw_prop_casino_blckjack_01"),0,0,0) diff --git a/DiamondBlackjack/cl_casinoteleporter.lua b/cl_casinoteleporter.lua similarity index 100% rename from DiamondBlackjack/cl_casinoteleporter.lua rename to cl_casinoteleporter.lua diff --git a/DiamondBlackjack/fxmanifest.lua b/fxmanifest.lua similarity index 100% rename from DiamondBlackjack/fxmanifest.lua rename to fxmanifest.lua diff --git a/DiamondBlackjack/peds.meta b/peds.meta similarity index 100% rename from DiamondBlackjack/peds.meta rename to peds.meta diff --git a/DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer.ycd b/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer.ycd similarity index 100% rename from DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer.ycd rename to stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer.ycd diff --git a/DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer_female.ycd b/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer_female.ycd similarity index 100% rename from DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer_female.ycd rename to stream/Animations/anim_casino_b@amb@casino@games@blackjack@dealer_female.ycd diff --git a/DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@player.ycd b/stream/Animations/anim_casino_b@amb@casino@games@blackjack@player.ycd similarity index 100% rename from DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@blackjack@player.ycd rename to stream/Animations/anim_casino_b@amb@casino@games@blackjack@player.ycd diff --git a/DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@shared@dealer@.ycd b/stream/Animations/anim_casino_b@amb@casino@games@shared@dealer@.ycd similarity index 100% rename from DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@shared@dealer@.ycd rename to stream/Animations/anim_casino_b@amb@casino@games@shared@dealer@.ycd diff --git a/DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@shared@player@.ycd b/stream/Animations/anim_casino_b@amb@casino@games@shared@player@.ycd similarity index 100% rename from DiamondBlackjack/stream/Animations/anim_casino_b@amb@casino@games@shared@player@.ycd rename to stream/Animations/anim_casino_b@amb@casino@games@shared@player@.ycd diff --git a/DiamondBlackjack/stream/Menus/RageUI.ytd b/stream/Menus/RageUI.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/RageUI.ytd rename to stream/Menus/RageUI.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_cards_blackjack.ytd b/stream/Menus/casinoui_cards_blackjack.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_cards_blackjack.ytd rename to stream/Menus/casinoui_cards_blackjack.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_cards_blackjack_high.ytd b/stream/Menus/casinoui_cards_blackjack_high.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_cards_blackjack_high.ytd rename to stream/Menus/casinoui_cards_blackjack_high.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_cards_three.ytd b/stream/Menus/casinoui_cards_three.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_cards_three.ytd rename to stream/Menus/casinoui_cards_three.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_cards_three_high.ytd b/stream/Menus/casinoui_cards_three_high.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_cards_three_high.ytd rename to stream/Menus/casinoui_cards_three_high.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_insidetrack.ytd b/stream/Menus/casinoui_insidetrack.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_insidetrack.ytd rename to stream/Menus/casinoui_insidetrack.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_lucky_wheel.ytd b/stream/Menus/casinoui_lucky_wheel.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_lucky_wheel.ytd rename to stream/Menus/casinoui_lucky_wheel.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_roulette.ytd b/stream/Menus/casinoui_roulette.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_roulette.ytd rename to stream/Menus/casinoui_roulette.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_roulette_high.ytd b/stream/Menus/casinoui_roulette_high.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_roulette_high.ytd rename to stream/Menus/casinoui_roulette_high.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_angel.ytd b/stream/Menus/casinoui_slots_angel.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_angel.ytd rename to stream/Menus/casinoui_slots_angel.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_deity.ytd b/stream/Menus/casinoui_slots_deity.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_deity.ytd rename to stream/Menus/casinoui_slots_deity.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_diamond.ytd b/stream/Menus/casinoui_slots_diamond.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_diamond.ytd rename to stream/Menus/casinoui_slots_diamond.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_evacuator.ytd b/stream/Menus/casinoui_slots_evacuator.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_evacuator.ytd rename to stream/Menus/casinoui_slots_evacuator.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_fame.ytd b/stream/Menus/casinoui_slots_fame.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_fame.ytd rename to stream/Menus/casinoui_slots_fame.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_impotent.ytd b/stream/Menus/casinoui_slots_impotent.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_impotent.ytd rename to stream/Menus/casinoui_slots_impotent.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_knife.ytd b/stream/Menus/casinoui_slots_knife.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_knife.ytd rename to stream/Menus/casinoui_slots_knife.ytd diff --git a/DiamondBlackjack/stream/Menus/casinoui_slots_ranger.ytd b/stream/Menus/casinoui_slots_ranger.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/casinoui_slots_ranger.ytd rename to stream/Menus/casinoui_slots_ranger.ytd diff --git a/DiamondBlackjack/stream/Menus/commonmenu.ytd b/stream/Menus/commonmenu.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/commonmenu.ytd rename to stream/Menus/commonmenu.ytd diff --git a/DiamondBlackjack/stream/Menus/shopui_title_casino.ytd b/stream/Menus/shopui_title_casino.ytd similarity index 100% rename from DiamondBlackjack/stream/Menus/shopui_title_casino.ytd rename to stream/Menus/shopui_title_casino.ytd diff --git a/DiamondBlackjack/stream/Peds/s_f_y_casino_01.ydd b/stream/Peds/s_f_y_casino_01.ydd similarity index 100% rename from DiamondBlackjack/stream/Peds/s_f_y_casino_01.ydd rename to stream/Peds/s_f_y_casino_01.ydd diff --git a/DiamondBlackjack/stream/Peds/s_f_y_casino_01.yft b/stream/Peds/s_f_y_casino_01.yft similarity index 100% rename from DiamondBlackjack/stream/Peds/s_f_y_casino_01.yft rename to stream/Peds/s_f_y_casino_01.yft diff --git a/DiamondBlackjack/stream/Peds/s_f_y_casino_01.ymt b/stream/Peds/s_f_y_casino_01.ymt similarity index 100% rename from DiamondBlackjack/stream/Peds/s_f_y_casino_01.ymt rename to stream/Peds/s_f_y_casino_01.ymt diff --git a/DiamondBlackjack/stream/Peds/s_f_y_casino_01.ytd b/stream/Peds/s_f_y_casino_01.ytd similarity index 100% rename from DiamondBlackjack/stream/Peds/s_f_y_casino_01.ytd rename to stream/Peds/s_f_y_casino_01.ytd diff --git a/DiamondBlackjack/stream/Peds/s_m_y_casino_01.ydd b/stream/Peds/s_m_y_casino_01.ydd similarity index 100% rename from DiamondBlackjack/stream/Peds/s_m_y_casino_01.ydd rename to stream/Peds/s_m_y_casino_01.ydd diff --git a/DiamondBlackjack/stream/Peds/s_m_y_casino_01.yft b/stream/Peds/s_m_y_casino_01.yft similarity index 100% rename from DiamondBlackjack/stream/Peds/s_m_y_casino_01.yft rename to stream/Peds/s_m_y_casino_01.yft diff --git a/DiamondBlackjack/stream/Peds/s_m_y_casino_01.ymt b/stream/Peds/s_m_y_casino_01.ymt similarity index 100% rename from DiamondBlackjack/stream/Peds/s_m_y_casino_01.ymt rename to stream/Peds/s_m_y_casino_01.ymt diff --git a/DiamondBlackjack/stream/Peds/s_m_y_casino_01.ytd b/stream/Peds/s_m_y_casino_01.ytd similarity index 100% rename from DiamondBlackjack/stream/Peds/s_m_y_casino_01.ytd rename to stream/Peds/s_m_y_casino_01.ytd diff --git a/DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ydd b/stream/Peds/u_f_m_casinocash_01.ydd similarity index 100% rename from DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ydd rename to stream/Peds/u_f_m_casinocash_01.ydd diff --git a/DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.yft b/stream/Peds/u_f_m_casinocash_01.yft similarity index 100% rename from DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.yft rename to stream/Peds/u_f_m_casinocash_01.yft diff --git a/DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ymt b/stream/Peds/u_f_m_casinocash_01.ymt similarity index 100% rename from DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ymt rename to stream/Peds/u_f_m_casinocash_01.ymt diff --git a/DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ytd b/stream/Peds/u_f_m_casinocash_01.ytd similarity index 100% rename from DiamondBlackjack/stream/Peds/u_f_m_casinocash_01.ytd rename to stream/Peds/u_f_m_casinocash_01.ytd diff --git a/DiamondBlackjack/sv_blackjack.lua b/sv_blackjack.lua similarity index 98% rename from DiamondBlackjack/sv_blackjack.lua rename to sv_blackjack.lua index 559a825..b66ab9b 100644 --- a/DiamondBlackjack/sv_blackjack.lua +++ b/sv_blackjack.lua @@ -348,7 +348,12 @@ for i=0,31,1 do --print("dealerHand: " .. tostring(dealerHand)) if currentHand ~= nil then if currentHand <= 21 then - local potentialWinAmount = blackjackGameData[gameId][source][1] * 2 + local potentialWinAmount + if currentHand == 21 and #blackjackGameData[gameId][source]["cardData"] == 2 then + potentialWinAmount = blackjackGameData[gameId][source][1] * 2.5 + else + potentialWinAmount = blackjackGameData[gameId][source][1] * 2 + end local potentialPushAmount = blackjackGameData[gameId][source][1] local playerPing = GetPlayerPing(source) if dealerHand > 21 then