diff --git a/Data/.DS_Store b/Data/.DS_Store index d883dced5..959cc3a4c 100644 Binary files a/Data/.DS_Store and b/Data/.DS_Store differ diff --git a/Data/.idea/.gitignore b/Data/.idea/.gitignore deleted file mode 100644 index 906bf8738..000000000 --- a/Data/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Datasource local storage ignored files -/../../../../../../../../../../../:\Users\charl\Documents\Jeux\rpgmaker\infinitefusion\dev\infinitefusion-e18\Data\.idea/dataSources/ -/dataSources.local.xml -# Editor-based HTTP Client requests -/httpRequests/ diff --git a/Data/.idea/Data.iml b/Data/.idea/Data.iml deleted file mode 100644 index c3cd732c0..000000000 --- a/Data/.idea/Data.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Data/.idea/modules.xml b/Data/.idea/modules.xml deleted file mode 100644 index b708111c7..000000000 --- a/Data/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Data/.idea/vcs.xml b/Data/.idea/vcs.xml deleted file mode 100644 index 6c0b86358..000000000 --- a/Data/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 73af1ea9e..014934234 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map129.rxdata b/Data/Map129.rxdata index f8d5d8df5..c1a79f90d 100644 Binary files a/Data/Map129.rxdata and b/Data/Map129.rxdata differ diff --git a/Data/Map418.rxdata b/Data/Map418.rxdata index ee73b056a..3c7957afd 100644 Binary files a/Data/Map418.rxdata and b/Data/Map418.rxdata differ diff --git a/Data/Map703.rxdata b/Data/Map703.rxdata index 02fc83a83..a21282433 100644 Binary files a/Data/Map703.rxdata and b/Data/Map703.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 1de416d09..3d17bed18 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index c280f37ff..341f608f1 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -5,8 +5,8 @@ #==============================================================================# module Settings # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format. - GAME_VERSION = '6.6.0' - GAME_VERSION_NUMBER = "6.6.0" + GAME_VERSION = '6.6.1' + GAME_VERSION_NUMBER = "6.6.1" LATEST_GAME_RELEASE = "6.6" POKERADAR_LIGHT_ANIMATION_RED_ID = 17 diff --git a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb index 16fc8e224..2eaf89d99 100644 --- a/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb +++ b/Data/Scripts/006_Map renderer/001_TilemapRenderer.rb @@ -54,6 +54,17 @@ class TilemapRenderer 1023 => "flowers_red[10]", 1031 => "flowers_grey[10]", 1039 => "flowers_white[10]", + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, 2 => { #small-town 996 => "flowers_orange[10]", @@ -67,6 +78,32 @@ class TilemapRenderer }, + 6 => { #Dewford Town + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, + + 7 => { #Sea Route + + #water cliffs + 1363 => "water_rock10", 1364 => "water_rock11", + 1389 => "water_rock01", 1391 => "water_rock09", + 1381 => "water_rock_shore08", 1382 => "water_rock_shore09", + + 1377 => "water_rock08", 1379 => "water_rock07", + 1384 => "water_rock_shore01", 1385 => "water_rock02", 1387 => "water_rock06", 1397 => "water_rock_shore07", + 1392 => "water_rock_shore02", 1393 =>"water_rock03", 1394 => "water_rock04", 1395 => "water_rock05", 1396 => "water_rock_shore06", + 1401 =>"water_rock_shore03", 1402 =>"water_rock_shore04", 1403 =>"water_rock_shore05", + }, + 23 => { #outdoor 1232 => "flowers_orange[10]", diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb index 7ae4a0e39..b69f4b342 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/005_UI_Trading.rb @@ -251,4 +251,5 @@ def pbStartTrade(pokemonIndex,newpoke,nickname,trainerName,trainerGender=0,saveg $Trainer.party[pokemonIndex] = yourPokemon setDialogIconOff(@event_id) if @event_id + return yourPokemon end diff --git a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb index 043b60394..0982088ba 100644 --- a/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb +++ b/Data/Scripts/016_UI/001_Non-interactive UI/006_UI_HallOfFame.rb @@ -180,8 +180,8 @@ class HallOfFame_Scene if !@singlerow ret = 92 + 128 * ypositionformula(battlernumber) / 2 else - y_position_base = 200 - height_increase = 30 + y_position_base = 125 + height_increase = 20 # Calculate the decrement based on the battlernumber: # Each pair (1-2, 3-4, etc.) will decrease y by height_increase y_decrement = 40 - height_increase * (battlernumber / 2) diff --git a/Data/Scripts/016_UI/005_UI_Party.rb b/Data/Scripts/016_UI/005_UI_Party.rb index 6652c2f16..b2f9ebe26 100644 --- a/Data/Scripts/016_UI/005_UI_Party.rb +++ b/Data/Scripts/016_UI/005_UI_Party.rb @@ -1231,7 +1231,8 @@ class PokemonPartyScreen splicerItem = selectSplicer() return unless splicerItem if pbDNASplicing(pokemon,@scene,splicerItem) - $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICER2 + echoln splicerItem + $PokemonBag.pbDeleteItem(splicerItem, 1) unless splicerItem == :INFINITESPLICERS || splicerItem == :INFINITESPLICERS2 end end diff --git a/Data/Scripts/052_InfiniteFusion/Wondertrade.rb b/Data/Scripts/052_InfiniteFusion/Wondertrade.rb index b79f42444..66c2f8c97 100644 --- a/Data/Scripts/052_InfiniteFusion/Wondertrade.rb +++ b/Data/Scripts/052_InfiniteFusion/Wondertrade.rb @@ -128,6 +128,10 @@ def pbWonderTrade(lvl, except = [], except2 = [], premiumWonderTrade = true) tname = getSpriterCreditForDexNumber(species) tname = randTrainerNames[rand(randTrainerNames.size)] if ! tname newpoke = pbStartTrade(pbGet(1), species, pname, tname, 0, true) # Starts the trade + + echoln newpoke + echholn newpoke.species + #lower level by 1 to prevent abuse if poke.level > 25 newpoke.level = poke.level - 1 diff --git a/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb b/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb index 20caee932..d2b6e414e 100644 --- a/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb +++ b/Data/Scripts/053_PIF_Hoenn/DynamicWeather/DynamicWeather_TownMap.rb @@ -76,6 +76,7 @@ end def get_current_map_weather_icon return if !$game_weather current_weather= $game_weather.current_weather[$game_map.map_id] + return if !current_weather weather_type = current_weather[0] weather_intensity = current_weather[1] icon = get_full_weather_icon_name(weather_type,weather_intensity) diff --git a/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb b/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb index aead4c985..bdf463f31 100644 --- a/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb +++ b/Data/Scripts/053_PIF_Hoenn/SurfingSplashes.rb @@ -125,10 +125,15 @@ Events.onStepTaken += proc { |sender, e| $game_temp.surf_patches.delete_at(index) echoln "surf patch encounter!" wild_pokemon = $PokemonEncounters.choose_wild_pokemon(:Water) - species = wild_pokemon[0] - level = wild_pokemon[1] - pbWildBattle(species, level) - break + if wild_pokemon + species = wild_pokemon[0] + level = wild_pokemon[1] + pbWildBattle(species, level) + break + else + pbItemBall(:OLDBOOT) + end + end end end diff --git a/Data/System.rxdata b/Data/System.rxdata index a0fb19d8d..c9c26a3e6 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 847d675f3..d16d8dd06 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ