Merged 1.0.1 into master

client/app/js/views/battles/battle_view.coffee

@@ -1251,6 +1251,7 @@ class @BattleView extends Backbone.View
 
   isIllusioned: (pokemon) =>
     illusionmons = ['Zoroark', 'Zorua']
+    console.log(pokemon.getIllu())
     return true if (pokemon.attributes.species in illusionmons) and pokemon.attributes.percent == 100 and @model.attributes.turn <= 1
     return true if pokemon.getIllu()
     return false

public/js/app.js

@@ -4835,6 +4835,7 @@
     BattleView.prototype.isIllusioned = function(pokemon) {
       var illusionmons, _ref;
       illusionmons = ['Zoroark', 'Zorua'];
+      console.log(pokemon.getIllu());
       if ((_ref = pokemon.attributes.species, __indexOf.call(illusionmons, _ref) >= 0) && pokemon.attributes.percent === 100 && this.model.attributes.turn <= 1) {
         return true;
       }

public/js/data.js

@@ -1,3 +1,3 @@
-var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
+var Generations = {"RB":{"SpeciesData":{"Abomasnow":{"eggGroups":["monster","grass"],"evolvedFrom":"Snover","genderRatio":4,"generation":4,"id":460},"Abra":{"eggGroups":["human-like"],"evolvesInto":["Kadabra"],"genderRatio":2,"generation":1,"id":63},"Absol":{"eggGroups":["field"],"genderRatio":4,"generation":3,"id":359},"Accelgor":{"eggGroups":["bug"],"evolvedFrom":"Shelmet","genderRatio":4,"generation":5,"id":617},"Aerodactyl":{"eggGroups":["flying"],"genderRatio":1,"generation":1,"id":142},"Aggron":{"eggGroups":["monster"],"evolvedFrom":"Lairon","genderRatio":4,"generation":3,"id":306},"Aipom":{"eggGroups":["field"],"evolvesInto":["Ambipom"],"genderRatio":4,"generation":2,"id":190},"Alakazam":{"eggGroups":["human-like"],"evolvedFrom":"Kadabra","genderRatio":2,"generation":1,"id":65},"Alomomola":{"eggGroups":["water1","water2"],"genderRatio":4,"generation":5,"id":594},"Altaria":{"eggGroups":["flying","dragon"],"evolvedFrom":"Swablu","genderRatio":4,"generation":3,"id":334},"Ambipom":{"eggGroups":["field"],"evolvedFrom":"Aipom","genderRatio":4,"generation":4,"id":424},"Amoonguss":{"eggGroups":["grass"],"evolvedFrom":"Foongus","genderRatio":4,"generation":5,"id":591},"Ampharos":{"eggGroups":["monster","field"],"evolvedFrom":"Flaaffy","genderRatio":4,"generation":2,"id":181},"Anorith":{"eggGroups":["water3"],"evolvesInto":["Armaldo"],"genderRatio":1,"generation":3,"id":347},"Arbok":{"eggGroups":["field","dragon"],"evolvedFrom":"Ekans","genderRatio":4,"generation":1,"id":24},"Arcanine":{"eggGroups":["field"],"evolvedFrom":"Growlithe","genderRatio":2,"generation":1,"id":59},"Arceus":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":493},"Archen":{"eggGroups":["flying","water3"],"evolvesInto":["Archeops"],"genderRatio":1,"generation":5,"id":566},"Archeops":{"eggGroups":["flying","water3"],"evolvedFrom":"Archen","genderRatio":1,"generation":5,"id":567},"Ariados":{"eggGroups":["bug"],"evolvedFrom":"Spinarak","genderRatio":4,"generation":2,"id":168},"Armaldo":{"eggGroups":["water3"],"evolvedFrom":"Anorith","genderRatio":1,"generation":3,"id":348},"Aron":{"eggGroups":["monster"],"evolvesInto":["Lairon"],"genderRatio":4,"generation":3,"id":304},"Articuno":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":1,"id":144},"Audino":{"eggGroups":["fairy"],"genderRatio":4,"generation":5,"id":531},"Axew":{"eggGroups":["monster","dragon"],"evolvesInto":["Fraxure"],"genderRatio":4,"generation":5,"id":610},"Azelf":{"eggGroups":["undiscovered"],"genderRatio":-1,"generation":4,"id":482},"Azumarill":{"eggGroups":["water1","fairy"],"evolvedFrom":"Marill","genderRatio":4,"generation":2,"id":184},"Azurill":{"eggGroups":["undiscovered"],"evolvesInto":["Marill"],"genderRatio":6,"generation":3,"id":298},"Bagon":{"eggGroups":["dragon"],"evolvesInto":["Shelgon"],"genderRatio":4,"generation":3,"id":371},"Baltoy":{"eggGroups":["mineral"],"evolvesInto":["Claydol"],"genderRatio":-1,"generation":3,"id":343},"Banette":{"eggGroups":["amorphous"],"evolvedFrom":"Shuppet","genderRatio":4,"generation":3,"id":354},"Barboach":{"eggGroups":["water2"],"evolvesInto":["Whiscash"],"genderRatio":4,"generation":3,"id":339},"Basculin":{"eggGroups":["water2"],"genderRatio":4,"generation":5,"id":550},"Bastiodon":{"eggGroups":["monster"],"evolvedFrom":"Shieldon","genderRatio":1,"generation":4,"id":411},"Bayleef":{"eggGroups":["monster","grass"],"evolvedFrom":"Chikorita","evolvesInto":["Meganium"],"genderRatio":1,"generation":2,"id":153},"Beartic":{"eggGroups":["field"],"evolvedFrom":"Cubchoo","genderRatio":4,"generation":5,"id":614},"Beautifly":{"eggGroups":["bug"],"evolvedFrom":"Silcoon","genderRatio":4,"generation":3,"id":267},"Beedrill":{"eggGroups":["bug"],"evolvedFrom":"Kakuna","genderRatio":4,"generation":1,"id":15},"Beheeyem":{"eggGroups":["human-like"],"evolvedFrom":"Elgyem","genderRatio":4,"generation":5,"id":606},"Beldum":{"eggGroups":["mineral"],"evolvesInto":["Metang"],"genderRatio":-1,"generation":3,"id":374},"Bellossom":{"eggGroups":["grass"],"evolvedFrom":"Gloom","genderRatio":4,"generation":2,"id":182},"Bellsprout":{"eggGroups":["grass"],"evolvesInto":["Weepinbell"],"genderRatio":4,"generation":1,"id":69},"Bibarel":{"eggGroups":["water1","field"],"evolvedFrom":"Bidoof","genderRatio":4,"generation":4,"id":400},"Bidoof":{"eggGroups":["water1","field"],"evolvesInto":["Bibarel"],"genderRatio":4,"generation":4,"id":399},"Bisharp":{"eggGroups":["human-like"],"evolvedFrom":"Pawniard","genderRatio":4,"generation":5,"id":625},"Blastoise":{"eggGroups":["monster","water1"],"evolvedFrom":"Wartortle","genderRatio":1,"generation":1,"id":9},"Blaziken":{"eggGroups":["field"],"evolvedFrom":"Combusken","genderRatio":1,"generation":3,"id":257},"Blissey":{"eggGroups":["fairy"],"evolvedFrom":"Chansey","genderRatio":8,"generation":2,"id":242},"Blitzle":{"eggGroups":["field"],"evolvesInto":["Zebstrika"],"genderRatio":4,"generation":5,"id":522},"Boldore":{"eggGroups":["mineral"],"evolvedFrom":"Roggenrola","evolvesInto":["Gigalith"],"genderRatioLine truncated
 EventPokemon = {"Absol":[{"generation":3,"level":5,"moves":["Scratch","Leer","Wish"],"forme":"default"},{"generation":3,"level":5,"moves":["Scratch","Leer","Spite"],"forme":"default"},{"generation":3,"level":35,"moves":["Razor Wind","Bite","Swords Dance","Spite"],"forme":"default"},{"generation":3,"level":70,"moves":["Double Team","Slash","Future Sight","Perish Song"],"forme":"default"}],"Aerodactyl":[{"generation":5,"level":15,"gender":"M","isDW":false,"abilities":["Pressure"],"moves":["Steel Wing","Ice Fang","Fire Fang","Thunder Fang"],"pokeball":"Cherish Ball","forme":"default"}],"Aggron":[{"generation":3,"level":100,"moves":["Iron Tail","Protect","Metal Sound","Double-Edge"],"forme":"default"},{"generation":3,"level":50,"moves":["Take Down","Iron Tail","Protect","Metal Sound"],"forme":"default"}],"Aipom":[{"generation":3,"level":10,"gender":"M","moves":["Scratch","Tail Whip","Sand-Attack"],"forme":"default"}],"Alakazam":[{"generation":3,"level":70,"moves":["Future Sight","Calm Mind","Psychic","Trick"],"forme":"default"}],"Altaria":[{"generation":3,"level":45,"moves":["Take Down","DragonBreath","Dragon Dance","Refresh"],"forme":"default"},{"generation":3,"level":36,"moves":["Heal Bell","DragonBreath","SolarBeam","Aerial Ace"],"forme":"default"},{"generation":5,"level":35,"gender":"M","isDW":true,"moves":["Take Down","Natural Gift","DragonBreath","False Swipe"],"forme":"default"}],"Anorith":[{"generation":5,"level":15,"gender":"M","isDW":false,"moves":["Harden","Mud Sport","Water Gun","Cross Poison"],"pokeball":"Cherish Ball","forme":"default"}],"Arbok":[{"generation":3,"level":33,"moves":["Refresh","Sludge Bomb","Glare","Bite"],"forme":"default"}],"Arceus":[{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"},{"generation":5,"level":100,"moves":["Recover","Hyper Beam","Perish Song","Judgment"],"forme":"default"},{"generation":4,"level":100,"moves":["Judgment","Roar of Time","Spacial Rend","Shadow Force"],"pokeball":"Cherish Ball","forme":"default"}Line truncated
 HelpDescriptions = {"1":{"rating":" <i>Also /ranking, /rank. </i>Gets a single username's rating on this server. Usage: /rating username","battles":"Finds all the battles a username is playing in on this server.      Usage: /battles username"},"3":{"mute":"Default length is 10 minutes, up to a maximum of two days. To specify different lengths, use 1m2h3d4w (minute, hour, day, week). Usage: /mute username, length, reason","unmute":"Unmutes a username. Usage: /unmute username","ban":"Default length is one hour, up to a maximum of one day. To specify different lengths, use 1m2h3d (minute, hour, day). Usage: /ban username, length, reason","unban":"Unbans a username. Usage: /unban username","ip":"Finds the current ips under use by a user","wall":" <i>Also /announce. </i>Announces something to the entire server. Usage: /wall message","whois":"Finds all alts associated with a username, or the main username of an alt"},"4":{"lockdown":"Prevents new battles from starting. Usage: /lockdown [on|off]","voice":" <i>Also /driver. </i>Voices a username permanently. Usage: /voice username","mod":"Mods a username permanently. Usage: /mod username","topic":"Changes the topic message. Usage: /topic message"},"5":{"admin":"Admins a username permanently. Usage: /admin username","deauth":"Deauthes a username permanently. Usage: /deauth username","eval":"Evaluates a script in the context of the server."}};

public/js/replays.js

@@ -4561,6 +4561,7 @@
     BattleView.prototype.isIllusioned = function(pokemon) {
       var illusionmons, _ref;
       illusionmons = ['Zoroark', 'Zorua'];
+      console.log(pokemon.getIllu());
       if ((_ref = pokemon.attributes.species, __indexOf.call(illusionmons, _ref) >= 0) && pokemon.attributes.percent === 100 && this.model.attributes.turn <= 1) {
         return true;
       }

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

@@ -21825,7 +21825,6 @@
             "abilities": [
                 "Levitate"
             ],
-            "hiddenAbility": "Unnerve",
             "isBattleOnly": true,
             "isItemBased": true,
             "weight": 820,
@@ -44880,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,
@@ -56961,7 +56960,8 @@
                     "Pursuit": 1,
                     "Shadow Sneak": 1,
                     "Spite": 1,
-                    "Sucker Punch": 31
+                    "Sucker Punch": 31,
+                    "Phantom Force": 55
                 },
                 "machine": {
                     "Attract": 0,
@@ -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_items.json

@@ -7,7 +7,7 @@
             "armor"
         ],
         "spriteId": 404,
-        "type": "megastone"
+        "type": "formeitem"
     },
     "Flygon Armor": {
         "description": "Increases the Defense and Special Defense stats of Flygon by 25% when held.",
@@ -17,7 +17,7 @@
             "armor"
         ],
         "spriteId": 404,
-        "type": "megastone"
+        "type": "formeitem"
     },
     "Leavanny Armor": {
         "description": "Increases the Defense and Special Defense stats of Leavanny by 25% when held.",
@@ -27,7 +27,7 @@
             "armor"
         ],
         "spriteId": 404,
-        "type": "megastone"
+        "type": "formeitem"
     },
     "Zekrom Armor": {
         "description": "Increases the Defense and Special Defense stats of Zekrom by 25% when held.",
@@ -37,7 +37,7 @@
             "armor"
         ],
         "spriteId": 404,
-        "type": "megastone"
+        "type": "formeitem"
     },
     "Ability Capsule": {
         "description": "Allows a Pokemon with one of its two standard Abilities to change to the other when used.",

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/in/pokemon.coffee

@@ -26,6 +26,9 @@ oldHasTakeableItem = @Pokemon::hasTakeableItem
   if @item.type == 'megastone'
     [ species, forme ] = @item.mega
     return false  if @species == species
+  else if @item.type is "formeitem"
+    [ species, forme ] = @item.itemForme
+    return false  if @species == species
   return true
 
 # Powder moves no longer affect Grass-type Pokemon.

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)
+