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

Adds sharpening blocks #15519

Merged
merged 5 commits into from Feb 25, 2016
Merged

Conversation

PKPenguin321
Copy link
Contributor

Two can be found in the kitchen vendor.

They are single-use. When a weapon is used on them, it gains the prefix "sharpened," gets the SHARP flag (allowing it to butcher things), and has it's force/throwforce increase by 5 4 up to a maximum of 15 12 30. If an item already has 15 12 30 or higher force (or throwforce (really only energy swords will have this)), they cannot be sharpened.

This also adds an admin variant, the super sharpening block, that makes an item do 200 damage on hit/throw and gain the prefix "super-sharpened."

Items with block chance cannot be sharpened. Blame zilenan Only items that are already sharp can be sharpened.

Yes, you can have "the sharpened sharpened rolling pin." Double prefixes can happen, but you'll only rarely see a prefix repeated once, and you should never see a prefix repeated more than twice (as by the time a third block is used, you'll have hit the force damage cap). This is intentional. By maintainer request, prefixes now go sharpened -> twice-sharpened -> thrice-sharpened You can no longer sharpen the same item more than once.

Two handed items get their wielded force increased rather than standard force.

Sprite by newfren.
8fn6s9w

🆑 PKPenguin321
rscadd: The kitchen vendor now contains two sharpening blocks.
rscadd: Only items that are already sharp (such as fire axes, knives, etc) can be sharpened. Items used on sharpening blocks become sharper and deadlier. The sharpening blocks themselves can only be used once, and you can only sharpen items once.
/:cl:

two can be found in the kitchen vendor
@@ -0,0 +1,38 @@
/obj/item/weapon/sharpener
name = "sharpening block"
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you are looking for "whetstone".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

implying anybody knows what that is
implying people don't know what a sharpening block is

"sharpening block" is easier to recognize at a glance. *shrug

@KazeEspada
Copy link
Contributor

Can't sharpen a fire axe or a cleaver.

@GunHog
Copy link
Contributor

GunHog commented Feb 14, 2016

I expect this to have a similar effect to Goofball's deep fryer, in terms of me sharpening the silliest of things.

@PKPenguin321
Copy link
Contributor Author

I expect this to have a similar effect to Goofball's deep fryer, in terms of me sharpening the silliest of things.

Good, players should have fun with this. It's a pretty funny feature.

src.desc = "[src.desc] At least, it used to."
used = 1
if(I.force > max)//if the item's force exceeds 15 after 5 force is added,
I.force = max//set it back to 15
Copy link
Contributor

Choose a reason for hiding this comment

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

No no no, you do

I.force = Clamp(I.force + 5, 0, max)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

just replace these two lines with that one line?

Copy link
Contributor

Choose a reason for hiding this comment

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

Well no replace the whole I.force = I.force+ increment with Clamp, and then just remove the

If(I.force) stuff

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah replace everything here with clamp please

@PKPenguin321
Copy link
Contributor Author

Can't sharpen a fire axe or a cleaver.

tfw nerds would cut your head off while chanting "OVERPOWERED, OVERPOWERED, OVERPOWERED"

if(I.force > max)//if the item's force exceeds 15 after 5 force is added,
I.force = max//set it back to 15
if(I.throwforce > max)//do this again for throwforce
I.throwforce = max
Copy link
Contributor

Choose a reason for hiding this comment

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

Same as above

I.throwforce = Clamp(I.throwforce + 5, 0, max)

@imtakingabreakdontatme
Copy link
Contributor

and you should never see a prefix repeated more than twice (as by the time a third block is used, you'll have hit the 15 force damage cap).

Until I use it 3 times on my medkit or something

I.sharpness = IS_SHARP
I.force = (I.force + increment)
I.throwforce = (I.throwforce + increment)
I.name = "[prefix] [I.name]"
Copy link
Contributor

Choose a reason for hiding this comment

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

I.name = "[prefix] [initial(I.name)]"

Copy link
Contributor

Choose a reason for hiding this comment

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

If you want to avoid multiple prefixes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

idk man multiple prefixes is kinda silly (the fun kind of silly) and helps to show exactly HOW sharp whatever you're getting attacked by is, i think i want to keep it. if you as a maintainer do not like it i will remove it however.

Copy link
Contributor

Choose a reason for hiding this comment

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

I have added far sillier things than double sharpened objects so I will leave that up to other people

@drynwyn
Copy link
Contributor

drynwyn commented Feb 14, 2016

You should make em' orderable at cargo or put them in the autolathe or maybe make them spawn in maint, just so that if you want to get a whole bunch and sharpen everything for DANGERSTATION, you can.

@PKPenguin321
Copy link
Contributor Author

Until I use it 3 times on my medkit or something

the thing is, 3 prefixes is the max. 5x3 = 15, and at that point you're not able to get another prefix. not to mention you should only be getting 2 sharpening blocks in a round (not counting away missions/janky maps that might have more than 1 kitchen for whatever reason)

I.throwforce = (I.throwforce + increment)
I.name = "[prefix] [I.name]"
src.name = "dull [src.name]"
src.desc = "[src.desc] At least, it used to."
Copy link
Contributor

Choose a reason for hiding this comment

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

src is implied.

Also, sharpening blocks don't go dull....

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I knew it, I just wasn't sure.

These sharpening blocks dull. They're made in space-china.

@Fox-McCloud
Copy link
Contributor

Sharpening of species' claws when? =p

@AnturK AnturK added the Feature Exposes new bugs in interesting ways label Feb 14, 2016

/obj/item/weapon/sharpener/attackby(obj/item/I, mob/user, params)
if(used)
user << "<span class='notice'>The sharpening block is too dull to use again.</span>"
Copy link
Contributor

Choose a reason for hiding this comment

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

whetstone's don't go dull... how about 'too worn'?

@KazeEspada
Copy link
Contributor

👎 makes every weapon a cleaver without nerfing them somewhere else and doesnt give a cleaver or fireaxe anything in return. COMPLETELY UTTERLY DEDTROYS WEAPON BALANCE.

@drynwyn
Copy link
Contributor

drynwyn commented Feb 14, 2016

You can get more then 2 by using vending machine restock modules

@Razoozle
Copy link
Contributor

I'm gonna lean for a 👎 on this.

@Incoming5643
Copy link
Contributor

Sharpened Sharpened Sharpened Major space carp plushie of the world +15

@PKPenguin321
Copy link
Contributor Author

balance police have arrived 🚨 🚓 👮 🚔 🚨

COMPLETELY UTTERLY DEDTROYS WEAPON BALANCE.

oh no, another 15 brute weapon. the game is broken my friends

@Zilenan91
Copy link

Additionally, you can also sharpen those chaplain staves twice to get a 15 brute, 50% block for everything murder machine.

sharpening now gives a message to bystanders telling what you sharpened
items with any block chance of any kind cannot be sharpened. separation between shields and weapons is absolute.
dull sharpening block -> worn out sharpening block
increments in force/throwforce now use Clamp()
adderol -> adderall
might be some other changes that i forgot but this is really the important stuff
@PKPenguin321
Copy link
Contributor Author

you can no longer sharpen items with block chance

You can get more then 2 by using vending machine restock modules

kitchen vendor has no restock modules

@Lumipharon
Copy link
Contributor

Sharpened sharpened bike horn.

Honk.

@Zilenan91
Copy link

@PKPenguin321 Vend both sharpening blocks and nothing else then deconstruct the machine. It should drop all of the components needed to remake it, and once created, be left with 1 sharpening block and 1 less of something else.

@Lumipharon
Copy link
Contributor

@Zilenan91 I can't say for kitchen vendors, but many vendors (such as engie vendors) canot be deconstructed, and so cannot be abused in this way.

@Cheridan
Copy link
Contributor

@PKPenguin321 If you add a check for sharp objects then I'll merge this.

@PKPenguin321
Copy link
Contributor Author

sigh
fine, i'll do it tomorrow

@Zilenan91
Copy link

If you want to restrict it to sharp items can you make the blocks do +5 brute each time too?

@PKPenguin321
Copy link
Contributor Author

that's what i'm thinking
but at the same time, muh balance
ill ask in coderbus

sharpening blocks can now only sharpen items that are already sharp, like knives, axes, etc. (super sharpening blocks don't care though)
max damage from sharpening is now 30 (no esword/ninja sword sharpening), increment is still 4 though
!!items can only be sharpened once!!
twohanded items (fire axes, spears) have their force when wielded increased rather than normal force increasing
@PKPenguin321
Copy link
Contributor Author

big update, check the latest commit/the original post

@Zilenan91
Copy link

What practical use is there in setting the max sharpness to 30? I can't think of a single weapon that can get there with a single sharpen.

@PKPenguin321
Copy link
Contributor Author

mainly just so you can't sharpen eswords tbh

@Zilenan91
Copy link

Don't eswords do 30 brute rather than 31? I guess it would still mean that you can't sharpen it? And if you did it would just waste it right.

@PKPenguin321
Copy link
Contributor Author

you can't sharpen things that are 30 or higher, you can't sharpen an esword at all
unless for whatever reason it keeps sharpness when it's just a handle (which would be a bug on it's own), but the then sharpen would be wasted because when you turned it on it would set it back to 30

@Fox-McCloud
Copy link
Contributor

This means that chef effectively has a 19 force weapon, every single shift.

The Axe now has an effective force of 28, and the spear has a force of 22.

The big winner in all of this, though, will be the chaplain--who will be able to attain a whopping 22 force weapon if he can get his hands on a block.

@Zilenan91
Copy link

You can only sharpen things once

@Fox-McCloud
Copy link
Contributor

You can only sharpen things once

Yeah, updated the math on it.

@Zilenan91
Copy link

All of this is totally fine.

@PKPenguin321
Copy link
Contributor Author

yeah and in reality the blocks will most likely be long used up before a fireaxe/chaplain weapon can get to it (unless the chef is a sneaky antag, in which case i have no problem with this, because he's an antag let him do what he wants)

@Fox-McCloud
Copy link
Contributor

Hmm...thoughts on making it a contraband item?

@Zilenan91
Copy link

It's fine

@Lumipharon
Copy link
Contributor

Holy fuck the discussion in this pr is still going.

@Dorsisdwarf Dorsisdwarf added the Balance Changes to functionality that modifies how effective certain methods are at powergaming label Feb 23, 2016
@imtakingabreakdontatme
Copy link
Contributor

Holy fuck the discussion in this pr is still going.

Cheridan added a commit that referenced this pull request Feb 25, 2016
@Cheridan Cheridan merged commit 26731ee into tgstation:master Feb 25, 2016
@PKPenguin321
Copy link
Contributor Author

KazeEspada You cant even sharpen knives
KazeEspada because knives are IS_SHARP_ACCURATE
KazeEspada not IS_SHARP

thanks for pointing that out in this PR before it got merged instead of in IRC after it got merged 😭

@PKPenguin321 PKPenguin321 deleted the sharpened-bikehorn branch February 25, 2016 02:13
@GunHog
Copy link
Contributor

GunHog commented Feb 25, 2016

TESTING

@PKPenguin321
Copy link
Contributor Author

when you tested every part of your PR on every commit but the last one
when you test the last one but quiiiite thoroughly enough

i tested it with a spawned in fireaxe and a spawned in block because i had just implemented two handed shit (which worked) then tested it with a glass shard from a window i broke with the axe

both of these objects have IS_SHARP and it never occured to me to try something with IS_SHARP_ACCURATE

i'm a failure 😭

AKlimentyev pushed a commit to Shadowlightbackup/-tg-station that referenced this pull request Feb 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance Changes to functionality that modifies how effective certain methods are at powergaming Feature Exposes new bugs in interesting ways
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet