Added damage modifier stats in radial graph

Mitcheljager · Oct 6, 2019 · b07bbb7 · b07bbb7
1 parent 85c2aa1
commit b07bbb7
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 8 deletions.
diff --git a/app/assets/javascripts/modify.js b/app/assets/javascripts/modify.js
@@ -22,6 +22,9 @@ function setModifier(event) {
 
     targetElements.forEach((targetElement) => {
       const dataTarget = targetElement.dataset.target
+
+      console.log(targetElement)
+
       const targetValue = parseFloat(currentItemData[dataTarget])
       const attachmentValue = parseFloat(targets[target])
 
@@ -30,6 +33,9 @@ function setModifier(event) {
         return
       }
 
+      console.log(targetElement)
+      console.log(targetValue)
+
       const alreadyActiveModifier = targetElement.querySelector(".item__small-info-modify-value")
       if (alreadyActiveModifier) alreadyActiveModifier.remove()
 

diff --git a/app/assets/stylesheets/elements/_attachments_table.scss b/app/assets/stylesheets/elements/_attachments_table.scss
@@ -35,6 +35,10 @@
       filter: brightness(20%);
     }
   }
+
+  span:first-child {
+    font-weight: bold;
+  }
 }
 
 .attachments-table__dropdown {

diff --git a/app/assets/stylesheets/elements/_circle-graph.scss b/app/assets/stylesheets/elements/_circle-graph.scss
@@ -15,10 +15,22 @@
   z-index: 2;
 
   h4 {
+    position: relative;
+    display: block;
     margin: 0 0 -.25em;
+    text-align: center;
     font-weight: 700;
     font-family: "Teko", sans-serif;
     color: var(--title-color);
+
+    .modify-element {
+      position: absolute;
+      font-size: 18px;
+      line-height: 1em;
+      left: 0;
+      top: 50%;
+      transform: translateY(-50%) translateX(-100%);
+    }
   }
 
   [class^="compare-"] {

diff --git a/app/views/pages/item_columns/_attachments_table.html.erb b/app/views/pages/item_columns/_attachments_table.html.erb
@@ -26,10 +26,12 @@
                   <% end %>
                 <% end %>
 
+                <%= attachment["name"].downcase.gsub(" ", "_").gsub("'", "")  %>
+
                 <a class="attachments-table__dropdown-item"
                    data-action="set-modifier"
                    data-modify-rarity="<%= rarity %>"
-                   data-to-modify="<%= attachment[rarity].without("description").to_json %>">
+                   data-to-modify="<%= to_modify = attachment[rarity].without("description").to_json %>">
                   <%= image_tag "attachments/#{ attachment["name"].downcase.gsub(" ", "_").gsub("'", "") }.png", alt: attachment["name"].humanize %>
 
                   <div>

diff --git a/app/views/pages/item_columns/_radial_graph.html.erb b/app/views/pages/item_columns/_radial_graph.html.erb
@@ -1,7 +1,7 @@
 <div class="circle-graph" data-role="circle-graph" data-target="<%= target %>">
   <div class="circle-graph__label">
     <%= label %>
-    <h4 data-role="circle-graph-value" data-compare-circle="<%= target %>"></h4>
+    <h4 data-role="circle-graph-value" data-compare-circle="<%= target %>" data-modify-target="<%= modify_target %>" data-target="<%= target %>"></h4>
     <% if defined?(damage_modifier) %>
       <div class="circle-graph__extra-modifier" data-role="damage-modifier"></div>
     <% end %>

diff --git a/app/views/pages/item_columns/_weapons.html.erb b/app/views/pages/item_columns/_weapons.html.erb
@@ -49,8 +49,8 @@
         </div>
 
         <div class="item-columns__radial-graphs">
-          <%= render "pages/item_columns/radial_graph", target: "damage", label: "DMG", max: get_max_value(items, "damage"), damage_modifier: true, extra_damage: true %>
-          <%= render "pages/item_columns/radial_graph", target: "rate_of_fire", label: "RPM", max: get_max_value(items, "rate_of_fire") %>
+          <%= render "pages/item_columns/radial_graph", target: "damage", label: "DMG", max: get_max_value(items, "damage"), modify_target: "damage_modifier", damage_modifier: true, extra_damage: true %>
+          <%= render "pages/item_columns/radial_graph", target: "rate_of_fire", label: "RPM", max: get_max_value(items, "rate_of_fire"), modify_target: "rate_of_fire" %>
         </div>
 
         <%= render "pages/item_columns/bar_graph", target: "damage_per_second", label: "Damage per second", max: get_max_value(items, "damage_per_second") %>

diff --git a/config/content/assault_rifles.yml b/config/content/assault_rifles.yml
@@ -31,6 +31,9 @@
         ammo_increase: 40%
       epic:
         ammo_increase: 50%
+    anvil_receiver:
+      legendary:
+        damage_modifier: 126.3%
   fire_modes:
     single: true
     auto: true
@@ -165,6 +168,9 @@
         ammo_increase: 40%
       epic:
         ammo_increase: 55%
+    anvil_receiver:
+      legendary:
+        damage_modifier: 150%
   fire_modes:
     single: true
     auto: true

diff --git a/config/content/pistols.yml b/config/content/pistols.yml
@@ -23,8 +23,6 @@
       - 2x_hcog_bruiser
       - 1x-2x_variable_holo
       - 1x_digital_threat
-    hop_up:
-      - disruptor_rounds
   attachments_overwrite:
     extended_light_mag:
       basic:
@@ -103,6 +101,9 @@
         ammo_increase: 50%
       epic:
         ammo_increase: 80%
+    hammerpoint_rounds:
+      epic:
+        damage_modifier: 161.5%
   fire_modes:
     single: true
 -

diff --git a/config/content/shotguns.yml b/config/content/shotguns.yml
@@ -23,6 +23,10 @@
       - hammerpoint_rounds
     stock:
       - shotgun_bolt
+  attachments_overwrite:
+    hammerpoint_rounds:
+      epic:
+        damage_modifier: 53.32%
   fire_modes:
     auto: true
   spray_pattern:

diff --git a/config/content/sub_machine_guns.yml b/config/content/sub_machine_guns.yml
@@ -98,8 +98,6 @@
       - 2x_hcog_bruiser
       - 1x-2x_variable_holo
       - 1x_digital_threat
-    hop_up:
-      - disruptor_rounds
     stock:
       - standard_stock
   attachments_overwrite: