Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mekanism Power Changes #6

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Mekanism Power Changes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a85813
Update Mek power changes
Soaryn Mar 1, 2024
0c5e4cc
Updates general.toml
Soaryn Mar 1, 2024
5dad15e
Merge pull request #1 from Soaryn/Soaryn-patch-2
Soaryn Mar 1, 2024
56ec057
Update common.toml
Soaryn Mar 1, 2024
73cd8e2
Update generator-storage.toml
Soaryn Mar 1, 2024
68171bb
Update generators.toml
Soaryn Mar 1, 2024
a168002
Update machine-storage.toml
Soaryn Mar 1, 2024
20a2409
Update machine-usage.toml
Soaryn Mar 1, 2024
b4a0dee
Update tiers.toml
Soaryn Mar 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/Mekanism/common.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
[common]
#Displayed energy type in Mekanism GUIs and network reader readings.
#Allowed Values: JOULES, FORGE_ENERGY
energyType = "FORGE_ENERGY"
energyType = "JOULES"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am fine with this, but the reason we initially changed it is that it just caused confusion for players with it having a different name

#Displayed temperature unit in Mekanism GUIs and network reader readings.
#Allowed Values: KELVIN, CELSIUS, RANKINE, FAHRENHEIT, AMBIENT
temperatureUnit = "KELVIN"
temperatureUnit = "CELSIUS"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why?

#Show time to decay radiation when readings are above safe levels. Set to false on the client side to disable MekaSuit Geiger and Dosimeter Unit timers. Set to false on the server side to disable handheld Geiger Counter and Dosimeter timers.
enableDecayTimers = true
#Should holiday greetings and easter eggs play for holidays (ex: Christmas and New Years) on the client. And should robit skins be randomized on the server.
Expand Down
120 changes: 60 additions & 60 deletions config/Mekanism/gear.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#Atomic Disassembler Settings
[gear.atomic_disassembler]
#Base Energy (Joules) usage of the Atomic Disassembler. (Gets multiplied by speed factor)
energyUsage = "10"
energyUsage = "4"
#Cost in Joules of using the Atomic Disassembler as a weapon.
energyUsageWeapon = "2000"
energyUsageWeapon = "4"
#The max Atomic Disassembler Vein Mining Block Count.
#Range: 2 ~ 1000000
miningCount = 128
Expand All @@ -27,70 +27,70 @@
#Range: -4.0 ~ 100.0
attackSpeed = -2.4
#Maximum amount (joules) of energy the Atomic Disassembler can contain.
maxEnergy = "1000000"
maxEnergy = "1500"
#Amount (joules) of energy the Atomic Disassembler can accept per tick.
chargeRate = "5000"

#Configurator Settings
[gear.configurator]
#Maximum amount (joules) of energy the Configurator can contain.
maxEnergy = "60000"
maxEnergy = "500"
#Amount (joules) of energy the Configurator can accept per tick.
chargeRate = "300"
chargeRate = "10"
#Energy usage in joules of using the configurator to configure machines.
energyPerConfigure = "400"
energyPerConfigure = "1"
#Energy cost in joules for each item the configurator ejects from a machine on empty mode.
energyPerItem = "8"
energyPerItem = "1"

#Electric Bow Settings
[gear.electric_bow]
#Maximum amount (joules) of energy the Electric Bow can contain.
maxEnergy = "120000"
maxEnergy = "1000"
#Amount (joules) of energy the Electric Bow can accept per tick.
chargeRate = "600"
chargeRate = "10"
#Cost in Joules of using the Electric Bow.
energyUsage = "120"
energyUsage = "4"
#Cost in Joules of using the Electric Bow with flame mode active.
energyUsageFire = "1200"
energyUsageFire = "16"

#Energy Tablet Settings
[gear.energy_tablet]
#Maximum amount (joules) of energy the Energy Tablet can contain.
maxEnergy = "1000000"
maxEnergy = "500"
#Amount (joules) of energy the Energy Tablet can accept per tick.
chargeRate = "5000"
chargeRate = "10"

#Gauge Dropper Settings
[gear.gauge_dropper]
#Rate at which a gauge dropper can be filled or emptied.
#Range: > 1
transferRate = 256
transferRate = 100
#Capacity of gauge droppers.
#Range: > 1
capacity = 16000
capacity = 4000

#Flamethrower Settings
[gear.flamethrower]
#Flamethrower Gas Tank capacity in mB.
#Range: 1 ~ 9223372036854775807
maxGas = 24000
maxGas = 10000
#Amount of hydrogen the Flamethrower can accept per tick.
#Range: 1 ~ 9223372036854775807
fillRate = 16
fillRate = 10
#Determines whether or not the Flamethrower can destroy items if it fails to smelt them.
destroyItems = true
destroyItems = false

#Free Runner Settings
[gear.free_runner]
#Energy cost/multiplier in Joules for reducing fall damage with free runners. Energy cost is: FallDamage * freeRunnerFallEnergyCost. (1 FallDamage is 1 half heart)
fallEnergyCost = "50"
fallEnergyCost = "4"
#Percent of damage taken from falling that can be absorbed by Free Runners when they have enough power.
#Range: 0.0 ~ 1.0
fallDamageReductionRatio = 1.0
#Maximum amount (joules) of energy Free Runners can contain.
maxEnergy = "64000"
maxEnergy = "1000"
#Amount (joules) of energy the Free Runners can accept per tick.
chargeRate = "320"
chargeRate = "10"

#Armored Free Runner Settings
[gear.free_runner.armored]
Expand All @@ -108,10 +108,10 @@
[gear.jetpack]
#Jetpack Gas Tank capacity in mB.
#Range: 1 ~ 9223372036854775807
maxGas = 24000
maxGas = 10000
#Amount of hydrogen the Jetpack can accept per tick.
#Range: 1 ~ 9223372036854775807
fillRate = 16
fillRate = 10
Comment on lines -111 to +114
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being adjusted?


#Armored Jetpack Settings
[gear.jetpack.armored]
Expand All @@ -128,18 +128,18 @@
#Network Reader Settings
[gear.network_reader]
#Maximum amount (joules) of energy the Network Reader can contain.
maxEnergy = "60000"
maxEnergy = "500"
#Amount (joules) of energy the Network Reader can accept per tick.
chargeRate = "300"
chargeRate = "10"
#Energy usage in joules for each network reading.
energyUsage = "400"
energyUsage = "1"

#Portable Teleporter Settings
[gear.portable_teleporter]
#Maximum amount (joules) of energy the Portable Teleporter can contain.
maxEnergy = "1000000"
maxEnergy = "2000"
#Amount (joules) of energy the Portable Teleporter can accept per tick.
chargeRate = "5000"
chargeRate = "100"
#Delay in ticks before a player is teleported after clicking the Teleport button in the portable teleporter.
#Range: 0 ~ 6000
delay = 0
Expand All @@ -148,37 +148,37 @@
[gear.scuba_tank]
#Scuba Tank Gas Tank capacity in mB.
#Range: 1 ~ 9223372036854775807
maxGas = 24000
maxGas = 10000
#Amount of oxygen the Scuba Tank Gas Tank can accept per tick.
#Range: 1 ~ 9223372036854775807
fillRate = 16
fillRate = 10
Comment on lines -151 to +154
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being adjusted?


#Seismic Reader Settings
[gear.seismic_reader]
#Maximum amount (joules) of energy the Seismic Reader can contain.
maxEnergy = "12000"
maxEnergy = "500"
#Amount (joules) of energy the Seismic Reader can accept per tick.
chargeRate = "60"
chargeRate = "10"
#Energy usage in joules required to use the Seismic Reader.
energyUsage = "250"
energyUsage = "5"

#Canteen Settings
[gear.canteen]
#Maximum amount of Nutritional Paste storable by the Canteen.
#Range: > 1
maxStorage = 64000
maxStorage = 10000
#Rate at which Nutritional Paste can be transferred into a Canteen.
#Range: > 1
transferRate = 128
transferRate = 100
Comment on lines +169 to +172
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being adjusted?


#Meka-Tool Settings
[gear.mekatool]
#Base energy (Joules) usage of the Meka-Tool. (Gets multiplied by speed factor)
energyUsage = "10"
energyUsage = "4"
#Silk touch energy (Joules) usage of the Meka-Tool. (Gets multiplied by speed factor)
energyUsageSilk = "100"
#Cost in Joules of using the Meka-Tool to deal 4 units of damage.
energyUsageWeapon = "2000"
energyUsageWeapon = "16"
#Cost in Joules of using the Meka-Tool to teleport 10 blocks.
energyUsageTeleport = "1000"
#Maximum distance a player can teleport with the Meka-Tool.
Expand All @@ -194,68 +194,68 @@
#Range: 0.1 ~ 100.0
baseEfficiency = 4.0
#Energy capacity (Joules) of the Meka-Tool without any installed upgrades. Quadratically scaled by upgrades.
baseEnergyCapacity = "16000000"
baseEnergyCapacity = "2500"
#Amount (joules) of energy the Meka-Tool can accept per tick. Quadratically scaled by upgrades.
chargeRate = "100000"
chargeRate = "25"
#Cost in Joules of using the Meka-Tool as a hoe.
energyUsageHoe = "10"
#Cost in Joules of using the Meka-Tool as a shovel for making paths and dowsing campfires.
energyUsageShovel = "10"
energyUsageShovel = "1"
#Cost in Joules of using the Meka-Tool as an axe for stripping logs, scraping, or removing wax.
energyUsageAxe = "10"
energyUsageAxe = "1"
#Cost in Joules of using the Meka-Tool to shear entities.
energyUsageShearEntity = "10"
energyUsageShearEntity = "1"
#Enable the 'Extended Vein Mining' mode for the Meka-Tool. (Allows vein mining everything not just ores/logs)
extendedMining = true

#MekaSuit Settings
[gear.mekasuit]
#Energy capacity (Joules) of MekaSuit items without any installed upgrades. Quadratically scaled by upgrades.
baseEnergyCapacity = "16000000"
baseEnergyCapacity = "2500"
#Amount (joules) of energy the MekaSuit can accept per tick. Quadratically scaled by upgrades.
chargeRate = "100000"
chargeRate = "50"
#Energy usage (Joules) of MekaSuit when adding 0.1 to jump motion.
baseJumpEnergyUsage = "1000"
baseJumpEnergyUsage = "1"
#Energy usage (Joules) per second of the MekaSuit when flying with the Elytra Unit.
elytraEnergyUsage = "32000"
elytraEnergyUsage = "4"
#Energy usage (Joules) of MekaSuit when lessening a potion effect.
energyUsagePotionTick = "40000"
energyUsagePotionTick = "4"
#Energy cost/multiplier in Joules for reducing magic damage via the inhalation purification unit. Energy cost is: MagicDamage * energyUsageMagicPrevent. (1 MagicDamage is 1 half heart).
energyUsageMagicReduce = "1000"
energyUsageMagicReduce = "10"
#Energy cost/multiplier in Joules for reducing fall damage with MekaSuit Boots. Energy cost is: FallDamage * freeRunnerFallEnergyCost. (1 FallDamage is 1 half heart)
energyUsageFall = "50"
#Energy usage (Joules) of MekaSuit when adding 0.1 to sprint motion.
energyUsageSprintBoost = "100"
energyUsageSprintBoost = "2"
#Energy usage (Joules) of MekaSuit per tick when flying via Gravitational Modulation.
energyUsageGravitationalModulation = "1000"
energyUsageGravitationalModulation = "4"
#Charge rate of inventory items (Joules) per tick.
inventoryChargeRate = "10000"
#Solar recharging rate (Joules) of helmet per tick, per upgrade installed.
solarRechargingRate = "500"
solarRechargingRate = "4"
#Energy usage (Joules) of MekaSuit per tick of using vision enhancement.
energyUsageVisionEnhancement = "500"
energyUsageVisionEnhancement = "2"
#Energy usage (Joules) of MekaSuit per tick of using hydrostatic repulsion.
energyUsageHydrostaticRepulsion = "500"
energyUsageHydrostaticRepulsion = "4"
#Energy usage (Joules) of MekaSuit per half-food of nutritional injection.
energyUsageNutritionalInjection = "20000"
energyUsageNutritionalInjection = "10"
#Energy usage (Joules) of MekaSuit per unit of damage applied.
energyUsageDamage = "100000"
energyUsageDamage = "10"
#Energy usage (Joules) of MekaSuit per tick of attracting a single item.
energyUsageItemAttraction = "250"
energyUsageItemAttraction = "1"
#Should the Gravitational Modulation unit give off vibrations when in use.
gravitationalVibrations = true
#Maximum amount of Nutritional Paste storable by the nutritional injection unit.
#Range: > 1
nutritionalMaxStorage = 128000
nutritionalMaxStorage = 20000
#Rate at which Nutritional Paste can be transferred into the nutritional injection unit.
#Range: > 1
nutritionalTransferRate = 256
nutritionalTransferRate = 200
#Maximum amount of Hydrogen storable in the jetpack unit.
#Range: 1 ~ 9223372036854775807
jetpackMaxStorage = 48000
jetpackMaxStorage = 15000
#Rate at which Hydrogen can be transferred into the jetpack unit.
#Range: 1 ~ 9223372036854775807
jetpackTransferRate = 256
jetpackTransferRate = 200
#Armor value of MekaSuit Helmets.
#Range: > 0
helmetArmor = 3
Expand Down
28 changes: 14 additions & 14 deletions config/Mekanism/general.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
transmitterAlloyUpgrade = true
#Base factor for working out machine performance with upgrades - UpgradeModifier * (UpgradesInstalled/UpgradesPossible).
#Range: > 1
maxUpgradeMultiplier = 10
maxUpgradeMultiplier = 4
#How much Boiler heat is immediately usable to convert water to steam.
#Range: 0.01 ~ 1.0
boilerWaterConductivity = 0.7
Expand Down Expand Up @@ -46,10 +46,10 @@
[general.dynamic_tank]
#Amount of fluid (mB) that each block of the dynamic tank contributes to the volume. Max = volume * fluidPerTank
#Range: 1 ~ 368224
fluidPerTank = 350000
fluidPerTank = 8000
#Amount of chemical (mB) that each block of the dynamic tank contributes to the volume. Max = volume * chemicalPerTank
#Range: 1 ~ 1581510980256305
chemicalPerTank = 16000000
chemicalPerTank = 8000
Comment on lines +49 to +52
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are these being adjusted? We redid their values in 10.1.0 and I am relatively happy with their updated values.


#Auto Eject Settings
[general.auto_eject]
Expand Down Expand Up @@ -81,13 +81,13 @@
#Disables Forge Energy (FE,RF,IF,uF,CF) power integration. Requires world restart (server-side option in SMP).
blacklistForge = false
#Conversion multiplier from Forge Energy to Joules (FE * feConversionRate = Joules)
feConversionRate = "2.5000"
feConversionRate = "1.0000"
#Disables Flux Networks higher throughput Forge Energy (FE,RF,IF,uF,CF) power integration. Requires world restart (server-side option in SMP). Note: Disabling Forge Energy integration also disables this.
blacklistFluxNetworks = false
#How much energy is produced per mB of Hydrogen, also affects Electrolytic Separator usage, Ethylene burn rate and Gas generator energy capacity.
HydrogenEnergyDensity = "200"
HydrogenEnergyDensity = "2"
#Maximum Joules per mB of Steam. Also affects Thermoelectric Boiler.
maxEnergyPerSteam = "10"
maxEnergyPerSteam = "0.05"

#Radiation Settings
[general.radiation]
Expand All @@ -98,13 +98,13 @@
chunkCheckRadius = 5
#Radiation sources are multiplied by this constant roughly once per second to represent their emission decay. At the default rate, it takes roughly 10 hours to remove a 1,000 Sv/h (crazy high) source.
#Range: 0.0 ~ 1.0
sourceDecayRate = 0.9995
sourceDecayRate = 0.9998
#Radiated objects and entities are multiplied by this constant roughly once per second to represent their dosage decay.
#Range: 0.0 ~ 1.0
targetDecayRate = 0.9995
targetDecayRate = 0.9998
#Defines the minimum severity radiation dosage severity (scale of 0 to 1) for which negative effects can take place. Set to 1 to disable negative effects completely.
#Range: 0.0 ~ 1.0
negativeEffectsMinSeverity = 0.1
negativeEffectsMinSeverity = 0.8
#Amount of gas (mB) that can be stored in a Radioactive Waste Barrel.
#Range: 1 ~ 9223372036854775807
radioactiveWasteBarrelMaxGas = 512000
Expand All @@ -113,13 +113,13 @@
radioactiveWasteBarrelProcessTicks = 20
#Number of mB of gas that decay every radioactiveWasteBarrelProcessTicks ticks when stored in a Radioactive Waste Barrel. Set to zero to disable decay all together. (Gases in the mekanism:waste_barrel_decay_blacklist tag will not decay).
#Range: 0 ~ 9223372036854775807
radioactiveWasteBarrelDecayAmount = 1
radioactiveWasteBarrelDecayAmount = 5

#Digital Miner Settings
[general.digital_miner]
#Energy multiplier for using silk touch mode with the Digital Miner.
#Range: > 1
silkMultiplier = 12
silkMultiplier = 4
#Maximum radius in blocks that the Digital Miner can reach. (Increasing this may have negative effects on stability and/or performance. We strongly recommend you leave it at the default value).
#Range: > 1
maxRadius = 32
Expand All @@ -137,7 +137,7 @@
#Energy needed to destroy or attract blocks with a Laser (per block hardness level).
energyNeededPerHardness = "100000"
#Energy used per half heart of damage being transferred to entities.
energyPerDamage = "2500"
energyPerDamage = "4"

#Oredictionificator Settings
[general.oredictionificator]
Expand Down Expand Up @@ -225,10 +225,10 @@
[general.sps]
#How much input gas (polonium) in mB must be processed to make 1 mB of antimatter. Input tank capacity is 2x this value.
#Range: > 1
inputPerAntimatter = 1000
inputPerAntimatter = 100
#Amount of output gas (mB, antimatter) that the SPS can store.
#Range: 1 ~ 9223372036854775807
outputTankCapacity = 1000
#Energy needed to process 1 mB of input (inputPerAntimatter * energyPerInput = energy to produce 1 mB of antimatter).
energyPerInput = "1000000"
energyPerInput = "100000"

Loading