Skip to content

Commit

Permalink
move MekView, separate resources, adaptations for RunMPEquipmentModifier
Browse files Browse the repository at this point in the history
  • Loading branch information
SJuliez committed Dec 7, 2024
1 parent 98f7e3e commit 0a5f398
Show file tree
Hide file tree
Showing 17 changed files with 466 additions and 286 deletions.
10 changes: 7 additions & 3 deletions megamek/docs/Scenarios/ScenarioV2 HowTo.mms
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,14 @@ factions:
# modifiers that apply to the unit; this must also be done for modifiers that apply
# to systems like Gyro, Controls, Engine; always write as list
unit:
# Gyro/controls problems: unit cannot twist
- type: runmp
delta: -1
# The system that this modifier comes from: gyro, avionics, controls, life support, cockpit
system: gyro

# Gyro/controls problems: unit cannot twist (turret/torso)
- type: notwist
# - type: runmp
# delta: -1
system: gyro

# note that a heat modifier can be applied to a jump jet slot, resulting in modified heat when jumping; all
# heat modifiers on JJ slots stack
Expand Down
136 changes: 136 additions & 0 deletions megamek/i18n/megamek/client/MekView.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
#
# Copyright (c) 2024 - The MegaMek Team. All Rights Reserved.
#
# This file is part of MegaMek.
#
# MegaMek is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# MegaMek is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
#

ActiveFighters=Active Fighters
Armor=Armor
CarryingCapacity=Carrying Capacity
Crew=Crew
Officers=Officers
Enlisted=Enlisted/Non-rated
Gunners=Gunners
BayPersonnel=Bay Personnel
Passengers=Passengers
Marines=Marines
BAMarines=BA Marines
ExtraCrewSeats=Extra Crew Seats:
DropshipCollar.NONE=No docking collar
DropshipCollar.NO_BOOM=No K-F Boom
DropshipCollar.PROTOTYPE_BOOM=Prototype K-F Boom
Clan=\ (Clan)
BaseTechLevel=Base Tech Level
Era=Era
Level=Level
Extinct=Extinct
TechRating=Tech Rating
Weight=Weight
BV=BV
Cost=Cost
Source=Source
Role=Role
ISExtinctOnly=* Does not apply to ComStar or Clans
DesignInvalid=[Design Invalid]
Endo\ Steel=\ (Endo Steel)
Endo\ Steel\ Prototype=\ (Endo Steel Prototype)
Reinforced=\ (Reinforced)
Composite=\ (Composite)
Endo-Composite=\ (Endo-Composite)
Primitive\ Aero=\ (Primitive)
engine=Engine
gyro=Gyro
cockpit=Cockpit
ConstructionFactor=Construction Factor
CapitalArmor=\ (Capital Scale)
TurretArmor=Turret Armor
Primitive=\ (Primitive)
Standard\ Aerospace=
Primitive\ Aerospace=\ (Primitive)
Primitive\ Fighter=\ (Primitive)
Heat=\ Heat
HeatSinks=Heat Sinks
FuelPoints=Fuel Points
SystemDamage=System Damage
Fuel.format=%s (%3.1f tons)
TonsPerBurnDay=Tons Per Burn Day
Internal=Internal
IS=\ (IS)
SI=Structural Integrity
SailIntegrity=Sail Integrity
KFIntegrity=KF Drive Integrity
Men=Soldiers
MixedIS=\ Mixed (Base IS)
MixedClan=\ Mixed (Base Clan)
Movement=Movement
VSTOL=VSTOL
Standard=
tons=\ tons
BARRating=BAR Rating
Burdened=Burdened by unjettisoned body-mounted missile launchers
DWPBurdened=Burdened by unjettisoned DWP
Industrial=\ Industrial
Heavy\ Industrial=\ Heavy Industrial
WeaponDamage=\ weapon(s) damaged
Pod=Pod
Fixed=Fixed
Quirks=Quirks
WeaponQuirks=Weapon Quirks
InvalidReasons=Invalid because:
InvalidButIllegalQuirk=Illegal Design Quirk, would be invalid because:
equipmentmods=Equipment Modifiers
SalvageQuality=Salvage Quality
PartialRepair=Partial Repair
damaged=Damaged
systems=Systems

controls=Controls
avionics=Avionics
lifesupport=Life Support
unknown=Unknown

walk=walk
run=run
cruise=cruise
flank=flank
safethrust=safe thrust
maxthrust=max thrust

# armor types, used programmatically
Commercial=\ Commercial
Ferro-Fibrous=\ (Ferro-Fibrous)
Standard\ Capital=\ (Standard)
Improved\ Ferro-Aluminum=\ (Improved Ferro-Alum)
Ferro-Carbide=\ (Ferro-Carbide)
Lamellor\ Ferro-Carbide=\ (Lamellor Ferro-Carbide)
Reactive=\ (Reactive)
Reflective=\ (Reflective)
Hardened=\ (Hardened)
Ferro-Lamellor=\ (Ferro-Lamellor)
Light\ Ferro-Fibrous=\ (Light Ferro-Fibrous)
Heavy\ Ferro-Fibrous=\ (Heavy Ferro-Fibrous)
Patchwork=\ (Patchwork)
Stealth=\ (Stealth)
Ferro-Fibrous\ Prototype=\ (Ferro-Fibrous Prototype)
Ferro-Aluminum=\ (Ferro-Aluminum)
Light\ Ferro-Aluminum=\ (Light Ferro-Aluminum)
Heavy\ Ferro-Aluminum=\ (Heavy Ferro-Aluminum)
Vehicular\ Stealth=\ (Vehicular\ Stealth)
Anti-Penetrative\ Ablation=\ (Anti-Penetrative\ Ablation)
Heat-Dissipating=\ (Heat-Dissipating)
Impact-Resistant=\ (Impact-Resistant)
Ballistic-Reinforced=\ (Ballistic-Reinforced)
Prototype\ Ferro-Aluminum=\ (Ferro-Aluminum Prototype)
56 changes: 56 additions & 0 deletions megamek/i18n/megamek/client/MekView_de.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#
# Copyright (c) 2024 - The MegaMek Team. All Rights Reserved.
#
# This file is part of MegaMek.
#
# MegaMek is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# MegaMek is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
#
Standard\ Aerospace=
Primitive\ Aerospace=\ (Primitiv)
Primitive\ Fighter=\ (Primitiv)
ActiveFighters=Aktive Kampfflugzeuge
Armor=Rüstung
CarryingCapacity=Transportfähigkeit
Crew=Mannschaft
Officers=Offiziere
Enlisted=Mannschaften
Gunners=Schützen
Passengers=Passagiere
Era=Ära
Weight=Gewicht
Cost=Preis
Source=Quelle
Role=Rolle
DesignInvalid=[Unerlaubtes Design]
Heat=\ Hitze
HeatSinks=Kühlkörper
Internal=Interne Struktur
SI=
SailIntegrity=Segel-Integrität
KFIntegrity=KF-Integrität
Men=Soldaten
MixedIS=Gemischt (Basis IS)
MixedClan=Gemischt (Basis Clan)
Movement=Bewegung
tons=\ Tonnen
Fixed=Fest
Quirks=Eigenheiten (Quirks)
WeaponQuirks=Waffen-Eigenheiten (Quirks)
equipmentmods=Ausrüstungs-Modifikationen
SalvageQuality=Niederwertige Qualität
PartialRepair=Teil-Reparatur
damaged=Beschädigt
systems=Systeme
controls=Kontrollen
unknown=Unbekannt
21 changes: 21 additions & 0 deletions megamek/i18n/megamek/client/MekView_en.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#
# Copyright (c) 2024 - The MegaMek Team. All Rights Reserved.
#
# This file is part of MegaMek.
#
# MegaMek is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# MegaMek is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
#


# Intentionally empty, falls back to the generic properties file
106 changes: 0 additions & 106 deletions megamek/i18n/megamek/client/messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2301,112 +2301,6 @@ MekSelectorDialog.Search.DoomedInSpace=Doomed In Space
MekSelectorDialog.Search.DoomedInExtremeTemp=Doomed In Extreme Temp
MekSelectorDialog.Search.DoomedInVacuum=Doomed In Vacuum

#Mekview (Lobby, MHQ, Etc)
MekView.ActiveFighters=Active Fighters
MekView.Armor=Armor
MekView.CarryingCapacity=Carrying Capacity
MekView.DropshipCollar=Docking Collar
MekView.Crew=Crew
MekView.Officers=Officers
MekView.Enlisted=Enlisted/Non-rated
MekView.Gunners=Gunners
MekView.BayPersonnel=Bay Personnel
MekView.Passengers=Passengers
MekView.Marines=Marines
MekView.BAMarines=BA Marines
MekView.ExtraCrewSeats=Extra Crew Seats:\
MekView.DropshipCollar.NONE=No docking collar
MekView.DropshipCollar.NO_BOOM=No K-F Boom
MekView.DropshipCollar.PROTOTYPE_BOOM=Prototype K-F Boom
MekView.Clan=\ (Clan)
MekView.BaseTechLevel=Base Tech Level
MekView.Era=Era
MekView.Level=Level
MekView.Extinct=Extinct
MekView.TechRating=Tech Rating
MekView.Weight=Weight
MekView.BV=BV
MekView.Cost=Cost
MekView.Source=Source
MekView.Unknown=(Unknown)
MekView.Role=Role
MekView.ISExtinctOnly=* Does not apply to ComStar or Clans
MekView.DesignInvalid=[Design Invalid]
MekView.Endo\ Steel=\ (Endo Steel)
MekView.Endo\ Steel\ Prototype=\ (Endo Steel Prototype)
MekView.Reinforced=\ (Reinforced)
MekView.Composite=\ (Composite)
MekView.Endo-Composite=\ (Endo-Composite)
MekView.Primitive\ Aero=\ (Primitive)
MekView.Engine=Engine
MekView.Gyro=Gyro
MekView.Cockpit=Cockpit
MekView.ConstructionFactor=Construction Factor
MekView.CapitalArmor=\ (Capital Scale)
MekView.TurretArmor=Turret Armor
MekView.Ferro-Fibrous=\ (Ferro-Fibrous)
MekView.Standard\ Capital=\ (Standard)
MekView.Improved\ Ferro-Aluminum=\ (Improved Ferro-Alum)
MekView.Ferro-Carbide=\ (Ferro-Carbide)
MekView.Lamellor\ Ferro-Carbide=\ (Lamellor Ferro-Carbide)
MekView.Reactive=\ (Reactive)
MekView.Reflective=\ (Reflective)
MekView.Hardened=\ (Hardened)
MekView.Ferro-Lamellor=\ (Ferro-Lamellor)
MekView.Light\ Ferro-Fibrous=\ (Light Ferro-Fibrous)
MekView.Heavy\ Ferro-Fibrous=\ (Heavy Ferro-Fibrous)
MekView.Patchwork=\ (Patchwork)
MekView.Stealth=\ (Stealth)
MekView.Ferro-Fibrous\ Prototype=\ (Ferro-Fibrous Prototype)
MekView.Ferro-Aluminum=\ (Ferro-Aluminum)
MekView.Light\ Ferro-Aluminum=\ (Light Ferro-Aluminum)
MekView.Heavy\ Ferro-Aluminum=\ (Heavy Ferro-Aluminum)
MekView.Vehicular\ Stealth=\ (Vehicular\ Stealth)
MekView.Anti-Penetrative\ Ablation=\ (Anti-Penetrative\ Ablation)
MekView.Heat-Dissipating=\ (Heat-Dissipating)
MekView.Impact-Resistant=\ (Impact-Resistant)
MekView.Ballistic-Reinforced=\ (Ballistic-Reinforced)
MekView.Prototype\ Ferro-Aluminum=\ (Ferro-Aluminum Prototype)
MekView.Primitive=\ (Primitive)
MekView.Standard\ Aerospace=
MekView.Primitive\ Aerospace=\ (Primitive)
MekView.Primitive\ Fighter=\ (Primitive)
MekView.Heat=\ Heat
MekView.HeatSinks=Heat Sinks
MekView.FuelPoints=Fuel Points
MekView.SystemDamage=System Damage
MekView.Fuel.format=%s (%3.1f tons)
MekView.TonsPerBurnDay=Tons Per Burn Day
MekView.Internal=Internal
MekView.IS=\ (IS)
MekView.SI=Structural Integrity
MekView.SailIntegrity=Sail Integrity
MekView.KFIntegrity=KF Drive Integrity
MekView.Men=Soldiers
MekView.MixedIS=\ Mixed (Base IS)
MekView.MixedClan=\ Mixed (Base Clan)
MekView.Movement=Movement
MekView.VSTOL=VSTOL
MekView.Standard=
MekView.tons=\ tons
MekView.BARRating=BAR Rating
MekView.Burdened=Burdened by unjettisoned body-mounted missile launchers
MekView.DWPBurdened=Burdened by unjettisoned DWP
MekView.Industrial=\ Industrial
MekView.Heavy\ Industrial=\ Heavy Industrial
MekView.Commercial=\ Commercial
MekView.WeaponDamage=\ weapon(s) damaged
MekView.Pod=Pod
MekView.Fixed=Fixed
MekView.Quirks=Quirks
MekView.WeaponQuirks=Weapon Quirks
MekView.EquipmentMods=Equipment Modifiers
MekView.SalvageQuality=Salvage Quality
MekView.PartialRepair=Partial Repair
MekView.Damaged=Damaged
MekView.InvalidReasons=Invalid because:
MekView.InvalidButIllegalQuirk=Illegal Design Quirk, would be invalid because:

#Minelaying
MineDensityDialog.title=Mine Density
MineDensityDialog.labDensity=Density
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* along with MegaMek. If not, see <http://www.gnu.org/licenses/>.
*/

package megamek.common;
package megamek.client.ui;

/**
* Enum of valid formatting styles, to use with MekView objects
Expand Down
Loading

0 comments on commit 0a5f398

Please sign in to comment.