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

Home run bat #823

Closed
wants to merge 10 commits into from
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Resources/Locale/en-US/deltav/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Utility
uplink-reinforcement-radio-nukie-mouse-name = Mouse Operative Reinforcement Teleporter
uplink-reinforcement-radio-nukie-mouse-desc = Calls in a specially trained mouse operative to assist you.
# Weapons
uplink-homerunbat-name = Home Run Bat
uplink-homerunbat-desc = Rigged bat pre-coated in blood for Syndicate tee-ball practice. Launch your foes!
# Implants
uplink-bionic-syrinx-implanter-name = Bionic Syrinx Implanter
uplink-bionic-syrinx-implanter-desc = An implant that enhances a harpy's natural talent for mimicry to let you adjust your voice to whoever you can think of.
13 changes: 12 additions & 1 deletion Resources/Prototypes/DeltaV/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@
categories:
- UplinkUtility

- type: listing
id: Home Run Bat
name: uplink-homerunbat-name
description: uplink-homerunbat-desc
productEntity: BaseBallBatHomerun
icon: { sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi, state: icon }
cost:
Telecrystal: 20
categories:
- UplinkWeapons

#- type: listing
Copy link
Member

Choose a reason for hiding this comment

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

sus

# id: UplinkCyborgBeaconSyndicate
# name: uplink-borg-beacon-name
Expand Down Expand Up @@ -45,4 +56,4 @@
- !type:BuyerWhitelistCondition
blacklist:
components:
- SurplusBundle
- SurplusBundle
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# DeltaV "Home Run Bat"

- type: entity
name: home run bat
parent: BaseItem
Copy link
Member

Choose a reason for hiding this comment

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

why cant this parent bat and remove like 75% of components

id: BaseBallBatHomerun
description: Heavy metal bat with an extra kick.
components:
- type: Sprite
sprite: DeltaV/Objects/Weapons/Melee/home_run_bat.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 35
musicmanvr marked this conversation as resolved.
Show resolved Hide resolved
Structural: 15
soundHit:
collection: ExplosionSmall
- type: MeleeRequiresWield # You can't hit a home run with one hand, jimbo.
- type: Wieldable
- type: MeleeThrowOnHit
Speed: 30 # Triple the speed of a gorilla gauntlet, not always a good thing!
Lifetime: 5
unanchorOnHit: true
Copy link
Member

@deltanedas deltanedas Feb 12, 2024

Choose a reason for hiding this comment

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

will this unanchor nukes or 500 glimmer probers ⚠️

also yaml typos:
Speed -> speed
Lifetime -> lifetime,
Enabled just remove it since its true by default

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It uses the same properties as the regular gorilla glove, but lemme test

Copy link
Contributor Author

Choose a reason for hiding this comment

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

will this unanchor nukes or 500 glimmer probers ⚠️

also yaml typos:

Speed -> speed

Lifetime -> lifetime,

Enabled just remove it since its true by default

Congratulations, you just discovered a bug with the gorilla gauntlet. The gauntlet can unanchor glimmer probers at 500, which means the bat can too.

Copy link
Member

Choose a reason for hiding this comment

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

prober should prevent unanchor via canceling an event or something on top of the shock thing when using wrench

Copy link
Contributor Author

Choose a reason for hiding this comment

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

prober should prevent unanchor via canceling an event or something on top of the shock thing when using wrench

I mean I can try to code it to where if glimmer is over 500 it physically cannot be unanchored

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, I know. But this event isn't getting triggered at all.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, the event is getting raised on the owner of the MeleeThrowOnHit component, not the thing being hit. Guess I'll just add a new event

Copy link
Member

@deltanedas deltanedas Feb 12, 2024

Choose a reason for hiding this comment

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

or just add another field (if the weapon isnt stored already it might be) for flexibility and raise it on the thing being hit as well, less logic to maintain

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh yeah, guess that works too

Copy link
Contributor

Choose a reason for hiding this comment

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

Enabled: true
- type: Item
size: Large
- type: Tool
qualities:
- Rolling
speed: 0.50 # it's very heavy, it does it slower than a wooden bat
- type: Clothing
quickEquip: false
slots:
- back
- type: UseDelay
delay: 2
- type: Tag
tags:
- BaseballBat
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"version": 1,
"license": "CC-BY-NC-SA-3.0",
"copyright": "Homerun bat variant modified by Mike, Taken from goonstation and modified by Swept at commit https://github.com/goonstation/goonstation/pull/3555/commits/b24eb6260647c0fcfe858268a26b6160bc50017a, wielded version by Easypoll",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "wielded-inhand-left",
"directions": 4
},
{
"name": "wielded-inhand-right",
"directions": 4
},
{
"name": "equipped-BACKPACK",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading