Skip to content

Commit

Permalink
Merge pull request #3 from CleverRaven/master
Browse files Browse the repository at this point in the history 
Update #3
  • Loading branch information
Xenomorph-III authored Oct 10, 2019
2 parents 37cd9bf + dea6b62 commit 47fadfe
Show file tree
Hide file tree
Showing 35 changed files with 1,065 additions and 636 deletions.
21 changes: 13 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,15 +586,20 @@ else
else
NCURSES_PREFIX = ncurses
endif
ifdef OSXCROSS
NCURSES_PREFIX = ncurses
endif
# ONLY when not cross-compiling, check for pkg-config or ncurses5-config
# When doing a cross-compile, we can't rely on the host machine's -configs
ifeq ($(CROSS),)
ifneq ($(shell pkg-config --libs $(NCURSES_PREFIX) 2>/dev/null),)
HAVE_PKGCONFIG = 1
endif
ifneq ($(shell which $(NCURSES_PREFIX)5-config 2>/dev/null),)
HAVE_NCURSES5CONFIG = 1
endif
ifeq ($(OSXCROSS),)
ifneq ($(shell pkg-config --libs $(NCURSES_PREFIX) 2>/dev/null),)
HAVE_PKGCONFIG = 1
endif
ifneq ($(shell which $(NCURSES_PREFIX)5-config 2>/dev/null),)
HAVE_NCURSES5CONFIG = 1
endif
endif
endif

# Link to ncurses if we're using a non-tiles, Linux build
Expand All @@ -611,8 +616,8 @@ else
endif

ifdef OSXCROSS
LDFLAGS += -L$(LIBSDIR)/ncurses/lib
CXXFLAGS += -I$(LIBSDIR)/ncurses/include
LDFLAGS += -L$(LIBSDIR)/$(NCURSES_PREFIX)/lib
CXXFLAGS += -I$(LIBSDIR)/$(NCURSES_PREFIX)/include
endif # OSXCROSS
endif # HAVE_NCURSES5CONFIG
endif # HAVE_PKGCONFIG
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/collections_domestic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
[ "ceramic_bowl", 50 ],
[ "ceramic_cup", 20 ],
[ "ceramic_mug", 20 ],
[ "wine_glass", 20 ],
[ "plastic_plate", 50 ],
[ "tumbler_plastic", 50 ],
[ "bowl_pewter", 25 ],
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/misc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
[ "glass_plate", 20 ],
[ "glass_bowl", 20 ],
[ "ceramic_plate", 10 ],
[ "wine_glass", 10 ],
[ "ceramic_bowl", 10 ],
[ "ceramic_cup", 10 ]
]
Expand Down
274 changes: 0 additions & 274 deletions data/json/items/generic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -700,20 +700,6 @@
"weight": "3220 g",
"volume": "750 ml"
},
{
"type": "GENERIC",
"id": "leaf_spring",
"symbol": ",",
"color": "light_gray",
"name": "leaf spring",
"category": "spare_parts",
"description": "A large, heavy-duty leaf spring. Probably from some car or truck, and looks an awful lot like a bow. You can barely bend it...",
"price": 5000,
"price_postapoc": 500,
"material": "steel",
"weight": "8440 g",
"volume": "5 L"
},
{
"type": "GENERIC",
"id": "lawnmower",
Expand Down Expand Up @@ -1848,19 +1834,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 +1847,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 47fadfe

Please sign in to comment.