diff --git a/.gitignore b/.gitignore index 856b771..ba99aff 100755 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,6 @@ node_modules/* logs/* start.bat -tokens.json \ No newline at end of file +tokens.json + +config.json \ No newline at end of file diff --git a/config.json b/config.json deleted file mode 100755 index 8034396..0000000 --- a/config.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "botName": "greenhambot", - "d_token": "MjkyNzAxNjg2NjE3ODY2MjUx.DEfe6Q.ShdWRL77BYgfKlW_oFvUwaiAn5Q", - "adminID": "88301001169207296", - "prefix": "!", - "passes": 2, - "allowedSfxChannels": "bot|alttp-alerts", - "sfxVolume": 0.3, - "botChannel": "bot", - "textCmdCooldown": 5, - "twitch": { - "channel": "#greenham", - "modChannel": "#greenham (the-lab)", - "botLogin": { - "username": "greenhambot", - "oauth": "oauth:90aunml4vwyt7zgulm7s5m7xt4hnpc" - }, - "editorLogin": { - "username": "greenham", - "oauth": "oauth:gmi4sjl3k0we0d4gsppkrcqcjpdma6" - }, - "cmdPrefix": "$", - "admins": ["greenham","greenhambot"], - "blacklistedUsers": [], - "ircServer" : "irc.chat.twitch.tv", - "debug": false, - "channelId": 78410627, - "controlRoomId": "637d55c7-f194-4c86-98e3-3bce54fd8b30", - "subRoomId": "6686e48b-7c5c-408d-ab58-034766b99cd4" - }, - "obs": { - "websocket": { - "address": "192.168.0.111:4444", - "password": "goodnewseveryone" - } - }, - "defaultSceneName": "fgfm", - "commercialSceneName": "commercial", - "currentActivitySceneItemName": "now-showing-txt", - "initialQueueSize": 3, - "recentlyPlayedMemory": 5, - "roomGrindChance": 10, - "roomGrindPlaytime": 450, - "roomShuffleChance": 85, - "roomVidPlaytime": 150, - "roomShuffleCount": 6, - "videoPollSize": 5, - "videoPollIntervalMinutes": 15, - "commercialsEnabled": false, - "commercialInterval": 3600, - "auwChance": 25, - "defaultSRVolume": 50, - "vodConfigFile": "./conf/vods.json", - "roomConfigFile": "./conf/rooms.json", - "roomVidsBasePath": "Y:\\media\\videos\\ALttP\\my-vids\\room-vids", - "debug": false -} \ No newline at end of file diff --git a/fgfm.TODO b/fgfm.TODO index e8ba884..bd75783 100755 --- a/fgfm.TODO +++ b/fgfm.TODO @@ -1,7 +1,8 @@ TODO: + ☐ Move vrmode timer to this bot, delete from SLCB ☐ Support a CLI flag to delay showing queue until command is issued ☐ Room vid requests / import - ☐ Support viewer requests + ☐ Improved interface for viewer requests ☐ Web interface? Twitch extension? ☐ Improvements ☐ When playing a room back, loop it at slower speeds for a few iterations diff --git a/fgfm.js b/fgfm.js index 78f8dca..b62e82a 100755 --- a/fgfm.js +++ b/fgfm.js @@ -24,6 +24,7 @@ let state = { "commercialPlaying": false }; +// Main screen turn on const obs = new GHOBS(config); obs.init() .then(() => {return twitchInit(config.twitch)})