Skip to content
Permalink
Branch: master
Commits on May 2, 2019
  1. add naginata to naginata recipe

    SeanWiig committed May 2, 2019
    now you can craft a naginata from a wakizashi as an alternative to a katana
Commits on Apr 24, 2019
  1. Still more linting

    SeanWiig committed Apr 24, 2019
  2. More linting!

    SeanWiig committed Apr 24, 2019
  3. Linting on item_groups.json

    SeanWiig committed Apr 24, 2019
  4. Move geta to boots.json

    SeanWiig committed Apr 24, 2019
Commits on Apr 12, 2019
  1. Update armor.json

    SeanWiig committed Apr 12, 2019
  2. Added urban samurai profession.

    SeanWiig committed Apr 12, 2019
    Added urban samurai. Starts with very fancy clothes and decent early-game melee. It is unique in being the only profession to start with a weapon compatible with niten ichi-ryu.
  3. itemgroups updated

    SeanWiig committed Apr 12, 2019
    - added the new items to the itemgroups, with haori being treated as a rare item and the kimono is slightly less common than before, while yukata is more common. Also, geta was added to itemgroups.
    
    - Fixed some typos
  4. martial arts apply to _inferior and _fake across the board

    SeanWiig committed Apr 12, 2019
    All martial arts which applied to weapons with fake and inferior variants now apply to all fake and inferior variants. This was already the case for the halberd and halberd_fake, now it's consistent for all weapons. Also, the survivor naginata was added to sojutsu.
  5. Japanese clothing pass

    SeanWiig committed Apr 12, 2019
    - Yukata added. Yukata is similar to the kimono, but has less protection and less warmth and even less encumbrance. It is slightly more common than the kimono. Like the kimono, it has the flag FANCY.
    
    -Haori added. It is a torso and arm outer garment with the SUPER_FANCY flag and low encumbrance. It is not very protective. It is a rare item.
    
    - dress hakama added. This is an outer wear leg garment. It is not very protective. The idea is that you could wear it over a kimono or yukata (or anything else)
    
    -  keikogi, karate_gi, zubon_gi, hakama_gi now have 2 defense, instead of 1, and have the STURDY flag. The idea is that martial arts wear is meant to withstand a lot of abuse and tumbling and are at least as tough and more tear-proof than jeans, which have 3? defense. keikogi and zubon_gi are now identical in terms of stats to the karate_gi, except that they're for legs or upper body only. hakama_gi now has slightly more coverage and warmth than zubon_gi, at the expense of being slightly more cumbersome.
    
    - tabi_gi and tabi_dress no longer have 10 encumbrance, which made them straight worse than socks with otherwise identical stats.
  6. Japanese melee pass

    SeanWiig committed Apr 12, 2019
    - Added naginata_fake and naginata_inferior
    
    - Small buff to fake and inferior variants of Japanese weapons. Fake variants are still worse than a makeshift crowbar.
Commits on Apr 11, 2019
  1. Cleanup json_blacklist (CleverRaven#29469)

    AMurkin authored and kevingranade committed Apr 11, 2019
    * remove non-existed paths
    * remove already astyled paths
  2. Actually fix json style

    kevingranade committed Apr 11, 2019
  3. Make Clang/Tiles/Cmake build a release build (CleverRaven#29470)

    kevingranade committed Apr 11, 2019
    * Make Clang/Tiles/Cmake build a release build
  4. Json style fix

    kevingranade committed Apr 11, 2019
  5. Define milk temperature for cows (CleverRaven#29462)

    Hirmuolio authored and kevingranade committed Apr 11, 2019
    * 38.6 C
  6. fix nails, tweak item spawning

    I-am-Erk authored and kevingranade committed Apr 11, 2019
  7. Update storage.json

    RarkGrames authored and kevingranade committed Apr 11, 2019
  8. Merge pull request CleverRaven#29459 from zombiethoughts/11/04/2019b

    ZhilkinSerg committed Apr 11, 2019
    Linting blacklisted json files.
  9. Update json_blacklist

    zombiethoughts committed Apr 11, 2019
  10. Merge pull request CleverRaven#29454 from esotericist/master

    ZhilkinSerg committed Apr 11, 2019
    Add unbound keybinding entry which reloads without trying weapons first.
  11. Merge pull request CleverRaven#29453 from thquinn/character-prev-tab

    ZhilkinSerg committed Apr 11, 2019
    Add PREV_TAB action to player display
  12. add winches to urban development garages (CleverRaven#29450)

    nornagon authored and kevingranade committed Apr 11, 2019
    * add winches to urban development
  13. Merge pull request CleverRaven#29446 from ZhilkinSerg/overmap-terrain…

    kevingranade committed Apr 11, 2019
    …-abstract-river
    
    Used overmap terrain abstracts for river tiles
  14. Merge pull request CleverRaven#29432 from ZhilkinSerg/refactor-unicod…

    kevingranade committed Apr 11, 2019
    …e-symbols
    
    Refactor unicode symbols
  15. Merge pull request CleverRaven#29429 from mlangsdorf/update_mapgen_co…

    kevingranade committed Apr 11, 2019
    …mmune
    
    missions: move the free merchants start and end functions to JSON
Older
You can’t perform that action at this time.