[Orxonox-commit 4995] r9664 - in code/trunk/data: levels levels/includes levels/templates overlays
landauf at orxonox.net
landauf at orxonox.net
Sun Aug 25 10:05:11 CEST 2013
Author: landauf
Date: 2013-08-25 10:05:10 +0200 (Sun, 25 Aug 2013)
New Revision: 9664
Modified:
code/trunk/data/levels/bigshipPresentation.oxw
code/trunk/data/levels/collateralDamageDemo.oxw
code/trunk/data/levels/gallery.oxw
code/trunk/data/levels/includes/weaponSettingsCollateral.oxi
code/trunk/data/levels/includes/weaponSettingsEscort.oxi
code/trunk/data/levels/includes/weaponSettingsTurret.oxi
code/trunk/data/levels/includes/weaponSettingsbigship.oxi
code/trunk/data/levels/maxim.oxw
code/trunk/data/levels/presentationHS12.oxw
code/trunk/data/levels/templates/bigship.oxt
code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt
code/trunk/data/levels/templates/spaceshipEscort.oxt
code/trunk/data/levels/templates/spaceshipTurret.oxt
code/trunk/data/levels/turretTest.oxw
code/trunk/data/overlays/tetrisHUD.oxo
Log:
eol-style native
Property changes on: code/trunk/data/levels/bigshipPresentation.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/collateralDamageDemo.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/gallery.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/includes/weaponSettingsCollateral.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/includes/weaponSettingsEscort.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/includes/weaponSettingsTurret.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/includes/weaponSettingsbigship.oxi
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: code/trunk/data/levels/maxim.oxw
===================================================================
--- code/trunk/data/levels/maxim.oxw 2013-08-25 08:03:25 UTC (rev 9663)
+++ code/trunk/data/levels/maxim.oxw 2013-08-25 08:05:10 UTC (rev 9664)
@@ -1,126 +1,126 @@
-<LevelInfo
- name = "Maxim's Test"
- description = "Intelligent Formation"
- tags = "test"
-/>
-
-<?lua
- include("stats.oxo")
- include("HUDTemplates3.oxo")
- include("templates/lodInformation.oxt")
-?>
-
-<?lua
- include("templates/spaceshipAssff.oxt")
- include("templates/spaceshipPirate.oxt")
- include("templates/spaceshipSwallow.oxt")
- include("templates/spaceshipTransporter.oxt")
-?>
-
-<Level
- gametype = "Mission"
->
- <templates>
- <Template link=lodtemplate_default />
- </templates>
- <?lua include("includes/notifications.oxi") ?>
-
- <NotificationQueueCEGUI
- name="narrative"
- targets="simpleNotification"
- size=3
- displayTime=3.9
- position="0.2, 0, 0.1, 0"
- fontSize="23"
- fontColor="0.3, 1, 0.2, 0.8"
- alignment="HorzCentred"
- displaySize="0.6, 0, 0, 0"
- />
-
- <Scene
- ambientlight = "0.8, 0.8, 0.8"
- skybox = "Orxonox/skyBoxMoreNebula"
- >
-
- <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-
- <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow/>
-
- <!-- TRIGGERS -->
- <DistanceTrigger name="FormationInit" position="800,700,600" target="Pawn" distance=60 stayActive="true" delay=0.1 />
- <DistanceTrigger name="LetsGo" position="200,-200,1000" target="Pawn" distance=180 stayActive="true" delay=0.1 />
- <BlinkingBillboard colour="1,1,0.05" position="200,-200,1000" frequency=0.6 amplitude=3 material="Flares/lensflare" />
- <DistanceTrigger name="Fight" position="-600,3000,-2000" target="Pawn" distance=180 stayActive="true" delay=0.1 />
- <BlinkingBillboard colour="0,0,1" position="-600,3000,-2000" frequency=0.6 amplitude=3 material="Flares/lensflare" />
-
-
-
- <Script code="formationcontroller formationflight true" onLoad="false">
- <events>
- <trigger>
- <EventListener event=FormationInit />
- </trigger>
- </events>
- </Script> <!-- !!! activates formation behaviour !!! -->
-
- <Script code="artificialcontroller setbotlevel 5" onLoad="false">
- <events>
- <trigger>
- <EventListener event=FormationInit />
- </trigger>
- </events>
- </Script>
-
- <SimpleNotification message="Let's go!">
- <events>
- <trigger>
- <EventListener event="LetsGo" />
- </trigger>
- </events>
- </SimpleNotification>
-
-
-
-
-<!-- ADDING FORMATION: 2 Swallows -->
-<?lua for i=0,1,1 do
-?>
- <SpaceShip position="<?lua print(400+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
- <templates>
- <Template link=spaceshipswallow /> <!--spaceshipTransporter spaceshippirate-->
- </templates>
- <controller>
- <AIController team=0>
- <events>
- <activity>
- <EventListener event="LetsGo" />
- </activity>
- </events>
- </AIController>
- </controller>
- </SpaceShip>
-<?lua end ?>
-
-<?lua for i=0,2,1 do
-?>
-
-
-<!-- ENEMY SWALLOWS -->
- <SpaceShip position="<?lua print(-400+i*200) ?>,3000,-2000" lookat="-1300,-600,900" visible="true">
- <templates>
- <Template link=spaceshipswallow />
- </templates>
- <controller>
- <AIController team=1>
- <events>
- <activity>
- <EventListener event="Fight" />
- </activity>
- </events>
- </AIController>
- </controller>
- </SpaceShip>
-<?lua end ?>
-
- </Scene>
+<LevelInfo
+ name = "Maxim's Test"
+ description = "Intelligent Formation"
+ tags = "test"
+/>
+
+<?lua
+ include("stats.oxo")
+ include("HUDTemplates3.oxo")
+ include("templates/lodInformation.oxt")
+?>
+
+<?lua
+ include("templates/spaceshipAssff.oxt")
+ include("templates/spaceshipPirate.oxt")
+ include("templates/spaceshipSwallow.oxt")
+ include("templates/spaceshipTransporter.oxt")
+?>
+
+<Level
+ gametype = "Mission"
+>
+ <templates>
+ <Template link=lodtemplate_default />
+ </templates>
+ <?lua include("includes/notifications.oxi") ?>
+
+ <NotificationQueueCEGUI
+ name="narrative"
+ targets="simpleNotification"
+ size=3
+ displayTime=3.9
+ position="0.2, 0, 0.1, 0"
+ fontSize="23"
+ fontColor="0.3, 1, 0.2, 0.8"
+ alignment="HorzCentred"
+ displaySize="0.6, 0, 0, 0"
+ />
+
+ <Scene
+ ambientlight = "0.8, 0.8, 0.8"
+ skybox = "Orxonox/skyBoxMoreNebula"
+ >
+
+ <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+
+ <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipswallow/>
+
+ <!-- TRIGGERS -->
+ <DistanceTrigger name="FormationInit" position="800,700,600" target="Pawn" distance=60 stayActive="true" delay=0.1 />
+ <DistanceTrigger name="LetsGo" position="200,-200,1000" target="Pawn" distance=180 stayActive="true" delay=0.1 />
+ <BlinkingBillboard colour="1,1,0.05" position="200,-200,1000" frequency=0.6 amplitude=3 material="Flares/lensflare" />
+ <DistanceTrigger name="Fight" position="-600,3000,-2000" target="Pawn" distance=180 stayActive="true" delay=0.1 />
+ <BlinkingBillboard colour="0,0,1" position="-600,3000,-2000" frequency=0.6 amplitude=3 material="Flares/lensflare" />
+
+
+
+ <Script code="formationcontroller formationflight true" onLoad="false">
+ <events>
+ <trigger>
+ <EventListener event=FormationInit />
+ </trigger>
+ </events>
+ </Script> <!-- !!! activates formation behaviour !!! -->
+
+ <Script code="artificialcontroller setbotlevel 5" onLoad="false">
+ <events>
+ <trigger>
+ <EventListener event=FormationInit />
+ </trigger>
+ </events>
+ </Script>
+
+ <SimpleNotification message="Let's go!">
+ <events>
+ <trigger>
+ <EventListener event="LetsGo" />
+ </trigger>
+ </events>
+ </SimpleNotification>
+
+
+
+
+<!-- ADDING FORMATION: 2 Swallows -->
+<?lua for i=0,1,1 do
+?>
+ <SpaceShip position="<?lua print(400+i*200) ?>,-200,1000" lookat="-1300,-600,900" visible="true">
+ <templates>
+ <Template link=spaceshipswallow /> <!--spaceshipTransporter spaceshippirate-->
+ </templates>
+ <controller>
+ <AIController team=0>
+ <events>
+ <activity>
+ <EventListener event="LetsGo" />
+ </activity>
+ </events>
+ </AIController>
+ </controller>
+ </SpaceShip>
+<?lua end ?>
+
+<?lua for i=0,2,1 do
+?>
+
+
+<!-- ENEMY SWALLOWS -->
+ <SpaceShip position="<?lua print(-400+i*200) ?>,3000,-2000" lookat="-1300,-600,900" visible="true">
+ <templates>
+ <Template link=spaceshipswallow />
+ </templates>
+ <controller>
+ <AIController team=1>
+ <events>
+ <activity>
+ <EventListener event="Fight" />
+ </activity>
+ </events>
+ </AIController>
+ </controller>
+ </SpaceShip>
+<?lua end ?>
+
+ </Scene>
</Level>
\ No newline at end of file
Property changes on: code/trunk/data/levels/maxim.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/presentationHS12.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/templates/bigship.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/templates/spaceshipCollateralDamage.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/templates/spaceshipEscort.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/templates/spaceshipTurret.oxt
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/levels/turretTest.oxw
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on: code/trunk/data/overlays/tetrisHUD.oxo
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the Orxonox-commit
mailing list