Skip to content

Commit

Permalink
Merge pull request #122 from colobot/dev-splitplanet
Browse files Browse the repository at this point in the history
Split Crystalium planet atmosphere files to remove duplicate lines
  • Loading branch information
Emxx52 authored Nov 27, 2024
2 parents 4ff1299 + a759b71 commit 64c226b
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 36 deletions.
1 change: 1 addition & 0 deletions levels/free/chapter004/level001/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ HelpFile name="cbot.txt"
Audio filename="music004.ogg"

#Include file="levels/missions/chapter004/planet.txt"
#Include file="levels/missions/chapter004/clear.txt"
TerrainRelief image="relief05.png" factor=1.0
TerrainResource image="res08.png"
TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0.000;0.502;1.000;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
AmbientColor air=0.400;0.400;0.400;0.400 water=0.078;0.078;0.078;0.078 // grey
FogColor air=0.706;0.871;1.000;0.000 water=0.039;0.078;0.392;0.000 // grey
VehicleColor color=0.686;0.820;0.843;0.000 // bleu-sable
DeepView air=100.00 water=25.00
FogStart air=0.1 water=0.1
SecondTexture rank=3
Background up=0.298;0.412;0.886;0.000 down=0.753;0.980;1.000;
ForegroundName image="lens5.png"
Background up=0.298;0.412;0.886;0.000 down=0.753;0.980;1.000;0.000
Planet pos=0.00;0.70 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=1.00;0.60 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=1.20;0.40 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Expand All @@ -16,7 +9,3 @@ Planet pos=3.85;0.30 dim=0.06 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=4.00;0.70 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=4.10;0.50 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=5.30;0.30 dim=0.08 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75

TerrainGenerate vision=400.00 depth=1 hard=0.7
TerrainRelief image="relief05.png" factor=1.0
TerrainResource image="res00.png"
2 changes: 2 additions & 0 deletions levels/missions/chapter004/foggy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Background up=0.706;0.871;1.000;0.000 down=0.706;0.871;1.000;0.000
TerrainWind speed=0.0;0.1
3 changes: 2 additions & 1 deletion levels/missions/chapter004/level001/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ Planet mode=1 pos=3.85; 0.10 dim=0.06 image="effect01.png" uv1=0.00;0.50 uv2=0.2
Planet mode=1 pos=4.00;-0.50 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet mode=1 pos=4.20; 0.30 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75

#Include file="%chap%/planet12.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/clear.txt"
TerrainRelief image="relief05.png" factor=1.0
TerrainResource image="res00.png"
TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0.000;0.502;1.000;
Expand Down
3 changes: 2 additions & 1 deletion levels/missions/chapter004/level002/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet12.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/clear.txt"
TerrainRelief image="relief19.png" factor=1.0
TerrainResource image="res03.png"
TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0.000;0.502;1.000;
Expand Down
3 changes: 2 additions & 1 deletion levels/missions/chapter004/level003/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet34.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/foggy.txt"
TerrainRelief image="relief25.png" factor=1.0
TerrainResource image="resae.png"
//TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0;128;255;0
Expand Down
3 changes: 2 additions & 1 deletion levels/missions/chapter004/level004/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet34.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/foggy.txt"
TerrainRelief image="relief20.png" factor=1.0
TerrainResource image="resae.png"
//TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0;128;255;0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ VehicleColor color=0.686;0.820;0.843;0.000 // bleu-sable
DeepView air=100.00 water=25.00
FogStart air=0.1 water=0.1
SecondTexture rank=3
Background up=0.706;0.871;1.000;0.000 down=0.706;0.871;1.000;0.000
ForegroundName image="lens5.png"

TerrainGenerate vision=400.00 depth=1 hard=0.7
TerrainWind speed=0.0;0.1
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
AmbientColor air=0.400;0.400;0.400;0.400 water=0.078;0.078;0.078;0.078 // grey
FogColor air=0.706;0.871;1.000;0.000 water=0.039;0.078;0.392;0.000 // grey
VehicleColor color=0.686;0.820;0.843;0.000 // bleu-sable
DeepView air=100.00 water=25.00
FogStart air=0.1 water=0.1
SecondTexture rank=3
Background up=0.298;0.412;0.886;0.000 down=0.753;0.980;1.000;
ForegroundName image="lens5.png"
Background up=0.298;0.412;0.886;0.000 down=0.753;0.980;1.000;0.000
Planet pos=0.00;0.70 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=1.00;0.60 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=1.20;0.40 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Expand All @@ -16,7 +9,3 @@ Planet pos=3.85;0.30 dim=0.06 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=4.00;0.70 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=4.10;0.50 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet pos=5.30;0.30 dim=0.08 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75

TerrainGenerate vision=400.00 depth=1 hard=0.7
TerrainRelief image="relief05.png" factor=1.0
TerrainResource image="res00.png"
2 changes: 2 additions & 0 deletions levels/plus/chapter004/foggy.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Background up=0.706;0.871;1.000;0.000 down=0.706;0.871;1.000;0.000
TerrainWind speed=0.0;0.1
3 changes: 2 additions & 1 deletion levels/plus/chapter004/level001/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ Planet mode=1 pos=3.85; 0.10 dim=0.06 image="effect01.png" uv1=0.00;0.50 uv2=0.2
Planet mode=1 pos=4.00;-0.50 dim=0.02 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75
Planet mode=1 pos=4.20; 0.30 dim=0.03 image="effect01.png" uv1=0.00;0.50 uv2=0.25;0.75

#Include file="%chap%/planet12.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/clear.txt"
TerrainRelief image="relief05.png" factor=1.0
TerrainResource image="res00.png"
TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0.000;0.502;1.000;
Expand Down
3 changes: 2 additions & 1 deletion levels/plus/chapter004/level002/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet12.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/clear.txt"
TerrainRelief image="relief19.png" factor=1.0
TerrainResource image="res03.png"
TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0.000;0.502;1.000;
Expand Down
3 changes: 2 additions & 1 deletion levels/plus/chapter004/level003/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet34.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/foggy.txt"
TerrainRelief image="relief25.png" factor=1.0
TerrainResource image="resae.png"
//TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0;128;255;0
Expand Down
3 changes: 2 additions & 1 deletion levels/plus/chapter004/level004/scene.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ EndingFile lost="other/lost000.txt"

Audio filename="music004.ogg"

#Include file="%chap%/planet34.txt"
#Include file="%chap%/planet.txt"
#Include file="%chap%/foggy.txt"
TerrainRelief image="relief20.png" factor=1.0
TerrainResource image="resae.png"
//TerrainWater image="lava04.png" level=30.0 moveX=1.0 moveY=0.3 water=TO color=0;128;255;0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ VehicleColor color=0.686;0.820;0.843;0.000 // bleu-sable
DeepView air=100.00 water=25.00
FogStart air=0.1 water=0.1
SecondTexture rank=3
Background up=0.706;0.871;1.000;0.000 down=0.706;0.871;1.000;0.000
ForegroundName image="lens5.png"

TerrainGenerate vision=400.00 depth=1 hard=0.7
TerrainWind speed=0.0;0.1

0 comments on commit 64c226b

Please sign in to comment.