Skip to content

Commit

Permalink
Merge pull request #74 from thomasleveil/release-1.10
Browse files Browse the repository at this point in the history
[UrT] add hitlocation constants : HL_HEAD, HL_HELMET and HL_TORSO
  • Loading branch information
thomasleveil committed Jul 14, 2013
2 parents 97a756b + a5df812 commit 5cd0d8a
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
11 changes: 9 additions & 2 deletions b3/parsers/iourt41.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,11 @@
# * protect some of the Client object property
# 08/04/2013 - 1.16 - Courgette
# * add EVT_BOMB_EXPLODED event
# 14/07/2013 - 1.17 - Courgette
# * add hitlocation constants : HL_HEAD, HL_HELMET and HL_TORSO
#
__author__ = 'xlr8or, Courgette'
__version__ = '1.16'
__version__ = '1.17'

import re, string, time, os, thread
from b3.parsers.q3a.abstractParser import AbstractParser
Expand Down Expand Up @@ -320,7 +322,12 @@ class Iourt41Parser(AbstractParser):
UT_MOD_M4='38'
UT_MOD_FLAG='39'
UT_MOD_GOOMBA='40'


# HIT LOCATIONS
HL_HEAD = '0'
HL_HELMET = '1'
HL_TORSO = '2'

## weapons id on Hit: lines are different than the one
## on the Kill: lines. Here the translation table
hitweapon2killweapon = {
Expand Down
11 changes: 10 additions & 1 deletion b3/parsers/iourt42.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
# info to the event data
# * added parsing of ClientJumpRunCanceled (generate EVT_CLIENT_JUMP_RUN_CANCEL)
# * fixed Client(Load|Save)Position parsing
# 14/07/2013 - 1.14 - Courgette
# * add hitlocation constants : HL_HEAD, HL_HELMET and HL_TORSO
#

import re, new
Expand All @@ -82,7 +84,8 @@
from b3.plugins.spamcontrol import SpamcontrolPlugin

__author__ = 'Courgette'
__version__ = '1.13'
__version__ = '1.14'


class Iourt42Client(Client):

Expand Down Expand Up @@ -215,6 +218,7 @@ def auth(self):
def __str__(self):
return "Client42<@%s:%s|%s:\"%s\":%s>" % (self.id, self.guid, self.pbid, self.name, self.cid)


class Iourt42Parser(Iourt41Parser):

gameName = 'iourt42'
Expand Down Expand Up @@ -389,6 +393,11 @@ class Iourt42Parser(Iourt41Parser):
UT_MOD_FLAG='41'
UT_MOD_GOOMBA='42'

# HIT LOCATIONS
HL_HEAD = '1'
HL_HELMET = '2'
HL_TORSO = '3'

## weapons id on Hit: lines are different than the one
## on the Kill: lines. Here the translation table
hitweapon2killweapon = {
Expand Down

0 comments on commit 5cd0d8a

Please sign in to comment.