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.

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

Gun Cleaning update #76229

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Maleclypse
Copy link
Member

Summary

Bugfixes "Minor fixes in gun cleaning"

Purpose of change

I saw in #76187 that pipe cleaners create cotton out of thin air. I've fixed that in another PR. Then I've taken a look at the different types of gun cleaning and adjusted them as needed. In many cases the cleaning cloth is now reusable. I am curious if there is some way to make the cloth dirty.

Describe the solution

Adds pipe dowel and then adjusts and adds a different cleaning type. Will add the fault to mend in flintlocks.

Describe alternatives you've considered

Leaving this to someone else but other people are slow when I can fix it myself fast.

Testing

tbd

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Mods: Innawood 🌲 Anything to do with Innawood mod <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 6, 2024
@github-actions github-actions bot added the Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves label Sep 6, 2024
@misterprimus
Copy link
Contributor

What exactly was the problem initially? In general the way you clean a gun is you take a rod, put a piece of cloth on it, apply gun cleaning solution, and ram it through the barrel. Previously the rod was the pipe cleaner crafted from a wire, the consumable patch (in this case we were treating the dirtying of the cloth as its destruction/removal from the game world) and the consumable solvent were the mend task consumables. So the pipe cleaner was basically this:
image

@Maleclypse
Copy link
Member Author

What exactly was the problem initially? In general the way you clean a gun is you take a rod, put a piece of cloth on it, apply gun cleaning solution, and ram it through the barrel. Previously the rod was the pipe cleaner crafted from a wire, the consumable patch (in this case we were treating the dirtying of the cloth as its destruction/removal from the game world) and the consumable solvent were the mend task consumables. So the pipe cleaner was basically this: image

What you shared isn't a pipe cleaner. It's a rod. Our item is an actual pipe cleaner.

{
    "id": "pipe_cleaner",
    "type": "GENERIC",
    "name": { "str": "pipe cleaner" },
    "description": "A tool designed to clean the interior surface of pipes, bottles, and similar objects.  This one is thin enough to be used for cleaning firearm barrels from dirt and fouling.",
    "weight": "50 g",
    "volume": "250 ml",
    "price": "5 USD",
    "price_postapoc": "50 cent",
    "material": [ "steel", "cotton" ],
    "symbol": ";",
    "color": "light_gray"
  },

Note the materials steel and cotton. The pipe cleaner recipe had zero cotton in it. Now it accurately makes a diy pipe cleaner.

@misterprimus
Copy link
Contributor

What exactly was the problem initially? In general the way you clean a gun is you take a rod, put a piece of cloth on it, apply gun cleaning solution, and ram it through the barrel. Previously the rod was the pipe cleaner crafted from a wire, the consumable patch (in this case we were treating the dirtying of the cloth as its destruction/removal from the game world) and the consumable solvent were the mend task consumables. So the pipe cleaner was basically this: image

What you shared isn't a pipe cleaner. It's a rod. Our item is an actual pipe cleaner.

{
    "id": "pipe_cleaner",
    "type": "GENERIC",
    "name": { "str": "pipe cleaner" },
    "description": "A tool designed to clean the interior surface of pipes, bottles, and similar objects.  This one is thin enough to be used for cleaning firearm barrels from dirt and fouling.",
    "weight": "50 g",
    "volume": "250 ml",
    "price": "5 USD",
    "price_postapoc": "50 cent",
    "material": [ "steel", "cotton" ],
    "symbol": ";",
    "color": "light_gray"
  },

Note the materials steel and cotton. The pipe cleaner recipe had zero cotton in it. Now it accurately makes a diy pipe cleaner.

When you say "pipe cleaner" do you mean this?

image

@Maleclypse
Copy link
Member Author

When you say "pipe cleaner" do you mean this?

image

No our pipe cleaners represented this. https://otistec.com/100-pack-pipe-cleaners/

@misterprimus
Copy link
Contributor

Just so we're on the same page, this is pretty much what cleaning a gun in survival conditions is mostly like:
gunclean

@Maleclypse
Copy link
Member Author

Maleclypse commented Sep 6, 2024 via email

@misterprimus
Copy link
Contributor

I’m familiar with that and it’s represented in the quick cleaning action. C

On Thu, Sep 5, 2024 at 8:22 PM misterprimus @.> wrote: Just so we're on the same page, this is pretty much what cleaning a gun in survival conditions is mostly like: gunclean.gif (view on web) https://github.com/user-attachments/assets/bfbd521c-5396-4aca-b741-332157f7752b — Reply to this email directly, view it on GitHub <#76229 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AM6UAQB33OCNVNRCFQZGS5DZVD7UBAVCNFSM6AAAAABNXRXHHOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGMZSHE4TONRWG4 . You are receiving this because you authored the thread.Message ID: @.>

Understood. But then are pipe cleaners going to be totally unnecessary for cleaning a gun? Because in all my years of cleaning guns, I've never used a pipe cleaner like that or seen one in a retail cleaning kit. Most gun cleaning kits are basically this:
image

And in my personal experience, the rod + a patch with solvent/oil is basically what's used 99% of the time. So I'm still a little confused as to what the pipe cleaner (anatomically correct as it may be in your adjusted recipe) is supposed to do as far as role fulfillment is concerned for barrel-cleaning. The barrel-cleaning phase is done with a rod, cloth, and solvent. Barrel brushing, in the few instances when it is done, is done with copper/brass brushes. Neither of these would be accomplished with the pipe cleaners you posted.

@Maleclypse
Copy link
Member Author

I’m familiar with that and it’s represented in the quick cleaning action. C

On Thu, Sep 5, 2024 at 8:22 PM misterprimus @.> wrote: Just so we're on the same page, this is pretty much what cleaning a gun in survival conditions is mostly like: gunclean.gif (view on web) https://github.com/user-attachments/assets/bfbd521c-5396-4aca-b741-332157f7752b — Reply to this email directly, view it on GitHub <#76229 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AM6UAQB33OCNVNRCFQZGS5DZVD7UBAVCNFSM6AAAAABNXRXHHOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGMZSHE4TONRWG4 . You are receiving this because you authored the thread.Message ID: _@**.**_>

Understood. But then are pipe cleaners going to be totally unnecessary for cleaning a gun? Because in all my years of cleaning guns, I've never used a pipe cleaner like that or seen one in a retail cleaning kit. Most gun cleaning kits are basically this: image

And in my personal experience, the rod + a patch with solvent/oil is basically what's used 99% of the time. So I'm still a little confused as to what the pipe cleaner (anatomically correct as it may be in your adjusted recipe) is supposed to do as far as role fulfillment is concerned for barrel-cleaning. The barrel-cleaning phase is done with a rod, cloth, and solvent. Barrel brushing, in the few instances when it is done, is done with copper/brass brushes. Neither of these would be accomplished with the pipe cleaners you posted.

I only use them on once a year or longer full disassemble and cleaning. I don't think they are an ideal tool for it as the main tool but I was being kind to the pc and suggesting it could be used assuming they lacked a real gun kit. I'm personally fine with removing it entirely but the other things are going to be much harder for the player to self craft.

@misterprimus
Copy link
Contributor

I’m familiar with that and it’s represented in the quick cleaning action. C

On Thu, Sep 5, 2024 at 8:22 PM misterprimus @.> wrote: Just so we're on the same page, this is pretty much what cleaning a gun in survival conditions is mostly like: gunclean.gif (view on web) https://github.com/user-attachments/assets/bfbd521c-5396-4aca-b741-332157f7752b — Reply to this email directly, view it on GitHub <#76229 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AM6UAQB33OCNVNRCFQZGS5DZVD7UBAVCNFSM6AAAAABNXRXHHOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGMZSHE4TONRWG4 . You are receiving this because you authored the thread.Message ID: _@**.**_>

Understood. But then are pipe cleaners going to be totally unnecessary for cleaning a gun? Because in all my years of cleaning guns, I've never used a pipe cleaner like that or seen one in a retail cleaning kit. Most gun cleaning kits are basically this: image
And in my personal experience, the rod + a patch with solvent/oil is basically what's used 99% of the time. So I'm still a little confused as to what the pipe cleaner (anatomically correct as it may be in your adjusted recipe) is supposed to do as far as role fulfillment is concerned for barrel-cleaning. The barrel-cleaning phase is done with a rod, cloth, and solvent. Barrel brushing, in the few instances when it is done, is done with copper/brass brushes. Neither of these would be accomplished with the pipe cleaners you posted.

I only use them on once a year or longer full disassemble and cleaning. I don't think they are an ideal tool for it as the main tool but I was being kind to the pc and suggesting it could be used assuming they lacked a real gun kit. I'm personally fine with removing it entirely but the other things are going to be much harder for the player to self craft.

Lots of things can function as the rod. A long screwdriver for example.
image

Chopstick (eating utensil) for smaller size barrels like that of a handgun. Or a straightened coat hanger (the "wire" as it was in the past).

And that's if you're ramming. If you pull (which would accomplish a similar result), you can just tie a wire or a string to the cloth and pull. https://www.youtube.com/watch?v=pDHYkWD7jYs

@Maleclypse
Copy link
Member Author

I’m familiar with that and it’s represented in the quick cleaning action. C

On Thu, Sep 5, 2024 at 8:22 PM misterprimus @.> wrote: Just so we're on the same page, this is pretty much what cleaning a gun in survival conditions is mostly like: gunclean.gif (view on web) https://github.com/user-attachments/assets/bfbd521c-5396-4aca-b741-332157f7752b — Reply to this email directly, view it on GitHub <#76229 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AM6UAQB33OCNVNRCFQZGS5DZVD7UBAVCNFSM6AAAAABNXRXHHOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDGMZSHE4TONRWG4 . You are receiving this because you authored the thread.Message ID: _@**.**_>

Understood. But then are pipe cleaners going to be totally unnecessary for cleaning a gun? Because in all my years of cleaning guns, I've never used a pipe cleaner like that or seen one in a retail cleaning kit. Most gun cleaning kits are basically this: image
And in my personal experience, the rod + a patch with solvent/oil is basically what's used 99% of the time. So I'm still a little confused as to what the pipe cleaner (anatomically correct as it may be in your adjusted recipe) is supposed to do as far as role fulfillment is concerned for barrel-cleaning. The barrel-cleaning phase is done with a rod, cloth, and solvent. Barrel brushing, in the few instances when it is done, is done with copper/brass brushes. Neither of these would be accomplished with the pipe cleaners you posted.

I only use them on once a year or longer full disassemble and cleaning. I don't think they are an ideal tool for it as the main tool but I was being kind to the pc and suggesting it could be used assuming they lacked a real gun kit. I'm personally fine with removing it entirely but the other things are going to be much harder for the player to self craft.

Lots of things can function as the rod. A long screwdriver for example. image

Chopstick (eating utensil) for smaller size barrels like that of a handgun. Or a straightened coat hanger (the "wire" as it was in the past).

And that's if you're ramming. If you pull (which would accomplish a similar result), you can just tie a wire or a string to the cloth and pull. https://www.youtube.com/watch?v=pDHYkWD7jYs

We don’t represent individual long screwdrivers so they’d have to be a screwdriver set, chopsticks are rare in game. I’m not debating you but you aren’t suggesting changes that I can accept as additions and substractions from the recipe. What I’m saying here is that if you have useful suggestions make them easy for me to work with. I’m trying to put my children to sleep so anything else outside of any suggested code changes from you is beyond the scope of what I’m doing in this PR.

@misterprimus
Copy link
Contributor

misterprimus commented Sep 6, 2024

and

Then I'd say let a "wire" (incl. mild steel, etc...) or even a "rope" or "long string" be usable as the "tool" needed to clean a gun. And require the cleaning step to consume a cotton patch and some solvent/cleaning solution. Does that sound agreeable?

@Maleclypse
Copy link
Member Author

and

Then I'd say let a "wire" (incl. mild steel, etc...) or even a "rope" or "long string" be usable as the "tool" needed to clean a gun. And require the cleaning step to consume a cotton patch and some solvent/cleaning solution. Does that sound agreeable?

That does. Do you mind adding it in this PR as code suggestions on the files tab?

@@ -28,7 +28,10 @@
"type": "requirement",
"//": "Gun cleaning",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"tools": [ [ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ] ],
"tools": [
[ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
[ [ "lc_wire", -1 ], [ "mc_wire", -1 ], [ "hc_wire", -1 ], [ "qt_wire", -1 ], [ "ch_wire", -1 ], [ "cable", -1 ], [ "string_36", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],

"components": [ [ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ] ]
"//": "Requires a rod/wire and cloth patch or similar item. The cloth patch et al is for cleaning gunk off the rod/wire/pipe cleaner.",
"tools": [
[ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
[ [ "pipe_cleaner", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
[ [ "lc_wire", -1 ], [ "mc_wire", -1 ], [ "hc_wire", -1 ], [ "qt_wire", -1 ], [ "ch_wire", -1 ], [ "cable", -1 ], [ "string_36", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a lot of detail for very little gain. It would be cool if we had true realism like different size bolts and consequently different sized wrenches (10mm, 9mm, etc...), but it looks like we're only at the "screwdriver" and "screwdriver set" level of detail. Typically when I need to clean a gun and don't have a proper head attachment for the barrel size, I just compensate by adding more cloth patches (or fewer if the barrel is tighter). Likewise we can use a wire for smaller barrels or bend the wire in two for more rigidity/thickness.

image

I would delete this change since it needlessly complicates things.

@@ -41,6 +41,7 @@
{
"id": "pistol_flintlock",
"looks_like": "glock_17",
"copy-from": "flintlock_base",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"copy-from": "flintlock_base",

@@ -71,6 +72,7 @@
{
"id": "rifle_flintlock",
"looks_like": "modular_ar15",
"copy-from": "flintlock_base",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"copy-from": "flintlock_base",

Comment on lines +2 to +9
{
"id": "fault_gun_flintlock",
"type": "fault",
"name": { "str": "Flintlock fouling" },
"description": "Firing blackpowder loads from a flintlock fouls it, which reduces reliability and, if left uncleaned, leads to rust. It fouls the gun much faster than the use of modern smokeless powder cartridges. Fouling is only a significant impact on reliability at high levels, but black powder fouling accumulates quickly.",
"item_prefix": "rusting",
"flags": [ "BLACKPOWDER_FOULING_DAMAGE", "NO_DIRTYING" ]
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"id": "fault_gun_flintlock",
"type": "fault",
"name": { "str": "Flintlock fouling" },
"description": "Firing blackpowder loads from a flintlock fouls it, which reduces reliability and, if left uncleaned, leads to rust. It fouls the gun much faster than the use of modern smokeless powder cartridges. Fouling is only a significant impact on reliability at high levels, but black powder fouling accumulates quickly.",
"item_prefix": "rusting",
"flags": [ "BLACKPOWDER_FOULING_DAMAGE", "NO_DIRTYING" ]
},

Comment on lines +14 to +25
{
"abstract": "flintlock_base",
"type": "GUN",
"reload_noise_volume": 10,
"//": "this is the default handling for anything with a flintlock",
"handling": 20,
"name": { "str": "flintlock gun" },
"symbol": "(",
"color": "light_gray",
"faults": [ "fault_gun_flintlock", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"ranged_damage": { "damage_type": "bullet", "amount": 0 }
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"abstract": "flintlock_base",
"type": "GUN",
"reload_noise_volume": 10,
"//": "this is the default handling for anything with a flintlock",
"handling": 20,
"name": { "str": "flintlock gun" },
"symbol": "(",
"color": "light_gray",
"faults": [ "fault_gun_flintlock", "fault_gun_dirt", "fault_gun_chamber_spent" ],
"ranged_damage": { "damage_type": "bullet", "amount": 0 }
},

Comment on lines +2223 to +2235
{
"id": "pipe_dowel",
"type": "GENERIC",
"name": { "str": "pipe dowel" },
"description": "A tool designed to fit inside of pipes, bottles, and similar objects. This one is thick enough to be used for cleaning flintlock barrels from dirt and fouling.",
"weight": "100 g",
"volume": "250 ml",
"price": "5 USD",
"price_postapoc": "50 cent",
"material": [ "steel" ],
"symbol": ";",
"color": "light_gray"
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"id": "pipe_dowel",
"type": "GENERIC",
"name": { "str": "pipe dowel" },
"description": "A tool designed to fit inside of pipes, bottles, and similar objects. This one is thick enough to be used for cleaning flintlock barrels from dirt and fouling.",
"weight": "100 g",
"volume": "250 ml",
"price": "5 USD",
"price_postapoc": "50 cent",
"material": [ "steel" ],
"symbol": ";",
"color": "light_gray"
},

Comment on lines +56 to +78
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "pipe_dowel",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "mechanics",
"difficulty": 1,
"time": "2 m",
"reversible": true,
"autolearn": true,
"components": [
[
[ "wire", 4 ],
[ "lc_wire", 4 ],
[ "mc_wire", 4 ],
[ "hc_wire", 4 ],
[ "qt_wire", 4 ],
[ "ch_wire", 4 ],
[ "cable", 4 ]
]
]
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "pipe_dowel",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "mechanics",
"difficulty": 1,
"time": "2 m",
"reversible": true,
"autolearn": true,
"components": [
[
[ "wire", 4 ],
[ "lc_wire", 4 ],
[ "mc_wire", 4 ],
[ "hc_wire", 4 ],
[ "qt_wire", 4 ],
[ "ch_wire", 4 ],
[ "cable", 4 ]
]
]
},

Comment on lines +53 to 66
{
"id": "gun_cleaning_flintlock",
"type": "requirement",
"//": "Flintlocks require a thicker tool to manage the wider barrel and also soapy water to clean the blackpowder.",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"tools": [
[ [ "pipe_dowel", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
[ [ "water_boiling_heat", 2, "LIST" ] ]
],
"components": [
[ [ "soapy_water", 3 ] ],
[ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ]
]
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{
"id": "gun_cleaning_flintlock",
"type": "requirement",
"//": "Flintlocks require a thicker tool to manage the wider barrel and also soapy water to clean the blackpowder.",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"tools": [
[ [ "pipe_dowel", -1 ], [ "small_repairkit", -1 ], [ "large_repairkit", -1 ] ],
[ [ "water_boiling_heat", 2, "LIST" ] ]
],
"components": [
[ [ "soapy_water", 3 ] ],
[ [ "cotton_patchwork", 1 ], [ "fur", 1 ], [ "faux_fur", 1 ], [ "felt_patch", 1 ], [ "cotton_ball", 2 ] ]
]
},

@misterprimus
Copy link
Contributor

misterprimus commented Sep 7, 2024

Something else I thought of is perhaps creating a "makeshift gun cleaning rod" out of a wire (any kind of wire) to simulate the process of bending a wire into a shape needed to be used for such a purpose (bending it in two for example). Kind of like a pipe is "shaped" into a makeshift crowbar. But it's your PR so up to you what sort of direction you want to go if you want to do what I recommended and just use a wire directly for the cleaning process. LMK and I can make that change probably.

@TheShadowFerret
Copy link
Contributor

Considering plastic coating is irrelevant to its function, raw copper wire(copper_wire) is also a suitable component

Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto-requesting reviews from non-collaborators: @Light-Wave

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Innawood 🌲 Anything to do with Innawood mod Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants