From 7001336ba6ebf41ecbebe444d2fdd777910c3a4a Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sat, 27 Mar 2021 06:01:52 -0500 Subject: [PATCH] Added npc trig/cond/resp type bitflags --- scripts/server/bitflag.js | 94 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 93 insertions(+), 1 deletion(-) diff --git a/scripts/server/bitflag.js b/scripts/server/bitflag.js index f7802528..d1dac6c6 100644 --- a/scripts/server/bitflag.js +++ b/scripts/server/bitflag.js @@ -116,7 +116,96 @@ let serverBitFlagKeys = { "showTimedRandomTips", "showActionTips", ], - subAccountSettingsFlagKeys: [], + npcTriggerTypeKeys: [ + "farProximity", // Comes within a far distance of NPC + "mediumProximity", // Comes within a medium distance of NPC + "nearProximity", // Comes within a close distance of NPC + "enterLineOfSight", // Enters the NPC's line of sight + "exitLineOfSight", // Leaves the NPC's line of sight + "pedCollision", // Bumps into ped on foot + "vehicleCollision", // Bumps into ped with a vehicle + "shootGun", // Shoots a gun (target isn't a factor, it's just about only shooting a gun in general) + "swingMelee", // Swings a melee weapon (target doesnt matter, it's just about only swinging a melee weapon in general) + "hotwireVehicleStart", // Begin attempt to hotwire a vehicle + "hotwireVehicleFail", // Failed to hotwire a vehicle + "hotwireVehicleSucceed", // Succeeded at hotwiring a vehicle + "vehicleAlarmStart", // Vehicle alarm goes off + "vehicleAlarmStop", // Vehicle alarm shuts off (disabled, battery dead, damaged, or just turned off legitly) + "sirenStart", // Any vehicle with a siren that gets activated + "sirenStop", // Any vehicle with a siren that gets deactivated + "vehicleEnter", // Enters any vehicle + "vehicleExit", // Exits any vehicle + "propertyEnter", // Enters any interior + "propertyExit", // Exits any interior + "attackedByMelee", // Any element is attacked by melee weapon + "attackedByGun", // Any element is attacked by gun + "attackedByFist", // Any element is attacked by fist + ], + npcTriggerConditionTypeKeys: [ + "isInLineOfSight", + "isFarProximity", + "isMediumProximity", + "isNearProximity", + "isEnemyClan", + "isAllyClan", + "isSameClan", + "isNotInClan", + "isLawEnforcement", + "isFirefighter", + "isParamedic", + "isCriminal", + "hasWantedLevel", + "isSelfVehicle", + "isPlayerVehicle", + "isOtherVehicle", + "isClanVehicle", + "isEmergencyVehicle", + "isPoliceVehicle", + "isDriver", + "isInFrontSeat", + "isInSeatId", + "vehicleLocked", + "vehicleHotwired", + "isPistol", + "isShotgun", + "isAutomatic", + "isRifle", + "isAssaultRifle", + "isSniper", + "isRPG", + "isFlameThrower", + "isTalking", + "isShouting", + "isWhispering", + ], + npcTriggerResponseTypeKeys: [ + "shout", + "talk", + "whisper", + "switchWeapon", + "shootWeapon", + "aimWeapon", + "fleeSprint", + "fleeWalk", + "fleeRun", + "attackMelee", + "attackFist", + "walkToward", + "runToward", + "sprintToward", + "crouch", + "phoneCall", + "walkieTalkieMessage", + "switchRadioStation", + "toggleSiren", + "fleeTo", + "driveTo", + "enterVehicle", + "exitVehicle", + "pullOutOfVehicle", + "enterProperty", + "searchArea", + ], } // =========================================================================== @@ -129,6 +218,9 @@ function initBitFlagScript() { serverBitFlags.clanFlags = createBitFlagTable(serverBitFlagKeys.clanFlagKeys); serverBitFlags.clanPermissionFlags = createBitFlagTable(serverBitFlagKeys.clanPermissionFlagKeys); serverBitFlags.factionFlags = createBitFlagTable(serverBitFlagKeys.factionFlagKeys); + serverBitFlags.npcTriggerTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerTypeKeys); + serverBitFlags.npcTriggerConditionTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerConditionTypeKeys); + serverBitFlags.npcTriggerResponseTypes = createBitFlagTable(serverBitFlagKeys.npcTriggerResponseTypeKeys); return true; }