From ff6e85341e4bc13c2339395542a8ba7aeb0d305d Mon Sep 17 00:00:00 2001 From: rofl0r Date: Fri, 2 Aug 2013 11:23:45 +0200 Subject: [PATCH] 0.34.11 import: change 4 --- g_src/keybindings.cpp | 114 +++++++++++++++++++++++++++++++++++++++++++++----- g_src/keybindings.h | 57 ++++++++++++++++++++++--- 2 files changed, 156 insertions(+), 15 deletions(-) diff --git a/g_src/keybindings.cpp b/g_src/keybindings.cpp index f75843a..dfef53e 100755 --- a/g_src/keybindings.cpp +++ b/g_src/keybindings.cpp @@ -406,6 +406,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_GEAR_ASSEMBLY, "HOTKEY_BUILDING_MACHINE_GEAR_ASSEMBLY"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_HORIZONTAL, "HOTKEY_BUILDING_MACHINE_AXLE_HORIZONTAL"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_VERTICAL, "HOTKEY_BUILDING_MACHINE_AXLE_VERTICAL"); + bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_ROLLERS, "HOTKEY_BUILDING_MACHINE_ROLLERS"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_BALLISTA, "HOTKEY_BUILDING_SIEGEENGINE_BALLISTA"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_CATAPULT, "HOTKEY_BUILDING_SIEGEENGINE_CATAPULT"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_TRAP_STONE, "HOTKEY_BUILDING_TRAP_STONE"); @@ -422,6 +423,8 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_UP, "HOTKEY_BUILDING_CONSTRUCTION_STAIR_UP"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_DOWN, "HOTKEY_BUILDING_CONSTRUCTION_STAIR_DOWN"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_UPDOWN, "HOTKEY_BUILDING_CONSTRUCTION_STAIR_UPDOWN"); + bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK, "HOTKEY_BUILDING_CONSTRUCTION_TRACK"); + bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK_STOP, "HOTKEY_BUILDING_CONSTRUCTION_TRACK_STOP"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_LEATHER, "HOTKEY_BUILDING_WORKSHOP_LEATHER"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_QUERN, "HOTKEY_BUILDING_WORKSHOP_QUERN"); bindingNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_MILLSTONE, "HOTKEY_BUILDING_WORKSHOP_MILLSTONE"); @@ -520,6 +523,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_D_MILITARY_ADD_UNIFORM, "D_MILITARY_ADD_UNIFORM"); bindingNames.insert(INTERFACEKEY_D_MILITARY_DELETE_UNIFORM, "D_MILITARY_DELETE_UNIFORM"); bindingNames.insert(INTERFACEKEY_D_MILITARY_NAME_UNIFORM, "D_MILITARY_NAME_UNIFORM"); + bindingNames.insert(INTERFACEKEY_D_MILITARY_NAME_SQUAD, "D_MILITARY_NAME_SQUAD"); bindingNames.insert(INTERFACEKEY_D_MILITARY_ADD_ARMOR, "D_MILITARY_ADD_ARMOR"); bindingNames.insert(INTERFACEKEY_D_MILITARY_ADD_PANTS, "D_MILITARY_ADD_PANTS"); bindingNames.insert(INTERFACEKEY_D_MILITARY_ADD_HELM, "D_MILITARY_ADD_HELM"); @@ -558,6 +562,28 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_D_JOBLIST, "D_JOBLIST"); bindingNames.insert(INTERFACEKEY_D_UNITLIST, "D_UNITLIST"); bindingNames.insert(INTERFACEKEY_D_LOOK, "D_LOOK"); + bindingNames.insert(INTERFACEKEY_D_HAULING, "D_HAULING"); + bindingNames.insert(INTERFACEKEY_D_HAULING_NEW_ROUTE, "D_HAULING_NEW_ROUTE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_NEW_STOP, "D_HAULING_NEW_STOP"); + bindingNames.insert(INTERFACEKEY_D_HAULING_REMOVE, "D_HAULING_REMOVE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_PROMOTE, "D_HAULING_PROMOTE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_VEHICLE, "D_HAULING_VEHICLE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_NICKNAME, "D_HAULING_NICKNAME"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_NEW_DEPART, "D_HAULING_STOP_NEW_DEPART"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_NEW_LINK, "D_HAULING_STOP_NEW_LINK"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_REMOVE, "D_HAULING_STOP_REMOVE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_SL_SELECT_PILE, "D_HAULING_STOP_SL_SELECT_PILE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_SL_TAKE_GIVE, "D_HAULING_STOP_SL_TAKE_GIVE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_DIR, "D_HAULING_STOP_LC_DIR"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_MODE, "D_HAULING_STOP_LC_MODE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_TIMER_UP, "D_HAULING_STOP_LC_TIMER_UP"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_TIMER_DOWN, "D_HAULING_STOP_LC_TIMER_DOWN"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_UP, "D_HAULING_STOP_LC_FULLNESS_UP"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_DOWN, "D_HAULING_STOP_LC_FULLNESS_DOWN"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_MORE_LESS, "D_HAULING_STOP_LC_MORE_LESS"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_DESIRED_TOTAL, "D_HAULING_STOP_LC_DESIRED_TOTAL"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_CHANGE, "D_HAULING_STOP_LC_CHANGE"); + bindingNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_ADVANCED, "D_HAULING_STOP_LC_ADVANCED"); bindingNames.insert(INTERFACEKEY_D_BURROWS, "D_BURROWS"); bindingNames.insert(INTERFACEKEY_D_BURROWS_ADD, "D_BURROWS_ADD"); bindingNames.insert(INTERFACEKEY_D_BURROWS_DELETE, "D_BURROWS_DELETE"); @@ -594,6 +620,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_D_LOOK_DUMP, "D_LOOK_DUMP"); bindingNames.insert(INTERFACEKEY_D_LOOK_MELT, "D_LOOK_MELT"); bindingNames.insert(INTERFACEKEY_D_LOOK_HIDE, "D_LOOK_HIDE"); + bindingNames.insert(INTERFACEKEY_D_LOOK_FOLLOW, "D_LOOK_FOLLOW"); bindingNames.insert(INTERFACEKEY_D_LOOK_ARENA_CREATURE, "D_LOOK_ARENA_CREATURE"); bindingNames.insert(INTERFACEKEY_D_LOOK_ARENA_ADV_MODE, "D_LOOK_ARENA_ADV_MODE"); bindingNames.insert(INTERFACEKEY_D_LOOK_ARENA_WATER, "D_LOOK_ARENA_WATER"); @@ -604,6 +631,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_ARENA_CREATURE_BLANK_LIST, "ARENA_CREATURE_BLANK_LIST"); bindingNames.insert(INTERFACEKEY_ARENA_CREATURE_REMOVE_ITEM, "ARENA_CREATURE_REMOVE_ITEM"); bindingNames.insert(INTERFACEKEY_ARENA_CREATURE_UNDEAD, "ARENA_CREATURE_UNDEAD"); + bindingNames.insert(INTERFACEKEY_ARENA_CREATURE_STRING, "ARENA_CREATURE_STRING"); bindingNames.insert(INTERFACEKEY_A_ENTER_NAME, "A_ENTER_NAME"); bindingNames.insert(INTERFACEKEY_A_CUST_NAME, "A_CUST_NAME"); bindingNames.insert(INTERFACEKEY_A_RANDOM_NAME, "A_RANDOM_NAME"); @@ -699,11 +727,8 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_HOTKEY_FARMER_SHEAR_CREATURE, "HOTKEY_FARMER_SHEAR_CREATURE"); bindingNames.insert(INTERFACEKEY_HOTKEY_FARMER_SPIN_THREAD, "HOTKEY_FARMER_SPIN_THREAD"); bindingNames.insert(INTERFACEKEY_HOTKEY_MILL_MILL, "HOTKEY_MILL_MILL"); - bindingNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TRAIN_HUNT, "HOTKEY_KENNEL_TRAIN_HUNT"); bindingNames.insert(INTERFACEKEY_HOTKEY_KENNEL_CATCH_VERMIN, "HOTKEY_KENNEL_CATCH_VERMIN"); bindingNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TAME_VERMIN, "HOTKEY_KENNEL_TAME_VERMIN"); - bindingNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TAME_UNIT, "HOTKEY_KENNEL_TAME_UNIT"); - bindingNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TRAIN_WAR, "HOTKEY_KENNEL_TRAIN_WAR"); bindingNames.insert(INTERFACEKEY_HOTKEY_FISHERY_PROCESS, "HOTKEY_FISHERY_PROCESS"); bindingNames.insert(INTERFACEKEY_HOTKEY_FISHERY_EXTRACT, "HOTKEY_FISHERY_EXTRACT"); bindingNames.insert(INTERFACEKEY_HOTKEY_FISHERY_CATCH, "HOTKEY_FISHERY_CATCH"); @@ -750,6 +775,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_HOTKEY_TRAP_CHAIN, "HOTKEY_TRAP_CHAIN"); bindingNames.insert(INTERFACEKEY_HOTKEY_TRAP_CAGE, "HOTKEY_TRAP_CAGE"); bindingNames.insert(INTERFACEKEY_HOTKEY_TRAP_PULL_LEVER, "HOTKEY_TRAP_PULL_LEVER"); + bindingNames.insert(INTERFACEKEY_HOTKEY_TRAP_TRACK_STOP, "HOTKEY_TRAP_TRACK_STOP"); bindingNames.insert(INTERFACEKEY_BUILDJOB_ADD, "BUILDJOB_ADD"); bindingNames.insert(INTERFACEKEY_BUILDJOB_CANCEL, "BUILDJOB_CANCEL"); bindingNames.insert(INTERFACEKEY_BUILDJOB_PROMOTE, "BUILDJOB_PROMOTE"); @@ -824,6 +850,9 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_BUILDJOB_FARM_AUTUMN, "BUILDJOB_FARM_AUTUMN"); bindingNames.insert(INTERFACEKEY_BUILDJOB_FARM_WINTER, "BUILDJOB_FARM_WINTER"); bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_MASTER, "BUILDJOB_STOCKPILE_MASTER"); + bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_LINK_ANYWHERE, "BUILDJOB_STOCKPILE_LINK_ANYWHERE"); + bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_GIVE_TO, "BUILDJOB_STOCKPILE_GIVE_TO"); + bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_WHEELBARROW, "BUILDJOB_STOCKPILE_WHEELBARROW"); bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_DELETE_CHILD, "BUILDJOB_STOCKPILE_DELETE_CHILD"); bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_SETTINGS, "BUILDJOB_STOCKPILE_SETTINGS"); bindingNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_BARREL_UP, "BUILDJOB_STOCKPILE_BARREL_UP"); @@ -909,6 +938,9 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_MANAGER_MAX, "MANAGER_MAX"); bindingNames.insert(INTERFACEKEY_MANAGER_WAGES, "MANAGER_WAGES"); bindingNames.insert(INTERFACEKEY_PET_BUTCHER, "PET_BUTCHER"); + bindingNames.insert(INTERFACEKEY_ANIMAL_SELECT_TRAINER, "ANIMAL_SELECT_TRAINER"); + bindingNames.insert(INTERFACEKEY_ANIMAL_WAR_TRAINING, "ANIMAL_WAR_TRAINING"); + bindingNames.insert(INTERFACEKEY_ANIMAL_HUNTING_TRAINING, "ANIMAL_HUNTING_TRAINING"); bindingNames.insert(INTERFACEKEY_KITCHEN_COOK, "KITCHEN_COOK"); bindingNames.insert(INTERFACEKEY_KITCHEN_BREW, "KITCHEN_BREW"); bindingNames.insert(INTERFACEKEY_SETUPGAME_NEW, "SETUPGAME_NEW"); @@ -933,6 +965,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_CIVZONE_CLAY_COLLECT, "CIVZONE_CLAY_COLLECT"); bindingNames.insert(INTERFACEKEY_CIVZONE_ACTIVE, "CIVZONE_ACTIVE"); bindingNames.insert(INTERFACEKEY_CIVZONE_MEETING, "CIVZONE_MEETING"); + bindingNames.insert(INTERFACEKEY_CIVZONE_ANIMAL_TRAINING, "CIVZONE_ANIMAL_TRAINING"); bindingNames.insert(INTERFACEKEY_CIVZONE_POND_WATER, "CIVZONE_POND_WATER"); bindingNames.insert(INTERFACEKEY_CIVZONE_PEN, "CIVZONE_PEN"); bindingNames.insert(INTERFACEKEY_CIVZONE_PEN_OPTIONS, "CIVZONE_PEN_OPTIONS"); @@ -985,6 +1018,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_DESIGNATE_SMOOTH, "DESIGNATE_SMOOTH"); bindingNames.insert(INTERFACEKEY_DESIGNATE_ENGRAVE, "DESIGNATE_ENGRAVE"); bindingNames.insert(INTERFACEKEY_DESIGNATE_FORTIFY, "DESIGNATE_FORTIFY"); + bindingNames.insert(INTERFACEKEY_DESIGNATE_TRACK, "DESIGNATE_TRACK"); bindingNames.insert(INTERFACEKEY_DESIGNATE_TOGGLE_ENGRAVING, "DESIGNATE_TOGGLE_ENGRAVING"); bindingNames.insert(INTERFACEKEY_DESIGNATE_UNDO, "DESIGNATE_UNDO"); bindingNames.insert(INTERFACEKEY_DESIGNATE_REMOVE_CONSTRUCTION, "DESIGNATE_REMOVE_CONSTRUCTION"); @@ -1010,6 +1044,16 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_MAGMA_DOWN, "BUILDING_TRIGGER_MIN_MAGMA_DOWN"); bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_UP, "BUILDING_TRIGGER_MAX_MAGMA_UP"); bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_DOWN, "BUILDING_TRIGGER_MAX_MAGMA_DOWN"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_TRACK_CART, "BUILDING_TRIGGER_ENABLE_TRACK_CART"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_DOWN, "BUILDING_TRIGGER_MIN_TRACK_CART_DOWN"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_UP, "BUILDING_TRIGGER_MIN_TRACK_CART_UP"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_DOWN, "BUILDING_TRIGGER_MAX_TRACK_CART_DOWN"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_UP, "BUILDING_TRIGGER_MAX_TRACK_CART_UP"); + bindingNames.insert(INTERFACEKEY_BUILDING_ROLLERS_SPEED_UP, "BUILDING_ROLLERS_SPEED_UP"); + bindingNames.insert(INTERFACEKEY_BUILDING_ROLLERS_SPEED_DOWN, "BUILDING_ROLLERS_SPEED_DOWN"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_UP, "BUILDING_TRACK_STOP_FRICTION_UP"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_DOWN, "BUILDING_TRACK_STOP_FRICTION_DOWN"); + bindingNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_DUMP, "BUILDING_TRACK_STOP_DUMP"); bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_CREATURE, "BUILDING_TRIGGER_ENABLE_CREATURE"); bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_LOCALS, "BUILDING_TRIGGER_ENABLE_LOCALS"); bindingNames.insert(INTERFACEKEY_BUILDING_TRIGGER_RESETS, "BUILDING_TRIGGER_RESETS"); @@ -1021,6 +1065,7 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_UNITVIEW_INV, "UNITVIEW_INV"); bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF, "UNITVIEW_PRF"); bindingNames.insert(INTERFACEKEY_UNITVIEW_WND, "UNITVIEW_WND"); + bindingNames.insert(INTERFACEKEY_UNITVIEW_FOLLOW, "UNITVIEW_FOLLOW"); bindingNames.insert(INTERFACEKEY_UNITVIEW_NEXT, "UNITVIEW_NEXT"); bindingNames.insert(INTERFACEKEY_UNITVIEW_SLAUGHTER, "UNITVIEW_SLAUGHTER"); bindingNames.insert(INTERFACEKEY_UNITVIEW_GEN_COMBAT, "UNITVIEW_GEN_COMBAT"); @@ -1028,9 +1073,11 @@ void keybinding_init() { bindingNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "UNITVIEW_GEN_MISC"); bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "UNITVIEW_PRF_PROF"); bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "UNITVIEW_PRF_PET"); - bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET_HUNT, "UNITVIEW_PRF_PET_HUNT"); - bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET_WAR, "UNITVIEW_PRF_PET_WAR"); bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "UNITVIEW_PRF_VIEW"); + bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "UNITVIEW_PRF_NEW_SQUAD"); + bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "UNITVIEW_PRF_REMOVE_FROM_SQUAD"); + bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_NAME_CURRENT_SQUAD, "UNITVIEW_PRF_NAME_CURRENT_SQUAD"); + bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_NAME_SELECTED_SQUAD, "UNITVIEW_PRF_NAME_SELECTED_SQUAD"); bindingNames.insert(INTERFACEKEY_STRING_A000, "STRING_A000"); bindingNames.insert(INTERFACEKEY_STRING_A001, "STRING_A001"); @@ -1795,6 +1842,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_GEAR_ASSEMBLY, "Hotkey: Building, Machine Component, Gear Assembly"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_HORIZONTAL, "Hotkey: Building, Machine Component, Horizontal Axle"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_VERTICAL, "Hotkey: Building, Machine Component, Vertical Axle"); + displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_MACHINE_ROLLERS, "Hotkey: Building, Machine Component, Rollers"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_BALLISTA, "Hotkey: Building, Siege, Ballista"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_CATAPULT, "Hotkey: Building, Siege, Catapult"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_TRAP_STONE, "Hotkey: Building, Trap, Stone"); @@ -1811,6 +1859,8 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_UP, "Hotkey: Building, Construction, Upward Stair"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_DOWN, "Hotkey: Building, Construction, Downward Stair"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_UPDOWN, "Hotkey: Building, Construction, Up/Down Stair"); + displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK, "Hotkey: Building, Construction, Track"); + displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK_STOP, "Hotkey: Building, Construction, Track Stop"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_LEATHER, "Hotkey: Building, Wksp, Leather"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_QUERN, "Hotkey: Building, Wksp, Quern"); displayNames.insert(INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_MILLSTONE, "Hotkey: Building, Wksp, Millstone"); @@ -1909,6 +1959,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_D_MILITARY_ADD_UNIFORM, "Main: Military, Add Uniform"); displayNames.insert(INTERFACEKEY_D_MILITARY_DELETE_UNIFORM, "Main: Military, Delete Uniform"); displayNames.insert(INTERFACEKEY_D_MILITARY_NAME_UNIFORM, "Main: Military, Name Uniform"); + displayNames.insert(INTERFACEKEY_D_MILITARY_NAME_SQUAD, "Main: Military, Name Squad"); displayNames.insert(INTERFACEKEY_D_MILITARY_ADD_ARMOR, "Main: Military, Add Armor"); displayNames.insert(INTERFACEKEY_D_MILITARY_ADD_PANTS, "Main: Military, Add Pants"); displayNames.insert(INTERFACEKEY_D_MILITARY_ADD_HELM, "Main: Military, Add Helm"); @@ -1947,6 +1998,28 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_D_JOBLIST, "Main: Job List"); displayNames.insert(INTERFACEKEY_D_UNITLIST, "Main: Unit List"); displayNames.insert(INTERFACEKEY_D_LOOK, "Main: Look"); + displayNames.insert(INTERFACEKEY_D_HAULING, "Main: Hauling"); + displayNames.insert(INTERFACEKEY_D_HAULING_NEW_ROUTE, "Main: Hauling, New Route"); + displayNames.insert(INTERFACEKEY_D_HAULING_NEW_STOP, "Main: Hauling, New Stop"); + displayNames.insert(INTERFACEKEY_D_HAULING_REMOVE, "Main: Hauling, Remove"); + displayNames.insert(INTERFACEKEY_D_HAULING_PROMOTE, "Main: Hauling, Promote"); + displayNames.insert(INTERFACEKEY_D_HAULING_VEHICLE, "Main: Hauling, Vehicle"); + displayNames.insert(INTERFACEKEY_D_HAULING_NICKNAME, "Main: Hauling, Name"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_NEW_DEPART, "Main: Hauling, Stop, New Leave Condition"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_NEW_LINK, "Main: Hauling, Stop, New Stockpile Link"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_REMOVE, "Main: Hauling, Stop, Remove"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_SL_SELECT_PILE, "Main: Hauling, Stop, Stockpile, Select"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_SL_TAKE_GIVE, "Main: Hauling, Stop, Stockpile, Take/Give"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_DIR, "Main: Hauling, Stop, Leave Condition, Dir"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_MODE, "Main: Hauling, Stop, Leave Condition, Mode"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_TIMER_UP, "Main: Hauling, Stop, Leave Condition, Timer Up"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_TIMER_DOWN, "Main: Hauling, Stop, Leave Condition, Timer Down"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_UP, "Main: Hauling, Stop, Leave Condition, Fullness Up"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_DOWN, "Main: Hauling, Stop, Leave Condition, Fullness Down"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_MORE_LESS, "Main: Hauling, Stop, Leave Condition, More/Less"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_DESIRED_TOTAL, "Main: Hauling, Stop, Leave Condition, Desired/Total"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_CHANGE, "Main: Hauling, Stop, Leave Condition, Change"); + displayNames.insert(INTERFACEKEY_D_HAULING_STOP_LC_ADVANCED, "Main: Hauling, Stop, Leave Condition, Advanced"); displayNames.insert(INTERFACEKEY_D_BURROWS, "Main: Burrows"); displayNames.insert(INTERFACEKEY_D_BURROWS_ADD, "Main: Burrows, Add"); displayNames.insert(INTERFACEKEY_D_BURROWS_DELETE, "Main: Burrows, Delete"); @@ -1983,6 +2056,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_D_LOOK_DUMP, "Dwf Look: Dump"); displayNames.insert(INTERFACEKEY_D_LOOK_MELT, "Dwf Look: Melt"); displayNames.insert(INTERFACEKEY_D_LOOK_HIDE, "Dwf Look: Hide"); + displayNames.insert(INTERFACEKEY_D_LOOK_FOLLOW, "Dwf Look: Follow"); displayNames.insert(INTERFACEKEY_D_LOOK_ARENA_CREATURE, "Dwf Look: Arena Creature"); displayNames.insert(INTERFACEKEY_D_LOOK_ARENA_ADV_MODE, "Dwf Look: Arena Adv Mode"); displayNames.insert(INTERFACEKEY_D_LOOK_ARENA_WATER, "Dwf Look: Arena Water"); @@ -1993,6 +2067,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_ARENA_CREATURE_BLANK_LIST, "Arena Creature: Blank List"); displayNames.insert(INTERFACEKEY_ARENA_CREATURE_REMOVE_ITEM, "Arena Creature: Remove Item"); displayNames.insert(INTERFACEKEY_ARENA_CREATURE_UNDEAD, "Arena Creature: Undead"); + displayNames.insert(INTERFACEKEY_ARENA_CREATURE_STRING, "Arena Creature: String"); displayNames.insert(INTERFACEKEY_A_ENTER_NAME, "Adventure: Creation, Name Entry"); displayNames.insert(INTERFACEKEY_A_CUST_NAME, "Adventure: Creation, Customize Name"); displayNames.insert(INTERFACEKEY_A_RANDOM_NAME, "Adventure: Creation, Random Name"); @@ -2088,11 +2163,8 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_HOTKEY_FARMER_SHEAR_CREATURE, "Hotkey: Farmer, Shear"); displayNames.insert(INTERFACEKEY_HOTKEY_FARMER_SPIN_THREAD, "Hotkey: Farmer, Spin"); displayNames.insert(INTERFACEKEY_HOTKEY_MILL_MILL, "Hotkey: Mill, Mill"); - displayNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TRAIN_HUNT, "Hotkey: Kennel, Hunt"); displayNames.insert(INTERFACEKEY_HOTKEY_KENNEL_CATCH_VERMIN, "Hotkey: Kennel, Catch"); displayNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TAME_VERMIN, "Hotkey: Kennel, Tame Small"); - displayNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TAME_UNIT, "Hotkey: Kennel, Tame Large"); - displayNames.insert(INTERFACEKEY_HOTKEY_KENNEL_TRAIN_WAR, "Hotkey: Kennel, War"); displayNames.insert(INTERFACEKEY_HOTKEY_FISHERY_PROCESS, "Hotkey: Fishery, Process"); displayNames.insert(INTERFACEKEY_HOTKEY_FISHERY_EXTRACT, "Hotkey: Fishery, Extract"); displayNames.insert(INTERFACEKEY_HOTKEY_FISHERY_CATCH, "Hotkey: Fishery, Catch"); @@ -2139,6 +2211,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_HOTKEY_TRAP_CHAIN, "Hotkey: Trap, Chain"); displayNames.insert(INTERFACEKEY_HOTKEY_TRAP_CAGE, "Hotkey: Trap, Cage"); displayNames.insert(INTERFACEKEY_HOTKEY_TRAP_PULL_LEVER, "Hotkey: Trap, Lever"); + displayNames.insert(INTERFACEKEY_HOTKEY_TRAP_TRACK_STOP, "Hotkey: Trap, Track Stop"); displayNames.insert(INTERFACEKEY_BUILDJOB_ADD, "Buildjob: Add"); displayNames.insert(INTERFACEKEY_BUILDJOB_CANCEL, "Buildjob: Cancel"); displayNames.insert(INTERFACEKEY_BUILDJOB_PROMOTE, "Buildjob: Promote"); @@ -2213,6 +2286,9 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_BUILDJOB_FARM_AUTUMN, "Buildjob: Farm, Autumn"); displayNames.insert(INTERFACEKEY_BUILDJOB_FARM_WINTER, "Buildjob: Farm, Winter"); displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_MASTER, "Buildjob: Stockpile, Master"); + displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_LINK_ANYWHERE, "Buildjob: Stockpile, Link/Anywhere"); + displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_GIVE_TO, "Buildjob: Stockpile, Give To"); + displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_WHEELBARROW, "Buildjob: Stockpile, Wheelbarrow"); displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_DELETE_CHILD, "Buildjob: Stockpile, Delete Child"); displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_SETTINGS, "Buildjob: Stockpile, Settings"); displayNames.insert(INTERFACEKEY_BUILDJOB_STOCKPILE_BARREL_UP, "Buildjob: Stockpile, Barrel Up"); @@ -2298,6 +2374,9 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_MANAGER_MAX, "Manager, Max"); displayNames.insert(INTERFACEKEY_MANAGER_WAGES, "Manager, Wages"); displayNames.insert(INTERFACEKEY_PET_BUTCHER, "Animals, Slaughter"); + bindingNames.insert(INTERFACEKEY_ANIMAL_SELECT_TRAINER, "Animals, Trainer"); + bindingNames.insert(INTERFACEKEY_ANIMAL_WAR_TRAINING, "Animals, War Training"); + bindingNames.insert(INTERFACEKEY_ANIMAL_HUNTING_TRAINING, "Animals, Hunting Training"); displayNames.insert(INTERFACEKEY_KITCHEN_COOK, "Kitchen, Cook"); displayNames.insert(INTERFACEKEY_KITCHEN_BREW, "Kitchen, Brew"); displayNames.insert(INTERFACEKEY_SETUPGAME_NEW, "Setup, New"); @@ -2320,6 +2399,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_CIVZONE_ACTIVE, "Main: Activity Zone, Active"); displayNames.insert(INTERFACEKEY_CIVZONE_FISH, "Main: Activity Zone, Fish"); displayNames.insert(INTERFACEKEY_CIVZONE_MEETING, "Main: Activity Zone, Meeting"); + displayNames.insert(INTERFACEKEY_CIVZONE_ANIMAL_TRAINING, "Main: Activity Zone, Animal Training"); displayNames.insert(INTERFACEKEY_CIVZONE_POND_OPTIONS, "Main: Activity Zone, Pond Options"); displayNames.insert(INTERFACEKEY_CIVZONE_POND_WATER, "Main: Activity Zone: Pond, Water"); displayNames.insert(INTERFACEKEY_CIVZONE_HOSPITAL_OPTIONS, "Main: Activity Zone, Hospital Options"); @@ -2374,6 +2454,7 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_DESIGNATE_SMOOTH, "Designate, Smooth"); displayNames.insert(INTERFACEKEY_DESIGNATE_ENGRAVE, "Designate, Engrave"); displayNames.insert(INTERFACEKEY_DESIGNATE_FORTIFY, "Designate, Fortify"); + displayNames.insert(INTERFACEKEY_DESIGNATE_TRACK, "Designate, Carve Track"); displayNames.insert(INTERFACEKEY_DESIGNATE_TOGGLE_ENGRAVING, "Designate, Toggle Engraving"); displayNames.insert(INTERFACEKEY_DESIGNATE_UNDO, "Designate, Undo"); displayNames.insert(INTERFACEKEY_DESIGNATE_REMOVE_CONSTRUCTION, "Designate, Remove Construction"); @@ -2399,6 +2480,16 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_MAGMA_DOWN, "Building, Trigger, Min Magma Down"); displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_UP, "Building, Trigger, Max Magma Up"); displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_DOWN, "Building, Trigger, Max Magma Down"); + displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_TRACK_CART, "Building, Trigger, Enable Cart"); + displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_DOWN, "Building, Trigger, Min Cart Down"); + displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_UP, "Building, Trigger, Min Cart Up"); + displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_DOWN, "Building, Trigger, Max Cart Down"); + displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_UP, "Building, Trigger, Max Cart Up"); + displayNames.insert(INTERFACEKEY_BUILDING_ROLLERS_SPEED_UP, "Building, Rollers, Speed Up"); + displayNames.insert(INTERFACEKEY_BUILDING_ROLLERS_SPEED_DOWN, "Building, Rollers, Speed Down"); + displayNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_UP, "Building, Track Stop, Friction Up"); + displayNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_DOWN, "Building, Track Stop, Friction Down"); + displayNames.insert(INTERFACEKEY_BUILDING_TRACK_STOP_DUMP, "Building, Track Stop, Dump"); displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_CREATURE, "Building, Trigger, Enable Creature"); displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_ENABLE_LOCALS, "Building, Trigger, Enable Locals"); displayNames.insert(INTERFACEKEY_BUILDING_TRIGGER_RESETS, "Building, Trigger, Resets"); @@ -2411,15 +2502,18 @@ void keybinding_init() { displayNames.insert(INTERFACEKEY_UNITVIEW_PRF, "Unitview, Prefs"); displayNames.insert(INTERFACEKEY_UNITVIEW_WND, "Unitview, Wounds"); displayNames.insert(INTERFACEKEY_UNITVIEW_NEXT, "Unitview, Next Unit"); + displayNames.insert(INTERFACEKEY_UNITVIEW_FOLLOW, "Unitview, Follow"); displayNames.insert(INTERFACEKEY_UNITVIEW_SLAUGHTER, "Unitview, Slaughter"); displayNames.insert(INTERFACEKEY_UNITVIEW_GEN_COMBAT, "Unitview, General, Combat"); displayNames.insert(INTERFACEKEY_UNITVIEW_GEN_LABOR, "Unitview, General, Labor"); displayNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "Unitview, General, Misc"); displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "Unitview, Prefs, Labor"); displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "Unitview, Prefs, Pets"); - displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET_HUNT, "Unitview, Prefs, Pets, Hunting"); - displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET_WAR, "Unitview, Prefs, Pets, War"); displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "Unitview, Prefs, Profile"); + displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "Unitview, Prefs, New Squad"); + displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "Unitview, Prefs, Remove From Squad"); + displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_NAME_CURRENT_SQUAD, "Unitview, Prefs, Name Current Squad"); + displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_NAME_SELECTED_SQUAD, "Unitview, Prefs, Name Selected Squad"); displayNames.insert(INTERFACEKEY_STRING_A000, "String: Backspace"); displayNames.insert(INTERFACEKEY_STRING_A001, "String: Character 001"); diff --git a/g_src/keybindings.h b/g_src/keybindings.h index c9146dc..50116f2 100755 --- a/g_src/keybindings.h +++ b/g_src/keybindings.h @@ -554,6 +554,7 @@ enum InterfaceKeyType INTERFACEKEY_HOTKEY_BUILDING_MACHINE_GEAR_ASSEMBLY, INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_VERTICAL, INTERFACEKEY_HOTKEY_BUILDING_MACHINE_AXLE_HORIZONTAL, + INTERFACEKEY_HOTKEY_BUILDING_MACHINE_ROLLERS, INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_BALLISTA, INTERFACEKEY_HOTKEY_BUILDING_SIEGEENGINE_CATAPULT, INTERFACEKEY_HOTKEY_BUILDING_TRAP_STONE, @@ -570,6 +571,8 @@ enum InterfaceKeyType INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_DOWN, INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_STAIR_UPDOWN, INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_FORTIFICATION, + INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK, + INTERFACEKEY_HOTKEY_BUILDING_CONSTRUCTION_TRACK_STOP, INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_LEATHER, INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_QUERN, INTERFACEKEY_HOTKEY_BUILDING_WORKSHOP_MILLSTONE, @@ -623,6 +626,11 @@ enum InterfaceKeyType INTERFACEKEY_BUILDING_TRIGGER_MIN_MAGMA_DOWN, INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_UP, INTERFACEKEY_BUILDING_TRIGGER_MAX_MAGMA_DOWN, + INTERFACEKEY_BUILDING_TRIGGER_ENABLE_TRACK_CART, + INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_DOWN, + INTERFACEKEY_BUILDING_TRIGGER_MIN_TRACK_CART_UP, + INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_DOWN, + INTERFACEKEY_BUILDING_TRIGGER_MAX_TRACK_CART_UP, INTERFACEKEY_BUILDING_TRIGGER_ENABLE_CREATURE, INTERFACEKEY_BUILDING_TRIGGER_ENABLE_LOCALS, INTERFACEKEY_BUILDING_TRIGGER_RESETS, @@ -630,6 +638,11 @@ enum InterfaceKeyType INTERFACEKEY_BUILDING_TRIGGER_MIN_SIZE_DOWN, INTERFACEKEY_BUILDING_TRIGGER_MAX_SIZE_UP, INTERFACEKEY_BUILDING_TRIGGER_MAX_SIZE_DOWN, + INTERFACEKEY_BUILDING_ROLLERS_SPEED_UP, + INTERFACEKEY_BUILDING_ROLLERS_SPEED_DOWN, + INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_UP, + INTERFACEKEY_BUILDING_TRACK_STOP_FRICTION_DOWN, + INTERFACEKEY_BUILDING_TRACK_STOP_DUMP, INTERFACEKEY_DESTROYBUILDING, INTERFACEKEY_SUSPENDBUILDING, INTERFACEKEY_BUILDINGLIST_ZOOM_T, @@ -755,11 +768,8 @@ enum InterfaceKeyType INTERFACEKEY_HOTKEY_FARMER_SHEAR_CREATURE, INTERFACEKEY_HOTKEY_FARMER_SPIN_THREAD, INTERFACEKEY_HOTKEY_MILL_MILL, - INTERFACEKEY_HOTKEY_KENNEL_TRAIN_HUNT, INTERFACEKEY_HOTKEY_KENNEL_CATCH_VERMIN, INTERFACEKEY_HOTKEY_KENNEL_TAME_VERMIN, - INTERFACEKEY_HOTKEY_KENNEL_TAME_UNIT, - INTERFACEKEY_HOTKEY_KENNEL_TRAIN_WAR, INTERFACEKEY_HOTKEY_FISHERY_PROCESS, INTERFACEKEY_HOTKEY_FISHERY_EXTRACT, INTERFACEKEY_HOTKEY_FISHERY_CATCH, @@ -805,10 +815,13 @@ enum InterfaceKeyType INTERFACEKEY_HOTKEY_TRAP_CHAIN, INTERFACEKEY_HOTKEY_TRAP_CAGE, INTERFACEKEY_HOTKEY_TRAP_GEAR_ASSEMBLY, + INTERFACEKEY_HOTKEY_TRAP_TRACK_STOP, INTERFACEKEY_HOTKEY_TRAP_PULL_LEVER, PILEZONEKEY_START, INTERFACEKEY_BUILDJOB_STOCKPILE_MASTER=PILEZONEKEY_START, + INTERFACEKEY_BUILDJOB_STOCKPILE_LINK_ANYWHERE, + INTERFACEKEY_BUILDJOB_STOCKPILE_GIVE_TO, INTERFACEKEY_BUILDJOB_STOCKPILE_DELETE_CHILD, INTERFACEKEY_BUILDJOB_STOCKPILE_SETTINGS, INTERFACEKEY_BUILDJOB_STOCKPILE_BARREL_UP, @@ -819,6 +832,7 @@ enum InterfaceKeyType INTERFACEKEY_BUILDJOB_STOCKPILE_BIN_DOWN, INTERFACEKEY_BUILDJOB_STOCKPILE_BIN_ZERO, INTERFACEKEY_BUILDJOB_STOCKPILE_BIN_MAX, + INTERFACEKEY_BUILDJOB_STOCKPILE_WHEELBARROW, INTERFACEKEY_STOCKPILE_ANIMAL, INTERFACEKEY_STOCKPILE_FOOD, INTERFACEKEY_STOCKPILE_WEAPON, @@ -859,6 +873,7 @@ enum InterfaceKeyType INTERFACEKEY_CIVZONE_CLAY_COLLECT, INTERFACEKEY_CIVZONE_ACTIVE, INTERFACEKEY_CIVZONE_MEETING, + INTERFACEKEY_CIVZONE_ANIMAL_TRAINING, INTERFACEKEY_CIVZONE_PEN, INTERFACEKEY_CIVZONE_PEN_OPTIONS, INTERFACEKEY_CIVZONE_POND_OPTIONS, @@ -873,6 +888,9 @@ enum InterfaceKeyType INTERFACEKEY_STORES_DUMP, INTERFACEKEY_STORES_HIDE, INTERFACEKEY_PET_BUTCHER, + INTERFACEKEY_ANIMAL_SELECT_TRAINER, + INTERFACEKEY_ANIMAL_WAR_TRAINING, + INTERFACEKEY_ANIMAL_HUNTING_TRAINING, INTERFACEKEY_KITCHEN_COOK, INTERFACEKEY_KITCHEN_BREW, INTERFACEKEY_ORDERS_AUTOFORBID, @@ -958,6 +976,28 @@ enum InterfaceKeyType INTERFACEKEY_D_JOBLIST, INTERFACEKEY_D_UNITLIST, INTERFACEKEY_D_LOOK, + INTERFACEKEY_D_HAULING, + INTERFACEKEY_D_HAULING_NEW_ROUTE, + INTERFACEKEY_D_HAULING_NEW_STOP, + INTERFACEKEY_D_HAULING_REMOVE, + INTERFACEKEY_D_HAULING_PROMOTE, + INTERFACEKEY_D_HAULING_VEHICLE, + INTERFACEKEY_D_HAULING_NICKNAME, + INTERFACEKEY_D_HAULING_STOP_NEW_DEPART, + INTERFACEKEY_D_HAULING_STOP_NEW_LINK, + INTERFACEKEY_D_HAULING_STOP_REMOVE, + INTERFACEKEY_D_HAULING_STOP_SL_SELECT_PILE, + INTERFACEKEY_D_HAULING_STOP_SL_TAKE_GIVE, + INTERFACEKEY_D_HAULING_STOP_LC_DIR, + INTERFACEKEY_D_HAULING_STOP_LC_MODE, + INTERFACEKEY_D_HAULING_STOP_LC_TIMER_UP, + INTERFACEKEY_D_HAULING_STOP_LC_TIMER_DOWN, + INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_UP, + INTERFACEKEY_D_HAULING_STOP_LC_FULLNESS_DOWN, + INTERFACEKEY_D_HAULING_STOP_LC_MORE_LESS, + INTERFACEKEY_D_HAULING_STOP_LC_DESIRED_TOTAL, + INTERFACEKEY_D_HAULING_STOP_LC_CHANGE, + INTERFACEKEY_D_HAULING_STOP_LC_ADVANCED, INTERFACEKEY_D_BURROWS, INTERFACEKEY_D_BURROWS_ADD, INTERFACEKEY_D_BURROWS_DELETE, @@ -994,6 +1034,7 @@ enum InterfaceKeyType INTERFACEKEY_D_LOOK_DUMP, INTERFACEKEY_D_LOOK_MELT, INTERFACEKEY_D_LOOK_HIDE, + INTERFACEKEY_D_LOOK_FOLLOW, INTERFACEKEY_D_LOOK_ARENA_CREATURE, INTERFACEKEY_D_LOOK_ARENA_ADV_MODE, INTERFACEKEY_D_LOOK_ARENA_WATER, @@ -1004,6 +1045,7 @@ enum InterfaceKeyType INTERFACEKEY_ARENA_CREATURE_BLANK_LIST, INTERFACEKEY_ARENA_CREATURE_REMOVE_ITEM, INTERFACEKEY_ARENA_CREATURE_UNDEAD, + INTERFACEKEY_ARENA_CREATURE_STRING, INTERFACEKEY_ASSIGNTRADE_VIEW, INTERFACEKEY_ASSIGNTRADE_STRING, INTERFACEKEY_ASSIGNTRADE_EXCLUDE_PROHIBITED, @@ -1062,6 +1104,7 @@ enum InterfaceKeyType INTERFACEKEY_DESIGNATE_SMOOTH, INTERFACEKEY_DESIGNATE_ENGRAVE, INTERFACEKEY_DESIGNATE_FORTIFY, + INTERFACEKEY_DESIGNATE_TRACK, INTERFACEKEY_DESIGNATE_TOGGLE_ENGRAVING, INTERFACEKEY_DESIGNATE_UNDO, INTERFACEKEY_DESIGNATE_REMOVE_CONSTRUCTION, @@ -1080,6 +1123,7 @@ enum InterfaceKeyType INTERFACEKEY_UNITVIEW_INV, INTERFACEKEY_UNITVIEW_PRF, INTERFACEKEY_UNITVIEW_WND, + INTERFACEKEY_UNITVIEW_FOLLOW, INTERFACEKEY_UNITVIEW_NEXT, INTERFACEKEY_UNITVIEW_SLAUGHTER, INTERFACEKEY_UNITVIEW_GEN_COMBAT, @@ -1087,9 +1131,11 @@ enum InterfaceKeyType INTERFACEKEY_UNITVIEW_GEN_MISC, INTERFACEKEY_UNITVIEW_PRF_PROF, INTERFACEKEY_UNITVIEW_PRF_PET, - INTERFACEKEY_UNITVIEW_PRF_PET_HUNT, - INTERFACEKEY_UNITVIEW_PRF_PET_WAR, INTERFACEKEY_UNITVIEW_PRF_VIEW, + INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, + INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, + INTERFACEKEY_UNITVIEW_PRF_NAME_CURRENT_SQUAD, + INTERFACEKEY_UNITVIEW_PRF_NAME_SELECTED_SQUAD, INTERFACEKEY_CUSTOMIZE_UNIT_NICKNAME, INTERFACEKEY_CUSTOMIZE_UNIT_PROFNAME, @@ -1130,6 +1176,7 @@ enum InterfaceKeyType INTERFACEKEY_D_MILITARY_ADD_UNIFORM, INTERFACEKEY_D_MILITARY_DELETE_UNIFORM, INTERFACEKEY_D_MILITARY_NAME_UNIFORM, + INTERFACEKEY_D_MILITARY_NAME_SQUAD, INTERFACEKEY_D_MILITARY_ADD_ARMOR, INTERFACEKEY_D_MILITARY_ADD_PANTS, INTERFACEKEY_D_MILITARY_ADD_HELM, -- 2.11.4.GIT