Update main.py

main.py

@@ -4,7 +4,7 @@ import math
 import random
 
 # =========================
-# إعدادات اللعبة (قوانين Kaggle)
+# إعدادات Kaggle الدقيقة
 # =========================
 BOARD_SIZE = 100
 SUN_RADIUS = 10
@@ -17,35 +17,31 @@ class Planet:
         self.x = x
         self.y = y
         self.production = production
-        # نصف القطر يعتمد على الإنتاج: 1 + ln(production)
-        self.radius = 1 + math.log(production) if production > 0 else 1
-        self.ships = random.randint(10, 50)
+        # المعادلة الأصلية: 1 + ln(production)
+        self.radius = 1 + math.log(production + 1)
+        self.ships = 10 if owner != -1 else random.randint(20, 100)
         
-        # مدار الكوكب
         self.dist_to_center = math.dist((x, y), (50, 50))
+        # الكواكب القريبة تدور (مدار < 45)
         self.is_orbiting = self.dist_to_center < 45
         self.angle = math.atan2(y - 50, x - 50)
-        self.angular_vel = random.uniform(0.025, 0.05)
+        self.angular_vel = random.uniform(0.02, 0.04)
 
     def update(self):
-        # دوران الكواكب
         if self.is_orbiting:
             self.angle += self.angular_vel
             self.x = 50 + math.cos(self.angle) * self.dist_to_center
             self.y = 50 + math.sin(self.angle) * self.dist_to_center
-        
-        # إنتاج السفن (المصنع) - كل دورة يزيد بعدد نقاط الإنتاج
         if self.owner != -1:
             self.ships += self.production
 
 class Fleet:
     def __init__(self, owner, x, y, angle, ships):
         self.owner = owner
-        self.x = x
-        self.y = y
+        self.x, self.y = x, y
         self.angle = angle
         self.ships = ships
-        # سرعة السفينة حسب حجمها (معادلة كاجل اللوغاريتمية)
+        # سرعة لوغاريتمية حسب حجم الأسطول
         log_ratio = math.log(max(1, ships)) / math.log(1000)
         self.speed = 1.0 + (MAX_SHIP_SPEED - 1.0) * math.pow(min(1.0, log_ratio), 1.5)
 
@@ -60,112 +56,109 @@ class GameEngine:
     def reset(self):
         self.planets = []
         self.fleets = []
-        # إنشاء 20 كوكب بتناظر رباعي (4-fold symmetry)
-        for i in range(5):
-            px, py = random.uniform(10, 45), random.uniform(10, 45)
+        # إنشاء كواكب بتناظر رباعي (4-fold symmetry)
+        for i in range(6): 
+            px, py = random.uniform(15, 40), random.uniform(15, 40)
             prod = random.randint(1, 5)
+            # التناظر الرباعي حول المركز (50, 50)
             coords = [(px, py), (100-px, py), (px, 100-py), (100-px, 100-py)]
             for idx, (cx, cy) in enumerate(coords):
-                owner = idx if i == 0 else -1
+                owner = idx if i == 0 else -1 # اللاعب 0 والخصم 1..3
                 self.planets.append(Planet(len(self.planets), owner, cx, cy, prod))
 
     def step(self):
         for p in self.planets: p.update()
-        
         for f in self.fleets[:]:
             f.update()
-            # ☀️ الشمس تقتل السفن
             if math.dist((f.x, f.y), (50, 50)) < SUN_RADIUS:
                 self.fleets.remove(f)
                 continue
-            
-            # تصادم السفن مع الكواكب (قتال)
             for p in self.planets:
                 if math.dist((f.x, f.y), (p.x, p.y)) < p.radius:
-                    self.resolve_combat(f, p)
+                    if p.owner == f.owner: p.ships += f.ships
+                    else:
+                        p.ships -= f.ships
+                        if p.ships < 0:
+                            p.owner = f.owner
+                            p.ships = abs(p.ships)
                     if f in self.fleets: self.fleets.remove(f)
                     break
-        self.run_ai()
-
-    def resolve_combat(self, fleet, planet):
-        if planet.owner == fleet.owner:
-            planet.ships += fleet.ships
-        else:
-            planet.ships -= fleet.ships
-            if planet.ships < 0:
-                planet.owner = fleet.owner
-                planet.ships = abs(planet.ships)
-
-    def run_ai(self):
-        # ذكاء اصطناعي بسيط يهاجم أقرب كوكب ضعيف
-        for p in self.planets:
-            if p.owner > 0: # ليس اللاعب البشري
-                targets = [target for target in self.planets if target.owner != p.owner]
-                if targets and p.ships > 20:
-                    target = min(targets, key=lambda t: math.dist((p.x, p.y), (t.x, t.y)))
-                    angle = math.atan2(target.y - p.y, target.x - p.x)
-                    send_count = int(p.ships * 0.5)
-                    p.ships -= send_count
-                    self.fleets.append(Fleet(p.owner, p.x, p.y, angle, send_count))
 
 game = GameEngine()
 
-def get_render():
-    p_json = json.dumps([{"x":p.x, "y":p.y, "r":p.radius, "o":p.owner, "s":p.ships} for p in game.planets])
-    f_json = json.dumps([{"x":f.x, "y":f.y, "o":f.owner} for f in game.fleets])
+def render_html():
+    p_data = [{"id":p.id, "x":p.x, "y":p.y, "r":p.radius, "o":p.owner, "s":p.ships} for p in game.planets]
+    f_data = [{"x":f.x, "y":f.y, "o":f.owner} for f in game.fleets]
     
+    # JavaScript للرسم - تم تحسينه ليعمل فوراً
     return f"""
-    <div style="background:#000; display:flex; justify-content:center; padding:10px;">
-        <canvas id="orbCanvas" width="500" height="500" style="background:#000; border:1px solid #333;"></canvas>
+    <div style="background:#111; display:flex; justify-content:center; padding:20px;">
+        <canvas id="gameCanvas" width="500" height="500" style="background:#000; border:2px solid #444; border-radius:50%; box-shadow: 0 0 20px #000;"></canvas>
     </div>
     <script>
         (function() {{
-            const canvas = document.getElementById('orbCanvas');
-            const ctx = canvas.getContext('2d');
-            const planets = {p_json};
-            const fleets = {f_json};
-            const s = 5; // Scale
+            const c = document.getElementById('gameCanvas');
+            const ctx = c.getContext('2d');
+            const s = 5; // Scale 100 to 500
 
             ctx.clearRect(0,0,500,500);
-            // Sun
-            ctx.fillStyle = "#FFD700";
+            
+            // Draw Sun
+            const grad = ctx.createRadialGradient(250,250,5,250,250,50);
+            grad.addColorStop(0, "yellow"); grad.addColorStop(1, "rgba(255,165,0,0)");
+            ctx.fillStyle = grad;
             ctx.beginPath(); ctx.arc(250, 250, {SUN_RADIUS}*s, 0, 7); ctx.fill();
 
             // Planets
-            planets.forEach(p => {{
-                ctx.fillStyle = p.o == 0 ? "#00A2FF" : (p.o == -1 ? "#555" : "#FF4444");
+            const pData = {json.dumps(p_data)};
+            pData.forEach(p => {{
+                ctx.fillStyle = p.o == 0 ? "#00a2ff" : (p.o == -1 ? "#555" : "#ff4444");
                 ctx.beginPath(); ctx.arc(p.x*s, p.y*s, p.r*s, 0, 7); ctx.fill();
-                ctx.fillStyle = "#fff"; ctx.fillText(Math.floor(p.s), p.x*s-5, p.y*s+5);
+                ctx.fillStyle = "white"; ctx.font = "bold 10px Arial";
+                ctx.fillText(Math.floor(p.s), p.x*s-5, p.y*s+3);
+                // ID
+                ctx.fillStyle = "#aaa"; ctx.font = "8px Arial";
+                ctx.fillText("ID:"+p.id, p.x*s-10, p.y*s-10);
             }});
 
             // Fleets
-            fleets.forEach(f => {{
-                ctx.fillStyle = f.o == 0 ? "#00A2FF" : "#FF4444";
+            const fData = {json.dumps(f_data)};
+            fData.forEach(f => {{
+                ctx.fillStyle = f.o == 0 ? "#00a2ff" : "#ff4444";
                 ctx.beginPath(); ctx.arc(f.x*s, f.y*s, 2, 0, 7); ctx.fill();
             }});
         }})();
     </script>
     """
 
-# =========================
-# واجهة Gradio
-# =========================
-with gr.Blocks(title="Orbit Wars RUI") as demo:
-    gr.Markdown("## 🚀 Orbit Wars - Kaggle Simulation")
-    board = gr.HTML(get_render())
+def run_step():
+    game.step()
+    return render_html()
+
+def launch_fleet(sid, angle, amount):
+    p = game.planets[int(sid)]
+    if p.owner == 0 and p.ships >= amount:
+        p.ships -= amount
+        game.fleets.append(Fleet(0, p.x, p.y, math.radians(angle), amount))
+    return render_html()
+
+with gr.Blocks(theme=gr.themes.Monochrome()) as demo:
+    gr.Markdown("# 🚀 Orbit Wars - RUI Company Dashboard")
+    canvas = gr.HTML(render_html())
     
     with gr.Row():
-        step_btn = gr.Button("Step ⏩")
+        step_btn = gr.Button("Step ⏩", variant="primary")
         reset_btn = gr.Button("Reset 🔄")
         
     with gr.Row():
-        src = gr.Number(label="Source Planet ID", value=0)
-        angle = gr.Slider(0, 360, label="Angle", value=0)
-        num = gr.Number(label="Ships", value=10)
-        launch_btn = gr.Button("Launch 🚀", variant="primary")
-
-    step_btn.click(lambda: (game.step(), get_render())[1], None, board)
-    reset_btn.click(lambda: (game.reset(), get_render())[1], None, board)
-    launch_btn.click(lambda s, a, n: (game.planets[int(s)].owner == 0 and n <= game.planets[int(s)].ships and [game.fleets.append(Fleet(0, game.planets[int(s)].x, game.planets[int(s)].y, math.radians(a), n)), setattr(game.planets[int(s)], 'ships', game.planets[int(s)].ships - n)], get_render())[1], [src, angle, num], board)
+        with gr.Column():
+            src_id = gr.Number(label="From Planet (ID)", value=0)
+            launch_angle = gr.Slider(0, 360, label="Angle 📐")
+            launch_num = gr.Number(label="Ships 🚢", value=10)
+            launch_btn = gr.Button("Launch! 🚀")
+
+    step_btn.click(run_step, outputs=canvas)
+    reset_btn.click(lambda: (game.reset(), render_html())[1], outputs=canvas)
+    launch_btn.click(launch_fleet, [src_id, launch_angle, launch_num], outputs=canvas)
 
 demo.launch()