Tags: Shootnik01/Cataclysm-BN
Tags
Merge pull request cataclysmbnteam#416 from olanti-p/beheading-effort Remove some includes from commonly included headers
Merge pull request cataclysmbnteam#406 from cataclysmbnteam/port-bp Port body part code from DDA up to May 4
ngettext wrapper + tests for changing language (cataclysmbnteam#401) * Make talk_topic string extraction consistent between runs * Remove <locale> include from output.h * Add wrapper around ngettext(), rename npgettext() Now all *gettext funcitons and _() macro are cata's wrappers. This is necessary since even without explicit libintl.h include <locale> header pulls in libintl.h on some platforms anyway. This behavior cannot be disabled, and could lead to a conflict between cata's ngettext and libintl's ngettext. As a bonus, this allowed to remove <libintl.h> and <locale> includes from translations.h * Replace ngettext() calls with wrapper, rename usages of npgettext() Done via find-and-replace * Test that translations return translated string * When testing, print lang switch related info via cata_printf Because DebugLog() does not immediately append newlines, and that makes the rest of the log ugly. * Always print rng seed for tests * Remove unused macro Static linkage is either broken anyway (msys), or works fine even without this macro (cygwin, mingw cross-compiled). * Remove unneeded check in translation test In this test we don't care if that's the original string, just that the string is a correct translation.
Survivor armor (re)additions (cataclysmbnteam#396) * Adding various things * Adding various things * Add 2 other helmets surv, fix positions * fix craft new backpack * Casings fix * fix * delete casings craft * fix * fix * delete "reversible": true on survivor_bigback * another backpack * fix * fix x2 * fix x3 * Update data/json/items/armor/storage.json Co-authored-by: Oleg Antipin <olanti-p@yandex.ru> * fix id craft Co-authored-by: Oleg Antipin <olanti-p@yandex.ru>
Enchantment/relic cleanup 2 (cataclysmbnteam#400) * Additional cleanup for tests * Tests for effects & mutations from enchantments * Enchantment values: stats * Enchantment values: SPEED * Some tests for speed / moves gain * Simplify check for enchantment 'has' condition * Clean up enchantment bonus calculation 1. Fix final value being out of bounds in some places. 2. Changed the formula for combining multiple enchantments to produce more easily predictable results. 3. Remove dead code * Renamed 2 functions to be less ambiguous * Enchantment values: ATTACK_COST, ITEM_ATTACK_COST * Enchantment values: MOVE_COST * Enchantment values: METABOLISM * Enchantment values: MANA_CAP, MANA_REGEN + mana tests * Migration for old enchant val enum strings * Consistent rounding for enchantment bonuses * fix typo * Revert effects cleanup change
PreviousNext