mirror of
https://gitlab.com/Deukhoofd/BattleSim.git
synced 2025-10-27 18:00:03 +00:00
Gotta git gud
This commit is contained in:
@@ -26,7 +26,6 @@ $ ->
|
||||
Conditions.SPECIES_CLAUSE
|
||||
Conditions.OHKO_CLAUSE
|
||||
Conditions.PRANKSTER_SWAGGER_CLAUSE
|
||||
Conditions.UNRELEASED_BAN
|
||||
Conditions.TIMED_BATTLE
|
||||
]
|
||||
|
||||
|
||||
@@ -14,7 +14,6 @@ HiddenPower = (if module? then require('../../../../shared/hidden_power') else w
|
||||
[ all, pokemonLine, gender, item ] = line.match(pokemonRegex)
|
||||
pokemon = {}
|
||||
team.push(pokemon)
|
||||
|
||||
if pokemonLine.match(/(.*?)\s*\((.*)\)/)
|
||||
pokemon.name = RegExp.$1
|
||||
pokemonLine = RegExp.$2
|
||||
@@ -30,7 +29,7 @@ HiddenPower = (if module? then require('../../../../shared/hidden_power') else w
|
||||
if pokemon.ability is oldability
|
||||
pokemon.ability = newability
|
||||
else if line.match(/^Level:\s+(.*)$/i)
|
||||
pokemon.level = Number(RegExp.$1) || 100
|
||||
pokemon.level = Number(RegExp.$1) || 120
|
||||
else if line.match(/^Happiness:\s+(.*)$/i)
|
||||
pokemon.happiness = Number(RegExp.$1) || 0
|
||||
else if line.match(/^Shiny: Yes$/i)
|
||||
@@ -105,7 +104,7 @@ HiddenPower = (if module? then require('../../../../shared/hidden_power') else w
|
||||
s.push("#{pokemon.nature} nature") if pokemon.nature
|
||||
|
||||
# Level
|
||||
s.push("Level: #{pokemon.level}") if pokemon.level && pokemon.level != 100
|
||||
s.push("Level: #{pokemon.level}") if pokemon.level && pokemon.level != 120
|
||||
|
||||
# Shiny
|
||||
s.push("Shiny: Yes") if pokemon.shiny
|
||||
|
||||
@@ -45,7 +45,7 @@ class @Pokemon extends Backbone.Model
|
||||
@set('ivs', ivs, silent: true)
|
||||
|
||||
@set('ability', @getAbilities()[0]) unless attributes.ability
|
||||
@set('level', 100) unless attributes.level
|
||||
@set('level', @getGeneration.maxLevel) unless attributes.level
|
||||
@set('happiness', 100) if isNaN(attributes.happiness)
|
||||
@set('nature', 'Hardy') unless attributes.nature
|
||||
hiddenPowerType = HiddenPower.BW.type(@get('ivs')).toLowerCase()
|
||||
@@ -66,7 +66,6 @@ class @Pokemon extends Backbone.Model
|
||||
speed: 0
|
||||
accuracy: 0
|
||||
evasion: 0
|
||||
|
||||
normalizeStats: (hash, defaultValue) ->
|
||||
stats = [ "hp", "attack", "defense", "specialAttack",
|
||||
"specialDefense", "speed"]
|
||||
@@ -180,7 +179,7 @@ class @Pokemon extends Backbone.Model
|
||||
stat: (key) ->
|
||||
base = @base(key)
|
||||
return 1 if base == 1 # For Shedinja. key doesn't have to be hp.
|
||||
level = @get('level') || 100
|
||||
level = @get('level') || @getGeneration.maxLevel
|
||||
iv = @iv(key)
|
||||
ev = Math.floor(@ev(key) / 4)
|
||||
total = if key == 'hp'
|
||||
|
||||
@@ -165,7 +165,14 @@ class @PokemonEditView extends Backbone.View
|
||||
|
||||
changeItem: (e) =>
|
||||
$list = $(e.currentTarget)
|
||||
@pokemon.set("item", $list.val())
|
||||
item = $list.val()
|
||||
{ItemData} = @generation
|
||||
itemdata = ItemData[item]
|
||||
@pokemon.set("item", item)
|
||||
if typeof itemdata.itemForme != 'undefined' and itemdata.itemForme[0] is @pokemon.get('species')
|
||||
@pokemon.set('forme', itemdata.itemForme[1])
|
||||
else if typeof @pokemon.getForme().isItemBased != 'undefined' and @pokemon.getForme().isItemBased
|
||||
@pokemon.set('forme', 'default')
|
||||
|
||||
changeGender: (e) =>
|
||||
$list = $(e.currentTarget)
|
||||
@@ -174,7 +181,7 @@ class @PokemonEditView extends Backbone.View
|
||||
changeLevel: (e) =>
|
||||
$input = $(e.currentTarget)
|
||||
value = parseInt($input.val(), 10)
|
||||
value = 1120 if isNaN(value) || value > 120
|
||||
value = @generation.maxLevel if isNaN(value) || value > @generation.maxLevel
|
||||
value = 1 if value < 1
|
||||
$input.val(value)
|
||||
@pokemon.set("level", value)
|
||||
|
||||
@@ -22,7 +22,7 @@ html
|
||||
li
|
||||
a(href="../") Simulator
|
||||
li
|
||||
a(href="//91.121.152.74/", target="_blank") Forums
|
||||
a(href="//forums.p-insurgence.com/", target="_blank") Forums
|
||||
li
|
||||
a(href="../leaderboard", target="_blank") Leaderboard
|
||||
#sub-nav
|
||||
|
||||
@@ -10,10 +10,9 @@ a.sprite.preload(href=pokemon.getPokedexUrl(), target='_blank', data-species = p
|
||||
span.gender.gender_female ♀
|
||||
else if pokemon.get('gender') === 'M'
|
||||
span.gender.gender_male ♂
|
||||
if pokemon.get('level') != 120
|
||||
span.pokemon-level
|
||||
span.pokemon-level-text Lv.
|
||||
= pokemon.get('level')
|
||||
span.pokemon-level
|
||||
span.pokemon-level-text Lv.
|
||||
= pokemon.get('level')
|
||||
.hp-text #{percent}%
|
||||
.hp(style = greenStyle)
|
||||
.hp-gradient
|
||||
|
||||
@@ -36,7 +36,7 @@ mixin displayPokemon(pokemon, i)
|
||||
.gender.gender_female ♀
|
||||
else if pokemon.get('gender') === 'M'
|
||||
.gender.gender_male ♂
|
||||
if pokemon.get('level') != 100
|
||||
if pokemon.get('level') != 120
|
||||
.level Lv.#{pokemon.get('level')}
|
||||
|
||||
.battle_teams
|
||||
|
||||
@@ -10,7 +10,7 @@ ul.nav
|
||||
a(href="/replays", target="_blank").nav_item Your Replays
|
||||
a(href="/leaderboard/", target="_blank").nav_item Leaderboard
|
||||
a(href="//bitbucket.org/PInsurgence/battle-simulator/issues?status=new&status=open", target="_blank").nav_item Bug Reports
|
||||
a(href="//91.121.152.74/c/battle-simulator/feature-requests", target="_blank").nav_item Feature Requests
|
||||
a(href="//forums.p-insurgence.com/c/battle-simulator/feature-requests", target="_blank").nav_item Feature Requests
|
||||
|
||||
ul.nav.nav_battles.hidden
|
||||
|
||||
|
||||
Reference in New Issue
Block a user