From 43cb927177b0789df534fb6140354758f8c12dd2 Mon Sep 17 00:00:00 2001 From: Rod99 Date: Thu, 31 Oct 2019 16:51:21 -0500 Subject: [PATCH 1/4] Start blades --- .../Weaponry/Archaic Weapons/Melee/{Blades.txt => Blades.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename battletech/Infantry/Weaponry/Archaic Weapons/Melee/{Blades.txt => Blades.json} (100%) diff --git a/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.txt b/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json similarity index 100% rename from battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.txt rename to battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json From aeba8023ceea19dd3a50c9029cd0252740c664b2 Mon Sep 17 00:00:00 2001 From: Rod99 Date: Tue, 21 Apr 2020 18:50:56 -0500 Subject: [PATCH 2/4] at least it WORKS --- CONTRIBUTING.md | 134 +++++++++++++++++- .../Battle Armor/Techniques/CLAAAAAW.json | 20 +-- .../Weaponry/Ballistics/ballistics.json | 6 +- .../Weaponry/Ballistics/vehicle_parts.json | 2 +- .../Archaic Weapons/Melee/Blades.json | 20 +++ .../Weaponry/Ballistics/Flechette/ammo.json | 6 +- .../Ballistics/Flechette/flechette.json | 16 +-- .../Weaponry/Ballistics/Slugs/ammo.json | 4 +- .../Weaponry/Ballistics/Slugs/magazines.json | 2 +- .../Weaponry/Ballistics/Slugs/slug.json | 4 +- .../Infantry/Weaponry/Lasers/IS/lasers.json | 2 +- .../Infantry/Weaponry/Missiles/SRM/SRM.json | 6 +- .../Infantry/Weaponry/Missiles/SRM/ammo.json | 2 +- .../Terrain/Buildings/overmap_terrain.json | 8 +- battletech/faction/bills.json | 4 +- battletech/scenarioes.json | 2 +- 16 files changed, 193 insertions(+), 45 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95b0d53..51a0baa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,13 +1,13 @@ # Rules * Keep it to lore, with exceptions. Many exceptions. -* Custom Vehicles/BA/'Mech designs can only be from MegaMekLab or from Sarna.net, or wherever you got them from. +* Custom Vehicles/BA/'Mech designs can only be from MegaMekLab or from Sarna.net, or wherever you got them from. I dun caaaaare! * Tiles are considered 1.55 meters. Don't ask, it took a while. A long while. * @Lord Rod, Lord of Rods [COM] for the vehicle speed rework, I approximated car width in meters as `0.4 * (tiles width) + 0.5<= 5`, or `2.5 + ( tiles - 5 ) * 0.15m` for larger vehicles. * Damage is calculated using MegamekLab's damage values, times ~~`(40/.18)`~~ `(40 * (.18 * x))?`. ~~`x * (40/.18)`, with x being the damage value.~~ I got `40` from the damage of the revolver in CDDA. `.18` is the damage value of the revolver in Battletech. -* `On a standard mapsheet the hex size as originally printed is approximately 1.25 inches and depicts terrain 30 meters (roughly 100 feet) across.` And since each tile is 1.55 meters, each hex is 19 tiles. -* Maybe infantry damage can be `x * 38.1428`, with x being the standard damage value. Make sure it isn't the armor piercing value, by the way. +* `On a standard map sheet the hex size as originally printed is approximately 1.25 inches and depicts terrain 30 meters (roughly 100 feet) across.` And since each tile is 1.55 meters, each hex is 19 tiles. +* Maybe infantry damage can be `x * 38.1428`, with x being the standard damage value. Make sure it isn't the armor-piercing value, by the way. * Example: > RAC/2 has a range of 18. > @@ -20,9 +20,135 @@ smh I give up. 5x abstraction, here we go.` -* ~~`Dispersion is the weapon's BV divided by 1.55, with a limit of 200 for rifles and stuff like that, and shotguns having a limit of 500. Rockets have a limit of 150, with Artemis IV taking 100 off. Lasers have a max of 45. This is all arbituary, by the way.`~~ +* ~~`Dispersion is the weapon's BV divided by 1.55, with a limit of 200 for rifles and stuff like that, and shotguns having a limit of 500. Rockets have a limit of 150, with Artemis IV taking 100 off. Lasers have a max of 45. This is all arbitrary, by the way.`~~ * Dispersion is based on type and range. * Could always convert infantry damage to mech damage with 3:0.02. * And with that, I can take the damage from the revolver in BT and base it from there? * Bow density is `226.667 g/L`. * Crossbow density is `1818.67 g/L`. + +## The actual work. + +### Melee +How the heck does melee work? +Frankly, under the other system, it was hella borky. + +Example: + + (40 * (.18 * x)) + + x = 0.02 + + (40 * 0.0036) + + 0.144 + +That's not how it's supposed to work at all... + + + +Alrighty! + +I'm doing something else. + + + +##### Wakizashi Cutting Example: + + "cutting": 24, +to: + + Wakizashi: 0.02, + + +To get to the proper value, you'd have to multiply by over 1200... + +#### Prototype BT to CDDA Conversion: + + x * 1200 + + x = 0.02 + + 0.02 * 1200 = 24 + +BUT! + +Let's try it with something else, eh? + +##### Bokken Bashing Example: + + "bashing": 25, +to + + Bokken: 0.04, +To get to the proper value you'd have to multiply by *625*. + +Battletech is horse fodder, that's what. + +"But Rod!" you'd demand. + +"You compared a cutting weapon's value conversion to a bashing weapon's value conversion." + +*sigh\* + +Here you go, you bloody demons: + +##### Zweihander Cutting Example: + + "cutting": 40, +to + + Zweihander: 0.05, + +To get to the proper value you'd have to multiply by a mere *800.* + +OR! + +Maybe one could combine *both `bashing` and `cutting`!* + +##### Zweihander Mixed Example: + + "cutting": 40, + "bashing": 17, + "mixed": 57, +to + + Zweihander: 0.05 + +To get to the proper value you'd have to multiply by only 1140. + +Which means nothing. +Literally nothing. + +We need things to compare it to. + + +##### Bokken Mixed Example: + + "bashing": 25, + "cutting": 1, +to + + Bokken: 0.04, +To get to the proper value you'd have to multiply by *650*. + +But what's more important is comparing it to another bashing weapon. + +##### Wakizashi Mixed Example: + + "cutting": 24, + "bashing": 3, +to + + Wakizashi: 0.02, + +To get to the proper value you'd have to multiply by *1400*. + +That's only a `260` difference. With a mean of 1270 as well... + +My head hurts now, but this is good enough for pre-tweaking values, no? + +#### Improved BT-To-CDDA Conversion + x = bt_Weapon_Damage + cdda_Weapon_Damage = x * 1270 + diff --git a/battletech/Battle Armor/Techniques/CLAAAAAW.json b/battletech/Battle Armor/Techniques/CLAAAAAW.json index 0dba1bf..dbd93a6 100644 --- a/battletech/Battle Armor/Techniques/CLAAAAAW.json +++ b/battletech/Battle Armor/Techniques/CLAAAAAW.json @@ -5,8 +5,9 @@ "name": "Crusher", "min_unarmed": 5, "unarmed_allowed": true, + "crit_ok": true, "stun_dur": 2, - "mult_bonuses": [ [ "damage", "bash", 1.6 ] ], + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 1.6 } ], "messages": [ "You grab and crush %s's limb", " grabs and crushes %s's limb" ] }, { @@ -16,32 +17,33 @@ "min_unarmed": 1, "unarmed_allowed": true, "stun_dur": 2, - "mult_bonuses": [ [ "damage", "bash", 2.3 ] ], + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 2.3 } ], "messages": [ "You smash %s's limb", " smashes %s's limb" ] }, { "type": "martial_art", "id": "move_strike", - "name": "Strike", - "description": "Sport of the true gentleman, modern boxing has evolved from the prizefights of the Victorian era.", + "name": "Metal Strike", + "description": "Angery man with metal claw hits hard.", "arm_block": 3, "leg_block": 99, "static_buffs": [ { "id": "strike_static", "name": "Strike", - "description": "PER increases unarmed power, STR reduces block damage.", + "description": "Testing buffs.", "unarmed_allowed": true, "min_unarmed": 6, "max_stacks": 1, - "flat_bonuses": [ [ "damage", "bash", "per", 0.4 ], [ "block", "str", 0.5 ] ] + + "flat_bonuses": [ { "stat": "damage", "type": "bash", "scaling-stat": "str", "scale": 0.4 } ] } ], "onmove_buffs": [ { "id": "strike_move_buff", "name": "Footwork", - "description": "Gain extra damage while moving.", + "description": "Trying out movement buffs.", "unarmed_allowed": true, "min_unarmed": 4, "buff_duration": 2, @@ -53,12 +55,12 @@ { "id": "strike_striker", "name": "Striker", - "description": "Break them.", + "description": "Break them? I dunno, this should be a 3x damage boost.", "min_unarmed": 7, "unarmed_allowed": true, "max_stacks": 3, "buff_duration": 3, - "mult_bonuses": [ [ "damage", "bash", 3 ] ] + "mult_bonuses": [ { "stat": "damage", "type": "bash", "scale": 3.0 } ] } ], "techniques": [ "tec_CRUSHER", "tec_POWER_PUNCH" ], diff --git a/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json b/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json index 6410fa7..e80b730 100644 --- a/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json +++ b/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json @@ -75,7 +75,7 @@ "symbol": "/", "color": "grey", "name": "Rotary Autocannon/5", - "description": "Developed in 3062 by the Federated Commonwealth, the Rotary Autocannon/2 is based only loosely on the Autocannon/2. While it has the same bore, it is capable of firing up to six times as many rounds as its standard cousin, allowing it to deal three times the damage of even an Ultra AC/2 (while the Inner Sphere variants suffer from a minor drop to effective range).", + "description": "Big cannon go brrt", "price": 81750000, "material": "steel", "flags": [ "MOUNTED_GUN" ], @@ -122,7 +122,7 @@ "symbol": "/", "color": "grey", "name": "Rotary Autocannon/10", - "description": "Developed in 3062 by the Federated Commonwealth, the Rotary Autocannon/2 is based only loosely on the Autocannon/2. While it has the same bore, it is capable of firing up to six times as many rounds as its standard cousin, allowing it to deal three times the damage of even an Ultra AC/2 (while the Inner Sphere variants suffer from a minor drop to effective range).", + "description": "heccin' chonker doesn't exist", "price": 81750000, "material": "steel", "flags": [ "MOUNTED_GUN" ], @@ -169,7 +169,7 @@ "symbol": "/", "color": "grey", "name": "Rotary Autocannon/20", - "description": "Developed in 3062 by the Federated Commonwealth, the Rotary Autocannon/2 is based only loosely on the Autocannon/2. While it has the same bore, it is capable of firing up to six times as many rounds as its standard cousin, allowing it to deal three times the damage of even an Ultra AC/2 (while the Inner Sphere variants suffer from a minor drop to effective range).", + "description": "why the hecc is this here. it doesn't even exist in lore", "price": 81750000, "material": "steel", "flags": [ "MOUNTED_GUN" ], diff --git a/battletech/Battlemechs/Weaponry/Ballistics/vehicle_parts.json b/battletech/Battlemechs/Weaponry/Ballistics/vehicle_parts.json index 8be03b1..3491330 100644 --- a/battletech/Battlemechs/Weaponry/Ballistics/vehicle_parts.json +++ b/battletech/Battlemechs/Weaponry/Ballistics/vehicle_parts.json @@ -83,7 +83,7 @@ "durability": 222, "damage_modifier": 80, "location": "on_roof", - "description": ".", + "description": "it's an autocannon that fires fast", "flags": [ "TURRET", "TOOL_NONE" ] } ] diff --git a/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json b/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json index e69de29..372b226 100644 --- a/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json +++ b/battletech/Infantry/Weaponry/Archaic Weapons/Melee/Blades.json @@ -0,0 +1,20 @@ +[ + { + "id": "bt_wakizashi", + "type": "TOOL", + "category": "weapons", + "symbol": "|", + "color": "light_gray", + "name": "Wakizashi [BT]", + "description": "Weebs in the year 30xx use these, yay.", + "price": 175500, + "to_hit": 1, + "material": "steel", + "weight": 1000, + "volume": "1700 ml", + "cutting": 25, + "techniques": [ "RAPID", "WBLOCK_2" ], + "qualities": [ [ "CUT", 1 ], [ "BUTCHER", 13 ] ], + "flags": [ "DURABLE_MELEE", "SHEATH_SWORD" ] + } +] \ No newline at end of file diff --git a/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json b/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json index 51ecdf6..62ba28d 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json +++ b/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json @@ -5,7 +5,7 @@ "name": "Incendiary Fléchette Block", "description": "Incendiary shotgun rounds, fléchette type. These polymer ammunition blocks encapsulate hypergolic chemicals which ignite upon air contact. A single ten-shot burst of these white-hot needles can cover a broad area, allowing the 'Firedrake' to saturate a full squad of enemy soldiers and ignite the surrounding terrain in a blaze in less than five seconds, though it has no effect on armored units such as combat vehicles or battle armor as the fléchettes simply bounce off.", "weight": 300, - "volume": 2, + "volume": "2000 ml", "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", @@ -23,7 +23,7 @@ "name": "Heavy Fléchette Block", "description": "Heavy shotgun rounds, fléchette type, designed specifically to overcome the usual ineffectiveness of fléchettes against armor. Heavy fléchette rounds travel at much greater speeds than normal, allowing them to penetrate armored targets more effectively.", "weight": 80, - "volume": 2, + "volume": "2000 ml", "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", @@ -42,7 +42,7 @@ "name": "Fléchette Block", "description": "Shotgun rounds, fléchette type, designed specifically to overcome the usual ineffectiveness of fléchettes against armor. Fletchettes are created by shredding a polymer-composite block and fired by a burst of compressed gas, making the weapon noiseless with little to no recoil and the favorite choice of assassins.", "weight": 200, - "volume": 2, + "volume": "2000 ml", "price": 5000, "material": [ "plastic", "powder" ], "symbol": "=", diff --git a/battletech/Infantry/Weaponry/Ballistics/Flechette/flechette.json b/battletech/Infantry/Weaponry/Ballistics/Flechette/flechette.json index 5e74f7f..cb7271a 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Flechette/flechette.json +++ b/battletech/Infantry/Weaponry/Ballistics/Flechette/flechette.json @@ -8,7 +8,7 @@ "id": "fd_needler", "description": "The 'Firedrake' Incendiary Support Needler is a support weapon produced by Mauser & Gray Firearms for the Lyran Alliance. First introduced in 3061, the 'Firedrake' continues in the spirit of previous weapons like the Shredder Heavy Needler on improving the range and power of traditional flechette-based weapons, this time by combining a high rate-of-fire and superior range with the incendiary properties of its special ammunition. A single ten-shot burst of these white-hot needles can cover a broad area, allowing the 'Firedrake' to saturate a full squad of enemy soldiers and ignite the surrounding terrain in a blaze in less than five seconds, though it has no effect on armored units such as combat vehicles or battle armor as the flechettes simply bounce off.", "weight": 25000, - "volume": 7, + "volume": "7000 ml", "price": 545000, "to_hit": -1, "bashing": 12, @@ -42,7 +42,7 @@ "id": "shred_needler", "description": "The 'Shredder' Heavy Needler is a Needler Rifle produced by Omnitech for the Lyran Alliance. Resembling a small, wide-barreled rifle, the Shredder is designed specifically to overcome the usual ineffectiveness of flechettes against armor. Its high-speed cutters launch heavy flechette rounds at much greater speeds than normal, allowing them to penetrate armored targets more effectively.", "weight": 1000, - "volume": 8, + "volume": "8000 ml", "price": 163500, "to_hit": -1, "bashing": 7, @@ -76,7 +76,7 @@ "id": "rifle_needler", "description": "The Needler Rifle is a vicious weapon that fires a spray of tiny fletchettes that can easily shred flesh. These fletchettes are created by shredding a polymer-composite block and fired by a burst of compressed gas, making the weapon noiseless with little to no recoil and the favorite choice of assassins. However, it is an incredibly short-ranged weapon with almost no armor penetration capabilities. This limits its use to self-defense and close-quarters combat, though it serves as an ideal weapon for boarding space-vessels.", "weight": 1000, - "volume": 8, + "volume": "8000 ml", "price": 81750, "to_hit": -1, "bashing": 6, @@ -109,7 +109,7 @@ "id": "rifle_needler_smg", "description": "The M&G Flechette Rifle is a Needler Rifle produced by Mauser & Gray Firearms for the Lyran Alliance. The rifle uses a special firing mechanism as well as an exotic polymer-composite formula to fire flechettes at a rate of fire comparable to a submachine gun. For this reason it is restricted to military personnel only.", "weight": 1500, - "volume": 8, + "volume": "8000 ml", "price": 218000, "to_hit": -1, "bashing": 6, @@ -149,7 +149,7 @@ "id": "pistol_needler", "description": "The Needler Pistol is a vicious weapon that fires a spray of tiny flechettes which easily shreds flesh.However, needlers are incredibly short-ranged weapons with almost no armor penetration capabilities. This limits their use to self-defense and close-quarters combat, as well as being ideal weapons for boarding space-vessels.This pistol is lighter and cheaper than the Needler Rifle and a favorite back-up weapon throughout the Inner Sphere and Periphery.", "weight": 300, - "volume": 0.5, + "volume": "500 ml", "price": 54500, "to_hit": 0, "bashing": 3, @@ -172,7 +172,7 @@ "id": "pistol_needler_holdout", "description": "The Hold-Out Needler Pistol is one of the smallest personal weapons on the market and, despite its incredibly short range, delivers as much damage as a full-sized Needler Pistol. For many MechWarriors, this disposable pocket pistol is their last line of defense in an emergency.", "weight": 50, - "volume": 0.5, + "volume": "500 ml", "price": 21800, "to_hit": -1, "bashing": 3, @@ -194,7 +194,7 @@ "id": "pistol_needler_smg", "description": "The Needler Pistol is a vicious weapon that fires a spray of tiny flechettes which easily shreds flesh.However, needlers are incredibly short-ranged weapons with almost no armor penetration capabilities. This limits their use to self-defense and close-quarters combat, as well as being ideal weapons for boarding space-vessels.This pistol is lighter and cheaper than the Needler Rifle and a favorite back-up weapon throughout the Inner Sphere and Periphery.", "weight": 650, - "volume": 0.5, + "volume": "500 ml", "price": 109000, "to_hit": 0, "bashing": 3, @@ -217,7 +217,7 @@ "id": "pistol_needler_light", "description": "The Sea Eagle Needler Pistol is a Needler Pistol produced by Irian PersArms, a subsidiary of Irian Technologies founded in 3032. Their sole entry into the needler market, unlike other needler pistols Irian's lightweight design can be fired one-handed, though a secondary grip under the barrel facilitates two-handed firing. The Sea Eagle's speed of fire and excellent balance also means its apparent recoil is less than other needler pistols, however its size limits the number of shots available and at its maximum rate of fire the pistol will expend its ammunition in only two bursts.", "weight": 350, - "volume": 0.5, + "volume": "500 ml", "price": 119900, "to_hit": 0, "bashing": 3, diff --git a/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json b/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json index f21b00b..7bf5e40 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json +++ b/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json @@ -4,7 +4,7 @@ "type": "AMMO", "name": "Auto-Pistol Ammo", "description": "Ammo for Auto-Pistol.", - "volume": 0.5, + "volume": "500 ml", "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", @@ -19,7 +19,7 @@ "type": "AMMO", "name": "Elephant Gun Shell", "description": "EGS.", - "volume": 0.1, + "volume": "100 ml", "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", diff --git a/battletech/Infantry/Weaponry/Ballistics/Slugs/magazines.json b/battletech/Infantry/Weaponry/Ballistics/Slugs/magazines.json index 50188ac..96d6070 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Slugs/magazines.json +++ b/battletech/Infantry/Weaponry/Ballistics/Slugs/magazines.json @@ -5,7 +5,7 @@ "name": "Auto-Pistol Magazine", "description": "Magazine for an Auto-Pistol.", "weight": 490, - "volume": 0.5, + "volume": "500 ml", "price": 9920, "material": "steel", "symbol": "#", diff --git a/battletech/Infantry/Weaponry/Ballistics/Slugs/slug.json b/battletech/Infantry/Weaponry/Ballistics/Slugs/slug.json index 14fdf11..791e579 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Slugs/slug.json +++ b/battletech/Infantry/Weaponry/Ballistics/Slugs/slug.json @@ -8,7 +8,7 @@ "id": "pistol_auto", "description": "The Auto-Pistol or Automatic Pistol is a fairly standard sidearm for both military and civilian use. Ammunition is fed into the pistol automatically from a detachable magazine, allowing for greater capacity and reload time than a Revolver.", "weight": 500, - "volume": 0.5, + "volume": "500 ml", "price": 54500, "to_hit": 0, "bashing": 3, @@ -30,7 +30,7 @@ "id": "elephant_gun", "description": "Yah.", "weight": 5000, - "volume": 0.5, + "volume": "500 ml", "price": 54500, "to_hit": 0, "bashing": 3, diff --git a/battletech/Infantry/Weaponry/Lasers/IS/lasers.json b/battletech/Infantry/Weaponry/Lasers/IS/lasers.json index 7f15d57..d4b7cac 100644 --- a/battletech/Infantry/Weaponry/Lasers/IS/lasers.json +++ b/battletech/Infantry/Weaponry/Lasers/IS/lasers.json @@ -6,7 +6,7 @@ "name": "Laser Pistol", "description": "The Laser Pistol is the standard sidearm of many pilots and officers in the more technologically-advanced militaries of the Inner Sphere. Though popular with superior range and punch compared to ballistic pistols, laser pistols are expensive and require the use of power packs to supply the necessary energy. The Laser Pistol can also be used as a cutting tool by keeping the trigger held down.", "weight": 1000, - "volume": 0.5, + "volume": "500 ml", "price": 75000, "to_hit": -1, "bashing": 5, diff --git a/battletech/Infantry/Weaponry/Missiles/SRM/SRM.json b/battletech/Infantry/Weaponry/Missiles/SRM/SRM.json index bee5800..b04236a 100644 --- a/battletech/Infantry/Weaponry/Missiles/SRM/SRM.json +++ b/battletech/Infantry/Weaponry/Missiles/SRM/SRM.json @@ -11,7 +11,7 @@ "skill": "launcher", "ammo": "srm", "weight": 200000, - "volume": 35, + "volume": "35000 ml", "bashing": 12, "to_hit": -6, "range": 477, @@ -46,7 +46,7 @@ "skill": "launcher", "ammo": "srm", "weight": 30000, - "volume": 35, + "volume": "35000 ml", "bashing": 12, "to_hit": -6, "range": 477, @@ -85,7 +85,7 @@ "skill": "launcher", "ammo": "srm", "weight": 20000, - "volume": 35, + "volume": "35000 ml", "bashing": 12, "to_hit": -6, "range": 2, diff --git a/battletech/Infantry/Weaponry/Missiles/SRM/ammo.json b/battletech/Infantry/Weaponry/Missiles/SRM/ammo.json index 739c57b..68e85fb 100644 --- a/battletech/Infantry/Weaponry/Missiles/SRM/ammo.json +++ b/battletech/Infantry/Weaponry/Missiles/SRM/ammo.json @@ -8,7 +8,7 @@ "color": "dark_gray", "description": "Clanners can't block this!", "material": [ "steel", "powder" ], - "volume": 5, + "volume": "5000 ml", "weight": 3300, "bashing": 1, "ammo_type": "srm", diff --git a/battletech/Terrain/Buildings/overmap_terrain.json b/battletech/Terrain/Buildings/overmap_terrain.json index 42b2726..78c3ca2 100644 --- a/battletech/Terrain/Buildings/overmap_terrain.json +++ b/battletech/Terrain/Buildings/overmap_terrain.json @@ -3,7 +3,7 @@ "id": "Wrecked_Battle_Vehicle_Storage_right", "type": "overmap_terrain", "name": "Salvage Vehicle Storage A", - "sym": 67, + "sym": "a", "color": "dark_gray", "see_cost": 5, "extras": "field", @@ -13,7 +13,7 @@ "id": "Wrecked_Battle_Vehicle_Storage_left", "type": "overmap_terrain", "name": "Salvage Vehicle Storage B", - "sym": 67, + "sym": "b", "color": "dark_gray", "see_cost": 5, "extras": "field", @@ -22,8 +22,8 @@ { "id": "Upper_Sanctum", "type": "overmap_terrain", - "name": "curious underground structure", - "sym": 67, + "name": "Upper EMPTY ROOM YOU-", + "sym": "?", "color": "dark_gray", "see_cost": 5, "extras": "build", diff --git a/battletech/faction/bills.json b/battletech/faction/bills.json index d2bcfe6..b0c4fb6 100644 --- a/battletech/faction/bills.json +++ b/battletech/faction/bills.json @@ -10,7 +10,7 @@ "symbol": ",", "material": [ "paper" ], "volume": 0, - "price": 10.9 + "price": 1090 },{ "type": "GENERIC", "id": "k_bill", @@ -22,6 +22,6 @@ "symbol": ",", "material": [ "paper" ], "volume": 0, - "price": 8.72 + "price": 8720 } ] diff --git a/battletech/scenarioes.json b/battletech/scenarioes.json index a0a29bd..69a634a 100644 --- a/battletech/scenarioes.json +++ b/battletech/scenarioes.json @@ -5,7 +5,7 @@ "description": "Mechs are cool.", "ident": "battletech", "points": 0, - "allowed_locs": [ "field", "forest" ], + "allowed_locs": [ "sloc_field", "sloc_forest" ], "start_name": "Battletech Infantry", "professions": [ "infantryman_bt", From 91e95f582a74230860f048c7cb5af20b303877db Mon Sep 17 00:00:00 2001 From: Rod99 Date: Tue, 21 Apr 2020 23:55:31 -0500 Subject: [PATCH 3/4] hecc --- .../Armors/Community/vehicletest.json | 176 ------------------ .../Armors/Inner Sphere/armor.json | 8 +- 2 files changed, 4 insertions(+), 180 deletions(-) delete mode 100644 battletech/Battle Armor/Armors/Community/vehicletest.json diff --git a/battletech/Battle Armor/Armors/Community/vehicletest.json b/battletech/Battle Armor/Armors/Community/vehicletest.json deleted file mode 100644 index 1c925ad..0000000 --- a/battletech/Battle Armor/Armors/Community/vehicletest.json +++ /dev/null @@ -1,176 +0,0 @@ - -[ - { - "type" : "vehicle", - "id" : "tank_atomic", - "name" : "Atomic Mini-Tank", - "blueprint" : [ - ["ooooooo"], - ["|x--|||"], - ["+x+#---"], - ["|x--t||"], - ["ooooooo"] - ], - "parts" : [ - {"x": -3, "y": -2, "part": "hdframe_vertical_2"}, - {"x": -3, "y": -2, "part": "hdboard_vertical"}, - {"x": -3, "y": -2, "part": "omnicam"}, - {"x": -3, "y": -2, "part": "plating_military"}, - {"x": -2, "y": -2, "part": "hdframe_vertical_2"}, - {"x": -2, "y": -2, "part": "hdboard_vertical"}, - {"x": -2, "y": -2, "part": "tread3"}, - {"x": -2, "y": -2, "part": "plating_military"}, - {"x": -1, "y": -2, "part": "hdframe_vertical_2"}, - {"x": -1, "y": -2, "part": "hdboard_vertical"}, - {"x": -1, "y": -2, "part": "tread3"}, - {"x": -1, "y": -2, "part": "plating_military"}, - {"x": 0, "y": -2, "part": "hdframe_vertical_2"}, - {"x": 0, "y": -2, "part": "hdboard_vertical"}, - {"x": 0, "y": -2, "part": "tread3"}, - {"x": 0, "y": -2, "part": "plating_military"}, - {"x": 1, "y": -2, "part": "hdframe_vertical_2"}, - {"x": 1, "y": -2, "part": "hdhalfboard_vertical"}, - {"x": 1, "y": -2, "part": "tread3"}, - {"x": 1, "y": -2, "part": "plating_military"}, - {"x": 2, "y": -2, "part": "hdframe_vertical_2"}, - {"x": 2, "y": -2, "part": "hdhalfboard_vertical"}, - {"x": 2, "y": -2, "part": "tread3"}, - {"x": 2, "y": -2, "part": "plating_military"}, - {"x": 3, "y": -2, "part": "hdframe_vertical_2"}, - {"x": 3, "y": -2, "part": "hdhalfboard_vertical"}, - {"x": 3, "y": -2, "part": "plating_military"}, - {"x": -3, "y": -1, "part": "hdframe_vertical_2"}, - {"x": -3, "y": -1, "part": "hdboard_horizontal"}, - {"x": -3, "y": -1, "part": "plating_military"}, - {"x": -2, "y": -1, "part": "hdframe_vertical_2"}, - {"x": -2, "y": -1, "part": "trunk_floor"}, - {"x": -2, "y": -1, "part": "minireactor"}, - {"x": -2, "y": -1, "part": "hdroof"}, - {"x": -1, "y": -1, "part": "hdframe_vertical_2"}, - {"x": -1, "y": -1, "part": "hdboard_sw"}, - {"x": -1, "y": -1, "part": "minireactor"}, - {"x": -1, "y": -1, "part": "plating_military"}, - {"x": 0, "y": -1, "part": "hdframe_vertical_2"}, - {"x": 0, "y": -1, "part": "hdboard_vertical"}, - {"x": 0, "y": -1, "part": "plating_military"}, - {"x": 1, "y": -1, "part": "hdframe_vertical_2"}, - {"x": 1, "y": -1, "part": "hdhalfboard_nw"}, - {"x": 1, "y": -1, "part": "plating_military"}, - {"x": 2, "y": -1, "part": "hdframe_vertical_2"}, - {"x": 2, "y": -1, "part": "hdhalfboard_horizontal"}, - {"x": 2, "y": -1, "part": "engine_electric_enhanced"}, - {"x": 2, "y": -1, "part": "headlight_reinforced"}, - {"x": 2, "y": -1, "part": "omnicam"}, - {"x": 2, "y": -1, "part": "plating_military"}, - {"x": 3, "y": -1, "part": "hdframe_vertical_2"}, - {"x": 3, "y": -1, "part": "hdhalfboard_horizontal"}, - {"x": 3, "y": -1, "part": "plating_military"}, - {"x": -3, "y": 0, "part": "hdframe_vertical_2"}, - {"x": -3, "y": 0, "part": "door_opaque"}, - {"x": -3, "y": 0, "part": "hdroof"}, - {"x": -3, "y": 0, "part": "plating_military"}, - {"x": -2, "y": 0, "part": "hdframe_vertical_2"}, - {"x": -2, "y": 0, "part": "trunk_floor"}, - {"x": -2, "y": 0, "part": "storage_battery"}, - {"x": -2, "y": 0, "part": "hdroof"}, - {"x": -1, "y": 0, "part": "hdframe_vertical_2"}, - {"x": -1, "y": 0, "part": "hdhatch"}, - {"x": -1, "y": 0, "part": "storage_battery"}, - {"x": -1, "y": 0, "part": "hdroof"}, - {"x": 0, "y": 0, "part": "hdframe_vertical_2"}, - {"x": 0, "y": 0, "part": "seat"}, - {"x": 0, "y": 0, "part": "seatbelt_heavyduty"}, - {"x": 0, "y": 0, "part": "controls"}, - {"x": 0, "y": 0, "part": "dashboard"}, - {"x": 0, "y": 0, "part": "cam_control"}, - {"x": 0, "y": 0, "part": "turret_mount"}, - {"x": 0, "y": 0, "part": "mounted_tank_auto", "ammo": 100, "ammo_types": [ "120mm_usable_heat", "120mm_usable_ap" ]}, - {"x": 0, "y": 0, "part": "vehicle_clock"}, - {"x": 0, "y": 0, "part": "hdroof"}, - {"x": 1, "y": 0, "part": "hdframe_vertical_2"}, - {"x": 1, "y": 0, "part": "hdhalfboard_vertical"}, - {"x": 1, "y": 0, "part": "plating_military"}, - {"x": 2, "y": 0, "part": "hdframe_vertical_2"}, - {"x": 2, "y": 0, "part": "hdhalfboard_vertical"}, - {"x": 2, "y": 0, "part": "engine_electric_enhanced"}, - {"x": 2, "y": 0, "part": "storage_battery"}, - {"x": 2, "y": 0, "part": "plating_military"}, - {"x": 3, "y": 0, "part": "hdframe_vertical_2"}, - {"x": 3, "y": 0, "part": "hdhalfboard_vertical"}, - {"x": 3, "y": 0, "part": "plating_military"}, - {"x": -3, "y": 1, "part": "hdframe_vertical_2"}, - {"x": -3, "y": 1, "part": "hdboard_horizontal"}, - {"x": -3, "y": 1, "part": "plating_military"}, - {"x": -2, "y": 1, "part": "hdframe_vertical_2"}, - {"x": -2, "y": 1, "part": "trunk_floor"}, - {"x": -2, "y": 1, "part": "minireactor"}, - {"x": -2, "y": 1, "part": "hdroof"}, - {"x": -1, "y": 1, "part": "hdframe_vertical_2"}, - {"x": -1, "y": 1, "part": "hdboard_se"}, - {"x": -1, "y": 1, "part": "minireactor"}, - {"x": -1, "y": 1, "part": "plating_military"}, - {"x": 0, "y": 1, "part": "hdframe_vertical_2"}, - {"x": 0, "y": 1, "part": "hdboard_vertical"}, - {"x": 0, "y": 1, "part": "plating_military"}, - {"x": 1, "y": 1, "part": "hdframe_vertical_2"}, - {"x": 1, "y": 1, "part": "hdhalfboard_ne"}, - {"x": 1, "y": 1, "part": "turretframe"}, - {"x": 1, "y": 1, "part": "am2browning", "ammo": 100 }, - {"x": 1, "y": 1, "part": "plating_military"}, - {"x": 2, "y": 1, "part": "hdframe_vertical_2"}, - {"x": 2, "y": 1, "part": "hdhalfboard_horizontal"}, - {"x": 2, "y": 1, "part": "engine_electric_enhanced"}, - {"x": 2, "y": 1, "part": "headlight_reinforced"}, - {"x": 2, "y": 1, "part": "omnicam"}, - {"x": 2, "y": 1, "part": "plating_military"}, - {"x": 3, "y": 1, "part": "hdframe_vertical_2"}, - {"x": 3, "y": 1, "part": "hdhalfboard_horizontal"}, - {"x": 3, "y": 1, "part": "plating_military"}, - {"x": -3, "y": 2, "part": "hdframe_vertical_2"}, - {"x": -3, "y": 2, "part": "hdboard_vertical"}, - {"x": -3, "y": 2, "part": "omnicam"}, - {"x": -3, "y": 2, "part": "plating_military"}, - {"x": -2, "y": 2, "part": "hdframe_vertical_2"}, - {"x": -2, "y": 2, "part": "hdboard_vertical"}, - {"x": -2, "y": 2, "part": "tread3"}, - {"x": -2, "y": 2, "part": "plating_military"}, - {"x": -1, "y": 2, "part": "hdframe_vertical_2"}, - {"x": -1, "y": 2, "part": "hdboard_vertical"}, - {"x": -1, "y": 2, "part": "tread3"}, - {"x": -1, "y": 2, "part": "plating_military"}, - {"x": 0, "y": 2, "part": "hdframe_vertical_2"}, - {"x": 0, "y": 2, "part": "hdboard_vertical"}, - {"x": 0, "y": 2, "part": "tread3"}, - {"x": 0, "y": 2, "part": "plating_military"}, - {"x": 1, "y": 2, "part": "hdframe_vertical_2"}, - {"x": 1, "y": 2, "part": "hdhalfboard_vertical"}, - {"x": 1, "y": 2, "part": "tread3"}, - {"x": 1, "y": 2, "part": "plating_military"}, - {"x": 2, "y": 2, "part": "hdframe_vertical_2"}, - {"x": 2, "y": 2, "part": "hdhalfboard_vertical"}, - {"x": 2, "y": 2, "part": "tread3"}, - {"x": 2, "y": 2, "part": "plating_military"}, - {"x": 3, "y": 2, "part": "hdframe_vertical_2"}, - {"x": 3, "y": 2, "part": "hdhalfboard_vertical"}, - {"x": 3, "y": 2, "part": "plating_military"} - ], - "items" : [ - {"x": -2, "y": -1, "chance": 70, "items": ["120mm_usable_heat"]}, - {"x": -2, "y": -1, "chance": 50, "items": ["120mm_usable_heat", "120mm_usable_ap"]}, - {"x": -2, "y": -1, "chance": 30, "items": ["120mm_usable_heat", "120mm_usable_heat", "120mm_usable_ap"]}, - {"x": -2, "y": -1, "chance": 10, "items": ["120mm_usable_heat", "120mm_usable_heat", "120mm_usable_heat", "120mm_usable_ap", "120mm_usable_ap"]}, - {"x": -2, "y": -1, "chance": 75, "items": ["electric_primer_large"]}, - {"x": -2, "y": -1, "chance": 50, "items": ["electric_primer_large"]}, - {"x": -3, "y": 0, "chance": 100, "items": ["ear_plugs"]}, - {"x": -2, "y": 0, "chance": 40, "items": ["plut_cell"]}, - {"x": -2, "y": 0, "chance": 20, "items": ["plut_cell", "plut_cell"]}, - {"x": -2, "y": 0, "chance": 10, "items": ["plut_cell", "plut_cell"]}, - {"x": -1, "y": 0, "chance": 5, "items": ["id_military"]}, - {"x": -1, "y": 0, "chance": 50, "items": ["120mm_usable_heat"]}, - {"x": -1, "y": 0, "chance": 25, "items": ["120mm_usable_heat", "120mm_usable_ap"]}, - {"x": -1, "y": 0, "chance": 12, "items": ["120mm_usable_heat", "120mm_usable_heat", "120mm_usable_ap"]}, - {"x": -2, "y": 1, "chance": 60, "items": ["50bmg"]}, - {"x": -2, "y": 1, "chance": 40, "items": ["50bmg", "50bmg"]} - ] - } -] \ No newline at end of file diff --git a/battletech/Battle Armor/Armors/Inner Sphere/armor.json b/battletech/Battle Armor/Armors/Inner Sphere/armor.json index 56d47e4..ffb5042 100644 --- a/battletech/Battle Armor/Armors/Inner Sphere/armor.json +++ b/battletech/Battle Armor/Armors/Inner Sphere/armor.json @@ -33,13 +33,13 @@ "need_charges_msg": "The armor is depleted.", "need_worn": true }, - "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED", "UPS" ] + "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED" ] }, { "id": "tornado_on", "type": "TOOL_ARMOR", "category": "armor", - "name": "P12 Tornado", + "name": "P12 Tornado (Active)", "description": "The P12 Tornado is a Power Armor (Light) suit, created by ComStar in the late twenty-ninth century to equip their special forces units with added protection.", "weight": 50000, "volume": 80, @@ -50,7 +50,7 @@ "material": [ "steel" ], "symbol": "[", "color": "light_gray", - "turns_per_charge": 1, + "power_draw": 200, "max_charges": 30000, "covers": [ "TORSO", "ARMS", "LEGS", "FEET" ], "coverage": 100, @@ -63,6 +63,6 @@ "ammo": [ "battery" ], "artifact_data": { "effects_worn": [ "AEP_STR_UP", "AEP_STR_UP", "AEP_STR_UP", "AEP_STR_UP" ] }, "use_action": { "type": "transform", "target": "tornado", "active": false, "msg": "You deactivate the armor." }, - "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED", "UPS" ] + "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED" ] } ] From 9a638e3551a1b66028a2a35a8c5f79bee0f932eb Mon Sep 17 00:00:00 2001 From: Rod995 <37703767+Rod995@users.noreply.github.com> Date: Wed, 24 Aug 2022 03:29:40 -0500 Subject: [PATCH 4/4] Getting Everything Back Just updating everything so that it works... or at least loads back into the game properly without those pesky errors getting in the way. --- .../Armors/Inner Sphere/armor.json | 80 +++++++++++++------ .../Armors/Inner Sphere/armormods.json | 22 +++-- battletech/Battle Armor/Equipment/power.json | 20 ++--- battletech/Battlemechs/Equipment/armor.json | 12 +-- .../Battlemechs/Weaponry/Ballistics/ammo.json | 8 +- .../Weaponry/Ballistics/ballistics.json | 16 ++-- .../Weaponry/Ballistics/Flechette/ammo.json | 6 +- .../Weaponry/Ballistics/Slugs/ammo.json | 4 +- .../Infantry/Weaponry/Lasers/IS/lasers.json | 2 +- battletech/Tech/IS/C3.json | 2 +- 10 files changed, 103 insertions(+), 69 deletions(-) diff --git a/battletech/Battle Armor/Armors/Inner Sphere/armor.json b/battletech/Battle Armor/Armors/Inner Sphere/armor.json index ffb5042..c516802 100644 --- a/battletech/Battle Armor/Armors/Inner Sphere/armor.json +++ b/battletech/Battle Armor/Armors/Inner Sphere/armor.json @@ -4,9 +4,9 @@ "type": "TOOL_ARMOR", "category": "armor", "name": "P12 Tornado", - "description": "The P12 Tornado is a Power Armor (Light) suit, created by ComStar in the late twenty-ninth century to equip their special forces units with added protection.", - "weight": 100000, - "volume": 80, + "description": "funny man in suit", + "weight": "400 kg", + "volume": "80 L", "looks_like": "power_armor_basic", "price": 7000000, "to_hit": -1, @@ -14,18 +14,15 @@ "material": [ "steel" ], "symbol": "[", "color": "light_gray", - "max_charges": 30000, "covers": [ "TORSO", "ARMS", "LEGS", "FEET" ], "coverage": 100, "encumbrance": 30, - "storage": 8, + "storage": "8000 ml", "warmth": 90, - "power_armor": true, "material_thickness": 11, "environmental_protection": 10, - "ammo": [ "battery" ], "use_action": { - "type": "transform", + "type": "set_transform", "target": "tornado_on", "active": true, "msg": "You activate the armor.", @@ -33,16 +30,38 @@ "need_charges_msg": "The armor is depleted.", "need_worn": true }, - "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED" ] + "flags": [ "USE_UPS", "NAT_UPS", "POWERARMOR_EXO", "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "TRADER_AVOID" ] }, { "id": "tornado_on", "type": "TOOL_ARMOR", "category": "armor", + "copy-from": "tornado", "name": "P12 Tornado (Active)", - "description": "The P12 Tornado is a Power Armor (Light) suit, created by ComStar in the late twenty-ninth century to equip their special forces units with added protection.", - "weight": 50000, - "volume": 80, + "description": "funny man fight back :(", + "power_draw": 1500, + "revert_to": "tornado", + "use_action": { + "type": "set_transform", + "turn_off": true, + "flag": "POWERARMOR_EXTERNAL", + "menu_text": "Deactivate", + "msg": "Turning off...", + "target": "tornado" + }, + "covers": [ "TORSO", "ARMS", "LEGS", "FEET" ], + "encumbrance": 5, + "weight_capacity_bonus": "410 kg", + "flags": [ "USE_UPS", "NAT_UPS", "POWERARMOR_EXO", "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "TRADER_AVOID" ] + }, + { + "id": "tornado_gun_test", + "type": "GUN", + "category": "armor", + "name": "P12 Tornado GT", + "description": "funny man in gunsuit", + "weight": "400 kg", + "volume": "80 L", "looks_like": "power_armor_basic", "price": 7000000, "to_hit": -1, @@ -50,19 +69,28 @@ "material": [ "steel" ], "symbol": "[", "color": "light_gray", - "power_draw": 200, - "max_charges": 30000, - "covers": [ "TORSO", "ARMS", "LEGS", "FEET" ], - "coverage": 100, - "encumbrance": 30, - "storage": 8, - "warmth": 90, - "power_armor": true, - "material_thickness": 11, - "environmental_protection": 10, - "ammo": [ "battery" ], - "artifact_data": { "effects_worn": [ "AEP_STR_UP", "AEP_STR_UP", "AEP_STR_UP", "AEP_STR_UP" ] }, - "use_action": { "type": "transform", "target": "tornado", "active": false, "msg": "You deactivate the armor." }, - "flags": [ "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "RECHARGE", "POWERED" ] + "valid_mod_locations": [ + [ "weapon mount", 2 ] + ], + "skill": "rifle", + "armor_data": { + "covers": [ "TORSO", "ARMS", "LEGS", "FEET" ], + "coverage": 100, + "encumbrance": 30, + "storage": "8000 ml", + "warmth": 90, + "material_thickness": 11, + "environmental_protection": 10, + "flags": [ "USE_UPS", "NAT_UPS", "POWERARMOR_EXO", "WATERPROOF", "STURDY", "ELECTRIC_IMMUNE", "TRADER_AVOID" ], + "use_action": { + "type": "set_transform", + "target": "tornado_on", + "active": true, + "msg": "You activate the armor.", + "need_charges": 1, + "need_charges_msg": "The armor is depleted.", + "need_worn": true + } + } } ] diff --git a/battletech/Battle Armor/Armors/Inner Sphere/armormods.json b/battletech/Battle Armor/Armors/Inner Sphere/armormods.json index d26e948..9b3fef5 100644 --- a/battletech/Battle Armor/Armors/Inner Sphere/armormods.json +++ b/battletech/Battle Armor/Armors/Inner Sphere/armormods.json @@ -2,21 +2,27 @@ { "id": "aux_flamer_ba", "type": "GUNMOD", - "name": "MWM Flamer", + "name": { "str": "MWM Flamer" }, "description": "made to test mvm slot", - "weight": 1820, - "volume": 4, + "weight": "1820 g", + "volume": "4 L", "price": 85000, "material": [ "steel" ], "symbol": "|", "color": "light_red", - "location": "mount", - "mod_targets": "TOOL_ARMOR", - "gun_data": { "ammo": "flammable", "skill": "launcher", "dispersion": 300, "durability": 10 }, + "mod_targets": [ "tornado_gun_test" ], + "location": "weapon mount", + "gun_data": { + "skill": "launcher", + "range": 30, + "ranged_damage": { "damage_type": "heat", "amount": 12 }, + "dispersion": 300, + "durability": 10, + "ammo": "flammable" + }, "magazine_well": 1, "magazines": [ [ "flammable", [ "aux_pressurized_tank" ] ] ], "dispersion_modifier": 30, - "min_skills": [ [ "weapon", 2 ], [ "launcher", 1 ] ], - "flags": [ "FIRE_100" ] + "flags": [ "FIRE_100", "POWERARMOR_COMPATIBLE" ] } ] diff --git a/battletech/Battle Armor/Equipment/power.json b/battletech/Battle Armor/Equipment/power.json index 52dd6cb..14ce041 100644 --- a/battletech/Battle Armor/Equipment/power.json +++ b/battletech/Battle Armor/Equipment/power.json @@ -10,7 +10,7 @@ "color": "yellow", "description": "The common Power Pack is typically the size of a pistol's grip, making it easy to store. While it provides enough of a charge for most electronic devices, it will be quickly drained after only a few shots from most energy weapons.", "material": "iron", - "volume": 1, + "volume": "150 ml", "weight": 250, "ammo_type": "battery", "count": 1, @@ -27,7 +27,7 @@ "color": "yellow", "description": "Micro Power Packs are much smaller, roughly the size of a coin, making them ideal for hand-held devices; however they carry less charge and are more expensive than standard packs.", "material": "iron", - "volume": 0.01, + "volume": "1 ml", "weight": 15, "ammo_type": "battery", "count": 1, @@ -44,12 +44,12 @@ "color": "yellow", "description": "A Satchel Battery provides a greater charge than standard packs, but is the weight and size of a full canteen, requiring it to be attached to a belt or combat webbing.", "material": "iron", - "volume": 3, + "volume": "3 L", "weight": 2000, "ammo_type": "battery", "count": 1, "encumbrance": 5, - "flags": [ "NO_UNLOAD", "RECHARGE", "UPS" ], + "flags": [ "NO_UNLOAD", "RECHARGE", "IS_UPS", "WATERPROOF" ], "use_action": { "type": "transform", "target": "h_satchel_on", @@ -70,12 +70,12 @@ "color": "yellow", "description": "A Satchel Battery provides a greater charge than standard packs, but is the weight and size of a full canteen, requiring it to be attached to a belt or combat webbing. This one is activated.", "material": "iron", - "volume": 3, + "volume": "3 L", "weight": 2000, "ammo_type": "battery", "count": 1, "encumbrance": 5, - "flags": [ "NO_UNLOAD", "RECHARGE", "UPS" ], + "flags": [ "NO_UNLOAD", "RECHARGE", "IS_UPS", "WATERPROOF" ], "use_action": { "type": "transform", "target": "h_satchel", @@ -96,13 +96,13 @@ "color": "red", "description": "A Satchel Battery provides a greater charge than standard packs, but is the weight and size of a full canteen, requiring it to be attached to a belt or combat webbing.", "material": "iron", - "volume": 3, + "volume": "30 L", "weight": 2000, "ammo_type": "battery", "count": 1, "power_armor": true, "encumbrance": 5, - "flags": [ "NO_UNLOAD", "RECHARGE", "UPS" ], + "flags": [ "NO_UNLOAD", "RECHARGE", "IS_UPS", "WATERPROOF" ], "use_action": { "type": "transform", "target": "satchel_ba_on", @@ -123,13 +123,13 @@ "color": "red", "description": "A Satchel Battery provides a greater charge than standard packs, but is the weight and size of a full canteen, requiring it to be attached to a belt or combat webbing.", "material": "iron", - "volume": 3, + "volume": "3 L", "weight": 2000, "ammo_type": "battery", "count": 1, "power_armor": true, "encumbrance": 5, - "flags": [ "NO_UNLOAD", "RECHARGE", "UPS" ], + "flags": [ "NO_UNLOAD", "RECHARGE", "IS_UPS", "WATERPROOF" ], "use_action": { "type": "transform", "target": "satchel_ba", diff --git a/battletech/Battlemechs/Equipment/armor.json b/battletech/Battlemechs/Equipment/armor.json index 17a2b8c..7db0bde 100644 --- a/battletech/Battlemechs/Equipment/armor.json +++ b/battletech/Battlemechs/Equipment/armor.json @@ -4,7 +4,7 @@ "id": "primitive_armor_ton", "name": "primitive armor slab", "symbol": ")", - "color": "grey", + "color": "light_gray", "broken_symbol": "|", "broken_color": "light_cyan", "durability": 13212, @@ -23,7 +23,7 @@ "looks_like": "plating_superalloy", "weight" : 1000000, "to_hit" : -1, - "color" : "grey", + "color" : "light_gray", "symbol" : "]", "material" : ["hardsteel", "ceramic"], "volume" : 145, @@ -37,7 +37,7 @@ "name": "primitive armor half ton", "looks_like": "plating_superalloy", "symbol": ")", - "color": "grey", + "color": "light_gray", "broken_symbol": "|", "broken_color": "light_cyan", "durability": 6606, @@ -55,7 +55,7 @@ "looks_like": "plating_superalloy", "weight" : 500000, "to_hit" : -1, - "color" : "grey", + "color" : "light_gray", "symbol" : "]", "material" : ["hardsteel", "ceramic"], "volume" : 73, @@ -69,7 +69,7 @@ "name": "primitive armor quarter-ton", "looks_like": "plating_superalloy", "symbol": ")", - "color": "grey", + "color": "light_gray", "broken_symbol": "|", "broken_color": "light_cyan", "durability": 3303, @@ -87,7 +87,7 @@ "looks_like": "plating_superalloy", "weight" : 250000, "to_hit" : -1, - "color" : "grey", + "color" : "light_gray", "symbol" : "]", "material" : ["hardsteel", "ceramic"], "volume" : 36, diff --git a/battletech/Battlemechs/Weaponry/Ballistics/ammo.json b/battletech/Battlemechs/Weaponry/Ballistics/ammo.json index d04e787..4b4bd94 100644 --- a/battletech/Battlemechs/Weaponry/Ballistics/ammo.json +++ b/battletech/Battlemechs/Weaponry/Ballistics/ammo.json @@ -9,7 +9,7 @@ "price": 500000, "material": [ "steel", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 1, "stack_size": 45, "ammo_type": "shell_ac2", @@ -33,7 +33,7 @@ "price": 500000, "material": [ "steel", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 1, "stack_size": 20, "ammo_type": "shell_ac5", @@ -57,7 +57,7 @@ "price": 500000, "material": [ "steel", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 1, "stack_size": 10, "ammo_type": "shell_ac10", @@ -81,7 +81,7 @@ "price": 500000, "material": [ "steel", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 1, "stack_size": 5, "ammo_type": "shell_ac20", diff --git a/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json b/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json index e80b730..1189cec 100644 --- a/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json +++ b/battletech/Battlemechs/Weaponry/Ballistics/ballistics.json @@ -3,7 +3,7 @@ "id": "autocannon_2", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Autocannon/2", "description": "The Autocannon is a direct-fire ballistic weapon, firing HEAP (High-Explosive Armor-Piercing) rounds at targets either singly or in bursts. This one has a rating of 2.", "price": 81750000, @@ -26,7 +26,7 @@ "id": "rotary_autocannon_2", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Rotary Autocannon/2", "description": "Developed in 3062 by the Federated Commonwealth, the Rotary Autocannon/2 is based only loosely on the Autocannon/2. While it has the same bore, it is capable of firing up to six times as many rounds as its standard cousin, allowing it to deal three times the damage of even an Ultra AC/2 (while the Inner Sphere variants suffer from a minor drop to effective range).", "price": 81750000, @@ -50,7 +50,7 @@ "id": "autocannon_5", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Autocannon/5", "description": "The Autocannon is a direct-fire ballistic weapon, firing HEAP (High-Explosive Armor-Piercing) rounds at targets either singly or in bursts. This one has a rating of 5.", "price": 81750000, @@ -73,7 +73,7 @@ "id": "rotary_autocannon_5", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Rotary Autocannon/5", "description": "Big cannon go brrt", "price": 81750000, @@ -97,7 +97,7 @@ "id": "autocannon_10", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Autocannon/10", "description": "The Autocannon is a direct-fire ballistic weapon, firing HEAP (High-Explosive Armor-Piercing) rounds at targets either singly or in bursts. This one has a rating of 10.", "price": 81750000, @@ -120,7 +120,7 @@ "id": "rotary_autocannon_10", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Rotary Autocannon/10", "description": "heccin' chonker doesn't exist", "price": 81750000, @@ -144,7 +144,7 @@ "id": "autocannon_20", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Autocannon/20", "description": "The Autocannon is a direct-fire ballistic weapon, firing HEAP (High-Explosive Armor-Piercing) rounds at targets either singly or in bursts. This one has a rating of 20.", "price": 81750000, @@ -167,7 +167,7 @@ "id": "rotary_autocannon_20", "type": "GUN", "symbol": "/", - "color": "grey", + "color": "light_gray", "name": "Rotary Autocannon/20", "description": "why the hecc is this here. it doesn't even exist in lore", "price": 81750000, diff --git a/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json b/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json index 62ba28d..b2d8e29 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json +++ b/battletech/Infantry/Weaponry/Ballistics/Flechette/ammo.json @@ -9,7 +9,7 @@ "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 10, "stack_size": 30, "ammo_type": "if_block", @@ -27,7 +27,7 @@ "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 10, "stack_size": 30, "ammo_type": "hf_block", @@ -46,7 +46,7 @@ "price": 5000, "material": [ "plastic", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 10, "stack_size": 30, "ammo_type": "fl_block", diff --git a/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json b/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json index 7bf5e40..438d5bb 100644 --- a/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json +++ b/battletech/Infantry/Weaponry/Ballistics/Slugs/ammo.json @@ -8,7 +8,7 @@ "price": 500000, "material": [ "plastic", "powder" ], "symbol": "=", - "color": "grey", + "color": "light_gray", "count": 10, "stack_size": 10, "ammo_type": "auto_pistol", @@ -24,7 +24,7 @@ "material": [ "plastic", "powder" ], "symbol": "=", "weight": 20, - "color": "grey", + "color": "light_gray", "count": 2, "stack_size": 2, "ammo_type": "elephant_bullet", diff --git a/battletech/Infantry/Weaponry/Lasers/IS/lasers.json b/battletech/Infantry/Weaponry/Lasers/IS/lasers.json index d4b7cac..2308896 100644 --- a/battletech/Infantry/Weaponry/Lasers/IS/lasers.json +++ b/battletech/Infantry/Weaponry/Lasers/IS/lasers.json @@ -12,7 +12,7 @@ "bashing": 5, "material": [ "steel", "plastic" ], "symbol": "-", - "color": "light_grey", + "color": "light_gray", "skill": "pistol", "range": 52, "ranged_damage": 23, diff --git a/battletech/Tech/IS/C3.json b/battletech/Tech/IS/C3.json index 9ca2c3d..994200d 100644 --- a/battletech/Tech/IS/C3.json +++ b/battletech/Tech/IS/C3.json @@ -16,7 +16,7 @@ "id": "C3_master", "name": "C3 Command Unit", "symbol": "^", - "color": "grey", + "color": "light_gray", "broken_symbol": "%", "broken_color": "red", "damage_modifier": 10,