Skip to content

Commit

Permalink
Check DPS of all items with sufficient DPS
Browse files Browse the repository at this point in the history
  • Loading branch information
anothersimulacrum committed Jun 16, 2024
1 parent f9c604e commit 3ae134c
Show file tree
Hide file tree
Showing 17 changed files with 626 additions and 125 deletions.
23 changes: 16 additions & 7 deletions data/mods/TEST_DATA/expected_dps_data/axes_dps.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,25 @@
"//3": "makeshift_axe: chunk of sharp steel",
"//4": "hand_axe: chunk of sharp rock",
"expected_dps": {
"hatchet": 18.0,
"crash_axe": 18.0,
"iceaxe": 12.5,
"throwing_axe": 14.4,
"carver_on": 22.5,
"pickaxe": 10.5,
"bowling_axe": 8.45,
"hand_axe": 8.5,
"primitive_adze": 10.0,
"primitive_axe": 10.0,
"makeshift_axe": 10.0,
"hand_axe": 8.5
"pickaxe": 10.5,
"iceaxe": 12.5,
"throwing_axe": 14.4,
"ax_sheets_welded": 15.8,
"ax_sheets_bolted": 15.8,
"bronze_axe": 17.88,
"hatchet": 18.0,
"crash_axe": 18.0,
"lc_battleaxe": 18.11,
"carver_on": 22.5,
"mc_battleaxe": 24.53,
"hc_battleaxe": 29.72,
"ch_battleaxe": 30.49,
"qt_battleaxe": 35.46
}
}
]
92 changes: 59 additions & 33 deletions data/mods/TEST_DATA/expected_dps_data/clubs_dps.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,70 @@
"type": "test_data",
"//": "expected value around 24 but most aren't dedicated weapons",
"expected_dps": {
"mace": 24.0,
"morningstar": 26.12,
"shillelagh_weighted": 24.17,
"bwirebat": 22.0,
"baton-extended": 11.35,
"bat_metal": 21.4,
"nailbat": 21.0,
"bat": 20.0,
"shillelagh": 22.21,
"bokken": 14.5,
"PR24-extended": 13.0,
"mace_inferior": 18.5,
"tonfa": 12.0,
"tonfa_wood": 11.0,
"shocktonfa_off": 11.1,
"shocktonfa_on": 12.42,
"crowbar": 15.0,
"morningstar_inferior": 19.17,
"bokken_inferior": 10.0,
"golf_club": 14.0,
"mace_fake": 13.0,
"claw_bar": 11.0,
"shovel": 10.25,
"e_tool": 11.0,
"sword_nail": 9.06,
"sword_wood": 8.5,
"cane": 10.5,
"cudgel": 10.9,
"primitive_hammer": 10.0,
"wire_barbed_baseball": 5.68,
"rock": 6.0,
"art_club": 6.99,
"club_wooden": 6.99,
"bokken_fake": 7,
"shillelagh_fake": 12.11,
"morningstar_fake": 10.74,
"wrench": 8.0,
"hammer": 7.0,
"rebar": 7.0,
"primitive_shovel": 7.0,
"makeshift_cane": 7.1,
"heavy_flashlight": 7.5,
"rock": 6.0
"wrench": 8.0,
"glass_macuahuitl": 8.2,
"sword_wood": 8.5,
"aztec_sword_stone": 8.7,
"aztec_sword_scrap": 8.8,
"sword_nail": 9.06,
"primitive_hammer": 10.0,
"bokken_inferior": 10.0,
"shovel": 10.25,
"cane": 10.5,
"morningstar_fake": 10.74,
"cudgel": 10.9,
"claw_bar": 11.0,
"e_tool": 11.0,
"tonfa_wood": 11.0,
"shocktonfa_off": 11.1,
"baton-extended": 11.35,
"lc_aztec_sword": 11.7,
"tonfa": 12.0,
"ny_hook": 12.02,
"shillelagh_fake": 12.11,
"makeshift_sap": 12.39,
"shocktonfa_on": 12.42,
"mc_aztec_sword": 12.9,
"PR24-extended": 13.0,
"mace_fake": 13.0,
"blackjack": 13.8,
"golf_club": 14.0,
"hc_aztec_sword": 14.1,
"bokken": 14.5,
"mace_pipe": 14.56,
"crowbar": 15.0,
"ch_aztec_sword": 15.8,
"teeth_macuahuitl": 16.08,
"qt_aztec_sword": 17.6,
"mace_trench": 18.39,
"mace_simple": 18.39,
"mace_inferior": 18.5,
"morningstar_inferior": 19.17,
"bat": 20.0,
"mace_bronze": 20.03,
"nailbat": 21.0,
"lc_mace": 21.44,
"mc_mace": 21.71,
"bat_metal": 21.4,
"shillelagh": 22.21,
"bwirebat": 22.0,
"louverture": 23.2,
"mace": 24.0,
"shillelagh_weighted": 24.17,
"hc_mace": 24.89,
"ch_mace": 25.38,
"morningstar": 26.12,
"qt_mace": 28.33
}
}
]
55 changes: 55 additions & 0 deletions data/mods/TEST_DATA/expected_dps_data/guns_dps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[
{
"type": "test_data",
"//": "Allow fairly low values, guns are not for bashing",
"expected_dps": {
"raging_judge": 5.53,
"sw_500": 5.53,
"model_10_revolver": 5.57,
"pipe_shotgun": 5.6,
"p220_10": 5.63,
"p226_357sig": 5.63,
"xd_10": 5.63,
"glock_18c": 5.66,
"glock_17": 5.66,
"glock_19": 5.66,
"glock_22": 5.66,
"ruger_charger_auto": 5.71,
"ruger_charger": 5.71,
"sig_mosquito": 5.74,
"p226_9mm": 5.79,
"colt_saa": 5.79,
"makarov": 5.82,
"af2011a1_38super": 5.83,
"walther_ccp": 5.84,
"mosin44": 5.91,
"bfr": 5.97,
"sks": 5.99,
"remington_870_breacher": 6.01,
"longrifle_flintlock": 6.03,
"ruger_lcr_38": 6.04,
"ruger_lcr_22": 6.04,
"1895sbl": 6.24,
"rm103a_pistol": 6.48,
"tokarev": 6.51,
"walther_ppq_45": 7.15,
"taurus_spectrum": 6.59,
"modular_deagle": 6.65,
"raging_bull": 6.65,
"walther_ppk": 6.66,
"sig_p230": 6.66,
"modular_ar15": 6.85,
"m1911-460": 7.19,
"m1911a1_38super": 7.19,
"m1911": 7.19,
"STI_DS_10": 7.19,
"walther_ppq_9mm": 7.26,
"walther_ppq_40": 7.26,
"sw629": 7.31,
"m1911_10": 7.4,
"pressin": 9.67,
"winchester_1897": 10.33,
"obrez": 10.98
}
}
]
13 changes: 13 additions & 0 deletions data/mods/TEST_DATA/expected_dps_data/integrated_dps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[
{
"type": "test_data",
"//": "Integrated weapons, bionics, etc",
"expected_dps": {
"integrated_fangs": 8.38,
"integrated_chitin3_claws": 8.42,
"bio_scalpel": 10.09,
"integrated_giant_pincer": 11.31,
"integrated_vampire_fangs": 13.61
}
}
]
98 changes: 98 additions & 0 deletions data/mods/TEST_DATA/expected_dps_data/junk_dps.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
[
{
"type": "test_data",
"//": "Uncategoried improvised weapons",
"expected_dps": {
"shock_epee": 5.59,
"pointy_stick_long": 5.83,
"pointy_stick": 5.89,
"fencing_sabre_sharpened": 8.03,
"sharpened_pipe": 8.8,
"fencing_epee_sharpened": 9.17
}
},
{
"type": "test_data",
"//": "Just junk items",
"expected_dps": {
"banjo": 5.53,
"saxophone": 5.55,
"pool_ball": 5.58,
"knuckle_skewer": 5.58,
"rock_sock": 5.63,
"2x4": 5.66,
"tazer": 5.69,
"violin": 5.71,
"etched_skull": 5.71,
"fighter_sting": 5.72,
"foot_crank": 5.73,
"fishing_rod_2pc_packed": 5.77,
"flint": 5.78,
"rock_flaking": 5.78,
"nailboard": 5.83,
"two_way_radio": 5.89,
"fishing_rod_tele": 5.93,
"bone_plaster": 5.98,
"bone_fossil": 5.98,
"grinder_blade": 6.01,
"circsaw_blade": 6.01,
"fishing_rod_2pc": 6.07,
"recoil_stock": 6.22,
"guitar_electric": 6.3,
"fishing_rod_tele_packed": 6.47,
"bee_sting": 6.52,
"qt_steel_chunk": 6.59,
"budget_steel_chunk": 6.59,
"hc_steel_chunk": 6.59,
"lc_steel_chunk": 6.59,
"ch_steel_chunk": 6.59,
"mc_steel_chunk": 6.59,
"steel_chunk": 6.59,
"soldering_iron_portable": 6.61,
"soldering_iron": 6.61,
"reference_fabrication1": 6.74,
"torch_done": 6.75,
"pickles_ferment": 6.75,
"fishing_rod_professional": 6.89,
"hand_rims": 6.91,
"ukulele": 6.92,
"eggs_ferment": 6.94,
"umbrella": 7.11,
"teleumbrella-extended": 7.11,
"vortex_stone": 7.12,
"adjustable_stock": 7.12,
"robofac_stock": 7.12,
"landough_calrisean": 7.26,
"flask_yeast": 7.26,
"fishing_rod_basic": 7.52,
"torch": 7.54,
"torch_lit": 7.54,
"pipe_quiver_large": 7.69,
"bipod_handguard": 7.69,
"bipod_mod": 7.69,
"bipod": 7.69,
"bipod_handguard_deployed": 7.69,
"heavy_flashlight_on": 7.73,
"wizard_cane": 7.86,
"wizard_cane_on": 7.86,
"modern_handguard": 7.94,
"barb_paralysis": 8.0,
"nitrogen_membrane_filter": 8.04,
"pipe": 8.09,
"sculpture_clay": 8.11,
"makeshift_crowbar": 8.26,
"hd_pipe": 8.28,
"pipe_quiver": 8.64,
"arisaka_monopod_deployed": 8.66,
"arisaka_monopod": 8.66,
"stick": 9.04,
"pot_makeshift_copper": 9.61,
"bolt_ballista_steel": 9.63,
"chain": 9.64,
"cow_bell": 10.1,
"pastaextruder": 10.37,
"baseball": 10.39,
"puck": 10.51
}
}
]
64 changes: 48 additions & 16 deletions data/mods/TEST_DATA/expected_dps_data/knives_dps.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,62 @@
"//": "expected value 19",
"//2": "bio_blade_weapon: much better than any other knife",
"expected_dps": {
"knife_baselard": 14.872,
"bio_blade_weapon": 24.5,
"kris_fake": 1.811,
"primitive_knife": 2.5,
"kirpan_cheap": 2.809,
"spike": 4.0,
"pockknife": 4.5,
"knife_steak": 5.86,
"tanto_fake": 6.93,
"throwing_knife": 7.0,
"bone_knife": 7.11,
"knife_butcher": 10,
"knife_combat": 16.489,
"karambit": 7.62,
"inter_bayonet": 7.77,
"copper_knife": 8.0,
"diveknife": 8.0,
"art_dagger": 8.08,
"lc_knife_rambo": 8.14,
"utility_knife_folding": 8.67,
"knife_folding": 8.67,
"bronze_knife": 8.75,
"knife_hunting": 8.83,
"nm_teeth": 9.35,
"knife_rambo": 9.41,
"mc_knife_rambo": 9.415,
"knife_butcher": 10,
"lc_knife_trench": 10.11,
"hc_knife_rambo": 10.19,
"switchblade": 10.5,
"office_letter_opener": 10.7,
"ch_knife_rambo": 10.96,
"enfield_bayonet": 11.06,
"kirpan": 11.385,
"kirpan_cheap": 2.809,
"qt_knife_rambo": 11.97,
"knife_chef": 12.13,
"mc_knife_trench": 12.29,
"broken_yrax_delta": 12.41,
"knife_trench": 12.74,
"tanto_inferior": 13.063,
"kris": 13.5,
"kris_fake": 1.811,
"hc_knife_trench": 13.52,
"knife_meat_cleaver": 13.97,
"pockknife": 4.5,
"primitive_knife": 2.5,
"mc_knife_rambo": 9.415,
"knife_rm42": 17.58,
"spike": 4.0,
"switchblade": 10.5,
"knife_vegetable_cleaver": 14.18,
"knife_carving": 14.26,
"ch_knife_trench": 14.28,
"knife_combat_army": 14.53,
"knife_baselard": 14.872,
"tanto": 14.954,
"tanto_inferior": 13.063,
"tanto_fake": 6.93,
"throwing_knife": 7.0,
"mc_knife_trench": 12.29
"lc_kukri": 15.06,
"qt_knife_trench": 15.39,
"knife_KABAR": 15.65,
"knife_combat": 16.489,
"knife_combat_marine": 17.02,
"knife_rm42": 17.58,
"kukri": 18.38,
"hc_kukri": 19.35,
"ch_kukri": 20.23,
"qt_kukri": 21.42,
"bio_blade_weapon": 24.5
}
}
]
Loading

0 comments on commit 3ae134c

Please sign in to comment.