Skip to content

Commit e6259fe

Browse files
CookStarCookStar
authored
Improved WeaponClass, WeaponID, WeaponType, and WeaponSlot for CS:GO/CS:S. (#478)
* Added WeaponSlot to CS:GO. Added WeaponType to CS:GO. * Fixed WeaponID in CS:GO. * Changed WeaponID and WeaponType to the names used internally in CS:S. * Added WeaponID and WeaponType to WeaponClass. Changed WeaponClass.slot to return WeaponSlot. Changed WeaponClass to be able to reference parent_class. Added missing WeaponClass data for CS:GO. * Changed ID, Type, Slot in CS:GO/CS:S weapon data to the weapon constants' name. Added sniperrifle, assaultrifle, submachinegun, mg tags to CS:GO/CS:S weapon data. Added cant_create, cant_find, and parent tags to CS:GO weapon data. Changed Entity.create, Entity.find, and Weapon.weapon_name in CS:GO to use new added tags with WeaponClassIter. * Fixed a bug in WeaponClass.item_definition_index. * Fixed a bug in WeaponClass.parse_weapon_constants.
1 parent 9050343 commit e6259fe

File tree

10 files changed

+645
-375
lines changed

10 files changed

+645
-375
lines changed

‎addons/source-python/data/source-python/weapons/constants/csgo/WeaponID.ini‎

100644100755
Lines changed: 65 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,72 @@
11
# ../data/source-python/weapons/constants/csgo/WeaponID.ini
22

3-
P228 = 1
4-
GLOCK = 2
5-
SCOUT = 3
6-
HEGRENADE = 4
7-
XM1014 = 5
8-
C4 = 6
9-
MAC10 = 7
3+
DEAGLE = 1
4+
ELITE = 2
5+
FIVESEVEN = 3
6+
GLOCK = 4
7+
#P228 = 5
8+
#USP = 6
9+
AK47 = 7
1010
AUG = 8
11-
SMOKEGRENADE = 9
12-
ELITE = 10
13-
FIVESEVEN = 11
14-
UMP45 = 12
15-
SG550 = 13
16-
GALIL = 14
17-
FAMAS = 15
18-
USP = 16
19-
AWP = 17
20-
MP5NAVY = 18
21-
M249 = 19
22-
M3 = 20
23-
M4A1 = 21
24-
TMP = 22
25-
G3SG1 = 23
26-
FLASHBANG = 24
27-
DEAGLE = 25
28-
SG552 = 26
29-
AK47 = 27
30-
KNIFE = 28
31-
P90 = 29
32-
SHIELD = 30
33-
KEVLAR = 31
34-
ASSAULTSUIT = 32
35-
NIGHTVISION = 33
36-
GALILAR = 34
37-
BIZON = 35
38-
MAG7 = 36
39-
NEGEV = 37
40-
SAWEDOFF = 38
41-
TEC9 = 39
42-
TASER = 40
43-
HKP2K = 41
44-
MP7 = 42
45-
MP9 = 43
46-
NOVA = 44
47-
P250 = 45
48-
SCAR17 = 46
49-
SCAR20 = 47
50-
SG556 = 48
51-
SSG08 = 49
52-
KNIFEGG = 50
53-
MOLOTOV = 51
54-
DECOY = 52
55-
INCENDIARY = 53
56-
DEFUSER = 54
57-
HEAVYASSAULTSUIT = 55
11+
AWP = 9
12+
FAMAS = 10
13+
G3SG1 = 11
14+
#GALIL = 12
15+
GALILAR = 13
16+
M249 = 14
17+
#M3 = 15
18+
M4A1 = 16
19+
MAC10 = 17
20+
#MP5NAVY = 18
21+
P90 = 19
22+
ZONE_REPULSOR = 20
23+
#SCOUT = 20
24+
#SG550 = 21
25+
#SG552 = 22
26+
MP5SD = 23
27+
#TMP = 23
28+
UMP45 = 24
29+
XM1014 = 25
30+
BIZON = 26
31+
MAG7 = 27
32+
NEGEV = 28
33+
SAWEDOFF = 29
34+
TEC9 = 30
35+
TASER = 31
36+
HKP2000 = 32
37+
MP7 = 33
38+
MP9 = 34
39+
NOVA = 35
40+
P250 = 36
41+
SHIELD = 37
42+
#SCAR17 = 37
43+
SCAR20 = 38
44+
SG556 = 39
45+
SSG08 = 40
46+
KNIFEGG = 41
47+
KNIFE = 42
48+
FLASHBANG = 43
49+
HEGRENADE = 44
50+
SMOKEGRENADE = 45
51+
MOLOTOV = 46
52+
DECOY = 47
53+
INCGRENADE = 48
54+
C4 = 49
55+
KEVLAR = 50
56+
ASSAULTSUIT = 51
57+
HEAVYASSAULTSUIT = 52
58+
NVGS = 54
59+
NVG = 54
60+
NIGHTVISION = 54
61+
DEFUSER = 55
5862
CUTTERS = 56
5963
HEALTHSHOT = 57
6064
KNIFE_T = 59
6165
M4A1_SILENCER = 60
6266
USP_SILENCER = 61
6367
CZ75A = 63
6468
REVOLVER = 64
65-
TAGGRENADE = 68
69+
TAGRENADE = 68
6670
FISTS = 69
6771
BREACHCHARGE = 70
6872
TABLET = 72
@@ -75,8 +79,10 @@ FIREBOMB = 81
7579
DIVERSION = 82
7680
FRAG_GRENADE = 83
7781
SNOWBALL = 84
82+
BUMPMINE = 85
7883
# Knives from cases.
7984
BAYONET = 500
85+
KNIFE_CSS = 503
8086
KNIFE_FLIP = 505
8187
KNIFE_GUT = 506
8288
KNIFE_KARAMBIT = 507
@@ -86,7 +92,11 @@ KNIFE_FALCHION = 512
8692
KNIFE_SURVIVAL_BOWIE = 514
8793
KNIFE_BUTTERFLY = 515
8894
KNIFE_PUSH = 516
95+
KNIFE_CORD = 517
96+
KNIFE_CANIS = 518
8997
KNIFE_URSUS = 519
9098
KNIFE_GYPSY_JACKKNIFE = 520
99+
KNIFE_OUTDOOR = 521
91100
KNIFE_STILETTO = 522
92101
KNIFE_WIDOWMAKER = 523
102+
KNIFE_SKELETON = 525

‎addons/source-python/data/source-python/weapons/constants/csgo/WeaponSlot.ini‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# ../data/source-python/weapons/constants/csgo/WeaponSlot.ini
2+
3+
PRIMARY = 0
4+
SECONDARY = 1
5+
KNIFE = 2
6+
GRENADE = 3
7+
C4 = 4
8+
SHIELD = 11
9+
TABLET = 12

‎addons/source-python/data/source-python/weapons/constants/csgo/WeaponType.ini‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# ../data/source-python/weapons/constants/csgo/WeaponType.ini
2+
3+
KNIFE = 0
4+
PISTOL = 1
5+
SMG = 2
6+
SUBMACHINEGUN = 2
7+
RIFLE = 3
8+
SHOTGUN = 4
9+
SNIPERRIFLE = 5
10+
SNIPER = 5
11+
MACHINEGUN = 6
12+
MG = 6
13+
C4 = 7
14+
EXPLOSIVE = 7
15+
TASER = 8
16+
GRENADE = 9
17+
EQUIPMENT = 10
18+
STACKABLEITEM = 11
19+
FISTS = 12
20+
BREACHCHARGE = 13
21+
BUMPMINE = 14
22+
TABLET = 15
23+
MELEE = 16
24+
SHIELD = 17
25+
ZONEREPULSOR = 18
26+
UNKNOWN = 19

‎addons/source-python/data/source-python/weapons/constants/orangebox/cstrike/WeaponID.ini‎

100644100755
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@ P90 = 29
3232
SHIELD = 30
3333
KEVLAR = 31
3434
ASSAULTSUIT = 32
35+
NVGS = 33
36+
NVG = 33
3537
NIGHTVISION = 33

‎addons/source-python/data/source-python/weapons/constants/orangebox/cstrike/WeaponType.ini‎

100644100755
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
KNIFE = 0
44
PISTOL = 1
55
SMG = 2
6+
SUBMACHINEGUN = 2
67
RIFLE = 3
78
SHOTGUN = 4
9+
SNIPERRIFLE = 5
810
SNIPER = 5
911
MACHINEGUN = 6
12+
MG = 6
13+
C4 = 7
1014
EXPLOSIVE = 7
1115
GRENADE = 8
16+
UNKNOWN = 9

0 commit comments

Comments
 (0)