various fixes from QA

This commit is contained in:
darkfire006 2019-02-16 12:28:41 -06:00
parent 642365f389
commit 8494c01322
5 changed files with 9 additions and 9 deletions

View File

@ -23,13 +23,13 @@ version=2
@register.register(clubintro)
:endif
:if:<Register.registered(EusineHere)>=false <and> <register.registed(EusineRematchTalk)>=True
:if:<Register.registered(EusineHere)>=false <and> <register.registed(EusineRematchTalk)>=true
:if:<system.random(7)>=5
@register.registertime(EusineHere,20,hour)
: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.registed(LiRematchTalk)>=true
:if:<system.random(10)>=5
@register.registertime(LiHere,4,hour)
@register.registertime(LiNotHere,3,day)
@ -72,7 +72,7 @@ version=2
:if:<Environment.day>=Monday
:if:<Environment.hour><9 <and> <Environment.hour>>2
:if:<register.registered(ChuckRematchTalk)>=true
@npc.warp(15,~,0.2,~)
@npc.warp(13,~,0.2,~)
:endif
:endif
:if:<Environment.hour><12 <and> <Environment.hour>>4
@ -118,7 +118,7 @@ version=2
:if:<Environment.day>=Wednesday
:if:<Environment.hour><9 <and> <Environment.hour>>2
:if:<register.registered(ChuckRematchTalk)>=true
@npc.warp(15,~,0.2,~)
@npc.warp(13,~,0.2,~)
:endif
:if:<register.registered(KiyoRematchTalk)>=true
@npc.warp(18,~,0.2,~)
@ -168,7 +168,7 @@ version=2
:if:<Environment.day>=Friday
:if:<Environment.hour><9 <and> <Environment.hour>>2
:if:<register.registered(ChuckRematchTalk)>=true
@npc.warp(15,~,0.2,~)
@npc.warp(13,~,0.2,~)
:endif
:endif
:if:<Environment.hour><15 <and> <Environment.hour>>8
@ -253,12 +253,12 @@ version=2
@player.move(0)
@player.turnto(1)
:if:<player.gender>=0
@text.show(Oh, Miss <player.name>.*It is so good to see you!*I am not sure what you told them, but all of the Gym Leaders from both Johto and Kanto have been frequenting the club!*The battles we have witnessed here have been spectacular!*I suspect our reputation for hosting the strongest trainers has begun to spread.*If you meet a worthy trainer feel free to invite them to visit us!)
@text.show(Oh, Miss <player.name>.*It is so good to see you!*I am not sure what you~told them, but all of the~Gym Leaders from both Johto~and Kanto have been~frequenting the club!*The battles we have~witnessed here have been~spectacular!*I suspect our reputation~for hosting the strongest~trainers has begun to spread.*If you meet a worthy trainer~feel free to invite them~to visit us!)
:else
@text.show(Oh, Mister <player.name>.*It is so good to see you!*I am not sure what you told them, but all of the Gym Leaders from both Johto and Kanto have been frequenting the club!*The battles we have witnessed here have been spectacular!*I suspect our reputation for hosting the strongest trainers has begun to spread.*If you meet a worthy trainer feel free to invite them to visit us!)
@text.show(Oh, Mister <player.name>.*It is so good to see you!*I am not sure what you~told them, but all of the~Gym Leaders from both Johto~and Kanto have been~frequenting the club!*The battles we have~witnessed here have been~spectacular!*I suspect our reputation~for hosting the strongest~trainers has begun to spread.*If you meet a worthy trainer~feel free to invite them~to visit us!)
:endif
@register.register(clubextendinvite)
:if:<register.registered(shinycelebi)>=true
:if:<register.registered(shrinecelebi)>=true
@npc.register(tohjofalls\hideout.dat|3|position|~,0,~)
@npc.register(tohjofalls\hideout.dat|4|position|~,0,~)
@npc.register(tohjofalls\hideout.dat|5|position|~,0,~)

View File

@ -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[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[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[Your Playground!*Goldenrod City~Game Corner]}}{"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[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[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]}}]}}