stabilization PR (#85)

* HandleStep_OnDoubleCollision_ResolvesIt corrected

* phantom letter fix

* letter to come bg color

* some definitions corrected

* dictionary correction

* obsolete words removed

* definition display improved

* home screen extra code removed

* smaller buttons

* Warm-up to awake

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupA.cs

@@ -2409,7 +2409,6 @@ class EngLookupA : WordLookupBase
 airward,
 airwards,
 airy,
-ais,
 aisle,
 aisled,
 aisless,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupD.cs

@@ -1333,8 +1333,6 @@ class EngLookupD : WordLookupBase
 dekameter,
 dekastere,
 dekle,
-del,
-del credere,
 delaceration,
 delacrymation,
 delactation,
@@ -3346,7 +3344,6 @@ class EngLookupD : WordLookupBase
 dijudicate,
 dijudicated,
 dijudication,
-dik
 dike,
 diked,
 diker,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupE.cs

@@ -3438,7 +3438,6 @@ class EngLookupE : WordLookupBase
 escurial,
 escutcheon,
 escutcheoned,
-ese,
 esemplastic,
 esential,
 esentially,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupG.cs

@@ -318,7 +318,6 @@ class EngLookupG : WordLookupBase
 gamosepalous,
 gamut,
 gamy,
-gan,
 ganch,
 gander,
 gane,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupH.cs

@@ -1735,11 +1735,9 @@ class EngLookupH : WordLookupBase
 hestern,
 hesternal,
 hesychast,
-het,
 hetairism,
 hetarism,
 hetchel,
-hete,
 heteracanth,
 heterarchy,
 heterauxesis,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupI.cs

@@ -2987,7 +2987,6 @@ class EngLookupI : WordLookupBase
 infusorian,
 infusories,
 infusory,
-ing,
 ingannation,
 ingate,
 ingathering,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupK.cs

@@ -680,7 +680,6 @@ class EngLookupK : WordLookupBase
 knopped,
 knoppern,
 knopweed,
-knor,
 knosp,
 knot,
 knotberry,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupN.cs

@@ -201,7 +201,6 @@ class EngLookupN : WordLookupBase
 nasty,
 nasute,
 nasutness,
-nat,
 natal,
 natal plum,
 natalitial,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Functions/Lookup/English/EngLookupS.cs

@@ -3467,12 +3467,6 @@ class EngLookupS : WordLookupBase
 sexuality,
 sexualize,
 sexually,
-sey,
-seye,
-seyen,
-seyh,
-seynd,
-seynt,
 sforzando,
 sforzato,
 sfumato,

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Levels/Campaign/Letter3Animals.cs

@@ -22,7 +22,7 @@ public class Letter3Animals : WordisGameLevelBase<Letter3Animals>, IWordisGameLe
 
         /// <inheritdoc cref="Letter3Animals"/>
         public static WordsSequence Animals => WordsSequence.FromCsv(
-            "Cat,Ant,Bat,Cow,Fly,Bee,Ape,Fox,Dog,Owl,Pig,Elk,Dik,Emu,Hen,Yak,Eel,Koi,rat,pup");
+            "Cat,Ant,Bat,Cow,Fly,Bee,Ape,Fox,Dog,Owl,Pig,Elk,Emu,Hen,Yak,Eel,Koi,rat,pup");
 
         private Letter3Animals(WordisGame game) : base(game)
         {

WordisProject/Assets/Wordis/BlockPuzzle/GameCore/Tests/WordisGameWaterTests.cs

@@ -200,8 +200,8 @@ public void HandleStep_OnDoubleCollision_ResolvesIt()
              * [-] [-] [-] [-]
              * [-] [Q] [-] [-] - static
              * [-] [A] [-] [-] - active
-             * [-]-[X]-[-] [-]-- water --
-             * [Z]-[Y]-[-] [-]-- water -- */
+             * [Z]-[X]-[-] [-]-- water --
+             * [-]-[Y]-[-] [-]-- water -- */
 
             var gameObjects = game.GameObjects.ToArray();
             Assert.IsNull(
@@ -214,6 +214,8 @@ public void HandleStep_OnDoubleCollision_ResolvesIt()
                 new StaticChar(1, 3, 'X'), gameObjects);
             Assert.Contains(
                 new StaticChar(1, 4, 'Y'), gameObjects);
+            Assert.Contains(
+                new StaticChar(0, 3, 'Z'), gameObjects);
         }
     }
 }

WordisProject/Assets/Wordis/BlockPuzzle/Scenes/Main.unity

@@ -21494,7 +21494,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -300, y: 0}
-  m_SizeDelta: {x: 225, y: 225}
+  m_SizeDelta: {x: 225, y: 196}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1093981465
 MonoBehaviour:
@@ -21568,12 +21568,12 @@ TextMesh:
   m_GameObject: {fileID: 1093981463}
   m_Text: "\u25C0"
   m_OffsetZ: -1
-  m_CharacterSize: 36
+  m_CharacterSize: 32
   m_LineSpacing: 1
   m_Anchor: 4
   m_Alignment: 1
   m_TabSize: 4
-  m_FontSize: 36
+  m_FontSize: 32
   m_FontStyle: 0
   m_RichText: 1
   m_Font: {fileID: 0}
@@ -37883,7 +37883,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 225, y: 225}
+  m_SizeDelta: {x: 225, y: 196}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1667601863
 MonoBehaviour:
@@ -37957,12 +37957,12 @@ TextMesh:
   m_GameObject: {fileID: 1667601861}
   m_Text: "\u25BC"
   m_OffsetZ: -1
-  m_CharacterSize: 36
+  m_CharacterSize: 32
   m_LineSpacing: 1
   m_Anchor: 4
   m_Alignment: 1
   m_TabSize: 4
-  m_FontSize: 36
+  m_FontSize: 32
   m_FontStyle: 0
   m_RichText: 1
   m_Font: {fileID: 0}
@@ -39435,7 +39435,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 300, y: 0}
-  m_SizeDelta: {x: 225, y: 225}
+  m_SizeDelta: {x: 225, y: 196}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1785016442
 MonoBehaviour:
@@ -39509,12 +39509,12 @@ TextMesh:
   m_GameObject: {fileID: 1785016440}
   m_Text: "\u25B6"
   m_OffsetZ: -1
-  m_CharacterSize: 36
+  m_CharacterSize: 32
   m_LineSpacing: 1
   m_Anchor: 4
   m_Alignment: 1
-  m_TabSize: 0
-  m_FontSize: 36
+  m_TabSize: 4
+  m_FontSize: 32
   m_FontStyle: 0
   m_RichText: 1
   m_Font: {fileID: 0}

WordisProject/Assets/Wordis/BlockPuzzle/Scripts/GamePlay/GamePlayUI.cs

@@ -24,7 +24,6 @@
 using Assets.Wordis.BlockPuzzle.Scripts.UI.Extensions;
 using Assets.Wordis.Frameworks.InputManager.Scripts;
 using Assets.Wordis.Frameworks.Utils;
-using TMPro;
 using UnityEngine;
 
 namespace Assets.Wordis.BlockPuzzle.Scripts.GamePlay
@@ -128,8 +127,6 @@ public void RestartGame(bool restore = false)
 
             ShowMessage(_wordisGameLevel.Goal); // move to level?
 
-            DefineWordFunc.WarmUp(); // preload word definitions
-
             ResumeGame();
         }
 
@@ -179,6 +176,9 @@ private void Awake()
             {
                 _gamePlaySettings = (GamePlaySettings)Resources.Load(nameof(GamePlaySettings));
             }
+
+            // Preload word definitions
+            DefineWordFunc.WarmUp();
         }
 
         private void OnDisable() => ClearGame(dropSession: false);
@@ -260,8 +260,9 @@ private void RefreshPresentation(WordisGame gameState)
             // 5. display a letter to come
             if (activeChar?.Point != gameState.StartPoint)
             {
+                var backgroundColor = new Color(0.10f, 0.13f, 0.21f);
                 var startBlock = gameBoard.allColumns[gameState.StartPoint.x][gameState.StartPoint.y];
-                startBlock.SetText($"{gameState.LetterToCome}", Color.black);
+                startBlock.SetText($"{gameState.LetterToCome}", backgroundColor);
             }
         }
 
@@ -301,25 +302,27 @@ private void RefreshVisualBlock(
         {
             var block = gameBoard.allColumns[x][y];
 
-            if (wordisObj == null)
+            if (wordisObj == null) // empty block
             {
                 if (activeChar != null &&
                     y > activeChar.Y &&
                     x == activeChar.X &&
                     !_wordisGameLevel.Settings.IsWaterZone(y))
                 {
                     // Highlight the trajectory
+                    block.SetText(string.Empty, Color.white);
                     block.Highlight(Block.DefaultCharTag);
                 }
                 else
                 {
+                    // Either empty or 'water'
                     block.PlaceBlock(_wordisGameLevel.Settings.IsWaterZone(block.RowId)
                         ? Block.WaterTag
                         : block.defaultSpriteTag);
                     block.SetText(string.Empty, Color.white);
                 }
             }
-            else
+            else // letter block
             {
                 block.PlaceBlock(Block.DefaultCharTag);
 
@@ -339,7 +342,7 @@ private void ShowWordDefinition(string word)
                 UIController.Instance.ShowTopTipAtPosition(
                     tipPosition: new Vector2(0, -250F), // todo: make default, dont specify in code
                     anchor: new Vector2(0.5F, 1), // todo: make default, dont specify in code
-                    tipText: definitions[0].Definition,
+                    tipText: $"{definitions[0].Word}: {definitions[0].Definition}",
                     duration: 7F);
             }
         }

WordisProject/Assets/Wordis/BlockPuzzle/Scripts/Home/HomeScreen.cs

@@ -13,7 +13,6 @@
 
 using Assets.Wordis.BlockPuzzle.GameCore.Levels;
 using Assets.Wordis.BlockPuzzle.Scripts.Controller;
-using Assets.Wordis.BlockPuzzle.Scripts.GamePlay;
 using Assets.Wordis.BlockPuzzle.Scripts.UI.Extensions;
 using Assets.Wordis.Frameworks.InputManager.Scripts;
 using UnityEngine;
@@ -36,24 +35,6 @@ public class HomeScreen : MonoBehaviour
         /// </summary>
         void Awake()
         {
-            GamePlaySettings gamePlaySettings = (GamePlaySettings)Resources.Load(nameof(GamePlaySettings));
-
-            if (!gamePlaySettings.classicModeSettings.modeEnabled)
-            {
-                _btnPlay.gameObject.SetActive(false);
-            }
-
-            if (!gamePlaySettings.timeModeSettings.modeEnabled)
-            {
-                btnTimeMode.gameObject.SetActive(false);
-            }
-
-            if (!gamePlaySettings.advancedModeSettings.modeEnabled)
-            {
-                btnAdvanceMode.gameObject.SetActive(false);
-            }
-
-            gamePlaySettings = null;
             GameAnalytics.Initialize();
 
             if (!FB.IsInitialized)

WordisProject/Assets/Wordis/Resources/Dictionary/A.csv

@@ -3224,7 +3224,7 @@ After-wit (n.) Wisdom or perception that comes after it can be of use.
 After-witted (a.) Characterized by after-wit; slow-witted.
 Aftmost (a.) Nearest the stern.
 Aftward (adv.) Toward the stern.
-Aga (n.) Alt. of Agha
+Aga (n.) In Turkey, a commander or chief officer. It is used also as a title of respect.
 Agha (n.) In Turkey, a commander or chief officer. It is used also as a title of respect.
 Again (adv.) In return, back; as, bring us word again.
 Again (adv.) Another time; once more; anew.
@@ -3639,7 +3639,6 @@ Ahriman (n.) The Evil Principle or Being of the ancient Persians; the Prince of
 Ahu (n.) The Asiatic gazelle.
 Ahull (adv.) With the sails furled, and the helm lashed alee; -- applied to ships in a storm. See Hull, n.
 Ahungered (a.) Pinched with hunger; very hungry.
-Ais (pl. ) of Ai
 Ai (n.) The three-toed sloth (Bradypus tridactylus) of South America. See Sloth.
 Aiblins (adv.) Alt. of Ablins
 Ablins (adv.) Perhaps; possibly.

WordisProject/Assets/Wordis/Resources/Dictionary/C.csv

@@ -6326,7 +6326,7 @@ City (n.) A large town.
 City (n.) A corporate town; in the United States, a town or collective body of inhabitants, incorporated and governed by a mayor and aldermen or a city council consisting of a board of aldermen and a common council; in Great Britain, a town corporate, which is or has been the seat of a bishop, or the capital of his see.
 City (n.) The collective body of citizens, or inhabitants of a city.
 City (a.) Of or pertaining to a city.
-Cive (n.) Same as Chive.
+Cive (n.) Perennial having hollow cylindrical leaves used for seasoning.
 Civet (n.) A substance, of the consistence of butter or honey, taken from glands in the anal pouch of the civet (Viverra civetta). It is of clear yellowish or brownish color, of a strong, musky odor, offensive when undiluted, but agreeable when a small portion is mixed with another substance. It is used as a perfume.
 Civet (n.) The animal that produces civet (Viverra civetta); -- called also civet cat. It is carnivorous, from two to three feet long, and of a brownish gray color, with transverse black bands and spots on the body and tail. It is a native of northern Africa and of Asia. The name is also applied to other species.
 Civet (v. t.) To scent or perfume with civet.
@@ -9693,10 +9693,8 @@ Comrogue (n.) A fellow rogue.
 Comtism (n.) Positivism; the positive philosophy. See Positivism.
 Comtist (n.) A disciple of Comte; a positivist.
 Con- () A prefix, fr. L. cum, signifying with, together, etc. See Com-.
-Con (adv.) Against the affirmative side; in opposition; on the negative side; -- The antithesis of pro, and usually in connection with it. See Pro.
 Conned (imp. & p. p.) of Con
 Conning (p. pr. & vb. n.) of Con
-Con (v. t.) To know; to understand; to acknowledge.
 Con (v. t.) To study in order to know; to peruse; to learn; to commit to memory; to regard studiously.
 Con (v. t.) To conduct, or superintend the steering of (a vessel); to watch the course of (a vessel) and direct the helmsman how to steer.
 Conacre (v. t.) To underlet a portion of, for a single crop; -- said of a farm.

WordisProject/Assets/Wordis/Resources/Dictionary/D.csv

@@ -2107,7 +2107,6 @@ Dekaliter (n.) Same as Decaliter.
 Dekameter (n.) Same as Decameter.
 Dekastere (n.) Same as Decastere.
 Dekle (n.) See Deckle.
-Del (n.) Share; portion; part.
 Delaceration (n.) A tearing in pieces.
 Delacrymation (n.) An involuntary discharge of watery humors from the eyes; wateriness of the eyes.
 Delactation (n.) The act of weaning.
@@ -4636,7 +4635,6 @@ Dicalcic (a.) Having two atoms or equivalents of calcium to the molecule.
 Dicarbonic (a.) Containing two carbon residues, or two carboxyl or radicals; as, oxalic acid is a dicarbonic acid.
 Dicast (n.) A functionary in ancient Athens answering nearly to the modern juryman.
 Dicastery (n.) A court of justice; judgment hall.
-Die (pl. ) of Dice
 Dice (n.) Small cubes used in gaming or in determining by chance; also, the game played with dice. See Die, n.
 Diced (imp. & p. p.) of Dice
 Dicing (p. pr. & vb. n.) of Dice
@@ -5082,7 +5080,6 @@ Dijudicated (imp. & p. p.) of Dijudicate
 Dijucating (p. pr. & vb. n.) of Dijudicate
 Dijudicate (v. i.) To make a judicial decision; to decide; to determine.
 Dijudication (n.) The act of dijudicating; judgment.
-Dik (n.) A dik-dik is the name for any of four species of small antelope in the genus Madoqua that live in the bushlands of eastern and southern Africa.
 Dike (n.) A ditch; a channel for water made by digging.
 Dike (n.) An embankment to prevent inundations; a levee.
 Dike (n.) A wall of turf or stone.

WordisProject/Assets/Wordis/Resources/Dictionary/E.csv

@@ -3847,7 +3847,7 @@ Eolian (a.) Formed, or deposited, by the action of wind, as dunes.
 Eolic (a. & n.) See Aeolic.
 Eolipile (n.) Same as Aeolipile.
 Eolis (n.) A genus of nudibranch mollusks having clusters of branchial papillae along the back. See Ceratobranchia.
-Eon (n.) Alt. of Aeon
+Eon (n.) An immeasurable or infinite space of time; eternity; a long space of time; an age.
 Aeon (n.) An immeasurable or infinite space of time; eternity; a long space of time; an age.
 Aeon (n.) One of the embodiments of the divine attributes of the Eternal Being.
 Eophyte (n.) A fossil plant which is found in the lowest beds of the Silurian age.
@@ -4898,7 +4898,6 @@ Escutcheon (n.) That part of a vessel's stern on which her name is written.
 Escutcheon (n.) A thin metal plate or shield to protect wood, or for ornament, as the shield around a keyhole.
 Escutcheon (n.) The depression behind the beak of certain bivalves; the ligamental area.
 Escutcheoned (a.) Having an escutcheon; furnished with a coat of arms or ensign.
-Ese (n.) Ease; pleasure.
 Esemplastic (a.) Shaped into one; tending to, or formative into, unity.
 Eserine (n.) An alkaloid found in the Calabar bean, and the seed of Physostigma venenosum; physostigmine. It is used in ophthalmic surgery for its effect in contracting the pupil.
 Esexual (a.) Sexless; asexual.
@@ -7488,7 +7487,6 @@ Eyliad (n.) See /iliad.
 Eyne (n.) Alt. of Eyen
 Eyen (n.) Plural of eye; -- now obsolete, or used only in poetry.
 Eyot (n.) A little island in a river or lake. See Ait.
-Eyr (n.) Air.
 Eyra (n.) A wild cat (Felis eyra) ranging from southern Brazil to Texas. It is reddish yellow and about the size of the domestic cat, but with a more slender body and shorter legs.
 Eyre (n.) A journey in circuit of certain judges called justices in eyre (or in itinere).
 Eyren (n. pl.) See Ey, an egg.