Skip to content

metric or imperial unit options #100

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

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

metric or imperial unit options #100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47d6702
initial stuff
udokao Jan 8, 2025
c90b5ce
Merge branch 'main' of github.com:OoriData/DF_Discord into user-optio…
choccccy Apr 17, 2025
5a51fc9
make functional
choccccy Apr 17, 2025
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
12 changes: 12 additions & 0 deletions discord_app/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,18 @@ def get_user_metadata(df_state: DFState, metadata_key: str):
user_metadata = df_state.convoy_obj.get('user_metadata')
return user_metadata.get(metadata_key)

def metric_to_imperial(measurement, unit_type: str):
''' # What the fuck is a kilometer? '''
match unit_type:
case 'volume':
# Liter to gallon conversion
return measurement / 3.79
case 'mass':
# Kilogram to pound conversion
return measurement / 2.20
case 'velocity':
# Km/h to mi/h conversion
return measurement / 1.61

def add_tutorial_embed(embeds: list[discord.Embed], df_state: DFState) -> discord.Embed:
if not df_state.convoy_obj:
Expand Down
33 changes: 28 additions & 5 deletions discord_app/convoy_menus.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@

from utiloori.ansi_color import ansi_color

from discord_app import api_calls, dialogue_menus, handle_timeout, discord_timestamp, df_embed_author, add_tutorial_embed, get_user_metadata, validate_interaction, DF_LOGO_EMOJI, OORI_WHITE, get_vehicle_emoji, get_settlement_emoji, get_cargo_emoji
from discord_app import (
api_calls, dialogue_menus, handle_timeout, discord_timestamp, df_embed_author, add_tutorial_embed,
get_user_metadata, validate_interaction, metric_to_imperial, DF_LOGO_EMOJI, OORI_WHITE, get_vehicle_emoji,
get_settlement_emoji, get_cargo_emoji
)
import discord_app.cargo_menus
import discord_app.vehicle_menus
import discord_app.vendor_views.buy_menus
Expand Down Expand Up @@ -63,19 +67,38 @@ async def make_convoy_embed(df_state: DFState, prospective_journey_plus_misc=Non

convoy_embed.description = vehicles_embed_str(df_state.convoy_obj['vehicles'])

if get_user_metadata(df_state, 'imperial'):
user_volume_unit = 'gallons'
user_mass_unit = 'lb'

convoy_fuel_capacity = metric_to_imperial(df_state.convoy_obj['max_fuel'], 'volume')
convoy_water_capacity = metric_to_imperial(df_state.convoy_obj['max_water'], 'volume')

convoy_fuel = metric_to_imperial(df_state.convoy_obj['fuel'], 'volume')
convoy_water = metric_to_imperial(df_state.convoy_obj['water'], 'volume')
else:
user_volume_unit = 'liters'
user_mass_unit = 'kg'

convoy_fuel_capacity = df_state.convoy_obj['max_fuel']
convoy_water_capacity = df_state.convoy_obj['max_water']

convoy_fuel = df_state.convoy_obj['fuel']
convoy_water = df_state.convoy_obj['water']

if get_user_metadata(df_state, 'mobile'):
convoy_embed.description += '\n' + '\n'.join([
'### Convoy Stats',
f'Fuel ⛽️: **{df_state.convoy_obj['fuel']:,.2f}** / {df_state.convoy_obj['max_fuel']:.0f}L',
f'Water 💧: **{df_state.convoy_obj['water']:,.2f}** / {df_state.convoy_obj['max_water']:.0f}L',
f'Fuel ⛽️: **{convoy_fuel:,.2f}** / {convoy_fuel_capacity:.0f}L',
f'Water 💧: **{convoy_water:,.2f}** / {convoy_water_capacity:.0f}L',
f'Food 🥪: **{df_state.convoy_obj['food']:,.2f}** / {df_state.convoy_obj['max_food']:.0f} meals',
f'Efficiency 🌿: **{df_state.convoy_obj['efficiency']:.0f}** / 100',
f'Top Speed 🚀: **{df_state.convoy_obj['top_speed']:.0f}** / 100',
f'Offroad Capability 🏔️: **{df_state.convoy_obj['offroad_capability']:.0f}** / 100'
])
else:
convoy_embed.add_field(name='Fuel ⛽️', value=f'**{df_state.convoy_obj['fuel']:,.2f}**\n/{df_state.convoy_obj['max_fuel']:.0f} liters')
convoy_embed.add_field(name='Water 💧', value=f'**{df_state.convoy_obj['water']:,.2f}**\n/{df_state.convoy_obj['max_water']:.0f} liters')
convoy_embed.add_field(name='Fuel ⛽️', value=f'**{convoy_fuel:,.2f}**\n/{convoy_fuel_capacity:.0f} {user_volume_unit}')
convoy_embed.add_field(name='Water 💧', value=f'**{convoy_water:,.2f}**\n/{convoy_water_capacity:.0f} {user_volume_unit}')
convoy_embed.add_field(name='Food 🥪', value=f'**{df_state.convoy_obj['food']:,.2f}**\n/{df_state.convoy_obj['max_food']:.0f} meals')

convoy_embed.add_field(name='Efficiency 🌿', value=f'**{df_state.convoy_obj['efficiency']:.0f}**\n/100')
Expand Down