diff --git a/panel/ID_card.py b/panel/ID_card.py index 8939365..3555a87 100644 --- a/panel/ID_card.py +++ b/panel/ID_card.py @@ -18,7 +18,9 @@ def display_stars(grade): # Reformatting money def format_money(value): - if value >= 1_000_000_000: + if value >= 1_000_000_000_000: + return f"{value / 1_000_000_000_000:.2f}T" + elif value >= 1_000_000_000: return f"{value / 1_000_000_000:.2f}B" elif value >= 1_000_000: return f"{value / 1_000_000:.2f}M" @@ -69,8 +71,8 @@ def ID_card(username, display="community_info"): st.subheader("πŸ’² Resources") colres1, colres2, colres3, colres4 = st.columns(4, gap="small") colres1.metric(f"πŸ’² Money", f"{format_money(money)}$") - colres2.metric(f"πŸ’΅ Money earned", f"{format_money(money_win)}$") - colres3.metric(f"🏷️ Money spent", f"{format_money(money_spent)}$") + colres2.metric(f"πŸ’΅ Earned", f"{format_money(money_win)}$") + colres3.metric(f"🏷️ Spent", f"{format_money(money_spent)}$") colres4.metric(f"πŸͺ™ Trade token", f"{trade_token}") if display == "player_info": colres4.progress(battle_played) @@ -112,18 +114,18 @@ def ID_card(username, display="community_info"): st.subheader("πŸ† Skills and trophies") if display == "player_info": colsu1, colsu2, colsu3 = st.columns(3, gap="small") - colsu1.metric(f"⭐ Galactic Commander", grade, delta="" if grade < 5 else "MAX") - colsu2.metric(f"πŸš€ Armada Expansion", fleet_size) - colsu3.metric(f"🧭 Astral Navigator", grade_navigation, delta="" if grade_navigation < 10 else "MAX") + colsu1.metric(f"⭐ Galactic\n\nCommander", grade, delta="" if grade < 5 else "MAX", help="Improve purchased shuttles but increases the price") + colsu2.metric(f"πŸš€ Armada\n\nExpansion", fleet_size) + colsu3.metric(f"🧭 Astral\n\nNavigator", grade_navigation, delta="" if grade_navigation < 10 else "MAX", help="Reduces the cost of Open Space and speeds up the obtaining of resources") colsu4, colsu5, colsu6 = st.columns(3, gap="small") - colsu4.metric(f"πŸ’₯ Stellar Strike", grade_damage, delta="" if grade_damage < 10 else "MAX") - colsu5.metric(f"πŸ›‘οΈ Cosmic Fortitude", grade_resistance, delta="" if grade_resistance < 10 else "MAX") - colsu6.metric(f"πŸͺΆ Celestial Agility", grade_agility, delta="" if grade_agility < 10 else "MAX") + colsu4.metric(f"πŸ’₯ Stellar\n\nStrike", grade_damage, delta="" if grade_damage < 10 else "MAX", help="Increases damage inflict") + colsu5.metric(f"πŸ›‘οΈ Cosmic\n\nFortitude", grade_resistance, delta="" if grade_resistance < 10 else "MAX", help="Reduces damage taken") + colsu6.metric(f"πŸͺΆ Celestial\n\nAgility", grade_agility, delta="" if grade_agility < 10 else "MAX", help="Increases chances of escape") colsu7, colsu8, colsu9 = st.columns(3, gap="small") - colsu7.metric(f"πŸ›’ Interstellar Commerce", grade_commerce, delta="" if grade_commerce < 10 else "MAX") - colsu8.metric(f"πŸ’Ž Treasure Hunter", grade_treasure, delta="" if grade_treasure < 10 else "MAX") - colsu9.metric(f"⚑ Token Accelerator", grade_token, delta="" if grade_token < 10 else "MAX") + colsu7.metric(f"πŸ›’ Interstellar\n\nCommerce", grade_commerce, delta="" if grade_commerce < 10 else "MAX", help="Reduces shuttle price") + colsu8.metric(f"πŸ’Ž Treasure\n\nHunter", grade_treasure, delta="" if grade_treasure < 10 else "MAX", help="Increases money, resources and artifacts earned") + colsu9.metric(f"⚑ Token\n\nAccelerator", grade_token, delta="" if grade_token < 10 else "MAX", help="Accelerate Trade Token generation") return df, value_list diff --git a/panel/battle.py b/panel/battle.py index 7df583d..0d8f398 100644 --- a/panel/battle.py +++ b/panel/battle.py @@ -51,8 +51,8 @@ def battle(username, df): st.session_state.selected_ships_enemy = [] # Begin the battle - if colwar1.button("πŸ’₯ Look for enemies !", disabled=True if len(enemy_list) > 2 else False): - for _ in range(random.randint(1, 10)): + if colwar1.button("πŸ’₯ Look for enemies !", disabled=True if len(enemy_list) > 2 else False, help="Fight between 3 and 10 enemies"): + for _ in range(random.randint(3, 10)): ship = roll(proba_letter=p_letter, proba_number=p_number) sql.add_ship(username, ship, "enemies") st.toast("βš”οΈ The enemies enter the battles") @@ -77,7 +77,7 @@ def battle(username, df): {'selector': 'td', 'props': [('max-width', '150px')]} ] ).set_properties(**{'text-align': 'left'}) - colfight1.write("Enemies list:") + colfight1.write("Fleet enemies") colfight1.dataframe(styled_df_enemy, use_container_width=True, hide_index=True) if not st.session_state.selected_ships_enemy: @@ -99,7 +99,8 @@ def battle(username, df): shuttles_for_fight = colselectfight1.multiselect("Select shuttles to fight", df["Ship"].tolist(), label_visibility="collapsed", placeholder="Select shuttles to fight (max:4)", - max_selections=4, default=df["Ship"].tolist()[:4]) + max_selections=4, default=df["Ship"].tolist()[:4], + help="Select up to 4 shuttles for battle") value_player = int(sum(get_cost(ship) for ship in shuttles_for_fight) * random.uniform(1, damage_bonus)) value_enemies = int(sum(get_cost(ship) for ship in styled_df_enemy["Ship"])) if colselectfight2.button(f"FIGHT !"): @@ -146,7 +147,7 @@ def battle(username, df): time.sleep(0.75) & st.rerun() # Leave (coward) - if colwar2.button("πŸƒβ€β™‚οΈLeave fight"): + if colwar2.button("πŸƒβ€β™‚οΈLeave fight", help="Enhance Celestial Agility to get away faster"): if random.random() <= agility_bonus: for ship in json.loads(enemy_list): sql.remove_ship(username, ship, "enemies", fight=False) diff --git a/panel/community.py b/panel/community.py index 1effbf5..ce3ed73 100644 --- a/panel/community.py +++ b/panel/community.py @@ -57,13 +57,14 @@ def community(username): colsm1, colsm2 = st.columns([2, 1], gap="small") # Send money - send_money = colsm1.slider("πŸ’Έ Send money", step=1, min_value=0, + send_money = colsm1.slider("πŸ’Έ Send money (1 Trade Token required)", step=1, min_value=0, max_value=money if money > 0 else 1, disabled=True if money < 1 or selected_username == username else False) colsm2.markdown("") if colsm2.button(f"Send {send_money}$ to {selected_username}", - disabled=True if money < 1 or selected_username == username or trade_token < 1 else False): + disabled=True if money < 1 or selected_username == username or trade_token < 1 else False, + help="Requires a Trade Token, fight battles to obtain one" if trade_token < 1 else ""): sql.update_money(selected_username, send_money, context="receiver") sql.update_money(username, send_money, context="sender") st.toast(f"πŸ’Έ {send_money}$ sends to {selected_username}") diff --git a/panel/shop.py b/panel/shop.py index 68efb08..d8dce5f 100644 --- a/panel/shop.py +++ b/panel/shop.py @@ -109,7 +109,7 @@ def shop(username, df, value_list): with st.expander("✨ Skills and upgrade", expanded=True): colsu1, colsu2, colsu3 = st.columns(3, gap="small") - colsu1.metric(f"⭐ Galactic Commander", grade, delta=1 if grade < 5 else "MAX") + colsu1.metric(f"⭐ Galactic\n\nCommander", grade, delta=1 if grade < 5 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade < 5: if colsu1.button( f"⬆️ Upgrade\n\n{upgrade(grade, 0.4, 1000)}$", @@ -117,14 +117,14 @@ def shop(username, df, value_list): sql.upgrade_grade_commander(username, upgrade(grade, 0.4, 1000), p_letter, p_number) time.sleep(0.75) & st.rerun() - colsu2.metric(f"πŸš€ Armada Expansion", fleet_size, delta=5) + colsu2.metric(f"πŸš€ Armada\n\nExpansion", fleet_size, delta=5, help=f"See DOCUMENTATION in the left sidebar") if colsu2.button( f"⬆️ Upgrade\n\n{upgrade_fleet(fleet_size)}$", disabled=True if money < upgrade_fleet(fleet_size) else False): sql.upgrade_fleet_size(username, upgrade_fleet(fleet_size)) time.sleep(0.75) & st.rerun() - colsu3.metric(f"🧭 Astral Navigator", grade_navigation, delta="-2.5% $ | -2 min" if grade_navigation < 10 else "Max", help='Hello') + colsu3.metric(f"🧭 Astral\n\nNavigator", grade_navigation, delta="-2.5% $ | -2 min" if grade_navigation < 10 else "Max", help=f"See DOCUMENTATION in the left sidebar") if grade_navigation < 10: if colsu3.button( f"⬆️ Upgrade\n\n{upgrade(grade_navigation, 0.3, 500)}$", @@ -135,7 +135,7 @@ def shop(username, df, value_list): colsu4, colsu5, colsu6 = st.columns(3, gap="small") - colsu4.metric(f"πŸ’₯ Stellar Strike", grade_damage, delta="+2.5%" if grade_damage < 10 else "MAX") + colsu4.metric(f"πŸ’₯ Stellar\n\nStrike", grade_damage, delta="+2.5%" if grade_damage < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_damage < 10: if colsu4.button( f"⬆️ Upgrade\n\n{upgrade(grade_damage, 0.3, 1000)}$", @@ -143,7 +143,7 @@ def shop(username, df, value_list): sql.upgrade_damage(username, upgrade(grade_damage, 0.3, 1000), damage_bonus) time.sleep(0.75) & st.rerun() - colsu5.metric(f"πŸ›‘οΈ Cosmic Fortitude", grade_resistance, delta="-2.5%" if grade_resistance < 10 else "MAX") + colsu5.metric(f"πŸ›‘οΈ Cosmic\n\nFortitude", grade_resistance, delta="-2.5%" if grade_resistance < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_resistance < 10: if colsu5.button( f"⬆️ Upgrade\n\n{upgrade(grade_resistance, 0.3, 1000)}$", @@ -151,7 +151,7 @@ def shop(username, df, value_list): sql.upgrade_resistance(username, upgrade(grade_resistance, 0.3, 1000), resistance_bonus) time.sleep(0.75) & st.rerun() - colsu6.metric(f"πŸͺΆ Celestial Agility", grade_agility, delta="+9%" if grade_agility < 10 else "MAX") + colsu6.metric(f"πŸͺΆ Celestial\n\nAgility", grade_agility, delta="+9%" if grade_agility < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_agility < 10: if colsu6.button( f"⬆️ Upgrade\n\n{upgrade(grade_agility, 0.3, 250)}$", @@ -161,7 +161,7 @@ def shop(username, df, value_list): colsu7, colsu8, colsu9 = st.columns(3, gap="small") - colsu7.metric(f"πŸ›’ Interstellar Commerce", grade_commerce, delta="-5%" if grade_commerce < 10 else "MAX") + colsu7.metric(f"πŸ›’ Interstellar\n\nCommerce", grade_commerce, delta="-5%" if grade_commerce < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_commerce < 10: if colsu7.button( f"⬆️ Upgrade\n\n{upgrade(grade_commerce, 0.4, 500)}$", @@ -170,7 +170,7 @@ def shop(username, df, value_list): sql.upgrade_commerce(username, upgrade(grade_commerce, 0.4, 500), commerce_bonus) time.sleep(0.75) & st.rerun() - colsu8.metric(f"πŸ’Ž Treasure Hunter", grade_treasure, delta="M:5%|R:2.5%|A:1%" if grade_treasure < 10 else "MAX") + colsu8.metric(f"πŸ’Ž Treasure\n\nHunter", grade_treasure, delta="M:5%|R:2.5%|A:1%" if grade_treasure < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_treasure < 10: if colsu8.button( f"⬆️ Upgrade\n\n{upgrade(grade_treasure, 0.3, 1500)}$", @@ -180,7 +180,7 @@ def shop(username, df, value_list): treasure_resource_bonus, treasure_artifact_bonus) time.sleep(0.75) & st.rerun() - colsu9.metric(f"⚑ Token Accelerator", grade_token, delta=1 if grade_token < 10 else "MAX") + colsu9.metric(f"⚑ Token\n\nAccelerator", grade_token, delta=1 if grade_token < 10 else "MAX", help=f"See DOCUMENTATION in the left sidebar") if grade_token < 10: if colsu9.button( f"⬆️ Upgrade\n\n{upgrade(grade_token, 0.3, 250)}$",