From 1f9ba944325205696e93210a59a3c580fc63894c Mon Sep 17 00:00:00 2001 From: Maruno17 Date: Sun, 3 Oct 2021 22:42:18 +0100 Subject: [PATCH] Fixed quote marks around LoseText in trainers.txt --- .../010_Data/002_PBS data/013_Trainer.rb | 2 +- .../021_Compiler/003_Compiler_WritePBS.rb | 2 +- PBS/trainers.txt | 40 +++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb index fd20b9a5e..7e7c75729 100644 --- a/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb +++ b/Data/Scripts/010_Data/002_PBS data/013_Trainer.rb @@ -13,7 +13,7 @@ module GameData SCHEMA = { "Items" => [:items, "*e", :Item], - "LoseText" => [:lose_text, "s"], + "LoseText" => [:lose_text, "q"], "Pokemon" => [:pokemon, "ev", :Species], # Species, level "Form" => [:form, "u"], "Name" => [:name, "s"], diff --git a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb index aedff0b19..3e99f987d 100644 --- a/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb +++ b/Data/Scripts/021_Compiler/003_Compiler_WritePBS.rb @@ -592,7 +592,7 @@ module Compiler end f.write(sprintf("Items = %s\r\n", trainer.items.join(","))) if trainer.items.length > 0 if trainer.real_lose_text && !trainer.real_lose_text.empty? - f.write(sprintf("LoseText = %s\r\n", csvQuoteAlways(trainer.real_lose_text))) + f.write(sprintf("LoseText = %s\r\n", trainer.real_lose_text)) end trainer.pokemon.each do |pkmn| f.write(sprintf("Pokemon = %s,%d\r\n", pkmn[:species], pkmn[:level])) diff --git a/PBS/trainers.txt b/PBS/trainers.txt index c957687b4..3462379db 100644 --- a/PBS/trainers.txt +++ b/PBS/trainers.txt @@ -1,13 +1,13 @@ # See the documentation on the wiki to learn how to edit this file. #------------------------------- [CAMPER,Liam] -LoseText = "A very good battle, indeed!" +LoseText = A very good battle, indeed! Pokemon = DIGLETT,10 Pokemon = BONSLY,11 #------------------------------- [LEADER_Brock,Brock] Items = FULLRESTORE,FULLRESTORE -LoseText = "Very good." +LoseText = Very good. Pokemon = GEODUDE,12 Gender = male Moves = DEFENSECURL,HEADSMASH,ROCKPOLISH,ROCKTHROW @@ -24,92 +24,92 @@ Pokemon = ONIX,14 Ball = HEAVYBALL #------------------------------- [TEAMROCKET_M,Grunt,1] -LoseText = "You're too good for me!" +LoseText = You're too good for me! Pokemon = WEEPINBELL,21 Shadow = yes #------------------------------- [TEAMROCKET_F,Grunt,1] -LoseText = "You're too good for me!" +LoseText = You're too good for me! Pokemon = BURMY,19 Pokemon = WINGULL,19 Pokemon = ELECTABUZZ,20 Shadow = yes #------------------------------- [YOUNGSTER,Ben] -LoseText = "Aww, I lost." +LoseText = Aww, I lost. Pokemon = RATTATA,11 Pokemon = EKANS,11 #------------------------------- [CAMPER,Jeff] -LoseText = "A very good battle, indeed!" +LoseText = A very good battle, indeed! Pokemon = SPEAROW,16 Pokemon = SENTRET,16 #------------------------------- [CAMPER,Jeff,1] -LoseText = "You beat me again!" +LoseText = You beat me again! Pokemon = FEAROW,29 Pokemon = FURRET,29 #------------------------------- [PICNICKER,Susie] -LoseText = "Defeated! Oh my!" +LoseText = Defeated! Oh my! Pokemon = MEOWTH,18 #------------------------------- [PICNICKER,Susie,1] -LoseText = "Defeated! Oh my!" +LoseText = Defeated! Oh my! Pokemon = PERSIAN,32 #------------------------------- [HIKER,Ford] -LoseText = "You're too good for me!" +LoseText = You're too good for me! Pokemon = MACHOP,19 #------------------------------- [FISHERMAN,Andrew] -LoseText = "Washed out!" +LoseText = Washed out! Pokemon = MAGIKARP,14 Pokemon = MAGIKARP,18 #------------------------------- [BEAUTY,Bridget] -LoseText = "My Skitty!" +LoseText = My Skitty! Pokemon = SKITTY,18 #------------------------------- [LASS,Crissy] -LoseText = "You didn't have to win so convincingly!" +LoseText = You didn't have to win so convincingly! Pokemon = PLUSLE,17 Pokemon = MINUN,17 #------------------------------- [COOLCOUPLE,Alice & Bob] -LoseText = "Our teamwork failed!" +LoseText = Our teamwork failed! Pokemon = TURTWIG,19 Pokemon = CHIMCHAR,19 #------------------------------- [POKEMONTRAINER_May,May] -LoseText = "..." +LoseText = ... Pokemon = COMBUSKEN,19 #------------------------------- [SWIMMER2_F,Ariel] -LoseText = "Washed out!" +LoseText = Washed out! Pokemon = STARYU,15 Pokemon = GOLDEEN,11 #------------------------------- [RIVAL1,Blue] -LoseText = "Not too shabby." +LoseText = Not too shabby. Pokemon = PIDGEOTTO,17 Pokemon = RATTATA,15 Pokemon = BULBASAUR,18 #------------------------------- [RIVAL1,Blue,1] -LoseText = "Not too shabby." +LoseText = Not too shabby. Pokemon = PIDGEOTTO,17 Pokemon = RATTATA,15 Pokemon = CHARMANDER,18 #------------------------------- [RIVAL1,Blue,2] -LoseText = "Not too shabby." +LoseText = Not too shabby. Pokemon = PIDGEOTTO,17 Pokemon = RATTATA,15 Pokemon = SQUIRTLE,18 #------------------------------- [CHAMPION,Blue] -LoseText = "A good battle indeed!" +LoseText = A good battle indeed! Pokemon = VENUSAUR,63 Item = SITRUSBERRY Pokemon = CHARIZARD,63