Reverted previous engine side encoding fix, converted the belonging script files to UTF-8.
This commit is contained in:
parent
911be5527d
commit
434d21a5d1
|
@ -51,7 +51,7 @@ Public Class Trainer
|
||||||
Dim path As String = GameModeManager.GetScriptPath("Trainer\" & TrainerFile & ".trainer")
|
Dim path As String = GameModeManager.GetScriptPath("Trainer\" & TrainerFile & ".trainer")
|
||||||
Security.FileValidation.CheckFileValid(path, False, "Trainer.vb")
|
Security.FileValidation.CheckFileValid(path, False, "Trainer.vb")
|
||||||
|
|
||||||
Dim Data() As String = System.IO.File.ReadAllLines(path, Encoding.GetEncoding("iso-8859-1"))
|
Dim Data() As String = System.IO.File.ReadAllLines(path)
|
||||||
|
|
||||||
If Data(0) = "[TRAINER FORMAT]" Then
|
If Data(0) = "[TRAINER FORMAT]" Then
|
||||||
LoadTrainer(Data)
|
LoadTrainer(Data)
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
[TRAINER FORMAT]
|
[TRAINER FORMAT]
|
||||||
Name|Bethany
|
Name|Bethany
|
||||||
TrainerClass|Pokémon Breeder
|
TrainerClass|Pokémon Breeder
|
||||||
Money|1540
|
Money|1540
|
||||||
IntroMessage|I'm curious, how do you raise~your Pokémon?
|
IntroMessage|I'm curious, how do you raise~your Pokémon?
|
||||||
OutroMessage|You raise your Pokémon with a whole lot of love!
|
OutroMessage|You raise your Pokémon with a whole lot of love!
|
||||||
DefeatMessage|In the same way your mother~raised you full of love,~you should raise your Pokémon.
|
DefeatMessage|In the same way your mother~raised you full of love,~you should raise your Pokémon.
|
||||||
TextureID|1
|
TextureID|1
|
||||||
Region|Sevii Islands
|
Region|Sevii Islands
|
||||||
IniMusic|johto_trainer_intro
|
IniMusic|johto_trainer_intro
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[TRAINER FORMAT]
|
[TRAINER FORMAT]
|
||||||
Name|Denise
|
Name|Denise
|
||||||
TrainerClass|Swimmer
|
TrainerClass|Swimmer
|
||||||
Money|212
|
Money|212
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[TRAINER FORMAT]
|
[TRAINER FORMAT]
|
||||||
Name|Samir
|
Name|Samir
|
||||||
TrainerClass|Swimmer
|
TrainerClass|Swimmer
|
||||||
Money|220
|
Money|220
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version=2
|
version=2
|
||||||
:if:<register.registered(trainer_fortune\water\005l)>=false
|
:if:<register.registered(trainer_fortune\water\005l)>=false
|
||||||
:then
|
:then
|
||||||
@text.show(Miu: Hello, Pokémon!~It's time to play!)
|
@text.show(Miu: Hello, Pokémon!~It's time to play!)
|
||||||
:endif
|
:endif
|
||||||
|
|
||||||
@battle.starttrainer(fortune\water\005l)
|
@battle.starttrainer(fortune\water\005l)
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
version=2
|
version=2
|
||||||
:if:<register.registered(trainer_fortune\water\005r)>=false
|
:if:<register.registered(trainer_fortune\water\005r)>=false
|
||||||
:then
|
:then
|
||||||
@text.show(Mia: Hello, Pokémon!~It's time to battle!)
|
@text.show(Mia: Hello, Pokémon!~It's time to battle!)
|
||||||
:endif
|
:endif
|
||||||
|
|
||||||
@battle.starttrainer(fortune\water\005r)
|
@battle.starttrainer(fortune\water\005r)
|
||||||
|
|
|
@ -4,7 +4,7 @@ TrainerClass|Twins,
|
||||||
Money|1320
|
Money|1320
|
||||||
IntroMessage|
|
IntroMessage|
|
||||||
OutroMessage|Mia: You're mean!~You're bad for winning!
|
OutroMessage|Mia: You're mean!~You're bad for winning!
|
||||||
DefeatMessage|Mia: Ohh...~I'm sorry, My Pokémon...
|
DefeatMessage|Mia: Ohh...~I'm sorry, My Pokémon...
|
||||||
TextureID|littlegirl,littlegirl
|
TextureID|littlegirl,littlegirl
|
||||||
Region|Sevii Islands
|
Region|Sevii Islands
|
||||||
IniMusic|johto_trainer_intro
|
IniMusic|johto_trainer_intro
|
||||||
|
|
|
@ -4,7 +4,7 @@ TrainerClass|Aroma Lady
|
||||||
Money|1456
|
Money|1456
|
||||||
IntroMessage|I let a pleasant breeze lead me~all the way here.
|
IntroMessage|I let a pleasant breeze lead me~all the way here.
|
||||||
OutroMessage|Giggle... You're so cute when you're determined.
|
OutroMessage|Giggle... You're so cute when you're determined.
|
||||||
DefeatMessage|I want to go to the woods over~there, but...*There are lots of Bug Pokémon.~They scare me a little.
|
DefeatMessage|I want to go to the woods over~there, but...*There are lots of Bug Pokémon.~They scare me a little.
|
||||||
TextureID|PinkShirtGirl
|
TextureID|PinkShirtGirl
|
||||||
Region|Sevii Islands
|
Region|Sevii Islands
|
||||||
IniMusic|johto_trainer_intro
|
IniMusic|johto_trainer_intro
|
||||||
|
|
|
@ -122,7 +122,7 @@ nextScript:
|
||||||
Security.FileValidation.CheckFileValid(path, False, "ActionScript.vb")
|
Security.FileValidation.CheckFileValid(path, False, "ActionScript.vb")
|
||||||
|
|
||||||
If System.IO.File.Exists(path) = True Then
|
If System.IO.File.Exists(path) = True Then
|
||||||
Dim Data As String = System.IO.File.ReadAllText(path, Encoding.GetEncoding("iso-8859-1"))
|
Dim Data As String = System.IO.File.ReadAllText(path)
|
||||||
Data = Data.Replace(vbNewLine, "^")
|
Data = Data.Replace(vbNewLine, "^")
|
||||||
Dim ScriptData() As String = Data.Split(CChar("^"))
|
Dim ScriptData() As String = Data.Split(CChar("^"))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue