chemistry: extracts and concentrates pt2#37944

Closed

NastyNate2612 wants to merge 105 commits intoCleverRaven:masterfrom NastyNate2612:Extracts-and-Concentrates-pt3

+13,533-1,908

Commits on Feb 12, 2020

extracts and concentrates pt3
NastyNate2612
committed

Commits on Feb 13, 2020

Commits on Mar 2, 2020

Commits on Mar 16, 2020

DinoModv3: DinoDNA (CleverRaven#26525 )

LyleSY
authored and
ZhilkinSerg
committed
[Aftershock] Millyficent whately and the migo (CleverRaven#36908 )

Maleclypse
authored and
ZhilkinSerg
committed
[Aftershock] Mutant npcs to aftershock (CleverRaven#37530 )

Maleclypse
authored and
ZhilkinSerg
committed
Aftershock Crafting System (CleverRaven#37707 )

John-Candlebury
authored and
ZhilkinSerg
committed
Dark Skies Part 2: Blacklists (CleverRaven#38501 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies Part 3: Effects and Items (CleverRaven#38520 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies Part 4: Overrides (CleverRaven#38526 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies 5: Override Scraps (CleverRaven#38550 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies 6: Snippets (CleverRaven#38551 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies 7: Monsters (CleverRaven#38552 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies 8: Adds strays, lurker, enemies; updates modinfo (CleverRaven#38596 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
Dark Skies: Spell Fixes (CleverRaven#38643 )

ephemeralstoryteller
authored and
ZhilkinSerg
committed
[Magiclysm] Add Magiclysm academy (CleverRaven#38511 )

curstwist
authored and
ZhilkinSerg
committed
Magiclysm: Forest Tomb (CleverRaven#37699 )

arijust
authored and
ZhilkinSerg
committed
Add demon chitin armor & repairing dragon armor (CleverRaven#36733 )

LaVeyanFiend
authored and
ZhilkinSerg
committed
Read ids and save ids for enchantments (CleverRaven#38262 )

KorGgenT
authored and
ZhilkinSerg
committed
Jsonize spell skills (CleverRaven#37368 )

KorGgenT
authored and
ZhilkinSerg
committed
JSONize AEP_EVIL and implement intermittent artifact effects (CleverRaven#38221 )

KorGgenT
authored and
ZhilkinSerg
committed
JSONize AEP_SMOKE and add emitters to enchantments (CleverRaven#38260 )

KorGgenT
authored and
ZhilkinSerg
committed
Traps can cast spells (CleverRaven#38122 )

KorGgenT
authored and
ZhilkinSerg
committed
Add subway maps (CleverRaven#37540 )

wapcaplet
authored and
ZhilkinSerg
committed
Add The Satanic Bible (CleverRaven#37806 )

karthas077
authored and
ZhilkinSerg
committed
Indian cookbook (CleverRaven#37930 )

ashGlaw
authored and
ZhilkinSerg
committed
AR pistols (CleverRaven#37768 )

RarkGrames
authored and
ZhilkinSerg
committed
SUS bathroom 3.5 (CleverRaven#37431 )

xanderrootslayer
authored and
ZhilkinSerg
committed
Add map_bash_info to fields (CleverRaven#37865 )

Fris0uman
authored and
ZhilkinSerg
committed
Add shot counter to mods and gun (CleverRaven#37693 )

dpwb
authored and
ZhilkinSerg
committed
Allow professions to start with a nearby vehicle (CleverRaven#37314 )

davidpwbrown
authored and
ZhilkinSerg
committed
Add Crazy Party scenario and Frat Boy/Sorority Girl profession (CleverRaven#37512 )

CountAlex
authored and
ZhilkinSerg
committed
Remove manual JSON object member check:

BevapDin
authored and
ZhilkinSerg
committed
Move some repeated code into a function get_mapgen_function.

BevapDin
authored and
ZhilkinSerg
committed
Move some code as function into mapgen.cpp

BevapDin
authored and
ZhilkinSerg
committed
Remove redundant declaration.

BevapDin
authored and
ZhilkinSerg
committed
Remove commented out code.

BevapDin
authored and
ZhilkinSerg
committed
Move access to oter_mapgen into mapgen.cpp

BevapDin
authored and
ZhilkinSerg
committed
Remove exposing variables from mapgen.cpp in the header.

BevapDin
authored and
ZhilkinSerg
committed
Add separate function to register mapgen object: register_mapgen_function

BevapDin
authored and
ZhilkinSerg
committed
Change oter_mapgen to contain ínstances of a dedicated class

BevapDin
authored and
ZhilkinSerg
committed
Merge oter_mapgen_weights into oter_mapgen:

BevapDin
authored and
ZhilkinSerg
committed
Store pointers directly in oter_mapgen weights map instead of indices into the vector itself.

BevapDin
authored and
ZhilkinSerg
committed
Use weighted_int_list for oter_mapgen weights

BevapDin
authored and
ZhilkinSerg
committed
Move code into a member function mapgen_basic_container::pick

BevapDin
authored and
ZhilkinSerg
committed
Move code into a member function: mapgen_basic_container::setup

BevapDin
authored and
ZhilkinSerg
committed
Move code into a member function: mapgen_basic_container::check_consistency

BevapDin
authored and
ZhilkinSerg
committed
Make all data members of mapgen_basic_container private.

BevapDin
authored and
ZhilkinSerg
committed
Make a separate class for oter_mapgen

BevapDin
authored and
ZhilkinSerg
committed
Replace auto with actual type

BevapDin
authored and
ZhilkinSerg
committed
Consistent naming: "omw" just like in the other function

BevapDin
authored and
ZhilkinSerg
committed
Consistent naming: just "iter" as there is no need to hint the data type (and what does the "f" even stand for?)

BevapDin
authored and
ZhilkinSerg
committed
Add usage checks for loaded mapgen instances.

BevapDin
authored and
ZhilkinSerg
committed
Add some documentation.

BevapDin
authored and
ZhilkinSerg
committed
Encapsulate the mapgen_function function pointers within mapgen_factory

BevapDin
authored and
ZhilkinSerg
committed
Remove mapgen entries for overmap terrain "null".

BevapDin
authored and
ZhilkinSerg
committed
Follow recommendation of clang-tidy

BevapDin
authored and
ZhilkinSerg
committed
Make parameter offset of load_mapgen_function mandatory.

BevapDin
authored and
ZhilkinSerg
committed
Remove default_idx parameter from load_mapgen_function.

BevapDin
authored and
ZhilkinSerg
committed
Refactor loading bonuses (CleverRaven#36562 )

BevapDin
authored and
ZhilkinSerg
committed
Add utf8_display_split function

jbytheway
authored and
ZhilkinSerg
committed
Switch mapgen keys from ints to strings

jbytheway
authored and
ZhilkinSerg
committed
Test Unicode mapgen with bookcases in house_w

jbytheway
authored and
ZhilkinSerg
committed
Document the Unicode mapgen support

jbytheway
authored and
ZhilkinSerg
committed
Refluff power armour and adjust stats slightly (CleverRaven#37578 )
ZhilkinSerg
committed
Match armor layers ui and help text (CleverRaven#38762 )

Pupsi-Mupsi
authored and
ZhilkinSerg
committed
Match advanced inventory UI and info text (CleverRaven#38763 )

Pupsi-Mupsi
authored and
ZhilkinSerg
committed
Match message log filter info and construction filter (CleverRaven#38764 )

Pupsi-Mupsi
authored and
ZhilkinSerg
committed
Match construction UI (CleverRaven#38765 )

Pupsi-Mupsi
authored and
ZhilkinSerg
committed
Match player info and martial arts UI (CleverRaven#38766 )

Pupsi-Mupsi
authored and
ZhilkinSerg
committed
Merge branch 'dev' into main-menu
ZhilkinSerg
authored
Merge pull request CleverRaven#37894 from Qrox/window-manager
ZhilkinSerg
authored
Merge branch 'dev' into main-menu
ZhilkinSerg
authored
Merge pull request CleverRaven#38235 from Qrox/main-menu
ZhilkinSerg
authored
Extracts and Concentrates pt 1 (CleverRaven#37936 )
NastyNate2612
authored
Update tool_qualities.json
ZhilkinSerg
authored
Merge branch 'dev' into Extracts-and-Concentrates-pt3
ZhilkinSerg
authored