From 7584cd9a9a31e4e68b26b9da892d79a61d82049a Mon Sep 17 00:00:00 2001 From: sakamakj <38378426+sakamakj@users.noreply.github.com> Date: Wed, 30 May 2018 01:29:11 +0200 Subject: [PATCH] added shout, !make popcorn (#62) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Create base-damage.cfg * Update base-damage.cfg * spellfix grievers changed to griefers * Create admin.cfg needs editing * Create announcements.cfg * Update announcements.cfg * needs translatoin * needs translation still in English * needs translation * needs translation * Create inventory-search.cfg * translation fixed not much more to write * translation fixed * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * needs translation * translation fixed * unfinishied * Translation mostly fixed Couldnt find the right words to correctly translate the emotions and genuine feelings behind "loops" and #fear the aids", they are so genuine as they are now. * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * translation fixed * hopefully correctly translated (read my comment) not sure if "not enough credentials" is correctly translated. I supposed you meant not enough security clearance or somthing like that. I could have written (Access denied due to invalid rank= Tillgång nekas på grund av otillräcklig rang) * translation fixed * translation fixed * translation fixed * grammar fix * grammer fix Yeah, I copied the grammar error from original English file and made a similiar error in the swedish version. * spell fix * better grammar * estetical language change * added order pizza * order pizza * fix * Update chat-bot.cfg * spelfix * Update auto-chat.lua * added make-cofee * added make cofee * fix because I cant spell apperantly * spell fix because I cant spell apperantly * missing = * coffee * make coffee * make coffee * food I find it quite funny that arty would pin that message on discord and it is still there. * food I wonder how long that pin will stay about the random food suggestion generator... * food changed to what to eat * food changed to whattoeat * Update chat-bot.cfg * Coffee on twise * mead and snaps added * !mead please * a fix * !pass some snaps * get-cocktail * !make cocktail * fix? * fix? * rhd (thadius suggestion) * lhd message added * Fixed Comment and indentation * rhd changed from shout to messages * I am also a lazy bastard * Update colours.lua * Not needed in commands if present in messages * Fixed missing comma * !make popcorn need more shouts. Somebody tried this without result so why not. * get-popcorn added * addition --- Addons/Admin/auto-chat.lua | 5 +++++ StandAlone/colours.lua | 1 + locale/en/chat-bot.cfg | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Addons/Admin/auto-chat.lua b/Addons/Admin/auto-chat.lua index 6701944b..ed121e95 100644 --- a/Addons/Admin/auto-chat.lua +++ b/Addons/Admin/auto-chat.lua @@ -46,6 +46,11 @@ local commands = { ['lenny']={'chat-bot.lenny'}, --Jokes about food and drink ['whattoeat']={'chat-bot.food'}, + ['makepopcorn']=function(player) Server.new_thread{ + timeout=math.floor(180*(math.random()+0.5)),data=player.name + }:on_event('timeout',function(self) + if self.data then game.print{'chat-bot.message',{'chat-bot.get-popcorn-2',self.data}} end + end):open() return {'chat-bot.get-popcorn-1'} end, ['orderpizza']=function(player) Server.new_thread{ timeout=math.floor(180*(math.random()+0.5)),data={player.name,0}, reopen=true }:on_event('timeout',function(self) diff --git a/StandAlone/colours.lua b/StandAlone/colours.lua index d962a738..2bdb3299 100644 --- a/StandAlone/colours.lua +++ b/StandAlone/colours.lua @@ -8,6 +8,7 @@ local default_colours = { mark9064={r=99,g=0,b=255}, eissturm={r=25,g=25,b=112}, Sakama={r=20,g=213,b=80}, + Sakama={r=20,g=213,b=80}, freek18={r=50,g=0,b=255}, aldldl={r=0,g=131,b=255}, NAD4X4={r=135,g=206,b=250}, diff --git a/locale/en/chat-bot.cfg b/locale/en/chat-bot.cfg index 9c6598bf..84b1da76 100644 --- a/locale/en/chat-bot.cfg +++ b/locale/en/chat-bot.cfg @@ -38,4 +38,6 @@ get-cocktail-1= 🍸 Inintiating mind reading unit... 🍸 get-cocktail-2= 🍸 Mixing favourite ingredients of __1__ 🍸 get-cocktail-3=🍸 __1__ your cocktail is done.🍸 lhd=All trains must be LHD! -food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ \ No newline at end of file +food=Don't know what to make for dinner? Use a random recipe from the random dinner suggestion generator at http://www.whatthefuckshouldimakefordinner.com/ +get-popcorn-1=Heating the oil and waiting for the popping sound... +get-popcorn-2=__1__ your popcorn is finished. Lean backwards and watch the drama unfold. \ No newline at end of file