Skip to content

Commit

Permalink
release 0.18.3
Browse files Browse the repository at this point in the history
  • Loading branch information
kurayamiblackheart committed Aug 14, 2024
1 parent a2ede8c commit da0f086
Show file tree
Hide file tree
Showing 18 changed files with 4,463 additions and 196 deletions.
4,540 changes: 4,350 additions & 190 deletions Data/CUSTOM_SPRITES

Large diffs are not rendered by default.

Binary file modified Data/Map036.rxdata
Binary file not shown.
Binary file modified Data/Map077.rxdata
Binary file not shown.
Binary file modified Data/MapInfos.rxdata
Binary file not shown.
2 changes: 1 addition & 1 deletion Data/Scripts/001_Settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Settings
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
GAME_VERSION = '6.2.3'
IF_VERSION = "6.2.3"
GAME_VERSION_NUMBER = "0.18.2"
GAME_VERSION_NUMBER = "0.18.3"

POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
Expand Down
13 changes: 13 additions & 0 deletions Data/Scripts/011_Battle/003_Battle/003_Battle_StartAndEnd.rb
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,30 @@ def pbSetUpSides
#=============================================================================
# Send out all battlers at the start of battle
#=============================================================================
def battleStartShinyCheck(foemon)
if foemon.shiny? && $PokemonSystem.autobattlershiny && $PokemonSystem.autobattlershiny == 1 && $PokemonSystem.autobattler && $PokemonSystem.autobattler == 1
$AutoBattler = false
$PokemonSystem.autobattler = 0
end
end

def pbStartBattleSendOut(sendOuts)
# "Want to battle" messages
if wildBattle?
foeParty = pbParty(1)
case foeParty.length
when 1
battleStartShinyCheck(foeParty[0])
pbDisplayPaused(_INTL("Oh! A wild {1} appeared!",foeParty[0].name))
when 2
battleStartShinyCheck(foeParty[0])
battleStartShinyCheck(foeParty[1])
pbDisplayPaused(_INTL("Oh! A wild {1} and {2} appeared!",foeParty[0].name,
foeParty[1].name))
when 3
battleStartShinyCheck(foeParty[0])
battleStartShinyCheck(foeParty[1])
battleStartShinyCheck(foeParty[2])
pbDisplayPaused(_INTL("Oh! A wild {1}, {2} and {3} appeared!",foeParty[0].name,
foeParty[1].name,foeParty[2].name))
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@ def pbGainExp
def pbGainEVsOne(idxParty, defeatedBattler)
pkmn = pbParty(0)[idxParty] # The Pokémon gaining EVs from defeatedBattler
evYield = defeatedBattler.pokemon.evYield
if $PokemonSystem.evstrain && $PokemonSystem.evstrain > 0
# Remove all yield EVs from opponents, except Power items.
evYield = {}
GameData::Stat.each_main { |s| evYield[s.id] = 0 }
end
# Num of effort points pkmn already has
evTotal = 0
GameData::Stat.each_main { |s| evTotal += pkmn.ev[s.id] }
Expand Down
5 changes: 4 additions & 1 deletion Data/Scripts/016_UI/001_UI_PauseMenu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -372,12 +372,15 @@ def pbStartPokemonMenu
# 235 = Rage Candy Bar
# 263 = Rare Candy
# 264 = Master Ball
# 3 = Max Repel
$game_temp.mart_prices[235] = [10000, 0] if $PokemonSystem.kuraystreamerdream == 0
$game_temp.mart_prices[263] = [10000, 0] if $PokemonSystem.kuraystreamerdream == 0
$game_temp.mart_prices[264] = [960000, 0] if $PokemonSystem.kuraystreamerdream == 0
$game_temp.mart_prices[3] = [700, 350] if $PokemonSystem.kuraystreamerdream == 0
$game_temp.mart_prices[235] = [-1, 0] if $PokemonSystem.kuraystreamerdream != 0
$game_temp.mart_prices[263] = [-1, 0] if $PokemonSystem.kuraystreamerdream != 0
$game_temp.mart_prices[264] = [-1, 0] if $PokemonSystem.kuraystreamerdream != 0
$game_temp.mart_prices[3] = [-1, 0] if $PokemonSystem.kuraystreamerdream != 0
# 68 = Eviolite
$game_temp.mart_prices[68] = [4000, 2000]
# 623 = Rocket Ball
Expand All @@ -394,7 +397,7 @@ def pbStartPokemonMenu
657, 659,
114, 115, 116, 100,
194,
235, 263, 264,
235, 263, 264, 3,
68
]
# allitems.push(568) if $game_switches[SWITCH_GOT_BADGE_8]
Expand Down
2 changes: 1 addition & 1 deletion Data/Scripts/016_UI/012_UI_TrainerCard.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def pbStartScene
@sprites["overlay"] = BitmapSprite.new(Graphics.width,Graphics.height,@viewport)
pbSetSystemFont(@sprites["overlay"].bitmap)
@sprites["trainer"] = IconSprite.new(336,112,@viewport)
@sprites["trainer"].setBitmap(GameData::TrainerType.player_front_sprite_filename($Trainer.trainer_type))
@sprites["trainer"].setBitmapDirectly(generate_front_trainer_sprite_bitmap())
@sprites["trainer"].x -= (@sprites["trainer"].bitmap.width-128)/2
@sprites["trainer"].y -= (@sprites["trainer"].bitmap.height-128)
@sprites["trainer"].z = 2
Expand Down
42 changes: 41 additions & 1 deletion Data/Scripts/016_UI/015_UI_Options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class PokemonSystem
attr_accessor :shenanigans
attr_accessor :kuraystreamerdream
attr_accessor :autobattler
attr_accessor :autobattleshortcut
attr_accessor :autobattlershiny
attr_accessor :shinyodds # overwrite the shiny odds
attr_accessor :unfusetraded # allow to unfuse traded pokemons

Expand Down Expand Up @@ -145,6 +147,7 @@ class PokemonSystem
attr_accessor :noevsmode
attr_accessor :maxivsmode
attr_accessor :showlevel_nolevelmode
attr_accessor :evstrain

attr_accessor :rocketballsteal

Expand Down Expand Up @@ -205,6 +208,8 @@ def initialize
@shenanigans = 0
@kuraystreamerdream = 0
@autobattler = 0
@autobattleshortcut = 0
@autobattlershiny = 0
@sb_maxing = 1
@unfusetraded = 0
@sb_soullinked = 0
Expand Down Expand Up @@ -269,6 +274,7 @@ def initialize

@noevsmode = 0
@maxivsmode = 0
@evstrain = 0
@showlevel_nolevelmode = 0
@rocketballsteal = 0
@trainerexpboost = 50
Expand Down Expand Up @@ -383,6 +389,8 @@ def load_file_data(saved)
@shiny_trainer_pkmn = saved.shiny_trainer_pkmn if saved.shiny_trainer_pkmn
@shenanigans = saved.shenanigans if saved.shenanigans
@autobattler = saved.autobattler if saved.autobattler
@autobattleshortcut = saved.autobattleshortcut if saved.autobattleshortcut
@autobattlershiny = saved.autobattlershiny if saved.autobattlershiny
@shinyodds = saved.shinyodds if saved.shinyodds
@sb_maxing = saved.sb_maxing if saved.sb_maxing
@sb_soullinked = saved.sb_soullinked if saved.sb_soullinked
Expand Down Expand Up @@ -426,6 +434,7 @@ def load_file_data(saved)
@skipcaughtprompt = saved.skipcaughtprompt if saved.skipcaughtprompt
@noevsmode = saved.noevsmode if saved.noevsmode
@maxivsmode = saved.maxivsmode if saved.maxivsmode
@evstrain = saved.evstrain if saved.evstrain
@showlevel_nolevelmode = saved.showlevel_nolevelmode if saved.showlevel_nolevelmode
@rocketballsteal = saved.rocketballsteal if saved.rocketballsteal
@trainerexpboost = saved.trainerexpboost if saved.trainerexpboost
Expand All @@ -434,7 +443,7 @@ def load_file_data(saved)

def options_as_json(options={})
{
"json_version" => "0.5",
"json_version" => "0.6",
"textspeed" => $PokemonSystem.textspeed,
"battlescene" => $PokemonSystem.battlescene,
"frame" => $PokemonSystem.frame,
Expand Down Expand Up @@ -479,6 +488,8 @@ def options_as_json(options={})
"shenanigans" => $PokemonSystem.shenanigans,
"kuraystreamerdream" => $PokemonSystem.kuraystreamerdream,
"autobattler" => $PokemonSystem.autobattler,
"autobattleshortcut" => $PokemonSystem.autobattleshortcut,
"autobattlershiny" => $PokemonSystem.autobattlershiny,
"shinyodds" => $PokemonSystem.shinyodds,
"unfusetraded" => $PokemonSystem.unfusetraded,
"sb_maxing" => $PokemonSystem.sb_maxing,
Expand Down Expand Up @@ -541,6 +552,7 @@ def options_as_json(options={})
"autosave_steps_switch" => $game_switches[AUTOSAVE_STEPS_SWITCH],
"noevsmode" => $PokemonSystem.noevsmode,
"maxivsmode" => $PokemonSystem.maxivsmode,
"evstrain" => $PokemonSystem.evstrain,
"showlevel_nolevelmode" => $PokemonSystem.showlevel_nolevelmode,
"rocketballsteal" => $PokemonSystem.rocketballsteal,
"trainerexpboost" => $PokemonSystem.trainerexpboost
Expand Down Expand Up @@ -706,9 +718,12 @@ def options_load_json(jsonparse)

$PokemonSystem.noevsmode = 0
$PokemonSystem.maxivsmode = 0
$PokemonSystem.evstrain = 0
$PokemonSystem.showlevel_nolevelmode = 0
$PokemonSystem.rocketballsteal = 0
$PokemonSystem.trainerexpboost = 50
$PokemonSystem.autobattleshortcut = 0
$PokemonSystem.autobattlershiny = 0
if json_ver >= 2
$PokemonSystem.noevsmode = jsonparse['noevsmode']
$PokemonSystem.maxivsmode = jsonparse['maxivsmode']
Expand All @@ -723,6 +738,11 @@ def options_load_json(jsonparse)
if json_ver >= 5
$PokemonSystem.importegg = jsonparse['importegg']
end
if json_ver >= 6
$PokemonSystem.evstrain = jsonparse['evstrain']
$PokemonSystem.autobattleshortcut = jsonparse['autobattleshortcut']
$PokemonSystem.autobattlershiny = jsonparse['autobattlershiny']
end

end

Expand All @@ -749,6 +769,8 @@ def options_convertjsonver(jsonparse)
return 6
when '0.7'
return 7
when '0.8'
return 8
end
else
return 0
Expand Down Expand Up @@ -2150,6 +2172,18 @@ def pbGetInGameOptions()
["You fight your own battles",
"Allows Trapstarr to take control of your pokemon"]
)
options << EnumOption.new(_INTL("Auto-Battle Shortcut"), [_INTL("On"), _INTL("Off")],
proc { $PokemonSystem.autobattleshortcut },
proc { |value| $PokemonSystem.autobattleshortcut = value },
["Allows to toggle Auto-Battle in battles with the X key.",
"Disable the Auto-Battle toggle shortcut."]
)
options << EnumOption.new(_INTL("Auto-Battle Shiny Stop"), [_INTL("Off"), _INTL("On")],
proc { $PokemonSystem.autobattlershiny },
proc { |value| $PokemonSystem.autobattlershiny = value },
["Do NOT stop Auto-Battle if a shiny enemy is detected.",
"Automatically stops Auto-Battle if a shiny enemy is detected."]
)

options << EnumOption.new(_INTL("Damage Variance"), [_INTL("Off"), _INTL("On")],
proc { $PokemonSystem.damage_variance },
Expand Down Expand Up @@ -2234,6 +2268,12 @@ def pbGetInGameOptions()
["Disabled.",
"Pokemon IVs are always at max."]
)
options << EnumOption.new(_INTL("EVs Train Mode"), [_INTL("Off"), _INTL("On")],
proc { $PokemonSystem.evstrain },
proc { |value| $PokemonSystem.evstrain = value },
["EVs yielding works as expected.",
"Enemies do not yield EVs (except yielding from held Power-items)."]
)
options << EnumOption.new(_INTL("Rocket Mode"), [_INTL("Off"), _INTL("On"), _INTL("All Balls")],
proc { $PokemonSystem.rocketballsteal },
proc { |value| $PokemonSystem.rocketballsteal = value },
Expand Down
43 changes: 43 additions & 0 deletions Data/Scripts/051_AddOns/ShinyColorOffsets.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,46 @@
# class ShinySelector
# def set_colors(pokemon_id)
#
#
#
# picturePath = get_unfused_sprite_path(getPokemon(pokemon_id).id_number)
# @pokemonBitmap = AnimatedBitmap.new(picturePath)
# @previewwindow = PictureWindow.new(@pokemonBitmap)
# @previewwindow.z = 100
#
#
#
# pbFadeOutIn {
# scene = ShinySliderOptionsScene.new
# screen = PokemonOptionScreen.new(scene)
# screen.pbStartScreen
# }
#
# end
# end
#
# class ShinySliderOptionsScene < PokemonOption_Scene
# def pbGetOptions(inloadscreen = false)
# options = []
# options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
# proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
# proc { |value|
# $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
# })
# end
#
# def initOptionsWindow
# options = []
# options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
# proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
# proc { |value|
# $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
# })
# return Window_PokemonOption.new(options, 0, 300, Graphics.width, Graphics.height)
# end
# end


SHINY_COLOR_OFFSETS = {
1 => -30,
2 => -85,
Expand Down
2 changes: 1 addition & 1 deletion Data/Scripts/051_AddOns/Spped Up.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class << Graphics
def self.update
if $PokemonSystem
if Input.trigger?(Input::JUMPUP) && $PokemonSystem.is_in_battle
if $PokemonSystem.autobattler
if $PokemonSystem.autobattler && $PokemonSystem.autobattleshortcut && $PokemonSystem.autobattleshortcut == 0
if $PokemonSystem.autobattler == 0
$PokemonSystem.autobattler = 1
$AutoBattler = true
Expand Down
Binary file modified Data/System.rxdata
Binary file not shown.
2 changes: 1 addition & 1 deletion Data/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.18.2
0.18.3
Binary file modified Data/messages.dat
Binary file not shown.
Binary file added Graphics/Characters/rocket_petrel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Graphics/Tilesets/Boat.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,6 @@ __Google Docs of the game (OBSOLETE, but some informations are still useful):__
- Added an option to display the level of the Pokemons in battle when using No Level Mode aka Base Stats Mode (warning: the levels of the Pokemons do not impact their stats in this mode!), that option may be helpful for moves such as Seismic Toss, etc. **| by REIZOD**
- Added a Rocket Mode, which is disabled by default. If enabled, you can catch the Pokemons of other trainers. You can configure it to work only on Rocket Ball or for every balls. If activated, Rocket Balls will appear in the Kuray Shop right at the start of the game. **| by REIZOD**
- Added a Trainer Exp. Boost modifier. By default in PIF/KIF, the exp. boost from defeating a trainer's Pokemon is +50%. You can change that boost now. **| by REIZOD**
- Added EVs Train Mode *(When you turn this new option ON, the enemies Pokemons will never yield their Pokemon's species EVs. However, the held Power-items will continue to give 4 of their respective EVs to your Pokemons. It's a QoL that allows you to utilize Power Anklet (Speed), Power Band (Special Defense), Power Belt (Defense), Power Bracer (Attack), Power Lens (Special Attack) and Power Weight (HP) to EVs train without having the EVs yields of the enemies Pokemons interfering with your EVs training.)* **| by REIZOD**
- Added Auto-Battle Shortcut *(Enabled by default. If disabled, the shortcut keybind to toggle Auto-Battle ON/OFF during battles will be disabled)* **| by REIZOD**
- Added Auto-Battle Shiny Stop *(Disabled by default. If enabled, the Auto-Battle will automatically turn itself OFF if a wild Shiny pokemon is encountered)* **| by REIZOD**

0 comments on commit da0f086

Please sign in to comment.