Skip to content
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

Feature/dps scaling #52

Merged
merged 8 commits into from
Oct 4, 2024
Merged

Feature/dps scaling #52

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
155cd48
Output
Surxe Oct 2, 2024
236d67b
Initial
Surxe Oct 2, 2024
01098c0
Merge branch 'develop' into bugfix/dps-scaling
Surxe Oct 2, 2024
1dd669d
ruff format
Surxe Oct 2, 2024
60b3caf
ruff format 2
Surxe Oct 2, 2024
e78d8dc
Removed old commented code/comments
Surxe Oct 2, 2024
3b76f90
Merge branch 'develop' into bugfix/dps-scaling
Surxe Oct 4, 2024
494d426
Post-merge output
Surxe Oct 4, 2024
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
56 changes: 28 additions & 28 deletions output-data/csv/hero-data.csv
View file
Open in desktop

Large diffs are not rendered by default.

126 changes: 94 additions & 32 deletions output-data/json/hero-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,9 @@
"BulletDamage": 1.492857,
"Health": 33.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.317459999999997,
"SustainedDPS": 2.0591131034482757
},
"LightMeleeDamage": 63,
"Lore": "hero_astro_lore",
Expand Down Expand Up @@ -320,7 +322,9 @@
"BulletDamage": 0.251429,
"Health": 32.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.7714349999999968,
"SustainedDPS": 2.1951763945028233
},
"LightMeleeDamage": 63,
"Lore": "hero_atlas_lore",
Expand Down Expand Up @@ -503,7 +507,9 @@
"BulletResist": 1.257143,
"BonusAttackRange": 77.334084,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.663387499999999,
"SustainedDPS": 2.535083355176937
},
"LightMeleeDamage": 63,
"Lore": "hero_bebop_lore",
Expand Down Expand Up @@ -642,7 +648,9 @@
"BulletDamage": 0.124929,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 1.3881000000000014,
"SustainedDPS": 0.7207442307692311
},
"LightMeleeDamage": 63,
"Lore": "hero_bomber_lore",
Expand Down Expand Up @@ -981,7 +989,9 @@
"BulletDamage": 0.33,
"Health": 40.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 1.1785714285714306,
"SustainedDPS": 0.9575625680087043
},
"LightMeleeDamage": 63,
"Lore": "hero_chrono_lore",
Expand Down Expand Up @@ -1148,7 +1158,9 @@
"BulletDamage": 0.707143,
"Health": 44.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.828572000000001,
"SustainedDPS": 1.8581859854014624
},
"LightMeleeDamage": 63,
"Lore": "hero_dynamo_lore",
Expand Down Expand Up @@ -1345,7 +1357,9 @@
"BulletDamage": 0.345714,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 1.7285700000000048,
"SustainedDPS": 1.3836946027895678
},
"LightMeleeDamage": 63,
"Lore": "hero_forge_lore",
Expand Down Expand Up @@ -1648,7 +1662,9 @@
"BulletDamage": 1.65,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.6666666666666643,
"SustainedDPS": 2.5429756965026655
},
"LightMeleeDamage": 63,
"Lore": "hero_ghost_lore",
Expand Down Expand Up @@ -1824,7 +1840,9 @@
"BulletDamage": 0.597143,
"Health": 31.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.3885719999999964,
"SustainedDPS": 1.8038694791666643
},
"LightMeleeDamage": 63,
"Lore": "hero_gigawatt_lore",
Expand Down Expand Up @@ -2113,7 +2131,9 @@
"BulletDamage": 0.223929,
"Health": 27.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.239289999999997,
"SustainedDPS": 1.1542731958762857
},
"LightMeleeDamage": 63,
"Lore": "hero_haze_lore",
Expand All @@ -2131,7 +2151,8 @@
"Role": "hero_haze_role",
"RoundsPerSecond": 10.0,
"SpiritScaling": {
"ClipSize": 0.5
"ClipSize": 0.5,
"SustainedDPS": 0.27687776141383935
},
"SprintSpeed": 0,
"Stamina": 3,
Expand Down Expand Up @@ -2289,7 +2310,9 @@
"BulletDamage": 0.785714,
"Health": 20.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.571427272727277,
"SustainedDPS": 2.2292633479494484
},
"LightMeleeDamage": 63,
"Lore": "hero_hornet_lore",
Expand Down Expand Up @@ -2463,7 +2486,9 @@
"BulletDamage": 0.282857,
"Health": 33.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.828569999999999,
"SustainedDPS": 1.4712269312271218
},
"LightMeleeDamage": 63,
"Lore": "hero_inferno_lore",
Expand Down Expand Up @@ -2835,7 +2860,9 @@
"BulletDamage": 0.707,
"Health": 50.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.828000000000003,
"SustainedDPS": 1.6740331491712723
},
"LightMeleeDamage": 63,
"Lore": "hero_kelvin_lore",
Expand Down Expand Up @@ -3002,7 +3029,9 @@
"BulletDamage": 0.196429,
"Health": 44.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 4.3650888888888915,
"SustainedDPS": 2.4477133956386368
},
"LightMeleeDamage": 63,
"Lore": "hero_krill_lore",
Expand Down Expand Up @@ -3187,7 +3216,9 @@
"BulletDamage": 0.707143,
"Health": 42.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.828572000000001,
"SustainedDPS": 2.1361611458333343
},
"LightMeleeDamage": 63,
"Lore": "hero_lash_lore",
Expand Down Expand Up @@ -3371,7 +3402,9 @@
"BulletDamage": 1.0,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.857142857142854,
"SustainedDPS": 1.9512195121951237
},
"LightMeleeDamage": 63,
"Lore": "hero_mirage_lore",
Expand Down Expand Up @@ -3566,7 +3599,9 @@
"BulletDamage": 0.124929,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.123224999999991,
"SustainedDPS": 1.5836070422535187
},
"LightMeleeDamage": 63,
"Lore": "hero_nano_lore",
Expand Down Expand Up @@ -3737,7 +3772,9 @@
"BulletDamage": 1.414286,
"Health": 27.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.1428577777777846,
"SustainedDPS": 2.4042862000000014
},
"LightMeleeDamage": 63,
"Lore": "hero_orion_lore",
Expand All @@ -3757,7 +3794,9 @@
"SpiritScaling": {
"MaxMoveSpeed": 0.04,
"RoundsPerSecond": 0.00625,
"FireRate": 0.25
"FireRate": 0.25,
"DPS": 0.15468750000000142,
"SustainedDPS": 0.09046719902314493
},
"SprintSpeed": 0,
"Stamina": 3,
Expand Down Expand Up @@ -4090,7 +4129,9 @@
"BulletDamage": 0.314286,
"Health": 35.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.591840000000005,
"SustainedDPS": 2.342504347826093
},
"LightMeleeDamage": 63,
"Lore": "hero_shiv_lore",
Expand Down Expand Up @@ -4264,7 +4305,9 @@
"BulletDamage": 0.573571,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 2.8678549999999987,
"SustainedDPS": 1.8502290322580635
},
"LightMeleeDamage": 63,
"Lore": "hero_slork_lore",
Expand Down Expand Up @@ -4423,7 +4466,9 @@
"BulletDamage": 0.314286,
"Health": 31.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 4.400003999999996,
"SustainedDPS": 2.9086564903846153
},
"LightMeleeDamage": 63,
"Lore": "hero_synth_lore",
Expand Down Expand Up @@ -4736,7 +4781,9 @@
"BulletDamage": 0.392857,
"Health": 35.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 5.61224285714286,
"SustainedDPS": 2.7270258729490955
},
"LightMeleeDamage": 63,
"Lore": "hero_tengu_lore",
Expand Down Expand Up @@ -5093,7 +5140,9 @@
"BulletDamage": 0.666836,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 5.556966666666668,
"SustainedDPS": 3.3341800000000035
},
"LightMeleeDamage": 63,
"Lore": "hero_tokamak_lore",
Expand Down Expand Up @@ -5284,7 +5333,9 @@
"BulletDamage": 0.864286,
"Health": 38.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 4.321429999999992,
"SustainedDPS": 2.6593415384615398
},
"LightMeleeDamage": 63,
"Lore": "hero_viscous_lore",
Expand Down Expand Up @@ -5449,7 +5500,9 @@
"BulletDamage": 0.942857,
"Health": 45.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.7714280000000002,
"SustainedDPS": 2.2373770240089357
},
"LightMeleeDamage": 63,
"Lore": "hero_warden_lore",
Expand All @@ -5468,7 +5521,9 @@
"RoundsPerSecond": 4.0,
"SpiritScaling": {
"RoundsPerSecond": 0.012,
"FireRate": 0.3
"FireRate": 0.3,
"DPS": 0.23759999999998627,
"SustainedDPS": 0.08351865840771922
},
"SprintSpeed": 0,
"Stamina": 3,
Expand Down Expand Up @@ -5620,7 +5675,9 @@
"BulletDamage": 0.377143,
"Health": 31.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 4.1904777777777795,
"SustainedDPS": 2.6148581333333354
},
"LightMeleeDamage": 63,
"Lore": "hero_wraith_lore",
Expand Down Expand Up @@ -5782,7 +5839,9 @@
"BulletDamage": 1.241429,
"Health": 41.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.91882165079365
"HeavyMeleeDamage": 4.91882165079365,
"DPS": 3.5469400000000064,
"SustainedDPS": 1.9862863999999973
},
"LightMeleeDamage": 63,
"Lore": "hero_wrecker_lore",
Expand Down Expand Up @@ -6096,7 +6155,9 @@
"BulletDamage": 0.353,
"Health": 31.0,
"LightMeleeDamage": 2.671429,
"HeavyMeleeDamage": 4.955694376811594
"HeavyMeleeDamage": 4.955694376811594,
"DPS": 4.412499999999994,
"SustainedDPS": 2.923799006073992
},
"LightMeleeDamage": 69,
"Lore": "hero_yamato_lore",
Expand All @@ -6114,7 +6175,8 @@
"Role": "hero_yamato_role",
"RoundsPerSecond": 2.5,
"SpiritScaling": {
"ClipSize": 0.15
"ClipSize": 0.15,
"SustainedDPS": 0.19573644963872283
},
"SprintSpeed": 0,
"Stamina": 3,
Expand Down
6 changes: 3 additions & 3 deletions src/parser/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ def _parse_heroes(self, parsed_abilities):
self.OUTPUT_DIR + '/json/hero-meaningful-stats.json', parsed_meaningful_stats
):
print(
"Warning: Non-constant stats have changed. " +
"Please update [[Module:HeroData]]'s write_hero_comparison_table " +
"lua function for the [[Hero Comparison]] page."
'Warning: Non-constant stats have changed. '
+ "Please update [[Module:HeroData]]'s write_hero_comparison_table "
+ 'lua function for the [[Hero Comparison]] page.'
)

json_utils.write(
Expand Down
8 changes: 4 additions & 4 deletions src/parser/parsers/changelogs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class ChangelogParser:
def __init__(self):
self.CHANGELOGS_DIR = os.path.join(os.path.dirname(__file__), '../raw-changelogs/')
self.OUTPUT_DIR = OUTPUT_DIR
self.OUTPUT_CHANGELOGS = self.OUTPUT_DIR+'/changelogs'
self.OUTPUT_CHANGELOGS = self.OUTPUT_DIR + '/changelogs'
self.resources = self._get_resources()

def run_all(self):
Expand Down Expand Up @@ -107,9 +107,9 @@ def _read_logs(self, version):

def _get_resources(self):
resources = {}
heroes = json_utils.read(self.OUTPUT_DIR+'/json/hero-data.json')
items = json_utils.read(self.OUTPUT_DIR+'/json/item-data.json')
abilities = json_utils.read(self.OUTPUT_DIR+'/json/ability-data.json')
heroes = json_utils.read(self.OUTPUT_DIR + '/json/hero-data.json')
items = json_utils.read(self.OUTPUT_DIR + '/json/item-data.json')
abilities = json_utils.read(self.OUTPUT_DIR + '/json/ability-data.json')

for key in heroes:
heroes[key]['Type'] = 'Heroes'
Expand Down
3 changes: 2 additions & 1 deletion src/parser/parsers/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os

# Inches per meter, as engine units are inches
ENGINE_UNITS_PER_METER = 1 / 0.0254
OUTPUT_DIR = os.getenv("OUTPUT_DIR", '../../output-data/')
OUTPUT_DIR = os.getenv('OUTPUT_DIR', '../../output-data/')
Loading