From 79a7829a24c74cfddda12b76c8e7a997218c12d6 Mon Sep 17 00:00:00 2001 From: dangilcal Date: Thu, 16 Apr 2026 17:33:47 +0200 Subject: [PATCH] cambio combinaciones de estratagemas y nombres de archivos faltantes --- .../java/com/helldivers/app/ActivityGame.java | 298 +++++++++--------- ...y_mines.png => md_i4_incendiary_mines.png} | Bin ...rrage.png => orbital_380mm_he_barrage.png} | Bin ...strike.png => orbital_airburst_strike.png} | Bin 4 files changed, 157 insertions(+), 141 deletions(-) rename app/src/main/res/drawable/{md_I4_lncendiary_mines.png => md_i4_incendiary_mines.png} (100%) rename app/src/main/res/drawable/{orbital 380mm_he_barrage.png => orbital_380mm_he_barrage.png} (100%) rename app/src/main/res/drawable/{orbital _airburst_strike.png => orbital_airburst_strike.png} (100%) diff --git a/app/src/main/java/com/helldivers/app/ActivityGame.java b/app/src/main/java/com/helldivers/app/ActivityGame.java index 9a055c0..4b7c1ac 100644 --- a/app/src/main/java/com/helldivers/app/ActivityGame.java +++ b/app/src/main/java/com/helldivers/app/ActivityGame.java @@ -17,153 +17,169 @@ public class ActivityGame extends AppCompatActivity { private static final int UP = 0, DOWN = 1, LEFT = 2, RIGHT = 3; - private static final int[][] STRATAGEMS = { - // Support Weapons (0-30) - new int[]{DOWN, LEFT, DOWN, UP, RIGHT}, - new int[]{DOWN, DOWN, LEFT, UP, RIGHT}, - new int[]{DOWN, LEFT, DOWN, UP, UP, LEFT}, - new int[]{DOWN, LEFT, DOWN, UP, LEFT}, - new int[]{DOWN, LEFT, RIGHT, UP, DOWN}, - new int[]{DOWN, LEFT, RIGHT, RIGHT, LEFT}, - new int[]{DOWN, LEFT, UP, LEFT, DOWN}, - new int[]{DOWN, LEFT, UP, DOWN, UP}, - new int[]{DOWN, LEFT, UP, DOWN, DOWN}, - new int[]{DOWN, LEFT, DOWN, UP, UP, RIGHT}, - new int[]{DOWN, RIGHT, DOWN, UP, LEFT, LEFT}, - new int[]{DOWN, DOWN, UP, LEFT, RIGHT}, - new int[]{UP, UP, LEFT, RIGHT}, - new int[]{DOWN, LEFT, UP, DOWN, RIGHT}, - new int[]{DOWN, DOWN, UP, DOWN, DOWN}, - new int[]{RIGHT, DOWN, UP, LEFT, RIGHT}, - new int[]{DOWN, DOWN, UP, DOWN, RIGHT}, - new int[]{DOWN, LEFT, RIGHT, LEFT, UP}, - new int[]{DOWN, LEFT, UP, LEFT, RIGHT}, - new int[]{RIGHT, DOWN, LEFT, UP, RIGHT}, - new int[]{DOWN, DOWN, LEFT, UP, LEFT}, - new int[]{DOWN, DOWN, LEFT, UP, DOWN}, - new int[]{RIGHT, UP, LEFT, RIGHT}, - new int[]{DOWN, LEFT, RIGHT, RIGHT, DOWN}, - new int[]{DOWN, LEFT, UP, DOWN, LEFT}, - new int[]{DOWN, LEFT, UP, LEFT, UP, UP}, - new int[]{UP, RIGHT, DOWN, LEFT, DOWN}, - new int[]{DOWN, DOWN, LEFT, UP, UP, LEFT}, - new int[]{DOWN, LEFT, RIGHT, LEFT, UP, UP}, - new int[]{UP, DOWN, DOWN, UP, UP, DOWN}, - // Orbital Strikes (31-42) - new int[]{RIGHT, RIGHT, UP}, - new int[]{RIGHT, DOWN, LEFT, UP, UP}, - new int[]{RIGHT, RIGHT, DOWN, RIGHT}, - new int[]{RIGHT, RIGHT, DOWN, LEFT, RIGHT, DOWN}, - new int[]{RIGHT, RIGHT, RIGHT}, - new int[]{RIGHT, RIGHT, DOWN, UP}, - new int[]{RIGHT, RIGHT, LEFT, DOWN}, - new int[]{RIGHT, DOWN, UP, UP, LEFT, DOWN, DOWN}, - new int[]{RIGHT, DOWN, RIGHT, DOWN, RIGHT, DOWN}, - new int[]{RIGHT, DOWN, UP, RIGHT, DOWN}, - new int[]{RIGHT, RIGHT, DOWN, LEFT, RIGHT, UP}, - new int[]{UP, DOWN, DOWN, UP, RIGHT}, - // Eagle Strikes (43-49) - new int[]{UP, RIGHT, RIGHT}, - new int[]{UP, RIGHT, DOWN, RIGHT}, - new int[]{UP, RIGHT, DOWN, DOWN, RIGHT}, - new int[]{UP, RIGHT, UP, DOWN}, - new int[]{UP, RIGHT, DOWN, UP}, - new int[]{UP, RIGHT, UP, LEFT}, - new int[]{UP, RIGHT, DOWN, DOWN, DOWN}, - // Emplacements (50-57) - new int[]{DOWN, LEFT, UP, RIGHT}, - new int[]{DOWN, LEFT, LEFT, DOWN}, - new int[]{DOWN, LEFT, UP, UP}, - new int[]{DOWN, DOWN, LEFT, RIGHT, LEFT, RIGHT}, - new int[]{UP, LEFT, RIGHT, RIGHT, LEFT}, - new int[]{RIGHT, DOWN, LEFT, RIGHT}, - new int[]{DOWN, LEFT, LEFT, RIGHT}, - new int[]{UP, LEFT, RIGHT, RIGHT, RIGHT}, - // Sentries (58-67) - new int[]{UP, RIGHT, RIGHT, UP}, - new int[]{UP, RIGHT, LEFT}, - new int[]{UP, RIGHT, LEFT, UP, LEFT}, - new int[]{UP, RIGHT, RIGHT, LEFT}, - new int[]{UP, RIGHT, RIGHT, LEFT, RIGHT}, - new int[]{UP, RIGHT, UP, LEFT, RIGHT}, - new int[]{UP, RIGHT, UP, LEFT, DOWN}, - new int[]{UP, RIGHT, UP, UP, LEFT}, - new int[]{UP, RIGHT, UP, DOWN}, - new int[]{UP, RIGHT, UP, DOWN, LEFT}, - // Backpacks (68-80) - new int[]{DOWN, LEFT, DOWN, UP, UP, LEFT}, - new int[]{UP, DOWN, UP, LEFT}, - new int[]{DOWN, LEFT, DOWN, DOWN, RIGHT}, - new int[]{LEFT, RIGHT, LEFT, RIGHT}, - new int[]{LEFT, RIGHT, UP, DOWN}, - new int[]{LEFT, RIGHT, RIGHT, LEFT}, - new int[]{LEFT, RIGHT, UP, DOWN, LEFT}, - new int[]{LEFT, RIGHT, UP, RIGHT, RIGHT}, - new int[]{RIGHT, DOWN, UP, UP, UP}, - new int[]{LEFT, RIGHT, UP, DOWN, UP}, - new int[]{LEFT, UP, LEFT, RIGHT}, - new int[]{LEFT, RIGHT, LEFT, UP}, - new int[]{LEFT, RIGHT, LEFT, RIGHT, LEFT}, - // Vehicles (81-84) - new int[]{LEFT, DOWN, RIGHT, UP, LEFT, LEFT, UP}, - new int[]{LEFT, DOWN, RIGHT, UP, LEFT, LEFT, DOWN}, - new int[]{LEFT, DOWN, RIGHT, DOWN, LEFT, LEFT, DOWN}, - new int[]{LEFT, DOWN, RIGHT, DOWN, LEFT, DOWN, UP, DOWN}, - // Mission (85-103) - new int[]{UP, DOWN, LEFT, UP, UP, LEFT, LEFT}, - new int[]{DOWN, DOWN, UP, LEFT, RIGHT}, - new int[]{UP, DOWN, LEFT, UP}, - new int[]{DOWN, LEFT, DOWN, UP, RIGHT, RIGHT}, - new int[]{RIGHT, RIGHT, RIGHT, RIGHT, UP, UP, LEFT, LEFT}, - new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN, LEFT}, - new int[]{LEFT, RIGHT, UP, DOWN, UP}, - new int[]{DOWN, RIGHT, DOWN, RIGHT, DOWN}, - new int[]{RIGHT, UP, UP, LEFT, UP}, - new int[]{UP, UP, LEFT, RIGHT, LEFT}, - new int[]{DOWN, DOWN, LEFT, RIGHT, LEFT}, - new int[]{LEFT, RIGHT, UP, DOWN, LEFT, LEFT, UP}, - new int[]{LEFT, DOWN, UP, DOWN}, - // Other - new int[]{RIGHT, RIGHT, DOWN, DOWN, UP} +private static final int[][] STRATAGEMS = { + // SUPPORT WEAPONS (12 items) - from wiki + new int[]{DOWN, LEFT, DOWN, UP, RIGHT}, // MG-43 Machine Gun + new int[]{DOWN, DOWN, LEFT, UP, RIGHT}, // EAT-17 Expendable Anti-Tank + new int[]{DOWN, LEFT, DOWN, UP, UP, LEFT}, // M-105 Stalwart + new int[]{DOWN, LEFT, DOWN, UP, LEFT}, // LAS-98 Laser Cannon + new int[]{DOWN, LEFT, RIGHT, UP, DOWN}, // APW-1 Anti-Materiel Rifle + new int[]{DOWN, LEFT, RIGHT, RIGHT, LEFT}, // GR-8 Recoilless Rifle + new int[]{DOWN, LEFT, UP, LEFT, DOWN}, // GL-21 Grenade Launcher + new int[]{DOWN, LEFT, UP, DOWN, UP}, // FLAM-40 Flamethrower + new int[]{DOWN, LEFT, DOWN, UP, UP, RIGHT}, // AC-8 Autocannon + new int[]{DOWN, RIGHT, DOWN, UP, LEFT, LEFT}, // ARC-3 Arc Thrower + new int[]{DOWN, RIGHT, DOWN, UP, LEFT, RIGHT},// RS-422 Railgun + new int[]{DOWN, DOWN, UP, DOWN, DOWN}, // FAF-14 Spear + + // ORBITAL (11 items) + new int[]{RIGHT, RIGHT, UP}, // Orbital Precision Strike + new int[]{RIGHT, DOWN, LEFT, UP, UP}, // Orbital Gatling Barrage + new int[]{RIGHT, RIGHT, RIGHT}, // Orbital Airburst Strike + new int[]{RIGHT, RIGHT, DOWN, LEFT, RIGHT, DOWN}, // Orbital 120MM HE Barrage + new int[]{RIGHT, RIGHT, DOWN, UP}, // Orbital Smoke Strike + new int[]{RIGHT, RIGHT, LEFT, DOWN}, // Orbital EMS Strike + new int[]{RIGHT, DOWN, UP, UP, LEFT, DOWN, DOWN}, // Orbital 380MM HE Barrage + new int[]{RIGHT, DOWN, RIGHT, DOWN, RIGHT, DOWN}, // Orbital Walking Barrage + new int[]{RIGHT, DOWN, UP, RIGHT, DOWN}, // Orbital Laser + new int[]{RIGHT, UP, DOWN, DOWN, RIGHT}, // Orbital Railcannon Strike + new int[]{RIGHT, RIGHT, DOWN, RIGHT}, // Orbital Gas Strike + + // EAGLE (7 items) + new int[]{UP, RIGHT, RIGHT}, // Eagle Strafing Run + new int[]{UP, RIGHT, DOWN, RIGHT}, // Eagle Airstrike + new int[]{UP, RIGHT, DOWN, DOWN, RIGHT}, // Eagle Cluster Bomb + new int[]{UP, RIGHT, UP, DOWN}, // Eagle Smoke Strike + new int[]{UP, RIGHT, DOWN, UP}, // Eagle Napalm Airstrike + new int[]{UP, RIGHT, UP, LEFT}, // Eagle 110MM Rocket Pods + new int[]{UP, RIGHT, DOWN, DOWN, DOWN}, // Eagle 500kg Bomb + + // BACKPACKS (4 items) + new int[]{DOWN, LEFT, DOWN, UP, UP, DOWN}, // B-1 Supply Pack + new int[]{DOWN, UP, UP, DOWN, UP}, // LIFT-850 Jump Pack + new int[]{DOWN, LEFT, DOWN, DOWN, UP, LEFT}, // SH-20 Ballistic Shield Backpack + new int[]{DOWN, UP, LEFT, RIGHT, LEFT, RIGHT},// SH-32 Shield Generator Pack + + // MINES (2 items) + new int[]{DOWN, LEFT, UP, RIGHT}, // MD-6 Anti-Personnel Minefield + new int[]{DOWN, LEFT, LEFT, DOWN}, // MD-I4 Incendiary Mines + + // EMPLACEMENTS (3 items) + new int[]{DOWN, DOWN, LEFT, RIGHT,LEFT, RIGHT}, // FX-12 Shield Generator Relay + new int[]{DOWN, UP, LEFT, RIGHT, RIGHT, LEFT}, // EMG-101 HMG Emplacement + new int[]{DOWN, UP, RIGHT, UP, LEFT, RIGHT}, // AARC-3 Tesla Tower + + // SENTRIES (6 items) + new int[]{DOWN, UP, RIGHT, LEFT}, // AG-16 Gatling Sentry + new int[]{DOWN, UP, RIGHT, RIGHT, UP}, // AMG-43 Machine Gun Sentry + new int[]{DOWN, UP, RIGHT, UP, LEFT, UP}, // AAC-8 Autocannon Sentry + new int[]{DOWN, UP, RIGHT, DOWN, UP, UP}, // AMLS-4X Rocket Sentry + new int[]{DOWN, UP, RIGHT, RIGHT, DOWN}, // AM-12 Mortar Sentry + new int[]{DOWN, UP, RIGHT, DOWN, RIGHT}, // AM-23 EMS Mortar Sentry + + // MISSION (12 items) + new int[]{UP, DOWN, RIGHT, LEFT, UP}, // Reinforce + new int[]{DOWN, DOWN, UP, RIGHT}, // Resupply + new int[]{UP, DOWN, RIGHT, UP}, // SOS Beacon + new int[]{DOWN, UP, LEFT, DOWN, UP, RIGHT, DOWN, UP}, // NUX-223 Hellbomb + new int[]{DOWN, DOWN, DOWN, UP, UP}, // SSSD Delivery + new int[]{UP, UP, LEFT, RIGHT, DOWN, DOWN}, // Seismic Probe + new int[]{UP, UP, LEFT, UP, RIGHT}, // Eagle Rearm + new int[]{DOWN, UP, DOWN, UP}, // Super Earth Flag + new int[]{LEFT, RIGHT, UP, UP, UP}, // Upload Data + new int[]{RIGHT, UP, UP, DOWN},// SEAF Artillery + new int[]{LEFT, UP, DOWN, RIGHT, DOWN, DOWN} // Hive Breaker Drill }; - private static final String[] NAMES = { - "Machine Gun", "EAT", "Stalwart", "Laser Cannon", "Anti-Materiel Rifle", "Recoilless Rifle", - "Grenade Launcher", "Flamethrower", "Heavy Machine Gun", "Autocannon", "Arc Thrower", - "Quasar Cannon", "Airburst Rocket", "Commando", "Spear", "Railgun", "W.A.S.P.", - "Breaching Hammer", "Epoch", "Speargun", "Expendable Napalm", "Leveller", "De-Escalator", - "Defoliation", "Sterilizer", "Belt-Fed GL", "Solo Silo", "Cremator", "Maxigun", - "C4 Pack", "One True Flag", - "Orbital Precision", "Orbital Gatling", "Orbital Gas", "Orbital 120mm", "Orbital Airburst", - "Orbital Smoke", "Orbital EMS", "Orbital 380mm", "Orbital Walking", "Orbital Laser", - "Orbital Napalm", "Orbital Railcannon", +private static final String[] NAMES = { + // SUPPORT WEAPONS (0-11) + "MG-43 Machine Gun", "EAT-17", "M-105 Stalwart", "LAS-98 Laser Cannon", "APW-1 Anti-Materiel Rifle", + "GR-8 Recoilless Rifle", "GL-21 Grenade Launcher", "FLAM-40 Flamethrower", "AC-8 Autocannon", + "ARC-3 Arc Thrower", "RS-422 Railgun", "FAF-14 Spear", + // ORBITAL (12-22) + "Orbital Precision", "Orbital Gatling", "Orbital Airburst", "Orbital 120mm", "Orbital Smoke", + "Orbital EMS", "Orbital 380mm", "Orbital Walking", "Orbital Laser", "Orbital Railcannon", "Orbital Gas", + // EAGLE (23-29) "Eagle Strafing", "Eagle Airstrike", "Eagle Cluster", "Eagle Smoke", "Eagle Napalm", - "Eagle Rocket", "Eagle 500kg", - "Anti-Personnel Mines", "Incendiary Mines", "Anti-Tank Mines", "Shield Relay", "HMG Emplacement", - "Grenadier", "Gas Mines", "Anti-Tank Emplacement", - "MG Sentry", "Gatling Sentry", "Autocannon Sentry", "Mortar Sentry", "Rocket Sentry", - "Tesla Tower", "EMS Mortar", "Laser Sentry", "Flame Sentry", "Gas Mortar", - "Supply Pack", "Jump Pack", "Ballistic Shield", "Guard Dog", "Rover", "Shield Generator", - "Directional Shield", "Hot Dog", "Hellbomb", "K-9", "Hover Pack", "Dog Breath", "Warp Pack", - "Patriot Exosuit", "Emancipator", "Fast Recon", "Bastion", - "Reinforce", "Resupply", "SOS Beacon", "Eagle Rearm", "Super Destroyer", - "Hellbomb", "Upload Data", "SSSD", "Super Earth Flag", "Seismic Probe", "Prospecting Drill", - "Dark Fluid", "Tectonic Drill", "Hive Breaker", "Cargo Container", "Reinforcement", "SEAF Artillery", - "Illumination Flare" + "Eagle Rocket Pods", "Eagle 500kg", + // BACKPACKS (30-33) + "Supply Pack", "Jump Pack", "Ballistic Shield", "Shield Generator", + // MINES (34-35) + "Anti-Personnel Mines", "Incendiary Mines", + // EMPLACEMENTS (36-38) + "Shield Relay", "HMG Emplacement", "Tesla Tower", + // SENTRIES (39-44) + "Gatling Sentry", "MG Sentry", "Autocannon Sentry", "Rocket Sentry", "Mortar Sentry", "EMS Mortar Sentry", + // MISSION (45-56) + "Reinforce", "Resupply", "SOS Beacon", "Hellbomb", "SSSD", "Seismic Probe", "Eagle Rearm", + "Super Earth Flag", "Upload Data", "SEAF Artillery", "Hive Breaker" }; private static final int[] ICONS = new int[]{ - R.drawable.support_1, R.drawable.support_2, R.drawable.support_3, R.drawable.support_4, R.drawable.support_5, - R.drawable.support_6, R.drawable.support_7, R.drawable.support_8, R.drawable.support_9, R.drawable.support_10, - R.drawable.class_1, R.drawable.class_2, R.drawable.class_3, R.drawable.class_4, R.drawable.class_5, - R.drawable.offensive_1, R.drawable.offensive_2, R.drawable.offensive_3, R.drawable.offensive_4, R.drawable.offensive_5, - R.drawable.offensive_6, R.drawable.offensive_7, R.drawable.offensive_8, R.drawable.offensive_9, R.drawable.offensive_10, - R.drawable.supply_1, R.drawable.supply_2, R.drawable.supply_3, R.drawable.supply_4, R.drawable.supply_5, - R.drawable.supply_6, R.drawable.supply_7, R.drawable.supply_8, R.drawable.supply_9, R.drawable.supply_10, - R.drawable.supply_11, R.drawable.supply_12, R.drawable.supply_13, R.drawable.supply_14, R.drawable.supply_15, - R.drawable.defensive_1, R.drawable.defensive_2, R.drawable.defensive_3, R.drawable.defensive_4, R.drawable.defensive_5, - R.drawable.defensive_6, R.drawable.defensive_7, R.drawable.defensive_8, R.drawable.defensive_9, R.drawable.defensive_10, - R.drawable.defensive_11 + // SUPPORT WEAPONS (0-11) + R.drawable.mg_43_machine_gun, + R.drawable.eat_17_expendable_anti_tank, + R.drawable.m_105_stalwart, + R.drawable.las_98_laser_cannon, + R.drawable.apw_1_anti_materiel_rifle, + R.drawable.gr_8_recoilless_rifle, + R.drawable.gl_21_grenade_launcher, + R.drawable.flam_40_flamethrower, + R.drawable.ac_8_autocannon, + R.drawable.arc_3_arc_thrower, + R.drawable.rs_422_railgun, + R.drawable.faf_14_spear_launcher, + // ORBITAL (12-22) + R.drawable.orbital_precision_strike, + R.drawable.orbital_gatling_barrage, + R.drawable.orbital_airburst_strike, + R.drawable.orbital_120mm_he_barrage, + R.drawable.orbital_smoke_strike, + R.drawable.orbital_ems_strike, + R.drawable.orbital_380mm_he_barrage, + R.drawable.orbital_walking_barrage, + R.drawable.orbital_laser, + R.drawable.orbital_railcannon_strike, + R.drawable.orbital_gas_strike, + // EAGLE (23-29) + R.drawable.eagle_strafing_run, + R.drawable.eagle_airstrike, + R.drawable.eagle_cluster_bomb, + R.drawable.eagle_smoke_strike, + R.drawable.eagle_napalm_airstrike, + R.drawable.eagle_110mm_rocket_pods, + R.drawable.eagle_500kg_bomb, + // BACKPACKS (30-33) + R.drawable.b_1_supply_pack, + R.drawable.lift_850_jump_pack, + R.drawable.sh_20_ballistic_shield_backpack, + R.drawable.sh_32_shield_generator_pack, + // MINES (34-35) + R.drawable.md_6_anti_personnel, + R.drawable.md_i4_incendiary_mines, + // EMPLACEMENTS (36-38) + R.drawable.fx_12_shield_generator_relay, + R.drawable.emg_101_hmg_emplacem_nt, + R.drawable.aarc_3_tesla_tower, + // SENTRIES (39-44) + R.drawable.ag_16_gatling_sentry, + R.drawable.amg_43_machine_gun_sentry, + R.drawable.aac_8_autocannon_sentry, + R.drawable.amls_4x_rocket_sentry, + R.drawable.am_12_mortar_sentry, + R.drawable.am_23_ems_mortar_sentry, + // MISSION (45-56) + R.drawable.reinforce, + R.drawable.resupply, + R.drawable.sos_beacon, + R.drawable.nux_223_hellbomb, + R.drawable.sssd_delivery, + R.drawable.seismic_probe, + R.drawable.eagle_rearm, + R.drawable.super_earth_flag, + R.drawable.nux_223_hellbomb, + R.drawable.sssd_delivery, + R.drawable.hive_breaker_drill }; private static final int[] ARROW_ICONS = new int[]{ diff --git a/app/src/main/res/drawable/md_I4_lncendiary_mines.png b/app/src/main/res/drawable/md_i4_incendiary_mines.png similarity index 100% rename from app/src/main/res/drawable/md_I4_lncendiary_mines.png rename to app/src/main/res/drawable/md_i4_incendiary_mines.png diff --git a/app/src/main/res/drawable/orbital 380mm_he_barrage.png b/app/src/main/res/drawable/orbital_380mm_he_barrage.png similarity index 100% rename from app/src/main/res/drawable/orbital 380mm_he_barrage.png rename to app/src/main/res/drawable/orbital_380mm_he_barrage.png diff --git a/app/src/main/res/drawable/orbital _airburst_strike.png b/app/src/main/res/drawable/orbital_airburst_strike.png similarity index 100% rename from app/src/main/res/drawable/orbital _airburst_strike.png rename to app/src/main/res/drawable/orbital_airburst_strike.png