cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9857 from GinjaNinja32/bot

Browse Source 
Adds support for bots which use world.Export() for server-to-bot communication
This commit is contained in:
Ccomp5950
2015-06-18 13:46:50 -04:00
parent 7ee7cafbff 8d232e9304
commit eea423ce0f
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/configuration.dm
View File

@@ -154,6 +154,7 @@
var/use_irc_bot = 0
var/irc_bot_host = ""
var/irc_bot_export = 0 // whether the IRC bot in use is a Bot32 (or similar) instance; Bot32 uses world.Export() instead of nudge.py/libnudge
var/main_irc = ""
var/admin_irc = ""
var/python_path = "" //Path to the python executable. Defaults to "python" on windows and "/usr/bin/env python2" on unix
@@ -483,6 +484,9 @@
if("use_irc_bot")
use_irc_bot = 1
if("irc_bot_export")
irc_bot_export = 1
if("ticklag")
Ticklag = text2num(value)

25
code/modules/ext_scripts/irc.dm
View File

@@ -1,17 +1,20 @@
/proc/send2irc(var/channel, var/msg)
if(config.use_irc_bot && config.irc_bot_host)
if(config.use_lib_nudge)
var/nudge_lib
if(world.system_type == MS_WINDOWS)
nudge_lib = "lib\\nudge.dll"
else
nudge_lib = "lib/nudge.so"
spawn(0)
call(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]")
if(config.irc_bot_export)
world.Export("http://[config.irc_bot_host]:45678?[list2params(list(pwd=config.comms_password, chan=channel, mesg=msg))]")
else
spawn(0)
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
if(config.use_lib_nudge)
var/nudge_lib
if(world.system_type == MS_WINDOWS)
nudge_lib = "lib\\nudge.dll"
else
nudge_lib = "lib/nudge.so"
spawn(0)
call(nudge_lib, "nudge")("[config.comms_password]","[config.irc_bot_host]","[channel]","[msg]")
else
spawn(0)
ext_python("ircbot_message.py", "[config.comms_password] [config.irc_bot_host] [channel] [msg]")
return
/proc/send2mainirc(var/msg)

3
config/example/config.txt
View File

@@ -242,6 +242,9 @@ USEALIENWHITELIST
## Uncomment to enable sending data to the IRC bot.
#USE_IRC_BOT
## Uncomment if the IRC bot requires using world.Export() instead of nudge.py/libnudge
#IRC_BOT_EXPORT
## Host where the IRC bot is hosted. Port 45678 needs to be open.
#IRC_BOT_HOST localhost