merging all the new changes #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is primarily to catch issues like json syntax errors in the mod data. Magiclysm has had a few such issues because it's under such heavy development lately.
includes: stone, log, wood panel, scrap metal and wattle/daub palettes
Changes the function to use a normal string, combined with simple concatenation. Additionally: remove redundant space to separate entries. Add it when adding a string to the result.
* ApocPrice Armor and Books Goal is to only be committing the changes in this section. * Update data/json/items/armor/ammo_pouch.json Co-Authored-By: Kevin Granade <[email protected]> * Update data/json/items/armor/ammo_pouch.json Co-Authored-By: Kevin Granade <[email protected]> * Update data/json/items/book/cooking.json Co-Authored-By: Kevin Granade <[email protected]> * Update data/json/items/book/cooking.json Co-Authored-By: Kevin Granade <[email protected]>
add modular faction storehouse
* Added an event type for gaining spell levels Also includes a default use of that by adding a memorial log event * Added character and spell to the new event * Added event sub that checks for config to learn other spell * Changed to support learning multiple levels * Publish spell level event for all new levels * Effects only support 2 props? * applied CR from int * Added translation call and removed debug msg * Fixed broken tests * Further test fix * Astyle fixes * Did tests fail due to mod dependency?
* Feather Mattress Creates Down-filled Mattresses and a recipe to make them * Update data/json/recipes/recipe_others.json Co-Authored-By: anothersimulacrum <[email protected]> * Update data/json/recipes/recipe_others.json Co-Authored-By: Rail-Runner <[email protected]> * Update data/json/items/resources/misc.json Co-Authored-By: Rail-Runner <[email protected]> * Change Furn_type Was this the appropriate change? "f_feather_mattress" } * Update data/json/items/resources/misc.json Co-Authored-By: anothersimulacrum <[email protected]> * added furniture entry
Fixes #32362 If the map marker is in the upper left corner of the overmap, then any "corner text" describing the location under the cursor will be drawn over the map marker. Start the corner text at 1,1 instead of 0,0 so it doesn't obscure the map marker.
Fix for faction shifting on load
overmap: put corner text starting at 1,1 instead of 0,0
DP tileset update
* Reducing crafting time for hooded hard-hat. From 45 m to 2 m. * Increase rags required. The item mentions protection from sun and rain so more fabric is required. + the bandana takes 2 rags to make.
…nd "A History of Firefighting" (#34120) * Changing read time. Changing read time of the books in question ( "Art and Science of Chemical Warfare" and "A History of Firefighting" ), from 10 min to 20 and 25 min respectively. * Increase time to 30 for "A History of Firefighting".
* Add washcloth Washcloth does the same job as a sponge, but can be crafted from a rag. * Add sponge as option to wash kit recipe
* Reworded slight calorie deficit message * Astyle * Added different starving messages for empty and non-empty stomach * Less strict check Also synonym to exhausted * Reworded once again * Update src/player.cpp Co-Authored-By: matskuman5 <[email protected]> * Update src/player.cpp Co-Authored-By: matskuman5 <[email protected]> * Use temp string variable
Enable Magiclysm on one Travis job
* Add a new_centered_win function This is intended to simplify window creation for this common use case. * Add stats_tracker::valid_scores Scores are often not meaningful or computed incorrectly if they started to exist partway through a game. Therefore, note which scores existed when the game started, and only report those that existed then and still exist now. * Add scrolling_text_view This is a text view with built-in scrollbar which can be used in the simplest cases when wanting to fit text into an otherwise-too-small area. This is actually a fairly rare situation in CDDA, because normally scrolling regions contain some sort of selected item, and this doesn't cater for that. * Replace kills screen with new scores screen Re-purpose the kills screen keybinding ')' to open a new UI that can display kills as before, but can also display the new scores info.
Fixes #29898 (again) Electrohack usage was converted to an activity, but the formula for success was made into a copy of the old, bad formula. Since iexamine::hack_attempt() has the correct formula and was already in a header used by activity_handlers.cpp, get rid of try_hack and use hack_attempt() in all cases. Remove some unnecessary if clauses in the process.
activity handler: use the iexamine hack success code
* change scope of mutation functions to Character * move Character functions from player.cpp * remove auto
Fix message when NPC doesn't find book to read
* show aoe for ter_transform
…34238) * Rename "hub assembly" to "wheel hub assembly" for easier discovery.
Obsolete the money traits.
Martial Arts Rebalance for Niten Ichi-Ryu
…4241) * Changed fixed modifier to multiplier * Changed gunmods to use new multiplier * Removed exact date from description * Removed emitter gunmod from G80 * Remove emitter gunmod slot from coilgun as well
Updated paragraph 1.1.0 because it is out of date. the mapgen entry is only present in 5 overmap json files and they are hardcoded locations.
Makes army winter jacket waterproof
Added looks_like to long stick. looks_like entry has description: hint to tilesets if this part has no tile, use the looks_like tile
* Adjusted AUTOSAFEMODETURNS max to reflect turn time change as well as default value to maintain the save time, also updated SAFEMODEINGORETURNS with the same time change * Rolled back default increases
…31802) * * add FOV_3D_Z_RANGE option. Minimum 0, maximum OVERMAP_LAYERS, default 4. * add logic to cast_zlight_segment that allows us to stop casting light segments beyond FOV_3D_Z_RANGE levels. Decent speedup!
Check translator comments with clang-tidy
* Added more descriptions to martial arts help menu
…mbedded Update MAPGEN.md paragraph 1.1.0
a fairly large 2 seat rowboat
* Remove unused member monster::last_baby It's actually never read. * Remove unused member monster::last_biosig It's actually never read.
* Added submap grid initialization for z-levels. * Fixed new submap inserting on correct z-level. Removed grid initialization for all z-levels. Ensured that new submap on generation will not overwrite existing one. Setsubmap to null in grid after deletion.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge change for fixing test bug