From 40054169fd4685ea58f61e59c1a0a05fb2d16c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Kapu=C5=9Bci=C5=84ski?= Date: Sat, 26 Oct 2024 14:05:49 +0200 Subject: [PATCH] Fixed incorrect battery states --- .../exercises/chapter001/level005/scene.txt | 22 +++++++++---------- .../exercises/chapter006/level003/scene.txt | 2 +- .../exercises/chapter007/level001/scene.txt | 2 +- .../exercises/chapter007/level002/scene.txt | 2 +- .../exercises/chapter007/level003/scene.txt | 2 +- levels/missions/chapter004/level004/scene.txt | 12 +++++----- levels/missions/chapter006/level003/scene.txt | 4 ++-- levels/missions/chapter006/level004/scene.txt | 2 +- levels/plus/chapter004/level004/scene.txt | 14 ++++++------ levels/plus/chapter006/level004/scene.txt | 4 ++-- levels/plus/chapter006/level005/scene.txt | 2 +- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/levels/exercises/chapter001/level005/scene.txt b/levels/exercises/chapter001/level005/scene.txt index 36472871..ab0ed413 100644 --- a/levels/exercises/chapter001/level005/scene.txt +++ b/levels/exercises/chapter001/level005/scene.txt @@ -34,17 +34,17 @@ TerrainCreate BeginObject CreateObject pos= 16; -13 dir=1.5 type=Me range=200 -CreateObject pos= 8; -3 dir=1.5 type=WheeledGrabber reset=1 trainer=1 script4="tcell2.txt" scriptRunnable4=false power=1 -CreateObject pos= 15; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= 12; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= 9; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= 6; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= 3; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= 0; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= -3; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= -6; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= -9; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 -CreateObject pos= -12; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=0 selectable=0 +CreateObject pos= 8; -3 dir=1.5 type=WheeledGrabber reset=1 trainer=1 script4="tcell2.txt" scriptRunnable4=false +CreateObject pos= 15; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= 12; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= 9; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= 6; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= 3; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= 0; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= -3; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= -6; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= -9; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 +CreateObject pos= -12; 5 dir=1.5 type=WingedShooter reset=1 script1="wingsh02.txt" run=1 range=200 power=-1 selectable=0 CreateObject pos= 0; -3 dir=0.0 type=PowerCell CreateObject pos= 1; -4 dir=0.0 type=PowerCell CreateObject pos= 2; -6 dir=0.0 type=PowerCell diff --git a/levels/exercises/chapter006/level003/scene.txt b/levels/exercises/chapter006/level003/scene.txt index 0f84a80a..47098dd3 100644 --- a/levels/exercises/chapter006/level003/scene.txt +++ b/levels/exercises/chapter006/level003/scene.txt @@ -68,7 +68,7 @@ CreateObject pos=37.50;-85.00 dir=0.0 type=GoalArea CreateObject pos=22.50;-90.00 dir=0.0 type=ExchangePost CreateObject pos=42.00;-85.00 dir=1.2 type=Me option=1 CreateObject pos=37.50;-75.00 dir=1.0 type=PracticeBot reset=1 trainer=1 script1="tremot2b.txt" run=1 //selectable=0 -CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot2a.txt" scriptRunnable4=false power=0 select=1 +CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot2a.txt" scriptRunnable4=false power=-1 select=1 CreateObject pos=27.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-85.00 dir=0.0 type=WayPoint reset=1 diff --git a/levels/exercises/chapter007/level001/scene.txt b/levels/exercises/chapter007/level001/scene.txt index 247e84d4..c544b597 100644 --- a/levels/exercises/chapter007/level001/scene.txt +++ b/levels/exercises/chapter007/level001/scene.txt @@ -67,7 +67,7 @@ CreateObject pos=37.50;-75.00 dir=0.0 type=StartArea CreateObject pos=37.50;-85.00 dir=0.0 type=GoalArea CreateObject pos=42.00;-85.00 dir=1.2 type=Me option=1 CreateObject pos=37.50;-75.00 dir=1.0 type=PracticeBot reset=1 trainer=1 script1="tremot3b.txt" run=1 //selectable=0 -CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot3a.txt" scriptRunnable4=false power=0 select=1 +CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot3a.txt" scriptRunnable4=false power=-1 select=1 CreateObject pos=27.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-85.00 dir=0.0 type=WayPoint reset=1 diff --git a/levels/exercises/chapter007/level002/scene.txt b/levels/exercises/chapter007/level002/scene.txt index b3ddab2f..25d612c7 100644 --- a/levels/exercises/chapter007/level002/scene.txt +++ b/levels/exercises/chapter007/level002/scene.txt @@ -67,7 +67,7 @@ CreateObject pos=37.50;-75.00 dir=0.0 type=StartArea CreateObject pos=37.50;-85.00 dir=0.0 type=GoalArea CreateObject pos=42.00;-85.00 dir=1.2 type=Me option=1 CreateObject pos=37.50;-75.00 dir=1.0 type=PracticeBot reset=1 trainer=1 script1="tremot4b.txt" run=1 //selectable=0 -CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot4a.txt" scriptRunnable4=false power=0 select=1 +CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot4a.txt" scriptRunnable4=false power=-1 select=1 CreateObject pos=27.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-85.00 dir=0.0 type=WayPoint reset=1 diff --git a/levels/exercises/chapter007/level003/scene.txt b/levels/exercises/chapter007/level003/scene.txt index b53b46f0..313b6946 100644 --- a/levels/exercises/chapter007/level003/scene.txt +++ b/levels/exercises/chapter007/level003/scene.txt @@ -67,7 +67,7 @@ CreateObject pos=37.50;-75.00 dir=0.0 type=StartArea CreateObject pos=37.50;-85.00 dir=0.0 type=GoalArea CreateObject pos=42.00;-85.00 dir=1.2 type=Me option=1 CreateObject pos=37.50;-75.00 dir=1.0 type=PracticeBot reset=1 trainer=1 script1="tremot5b.txt" run=1 //selectable=0 -CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot5a.txt" scriptRunnable4=false power=0 select=1 +CreateObject pos=42.00;-82.00 dir=1.0 type=WheeledGrabber script4="tremot5a.txt" scriptRunnable4=false power=-1 select=1 CreateObject pos=27.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-75.00 dir=0.0 type=WayPoint reset=1 CreateObject pos=17.50;-85.00 dir=0.0 type=WayPoint reset=1 diff --git a/levels/missions/chapter004/level004/scene.txt b/levels/missions/chapter004/level004/scene.txt index c2b2c98b..f8fbe4ec 100644 --- a/levels/missions/chapter004/level004/scene.txt +++ b/levels/missions/chapter004/level004/scene.txt @@ -27,7 +27,7 @@ CreateObject pos=29.50;-78.25 dir=1.5 type=WingedGrabber script3="exchg1.txt" sc // Cratère entrée CreateObject pos= 32;103 dir=0.3 type=WreckBotw1 -CreateObject pos= 28; 84 dir=1.2 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos= 28; 84 dir=1.2 type=TrackedShooter power=-1 proxyActivate=1 // Cratère ouest CreateObject pos=-136;200 dir=0.7 type=RuinBotFactory @@ -37,12 +37,12 @@ CreateObject pos=-136;200 dir=0.1 type=PowerCell power=0.2 proxyActivate=1 CreateObject pos=-136;205 dir=0.5 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-140;202 dir=0.2 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-142;198 dir=0.3 type=PowerCell power=0.3 proxyActivate=1 -CreateObject pos=-170;278 dir=1.2 type=WingedShooter power=0 proxyActivate=1 +CreateObject pos=-170;278 dir=1.2 type=WingedShooter power=-1 proxyActivate=1 CreateObject pos=-161;274 dir=0.3 type=WreckBotw2 CreateObject pos=-171;281 dir=0.7 type=WreckBott1 -CreateObject pos=-163;282 dir=1.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos=-163;282 dir=1.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos=-166;282 dir=0.3 type=PowerCell power=0.0 proxyActivate=1 -CreateObject pos=-116;197 dir=0.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos=-116;197 dir=0.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos=-114;200 dir=0.4 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-113;193 dir=0.9 type=Quartz1 CreateObject pos=-129;212 dir=0.5 type=Quartz3 @@ -66,7 +66,7 @@ CreateObject pos=-149;267 dir=0.1 type=Quartz3 // Cratère est CreateObject pos= 79;204 dir=0.7 type=RuinRadar -CreateObject pos= 105;223 dir=0.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos= 105;223 dir=0.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos= 97;223 dir=0.9 type=WreckBott2 CreateObject pos= 116;235 dir=0.5 type=Quartz1 CreateObject pos= 117;241 dir=0.5 type=Quartz3 @@ -77,7 +77,7 @@ CreateObject pos= 129;256 dir=0.2 type=Quartz1 CreateObject pos= 130;250 dir=1.0 type=Quartz3 CreateObject pos= 138;265 dir=0.2 type=Quartz2 CreateObject pos= 138;298 dir=0.5 type=Quartz1 -CreateObject pos= 163;295 dir=1.0 type=WingedShooter power=0 proxyActivate=1 +CreateObject pos= 163;295 dir=1.0 type=WingedShooter power=-1 proxyActivate=1 CreateObject pos= 177;288 dir=0.3 type=WreckBott1 h=-1 CreateObject pos= 181;293 dir=0.9 type=PowerStation proxyActivate=1 CreateObject pos= 190;300 dir=1.3 type=RuinBotFactory diff --git a/levels/missions/chapter006/level003/scene.txt b/levels/missions/chapter006/level003/scene.txt index c9fdbb96..21a19171 100644 --- a/levels/missions/chapter006/level003/scene.txt +++ b/levels/missions/chapter006/level003/scene.txt @@ -32,13 +32,13 @@ CreateObject pos= 17;-64 dir=0.7 type=Greenery15 CreateObject pos= 18;-56 dir=0.0 type=PowerCell power=0.8 CreateObject pos= 21;-55 dir=0.4 type=NuclearCell power=0.4 CreateObject pos= 21;-61 dir=0.4 type=BotFactory -CreateObject pos= 21;-61 dir=1.4 type=LeggedShooter power=0.0 proxyActivate=1 proxyDistance=12 +CreateObject pos= 21;-61 dir=1.4 type=LeggedShooter power=-1 proxyActivate=1 proxyDistance=12 CreateObject pos= 21;-72 dir=1.1 type=WreckBotw1 CreateObject pos= 23;-73 dir=0.1 type=PowerCell power=0.2 CreateObject pos= 26;-59 dir=0.0 type=PowerCell power=1.0 CreateObject pos= 28;-47 dir=1.7 type=Greenery17 CreateObject pos= 31;-59 dir=0.5 type=RuinConvert -CreateObject pos= 31;-59 dir=1.3 type=LeggedShooter power=0.0 proxyActivate=1 proxyDistance=12 +CreateObject pos= 31;-59 dir=1.3 type=LeggedShooter power=-1 proxyActivate=1 proxyDistance=12 CreateObject pos= 35;-58 dir=0.4 type=Greenery15 CreateObject pos= 37;-50 dir=0.2 type=Greenery16 CreateObject pos= 40;-47 dir=1.8 type=Greenery19 diff --git a/levels/missions/chapter006/level004/scene.txt b/levels/missions/chapter006/level004/scene.txt index 82b6ecd2..c32cb277 100644 --- a/levels/missions/chapter006/level004/scene.txt +++ b/levels/missions/chapter006/level004/scene.txt @@ -79,7 +79,7 @@ CreateObject pos=-348;54 dir=0.4 type=RuinConvert CreateObject pos=-329;50 dir=0.4 type=WreckBotw2 CreateObject pos=-331;51 dir=0.4 type=PowerCell power=0.1 CreateObject pos=-348;54 dir=0.0 type=NuclearCell power=0.4 proxyActivate=1 proxyDistance=5 -CreateObject pos=-345;82 dir=1.2 type=WingedOrgaShooter power=0 proxyActivate=1 proxyDistance=12 camera=BACK +CreateObject pos=-345;82 dir=1.2 type=WingedOrgaShooter power=-1 proxyActivate=1 proxyDistance=12 camera=BACK CreateObject pos=-308;50 dir=0.0 type=Greenery16 CreateObject pos=-305;43 dir=0.4 type=Greenery15 CreateObject pos=-309;41 dir=0.1 type=Greenery17 diff --git a/levels/plus/chapter004/level004/scene.txt b/levels/plus/chapter004/level004/scene.txt index 06871608..47915fee 100644 --- a/levels/plus/chapter004/level004/scene.txt +++ b/levels/plus/chapter004/level004/scene.txt @@ -26,7 +26,7 @@ CreateObject pos=29.50;-78.25 dir=1.5 type=WingedGrabber script3="exchg1.txt" sc // Cratère entrée CreateObject pos= 32;103 dir=0.3 type=WreckBotw1 -CreateObject pos= 28; 84 dir=1.2 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos= 28; 84 dir=1.2 type=TrackedShooter power=-1 proxyActivate=1 // Cratère ouest CreateObject pos=-136;200 dir=0.7 type=RuinBotFactory @@ -36,12 +36,12 @@ CreateObject pos=-136;200 dir=0.1 type=PowerCell power=0.2 proxyActivate=1 CreateObject pos=-136;205 dir=0.5 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-140;202 dir=0.2 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-142;198 dir=0.3 type=PowerCell power=0.3 proxyActivate=1 -CreateObject pos=-170;278 dir=1.2 type=WingedShooter power=0 proxyActivate=1 +CreateObject pos=-170;278 dir=1.2 type=WingedShooter power=-1 proxyActivate=1 CreateObject pos=-161;274 dir=0.3 type=WreckBotw2 CreateObject pos=-171;281 dir=0.7 type=WreckBott1 -CreateObject pos=-163;282 dir=1.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos=-163;282 dir=1.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos=-166;282 dir=0.3 type=PowerCell power=0.0 proxyActivate=1 -CreateObject pos=-116;197 dir=0.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos=-116;197 dir=0.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos=-114;200 dir=0.4 type=PowerCell power=0.0 proxyActivate=1 CreateObject pos=-113;193 dir=0.9 type=Quartz1 CreateObject pos=-129;212 dir=0.5 type=Quartz3 @@ -65,7 +65,7 @@ CreateObject pos=-149;267 dir=0.1 type=Quartz3 // Cratère est CreateObject pos= 79;204 dir=0.7 type=RuinRadar -CreateObject pos= 105;223 dir=0.8 type=TrackedShooter power=0 proxyActivate=1 +CreateObject pos= 105;223 dir=0.8 type=TrackedShooter power=-1 proxyActivate=1 CreateObject pos= 97;223 dir=0.9 type=WreckBott2 CreateObject pos= 116;235 dir=0.5 type=Quartz1 CreateObject pos= 117;241 dir=0.5 type=Quartz3 @@ -76,9 +76,9 @@ CreateObject pos= 129;256 dir=0.2 type=Quartz1 CreateObject pos= 130;250 dir=1.0 type=Quartz3 CreateObject pos= 138;265 dir=0.2 type=Quartz2 CreateObject pos= 138;298 dir=0.5 type=Quartz1 -CreateObject pos= 163;295 dir=1.0 type=WingedShooter power=0 proxyActivate=1 +CreateObject pos= 163;295 dir=1.0 type=WingedShooter power=-1 proxyActivate=1 //CreateObject pos= 177;288 dir=0.3 type=WreckBott1 h=-1 -CreateObject pos= 177;288 dir=0.3 type=TrackedBuilder power=0 proxyActivate=1 +CreateObject pos= 177;288 dir=0.3 type=TrackedBuilder power=-1 proxyActivate=1 CreateObject pos= 181;293 dir=0.9 type=PowerStation proxyActivate=1 CreateObject pos= 190;300 dir=1.3 type=RuinBotFactory CreateObject pos= 194;295 dir=0.2 type=PowerCell power=0.3 proxyActivate=1 diff --git a/levels/plus/chapter006/level004/scene.txt b/levels/plus/chapter006/level004/scene.txt index 7d016dc2..7bce422f 100644 --- a/levels/plus/chapter006/level004/scene.txt +++ b/levels/plus/chapter006/level004/scene.txt @@ -32,13 +32,13 @@ CreateObject pos= 17;-64 dir=0.7 type=Greenery15 CreateObject pos= 18;-56 dir=0.0 type=PowerCell power=0.8 CreateObject pos= 21;-55 dir=0.4 type=NuclearCell power=0.4 CreateObject pos= 21;-61 dir=0.4 type=BotFactory -CreateObject pos= 21;-61 dir=1.4 type=LeggedShooter power=0.0 proxyActivate=1 proxyDistance=12 +CreateObject pos= 21;-61 dir=1.4 type=LeggedShooter power=-1 proxyActivate=1 proxyDistance=12 CreateObject pos= 21;-72 dir=1.1 type=WreckBotw1 CreateObject pos= 23;-73 dir=0.1 type=PowerCell power=0.2 CreateObject pos= 26;-59 dir=0.0 type=PowerCell power=1.0 CreateObject pos= 28;-47 dir=1.7 type=Greenery17 CreateObject pos= 31;-59 dir=0.5 type=RuinConvert -CreateObject pos= 31;-59 dir=1.3 type=LeggedShooter power=0.0 proxyActivate=1 proxyDistance=12 +CreateObject pos= 31;-59 dir=1.3 type=LeggedShooter power=-1 proxyActivate=1 proxyDistance=12 CreateObject pos= 35;-58 dir=0.4 type=Greenery15 CreateObject pos= 37;-50 dir=0.2 type=Greenery16 CreateObject pos= 40;-47 dir=1.8 type=Greenery19 diff --git a/levels/plus/chapter006/level005/scene.txt b/levels/plus/chapter006/level005/scene.txt index 506f68e0..2074b523 100644 --- a/levels/plus/chapter006/level005/scene.txt +++ b/levels/plus/chapter006/level005/scene.txt @@ -86,7 +86,7 @@ CreateObject pos=-342;59 dir=0.4 type=PowerCell power=0.0 CreateObject pos=-321;53 dir=0.4 type=PowerCell power=0.0 CreateObject pos=-304;48 dir=0.4 type=PowerCell power=0.0 CreateObject pos=-348;54 dir=0.0 type=NuclearCell power=0.4 proxyActivate=1 proxyDistance=5 -CreateObject pos=-345;82 dir=1.2 type=WingedOrgaShooter power=0 proxyActivate=1 proxyDistance=12 camera=BACK +CreateObject pos=-345;82 dir=1.2 type=WingedOrgaShooter power=-1 proxyActivate=1 proxyDistance=12 camera=BACK CreateObject pos=-308;50 dir=0.0 type=Greenery16 CreateObject pos=-305;43 dir=0.4 type=Greenery15 CreateObject pos=-309;41 dir=0.1 type=Greenery17