Skip to content

Commit

Permalink
Volleyballs (#38192)
Browse files Browse the repository at this point in the history
  • Loading branch information
klorpa authored and ZhilkinSerg committed Mar 17, 2020
1 parent 329e489 commit 3bb953e
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 1 deletion.
1 change: 1 addition & 0 deletions data/json/itemgroups/Clothing_Gear/gear_civilian.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@
[ "novel_pulp", 16 ],
[ "radio_car_box", 1 ],
[ "basketball", 8 ],
[ "beach_volleyball", 8 ],
[ "radiocontrol", 5 ],
[ "whistle", 3 ],
[ "slingshot", 10 ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@
[ "helmet_football", 20 ],
[ "jersey", 100 ],
[ "basketball", 100 ],
[ "beach_volleyball", 25 ],
[ "indoor_volleyball", 50 ],
[ "armguard_soft", 50 ],
[ "chestguard_hard", 20 ],
[ "armguard_hard", 20 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/Locations_MapExtras/mansion.json
Original file line number Diff line number Diff line change
Expand Up @@ -747,6 +747,8 @@
[ "helmet_football", 10 ],
[ "football", 60 ],
[ "basketball", 50 ],
[ "beach_volleyball", 40 ],
[ "indoor_volleyball", 40 ],
[ "helmet_bike", 25 ],
[ "helmet_ball", 25 ],
[ "headgear", 20 ],
Expand Down
2 changes: 2 additions & 0 deletions data/json/itemgroups/activities_hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
[ "jersey", 30 ],
[ "puck", 30 ],
[ "basketball", 25 ],
[ "indoor_volleyball", 20 ],
[ "beach_volleyball", 20 ],
[ "golf_club", 35 ],
[ "hat_golf", 20 ],
[ "gloves_golf", 20 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,7 @@
"type": "item_group",
"items": [
[ "basketball", 100 ],
[ "indoor_volleyball", 50 ],
[ "baseball", 100 ],
[ "hat_ball", 10 ],
[ "helmet_ball", 20 ],
Expand Down
8 changes: 8 additions & 0 deletions data/json/items/armor/torso_clothes.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,14 @@
{
"id": "monroeville",
"text": "A hockey jersey made of thick material imprinted with the logo of the Monroeville Zombies."
},
{
"id": "rugby",
"text": "A rugby jersey made of thick material imprinted with the logo of the Canberra Drop Bears."
},
{
"id": "volleyball",
"text": "A volleyball jersey made of thick material imprinted with the logo of the Ooarai Ducks."
}
],
"flags": [ "VARSIZE" ]
Expand Down
32 changes: 31 additions & 1 deletion data/json/items/generic/toys_and_sports.json
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"name": { "str": "bowling ball" },
"description": "A large, heavy ball. Before the apocalypse, its main purpose was to be rolled along waxed floors.",
"category": "other",
"price": 30,
"price": 3000,
"material": "ceramic",
"weight": "2000 g",
"volume": "2500 ml",
Expand Down Expand Up @@ -167,6 +167,36 @@
"bashing": 6,
"to_hit": -1
},
{
"type": "GENERIC",
"id": "indoor_volleyball",
"symbol": "*",
"color": "white",
"name": "volleyball",
"category": "other",
"description": "A standard regulation volleyball.",
"price": 1000,
"material": "leather",
"weight": "260 g",
"volume": "1 L",
"bashing": 4,
"to_hit": -1
},
{
"type": "GENERIC",
"id": "beach_volleyball",
"symbol": "*",
"color": "green",
"name": "beach volleyball",
"category": "other",
"description": "A brightly colored beach volleyball. It is slightly larger than a regular white one.",
"price": 1200,
"material": "leather",
"weight": "280 g",
"volume": "1 L",
"bashing": 4,
"to_hit": -1
},
{
"type": "GENERIC",
"id": "puck",
Expand Down
1 change: 1 addition & 0 deletions data/json/mapgen/park.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@
],
"palettes": [ "park_asphalt_palette" ],
"items": { "b": { "item": "shoes", "chance": 15, "repeat": [ 2, 5 ] } },
"place_item": [ { "item": "beach_volleyball", "x": 8, "y": 6 } ],
"monsters": { "$": { "monster": "GROUP_PARK_SCENIC", "chance": 50 }, " ": { "monster": "GROUP_PARK_PLAYGROUND", "chance": 100 } }
}
},
Expand Down

0 comments on commit 3bb953e

Please sign in to comment.