From 4d8f20e79a6e4f718f11573007f05ddf715736b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Mu=C3=B1oz?= Date: Mon, 21 Mar 2016 08:10:05 +0100 Subject: [PATCH] Series typos and minor bug fixes from i18N Series typos and minor bug fixes from i18N Only very simple bug fixes changed as I tried to avoid need for code changes. --- .gitignore | 1 + Series/ADV_FederatedTerritories.txt | 43 +++++++++++-------- Series/ARC_TS_CrimeStory.txt | 2 +- Series/PLOT_BanditJob2.txt | 2 +- Series/PLOT_BioHunt.txt | 2 +- Series/PLOT_CorpJob2.txt | 6 +-- Series/PLOT_FinalRest.txt | 2 +- Series/PLOT_Gift.txt | 6 +-- Series/PLOT_GuardJob4.txt | 2 +- Series/PLOT_LostExpedition.txt | 6 +-- Series/PLOT_Shimli5.txt | 2 +- Series/PLOT_TruckGuardJob1.txt | 4 +- Series/PLOT_TruckJob1.txt | 8 ++-- Series/SCENE_ProtectConvoy.txt | 2 + Series/STCdefault.txt | 21 ++++++--- Series/TS_CORP_DZProject_PLOT_Resistance.txt | 2 +- Series/TS_CORP_DZProject_STORY.txt | 6 +-- Series/TS_CORP_NewFactory_PLOT_Default.txt | 2 +- Series/TS_GRD_BanDef_PLOT_Job1.txt | 4 +- Series/TS_GRD_PumpPusher_PLOT0_Default.txt | 2 +- Series/TS_GSP_Garu_STORY.txt | 2 +- Series/TS_GSP_Hermit_STORY.txt | 2 +- Series/TS_GSP_WarClub_PLOT_Default.txt | 4 +- Series/TS_GSP_WestSide_STORY.txt | 2 +- Series/TS_GTH_Default_PLOT.txt | 2 +- Series/TS_MIL_Default_PLOT_Default.txt | 2 +- .../TS_MONK_ItemSearch_PLOT1_HistoricSite.txt | 2 +- .../TS_MONK_ItemSearch_PLOT2_FireOfHeaven.txt | 2 +- Series/TS_PLOT_BiocorpBasement.txt | 2 +- Series/TS_PLOT_CorporatePromotion_1.txt | 2 +- Series/TS_PLOT_GuardianPromotion_1.txt | 2 +- Series/TS_PLOT_IriaRuby.txt | 2 +- Series/TS_STORY_Cetus_PLOT_1.txt | 6 +-- Series/TS_STORY_Cetus_PLOT_2a.txt | 2 +- Series/TS_Scene_Convoy1.txt | 2 + Series/TS_Story_RobotWarriors.txt | 4 +- Series/TS_XRAN_SCENE_MarsNeedsClones.txt | 2 +- Series/TS_XRAN_a--F_Investigation.txt | 2 +- Series/TS_XRAN_a--X_Accused.txt | 4 +- Series/TS_XRAN_a-AU_Diary.txt | 2 +- Series/TS_XRAN_a-R-_KnowTooMuch.txt | 4 +- Series/TS_XRAN_aC--_FaceYourEnemy.txt | 4 +- Series/TS_XRAN_aC--_MarsNeedsClones.txt | 2 +- Series/TS_XRAN_aC-L_SchoolPals.txt | 2 +- Series/TS_XRAN_aF--_Hunter.txt | 4 +- Series/WMONdefault.txt | 2 +- 46 files changed, 108 insertions(+), 85 deletions(-) diff --git a/.gitignore b/.gitignore index 06e6b9e..3b64a1e 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ nosetests.xml .mr.developer.cfg .project .pydevproject +*.bak diff --git a/Series/ADV_FederatedTerritories.txt b/Series/ADV_FederatedTerritories.txt index c9aefa5..09a7e07 100644 --- a/Series/ADV_FederatedTerritories.txt +++ b/Series/ADV_FederatedTerritories.txt @@ -1636,7 +1636,7 @@ Scene 11 0 Msg3 Msg4 Msg5 - msg6 + Msg6 Msg7 Msg8 Msg9 @@ -2144,7 +2144,8 @@ Scene 13 0 result1 wares <10 11> Msg1 - Msg2 + % Msg2 + Msg2 Msg3 prompt1 @@ -2215,7 +2216,7 @@ Scene 13 0 Msg1 Msg2 Msg3 - msg4 + Msg4 Msg5 Msg6 prompt1 @@ -3081,7 +3082,7 @@ Scene 16 0 Msg2 Msg3 Msg4 - Msg5 + Msg5 Msg6 Msg7 Msg8 @@ -3234,7 +3235,7 @@ Scene 16 0 Msg2 Msg3 Msg4 - Msg5 + Msg5 Msg6 prompt1 prompt2 @@ -3802,7 +3803,8 @@ Scene 18 0 Msg2 CLUE14 CLUE29 - CLUE34 + CLUE34 + %CLUE34 GoC34NoWin GoC34Again clue37 @@ -4366,6 +4368,10 @@ Scene 24 0 width 10 height 10 sub + rect + FloorType 30 + name + rect FloorType 14 name @@ -4406,7 +4412,7 @@ Scene 24 0 BorderType 38 FloorType 28 - Persona 2414 + Persona 2415 greeting GoNoMoney GoNotHungry @@ -4429,7 +4435,7 @@ Scene 24 0 Prompt12 Prompt13 - Persona 2415 + Persona 2416 % V1 = PC has paid the registration fee greeting GoCheckContract @@ -4470,7 +4476,7 @@ Scene 24 0 Prompt8 Prompt9 - Persona 2413 + Persona 2414 % President of RegEx corporation % V1 = Renown + Reaction, determines if PC can get job... greeting @@ -4499,7 +4505,7 @@ Scene 24 0 Prompt3 Prompt4 - Persona 2416 + Persona 2417 greeting Result1 .wares @@ -4551,7 +4557,8 @@ Scene 24 0 NPC Scientist SetTeam 6 SetPersona 2407 - home + % home + home SetFaction 5 STC APPARATUS-1 @@ -4575,29 +4582,29 @@ Scene 24 0 NPC Journalist SetTeam 2 - SetPersona 2411 + SetPersona 2412 NPC Corporate Executive SetTeam 2 - SetPersona 2412 + SetPersona 2413 home SetFaction 5 NPC Leader job SetTeam 2 - SetPersona 2413 + SetPersona 2414 home SetFaction 6 NPC Cook SetTeam 2 - SetPersona 2414 + SetPersona 2415 home NPC Cyberdoc SetTeam 2 - SetPersona 2415 + SetPersona 2416 home Skill 22 5 Skill 24 12 @@ -4607,7 +4614,7 @@ Scene 24 0 NPC Mechanic SetTeam 2 - SetPersona 2416 + SetPersona 2417 home Ego 16 @@ -5770,7 +5777,7 @@ Scene 36 0 end inv - monster ASSASSIN LORD + Monster ASSASSIN LORD name chardesc Old Chaotic Shy Easygoing Renowned job diff --git a/Series/ARC_TS_CrimeStory.txt b/Series/ARC_TS_CrimeStory.txt index 93a66e2..de1f510 100644 --- a/Series/ARC_TS_CrimeStory.txt +++ b/Series/ARC_TS_CrimeStory.txt @@ -31,7 +31,7 @@ sub Msg3 Msg4 Msg5 - Msg6 + Msg6 Msg7 prompt1 prompt2 diff --git a/Series/PLOT_BanditJob2.txt b/Series/PLOT_BanditJob2.txt index 1641147..b4fc693 100644 --- a/Series/PLOT_BanditJob2.txt +++ b/Series/PLOT_BanditJob2.txt @@ -91,7 +91,7 @@ sub Msg15 Msg16 Msg17 - Msg18 + Msg18 Msg19 Msg20 diff --git a/Series/PLOT_BioHunt.txt b/Series/PLOT_BioHunt.txt index 566fa93..c34dde2 100644 --- a/Series/PLOT_BioHunt.txt +++ b/Series/PLOT_BioHunt.txt @@ -172,7 +172,7 @@ sub % use "$ \VAL V4 " to insert the pay for the mission, % and don't forget to mention that the PC also gets salvage. Msg11 - Msg11_1 + Msg11_1 CMsg11_1 Msg11_2 CMsg11_2 diff --git a/Series/PLOT_CorpJob2.txt b/Series/PLOT_CorpJob2.txt index 8983b60..cb67b3f 100644 --- a/Series/PLOT_CorpJob2.txt +++ b/Series/PLOT_CorpJob2.txt @@ -166,7 +166,7 @@ sub Msg36 Msg37 Msg38 - Msg39 + Msg39 Msg40 Msg41 Msg42 @@ -199,7 +199,7 @@ sub Msg113 Msg112 Msg111 - Msg110 + Msg110 Msg109 Msg108 Msg107 @@ -207,7 +207,7 @@ sub Msg105 Msg104 Msg103 - Msg102 + Msg102 Msg101 Prompt1 diff --git a/Series/PLOT_FinalRest.txt b/Series/PLOT_FinalRest.txt index 6e6fb78..bc19529 100644 --- a/Series/PLOT_FinalRest.txt +++ b/Series/PLOT_FinalRest.txt @@ -44,7 +44,7 @@ sub Msg2 Msg3 Msg4 - Msg5 + Msg5 Msg6 Msg7 diff --git a/Series/PLOT_Gift.txt b/Series/PLOT_Gift.txt index b13730a..3da6b3f 100644 --- a/Series/PLOT_Gift.txt +++ b/Series/PLOT_Gift.txt @@ -111,15 +111,15 @@ sub Msg21 Msg22 Msg23 - Msg24 + Msg24 Msg25 Msg26 Msg27 Msg28 Msg29 - Msg30 + Msg30 Msg31 - Msg32 + Msg32 Msg33 Msg34 Msg35 diff --git a/Series/PLOT_GuardJob4.txt b/Series/PLOT_GuardJob4.txt index 2743fdf..d262398 100644 --- a/Series/PLOT_GuardJob4.txt +++ b/Series/PLOT_GuardJob4.txt @@ -101,7 +101,7 @@ sub Msg10 Msg11 - Msg12 + Msg12 Msg13 Msg14 Msg15 diff --git a/Series/PLOT_LostExpedition.txt b/Series/PLOT_LostExpedition.txt index 26951c9..691d0d0 100644 --- a/Series/PLOT_LostExpedition.txt +++ b/Series/PLOT_LostExpedition.txt @@ -113,14 +113,14 @@ sub % 11 - 15 : PC got email about mission; asked to accept Msg11 Msg12 - Msg13 + Msg13 Msg14 <\PC , I'm glad to see you... We have a situation which requires your skills. An expedition from the university has been trapped by a cave-in. They're in a monster-infested dungeon; you have to get down there and provide medical aid.> Msg15 % 16 - 20 : Player has "the right stuff"; will be offered mission. Msg16 - Msg17 - Msg18 + Msg17 + Msg18 Msg19 Msg20 diff --git a/Series/PLOT_Shimli5.txt b/Series/PLOT_Shimli5.txt index 94f2d6f..5a95bf9 100644 --- a/Series/PLOT_Shimli5.txt +++ b/Series/PLOT_Shimli5.txt @@ -31,7 +31,7 @@ sub Msg8 Msg9 - Msg10 + Msg10 Msg11 Prompt1 diff --git a/Series/PLOT_TruckGuardJob1.txt b/Series/PLOT_TruckGuardJob1.txt index 845229d..9163cbd 100644 --- a/Series/PLOT_TruckGuardJob1.txt +++ b/Series/PLOT_TruckGuardJob1.txt @@ -162,7 +162,7 @@ sub Msg11 Msg12 Msg13 - Msg14 + Msg14 Msg15 % 16 - 20 : Player is asked if he is looking for a job. @@ -180,7 +180,7 @@ sub Msg25 % 26 - 30 : Why are you taking such a dangerous route? - Msg26 + Msg26 Msg27 Msg28 Msg29 diff --git a/Series/PLOT_TruckJob1.txt b/Series/PLOT_TruckJob1.txt index a88f8fd..16dac7e 100644 --- a/Series/PLOT_TruckJob1.txt +++ b/Series/PLOT_TruckJob1.txt @@ -264,12 +264,12 @@ sub Msg7 Msg8 <\PERSONA E4 can probably tell you something about the attack.> Msg9 - Msg10 <\PERSONA E4 was the latest merchant to be robbed. Go see if you can find out anything abut the attack that might help us.> + Msg10 <\PERSONA E4 was the latest merchant to be robbed. Go see if you can find out anything about the attack that might help us.> Msg11 - Msg12 + Msg12 Msg13 Msg14 - Msg15 + Msg15 Msg16 Msg17 Msg18 @@ -534,7 +534,7 @@ sub Msg15 Msg16 Msg17 - Msg18 <\PERSONA E4 in \SCENE ESCene 4 is the buyer for this merchandise. + Msg18 <\PERSONA E4 in \SCENE ESCene 4 is the buyer for this merchandise.> Msg19 Msg20 Prompt1 diff --git a/Series/SCENE_ProtectConvoy.txt b/Series/SCENE_ProtectConvoy.txt index f215974..f9b478d 100644 --- a/Series/SCENE_ProtectConvoy.txt +++ b/Series/SCENE_ProtectConvoy.txt @@ -77,6 +77,8 @@ inv armor 8 mass 81 sub + Gyro 1 + Engine 5 Sensor 1 CPIT sub diff --git a/Series/STCdefault.txt b/Series/STCdefault.txt index 06e7808..9fead93 100644 --- a/Series/STCdefault.txt +++ b/Series/STCdefault.txt @@ -269,6 +269,17 @@ sub Rockets 1 end +MLauncher 1 +name +desig +Scale 2 +Range 6 +ACC -2 +Magazine 24 +sub + Rockets 1 +end + MLauncher 1 name desig @@ -589,10 +600,10 @@ Msg3 Msg5 Msg6 Msg7 -Msg26 -Msg30 -Msg46 -Msg50 +Msg26 +Msg30 +Msg46 +Msg50 Prop 5 name @@ -656,7 +667,7 @@ Msg2 Msg3 Msg4 Msg5 -Msg6 +Msg6 Msg7 Prop 5 diff --git a/Series/TS_CORP_DZProject_PLOT_Resistance.txt b/Series/TS_CORP_DZProject_PLOT_Resistance.txt index f0cab46..e516d13 100644 --- a/Series/TS_CORP_DZProject_PLOT_Resistance.txt +++ b/Series/TS_CORP_DZProject_PLOT_Resistance.txt @@ -167,7 +167,7 @@ sub % 26 - 30 : PC will be told exact enemy point value. % use "\VAL V3 " to insert the value. Msg26 - Msg27 + Msg27 Msg28 Msg29 Msg30 diff --git a/Series/TS_CORP_DZProject_STORY.txt b/Series/TS_CORP_DZProject_STORY.txt index 09e023c..a0e57c7 100644 --- a/Series/TS_CORP_DZProject_STORY.txt +++ b/Series/TS_CORP_DZProject_STORY.txt @@ -65,14 +65,14 @@ story % 101 - 105 : Story has ended, public outcry stopped expansion. Msg101 <\NARRATIVE 1 forced to abandon dead zone construction project following public outcry over treatment of local residents.> Msg102 <\NARRATIVE 1 to be investigated for human rights abuses in failed dead zone mining project.> - Msg103 + Msg103 Msg104 <\NARRATIVE 1 bows to public pressure; abandons plan to place toxic waste dump in tribal village.> Msg105 % 151 - 155 : Public opposes corporate expansion. Msg151 Msg152 - Msg153 + Msg153 Msg154 <\NARRATIVE 1 suspected of destroying peaceful settlements in order to secure territory for its dead zone expansion program.> Msg155 @@ -88,7 +88,7 @@ story Msg252 Msg253 Msg254 - Msg255 + Msg255 % 301 - 305 : Just tell that corp is expanding without elaboration. Msg301 <\NARRATIVE 1 plans new industrial complex on edge of dead zone.> diff --git a/Series/TS_CORP_NewFactory_PLOT_Default.txt b/Series/TS_CORP_NewFactory_PLOT_Default.txt index 81153e7..beb6eb7 100644 --- a/Series/TS_CORP_NewFactory_PLOT_Default.txt +++ b/Series/TS_CORP_NewFactory_PLOT_Default.txt @@ -172,7 +172,7 @@ sub % 06 - 10 : Player has lost the battle. Msg6 - Msg7 + Msg7 Msg8 Msg9 Msg10 diff --git a/Series/TS_GRD_BanDef_PLOT_Job1.txt b/Series/TS_GRD_BanDef_PLOT_Job1.txt index cd943b2..23abf2f 100644 --- a/Series/TS_GRD_BanDef_PLOT_Job1.txt +++ b/Series/TS_GRD_BanDef_PLOT_Job1.txt @@ -177,14 +177,14 @@ sub % 11 - 15 : Description of mission. % use "$ \VAL V4 " to insert the pay for the mission, % and don't forget to mention that the PC also gets salvage. - Msg11 + Msg11 Msg12 Msg13 Msg14 Msg15 % 16 - 20 : Player is asked if he is looking for a job. - Msg16 + Msg16 Msg17 Msg18 Msg19 diff --git a/Series/TS_GRD_PumpPusher_PLOT0_Default.txt b/Series/TS_GRD_PumpPusher_PLOT0_Default.txt index 2da2e4e..fdaa5fb 100644 --- a/Series/TS_GRD_PumpPusher_PLOT0_Default.txt +++ b/Series/TS_GRD_PumpPusher_PLOT0_Default.txt @@ -108,7 +108,7 @@ sub % 02 : PC won't take the case. Prompt2 - Prompt2_1 + Prompt2_1 % 03 : Next clue has been discovered. Prompt3 diff --git a/Series/TS_GSP_Garu_STORY.txt b/Series/TS_GSP_Garu_STORY.txt index d6b178d..1dd0a98 100644 --- a/Series/TS_GSP_Garu_STORY.txt +++ b/Series/TS_GSP_Garu_STORY.txt @@ -63,7 +63,7 @@ sub Prompt1 Prompt2 Prompt3 - CPrompt3 + CPrompt3 Prompt4 Prompt5 CPrompt5 diff --git a/Series/TS_GSP_Hermit_STORY.txt b/Series/TS_GSP_Hermit_STORY.txt index b9b9b1f..005fb18 100644 --- a/Series/TS_GSP_Hermit_STORY.txt +++ b/Series/TS_GSP_Hermit_STORY.txt @@ -36,7 +36,7 @@ sub Msg1 Msg2 - Msg3 + Msg3 Msg4 Msg5 Msg6 diff --git a/Series/TS_GSP_WarClub_PLOT_Default.txt b/Series/TS_GSP_WarClub_PLOT_Default.txt index d901de9..3f31fa9 100644 --- a/Series/TS_GSP_WarClub_PLOT_Default.txt +++ b/Series/TS_GSP_WarClub_PLOT_Default.txt @@ -27,7 +27,7 @@ sub % V1 = Been Before % V2 = Randomizer % MoveKeyItem E3 E2 to place the war club... don't forget! - rumor + rumor greeting GoKeepLooking @@ -102,7 +102,7 @@ sub Msg20 Msg21 - Msg22 + Msg22 Msg23 Msg24 Msg25 diff --git a/Series/TS_GSP_WestSide_STORY.txt b/Series/TS_GSP_WestSide_STORY.txt index e60208a..69b2249 100644 --- a/Series/TS_GSP_WestSide_STORY.txt +++ b/Series/TS_GSP_WestSide_STORY.txt @@ -129,7 +129,7 @@ sub Msg7 Msg8 Msg9 - Msg10 + Msg10 Msg11 Msg12 Msg13 diff --git a/Series/TS_GTH_Default_PLOT.txt b/Series/TS_GTH_Default_PLOT.txt index 50edec8..19ae1c8 100644 --- a/Series/TS_GTH_Default_PLOT.txt +++ b/Series/TS_GTH_Default_PLOT.txt @@ -64,7 +64,7 @@ sub CMsg2_2 Msg2_3 CMsg2_3 - Msg2_4 + Msg2_4 CMsg2_4 Msg2_5 CMsg2_5 diff --git a/Series/TS_MIL_Default_PLOT_Default.txt b/Series/TS_MIL_Default_PLOT_Default.txt index b196977..52b3a70 100644 --- a/Series/TS_MIL_Default_PLOT_Default.txt +++ b/Series/TS_MIL_Default_PLOT_Default.txt @@ -212,7 +212,7 @@ sub Msg11_4 CMsg11_4 Msg11_5 - Msg11_6 + Msg11_6 CMsg11_6 Msg11_7 CMsg11_7 diff --git a/Series/TS_MONK_ItemSearch_PLOT1_HistoricSite.txt b/Series/TS_MONK_ItemSearch_PLOT1_HistoricSite.txt index b0ee240..0205384 100644 --- a/Series/TS_MONK_ItemSearch_PLOT1_HistoricSite.txt +++ b/Series/TS_MONK_ItemSearch_PLOT1_HistoricSite.txt @@ -107,7 +107,7 @@ sub % 16 - 18 : PC has lost the mission. Msg16 - Msg17 + Msg17 Msg18 % 101 : The item somehow got destroyed... diff --git a/Series/TS_MONK_ItemSearch_PLOT2_FireOfHeaven.txt b/Series/TS_MONK_ItemSearch_PLOT2_FireOfHeaven.txt index 31187be..f25a09a 100644 --- a/Series/TS_MONK_ItemSearch_PLOT2_FireOfHeaven.txt +++ b/Series/TS_MONK_ItemSearch_PLOT2_FireOfHeaven.txt @@ -88,7 +88,7 @@ inv sub gear 4 3 20 name - type + type scale 0 mass 2 Range 6 diff --git a/Series/TS_PLOT_BiocorpBasement.txt b/Series/TS_PLOT_BiocorpBasement.txt index 2d7ba0c..bb09492 100644 --- a/Series/TS_PLOT_BiocorpBasement.txt +++ b/Series/TS_PLOT_BiocorpBasement.txt @@ -22,7 +22,7 @@ sub Msg1 Msg2 Msg4 - Msg5 + Msg5 Msg6 Msg7 <\PERSONA 2407 in \SCENE SCeneID wants you to destroy the spawning vat in the basement of BioCorp Labs.> Msg8 diff --git a/Series/TS_PLOT_CorporatePromotion_1.txt b/Series/TS_PLOT_CorporatePromotion_1.txt index 05a29a1..81bcff0 100644 --- a/Series/TS_PLOT_CorporatePromotion_1.txt +++ b/Series/TS_PLOT_CorporatePromotion_1.txt @@ -24,7 +24,7 @@ Plot 0 Msg1 <\ELEMENT 2 @ \SCENE EScene 2 :// You've earned a promotion. Come see me to accept your reward.> Msg2 <\ELEMENT 2 @ \SCENE EScene 2 :// I have urgent business which requires your attention at once.> Msg3 <\ELEMENT 2 @ \SCENE EScene 2 :// Report here for debriefing at once, soldier.> - Msg4 <\ELEMENT 2 @ \SCENE EScene 2 :// You have been promoted. Report here to receive your comission.> + Msg4 <\ELEMENT 2 @ \SCENE EScene 2 :// You have been promoted. Report here to receive your commission.> Msg5 <\ELEMENT 2 @ \SCENE EScene 2 :// Your presence is required at headquarters immediately.> sub diff --git a/Series/TS_PLOT_GuardianPromotion_1.txt b/Series/TS_PLOT_GuardianPromotion_1.txt index 66a9aea..62fc470 100644 --- a/Series/TS_PLOT_GuardianPromotion_1.txt +++ b/Series/TS_PLOT_GuardianPromotion_1.txt @@ -25,7 +25,7 @@ Plot 0 Msg1 <\ELEMENT 2 @ \SCENE EScene 2 :// You've earned a promotion. Come see me to accept your reward.> Msg2 <\ELEMENT 2 @ \SCENE EScene 2 :// I have urgent business which requires your attention at once.> Msg3 <\ELEMENT 2 @ \SCENE EScene 2 :// Report here for debriefing at once, \RANK .> - Msg4 <\ELEMENT 2 @ \SCENE EScene 2 :// You have been promoted. Report here to receive your comission.> + Msg4 <\ELEMENT 2 @ \SCENE EScene 2 :// You have been promoted. Report here to receive your commission.> Msg5 <\ELEMENT 2 @ \SCENE EScene 2 :// Your presence is required at headquarters immediately.> sub diff --git a/Series/TS_PLOT_IriaRuby.txt b/Series/TS_PLOT_IriaRuby.txt index 6e0947e..85fba20 100644 --- a/Series/TS_PLOT_IriaRuby.txt +++ b/Series/TS_PLOT_IriaRuby.txt @@ -120,7 +120,7 @@ sub result15 result16 result17 - Msg1 + Msg1 Msg2 Msg3 Msg4 diff --git a/Series/TS_STORY_Cetus_PLOT_1.txt b/Series/TS_STORY_Cetus_PLOT_1.txt index 1f4890e..6c32057 100644 --- a/Series/TS_STORY_Cetus_PLOT_1.txt +++ b/Series/TS_STORY_Cetus_PLOT_1.txt @@ -92,8 +92,8 @@ sub Msg1 Msg2 Msg3 - Msg4 - Msg5 + Msg4 + Msg5 Prompt1 Prompt2 Prompt3 @@ -173,7 +173,7 @@ sub Persona 4 greeting GoFirstTime - Msg1 + Msg1 end diff --git a/Series/TS_STORY_Cetus_PLOT_2a.txt b/Series/TS_STORY_Cetus_PLOT_2a.txt index 1b19d83..d100490 100644 --- a/Series/TS_STORY_Cetus_PLOT_2a.txt +++ b/Series/TS_STORY_Cetus_PLOT_2a.txt @@ -54,7 +54,7 @@ sub Msg1 Msg2 Msg3 - Msg4 + Msg4 Msg5 <\ELEMENT 1 shopping area destroyed after being attacked by Cetus. At least seven people dead.> Msg21 diff --git a/Series/TS_Scene_Convoy1.txt b/Series/TS_Scene_Convoy1.txt index 1c58228..f1edfc2 100644 --- a/Series/TS_Scene_Convoy1.txt +++ b/Series/TS_Scene_Convoy1.txt @@ -135,6 +135,8 @@ inv armor 8 mass 81 sub + Gyro 1 + Engine 8 Sensor 1 CPIT sub diff --git a/Series/TS_Story_RobotWarriors.txt b/Series/TS_Story_RobotWarriors.txt index c67a5e6..cd15df1 100644 --- a/Series/TS_Story_RobotWarriors.txt +++ b/Series/TS_Story_RobotWarriors.txt @@ -68,7 +68,7 @@ sub Msg4 Msg5 - Msg6 + Msg6 Msg7 Msg8 Msg9 @@ -147,7 +147,7 @@ sub msg1 msg2 - msg3 + msg3 Msg4 Msg5 Msg6 diff --git a/Series/TS_XRAN_SCENE_MarsNeedsClones.txt b/Series/TS_XRAN_SCENE_MarsNeedsClones.txt index a8f144e..bf758b7 100644 --- a/Series/TS_XRAN_SCENE_MarsNeedsClones.txt +++ b/Series/TS_XRAN_SCENE_MarsNeedsClones.txt @@ -24,7 +24,7 @@ sub Team 2 SetEnemy 1 - Set Ally 3 + SetAlly 3 Team 3 home diff --git a/Series/TS_XRAN_a--F_Investigation.txt b/Series/TS_XRAN_a--F_Investigation.txt index 4346c83..4df5ffd 100644 --- a/Series/TS_XRAN_a--F_Investigation.txt +++ b/Series/TS_XRAN_a--F_Investigation.txt @@ -134,7 +134,7 @@ sub CMsg4_4 Msg4_5 CMsg4_5 - Msg4_6 + Msg4_6 CMsg4_6 Msg5 diff --git a/Series/TS_XRAN_a--X_Accused.txt b/Series/TS_XRAN_a--X_Accused.txt index e98e805..bd65da4 100644 --- a/Series/TS_XRAN_a--X_Accused.txt +++ b/Series/TS_XRAN_a--X_Accused.txt @@ -79,8 +79,8 @@ sub Msg5 Msg6 Msg7 - Msg8 - Msg9 + Msg8 + Msg9 Prompt1 Prompt2 Prompt3 diff --git a/Series/TS_XRAN_a-AU_Diary.txt b/Series/TS_XRAN_a-AU_Diary.txt index 6ad9321..4ae8663 100644 --- a/Series/TS_XRAN_a-AU_Diary.txt +++ b/Series/TS_XRAN_a-AU_Diary.txt @@ -74,7 +74,7 @@ sub CMsg2_15 Msg2_16 CMsg2_16 - Msg2_17 + Msg2_17 CMsg2_17 diff --git a/Series/TS_XRAN_a-R-_KnowTooMuch.txt b/Series/TS_XRAN_a-R-_KnowTooMuch.txt index a6f9d9b..f5f5c15 100644 --- a/Series/TS_XRAN_a-R-_KnowTooMuch.txt +++ b/Series/TS_XRAN_a-R-_KnowTooMuch.txt @@ -52,7 +52,7 @@ sub GoStartFight Msg1 - Msg1_1 + Msg1_1 CMsg1_1 Msg1_2 CMsg1_2 @@ -61,7 +61,7 @@ sub Msg2 Msg2_1 - Msg2_2 + Msg2_2 Msg2_3 Msg2_4 diff --git a/Series/TS_XRAN_aC--_FaceYourEnemy.txt b/Series/TS_XRAN_aC--_FaceYourEnemy.txt index 24103f2..bf32ec7 100644 --- a/Series/TS_XRAN_aC--_FaceYourEnemy.txt +++ b/Series/TS_XRAN_aC--_FaceYourEnemy.txt @@ -83,7 +83,7 @@ sub CMsg1_4 Msg1_5 CMsg1_5 - Msg1_6 + Msg1_6 CMsg1_6 Msg1_7 CMsg1_7 @@ -148,7 +148,7 @@ sub CMsg8_13 Msg9 - Msg9_3 + Msg9_3 CMsg9_3 Msg9_4 CMsg9_4 diff --git a/Series/TS_XRAN_aC--_MarsNeedsClones.txt b/Series/TS_XRAN_aC--_MarsNeedsClones.txt index 200cf0c..16c2a3e 100644 --- a/Series/TS_XRAN_aC--_MarsNeedsClones.txt +++ b/Series/TS_XRAN_aC--_MarsNeedsClones.txt @@ -45,7 +45,7 @@ sub CMsg1_1 Msg1_2 CMsg1_2 - Msg1_3 + Msg1_3 CMsg1_3 Msg1_4 CMsg1_4 diff --git a/Series/TS_XRAN_aC-L_SchoolPals.txt b/Series/TS_XRAN_aC-L_SchoolPals.txt index 78515d7..57a0db6 100644 --- a/Series/TS_XRAN_aC-L_SchoolPals.txt +++ b/Series/TS_XRAN_aC-L_SchoolPals.txt @@ -190,7 +190,7 @@ sub CMsg9_4 Msg9_5 CMsg9_5 - Msg9_6 + Msg9_6 CMsg9_6 Msg10 <\ELEMENT 2 in \ELEMENT 1 asked you to speak with \ELEMENT 4 in \ELEMENT 3 .> diff --git a/Series/TS_XRAN_aF--_Hunter.txt b/Series/TS_XRAN_aF--_Hunter.txt index ea463f6..b82ced5 100644 --- a/Series/TS_XRAN_aF--_Hunter.txt +++ b/Series/TS_XRAN_aF--_Hunter.txt @@ -113,7 +113,7 @@ sub Persona 4 greeting - Msg1 + Msg1 Msg1_1 CMsg1_1 Msg1_2 @@ -128,7 +128,7 @@ sub CMsg1_6 Msg1_7 CMsg1_7 - Msg1_11 + Msg1_11 CMsg1_11 Msg1_12 CMsg1_12 diff --git a/Series/WMONdefault.txt b/Series/WMONdefault.txt index 97e0b6c..dfbadfb 100644 --- a/Series/WMONdefault.txt +++ b/Series/WMONdefault.txt @@ -1092,7 +1092,7 @@ sdl_sprite sdl_colors <157 172 183 162 153 235 230 0 0> sdl_portrait type -CHAT_ATTACK +CHAT_ATTACK % Begin Science block. clue29 GoPelt