Minor fixes QA related
dden-ID ecru-east gate grod-sign mtm-ladders clubmap-jjm e and li shrine-cleanup no real change main-clean up no real change
This commit is contained in:
parent
1b6062e37e
commit
a33fdd9f61
|
@ -23,13 +23,15 @@ version=2
|
||||||
@register.register(clubintro)
|
@register.register(clubintro)
|
||||||
:endif
|
:endif
|
||||||
|
|
||||||
:if:<Register.registered(EusineHere)>=false <and> <register.registed(EusineRematchTalk)>=true
|
:if:<Register.registered(EusineHere)>=false <and> <Register.registered(EusineNotHere)>=false <and> <register.registered(EusineRematchTalk)>=true
|
||||||
:if:<system.random(7)>=5
|
:if:<system.random(7)>=5
|
||||||
@register.registertime(EusineHere,20,hour)
|
@register.registertime(EusineHere,20,hour)
|
||||||
|
:else
|
||||||
|
@register.registertime(EusineNotHere,20,hour)
|
||||||
:endif
|
:endif
|
||||||
:endif
|
:endif
|
||||||
|
|
||||||
:if:<Register.registered(LiHere)>=false <and> <Register.registered(LiNotHere)>=false <and> <register.registed(LiRematchTalk)>=true
|
:if:<Register.registered(LiHere)>=false <and> <Register.registered(LiNotHere)>=false <and> <register.registered(LiRematchTalk)>=true
|
||||||
:if:<system.random(10)>=5
|
:if:<system.random(10)>=5
|
||||||
@register.registertime(LiHere,4,hour)
|
@register.registertime(LiHere,4,hour)
|
||||||
@register.registertime(LiNotHere,3,day)
|
@register.registertime(LiNotHere,3,day)
|
||||||
|
@ -259,9 +261,9 @@ version=2
|
||||||
:endif
|
:endif
|
||||||
@register.register(clubextendinvite)
|
@register.register(clubextendinvite)
|
||||||
:if:<register.registered(shrinecelebi)>=true
|
:if:<register.registered(shrinecelebi)>=true
|
||||||
@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
|
@npc.register(tohjofalls\hideout.dat|3|position|3,0,0)
|
||||||
@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
|
@npc.register(tohjofalls\hideout.dat|4|position|4,0,1)
|
||||||
@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)
|
@npc.register(tohjofalls\hideout.dat|5|position|5,0,0)
|
||||||
:endif
|
:endif
|
||||||
:endif
|
:endif
|
||||||
:end
|
:end
|
||||||
|
|
|
@ -2,29 +2,27 @@ version=2
|
||||||
|
|
||||||
@text.show(It is an old shrine.)
|
@text.show(It is an old shrine.)
|
||||||
|
|
||||||
:if:<pokemon.ot(0)>=42069 <and> <pokemon.isshiny(0)>=true <and> <pokemon.catchball(0)>=45 <and> <register.registered(spiky)>=false
|
:if:<pokemon.ot(0)>=42069 <and> <pokemon.isshiny(0)>=true <and> <pokemon.catchball(0)>=45 <and> <register.registered(spiky)>=false
|
||||||
:if:<pokemon.count>>5
|
:if:<pokemon.count>>5
|
||||||
@text.show(Something seems wrong.*Maybe you should come~back with less Pokémon?)
|
@text.show(Something seems wrong.*Maybe you should come~back with less Pokémon?)
|
||||||
:end
|
:end
|
||||||
:else
|
:else
|
||||||
@script.start(ilex/spiky)
|
@script.start(ilex/spiky)
|
||||||
:end
|
:end
|
||||||
:endif
|
|
||||||
:endif
|
:endif
|
||||||
|
:endif
|
||||||
:if:<register.registered(shrinecelebi)>=false <and> <inventory.countitem(115)>>0
|
|
||||||
|
:if:<register.registered(shrinecelebi)>=false <and> <inventory.countitem(115)>>0
|
||||||
@text.show(The GS Ball is~reacting to the shrine!)
|
@text.show(The GS Ball is~reacting to the shrine!)
|
||||||
:if:<pokemon.count>>5
|
:if:<pokemon.count>>5
|
||||||
@text.show(Something seems wrong.*Maybe you should come~back with less Pokémon?)
|
@text.show(Something seems wrong.*Maybe you should come~back with less Pokémon?)
|
||||||
:end
|
:end
|
||||||
:else
|
:else
|
||||||
|
@text.show(Place the GS Ball~in the shrine?)
|
||||||
@text.show(Place the GS Ball~in the shrine?)
|
|
||||||
@options.show(Yes,No)
|
@options.show(Yes,No)
|
||||||
:when:Yes
|
:when:Yes
|
||||||
@camera.reset
|
@camera.reset
|
||||||
:if:<system.random(1,2048)>=1
|
:if:<system.random(1,2048)>=1
|
||||||
:then
|
|
||||||
@register.register(shinycelebi)
|
@register.register(shinycelebi)
|
||||||
:else
|
:else
|
||||||
@register.unregister(shinycelebi)
|
@register.unregister(shinycelebi)
|
||||||
|
@ -73,7 +71,6 @@ version=2
|
||||||
@npc.turn(9,1)
|
@npc.turn(9,1)
|
||||||
|
|
||||||
:if:<register.registered(shinycelebi)>=true
|
:if:<register.registered(shinycelebi)>=true
|
||||||
:then
|
|
||||||
@npc.wearskin(10,[POKEMON|S]251)
|
@npc.wearskin(10,[POKEMON|S]251)
|
||||||
@level.update
|
@level.update
|
||||||
:endif
|
:endif
|
||||||
|
@ -108,7 +105,6 @@ version=2
|
||||||
|
|
||||||
@camera.set(0,0.4,3,1,0)
|
@camera.set(0,0.4,3,1,0)
|
||||||
:if:<register.registered(shinycelebi)>=true
|
:if:<register.registered(shinycelebi)>=true
|
||||||
:then
|
|
||||||
@npc.wearskin(0,[POKEMON|S]251)
|
@npc.wearskin(0,[POKEMON|S]251)
|
||||||
@level.update
|
@level.update
|
||||||
:endif
|
:endif
|
||||||
|
@ -220,7 +216,6 @@ version=2
|
||||||
|
|
||||||
@camera.set(0,1,3.75,5,-0.25)
|
@camera.set(0,1,3.75,5,-0.25)
|
||||||
:if:<register.registered(shinycelebi)>=true
|
:if:<register.registered(shinycelebi)>=true
|
||||||
:then
|
|
||||||
@npc.wearskin(0,[POKEMON|S]251)
|
@npc.wearskin(0,[POKEMON|S]251)
|
||||||
@level.update
|
@level.update
|
||||||
:endif
|
:endif
|
||||||
|
@ -326,7 +321,6 @@ version=2
|
||||||
|
|
||||||
@camera.set(0.8,1.5,3,1.15,-0.5)
|
@camera.set(0.8,1.5,3,1.15,-0.5)
|
||||||
:if:<register.registered(shinycelebi)>=true
|
:if:<register.registered(shinycelebi)>=true
|
||||||
:then
|
|
||||||
@npc.wearskin(10,[POKEMON|S]251)
|
@npc.wearskin(10,[POKEMON|S]251)
|
||||||
@level.update
|
@level.update
|
||||||
:endif
|
:endif
|
||||||
|
@ -350,7 +344,6 @@ version=2
|
||||||
@pokemon.add(251,60,Obtained at,115,Ilex Forest)
|
@pokemon.add(251,60,Obtained at,115,Ilex Forest)
|
||||||
|
|
||||||
:if:<register.registered(shinycelebi)>=true
|
:if:<register.registered(shinycelebi)>=true
|
||||||
:then
|
|
||||||
@pokemon.setshiny(<pokemon.count>-1,1)
|
@pokemon.setshiny(<pokemon.count>-1,1)
|
||||||
:else
|
:else
|
||||||
@pokemon.setshiny(<pokemon.count>-1,0)
|
@pokemon.setshiny(<pokemon.count>-1,0)
|
||||||
|
@ -376,7 +369,6 @@ version=2
|
||||||
@level.wait(30)
|
@level.wait(30)
|
||||||
@camera.reset
|
@camera.reset
|
||||||
@player.achieveemblem(time)
|
@player.achieveemblem(time)
|
||||||
|
|
||||||
:when:No
|
:when:No
|
||||||
:end
|
:end
|
||||||
:endwhen
|
:endwhen
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
version=2
|
version=2
|
||||||
:if:<register.registered(<storage.get(string,leader)>rematch)>=false
|
:if:<register.registered(<storage.get(string,leader)>rematch)>=false
|
||||||
@text.show(<battle.intromessage(gymrematch\\<storage.get(string,leader)>)>)
|
@text.show(<battle.intromessage(gymrematch\<storage.get(string,leader)>)>)
|
||||||
@battle.trainer(gymrematch\\<storage.get(string,leader)>)
|
@battle.trainer(gymrematch\<storage.get(string,leader)>)
|
||||||
@register.registertime(<storage.get(string,leader)>rematch,12,hours)
|
@register.registertime(<storage.get(string,leader)>rematch,12,hours)
|
||||||
:endif
|
:endif
|
||||||
@text.show(<battle.defeatmessage(gymrematch\\<storage.get(string,leader)>)>)
|
@text.show(<battle.defeatmessage(gymrematch\<storage.get(string,leader)>)>)
|
||||||
:end
|
:end
|
Binary file not shown.
Binary file not shown.
|
@ -641,7 +641,7 @@ Signs:
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[26,0,9]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Goldenrod City~Pokémon Gym~Leader: Whitney*The Incredibly~Pretty Girl!]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[26,0,9]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Goldenrod City~Pokémon Gym~Leader: Whitney*The Incredibly~Pretty Girl!]}}{"Rotation"{int[0]}}]}}
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[22,0,18]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Goldenrod City*The Festive City~of Opulent Charm]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[22,0,18]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Goldenrod City*The Festive City~of Opulent Charm]}}{"Rotation"{int[0]}}]}}
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[28,0,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[The World is a~Riding Path!~Taming Shop]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[28,0,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[The World is a~Riding Path!~Taming Shop]}}{"Rotation"{int[0]}}]}}
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[16,0,21.65]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[We host the Best of the Best!*Goldenrod City Battle Bar*Members only.]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[16,0,22]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[We host the Best of the Best!*Goldenrod City Battle Bar*Members only.]}}{"Rotation"{int[0]}}]}}
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[12,0,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Underground~Entrance]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[12,0,30]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[32,32,16,16][48,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[1]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Underground~Entrance]}}{"Rotation"{int[0]}}]}}
|
||||||
|
|
||||||
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[16,0,27.65]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[80,32,16,16][32,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Pokémon Center~We heal YOUR~Pokémon.]}}{"Rotation"{int[0]}}]}}
|
{"Entity"{ENT[{"EntityID"{str[SignBlock]}}{"Position"{sngArr[16,0,27.65]}}{"TexturePath"{str[Cherrygrove]}}{"Textures"{recArr[[80,32,16,16][32,32,16,16]]}}{"TextureIndex"{intArr[0,0,1,1,1,1,0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[4]}}{"Action"{int[0]}}{"AdditionalValue"{str[Pokémon Center~We heal YOUR~Pokémon.]}}{"Rotation"{int[0]}}]}}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue