Skip to content

Commit

Permalink
Move flowers and buds to obsolete (#34579)
Browse files Browse the repository at this point in the history 
* Moved flowers and buds from items generic to obsolete

* Moved flowers and buds from items generic to obsolete
  • Loading branch information
@snipercup @ZhilkinSerg
snipercup authored and ZhilkinSerg committed Oct 9, 2019
1 parent 0f02c96 commit 4b00834
Show file tree
Hide file tree
Showing 2 changed files with 260 additions and 260 deletions.
260 changes: 0 additions & 260 deletions data/json/items/generic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1848,19 +1848,6 @@
"to_hit": -2,
"flags": [ "TRADER_AVOID" ]
},
{
"type": "GENERIC",
"id": "poppy_flower",
"name": "poppy flower",
"description": "A poppy stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "light_red",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "poppy_bud",
Expand All @@ -1874,253 +1861,6 @@
"volume": 0,
"price": 200
},
{
"type": "GENERIC",
"id": "bluebell_bud",
"name": "bluebell bud",
"description": "A bluebell bud. Contains some substances commonly produced by a bluebell flower.",
"weight": "30 g",
"to_hit": -3,
"color": "blue",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "dahlia_flower",
"name": "dahlia",
"description": "A dahlia stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "dahlia_bud",
"name": "dahlia bud",
"description": "A dahlia bud. Contains some substances commonly produced by a dahlia.",
"weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "rose_flower",
"name": "rose",
"description": "A rose stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "red",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "rose_bud",
"name": "rose bud",
"description": "A rose bud. Contains some substances commonly produced by a rose flower.",
"weight": "30 g",
"to_hit": -3,
"color": "red",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "hydrangea_flower",
"name": "hydrangea",
"description": "A hydrangea stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "light_blue",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "hydrangea_bud",
"name": "hydrangea bud",
"description": "A hydrangea bud. Contains some substances commonly produced by a hydrangea flower.",
"weight": "30 g",
"to_hit": -3,
"color": "light_blue",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "tulip_flower",
"name": "tulip",
"description": "A tulip stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "tulip_bud",
"name": "tulip bud",
"description": "A tulip bud. Contains some substances commonly produced by a tulip flower.",
"weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "spurge_flower",
"name": "spurge",
"description": "A spurge stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "light_green",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "spurge_bud",
"name": "spurge bud",
"description": "A spurge bud. Contains some substances commonly produced by a spurge flower.",
"weight": "30 g",
"to_hit": -3,
"color": "light_green",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "black_eyed_susan_flower",
"name": "black eyed susan",
"description": "A black eyed susan stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "black_eyed_susan_bud",
"name": "black eyed susan bud",
"description": "A black eyed susan bud. Contains some substances commonly produced by a black eyed susan flower.",
"weight": "30 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "lily_flower",
"name": "lily",
"description": "A lily stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "lily_bud",
"name": "lily bud",
"description": "A lily bud. Contains some substances commonly produced by a lily flower.",
"weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "lotus_flower",
"name": "lotus",
"description": "A lotus stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "lotus_bud",
"name": "lotus bud",
"description": "A lotus bud. Contains some substances commonly produced by a lotus flower.",
"weight": "30 g",
"to_hit": -3,
"color": "yellow",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "lilac_flower",
"name": "lilac",
"description": "A lilac stalk with some petals.",
"weight": "40 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 0
},
{
"type": "GENERIC",
"id": "lilac_bud",
"name": "lilac bud",
"description": "A lilac bud. Contains some substances commonly produced by a lilac flower.",
"weight": "30 g",
"to_hit": -3,
"color": "magenta",
"symbol": ",",
"material": [ "veggy" ],
"volume": "250 ml",
"price": 200
},
{
"type": "GENERIC",
"id": "sunflower",
Expand Down
Loading

0 comments on commit 4b00834

Please sign in to comment.