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.

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

Bring up to date #5

Merged
merged 723 commits into from
Nov 26, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
723 commits
Select commit Hold shift + click to select a range
bde1ab9
folding vehicles: improve collision test when unfolding (#26685)
mlangsdorf Nov 15, 2018
a372021
Merge pull request #26656 from Qrox/item-category-translation
kevingranade Nov 15, 2018
bad7fdb
Proposed copy-from recipe fixes (#26666)
kevingranade Nov 15, 2018
bec3a77
vehicles: align turn directions in increments of 15 degrees (#26671)
mlangsdorf Nov 15, 2018
b6aae03
Merge pull request #26689 from CleverRaven/kevingranade-no-weird-jacks
Rivet-the-Zombie Nov 15, 2018
c599c94
vehicle parts: add recipe for fuel bunker
mlangsdorf Nov 15, 2018
a01730a
Rewording of gasmask description
jbytheway Nov 15, 2018
96f5764
Make point a literal (constexpr) type
jbytheway Oct 31, 2018
08a2123
Make tripoint a literal (constexpr) type
jbytheway Oct 31, 2018
c63d113
Make static tripoints constexpr
jbytheway Nov 15, 2018
f09bf40
Update bar.json
LovamKicsiGazsii Nov 15, 2018
0e362f8
refresh_display and wait_for_any_key
Nov 15, 2018
2dd0ccf
Update dojo.json
LovamKicsiGazsii Nov 15, 2018
147c6fc
Update gym.json
LovamKicsiGazsii Nov 15, 2018
acd303b
Update laundromat.json
LovamKicsiGazsii Nov 15, 2018
6e6c682
Update pizza_parlor.json
LovamKicsiGazsii Nov 15, 2018
32dc417
Update restaurant_fast.json
LovamKicsiGazsii Nov 15, 2018
c7758ff
Update teashop.json
LovamKicsiGazsii Nov 15, 2018
7903877
Use '(poor fit)' in item::tname
jbytheway Nov 15, 2018
3810fdc
Use '(poor fit)' in item descriptions
jbytheway Nov 15, 2018
513ab21
Remove other mentions of the '(fits)' tag
jbytheway Nov 15, 2018
1523bf7
Support older gcc versions
jbytheway Nov 15, 2018
013455f
Shift greatbow crafting difficulty to end-game.
kevingranade Nov 16, 2018
17d344b
Rein in greatbow damage.
kevingranade Nov 16, 2018
6722f52
Merge pull request #26696 from Qrox/fix-linebreak
kevingranade Nov 16, 2018
20b6e41
Add an additional build stage for build variants.
kevingranade Nov 16, 2018
d0772ff
Merge pull request #26701 from jbytheway/literal_points
kevingranade Nov 16, 2018
a7f9c3a
Makefile indentation
jbytheway Nov 14, 2018
54ad2d0
Use -rdynamic only on Linux
jbytheway Nov 14, 2018
0e2f9a8
Search for exact symbol from nm
jbytheway Nov 14, 2018
658e45f
Add missing translation markup
Pupsi-Mupsi Nov 16, 2018
e42f730
Add missing translation markup
Pupsi-Mupsi Nov 16, 2018
4417961
Merge pull request #2 from Pupsi-Mupsi/pm-atm
Pupsi-Mupsi Nov 16, 2018
e785dda
Arbitrary number of spaces between summary parts.
Nov 16, 2018
d477150
Merge pull request #26721 from Pupsi-Mupsi/pm-mtm
Rivet-the-Zombie Nov 16, 2018
77fcbec
Merge pull request #26718 from CleverRaven/kevingranade-rein-in-great…
ZhilkinSerg Nov 16, 2018
5a60e12
Merge pull request #26722 from AMurkin/patch-1
ZhilkinSerg Nov 16, 2018
fc04c45
Merge pull request #26703 from AMurkin/fix-robot-finds-kitten-animation
ZhilkinSerg Nov 16, 2018
886bf61
Merge pull request #26695 from CleverRaven/kevingranade-travis-stages
ZhilkinSerg Nov 16, 2018
6413195
force travis rebuild
Firestorm01X2 Nov 16, 2018
6e9aecd
force travis rebuild
Firestorm01X2 Nov 16, 2018
e1352c9
Routine i18n updates as of Nov 17, 2018
BrettDong Nov 16, 2018
03e5ccc
Adds LivePeople Tileset
rainbowjose Nov 16, 2018
e5e1166
Adds LivePeople Tileset
rainbowjose Nov 16, 2018
384fc1e
Factor out random transparency generation
jbytheway Nov 6, 2018
555f74f
Factor out comparison and printing code
jbytheway Nov 6, 2018
b8438fa
More protection from animation segfaults
jbytheway Nov 9, 2018
2608c7f
Test helper to clear fields from map
jbytheway Nov 3, 2018
f6af1d1
Tidy up map helpers
jbytheway Nov 6, 2018
a0c187e
Clear map in invlet_test
jbytheway Nov 9, 2018
be7bb39
Merge pull request #26723 from BrettDong/i18n
ZhilkinSerg Nov 16, 2018
fa768a0
Merge pull request #26704 from jbytheway/fits
ZhilkinSerg Nov 16, 2018
d6a5b3b
Moved the Arsonist to another room in the shelter, this is so she wil…
WilliamRoubicek Nov 17, 2018
35ab94a
Fix execution of one action from remote vehicle control menu.
swofle Nov 17, 2018
ba083fb
Merge pull request #26732 from mlangsdorf/fuel_bunker_recipe
Rivet-the-Zombie Nov 17, 2018
8382228
Changing vacuum-packed food to work the same as canned food (#26554)
lancewf Nov 17, 2018
3e55b26
Merge pull request #26675 from jbytheway/backtrace_fixes
kevingranade Nov 17, 2018
e8c8af0
Update src/iuse.cpp
ZhilkinSerg Nov 17, 2018
2fd5326
Merge pull request #26698 from jbytheway/gas_mask_descriptions
kevingranade Nov 17, 2018
2eec0ab
Merge pull request #26728 from jbytheway/test_refactoring
kevingranade Nov 17, 2018
c1862ed
Use Xenial dist in test stage for faster initial build (#26730)
kevingranade Nov 17, 2018
c07b559
Added x86 platforms to vcpkg solution (#26724)
ZhilkinSerg Nov 17, 2018
481f164
Fix release builds (#26735)
jbytheway Nov 17, 2018
0f04c34
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
874e280
Update data/json/mapgen/gym.json
ZhilkinSerg Nov 17, 2018
77fdc19
Update data/json/mapgen/gym.json
ZhilkinSerg Nov 17, 2018
4df5e42
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
8fdc46d
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
a9bf84b
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
c390d6c
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
26a60a2
Move apparent_light_at to lightmap.cpp
jbytheway Nov 1, 2018
101cebf
Removed old hazmat suit with mask
Night-Pryanik Nov 17, 2018
3756c59
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
f6e36ef
Update data/json/mapgen/bar.json
ZhilkinSerg Nov 17, 2018
4288282
Update data/json/mapgen/gym.json
ZhilkinSerg Nov 17, 2018
8db35d7
Update data/json/mapgen/gym.json
ZhilkinSerg Nov 17, 2018
de91682
Update data/json/mapgen/gym.json
ZhilkinSerg Nov 17, 2018
e53b565
Removed duplicate anbc suit
Night-Pryanik Nov 17, 2018
ffbb019
npctalk: add support for NPC backstories
mlangsdorf Nov 17, 2018
f2c8717
Exit on error in requirements.sh
jbytheway Nov 17, 2018
72dbbd0
Treat apt-get update warnings as errors
jbytheway Nov 17, 2018
d675052
Updated Appveyor configuration with vcpkg solution (#26727)
ZhilkinSerg Nov 18, 2018
779bceb
change 'author' key to 'authors' so it will show properly in mod sele…
OrenAudeles Nov 18, 2018
d0da411
Update FindCurses.cmake (#26741)
jbytheway Nov 18, 2018
7b4ca92
Merge pull request #26740 from jbytheway/requirements_failures
kevingranade Nov 18, 2018
9b94d25
Updated SDL paths
ZhilkinSerg Nov 17, 2018
ff99c20
faction camps: don't delete non-food items when distributing food
mlangsdorf Nov 17, 2018
e1c8ac8
fixed overworld performance until draw/LOS code is optimised
dissociativity Nov 18, 2018
8c594ee
make long and tall grass more visually distinct
dissociativity Nov 18, 2018
d5e7134
Linted gym.json
ZhilkinSerg Nov 18, 2018
d9e90ad
Merge pull request #26720 from rainbowjose/master
ZhilkinSerg Nov 18, 2018
d25e83e
Merge pull request #26736 from Night-Pryanik/remove-excessive-hazmat-…
ZhilkinSerg Nov 18, 2018
8036356
Merge pull request #26725 from LovamKicsiGazsii/master
ZhilkinSerg Nov 18, 2018
60c949e
Merge pull request #26733 from WilliamRoubicek/Hobo
ZhilkinSerg Nov 18, 2018
d3c489c
Merge pull request #26746 from dissociativity/forkd
ZhilkinSerg Nov 18, 2018
d5e948b
Merge pull request #26734 from swofle/remote-veh-action
ZhilkinSerg Nov 18, 2018
1af0a24
Merge pull request #26738 from mlangsdorf/npctalk_backstory_support
ZhilkinSerg Nov 18, 2018
6da0148
revert long grass colour change
dissociativity Nov 18, 2018
0b515e8
Merge pull request #26658 from Firestorm01X2/riv-accuracy
Rivet-the-Zombie Nov 18, 2018
e1432f0
Converts LivePeople to DeadPeople, after discussion with author
rainbowjose Nov 18, 2018
588755e
Merge pull request #26750 from dissociativity/forkd
ZhilkinSerg Nov 18, 2018
f03c26b
Merge pull request #26752 from rainbowjose/livetodead
ZhilkinSerg Nov 18, 2018
8c602b9
equalize makeshift crowbar melee-techniques
Pupsi-Mupsi Nov 18, 2018
693a118
CMake: generate library of non-main.cpp stuff
jbytheway Nov 17, 2018
6ba2152
Vim modelines for CMakeLists.txt
jbytheway Nov 17, 2018
1d0d205
Add tests to CMake build
jbytheway Nov 17, 2018
6184a49
Prevent seeing light on walls from dark side
jbytheway Nov 1, 2018
5f1b6bd
Some initial tests for visibility
jbytheway Nov 3, 2018
5ac3909
Ensure vision tests support variable time of day
jbytheway Nov 3, 2018
9995568
Improved vision tests
jbytheway Nov 4, 2018
e136a93
Tweak light_shining_in test
jbytheway Nov 5, 2018
96d5c19
Refactor vision tests
jbytheway Nov 5, 2018
ba36f2b
Account for vision_threshold in vision tests
jbytheway Nov 5, 2018
e0cd8ab
Test rotations/reflections of vision tests
jbytheway Nov 5, 2018
4533b6c
Remove unnecessary comments
jbytheway Nov 5, 2018
e72191a
Add commented-out testing on 3D FOV algorithm
jbytheway Nov 5, 2018
381224c
Rearrange map editor tile stats
jbytheway Nov 5, 2018
a017f99
Increase map editor info window size
jbytheway Nov 5, 2018
670596b
Add four_quadrants::to_string
jbytheway Nov 5, 2018
f2dde63
Tests for shadowcasting float vs quad
jbytheway Nov 6, 2018
531704d
Enable 3D FOV vision tests where possible
jbytheway Nov 6, 2018
a84e858
ApparentLight -> apparent_light_info
jbytheway Nov 6, 2018
f04bca0
Document Mark Firewood Source
jbytheway Nov 18, 2018
40e3bc4
Format count of messages in memorial log
Nov 19, 2018
6d80541
astyle
Nov 19, 2018
4b82451
Merge pull request #26761 from jbytheway/firewood_source_docs
Rivet-the-Zombie Nov 19, 2018
6128fdf
Fix some typos in docs
Cyrano7 Nov 19, 2018
dff171e
Trim some trailing whitspace
Cyrano7 Nov 19, 2018
aeb1e0c
Fix issue with multiple bike racks on the same axis.
swofle Nov 19, 2018
c9fc653
Fix structure of modinfo.json for fujistruct
ralreegorganon Nov 19, 2018
5d47a62
Allow explicit specification of overmap special connection type
ralreegorganon Nov 13, 2018
6fb24ca
Merge pull request #26755 from Pupsi-Mupsi/crowbar
ZhilkinSerg Nov 19, 2018
e195b30
Merge pull request #26765 from ralreegorganon/fujistruct-modinfo
ZhilkinSerg Nov 19, 2018
c6adfa6
Merge pull request #26768 from Cyrano7/docs
ZhilkinSerg Nov 19, 2018
752b47c
Merge pull request #26767 from ralreegorganon/specify-overmap-special…
ZhilkinSerg Nov 19, 2018
78ed9f4
Merge pull request #26766 from AMurkin/format-count-in-memorial
ZhilkinSerg Nov 19, 2018
77abf80
fix power of oars
mlangsdorf Nov 19, 2018
2cab9db
Stone spear can be stored in a spear sheath
Centac Nov 20, 2018
e45d527
Merge pull request #26488 from jbytheway/no_light_through_walls
kevingranade Nov 20, 2018
0bdb744
Merge pull request #26757 from jbytheway/cmake_tests
kevingranade Nov 20, 2018
d9fc51f
make option for building with sanitizer
jbytheway Oct 25, 2018
66a9f84
Merge pull request #26774 from Centac/patch-1
Rivet-the-Zombie Nov 20, 2018
4572d1b
Flying creatures will fly over the deep water
Night-Pryanik Nov 20, 2018
05bcaa8
Merge pull request #26771 from CleverRaven/boats_power_fix
ZhilkinSerg Nov 20, 2018
caa1bf5
Merge pull request #26769 from swofle/multiple-bike-rack-fix
ZhilkinSerg Nov 20, 2018
771c9e4
fixes activation messages for radio-triggered grenades (#26760)
ericlimer Nov 20, 2018
acfdc85
Don't use constexpr pair (#26786)
jbytheway Nov 21, 2018
c481c76
vehicles: convert a few more values to watts and fix loud backfires (…
mlangsdorf Nov 21, 2018
8b0577e
Fix map_clear field clearing (#26785)
jbytheway Nov 21, 2018
a00b61e
Merge pull request #26776 from Night-Pryanik/ducks-flying-over-the-water
Rivet-the-Zombie Nov 21, 2018
272b547
Adds favorite recipies tab
OzoneH3 Nov 21, 2018
559f69d
Flowers won't collide with vehicles anymore
Night-Pryanik Nov 21, 2018
1feb906
Fixed crash in 64-bit MinGW binaries
ZhilkinSerg Nov 21, 2018
cf078df
Replaced magic numbers with defines
ZhilkinSerg Nov 21, 2018
87d51ff
Removed redundant conditional expression
ZhilkinSerg Nov 22, 2018
6eb89bb
Add comment explaining avoidance of std::max()
kevingranade Nov 22, 2018
34b0232
Merge pull request #26798 from ZhilkinSerg/fix-lightmap
kevingranade Nov 22, 2018
bcaf8b3
Fix typo in mod description
beeryt Nov 21, 2018
184e4ed
Support reloading from opened tin can
artur-kink Nov 21, 2018
9196c5f
refugee ranch: use a palette
mlangsdorf Nov 21, 2018
e775110
Lint archery.json
Nov 22, 2018
7ad4972
Lint crossbows.json
Nov 22, 2018
0051c81
Merge pull request #26697 from kwl01skz/patch-3
Rivet-the-Zombie Nov 22, 2018
ca4b22a
Move Favorite Tab category to json. Typo fix.
OzoneH3 Nov 22, 2018
2a5b2ca
Update json Blacklist
Nov 22, 2018
d43d421
expanded mre
NotFuji Nov 22, 2018
8d0838b
Use translate_marker instead of translate_marker_context
Pupsi-Mupsi Nov 22, 2018
5af65a9
removed duplicate beef
NotFuji Nov 22, 2018
d30e9b3
copy-from
NotFuji Nov 22, 2018
f064af6
player_display: fix crash in player_display with many traits
mlangsdorf Nov 22, 2018
0c2f273
Cast natural light regardless of brightness
jbytheway Nov 22, 2018
0d71c16
Test for seeing walls at night
jbytheway Nov 22, 2018
e195a0a
Mark opaque vehicle tiles as not outside
jbytheway Nov 22, 2018
961a8ac
Note a minor flaw in the transparency calculation
jbytheway Nov 22, 2018
35dc9dd
Merge pull request #26792 from Night-Pryanik/flowers-don't-collide-wi…
ZhilkinSerg Nov 22, 2018
6f7b1a6
Merge pull request #26800 from darktoes/crossbows/archery.JSON-Linting
ZhilkinSerg Nov 22, 2018
e2fe033
Merge pull request #26805 from mlangsdorf/display_fix
ZhilkinSerg Nov 22, 2018
0adb698
Use unique_ptr for global game
jbytheway Oct 26, 2018
094b914
Routine i18n updates as of Nov 23, 2018
BrettDong Nov 23, 2018
0873e1c
Display recently crafted recipes
OzoneH3 Nov 23, 2018
fddebd7
astyle
OzoneH3 Nov 23, 2018
b57cb00
game: move the chat() function into npctalk.cpp
mlangsdorf Nov 23, 2018
3a795dc
Merge pull request #26812 from BrettDong/i18n
Rivet-the-Zombie Nov 23, 2018
0c25b0c
npctalk: add group commands for followers to guard or follow
mlangsdorf Nov 23, 2018
856d521
Updated mil/police professions
NotFuji Nov 23, 2018
23956c8
Removed excess 9mm from swat
NotFuji Nov 23, 2018
c3ef203
And flashbang
NotFuji Nov 23, 2018
e6c3fd6
Added ski-mask allergy replacement
NotFuji Nov 23, 2018
ea12ae4
Forest trails - docs
ralreegorganon Nov 13, 2018
0621047
Forest trails - json
ralreegorganon Nov 13, 2018
0c65876
Forest trails - forest trail settings
ralreegorganon Nov 13, 2018
b2c3b18
Forest trails - add forest trail mapgen functions
ralreegorganon Nov 13, 2018
ee42fe2
Forest trails - add forest trail overmap functions
ralreegorganon Nov 13, 2018
da7a143
Translate help category names
Nov 23, 2018
921da7c
Translate help texts
Nov 23, 2018
e49c5bc
Store original help category names
Nov 23, 2018
b3296d1
Initialize Character fields
jbytheway Oct 26, 2018
014b6dd
Don't save uninitialized player_activity members
jbytheway Oct 26, 2018
ceab308
Avoid circular references between NPCs
jbytheway Nov 22, 2018
1d9982c
Merge pull request #26802 from Pupsi-Mupsi/bug-context
Rivet-the-Zombie Nov 24, 2018
1417012
Merge pull request #26814 from mlangsdorf/npc_group_commands
ZhilkinSerg Nov 24, 2018
4f4e326
Merge pull request #26806 from jbytheway/see_walls_at_night
ZhilkinSerg Nov 24, 2018
2e84874
Merge pull request #26807 from jbytheway/darkness_in_vehicles
ZhilkinSerg Nov 24, 2018
75e1069
Merge pull request #26819 from AMurkin/translate-help
ZhilkinSerg Nov 24, 2018
160421e
Merge pull request #26791 from OzoneH3/fav_rec
ZhilkinSerg Nov 24, 2018
9f40df2
Merge pull request #26813 from OzoneH3/recent_recipe
ZhilkinSerg Nov 24, 2018
565475f
Merge pull request #26821 from jbytheway/uninitialized_memory
ZhilkinSerg Nov 24, 2018
0825239
Merge pull request #26822 from jbytheway/leaks_in_tests
ZhilkinSerg Nov 24, 2018
2c9cd4a
Overhaul protection descriptions
jbytheway Nov 24, 2018
51ae740
Inform players that damage will reduce resistances
jbytheway Nov 24, 2018
f35326f
More separation lines in item description
jbytheway Nov 24, 2018
16bb6fc
Rename get_env_resist_w_filter
jbytheway Nov 24, 2018
de4721e
Linted professions.json
NotFuji Nov 24, 2018
626d80d
Linted recipe_deconstruction_package.json
NotFuji Nov 24, 2018
c7278a8
npc: add NPC_MISSION_GUARD_ALLY to is_guarding
mlangsdorf Nov 24, 2018
71730b6
Merge pull request #26803 from NotFuji/mre_stuff
ZhilkinSerg Nov 24, 2018
bbe2008
Merge pull request #26829 from mlangsdorf/group_guard_fix
ZhilkinSerg Nov 24, 2018
9f89194
Merge pull request #26828 from jbytheway/more_protection_description_…
ZhilkinSerg Nov 24, 2018
01105aa
Optimized headers
ZhilkinSerg Nov 24, 2018
ddfe014
Fixed incorrect roundings
ZhilkinSerg Nov 24, 2018
8e4c4a8
Fixed downcast
ZhilkinSerg Nov 24, 2018
8b87ef8
Fixed unique pointer reset
ZhilkinSerg Nov 24, 2018
5cb0208
Used bool literals
ZhilkinSerg Nov 24, 2018
12ce1e1
Do not copy loop variables
ZhilkinSerg Nov 24, 2018
6ce25e4
Removed redundant call to cstr
ZhilkinSerg Nov 24, 2018
7cc57b1
Replaced zero constant with nullptr
ZhilkinSerg Nov 24, 2018
9515404
Split up options_manager::init
jbytheway Nov 24, 2018
07e8f24
No more fins
NotFuji Nov 25, 2018
76c1d71
Idling Muscle Engines
LetterShapedGlyphs Nov 25, 2018
6c1af92
Palisade wall HP
I-am-Erk Nov 25, 2018
f6f8e92
Merge branch 'master' into ManualEngines
LetterShapedGlyphs Nov 25, 2018
9b87013
Update vehicle::last_update after unfolding it.
BevapDin Nov 25, 2018
4122a0e
Moved broken limb check
LetterShapedGlyphs Nov 25, 2018
d65b2a1
Updating tileset
rainbowjose Nov 25, 2018
cd6d89f
Rolled back some header include changes
ZhilkinSerg Nov 25, 2018
8704c4f
Fix some MRE typos
Cyrano7 Nov 25, 2018
003ccb9
Simplified variables in start_engines_finish
karthas077 Nov 25, 2018
36eaa96
Re-order GUI priority
LetterShapedGlyphs Nov 25, 2018
af9da91
Astyle
LetterShapedGlyphs Nov 25, 2018
05cf317
Merge pull request #26841 from Cyrano7/MRE
ZhilkinSerg Nov 25, 2018
45700fe
Merge pull request #26837 from BevapDin/hrs
ZhilkinSerg Nov 25, 2018
fdea4be
Merge pull request #26835 from I-am-Erk/Palisades-Erk
ZhilkinSerg Nov 25, 2018
38918e7
Merge pull request #26833 from jbytheway/split_huge_function
ZhilkinSerg Nov 25, 2018
bad4000
Merge pull request #26838 from Griffinhart/cygwin-fix
ZhilkinSerg Nov 25, 2018
dfe9dec
Merge pull request #26839 from rainbowjose/livetodead
ZhilkinSerg Nov 25, 2018
58807ac
Merge pull request #26773 from ralreegorganon/forest-trails
ZhilkinSerg Nov 25, 2018
e4d05a4
Merge pull request #26815 from NotFuji/milstuff
ZhilkinSerg Nov 25, 2018
e502364
Merge pull request #26832 from ZhilkinSerg/sa-2018-11-24
Rivet-the-Zombie Nov 25, 2018
d32485d
Merge pull request #26842 from Karthas077/CraftingSearch
OzoneH3 Nov 25, 2018
9d2bf21
Merge pull request #26840 from Karthas077/ManualEngines
Rivet-the-Zombie Nov 26, 2018
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
Prev Previous commit
Next Next commit
Changing vacuum-packed food to work the same as canned food (CleverRa…
…ven#26554)

* Changing vacuum-packed food to work the same as canned soup

Signed-off-by: Lance Finfrock <[email protected]>

* Adding 'obsolete' for removed recipes
  • Loading branch information
lancewf authored and kevingranade committed Nov 17, 2018
commit 8382228295f4f72ee213bc5139bb0c97a0ba2a7c
38 changes: 9 additions & 29 deletions data/json/items/comestibles.json
Original file line number Diff line number Diff line change
Expand Up @@ -1845,26 +1845,6 @@
"stack_size": 2,
"fun": 2
},
{
"type": "COMESTIBLE",
"id": "fish_vac",
"name": "salted fish slices",
"name_plural": "salted fish slices",
"weight": 84,
"color": "white",
"spoils_in": "2 days",
"container": "bag_plastic",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -5,
"calories": 191,
"description": "Fish fillets cured in brine and vacuum-packed. Salty but tasty in a pinch.",
"price": 1000,
"material": "flesh",
"volume": 1,
"charges": 2,
"fun": 3
},
{
"type": "COMESTIBLE",
"id": "fish_fried",
Expand Down Expand Up @@ -7627,17 +7607,17 @@
},
{
"type": "COMESTIBLE",
"id": "meat_vac",
"id": "meat_salted",
"name": "salted meat slice",
"weight": 120,
"color": "red",
"spoils_in": "2 days",
"container": "bag_plastic",
"container": "plastic_bag_vac",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -5,
"calories": 182,
"description": "Meat slices cured in brine and vacuum-packed. Salty but tasty in a pinch.",
"description": "Meat slices cured in brine. Salty but tasty in a pinch.",
"price": 500,
"material": "flesh",
"volume": 1,
Expand All @@ -7647,20 +7627,20 @@
},
{
"type": "COMESTIBLE",
"id": "hflesh_vac",
"copy-from": "meat_vac",
"id": "hflesh_salted",
"copy-from": "meat_salted",
"name": "salted simpleton slices",
"description": "Human flesh slices cured in brine and vacuum-packed. Salty but tasty in a pinch.",
"material": "hflesh"
},
{
"type": "COMESTIBLE",
"id": "veggy_vac",
"id": "veggy_salted",
"name": "salted veggy chunk",
"weight": 121,
"color": "green",
"spoils_in": "3 days",
"container": "bag_plastic",
"container": "plastic_bag_vac",
"comestible_type": "FOOD",
"symbol": "%",
"quench": -5,
Expand All @@ -7675,12 +7655,12 @@
},
{
"type": "COMESTIBLE",
"id": "apple_vac",
"id": "apple_sugar",
"name": "fruit slice",
"weight": 53,
"color": "red",
"spoils_in": "7 days 12 hours",
"container": "bag_plastic",
"container": "plastic_bag_vac",
"comestible_type": "FOOD",
"symbol": "%",
"quench": 3,
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/carnivore.json
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@
"name_plural": "salted fish",
"//": "Two fillets of fish needed here.",
"description": "Salty dried fish that lasts for a long time, but will make you thirsty.",
"weight": 44,
"weight": 84,
"container": "bag_plastic",
"color": "light_gray",
"spoils_in": "24 days",
Expand Down
18 changes: 18 additions & 0 deletions data/json/items/containers.json
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,24 @@
"unseals_into": "null",
"qualities": [ [ "CONTAIN", 1 ], [ "BOIL", 2 ] ]
},
{
"id": "plastic_bag_vac",
"type": "CONTAINER",
"category": "other",
"name": "vacuum-packed bag",
"description": "This is a bag of vacuum-packed food.",
"weight": 2,
"volume": 0,
"contains": 2,
"price": 0,
"material": "plastic",
"symbol": "%",
"color": "red",
"watertight": false,
"preserves": true,
"rigid": false,
"unseals_into": "bag_plastic"
},
{
"id": "can_food",
"type": "CONTAINER",
Expand Down
50 changes: 50 additions & 0 deletions data/json/items/migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -470,5 +470,55 @@
"id": "lasagne_cooked",
"type": "MIGRATION",
"replace": "spaghetti_cooked"
},
{
"id": "fish_vac",
"type": "MIGRATION",
"replace": "salted_fish"
},
{
"id": "apple_vac",
"type": "MIGRATION",
"replace": "apple_sugar"
},
{
"id": "hflesh_vac",
"type": "MIGRATION",
"replace": "hflesh_salted"
},
{
"id": "meat_vac",
"type": "MIGRATION",
"replace": "meat_salted"
},
{
"id": "veggy_vac",
"type": "MIGRATION",
"replace": "veggy_salted"
},
{
"id": "bag_fish_vac",
"type": "MIGRATION",
"replace": "salted_fish"
},
{
"id": "bag_apple_vac",
"type": "MIGRATION",
"replace": "apple_sugar"
},
{
"id": "bag_hflesh_vac",
"type": "MIGRATION",
"replace": "hflesh_salted"
},
{
"id": "bag_meat_vac",
"type": "MIGRATION",
"replace": "meat_salted"
},
{
"id": "bag_veggy_vac",
"type": "MIGRATION",
"replace": "veggy_salted"
}
]
101 changes: 0 additions & 101 deletions data/json/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -315,107 +315,6 @@
"techniques": [ "WBLOCK_1", "BRUTAL", "SWEEP" ],
"flags": [ "NONCONDUCTIVE" ]
},
{
"id": "bag_apple_vac",
"type": "GENERIC",
"category": "food",
"name": "vacuum-packed fruit slice",
"description": "This is a bag of vacuum packed fruit slices in plastic packaging. Use to open and eat to enjoy.",
"weight": 152,
"volume": 1,
"price": 500,
"bashing": 8,
"material": [ "plastic", "veggy" ],
"symbol": "%",
"color": "red",
"use_action": {
"target": "apple_vac",
"msg": "You open the vacuum pack, exposing it to the atmosphere.",
"container": "bag_plastic",
"menu_text": "Open bag",
"type": "transform"
}
},
{
"id": "bag_fish_vac",
"type": "GENERIC",
"category": "food",
"name": "vacuum-packed fish slice",
"description": "This is a bag of vacuum packed fish slices in plastic packaging. Use to open and eat to enjoy.",
"weight": 240,
"volume": 1,
"price": 750,
"bashing": 8,
"material": [ "plastic", "flesh" ],
"symbol": "%",
"color": "light_gray",
"use_action": {
"target": "fish_vac",
"msg": "You open the vacuum pack, exposing it to the atmosphere.",
"container": "bag_plastic",
"menu_text": "Open bag",
"type": "transform"
}
},
{
"id": "bag_hflesh_vac",
"copy-from": "bag_meat_vac",
"type": "GENERIC",
"name": "vacuum-packed salted simpleton slice",
"description": "This is a bag of vacuum packed human flesh slices in plastic packaging. Use to open and eat to enjoy.",
"material": [ "plastic", "hflesh" ],
"use_action": {
"target": "hflesh_vac",
"msg": "You open the vacuum pack, exposing it to the atmosphere.",
"container": "bag_plastic",
"menu_text": "Open bag",
"type": "transform"
}
},
{
"id": "bag_meat_vac",
"type": "GENERIC",
"category": "food",
"name": "vacuum-packed meat slice",
"name_plural": "vacuum-packed meat slices",
"description": "This is a bag of vacuum packed meat slices in plastic packaging. Use to open and eat to enjoy.",
"weight": 240,
"volume": 1,
"price": 750,
"bashing": 8,
"material": [ "plastic", "flesh" ],
"symbol": "%",
"color": "red",
"use_action": {
"target": "meat_vac",
"msg": "You open the vacuum pack, exposing it to the atmosphere.",
"container": "bag_plastic",
"menu_text": "Open bag",
"type": "transform"
}
},
{
"id": "bag_veggy_vac",
"type": "GENERIC",
"category": "food",
"name": "vacuum-packed veggy chunk",
"description": "This is a bag of vacuum packed vegetable slices in plastic packaging. Use to open and eat to enjoy.",
"weight": 242,
"volume": 1,
"price": 650,
"bashing": 8,
"cutting": 1,
"material": [ "plastic", "veggy" ],
"symbol": "%",
"color": "green",
"use_action": {
"target": "veggy_vac",
"msg": "You open the vacuum pack, exposing it to the atmosphere.",
"container": "bag_plastic",
"menu_text": "Open bag",
"type": "transform"
}
},
{
"id": "banjo",
"type": "TOOL",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/butcher.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
[ "hotdogs_frozen", 6 ],
[ "sausage", 4 ],
[ "sweet_sausage", 2 ],
[ "bag_meat_vac", 2 ],
[ "meat_salted", 2 ],
[ "meat_canned", 2 ],
[ "offal_canned", 2 ],
[ "meat_smoked", 2 ],
Expand Down
Loading