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.

Sign up for GitHub

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

Jump to bottom

Added in new shields #2856

Merged
merged 39 commits into from
May 22, 2023
Merged

Added in new shields #2856

merged 39 commits into from
May 22, 2023

Conversation

yay855
Copy link
Contributor

@yay855 yay855 commented May 22, 2023

Summary

@yay855
Added in new shields
338c8a3 
Two new shields, one reinforced with leather and one reinforced with steel, plus recipes adding the steel one to the medieval itemgroup.
@yay855
Made the leather shield uncraftable
d98448f
@yay855
Added large variations
a7cc3fe 
Added large banded shields, large leather shields, plus recipes for them and the antique itemgroup.
@yay855
Fixed missing "type" field
24cc81b
@github-actions github-actions bot added the data PRs related to datas. Won't crash game (probably) label May 22, 2023
github-actions[bot]
github-actions bot reviewed May 22, 2023
View reviewed changes
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/recipes/armor/other.json Outdated Show resolved Hide resolved
data/json/recipes/armor/other.json Outdated Show resolved Hide resolved
yay855 and others added 10 commits May 21, 2023 21:37
@yay855 @github-actions
Update data/json/items/armor/shields.json
5184dd6 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
deba095 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
5660786 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
b44d010 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
3eeed5a 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
718a12d 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
02c0eee 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/items/armor/shields.json
2793f42 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/recipes/armor/other.json
09a93ae 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@yay855 @github-actions
Update data/json/recipes/armor/other.json
3452620 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@scarf005 scarf005 requested a review from chaosvolt May 22, 2023 01:56
chaosvolt
chaosvolt requested changes May 22, 2023
View reviewed changes
data/json/items/armor/shields.json Show resolved Hide resolved
data/json/items/armor/shields.json Show resolved Hide resolved
data/json/items/armor/shields.json Show resolved Hide resolved
data/json/items/armor/shields.json Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
yay855 and others added 11 commits May 21, 2023 22:17
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
a09d743 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
5784cce 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
593f60f 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
577a0d5 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
d01d62b 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
965b3d8 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
2e68ee4 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@chaosvolt
Lil fix for redundant value updates
a14d2f2
@yay855
Gave large leather and metal shields higher block
379dbf8
@yay855
Merge branch 'more-shields' of https://github.com/yay855/Cataclysm-BN …
7284c2f 
…into more-shields
@yay855
Fixes
87e247e 
Made leather shield no longer made of leather, gave large shields wblock_3.
@yay855
Fixes 2
c59314c 
Made leather and banded shield 3 thickness instead of 4
chaosvolt
chaosvolt requested changes May 22, 2023
View reviewed changes
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
data/json/items/armor/shields.json Outdated Show resolved Hide resolved
yay855 and others added 7 commits May 21, 2023 23:09
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
93813bf 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
ebb1e85 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
51d39ad 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
91db9f3 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
e39555f 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
c74a201 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
398a892 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
yay855 and others added 5 commits May 21, 2023 23:10
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
6192c55 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@yay855 @chaosvolt
Update data/json/items/armor/shields.json
9f04223 
Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
@chaosvolt
Quickfix
4a7453b
@yay855
Fixed wrong comma
e849f9e
@yay855
Merge branch 'more-shields' of https://github.com/yay855/Cataclysm-BN …
2ca97c1 
…into more-shields
chaosvolt
chaosvolt approved these changes May 22, 2023
View reviewed changes
Copy link
Member

@chaosvolt chaosvolt left a comment

Choose a reason for hiding this comment

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

Looks good to me, external tileset sprites coming Soon™

@yay855
Copy link
Contributor Author

yay855 commented May 22, 2023

Looks good to me, external tileset sprites coming Soon™

Hell yeah, dude. Appreciated- I can't sprite for anything.

@chaosvolt chaosvolt merged commit f033055 into cataclysmbnteam:upload May 22, 2023
8 checks passed
@yay855 yay855 deleted the more-shields branch May 24, 2023 06:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-actions github-actions[bot] github-actions left review comments

@chaosvolt chaosvolt chaosvolt approved these changes

Assignees
No one assigned
Labels
data PRs related to datas. Won't crash game (probably)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@yay855 @chaosvolt @scarf005