Add looks_like to a number of books #45953
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
added 2 commits
December 9, 2020 23:54
BrettDong
added
SDL: Tiles / Sound
|
Thank you! What are the 5 unknown ones? |
|
Those are schematics. I'm not sure why those are showing unknown. |
|
There we go. Fixed. |
Cornelllo
added a commit
to Cornelllo/Cataclysm-DDA
that referenced
this pull request
Dec 12, 2020
* activity_actor: fix segfault in drop activities restack pocket *after* manipulating charges also restack pocket when changing favorite status from inventory menu fixes CleverRaven#45633 * item: don't try to use charges if there's no ammo fixes CleverRaven#45640 * Fix wrong offset of pike overlay * Fix item::deserialize failed to visit object error There were two sources of failed to visit object errors in item::deserialize. The first occurred because a JsonObject was being fetched and immediately destroyed when checking if it had a member. Shift this to fetch the object and keep it around to reuse later, and more importantly tell it to ignore unvisited members. The second occurred when loading the basic data. Here, a second data type derived from a JsonObject is required. There were two issues here. 1. The original data object did visit the same members as the derived one. This is fixed with the added copy_visited_members function. 2. The derived type was still a JsonObject, so now we had two JsonObjects of the same data, with both visited different data. To fix this, allow omitted members on the derived type. * Add submap loading tests Add tests for each part of submap loading (except for camps, which appear to be obsolete). Each test tests a single separate area to prevent cross-contamination, and as such each has a separate JSON definition. For tests using the four corners and the point (4,7), this is to ensure no rotation or anything occurs, and the extra point is to make sure testing just the corners doesn't bite us somewhere. All JSON is either taken from or inspired by real JSON produced by our submap deserializer. * Rebalance 40mm grenades * Fix excess commas * Fix items disappear from container when it placed. Drop items on the ground from deployed containers. fixes 45651 * Fix rebar rail rifle * fix typo * Add dandelion and chamomile tea bags and recipes (CleverRaven#43241) * Fixes activity zone sorting for comestibles in containers. (CleverRaven#45453) * Fix typo in documentation * Add brown bread and bread flour with container (CleverRaven#45576) * Adds homeopathic pills (CleverRaven#45592) * Gun's displayed weight fix (CleverRaven#45623) * adds loaded ammo mass to total gun mass * magazine weight is being added to gun total weight * Update shot.json * Update shot.json * Fix range-loop-analysis (clang 12) (CleverRaven#45657) * Housekeeping: remove obsolete mtype::species_ptrs (CleverRaven#45664) * Fix rotated tiles offset (CleverRaven#45556) * Update shot.json * fix invalid bionic id null (CleverRaven#45667) * Silence an advisory warning. * npctrade: stop selling things that are marked TRADER_AVOID Fixes CleverRaven#44449 NPCs were trading items that were marked TRADER_AVOID, for two reasons: 1. NPC_TRADER_AVOID was being checked only for NPC shopkeepers. 2. The logic for assembling trade lists checked if the list was for an NPC and if the NPC wanted to sell it, OR if the NPC wanted to buy it. So the NPC would not want to sell an item they held, but they would still sell it if they wanted to buy it. Redo the logic for TRADER_AVOID to take place after the check for npc_will_exchange_items_freely() but have it occur even for NPCs that aren't shopkeepers. Also, redo the logic that assembles lists so the NPC only checks want_to_buy() when assembling the list of the avatar's trade goods. * Add instant coffee to loot table (CleverRaven#45639) * snacks, office, cubical office, office breakroom, shelter * stash_food, mil_food_nodrugs, ws_fire_lookout_tower * Fix instant coffee overriding brew * tools: rebalance the makeshift glaive (CleverRaven#45658) The makeshift glaive is really good for an easy, improvised weapon. Add it to the effective DPS tests and nerf its accuracy to bring it in line with other makeshift polearms. * Fix issues with radio-modded explosives inside RC cars (CleverRaven#45661) * Added a pocket in RC car that should fit radio-activated explosives * Simplified and updated code for sending the signal * Silence compiler warning (CleverRaven#45679) * Add new helper function get_book_mastery (CleverRaven#45475) * fix freshwater research station spawning (CleverRaven#45552) * Allow quartering organ-less corpses without field dressing * no more blanket nuh-uh. * character: slightly improve find_ammo helper only skip nodes if they are actually loaded as magazines fixes CleverRaven#45689 * Add fast-scroll to active world mods menu * Add licorice to vanilla * Add chocolate cow to vanilla * Routine i18n updates on 29 Nov 2020 * wagons! * Fix wrong format * Update urban_5_house.json * Tweaks to clothing_mods.json * Fixed graffiti not showing full text in mouselook (CleverRaven#45691) * [DinoMod] Dino daycare difficulty fix (CleverRaven#45714) * remove diff from hatchlings * diff fix for juveniles * fix lookslike * Fix aircraft mechanic profession typo (CleverRaven#45707) * [Mythical Martial Arts] Updated descriptions of D&D styles * Street lights and Traffic lights don't block sight * misc item category fixes * Fixed unseen sound not showing fully * Terrain can emit fields (CleverRaven#45686) * Remove useless EMITTER flag from vehicles (CleverRaven#45723) * Add missing canned_liver ingredient in recipes * ensure that casings are stackable (fix CleverRaven#44469) * Bats aren't polearms * fix issues with sound (walking on boats), sound triggering twice * Add pigeons * Edit chicken coops in roof * Add winter spawn * Stylished json * fix typos in crane descriptions * fix mall subway access * Fix Otaku proficiency * adjust loot spawns in freshwater research station * improve consistency of the nested items `tname` * fix test * remove redundant translator comment * fix typo in stylish transition bifocals * Mention computers skill in bionics installation intro as seen in src/bionics.cpp:2007 * [Magiclysm] Add light orichalcum frame (CleverRaven#45692) * Adds light orichalcum frame * Slight damage reduction boost * JSON lint fix * JSON lint fix Co-authored-by: Salty Panda <[email protected]> * Aftershock: Astrobiology lab (CleverRaven#45660) * Habitat Terrains * Adjustments to alien terains Lowered the move costs of most soils plus some color and symbol viariation for terrains. * Astrobiology lab * Delete duplicate region settings * Style item group * Remove dead vehicle fixup code. * Update shot.json * Update data/json/items/ammo/shot.json * switch to ">" symbol for nesting indication * Fixed full body armor mutations not covering head * Removed eye armor from non-slime non-mycus mutations * Allow to return softwares for missions (CleverRaven#45434) * Check Software container in count_items * Also count softwares in players pockets * count_softwares * find softwares hidden in pocketses * Consume software container upon returning software for a quest * add a roof to hospital * Allow customizing initial date in scenarios (CleverRaven#45466) * Allow customizing initial date in scenarios * Update doc/JSON_INFO.md * Jsonifying heat emission, and hot springs (CleverRaven#45632) * hot springs and jazz * translations: fix android localization * fix CleverRaven#45759: limit the number of attempts to place the city to avoid infinite loop when no free space is available * MshockXotto+ Update 02/12/2020 (CleverRaven#45771) * MshockXotto+ Update 02/12/2020 * Include json fix from I-am-Erk/CDDA-Tilesets#310 * Oversized recipes and clothing items (CleverRaven#44783) * [Dinomod] Adding Amargasaurus and Kosmoceratops AKA Finishing obscure dinos (CleverRaven#45478) * Add more NKIs (non-kitten items) to Robot Finds Kitten (CleverRaven#44969) * Add more non-kitten items to Robot Finds Kitten Including: - More items from the official GPL Robot Finds Kitten game - Moose from CleverRaven#27985, plus many new original CDDA-themed items - Items suggested by Discord users - Some robot-generated items * Add items from I-am-Erk Co-authored-by: I-am-Erk <[email protected]> * BrownLikeBears update 04-12-20 * lard byproducts have similar properties to base product (CleverRaven#45599) * Sort expansion (CleverRaven#45646) * Adding a NO_SHOOT terrain Flag and example of use (CleverRaven#45730) * Jsonify office tower (CleverRaven#45738) * Replaced OMTs in city_building definition * Added new OMTs and obsoleted old ones * Replaced old OMT with the new ones in Graphical Overmap and Alternate Map Symbols mods * Replaced old OMT with the new one in mission definition * Added new office tower to the list of city buildings spawn list * Migration * Removed huge hardcoded draw_office_tower function for good * Convert ordinary walls to conrete ones * Add 40mm blackpowder loads (CleverRaven#45740) * Add 40mm blackpowder loads * Add RELOAD_EJECT to tube launcher * Removed spammed unnecessary messages * Update recipe_medsandchemicals.json added recipie for sulphuric acid * Butter knife no longer disassembles into spike * Rephrase NPC following request In NPC engagement menu, instead of ""He will follow at about 2 paces", say "Follow me at about 2 paces", and likewise "Follow me at about 4 paces"". This better fits the other options in the same menu, phrased like "Stick close to me", "You can use ranged weapons", "Don't use grenades" etc. Fix test case for new NPC follow rule. * game: defer explosions (CleverRaven#45693) * game: defer explosions trigger explosions after processing all items fixes CleverRaven#45662 * tests: update explosion test * Add PREDATOR_FUN flag and implementation * Fix item with the same relic_data stack (CleverRaven#45790) * items: add poleaxe to the effective DPS damage and adjust damage The poleaxe wasn't in the effective DPS tests, so add it at about the same DPS as a glaive. Adjust the poleaxe accuracy down to 1, same as the other polearms, and increase the damage slightly to bring up the DPS to target. * fix ammo_unset clearing item mods * Fix NPC not gaining XP when reading with player * Hyper-metabolism rework (CleverRaven#45687) * Routine i18n updates on 5 Dec 2020 * increase capacity of soldering iron pseudo item * Update sandwich.json * move a few player functions to character - has_mission_item - has_gun_for_ammo - has_magazine_for_ammo - can_interface_armor - item_reduce_charges * level_cache: move the level_cache into its own C++ file In preparation for making the vehicle elements level_cache into a proper cache with dirty bits, move the entire thing into another file. * level_cache: make the vehicle cache parts private Make the vehicle cache members private, in preparation for adding dirty bits, and then change all users of the vehicle cache to access the vehicle cache through getters and setters. * Fix typo in FOODCO description * Red leather jacket go brrrr * generate_overlay_ids.py: expanded hardcoded ids * Fix inventory_ui PAGE_UP/DOWN-page-scroll * Fix duplicate item * account chairvoyance when checking for Character -> creature visibility * Update game_inventory.cpp * level_cache: add a dirty flag for the vehicle cache Add a dirty bit to the vehicle cache component of the level cache, and a separate bit to indicate the cache is completely empty, and optimize cache clearing to be no-ops if the cache is clean or empty. * map: clear and build the vehicle cache across all z-levels Now that the vehicle cache has proper dirty bits, convert the calls to clear and reset on a per z-level basis to "clear_all_vehicle_caches" and "build_all_vehicle_caches" across all z-levels. Slightly reorganize calls to these functions to guarantee that the cache is built after it has been cleared. * level_cache: pass veh to set_veh_cached_parts by reference veh can never be null, by it's only caller, so pass it by reference instead of as a pointer. Don't pass it as a const reference, because a const reference can't be converted easily to a non-const pointer. * Fix support of font formats * Correct zombie horse symbol and color * prevent freeze during migo portal generation (#$45807) (CleverRaven#45825) * Debug menu option to generate sound at tile (CleverRaven#45823) * Documentation update for Terrain Flag and MAGIC.md (CleverRaven#45833) Co-authored-by: anothersimulacrum <[email protected]> * Fixed extinguishing items on boats (CleverRaven#45835) * Fixes Compare items color bug (CleverRaven#45808) * [Aftershock] Add new electronic machinery (CleverRaven#45695) Co-authored-by: Alexey Mostovoy <[email protected]> * Add River Starting Location (CleverRaven#45677) * Prevent game from placing character in water In order to have a water start location we first need to make sure that overmap terrain with water can be chosen as starting locations without spawning the character underwater. * Add a river starting location Added a starting location on a riverbank and updated the wilderness scenario to sometimes spawn a player there * Update data/json/monstergroups/wilderness.json Co-authored-by: Fris0uman <[email protected]> * Added a repair material list to repair menu * Center cursor on player after all UIs are drawn Also, add a little explanatory comment for anyone debugging cursor issues in the future that changing curs_set() won't crash the game. There are probably cursor errors all over the shop, but this solves at least one of them. Also remove the old code that did the same thing. * Remove double-shot firing mode from pump shotgun. * Add avatar::clear_identified() * Fix canned liver and offal being the wrong size. * Add plant fiber/fibre byproduct (CleverRaven#45894) With this change you no longer waste the plant fiber when creating cattail jelly. * Fix another aircraft mechanic proficency typo (CleverRaven#45883) * Fixed typo in boots.json Fixed typo in boots.json for xl chitin boots * [AFTERSHOCK] Moxphores (CleverRaven#45801) * Move Object Creator to a separate solution (CleverRaven#45885) * Update misc.json (CleverRaven#45899) * improve npc overmap travel: (CleverRaven#45896) * recalculate goal when it's not reachable * still look for needs if CITY_SIZE=0 * change `overmap_location::terrains` type to `flat_set`, refactor `npc::set_omt_destination` * Avoid fusing with the last critter if no proper critter is found (CleverRaven#45886) * Avoid fusing with the last critter if no proper critter is found fixes CleverRaven#36348 * Nerf the fastest new zombie animals so attacks take a whole turn (CleverRaven#45880) * Slow attack of fastest new zombie animals by adding 'attack_cost' equal to 'speed', making them attack once per turn * Slow attack of barghest and hulking horror by adding "attack_cost" to match the "speed" in the proportional copy-from * Slow some special attacks too with "move_cost" equal to speed * Do not use C-style casts * Removed duplicate functions * Create a issue template config file Provides redirects to github discussions page and project forums, and disables the "blank issue template". * Delete ISSUE_TEMPLATE.md * Fix spelling issues (CleverRaven#45878) * JSON description spelling fixes * Markdown + txt spelling fixes * Fix FLAMMABLE_ASH flag for butchering rack * Fix result spelling of southwest * Fix cephalopod achievement id spelling * unsually is probably unusually * Fix spelling in dynamic line * Simple comment/text spelling fixes * Fix variable/enum spellings * Fix function spelling issues * Gate 3+ engines behind DEBUG_HS (CleverRaven#45914) It's not intended that a survivor can install more than 2 engines in a vehicle, yet it is still useful to be able to install more than 2 engines for vehicle creation. Additionally, it was often asked how to get to mechanics 12, an effectively impossible task, but still show for the install requirements for 2+ engines. As such, require debug hammerspace to install more than 2 engines or display the skills need to install more engines. The skills don't mean anything after 2 engines, but it's easier to leave them there, and there is no harm in doing so. * remove gravel (CleverRaven#45872) * Check if curr_weapon is null before trying to remove flag (CleverRaven#45869) * Check if curr_weapon is null before trying to remove flag * Apply satheon49's patch * Decrease log level to avoid emitting backtrace (CleverRaven#45841) * Fix string return in game_inventory.cpp * CleverRaven#45935 use id for movement mode tile overlays * Make Dory SHEATH_SPEAR and NONCONDUCTIVE * Removing of a choice components in rope (CleverRaven#45939) * Allows drawing acid from Acidic Zombies again (CleverRaven#45929) Fixes a bug that appeard because the drawn sulphuirc acid had a higher weight than what the blood draw kit supported. * Line 516, Recipe Mortar and Pestle (CleverRaven#45921) * Disable cursor centering for SDL builds This breaks firing cursors and probably other things in SDL builds, so disable it. * Update Ultica 10-12-2020 * Add update date to txt * MSX+ Update 10-12-20 * ChibiUltica Update 10-12-20 * Add looks_like to a number of books (CleverRaven#45953) * Added appropriate looks_like tags for books * Added looks_like to schematic template. * Craftable RC cars (CleverRaven#45847) * Add radio car wheels part necessary for crafting RC cars More components, time, skills, and tools needed to craft. * Alter radio car wheel description also changed from one wheel to a set of wheels and adjusted weight and volume accordingly now uses the wheels from casters with glued on rubber chunks, carved to have treads. gives some more parts back to accommodate crafting recipe, takes more time. Included metal sawing to simulate cutting full sized springs in half for RC car suspension. More craft time, swap 4 micro motors for 1 small motor, add cutting tool prerequisite. Change 4 micro motors to 1 small motor. swap one small motor to one tiny motor for power and two micro motors for steering. swap small motor to tiny motor and add two micro motors Add metal sawing prerequisite to remove wheel from caster fork. * Display translated Rh blood type * More yield for quartered corpses (CleverRaven#45963) * replace usage of string "FLAMMABLE*" flags with bitflags (CleverRaven#45971) * extract activity_actor subclasses to a seperate header to reduce inclusion overhead and fanout (CleverRaven#45967) Co-authored-by: andrei <[email protected]> Co-authored-by: Angela Graves <[email protected]> Co-authored-by: Zhilkin Serg <[email protected]> Co-authored-by: Fris0uman <[email protected]> Co-authored-by: anothersimulacrum <[email protected]> Co-authored-by: Rail-Runner <[email protected]> Co-authored-by: CAHEK7 <[email protected]> Co-authored-by: John Candlebury <[email protected]> Co-authored-by: XygenSS <[email protected]> Co-authored-by: levkropp <[email protected]> Co-authored-by: Squishums <[email protected]> Co-authored-by: Xaleth <[email protected]> Co-authored-by: aoae23 <[email protected]> Co-authored-by: Jakub Cieplinski <[email protected]> Co-authored-by: Hyper-Jija <[email protected]> Co-authored-by: akirashirosawa <[email protected]> Co-authored-by: Ivan Zaitsev <[email protected]> Co-authored-by: 8street <[email protected]> Co-authored-by: Kevin Granade <[email protected]> Co-authored-by: Mark Langsdorf <[email protected]> Co-authored-by: LaVeyanFiend <[email protected]> Co-authored-by: Anton Burmistrov <[email protected]> Co-authored-by: sacrificerXY <[email protected]> Co-authored-by: curstwist <[email protected]> Co-authored-by: Pupsi-Mupsi <[email protected]> Co-authored-by: Brett Dong <[email protected]> Co-authored-by: SirPendrak <[email protected]> Co-authored-by: LyleSY <[email protected]> Co-authored-by: Hiram Anderson <[email protected]> Co-authored-by: Hymore246 <[email protected]> Co-authored-by: casswedson <[email protected]> Co-authored-by: Fris0uman <[email protected]> Co-authored-by: Gáspár Márton <[email protected]> Co-authored-by: Cimanyd0 <[email protected]> Co-authored-by: Sergey Alirzaev <[email protected]> Co-authored-by: Salty Panda <[email protected]> Co-authored-by: Salty Panda <[email protected]> Co-authored-by: Kelenius <[email protected]> Co-authored-by: Positronic-Girl <[email protected]> Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Theawesomeboophis <[email protected]> Co-authored-by: Eric Pierce <[email protected]> Co-authored-by: I-am-Erk <[email protected]> Co-authored-by: satheon <[email protected]> Co-authored-by: PatrikLundell <[email protected]> Co-authored-by: elsxf <[email protected]> Co-authored-by: andrei <[email protected]> Co-authored-by: Middo <[email protected]> Co-authored-by: KorGgenT <[email protected]> Co-authored-by: jumjummju <[email protected]> Co-authored-by: Serhiy Zahoriya <[email protected]> Co-authored-by: Ramza13 <[email protected]> Co-authored-by: Aloxaf <[email protected]> Co-authored-by: satheon49 <[email protected]> Co-authored-by: Saicchi <[email protected]> Co-authored-by: Thomas Wisneski <[email protected]> Co-authored-by: YoungBlood01 <[email protected]> Co-authored-by: Xygen <[email protected]> Co-authored-by: Alexey Mostovoy <[email protected]> Co-authored-by: Reed Schrier <[email protected]> Co-authored-by: UmbralReaper <[email protected]> Co-authored-by: Rjtheperson <[email protected]> Co-authored-by: Mom-Bun <[email protected]> Co-authored-by: jumjummju <[email protected]> Co-authored-by: haveric <[email protected]> Co-authored-by: Lamandus <[email protected]> Co-authored-by: Stephen Pittman <[email protected]> Co-authored-by: Nikita Vanku <[email protected]> Co-authored-by: slimeboy460 <[email protected]> Co-authored-by: Viktor Matthys <[email protected]> Co-authored-by: xerenogan <[email protected]> Co-authored-by: Entity-y <[email protected]>
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.
Summary
SUMMARY: Infrastructure "Add looks_like to a number of books"
Purpose of change
Fixes #45926
There are a number of books that look very similar to others, and were not using the existing tile art.
As a result most of the books were appearing in the ultica tileset as question marks.
Describe the solution
Checked which books were not showing the correct tile in-game, and then went through each books json and added the appropriate looks_like option.
Describe alternatives you've considered
None.
Testing
Spawned every single book, each on it's own separate tile. Loaded the changed json and made sure every book displayed correctly. Checked debug.log after running to ensure no additional errors.
Additional context