Some conflicts resolved

Assets/Scripts/satelity/SatelitTask.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Collections;
+using UnityEngine;
+
+/// <summary>
+/// Satellite minigame — auto-completes after 1 second.
+/// Students can replace this with real gameplay via a PR.
+/// </summary>
+public class SatelitTask : MonoBehaviour, ITask
+{
+    public string TaskID { get; set; }
+    public TaskType TaskType { get; set; }
+    public string TaskName { get; set; }
+    public (double, double) TaskLocation { get; set; }
+    public bool IsCompleted { get; private set; }
+
+    private Action<ITask> _onCompleted;
+    private Action<ITask> _onExit;
+
+    public void Initialize(Action<ITask> onCompleted)
+    {
+        IsCompleted = false;
+        _onCompleted = onCompleted;
+        StartCoroutine(AutoComplete());
+    }
+
+    public void Complete()
+    {
+        if (IsCompleted) return;
+        IsCompleted = true;
+        _onCompleted?.Invoke(this);
+        ExitTask(_onExit);
+    }
+
+    public void ExitTask(Action<ITask> onExit)
+    {
+        onExit?.Invoke(this);
+    }
+
+    private IEnumerator AutoComplete()
+    {
+        Debug.Log("[SatelitTask] Satellite task started — auto-completing in 1s.");
+        yield return new WaitForSeconds(1f);
+        Complete();
+    }
+}

Assets/Scripts/satelity/SatelitTask.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 375a1ddbfc192413b48906965449af87
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/satelity/WindController.cs

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 using System;
 using UnityEngine;
 using UnityEngine.EventSystems;
@@ -10,6 +11,23 @@ public class WindController : MonoBehaviour, ITask
     public float maxWindTorque = 8f;
     public float windChangeSpeed = 0.6f;
     public float gustInterval = 4f;
+=======
+using UnityEngine;
+
+public class WindController : MonoBehaviour
+{
+    [Header("settings větru")]
+    [Tooltip("Maximální síla větru (kladná i záporná)")]
+    public float maxWindTorque = 8f;
+
+    [Tooltip("Jak rychle se větr mění směrem/sílou")]
+    public float windChangeSpeed = 0.6f;
+
+    [Tooltip("Jak často se objeví silnější vichřice (v sekundách)")]
+    public float gustInterval = 4f;
+
+    [Tooltip("Multiplier pro sílu vichřice")]
+>>>>>>> origin/main
     public float gustMultiplier = 2.0f;
 
     public float CurrentWindTorque { get; private set; }
@@ -17,6 +35,7 @@ public class WindController : MonoBehaviour, ITask
     private float targetTorque;
     private float gustTimer;
 
+<<<<<<< HEAD
 
     private Action<ITask> _onCompleted;
     private Action<ITask> _onExit;
@@ -27,6 +46,8 @@ public class WindController : MonoBehaviour, ITask
     public Position TaskLocation { get; set; }
     public bool IsCompleted { get; private set; }
 
+=======
+>>>>>>> origin/main
     void Start()
     {
         PickNewTargetTorque();
@@ -35,6 +56,7 @@ public class WindController : MonoBehaviour, ITask
 
     void Update()
     {
+<<<<<<< HEAD
         CurrentWindTorque = Mathf.Lerp(CurrentWindTorque, targetTorque, Time.deltaTime * windChangeSpeed);
 
         gustTimer -= Time.deltaTime;
@@ -45,11 +67,27 @@ public class WindController : MonoBehaviour, ITask
 
             gustTimer = gustInterval;
             Invoke(nameof(PickNewTargetTorque), 0.8f);
+=======
+        // Smoothly move wind toward target torque
+        CurrentWindTorque = Mathf.Lerp(CurrentWindTorque, targetTorque, Time.deltaTime * windChangeSpeed);
+
+        // Occasional gusts
+        gustTimer -= Time.deltaTime;
+        if (gustTimer <= 0f)
+        {
+            // Apply a short gust by shifting target torque more aggressively
+            float gust = Random.Range(-maxWindTorque, maxWindTorque) * gustMultiplier;
+            targetTorque = Mathf.Clamp(gust, -maxWindTorque * gustMultiplier, maxWindTorque * gustMultiplier);
+
+            gustTimer = gustInterval;
+            Invoke(nameof(PickNewTargetTorque), 0.8f); // gust lasts ~0.8s
+>>>>>>> origin/main
         }
     }
 
     private void PickNewTargetTorque()
     {
+<<<<<<< HEAD
         targetTorque = UnityEngine.Random.Range(-maxWindTorque, maxWindTorque);
     }
 
@@ -74,4 +112,9 @@ public class WindController : MonoBehaviour, ITask
         _onExit = onExit;
         _onExit?.Invoke(this);
     }
-}
+}
+=======
+        targetTorque = Random.Range(-maxWindTorque, maxWindTorque);
+    }
+}
+>>>>>>> origin/main