From 138841b0277bc66c10cc71a632dff53668644aef Mon Sep 17 00:00:00 2001 From: haunter Date: Mon, 4 May 2026 23:19:09 +0300 Subject: [PATCH] atttack planner postponed/removed --- .../07_attack_planner.js | 0 .../attack_planner.html | 0 .../attack_planner.py | 0 app.py | 2 - bot_modules/02_state.js | 2 +- bot_modules/05_main.js | 3 - future_ideas.md | 2 +- routes/api.py | 2 +- routes/auth.py | 6 +- routes/dashboard.py | 62 ------------------- templates/hub.html | 12 ---- templates/options.html | 8 --- 12 files changed, 4 insertions(+), 95 deletions(-) rename {bot_modules => abandoned_features}/07_attack_planner.js (100%) rename {templates => abandoned_features}/attack_planner.html (100%) rename {routes => abandoned_features}/attack_planner.py (100%) diff --git a/bot_modules/07_attack_planner.js b/abandoned_features/07_attack_planner.js similarity index 100% rename from bot_modules/07_attack_planner.js rename to abandoned_features/07_attack_planner.js diff --git a/templates/attack_planner.html b/abandoned_features/attack_planner.html similarity index 100% rename from templates/attack_planner.html rename to abandoned_features/attack_planner.html diff --git a/routes/attack_planner.py b/abandoned_features/attack_planner.py similarity index 100% rename from routes/attack_planner.py rename to abandoned_features/attack_planner.py diff --git a/app.py b/app.py index 9d24d1b..c248391 100644 --- a/app.py +++ b/app.py @@ -6,7 +6,6 @@ from routes.api import api from routes.dashboard import dashboard from routes.auth import auth from routes.tracker import tracker -from routes.attack_planner import attack_planner import logging logging.basicConfig( @@ -72,7 +71,6 @@ app.register_blueprint(api) app.register_blueprint(dashboard) app.register_blueprint(auth) app.register_blueprint(tracker) -app.register_blueprint(attack_planner) if __name__ == '__main__': print("✅ Grepolis Remote — DB initialised") diff --git a/bot_modules/02_state.js b/bot_modules/02_state.js index 8e488cf..b71745a 100644 --- a/bot_modules/02_state.js +++ b/bot_modules/02_state.js @@ -193,7 +193,7 @@ function gatherState() { }; }); - // ---- World speed & unit speed table (for attack planner calculations) ----- + // ---- World speed & unit speed table ----- let world_speed = 1; let unit_speeds = {}; try { diff --git a/bot_modules/05_main.js b/bot_modules/05_main.js index e289653..ccd2cc8 100644 --- a/bot_modules/05_main.js +++ b/bot_modules/05_main.js @@ -235,9 +235,6 @@ function boot() { if (typeof window._grcInitTracker === 'function') { window._grcInitTracker(); // live tracker event-driven } - if (typeof window._grcInitAttackPlanner === 'function') { - window._grcInitAttackPlanner(); // attack planner countdown engine - } } if (document.readyState === 'complete') { diff --git a/future_ideas.md b/future_ideas.md index b9122a9..25d5737 100644 --- a/future_ideas.md +++ b/future_ideas.md @@ -84,7 +84,7 @@ Command delivery relies on HTTP polling. If an attack plan requires a launch in **Benefits:** - **Zero Polling Latency:** Commands arrive in ~100ms instead of 8-18 seconds. - **Perfect Attack Timing:** Ensures clients receive armed plans immediately, maximizing the margin for precise execution. -- **Instant UI Updates:** The dashboard and attack planner can update in real-time as members come online or troop counts change. +- **Instant UI Updates:** The dashboard can update in real-time as members come online or troop counts change. ## 3. Server-Sent Events (SSE) Lag/Refresh Bug Fix **Issue:** diff --git a/routes/api.py b/routes/api.py index 180246e..f248ce6 100644 --- a/routes/api.py +++ b/routes/api.py @@ -100,7 +100,7 @@ def receive_state(): )) conn.commit() - # Store world speed + unit data for attack planner calculations + # Store world speed + unit data world_speed = data.get('world_speed') unit_speeds = data.get('unit_speeds') if world_id and world_speed is not None and unit_speeds: diff --git a/routes/auth.py b/routes/auth.py index e317c77..811283d 100644 --- a/routes/auth.py +++ b/routes/auth.py @@ -156,8 +156,6 @@ def options(): 'is_online': is_online, 'feat_farm': 'farm' in (row['features'] or 'farm,admin'), 'feat_admin': 'admin' in (row['features'] or 'farm,admin'), - 'feat_atk_planner': 'attack_planner' in (row['features'] or ''), - 'feat_atk_planner_admin': 'attack_planner_admin' in (row['features'] or ''), }) conn.close() @@ -238,10 +236,8 @@ def remove_member(player_id, world_id): def update_member_features(player_id, world_id): farm = 'farm' if request.form.get('farm') else None admin = 'admin' if request.form.get('admin') else None - atk_planner = 'attack_planner' if request.form.get('attack_planner') else None - atk_planner_admin = 'attack_planner_admin' if request.form.get('attack_planner_admin') else None - features = ','.join(f for f in [farm, admin, atk_planner, atk_planner_admin] if f) or '' + features = ','.join(f for f in [farm, admin] if f) or '' conn = get_db() clan = conn.execute( diff --git a/routes/dashboard.py b/routes/dashboard.py index 9c20fe7..d736315 100644 --- a/routes/dashboard.py +++ b/routes/dashboard.py @@ -97,24 +97,6 @@ def player_farm(player_id, world_id): def player_tracker(player_id, world_id): return render_template('tracker.html', player_id=player_id, world_id=world_id) -@dashboard.route('/player///attack-planner') -@login_required -def player_attack_planner(player_id, world_id): - clan_key = '' - if current_user.clan_id: - conn = get_db() - clan = conn.execute( - 'SELECT clan_key FROM clans WHERE id = ?', (current_user.clan_id,) - ).fetchone() - conn.close() - if clan: - clan_key = clan['clan_key'] - return render_template('attack_planner.html', - player_id=player_id, - world_id=world_id, - clan_key=clan_key) - - # ------------------------------------------------------------------ # GET /dashboard/farm-settings — returns current farm config # POST /dashboard/farm-settings — updates farm config @@ -291,50 +273,6 @@ def get_towns(): return jsonify(towns) -# ------------------------------------------------------------------ -# GET /dashboard/clan-towns?world_id=... -# Returns all towns for ALL clan members in a given world. -# Used by attack planner to let admin pick any player's town. -# ------------------------------------------------------------------ -@dashboard.route('/dashboard/clan-towns', methods=['GET']) -@login_required -def get_clan_towns(): - world_id = request.args.get('world_id', '').strip() - clan_id = current_user.clan_id - if not clan_id or not world_id: - return jsonify([]) - - conn = get_db() - rows = conn.execute(''' - SELECT ts.town_id, ts.town_name, ts.player, ts.player_id, - ts.x, ts.y, ts.sea, ts.world_id, ts.updated_at, ts.data - FROM town_state ts - INNER JOIN clan_members cm - ON cm.player_id = ts.player_id - AND cm.world_id = ts.world_id - AND cm.clan_id = ? - WHERE ts.world_id = ? - ORDER BY ts.player ASC, ts.town_name ASC - ''', (clan_id, world_id)).fetchall() - conn.close() - - towns = [] - for r in rows: - d = json.loads(r['data']) if r['data'] else {} - towns.append({ - 'town_id': r['town_id'], - 'town_name': r['town_name'], - 'player': r['player'], - 'player_id': r['player_id'], - 'world_id': r['world_id'], - 'x': r['x'], - 'y': r['y'], - 'sea': r['sea'], - 'units': d.get('units', {}), - }) - return jsonify(towns) - - # ------------------------------------------------------------------ # POST /dashboard/blueprints # Toggle a blueprint for a specific town diff --git a/templates/hub.html b/templates/hub.html index 9d98e45..0350bba 100644 --- a/templates/hub.html +++ b/templates/hub.html @@ -100,12 +100,6 @@ .hub-card.tracker::before { background: radial-gradient(circle at top left, rgba(111,207,207,0.08), transparent 70%); } .hub-card.tracker:hover { border-color: #6fcfcf; box-shadow: 0 12px 40px rgba(111,207,207,0.15); } - /* Attack Planner — red/orange */ - .hub-card.attack { border-color: #301a1a; } - .hub-card.attack::before { background: radial-gradient(circle at top left, rgba(224,85,85,0.08), transparent 70%); } - .hub-card.attack:hover { border-color: #e05555; box-shadow: 0 12px 40px rgba(224,85,85,0.15); } - .hub-card.attack .card-title { color: #e05555; } - .card-icon { font-size: 2.8rem; margin-bottom: 1rem; @@ -179,12 +173,6 @@
Παρακολούθηση κινήσεων στρατού σε πραγματικό χρόνο. Εισερχόμενες επιθέσεις και ενισχύσεις.
- - ⚔️ -
Attack Planner
-
Συντονισμένες επιθέσεις σε ακριβή χρόνο. Υπολογισμός χρόνου αποστολής, επιστροφής και πλοίων.
- - ← Επιστροφή στην επιλογή παίκτη diff --git a/templates/options.html b/templates/options.html index c467714..179e32e 100644 --- a/templates/options.html +++ b/templates/options.html @@ -295,20 +295,12 @@ - - {% else %}
🌾 Farm 🏛 Admin - ⚔️ Planner - 🎯 Planner Admin
{% endif %}