[Orxonox-commit 6017] r10676 - code/branches/campaignHS15/data/levels
paulsc at orxonox.net
paulsc at orxonox.net
Mon Oct 19 22:30:28 CEST 2015
Author: paulsc
Date: 2015-10-19 22:30:27 +0200 (Mon, 19 Oct 2015)
New Revision: 10676
Modified:
code/branches/campaignHS15/data/levels/Campaign1.oxw
Log:
Uniformized formatting, partially automatically.
The rules are now as follows:
- All XML tags are indented with 4-space tabs
- Object tags are separated by a newline
- Strings are double-quoted unless representing another type (int, bool etc)
Modified: code/branches/campaignHS15/data/levels/Campaign1.oxw
===================================================================
--- code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-10-19 20:20:29 UTC (rev 10675)
+++ code/branches/campaignHS15/data/levels/Campaign1.oxw 2015-10-19 20:30:27 UTC (rev 10676)
@@ -1,35 +1,35 @@
<LevelInfo
- name = "CampaignHS15 1"
- description = "Protect the transporter!"
- tags = "mission"
- screenshot = "missionOne.png"
+ name = "CampaignHS15 1"
+ description = "Protect the transporter!"
+ tags = "mission"
+ screenshot = "missionOne.png"
/>
<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
?>
<?lua
- include("templates/spaceshipAssff2.oxt")
- include("templates/spaceshipPirate.oxt")
- include("templates/spaceshipEscort.oxt")
- include("templates/spaceshipRing.oxt")
- include("templates/spaceshipSwallow.oxt")
- include("templates/spaceshipTransporter.oxt")
+ include("templates/spaceshipAssff2.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipEscort.oxt")
+ include("templates/spaceshipRing.oxt")
+ include("templates/spaceshipSwallow.oxt")
+ include("templates/spaceshipTransporter.oxt")
?>
-<Level gametype = "Mission">
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
+<Level gametype = "Mission">
+ <templates>
+ <Template link="lodtemplate_default" />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/Starbox"
- >
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/Starbox"
+ >
<WorldAmbientSound source="Earth.ogg" looping="true" playOnLoad="true" />
@@ -40,7 +40,7 @@
<GlobalQuest id="quest1">
<QuestDescription title="Reach the Station!" description="" failMessage="" completeMessage="" />
<hints>
- <QuestHint id="quest1hint1" />
+ <QuestHint id="quest1hint1" />
</hints>
<subquests>
</subquests>
@@ -51,15 +51,15 @@
<hints>
</hints>
<subquests>
- <GlobalQuest id="quest2.1">
- <QuestDescription title="Get a better Spaceship" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
- <GlobalQuest id="quest2.2">
- <QuestDescription title="Get some Pickups" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
- <GlobalQuest id="quest2.3">
- <QuestDescription title="Meet your Unit" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
+ <GlobalQuest id="quest2.1">
+ <QuestDescription title="Get a better Spaceship" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
+ <GlobalQuest id="quest2.2">
+ <QuestDescription title="Get some Pickups" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
+ <GlobalQuest id="quest2.3">
+ <QuestDescription title="Meet your Unit" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
</subquests>
</GlobalQuest>
@@ -76,12 +76,12 @@
<hints>
</hints>
<subquests>
- <GlobalQuest id="quest4.1">
- <QuestDescription title="Get to the Defense Station" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
- <GlobalQuest id="quest4.2">
- <QuestDescription title="Find the turret" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
+ <GlobalQuest id="quest4.1">
+ <QuestDescription title="Get to the Defense Station" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
+ <GlobalQuest id="quest4.2">
+ <QuestDescription title="Find the turret" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
</subquests>
</GlobalQuest>
@@ -99,11 +99,11 @@
</hints>
<subquests>
<GlobalQuest id="quest6.1">
- <QuestDescription title="Collect the local Pickups" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
- <GlobalQuest id="quest6.2">
- <QuestDescription title="Use Portal to the Transporter" description="" failMessage="" completeMessage="" />
- </GlobalQuest>
+ <QuestDescription title="Collect the local Pickups" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
+ <GlobalQuest id="quest6.2">
+ <QuestDescription title="Use Portal to the Transporter" description="" failMessage="" completeMessage="" />
+ </GlobalQuest>
</subquests>
</GlobalQuest>
@@ -118,14 +118,13 @@
<!--EVENTS-->
<EventMultiTrigger name=spawntrigger>
- <events>
- <trigger>
- <SpawnPoint team=1 position="-50,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
- </trigger>
- </events>
+ <events>
+ <trigger>
+ <SpawnPoint team=1 position="-50,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff2 />
+ </trigger>
+ </events>
</EventMultiTrigger>
-
<QuestEffectBeacon times=1>
<effects>
<AddQuest questId="quest1" />
@@ -170,53 +169,51 @@
</collisionShapes>
</StaticEntity>
- <!--ELEMENTS -->
+ <!--ELEMENTS -->
- <?lua
- max = 5
+ <?lua
+ max = 5
for i = 1, max, 1
do
- x = math.cos(math.pi/8*(i+1))*1500
- y = math.sin(math.pi/8*(i+1))*1500
+ x = math.cos(math.pi/8*(i+1))*1500
+ y = math.sin(math.pi/8*(i+1))*1500
?>
<SpaceShip position="<?lua print(y)?>,<?lua print(math.pow(-1,i)*250) ?>,<?lua print(x)?>" lookat="0,0,0" team=2>
<templates>
- <Template link=spaceshippirate />
+ <Template link="spaceshippirate" />
</templates>
<controller>
<WaypointPatrolController alertnessradius=600 team=1>
- <waypoints>
- <Attacher target="transporter" deletewithparent=false />
- </waypoints>
+ <waypoints>
+ <Attacher target="transporter" deletewithparent=false />
+ </waypoints>
</WaypointPatrolController>
</controller>
</SpaceShip>
<?lua end ?>
- <SpaceShip position="-2500,0,1700" lookat="-2500,0,-1800" team=1 name="transporter">
- <templates>
- <Template link=spaceshipTransporter />
- </templates>
- <controller>
- <WaypointController accuracy=10>
- <waypoints>
- <Model mesh="sphere.mesh" scale=100 position="-2500,0,1650" />
- <?lua
- max = 5
- for i = 1, max, 1
- do
- x = math.cos(math.pi/8*(i+1))*3490
- y = -math.sin(math.pi/8*(i+1))*3490
- ?>
- <Model mesh="sphere.mesh" scale=100 position="<?lua print(y) ?>+490,0,<?lua print(x) ?>" />
- <?lua end ?>
- <Model mesh="sphere.mesh" scale=100 position="-2500,0,-1650" />
- </waypoints>
- </WaypointController>
- </controller>
- </SpaceShip>
+ <SpaceShip position="-2500,0,1700" lookat="-2500,0,-1800" team=1 name="transporter">
+ <templates>
+ <Template link="spaceshipTransporter" />
+ </templates>
+ <controller>
+ <WaypointController accuracy=10>
+ <waypoints>
+ <Model mesh="sphere.mesh" scale=100 position="-2500,0,1650" />
+ <?lua
+ max = 5
+ for i = 1, max, 1
+ do
+ x = math.cos(math.pi/8*(i+1))*3490
+ y = -math.sin(math.pi/8*(i+1))*3490
+ ?>
+ <Model mesh="sphere.mesh" scale=100 position="<?lua print(y) ?>+490,0,<?lua print(x) ?>" />
+ <?lua end ?>
+ <Model mesh="sphere.mesh" scale=100 position="-2500,0,-1650" />
+ </waypoints>
+ </WaypointController>
+ </controller>
+ </SpaceShip>
-
-
- </Scene>
+ </Scene>
</Level>
More information about the Orxonox-commit
mailing list