minor changes to main.py. nothing major

main.py

@@ -1,14 +1,14 @@
 import matplotlib.pyplot as plt
 
 # Predefined variables used in the functions, modifiable
-data_points = 450000  # please make data_points and xScale in multiples of 10
+data_points = 450000  # please make data_points and x_scale in multiples of 10
 x_scale = 45  # scale of the X axis
 y_scale = 300000  # scale of the Y axis
 x_increments = x_scale / data_points
 
 # graph limits
 plt.xlim(0, x_scale)
-plt.ylim(0, 300000)
+plt.ylim(0, y_scale)
 
 # establish x array
 x = []
@@ -18,47 +18,48 @@
 # Initialize list to store legend labels
 legend_labels = []
 
-def plot_dps_graph(fire_delay, reload_time, damage_per_shot, mag_cap, ammo_reserve, legend_label, delay_first_shot):
-  # Initialize t_dmg list
-  t_dmg = []
-  shots_fired = 0
-  next_fire = fire_delay
-  total_damage = 0 if delay_first_shot else damage_per_shot #* -1
-  time_elapsed = 0
-  shots_fired_total = 0
+def plot_dps_graph(fire_delay, reload_time, damage_per_shot, magazine_capacity, ammo_reserve, legend_label, delay_first_shot):
+    # Initialize t_dmg list
+    t_dmg = []
+    shots_fired = 0
+    next_fire = fire_delay
+    total_damage = 0 if delay_first_shot else damage_per_shot
+    time_elapsed = 0
+    shots_fired_total = 0
 
-  for i in range(data_points):
-      if shots_fired_total == ammo_reserve:
-          total_damage = total_damage
-      else:
-          if shots_fired > mag_cap:
-              next_fire += reload_time
-              shots_fired = 0
-          elif time_elapsed == next_fire:
-              total_damage += damage_per_shot
-              next_fire += fire_delay
-              next_fire = round(next_fire, 5)
-              shots_fired += 1
-              shots_fired_total += 1
-          else:
-              total_damage = total_damage
-      time_elapsed += x_increments
-      time_elapsed = round(time_elapsed, 8)
-      t_dmg.append(total_damage)
+    # Calculate total damage over time
+    for i in range(data_points):
+        if shots_fired_total == ammo_reserve:
+            total_damage = total_damage
+        else:
+            if shots_fired > magazine_capacity:
+                next_fire += reload_time
+                shots_fired = 0
+            elif time_elapsed == next_fire:
+                total_damage += damage_per_shot
+                next_fire += fire_delay
+                next_fire = round(next_fire, 5)
+                shots_fired += 1
+                shots_fired_total += 1
+            else:
+                total_damage = total_damage
+        time_elapsed += x_increments
+        time_elapsed = round(time_elapsed, 8)
+        t_dmg.append(total_damage)
 
-  dps = [0]
-  for z in range(data_points):
+    dps = [0]
+    for z in range(data_points):
       if z != 0:
           dps.append(t_dmg[z] / x[z])
 
-  plt.plot(x, dps)
-  plt.xlabel("Time (Seconds)")
-  plt.ylabel("Damage Per Second")
+    plt.plot(x, dps)
+    plt.xlabel("Time (Seconds)")
+    plt.ylabel("Damage Per Second")
 
   # Add legend label to list
-  legend_labels.append(legend_label)
+    legend_labels.append(legend_label)
 
-# example function calls (fire_delay, reload_time, damage_per_shot, mag_cap, ammo_reserve, legend_label, delay_first_shot)
+# example function calls (fire_delay, reload_time, damage_per_shot, magazine_capacity, ammo_reserve, legend_label, delay_first_shot)
 plot_dps_graph(0.067, 0.73, 5200, 150, 547, "lmg", False)
 plot_dps_graph(3, 1.25, 193000, 2, 8, "rocket launcher", False)
 plot_dps_graph(0.5, 0.83, 98000, 8, 26, "charge up rifle", True)