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

Feat(data): Implement Engine Slot system in Delta #46

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
a339bca
Creating engine slots
Zitchas Apr 1, 2024
101a7d7
Finishing things off
Zitchas Apr 2, 2024
4394357
Fixing Captain Nate
Zitchas Apr 2, 2024
48fdbe9
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 3, 2024
70dc640
Fix Salker error & giving Coal reverse slots 1.5
Zitchas Apr 3, 2024
47bff25
Code: Making slots visible (and specific warnings)
Zitchas Apr 3, 2024
ffc0c8c
Code Style fixes
Zitchas Apr 3, 2024
699e11b
Accessory slot and code support
Zitchas Apr 6, 2024
dc5234f
Code Style (line length)
Zitchas Apr 6, 2024
262f749
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 7, 2024
bd84e81
Reducing counts to meet the limits
Zitchas Apr 7, 2024
aef21e1
Next "end of work day commit"
Zitchas Apr 8, 2024
beceb0c
End of work-day-commit
Zitchas Apr 9, 2024
7d2d451
Actual end-of-work-day commit
Zitchas Apr 9, 2024
b273b1a
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 9, 2024
dd048f8
Creating Unclassified and Unclassified Minor Categories
Zitchas Apr 11, 2024
5c687ae
Correcting the Ayym's bays
Zitchas Apr 11, 2024
8c96db8
Removing an extra space
Zitchas Apr 12, 2024
f5724f0
Adding a few missing ships
Zitchas Apr 12, 2024
6316715
Creating "Game Mechanics" category
Zitchas Apr 14, 2024
d4fe03d
Adding 10% Reverse Thrust to all thrusters
Zitchas Apr 15, 2024
a39fa51
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 15, 2024
de3fad1
Merge remote-tracking branch 'upstream/master' into f(data)-EngineSlo…
Zitchas Apr 17, 2024
7b3acfc
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 17, 2024
80c0a16
Variable Thruster Accessory Afterburner space
Zitchas Apr 18, 2024
5a8a882
Adding Variable Propulsion Accessory slots
Zitchas Apr 18, 2024
9aa585d
Replace "propulsion accessory slot" with "engine mod space"
Zitchas Apr 18, 2024
9f528d6
Updating source instances
Zitchas Apr 18, 2024
3066f5b
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 18, 2024
d03760a
Updating display label
Zitchas Apr 19, 2024
055aacf
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 20, 2024
61fb1e7
Creating WeaponInfoPanel
Zitchas Apr 20, 2024
5a0df29
Renaming it the Hardpoint tab, and making it work
Zitchas Apr 21, 2024
a56da81
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas Apr 21, 2024
341d97e
Merge branch 'f(data)-EngineSlotSystem-Delta' of github.com:Zitchas/e…
Zitchas Apr 22, 2024
32bfbfd
Finalized Info Panel Graphics
Zitchas Apr 22, 2024
d5533e8
A first slight differentiation...
Zitchas Apr 22, 2024
f0916e7
Copyright and Whitespace fix
Zitchas Apr 22, 2024
0e7ecc9
Some more whitesspace
Zitchas Apr 22, 2024
c70ce91
Copyright and whitespace
Zitchas Apr 23, 2024
8e2694a
Hopefully last batch of VS induced whitespace errors
Zitchas Apr 23, 2024
83b6ae5
Whitespace is a thing...
Zitchas Apr 23, 2024
64c9b7e
error const ship should be Ship
Zitchas Apr 23, 2024
5d08168
Shortcut underlining
Zitchas Apr 24, 2024
dd9194e
Starting the Breakdown for modularity
Zitchas Apr 27, 2024
429a954
Whitespace
Zitchas Apr 27, 2024
c52bf30
Adding more info sections
Zitchas Apr 28, 2024
924ff2c
Adding more info...
Zitchas May 3, 2024
94c6be9
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 3, 2024
3b3911d
Commenting out a variable that is currently unused and removing the d…
Zitchas May 3, 2024
f0aa483
Merge branch 'f(data)-EngineSlotSystem-Delta' of github.com:Zitchas/e…
Zitchas May 3, 2024
ebefd20
trailing space fix
Zitchas May 3, 2024
181ea6e
Splitting out OutfitSpace for stand alone use
Zitchas May 3, 2024
a160da3
Adding the ship capacities and hardpoint sections
Zitchas May 3, 2024
6286edb
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 4, 2024
ad5eafc
Adding Bay section
Zitchas May 4, 2024
b3505f2
WIP-Energy and Heat display
Zitchas May 4, 2024
53fd18a
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 5, 2024
6a3e643
Standardising Rectangle &bounds...
Zitchas May 5, 2024
1d281f6
Code Improvements (infoPanelLine++)
Zitchas May 5, 2024
e33ef0b
Standardizing the lack of space after the & and the lowercase i on in…
Zitchas May 5, 2024
58a4c66
Comments and finalizing Heat/Energy
Zitchas May 5, 2024
5b04f45
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 5, 2024
063bf61
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 9, 2024
6f87cd7
Implement simplistic accounting for bay mass
Zitchas May 10, 2024
f8f18ff
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 10, 2024
04616c7
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 11, 2024
3c03ae3
Proper lateral thrust calculations
Zitchas May 11, 2024
ae82e44
Cutting down the Hardpoint Panel to final stat list
Zitchas May 11, 2024
61bde32
Moving the ship & hardpoints closer to center
Zitchas May 11, 2024
7b3a46a
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 12, 2024
78596f6
Centering and expanding the weapons display
Zitchas May 12, 2024
6ee22ca
Making centerline turrets alternate sides
Zitchas May 12, 2024
c6f68c8
Adding Ship Thumbnail and Sprite to Ship Info Panel
Zitchas May 12, 2024
edac6cc
Removing the old call from HardpointPanel
Zitchas May 12, 2024
66f1590
Remove unused attribute from HardpointInfoPanel
Zitchas May 12, 2024
5c11588
Removing an unused function
Zitchas May 12, 2024
84140ee
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 12, 2024
4da4f66
Moving Most Methods into ShipInfoDisplay
Zitchas May 12, 2024
be4bbae
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 12, 2024
de2e464
Comments make lines too long, so newlines!
Zitchas May 12, 2024
46e0537
two items of whitespace
Zitchas May 12, 2024
007b462
Having Ammunition display in HardpointInfoPanel
Zitchas May 12, 2024
09d3269
An uneeded blank line
Zitchas May 12, 2024
72e6886
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 14, 2024
72e5e1a
Merge branch 'experimental' into f(data)-EngineSlotSystem-Delta
Zitchas May 15, 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
8 changes: 8 additions & 0 deletions data/_deprecated/deprecated outfits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ outfit "Korath Ark'torbal Thruster"
category "Engines"
"cost" 40000
thumbnail "outfit/unknown"
"thruster slot" -1
"engine mod space" 0.81
"mass" 17
"outfit space" -17
"engine capacity" -17
Expand All @@ -79,6 +81,7 @@ outfit "Korath Ark'parat Steering"
category "Engines"
"cost" 36000
thumbnail "outfit/unknown"
"steering slot" -1
"mass" 12
"outfit space" -12
"engine capacity" -12
Expand All @@ -91,6 +94,8 @@ outfit "Korath Jak'torbal Thruster"
category "Engines"
"cost" 317000
thumbnail "outfit/unknown"
"thruster slot" -1
"engine mod space" 1.42
"mass" 89
"outfit space" -89
"engine capacity" -89
Expand All @@ -112,6 +117,7 @@ outfit "Korath Jak'parat Steering"
category "Engines"
"cost" 2740000
thumbnail "outfit/unknown"
"steering slot" -1
"mass" 67
"outfit space" -67
"engine capacity" -67
Expand All @@ -138,6 +144,7 @@ outfit "Reverse Thruster"
category "Engines"
"cost" 140000
thumbnail "outfit/reverse thruster"
"reverse thruster slot" -1
"mass" 22
"outfit space" -22
"weapon capacity" -22
Expand Down Expand Up @@ -235,6 +242,7 @@ outfit "Afterburner"
category "Engines"
"cost" 70000
thumbnail "outfit/afterburner"
"engine mod space" -0.76
"mass" 10
"outfit space" -10
"engine capacity" -10
Expand Down
23 changes: 18 additions & 5 deletions data/_deprecated/deprecated ships.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ ship "Korath Dredger"
"outfit space" 763
"weapon capacity" 276
"engine capacity" 206
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 300
"shield damage" 4600
Expand Down Expand Up @@ -109,6 +112,9 @@ ship "Korath Raider"
"outfit space" 777
"weapon capacity" 339
"engine capacity" 159
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 250
"shield damage" 3600
Expand Down Expand Up @@ -179,6 +185,9 @@ ship "Korath Chaser"
"outfit space" 92
"weapon capacity" 25
"engine capacity" 30
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 48
"shield damage" 320
Expand Down Expand Up @@ -220,6 +229,9 @@ ship "Korath World-Ship"
"outfit space" 839
"weapon capacity" 314
"engine capacity" 165
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 400
"shield damage" 8000
Expand Down Expand Up @@ -333,9 +345,9 @@ ship "Korath Dredger" "Korath Dredger (Crippled)"

"Reverser (Lunar Class)"
"Steering (Lunar Class)"
"Steering (Asteroid Class)"
# "Steering (Asteroid Class)" # Extra steering
"Thruster (Lunar Class)"
"Thruster (Asteroid Class)"
# "Thruster (Asteroid Class)" # Extra thruster
"Hyperdrive"
"Jump Drive (Broken)"

Expand Down Expand Up @@ -502,9 +514,9 @@ ship "Korath Raider" "Korath Raider (Crippled)"
"Outfits Expansion"

"Bow Drive (Meteor Class)"
"Thruster (Asteroid Class)"
# "Thruster (Asteroid Class)" # Extra thruster
"Thruster (Lunar Class)"
"Steering (Asteroid Class)"
# "Steering (Asteroid Class)" # Extra steering
"Steering (Lunar Class)"
"Afterburner (Asteroid Class)"
"Jump Drive (Broken)"
Expand Down Expand Up @@ -683,11 +695,12 @@ ship "Korath Chaser" "Korath Chaser (World-Ship)"
"atmosphere scan" 1
outfits
"Generator (Candle Class)"
"Systems Core (Tiny)"
# "Systems Core (Tiny)" # To make space for a thruster
"Small Bunk Room"
"Korath Repeater Rifle" 3

"Steering (Asteroid Class)"
"Thruster (Asteroid Class)"
"Afterburner (Asteroid Class)"
"Hyperdrive"

Expand Down
2 changes: 1 addition & 1 deletion data/_ui/help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ help "navigation"

help "outfitter"
`Here, you can buy new equipment for your ship. Your ship has a limited amount of "outfit space," and most outfits use up some of that space.`
`Some types of outfits have other requirements as well. For example, only some of your outfit space can be used for engines or weapons; this is your ship's "engine capacity" and "weapon capacity." Guns and missile launchers also require a free "gun port," and turrets require a free "turret mount." Also, missiles can only be bought if you have the right launcher installed.`
`Some types of outfits have other requirements as well. For example, only some of your outfit space can be used for engines or weapons; this is your ship's "engine capacity" and "weapon capacity." Propulsion systems will require an open slot to install them in, and most ships only have 1 slot for thrusters and another for steering. Guns and missile launchers also require a free "gun port," and turrets require a free "turret mount." Also, missiles can only be bought if you have the right launcher installed.`
`Use your scroll wheel or click and drag, to scroll the view.`
`As in the trading and shipyard panels, you can hold down Shift, Control, or Alt to buy 5, 20, or 500 of an outfit at once, or multiple keys for larger amounts.`
`You can also press F to search the outfitter for a specific item.`
Expand Down
36 changes: 35 additions & 1 deletion data/_ui/interfaces.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1600,33 +1600,67 @@ interface "info panel"
box "outfits"
from -250 -290 to 500 30
box "weapons"
from -250 30 to 250 280
from -250 -270 to 500 280
box "ship info thumbnail"
from -250 30 to 125 280
box "ship info sprite"
from 125 30 to 500 280
box "cargo"
from 250 -290 to 500 280

visible if "hardpoint tab"
button R
center -375 -270
dimensions 250 30
sprite "ui/hardpoint tab"
center 0 -310
label "Hardpoint Info"
center -180 -305
color "bright"
label "_Ship Info"
center -300 -305
label "Player _Info"
center -420 -305
button i
center -420 -305
dimensions 120 30
button s
center -300 -305
dimensions 120 30

visible if "ship tab"
button R
center -375 -270
dimensions 250 30
sprite "ui/ship tab"
center 0 -310
label "_Hardpoint Info"
center -180 -305
label "Ship Info"
center -300 -305
color "bright"
label "Player _Info"
center -420 -305
button h
center -180 -305
dimensions 120 30
button i
center -420 -305
dimensions 120 30

visible if "player tab"
sprite "ui/player tab"
center 0 -310
label "_Hardpoint Info"
center -180 -305
label "_Ship Info"
center -300 -305
label "Player Info"
center -420 -305
color "bright"
button h
center -180 -305
dimensions 120 30
button s
center -300 -305
dimensions 120 30
Expand Down
12 changes: 12 additions & 0 deletions data/bunrodea/bunrodea outfits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ outfit "Chiisana Rift Thruster"
category "Engines"
cost 130000
thumbnail "outfit/chiisana rift thruster"
"thruster slot" -1
"engine mod space" 0.76
"mass" 11
"outfit space" -11
"engine capacity" -11
Expand All @@ -248,6 +250,8 @@ outfit "Nami Rift Thruster"
category "Engines"
cost 262000
thumbnail "outfit/nami rift thruster"
"thruster slot" -1
"engine mod space" 0.86
"mass" 19
"outfit space" -19
"engine capacity" -19
Expand All @@ -273,6 +277,8 @@ outfit "Ookii Rift Thruster"
category "Engines"
cost 512000
thumbnail "outfit/ookii rift thruster"
"thruster slot" -1
"engine mod space" 1.05
"mass" 32
"outfit space" -32
"engine capacity" -32
Expand All @@ -298,6 +304,8 @@ outfit "Subarashii Rift Thruster"
category "Engines"
cost 1004000
thumbnail "outfit/subarashii rift thruster"
"thruster slot" -1
"engine mod space" 1.23
"mass" 55
"outfit space" -55
"engine capacity" -55
Expand All @@ -322,6 +330,7 @@ outfit "Chiisana Rift Steering"
category "Engines"
cost 201000
thumbnail "outfit/chiisana rift steering"
"steering slot" -1
"mass" 17
"outfit space" -17
"engine capacity" -17
Expand All @@ -334,6 +343,7 @@ outfit "Nami Rift Steering"
category "Engines"
cost 442000
thumbnail "outfit/nami rift steering"
"steering slot" -1
"mass" 31
"outfit space" -31
"engine capacity" -31
Expand All @@ -346,6 +356,7 @@ outfit "Ookii Rift Steering"
category "Engines"
cost 940000
thumbnail "outfit/ookii rift steering"
"steering slot" -1
"mass" 53
"outfit space" -53
"engine capacity" -53
Expand All @@ -358,6 +369,7 @@ outfit "Subarashii Rift Steering"
category "Engines"
cost 1577000
thumbnail "outfit/subarashii rift steering"
"steering slot" -1
"mass" 90
"outfit space" -90
"engine capacity" -90
Expand Down
32 changes: 28 additions & 4 deletions data/bunrodea/bunrodea ships.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ ship "Kaiken"
"outfit space" 121
"weapon capacity" 35
"engine capacity" 45
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 40
"shield damage" 400
Expand All @@ -40,7 +43,7 @@ ship "Kaiken"
"Small Shield Relay"
"Shield Relay Limiter" 6

"Chiisana Rift Thruster" 2
"Chiisana Rift Thruster" # Extra thruster
"Chiisana Rift Steering"

engine -5.5 30.5
Expand Down Expand Up @@ -74,6 +77,9 @@ ship "Sasumata"
"outfit space" 397
"weapon capacity" 122
"engine capacity" 126
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
"cloak" .05
"cloaking energy" 10
"cloaking fuel" .05
Expand Down Expand Up @@ -138,6 +144,9 @@ ship "Tanto"
"outfit space" 231
"weapon capacity" 56
"engine capacity" 102
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 120
"shield damage" 1200
Expand All @@ -152,7 +161,7 @@ ship "Tanto"

"Ookii Rift Thruster"
"Ookii Rift Steering"
"Chiisana Rift Thruster"
# "Chiisana Rift Thruster" # Extra thruster
"Hyperdrive"

engine -20 148
Expand Down Expand Up @@ -190,6 +199,9 @@ ship "Ararebo"
"outfit space" 594
"weapon capacity" 112
"engine capacity" 108
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 200
"shield damage" 2000
Expand Down Expand Up @@ -257,6 +269,9 @@ ship "Tekkan"
"outfit space" 321
"weapon capacity" 100
"engine capacity" 85
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 140
"shield damage" 1400
Expand Down Expand Up @@ -313,6 +328,9 @@ ship "Kunai"
"outfit space" 407
"weapon capacity" 158
"engine capacity" 102
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 210
"shield damage" 2100
Expand All @@ -331,7 +349,7 @@ ship "Kunai"

"Ookii Rift Thruster"
"Ookii Rift Steering"
"Chiisana Rift Steering"
# "Chiisana Rift Steering" # Extra steering
"Hyperdrive"

engine -8 49
Expand Down Expand Up @@ -371,6 +389,9 @@ ship "Kama"
"outfit space" 573
"weapon capacity" 247
"engine capacity" 121
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 350
"shield damage" 3500
Expand All @@ -391,7 +412,7 @@ ship "Kama"

"Ookii Rift Thruster"
"Ookii Rift Steering"
"Nami Rift Steering"
# "Nami Rift Steering" # Extra steering
"Hyperdrive"

engine -11.5 132.5
Expand Down Expand Up @@ -438,6 +459,9 @@ ship "Chigiriki"
"outfit space" 747
"weapon capacity" 504
"engine capacity" 145
"reverse thruster slot" 1
"steering slot" 1
"thruster slot" 1
weapon
"blast radius" 410
"shield damage" 4100
Expand Down
Loading
Loading