diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 8e67182ba..826e1e8a6 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index 22a06f68e..eba36f0b2 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map247.rxdata b/Data/Map247.rxdata index f8a606ebd..16960548f 100644 Binary files a/Data/Map247.rxdata and b/Data/Map247.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 4fdf5ff89..181b94c6d 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb b/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb index 5dcc179cc..81b0abda2 100644 --- a/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb +++ b/Data/Scripts/050_AddOns/GuessPokemonQuiz.rb @@ -191,12 +191,16 @@ class FusionQuiz def current_streak_dialog() return if @current_streak ==0 + streak_base_worth= @difficulty == :REGULAR ? 25 : 100 if @current_streak % 4 == 0 + extra_points = (@current_streak/4)*streak_base_worth if @current_streak >= 8 pbMessage(_INTL("That's {1} correct answers in a row. You're on a roll!", @current_streak)) else pbMessage(_INTL("That's {1} correct answers in a row. You're doing great!", @current_streak)) end + pbMessage(_INTL("Here's {1} extra points for maintaining a streak!",extra_points)) + award_points(extra_points) end end @@ -229,7 +233,6 @@ class FusionQuiz def give_answer(prompt_message, answer_id, should_generate_new_choices) question_answered = false answer_pokemon_name = getPokemon(answer_id).real_name - while !question_answered if @difficulty == :ADVANCED player_answer = prompt_pick_answer_advanced(prompt_message, answer_id) diff --git a/Data/Scripts/050_AddOns/New Items effects.rb b/Data/Scripts/050_AddOns/New Items effects.rb index 0927d97cf..0b64e726e 100644 --- a/Data/Scripts/050_AddOns/New Items effects.rb +++ b/Data/Scripts/050_AddOns/New Items effects.rb @@ -1870,7 +1870,8 @@ ItemHandlers::UseInField.add(:BOXLINK, proc { |item| blacklisted_maps = [ 315,316,317,318,328,343,#Elite Four 776,777,778,779,780,781,782,783,784, #Mt. Silver - 722,723,724,720 #Dream sequence + 722,723,724,720, #Dream sequence + 304,306,307 #Victory road ] if blacklisted_maps.include?($game_map.map_id) Kernel.pbMessage("There doesn't seem to be any network coverage here...") diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index 809d9c591..da372a398 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 3aeb3d610..328f9c904 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ