mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-07-22 07:37:00 +00:00
Update 6.8
This commit is contained in:
chardub
@@ -10,8 +10,7 @@ class TrainerAppearance
|
||||
attr_accessor :hat_color
|
||||
attr_accessor :hat2_color
|
||||
|
||||
|
||||
def initialize(skin_color, hat, clothes, hair, hair_color = 0, clothes_color = 0, hat_color = 0, hat2=nil, hat2_color=0)
|
||||
def initialize(skin_color, hat, clothes, hair, hair_color = 0, clothes_color = 0, hat_color = 0, hat2 = nil, hat2_color = 0)
|
||||
@skin_color = skin_color
|
||||
@hat = hat
|
||||
@hat2 = hat2
|
||||
@@ -29,40 +28,49 @@ def getTypeExpertAppearance(trainer_type)
|
||||
end
|
||||
|
||||
TYPE_EXPERTS_APPEARANCES = {
|
||||
:TYPE_EXPERT_NORMAL => TrainerAppearance.new(5, "snorlaxhat", "normal", "1_painter", 0, 0, 0), #OK
|
||||
:TYPE_EXPERT_FIGHTING => TrainerAppearance.new(1, "karateHeadband", "fighting", "4_samurai", 0, 0, 0), #OK
|
||||
:TYPE_EXPERT_FLYING =>TrainerAppearance.new(6,"swablu","flying","1_lass",1260,0,0),
|
||||
:TYPE_EXPERT_POISON => TrainerAppearance.new(5, "parashroom", "deadlypoisondanger", "3_lowbraids", 270, 0, 0), #OK
|
||||
:TYPE_EXPERT_GROUND => TrainerAppearance.new(5, "sandshrewbeanie", "groundcowboy", "3_shortspike", 0, 0, 0), #OK
|
||||
:TYPE_EXPERT_NORMAL => TrainerAppearance.new(5, "snorlaxhat", "normal", "1_painter", 0, 0, 0), # OK
|
||||
:TYPE_EXPERT_FIGHTING => TrainerAppearance.new(1, "karateHeadband", "fighting", "4_samurai", 0, 0, 0), # OK
|
||||
:TYPE_EXPERT_FLYING => TrainerAppearance.new(6, "swablu", "flying", "1_lass", 1260, 0, 0),
|
||||
:TYPE_EXPERT_POISON => TrainerAppearance.new(5, "parashroom", "deadlypoisondanger", "3_lowbraids", 270, 0, 0), # OK
|
||||
:TYPE_EXPERT_GROUND => TrainerAppearance.new(5, "sandshrewbeanie", "groundcowboy", "3_shortspike", 0, 0, 0), # OK
|
||||
# TYPE_EXPERT_ROCK =>#TODO NEEDS OUTFIT, LOCATION, TEAM
|
||||
:TYPE_EXPERT_BUG => TrainerAppearance.new("0", "bugantenna", "bughakama", "3_hime", 60, 0,), #OK
|
||||
:TYPE_EXPERT_GHOST => TrainerAppearance.new(6,"pumpkaboohelmet","ghostoutfit","4_punktails",0,0,960),# todo Needs location, TEAM
|
||||
:TYPE_EXPERT_STEEL => TrainerAppearance.new(2, "veteranM", "steelworkerF", "4_highpony", 0, 0, 0), #OK
|
||||
:TYPE_EXPERT_FIRE => TrainerAppearance.new(4, "firefigther", "fire", "2_bob", 330, 0, 0), #OK
|
||||
:TYPE_EXPERT_BUG => TrainerAppearance.new("0", "bugantenna", "bughakama", "3_hime", 60, 0,), # OK
|
||||
:TYPE_EXPERT_GHOST => TrainerAppearance.new(6, "pumpkaboohelmet", "ghostoutfit", "4_punktails", 0, 0, 960),
|
||||
:TYPE_EXPERT_STEEL => TrainerAppearance.new(2, "veteranM", "steelworkerF", "4_highpony", 0, 0, 0), # OK
|
||||
:TYPE_EXPERT_FIRE => TrainerAppearance.new(4, "firefigther", "fire", "2_bob", 330, 0, 0), # OK
|
||||
:TYPE_EXPERT_WATER => TrainerAppearance.new(5, "waterdress", "waterdress", "1_pixie", 180, 0, 0),
|
||||
:TYPE_EXPERT_GRASS => TrainerAppearance.new(4,"grassexpert","grassexpert","1_roseradeM",-300,0,0), #TODO NEEDS LOCATION, TEAM
|
||||
:TYPE_EXPERT_ELECTRIC => TrainerAppearance.new(3, "designerheadphones", "urbanelectric", "1_dancer", 10, 0, 0), #OK
|
||||
# TYPE_EXPERT_PSYCHIC =># TODO NEEDS OUTFIT, LOCATION, TEAM
|
||||
:TYPE_EXPERT_ICE => TrainerAppearance.new(6,"skierF","iceoutfit","1_wavy",0,0,210),
|
||||
:TYPE_EXPERT_DRAGON => TrainerAppearance.new(5, "aerodactylSkull", "dragonconqueror", "2_SpecialLatias", 670, 0, 510), #OK
|
||||
:TYPE_EXPERT_DARK => TrainerAppearance.new(4,"cynthiaaccessory","darkoutfit","3_emo",330,0,0),
|
||||
:TYPE_EXPERT_FAIRY => TrainerAppearance.new(6, "mikufairy", "mikufairyf", "5_mikufairy", 0, 0, 0) #OK
|
||||
:TYPE_EXPERT_GRASS => TrainerAppearance.new(3, "grassexpert", "grassexpert", "3_roseradeF", 70, 0, 0, "sprout"),
|
||||
:TYPE_EXPERT_ELECTRIC => TrainerAppearance.new(3, "designerheadphones", "urbanelectric", "1_dancer", 10, 0, 0), # OK
|
||||
:TYPE_EXPERT_PSYCHIC => TrainerAppearance.new(4, "nil", "psyshamanm", "3_nhair", 250, 0, 0), # TODO NEEDS OUTFIT, LOCATION, TEAM
|
||||
:TYPE_EXPERT_ICE => TrainerAppearance.new(6, "skierF", "iceoutfit", "1_wavy", 0, 0, 210),
|
||||
:TYPE_EXPERT_DRAGON => TrainerAppearance.new(5, "aerodactylSkull", "dragonconqueror", "2_SpecialLatias", 670, 0, 510), # OK
|
||||
:TYPE_EXPERT_DARK => TrainerAppearance.new(4, "cynthiaaccessory", "darkoutfit", "3_emo", 330, 0, 0),
|
||||
:TYPE_EXPERT_FAIRY => TrainerAppearance.new(6, "mikufairy", "mikufairyf", "5_mikufairy", 0, 0, 0), # OK
|
||||
|
||||
# Hoenn designers
|
||||
:ADVENTURER_KANTO => TrainerAppearance.new(3,"ash","leaf","4_boxbraids",0,0,0),
|
||||
:ADVENTURER_JOHTO => TrainerAppearance.new(5,"gold","kris","3_lass",50,0,0),
|
||||
:ADVENTURER_SINNOH => TrainerAppearance.new(6,"lucasDPP","longshirtskirt","1_hime",0,0,0) ,
|
||||
:ADVENTURER_UNOVA => TrainerAppearance.new(5, "hilbert", "red", "1_nhair", 0, 0, 0),
|
||||
:ADVENTURER_KALOS => TrainerAppearance.new(5, "serena", "Ramos", "2_naveen", 0, 0, 0),
|
||||
:ADVENTURER_ALOLA => TrainerAppearance.new(4,"seleneUSUM","chimingdress","4_cheryl",0,0,0),
|
||||
|
||||
}
|
||||
|
||||
TYPE_EXPERT_TRAINERS = {
|
||||
:QMARK => ["name", "loseText"],
|
||||
:ELECTRIC => ["Ray", _INTL("What a shocking turn of events!")],
|
||||
:BUG => ["Bea", _INTL("I’m bugging out of here!")],
|
||||
:BUG => ["Bea", _INTL("I'm bugging out of here!")],
|
||||
:FAIRY => ["Luna", _INTL("You outshined me!")],
|
||||
:DRAGON => ["Draco", _INTL("I shall scale back my plans.")],
|
||||
:FIGHTING => ["Floyd", _INTL("I have to throw in the towel.")],
|
||||
:GROUND => ["Pedro", _INTL("I’m buried under this loss.")],
|
||||
:GROUND => ["Pedro", _INTL("I'm buried under this loss.")],
|
||||
:FIRE => ["Blaze", _INTL("I guess I got burned out.")],
|
||||
:GRASS => ["Ivy", _INTL("ou really cut me down to size!")],
|
||||
:ICE => ["Crystal", _INTL("I’m skating on thin ice!")],
|
||||
:ROCK => ["Slate", _INTL("Looks like I’ve hit rock bottom...")],
|
||||
:GRASS => ["Basil", _INTL("I ran out of sunlight!")],
|
||||
:ICE => ["Crystal", _INTL("I'm skating on thin ice!")],
|
||||
:ROCK => ["Slate", _INTL("Looks like I've hit rock bottom...")],
|
||||
:WATER => ["Marina", _INTL("You really made a splash!")],
|
||||
:FLYING => ["Gale", _INTL("I guess I’m grounded for now.")],
|
||||
:FLYING => ["Gale", _INTL("I guess I'm grounded for now.")],
|
||||
:DARK => ["Gerard", _INTL("I guess I'll slip back into the shadows...")],
|
||||
:STEEL => ["Silvia", _INTL("I was a bit rusty...")],
|
||||
:PSYCHIC => ["Carl", _INTL("I could not foresee this defeat.")],
|
||||
@@ -74,8 +82,8 @@ TYPE_EXPERT_TRAINERS = {
|
||||
TYPE_EXPERT_REWARDS = {
|
||||
:QMARK => [],
|
||||
:ELECTRIC => [CLOTHES_ELECTRIC],
|
||||
:BUG => [CLOTHES_BUG_1,CLOTHES_BUG_2],
|
||||
:FAIRY => [CLOTHES_FAIRY_F,CLOTHES_FAIRY_M],
|
||||
:BUG => [CLOTHES_BUG_1, CLOTHES_BUG_2],
|
||||
:FAIRY => [CLOTHES_FAIRY_F, CLOTHES_FAIRY_M],
|
||||
:DRAGON => [CLOTHES_DRAGON],
|
||||
:FIGHTING => [CLOTHES_FIGHTING],
|
||||
:GROUND => [CLOTHES_GROUND],
|
||||
@@ -83,17 +91,18 @@ TYPE_EXPERT_REWARDS = {
|
||||
:GRASS => [CLOTHES_GRASS],
|
||||
:ICE => [CLOTHES_ICE],
|
||||
:ROCK => [CLOTHES_ROCK],
|
||||
:WATER => [CLOTHES_WATER],
|
||||
:WATER => [CLOTHES_WATER, CLOTHES_WATER_NEUTRAL],
|
||||
:FLYING => [CLOTHES_FLYING],
|
||||
:DARK => [CLOTHES_DARK],
|
||||
:STEEL => [CLOTHES_STEEL_F,CLOTHES_STEEL_M],
|
||||
:PSYCHIC => [CLOTHES_PSYCHIC],
|
||||
:STEEL => [CLOTHES_STEEL_F, CLOTHES_STEEL_M],
|
||||
:PSYCHIC => [CLOTHES_PSYCHIC_M, CLOTHES_PSYCHIC_F],
|
||||
:GHOST => [CLOTHES_GHOST],
|
||||
:POISON => [CLOTHES_POISON],
|
||||
:NORMAL => [CLOTHES_NORMAL],
|
||||
}
|
||||
|
||||
TOTAL_NB_TYPE_EXPERTS = 14
|
||||
|
||||
def type_expert_battle(type_id)
|
||||
type = GameData::Type.get(type_id)
|
||||
pbCallBub(2, @event_id)
|
||||
@@ -111,16 +120,16 @@ def type_expert_battle(type_id)
|
||||
echoln gym_randomizer_index
|
||||
pbSet(VAR_CURRENT_GYM_TYPE, gym_randomizer_index)
|
||||
if PokemonSelection.choose(1, 4, true, true, proc { |poke| poke.hasType?(type_id) })
|
||||
#Level is equal to the highest level in player's party
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH]=true
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE]=true
|
||||
# Level is equal to the highest level in player's party
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH] = true
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE] = true
|
||||
|
||||
pbSet(Settings::OVERRIDE_BATTLE_LEVEL_VALUE_VAR, $Trainer.highest_level_pokemon_in_party)
|
||||
trainer_class = "TYPE_EXPERT_#{type_id.to_s}".to_sym
|
||||
trainer_name = TYPE_EXPERT_TRAINERS[type_id][0]
|
||||
lose_text = TYPE_EXPERT_TRAINERS[type_id][1]
|
||||
if pbTrainerBattle(trainer_class, trainer_name, lose_text, false, 0, false)
|
||||
pbSet(VAR_TYPE_EXPERTS_BEATEN,pbGet(VAR_TYPE_EXPERTS_BEATEN)+1)
|
||||
pbSet(VAR_TYPE_EXPERTS_BEATEN, pbGet(VAR_TYPE_EXPERTS_BEATEN) + 1)
|
||||
pbCallBub(2, @event_id)
|
||||
pbMessage(_INTL("Woah! You beat me at my own specialty! "))
|
||||
pbCallBub(2, @event_id)
|
||||
@@ -134,8 +143,8 @@ def type_expert_battle(type_id)
|
||||
pbMessage(_INTL("When you wear it, you can sometimes find {1}-type related items after battles!", type.real_name))
|
||||
show_nb_type_experts_defeated()
|
||||
PokemonSelection.restore
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH]=false
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE]=false
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH] = false
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE] = false
|
||||
pbSet(VAR_CURRENT_GYM_TYPE, -1)
|
||||
return true
|
||||
end
|
||||
@@ -145,8 +154,8 @@ def type_expert_battle(type_id)
|
||||
end
|
||||
end
|
||||
PokemonSelection.restore
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH]=false
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE]=false
|
||||
$game_switches[Settings::OVERRIDE_BATTLE_LEVEL_SWITCH] = false
|
||||
$game_switches[SWITCH_DONT_RANDOMIZE] = false
|
||||
pbSet(VAR_CURRENT_GYM_TYPE, -1)
|
||||
return false
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user