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.

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

Economy Test #6050

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
0821cbf
Double all commodity prices
Amazinite Jun 6, 2021
b355718
Maintain the same profit margins
Amazinite Jun 6, 2021
1eac39a
Tweak minable asteroid hulls, payloads, and costs
Amazinite Jun 7, 2021
41285ff
Further increased most commodity prices
Amazinite Jun 7, 2021
46ecfc1
Missed a 0
Amazinite Jun 7, 2021
d8781b9
Lower the raid warning from triggering at a 49% raid chance to a 14% …
Amazinite Jun 7, 2021
ff13679
Lay groundwork for increasing minable payload drop rates
Amazinite Jun 12, 2021
877ae1e
Add prospecting weapon damage for increasing minable payload drop rates
Amazinite Jun 12, 2021
a6cd040
Missed a line
Amazinite Jun 12, 2021
fbb23d9
Toughness must be positive
Amazinite Jun 12, 2021
7788616
This thing
Amazinite Jun 12, 2021
08dc978
The other thing
Amazinite Jun 12, 2021
ec8f25d
Give toughnesses to minable asteroids
Amazinite Jun 12, 2021
28ca703
Allow a single mission definition to generate multiple jobs at once
Amazinite Jun 13, 2021
996d206
Create tractor beam weapons that function similarly to anti-missile w…
Amazinite Jun 14, 2021
1dc5366
Remove duplicate code in Hardpoint
Amazinite Jun 14, 2021
f8874e3
Display the tractor beam weapon attribute in the outfitter
Amazinite Jun 14, 2021
c92da2b
Allow opportunistic and focused firing of tractor beams
Amazinite Jun 14, 2021
a9381d1
Don't fire tractor beams if you don't have cargo space
Amazinite Jun 14, 2021
eb766a4
Added mining laser, mining turret, and tractor turret weapons to huma…
Amazinite Jun 14, 2021
55364f3
Exclude tractor beams from the no turret turn warning
Amazinite Jun 14, 2021
8044c98
Oops
Amazinite Jun 14, 2021
6e778cb
Fixed the toughness of titanium asteroids
Amazinite Jun 14, 2021
e7f6522
Calculate the net effect of all tractor beams acting on a flotsam in …
Amazinite Jun 14, 2021
3314907
Dampen flotsam motion perpendicular to the tractor beam
Amazinite Jun 14, 2021
0be9f25
Use the cross product instead of the dot product of the flotsam veloc…
Amazinite Jun 15, 2021
b0818d8
Increase pirate system commodity prices to be middling to high
Amazinite Jun 16, 2021
71619db
Create unique projectiles for mining lasers
Amazinite Jun 16, 2021
908de79
Ships won't try to tractor beam their own dumped cargo
Amazinite Jun 16, 2021
af45f63
Create unique effects for tractor beams
Amazinite Jun 16, 2021
508e25b
Increase mining laser hull damage
Amazinite Jun 18, 2021
0baa672
Don't count ships with only tractor beams as armed
Amazinite Jun 21, 2021
8f1d9c2
Increase energy cost of tractor beam and firing cost of mining lasers
Amazinite Jun 22, 2021
3d07954
Don't fire tractor beams like normal weapons when you have no free ca…
Amazinite Jun 22, 2021
994d86e
Decay the velocity of flotsams along the perpendicular of the pull in…
Amazinite Jun 22, 2021
bcdaa2d
Change how credit score is gained
Amazinite Jun 22, 2021
f24f18c
Merge remote-tracking branch 'upstream/master' into economy-test
Amazinite Sep 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions data/commodities.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# PARTICULAR PURPOSE. See the GNU General Public License for more details.

trade
commodity "Food" 100 600
commodity "Food" 800 1300
"animal feed"
"apples"
"applesauce"
Expand Down Expand Up @@ -94,7 +94,7 @@ trade
"vinegar"
"wheat"
"yams"
commodity "Clothing" 140 440
commodity "Clothing" 680 980
"beach towels"
"blankets"
"body armor"
Expand Down Expand Up @@ -134,7 +134,7 @@ trade
"waterproof fiber"
"wool"
"work boots"
commodity "Metal" 190 590
commodity "Metal" 1090 1490
"aluminized steel"
"aluminum"
"beryllium"
Expand Down Expand Up @@ -184,7 +184,7 @@ trade
"tool steel blanks"
"vanadium"
"zinc"
commodity "Plastic" 240 540
commodity "Plastic" 780 1080
"acetone"
"asphalt"
"bakelite"
Expand Down Expand Up @@ -222,7 +222,7 @@ trade
"unplasticized PVC"
"vinylesters"
"xylene"
commodity "Equipment" 330 730
commodity "Equipment" 1310 1710
"3D printers"
"CNC machines"
"air conditioners"
Expand Down Expand Up @@ -287,7 +287,7 @@ trade
"welding torches"
"wheelbarrows"
"whiskey barrels"
commodity "Medical" 430 930
commodity "Medical" 1510 2010
"antibacterials"
"antibiotics"
"anti-inflammatories"
Expand Down Expand Up @@ -328,7 +328,7 @@ trade
"tourniquets"
"tranquilizers"
"tweezers"
commodity "Industrial" 520 920
commodity "Industrial" 1840 2240
"aniline dyes"
"assorted shimstock"
"battery acid"
Expand Down Expand Up @@ -392,7 +392,7 @@ trade
"turret lathes"
"vacuum cleaners"
"varnish"
commodity "Electronics" 590 890
commodity "Electronics" 2280 2680
"accelerometers"
"amplifiers"
"batteries"
Expand Down Expand Up @@ -450,7 +450,7 @@ trade
"vacuum tubes"
"voltage converters"
"wireless receivers"
commodity "Heavy Metals" 610 1310
commodity "Heavy Metals" 2970 3670
"actinide metals"
"barium"
"bismuth"
Expand All @@ -471,7 +471,7 @@ trade
"reactor-grade uranium"
"thorium"
"tungsten"
commodity "Luxury Goods" 920 1520
commodity "Luxury Goods" 3740 4340
"antique swords"
"bawdy magazines"
"brandy"
Expand Down
76 changes: 38 additions & 38 deletions data/harvesting.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@

minable "aluminum"
sprite "asteroid/silicon/spin"
hull 1000
payload "Aluminum" 40
hull 850
payload "Aluminum" 50
explode "smoke" 40
explode "bolide" 40
explode "asteroid crunch large"

outfit "Aluminum"
plural "Aluminum"
category "Special"
cost 1800
cost 1600
thumbnail "outfit/harvested aluminum"
"flotsam sprite" "effect/flotsam aluminum"
"mass" 1
Expand All @@ -29,16 +29,16 @@ outfit "Aluminum"

minable "copper"
sprite "asteroid/gold/spin"
hull 1200
payload "Copper" 20
hull 1000
payload "Copper" 35
explode "smoke" 20
explode "bolide" 20
explode "asteroid crunch small"

outfit "Copper"
plural "Copper"
category "Special"
cost 3000
cost 2100
thumbnail "outfit/harvested copper"
"flotsam sprite" "effect/flotsam copper"
"mass" 1
Expand All @@ -48,16 +48,16 @@ outfit "Copper"

minable "gold"
sprite "asteroid/gold/spin"
hull 2800
payload "Gold" 16
hull 2400
payload "Gold" 30
explode "smoke" 20
explode "bolide" 20
explode "asteroid crunch small"

outfit "Gold"
plural "Gold"
category "Special"
cost 8000
cost 4400
thumbnail "outfit/harvested gold"
"flotsam sprite" "effect/flotsam gold"
"mass" 1
Expand All @@ -67,16 +67,16 @@ outfit "Gold"

minable "iron"
sprite "asteroid/iron/spin"
hull 1600
payload "Iron" 50
hull 1300
payload "Iron" 55
explode "smoke" 40
explode "bolide" 40
explode "asteroid crunch large"

outfit "Iron"
plural "Iron"
category "Special"
cost 1200
cost 1100
thumbnail "outfit/harvested iron"
"flotsam sprite" "effect/flotsam iron"
"mass" 1
Expand All @@ -86,8 +86,8 @@ outfit "Iron"

minable "lead"
sprite "asteroid/lead/spin"
hull 800
payload "Lead" 32
hull 700
payload "Lead" 60
explode "smoke" 30
explode "bolide" 30
explode "asteroid crunch medium"
Expand All @@ -105,16 +105,16 @@ outfit "Lead"

minable "neodymium"
sprite "asteroid/iron/spin"
hull 3600
payload "Neodymium" 40
hull 3000
payload "Neodymium" 65
explode "smoke" 40
explode "bolide" 40
explode "asteroid crunch large"

outfit "Neodymium"
plural "Neodymium"
category "Special"
cost 3800
cost 2300
thumbnail "outfit/harvested neodymium"
"flotsam sprite" "effect/flotsam neodymium"
"mass" 1
Expand All @@ -124,16 +124,16 @@ outfit "Neodymium"

minable "platinum"
sprite "asteroid/silver/spin"
hull 4000
payload "Platinum" 16
hull 3400
payload "Platinum" 32
explode "smoke" 20
explode "bolide" 20
explode "asteroid crunch small"

outfit "Platinum"
plural "Platinum"
category "Special"
cost 10000
cost 5000
thumbnail "outfit/harvested platinum"
"flotsam sprite" "effect/flotsam platinum"
"mass" 1
Expand All @@ -143,16 +143,16 @@ outfit "Platinum"

minable "silicon"
sprite "asteroid/silicon/spin"
hull 400
payload "Silicon" 50
hull 350
payload "Silicon" 80
explode "smoke" 40
explode "bolide" 40
explode "asteroid crunch large"

outfit "Silicon"
plural "Silicon"
category "Special"
cost 400
cost 500
thumbnail "outfit/harvested silicon"
"flotsam sprite" "effect/flotsam silicon"
"mass" 1
Expand All @@ -162,16 +162,16 @@ outfit "Silicon"

minable "silver"
sprite "asteroid/silver/spin"
hull 2000
payload "Silver" 20
hull 1700
payload "Silver" 35
explode "smoke" 20
explode "bolide" 20
explode "asteroid crunch small"

outfit "Silver"
plural "Silver"
category "Special"
cost 6000
cost 3600
thumbnail "outfit/harvested silver"
"flotsam sprite" "effect/flotsam silver"
"mass" 1
Expand All @@ -181,16 +181,16 @@ outfit "Silver"

minable "titanium"
sprite "asteroid/titanium/spin"
hull 2400
payload "Titanium" 32
hull 2000
payload "Titanium" 50
explode "smoke" 30
explode "bolide" 30
explode "asteroid crunch medium"

outfit "Titanium"
plural "Titanium"
category "Special"
cost 2500
cost 1900
thumbnail "outfit/harvested titanium"
"flotsam sprite" "effect/flotsam titanium"
"mass" 1
Expand All @@ -200,16 +200,16 @@ outfit "Titanium"

minable "tungsten"
sprite "asteroid/titanium/spin"
hull 4800
payload "Tungsten" 24
hull 4100
payload "Tungsten" 40
explode "smoke" 30
explode "bolide" 30
explode "asteroid crunch medium"

outfit "Tungsten"
plural "Tungsten"
category "Special"
cost 4500
cost 2700
thumbnail "outfit/harvested tungsten"
"flotsam sprite" "effect/flotsam tungsten"
"mass" 1
Expand All @@ -219,16 +219,16 @@ outfit "Tungsten"

minable "uranium"
sprite "asteroid/lead/spin"
hull 3200
payload "Uranium" 24
hull 2700
payload "Uranium" 40
explode "smoke" 30
explode "bolide" 30
explode "asteroid crunch medium"

outfit "Uranium"
plural "Uranium"
category "Special"
cost 5000
cost 300
Amazinite marked this conversation as resolved.
Show resolved Hide resolved
thumbnail "outfit/harvested uranium"
"flotsam sprite" "effect/flotsam uranium"
"mass" 1
Expand All @@ -238,16 +238,16 @@ outfit "Uranium"

minable "yottrite"
sprite "asteroid/yottrite/spin"
hull 20000
payload "Yottrite" 7
hull 17500
payload "Yottrite" 13
explode "smoke" 30
explode "bolide" 30
explode "asteroid crunch medium"

outfit "Yottrite"
plural "Yottrite"
category "Special"
cost 200000
cost 100000
thumbnail "outfit/harvested yottrite"
"flotsam sprite" "effect/flotsam yottrite"
"mass" 3.14
Expand Down