diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/checkin.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/checkin.dat new file mode 100644 index 000000000..b785f8d0f Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/checkin.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/enterchoose.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/enterchoose.dat new file mode 100644 index 000000000..4d4176bc4 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/enterchoose.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/intro_walk.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/intro_walk.dat new file mode 100644 index 000000000..9871e8cce Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/intro_walk.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/lost.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/lost.dat new file mode 100644 index 000000000..a823a2cea Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/lost.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/main.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/main.dat new file mode 100644 index 000000000..ccbd67ed3 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/main.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/record_machine.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/record_machine.dat new file mode 100644 index 000000000..57323aaef Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/record_machine.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/roomevent.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/roomevent.dat new file mode 100644 index 000000000..e8aa50729 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/roomevent.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/won7.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/won7.dat new file mode 100644 index 000000000..0b0a49747 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/won7.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/challenge/wonbrain.dat b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/wonbrain.dat new file mode 100644 index 000000000..ec0c0463c Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/challenge/wonbrain.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/chatter.dat b/P3D/Content/Data/Scripts/frontier/battlepike/chatter.dat new file mode 100644 index 000000000..a33d90574 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/chatter.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/checkin.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/checkin.dat new file mode 100644 index 000000000..b785f8d0f Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/checkin.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/enterchoose.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/enterchoose.dat new file mode 100644 index 000000000..4d4176bc4 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/enterchoose.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/intro_walk.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/intro_walk.dat new file mode 100644 index 000000000..9871e8cce Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/intro_walk.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/lost.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/lost.dat new file mode 100644 index 000000000..a823a2cea Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/lost.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/main.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/main.dat new file mode 100644 index 000000000..ccbd67ed3 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/main.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/record_machine.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/record_machine.dat new file mode 100644 index 000000000..57323aaef Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/record_machine.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/endless/roomevent.dat b/P3D/Content/Data/Scripts/frontier/battlepike/endless/roomevent.dat new file mode 100644 index 000000000..e8aa50729 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/endless/roomevent.dat differ diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/hint.dat b/P3D/Content/Data/Scripts/frontier/battlepike/hint.dat new file mode 100644 index 000000000..43480cf9f --- /dev/null +++ b/P3D/Content/Data/Scripts/frontier/battlepike/hint.dat @@ -0,0 +1,32 @@ +version=2 +:if:=true + @text.show(From every path I sense a dreadful presence...) + :end +:endif + +I beg your pardon, but...~Are you perhaps finding it difficult to choose your path? +@options.show(Yes,No) + :when:No + @text.show(I See...~I apologize for my~impertinence...) + :end + :when:Yes + :select: + :when:0 + @text.show(Ah, let me see...*There is something about~the path on the left...) + :when:1 + @text.show(Ah, let me see...*There is something about~the path in the center...) + :when:2 + @text.show(Ah, let me see...*There is something about~the path on the right...) + :endwhen + :select: + :when:0 + @text.show(For some odd reason,~I felt a wave of nostalgia~coming from it...) + :when:1 + @text.show(Is it...~A Trainer?*I sense the presence~of people...) + :when:2 + @text.show(It seems to have the distinct~aroma of Pokémon wafting~around it...) + :when:3 + @text.show(I seem to have heard~something...*It may have been~whispering...) + :endwhen +:endwhen +:end \ No newline at end of file diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/roomchooser.dat b/P3D/Content/Data/Scripts/frontier/battlepike/roomchooser.dat new file mode 100644 index 000000000..be91d8d34 --- /dev/null +++ b/P3D/Content/Data/Scripts/frontier/battlepike/roomchooser.dat @@ -0,0 +1,125 @@ +version=2 +#0 = status Condition - skip if all status or faint +#1 = partial recovery - skip if fully healed +#2 = single battle +#3 = full recovery - Skip if fully healed +#4 = Wild Pokemon +#5 = Hard Battle+heal - not hinted if no healing needed +#6 = no event +#7 = Double Battle - skip if only one mon +#8 = Lucy +:if:=true + @register.change(pikehintspot,3) + @register.change(pikehint,4) + @register.change(pikehinted,8) + @player.move(0) + @text.show(I am sorry to say...*A terrifying event,~yes, a horrible one,~is about to befall you...*I urge you to pay the utmost~care and prepare for~the worst...) +:else + @register.change(pikehintspot,) + @register.change(pikehint,) + + :select: + :when:0 + :if: = none = none = none + :if:=true + @register.change(pikehinted,0) + :else + @register.change(pikehinted,) + :endif + :else + @register.change(pikehinted,1) + :endif + :when:1 + :if:=true + @register.change(pikehinted,2) + :else + @register.change(pikehinted,) + :endif + :when:2 + :if:=true + @register.change(pikehinted,4) + :else + @register.change(pikehinted,) + :endif + :when:3 + :if:=1 + @register.change(pikehinted,6) + :else + :if:=0 + @register.change(pikehinted,7) + :else + @register.change(pikehinted,6) + :endif + :endif + :when:4 + @register.change(pikehinted,8) + :endwhen + @storage.set(integer,potentialrooms,0) + @storage.set(integer,roomcounter,0) + :while:<8 + :select: + :when:0 + :if:=0 + :if: = none = none = none + @storage.set(integer,potroom,0) + @storage.update(integer,potentialrooms,+,1) + :endif + :endif + :when:1 + :if:=0 + :if:=false + @storage.set(integer,potroom,1) + @storage.update(integer,potentialrooms,+,1) + :endif + :endif + :when:2 + :if:=1 + @storage.set(integer,potroom,2) + @storage.update(integer,potentialrooms,+,1) + :endif + :when:3 + :if:=1 + :if:=false + @storage.set(integer,potroom,3) + @storage.update(integer,potentialrooms,+,1) + :endif + :endif + :when:4 + :if:=2 + @storage.set(integer,potroom,4) + @storage.update(integer,potentialrooms,+,1) + :endif + :when:5 + :if:=2 + @storage.set(integer,potroom,5) + @storage.update(integer,potentialrooms,+,1) + :endif + :when:6 + :if:=3 + @storage.set(integer,potroom,6) + @storage.update(integer,potentialrooms,+,1) + :endif + :when:7 + :if:=3 + :if:=1 + @storage.set(integer,potroom,7) + @storage.update(integer,potentialrooms,+,1) + :endif + :endif + :endwhen + @storage.update(integer,roomcounter,+,1) + :endwhile +:endif +@storage.set(integer,roomsset,0) +:while:<3 + :if:=true + @register.change(pikeroom,8) + :else + :if: = + @register.change(pikeroom,) + :else + @register.change(pikeroom,-1)>)>)>) + :endif + :endif + @storage.update(integer,roomsset,+,1) +:endwhile diff --git a/P3D/Content/Data/Scripts/frontier/battlepike/ruleboard.dat b/P3D/Content/Data/Scripts/frontier/battlepike/ruleboard.dat new file mode 100644 index 000000000..040bf3360 Binary files /dev/null and b/P3D/Content/Data/Scripts/frontier/battlepike/ruleboard.dat differ diff --git a/P3D/Content/Data/badges.dat b/P3D/Content/Data/badges.dat index cfac28d19..493d6269a 100644 --- a/P3D/Content/Data/badges.dat +++ b/P3D/Content/Data/badges.dat @@ -21,3 +21,6 @@ frontier_1_gold|name=Gold Ability|description=You defeated the Frontier Brain of frontier_2_silver|name=Silver Knowledge|description=Only few trainers achieved this emblem~which shows what strength lies~inside them.|Texture=GUI\Badges,100,200,50,50 frontier_2_gold|name=Gold Knowledge|description=This Emblem displays how great you can~interact with Pokémon and how well~you can adapt your strategy to a new situation.|Texture=GUI\Badges,150,200,50,50 + +frontier_3_silver|name=Silver Luck|description=You have shown great skill at taking~the luck thrown your way, good or bad.|Texture=GUI\Badges,200,200,50,50 +frontier_3_gold|name=Gold Luck|description=Your luck trumped all at the Battle Pike.~You mitigated the worst luck and~doubled down on the best luck.|Texture=GUI\Badges,250,200,50,50 diff --git a/P3D/Content/Data/maps/frontier/battlepike/choose.dat b/P3D/Content/Data/maps/frontier/battlepike/choose.dat new file mode 100644 index 000000000..c79c65bc9 Binary files /dev/null and b/P3D/Content/Data/maps/frontier/battlepike/choose.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/finalroom.dat b/P3D/Content/Data/maps/frontier/battlepike/finalroom.dat new file mode 100644 index 000000000..0cb002459 Binary files /dev/null and b/P3D/Content/Data/maps/frontier/battlepike/finalroom.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/main.dat b/P3D/Content/Data/maps/frontier/battlepike/main.dat index 0f77ae6d6..cc90707e5 100644 Binary files a/P3D/Content/Data/maps/frontier/battlepike/main.dat and b/P3D/Content/Data/maps/frontier/battlepike/main.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/passage.dat b/P3D/Content/Data/maps/frontier/battlepike/passage.dat index e8d1176a4..0170c9543 100644 Binary files a/P3D/Content/Data/maps/frontier/battlepike/passage.dat and b/P3D/Content/Data/maps/frontier/battlepike/passage.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/room.dat b/P3D/Content/Data/maps/frontier/battlepike/room.dat deleted file mode 100644 index dace9fa25..000000000 Binary files a/P3D/Content/Data/maps/frontier/battlepike/room.dat and /dev/null differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/rooms/0.dat b/P3D/Content/Data/maps/frontier/battlepike/rooms/0.dat new file mode 100644 index 000000000..0c861afc5 Binary files /dev/null and b/P3D/Content/Data/maps/frontier/battlepike/rooms/0.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/rooms/1.dat b/P3D/Content/Data/maps/frontier/battlepike/rooms/1.dat new file mode 100644 index 000000000..7effd1613 Binary files /dev/null and b/P3D/Content/Data/maps/frontier/battlepike/rooms/1.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/rooms/2.dat b/P3D/Content/Data/maps/frontier/battlepike/rooms/2.dat new file mode 100644 index 000000000..7effd1613 Binary files /dev/null and b/P3D/Content/Data/maps/frontier/battlepike/rooms/2.dat differ diff --git a/P3D/Content/Data/maps/frontier/battlepike/wildroom.dat b/P3D/Content/Data/maps/frontier/battlepike/wildroom.dat index 49a3167fb..d60409db2 100644 Binary files a/P3D/Content/Data/maps/frontier/battlepike/wildroom.dat and b/P3D/Content/Data/maps/frontier/battlepike/wildroom.dat differ diff --git a/P3D/Content/Data/maps/poke/frontier/battlepike/wildroom.poke b/P3D/Content/Data/maps/poke/frontier/battlepike/wildroom.poke new file mode 100644 index 000000000..d1c981ce2 --- /dev/null +++ b/P3D/Content/Data/maps/poke/frontier/battlepike/wildroom.poke @@ -0,0 +1,5 @@ +name=Skip +type=Skip +{0|{"Pokemon"[336]}{"OriginalNumber"[-1]}{"Gender"[0]}{"EggSteps"[0]}{"Item"[0]}{"ItemData"[]}{"NickName"[]}{"Level"[]}{"OT"[00000]}{"Ability"[151]}{"Status"[]}{"Nature"[3]}{"CatchLocation"[Battle Pike]}{"CatchTrainer"[Lucy]}{"CatchBall"[5]}{"CatchMethod"[annoyed]}{"Friendship"[70]}{"isShiny"[0]}{"Attack1"[92]}{"Attack2"[137]}{"Attack3"[188]}{"Attack4"[34]}{"EVs"[88,84,84,84,84,84]}{"IVs"[22,22,22,22,22,22]}{"AdditionalData"[]}|26|-1|,} +{0|{"Pokemon"[350]}{"OriginalNumber"[-1]}{"Gender"[0]}{"EggSteps"[0]}{"Item"[0]}{"ItemData"[]}{"NickName"[]}{"Level"[]}{"OT"[00000]}{"Ability"[63]}{"Status"[]}{"Nature"[15]}{"CatchLocation"[Battle Pike]}{"CatchTrainer"[Lucy]}{"CatchBall"[5]}{"CatchMethod"[annoyed]}{"Friendship"[70]}{"isShiny"[0]}{"Attack1"[92]}{"Attack2"[95]}{"Attack3"[34]}{"Attack4"[57]}{"EVs"[88,84,84,84,84,84]}{"IVs"[22,22,22,22,22,22]}{"AdditionalData"[]}|26|-1|,} +{0||48|-1|,} diff --git a/P3D/Content/Textures/NPC/96.png b/P3D/Content/Textures/NPC/96.png new file mode 100644 index 000000000..82e7e1804 Binary files /dev/null and b/P3D/Content/Textures/NPC/96.png differ diff --git a/P3D/Content/Textures/battlepike.png b/P3D/Content/Textures/battlepike.png index 7fe9c70ca..423ce68f7 100644 Binary files a/P3D/Content/Textures/battlepike.png and b/P3D/Content/Textures/battlepike.png differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 4418265d6..8c1f8b3af 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -19484,6 +19484,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -29290,7 +29293,7 @@ PreserveNewest - + PreserveNewest @@ -29347,6 +29350,18 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -29455,6 +29470,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -29902,6 +29920,66 @@ PreserveNewest + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + PreserveNewest diff --git a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb index 09d0cbb58..07f2bda46 100644 --- a/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb +++ b/P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb @@ -493,6 +493,9 @@ Dim checkType As String = args(1) Return ReturnBoolean(p.IsType(New Element(checkType).Type)) + Case "ability" + Dim p As Pokemon = Core.Player.Pokemons(int(argument)) + Return p.Ability.ID() Case "displayname" Dim index As Integer = int(argument.GetSplit(0)) Return Core.Player.Pokemons(index).GetDisplayName()