echoes91
/
pioneer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'new_commodity_prices'

master
Karl F 2020-03-15 12:36:03 +01:00
parent 392277f65f 9d3bab8acd
commit c2f3305730
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Changelog.txt
View File

@ -1,11 +1,12 @@
March 2020
* New Features
* Stars that are brighter are now bigger and have a brighter color on the Starfield (#4833)
* Stars that are brighter are now bigger and have a brighter colour on the Starfield (#4833)
* Texture Cache Visualizer and Memory Usage Tracker (#4835)
* Complete overhaul of commodity prices, to be similar to Frontier (#4831)
* Fixes
* Prevent change of Pioneer's mouse pointer when hiding HUD (#4827)
* Fix body grouping and setspeed target behavior in flightUI (#4794)
* Fix body grouping and setspeed target behaviour in flightUI (#4794)
* Internal Changes
* Perf counter Windows memory info (#4820)

60
data/libs/Equipment.lua
View File

@ -494,12 +494,12 @@ local CARGOLANGRESOURCE = "commodity"
cargo = {
hydrogen = EquipType.New({
l10n_key = 'HYDROGEN', l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=1,
l10n_key = 'HYDROGEN', l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=10,
capabilities={mass=1}, economy_type="mining",
purchasable=true, icon_name="Hydrogen"
}),
liquid_oxygen = EquipType.New({
l10n_key="LIQUID_OXYGEN", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=1.5,
l10n_key="LIQUID_OXYGEN", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=9.8,
capabilities={mass=1}, economy_type="mining",
purchasable=true, icon_name="Liquid_Oxygen"
}),
@ -509,142 +509,142 @@ cargo = {
purchasable=true, icon_name="Water"
}),
carbon_ore = EquipType.New({
l10n_key="CARBON_ORE", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=5,
l10n_key="CARBON_ORE", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=7,
capabilities={mass=1}, economy_type="mining",
purchasable=true, icon_name="Carbon_ore"
}),
metal_ore = EquipType.New({
l10n_key="METAL_ORE", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=3,
l10n_key="METAL_ORE", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=43,
capabilities={mass=1}, economy_type="mining",
purchasable=true, icon_name="Metal_ore"
}),
metal_alloys = EquipType.New({
l10n_key="METAL_ALLOYS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=8,
l10n_key="METAL_ALLOYS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=24,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Metal_alloys"
}),
precious_metals = EquipType.New({
l10n_key="PRECIOUS_METALS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=180,
l10n_key="PRECIOUS_METALS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=2180,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Precious_metals"
}),
plastics = EquipType.New({
l10n_key="PLASTICS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=12,
l10n_key="PLASTICS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=36,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Plastics"
}),
fruit_and_veg = EquipType.New({
l10n_key="FRUIT_AND_VEG", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=12,
l10n_key="FRUIT_AND_VEG", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=105,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Fruit_and_Veg"
}),
animal_meat = EquipType.New({
l10n_key="ANIMAL_MEAT", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=18,
l10n_key="ANIMAL_MEAT", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=125,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Animal_Meat"
}),
live_animals = EquipType.New({
l10n_key="LIVE_ANIMALS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=32,
l10n_key="LIVE_ANIMALS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=932,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Live_Animals"
}),
liquor = EquipType.New({
l10n_key="LIQUOR", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=8,
l10n_key="LIQUOR", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=422,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Liquor"
}),
grain = EquipType.New({
l10n_key="GRAIN", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=10,
l10n_key="GRAIN", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=41,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Grain"
}),
slaves = EquipType.New({
l10n_key="SLAVES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=232,
l10n_key="SLAVES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=1011,
capabilities={mass=1}, economy_type="agriculture",
purchasable=true, icon_name="Slaves"
}),
textiles = EquipType.New({
l10n_key="TEXTILES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=8.5,
l10n_key="TEXTILES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=65,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Textiles"
}),
fertilizer = EquipType.New({
l10n_key="FERTILIZER", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=4,
l10n_key="FERTILIZER", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=15,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Fertilizer"
}),
medicines = EquipType.New({
l10n_key="MEDICINES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=22,
l10n_key="MEDICINES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=563,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Medicines"
}),
consumer_goods = EquipType.New({
l10n_key="CONSUMER_GOODS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=140,
l10n_key="CONSUMER_GOODS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=246,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Consumer_goods"
}),
computers = EquipType.New({
l10n_key="COMPUTERS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=80,
l10n_key="COMPUTERS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=461,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Computers"
}),
rubbish = EquipType.New({
l10n_key="RUBBISH", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=-0.1,
l10n_key="RUBBISH", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=-0.7,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Rubbish"
}),
radioactives = EquipType.New({
l10n_key="RADIOACTIVES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=-3.5,
l10n_key="RADIOACTIVES", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=-4.4,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Radioactive_waste"
}),
narcotics = EquipType.New({
l10n_key="NARCOTICS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=157,
l10n_key="NARCOTICS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=632,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Narcotics"
}),
nerve_gas = EquipType.New({
l10n_key="NERVE_GAS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=265,
l10n_key="NERVE_GAS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=813,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Nerve_Gas"
}),
military_fuel = EquipType.New({
l10n_key="MILITARY_FUEL", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=60,
l10n_key="MILITARY_FUEL", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=49,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Military_fuel"
}),
robots = EquipType.New({
l10n_key="ROBOTS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=63,
l10n_key="ROBOTS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=829,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Robots"
}),
hand_weapons = EquipType.New({
l10n_key="HAND_WEAPONS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=124,
l10n_key="HAND_WEAPONS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=251,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Hand_weapons"
}),
air_processors = EquipType.New({
l10n_key="AIR_PROCESSORS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=20,
l10n_key="AIR_PROCESSORS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=204,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Air_processors"
}),
farm_machinery = EquipType.New({
l10n_key="FARM_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=11,
l10n_key="FARM_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=80,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Farm_machinery"
}),
mining_machinery = EquipType.New({
l10n_key="MINING_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=12,
l10n_key="MINING_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=312,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Mining_machinery"
}),
battle_weapons = EquipType.New({
l10n_key="BATTLE_WEAPONS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=220,
l10n_key="BATTLE_WEAPONS", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=607,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Battle_weapons"
}),
industrial_machinery = EquipType.New({
l10n_key="INDUSTRIAL_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=13,
l10n_key="INDUSTRIAL_MACHINERY", l10n_resource = CARGOLANGRESOURCE, slots="cargo", price=124,
capabilities={mass=1}, economy_type="industry",
purchasable=true, icon_name="Industrial_machinery"
}),