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

Nonlethal Weapon for an ONI #371

Merged
merged 3 commits into from
Dec 7, 2024
Merged

Conversation

VividPups
Copy link
Contributor

Description

One shift as captain a security corpsman approached me, and they gave me a problem that was really an oversight, So far there isn't a legal non-sec weapon for Oni bartenders to have to protect their bars, as we know Bartenders come with nonlethal weapons (except for the knife on the Mosin) this is to help that problem, I pretty much pull all the things from when I made this in Frontier. however, I change the damage type to be stun only. so far the stun baton takes about 3 hits to stun someone, the brass knuckles take 6 to stun someone but it is a bit faster

this technically adds 3 different types
Crassnuckles (it is a whoopie cushion brass knuckles) for clowns
improvise BrassKnuckles
and the official one for Oni's

image
image
image

Changelog

🆑

  • add: brass-knuckles to the oni loadout
  • add: can now craft brass knuckles as a stun weapon
  • add: the crass-knuckles

Oni melee
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Nov 21, 2024
Copy link
Contributor

github-actions bot commented Nov 21, 2024

RSI Diff Bot; head commit 6a5c81e merging into 3cad8aa
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Objects/Weapons/Melee/brassknuckles.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Objects/Weapons/Melee/crassknuckles.rsi

State Old New Status
equipped-HAND Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after 6a5c81e

@VividPups
Copy link
Contributor Author

The only problem I am having is that I can't seem to get the Crafting recipe to work with the crassknuckles, would ask for help with that

@FoxxoTrystan FoxxoTrystan added the Priority: 3-Low Should be resolved at some point label Nov 22, 2024
Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

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

Test fails are valid.

@Memeji
Copy link
Collaborator

Memeji commented Nov 23, 2024

The only problem I am having is that I can't seem to get the Crafting recipe to work with the crassknuckles, would ask for help with that

What is the issue?

@VividPups
Copy link
Contributor Author

The only problem I am having is that I can't seem to get the Crafting recipe to work with the crassknuckles, would ask for help with that

What is the issue?

It just keep saying that they don't have the materials

@VividPups
Copy link
Contributor Author

Test fails are valid.

Looks like it's from the behonker and I didn't do anything to it

@Fansana
Copy link
Owner

Fansana commented Nov 23, 2024

they are to expensive put them at less then 17 spesos

@Fansana
Copy link
Owner

Fansana commented Nov 23, 2024

Tested this just now and they feel a tad strong. Mostly the stamina damage.

@VividPups
Copy link
Contributor Author

VividPups commented Nov 23, 2024

Tested this just now and they feel a tad strong. Mostly the stamina damage.

It's for a bartender oni only, stun baton is 3 hits, these should be 6 hits. The weapon is designed to be nonlethal. (Little lethal bc you are having. Metal to your face)

@VividPups
Copy link
Contributor Author

I also am not sure how to fix the behonkers

@FoxxoTrystan
Copy link
Collaborator

Tests fails are valid, look into them to how to fix them.

@VividPups
Copy link
Contributor Author

Tests fails are valid, look into them to how to fix them.

that doesn't help me at all trystan

@fenndragon
Copy link
Contributor

Tests fails are valid, look into them to how to fix them.

The test fail is the error code 1 which is usually a false positive. What makes this one a valid fail?

@Memeji
Copy link
Collaborator

Memeji commented Nov 30, 2024

Reason for test fail:

  1. WeaponBrassKnucklesWhoopie increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 30.0d
    But was: 100.0d

  2. WeaponBrassKnucklesImprovised increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d

  3. WeaponBrassKnuckles increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d

So the brass knuckles, when turned into raw materials, results in materials that cost more than the weapon.
This means it can be a free money generator, according to the system :p

@fenndragon
Copy link
Contributor

Tests fails are valid, look into them to how to fix them.

Nevermind I found it. You need to raise the price of the brass knuckles as the materials to make it are worth more than the knuckles themselves. If you buy them then break them down you make a profit.

@fenndragon
Copy link
Contributor

I

Reason for test fail:

  1. WeaponBrassKnucklesWhoopie increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 30.0d
    But was: 100.0d
  2. WeaponBrassKnucklesImprovised increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d
  3. WeaponBrassKnuckles increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d

So the brass knuckles, when turned into raw materials, results in materials that cost more than the weapon. This means it can be a free money generator, according to the system :p

Fuck you beat me to it

@Memeji
Copy link
Collaborator

Memeji commented Nov 30, 2024

I

Reason for test fail:

  1. WeaponBrassKnucklesWhoopie increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 30.0d
    But was: 100.0d
  2. WeaponBrassKnucklesImprovised increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d
  3. WeaponBrassKnuckles increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d

So the brass knuckles, when turned into raw materials, results in materials that cost more than the weapon. This means it can be a free money generator, according to the system :p

Fuck you beat me to it

heheheheheheheheheheeh am speedy

@VividPups
Copy link
Contributor Author

Reason for test fail:

  1. WeaponBrassKnucklesWhoopie increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 30.0d
    But was: 100.0d
  2. WeaponBrassKnucklesImprovised increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d
  3. WeaponBrassKnuckles increases in price after decomposed into raw materials
    Assert.That(sumPrice, Is.LessThanOrEqualTo(price))
    Expected: less than or equal to 17.500011920928955d
    But was: 100.0d

So the brass knuckles, when turned into raw materials, results in materials that cost more than the weapon. This means it can be a free money generator, according to the system :p

Thank you i don't know how to fully read the checkers yet and this does make since because This is techionally a port from frontier where they Adjust a bunch of prices

@VividPups
Copy link
Contributor Author

I will have this completed within next two days

@FoxxoTrystan FoxxoTrystan added Status: Awaiting Changes Do not merge due to requested changes and removed Status: Needs Review Someone please review this labels Dec 2, 2024
Copy link
Contributor

github-actions bot commented Dec 2, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Dec 2, 2024
@github-actions github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Dec 4, 2024
@VividPups
Copy link
Contributor Author

Merge errors were fix

@Fansana Fansana merged commit 04aba54 into Fansana:master Dec 7, 2024
13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Dec 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 3-Low Should be resolved at some point Status: Awaiting Changes Do not merge due to requested changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants