Skip to content

Test pull my changes? #1

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.

Sign up for GitHub

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

Open
EterniumDev wants to merge 6 commits into
base: InProgress
Choose a base branch
from
Open

Test pull my changes? #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee90bd7
Merge In Progress from RGreenlees
EterniumDev May 27, 2023
4b1e7f3
Limit bots entering build state on recycling structures
EterniumDev May 27, 2023
eb1dc3e
Faded gamemode support
EterniumDev May 27, 2023
32658c8
Disable grenade launcher to prevent bot mass teamkill
EterniumDev May 27, 2023
387bc99
Marine commander now deploys 1 IP per 2 marines
EterniumDev May 27, 2023
0ceaaf0
Bot commander can now use Catpacks
EterniumDev May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 66 additions & 6 deletions evobot/src/NS_Constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
#define IMPULSE_ALIEN_UPGRADE_FOCUS 111
#define IMPULSE_ALIEN_UPGRADE_SCENTOFFEAR 112

#define IMPULSE_ALIEN_UPGRADE_ABILITY3_UNLOCK 118 // Unlock ability 3 in combat mode
#define IMPULSE_ALIEN_UPGRADE_ABILITY4_UNLOCK 126 // Unlock ability 4 in combat mode

#define IMPULSE_ALIEN_TAUNT 9
#define IMPULSE_ALIEN_REQUEST_HEAL 14

Expand Down Expand Up @@ -128,12 +131,12 @@ const int kSpitVelocity = 1500;
const int kShootCloudVelocity = 1100;
const int kAcidRocketVelocity = 2000;

const float kBiteRange = 60.0f;
const float kBite2Range = 60.0f; // Lerk bite range
const float kBiteRange = 75.0f;
const float kBite2Range = 75.0f; // Lerk bite range

const float kHealingSprayRange = 100.0f;
const float kHealingSprayRange = 300.0f;

const float kSwipeRange = 60.0f; // Fade swipe range
const float kSwipeRange = 90.0f; // Fade swipe range

const float kClawsRange = 90.0f; // Onos gore range
const float kDevourRange = 100.0f; // Onos gore range
Expand Down Expand Up @@ -215,6 +218,17 @@ const int kGameStatusUnspentLevels = 4;
const int kNumHotkeyGroups = 5;
const int kSelectAllHotGroup = kNumHotkeyGroups + 1;

// Game mode (e.g. combat, regular, MvM, AvA etc)
enum NSGameMode
{
GAME_MODE_NONE = 0, // Undefined game mode
GAME_MODE_REGULAR = 1, // Regular NS game mode
GAME_MODE_COMBAT = 2, // Combat game mode
GAME_MODE_MVM = 3, // Marine vs Marine mode
GAME_MODE_AVA = 4, // Alien vs Alien mode
GAME_MODE_FADED = 5 // Faded custom gamemode
};

// All iuser3 values to denote entity classification (e.g. player class, or building type)
typedef enum
{
Expand Down Expand Up @@ -340,6 +354,51 @@ typedef enum
MASK_SENSORY_NEARBY = 0x40000000 // Player is cloaked by a sensory chamber
} AvHUpgradeMask;

// All iuser4 masks that can be applied to a player to denote what upgrades or status effects they have applied
typedef enum
{
COMBAT_MARINE_UPGRADE_NONE = 0,
COMBAT_MARINE_UPGRADE_CATALYST = 1 << 0,
COMBAT_MARINE_UPGRADE_RESUPPLY = 1 << 1,
COMBAT_MARINE_UPGRADE_SCAN = 1 << 2,
COMBAT_MARINE_UPGRADE_MOTIONTRACKING = 1 << 3,
COMBAT_MARINE_UPGRADE_MINES = 1 << 4,
COMBAT_MARINE_UPGRADE_WELDER = 1 << 5,
COMBAT_MARINE_UPGRADE_GRENADE = 1 << 6,
COMBAT_MARINE_UPGRADE_ARMOUR1 = 1 << 7,
COMBAT_MARINE_UPGRADE_ARMOUR2 = 1 << 8,
COMBAT_MARINE_UPGRADE_ARMOUR3 = 1 << 9,
COMBAT_MARINE_UPGRADE_JETPACK = 1 << 10,
COMBAT_MARINE_UPGRADE_HEAVYARMOUR = 1 << 11,
COMBAT_MARINE_UPGRADE_DAMAGE1 = 1 << 12,
COMBAT_MARINE_UPGRADE_DAMAGE2 = 1 << 13,
COMBAT_MARINE_UPGRADE_DAMAGE3 = 1 << 14,
COMBAT_MARINE_UPGRADE_SHOTGUN = 1 << 15,
COMBAT_MARINE_UPGRADE_HMG = 1 << 16,
COMBAT_MARINE_UPGRADE_GRENADELAUNCHER = 1 << 17
} CombatModeMarineUpgrade;

// All iuser4 masks that can be applied to a player to denote what upgrades or status effects they have applied
typedef enum
{
COMBAT_ALIEN_UPGRADE_NONE = 0,
COMBAT_ALIEN_UPGRADE_ABILITY3 = 1 << 0,
COMBAT_ALIEN_UPGRADE_ABILITY4 = 1 << 1,
COMBAT_ALIEN_UPGRADE_SILENCE = 1 << 2,
COMBAT_ALIEN_UPGRADE_CELERITY = 1 << 3,
COMBAT_ALIEN_UPGRADE_ADRENALINE = 1 << 4,
COMBAT_ALIEN_UPGRADE_SCENTOFFEAR = 1 << 5,
COMBAT_ALIEN_UPGRADE_FOCUS = 1 << 6,
COMBAT_ALIEN_UPGRADE_CLOAKING = 1 << 7,
COMBAT_ALIEN_UPGRADE_CARAPACE = 1 << 8,
COMBAT_ALIEN_UPGRADE_REDEMPTION = 1 << 9,
COMBAT_ALIEN_UPGRADE_REGENERATION = 1 << 10,
COMBAT_ALIEN_UPGRADE_GORGE = 1 << 11,
COMBAT_ALIEN_UPGRADE_LERK = 1 << 12,
COMBAT_ALIEN_UPGRADE_FADE = 1 << 13,
COMBAT_ALIEN_UPGRADE_ONOS = 1 << 14,
} CombatModeAlienUpgrade;

// Used in network messages to work out what information about a hive is being sent (see BotClient_NS_AlienInfo in bot_client.cpp)
enum AlienInfo_ChangeFlags
{
Expand Down Expand Up @@ -443,9 +502,10 @@ typedef enum
{
ITEM_NONE = 0,

ITEM_MARINE_RESUPPLY = 31, // For combat mode
ITEM_MARINE_HEAVYARMOUR = 38,
ITEM_MARINE_JETPACK = 39,
ITEM_MARINE_CATALYSTS = 47,
ITEM_MARINE_CATALYSTS = 27,
ITEM_MARINE_SCAN = 53,
ITEM_MARINE_HEALTHPACK = 59,
ITEM_MARINE_AMMO = 60,
Expand All @@ -454,7 +514,7 @@ typedef enum
ITEM_MARINE_SHOTGUN = 64,
ITEM_MARINE_HMG = 65,
ITEM_MARINE_GRENADELAUNCHER = 66


} NSDeployableItem;

Expand Down
Loading