Merge pull request #41 from SWE2024/dev

finished project

Assets/Scenes/SceneGame.unity

@@ -5834,8 +5834,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1000, y: 250}
-  m_SizeDelta: {x: 300, y: 200}
+  m_AnchoredPosition: {x: 1175, y: -225}
+  m_SizeDelta: {x: 250, y: 250}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &212927945
 MonoBehaviour:
@@ -36878,7 +36878,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: 2560, y: 2000}
+  m_SizeDelta: {x: 2560, y: 1440}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1840452419
 MonoBehaviour:
@@ -36900,7 +36900,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Card Inventory
+  m_text: Outcome of Trading in Cards
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: e3afd6450cbd8a84cbcc577456a52d03, type: 2}
   m_sharedMaterial: {fileID: 5575954358767294868, guid: e3afd6450cbd8a84cbcc577456a52d03, type: 2}

Assets/Scripts/Country.cs

@@ -121,7 +121,7 @@ public void ReverseColorChange()
     /// <returns>
     /// List of <c>Country</c> objects that are neighboring enemies.
     /// </returns>
-    public List<Country> HighlightEnemyNeighbours()
+    public List<Country> HighlightEnemyNeighbors()
     {
         TempColorChange(Color.grey);
 
@@ -138,12 +138,12 @@ public List<Country> HighlightEnemyNeighbours()
     }
 
     /// <summary>
-    /// <c>HighlightFriendlyNeighbours</c> recursively checks all neighbors and if they are friendly, adds them to a list.
+    /// <c>HighlightFriendlyNeighbors</c> recursively checks all neighbors and if they are friendly, adds them to a list.
     /// </summary>
     /// <returns>
     /// List of <c>Country</c> that you can fortify with.
     /// </returns>
-    public List<Country> HighlightFriendlyNeighbours() // currently only finds 1 layer of neighbors
+    public List<Country> HighlightFriendlyNeighbors() // currently only finds 1 layer of neighbors
     {
         TempColorChange(Color.grey);