Changes

Assets/Scenes/Start.unity

@@ -149,8 +149,8 @@ Transform:
   m_LocalPosition: {x: -639.39, y: -363.6, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children: []
-  m_Father: {fileID: 4727533072734170869}
-  m_RootOrder: 7
+  m_Father: {fileID: 395381597}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &25866765
 SpriteRenderer:
@@ -296,8 +296,8 @@ Transform:
   m_LocalPosition: {x: -648.4, y: -363.6, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children: []
-  m_Father: {fileID: 4727533072734170869}
-  m_RootOrder: 4
+  m_Father: {fileID: 395381597}
+  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &145404606
 SpriteRenderer:
@@ -349,6 +349,45 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &395381596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 395381597}
+  m_Layer: 5
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &395381597
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 395381596}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 145404605}
+  - {fileID: 881093439}
+  - {fileID: 1830301037}
+  - {fileID: 25866764}
+  m_Father: {fileID: 4727533072734170869}
+  m_RootOrder: 4
+  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: 3.7, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &881093438
 GameObject:
   m_ObjectHideFlags: 0
@@ -377,8 +416,8 @@ Transform:
   m_LocalPosition: {x: -645.5, y: -363.6, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children: []
-  m_Father: {fileID: 4727533072734170869}
-  m_RootOrder: 5
+  m_Father: {fileID: 395381597}
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &881093440
 SpriteRenderer:
@@ -458,8 +497,8 @@ Transform:
   m_LocalPosition: {x: -642.7, y: -363.6, z: 0}
   m_LocalScale: {x: 2, y: 2, z: 2}
   m_Children: []
-  m_Father: {fileID: 4727533072734170869}
-  m_RootOrder: 6
+  m_Father: {fileID: 395381597}
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &1830301038
 SpriteRenderer:
@@ -650,7 +689,10 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "Emma Kemppainen - Moritz R\xF6tner - Lukas Scheuerle - Alexander Scheurer\n\n"
+  m_text: 'Emma Kemppainen - Moritz Roetner - Lukas Scheuerle - Alexander Scheurer
+
+
+'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -695,7 +737,7 @@ MonoBehaviour:
   m_enableWordWrapping: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
-  m_firstOverflowCharacterIndex: 71
+  m_firstOverflowCharacterIndex: 72
   m_linkedTextComponent: {fileID: 0}
   m_isLinkedTextComponent: 0
   m_isTextTruncated: 0
@@ -719,7 +761,7 @@ MonoBehaviour:
   m_margin: {x: 0, y: 0, z: 0, w: 0}
   m_textInfo:
     textComponent: {fileID: 2078782219}
-    characterCount: 72
+    characterCount: 73
     spriteCount: 0
     spaceCount: 12
     wordCount: 11
@@ -887,6 +929,11 @@ PrefabInstance:
       propertyPath: m_MatchWidthOrHeight
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4727533073634700043, guid: d3331bd9950dc5f4cbfc1223d20011ce,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 21.6
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d3331bd9950dc5f4cbfc1223d20011ce, type: 3}
 --- !u!224 &4727533072734170869 stripped

Assets/Scripts/ChatCommandParser.cs

@@ -122,7 +122,7 @@ public void Parse(string name, string msg)
             case MsgCmd.arm:
                 if (GameLogic.State == GameState.Playing)
                 {
-                    if (team == TEAM.GOOD)
+                    if (team == TEAM.BOTH)
                         return;
 
                     if (IsPlayerBlockedByCooldown(name, Cmd.arm))

Assets/Scripts/Interactables/Chargeable.cs

@@ -88,6 +88,6 @@ private void OnTriggerEnter2D(Collider2D other)
   }
   public new void SetCommandWeight(int activePlayerCount)
   {
-    commandWeight = 1.0f / activePlayerCount;
+    commandWeight = 5.0f / activePlayerCount;
   }
 }

Assets/Scripts/Interactables/Interactable.cs

@@ -52,7 +52,7 @@ public void SetName(string name)
 
   public void SetCommandWeight(int activePlayerCount)
   {
-    commandWeight = 10.0f / activePlayerCount;
+    commandWeight = 1.0f / activePlayerCount;
   }
 
   public void DoCommand(Cmd cmd, string message = "")

Assets/Scripts/Interactables/Movable.cs

@@ -6,7 +6,7 @@ namespace Assets.Scripts.Interactables
     public class Movable : TurnAroundOnCollisionBehaviour
     {
         public Vector2 TargetPosition;
-        public float Speed = 3f;
+        public float Speed = 0.5f;
 
         private float t = 0;
 

Assets/Scripts/UiStartScreenControls.cs

@@ -16,7 +16,7 @@ public void OnClickStart()
             Config.TwitchAccessToke = AccessTokenField.text;
             Config.TwitchChannel = ChannelField.text;
 
-            SceneManager.LoadScene("TestEverything");
+            SceneManager.LoadScene("LevelLukas");
         }
     }
 

ProjectSettings/GraphicsSettings.asset

@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 13
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -31,6 +31,9 @@ GraphicsSettings:
   m_AlwaysIncludedShaders:
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
@@ -55,3 +58,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_AllowEnlightenSupportForUpgradedProject: 1