From c655c5b3e5f78d72a1946ff15a1812458a55312d Mon Sep 17 00:00:00 2001
From: zikaeroh <48577114+zikaeroh@users.noreply.github.com>
Date: Sat, 23 May 2020 21:19:22 -0700
Subject: [PATCH] Fix multi word phrases

---
 internal/words/static/codenames/default.txt |  14 +--
 internal/words/static/codenames/duet.txt    |  27 ++---
 internal/words/static/esc.go                | 105 ++++++++++----------
 3 files changed, 67 insertions(+), 79 deletions(-)

diff --git a/internal/words/static/codenames/default.txt b/internal/words/static/codenames/default.txt
index 32f4c87a715bf49481cd49fd0105fbad5b3a8310..a5b156e43f7c16ef30cac3969823ba7143f7f1c0 100644
--- a/internal/words/static/codenames/default.txt
+++ b/internal/words/static/codenames/default.txt
@@ -1,8 +1,7 @@
 Hollywood
 Well
 Foot
-New
-York
+New York
 Spring
 Court
 Tube
@@ -40,7 +39,7 @@ Pass
 Missile
 Paste
 Drop
-Pheonix
+Phoenix
 Marble
 Staff
 Figure
@@ -173,8 +172,7 @@ Straw
 Switch
 Skyscraper
 Laser
-Scuba
-Diver
+Scuba Diver
 Africa
 Plastic
 Dwarf
@@ -206,8 +204,7 @@ Tap
 Mouth
 Ambulance
 Dress
-Ice
-Cream
+Ice Cream
 Rabbit
 Buck
 Agent
@@ -225,8 +222,7 @@ Film
 Button
 Snowman
 Helicopter
-Loch
-Ness
+Loch Ness
 Log
 Princess
 Time
diff --git a/internal/words/static/codenames/duet.txt b/internal/words/static/codenames/duet.txt
index a71991c0f8ca961d90dd0a812bb918afdc494ded..6f67b15d278b328f9370369cfc99591ef655d1ac 100644
--- a/internal/words/static/codenames/duet.txt
+++ b/internal/words/static/codenames/duet.txt
@@ -1,7 +1,7 @@
 Drum
 Bride
 Wagon
-Univerity
+University
 Hit
 Ash
 Bass
@@ -13,8 +13,7 @@ Beam
 Spoon
 Country
 Nose
-King
-Arthur
+King Arthur
 Stamp
 Camp
 Brain
@@ -165,8 +164,7 @@ Drone
 Steam
 Biscuit
 Rip
-Notre
-Dame
+Notre Dame
 Lip
 Shampoo
 Cheese
@@ -239,9 +237,7 @@ Meter
 Sling
 Delta
 Step
-Joan
-of
-Arc
+Joan of Arc
 Comet
 Bath
 Polo
@@ -268,8 +264,7 @@ Yellowstone
 Silk
 Hose
 Sloth
-Kung
-Fu
+Kung Fu
 Clock
 Bean
 Lightning
@@ -279,8 +274,7 @@ Ranch
 Pearl
 Flat
 Virus
-Ice
-Age
+Ice Age
 Coffee
 Marathon
 Attic
@@ -297,8 +291,7 @@ Tornado
 Memory
 Jockey
 Minotaur
-Big
-Bang
+Big Bang
 Page
 Sphinx
 Crusader
@@ -325,8 +318,7 @@ Eden
 Army
 Paddle
 Saloon
-Mona
-Lisa
+Mona Lisa
 Mile
 Blizzard
 Quarter
@@ -368,8 +360,7 @@ Taste
 Fuel
 Mosquito
 Wizard
-Big
-Ben
+Big Ben
 Garden
 Waitress
 Shoot
diff --git a/internal/words/static/esc.go b/internal/words/static/esc.go
index 3ac7752bf6425d7a50844ebdc575554889b6e6e8..4736edf12c7b76688f9773b587af36aa5da00656 100644
--- a/internal/words/static/esc.go
+++ b/internal/words/static/esc.go
@@ -226,66 +226,67 @@ j9FjZc7M+WXitYmiAe+5mPJfdWng6+2+PBYuVvERRUxpXqfziHH5BQAA//+Xdl6cYAAAAA==
 		size:    2482,
 		modtime: 0,
 		compressed: `
-H4sIAAAAAAAC/ySW0XbaSg+F7/dbYRNCGyD+MaescynGwlY9HvmXZ0Ldpz9Lzl1YERpJ+9MWR41xfal2
-uHOMOKhmXPiFf9VGtLNJ6lFrsYxbeTAalZRxo0fkjDbKjD1lxt4kRpx40oTK87TBmBMOJIabWhjQZg88
-Uw4DfpjHRQ0jDkYpMHZlyUZRCCeZtCySGG02pgnvUb8Yl2IL48SzcRioJDSRVtxU84CdTajYptIR9kKT
-pg73gSKj1kkCzjRNHve+1dTQsuAsyyKR/cNWvs5oBtYkf3Ame0R/nZ5PHKQv5mE2ouaUqRjagTp94SDL
-gFpz1oS3fp0zbgNTZkMb/O0DxYibkTepFhh7Sbp4gsqHdfYWb8VGXv3J4LlSNgoZlUnXM676kISTxzXR
-h1dR6nAQ2/4aUalOqCmjHTSjLZJRDxp0i71qiZx94myh2IqzasKFM070Wr1IyhyjZMYu9RzRztKx4Z1t
-orR6ySMacbU+NgaMvF5zxdWRSF0JWc1Hk1GVPjLu3+Gcw1BmNMbL4mkT4642YRfnBZWL05BjIr898ZXC
-yBm1qUczRez+ZnbR5k0fozCUzDhq5ugy24pWYydsuNKKRpe8KRsY7f8LmUO2LKgo405fjJoM7VT6PrLh
-LfXRp1gbLQNuJNH/3+GollDTLJkiDuxI7jmMqMrzSVFxlmC6BJ0ZPzljX8KIq5d/M5KEg3Ds8K6xw03C
-iHrwL/+vOG9tNhkZH5R6MlWfyMhog3DKsmQvaaN9oJGXmb2Bu6QOH9LhbXrQsqyOgu+lZsa7aUkd9kbP
-jCNNuJPhrGXhDVA21MN3CZIIlcaMdtaMRigpmjJLRBM14ySa0GiUwDgydThJ3r6uKbBlnEuPXxRKmbDL
-kbxY74VeaF+b0O24LsFoZsOJlo378vAN/GLD7mkSyMFdsgTsX2RPnGjGSZ4uZuLVh77wMijjnyTBFWjn
-1eHIC+6+Pc2WvN0a/hEYN+px5wcOlPBplHrGjSfnpKZEHaENarP39U/q2DKNbDi7yG/FXLtWS8Ru3sjS
-6Alnn517yPQocbOi/catP1dv/nOlx0Mc8TBi13PKaN24LiX7Bma8D07gp0S0ZWYb2BS1dowPeQmOunxD
-1VIu5qTECVXZXKNN+poo4chRgs4+/JOGARcv4KQ9GpMU/MNNJjczHXHlL40le4+tT+7sbbSze+67Ofd3
-WgbfY5oYFVPG0SO2UaMRc284SRqx35o9xNW3HC3b16bgoBq9ihGVlWVA45/bTIafNOHT+m11LTr0FBin
-bSwT/VXfH19FWlDH8kDrr9zpm0i/A+3gLvqzzPKN2ezi/nR/dHtb5+J8ObqfUb4cdM9fMRneo3d21Rca
-WfJWYOo04ep1/qKEX5w90k10IOtdXcvYy8LkbVOccPb19QRpG5Gk3iVoVqNJOnzObOQNiC+J+H743qYe
-F+kHN1ZeMv51q7j5O2xoyjSPknAbhJ+ovLeq9O7rGfUanC6O/O0ZNcUndmKo9I8D5zd0KNMDu5TJQvZV
-uVlJ48YEGk59Ee9Ps2d2ahhHeo1ua5lt9cs2b3vRxtLjM2T1+d0HmbGbeNu9H19q7o9bVHmgjvL0HXzg
-jdyu3zmJz9y/s99cwH8GHNkN/aJfHNHIzDjKRJFWl9X05UVt65g6IVyYO+dv0NmlDgNO7iQ34e/fCKgd
-zFqdrfovhwGV613p9MC1uCEf1Hyylea8gUzfdYzY63ZeKveBSl/Yc2/sd23azmFivAuljIuv996o943I
-1EmZcIh+MWoyUz8CI/sdH5y6s3YccdNxVbytfh3/SFAc/Sa0L9f7g1fsonDCTV8us8ribJt83yn3+I/k
-JlYPxc92pU5FHZVGXCT9JnzGdXI1Ko5us87Pnin7byAH9iwxiibyQ76n1bN5SCNOe4dazOG5qjv6sJlc
-TbOfXkou238BAAD///SFqXuyCQAA
+H4sIAAAAAAAC/ySWUXajSq+F3/coeioGx3F3bIdrfNrrPMqFDDoUJa6oipse/b9E3uIVISTtT1scNcb1
+pdrhzjHioJpx4dePf9VGtLNJ6lFrsYxbeTAalZRxo0fkjDbKjD1lxt4kRpx40oTK87TBmBMOJIabWhjQ
+Zg88Uw4DfprHRQ0jDkYpMHZlyUZRCCeZtCySGG02pgnvUb8Yl2IL48SzcRioJDSRVtxU84CdTajYptIR
+9kKTpg73gSKj1kkCzjRNHve+1dTQsuAsyyKR/cdWvs5oBuUkf3Ame0R/Oz2fOEhfzMNsRM0pUzG0A3X6
+wkGWAbXmrAlv/Tpn3AamzIY2+LsPFCNuRt6kWmDsJeniCSof1tlbvBUbefVXBs+VslHIqEy6nnHVhySc
+PK6JPryKUoeD2PbXiEp1Qk0Z7aAZbZGMetCgW+xVS+TsE2cLxVacVRMunHGi1+pFUuYYJTN2qeeIdpaO
+De9sE6XVSx7RiKv1sTFg5PWaK66OROpKyGo+moyq9JFx/w7nHIYyozFeFk+bGHe1Cbs4L6hcnIYcE/nP
+E18pjJxRm3o0U8Tub2YXbd70MQpDyYyjZo4us61oNXbChiutaHTJm7KB0f5/IXPIlgUVZdzpi1GToZ1K
+30c2vKU++hRro2XAjST6/zsc1RJqmiVTxIEdyT2HEVV5PikqzhJMl6Az4xdn7EsYcfXyb0aScBCOHd41
+drhJGFEP/vD/FeetzSYj44NST6bqExkZbRBOWZbsJW20DzTyMrM3cJfU4UM6vE0PWpbVUfC91Mx4Ny2p
+w97omXGkCXcynLUsvAHKhnr4LkESodKY0c6a0QglRVNmiWiiZpxEExqNEhhHpg4nydvjmgJbxrn0+E2h
+lAm7HMmL9V7ohfa1Cd2O6xKMZjacaNm4Lw/6sZcvNuyeJoEc3CVLwP5F9sSJZpzk6WImXn3oCy+DMv5J
+ElyBdl4djrzg7tvTbMnbreGfgXGjHnd+4EAJn0apZ9x4ck5qStQR2qA2e1//pI4t08iGs4v8Vsy1a7VE
+7OaNLI2ecPbZuYdMjxI3K9pv3P4M/KPe/OdKj4c44mHErueU0bpxXUr2Dcx4H5zAT4loy8w2sClq7Rgf
+8hIcdfmGqqVczEmJE6qyuUab9DVRwpGjBJ19+CcNw4+LF3DSHo1JCv7jJpObmY648pfGkr3H1id39jba
+2T333Zz7Oy2D7zFNjIop4+gR26jRiLk3nCSN2G/NHuLqW46W7WtTcFCNXsWIysoyoPHfbSbDL5rwaf22
+uhYdegqM0zaWif6q74+vIi2oY3mg9bfc6ZtIvwPt4C76q8zyjdns4v5yf3R7W+fifDm6n1G+HHTPXzEZ
+3qN3dtUXGlnyVmDqNOHqdf6mhN+cPdJNdCDrXV3L2MvC5G1TnHD29fUEaRuRpN4laFajSTp8zmzkDYgv
+ifh++N6mHhfpBzdWXjL+dau4+XvY0JRpHiXhNgg/UXlvVend1zPqNThdHPnbM2qKT+zEUOkfB85v6FCm
+B3Ypk4Xsq3KzksaNCTSc+iLen2bP7NQwjvQa3dYy2+qXbd72oo2lx2fI6vO7DzJjN/G2ez+/1Nwft6jy
+QB3l6Tv4wBu5Xb9zEp+5P7PfXMA/A47shn7RL45oZGYcZaJIq8tq+vKitnVMnRAuzJ3zN+jsUocBJ3eS
+m/D3NwJqB7NWZ6v+y2FA5XpXOj1wLW7IBzWfbKU5byDTdx0j9rqdl8p9oNIX9twb+12btnOYGO9CKePi
+67036n0jMnVSJhyiX4yazNSPwMh+xwen7qwdR9x0XBVvq1/HPxIUR78J7cv1/uAVuyiccNOXy6yyONsm
+33fKPf4juYnVQ/GzXalTUUelERdJ/xE+4zq5GhVHt1nnZ8+U/RvIgT1LjKKJ/JDvafVsHtKI096hFnN4
+ruqOPmwmV9Psp5eSy/a/AAAA///SQbudsgkAAA==
 `,
 	},
 
 	"/codenames/duet.txt": {
 		name:    "duet.txt",
 		local:   "codenames/duet.txt",
-		size:    2633,
+		size:    2634,
 		modtime: 0,
 		compressed: `
-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
+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
+h4maTUoKAAA=
 `,
 	},