Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: npc label #58000

Merged
merged 1 commit into from
May 29, 2022
Merged

fix: npc label #58000

merged 1 commit into from
May 29, 2022

Conversation

casswedson
Copy link
Contributor

Summary

None

Purpose of change

Fixes #57994
Also I took note of additional context
Now that I think about it I pretty much implemented this blindfolded, cause whenever something fails it is pretty esoteric to me too; good thing being an expert isn't a must

Describe the solution

Should cover everything here

npc related files
./npc
./src/npc.cpp
./src/npcmove.cpp
./src/npctalk_funcs.cpp
./src/npc_attack.h
./src/npc_class.h
./src/npc.h
./src/npc_attack.cpp
./src/npc_favor.h
./src/npctalk.h
./src/npctrade.cpp
./src/npctrade.h
./src/talker_npc.h
./src/npc_class.cpp
./src/talker_npc.cpp
./src/npctalk.cpp
./src/npctrade_utils.h
./src/npctrade_utils.cpp
./data/json/npcs
./data/json/npcs/TALK_SURVIVOR_CHEF.json
./data/json/npcs/necropolis
./data/json/npcs/tacoma_ranch
./data/json/npcs/TALK_TEST.json
./data/json/npcs/items_generic.json
./data/json/npcs/necropolis/NPC_Old_Guard_Commo.json
./data/json/npcs/BG_traits.json
./data/json/npcs/NC_BOUNTY_HUNTER.json
./data/json/npcs/hints.json
./data/json/npcs/TALK_FACTION_CAMP.json
./data/json/npcs/classes.json
./data/json/npcs/BG_trait_groups.json
./data/json/npcs/npc.json
./data/json/npcs/exodii
./data/json/npcs/isherwood_farm
./data/json/npcs/NC_FARMER.json
./data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
./data/json/npcs/island_prison
./data/json/npcs/TALK_COMMON_GREET.json
./data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
./data/json/npcs/NC_DEBUG.json
./data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
./data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
./data/json/npcs/TALK_COMMON_OTHER.json
./data/json/npcs/talk_tags_chat.json
./data/json/npcs/island_prison/prisoners.json
./data/json/npcs/bunker_shop
./data/json/npcs/random_encounters
./data/json/npcs/isherwood_farm/NPC_Luke_Isherwood.json
./data/json/npcs/bunker_shop/TALK_BUNKER_MERCHANT.json
./data/json/npcs/bunker_shop/npc.json
./data/json/npcs/refugee_center
./data/json/npcs/random_encounters/free_merchant_caravans.json
./data/json/npcs/bunker_shop/classes.json
./data/json/npcs/bunker_shop/NC_BUNKER_MERCHANT.json
./data/json/npcs/random_encounters/john_bailey.json
./data/json/npcs/tacoma_ranch/mission_mapgen_tacoma_commune.json
./data/json/npcs/tacoma_ranch/NPC_ranch_sickly_laborer.json
./data/json/npcs/NC_SOLDIER.json
./data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
./data/json/npcs/tacoma_ranch/NPC_ranch_farmer2.json
./data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
./data/json/npcs/tacoma_ranch/NPC_ranch_doctor.json
./data/json/npcs/tacoma_ranch/NPC_ranch_carpenter2.json
./data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter1.json
./data/json/npcs/tacoma_ranch/NPC_ranch_bartender.json
./data/json/npcs/NC_COWBOY.json
./data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json
./data/json/npcs/isherwood_farm/NPC_Jack_Isherwood.json
./data/json/npcs/tacoma_ranch/NPC_ranch_generic.json
./data/json/npcs/factions.json
./data/json/npcs/refugee_center/missiondef_free_merchants.json
./data/json/npcs/isolated_road
./data/json/npcs/refugee_center/surface_staff
./data/json/npcs/refugee_center/surface_visitors
./data/json/npcs/refugee_center/surface_refugees
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard3.json
./data/json/npcs/refugee_center/surface_visitors/NPC_old_guard_representative.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_shopkeep.json
./data/json/npcs/refugee_center/surface_staff/NPC_old_guard_doctor.json
./data/json/npcs/refugee_center/surface_visitors/NPC_scavenger_mercenary.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_hostile_guard.json
./data/json/npcs/isolated_road/isolated_road_cody_fabricate.json
./data/json/npcs/refugee_center/surface_visitors/NPC_hunter.json
./data/json/npcs/refugee_center/surface_visitors/NPC_arsonist.json
./data/json/npcs/refugee_center/surface_visitors/NPC_visiting_scavenger.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard2.json
./data/json/npcs/isolated_road/isolated_road_item_groups.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard_generic.json
./data/json/npcs/isolated_road/isolated_road_npcs.json
./data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_guard1.json
./data/json/npcs/isolated_road/isolated_road_jay_convert.json
./data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
./data/json/npcs/isolated_road/isolated_road_missions.json
./data/json/npcs/isolated_road/isolated_road_jay_dialogue.json
./data/json/npcs/isolated_road/isolated_road_cody_prototype.json
./data/json/npcs/isolated_road/isolated_road_worn.json
./data/json/npcs/refugee_center/FREE_MERCHANTS_INFO.md
./data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
./data/json/npcs/tacoma_ranch/NPC_ranch_guard.json
./data/json/npcs/exodii/exodii_merchant_talk_exodization.json
./data/json/npcs/starting_traits.json
./data/json/npcs/tacoma_ranch/NPC_ranch_farmer1.json
./data/json/npcs/exodii/exodii_merchant_missions.json
./data/json/npcs/refugee_center/surface_staff/Smokes
./data/json/npcs/refugee_center/beggars
./data/json/npcs/mine
./data/json/npcs/refugee_center/beggars/BEGGAR_2_Dino_Dave.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Vanessa_Toby.json
./data/json/npcs/mine/spiral_madman.json
./data/json/npcs/refugee_center/beggars/BEGGAR_1_Reena_Sandhu.json
./data/json/npcs/refugee_center/beggars/BEGGAR_4_Brandon_Garder.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Stan_Borichenko.json
./data/json/npcs/refugee_center/beggars/BEGGAR_5_Yusuke_Taylor.json
./data/json/npcs/refugee_center/surface_staff/Smokes/NPC_Smokes.json
./data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Fatima_Al_Jadir.json
./data/json/npcs/refugee_center/beggars/BEGGAR_3_Luo_Meizhen.json
./data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_missions.json
./data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_talk_fluff.json
./data/json/npcs/refugee_center/surface_refugees/shared_dialogue.json
./data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_itemlist.json
./data/json/npcs/refugee_center/surface_staff/Smokes/free_merchant_shopkeep_goods.json
./data/json/npcs/refugee_center/surface_refugees/NPC_John_Clemens.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Guneet_Singh.json
./data/json/npcs/exodii/exodii_merchant_definitions.json
./data/json/npcs/exodii/exodii_merchant_itemlist.json
./data/json/npcs/TALK_COMMON_ALLY.json
./data/json/npcs/appearance_trait_groups.json
./data/json/npcs/tacoma_ranch/NPC_ranch_crop_overseer.json
./data/json/npcs/exodii/exodii_merchant_talk.json
./data/json/npcs/tacoma_ranch/NPC_ranch_nurse.json
./data/json/npcs/NC_DOCTOR.json
./data/json/npcs/NC_JUNK_SHOPKEEP.json
./data/json/npcs/exodii/non-NPC_missions.json
./data/json/npcs/tacoma_ranch/NPC_ranch_scavenger.json
./data/json/npcs/TALK_CYBORG_1.json
./data/json/npcs/TALK_TRUE_FOODPERSON.json
./data/json/npcs/NC_TRUE_FOODPERSON.json
./data/json/npcs/tacoma_ranch/NPC_ranch_scrapper.json
./data/json/npcs/destination_locations.json
./data/json/npcs/npc_behavior.json
./data/json/npcs/tacoma_ranch/NPC_ranch_woodcutter2.json
./data/json/npcs/tacoma_ranch/NPC_ranch_barber.json
./data/json/npcs/expertise_traits.json
./data/json/npcs/tacoma_ranch/NPC_ranch_carpenter1.json
./data/json/npcs/TALK_NC_FARMER.json
./data/json/npcs/prisoners
./data/json/npcs/godco
./data/json/npcs/Lighthouse_Family
./data/json/npcs/prisoners/mi-go_prisoners.json
./data/json/npcs/Lighthouse_Family/NPC_lighthouse_woman.json
./data/json/npcs/godco/NPC_Sonia_Greene.json
./data/json/npcs/godco/cook.json
./data/json/npcs/Lighthouse_Family/NPC_lighthouse_man.json
./data/json/npcs/godco/foodguard.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Mangalpreet_Singh.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Garry_Villeneuve.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Rhyzaea_Johnny.json
./data/json/npcs/godco/NPC_Chloe_Taylor_King.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Uyen_Tran.json
./data/json/npcs/NC_SCIENTIST.json
./data/json/npcs/Lighthouse_Family/TALK_fix_lighthouse.json
./data/json/npcs/Lighthouse_Family/npc_survivor.json
./data/json/npcs/godco/NPC_Zachary_Montes.json
./data/json/npcs/Lighthouse_Family/NPC_lighthouse_girl.json
./data/json/npcs/NC_THUG.json
./data/json/npcs/necropolis/NPC_Old_Guard_Captain.json
./data/json/npcs/missiondef.json
./data/json/npcs/necropolis/NPC_Old_Guard_Soldier.json
./data/json/npcs/TALK_COMPUTER.json
./data/json/npcs/NC_CYBORG.json
./data/json/npcs/robofac
./data/json/npcs/holdouts
./data/json/npcs/robofac/ROBOFAC_SURFACE_FREEMERCHANT.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Alonso_Lautrec.json
./data/json/npcs/robofac/robofac_basement_npcs
./data/json/npcs/refugee_center/surface_refugees/NPC_Dino_Dave.json
./data/json/npcs/holdouts/Rural-Cowboy_Friendly.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Aleesha_Seward.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json
./data/json/npcs/holdouts/Mr_Lapin.json
./data/json/npcs/holdouts/rural.json
./data/json/npcs/robofac/NPC_Cranberry_Foster.json
./data/json/npcs/holdouts/Rural-Cowboy_Trader.json
./data/json/npcs/holdouts/Rural-Cowboy_Nihilist.json
./data/json/npcs/robofac/NC_ROBOFAC_FIELD_RESEARCHER.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json
./data/json/npcs/robofac/NC_ROBOFAC_SCIENTIST.json
./data/json/npcs/holdouts/Rural-Cowboy_Hostile.json
./data/json/npcs/robofac/NPC_Ulysses_Rourke.json
./data/json/npcs/holdouts/NC_GLOOSCAP.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json
./data/json/npcs/robofac/NPC_robofac_generic_security.json
./data/json/npcs/NC_NINJA.json
./data/json/npcs/NC_SCAVENGER.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json
./data/json/npcs/TALK_FRIEND_CONVERSATION.json
./data/json/npcs/NC_HUNTER.json
./data/json/npcs/refugee_center/surface_refugees/NPC_Pablo_Nunez.json
./data/json/npcs/TALK_CITY_COP.json
./data/json/npcs/robofac/robofac_intercom
./data/json/npcs/Kindred
./data/json/npcs/Backgrounds
./data/json/npcs/robofac/robofac_intercom/robofac_intercom_missions.json
./data/json/npcs/robofac/robofac_intercom/robofac_intercom_trades.json
./data/json/npcs/Kindred/NPC_Brigitte_LaCroix.json
./data/json/npcs/Kindred/NPC_Darren_Cooper.json
./data/json/npcs/robofac/robofac_intercom/robofac_intercom.json
./data/json/npcs/robofac/robofac_intercom/robofac_intercom_prototypes.json
./data/json/npcs/TALK_MARLOSS_VOICE.json
./data/json/npcs/NC_MARLOSS_VOICE.json
./data/json/npcs/NC_BARTENDER.json
./data/json/npcs/NC_SURVIVOR_CHEF.json
./data/json/npcs/TALK_ALLY_TUTORIAL.json
./data/json/npcs/NC_CITY_COP.json
./data/json/npcs/NC_HACKER.json
./data/json/npcs/other
./data/json/npcs/old_guard
./data/json/npcs/Backgrounds/evacuee_2.json
./data/json/npcs/other/NPC_pizzaiolo.json
./data/json/npcs/Backgrounds/rural_2.json
./data/json/npcs/Backgrounds/wedding_1.json
./data/json/npcs/other/meteorologist.json
./data/json/npcs/Backgrounds/no_past_1.json
./data/json/npcs/Backgrounds/no_past_2.json
./data/json/npcs/Backgrounds/evacuee_6.json
./data/json/npcs/NC_ARSONIST.json
./data/json/npcs/NC_TRADER.json
./data/json/npcs/Backgrounds/meteorologist.json
./data/json/npcs/TALK_COMMON_MISSION.json
./data/json/npcs/talk_tags.json
./data/json/npcs/Backgrounds/dreamer.json
./data/json/npcs/Backgrounds/soldier_1.json
./data/json/npcs/Backgrounds/lost_partner_2.json
./data/json/npcs/Backgrounds/professor_1.json
./data/json/npcs/Backgrounds/left_for_dead_2.json
./data/json/npcs/Backgrounds/grad_student_1.json
./data/json/npcs/Backgrounds/religious_2.json
./data/json/npcs/Backgrounds/backgrounds_table_of_contents.json
./data/json/npcs/Backgrounds/no_past_4.json
./data/json/npcs/Backgrounds/hunter_2.json
./data/json/npcs/Backgrounds/criminal_2.json
./data/json/npcs/Backgrounds/gung_ho_1.json
./data/json/npcs/Backgrounds/cyborg_1.json
./data/json/npcs/Backgrounds/nerd_1.json
./data/json/npcs/Backgrounds/scavenger_merc_1.json
./data/json/npcs/Backgrounds/no_past_3.json
./data/json/npcs/Backgrounds/lost_partner_1.json
./data/json/npcs/Backgrounds/hunter_1.json
./data/json/npcs/Backgrounds/out_of_town_2.json
./data/json/npcs/Backgrounds/scientist_2.json
./data/json/npcs/Backgrounds/gung_ho_3.json
./data/json/npcs/Backgrounds/scientist_1.json
./data/json/npcs/Backgrounds/OtherSurvivorStories
./data/json/npcs/Backgrounds/OtherSurvivorStories/Brigitte_LaCroix_Background.json
./data/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_01.json
./data/json/npcs/Backgrounds/OtherSurvivorStories/No_Others_02.json
./data/json/npcs/Backgrounds/OtherSurvivorStories/NC_Farmer_background.json
./data/json/npcs/Backgrounds/OtherSurvivorStories/Lapin_01.json
./data/json/npcs/Backgrounds/OtherSurvivorStories/NC_SURVIVOR_CHEF_background.json
./data/json/npcs/Backgrounds/evacuee_5.json
./data/json/npcs/Backgrounds/evacuee_1.json
./data/json/npcs/Backgrounds/left_for_dead_1.json
./data/json/npcs/Backgrounds/evacuee_4.json
./data/json/npcs/Backgrounds/soldier_2.json
./data/json/npcs/Backgrounds/hospital_3.json
./data/json/npcs/Backgrounds/cop_3.json
./data/json/npcs/Backgrounds/no_past_5.json
./data/json/npcs/Backgrounds/high_school_1.json
./data/json/npcs/Backgrounds/othersurvivors_table_of_contents.json
./data/json/npcs/Backgrounds/rural_1.json
./data/json/npcs/Backgrounds/left_for_dead_3.json
./data/json/npcs/Backgrounds/burger_flipper_1.json
./data/json/npcs/Backgrounds/religious_1.json
./data/json/npcs/robofac/robofac_basement_npcs/NPC_Sunil_Narayana.json
./data/json/npcs/Backgrounds/bg_pizzaiolo.json
./data/json/npcs/robofac/robofac_basement_npcs/NPC_Darla_Novak.json
./data/json/npcs/Backgrounds/fema_evacuee_1.json
./data/json/npcs/Backgrounds/whathappened_table_of_contents.json
./data/json/npcs/robofac/robofac_basement_npcs/NPC_Jonathan_Farrier.json
./data/json/npcs/Backgrounds/gung_ho_2.json
./data/json/npcs/robofac/robofac_basement_npcs/NPC_Andrea_Dzvonko.json
./data/json/npcs/Backgrounds/cop_2.json
./data/json/npcs/Backgrounds/confused_1.json
./data/json/npcs/Backgrounds/evacuee_3.json
./data/json/npcs/Backgrounds/out_of_town_1.json
./data/json/npcs/Backgrounds/prepper_2.json
./data/json/npcs/Backgrounds/codger.json
./data/json/npcs/Backgrounds/prepper_1.json
./data/json/npcs/Backgrounds/lab_1.json
./data/json/npcs/Backgrounds/cop_1.json
./data/json/npcs/Backgrounds/hospital_1.json
./data/json/npcs/Backgrounds/prisoner_1.json
./data/json/npcs/Backgrounds/hospital_2.json
./data/json/npcs/Backgrounds/criminal_1.json
./data/mods/Military_Professions/npc
./data/mods/Military_Professions/npc/classes.json
./data/mods/Military_Professions/npc/NC_OPS.json
./data/mods/Military_Professions/npc/NC_ARMY.json
./data/json/npcs/old_guard/NPC_Old_Guard_FOB_pilot.json
./data/json/npcs/old_guard/NPC_Old_Guard_FOB_Soldier_1.json
./data/json/npcs/old_guard/NPC_Old_Guard_FOB_quartermaster.json
./data/json/npcs/old_guard/NPC_Old_Guard_FOB_officer.json
./data/json/snippets/epilogue_npc.json
./data/json/snippets/npc_quips.json
./data/mods/Aftershock/npcs
./data/mods/Aftershock/npcs/factions.json
./data/mods/Aftershock/npcs/prepnet_dialogue.json
./data/mods/Aftershock/npcs/threshold_recruit_dialogue.json
./data/mods/Aftershock/npcs/frankenstein_classes.json
./data/mods/Aftershock/npcs/sadie.json
./data/mods/Aftershock/npcs/npc.json
./data/mods/Aftershock/npcs/classes.json
./data/mods/Aftershock/npcs/cyrus_whately.json
./data/mods/Aftershock/npcs/prepnet_phyle
./data/mods/Aftershock/npcs/prepnet_phyle/prepnet_trade.json
./data/mods/Aftershock/npcs/milly_whately_dialogue.json
./data/mods/Aftershock/npcs/whately_generic_dialogue.json
./data/mods/Aftershock/npcs/mutant_npcs
./data/mods/Aftershock/npcs/Backgrounds
./data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json
./data/mods/Aftershock/npcs/cyropod_classes.json
./data/mods/Aftershock/npcs/cyborg_npcs
./data/mods/Aftershock/npcs/Backgrounds/npc_classes_mutant.json
./data/mods/Aftershock/npcs/Backgrounds/radiation_1.json
./data/mods/Aftershock/npcs/Backgrounds/whately.json
./data/mods/Aftershock/npcs/Backgrounds/uplifted_animal_3.json
./data/mods/Aftershock/npcs/Backgrounds/uplifted_animal_4.json
./data/mods/Aftershock/npcs/Backgrounds/radiation_2.json
./data/mods/Aftershock/npcs/cyborg_npcs/npc_classes_cyborg.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_2.json
./data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json
./data/mods/Aftershock/npcs/Backgrounds/vatgrown_1.json
./data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json
./data/mods/Aftershock/npcs/cyborg_npcs/item_groups_cyborg.json
./data/mods/Aftershock/npcs/Backgrounds/trait_groups.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_3.json
./data/mods/Aftershock/npcs/Backgrounds/BG_trait_groups_afs.json
./data/mods/Aftershock/npcs/Backgrounds/recent_mutation_1.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_afterlife.json
./data/mods/Aftershock/npcs/cyborg_npcs/backgrounds
./data/mods/Aftershock/npcs/cyborg_npcs/backgrounds/bg_traits_cyborg.json
./data/mods/Aftershock/npcs/cyborg_npcs/backgrounds/trait_groups_cyborg.json
./data/mods/Aftershock/npcs/Backgrounds/uplifted_animal_1.json
./data/mods/Aftershock/npcs/Backgrounds/criminal_experiment.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_2.json
./data/mods/Aftershock/npcs/Backgrounds/ganger_1.json
./data/mods/Aftershock/npcs/Backgrounds/talk_cyborg_abomination.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_schizo_1.json
./data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_bonesinger.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_dreamer.json
./data/mods/Aftershock/npcs/Backgrounds/selftest.json
./data/mods/Aftershock/npcs/Backgrounds/ganger_2.json
./data/mods/Aftershock/npcs/Backgrounds/ganger_3.json
./data/mods/Aftershock/npcs/Backgrounds/BGRS_migo_1.json
./data/mods/Aftershock/npcs/Backgrounds/cyberninja.json
./data/mods/Aftershock/npcs/Backgrounds/uplifted_animal_5.json
./data/mods/Aftershock/npcs/Backgrounds/uplifted_animal_2.json
./data/mods/No_Hope/NPC/npc_classes_bandits.json
./data/mods/No_Hope/NPC/npc.json
./data/mods/No_Hope/NPC/npc_classes_mutant.json
./data/mods/No_Hope/Mapgen/city_npc_nested_spawns.json
./data/mods/No_Hope/Mapgen/campground_npc.json
./data/mods/DinoMod/NPC/npc_classes_mutant.json
./data/mods/TEST_DATA/npc_shop_cons_rates.json
./data/mods/Magiclysm/npc
./data/mods/Magiclysm/npc/TALK_FORGE_HELEN_TAVREL.json
./data/mods/Magiclysm/npc/TALK_FORGE_MERCHANT.json
./data/mods/Magiclysm/npc/factions.json
./data/mods/Magiclysm/npc/TALK_FORGE_ARDELIA.json
./data/mods/Magiclysm/npc/trait_groups.json
./data/mods/Magiclysm/npc/TALK_TECHNO_KID.json
./data/mods/Magiclysm/npc/classes.json
./data/mods/Magiclysm/npc/npc.json
./data/mods/Magiclysm/npc/missiondef.json
./data/mods/Magiclysm/npc/TALK_HEALER_GREY.json
./data/mods/Magiclysm/npc/TALK_OLD_MAGUS.json
./data/mods/Magiclysm/npc/items_worn.json
./data/mods/Magiclysm/npc/TALK_FORGE_PIRATE.json
./data/json/mapgen/campground_npc.json
./data/json/mapgen/nested/city_npc_nested_spawns.json
./data/json/mapgen/nested/npc_nested_spawns.json
./lang/string_extractor/parsers/npc_class.py
./tests/npc_talk_test.cpp
./tests/npc_test.cpp
./lang/string_extractor/parsers/npc.py
./tests/npc_shop_cons_rates_test.cpp
./tests/npc_attack_test.cpp

Describe alternatives you've considered

Testing

casswedson#41 modifies the same files as the pr mentined in the issue

Additional context

@github-actions github-actions bot added Code: Tooling Tooling that is not part of the main game but is part of the repo. json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels May 29, 2022
@Maleclypse
Copy link
Member

Maleclypse commented May 29, 2022

I noticed recently that the debug_menu.cpp doesn't seem to cause the "Code: Debug" tag to fire I think. But something pretty immediately grabbed my attention from the computer beore I could confirm.

@NetSysFire NetSysFire added the <Bugfix> This is a fix for a bug (or closes open issue) label May 29, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label May 29, 2022
@dseguin dseguin merged commit c40daa6 into CleverRaven:master May 29, 2022
@casswedson casswedson deleted the fix-npc-label branch May 29, 2022 22:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) Code: Tooling Tooling that is not part of the main game but is part of the repo. json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NPC label does not apply correctly
4 participants