X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstats.qh;h=9bdcb5773a5e4bcff57fe8079b53542babfa2bef;hb=67a16f3121a7d968a096c2c24149ce232c4a21fb;hp=28ec85e30a7cedf7d8c485ba1365403d6f35336e;hpb=df24112faf15050091bd940e7ed0c625b3c76c62;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/stats.qh b/qcsrc/common/stats.qh index 28ec85e30..9bdcb5773 100644 --- a/qcsrc/common/stats.qh +++ b/qcsrc/common/stats.qh @@ -5,23 +5,38 @@ // 255 is the current limit (MAX_CL_STATS - 1), engine will need to be modified if you wish to add more stats const int MAX_CL_STATS = 256; -const int STAT_HEALTH = 0; +// -Wdouble-declaration +// const int STAT_HEALTH = 0; // 1 empty? const int STAT_WEAPON = 2; -const int STAT_AMMO = 3; -const int STAT_ARMOR = 4; -const int STAT_WEAPONFRAME = 5; -const int STAT_SHELLS = 6; -const int STAT_NAILS = 7; -const int STAT_ROCKETS = 8; -const int STAT_CELLS = 9; -const int STAT_ACTIVEWEAPON = 10; -const int STAT_TOTALSECRETS = 11; -const int STAT_TOTALMONSTERS = 12; -const int STAT_SECRETS = 13; -const int STAT_MONSTERS = 14; -const int STAT_ITEMS = 15; -const int STAT_VIEWHEIGHT = 16; +// -Wdouble-declaration +// const int STAT_AMMO = 3; +// -Wdouble-declaration +// const int STAT_ARMOR = 4; +// -Wdouble-declaration +// const int STAT_WEAPONFRAME = 5; +// -Wdouble-declaration +// const int STAT_SHELLS = 6; +// -Wdouble-declaration +// const int STAT_NAILS = 7; +// -Wdouble-declaration +// const int STAT_ROCKETS = 8; +// -Wdouble-declaration +// const int STAT_CELLS = 9; +// -Wdouble-declaration +// const int STAT_ACTIVEWEAPON = 10; +// -Wdouble-declaration +// const int STAT_TOTALSECRETS = 11; +// -Wdouble-declaration +// const int STAT_TOTALMONSTERS = 12; +// -Wdouble-declaration +// const int STAT_SECRETS = 13; +// -Wdouble-declaration +// const int STAT_MONSTERS = 14; +// -Wdouble-declaration +// const int STAT_ITEMS = 15; +// -Wdouble-declaration +// const int STAT_VIEWHEIGHT = 16; // 17 empty? // 18 empty? // 19 empty? @@ -92,8 +107,8 @@ const int STAT_HEALING_ORB_ALPHA = 83; const int STAT_PLASMA = 84; const int STAT_OK_AMMO_CHARGE = 85; const int STAT_OK_AMMO_CHARGEPOOL = 86; -const int STAT_CTF_FLAGSTATUS = 87; -// 88 empty? +const int STAT_FROZEN = 87; +const int STAT_REVIVE_PROGRESS = 88; // 89 empty? // 90 empty? // 91 empty? @@ -104,8 +119,7 @@ const int STAT_CTF_FLAGSTATUS = 87; // 96 empty? // 97 empty? // 98 empty? -// 99 empty? - +const int STAT_ROUNDLOST = 99; /* The following stats change depending on the gamemode, so can share the same ID */ // IDs 100 to 104 reserved for gamemodes @@ -138,27 +152,29 @@ const int STAT_KH_PINKKEY_TEAM = 103; /* Gamemode-specific stats end here */ - -const int STAT_FROZEN = 105; -const int STAT_REVIVE_PROGRESS = 106; -// 107 empty? -// 108 empty? -// 109 empty? -// 110 empty? -// 111 empty? -// 112 empty? -// 113 empty? -// 114 empty? -// 115 empty? -// 116 empty? -// 117 empty? -// 118 empty? -// 119 empty? -// 120 empty? -// 121 empty? -// 122 empty? -// 123 empty? -// 124 empty? +const int STAT_PL_VIEW_OFS1 = 105; +const int STAT_PL_VIEW_OFS2 = 106; +const int STAT_PL_VIEW_OFS3 = 107; +const int STAT_PL_MIN1 = 108; +const int STAT_PL_MIN2 = 109; +const int STAT_PL_MIN3 = 110; +const int STAT_PL_MAX1 = 111; +const int STAT_PL_MAX2 = 112; +const int STAT_PL_MAX3 = 113; +const int STAT_PL_CROUCH_MIN1 = 114; +const int STAT_PL_CROUCH_MIN2 = 115; +const int STAT_PL_CROUCH_MIN3 = 116; +const int STAT_PL_CROUCH_MAX1 = 117; +const int STAT_PL_CROUCH_MAX2 = 118; +const int STAT_PL_CROUCH_MAX3 = 119; +const int STAT_PL_CROUCH_VIEW_OFS1 = 117; +const int STAT_PL_CROUCH_VIEW_OFS2 = 118; +const int STAT_PL_CROUCH_VIEW_OFS3 = 119; +const int STAT_WEAPONSINMAP = 120; +const int STAT_WEAPONSINMAP2 = 121; +const int STAT_WEAPONSINMAP3 = 122; +const int STAT_BUFF_TIME = 123; +const int STAT_CTF_FLAGSTATUS = 124; // 125 empty? // 126 empty? // 127 empty? @@ -174,22 +190,22 @@ const int STAT_REVIVE_PROGRESS = 106; // 137 empty? // 138 empty? // 139 empty? -// 140 empty? -// 141 empty? -// 142 empty? -// 143 empty? -// 144 empty? -// 145 empty? -// 146 empty? -// 147 empty? -// 148 empty? -// 149 empty? -// 150 empty? -// 151 empty? -// 152 empty? -// 153 empty? -// 154 empty? -// 155 empty? +// 140 reserved +// 141 reserved +// 142 reserved +// 143 reserved +// 144 reserved +// 145 reserved +// 146 reserved +// 147 reserved +// 148 reserved +// 149 reserved +// 150 reserved +// 151 reserved +// 152 reserved +// 153 reserved +// 154 reserved +// 155 reserved // 156 empty? // 157 empty? // 158 empty? @@ -201,60 +217,60 @@ const int STAT_REVIVE_PROGRESS = 106; // 163 empty? // 164 empty? // 165 empty? -// 166 empty? -// 167 empty? -// 168 empty? -// 169 empty? -// 170 empty? -// 171 empty? -// 172 empty? -// 173 empty? -// 174 empty? -// 175 empty? -// 176 empty? -// 177 empty? -// 178 empty? -// 179 empty? -// 180 empty? -// 181 empty? -// 182 empty? -// 183 empty? -// 184 empty? -// 185 empty? -// 186 empty? -// 187 empty? -// 188 empty? -// 189 empty? -// 190 empty? -// 191 empty? -// 192 empty? -// 193 empty? -// 194 empty? +const int STAT_MULTIJUMP_DODGING = 166; +const int STAT_MULTIJUMP_MAXSPEED = 167; +const int STAT_GAMEPLAYFIX_UPVELOCITYCLEARSONGROUND = 168; +const int STAT_BUGRIGS_REVERSE_STOPPING = 169; +const int STAT_BUGRIGS_REVERSE_SPINNING = 170; +const int STAT_BUGRIGS_CAR_JUMPING = 171; +const int STAT_BUGRIGS_FRICTION_AIR = 172; +const int STAT_BUGRIGS_STEER = 173; +const int STAT_BUGRIGS_SPEED_POW = 174; +const int STAT_BUGRIGS_SPEED_REF = 175; +const int STAT_BUGRIGS_ACCEL = 176; +const int STAT_BUGRIGS_FRICTION_BRAKE = 177; +const int STAT_BUGRIGS_AIR_STEERING = 178; +const int STAT_BUGRIGS_FRICTION_FLOOR = 179; +const int STAT_BUGRIGS_REVERSE_SPEEDING = 180; +const int STAT_BUGRIGS_PLANAR_MOVEMENT = 181; +const int STAT_BUGRIGS_ANGLE_SMOOTHING = 182; +const int STAT_BUGRIGS = 183; +const int STAT_GAMEPLAYFIX_STEPDOWN = 184; +const int STAT_MOVEVARS_JUMPSTEP = 185; +const int STAT_NOSTEP = 186; +const int STAT_GAMEPLAYFIX_UNSTICKPLAYERS = 187; +const int STAT_GAMEPLAYFIX_STEPMULTIPLETIMES = 188; +const int STAT_GAMEPLAYFIX_DOWNTRACEONGROUND = 189; +const int STAT_GAMEPLAYFIX_EASIERWATERJUMP = 190; +const int STAT_MOVEVARS_FRICTION_SLICK = 191; +const int STAT_MOVEVARS_FRICTION_ONLAND = 192; +const int STAT_MOVEVARS_JUMPSPEEDCAP_DISABLE_ONRAMPS = 193; +const int STAT_MOVEVARS_TRACK_CANJUMP = 194; // 195 empty? -// 196 empty? -// 197 empty? -// 198 empty? -// 199 empty? -// 200 empty? -// 201 empty? -// 202 empty? -// 203 empty? -// 204 empty? -// 205 empty? -// 206 empty? -// 207 empty? -// 208 empty? -// 209 empty? -// 210 empty? -// 211 empty? -// 212 empty? -// 213 empty? -// 214 empty? -// 215 empty? -// 216 empty? -// 217 empty? -// 218 empty? -// 219 empty? +const int STAT_DOUBLEJUMP = 196; +const int STAT_MOVEVARS_CL_TRACK_CANJUMP = 197; +const int STAT_MULTIJUMP_ADD = 198; +const int STAT_MULTIJUMP_SPEED = 199; +const int STAT_MULTIJUMP = 200; +const int STAT_DODGING_TIMEOUT = 201; +const int STAT_DODGING_WALL = 202; +const int STAT_DODGING_UP_SPEED = 203; +const int STAT_DODGING_RAMP_TIME = 204; +const int STAT_DODGING_HEIGHT_THRESHOLD = 205; +const int STAT_DODGING_DISTANCE_THRESHOLD = 206; +const int STAT_DODGING_HORIZ_SPEED = 207; +const int STAT_DODGING_DELAY = 208; +const int STAT_DODGING_FROZEN_NO_DOUBLETAP = 209; +const int STAT_DODGING_HORIZ_SPEED_FROZEN = 210; +const int STAT_DODGING = 211; +const int STAT_DODGING_FROZEN = 212; +const int STAT_JETPACK_MAXSPEED_UP = 213; +const int STAT_JETPACK_MAXSPEED_SIDE = 214; +const int STAT_JETPACK_FUEL = 215; +const int STAT_JETPACK_ANTIGRAVITY = 216; +const int STAT_JETPACK_ACCEL_SIDE = 217; +const int STAT_JETPACK_ACCEL_UP = 218; +const int STAT_MOVEVARS_HIGHSPEED = 219; const int STAT_MOVEVARS_AIRACCEL_QW_STRETCHFACTOR = 220; const int STAT_MOVEVARS_AIRCONTROL_PENALTY = 221; const int STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW = 222; @@ -270,14 +286,19 @@ const int STAT_MOVEVARS_AIRSTOPACCELERATE = 231; const int STAT_MOVEVARS_AIRSTRAFEACCELERATE = 232; const int STAT_MOVEVARS_MAXAIRSTRAFESPEED = 233; const int STAT_MOVEVARS_AIRCONTROL = 234; -const int STAT_FRAGLIMIT = 235; -const int STAT_TIMELIMIT = 236; +// -Wdouble-declaration +// const int STAT_FRAGLIMIT = 235; +// -Wdouble-declaration +// const int STAT_TIMELIMIT = 236; const int STAT_MOVEVARS_WALLFRICTION = 237; const int STAT_MOVEVARS_FRICTION = 238; const int STAT_MOVEVARS_WATERFRICTION = 239; -const int STAT_MOVEVARS_TICRATE = 240; -const int STAT_MOVEVARS_TIMESCALE = 241; -const int STAT_MOVEVARS_GRAVITY = 242; +// -Wdouble-declaration +// const int STAT_MOVEVARS_TICRATE = 240; +// -Wdouble-declaration +// const int STAT_MOVEVARS_TIMESCALE = 241; +// -Wdouble-declaration +// const int STAT_MOVEVARS_GRAVITY = 242; const int STAT_MOVEVARS_STOPSPEED = 243; const int STAT_MOVEVARS_MAXSPEED = 244; const int STAT_MOVEVARS_SPECTATORMAXSPEED = 245;