From a0dd77cfdea7ad9860ab8b9cf45b79c97c20aac0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 19 Oct 2024 14:07:30 -0500 Subject: [PATCH 1/4] Update 57.json Update 57.json --- data/json/items/ammo/57.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/ammo/57.json b/data/json/items/ammo/57.json index ab30829ef692b..ba7ea0fd8b083 100644 --- a/data/json/items/ammo/57.json +++ b/data/json/items/ammo/57.json @@ -21,7 +21,7 @@ "range": 14, "damage": { "damage_type": "bullet", "amount": 20, "armor_penetration": 18 }, "dispersion": 40, - "recoil": 90, + "recoil": 515, "effects": [ "COOKOFF" ] }, { From d962c9e5aa19c6a4d3a55fb0bbdfa1a14533d02c Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sat, 19 Oct 2024 23:10:07 -0500 Subject: [PATCH 2/4] Update 57.json --- data/json/items/gun/57.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index b15b0224f6047..6c2283580bd79 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -29,7 +29,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 440, "durability": 8, - "min_cycle_recoil": 81, + "min_cycle_recoil": 450, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], "valid_mod_locations": [ @@ -83,7 +83,7 @@ "skill": "smg", "dispersion": 260, "durability": 8, - "min_cycle_recoil": 81, + "min_cycle_recoil": 450, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], "valid_mod_locations": [ [ "barrel", 1 ], @@ -135,7 +135,7 @@ "skill": "pistol", "dispersion": 380, "durability": 8, - "min_cycle_recoil": 81, + "min_cycle_recoil": 450, "reload": 500, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], @@ -190,7 +190,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 400, "durability": 8, - "min_cycle_recoil": 81, + "min_cycle_recoil": 450, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], "valid_mod_locations": [ From d2db0fe10f69ac6ad06de937e1cfec37e1ff53b9 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Sun, 20 Oct 2024 23:55:26 -0500 Subject: [PATCH 3/4] Update house_detatched1.json --- data/json/mapgen/house/house_detatched1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/house/house_detatched1.json b/data/json/mapgen/house/house_detatched1.json index 7fad1f2f95716..74ce25aacea69 100644 --- a/data/json/mapgen/house/house_detatched1.json +++ b/data/json/mapgen/house/house_detatched1.json @@ -33,6 +33,7 @@ ".......%...%........%..." ], "palettes": [ "domestic_general_and_variant_palette" ], + "place_monsters": [ { "chance": 5, "density": 1, "monster": "GROUP_ZOMBIE", "x": 7, "y": 10 } ], "terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], @@ -78,7 +79,6 @@ { "chance": 35, "item": "alcohol", "x": 10, "y": 15 }, { "chance": 35, "item": "alcohol", "x": 10, "y": 13 } ], - "place_monsters": [ { "chance": 5, "density": 1, "monster": "GROUP_ZOMBIE", "x": 7, "y": 10 } ], "place_vehicles": [ { "vehicle": "bikeshop", "x": 19, "y": 14, "rotation": 270, "chance": 20 } ], "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 15, "y": 0 } ] } From a2593f27a3748ac19dee3db886dad4cfbf77ddd0 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Thu, 24 Oct 2024 00:05:34 -0500 Subject: [PATCH 4/4] Apply suggestions from code review --- data/json/items/gun/57.json | 8 ++++---- data/json/mapgen/house/house_detatched1.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/gun/57.json b/data/json/items/gun/57.json index 6c2283580bd79..f5f952b587d07 100644 --- a/data/json/items/gun/57.json +++ b/data/json/items/gun/57.json @@ -29,7 +29,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 440, "durability": 8, - "min_cycle_recoil": 450, + "min_cycle_recoil": 330, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], "valid_mod_locations": [ @@ -83,7 +83,7 @@ "skill": "smg", "dispersion": 260, "durability": 8, - "min_cycle_recoil": 450, + "min_cycle_recoil": 330, "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ], "valid_mod_locations": [ [ "barrel", 1 ], @@ -135,7 +135,7 @@ "skill": "pistol", "dispersion": 380, "durability": 8, - "min_cycle_recoil": 450, + "min_cycle_recoil": 330, "reload": 500, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], @@ -190,7 +190,7 @@ "ranged_damage": { "damage_type": "bullet", "amount": -2 }, "dispersion": 400, "durability": 8, - "min_cycle_recoil": 450, + "min_cycle_recoil": 330, "flags": [ "ALLOWS_BODY_BLOCK" ], "weapon_category": [ "AUTOMATIC_PISTOLS" ], "valid_mod_locations": [ diff --git a/data/json/mapgen/house/house_detatched1.json b/data/json/mapgen/house/house_detatched1.json index 74ce25aacea69..7fad1f2f95716 100644 --- a/data/json/mapgen/house/house_detatched1.json +++ b/data/json/mapgen/house/house_detatched1.json @@ -33,7 +33,6 @@ ".......%...%........%..." ], "palettes": [ "domestic_general_and_variant_palette" ], - "place_monsters": [ { "chance": 5, "density": 1, "monster": "GROUP_ZOMBIE", "x": 7, "y": 10 } ], "terrain": { "%": [ "t_region_shrub", "t_region_shrub_fruit", "t_region_shrub_decorative" ], "[": [ [ "t_region_tree_fruit", 2 ], [ "t_region_tree_nut", 2 ], "t_region_tree_shade" ], @@ -79,6 +78,7 @@ { "chance": 35, "item": "alcohol", "x": 10, "y": 15 }, { "chance": 35, "item": "alcohol", "x": 10, "y": 13 } ], + "place_monsters": [ { "chance": 5, "density": 1, "monster": "GROUP_ZOMBIE", "x": 7, "y": 10 } ], "place_vehicles": [ { "vehicle": "bikeshop", "x": 19, "y": 14, "rotation": 270, "chance": 20 } ], "place_nested": [ { "chunks": [ "rolling_trash_can_1x1" ], "x": 15, "y": 0 } ] }