Deukhoofd
/
BattleSim
mirror of https://gitlab.com/Deukhoofd/BattleSim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually fixed the bug this time

This commit is contained in:
Deukhoofd 2016-05-21 20:53:44 +02:00
parent 206021f0c7
commit df9cfe99d8
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/js/data.js
View File

File diff suppressed because one or more lines are too long

4
server/in/data/data_formes.json
View File

@ -4188,7 +4188,7 @@
"Petal Dance",
"Boomburst",
"Roost",
"Grass Whistle",
"GrassWhistle",
"Flash Cannon",
"Mega Drain"
]
@ -4312,7 +4312,7 @@
"Petal Dance",
"Boomburst",
"Roost",
"Grass Whistle",
"GrassWhistle",
"Flash Cannon",
"Mega Drain"
]

7
server/randomTeams.coffee
View File

@ -10,7 +10,7 @@ UberCount = 0
PUCount = 0
UnreleasedCount = 0
DeltaCount = 0
generation = ""
createTeamBookshelf = (format, requs, next) ->
createTeam format, requs, (mons, teamname) ->
@ -201,6 +201,11 @@ generateMoves = (possibleMoves) ->
if movesArr.length < 4
moveIndex = Math.floor(Math.random() * (possibleMoves.length))
movename = possibleMoves[moveIndex]
moveobj = gen.GenerationJSON[generation].MoveData[movename]
if typeof moveobj == "undefined" and !(/Hidden Power/.test(movename))
console.log(movename)
generateMove()
return
#We reject the move if it's not defined
if typeof movename == "undefined"
generateMove()