Skip to content

Commit

Permalink
fix(ui): Fix duplicated display of the new fuel attributes and make t…
Browse files Browse the repository at this point in the history
…heir tooltips work (endless-sky#10771)
  • Loading branch information
tibetiroka authored Nov 11, 2024
1 parent ab916a9 commit 6ab8e8f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
7 changes: 2 additions & 5 deletions data/_ui/tooltips.txt
Original file line number Diff line number Diff line change
Expand Up @@ -438,13 +438,10 @@ tip "scramble resistance heat:"
tip "jump speed:"
`The maximum velocity the ship can jump at.`

tip "jump fuel:"
`Fuel consumed when jumping between systems using this drive.`

tip "hyperdrive fuel"
tip "hyperdrive fuel:"
`Fuel consumed when jumping between systems using this hyperdrive.`

tip "jump drive fuel"
tip "jump drive fuel:"
`Fuel consumed when jumping between systems using this jump drive.`

tip "jump range:"
Expand Down
2 changes: 2 additions & 0 deletions source/Outfit.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@ void Outfit::Load(const DataNode &node)
double jumpFuel = attributes.Get("jump fuel");
attributes["jump drive fuel"] = (jumpFuel > 0. ? jumpFuel : DEFAULT_JUMP_DRIVE_COST);
}
if(attributes.Get("jump fuel"))
attributes["jump fuel"] = 0.;

// Only outfits with the jump drive and jump range attributes can
// use the jump range, so only keep track of the jump range on
Expand Down

0 comments on commit 6ab8e8f

Please sign in to comment.