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.

Sign up for GitHub

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

Jump to bottom

Add map_bash_info to fields #37865

Merged
merged 39 commits into from
Mar 10, 2020
Merged

Add map_bash_info to fields #37865

merged 39 commits into from
Mar 10, 2020

Conversation

Fris0uman
Copy link
Contributor

Summary

SUMMARY: Infrastructure "Add map_bash_info to fields "

Purpose of change

Add map_bash_info to fields
Make gum web bashable

Describe the solution

Describe alternatives you've considered

Testing

Spawn some gum spiders
Bash the webs

Additional context

BevapDin
BevapDin reviewed Feb 10, 2020
View reviewed changes
src/handle_action.cpp Outdated Show resolved Hide resolved
@ZhilkinSerg ZhilkinSerg added 0.E Feature Freeze <Enhancement / Feature> New features, or enhancements on existing [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mods Issues related to mods or modding labels Feb 10, 2020
@Fris0uman Fris0uman marked this pull request as ready for review February 10, 2020 18:45
BevapDin
BevapDin reviewed Feb 10, 2020
View reviewed changes
src/handle_action.cpp Outdated Show resolved Hide resolved
ZhilkinSerg
ZhilkinSerg reviewed Feb 11, 2020
View reviewed changes
src/mapdata.h Outdated Show resolved Hide resolved
ZhilkinSerg
ZhilkinSerg reviewed Feb 11, 2020
View reviewed changes
src/handle_action.cpp Outdated Show resolved Hide resolved
ZhilkinSerg
ZhilkinSerg reviewed Feb 11, 2020
View reviewed changes
src/mapdata.cpp Outdated Show resolved Hide resolved
ZhilkinSerg
ZhilkinSerg reviewed Feb 11, 2020
View reviewed changes
doc/JSON_INFO.md Outdated Show resolved Hide resolved
ZhilkinSerg
ZhilkinSerg reviewed Feb 11, 2020
View reviewed changes
doc/JSON_INFO.md Outdated Show resolved Hide resolved
This was referenced Feb 16, 2020
Closed
Closed
karthas077 and others added 9 commits March 7, 2020 10:10
@karthas077 @ZhilkinSerg
Add The Satanic Bible (CleverRaven#37806)
5af8e88
@ZhilkinSerg
add shot counter to mods and gun
3d18006
@I-am-Erk @ZhilkinSerg
Refluff power armour and adjust stats slightly (CleverRaven#37578)
2b6e39b
@ZhilkinSerg
Fix line endings
51e0405
@ZhilkinSerg
Allow professions to start with a nearby vehicle - trucker profession (…
974886d 
…CleverRaven#37314)
@ephemeralstoryteller @ZhilkinSerg
Dark Skies 8: Adds strays, lurker, enemies; updates modinfo (CleverRa…
ed6a6d7 
…ven#38596)
@ephemeralstoryteller
updates for spell fixes (CleverRaven#38643)
e409ccb 
re: CleverRaven#38585
@curstwist @KorGgenT
[Magiclysm] Add Magiclysm academy (CleverRaven#38511)
414f387 
* support files

new item_groups, 2 maps, magic_basement hint for trap door.

* add magic academy

* Update data/mods/Magiclysm/items/books_lore.json

Co-Authored-By: Curtis Merrill <[email protected]>

* fix lava bomb

* fix typo, improve word choice.

* remove rune spanws

Co-authored-by: Curtis Merrill <[email protected]>
@arijust @KorGgenT
Magiclysm: Forest Tomb (CleverRaven#37699)
6e83cb4 
* Create forest_tomb.json

* Add forest tomb to overmap_specials

* Add forest tomb to overmap_terrain

* Add magic_animist item group

* Add stone altar.

* Lint

* Lint.

* use animist_items itemgroup instead

* lint

Co-authored-by: KorGgenT <[email protected]>
@ZhilkinSerg ZhilkinSerg changed the base branch from master to dev March 9, 2020 08:26
@ZhilkinSerg ZhilkinSerg merged commit d000196 into CleverRaven:dev Mar 10, 2020
@ZhilkinSerg ZhilkinSerg mentioned this pull request Mar 10, 2020
Closed
13 tasks
@Fris0uman Fris0uman deleted the json_bash_field branch March 10, 2020 22:15
ZhilkinSerg pushed a commit that referenced this pull request Mar 15, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
23f3fb7
ZhilkinSerg pushed a commit that referenced this pull request Mar 15, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
a470a92
ZhilkinSerg pushed a commit that referenced this pull request Mar 16, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
077a7ef
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
c56b01f
ZhilkinSerg pushed a commit that referenced this pull request Mar 17, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
2a00973
ZhilkinSerg pushed a commit that referenced this pull request Mar 18, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
02ceceb
ZhilkinSerg pushed a commit that referenced this pull request Mar 29, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
1f8ef98
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
68910ec
ZhilkinSerg pushed a commit that referenced this pull request Apr 1, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
de64fd9
@ZhilkinSerg ZhilkinSerg mentioned this pull request Apr 1, 2020
Merged
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
eff8b00
ZhilkinSerg pushed a commit that referenced this pull request Apr 2, 2020
@Fris0uman @ZhilkinSerg
Add map_bash_info to fields (#37865)
058c863
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZhilkinSerg ZhilkinSerg ZhilkinSerg left review comments

@BevapDin BevapDin BevapDin left review comments

@John-Candlebury John-Candlebury Awaiting requested review from John-Candlebury

Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` <Enhancement / Feature> New features, or enhancements on existing Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.