progress bar

yogstation13 · Nov 24, 2024 · 307f6cb · 307f6cb
1 parent ba17312
commit 307f6cb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 5 deletions.
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
@@ -136,6 +136,8 @@
 	ui_interact(usr)
 
 /atom/movable/screen/skill_menu/ui_interact(mob/user, datum/tgui/ui)
+	if(!user.mind)
+		CRASH("[user.type] ([user]) tried to use the skill menu without a mind!")
 	ui = SStgui.try_update_ui(user, src, ui)
 	if (!ui)
 		ui = new(user, src, "SkillMenu", "Allocate Skill Points")
@@ -148,13 +150,20 @@
 		skill_data.Add(list(list(
 			"base" = user.get_skill(skill),
 			"allocated" = allocated_skills[skill],
+			"exp_progress" = user.mind?.exp_progress[skill],
 		)))
 	data["skills"] = skill_data
 	data["skill_points"] = user.mind.skill_points
 	data["allocated_points"] = allocated_points
 	data["exceptional_skill"] = HAS_MIND_TRAIT(user, TRAIT_EXCEPTIONAL_SKILL)
 	return data
 
+/atom/movable/screen/skill_menu/ui_static_data(mob/user)
+	var/static/list/data = list(
+		"exp_per_level" = EXPERIENCE_PER_LEVEL
+	)
+	return data
+
 /atom/movable/screen/skill_menu/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
 	. = ..()
 	if(.)

diff --git a/tgui/packages/tgui/interfaces/SkillMenu.js b/tgui/packages/tgui/interfaces/SkillMenu.js
@@ -1,6 +1,6 @@
 import { classes } from 'common/react';
 import { useBackend } from '../backend';
-import { Box, Button, Icon, LabeledList, Section, Stack, Tooltip } from '../components';
+import { Box, Button, Icon, LabeledList, ProgressBar, Section, Stack, Tooltip } from '../components';
 import { Window } from '../layouts';
 
 export const SkillMenu = (props, context) => {
@@ -10,7 +10,7 @@ export const SkillMenu = (props, context) => {
   return (
     <Window
       title="Skills"
-      width={224}
+      width={320}
       height={262}
       >
       <Window.Content>
@@ -21,30 +21,35 @@ export const SkillMenu = (props, context) => {
               name="Physiology"
               index={0}
               tooltip="Medical knowledge and surgical precision."
+              color='blue'
             />
             <AdjustSkill
               skill="mechanics"
               name="Mechanics"
               index={1}
               tooltip="Construction and repair of structures, machinery, and exosuits."
+              color='orange'
             />
             <AdjustSkill
               skill="technical"
               name="Technical"
               index={2}
               tooltip="Electrical work, robot maintenance, and piloting exosuits or ships."
+              color='yellow'
             />
             <AdjustSkill
               skill="science"
               name="Science"
               index={3}
               tooltip="Knowledge of biology, chemistry, or other scientific fields."
+              color='rebeccapurple'
             />
             <AdjustSkill
               skill="fitness"
               name="Fitness"
               index={4}
               tooltip="Physical prowess and accuracy with weapons."
+              color='red'
             />
           </LabeledList>
           <Button
@@ -67,9 +72,11 @@ export const SkillMenu = (props, context) => {
 
 const AdjustSkill = (props, context) => {
   const { act, data } = useBackend(context);
-  const { skill, name, index, tooltip } = props;
-  const { skills, skill_points, allocated_points, exceptional_skill } = data;
-  const { base, allocated } = skills[index];
+  const { skill, name, index, tooltip, color } = props;
+  const { skills, skill_points, allocated_points, exceptional_skill, exp_per_level } = data;
+  const { base, allocated, exp_progress } = skills[index];
+
+  const exp_required = exp_per_level * Math.pow(2, base)
 
   return (
     <Stack>
@@ -103,6 +110,16 @@ const AdjustSkill = (props, context) => {
               amount: 1,
             })}
           />
+          <ProgressBar
+            value={exp_progress}
+            maxValue={exp_required}
+            color={color}
+            width={7.5}
+            ml={1}
+            textAlign="left"
+          >
+            {Math.floor(exp_progress)} / {Math.floor(exp_required)}
+          </ProgressBar>
         </Box>
       </LabeledList.Item>
     </Stack>