Resolved #13, Resolved #39, Added Forests Curse and Trick-or-Treat

server/bw/data/moves.coffee

@@ -493,6 +493,7 @@ extendMove 'Camouflage', ->
     # Camouflage changes type based on terrain
     # In Wi-Fi battles, the terrain always results in Ground type.
     target.types = [ "Ground" ]
+    battle.message "#{user.name} transformed into a Ground type!"
 
 extendMove 'Captivate', ->
   oldUse = @use
@@ -534,6 +535,7 @@ extendMove 'Conversion', ->
     if !type?
       @fail(battle, user)
       return false
+    battle.message "#{user.name} transformed into #{type} Type!"
     target.types = [ type ]
 
 extendMove 'Conversion 2', ->
@@ -547,7 +549,9 @@ extendMove 'Conversion 2', ->
     possibles = []
     for type, value of util.Type
       possibles.push(type)  if util.typeEffectiveness(moveType, [ type ]) < 1
-    user.types = [ battle.rng.choice(possibles, "conversion 2") ]
+    newType = battle.rng.choice(possibles, "conversion 2")
+    battle.message "#{user.name} transformed into #{newType} Type!"
+    user.types = [ newType ]
 
 makeThiefMove 'Covet'
 
@@ -1308,34 +1312,37 @@ extendMove 'Magnet Rise', ->
       return false
 
 extendMove 'Magnitude', ->
+  lastUse = {turn: 0, user: null}
   @basePower = (battle, user, target) ->
-    rand = battle.rng.randInt(0, 99, "magnitude")
-    magnitude = 0
-    power = 0
-    if rand < 5
-      power = 10
-      magnitude = 4
-    else if rand < 15
-      power = 30
-      magnitude = 5
-    else if rand < 35
-      power = 50
-      magnitude = 6
-    else if rand < 65
-      power = 70
-      magnitude = 7
-    else if rand < 85
-      power = 90
-      magnitude = 8
-    else if rand < 95
-      power = 110
-      magnitude = 9
-    else
-      power = 150
-      magnitude = 10
-
-    battle.message "Magnitude #{magnitude}!"
-    power
+    if !(battle.turn == lastUse.turn && user == lastUse.user)
+      rand = battle.rng.randInt(0, 99, "magnitude")
+      magnitude = 0
+      power = 0
+      if rand < 5
+        power = 10
+        magnitude = 4
+      else if rand < 15
+        power = 30
+        magnitude = 5
+      else if rand < 35
+        power = 50
+        magnitude = 6
+      else if rand < 65
+        power = 70
+        magnitude = 7
+      else if rand < 85
+        power = 90
+        magnitude = 8
+      else if rand < 95
+        power = 110
+        magnitude = 9
+      else
+        power = 150
+        magnitude = 10
+      lastUse.turn = battle.turn
+      lastUse.user = user
+      battle.message "Magnitude #{magnitude}!"
+      power
 
 extendMove 'Me First', ->
   bannedMoves = {

server/in/battle.coffee

@@ -19,8 +19,8 @@ eval(coffee.compile(require('fs').readFileSync(path, 'utf8'), bare: true))
     [ species, forme ] = pokemon.item.mega
   pokemon.changeForme(forme)
 
-  pokemon.team.megaEvolve() if forme is "mega"
-  pokemon.team.primalEvolve() if forme is "primal"
+  pokemon.team.megaEvolve() if /mega/.test(forme)
+  pokemon.team.primalEvolve() if /primal/.test(forme)
 
   ability = @FormeData[species][forme]["abilities"][0]
   ability = Ability[ability.replace(/\s+/g, '')]

server/in/data/data_formes.json

@@ -44879,7 +44879,7 @@
                     "Curse": 28,
                     "Destiny Bond": 39,
                     "Faint Attack": 19,
-                    "Forest's Curse": 35,
+                    "Forests Curse": 35,
                     "Growth": 8,
                     "Horn Leech": 54,
                     "Ingrain": 13,
@@ -61963,7 +61963,7 @@
                     "Curse": 28,
                     "Destiny Bond": 39,
                     "Faint Attack": 19,
-                    "Forest's Curse": 35,
+                    "Forests Curse": 35,
                     "Growth": 8,
                     "Horn Leech": 62,
                     "Ingrain": 13,

server/in/data/data_moves.json

@@ -4407,7 +4407,7 @@
         "target": "selected-pokemon",
         "type": "Normal"
     },
-    "Forest's Curse": {
+    "Forests Curse": {
         "accuracy": 100,
         "ailmentChance": 0,
         "ailmentId": "none",

server/in/data/moves.coffee

@@ -141,3 +141,18 @@ extendMove 'Wildfire', ->
         if !(p.isFainted()) && weakness >= 2
           p.attach(Status.Burn)
 
+extendMove "Forests Curse", ->
+  @afterSuccessfulHit = (battle, user, target) ->
+    if target.hasType("Grass")
+      @fail(battle, user)
+      return false
+    battle.message "Grass type was added to #{target.name}"
+    target.types.push "Grass"
+
+extendMove "Trick-or-Treat", ->
+  @afterSuccessfulHit = (battle, user, target) ->
+    if target.hasType("Ghost")
+      @fail(battle, user)
+      return false
+    battle.message "Ghost type was added to #{target.name}"
+    target.types.push "Ghost"

server/xy/data/data_formes.json

@@ -60664,7 +60664,7 @@
                     "Curse": 28,
                     "Destiny Bond": 39,
                     "Faint Attack": 19,
-                    "Forest's Curse": 35,
+                    "Forests Curse": 35,
                     "Growth": 8,
                     "Horn Leech": 54,
                     "Ingrain": 13,
@@ -60749,7 +60749,7 @@
                     "Curse": 28,
                     "Destiny Bond": 39,
                     "Faint Attack": 19,
-                    "Forest's Curse": 35,
+                    "Forests Curse": 35,
                     "Growth": 8,
                     "Horn Leech": 62,
                     "Ingrain": 13,

server/xy/data/moves.coffee

@@ -95,3 +95,4 @@ extendMove 'Venom Drench', ->
       return false
 
     target.boost(attack: -1, specialAttack: -1, speed: -1)
+