DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-06 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Altered encounter chance calculation to be closer to Gen 3 (inc. Rock Smash), Pokémon's ball bug fix

Browse Source
This commit is contained in:
Maruno17
2021-03-01 23:28:43 +00:00
parent ec742ac5f2
commit 8b0796588f
9 changed files with 142 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/011_Data/001_PBS data/012_Trainer.rb
View File

@@ -157,7 +157,7 @@ module GameData
pkmn.update_shadow_moves(true) pkmn.update_shadow_moves(true)
pkmn.shiny = false pkmn.shiny = false
end end
pkmn.poke_ball = pbBallTypeToItem(pkmn_data[:poke_ball]) if pkmn_data[:poke_ball] pkmn.poke_ball = pbBallTypeToItem(pkmn_data[:poke_ball]).id if pkmn_data[:poke_ball]
pkmn.calcStats pkmn.calcStats
end end
return trainer return trainer

8
Data/Scripts/011_Data/002_Hardcoded data/016_PBEncounterTypes.rb
View File

@@ -60,10 +60,10 @@ module EncounterTypes
[20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1] [20, 20, 10, 10, 10, 10, 5, 5, 4, 4, 1, 1]
] ]
Chances_Per_Step = [ Chances_Per_Step = [
25, 25, 25, 25, 25, 25, # Lands 21, 21, 21, 21, 21, 21, # Lands
10, 10, 10, 10, 10, 10, # Caves 5, 5, 5, 5, 5, 5, # Caves
10, 10, 10, 10, 10, 10, # Waters 2, 2, 2, 2, 2, 2, # Waters
0, 0, 0, 0, 0, 0, 25 0, 0, 0, 50, 0, 0, 21
] ]
Kinds = [ Kinds = [
1, 1, 1, 1, 1, 1, # Lands 1, 1, 1, 1, 1, 1, # Lands

6
Data/Scripts/012_Battle/005_Battle scene/001_PokeBattle_Animation.rb
View File

@@ -87,7 +87,7 @@ module PokeBattle_BallAnimationMixin
def addBallSprite(ballX, ballY, poke_ball) def addBallSprite(ballX, ballY, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball) file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball)
if !pbResolveBitmap(file_path) if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball)) file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball).id_number)
end end
ball = addNewSprite(ballX, ballY, file_path, PictureOrigin::Center) ball = addNewSprite(ballX, ballY, file_path, PictureOrigin::Center)
@ballSprite = @pictureSprites.last @ballSprite = @pictureSprites.last
@@ -207,7 +207,7 @@ module PokeBattle_BallAnimationMixin
def ballSetOpen(ball, delay, poke_ball) def ballSetOpen(ball, delay, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s_open", poke_ball) file_path = sprintf("Graphics/Battle animations/ball_%s_open", poke_ball)
if !pbResolveBitmap(file_path) if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d_open", pbGetBallType(poke_ball)) file_path = sprintf("Graphics/Battle animations/ball_%02d_open", pbGetBallType(poke_ball).id_number)
end end
ball.setName(delay, file_path) ball.setName(delay, file_path)
if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height
@@ -218,7 +218,7 @@ module PokeBattle_BallAnimationMixin
def ballSetClosed(ball, delay, poke_ball) def ballSetClosed(ball, delay, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball) file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball)
if !pbResolveBitmap(file_path) if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball)) file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball).id_number)
end end
ball.setName(delay, file_path) ball.setName(delay, file_path)
if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height

64
Data/Scripts/013_Overworld/007_PField_Encounters.rb
View File

@@ -7,6 +7,7 @@ class PokemonEncounters
def initialize def initialize
@step_chances = nil @step_chances = nil
@encounter_tables = [] @encounter_tables = []
@chance_accumulator = 0
end end
def setup(map_ID) def setup(map_ID)
@@ -22,6 +23,7 @@ class PokemonEncounters
def reset_step_count def reset_step_count
@step_count = 0 @step_count = 0
@chance_accumulator = 0
end end
#============================================================================= #=============================================================================
@@ -107,47 +109,66 @@ class PokemonEncounters
return false if $game_system.encounter_disabled return false if $game_system.encounter_disabled
return false if !$Trainer return false if !$Trainer
return false if $DEBUG && Input.press?(Input::CTRL) return false if $DEBUG && Input.press?(Input::CTRL)
# Wild encounters cannot happen for the first 3 steps after a previous wild
# encounter
@step_count += 1
return false if @step_count <= 3
# Check if enc_type has a defined step chance/encounter table # Check if enc_type has a defined step chance/encounter table
return false if !@step_chances[enc_type] || @step_chances[enc_type] == 0 return false if !@step_chances[enc_type] || @step_chances[enc_type] == 0
return false if !has_encounter_type?(enc_type) return false if !has_encounter_type?(enc_type)
# Determine the encounter step chance (probability of a wild encounter # Get base encounter chance and minimum steps grace period
# happening). The actual probability is the written encounter step chance, encounter_chance = @step_chances[enc_type].to_f
# with modifiers applied, divided by 180. min_steps_needed = (8 - encounter_chance / 10).clamp(0, 8).to_f
encount = @step_chances[enc_type].to_f # Apply modifiers to the encounter chance and the minimum steps amount
encount *= 0.8 if $PokemonGlobal.bicycle encounter_chance += @chance_accumulator / 200
encounter_chance *= 0.8 if $PokemonGlobal.bicycle
if !Settings::FLUTES_CHANGE_WILD_ENCOUNTER_LEVELS if !Settings::FLUTES_CHANGE_WILD_ENCOUNTER_LEVELS
encount /= 2 if $PokemonMap.blackFluteUsed encounter_chance /= 2 if $PokemonMap.blackFluteUsed
encount *= 1.5 if $PokemonMap.whiteFluteUsed min_steps_needed *= 2 if $PokemonMap.blackFluteUsed
encounter_chance *= 1.5 if $PokemonMap.whiteFluteUsed
min_steps_needed /= 2 if $PokemonMap.whiteFluteUsed
end end
first_pkmn = $Trainer.first_pokemon first_pkmn = $Trainer.first_pokemon
if first_pkmn if first_pkmn
case first_pkmn.item_id case first_pkmn.item_id
when :CLEANSETAG when :CLEANSETAG
encount *= 2.0 / 3 encounter_chance *= 2.0 / 3
min_steps_needed *= 4 / 3.0
when :PUREINCENSE when :PUREINCENSE
encount *= 2.0 / 3 encounter_chance *= 2.0 / 3
min_steps_needed *= 4 / 3.0
else # Ignore ability effects if an item effect applies else # Ignore ability effects if an item effect applies
case first_pkmn.ability_id case first_pkmn.ability_id
when :STENCH, :WHITESMOKE, :QUICKFEET when :STENCH, :WHITESMOKE, :QUICKFEET
encount /= 2 encounter_chance /= 2
min_steps_needed *= 2
when :SNOWCLOAK when :SNOWCLOAK
encount /= 2 if $game_screen.weather_type == PBFieldWeather::Snow || if $game_screen.weather_type == PBFieldWeather::Snow ||
$game_screen.weather_type == PBFieldWeather::Blizzard $game_screen.weather_type == PBFieldWeather::Blizzard
encounter_chance /= 2
min_steps_needed *= 2
end
when :SANDVEIL when :SANDVEIL
encount /= 2 if $game_screen.weather_type == PBFieldWeather::Sandstorm if $game_screen.weather_type == PBFieldWeather::Sandstorm
encounter_chance /= 2
min_steps_needed *= 2
end
when :SWARM when :SWARM
encount *= 1.5 encounter_chance *= 1.5
min_steps_needed /= 2
when :ILLUMINATE, :ARENATRAP, :NOGUARD when :ILLUMINATE, :ARENATRAP, :NOGUARD
encount *= 2 encounter_chance *= 2
min_steps_needed /= 2
end end
end end
end end
# Wild encounters are much less likely to happen for the first few steps
# after a previous wild encounter
if @step_count < min_steps_needed
@step_count += 1
return false if rand(100) >= encounter_chance * 5 / (@step_chances[enc_type] + @chance_accumulator / 200)
end
# Decide whether the wild encounter should actually happen # Decide whether the wild encounter should actually happen
return rand(180) < encount return true if rand(100) < encounter_chance
# If encounter didn't happen, make the next step more likely to produce one
@chance_accumulator += @step_chances[enc_type]
return false
end end
# Returns whether an encounter with the given Pokémon should be allowed after # Returns whether an encounter with the given Pokémon should be allowed after
@@ -157,7 +178,10 @@ class PokemonEncounters
# Repel # Repel
if repel_active && !pbPokeRadarOnShakingGrass if repel_active && !pbPokeRadarOnShakingGrass
first_pkmn = (Settings::REPEL_COUNTS_FAINTED_POKEMON) ? $Trainer.first_pokemon : $Trainer.first_able_pokemon first_pkmn = (Settings::REPEL_COUNTS_FAINTED_POKEMON) ? $Trainer.first_pokemon : $Trainer.first_able_pokemon
return false if first_pkmn && enc_data[1] < first_pkmn.level if first_pkmn && enc_data[1] < first_pkmn.level
@chance_accumulator = 0
return false
end
end end
# Some abilities make wild encounters less likely if the wild Pokémon is # Some abilities make wild encounters less likely if the wild Pokémon is
# sufficiently weaker than the Pokémon with the ability # sufficiently weaker than the Pokémon with the ability

4
Data/Scripts/013_Overworld/011_PField_FieldMoves.rb
View File

@@ -592,7 +592,9 @@ HiddenMoveHandlers::UseMove.add(:HEADBUTT,proc { |move,pokemon|
# Rock Smash # Rock Smash
#=============================================================================== #===============================================================================
def pbRockSmashRandomEncounter def pbRockSmashRandomEncounter
if rand(100)<25 encounter_data = GameData::Encounter.get($game_map.map_id, $PokemonGlobal.encounter_version)
chance = (encounter_data) ? encounter_data.step_chances[EncounterTypes::RockSmash] || 50 : 50
if rand(100) < chance
pbEncounter(EncounterTypes::RockSmash) pbEncounter(EncounterTypes::RockSmash)
end end
end end

2
Data/Scripts/016_Pokemon/010_Pokemon_Deprecated.rb
View File

@@ -58,7 +58,7 @@ class PokeBattle_Pokemon
ret.pokerus = pkmn.pokerus if pkmn.pokerus ret.pokerus = pkmn.pokerus if pkmn.pokerus
ret.name = pkmn.name ret.name = pkmn.name
ret.happiness = pkmn.happiness ret.happiness = pkmn.happiness
ret.poke_ball = pbBallTypeToItem(pkmn.ballused) ret.poke_ball = pbBallTypeToItem(pkmn.ballused).id
ret.markings = pkmn.markings if pkmn.markings ret.markings = pkmn.markings if pkmn.markings
ret.iv = pkmn.iv.clone ret.iv = pkmn.iv.clone
ret.ivMaxed = pkmn.ivMaxed.clone if pkmn.ivMaxed ret.ivMaxed = pkmn.ivMaxed.clone if pkmn.ivMaxed

56
PBS/Gen 5/encounters.txt
View File

@@ -1,7 +1,7 @@
# See the documentation on the wiki to learn how to edit this file. # See the documentation on the wiki to learn how to edit this file.
#------------------------------- #-------------------------------
[002] # Lappet Town [002] # Lappet Town
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -18,14 +18,14 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[005] # Route 1 [005] # Route 1
Land,25 Land,21
40,PIDGEY,11,14 40,PIDGEY,11,14
40,RATTATA,11,14 40,RATTATA,11,14
9,PIDGEY,11,13 9,PIDGEY,11,13
9,RATTATA,11,13 9,RATTATA,11,13
1,PIDGEY,14 1,PIDGEY,14
1,RATTATA,14 1,RATTATA,14
LandNight,25 LandNight,21
39,RATTATA,10,14 39,RATTATA,10,14
30,HOOTHOOT,10,13 30,HOOTHOOT,10,13
20,SPINARAK,8,12 20,SPINARAK,8,12
@@ -34,12 +34,12 @@ LandNight,25
1,RATTATA,15 1,RATTATA,15
#------------------------------- #-------------------------------
[021] # Route 2 [021] # Route 2
Land,25 Land,21
50,RATTATA,12,15 50,RATTATA,12,15
30,POOCHYENA,11,15 30,POOCHYENA,11,15
10,SHINX,10,12 10,SHINX,10,12
10,SHINX,10,11 10,SHINX,10,11
Water,10 Water,2
60,MAGIKARP,7,10 60,MAGIKARP,7,10
30,GOLDEEN,11,14 30,GOLDEEN,11,14
10,STARYU,12,15 10,STARYU,12,15
@@ -66,7 +66,7 @@ HeadbuttHigh
20,SPINARAK,9,12 20,SPINARAK,9,12
#------------------------------- #-------------------------------
[028] # Natural Park [028] # Natural Park
Land,25 Land,21
20,CATERPIE,10 20,CATERPIE,10
20,SUNKERN,12 20,SUNKERN,12
20,WEEDLE,10 20,WEEDLE,10
@@ -74,19 +74,19 @@ Land,25
15,PIDGEY,12,14 15,PIDGEY,12,14
5,KAKUNA,10 5,KAKUNA,10
5,METAPOD,10 5,METAPOD,10
LandNight,25 LandNight,21
30,HOOTHOOT,10,14 30,HOOTHOOT,10,14
30,SPINARAK,10,15 30,SPINARAK,10,15
20,PINECO,9,13 20,PINECO,9,13
10,DROWZEE,9,15 10,DROWZEE,9,15
10,NATU,12,14 10,NATU,12,14
LandMorning,25 LandMorning,21
25,CATERPIE,10,12 25,CATERPIE,10,12
25,WEEDLE,10,12 25,WEEDLE,10,12
20,PIDGEY,10,14 20,PIDGEY,10,14
15,KAKUNA,10 15,KAKUNA,10
15,METAPOD,10 15,METAPOD,10
BugContest,25 BugContest,21
20,CATERPIE,7,18 20,CATERPIE,7,18
20,WEEDLE,7,18 20,WEEDLE,7,18
10,KAKUNA,9,18 10,KAKUNA,9,18
@@ -99,13 +99,13 @@ BugContest,25
5,SCYTHER,13,14 5,SCYTHER,13,14
#------------------------------- #-------------------------------
[031] # Route 3 [031] # Route 3
Land,25 Land,21
30,NIDORANfE,12,15 30,NIDORANfE,12,15
30,NIDORANmA,12,15 30,NIDORANmA,12,15
20,PIKACHU,14,17 20,PIKACHU,14,17
10,EEVEE,15 10,EEVEE,15
10,PONYTA,13,15 10,PONYTA,13,15
Water,10 Water,2
60,SURSKIT,13,14 60,SURSKIT,13,14
35,LOTAD,14 35,LOTAD,14
5,LOTAD,15 5,LOTAD,15
@@ -120,7 +120,7 @@ SuperRod
40,CHINCHOU,11,12 40,CHINCHOU,11,12
40,REMORAID,12,14 40,REMORAID,12,14
20,LUVDISC,10,16 20,LUVDISC,10,16
RockSmash RockSmash,50
60,NOSEPASS,13,14 60,NOSEPASS,13,14
40,GEODUDE,12,15 40,GEODUDE,12,15
HeadbuttLow HeadbuttLow
@@ -137,7 +137,7 @@ HeadbuttHigh
20,BURMY,12,15 20,BURMY,12,15
#------------------------------- #-------------------------------
[034] # Ice Cave [034] # Ice Cave
Cave,10 Cave,5
40,SWINUB,16,18 40,SWINUB,16,18
20,SNEASEL,14,16 20,SNEASEL,14,16
20,SNORUNT,12,15 20,SNORUNT,12,15
@@ -145,35 +145,35 @@ Cave,10
10,SNOVER,14 10,SNOVER,14
#------------------------------- #-------------------------------
[039] # Route 4 [039] # Route 4
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[041] # Route 5 [041] # Route 5
Land,25 Land,21
50,GRIMER,13,15 50,GRIMER,13,15
40,SPEAROW,13,16 40,SPEAROW,13,16
10,SLUGMA,13,14 10,SLUGMA,13,14
#------------------------------- #-------------------------------
[044] # Route 6 [044] # Route 6
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[047] # Route 7 [047] # Route 7
Land,25 Land,21
50,SHELLOS,12,15 50,SHELLOS,12,15
30,BIDOOF,14,17 30,BIDOOF,14,17
10,MURKROW,12,14 10,MURKROW,12,14
10,WURMPLE,9,12 10,WURMPLE,9,12
RockSmash RockSmash,50
90,NOSEPASS,13,14 90,NOSEPASS,13,14
10,GEODUDE,12,15 10,GEODUDE,12,15
#------------------------------- #-------------------------------
[049] # Rock Cave [049] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -182,7 +182,7 @@ Cave,10
10,MAWILE,14,16 10,MAWILE,14,16
#------------------------------- #-------------------------------
[050] # Rock Cave [050] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -191,7 +191,7 @@ Cave,10
10,GEODUDE,13,15 10,GEODUDE,13,15
#------------------------------- #-------------------------------
[051] # Dungeon [051] # Dungeon
Cave,10 Cave,5
20,CHINGLING,1 20,CHINGLING,1
20,CLEFFA,1 20,CLEFFA,1
20,IGGLYBUFF,1 20,IGGLYBUFF,1
@@ -200,7 +200,7 @@ Cave,10
10,TYROGUE,1 10,TYROGUE,1
#------------------------------- #-------------------------------
[066] # Safari Zone [066] # Safari Zone
Land,25 Land,21
20,ABRA,12,15 20,ABRA,12,15
20,DODUO,13,15 20,DODUO,13,15
20,NIDORANfE,15,16 20,NIDORANfE,15,16
@@ -209,7 +209,7 @@ Land,25
10,TANGELA,14,16 10,TANGELA,14,16
#------------------------------- #-------------------------------
[068] # Safari Zone [068] # Safari Zone
Land,25 Land,21
20,EXEGGCUTE,15,18 20,EXEGGCUTE,15,18
20,RHYHORN,16,18 20,RHYHORN,16,18
10,AIPOM,14,17 10,AIPOM,14,17
@@ -222,7 +222,7 @@ Land,25
4,SCYTHER,16 4,SCYTHER,16
1,CHANSEY,17 1,CHANSEY,17
1,KANGASKHAN,19 1,KANGASKHAN,19
Water,10 Water,2
60,PSYDUCK,16,18 60,PSYDUCK,16,18
30,MARILL,15,18 30,MARILL,15,18
5,BUIZEL,15,17 5,BUIZEL,15,17
@@ -242,7 +242,7 @@ SuperRod
1,DRATINI,17 1,DRATINI,17
#------------------------------- #-------------------------------
[069] # Route 8 [069] # Route 8
Land,25 Land,21
20,MAREEP,16,18 20,MAREEP,16,18
20,ODDISH,15,17 20,ODDISH,15,17
13,BONSLY,14,16 13,BONSLY,14,16
@@ -253,7 +253,7 @@ Land,25
5,BONSLY,14,17 5,BONSLY,14,17
1,BONSLY,15,16 1,BONSLY,15,16
1,BONSLY,15 1,BONSLY,15
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -270,7 +270,7 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[070] # Underwater [070] # Underwater
Land,25 Land,21
20,CHINCHOU,17,21 20,CHINCHOU,17,21
20,CLAMPERL,18,20 20,CLAMPERL,18,20
20,SHELLDER,18,20 20,SHELLDER,18,20
@@ -280,7 +280,7 @@ Land,25
10,SHELLDER,18,19 10,SHELLDER,18,19
#------------------------------- #-------------------------------
[075] # Tiall Region [075] # Tiall Region
Land,25 Land,21
20,GEODUDE,11,14 20,GEODUDE,11,14
20,RATTATA,11,14 20,RATTATA,11,14
10,CUBONE,11,14 10,CUBONE,11,14

56
PBS/Gen 7/encounters.txt
View File

@@ -1,7 +1,7 @@
# See the documentation on the wiki to learn how to edit this file. # See the documentation on the wiki to learn how to edit this file.
#------------------------------- #-------------------------------
[002] # Lappet Town [002] # Lappet Town
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -18,14 +18,14 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[005] # Route 1 [005] # Route 1
Land,25 Land,21
40,PIDGEY,11,14 40,PIDGEY,11,14
40,RATTATA,11,14 40,RATTATA,11,14
9,PIDGEY,11,13 9,PIDGEY,11,13
9,RATTATA,11,13 9,RATTATA,11,13
1,PIDGEY,14 1,PIDGEY,14
1,RATTATA,14 1,RATTATA,14
LandNight,25 LandNight,21
39,RATTATA,10,14 39,RATTATA,10,14
30,HOOTHOOT,10,13 30,HOOTHOOT,10,13
20,SPINARAK,8,12 20,SPINARAK,8,12
@@ -34,12 +34,12 @@ LandNight,25
1,RATTATA,15 1,RATTATA,15
#------------------------------- #-------------------------------
[021] # Route 2 [021] # Route 2
Land,25 Land,21
50,RATTATA,12,15 50,RATTATA,12,15
30,POOCHYENA,11,15 30,POOCHYENA,11,15
10,SHINX,10,12 10,SHINX,10,12
10,SHINX,10,11 10,SHINX,10,11
Water,10 Water,2
60,MAGIKARP,7,10 60,MAGIKARP,7,10
30,GOLDEEN,11,14 30,GOLDEEN,11,14
10,STARYU,12,15 10,STARYU,12,15
@@ -66,7 +66,7 @@ HeadbuttHigh
20,SPINARAK,9,12 20,SPINARAK,9,12
#------------------------------- #-------------------------------
[028] # Natural Park [028] # Natural Park
Land,25 Land,21
20,CATERPIE,10 20,CATERPIE,10
20,SUNKERN,12 20,SUNKERN,12
20,WEEDLE,10 20,WEEDLE,10
@@ -74,19 +74,19 @@ Land,25
15,PIDGEY,12,14 15,PIDGEY,12,14
5,KAKUNA,10 5,KAKUNA,10
5,METAPOD,10 5,METAPOD,10
LandNight,25 LandNight,21
30,HOOTHOOT,10,14 30,HOOTHOOT,10,14
30,SPINARAK,10,15 30,SPINARAK,10,15
20,PINECO,9,13 20,PINECO,9,13
10,DROWZEE,9,15 10,DROWZEE,9,15
10,NATU,12,14 10,NATU,12,14
LandMorning,25 LandMorning,21
25,CATERPIE,10,12 25,CATERPIE,10,12
25,WEEDLE,10,12 25,WEEDLE,10,12
20,PIDGEY,10,14 20,PIDGEY,10,14
15,KAKUNA,10 15,KAKUNA,10
15,METAPOD,10 15,METAPOD,10
BugContest,25 BugContest,21
20,CATERPIE,7,18 20,CATERPIE,7,18
20,WEEDLE,7,18 20,WEEDLE,7,18
10,KAKUNA,9,18 10,KAKUNA,9,18
@@ -99,13 +99,13 @@ BugContest,25
5,SCYTHER,13,14 5,SCYTHER,13,14
#------------------------------- #-------------------------------
[031] # Route 3 [031] # Route 3
Land,25 Land,21
30,NIDORANfE,12,15 30,NIDORANfE,12,15
30,NIDORANmA,12,15 30,NIDORANmA,12,15
20,PIKACHU,14,17 20,PIKACHU,14,17
10,EEVEE,15 10,EEVEE,15
10,PONYTA,13,15 10,PONYTA,13,15
Water,10 Water,2
60,SURSKIT,13,14 60,SURSKIT,13,14
35,LOTAD,14 35,LOTAD,14
5,LOTAD,15 5,LOTAD,15
@@ -120,7 +120,7 @@ SuperRod
40,CHINCHOU,11,12 40,CHINCHOU,11,12
40,REMORAID,12,14 40,REMORAID,12,14
20,LUVDISC,10,16 20,LUVDISC,10,16
RockSmash RockSmash,50
60,NOSEPASS,13,14 60,NOSEPASS,13,14
40,GEODUDE,12,15 40,GEODUDE,12,15
HeadbuttLow HeadbuttLow
@@ -137,7 +137,7 @@ HeadbuttHigh
20,BURMY,12,15 20,BURMY,12,15
#------------------------------- #-------------------------------
[034] # Ice Cave [034] # Ice Cave
Cave,10 Cave,5
40,SWINUB,16,18 40,SWINUB,16,18
20,SNEASEL,14,16 20,SNEASEL,14,16
20,SNORUNT,12,15 20,SNORUNT,12,15
@@ -145,35 +145,35 @@ Cave,10
10,SNOVER,14 10,SNOVER,14
#------------------------------- #-------------------------------
[039] # Route 4 [039] # Route 4
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[041] # Route 5 [041] # Route 5
Land,25 Land,21
50,GRIMER,13,15 50,GRIMER,13,15
40,SPEAROW,13,16 40,SPEAROW,13,16
10,SLUGMA,13,14 10,SLUGMA,13,14
#------------------------------- #-------------------------------
[044] # Route 6 [044] # Route 6
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[047] # Route 7 [047] # Route 7
Land,25 Land,21
50,SHELLOS,12,15 50,SHELLOS,12,15
30,BIDOOF,14,17 30,BIDOOF,14,17
10,MURKROW,12,14 10,MURKROW,12,14
10,WURMPLE,9,12 10,WURMPLE,9,12
RockSmash RockSmash,50
90,NOSEPASS,13,14 90,NOSEPASS,13,14
10,GEODUDE,12,15 10,GEODUDE,12,15
#------------------------------- #-------------------------------
[049] # Rock Cave [049] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -182,7 +182,7 @@ Cave,10
10,MAWILE,14,16 10,MAWILE,14,16
#------------------------------- #-------------------------------
[050] # Rock Cave [050] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -191,7 +191,7 @@ Cave,10
10,GEODUDE,13,15 10,GEODUDE,13,15
#------------------------------- #-------------------------------
[051] # Dungeon [051] # Dungeon
Cave,10 Cave,5
20,CHINGLING,1 20,CHINGLING,1
20,CLEFFA,1 20,CLEFFA,1
20,IGGLYBUFF,1 20,IGGLYBUFF,1
@@ -200,7 +200,7 @@ Cave,10
10,TYROGUE,1 10,TYROGUE,1
#------------------------------- #-------------------------------
[066] # Safari Zone [066] # Safari Zone
Land,25 Land,21
20,ABRA,12,15 20,ABRA,12,15
20,DODUO,13,15 20,DODUO,13,15
20,NIDORANfE,15,16 20,NIDORANfE,15,16
@@ -209,7 +209,7 @@ Land,25
10,TANGELA,14,16 10,TANGELA,14,16
#------------------------------- #-------------------------------
[068] # Safari Zone [068] # Safari Zone
Land,25 Land,21
20,EXEGGCUTE,15,18 20,EXEGGCUTE,15,18
20,RHYHORN,16,18 20,RHYHORN,16,18
10,AIPOM,14,17 10,AIPOM,14,17
@@ -222,7 +222,7 @@ Land,25
4,SCYTHER,16 4,SCYTHER,16
1,CHANSEY,17 1,CHANSEY,17
1,KANGASKHAN,19 1,KANGASKHAN,19
Water,10 Water,2
60,PSYDUCK,16,18 60,PSYDUCK,16,18
30,MARILL,15,18 30,MARILL,15,18
5,BUIZEL,15,17 5,BUIZEL,15,17
@@ -242,7 +242,7 @@ SuperRod
1,DRATINI,17 1,DRATINI,17
#------------------------------- #-------------------------------
[069] # Route 8 [069] # Route 8
Land,25 Land,21
20,MAREEP,16,18 20,MAREEP,16,18
20,ODDISH,15,17 20,ODDISH,15,17
13,BONSLY,14,16 13,BONSLY,14,16
@@ -253,7 +253,7 @@ Land,25
5,BONSLY,14,17 5,BONSLY,14,17
1,BONSLY,15,16 1,BONSLY,15,16
1,BONSLY,15 1,BONSLY,15
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -270,7 +270,7 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[070] # Underwater [070] # Underwater
Land,25 Land,21
20,CHINCHOU,17,21 20,CHINCHOU,17,21
20,CLAMPERL,18,20 20,CLAMPERL,18,20
20,SHELLDER,18,20 20,SHELLDER,18,20
@@ -280,7 +280,7 @@ Land,25
10,SHELLDER,18,19 10,SHELLDER,18,19
#------------------------------- #-------------------------------
[075] # Tiall Region [075] # Tiall Region
Land,25 Land,21
20,GEODUDE_1,11,14 20,GEODUDE_1,11,14
20,RATTATA_1,11,14 20,RATTATA_1,11,14
10,CUBONE,11,14 10,CUBONE,11,14

56
PBS/encounters.txt
View File

@@ -1,7 +1,7 @@
# See the documentation on the wiki to learn how to edit this file. # See the documentation on the wiki to learn how to edit this file.
#------------------------------- #-------------------------------
[002] # Lappet Town [002] # Lappet Town
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -18,14 +18,14 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[005] # Route 1 [005] # Route 1
Land,25 Land,21
40,PIDGEY,11,14 40,PIDGEY,11,14
40,RATTATA,11,14 40,RATTATA,11,14
9,PIDGEY,11,13 9,PIDGEY,11,13
9,RATTATA,11,13 9,RATTATA,11,13
1,PIDGEY,14 1,PIDGEY,14
1,RATTATA,14 1,RATTATA,14
LandNight,25 LandNight,21
39,RATTATA,10,14 39,RATTATA,10,14
30,HOOTHOOT,10,13 30,HOOTHOOT,10,13
20,SPINARAK,8,12 20,SPINARAK,8,12
@@ -34,12 +34,12 @@ LandNight,25
1,RATTATA,15 1,RATTATA,15
#------------------------------- #-------------------------------
[021] # Route 2 [021] # Route 2
Land,25 Land,21
50,RATTATA,12,15 50,RATTATA,12,15
30,POOCHYENA,11,15 30,POOCHYENA,11,15
10,SHINX,10,12 10,SHINX,10,12
10,SHINX,10,11 10,SHINX,10,11
Water,10 Water,2
60,MAGIKARP,7,10 60,MAGIKARP,7,10
30,GOLDEEN,11,14 30,GOLDEEN,11,14
10,STARYU,12,15 10,STARYU,12,15
@@ -66,7 +66,7 @@ HeadbuttHigh
20,SPINARAK,9,12 20,SPINARAK,9,12
#------------------------------- #-------------------------------
[028] # Natural Park [028] # Natural Park
Land,25 Land,21
20,CATERPIE,10 20,CATERPIE,10
20,SUNKERN,12 20,SUNKERN,12
20,WEEDLE,10 20,WEEDLE,10
@@ -74,19 +74,19 @@ Land,25
15,PIDGEY,12,14 15,PIDGEY,12,14
5,KAKUNA,10 5,KAKUNA,10
5,METAPOD,10 5,METAPOD,10
LandNight,25 LandNight,21
30,HOOTHOOT,10,14 30,HOOTHOOT,10,14
30,SPINARAK,10,15 30,SPINARAK,10,15
20,PINECO,9,13 20,PINECO,9,13
10,DROWZEE,9,15 10,DROWZEE,9,15
10,NATU,12,14 10,NATU,12,14
LandMorning,25 LandMorning,21
25,CATERPIE,10,12 25,CATERPIE,10,12
25,WEEDLE,10,12 25,WEEDLE,10,12
20,PIDGEY,10,14 20,PIDGEY,10,14
15,KAKUNA,10 15,KAKUNA,10
15,METAPOD,10 15,METAPOD,10
BugContest,25 BugContest,21
20,CATERPIE,7,18 20,CATERPIE,7,18
20,WEEDLE,7,18 20,WEEDLE,7,18
10,KAKUNA,9,18 10,KAKUNA,9,18
@@ -99,13 +99,13 @@ BugContest,25
5,SCYTHER,13,14 5,SCYTHER,13,14
#------------------------------- #-------------------------------
[031] # Route 3 [031] # Route 3
Land,25 Land,21
30,NIDORANfE,12,15 30,NIDORANfE,12,15
30,NIDORANmA,12,15 30,NIDORANmA,12,15
20,PIKACHU,14,17 20,PIKACHU,14,17
10,EEVEE,15 10,EEVEE,15
10,PONYTA,13,15 10,PONYTA,13,15
Water,10 Water,2
60,SURSKIT,13,14 60,SURSKIT,13,14
35,LOTAD,14 35,LOTAD,14
5,LOTAD,15 5,LOTAD,15
@@ -120,7 +120,7 @@ SuperRod
40,CHINCHOU,11,12 40,CHINCHOU,11,12
40,REMORAID,12,14 40,REMORAID,12,14
20,LUVDISC,10,16 20,LUVDISC,10,16
RockSmash RockSmash,50
60,NOSEPASS,13,14 60,NOSEPASS,13,14
40,GEODUDE,12,15 40,GEODUDE,12,15
HeadbuttLow HeadbuttLow
@@ -137,7 +137,7 @@ HeadbuttHigh
20,BURMY,12,15 20,BURMY,12,15
#------------------------------- #-------------------------------
[034] # Ice Cave [034] # Ice Cave
Cave,10 Cave,5
40,SWINUB,16,18 40,SWINUB,16,18
20,SNEASEL,14,16 20,SNEASEL,14,16
20,SNORUNT,12,15 20,SNORUNT,12,15
@@ -145,35 +145,35 @@ Cave,10
10,SNOVER,14 10,SNOVER,14
#------------------------------- #-------------------------------
[039] # Route 4 [039] # Route 4
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[041] # Route 5 [041] # Route 5
Land,25 Land,21
50,GRIMER,13,15 50,GRIMER,13,15
40,SPEAROW,13,16 40,SPEAROW,13,16
10,SLUGMA,13,14 10,SLUGMA,13,14
#------------------------------- #-------------------------------
[044] # Route 6 [044] # Route 6
Land,25 Land,21
50,SHELLOS_1,12,15 50,SHELLOS_1,12,15
40,GRIMER,13,15 40,GRIMER,13,15
10,MURKROW,12,14 10,MURKROW,12,14
#------------------------------- #-------------------------------
[047] # Route 7 [047] # Route 7
Land,25 Land,21
50,SHELLOS,12,15 50,SHELLOS,12,15
30,BIDOOF,14,17 30,BIDOOF,14,17
10,MURKROW,12,14 10,MURKROW,12,14
10,WURMPLE,9,12 10,WURMPLE,9,12
RockSmash RockSmash,50
90,NOSEPASS,13,14 90,NOSEPASS,13,14
10,GEODUDE,12,15 10,GEODUDE,12,15
#------------------------------- #-------------------------------
[049] # Rock Cave [049] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -182,7 +182,7 @@ Cave,10
10,MAWILE,14,16 10,MAWILE,14,16
#------------------------------- #-------------------------------
[050] # Rock Cave [050] # Rock Cave
Cave,10 Cave,5
20,MAGNETON,14,16 20,MAGNETON,14,16
20,MAGNETON,14,17 20,MAGNETON,14,17
20,NOSEPASS,14,15 20,NOSEPASS,14,15
@@ -191,7 +191,7 @@ Cave,10
10,GEODUDE,13,15 10,GEODUDE,13,15
#------------------------------- #-------------------------------
[051] # Dungeon [051] # Dungeon
Cave,10 Cave,5
20,CHINGLING,1 20,CHINGLING,1
20,CLEFFA,1 20,CLEFFA,1
20,IGGLYBUFF,1 20,IGGLYBUFF,1
@@ -200,7 +200,7 @@ Cave,10
10,TYROGUE,1 10,TYROGUE,1
#------------------------------- #-------------------------------
[066] # Safari Zone [066] # Safari Zone
Land,25 Land,21
20,ABRA,12,15 20,ABRA,12,15
20,DODUO,13,15 20,DODUO,13,15
20,NIDORANfE,15,16 20,NIDORANfE,15,16
@@ -209,7 +209,7 @@ Land,25
10,TANGELA,14,16 10,TANGELA,14,16
#------------------------------- #-------------------------------
[068] # Safari Zone [068] # Safari Zone
Land,25 Land,21
20,EXEGGCUTE,15,18 20,EXEGGCUTE,15,18
20,RHYHORN,16,18 20,RHYHORN,16,18
10,AIPOM,14,17 10,AIPOM,14,17
@@ -222,7 +222,7 @@ Land,25
4,SCYTHER,16 4,SCYTHER,16
1,CHANSEY,17 1,CHANSEY,17
1,KANGASKHAN,19 1,KANGASKHAN,19
Water,10 Water,2
60,PSYDUCK,16,18 60,PSYDUCK,16,18
30,MARILL,15,18 30,MARILL,15,18
5,BUIZEL,15,17 5,BUIZEL,15,17
@@ -242,7 +242,7 @@ SuperRod
1,DRATINI,17 1,DRATINI,17
#------------------------------- #-------------------------------
[069] # Route 8 [069] # Route 8
Land,25 Land,21
20,MAREEP,16,18 20,MAREEP,16,18
20,ODDISH,15,17 20,ODDISH,15,17
13,BONSLY,14,16 13,BONSLY,14,16
@@ -253,7 +253,7 @@ Land,25
5,BONSLY,14,17 5,BONSLY,14,17
1,BONSLY,15,16 1,BONSLY,15,16
1,BONSLY,15 1,BONSLY,15
Water,10 Water,2
60,TENTACOOL,14,19 60,TENTACOOL,14,19
30,MANTYKE,15,16 30,MANTYKE,15,16
10,REMORAID,14,16 10,REMORAID,14,16
@@ -270,7 +270,7 @@ SuperRod
5,STARYU,15,17 5,STARYU,15,17
#------------------------------- #-------------------------------
[070] # Underwater [070] # Underwater
Land,25 Land,21
20,CHINCHOU,17,21 20,CHINCHOU,17,21
20,CLAMPERL,18,20 20,CLAMPERL,18,20
20,SHELLDER,18,20 20,SHELLDER,18,20
@@ -280,7 +280,7 @@ Land,25
10,SHELLDER,18,19 10,SHELLDER,18,19
#------------------------------- #-------------------------------
[075] # Tiall Region [075] # Tiall Region
Land,25 Land,21
20,GEODUDE_1,11,14 20,GEODUDE_1,11,14
20,RATTATA_1,11,14 20,RATTATA_1,11,14
10,CUBONE,11,14 10,CUBONE,11,14