[Orxonox-commit 6448] r11104 - in code/trunk/data: levels levels/includes levels/templates overlays
fvultier at orxonox.net
fvultier at orxonox.net
Sun Jan 31 23:42:11 CET 2016
Author: fvultier
Date: 2016-01-31 23:42:11 +0100 (Sun, 31 Jan 2016)
New Revision: 11104
Removed:
code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi
code/trunk/data/levels/templates/FPS_HS14.oxt
Modified:
code/trunk/data/levels/FPSTest.oxw
code/trunk/data/levels/FPS_Level_HS14.oxw
code/trunk/data/levels/InsideSpaceStation.oxw
code/trunk/data/levels/dockingToASpaceStation.oxw
code/trunk/data/levels/expeditionSector.oxw
code/trunk/data/levels/levelTry.oxw
code/trunk/data/levels/presentationFS102.oxw
code/trunk/data/levels/presentationFS10Ed.oxw
code/trunk/data/levels/presentationHS13.oxw
code/trunk/data/levels/shuttleAttack.oxw
code/trunk/data/levels/shuttleRetaliation.oxw
code/trunk/data/levels/templates/FPS.oxt
code/trunk/data/overlays/HUDTemplatesFPS.oxo
Log:
Some HUDs (Health, Shield, Weapons, EnemyHealth, EnemyShield) are also displayed in FPS mode. Removed two unused redundant files.
Modified: code/trunk/data/levels/FPSTest.oxw
===================================================================
--- code/trunk/data/levels/FPSTest.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/FPSTest.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -8,6 +8,7 @@
<?lua
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("stats.oxo")
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipH2.oxt")
Modified: code/trunk/data/levels/FPS_Level_HS14.oxw
===================================================================
--- code/trunk/data/levels/FPS_Level_HS14.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/FPS_Level_HS14.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -10,6 +10,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/pickupRepresentationTemplates.oxt")
?>
@@ -21,7 +22,7 @@
include("templates/bigship.oxt")
include("templates/spaceshipTurret.oxt")
include("templates/spaceshipCollateralDamage.oxt")
- include("templates/FPS_HS14.oxt")
+ include("templates/FPS.oxt")
include("templates/HeavyCruiser.oxt")
include("templates/spacestation_elements.oxt")
?>
@@ -138,7 +139,7 @@
<!-- FPS Player as destination of the dock -->
<!-- My position after docking -->
- <FpsPlayer template = "fps_HS14" radarname = "First Person Player" position = "1330,-20016,0" >
+ <FpsPlayer template = "fps" radarname = "First Person Player" position = "1330,-20016,0" >
<attached>
<DistanceTriggerBeacon name="bcnDestroyer" />
<DockingTarget name="fistperson" />
@@ -312,7 +313,7 @@
</attached>
- </StaticEntity>
+</StaticEntity>
<!-- Homogenous gravitationfield to simulate local gravity (activating the normal gravity will affect the spaceship terribly) -->
Modified: code/trunk/data/levels/InsideSpaceStation.oxw
===================================================================
--- code/trunk/data/levels/InsideSpaceStation.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/InsideSpaceStation.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -8,6 +8,7 @@
<?lua
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("stats.oxo")
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipH2.oxt")
Modified: code/trunk/data/levels/dockingToASpaceStation.oxw
===================================================================
--- code/trunk/data/levels/dockingToASpaceStation.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/dockingToASpaceStation.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -9,6 +9,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/pickupRepresentationTemplates.oxt")
?>
Modified: code/trunk/data/levels/expeditionSector.oxw
===================================================================
--- code/trunk/data/levels/expeditionSector.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/expeditionSector.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -8,6 +8,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/spaceshipAssff.oxt")
Deleted: code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi
===================================================================
--- code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/includes/weaponSettingsFPS_HS14.oxi 2016-01-31 22:42:11 UTC (rev 11104)
@@ -1,55 +0,0 @@
- <weaponslots>
- <WeaponSlot position="0,0,0" yaw=0 pitch=0 roll=0 />
-<!--
- <WeaponSlot position="-0.5,0.8,2.5" yaw=0 pitch=0 roll=0 />
- <WeaponSlot position="15,-1.5,-25" yaw=0 pitch=0 roll=0 />
- <WeaponSlot position="0,0,-45" yaw=0 pitch=0 roll=0 />
--->
- </weaponslots>
- <weaponsets>
- <WeaponSet firemode=0 />
- <WeaponSet firemode=1 />
- </weaponsets>
- <weaponpacks>
- <WeaponPack firemode=0>
- <links>
- <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
- <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
- <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
- </links>
- <Weapon>
- <HsW01 mode=0 munitionpershot=0 delay=0.0 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.7, -0.3, -3" />
- <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20/>
- </Weapon>
- <LaserGun
- position="0,0,0"
- munitionType="LaserGunMunition"
- bulletLoadingTime="0.2"
- magazineLoadingTime="5.0"
- speed="1000"
- unlimitedMunition=true
- />
- <!--LaserGun
- position="0,0,0"
- munitionType="LaserGunMunition"
- bulletLoadingTime="0.2"
- magazineLoadingTime="5.0"
- speed="1250"
- unlimitedMunition=true
- />
- </WeaponPack>
- <WeaponPack firemode=1>
- <Fusion
- position="0,0,0"
- munitionType="FusionMunition"
- bulletLoadingTime="0.3"
- magazineLoadingTime="3"
- speed="600"
- unlimitedMunition=true
- /-->
- </WeaponPack>
- </weaponpacks>
- <munition>
- <LaserMunition initialmagazines=8 maxmagazines=8 munitionpermagazine=5 replenishamount=1 replenishinterval=7.5/>
- <LightningMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=8 />
- </munition>
Modified: code/trunk/data/levels/levelTry.oxw
===================================================================
--- code/trunk/data/levels/levelTry.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/levelTry.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -9,6 +9,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/pickupRepresentationTemplates.oxt")
?>
Modified: code/trunk/data/levels/presentationFS102.oxw
===================================================================
--- code/trunk/data/levels/presentationFS102.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/presentationFS102.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -7,6 +7,7 @@
<?lua
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("stats.oxo")
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipH2.oxt")
Modified: code/trunk/data/levels/presentationFS10Ed.oxw
===================================================================
--- code/trunk/data/levels/presentationFS10Ed.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/presentationFS10Ed.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -7,6 +7,7 @@
<?lua
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("stats.oxo")
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipH2.oxt")
Modified: code/trunk/data/levels/presentationHS13.oxw
===================================================================
--- code/trunk/data/levels/presentationHS13.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/presentationHS13.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -9,6 +9,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/pickupRepresentationTemplates.oxt")
?>
Modified: code/trunk/data/levels/shuttleAttack.oxw
===================================================================
--- code/trunk/data/levels/shuttleAttack.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/shuttleAttack.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -9,6 +9,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/spaceshipAssff.oxt")
Modified: code/trunk/data/levels/shuttleRetaliation.oxw
===================================================================
--- code/trunk/data/levels/shuttleRetaliation.oxw 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/shuttleRetaliation.oxw 2016-01-31 22:42:11 UTC (rev 11104)
@@ -8,6 +8,7 @@
<?lua
include("stats.oxo")
include("HUDTemplates3.oxo")
+ include("HUDTemplatesFPS.oxo")
include("templates/lodInformation.oxt")
include("templates/spaceshipAssff.oxt")
Modified: code/trunk/data/levels/templates/FPS.oxt
===================================================================
--- code/trunk/data/levels/templates/FPS.oxt 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/templates/FPS.oxt 2016-01-31 22:42:11 UTC (rev 11104)
@@ -1,5 +1,6 @@
<Template name=fps>
<FpsPlayer
+ hudtemplate = fpshud
spawnparticlesource = "Orxonox/fairytwirl"
spawnparticleduration = 3
explosionchunks = 6
@@ -8,6 +9,13 @@
maxhealth = 200
initialhealth = 100
+ shieldhealth = 30
+ initialshieldhealth = 30
+ maxshieldhealth = 30
+ shieldabsorption = 0.9
+ shieldrechargerate = 1
+ shieldrechargewaittime = 1
+
primaryThrust = 0;
auxilaryThrust = 0;
rotationThrust = 0;
Deleted: code/trunk/data/levels/templates/FPS_HS14.oxt
===================================================================
--- code/trunk/data/levels/templates/FPS_HS14.oxt 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/levels/templates/FPS_HS14.oxt 2016-01-31 22:42:11 UTC (rev 11104)
@@ -1,59 +0,0 @@
-<Template name=fps_HS14>
- <FpsPlayer
- spawnparticlesource = "Orxonox/fairytwirl"
- spawnparticleduration = 3
- explosionchunks = 6
-
- health = 100
- maxhealth = 200
- initialhealth = 100
-
- primaryThrust = 0;
- auxilaryThrust = 0;
- rotationThrust = 0;
-
- collisionType = "dynamic"
- mass = 100
- linearDamping = 0.7
- angularDamping = 0.9999999
- friction = 0.01
-
- weapon = "hs-w01.mesh"
- >
- <collisionShapes>
- <!--Normal values: position="0,-45,0" halfExtents="15,50,15" -->
- <BoxCollisionShape position="0,-45,0" halfExtents="15,50,15" />
- </collisionShapes>
-
- <camerapositions>
- <CameraPosition position="-1,1,2.2" drag=false mouselook=true />
- </camerapositions>
- <explosion >
- <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
- <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" />
- <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
- </explosion>
-
- <?lua
- include("../includes/weaponSettingsFPS_HS14.oxi")
- ?>
-
- </FpsPlayer>
-</Template>
-<!--
-<Template name=fpscamera defaults=0>
- <FpsPlayer>
- <camerapositions>
- <CameraPosition position="0,0,20" drag=false mouselook=true />
-
- <!--
- CameraPosition position="0,150,-25" pitch=-90 drag=true />
- <CameraPosition position="0,0,-40" yaw=180 drag=true />
- <CameraPosition position="0,3,-14" yaw=0 />
- <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
- <CameraPosition position="50,5,-8" yaw=90 drag=true /
-
- </camerapositions>
- </FpsPlayer>
-</Template>
--->
Modified: code/trunk/data/overlays/HUDTemplatesFPS.oxo
===================================================================
--- code/trunk/data/overlays/HUDTemplatesFPS.oxo 2016-01-31 19:43:10 UTC (rev 11103)
+++ code/trunk/data/overlays/HUDTemplatesFPS.oxo 2016-01-31 22:42:11 UTC (rev 11104)
@@ -1,8 +1,3 @@
-<Template name="spectatorhud">
- <OverlayGroup name = "spectatorhud" scale = "1, 1">
- </OverlayGroup>
-</Template>
-
<Template name="fpshud">
<OverlayGroup name = "fpshud" scale = "1, 1">
<Map />
@@ -10,37 +5,73 @@
<HUDHealthBar
name = "HealthBar1"
background = "Orxonox/HealthBarBackground"
- size = "0.35, 0.0875"
+ size = "0.40, 0.08"
position = "0.0 , 0.95 "
pickpoint = "0, 1"
bartexture = "healthbar_bar.png"
textfont = "VeraMono"
textusebarcolour = true
- textsize = 0.039
- textoffset = "0.315, 0.05"
+ textscale = 0.4
+ textoffset = "0.325, -0.825"
textpickpoint = "0, 0"
textalign = "right"
- correctaspect = false
- textcorrectaspect = false
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconHealth"
>
<BarColour position = 0.0 colour = "0.7,0.2,0.2" />
<BarColour position = 0.5 colour = "0.7,0.7,0.2" />
<BarColour position = 1.0 colour = "0.2,0.7,0.2" />
</HUDHealthBar>
- <!-- <HUDSpeedBar
- name = "SpeedBar1"
+ <HUDShieldBar
+ name = "ShieldBar1"
background = "Orxonox/BarBackground"
- size = "0.35, 0.05"
+ size = "0.40, 0.04"
position = "0.0 , 1.0 "
pickpoint = "0, 1"
- correctaspect = false
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconShield"
>
- <BarColour position = 0.0 colour = "0.7,0.5,0.2" />
- <BarColour position = 0.5 colour = "0.2,0.7,0.2" />
- <BarColour position = 1.0 colour = "0.7,0.2,0.2" />
- </HUDSpeedBar>
--->
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDShieldBar>
+
+ <HUDEnemyHealthBar
+ name = "EnemyHealthBar"
+ background = "Orxonox/HealthBarBackground"
+ size = "0.4, 0.08"
+ position = "1 ,0"
+ pickpoint = "1, 0"
+ bartexture = "healthbar_bar.png"
+ textfont = "VeraMono"
+ textusebarcolour = true
+ textscale = 0.4
+ textoffset = "-0.675, 0.175"
+ textpickpoint = "0, 0"
+ textalign = "right"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconHealth"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDEnemyHealthBar>
+
+ <HUDEnemyShieldBar
+ name = "EnemyShieldBar1"
+ background = "Orxonox/BarBackground"
+ size = "0.40, 0.04"
+ position = "1.0 , 0.1 "
+ pickpoint = "1, 0"
+ correctaspect = true
+ iconmaterial = "Orxonox/BarIconShield"
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDEnemyShieldBar>
+
<HUDNavigation
name = "Navigation"
correctaspect = true
@@ -63,6 +94,15 @@
maximumDotSize = 0.1
/>
+ <HUDWeaponSystem
+ name = "WeaponSystem"
+ correctaspect = true
+ position = "0.01, 0.01"
+ pickpoint = "0, 0"
+ visible = "true"
+ weaponModeHUDSize = "0.09, 0.03"
+ />
+
<HUDTimer
name = "Timer"
position = "0.5, 0.85"
@@ -72,11 +112,17 @@
align = "center"
/>
- <!-- <GUIOverlay
+ <GUIOverlay
name = "QuestGUI"
guiname = "QuestGUI"
visible = "false"
/>
--->
+
+ <GUIOverlay
+ name = "PickupInventory"
+ guiname = "PickupInventory"
+ visible = "false"
+ />
+
</OverlayGroup>
</Template>
More information about the Orxonox-commit
mailing list