Skip to content

Commit 2111e49

Browse files
committed
v
1 parent b17ae88 commit 2111e49

7 files changed

Lines changed: 17 additions & 7 deletions

File tree

.DS_Store

0 Bytes
Binary file not shown.

assets/.DS_Store

0 Bytes
Binary file not shown.

assets/audio/nosound.mp3

3.12 KB
Binary file not shown.

frameworks/ffmpeg

76.1 MB
Binary file not shown.

frameworks/ffprobe

76 MB
Binary file not shown.

main.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1+
#!/usr/bin/env python
12
# Credits!!!
2-
# Google Bard - Help
3-
# OpenAI ChatGPT - Help
4-
# Microsoft Bing AI Chat Copilot - Help
53
# (YT) Clear Code - Particle System
64
# jay3332 - Number Abbreviation
75
# Cryptogrounds / Considera Core
@@ -20,7 +18,13 @@
2018
import json
2119
import csv
2220
import asyncio
21+
import pydub
22+
from pydub import AudioSegment
2323
#pynanosvg
24+
import ffmpeg
25+
#from ffprobe import FFProbe
26+
sys.path.append('./frameworks/ffmpeg')
27+
sys.path.append('./frameworks/ffprobe')
2428

2529
GameFPS = 60
2630

@@ -522,6 +526,7 @@ def constrain(val, min_val, max_val):
522526
pygamemixermusic = 1
523527
musicfilepath = ""
524528
musicintrofilepath = ""
529+
pymusictype = ""
525530
def PlayMusic(musNum):
526531
pygame.mixer.music.stop()
527532
global pygamemixermusic, musicfilepath, musicintrofilepath
@@ -550,15 +555,17 @@ def PlayMusic(musNum):
550555
pygamemixermusic = .9
551556
pymusictype = "mp3"
552557
musicfilepath = "./assets/audio/(radzlan - Miami Hotline Vol.3 (feat. Demonicity)) 673473_-Miami-Hotline--Vol3.mp3"
553-
musicintrofilepath = "./assets/audio/nosound.wav"
558+
musicintrofilepath = "./assets/audio/nosound.mp3"
554559
elif musNum == 6:
555560
pygamemixermusic = .9
556561
pymusictype = "wav"
557562
musicfilepath = "./assets/audio/INOSSI - Got you-loop.wav"
558563
musicintrofilepath = "./assets/audio/INOSSI - Got you-start.wav"
559-
pygame.mixer.music.load(musicintrofilepath)
560-
pygame.mixer.music.set_volume(Decimal(pygamemixermusic))
561-
pygame.mixer.music.play()
564+
musicintro = AudioSegment.from_file(musicintrofilepath, format=pymusictype)
565+
musicintro = AudioSegment.from_file(musicintrofilepath, format=musicintrofilepath[-3:])
566+
#pygame.mixer.music.load(musicintrofilepath)
567+
#pygame.mixer.music.set_volume(Decimal(pygamemixermusic))
568+
#pygame.mixer.music.play()
562569

563570
PlayMusic(random.randint(1,6))
564571
pygame.mixer.music.set_volume(Decimal(pygamemixermusic) * (Settings[1]["value"] / 100))

requirements.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@ wheel
77
toml
88
datetime
99
pickle-mixin
10+
pydub
11+
ffmpeg
12+
ffprobe
1013
asyncio
1114
PyInstaller

0 commit comments

Comments
 (0)