diff --git a/data/json/items/archery.json b/data/json/items/archery.json index df45ec1a1b7bc..5d93eb257346d 100644 --- a/data/json/items/archery.json +++ b/data/json/items/archery.json @@ -12,7 +12,7 @@ "weight": "30 g", "bashing": 3, "ammo_type": "arrow", - "prop_damage": 0.7, + "prop_damage": 0.75, "dispersion": 250, "loudness": 0, "count": 10, @@ -32,7 +32,6 @@ "weight": "55 g", "bashing": 3, "ammo_type": "arrow", - "prop_damage": 1.12, "pierce": 3, "dispersion": 150, "loudness": 0, @@ -74,7 +73,7 @@ "bashing": 2, "cutting": 1, "ammo_type": "arrow", - "prop_damage": 1.25, + "prop_damage": 1.5, "pierce": 1, "dispersion": 110, "loudness": 0, @@ -95,7 +94,7 @@ "weight": "35 g", "bashing": 4, "ammo_type": "arrow", - "prop_damage": 0.7, + "prop_damage": 0.75, "dispersion": 150, "loudness": 0, "count": 10, @@ -136,6 +135,7 @@ "bashing": 6, "cutting": 2, "ammo_type": "arrow", + "prop_damage": 1.25, "dispersion": 150, "loudness": 0, "count": 10, @@ -178,7 +178,7 @@ "bashing": 3, "cutting": 2, "ammo_type": "arrow", - "prop_damage": 1.25, + "prop_damage": 1.5, "pierce": 1, "range": 2, "dispersion": 75, @@ -201,7 +201,6 @@ "bashing": 3, "cutting": 2, "ammo_type": "arrow", - "prop_damage": 1.12, "pierce": 3, "range": 2, "dispersion": 75, @@ -245,7 +244,7 @@ "weight": "40 g", "bashing": 1, "ammo_type": "arrow", - "prop_damage": 1.35, + "prop_damage": 1.75, "range": 4, "dispersion": 50, "loudness": 0, @@ -316,26 +315,27 @@ "type": "GUN", "symbol": "(", "color": "yellow", - "name": "self bow", + "name": "crude bow", "description": "A primitive bow fashioned from a single piece of wood, made specifically for the person using it. Weak and wildly inaccurate, it doesn't work that well, unfortunately…", - "price": 10000, + "price": 150, "//": "Not exactly something that would have high resale value, I'm afraid.", "material": "wood", "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "reload_noise_volume": 3, "loudness": 8, "skill": "archery", + "min_strength": 6, "ammo": "arrow", "weight": "1360 g", "volume": "2500 ml", "bashing": 6, "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 }, - "ranged_damage": 5, + "ranged_damage": 4, "range": 8, "dispersion": 1250, - "durability": 6, + "durability": 4, "clip_size": 1, - "reload": 50 + "reload": 30 }, { "id": "shortbow", @@ -347,9 +347,9 @@ "description": "Though not as powerful as the longbow, this bow is quicker and easier to draw, and can be used effectively by those of average strength. Good for small game or the survivor on the go.", "price": 16000, "material": "wood", - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 4, + "min_strength": 6, "ammo": "arrow", "weight": "340 g", "volume": "1500 ml", @@ -357,7 +357,7 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 }, "reload_noise_volume": 3, "loudness": 6, - "ranged_damage": 4, + "ranged_damage": 5, "range": 10, "dispersion": 1000, "durability": 6, @@ -377,7 +377,7 @@ "material": [ "steel", "plastic" ], "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON" ], "skill": "archery", - "min_strength": 6, + "min_strength": 10, "ammo": "arrow", "weight": "907 g", "volume": "1500 ml", @@ -385,12 +385,12 @@ "to_hit": 1, "reload_noise_volume": 3, "loudness": 10, - "ranged_damage": 18, + "ranged_damage": 10, "range": 18, "dispersion": 850, "durability": 6, "clip_size": 1, - "reload": 110, + "reload": 30, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ], "use_action": { "menu_text": "Tighten Limbs", @@ -407,10 +407,8 @@ "name": "compound bow (high)", "name_plural": "compound bows (high)", "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by very strong archers. Currently set to a high weight, and ready to cause some real damage - if you can draw it.", - "min_strength": 8, - "reload": 120, - "ranged_damage": 22, - "range": 22, + "min_strength": 12, + "ranged_damage": 12, "use_action": { "menu_text": "Loosen Limbs", "type": "transform", @@ -426,10 +424,8 @@ "name": "compound bow (low)", "name_plural": "compound bows (low)", "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by average archers. Currently set to a low weight, making it much easier to draw.", - "min_strength": 4, - "reload": 85, - "ranged_damage": 14, - "range": 14, + "min_strength": 8, + "ranged_damage": 8, "use_action": { "menu_text": "Tighten Limbs", "type": "transform", @@ -448,9 +444,9 @@ "description": "A bow made from multiple materials for increased energy efficiency. Complicated to make, but stronger than an all-wood short bow.", "price": 32000, "material": [ "wood", "bone" ], - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 5, + "min_strength": 14, "ammo": "arrow", "weight": "400 g", "volume": "1750 ml", @@ -458,12 +454,12 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 }, "reload_noise_volume": 3, "loudness": 6, - "ranged_damage": 5, + "ranged_damage": 12, "range": 12, "dispersion": 950, "durability": 6, "clip_size": 1, - "reload": 35, + "reload": 30, "valid_mod_locations": [ [ "dampening", 1 ] ] }, { @@ -476,9 +472,9 @@ "description": "A modern bow that curves away from the archer at the tips for increased power, which can be used effectively by those of somewhat above-average strength. Good and easy to use, but nothing special.", "price": 38000, "material": [ "steel", "plastic" ], - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 5, + "min_strength": 10, "ammo": "arrow", "weight": "540 g", "volume": "2500 ml", @@ -486,12 +482,12 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 }, "reload_noise_volume": 3, "loudness": 8, - "ranged_damage": 14, + "ranged_damage": 9, "range": 14, "dispersion": 850, "durability": 6, "clip_size": 1, - "reload": 90, + "reload": 30, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ] }, { @@ -500,26 +496,26 @@ "type": "GUN", "symbol": "(", "color": "yellow", - "name": "reflex bow", + "name": "reflex recurve bow", "description": "A bow with limbs that curve away from the archer near the riser for power. Smaller than some bows, but decently powerful and quick.", "price": 42000, "material": [ "wood", "bone" ], - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", "ammo": "arrow", - "min_strength": 5, + "min_strength": 6, "weight": "400 g", "volume": "1500 ml", "bashing": 12, "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 14 }, "reload_noise_volume": 3, "loudness": 6, - "ranged_damage": 6, + "ranged_damage": 5, "range": 12, "dispersion": 950, "durability": 6, "clip_size": 1, - "reload": 40, + "reload": 30, "valid_mod_locations": [ [ "dampening", 1 ] ] }, { @@ -534,7 +530,7 @@ "material": [ "steel", "plastic", "wood" ], "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 5, + "min_strength": 10, "ammo": "arrow", "weight": "600 g", "volume": "3500 ml", @@ -542,12 +538,12 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 }, "reload_noise_volume": 3, "loudness": 8, - "ranged_damage": 12, + "ranged_damage": 6, "range": 14, "dispersion": 850, "durability": 6, "clip_size": 1, - "reload": 80, + "reload": 30, "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ] }, { @@ -560,9 +556,9 @@ "description": "A six-foot wooden bow that takes a fair amount of strength to draw. It can be used effectively by those of somewhat above-average strength. Used mainly in medieval England in wartime, but pierces zombie hide just as well as chainmail.", "price": 50000, "material": "wood", - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 5, + "min_strength": 12, "ammo": "arrow", "weight": "680 g", "volume": "3500 ml", @@ -570,29 +566,29 @@ "armor_data": { "covers": [ "TORSO" ], "coverage": 5, "material_thickness": 1, "encumbrance": 20 }, "reload_noise_volume": 3, "loudness": 8, - "ranged_damage": 10, + "ranged_damage": 7, "range": 18, "dispersion": 1000, "durability": 6, "clip_size": 1, - "reload": 70, + "reload": 30, "valid_mod_locations": [ [ "dampening", 1 ] ] }, { "id": "woodgreatbow", "copy-from": "longbow", "type": "GUN", - "name": "wooden greatbow", + "name": "wood greatbow", "description": "An extremely large and stiff longbow, made with enormous limbs and a thick string to take an immense amount of energy. Takes incredible strength to draw.", "price": 150000, - "min_strength": 18, + "min_strength": 19, "weight": "3200 g", "volume": "6250 ml", "armor_data": { "covers": [ "TORSO" ], "coverage": 7, "material_thickness": 2, "encumbrance": 25 }, "durability": 8, - "reload": 100, + "reload": 30, "loudness": 16, - "ranged_damage": 20, + "ranged_damage": 12, "range": 20 }, { @@ -607,7 +603,7 @@ "material": [ "steel", "plastic" ], "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT" ], "skill": "archery", - "min_strength": 18, + "min_strength": 19, "ammo": "arrow", "weight": "2000 g", "volume": "4 L", @@ -615,8 +611,8 @@ "reload_noise_volume": 4, "loudness": 20, "durability": 8, - "reload": 150, - "ranged_damage": 40, + "reload": 30, + "ranged_damage": 16, "range": 22, "dispersion": 1000, "clip_size": 1, @@ -632,9 +628,9 @@ "description": "A modernized bow that combines the traits from both the reflex and the recurve bows, with both limbs and tips curving away from the archer, and reinforced with composite materials. This dramatically increases the power and requires significant strength to draw the bow effectively, but can still be fired quickly.", "price": 72000, "material": [ "wood" ], - "flags": [ "FIRE_TWOHAND", "STR_DRAW", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], + "flags": [ "FIRE_TWOHAND", "RELOAD_AND_SHOOT", "PRIMITIVE_RANGED_WEAPON", "BELTED", "WATER_FRIENDLY" ], "skill": "archery", - "min_strength": 6, + "min_strength": 12, "ammo": "arrow", "weight": "450 g", "volume": "2 L", @@ -647,8 +643,8 @@ "dispersion": 950, "durability": 6, "clip_size": 1, - "reload": 40, - "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ] + "reload": 30, + "valid_mod_locations": [ [ "sights", 1 ], [ "accessories", 2 ], [ "dampening", 1 ] ] }, { "type": "GENERIC", diff --git a/data/json/items/crossbows.json b/data/json/items/crossbows.json index ee9e8d5568d7d..c0902fba081e4 100644 --- a/data/json/items/crossbows.json +++ b/data/json/items/crossbows.json @@ -12,7 +12,7 @@ "weight": "20 g", "bashing": 3, "ammo_type": "bolt", - "prop_damage": 0.7, + "prop_damage": 0.75, "dispersion": 250, "loudness": 0, "count": 10, @@ -31,7 +31,7 @@ "weight": "25 g", "bashing": 4, "ammo_type": "bolt", - "prop_damage": 0.7, + "prop_damage": 0.75, "dispersion": 180, "loudness": 0, "count": 10, @@ -70,6 +70,7 @@ "bashing": 6, "cutting": 2, "ammo_type": "bolt", + "prop_damage": 1.25, "dispersion": 180, "loudness": 0, "count": 10, @@ -89,7 +90,7 @@ "weight": "45 g", "bashing": 1, "ammo_type": "bolt", - "prop_damage": 1.25, + "prop_damage": 1.5, "pierce": 1, "dispersion": 110, "loudness": 0, @@ -109,7 +110,6 @@ "weight": "45 g", "bashing": 3, "ammo_type": "bolt", - "prop_damage": 1.12, "pierce": 3, "dispersion": 100, "loudness": 0, @@ -148,6 +148,7 @@ "weight": "55 g", "bashing": 1, "ammo_type": "bolt", + "prop_damage": 1.25, "pierce": 1, "dispersion": 100, "loudness": 0, @@ -190,7 +191,6 @@ "bashing": 3, "cutting": 2, "ammo_type": "bolt", - "prop_damage": 1.12, "pierce": 4, "range": 2, "dispersion": 65, @@ -233,7 +233,7 @@ "weight": "30 g", "bashing": 1, "ammo_type": "bolt", - "prop_damage": 1.35, + "prop_damage": 1.75, "range": 4, "dispersion": 60, "loudness": 0, @@ -272,19 +272,20 @@ "color": "green", "name": "pistol crossbow", "description": "A small concealable pistol-like crossbow. It's weak due to its small size and draw, so it is best suited for hunting small game. Bolts fired from this weapon have a good chance of remaining intact for re-use.", - "price": 55000, - "material": [ "steel", "wood" ], + "price": 5500, + "material": [ "steel", "plastic" ], "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "pistol", "ammo": "bolt", "weight": "900 g", "volume": "500 ml", "bashing": 4, - "ranged_damage": 7, + "ranged_damage": 9, "range": 6, "dispersion": 400, "durability": 6, "clip_size": 1, + "reload": 1200, "valid_mod_locations": [ [ "accessories", 2 ], [ "grip", 1 ], @@ -305,33 +306,24 @@ "color": "green", "name": "crossbow", "description": "A slow-loading hand weapon that launches bolts. Stronger people can reload it much faster. Bolts fired from this weapon have a good chance of remaining intact for re-use.", - "price": 69000, + "price": 6000, "material": [ "steel", "wood" ], - "flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ], + "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", + "min_strength": 8, "ammo": "bolt", "weight": "2728 g", "volume": "1500 ml", "bashing": 11, "to_hit": 1, "loudness": 10, - "ranged_damage": 17, + "ranged_damage": 10, "range": 9, "dispersion": 375, "durability": 6, "clip_size": 1, - "reload": 500, - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "dampening", 1 ], - [ "rail mount", 1 ], - [ "sights mount", 1 ], - [ "underbarrel mount", 1 ] - ] + "reload": 1200, + "valid_mod_locations": [ [ "dampening", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ] }, { "id": "compositecrossbow", @@ -344,20 +336,21 @@ "description": "A slightly larger, more powerful crossbow utilizing composite material limbs and somewhat more modern design practices.", "price": 89000, "material": [ "steel", "wood", "bone" ], - "flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ], + "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", + "min_strength": 8, "ammo": "bolt", "weight": "3500 g", "volume": "1750 ml", "bashing": 11, "to_hit": 1, - "ranged_damage": 20, + "ranged_damage": 11, "range": 16, "loudness": 8, "dispersion": 350, "durability": 6, "clip_size": 1, - "reload": 600, + "reload": 1200, "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -381,20 +374,21 @@ "description": "A high-power crossbow with shaped cams and extra cables for high-power shots. Takes less time to reload due to a modern string-pulling system.", "price": 200000, "material": [ "steel", "plastic" ], - "flags": [ "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON" ], + "flags": "PRIMITIVE_RANGED_WEAPON", "skill": "rifle", + "min_strength": 8, "ammo": "bolt", "weight": "3000 g", "volume": "1750 ml", "bashing": 11, "to_hit": 1, - "ranged_damage": 28, + "ranged_damage": 14, "range": 22, "loudness": 12, "dispersion": 325, "durability": 6, "clip_size": 1, - "reload": 300, + "reload": 1200, "valid_mod_locations": [ [ "accessories", 4 ], [ "grip", 1 ], @@ -416,34 +410,24 @@ "color": "green", "name": "heavy crossbow", "description": "A HUGE medieval crossbow from Germany with a very slow, difficult reloading process not suited for unskilled users. Its tension is so powerful that you feel it shake after firing. Bolts fired from this weapon have a good chance of remaining intact for re-use.", - "price": 324000, - "//": "Modern crossbows can come in anywhere from $300 to $2K. Large plus Antique = expensive.", + "price": 32400, "material": [ "iron", "wood" ], - "flags": [ "FIRE_TWOHAND", "STR_RELOAD", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], + "flags": [ "FIRE_TWOHAND", "PRIMITIVE_RANGED_WEAPON", "TRADER_AVOID" ], "skill": "rifle", + "min_strength": 8, "ammo": "bolt", "weight": "6803 g", "volume": "5 L", "bashing": 20, "to_hit": -1, - "ranged_damage": 50, + "ranged_damage": 22, "range": 30, - "dispersion": 330, + "dispersion": 300, "recoil": 30, "durability": 6, "clip_size": 1, "reload": 6000, - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sights", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ], - [ "dampening", 1 ] - ] + "valid_mod_locations": [ [ "dampening", 1 ] ] }, { "id": "rep_crossbow", @@ -463,22 +447,13 @@ "volume": "2500 ml", "bashing": 13, "to_hit": -1, - "ranged_damage": 12, + "ranged_damage": 7, "range": 8, "dispersion": 500, "recoil": 30, "durability": 6, "clip_size": 10, - "reload": 50, - "valid_mod_locations": [ - [ "accessories", 4 ], - [ "grip", 1 ], - [ "mechanism", 4 ], - [ "rail", 1 ], - [ "sling", 1 ], - [ "stock", 1 ], - [ "underbarrel", 1 ], - [ "dampening", 1 ] - ] + "reload": 900, + "valid_mod_locations": [ [ "dampening", 1 ] ] } ] diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index 7d4bdb2f6fa34..6c52b083de6e9 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -16,7 +16,7 @@ "ammo": "bolt", "skill": "rifle", "range": 8, - "ranged_damage": 12, + "ranged_damage": 10, "dispersion": 180, "durability": 10, "clip_size": 1 diff --git a/doc/GAME_BALANCE.md b/doc/GAME_BALANCE.md index 5f22972423d21..a69c071118be1 100644 --- a/doc/GAME_BALANCE.md +++ b/doc/GAME_BALANCE.md @@ -186,7 +186,7 @@ Pawn shop | Anything except milspec weighted towards unusual calibers | Everywhere else | Predominately 9mm and 223. Always with standard magazine | Often | Sometimes | Ruger 223 mag, M1911 mag ## Ammo stats -The damage (**Dmg**) of ammunition is the square root of a round's muzzle energy in joules (**Energy, J**) rounded to the nearest integer with an arbitrary increase or decrease to account for terminal ballistics. Damage of handloaded ammo is set to 92% (rounded down) of their factory counterparts. A similar system for calculating recoil is planned but not currently being worked on. The figures used to calculate stats and any other relevant information are presented in table below. +The damage (**Dmg**) of ammunition is the square root of a round's muzzle energy in joules (**Energy, J**) rounded to the nearest integer with an arbitrary increase or decrease to account for terminal ballistics. Damage of handloaded ammo is set to 92% (rounded down) of their factory counterparts. A similar system for calculating recoil is planned but not currently being worked on. The figures used to calculate stats and any other relevant information are presented in table below. Bows and arrows use a similar system, but energy is defined in the bow or crossbow, and the arrow provides an adjustment for terminal ballistics with the prop_damage field. Each cartridge also has a Base Barrel Length (**Base Brl**) listed; this determines the damage for the connected guns. A firearm has its damage modifier determined by it's real life barrel length; for every three inches between it and the listed baseline here, the gun takes a 1 point bonus or penalty, rounding to the nearest modifier. For example, a .45 ACP gun with a 7 inch barrel would get a +1 bonus (against a baseline of 5 inches). diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index 46a1e4ea495e1..49dfd8e90cc06 100644 --- a/tests/iteminfo_test.cpp +++ b/tests/iteminfo_test.cpp @@ -66,7 +66,7 @@ TEST_CASE( "gun_damage_multiplier_not_integer", "[item][iteminfo]" ) iteminfo_test( item( "compbow" ), q, "--\n" - "Damage: 18*1.25 = 22\n" ); + "Damage: 22*1.25 = 28\n" ); } TEST_CASE( "nutrients_in_regular_item", "[item][iteminfo]" )