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

Золотая Бита #1149

Merged
merged 5 commits into from
Feb 26, 2025
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,6 @@ ent-ADTWoodenSword = деревянный меч

ent-ADTCleawingSaw = Боевой Секач
.desc = Секач имеет два режима: быстрый удар и широкий замах. В режиме широкого замаха вы наносите повышенный урон. В режиме быстрого удара вы наносите сниженный урон, но с куда большей скоростью.

ent-ADTBaseBallBat = золотая бита
.desc = Золотая бейсбольная бита.
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
- type: entity
name: baseball bat
parent: [BaseItem, BaseMinorContraband]
id: ADTBaseBallBat
description: A robust baseball bat.
components:
- type: Sprite
sprite: ADT/Objects/Weapons/Melee/goldbat.rsi
state: icon
- type: MeleeWeapon
wideAnimationRotation: -135
damage:
types:
Blunt: 10
Structural: 5
soundHit:
collection: MetalThud
- type: Wieldable
- type: IncreaseDamageOnWield
damage:
types:
Blunt: 15
Structural: 15
- type: Item
size: Normal
- type: Tool
qualities:
- Rolling
speedModifier: 0.75 # a bit unwieldly but does the job
- type: UseDelay
delay: 1
- type: PhysicalComposition
materialComposition:
Gold: 250
- 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.
31 changes: 31 additions & 0 deletions Resources/Textures/ADT/Objects/Weapons/Melee/goldbat.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Created by discord:NexoKingg#nexokingg",
"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
}
]
}

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