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

Merge with upstream #2

Merged
merged 516 commits into from
Feb 13, 2020
Merged
Changes from 1 commit
Commits
Show all changes
516 commits
Select commit Hold shift + click to select a range
be48170
Remove placeholder repairs like
Brian-Otten Feb 5, 2020
b891bc9
Update json_info barrel_length description
snipercup Feb 5, 2020
fb0977d
Corrected whistle multitool weight and volume
l29ah Feb 5, 2020
9d71d56
Armor name to object
snipercup Feb 5, 2020
79afbe7
Update src/crafting.cpp
SeventhSandwich Feb 6, 2020
7339e22
Update src/crafting.cpp
SeventhSandwich Feb 6, 2020
88043ab
Update src/crafting.cpp
SeventhSandwich Feb 6, 2020
0b568b8
Display item volumes with a higher precision
l29ah Feb 6, 2020
13c972d
Merge branch 'master' into refactor-eating-morale
wapcaplet Feb 6, 2020
0f5b15d
Store g->m.veh_at(pt); inline food.rotten()
wapcaplet Feb 6, 2020
4c2a7a7
Update src/crafting.cpp
SeventhSandwich Feb 6, 2020
075927a
Merge pull request #37742 from l29ah/whistle-multitool
ZhilkinSerg Feb 6, 2020
baacc0b
Merge pull request #37743 from snipercup/Armor-name-to-object
ZhilkinSerg Feb 6, 2020
9039f17
Merge pull request #37740 from snipercup/Update-json_info-barrel_leng…
ZhilkinSerg Feb 6, 2020
6ea86b8
Merge pull request #37739 from Brian-Otten/Replace-bad-repairs-like-f…
ZhilkinSerg Feb 6, 2020
4e4aca2
Gun barrel length to string (#37738)
snipercup Feb 6, 2020
f45a15f
Merge pull request #37744 from l29ah/volume-ml-display
ZhilkinSerg Feb 6, 2020
f2d36e9
Merge branch 'master' into you-dont-know-recipes
wapcaplet Feb 6, 2020
868f833
kitchen item group revamp
LilShiningMan Feb 6, 2020
e252557
Merge pull request #37751 from LilShiningMan/LSM---kitchen-item-list-…
ZhilkinSerg Feb 6, 2020
977bca1
Merge pull request #37709 from SeventhSandwich/disassemble_ammo_fix
Rivet-the-Zombie Feb 6, 2020
de46330
Fix astyle regression
ZhilkinSerg Feb 6, 2020
f79dc2f
Name to object
snipercup Feb 6, 2020
6915fcd
Added missing zeds
RarkGrames Feb 6, 2020
dfe8179
Appease clang
ZhilkinSerg Feb 6, 2020
6ff7411
Merge pull request #37755 from RarkGrames/Military-base-monstergroups…
ZhilkinSerg Feb 6, 2020
e71e450
Merge pull request #37756 from snipercup/tool-name-to-object-2
ZhilkinSerg Feb 6, 2020
37a3948
Comestible alcohol name to object (#37757)
snipercup Feb 6, 2020
5719845
Gun barrel length to string (#37754)
snipercup Feb 6, 2020
7f9aeeb
Audit holster capacities (#37741)
Feb 6, 2020
23291db
Gun volume audit for .45 Long Colt (#37681)
Feb 6, 2020
7bb62aa
Change pouch to ragpouch in looks_like
snipercup Feb 6, 2020
59e0b5d
Added position query for spray can and markers actions.
eilaattwood Feb 6, 2020
77f0719
Monsterdrops.json sorting
RarkGrames Feb 6, 2020
9a729a8
Name to object
snipercup Feb 6, 2020
7229319
Merge pull request #37765 from snipercup/Armor-name-to-object-2
ZhilkinSerg Feb 6, 2020
4065a16
Merge pull request #37762 from RarkGrames/Monsterdrops-sorting
ZhilkinSerg Feb 6, 2020
16987c9
Merge pull request #37759 from snipercup/fix-look_like-pouch
ZhilkinSerg Feb 6, 2020
dafeca7
Update recipe_food.json
Feb 6, 2020
d267b40
Allowed scrolling while examining items in AIM
Night-Pryanik Feb 6, 2020
1353496
Updated turret mount description
olanti-p Feb 6, 2020
14a0ab2
Merge pull request #37774 from olanti-p/update-turret-mount-description
ZhilkinSerg Feb 6, 2020
bfab870
Merge pull request #37773 from Night-Pryanik/allow-scrolling-while-ex…
ZhilkinSerg Feb 6, 2020
e201d28
Tool name to object leave the s, change volume to string (#37770)
snipercup Feb 6, 2020
7173d8a
Generic name to object, leave the s (#37767)
snipercup Feb 6, 2020
e43e9ec
Merge pull request #37761 from eilaattwood/write-on-walls
ZhilkinSerg Feb 6, 2020
b2cc79a
Added a few names to en.json (#37769)
Thomasasia Feb 6, 2020
06542f4
Merge remote-tracking branch 'upstream/master' into Fix-Sauteed-Fiddl…
Feb 6, 2020
7f8158e
Tool name to object (#37775)
snipercup Feb 6, 2020
40c494c
Cardboard as a material (#37764)
RarkGrames Feb 6, 2020
af493d6
Update house_wooded.json
curstwist Feb 6, 2020
1968cae
Update recipe_food.json
Feb 6, 2020
3beed9a
Remove Circus Strongman
Xanmyral Feb 7, 2020
3228bad
WIP Attempt to use get_available_recipes
wapcaplet Feb 7, 2020
5617811
Fix crash, tweak message
wapcaplet Feb 7, 2020
b9a79d3
Prevent broken legs dropping weapon
Ramza13 Feb 7, 2020
00f2424
Merge branch 'master' into refactor-eating-morale
wapcaplet Feb 7, 2020
73da9d2
Add new map::has_nearby_table function
wapcaplet Feb 7, 2020
f4d6648
Use map::has_nearby_table for eating/butchering
wapcaplet Feb 7, 2020
d54f2fb
Add debug menu item for spawning nested mapgen
ralreegorganon Feb 6, 2020
8acd318
Name to object, leave the s
snipercup Feb 7, 2020
ebb4e4c
Name to object, flags to array
snipercup Feb 7, 2020
f52c2de
Name to object, fix looks_like
snipercup Feb 7, 2020
6c48955
Name to object, flags to array
snipercup Feb 7, 2020
29de372
Merge pull request #37779 from ashGlaw/Fix-Sauteed-Fiddleheads
Rivet-the-Zombie Feb 7, 2020
70de8fa
Name to object
snipercup Feb 7, 2020
2cd4312
Name to object
snipercup Feb 7, 2020
016623e
Name to object
snipercup Feb 7, 2020
b3bc95d
Name to object, volume to string
snipercup Feb 7, 2020
f7c0472
Name to object
snipercup Feb 7, 2020
4dc5b81
Name to object
snipercup Feb 7, 2020
e2cf75c
Merge pull request #37792 from snipercup/Tool-name-to-object-leave-the-s
ZhilkinSerg Feb 7, 2020
999937b
Merge pull request #37793 from snipercup/Comestible-modern-json
ZhilkinSerg Feb 7, 2020
cb6e55e
Gun name to object (#37795)
snipercup Feb 7, 2020
5304aa1
Armor name to object (#37796)
ZhilkinSerg Feb 7, 2020
7106502
Merge pull request #37797 from snipercup/ammo-modern-json
ZhilkinSerg Feb 7, 2020
f4f0434
Generic modern json (#37799)
snipercup Feb 7, 2020
f24a046
Merge pull request #37790 from wapcaplet/wapcaplet-has-table-nearby
ZhilkinSerg Feb 7, 2020
a4cf065
Merge pull request #37788 from ralreegorganon/nested-mapgen-debug
ZhilkinSerg Feb 7, 2020
3e4a4ea
Merge pull request #37780 from curstwist/house-stair-fix
ZhilkinSerg Feb 7, 2020
7ad7c3d
Allow using short cordage pieces to craft candles (#37777)
l29ah Feb 7, 2020
3569c49
Merge pull request #37786 from Ramza13/dropping
ZhilkinSerg Feb 7, 2020
9aa7645
Check if entire pane is liquid items before allowing moving all in AI…
Feb 7, 2020
8340fba
Skimming through book's contents won't show skill increasing indicator
Night-Pryanik Feb 7, 2020
09073af
Remove DROPS_AMMO from firefighter bot
CSHague Feb 7, 2020
c1d5a15
Merge branch 'master' into refactor-eating-morale
wapcaplet Feb 7, 2020
3000130
Routine i18n updates on 7 Feb 2020
BrettDong Feb 7, 2020
6f354d1
Migrate direct item spawns
ifreund Feb 7, 2020
dc49cec
Always prompt for direction if autoselect disabled
ifreund Feb 7, 2020
839babb
Merge pull request #37802 from BrettDong/i18n
ZhilkinSerg Feb 7, 2020
8f085f4
Merge pull request #37801 from CSHague/patch-6
ZhilkinSerg Feb 7, 2020
ff590a0
Rename bodypart name variables to better explain their functions
Qrox Feb 7, 2020
8ebd79c
Migrate bodypart names to class translation
Qrox Feb 7, 2020
eeee409
Update TRANSLATING.md and extract_json_strings.py
Qrox Feb 7, 2020
e7271b0
Merge pull request #37803 from ifreund/migrate-direct-item-spawn
ZhilkinSerg Feb 7, 2020
73ddf8e
aim_mv to int
Kilvoctu Feb 7, 2020
5885a7e
Fix typo
olanti-p Feb 7, 2020
5079712
Merge pull request #37814 from olanti-p/pseuso-typo-fix
ZhilkinSerg Feb 7, 2020
63798be
Merge pull request #37807 from Qrox/bodypart-names
ZhilkinSerg Feb 7, 2020
073e2dc
Merge pull request #37805 from ifreund/tweak-direction-prompt
ZhilkinSerg Feb 7, 2020
543a969
Merge pull request #37800 from Night-Pryanik/skimming-book-doesn't-sh…
ZhilkinSerg Feb 7, 2020
09de9e8
Merge pull request #37783 from Xanmyral/Remove-Circus-Strong
ZhilkinSerg Feb 7, 2020
d31cd4a
Display appropriate item values with less precision (#37812)
Kilvoctu Feb 7, 2020
8e990f5
Increase body bag storage capacity (#37723)
Alterforce Feb 7, 2020
c398d45
Update tileset compose colorspace handling
ralreegorganon Feb 7, 2020
793e3b5
WIP Add test for item recipes in description
wapcaplet Feb 7, 2020
dc4bf2e
Merge branch 'master' into refactor-eating-morale
wapcaplet Feb 8, 2020
5341545
Fix NPC equip message
Ramza13 Feb 8, 2020
e48836f
Added scrub brush to washing kit recipe
Feb 8, 2020
f7bc0e6
Merge pull request #37818 from ralreegorganon/tileset-compose-colorsp…
ZhilkinSerg Feb 8, 2020
cb1289a
Merge pull request #37825 from ashGlaw/Washing-Kit-Recipe-Expansion
ZhilkinSerg Feb 8, 2020
d4566de
Merge pull request #37824 from Ramza13/npc_equip_mutant
ZhilkinSerg Feb 8, 2020
0a5669c
Explosives requirements infrastructure (#37822)
Brian-Otten Feb 8, 2020
b0d1189
Merge pull request #37809 from Kilvoctu/moves-int
ZhilkinSerg Feb 8, 2020
45eb2f8
Merge pull request #37706 from I-am-Erk/field-lookslike
Rivet-the-Zombie Feb 8, 2020
7fd16fa
Fix reference to non-existing item group
BevapDin Feb 8, 2020
4a7753d
Merge pull request #37829 from BevapDin/bor
ZhilkinSerg Feb 8, 2020
badef33
Add Debian/Ubuntu install instructions to README
reinerh Feb 8, 2020
e694f9e
Remove reference to game::u from code in Character/player/avatar memb…
BevapDin Feb 8, 2020
f8f5817
Add missing string_format call (#37831)
ifreund Feb 8, 2020
302dadf
Add flashlight battery to tutorial and update keybinds (#37832)
ifreund Feb 8, 2020
eec480f
Merge pull request #37835 from BevapDin/bdv
ZhilkinSerg Feb 8, 2020
dd61a9d
Merge pull request #37833 from reinerh/master
ZhilkinSerg Feb 8, 2020
74ebe38
Merge branch 'master' into refactor-eating-morale
wapcaplet Feb 8, 2020
a58d3ad
Added WASH_HARD_ITEMS to scrub brush
Feb 8, 2020
7c343bb
Factor out `map::has_nearby_chair` for eating
wapcaplet Feb 8, 2020
baff81f
Merge pull request #37840 from ashGlaw/Scrub-Brush-Usefulness-Expansion
ZhilkinSerg Feb 8, 2020
62c8b0f
Set a very low freezing_point for spice
AMurkin Feb 8, 2020
33ca8a7
Don't initialize vp until we need it
wapcaplet Feb 8, 2020
780e969
Merge branch 'master' into you-dont-know-recipes
wapcaplet Feb 8, 2020
3ffc4f0
Use ternary expression instead of 6-liner
wapcaplet Feb 8, 2020
93d5c85
Fix type cast warnings
olanti-p Feb 8, 2020
d901ec6
Changed type to match docs
olanti-p Feb 8, 2020
2b05dec
Looks_like for rifle magazines
TheShadowFerret Feb 6, 2020
5c6c1ce
Add looks_like to pistol magazines
TheShadowFerret Feb 6, 2020
cd226db
Split off looks_like for revolver speedloaders
TheShadowFerret Feb 7, 2020
78705fb
Add magazine looks_like for SMGs
TheShadowFerret Feb 7, 2020
490001b
Looks_like for pressurized tanks
TheShadowFerret Feb 9, 2020
fee9889
Looks_like for shotgun mags and speedloaders
TheShadowFerret Feb 9, 2020
4624054
Nail rifle magazine looks_like
TheShadowFerret Feb 9, 2020
1ca4f95
Merge pull request #37843 from olanti-p/fix-mut-lum-float
ZhilkinSerg Feb 9, 2020
c8871f1
Merge pull request #37844 from olanti-p/fix-warnings
ZhilkinSerg Feb 9, 2020
f0ef673
UltiCa updates to mainline (#37846)
I-am-Erk Feb 9, 2020
346877f
Merge pull request #37826 from AMurkin/add-flag-edible-frozen
ZhilkinSerg Feb 9, 2020
ef0f3c5
Looks_like for 8x40 and .410 mags
TheShadowFerret Feb 9, 2020
3561ef3
WIP Improve item recipe tests (still failing)
wapcaplet Feb 9, 2020
aec402c
Looks_like for explosive launchers and .50 ammo belt
TheShadowFerret Feb 9, 2020
b017402
Remove duplicate looks_like
TheShadowFerret Feb 9, 2020
f39733d
Missing comma
TheShadowFerret Feb 9, 2020
6fb8d13
Fix item recipe info test cases
wapcaplet Feb 9, 2020
39d32cf
Remove unused crowbar variable
wapcaplet Feb 9, 2020
da56791
Migrate M47 from Magiclysm with Generic Guns active (#37659)
Feb 9, 2020
0e870ea
Merge pull request #37748 from LaVeyanFiend/Looks_Like_Mags
Rivet-the-Zombie Feb 9, 2020
e55f98d
Add looks_like support for fields (#37726)
ZhilkinSerg Feb 9, 2020
92a81b5
Merge remote-tracking branches 'origin/pr/37713' and 'origin/pr/37661'
codemime Feb 9, 2020
a5829a0
fix #37614
jkraybill Feb 9, 2020
3935ceb
Name to object
snipercup Feb 9, 2020
f2881ee
Python script shebang cleanup (#37859)
jbytheway Feb 9, 2020
32d5213
Merge pull request #37858 from jkraybill/37614b
ZhilkinSerg Feb 9, 2020
9e9ad73
Fix Nopalitos recipe (#37857)
jkraybill Feb 9, 2020
e5d9448
Merge pull request #37862 from snipercup/Generic-name-to-object
ZhilkinSerg Feb 9, 2020
5e69069
Fix pickup when mounted (#37861)
8street Feb 9, 2020
55195aa
Fix typo in tainted blood description (#37853)
Drack820 Feb 9, 2020
7a38932
Fix telescope eyes not preventing eye mutations (#37849)
Ramza13 Feb 9, 2020
4e4f579
Use setting where needed
Ramza13 Feb 9, 2020
7f02af3
Fix astyle regression
ifreund Feb 9, 2020
fd9640e
Merge pull request #37872 from ifreund/astyle-reg
codemime Feb 10, 2020
b660524
Generic name to object (#37868)
snipercup Feb 10, 2020
1e58b1d
Add basements 1 (#37863)
curstwist Feb 10, 2020
60eb74e
add basements to house_garage series (#37864)
curstwist Feb 10, 2020
b7876ca
Remove binoculars from Bionic Sniper profession (#37880)
Cyrano7 Feb 10, 2020
1b61a64
Add basements 3 (#37873)
curstwist Feb 10, 2020
64ea322
Name to object, leave the s (#37870)
snipercup Feb 10, 2020
901eb71
Add script to generate tags for CDDA json data (#37877)
jbytheway Feb 10, 2020
315d8a5
Fix shooter earmuff not deafening when off (#37876)
Feb 10, 2020
71ab5ea
#37817 fix
jkraybill Feb 10, 2020
55e1009
Added tweaks
RarkGrames Feb 10, 2020
3cc14f5
Fix possible DBZ in vehicle code
ZhilkinSerg Feb 10, 2020
e9755fa
Comestible name to object (#37885)
snipercup Feb 10, 2020
1dc79b2
#37817 fix (#37884)
ZhilkinSerg Feb 10, 2020
19069c2
Gun barrel length to string
snipercup Feb 10, 2020
1d0d809
Merge pull request #37887 from snipercup/Gun-barrel-length-to-string
ZhilkinSerg Feb 10, 2020
0a401c8
Merge pull request #37871 from Ramza13/auto_forage
ZhilkinSerg Feb 10, 2020
a401c78
Make sees player mod compatible with retrodays+
ZhilkinSerg Feb 10, 2020
635b21a
Update food.json
RarkGrames Feb 10, 2020
a39ac90
Merge pull request #37890 from RarkGrames/Vet-Survivor-Z-tweaks
ZhilkinSerg Feb 10, 2020
2073ce1
Merge pull request #37891 from RarkGrames/Pasta-item-group-fix
ZhilkinSerg Feb 10, 2020
082e978
Encapsulate ter
ifreund Feb 10, 2020
98ac91f
Encapsulate frn
ifreund Feb 10, 2020
2f3e33d
Encapsulate lum
ifreund Feb 10, 2020
dcd1728
Partially encapsulate itm
ifreund Feb 10, 2020
1bb530e
Partially encapsulate fld
ifreund Feb 10, 2020
d93f263
Encapsulate trp
ifreund Feb 10, 2020
a0f97cd
Make submap privately inherit from maptile_soa
ifreund Feb 10, 2020
bb27d5a
Use static constexpr in class
ifreund Feb 10, 2020
56851a6
npc: only report attitude changes that the avatar can see
mlangsdorf Feb 10, 2020
c5dc07d
Remove non-existing ammo effect from code
ZhilkinSerg Feb 10, 2020
59efb9a
Merge pull request #37889 from CleverRaven/mod-sees-player-retrodays-…
Rivet-the-Zombie Feb 10, 2020
61272b3
missedmigrations, riot bot, blacklist more, missed casings, (#37888)
tenmillimaster Feb 10, 2020
fd705dc
add more basements (#37900)
curstwist Feb 11, 2020
75b4189
Create CODEOWNERS file to alert mod maintainers to changes in their m…
I-am-Erk Feb 11, 2020
a619b02
Allow user font dir
ZhilkinSerg Feb 10, 2020
5a90688
Transfer inhaler to NPC inventory on mission end (#37454)
wapcaplet Feb 11, 2020
0dcf11e
Fix map memory edge case (#37460)
Trioct Feb 11, 2020
74040d0
Don't add duplicate options to the page (#37548)
ZhilkinSerg Feb 11, 2020
9f4e399
Clear loaded scenario blacklist when leaving world
anothersimulacrum Feb 11, 2020
6d26b22
Adjust grenade values (#37585)
Brian-Otten Feb 11, 2020
7572e38
Clear the screen after exiting from character creation UI (#37915)
Night-Pryanik Feb 11, 2020
922fcd2
Merge pull request #37914 from anothersimulacrum/scen-bl
ZhilkinSerg Feb 11, 2020
6228457
Comestible name to object (#37907)
snipercup Feb 11, 2020
eb64734
Ammo modern json (#37909)
snipercup Feb 11, 2020
7404a1e
Gun name to object (#37903)
snipercup Feb 11, 2020
f7a5213
Merge pull request #37896 from mlangsdorf/visible_npc_attitude_change
ZhilkinSerg Feb 11, 2020
4ab395e
Add houses for existing basements (#37902)
curstwist Feb 11, 2020
af70a99
Merge pull request #37898 from CleverRaven/fix-non-existent-ae
Rivet-the-Zombie Feb 11, 2020
9fc9910
Name to object leave the s, double have decimal
snipercup Feb 11, 2020
5b0355c
Change hay into bale of hay (#37924)
arijust Feb 11, 2020
3a66527
Update colors.json (#37854)
8street Feb 11, 2020
07d5448
Craft soapy water out of soap flakes (#37878)
Cyrano7 Feb 11, 2020
e4373aa
Update pages.h
SeventhSandwich Feb 11, 2020
9b081aa
add more basements (#37931)
curstwist Feb 11, 2020
477b5b9
Tweaked description window x start point
Night-Pryanik Feb 11, 2020
011455f
Added recipe for ghee (#37913)
ashGlaw Feb 11, 2020
9d33e5e
Merge pull request #37938 from Night-Pryanik/character-creation-menu-fix
ZhilkinSerg Feb 11, 2020
ae561f6
Merge pull request #37932 from SeventhSandwich/map_management_doc_edit
ZhilkinSerg Feb 11, 2020
b75d7db
'Remove attached part first.' message displays the part name (#37922)
AMurkin Feb 11, 2020
7b82082
Merge pull request #37923 from snipercup/Ammo-modern-json-2
ZhilkinSerg Feb 11, 2020
d3788e1
Changelog jan 2020 (#37881)
kevingranade Feb 11, 2020
ab75d68
Fix documentation typo
kevingranade Feb 11, 2020
36d1aa4
Change food recipes in minor ways to improve utelization of ingredien…
ashGlaw Feb 12, 2020
09e4c23
houses for legacy basements (#37939)
curstwist Feb 12, 2020
d134d6e
add more basic basements (#37940)
curstwist Feb 12, 2020
eb555fa
add last basements (#37948)
curstwist Feb 12, 2020
72820b5
Gun name to object (#37941)
snipercup Feb 12, 2020
08794ba
Merge pull request #37886 from CleverRaven/fix-DBZ-2020-02-10
Rivet-the-Zombie Feb 12, 2020
a39b01f
Expand looks_like for terrain (#37957)
I-am-Erk Feb 12, 2020
3289d72
Gun-name-to-object-leave-the-s
snipercup Feb 12, 2020
829501c
Allow meat scraps as ingredient in meat sandwiches (#37958)
bug-sniper Feb 12, 2020
571c690
Merge pull request #37966 from snipercup/Gun-name-to-object-leave-the-s
ZhilkinSerg Feb 12, 2020
b500988
move (labels) sound out of needs
Kilvoctu Feb 12, 2020
e50c4a9
Tool_armor gun monster name to object
snipercup Feb 12, 2020
cd7fe08
fix Repairs like balclava (#37967)
snipercup Feb 12, 2020
0ec17df
Format bug report template comments as such (#37963)
l29ah Feb 12, 2020
c84712e
Generic, bionic_item modern json (#37975)
snipercup Feb 12, 2020
be76bfb
Merge pull request #37972 from snipercup/Tool_armor-gun-monster-name-…
ZhilkinSerg Feb 12, 2020
f7cd6e8
Merge pull request #37973 from Kilvoctu/remove-duplicate-sound-label-…
ZhilkinSerg Feb 12, 2020
b9b3901
Abandon camp fix (#37976)
Feb 12, 2020
ca752b6
Add line to fix test
Kilvoctu Feb 13, 2020
4eca2cd
Merge pull request #37988 from Kilvoctu/panel-test-fix
ZhilkinSerg Feb 13, 2020
3a8c5fb
Merge pull request #37893 from ifreund/submap-encapsulation
Rivet-the-Zombie Feb 13, 2020
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
Gun barrel length to string (CleverRaven#37754)
* Gun barrel length to string

* Correct volumes

* Actual volumes based on testing from master

* Gun barrel length to string
snipercup authored Feb 6, 2020
commit 5719845adc8be123836f9879b7dc172b9da72658
2 changes: 1 addition & 1 deletion data/json/items/gun/270win.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"durability": 8,
"blackpowder_tolerance": 24,
"clip_size": 4,
"barrel_length": 3,
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
}
]
6 changes: 3 additions & 3 deletions data/json/items/gun/300.json
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@
"dispersion": 90,
"durability": 8,
"min_cycle_recoil": 4770,
"barrel_length": 2,
"barrel_length": "500 ml",
"magazines": [ [ "300", [ "m2010mag" ] ] ],
"flags": [ "NEVER_JAMS" ]
},
@@ -43,7 +43,7 @@
"durability": 8,
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_length": 3,
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE" ]
},
{
@@ -66,7 +66,7 @@
"durability": 8,
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_length": 3,
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE" ]
}
]
2 changes: 1 addition & 1 deletion data/json/items/gun/3006.json
Original file line number Diff line number Diff line change
@@ -174,7 +174,7 @@
"durability": 8,
"blackpowder_tolerance": 24,
"clip_size": 4,
"barrel_length": 3,
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
},
{
10 changes: 5 additions & 5 deletions data/json/items/gun/308.json
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
"durability": 8,
"min_cycle_recoil": 2700,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"barrel_length": 2,
"barrel_length": "500 ml",
"magazines": [ [ "308", [ "falmag", "falbigmag", "fal_makeshiftmag" ] ] ]
},
{
@@ -123,7 +123,7 @@
"dispersion": 110,
"durability": 8,
"min_cycle_recoil": 2700,
"barrel_length": 2,
"barrel_length": "500 ml",
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
@@ -238,7 +238,7 @@
"durability": 6,
"blackpowder_tolerance": 60,
"reload": 200,
"barrel_length": 2,
"barrel_length": "500 ml",
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
@@ -276,7 +276,7 @@
"durability": 9,
"blackpowder_tolerance": 24,
"clip_size": 3,
"barrel_length": 3,
"barrel_length": "750 ml",
"flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
},
{
@@ -314,7 +314,7 @@
"dispersion": 85,
"durability": 9,
"min_cycle_recoil": 2700,
"barrel_length": 2,
"barrel_length": "500 ml",
"default_mods": [ "rifle_scope", "cheek_pad" ],
"magazines": [ [ "308", [ "m14mag", "m14smallmag", "m14_makeshiftmag" ] ] ],
"valid_mod_locations": [
4 changes: 2 additions & 2 deletions data/json/items/gun/50.json
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@
"ranged_damage": -5,
"dispersion": 130,
"durability": 8,
"barrel_length": 5,
"barrel_length": "1250 ml",
"default_mods": [ "bipod", "rifle_scope", "muzzle_brake" ],
"magazine_well": 1,
"magazines": [ [ "50", [ "m107a1mag" ] ] ],
@@ -45,7 +45,7 @@
"dispersion": 250,
"durability": 8,
"reload": 400,
"barrel_length": 5,
"barrel_length": "1250 ml",
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 3 ] ],
"valid_mod_locations": [
[ "accessories", 4 ],
2 changes: 1 addition & 1 deletion data/json/items/gun/762.json
Original file line number Diff line number Diff line change
@@ -59,7 +59,7 @@
"dispersion": 160,
"durability": 9,
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
"barrel_length": 1,
"barrel_length": "250 ml",
"default_mods": [ "folding_stock" ],
"valid_mod_locations": [
[ "accessories", 4 ],
2 changes: 1 addition & 1 deletion data/json/items/gun/762R.json
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@
"dispersion": 90,
"durability": 10,
"clip_size": 5,
"barrel_length": 4,
"barrel_length": "1000 ml",
"valid_mod_locations": [
[ "accessories", 4 ],
[ "barrel", 1 ],
2 changes: 1 addition & 1 deletion data/json/items/gun/shot.json
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@
"looks_like": "mossberg_500",
"default_mods": [ "sights_mount", "underbarrel_mount" ],
"price": 70000,
"barrel_length": 0,
"barrel_length": "0 ml",
"clip_size": 9
},
{