Mech -> Mek updates.

megamek/data/scenarios/Examples/Example_options.xml

@@ -413,7 +413,7 @@
  <optionvalue>false</optionvalue>
  </gameoption>
  <gameoption>
- <optionname>armed_mechwarriors</optionname>
+ <optionname>armed_mekwarriors</optionname>
  <optionvalue>false</optionvalue>
  </gameoption>
  <gameoption>

megamek/data/scenarios/Lucho/Citadel_Defense.xml

@@ -417,7 +417,7 @@
  <optionvalue>false</optionvalue>
  </gameoption>
  <gameoption>
- <optionname>armed_mechwarriors</optionname>
+ <optionname>armed_mekwarriors</optionname>
  <optionvalue>true</optionvalue>
  </gameoption>
  <gameoption>

megamek/data/scenarios/Lucho/Last_Stand_at_Guanabara.xml

@@ -417,7 +417,7 @@
  <optionvalue>false</optionvalue>
  </gameoption>
  <gameoption>
- <optionname>armed_mechwarriors</optionname>
+ <optionname>armed_mekwarriors</optionname>
  <optionvalue>true</optionvalue>
  </gameoption>
  <gameoption>

megamek/data/scenarios/Lucho/Uninvited_Guests.xml

@@ -417,7 +417,7 @@
  <optionvalue>false</optionvalue>
  </gameoption>
  <gameoption>
- <optionname>armed_mechwarriors</optionname>
+ <optionname>armed_mekwarriors</optionname>
  <optionvalue>true</optionvalue>
  </gameoption>
  <gameoption>

megamek/data/scenarios/TrainingScenarios/README.txt

@@ -1,6 +1,6 @@
-FUTURE AMMENDMENTS (for game developers)
+FUTURE AMENDMENTS (for game developers)
 This training scenario series is intended to introduce small chunks of the rules with each scenario.
-Provide game options to disable the following Advance rules: Torso Twisting, Heat, Mechwarriors, Piloting Skill Rolls, Critical Hits, Physical Attacks.
+Provide game options to disable the following Advance rules: Torso Twisting, Heat, MekWarriors, Piloting Skill Rolls, Critical Hits, Physical Attacks.
 Provide a way to set Game Options within the .mms file.
 
 **********Battletech 3rd Edition Training Scenario #1 - First Run, pg. 36**********
@@ -107,7 +107,7 @@ VICTORY CONDITIONS
 The BattleMaster must exit the South map edge to claim victory. Otherwise the Attacker wins.
 
 SPECIAL RULES
-This scenario should only use the Basic Rules of moving & firing, plus the Advance Rules of Torso Twisting, Heat, Mechwarriors, & Piloting Skill Rolls.
+This scenario should only use the Basic Rules of moving & firing, plus the Advance Rules of Torso Twisting, Heat, MekWarriors, & Piloting Skill Rolls.
 No Physical Attacks from any mech.
 Set Game Options "Allow pushing off the map" to false.
 Set Game Options "Fire and smoke" to false.

megamek/docs/history.txt

@@ -803,7 +803,7 @@ MEGAMEK VERSION HISTORY:
 + PR #3734: Fixing Nowhwere Typos
 + PR #3733: Change border colors on the minimap for moved units
 + Issue #3599: Unjam/clear turret buttons update properly after canceling pending firing orders
-+ Issue #3711: Female mechwarriors are now able to have a beer after ejecting from their mech
++ Issue #3711: Female mekwarriors are now able to have a beer after ejecting from their mech
 + Data: New Sprites including the return of 'Royal' sprites (Thanks to UlyssesSockdrawer)
 + Data: Battle Armor moving to new MUL conventions (4,5,6 unit squads).
 + Issue #3695: Increased amount and usefulness of data displayed in the General tab of the unit display.
@@ -3967,7 +3967,7 @@ v0.37.12 (2014-06-03 19:06 UTC)
 + Revised bombing attacks to roll per bomb and scatter by MoF (as per dive
  bombing errata)
 + Errata: Superheavy 'Meks can move and fire (i)HGRs safely, no PSR needed
-+ Bug [4119]: Princess won't shoot Mechwarriors.
++ Bug [4119]: Princess won't shoot MekWarriors.
 + Data: Unit images and fixes, tech level fixes.
 + Bug [#4123]: Client never receives COMMAND_SERVER_CORRECT_NAME packet
 + Bug [#4121]: ClientGUI.bots map may not be accurate
@@ -4717,7 +4717,7 @@ v0.37.4 (2014-01-12 02:20)
  way incendiary ammo works and to take into account fire-resistant armor.
 + Bug: TESMP shutdown effect on tanks didn't last as long as it should
 + Bug: Tanks don't report when they automatically startup in the end phase
-+ Added code to reduce the utility of firing on ejected mechwarriors/crews by
++ Added code to reduce the utility of firing on ejected mekwarriors/crews by
  1000. This should make Princess much less likely to fire on them.
 + Bug: /localLoad not working
 + Bug [#3981]: NPE in WeaponAttackAction.toHit with Apollo and ArtV
@@ -9655,7 +9655,7 @@ v0.33.5 (2007-04-14, 19:12 GMT+1)
  locations.
 + Added a couple more RS:PPU 'Meks
 + Corrected RS:PPU 'Meks to be level 2 rather than 3
-+ Added House rule that Mechwarriors on the field only have 1 hex vis in double
++ Added House rule that Mearriors on the field only have 1 hex vis in double
  blind games
 + Corrected internal structure points for meks<=20t (they missed 1 point in the
  legs)

megamek/i18n/megamek/common/options/messages.properties

@@ -214,8 +214,8 @@ GameOptionsInfo.option.all_have_ei_cockpit.displayableName=(Unofficial) All unit
 GameOptionsInfo.option.all_have_ei_cockpit.description=If checked, pilots with EI implants get the benefit in any unit, not just clan Meks and BA. For pilot damage, ProtoMeks use Mek rules, all other units use BA rules.
 GameOptionsInfo.option.extreme_temperature_survival.displayableName=(Unofficial) Extreme temperature survival
 GameOptionsInfo.option.extreme_temperature_survival.description=If checked, Infantry and MekWarriors don't instantly die in extreme temperatures, but you get a short time to save them. Not implemented.
-GameOptionsInfo.option.armed_mechwarriors.displayableName=(Unofficial) Armed MekWarriors
-GameOptionsInfo.option.armed_mechwarriors.description=If checked, MekWarriors carry a sidearm that can be fired using same rules as an infantry rifle.
+GameOptionsInfo.option.armed_mekwarriors.displayableName=(Unofficial) Armed MekWarriors
+GameOptionsInfo.option.armed_mekwarriors.description=If checked, MekWarriors carry a sidearm that can be fired using same rules as an infantry rifle.
 GameOptionsInfo.option.pilots_visual_range_one.displayableName=(Unofficial) Limited MekWarrior Visibility
 GameOptionsInfo.option.pilots_visual_range_one.description=If checked, MekWarriors only have a visibility of 1 when visibility is set to less then 999 and DB is turned on.
 GameOptionsInfo.option.pilots_cannot_spot.displayableName=(Unofficial) MekWarriors cannot spot
@@ -763,16 +763,16 @@ PartialRepairsInfo.option.aero_fueltank_crit.displayableName=Misrepaired Fuel Ta
 PartialRepairsInfo.option.aero_fueltank_crit.description=-10% fuel capacity
 PartialRepairsInfo.option.aero_gear_crit.displayableName=Misrepaired Landing Gear
 PartialRepairsInfo.option.aero_gear_crit.description=+2 to landing rolls
-PartialRepairsInfo.option.mech_reactor_3_crit.displayableName=3+ Critical Engine Hits
-PartialRepairsInfo.option.mech_reactor_3_crit.description=8 heat buildup
-PartialRepairsInfo.option.mech_reactor_2_crit.displayableName=2 Critical Engine Hits
-PartialRepairsInfo.option.mech_reactor_2_crit.description=5 heat buildup
-PartialRepairsInfo.option.mech_reactor_1_crit.displayableName=1 Critical Engine Hit
-PartialRepairsInfo.option.mech_reactor_1_crit.description=3 heat buildup
-PartialRepairsInfo.option.mech_gyro_1_crit.displayableName=1 Critical Gyro Hit
-PartialRepairsInfo.option.mech_gyro_1_crit.description=+1 to pilot rolls
-PartialRepairsInfo.option.mech_gyro_2_crit.displayableName=2 Critical Gyro hits
-PartialRepairsInfo.option.mech_gyro_2_crit.description=+2 to pilot rolls
+PartialRepairsInfo.option.mek_reactor_3_crit.displayableName=3+ Critical Engine Hits
+PartialRepairsInfo.option.mek_reactor_3_crit.description=8 heat buildup
+PartialRepairsInfo.option.mek_reactor_2_crit.displayableName=2 Critical Engine Hits
+PartialRepairsInfo.option.mek_reactor_2_crit.description=5 heat buildup
+PartialRepairsInfo.option.mek_reactor_1_crit.displayableName=1 Critical Engine Hit
+PartialRepairsInfo.option.mek_reactor_1_crit.description=3 heat buildup
+PartialRepairsInfo.option.mek_gyro_1_crit.displayableName=1 Critical Gyro Hit
+PartialRepairsInfo.option.mek_gyro_1_crit.description=+1 to pilot rolls
+PartialRepairsInfo.option.mek_gyro_2_crit.displayableName=2 Critical Gyro hits
+PartialRepairsInfo.option.mek_gyro_2_crit.description=+2 to pilot rolls
 PartialRepairsInfo.option.sensors_1_crit.displayableName=Misrepaired Sensors (1 hit)
 PartialRepairsInfo.option.sensors_1_crit.description=+1 to to-hit rolls
 PartialRepairsInfo.option.mech_sensors_2_crit.displayableName=Misrepaired Sensors (2 hits)
@@ -791,8 +791,8 @@ PartialRepairsInfo.option.aero_sensor_replace.displayableName=Misreplaced Sensor
 PartialRepairsInfo.option.aero_sensor_replace.description=+1 to to-hit rolls
 PartialRepairsInfo.option.aero_weapon_replace.displayableName=Misreplaced Weapon
 PartialRepairsInfo.option.aero_weapon_replace.description=+1 to to-hit rolls
-PartialRepairsInfo.option.mech_engine_replace.displayableName=Misreplaced Engine
-PartialRepairsInfo.option.mech_engine_replace.description=+1 Heat buildup
+PartialRepairsInfo.option.mek_engine_replace.displayableName=Misreplaced Engine
+PartialRepairsInfo.option.mek_engine_replace.description=+1 Heat buildup
 PartialRepairsInfo.option.mech_gyro_replace.displayableName=Misconfigured Gyro
 PartialRepairsInfo.option.mech_gyro_replace.description=+1 to piloting rolls
 

megamek/i18n/megamek/common/options/messages_es.properties

@@ -188,12 +188,12 @@ GameOptionsInfo.option.all_have_ei_cockpit.displayableName=(No oficial) Todas la
 GameOptionsInfo.option.all_have_ei_cockpit.description=Si esta marcada,\nLos pilotos con implantes EI obtienen el beneficio en cualquier unidad,\nNo solo los Meks del clan y AB.\nPara el dano del piloto,\nProtoMeks usa las reglas Mek,\nTodas las demas unidades usan las reglas AB.
 GameOptionsInfo.option.extreme_temperature_survival.displayableName=(No oficial) Supervivencia a temperaturas extremas
 GameOptionsInfo.option.extreme_temperature_survival.description=Si esta marcada,\nInfanteria y guerreros mecanicos no mueren instantaneamente en temperaturas extremas,\n pero tienes poco tiempo para salvarlos.\nNo implementado.
-GameOptionsInfo.option.armed_mechwarriors.displayableName=(No oficial) MekWarriors armados
-GameOptionsInfo.option.armed_mechwarriors.description=Si esta marcado,\nMekWarriors llevan un arma lateral que puede dispararse usando las mismas reglas que un rifle de infanteria.
+GameOptionsInfo.option.armed_mekwarriors.displayableName=(No oficial) MekWarriors armados
+GameOptionsInfo.option.armed_mekwarriors.description=Si esta marcado,\nMekWarriors llevan un arma lateral que puede dispararse usando las mismas reglas que un rifle de infanteria.
 GameOptionsInfo.option.pilots_visual_range_one.displayableName=(No oficial) Visibilidad limitada de Mechwarrior
-GameOptionsInfo.option.pilots_visual_range_one.description=Si esta marcada,\nMechwarriors solo tiene una visibilidad de 1 cuando la visibilidad se establece en menos de 999 y DB esta activado.
+GameOptionsInfo.option.pilots_visual_range_one.description=Si esta marcada,\nMekWarriors solo tiene una visibilidad de 1 cuando la visibilidad se establece en menos de 999 y DB esta activado.
 GameOptionsInfo.option.pilots_cannot_spot.displayableName=(No oficial) MekWarriors no puede detectar
-GameOptionsInfo.option.pilots_cannot_spot.description=Si esta marcado,\nMechwarriors no puede detectar fuego de las FDI.
+GameOptionsInfo.option.pilots_cannot_spot.description=Si esta marcado,\nMekWarriors no puede detectar fuego de las FDI.
 GameOptionsInfo.option.metal_content.displayableName=(No oficial) Contenido de metal para sensores MagScan.
 GameOptionsInfo.option.metal_content.description=Si se marca y el mapa en uso tiene contenido de metal configurado en hexagonos,\nEse contenido de metal afectara la capacidad del sensor MagScan.
 GameOptionsInfo.option.ba_grab_bars.displayableName=(No oficial) AB Barras de agarre en Meks estandar
@@ -731,16 +731,16 @@ PartialRepairsInfo.option.aero_fueltank_crit.displayableName=Deposito de combust
 PartialRepairsInfo.option.aero_fueltank_crit.description=-10% de capacidad de combustible
 PartialRepairsInfo.option.aero_gear_crit.displayableName=Tren de aterrizaje mal reparado
 PartialRepairsInfo.option.aero_gear_crit.description=+2 para tiradas de aterrizaje.
-PartialRepairsInfo.option.mech_reactor_3_crit.displayableName=3+ golpes criticos del motor
-PartialRepairsInfo.option.mech_reactor_3_crit.description=8 acumulacion de calor.
-PartialRepairsInfo.option.mech_reactor_2_crit.displayableName=2 golpes criticos del motor
-PartialRepairsInfo.option.mech_reactor_2_crit.description=5 acumulacion de calor.
-PartialRepairsInfo.option.mech_reactor_1_crit.displayableName=1 golpe critico del motor
-PartialRepairsInfo.option.mech_reactor_1_crit.description=3 acumulacion de calor
-PartialRepairsInfo.option.mech_gyro_1_crit.displayableName=1 golpe critico de giroscopio
-PartialRepairsInfo.option.mech_gyro_1_crit.description=+1 para tiradas de pilotaje.
-PartialRepairsInfo.option.mech_gyro_2_crit.displayableName=2 golpe critico de giroscopio
-PartialRepairsInfo.option.mech_gyro_2_crit.description=+2 para tiradas de pilotaje.
+PartialRepairsInfo.option.mek_reactor_3_crit.displayableName=3+ golpes criticos del motor
+PartialRepairsInfo.option.mek_reactor_3_crit.description=8 acumulacion de calor.
+PartialRepairsInfo.option.mek_reactor_2_crit.displayableName=2 golpes criticos del motor
+PartialRepairsInfo.option.mek_reactor_2_crit.description=5 acumulacion de calor.
+PartialRepairsInfo.option.mek_reactor_1_crit.displayableName=1 golpe critico del motor
+PartialRepairsInfo.option.mek_reactor_1_crit.description=3 acumulacion de calor
+PartialRepairsInfo.option.mek_gyro_1_crit.displayableName=1 golpe critico de giroscopio
+PartialRepairsInfo.option.mek_gyro_1_crit.description=+1 para tiradas de pilotaje.
+PartialRepairsInfo.option.mek_gyro_2_crit.displayableName=2 golpe critico de giroscopio
+PartialRepairsInfo.option.mek_gyro_2_crit.description=+2 para tiradas de pilotaje.
 PartialRepairsInfo.option.sensors_1_crit.displayableName=Sensores mal reparados (1 Golpe)
 PartialRepairsInfo.option.sensors_1_crit.description=+1 para tiradas de golpe.
 PartialRepairsInfo.option.mech_sensors_2_crit.displayableName=Sensores mal reparados (2 Golpe)
@@ -759,8 +759,8 @@ PartialRepairsInfo.option.aero_sensor_replace.displayableName=Sensores mal reemp
 PartialRepairsInfo.option.aero_sensor_replace.description=+1 para tiradas de golpe.
 PartialRepairsInfo.option.aero_weapon_replace.displayableName=Arma mal reemplazada
 PartialRepairsInfo.option.aero_weapon_replace.description=+1 para tiradas de golpe.
-PartialRepairsInfo.option.mech_engine_replace.displayableName=Motor mal reemplazado
-PartialRepairsInfo.option.mech_engine_replace.description=+1 Acumulacion de calor.
+PartialRepairsInfo.option.mek_engine_replace.displayableName=Motor mal reemplazado
+PartialRepairsInfo.option.mek_engine_replace.description=+1 Acumulacion de calor.
 PartialRepairsInfo.option.mech_gyro_replace.displayableName=Giroscopio mal configurado
 PartialRepairsInfo.option.mech_gyro_replace.description=+1 para tiradas de pilotaje.