some oot stuff

diff --git a/app/Models/ChatLib.php b/app/Models/ChatLib.php
index d6a7ffcbbe7906bef5ae3e25b40cdf0e080cad71..c2023946c04bf71ff8817dd1ba322d909c6939e1 100644 (file)
--- a/app/Models/ChatLib.php
+++ b/app/Models/ChatLib.php
@@ -344,60 +344,92 @@ class ChatLib {
                        'aga(hnim)?',
                        'armos( knights)?',
                        'arrghus',
+                       'barinade',
                        'blind',
-                       'ganon(dorf)?',
+                       'bongo bongo',
+                       '(king )?dodongo',
+                       '(phantom )?ganon(dorf)?',
+                       '(queen )?gohma',
                        'helma',
                        'kholdstare',
                        'lanmo(las)?',
                        'moldorm',
+                       'morpha',
                        'mothula',
                        'mott[ei]',
                        'trinexx',
+                       'twin ?rov(a|er)',
                        'vit(reous|ty)',
+                       'v[ou]lvagin?a',
                ],
 
                'zd' => [
                        'eastern',
+                       'dm?c',
+                       'deku( tree)?',
                        'desert( palace)?',
+                       'fire ?(temple)?',
+                       'forest ?(temple)?',
                        'gt',
+                       'gtg',
                        'hera',
-                       'ice ?(palace)?',
+                       'ice ?(cavern|palace)?',
+                       'jabu ?(jabu)?',
                        '(misery )?mire',
                        'pod',
+                       'shadow ?(temple)?',
                        'skull ?woods',
+                       'spirit ?(temple)?',
                        'swamp',
-                       'thieve\'?s\'? ?town',
+                       'thie(f|ve)\'?s\'? ?town',
                        'tr',
                        'tt',
+                       'water ?(temple)?',
                ],
 
                'zi' => [
+                       '(fire|ice|light) arrows',
+                       '(magic )?beans',
+                       'biggoron|bgs',
                        '(big|small|retro|generic) ?keys?',
                        'b[oö]gen',
                        'bombos',
-                       'boots',
+                       'bomb( ?bag|chuus?|s)',
+                       '(hover|iron)? ?boots',
                        'bottle',
                        'bows?',
                        'bugnet',
                        'byrna',
                        'cape',
+                       '(deku )?(stick|nuts)',
+                       'din\'?s( fire)?',
+                       'double defense',
                        'ether',
+                       'farore\'?s( wind)?',
                        'flasche',
                        'flippers',
                        'fl[uö]te',
                        'frod',
-                       '(gloves?|mitts|handschuhe?)',
+                       'frogs? ?(2|two)?',
+                       '(gloves?|mitts|handschuhe?|strength)',
                        '(half|quarter) ?magic',
                        'hammer',
-                       'hookshot',
+                       '(hook|long)shot',
+                       'hovers',
                        '(ice|fire) ?rod',
+                       'irons',
+                       'k(okiri)?-?sword',
                        'lampe?',
-                       'laser ?bridge',
+                       'lens( of truth)?',
+                       '(ruto\'?s )letter',
+                       'lights',
+                       'lullaby',
                        'mearl',
                        'mirror',
                        'moon ?pearl',
                        'mushroom',
                        'ocarina',
+                       'p(er|re)scription',
                        'pilz',
                        'powder',
                        'puder',
@@ -406,18 +438,25 @@ class ChatLib {
                        '(red|green|blue) ?(goo|potion)',
                        '(red|green|blue|baby) ?mail',
                        '(red|blue|bu|boo|good|bad|both)merang',
+                       '(gold|silver)? ?scale',
                        'schaufel',
                        '(gro(ss|ß)er? |kleiner? )?schlüssel',
                        'schwert',
+                       '(deku|hylian|mirror)? ?shield',
                        'shovel',
                        'silvers',
+                       '(slingshot|zwille)',
                        'somaria',
                        'spiegel',
+                       'stone( of agony)?',
+                       'storms',
                        'sword',
+                       '(red|green|blue|goron|zora)? ?tunic',
                ],
 
                'zl' => [
                        'big chest',
+                       '(bomb ?chuu )?bowling',
                        'bumper( cave)?( ledge)?',
                        '(hyrule)? ?castle ?(tower)?',
                        'catfish',
@@ -428,9 +467,15 @@ class ChatLib {
                        'desert( ledge)?',
                        'dig(ging)? ?game',
                        '((back|front) of )?escape',
+                       '(child|adult)? ?fishing',
+                       '(arrow|chest|fishing) (mini ?)?game',
+                       '(open|storms)? ?grotto',
                        'gyl',
                        'hobo',
                        'hook ?(shot) cave',
+                       'kak(ariko)',
+                       'lake hylia',
+                       '(laser|rainbow) ?bridge',
                        'lava ?chest',
                        '(light|dark) ?world',
                        'lss',
@@ -441,10 +486,14 @@ class ChatLib {
                        'red bomb',
                        'sahasrahla',
                        'sasha',
+                       'sfm',
+                       '([1-5]0 )?skulls',
                        'sick kid',
                        'stumpy',
                        'tile ?room',
+                       'temple of time',
                        'torch',
+                       '(gerudo )?valley',
                        'zora( ledge)?',
                ],
        ];

diff --git a/app/TwitchBot/TokenizedMessage.php b/app/TwitchBot/TokenizedMessage.php
index 8cf83ba3892a0d48f91e76e9b45e454e68d7cca4..ca51451d37d2480930bbe3a9bd5238fdb0b44730 100644 (file)
--- a/app/TwitchBot/TokenizedMessage.php
+++ b/app/TwitchBot/TokenizedMessage.php
@@ -326,7 +326,7 @@ class TokenizedMessage {
                                $this->classification = 'kappa';
                        } else if ($this->startsOrEndsWithRaw(['o7']) || $this->hasEmoteThatContains('salut')) {
                                $this->classification = 'o7';
-                       } else if (!$this->isLong() && ($this->containsRaw(['haha', 'hehe', 'hihi', 'kekw', 'lol', 'lul']) || $this->hasTokenThatStartsWith(['xd']) || $this->hasConsecutiveTokens([':', 'd']))) {
+                       } else if (!$this->isLong() && ($this->containsRaw(['dekw', 'haha', 'hehe', 'hihi', 'kekw', 'lol', 'lul']) || $this->hasTokenThatStartsWith(['xd']) || $this->hasConsecutiveTokens([':', 'd']))) {
                                $this->classification = 'lol';
                        } else if (is_numeric($this->raw)) {
                                $this->classification = 'number';