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

Port Samurai armor from Nyano #334

Merged
merged 4 commits into from
Sep 19, 2023
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
8 changes: 8 additions & 0 deletions Resources/Locale/en-US/_Nyano/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
uplink-kanabou-name = Kanabou
uplink-kanabou-desc = A weapon for those who wish to forgo subtlety. Particularly suited to oni.
Copy link
Contributor

Choose a reason for hiding this comment

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

Extra lines?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

well technically is adding them back since they where deleted and the uplink list doesn't have the .ftl for the kanabou and Rickenbacker.


uplink-rickenbacker4001-name = Rickenbacker 4001
uplink-rickenbacker4001-desc = When it comes down to it, there are very few people who will swing the bat.

uplink-samurai-bundle-name = Syndicate samurai armor bundle
uplink-samurai-bundle-desc = A bundle containing a modern replica of a full Tousei-Gusoku set.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
- type: entity
id: ClothingBackpackDuffelSyndicateBundleSamurai
parent: ClothingBackpackDuffelSyndicateBundle
name: Samurai armor bundle
description: "A bundle containing a modern replica of a full Tousei-Gusoku set."
components:
- type: StorageFill
contents:
- id: ClothingOuterArmorTouseiGusoku
- id: ClothingHeadHelmetKabuto
15 changes: 15 additions & 0 deletions Resources/Prototypes/_Nyano/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,18 @@
- !type:BuyerJobCondition
whitelist:
- Musician

- type: listing
id: UplinkSamurai
name: uplink-samurai-bundle-name
description: uplink-samurai-bundle-desc
icon: { sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi, state: icon }
productEntity: ClothingBackpackDuffelSyndicateBundleSamurai
cost:
Telecrystal: 6
categories:
- UplinkArmor
conditions:
- !type:BuyerSpeciesCondition
whitelist:
- Oni
21 changes: 20 additions & 1 deletion Resources/Prototypes/_Nyano/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,23 @@
coefficients:
Blunt: 0.80
Slash: 0.95
Piercing: 0.95
Piercing: 0.95

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHelmetKabuto
name: kabuto and menpo
description: A modern replica of a kabuto and menpo.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/Head/Helmets/kabuto.rsi
- type: Item
size: 15
- type: Armor
modifiers:
coefficients:
Blunt: 0.80
Slash: 0.80
Piercing: 0.80
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
parent: ClothingOuterBase
id: ClothingOuterArmorKendoBogu
name: bogu
description: A set of armor used in Kendo. It covers the waist, torso, and hands.
description: A set of armor used in Kendo. It covers the waist, torso, and hands.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/OuterClothing/Armor/bogu.rsi
Expand All @@ -33,3 +33,22 @@
- type: ClothingSpeedModifier
walkModifier: 0.95
sprintModifier: 0.85

- type: entity
parent: ClothingOuterBase
id: ClothingOuterArmorTouseiGusoku
name: tousei-gusoku
description: A modern replica of a Ni-mai-do Gusoku armor set.
components:
- type: Sprite
sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi
- type: Clothing
sprite: Nyanotrasen/Clothing/OuterClothing/Armor/touseigusoku.rsi
- type: Item
size: 50
- type: Armor
modifiers:
coefficients:
Blunt: 0.60
Slash: 0.60
Piercing: 0.75
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Hyenh#6078 (313846233099927552)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "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
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,26 @@
{
"version": 1,
"license": "CC-BY-SA-4.0",
"copyright": "Hyenh#6078 (313846233099927552)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-OUTERCLOTHING",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading