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

RPG dice #31031

Merged
merged 39 commits into from
Jun 11, 2019
Merged

RPG dice #31031

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
200a19f
Update ammo.json
krekeler0 Jun 1, 2019
89775d3
Update professions.json
krekeler0 Jun 1, 2019
22b056b
Update ammo.json
krekeler0 Jun 1, 2019
f6e41ba
Update SUS_specific_use_storage_items.json
krekeler0 Jun 1, 2019
1fa951f
Update SUS_specific_use_storage_items.json
krekeler0 Jun 1, 2019
6de8c38
Update ammo.json
krekeler0 Jun 1, 2019
d248b28
Update ammo.json
krekeler0 Jun 1, 2019
c0bce1a
Update SUS_specific_use_storage_items.json
krekeler0 Jun 1, 2019
90bb809
Update professions.json
krekeler0 Jun 2, 2019
e8b0754
Update ammo.json
krekeler0 Jun 2, 2019
a8ad9a9
Update SUS_specific_use_storage_items.json
krekeler0 Jun 2, 2019
3dd089f
Update professions.json
krekeler0 Jun 2, 2019
8e689b6
Update basement_game.json
krekeler0 Jun 2, 2019
41ae7cc
Update mall_item_groups.json
krekeler0 Jun 2, 2019
c0f1b0a
Update misc.json
krekeler0 Jun 3, 2019
f740088
Update item_groups.json
krekeler0 Jun 3, 2019
620a6ee
Update monster_drops.json
krekeler0 Jun 3, 2019
a86f51a
Update ammo.json
krekeler0 Jun 3, 2019
8cddb74
Update ammo.json
krekeler0 Jun 3, 2019
37e1170
Update item_groups.json
krekeler0 Jun 3, 2019
2dad012
Update mall_item_groups.json
krekeler0 Jun 3, 2019
c615ae3
Update misc.json
krekeler0 Jun 3, 2019
3dbba16
Update SUS_specific_use_storage_items.json
krekeler0 Jun 3, 2019
5c942e2
Update basement_game.json
krekeler0 Jun 3, 2019
4e270c2
Update monster_drops.json
krekeler0 Jun 3, 2019
5c2ea2a
Update monster_drops.json
krekeler0 Jun 3, 2019
1b4eea8
Update monster_drops.json
krekeler0 Jun 3, 2019
e5453a4
Update monster_drops.json
krekeler0 Jun 3, 2019
d9d94f4
Update materials.json
krekeler0 Jun 5, 2019
a5c7da4
Update ammo.json
krekeler0 Jun 5, 2019
3d86d76
Update materials.json
krekeler0 Jun 5, 2019
cb48100
Update materials.json
krekeler0 Jun 5, 2019
a8a876b
Add die use action
anothersimulacrum Jun 6, 2019
0f77bd9
Merge pull request #1 from anothersimulacrum/die-use-action
krekeler0 Jun 6, 2019
395c15e
Adjust use action a bit
anothersimulacrum Jun 7, 2019
bc66146
Merge pull request #2 from anothersimulacrum/die-use-action
krekeler0 Jun 7, 2019
c686951
Update src/item.cpp
krekeler0 Jun 7, 2019
4d84415
Update materials.json
krekeler0 Jun 9, 2019
eccbd84
Update materials.json
krekeler0 Jun 10, 2019
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
21 changes: 21 additions & 0 deletions data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,5 +1327,26 @@
"count": 50,
"ammo_type": "tinder",
"effects": [ "NEVER_MISFIRES" ]
},
{
"type": "AMMO",
"id": "rpg_dice",
"price": 10,
"name": "rpg dice",
Copy link
Member

@anothersimulacrum anothersimulacrum Jun 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

You need a "name_plural", or else multiples will show up as x rpg dices.
(The plural name should be the same, because it's already plural)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

okay so (I really don't know how this works) should I end this one and make a new one with that in?

Copy link
Member

Choose a reason for hiding this comment

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

No, you make the change, commit it, and push it to this branch.

Copy link
Member

Choose a reason for hiding this comment

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

also, the singular is "die"

"name_plural": "rpg dice",
Copy link
Contributor

Choose a reason for hiding this comment

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

Here and above, "RPG" should be all caps

"symbol": "=",
"color": "light_gray",
"looks_like": "marble",
"description": "Some dice used to play various role playing games, coming in several shapes and sizes",
Copy link
Contributor

Choose a reason for hiding this comment

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

The description should be for that of a singular die (rather than "some dice"). Also, "role-playing" is hyphenated

Eg

Suggested change
"description": "Some dice used to play various role playing games, coming in several shapes and sizes",
"description": "A die often used to play various role-playing games",

Copy link
Member

@I-am-Erk I-am-Erk Jun 1, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

There's no reason the item can't depict a set of dice. A deck of cards is a single item, not 52 individual playing cards.

Copy link
Contributor

Choose a reason for hiding this comment

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

Per the PR:

The dice are (unless I messed up) usable as ammunition for the sling and slingshot. They are pretty much marbles with slightly adjusted stats such as less damage and higher range.

It probably makes more sense to be shooting individual die, no?

"material": "plastic",
"volume": 1,
"weight": 1,
"ammo_type": "pebble",
"damage": 1,
"range": 20,
"dispersion": 15,
"loudness": 0,
"count": 7,
"effects": [ "NEVER_MISFIRES" ]
}
]
2 changes: 1 addition & 1 deletion data/json/professions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3582,7 +3582,7 @@
"skills": [ { "level": 2, "name": "speech" }, { "level": 1, "name": "survival" } ],
"items": {
"both": {
"items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch" ],
"items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "rpg_dice" ],
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
"items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "rpg_dice" ],
"items": [ "jeans", "tshirt", "socks", "sneakers", "mbag", "pizza_cheese", "cola", "dnd_handbook", "wristwatch", "RPG_dice" ],

Copy link
Contributor Author

Choose a reason for hiding this comment

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

thank you when changing the ID I forgot about that.

"entries": [ { "group": "charged_cell_phone" } ]
},
"male": [ "briefs" ],
Expand Down