[pull] master from CleverRaven:master #26
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
![pull[bot]](https://avatars.githubusercontent.com/in/12910?s=60&v=4){kind=small}
github-actions
bot
added
[C++]
[JSON]
Code: Tests
Fields / Furniture / Terrain / Traps
Melee
Missions
Items: Armor / Clothing
Items: Containers
Mutations / Traits / Professions/ Hobbies
Spawn
Map / Mapgen
Player Faction Base / Camp
Items: Ammo / Guns
Mods: Magiclysm
Items: Archery
Lore
Mods: Mind Over Matter
labels
* lower case the category names * use sentence case * tweak test accordingly
Fix issue with peeking vertically
[MoM] Check each body part for poison and badpoison
github: build libbacktrace locally and use it for linux/mingw bindist
* Magiclysm monster name audit * Update zombified_monsters.json * Dictionary * Derped
* Fix duplicate Jenny's mission Fix #70861 * Fix Mercenary wrong spawn point Fix Mercenary's spawn point : from "x": 49, "y": 3 ( in the walls ) to "x": 48, "y": 5 ( on the chair )
eoc/math: port arithmetic power to math
* Initial commit * Fixes * Fix errors * Number adjustment * Wake rebalance * essense -> essence * rules -> laws * Embrace of the Verdant Mother heals triffids * Separate ban penalties into EOC_PARACLESIAN_BROKE_FAE_BAN so to can be called from elsewhere * Move Fae bans to their own file for organization * Save BEFORE you push
* Item variant and gun plural name audit * Update data/json/items/armor/ammo_pouch.json Co-authored-by: Jianxiang Wang (王健翔) <[email protected]> * 2nd round * Update torso_clothes.json * Apply suggestions from code review * Dictionary * Who the hell added "youre" to the dictionary smh * And "wasnt" smh * Update item_tname_test.cpp --------- Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
…lly (#70950) * Allow scenarios to whitelist/blacklist hobbies Following the model for professions, whitelist/blacklist hobbies. * Professions can whitelist/blacklist hobbies * Allow blacklisting professions/hobbies globally Very much following the model of scenario blacklisting. Except we don't get fancy and invert the whitelist, we just change the profession function to care about that.
* Limb tests * Breakage tests + suffer fix * clang * Fix tests * Update limb_test.cpp
[Magiclysm] Scale Magus stat buffs with spell level
eoc/math: port item_rad to math
* Fix * fix * Update activity_actor_definitions.h
[MoM] Fix Telekinesis Contemplation recipes
Allow EoCs to use mutate_towards
…e the math! (#70936) * more math * more math * a bit more * compare_int to be gone * compare_int to be gone * and more * compare_num be gone * arithmetic be gone * lint * fix stuff * fix stuff * revert u_val('power') * jmathify and fix addictions * Apply suggestions from code review Co-authored-by: andrei <[email protected]> * migrate u_know_jaryi, mention talked_to_hub and know_jaryi should be ported to u_val * revert item_rad RAD_DETECT * replace the only place with spell level school; add to another place because i can * "=" -> "==" * Update data/json/npcs/TALK_TEST.json Co-authored-by: andrei <[email protected]> * lint * replace all addiction formulas to use same jmath --------- Co-authored-by: andrei <[email protected]>
…0979) * Initial commit * Homullus can't kill ferals either * Sylphs cannot spend too long underground * Salamanders cannot get wet * Arvore EoC updates * Ierde cannot mine
Make the pain caused by scurvy less frequent
Fix #70997: In npctalk.cpp, some vectors' initializations are wrong
Prevents the following compile error on gcc 13.2.0:
```
In file included from /usr/include/c++/13/algorithm:60,
from pch/main-pch.hpp:13:
In function ‘constexpr const _Tp& std::max(const _Tp&, const _Tp&) [with _Tp = int]’,
inlined from ‘virtual void hacksaw_activity_actor::start(player_activity&, Character&)’ at src/activity_actor.cpp:1257:32:
/usr/include/c++/13/bits/stl_algobase.h:262:7: error: ‘qual’ may be used uninitialized [-Werror=maybe-uninitialized]
262 | if (__a < __b)
| ^~
src/activity_actor.cpp: In member function ‘virtual void hacksaw_activity_actor::start(player_activity&, Character&)’:
src/activity_actor.cpp:1247:9: note: ‘qual’ was declared here
1247 | int qual;
| ^~~~
At global scope:
cc1plus: note: unrecognized command-line option ‘-Wno-unknown-warning-option’ may have been intended to silence earlier diagnostics
cc1plus: all warnings being treated as errors
make: *** [Makefile:1060: obj/tiles/activity_actor.o] Error 1
make: *** Waiting for unfinished jobs....
```
* add 2 unicorn plushies * 2 unicorn plushies fixed commas * typo fix * doublespace the end of sentences * Update dictionary.txt
move condition functions to cpp file
Fix: Prevent uninitialized int
Knut-Aage-Hofseth
merged commit 928ae2c
into
Knut-Aage-Hofseth:master
1 of 5 checks passed
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.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )