mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-10 14:44:58 +00:00
Minor fixes to Pokérus code, fixed some incorrect apostrophes in PBS files
This commit is contained in:
@@ -789,7 +789,7 @@ class Pokemon
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Returns the Pokérus infection stage for this Pokémon. The possible stages are
|
# Returns the Pokérus infection stage for this Pokémon. The possible stages are
|
||||||
# 0 (not infected), 1 (infected) and 2 (cured)
|
# 0 (not infected), 1 (infected) and 2 (cured).
|
||||||
# @return [0, 1, 2] current Pokérus infection stage
|
# @return [0, 1, 2] current Pokérus infection stage
|
||||||
def pokerusStage
|
def pokerusStage
|
||||||
return 0 if @pokerus == 0
|
return 0 if @pokerus == 0
|
||||||
@@ -797,11 +797,11 @@ class Pokemon
|
|||||||
end
|
end
|
||||||
|
|
||||||
# Gives this Pokémon Pokérus (either the specified strain or a random one).
|
# Gives this Pokémon Pokérus (either the specified strain or a random one).
|
||||||
# @param strain [Integer] Pokérus strain to give
|
# @param strain [Integer] Pokérus strain to give (1-15 inclusive, or 0 for random)
|
||||||
def givePokerus(strain = 0)
|
def givePokerus(strain = 0)
|
||||||
return if self.pokerusStage == 2 # Can't re-infect a cured Pokémon
|
return if self.pokerusStage == 2 # Can't re-infect a cured Pokémon
|
||||||
$stats.pokerus_infections += 1
|
$stats.pokerus_infections += 1
|
||||||
strain = rand(1..16) if strain <= 0 || strain >= 16
|
strain = rand(1...16) if strain <= 0 || strain >= 16
|
||||||
time = 1 + (strain % 4)
|
time = 1 + (strain % 4)
|
||||||
@pokerus = time
|
@pokerus = time
|
||||||
@pokerus |= strain << 4
|
@pokerus |= strain << 4
|
||||||
@@ -810,7 +810,7 @@ class Pokemon
|
|||||||
# Resets the infection time for this Pokémon's Pokérus (even if cured).
|
# Resets the infection time for this Pokémon's Pokérus (even if cured).
|
||||||
def resetPokerusTime
|
def resetPokerusTime
|
||||||
return if @pokerus == 0
|
return if @pokerus == 0
|
||||||
strain = @pokerus % 16
|
strain = @pokerus / 16
|
||||||
time = 1 + (strain % 4)
|
time = 1 + (strain % 4)
|
||||||
@pokerus = time
|
@pokerus = time
|
||||||
@pokerus |= strain << 4
|
@pokerus |= strain << 4
|
||||||
@@ -822,6 +822,11 @@ class Pokemon
|
|||||||
@pokerus -= 1
|
@pokerus -= 1
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Cures this Pokémon's Pokérus (if infected).
|
||||||
|
def curePokerus
|
||||||
|
@pokerus -= @pokerus % 16
|
||||||
|
end
|
||||||
|
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
# Ownership, obtained information
|
# Ownership, obtained information
|
||||||
#=============================================================================
|
#=============================================================================
|
||||||
|
|||||||
@@ -16990,7 +16990,7 @@ Weight = 40.0
|
|||||||
Color = Blue
|
Color = Blue
|
||||||
Shape = Bipedal
|
Shape = Bipedal
|
||||||
Category = Ninja
|
Category = Ninja
|
||||||
Pokedex = It appears and vanishes with a ninja’s grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
Pokedex = It appears and vanishes with a ninja's grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[BUNNELBY]
|
[BUNNELBY]
|
||||||
@@ -17241,7 +17241,7 @@ Weight = 81.5
|
|||||||
Color = Brown
|
Color = Brown
|
||||||
Shape = Quadruped
|
Shape = Quadruped
|
||||||
Category = Royal
|
Category = Royal
|
||||||
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride’s cubs.
|
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride's cubs.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[FLABEBE]
|
[FLABEBE]
|
||||||
|
|||||||
@@ -16997,7 +16997,7 @@ Weight = 40.0
|
|||||||
Color = Blue
|
Color = Blue
|
||||||
Shape = Bipedal
|
Shape = Bipedal
|
||||||
Category = Ninja
|
Category = Ninja
|
||||||
Pokedex = It appears and vanishes with a ninja’s grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
Pokedex = It appears and vanishes with a ninja's grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[BUNNELBY]
|
[BUNNELBY]
|
||||||
@@ -17248,7 +17248,7 @@ Weight = 81.5
|
|||||||
Color = Brown
|
Color = Brown
|
||||||
Shape = Quadruped
|
Shape = Quadruped
|
||||||
Category = Royal
|
Category = Royal
|
||||||
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride’s cubs.
|
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride's cubs.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[FLABEBE]
|
[FLABEBE]
|
||||||
|
|||||||
@@ -17003,7 +17003,7 @@ Weight = 40.0
|
|||||||
Color = Blue
|
Color = Blue
|
||||||
Shape = Bipedal
|
Shape = Bipedal
|
||||||
Category = Ninja
|
Category = Ninja
|
||||||
Pokedex = It appears and vanishes with a ninja’s grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
Pokedex = It appears and vanishes with a ninja's grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[BUNNELBY]
|
[BUNNELBY]
|
||||||
@@ -17254,7 +17254,7 @@ Weight = 81.5
|
|||||||
Color = Brown
|
Color = Brown
|
||||||
Shape = Quadruped
|
Shape = Quadruped
|
||||||
Category = Royal
|
Category = Royal
|
||||||
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride’s cubs.
|
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride's cubs.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[FLABEBE]
|
[FLABEBE]
|
||||||
|
|||||||
@@ -17003,7 +17003,7 @@ Weight = 40.0
|
|||||||
Color = Blue
|
Color = Blue
|
||||||
Shape = Bipedal
|
Shape = Bipedal
|
||||||
Category = Ninja
|
Category = Ninja
|
||||||
Pokedex = It appears and vanishes with a ninja’s grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
Pokedex = It appears and vanishes with a ninja's grace. It toys with its enemies using swift movements, while slicing them with throwing stars of sharpest water.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[BUNNELBY]
|
[BUNNELBY]
|
||||||
@@ -17254,7 +17254,7 @@ Weight = 81.5
|
|||||||
Color = Brown
|
Color = Brown
|
||||||
Shape = Quadruped
|
Shape = Quadruped
|
||||||
Category = Royal
|
Category = Royal
|
||||||
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride’s cubs.
|
Pokedex = With fiery breath of more than 6,000 degrees Celsius, they viciously threaten any challenger. The females protect the pride's cubs.
|
||||||
Generation = 6
|
Generation = 6
|
||||||
#-------------------------------
|
#-------------------------------
|
||||||
[FLABEBE]
|
[FLABEBE]
|
||||||
|
|||||||
Reference in New Issue
Block a user