Wpnmaster lvls 1-5 xcpt counters.

Weaponmaster levels 1-5 should be complete other
than counter attacks.  True Friend's mechanics were
changed from their original theorycrafting.

Added an image for a new passive.

Fixed some syntax errors I was too lazy to rebase into
their appropriate locations...

src/ability.py

@@ -735,8 +735,22 @@ def _shieldBashCheck(self, target):
 
     def _trueFriend(self, target):
         source = self.owner
-        # TODO: STUB
-        pass
+        bonusDodge = False
+        if source.usingShield():
+            selfMagnitude = 35
+            friendMagnitude = 30
+        else:
+            selfMagnitude = 30
+            friendMagnitude = 25
+            bonusDodge = True
+        duration = 1
+        Combat.addStatus(source, "True Friend", duration, selfMagnitude)
+        for ally in Combat.getAOETargets(source.cPane, source.cLocation, radius=1, selectMonsters=False):
+            if ally != source:
+                Combat.addStatus(ally, "True Friend", duration, friendMagnitude)
+            if bonusDodge:
+                Combat.addStatus(ally, "True Friend Parry", duration)
+        Combat.endTurn(source)
 
     # Spellsword
     def _martialMode(self, target):
@@ -2497,11 +2511,11 @@ def _quaffPotionCheck(self, target):
         'checkFunction' : None,
         'breakStealth' : 100,
         'image' : WEAPONMASTER_SKILLS + 'true-friend.png',
-        'text' : 'If you end your turn adjacent to another player that is \n' +\
-                 'not a Weaponmaster, you will receive all melee attacks\n' +\
-                 'directed at that player 60% of the time. You gain 5%\n' +\
-                 'bonus DR during this period. You cannot counter attacks\n' +\
-                 'from angles that you could not previously counter.'
+        'text' : 'Grant +25 DR to all allies adjacent to you and +30 DR\n' +\
+                 'to yourself for the coming enemy turn. If you are using\n' +\
+                 'a shield, both you and affected allies gain and additional\n' +\
+                 '+5 DR. If you are not using a shield, both you and affected\n' +\
+                 'allies gain a bonus +2 Dodge.'
         },
 
 

src/combat.py

@@ -294,8 +294,8 @@ def calcHit(source, target, type, rating=0, modifier=0, critMod=0, ignoreMeleeBo
                                          target)
                 return "Miss"
             if source.usingWeapon("Ranged") and \
-               Dice.rollBeneath(target.totalRangedAvoidanceChance):
-               Combat.sendCombatMessage("Avoided ranged attack (" + str(target.totalRangedAvoidanceChance) +
+            Dice.rollBeneath(target.totalRangedAvoidanceChance):
+                Combat.sendCombatMessage("Avoided ranged attack (" + str(target.totalRangedAvoidanceChance) +
                                         "%)", target)
                 return "Miss"
             attackOne = Combat.physicalHitMechanics(source, target, modifier, critMod, ignoreMeleeBowPenalty)

src/data/Status_Effects_Data.txt

@@ -856,19 +856,19 @@
     [MAGNITUDE: 20]
   [CATEGORY: Buff]
 
-#[NAME: True Friend]
-#  [TYPE: Display]
-#  [IMAGE: skills/weaponmaster_skills/true-friend.png]
-#  [ELEMENT: None]
-#  [INTERNAL: DR_bonus]
-#    [MAGNITUDE: 5]
-	
-#[NAME: True Friend Protection]
-#  [TYPE: Display]
-#  [IMAGE: skills/weaponmaster_skills/true-friend.png]
-#  [ELEMENT: None]
-#  [INTERNAL: Redirect_melee_attacks]
-#    [MAGNITUDE: 90]
+[NAME: True Friend]
+  [TYPE: Display]
+  [IMAGE: skills/weaponmaster_skills/true-friend.png]
+  [ELEMENT: None]
+  [INTERNAL: DR_bonus]
+    [MAGNITUDE: 0]
+
+[NAME: True Friend Parry]
+  [TYPE: Display]
+  [IMAGE: skills/weaponmaster_skills/true-friend.png]
+  [ELEMENT: None]
+  [INTERNAL: Dodge_bonus]
+    [MAGNITUDE: 2]
 
 # Display Effects -- Dragoon Skills
 

src/passiveability.py

@@ -858,7 +858,7 @@ def applyRegeneration(self, target, reverse=False):
         'action' : applyShieldEfficiency,
         'onStringList' : ['Outgoing Melee Attack'],
         'offStringList' : [],
-        # 'image' : WEAPONMASTER + 'shield-efficiency.png',
+        'image' : WEAPONMASTER + 'shield-efficiency.png',
         'text' : 'Basic melee attacks refund 1 AP when using a shield.' 
         },
         'Direct Counterattack':

src/welcome.py

@@ -30,9 +30,9 @@
         IP = ()
 else:
     IP = ()
-CLASSES = ('Assassin', 'Barbarian', 'Dragoon', 'Spellsword', 'Marksman',
-           'Druid', 'Anarchist', 'Shadow', 'Nightblade', 'Battle Mage',
-           'Arcane Archer', 'Trickster')
+CLASSES = ('Assassin', 'Barbarian', 'Dragoon', 'Weapon Master','Spellsword',
+           'Marksman', 'Druid', 'Anarchist', 'Shadow', 'Nightblade',
+           'Battle Mage', 'Arcane Archer', 'Trickster')
 RACES = ('Human', 'Dwarf', 'Elf', 'Halfling', 'Orc')
 savesprefix = os.path.join('res', 'saves', 'characters')
 CHARSAVES = [path.lstrip(savesprefix).lstrip(os.path.sep) for path in