commit e2945b532780f90e9c54fc99d872c434f59d45ee Author: Phil Carmody Date: Tue Apr 7 17:52:53 2020 +0300 index.html - fix missing Signed-off-by: Phil Carmody commit 2318d5bba3ea2d0b8bf8824e279e8e8ff91f1ec0 Author: Phil Carmody Date: Tue Apr 7 17:44:12 2020 +0300 index.html - fix missing s Signed-off-by: Phil Carmody commit 78c642b838c217a0a9532baaa50ffc95241f829a Author: Phil Carmody Date: Tue Apr 7 17:37:24 2020 +0300 nerd/events - a Loss and a Godsend regarding systemd Signed-off-by: Phil Carmody commit a0026859f0d57bfa62fcb6b68dff367d50d05034 Author: Phil Carmody Date: Tue Apr 7 16:31:45 2020 +0300 nerd/events - fix remaining fixed-gender messages Signed-off-by: Phil Carmody commit ef91c1e38688a39a4fb7691d280209c8f796e6db Author: Phil Carmody Date: Tue Apr 7 16:27:33 2020 +0300 index.html - fix broken code block in examples Signed-off-by: Phil Carmody commit 2ae3abc7bfa07e889634ff75ee8b0f87ea81963b Author: Phil Carmody Date: Tue Apr 7 15:02:50 2020 +0300 bot.pl - add a new 'zie'-based genderless pronoun set Some choice is good, therefore more choice is better. commit 5fb23b2f16c2d25f8d88ff42d25b2830fb7110c9 Author: Phil Carmody Date: Tue Apr 7 14:55:00 2020 +0300 bot.pl - clearer gender pronouns processing Signed-off-by: Phil Carmody commit 7858f8a9e2c29bc00cbe3f92a3239ae27626d66b Author: Phil Carmody Date: Sat Feb 16 14:30:14 2019 +0200 index.html - be more friendly Signed-off-by: Phil Carmody commit 4e21da008a437557651d57b18c83f0d1f84992e1 Author: Phil Carmody Date: Sat Feb 16 14:29:35 2019 +0200 bot - simplify info request handling Signed-off-by: Phil Carmody commit c7ca83b61c77cbb54349cb67cbdbf777c136e48b Author: Phil Carmody Date: Thu Aug 20 15:59:41 2015 +0300 trek: some events and items Signed-off-by: Phil Carmody commit a1d0acb2eab6410382d4b01a5b40de1574c11cb4 Author: Phil Carmody Date: Fri Jul 24 00:07:55 2015 +0300 documentation: add index.html Mostly up to date, the only missing bit is marked as such. Signed-off-by: Phil Carmody commit a3a2e5f1499e1c0e689847208636c14f4ccf807f Author: Phil Carmody Date: Thu Jul 23 12:43:21 2015 +0300 beer: events - add some new macro expansion choices ISO Amish Pale Ale! Signed-off-by: Phil Carmody commit 70eee2b9cd9ed2d5e24bc8049ea1fdf38c5b3b7f Author: Phil Carmody Date: Wed Jul 22 16:47:29 2015 +0300 trek: events - use new shorthand Cm/Cf event types Signed-off-by: Phil Carmody commit 179e7f485501b0403320617d6b3e5c11f208cc17 Author: Phil Carmody Date: Wed Jul 22 16:44:48 2015 +0300 bot.pl: events - add shorthand for single-gender G/C events e.g. Cf = C %!+f% More than one gender, or exclusion of a gender, and you need to use the full baroque syntax. This could trivially be extended to W/L events too, and probably others. Signed-off-by: Phil Carmody commit 9d9c2a5af1d0370e086ecbe39f28972257e28428 Author: Phil Carmody Date: Wed Jul 22 16:17:35 2015 +0300 trek: first hack at some Star Trek themed items/events Very minimal items currently, needs some real work. Events include something, usually a calamity, making reference to every single episode of TNG S01, and a few more generic ones. Uses the new "%![-+][mfn]+%" event prefixes, which quite obviously suck. Signed-off-by: Phil Carmody commit 41d018cd50403c7df95f7befd5066a764e5d1797 Author: Phil Carmody Date: Wed Jul 22 16:09:04 2015 +0300 bot.pl: permit restriction of some events to specific genders An event with the prefix %!+chars% or %!-chars% will be rejected if the (first) player's gender isn't (+) or is (-) in 'chars', where chars can be any or all of 'm', 'f', and 'n'. A player with 'u' or 'pc' gender is considered able to undergo all events. Intended only for C and G events initially, but this expansion applies to pretty much all event types so could be used elsewhere. (Note - item calamities/godsends are *not* C/G events.) The syntax is crummy, and should be made more easily usable Signed-off-by: Phil Carmody commit 2766dfb4bda4d50adaf444341f0fcaa6a013e8e3 Author: Phil Carmody Date: Wed Jul 22 16:06:26 2015 +0300 bot.pl: fix unnecessary name echoing when testing events Prefixing the name became unnecessary in commit 42af00cf bot.pl: make item events (c/g) understand more %variables% Signed-off-by: Phil Carmody commit 232533cdf694cdbc07a9601bad3d742159e9d077 Author: Phil Carmody Date: Wed Jul 22 16:00:08 2015 +0300 bot.pl: add name2gender() helper Other things may need the gender of non-existent players - e.g. events can be eventtest-ed using arbitrary names. Signed-off-by: Phil Carmody commit 299b577b8a3872e6c7b680a1f289982779806b37 Author: Phil Carmody Date: Wed Jul 22 14:32:50 2015 +0300 bot.pl: fix uninitialised $debug_reentrancy warning As lots of init happens at the top level, the lower definition isn't seen when the first call to debug() happens. Hence previously there was a console warning. Moving the definition before first possible use fixes that. Signed-off-by: Phil Carmody commit 53c4772b79206c5cdb28d29a1b88b9f908c968cb Author: Phil Carmody Date: Tue Jul 21 22:32:51 2015 +0300 bot.pl: harden expression expansion against evil player names Always do the player name expansion last, so that any % signs can cause no further variable expansion. Signed-off-by: Phil Carmody commit 42af00cfd3b9a346c79c58b527867585c4cf86a4 Author: Phil Carmody Date: Tue Jul 21 22:28:54 2015 +0300 bot.pl: make item events (c/g) understand more %variables% Firstly introduce the default-leading-%player% expansion into the core helper function, as all clients want it. Secondly, add %type% expansion to the event, as events should be about specific items too. Signed-off-by: Phil Carmody commit 8a1df75e8b257204676deb1071d14a7fc07a1a3a Author: Phil Carmody Date: Tue Jul 21 22:22:52 2015 +0300 bot.pl: fix inability to modify items with typeid 0 0 is false, but it is an itemid. Check definedness instead. Signed-off-by: Phil Carmody commit 6bdbfca7948e8ec8b86bcd9b153d3a999cba49a5 Author: Phil Carmody Date: Tue Jul 21 14:15:00 2015 +0300 bot.pl: fix mis-indexing of fragile items $_ is the number itself, which is the type id, not the index in the @fragileitems array where that number resides. Signed-off-by: Phil Carmody commit 5862bc821eda06eb9dd97aedaca123ee5263e7d4 Author: Phil Carmody Date: Mon Jul 20 11:13:37 2015 +0300 bot.pl: dropped items - fix to ensure there's a default base longevity Reliance on uninitialised variable ensued when it wasn't set. Introduced in: commit 28d93d8e bot.pl: use itemdbfile not rpitembase to test if dropping items Signed-off-by: Phil Carmody commit 6ffe4f7d037c9d0fb2ca1fbd25d40083d668a59f Author: Phil Carmody Date: Mon Jul 20 11:23:23 2015 +0300 bot.pl: remove rpitemstep since decay is linear Should have been removed in: commit 1559c46f bot.pl: KISS-ify dropped item decay Signed-off-by: Phil Carmody commit 8ca72316320767eb55e55f2868979bf421814bbd Author: Phil Carmody Date: Mon Jul 20 11:07:09 2015 +0300 beer: events - fix trailing whitespace. Signed-off-by: Phil Carmody commit 807ef3821a02dc80569f2d636dda3643615d0061 Author: Phil Carmody Date: Tue May 19 19:50:37 2015 +0300 bot.pl: make reentrancy checking a truly global variable The previous code caused warnings, it may not even have worked. Signed-off-by: Phil Carmody commit 088416c8538134be09a40da542440c69ad98c82c Author: Phil Carmody Date: Tue May 19 19:49:29 2015 +0300 items.txt - take advantage of implicit punctuation Slightly churny, but now we have the feature we should use it. Signed-off-by: Phil Carmody commit f7056c6db197cc91b8d4defc30b631df016ff317 Author: Phil Carmody Date: Tue May 19 19:43:21 2015 +0300 bot.pl: let item modifications be implicitly punctuated They all end in "!", there's no need to actually have that in every string. Signed-off-by: Phil Carmody commit 851e8e3625940574cce8563a47660a71d3f498ea Author: Phil Carmody Date: Tue May 19 19:37:06 2015 +0300 bot.pl: more flexibility for item godsends/calamaties Permit things like c="Rust develops on %player%'s %type%!". Treat a leading "%player%" as implicit which is prepended if that string is otherwise absent. Signed-off-by: Phil Carmody commit 6c194733c85b7da746eb84c7fe96f82726d45d86 Author: Phil Carmody Date: Tue May 19 19:12:38 2015 +0300 beer: fix item calamaty grammer "player object" should be "player's object". Signed-off-by: Phil Carmody commit 5e846c75f538b29771dcd447646a22c730dc7b6b Author: Phil Carmody Date: Tue May 19 18:44:26 2015 +0300 nerd: more event/item customisations Signed-off-by: Phil Carmody commit 1559c46fabf0dd75955d280a2bc170a84f2995af Author: Phil Carmody Date: Thu Apr 23 16:33:21 2015 +0300 bot.pl: KISS-ify dropped item decay Linear. No bumps, humps, troughs, ramps, or any crap like that. One parameter - decay time per level. Signed-off-by: Phil Carmody commit 751c6b0df1d89e8ec48cd0fb7f9a6b073fdcf3ba Author: Phil Carmody Date: Sun Apr 19 22:52:39 2015 +0300 nerd: items - put space between number and unit in hard disks 800GB was just way too difficult to read. Signed-off-by: Phil Carmody commit 622ea790ba8c9ce9abf08983be5f0ec2fce175db Author: Phil Carmody Date: Sun Apr 19 20:36:58 2015 +0300 nerd: events - more versions of Windows to be installed Signed-off-by: Phil Carmody commit 192c215fff9c038ca61c8f0790f47c78486e0b2d Author: Phil Carmody Date: Sat Apr 18 21:31:35 2015 +0300 nerd: items - Linux 4.0+ - Hurr Durr, I'm a sheep Signed-off-by: Phil Carmody commit dd90fa1f6116bbdaa61a65e4d27c427df8f8d915 Author: Phil Carmody Date: Sat Apr 18 21:24:35 2015 +0300 bot.pl: prevent possible endless loop in modify_item If only godsends or only calamaties are defined for items, then if an event of the wrong parity is chosen, the loop would loop for ever trying to find an event of the nonexistent type. Signed-off-by: Phil Carmody commit 962afea3f2163c27f4b9f893f8f4cefc54f96841 Author: Phil Carmody Date: Sat Apr 18 20:32:56 2015 +0300 bot.pl: document a few more of the parameters Signed-off-by: Phil Carmody commit 28d93d8ec443241c466bc8b9eccbfadb1d516ee4 Author: Phil Carmody Date: Sat Apr 18 20:12:45 2015 +0300 bot.pl: use itemdbfile not rpitembase to test if dropping items We can't drop without the file to drop into, so it's the simplest thing to check for. Signed-off-by: Phil Carmody commit 50809c3d91303fc71bfd841e425bc594f9429c18 Author: Phil Carmody Date: Sat Apr 18 20:06:43 2015 +0300 bot.pl: give logfile for dropped item decay a more sensible setting It was too similar to the database file setting. Just call it decayfile, as that's what the logs basically are. Signed-off-by: Phil Carmody commit 8ad8bef06947f400e04cf1d1bb463067b578778a Author: Phil Carmody Date: Sat Apr 18 20:04:15 2015 +0300 bot.pl: make the dropped item decay curve not max out Just a slow and steady growth happens after reaching the 86400 cusp. Signed-off-by: Phil Carmody commit d0591de21e7e3b00f3c3001a7dbac47d85f88c10 Author: Phil Carmody Date: Sat Apr 18 19:11:27 2015 +0300 bot.pl: adjust dropped object delay rates This slowly ramps up at the default (600/1.06) settings, and never lets any item stay at a level for more than 1 day. That upper bound could be made less rigid, so a FIXME comment has been added. Signed-off-by: Phil Carmody commit 283db985be4278ab895f0318f9a7f9dafea4da4e Author: Phil Carmody Date: Sat Apr 18 15:19:24 2015 +0300 bot.pl: add separate mapitem logging Signed-off-by: Phil Carmody commit 5c035cabceeddf36f16b826cc0e74dd04e22a6ac Author: Phil Carmody Date: Sat Apr 18 15:17:48 2015 +0300 bot.pl: don't log a message to nowhere Signed-off-by: Phil Carmody commit 155d10bf40a47323b507ac30b39261e11bbc8ef3 Author: Phil Carmody Date: Sat Apr 18 15:16:15 2015 +0300 bot.pl: short circuit dropped item decay when items aren't dropped Signed-off-by: Phil Carmody commit 661ebf63c337fe2d7ef93c8ccea6464b1b6f3741 Author: Phil Carmody Date: Fri Apr 17 18:31:54 2015 +0300 bot.pl: mode debug logging into generic log framework As the generic log framework falls back on debug messages, it needs to prevent re-entrancy. Signed-off-by: Phil Carmody commit 10f9901bc007982a74b7629d0b5a35aec921aa7c Author: Phil Carmody Date: Fri Apr 17 17:50:02 2015 +0300 bot.pl: abstract logging out to arbitrary files Signed-off-by: Phil Carmody commit f8a1b1fab87e771c783cd0b24b0ea334d26c557e Author: Phil Carmody Date: Fri Apr 17 01:06:16 2015 +0300 bot.pl: simplify get_event syntax Perl == line noise... Signed-off-by: Phil Carmody commit ecdf4d7b4fc536dfdbd9dcdbfa524f58e068eaae Author: Phil Carmody Date: Fri Apr 17 00:41:59 2015 +0300 bot.pl: better gender conjugation 'is' and 'has' Add intelligence to prevent this from happening: < beerbot> juovo realises that they has lost their way Signed-off-by: Phil Carmody commit f9875e1a92961bb4750f2632537b13513f03d19d Author: Phil Carmody Date: Thu Jun 12 19:00:12 2014 +0300 bot.pl: itemdb - let no file == empty file So firstly, it's not an error if it doesn't exist, but we must initialise the hash/flag correctly. Secondly, we can delete it if we put nothing in it. This means that the backup function won't make needless dupes. Signed-off-by: Phil Carmody commit ed89b7bea7e605d874bbafeb9f593cd4754340f5 Author: Phil Carmody Date: Thu Jun 12 18:42:00 2014 +0300 bot.pl: mapitems - do not save file if no changes Keep a dirty flag updated when the map items change. Alas, it doesn't stop the file from being backed up regularly. Signed-off-by: Phil Carmody commit edcc9d7bc561b08628dd714407355b737cadad4f Author: Phil Carmody Date: Sun May 18 20:57:53 2014 +0300 bot.pl: fix bracketting typo which broke the script Introduced half a dozen commits back in commit 5a6e2f186bd2 Date: Sun May 18 16:08:13 2014 +0300 bot.pl: Simplify penance customisation for all alignments Signed-off-by: Phil Carmody commit af10c7c8daaf23e6ecc157d6c304d813101b270d Author: Phil Carmody Date: Sun Jun 8 20:03:30 2014 +0300 bot.pl: make challenge frequency tweakable Signed-off-by: Phil Carmody commit f9b269d63346628530435db58d808af4d12af9bf Author: Phil Carmody Date: Sat Jun 7 10:30:36 2014 +0300 bot.pl: simplify quest file writing options There's no need for both a file name and a boolean flag. If there's a filename set, then that means write to it. Signed-off-by: Phil Carmody commit 389275f7f18a5e8366f10b4fde45590f7d174703 Author: Phil Carmody Date: Sat Jun 7 10:23:39 2014 +0300 bot.pl: improve documentation of the settings Signed-off-by: Phil Carmody commit 30cdc601900e15e4d0f0d6f5f8067b633fb16622 Author: Phil Carmody Date: Tue Jun 3 21:33:06 2014 +0300 bot.pl: cosmetic - canonicalise %opts access Nobody else uses 'quotes', so remove them here. Signed-off-by: Phil Carmody commit fcfa08d68dfa802a27bcc33d9590ba0cf1a4bc16 Author: Phil Carmody Date: Tue Jun 3 15:43:37 2014 +0300 bot.pl: canonicalise rpreport conditions Only do one thing per if(), so that all of the independent events can be handled independently of each other. Signed-off-by: Phil Carmody commit 5a6e2f186bd21af48d4b86f9ea991834f20da977 Author: Phil Carmody Date: Sun May 18 16:08:13 2014 +0300 bot.pl: Simplify penance customisation for all alignments Sometimes, you don't want to define all of PG, PN, and PE - so just use PA to define a message that applies to all alignments. Specalised ones can coexist with these universal ones. Signed-off-by: Phil Carmody commit 6824c8867b43bac4f5fbbfeb78ef65c93c2cd20b Author: Phil Carmody Date: Sun May 18 15:54:53 2014 +0300 bot.pl: add penance to stop times spiralling out of control With few players, an unlucky one with poor kit will keep losing fights, and her time to level up will exponentially grow from the losses. Prevent this spiralling out of control by pulling the player's level down by one, and resetting their clock, so they have to do the whole previous level again. They do not pass go, and do not collect 200 pounds. The message has 2 parts, first the supplication, which depends on the player's alignment, PG, PN, and PE, and secondly the penance itself, P. Defaults are provided for all of these messages if no themed ones are available. Note that the level down takes place between supplication and pennance, so that the %level% macro expands to different numbers. Signed-off-by: Phil Carmody commit c9fe31e1df8255a97de579eb7baeacb71bdc3ad4 Author: Phil Carmody Date: Fri May 16 11:15:26 2014 +0300 bot.pl: enable %level% in the same contexts as %player% It expands to their current level. %level0% and %level1% likewise in multi-player expansions. Signed-off-by: Phil Carmody commit bb1ae15c4b9deca556b7f2d936d1df8c550349b4 Author: Phil Carmody Date: Fri May 16 00:31:37 2014 +0300 bot.pl: rename fight helpers to be more obvious Signed-off-by: Phil Carmody commit 0b09d8f4c35565a5018839e4deeb9516c782c08b Author: Phil Carmody Date: Thu May 1 15:24:57 2014 +0300 bot.pl: fix extra 'and' in inventory list Added by the list helper now, no need to add manually. Signed-off-by: Phil Carmody commit 206073954d3936dab54fa41f57360aff3b9c3a51 Author: Phil Carmody Date: Tue Mar 11 02:19:56 2014 +0200 bot.pl: exit early from challenge helper if opponent is bot We can't damage it, and can't steal from it, just bail. Signed-off-by: Phil Carmody commit d23fe8881b9ca20ff4764bfe7b5a06259ecfb57c Author: Phil Carmody Date: Tue Mar 11 01:27:36 2014 +0200 bot.pl: make new_generic_battle_helper return a ratio for the score This is the proportion of the winner's score p0 won, or was defeated by. You can never win by more than your whole score, so return 1.0. You can never lose by more than your opponent's score, so return -1.0 Signed-off-by: Phil Carmody commit 4f539c4b75010c402c4f09582dd8997bee5ace47 Author: Phil Carmody Date: Mon Mar 10 12:38:35 2014 +0200 bot.pl: pull shared generic battle code into new helper Signed-off-by: Phil Carmody commit 11492c7626dbc857f7637962873088412dfa45f5 Author: Phil Carmody Date: Sun Mar 9 20:48:13 2014 +0200 bot.pl: new admin command - 'brawl' By default it's a gentleman's duel, and the winner benefits. However, with 'evil' as a modifier, it becomes an honourless brawl, and the loser will be set back. Signed-off-by: Phil Carmody commit 0b3852d30cd73b853c6d156a4feca01d92495ed4 Author: Phil Carmody Date: Sun Mar 9 13:23:59 2014 +0200 bot.pl: create a symmetrical fight helper Presently, fights are asymmetrical - one player fights another, and it's the instigator whose time changes. However, there's no "play to win" or "play to avoid a loss" symmetry. This new helper takes a flag which has the following values: -1: only time may be subtracted, from the winner. 0: as before, instigator (player 0) has his time changed. +1: only time may be added, to the loser. Of course, if the bot has to change time, which can only happen if the flag's non-zero, or he's player 0 with flag=0, then the thing's a nonsense, and in that case, just back away... Presently no hooks call this. Signed-off-by: Phil Carmody commit cbbd389f3c2f9d969d775d319ee5c49f25dfdc9e Author: Phil Carmody Date: Wed Apr 2 22:56:05 2014 +0300 bot.pl: add a new admin debugging aid 'eventtest' This will create a random event of the chosen type (GCWLHE), and echo it back. Only player and programattic replacements can be made, event specific ones (%gain%, etc) can't be, obviously. Signed-off-by: Phil Carmody commit b057bfe2998fb15bfef4f24f087d1f83963a758a Author: Phil Carmody Date: Wed Apr 2 22:54:03 2014 +0300 bot.pl: harden him()/his()/... helpers If they don't know the name, they give a generic (unknown) pronoun Signed-off-by: Phil Carmody commit 0c4b3235c28a60bd3e839952210161337ac30b47 Author: Phil Carmody Date: Wed Apr 2 22:53:23 2014 +0300 beer/events.txt: fix up new event was mangled, should squash Signed-off-by: Phil Carmody commit 4d9ce85b39b8f61102cd0d3c6841946fad37b840 Author: Phil Carmody Date: Wed Apr 2 21:35:09 2014 +0300 beer/events.txt: invent a new beer style Inspired by Marduk's comment on IRC. Signed-off-by: Phil Carmody commit 6202034c2bc6b1205862adbff166423b07770c8f Author: Phil Carmody Date: Wed Apr 2 20:18:29 2014 +0300 bot.pl,events.txt: change QI and QS macro expectations They should use the new %players% macro, not the fudged %player% one. Signed-off-by: Phil Carmody commit 283350c60e238d33c1fba09424ddd2a51cb05c32 Author: Phil Carmody Date: Wed Apr 2 19:50:43 2014 +0300 bot.pl: more use of the comma_list helper Signed-off-by: Phil Carmody commit d5b974e46416e0ce1eec0650ababe71bd544c385 Author: Phil Carmody Date: Wed Apr 2 19:13:49 2014 +0300 bot.pl: bugfix - quest reporting had duplicated elements The quest text now contains the questers and the initialisation blurb already, so duplication must be dropped from the reporting code. Signed-off-by: Phil Carmody commit 16c9791dcbdae5b62fff80d8130b0e97a7851db5 Author: Phil Carmody Date: Wed Apr 2 18:04:37 2014 +0300 bot.pl: add a %players% macro which will list expand Presently unused, but will be usable for quest events. The helper function is usable in an even broader set of contexts. Signed-off-by: Phil Carmody commit 80aced7b30c4d892e6b9921b3882b4e68cecec8e Author: Phil Carmody Date: Wed Apr 2 17:36:09 2014 +0300 bot.pl: push holiness() and evilness() through the get_event helper That way it can get all of the programattic expansion that all other events have. Signed-off-by: Phil Carmody commit 68ab76ed0053c6d9cec605cc0e97777305c04505 Author: Phil Carmody Date: Wed Apr 2 17:30:44 2014 +0300 bot.pl: change get_event so it takes a player list (by reference) That way, it can be used for multi-player events. The quests with their "a, b, c and d" lists are still treated as a single player, but that could be changed. Signed-off-by: Phil Carmody commit 11f2bc54024e5b963b710fc9fd937506452afa44 Author: Phil Carmody Date: Mon Mar 24 03:06:37 2014 +0200 bot.pl: rewrite programattic elements in quest descriptions Signed-off-by: Phil Carmody commit 55d339c20f7c8df5eb400c53f43924d3efb0e018 Author: Phil Carmody Date: Mon Mar 24 03:05:44 2014 +0200 bot.pl: split rewrite_event into 2 parts The programatics elements may want to be rewritten independently of the player aspects. Signed-off-by: Phil Carmody commit ffcc40723873aea5adec2f2e62c70a98e72e9e34 Author: Phil Carmody Date: Wed Mar 19 15:03:05 2014 +0200 beer/events.txt: accidentally a new event Signed-off-by: Phil Carmody commit 6a5b004b0e85b24565604a3a20705cc86f38415a Author: Phil Carmody Date: Wed Mar 19 14:38:18 2014 +0200 nerd/events.txt: accidentally a new event Signed-off-by: Phil Carmody commit 72383450b9c96a81ad0984e51984ebeca1ca603b Author: Phil Carmody Date: Sat Mar 15 17:14:09 2014 +0200 bot.pl: rewrite_event - in substr, use the length not the end Signed-off-by: Phil Carmody commit 325aa3935bc9085d511e305c7f25a028c6d9b324 Author: Phil Carmody Date: Sat Mar 15 17:15:05 2014 +0200 bot.pl: rewrite_events - grab macro bounds correctly Since we added .* to the beginning, $-[0] has moved. Signed-off-by: Phil Carmody commit 2bc4a2881cf2ae1bf74a00011c9fffdfbc86d16b Author: Phil Carmody Date: Sat Mar 15 14:14:18 2014 +0200 nerd/events.txt: Khyber's DDoS threat needs repeating Signed-off-by: Phil Carmody commit 33d9915867dbb0ddec3726ff80a2e20977f6c23d Author: Phil Carmody Date: Sat Mar 15 14:10:50 2014 +0200 bot.pl: enable nested computed components in events E.g. "did %{an X|a Y|a Z|%{2#+1#9}% Zs}%" Work from the inside out. Uses a leading .* which can have nasty big-Oh from backtracking in corner cases, but those are irrelevant for the kinds of sentences we'll be writing. Signed-off-by: Phil Carmody commit a255091e0c68f68eef72e04fc02e2834126d0074 Author: Phil Carmody Date: Fri Mar 14 19:26:14 2014 +0200 nerd/events.txt: previous fix was no good, interpol and UNIT are broken too Signed-off-by: Phil Carmody commit 40330631bea09f8a6a8446ac160e27bcea13f41b Author: Phil Carmody Date: Fri Mar 14 19:21:42 2014 +0200 nerd/events.txt: fix repeated word Signed-off-by: Phil Carmody commit 0867f6c81556e3abb5ad4f65d3977d0b36ce27c8 Author: Phil Carmody Date: Fri Mar 14 11:46:09 2014 +0200 events.txt,nerd/events.txt: typo cleanups Signed-off-by: Phil Carmody commit 2b009e162af58dc386dd0bec065ecf8afa2ab311 Author: Phil Carmody Date: Thu Mar 13 23:39:55 2014 +0200 bot.pl: don't capture the \n before parsing Parsing just gets rid of it anyway. Signed-off-by: Phil Carmody commit 3a95899bf0cc8e0db4385c0480cf4a1681805157 Author: Phil Carmody Date: Thu Mar 13 16:54:48 2014 +0200 bot.pl: fix collision fight probability scalar(@temp) was used to generate random numbers, so remember it; Signed-off-by: Phil Carmody commit 1d12cd9fbae72d250eb7e0e2f05563ee0a4e5109 Author: Phil Carmody Date: Thu Mar 13 16:44:23 2014 +0200 nerd/events.txt: QI message - FSF/EFF/ACLU Signed-off-by: Phil Carmody commit e712fc49365e4a875f31c7cc5eb2c5bbba9ba3e3 Author: Phil Carmody Date: Thu Mar 13 16:15:45 2014 +0200 bot.pl: move players in random order If the player hash doesn't change, the order in which players move will be fixed. That means that pA will always get to a square before pB for all A commit ca69bc3cba7d74277865c7aec4438fe0a948cb64 Author: Phil Carmody Date: Thu Mar 13 15:07:54 2014 +0200 nerd/events.txt: "Soylentology" just must be in some events The name came from MrBluze on the staff IRC channel. Signed-off-by: Phil Carmody commit 11838f2f7b7352aeea5876f93283e607466c6cc8 Author: Phil Carmody Date: Thu Mar 13 14:46:25 2014 +0200 bot.pl: bugfix - actually name the quest Signed-off-by: Phil Carmody commit 7339161fac93e16ed22877154da10160f92a60df Author: Phil Carmody Date: Thu Mar 13 00:40:44 2014 +0200 bot.pl: bugfix - fix fencepost error in map size The conf file says "width" and "height". So if it says 500, then the valid addresses are 0..499. Therefore wrap 500 to 0, and -1 to 499. Signed-off-by: Phil Carmody commit 41bc07422439bb0dfd3616eaabf1f432844f85bc Author: Phil Carmody Date: Thu Mar 13 00:16:36 2014 +0200 bot.pl: line parser simplification The s/// operator exists for a reason. Signed-off-by: Phil Carmody commit 0aef746e5efacc241a84a79b7b4e1e12e37dbd96 Author: Phil Carmody Date: Wed Mar 12 17:58:48 2014 +0200 bot.pl: delay initialisation of penalty variables Move closer to where they're used. Signed-off-by: Phil Carmody commit 760122c1e079913ad6b71f3a63b41f0d652fa586 Author: Phil Carmody Date: Wed Mar 12 16:04:51 2014 +0200 bot.pl: get quest intro from the events file, or neutral default More removal of "gods", which won't be appropriate for all themes. Signed-off-by: Phil Carmody commit e0b95d838f12dfea2682ecaeb665854b0768c05a Author: Phil Carmody Date: Wed Mar 12 14:57:16 2014 +0200 events.pl: default fantasy quest introduction sentence stashed here We'll later fetch it from here rather than it being hard coded as a string in the code. Signed-off-by: Phil Carmody commit 9d0cd0073fdf7f5ea0e09aed4e2c4e5c034bc4e6 Author: Phil Carmody Date: Wed Mar 12 13:29:33 2014 +0200 bot.pl: merge identical penalties Signed-off-by: Phil Carmody commit f6a142e5b2c4824537794658f3ddc5196b265b1a Author: Phil Carmody Date: Wed Mar 12 13:26:26 2014 +0200 bot.pl: reorder penalties to put more similar things nearer each other Signed-off-by: Phil Carmody commit c88bf10bdee14cf7d160075837df8ccbf6aa1a26 Author: Phil Carmody Date: Wed Mar 12 13:25:16 2014 +0200 bot.pl: make penalties more data driven Signed-off-by: Phil Carmody commit 4459408c0e254450d6c42312b2f12d75d3f358c6 Author: Phil Carmody Date: Tue Mar 11 00:59:55 2014 +0200 bot.pl: neutral default quest messages, and themed ones from file Signed-off-by: Phil Carmody commit 13c794c47ba5085206d7307bc8755ecf293e6b5c Author: Phil Carmody Date: Tue Mar 11 00:57:57 2014 +0200 events.txt: stow the default quest messages safely in this file We'll soon need to fetch them from here. Signed-off-by: Phil Carmody commit 1f04c492c54c832dc3b376b1da2ed43ac7034e13 Author: Phil Carmody Date: Mon Mar 10 12:56:19 2014 +0200 bot.pl: bugfix - restoring quests never worked a) Wasn't reading the right file! b) Was out by one on quester numbers (1-4 in file, 0-3 in struct). Signed-off-by: Phil Carmody commit f20be12050f48e555c1897970d263e57061536a5 Author: Phil Carmody Date: Mon Mar 10 00:45:25 2014 +0200 bot.pl: bugfix - restore prior challenge/collision alignment behaviour Bug, removing distinction between challenge and collision, was introduced here: commit 9e3fc28a94d2f9512473ae786dc6dc2deb829e1f Author: Phil Carmody Date: Sun Mar 9 14:28:16 2014 +0200 bot.pl: pass string to generic fight function rather than flag Signed-off-by: Phil Carmody commit e2e78edc48aee0fb709e5961ffbcbbb5a50c90b9 Author: Phil Carmody Date: Sun Mar 9 20:58:12 2014 +0200 nerd/events.txt: two new weenie-riot quests Which OO language is better? Which init system is better? Flame on! Signed-off-by: Phil Carmody commit 0b2285e01f782131f1a9e85dc777b86846384bcf Author: Phil Carmody Date: Sun Mar 9 14:53:09 2014 +0200 bot.pl: bugfix - the bot doesn't have a gender Can't use the them() funcion on it, as it has no %rps entry. This seems to be the only caller that can have $primnick as a player name, so we can keep the core helpers simple and naive. This was a horrible bug, the them() function was causing an %rps record to be created for thebot, which was causing deep recursion in itemsum later. Signed-off-by: Phil Carmody commit 091bc69a88fc173947adb4d313a167ab615bcd80 Author: Phil Carmody Date: Sun Mar 9 14:29:53 2014 +0200 bot.pl: simplify opponent selection in challenge Simply select from all online players, and then substitute the bot if you pick yourself. Signed-off-by: Phil Carmody commit 9e3fc28a94d2f9512473ae786dc6dc2deb829e1f Author: Phil Carmody Date: Sun Mar 9 14:28:16 2014 +0200 bot.pl: pass string to generic fight function rather than flag Permits more types of challenge/collision/etc. Signed-off-by: Phil Carmody commit 70c058d5031766948082723352c0ca8967cbe06d Author: Phil Carmody Date: Sun Mar 9 03:33:44 2014 +0200 nerd/events.txt: a few more calamities and godsends Signed-off-by: Phil Carmody commit 4bc33c10de55427da31fdc015cc5969d76cb1794 Author: Phil Carmody Date: Sun Mar 9 02:59:07 2014 +0200 nerd/items.txt: use some of the new spangly bot features for types multi-delta programattic expressions for RAM %type% in several places %notype% for core storage Also added a new unique modem (tachyonic antitelephone, one of einstein's) Signed-off-by: Phil Carmody commit 7624e6e6ef5b8b64603407f0624ba66e63c5e5d4 Author: Phil Carmody Date: Sun Mar 9 02:11:45 2014 +0200 bot.pl: enable marking type-aliases with %notype% to avoid repetition If the type is coffee machine, then a unique civet will not contain that type word, and must never be suffixed with that word. So add %notype% to prevent addition of the type ever. Signed-off-by: Phil Carmody commit 7cd31c228e788228819810144b5bb4ba0f113d75 Author: Phil Carmody Date: Sun Mar 9 02:05:56 2014 +0200 bot.pl: enable forced upper casing of %type% replacement type => object verbatim (presumed lower case) Type => Object (made title case) TYPE => OBJECT (made all caps) Signed-off-by: Phil Carmody commit 0f07941ecb0caa29d3da8d807a62d22d984cc3ab Author: Phil Carmody Date: Sun Mar 9 00:11:46 2014 +0200 bot.pl: make character initialisation order the same First the common fields, then the fields which will be different between offline owner account creation and online user account creation. Signed-off-by: Phil Carmody commit 81731ff5d957629327cd7cdc4a67ceb58332152f Author: Phil Carmody Date: Sun Mar 9 00:04:19 2014 +0200 bot.pl: use helper variable to reduce noise in account creation This makes it more similar to the owner account creation. Note, the whole block has changed whitespace indentation. No functional changes. Signed-off-by: Phil Carmody commit b8c356de0668376d7ee624a06ba756a082d31579 Author: Phil Carmody Date: Sat Mar 8 22:39:37 2014 +0200 bot.pl: merge the two 1-on-1 fights into one function They were clearly copy-pasted in the first place, as the collision fight used to check whether you were colliding with the bot! Parametrise them - the only differences are the relevance of alignment on critical strikes (why? is that just oversight due to unnecessary duplication of the code?) and the message: "came upon" vs. "challenged". Only preserving the former due to back-ass-ward compatibility. Signed-off-by: Phil Carmody commit 4b91028177306c87870b65410cd4b1d25f3bdd0a Author: Phil Carmody Date: Sat Mar 8 02:24:25 2014 +0200 bot.pl: for programmatic levels, permit sets of deltas Basically, this is so that I can go 2,3,4,6,8,12,16,24,32,48,... That alas requires scale values of *1.33333 and 1.5, which means that the delta precision is no longer the desired precision. Therefore set the max precision in such cases from the initial value's precision, not the delta's. Signed-off-by: Phil Carmody commit 7df3d85a2cc10c270ba6c0bcfc6b37d5e1510f41 Author: Phil Carmody Date: Sat Mar 8 01:54:08 2014 +0200 nerd/items.txt: migrate to new description != enemies' reaction format Signed-off-by: Phil Carmody commit cddf1643c767d035743d7d306bc3acbf784aba8c Author: Phil Carmody Date: Sat Mar 8 01:51:35 2014 +0200 bot.pl: split the enemies' reactions from the unique description Has backward compatibility with old items.txt files, but introduces an enemies' reaction field. Old style files will have their sentences automatically separated when reading them in. Signed-off-by: Phil Carmody commit 96af9d2b4424dd2b6af8719bd6a193264e98e4b8 Author: Phil Carmody Date: Sat Mar 8 00:39:13 2014 +0200 bot.pl: pull article and saytype handling out of leaf functions This permits item_describe to do all the logic for both uniques and plain items. It also means the clients don't need to select 'a' or 'the' as the article. Alas the full description of uniques, i.e. the "your enemies swoon..." bit, is messing up the interface, and one client can't use the item_describe interface, having to go straight to unique_describe to get the "full" description. That's lame. The description should be split. Signed-off-by: Phil Carmody commit d990cc968e25dce38dfb6626f4d3d251e7874faf Author: Phil Carmody Date: Fri Mar 7 18:58:39 2014 +0200 nerd/items.txt: add some %type% markers to unique descriptions Signed-off-by: Phil Carmody commit 1781d9111be6120f113ad333af7e04d07a6bd4c0 Author: Phil Carmody Date: Fri Mar 7 18:54:02 2014 +0200 bot.pl: unique_describe detects and replaces type descriptors And then only appends the type descriptor if needed. Signed-off-by: Phil Carmody commit c90d38df9f403798de01fdfc8ea26c2f0ef71608 Author: Phil Carmody Date: Fri Mar 7 18:46:01 2014 +0200 bot.pl: add a saytype parameter to item_describe And to all the helpers it calls too. This is because we don't want to return a value to the caller to tell it whether we said the type or not when expanding a unique's name, so it should just tell us to append the type if it's sure it needs it. item_describe's helpers can then decide if they've already said enough, in which case they don't need to say the type, or if they haven't, in which case they do appent the type. Currently, nothing actually detects the types in the names, so there should be no visible changes. Signed-off-by: Phil Carmody commit 64d439651f3cb24116e8450ad6fdf8973db450b0 Author: Phil Carmody Date: Fri Mar 7 18:16:40 2014 +0200 bot.pl: loosen uniq_describe interface to take struct rather than desc From struct, we can get all the other info that we might need, such as the type. That will be useful later when we need to ensure the type is in the description. Signed-off-by: Phil Carmody commit c0acb8c2bea9551b0b2cde31f273f0f9ee0b4965 Author: Phil Carmody Date: Fri Mar 7 18:07:58 2014 +0200 bot.pl: fix caller to item_describe - should squash Signed-off-by: Phil Carmody commit c43e865e35ed63a2a0106e9f88144e36b4ad4f00 Author: Phil Carmody Date: Fri Mar 7 17:58:53 2014 +0200 bot.pl: improve plain_describe readability Comment interface, and explicitly name the 2nd parameter ($level). Signed-off-by: Phil Carmody commit cce11c792cde11189eb2f58004d0baff4cd66718 Author: Phil Carmody Date: Fri Mar 7 17:53:28 2014 +0200 bot.pl: improve item describe function names The helpers to item_describe also describe. Make that clear. Clarify the interface with some comments too. Signed-off-by: Phil Carmody commit 814b797d94de00a45bb049f7bdf0bc3a91800db3 Author: Phil Carmody Date: Fri Mar 7 14:02:41 2014 +0200 nerd/events.txt: some new nerdy events Mostly C/G, but promoted the Linus C to be a L. Signed-off-by: Phil Carmody commit cd211248d38d864364e892d27dfccf64dc220d0e Author: Phil Carmody Date: Thu Mar 6 18:33:07 2014 +0200 bot.pl: permit users to change their class If you're logged in, and you had full permission to chose your class in the first place, then you should be permitted to change it. IMHO. Requested-by: mattie_p on #Soylent Signed-off-by: Phil Carmody commit fe49929dec7f71a6bbfe8a36a5382fa772d98c7c Author: Phil Carmody Date: Thu Mar 6 18:31:53 2014 +0200 bot.pl: remove redundant logged in calls Signed-off-by: Phil Carmody commit 35fdfcc79c2cfb476b8b83539dd70e7dd56435aa Author: Phil Carmody Date: Thu Mar 6 18:24:51 2014 +0200 bot.pl: new quick logged-in checker Belt and braces at the moment, the old checks remain redundantly. Signed-off-by: Phil Carmody commit 602032aa84eb07c0cd079db3d1f2ae7144c187b9 Author: Phil Carmody Date: Thu Mar 6 18:23:14 2014 +0200 bot.pl: remove undefined variable warning from admin permission checker Signed-off-by: Phil Carmody commit e2d38f9c31b2ccde0f1c04fa985e6d8bdb557120 Author: Phil Carmody Date: Wed Mar 5 12:39:01 2014 +0200 bot.pl: prepare for expanded gamut of checks for message permissions Presently, it's just admin-related, but we could also demand that they are simply logged in. Signed-off-by: Phil Carmody commit 56df1dc3ad7f7d30aae02ebbf24d00343d266ae6 Author: Phil Carmody Date: Wed Mar 5 12:09:58 2014 +0200 bot.pl: throw away redundant ha() checks The data-driven function works fine, this boilerplate is unneccessary now. Signed-off-by: Phil Carmody commit 5a7ec576d87bf31169c27f372e4e9a6a9c48755f Author: Phil Carmody Date: Wed Mar 5 11:54:17 2014 +0200 bot.pl: extract admin checks into data-driven helper Signed-off-by: Phil Carmody commit 5168ebf8fd9c0545420ea46c62ba11ea3dd4b34a Author: Phil Carmody Date: Fri Mar 7 13:20:04 2014 +0200 bot.pl: friendlier quit/restart messages The admin can give a reason for the die/restart if he sees fit. Also, the message doesn't need the admin's whole ident, only the nick, as people can /whois on that if they really care (and if the admin is somehow cloaked frmo whois, then we should respect that). Signed-off-by: Phil Carmody commit 62a270179318ef7c1f1b84199f18142ea539af19 Author: Phil Carmody Date: Fri Mar 7 13:01:46 2014 +0200 bot.pl: use current branch, not master in updates check Also, we don't ever use the script directory per se, only the git directory, so just call it that and append .git. Signed-off-by: Phil Carmody commit 7d2578ab98454015435f2f4114286efa9cf6c185 Author: Phil Carmody Date: Fri Mar 7 13:00:31 2014 +0200 bot.pl: put spaces into ($) prototypes, it confuses emacs It thinks $) is a variable, and gets the bracked matching wrong. Signed-off-by: Phil Carmody commit 2717bdd4e8decf9a2f139c90d2653ed9dd316fa5 Author: Phil Carmody Date: Fri Mar 7 11:45:03 2014 +0200 bot.pl: don't pass references to privmsg in peval Ensure we stringify, or we won't be able to do the substr() in privmsg without the warning: "Attempt to use reference as lvalue in substr at ../bot.pl line 1770." Signed-off-by: Phil Carmody commit 619383729e4d8c73ebf48ace4ed3f8660d6f6d88 Author: Phil Carmody Date: Thu Mar 6 18:07:47 2014 +0200 bot.pl: reverse logout logic If you're not logged in, this is just a failure to do a command as with any other command. The penalty is the real payload. Signed-off-by: Phil Carmody commit 56606d9c41dfca7ed4859dd0e10bbe08f6ba49d8 Author: Phil Carmody Date: Wed Mar 5 01:09:32 2014 +0200 bot.pl: canonicalise trailing semicolons in blocks Without them, emacs misindents, keep them all the same. Signed-off-by: Phil Carmody commit 37923db4f3a1114ab0f8333e13f0c7d0dd6b279a Author: Phil Carmody Date: Tue Mar 4 20:57:29 2014 +0200 bot.pl: make the +v count match the nick list length Nearly fixed in: commit 0e7a55fb42339b4d4e55813e3a35ff3e780d6588 Author: Phil Carmody Date: Mon Oct 10 14:01:26 2011 +0300 bot.pl: silence uninitialised value warning in +v line This final change was the obvious way to make the code perfect. I was reminded of this issue by: http://idle.quyo.de/patches/irpgbot.v3.1.2/irpgbot.v3.1.2+voice.patch but that patch is very clumsy in comparison. Signed-off-by: Phil Carmody commit 4e1aa81153e704dbeaaa98b5058ce2a3e12f65e2 Author: Phil Carmody Date: Mon Mar 3 10:45:49 2014 +0200 bot.pl: fix dropped unique decay type mismatch When a unique is dropped, the level will be a string not a number. This causes a "not numeric" warning. Signed-off-by: Phil Carmody commit 0d8f539e4c4b9417a512c8418c6f8a2d44f3ceed Author: Phil Carmody Date: Sun Mar 2 16:20:15 2014 +0200 bot.pl: add inventory command Signed-off-by: Phil Carmody commit 07d3b08886e07742ae7a4561aa1df098a92971e3 Author: Phil Carmody Date: Sun Mar 2 16:07:37 2014 +0200 bot.pl: fix exchange_object critical bug Function name was wrong. Introduced here: commit 0e6f45fdad10f03a7214757f4a7f8e42932dc94d Author: Phil Carmody Date: Tue Feb 25 19:14:03 2014 +0200 bot.pl: dropped items - preparation - pick up left items Signed-off-by: Phil Carmody commit e801411fc1e609f7bc8641bc00d997f1ce6e4a03 Author: Phil Carmody Date: Sun Mar 2 16:00:54 2014 +0200 bot.pl: parameterise status code to cover both cases Signed-off-by: Phil Carmody commit 1cd45d50d4690a1df9fc9dfbacb8aaebce4aaaca Author: Phil Carmody Date: Sun Mar 2 15:55:28 2014 +0200 bot.pl: fix help for gender command Signed-off-by: Phil Carmody commit 774367e121dcb67148cc886fc4a1ba473446eb9f Author: Phil Carmody Date: Wed Feb 26 21:45:43 2014 +0200 bot.pl: add the commit id to the version string in the info message FatPhil doesn't do releases /per se/ yet, so the commit id is all that really matters. Signed-off-by: Phil Carmody commit 891b759526d29d7e5522f71db2781b5a339f5fe1 Author: Phil Carmody Date: Wed Feb 26 21:37:32 2014 +0200 bot.pl: make current hash visible Leave undefined if not version checking, but otherwise, let the value be visible to the rest of the code. Signed-off-by: Phil Carmody commit 210b8d41cb17865b547af0b0fcb9f7e63210cb92 Author: Phil Carmody Date: Wed Feb 26 21:36:46 2014 +0200 bot.pl: fix description of current item when rejecting new one Lost the unique info. Signed-off-by: Phil Carmody commit b3e58592fbe050bb40e6ac83c5ac44c4d58b05ab Author: Phil Carmody Date: Wed Feb 26 21:11:12 2014 +0200 bot.pl: make itemlevel debug helper also recognise uniques -> itemlevel 8 86 <- itemlevel(8,86) = linux 3.33 OS -> itemlevel 86b <- itemlevel(8,86b) = level 86 Linus's final bug-free Ready for the Desktop version of linux OS Signed-off-by: Phil Carmody commit e3eed6e75a89c366468ad67602d56a4e7a0d9aa5 Author: Phil Carmody Date: Wed Feb 26 15:14:26 2014 +0200 bot.pl,irpg.conf: settable frequency of top players list Defaults to 36000s (10 hours), but can be set to a different value in the config file. Suggested-by: stdhell (stderr) on #Soylent Signed-off-by: Phil Carmody commit 6a069ba918e271f7f9118cad425d044afddaf676 Author: Phil Carmody Date: Wed Feb 26 13:50:21 2014 +0200 bot.pl: make rpreport periods more flexible Adding selfclock wasn't a fair representation of the amount of time that had elapsed, as some of the jobs took time. Therefore add real elapsed time rather than theoretical elapsed time. This makes the residue modulo the various periods able to wrap past 0 without being 0. So just throw away the fractions, and look at how many big steps have been made. Based-on: http://idle.quyo.de/patches/irpgbot.v3.1.2/irpgbot.v3.1.2+skew.patch by Markus John [johm@quyo.de], Christian Schuster [blackout@s2000.ws] But unlike their "look for the fractional part to go backwards" method, mine has no failure modes. Signed-off-by: Phil Carmody commit 37cd2a41ab1a982bc5c013da12695efad975a821 Author: Phil Carmody Date: Tue Feb 25 19:17:45 2014 +0200 bot.pl: dropped items - actually drop things Two cases of taking a new better item in hand and dropping the old one. One case of simply dropping a crummy unwanted item. Signed-off-by: Phil Carmody commit 53666ba46dc751440bbfee50ffd0a25acd738904 Author: Phil Carmody Date: Tue Feb 25 19:16:36 2014 +0200 bot.pl: dropped items - preparation - turn on decay Still, nothing can be dropped, so nothing happens. Signed-off-by: Phil Carmody commit aaeca7441f7d718a7097c18b9f00e8f7097bd2f6 Author: Phil Carmody Date: Tue Feb 25 19:15:12 2014 +0200 irpg.conf: dropped items - preparation - default disabled config options Even if you enable these, still nothing's dropped. Signed-off-by: Phil Carmody commit 0e6f45fdad10f03a7214757f4a7f8e42932dc94d Author: Phil Carmody Date: Tue Feb 25 19:14:03 2014 +0200 bot.pl: dropped items - preparation - pick up left items Nothing can yet be on a map, so this still does nothing. Signed-off-by: Phil Carmody commit ad2cbe92c4450b83dc4fa4ee45bd5c9b162c7d37 Author: Phil Carmody Date: Tue Feb 25 19:11:13 2014 +0200 bot.pl: dropped items - preparation - load and save code In the absense of config options, these will return without doing anything. Signed-off-by: Phil Carmody commit d044e58e0a152121803bb320317f019395b70585 Author: Phil Carmody Date: Tue Feb 25 19:08:39 2014 +0200 bot.pl: dropped items - preparation - helpers to manage the hash Not called yet from anywhere. Signed-off-by: Phil Carmody commit abd587646000f25b6a8bc2eaacede4a9b4952f6a Author: Phil Carmody Date: Tue Feb 25 19:03:15 2014 +0200 bot.pl: remove unused dropped junk items code Gonna replace it with something functional. Signed-off-by: Phil Carmody commit 892806fc8658c49aad53ceee0b2f8d1b3342fd4f Author: Phil Carmody Date: Tue Feb 25 18:53:09 2014 +0200 bot.pl: fix silly extra recursion in itemsum No point calling the function twice back to back. Signed-off-by: Phil Carmody commit 03d362e379e8b9e1249cb587e74784c4a368d710 Author: Phil Carmody Date: Tue Feb 25 18:47:58 2014 +0200 bot.pl: pull item level->value conversion into a helper function Signed-off-by: Phil Carmody commit 5f4856c2fc44a92637172dbddd558d4f0419f0ee Author: Phil Carmody Date: Tue Feb 25 02:03:31 2014 +0200 bot.pl: move complex penalty calculation into common path No point repeating the expression everywhere. Signed-off-by: Phil Carmody commit 6d21754423629e0e92eb753a5ba0811a2099c357 Author: Phil Carmody Date: Tue Feb 25 02:01:22 2014 +0200 bot.pl: add ttl helper to calculate times Based-on: http://idle.quyo.de/patches/irpgbot.v3.1.2/irpgbot.v3.1.2+ttl.patch by Markus John [johm@quyo.de], but that patch has an error in that it calculates the previous level's delay, not the coming level's delay. It therefore changes the code. My patch does not change the behaviour of the code. Signed-off-by: Phil Carmody commit dfce34026fc5a1cc9097d8705261cffc1b9b2d39 Author: Phil Carmody Date: Tue Feb 25 01:04:16 2014 +0200 bot.pl: move local variable $ulevel into tighter scope in find_item Signed-off-by: Phil Carmody commit fff3594a5a51a3bc3c56035c1cb43f9f4111a3f6 Author: Phil Carmody Date: Tue Feb 25 00:12:24 2014 +0200 bot.pl: permit config file to have solitary keys with no value Based-on: http://idle.quyo.de/patches/irpgbot.v3.1.2/irpgbot.v3.1.2+config.patch by Christian Schuster [blackout@s2000.ws] Signed-off-by: Phil Carmody commit 911392a8a1abf5a6736751d741d4ff555999d9c0 Author: Phil Carmody Date: Tue Feb 25 00:11:35 2014 +0200 bot.pl: move local vars into a smaller block key and val are only used inside the block, move them there. Signed-off-by: Phil Carmody commit 802d6dac32a6b4d474f474714dca8962f82830c8 Author: Phil Carmody Date: Tue Feb 25 00:08:14 2014 +0200 bot.pl: fix uninitialised variable bug in ha() Can't interpolate an undef into a string without a warning. Signed-off-by: Phil Carmody commit b2c8b38056f8d86c6533b9bf33cd0079b628dc5b Author: Phil Carmody Date: Tue Feb 25 00:01:54 2014 +0200 bot.pl: fix horribly verbose unique item description in modify Would use the full description, which is just noise in that context. Issue was introduced in commit a76002565e9eb25b3f7b682e5b2a02aa2324289c Author: Phil Carmody Date: Thu Feb 9 21:11:37 2012 +0200 bot.pl: modify_item names unique items Signed-off-by: Phil Carmody commit faf8532f55255dc631207eb0ab7e54deeeb52fb7 Author: Phil Carmody Date: Tue Feb 25 00:00:16 2014 +0200 bot.pl: move change strings into smaller blocks One's used in one half of the if, the other's used in the other. Move them there. Signed-off-by: Phil Carmody commit 2ba8be4dc2d56a11518851660b33908e57eb2baf Author: Phil Carmody Date: Mon Feb 24 23:19:16 2014 +0200 bot.pl: fix nick length change error The old name must be replaced, the length being used in the substr was the new length. The s/// operator's a much easier way to fix this. Based-on: http://idle.quyo.de/patches/irpgbot.v3.1.2/irpgbot.v3.1.2+nick.patch by Christian Schuster [blackout@s2000.ws] Signed-off-by: Phil Carmody commit 457cce76d7889c5b1927ced9f5aa62a41c518af6 Author: Phil Carmody Date: Mon Feb 24 19:06:02 2014 +0200 bot.pl: tweak a/an article usage Most obvious when saying "A 8-year old vintage gueuze", etc. Regexp was a hacked-down version of the logic in: http://search.cpan.org/dist/Lingua-EN-Inflect/lib/Lingua/EN/Inflect.pm#PROVIDING_INDEFINITE_ARTICLES Signed-off-by: Phil Carmody commit 398481bab24d0287effb55d5d6e6f43d6c729b85 Author: Phil Carmody Date: Mon Feb 24 18:27:01 2014 +0200 beer: remove .irpg.conf It should never have been in the repo in the first place. Signed-off-by: Phil Carmody commit f5ba74910c9bbf012c992d1d26cc61f07c8d8e2c Author: Phil Carmody Date: Mon Feb 24 18:04:17 2014 +0200 nerd/events.txt: add SN-suggested calamity LKML Suggested-by: Landon on #Soylent Coffee Suggested-by: mattie_p on #Soylent Signed-off-by: Phil Carmody commit 9d8aa98b113fa660d9966916cb387a290e16f386 Author: Phil Carmody Date: Mon Feb 24 17:54:28 2014 +0200 bot.pl,events.txt: configurable evilness event Signed-off-by: Phil Carmody commit b9497ab9c797d4468e727f91ed3293531c3b4a22 Author: Phil Carmody Date: Mon Feb 24 17:46:10 2014 +0200 bot.pl: use rewrite helper in holiness rename local variable to something less clumsy in the process. Signed-off-by: Phil Carmody commit d2974bd9bbf23a02114558b214564ab71a5d7878 Author: Phil Carmody Date: Mon Feb 24 16:14:44 2014 +0200 bot.pl: fix unique message config The players' alignments are lower case. Signed-off-by: Phil Carmody commit 5250399e9da0750f91a9a92e8cb227f5cde64473 Author: Phil Carmody Date: Mon Feb 24 15:25:26 2014 +0200 bot.pl: merge all item swapping instances with a parameterised message Signed-off-by: Phil Carmody commit a822b257afeef6988e7f7885a358a2242c89e813 Author: Phil Carmody Date: Mon Feb 24 15:12:57 2014 +0200 bot.pl: fix rewrite helpers "" isn't a valid index, but we can prefix all numbers with a 0. Signed-off-by: Phil Carmody commit 42f8c00ec2b901bea5c9761c8c8bb669b7eb8459 Author: Phil Carmody Date: Mon Feb 24 14:54:17 2014 +0200 bot.pl: create rewrite helpers This makes it easier for more strings to be parameterised, and interpolated consistently. Signed-off-by: Phil Carmody commit fd036beb82744ad1b51c03b7f5d89fe8cfa3c6a3 Author: Phil Carmody Date: Mon Feb 24 14:19:51 2014 +0200 nerd/events.txt: fix ambiguous %her% %her% matches the posessive (his/her/their) first, so can't be the object (him/her/them) as well. Signed-off-by: Phil Carmody commit d6dc22bbdbc555fe42dbe903dc71b9f1e8b45b97 Author: Phil Carmody Date: Mon Feb 24 13:27:00 2014 +0200 bot.pl: refactor swap_items functionality There's another swap, not related to fights, but that requires changing the message. Signed-off-by: Phil Carmody commit af6f91c9058d1221a8270b605f556c1e797d1333 Author: Phil Carmody Date: Mon Feb 24 12:41:53 2014 +0200 nerd/events.txt: a couple more calamities shock sites Signed-off-by: Phil Carmody commit 47d328d40a5b63a91221fee3c5e7af8777b9fa05 Author: Phil Carmody Date: Mon Feb 24 12:02:14 2014 +0200 nerd/events.txt: 3 different unique acquisition messages Signed-off-by: Phil Carmody commit 15be41166c84648f9c09396618135a31cf0d99c9 Author: Phil Carmody Date: Mon Feb 24 11:52:00 2014 +0200 bot.pl: truncate unique descriptions Except when they're first handed out. Is this an improvement? Signed-off-by: Phil Carmody commit 16653f69fff0bcd71d97b3c0f60561d9e0cc71bb Author: Phil Carmody Date: Mon Feb 24 11:47:33 2014 +0200 nerd/items.txt: improve grammer of uniques They have to be able to follow "his " and "a "; Signed-off-by: Phil Carmody commit db793e9506c2b2540ceaf15e53a327e4a6790c9a Author: Phil Carmody Date: Mon Feb 24 11:23:48 2014 +0200 bot.pl/events.txt: pull unique object message out to events file Default secular message is terribly neutral, but you can now customise the message for the three different alignments. UG, UN, and UE prefix the three. U can be used to define all three in one go. Signed-off-by: Phil Carmody commit d8d81030bf5f0054546bbb4d2025eec7e1dd5c9c Author: Phil Carmody Date: Mon Feb 24 11:10:34 2014 +0200 nerd/items.txt: add some more uniques Removed 'p2', alas, as most people didn't work at Nokia! Signed-off-by: Phil Carmody commit 1c575b7f2733f13c62b6f6ae4e85d9c13d1a63f0 Author: Phil Carmody Date: Sun Feb 23 18:04:17 2014 +0200 bot.pl: let unique_notice know who the user affected is That way it can modify what it says depending on gender/alignment Signed-off-by: Phil Carmody commit c56661efe5ddc0167f9f074058cd316cb04efccf Author: Phil Carmody Date: Sun Feb 23 17:41:44 2014 +0200 bot.pl: add a gender-aware were() helper - he/she/it was, they were. Signed-off-by: Phil Carmody commit 5ebf6cd8c1fb49d9c0f2e69db82d25ada3da92fc Author: Phil Carmody Date: Sun Feb 23 17:33:46 2014 +0200 bot.pl: simplify item swapping code (fights & stealing) In the process, make sure we use the most powerful helpers available to simplify the code. Note - two chunks of code now become identical. Signed-off-by: Phil Carmody commit 8ba3ef416e3da896b6fe69baa3e080be90185e25 Author: Phil Carmody Date: Sun Feb 23 16:53:01 2014 +0200 beer/events.txt: expand the calamities Signed-off-by: Phil Carmody commit 0863148644b38d010c0b25a5be4d8d68e780581e Author: Phil Carmody Date: Sun Feb 23 16:52:16 2014 +0200 nerd/events.txt: Add some holiness events - FSM themed Signed-off-by: Phil Carmody commit 8c79a317a1bac78dda55f0e63d1a40075f26d519 Author: Phil Carmody Date: Sun Feb 23 16:40:28 2014 +0200 beer/events.txt: add a holiness event Signed-off-by: Phil Carmody commit 028dee2b282246fc1eef729561804491bbfdcc3a Author: Phil Carmody Date: Sun Feb 23 16:35:06 2014 +0200 bot.pl,events.txt: move fantasy holiness into events file Put a non-descript holiness as the default. Signed-off-by: Phil Carmody commit 43e1f6664afe0682c2ec3e28ca30f9a21509a87d Author: Phil Carmody Date: Sun Feb 23 16:08:31 2014 +0200 bot.pl: extract holiness message into parametrised global variable This way we can overwrite it from the config file. Signed-off-by: Phil Carmody commit fedcae1b7b91a2d33394ddc681b2178ef21a2603 Author: Phil Carmody Date: Sun Feb 23 15:18:10 2014 +0200 bot.pl: rename goodness to holiness Going to bubble goodness and evilness into the events file. Therefore need 2 unclaimed letters, and G's taken. so H and E they will be. Signed-off-by: Phil Carmody commit c0360a0bd22b1927164d14a454a657ce6b8fdab2 Author: Phil Carmody Date: Sun Feb 23 14:18:08 2014 +0200 nerd/events.txt: A few more modern nerdy calamaties and godsends Signed-off-by: Phil Carmody