Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11493 for code/trunk/data


Ignore:
Timestamp:
Oct 16, 2017, 4:07:37 PM (7 years ago)
Author:
patricwi
Message:

Merged tgidronFS16

Location:
code/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • code/trunk

  • code/trunk/data/levels/Hover.oxw

    r11052 r11493  
    33 description = "Level for Minigame Hover"
    44 tags = "minigame"
    5  screenshot = "emptylevel.png"
     5 screenshot = "hover.png"
    66/>
    77
    … …  
    2020<?lua
    2121MAZE_NUM_CELLS = 10
    22 MAZE_CELL_SIZE = 100
    23 MAZE_CELL_HEIGHT = 30
     22MAZE_CELL_SIZE = 600
     23MAZE_CELL_HEIGHT = 180
     24MAZE_WALL_THICKNESS = 10
    2425MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE
    2526?>
     27
     28<!-- Shrink Pickup Representation -->
     29
     30<Template name=smallshrinkpickupRepresentation>
     31    <PickupRepresentation>
     32        <spawner-representation>
     33            <StaticEntity>
     34                <attached>
     35                    <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.5>
     36                        <attached>
     37                            <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.35 />
     38                        </attached>
     39                    </Billboard>
     40                </attached>
     41            </StaticEntity>
     42        </spawner-representation>
     43    </PickupRepresentation>
     44</Template>
     45
     46
     47<Template name=smallshrinkpickup baseclass=ShrinkPickup>
     48  <ShrinkPickup
     49    representation = "smallshrinkpickup"
     50    duration = 10.0
     51    shrinkFactor = 2
     52    activaionType = "immediate"
     53    durationType = "continuous"
     54  />
     55</Template>
     56
     57<!-- Speed Pickup Representation -->
     58
     59<Template name=hugespeedpickupRepresentation>
     60    <PickupRepresentation>
     61        <spawner-representation>
     62            <StaticEntity>
     63                <attached>
     64                    <Billboard position="0,0,0" colour="0.99,0.96,0.52" material="Sphere2" scale=0.5>
     65                        <attached>
     66                            <Billboard position="0,0,0" colour="0.98,0.94,0.22" material="3arrowsup" scale=0.7 />
     67                        </attached>
     68                    </Billboard>
     69                </attached>
     70            </StaticEntity>
     71        </spawner-representation>
     72    </PickupRepresentation>
     73</Template>
     74
     75<Template name=hugespeedpickup baseclass=SpeedPickup>
     76  <SpeedPickup
     77    representation = "hugespeedpickup"
     78    duration = 10.0
     79    speedAdd = 0.0
     80    SpeedMultiply = 5.0
     81    activationType = "immediate"
     82    durationType = "continuous"
     83  />
     84</Template>
     85
     86<!-- Destroy Carrier Pickup Representation -->
     87
     88<Template name=destroyhoverpickupRepresentation>
     89    <PickupRepresentation>
     90        <spawner-representation>
     91            <StaticEntity>
     92                <attached>
     93                    <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Sphere2" scale=0.5>
     94                        <attached>
     95                            <Billboard position="0,0,0" colour="0.6,0.⁰,0.8" material="Asterisk" scale=0.65 />
     96                        </attached>
     97                    </Billboard>
     98                </attached>
     99            </StaticEntity>
     100        </spawner-representation>
     101    </PickupRepresentation>
     102</Template>
     103
     104<Template name=destroyhoverpickup baseclass=MetaPickup>
     105  <MetaPickup representation="destroyhover" metaType="destroyCarrier" />
     106</Template>
     107
     108<!-- Obstacle (crate) Template -->
     109
     110<Template name=obstacle baseclass=Pawn>
     111    <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=10000000000000 name=box RVName = "Box 4" >
     112        <attached>
     113            <Model position="0,0,0" mesh="crate.mesh" scale3D="15,15,15" />
     114        </attached>
     115        <collisionShapes>
     116            <BoxCollisionShape position="0,0,0" halfExtents="70,70,70" />
     117        </collisionShapes>
     118    </Pawn>
     119</Template>
     120
     121<!-- Ground Template -->
     122
     123<Template name=ground baseclass=StaticEntity>
     124    <StaticEntity position="0,0,0" direction="0,0,0" collisionType=static mass=100000000 friction=0.01 >
     125      <attached>
     126        <Model position="0,0,0" mesh="CubeGround.mesh" scale3D="300,20,300" />
     127      </attached>
     128      <collisionShapes>
     129        <BoxCollisionShape position="0,0,0" halfExtents="300,10,300" />
     130      </collisionShapes>
     131    </StaticEntity>
     132</Template>
    26133
    27134<Level
    … …  
    32139    <Template link=lodtemplate_default />
    33140  </templates>
     141
    34142  <?lua include("includes/notifications.oxi") ?>
    35143
    … …  
    37145    ambientlight = "0.8, 0.8, 0.8"
    38146    skybox       = "Orxonox/Starbox"
    39     gravity      = "0, -200, 0"
     147    gravity      = "0, -300, 0"
    40148  >
     149
     150    <PickupRepresentation
     151      name = "destroyhover"
     152      pickupName = "Destroy Hover Pickup"
     153      pickupDescription = "destroys you."
     154      spawnerTemplate = "destroyhoverpickupRepresentation"
     155      inventoryRepresentation = "destroyHoverPickup"
     156    />
     157
     158    <PickupRepresentation
     159      name = "hugespeedpickup"
     160      pickupName = "Huge Speed Boost"
     161      pickupDescription = "Multiplies Speed of the Ship by a huge amount."
     162      spawnerTemplate = "hugespeedpickupRepresentation"
     163      inventoryRepresentation = "HugeSpeed"
     164    />
     165
     166    <PickupRepresentation
     167      name = "smallshrinkpickup"
     168      pickupName = "Small Shrink"
     169      pickupDescription = "Shrinks the ship by a small amount."
     170      spawnerTemplate = "smallshrinkpickupRepresentation"
     171      inventoryRepresentation = "SmallShrink"
     172    />
    41173
    42174    <StaticEntity position="0,0,0" collisionType="static">
    … …  
    46178          cellSize="<?lua print(MAZE_CELL_SIZE)?>"
    47179          cellHeight="<?lua print(MAZE_CELL_HEIGHT)?>"
     180          wallThickness="<?lua print(MAZE_WALL_THICKNESS)?>"
     181          obstacletemplate=obstacle
     182          pickuptemplate=destroyhoverpickup
     183          pickuprepresentationtemplate=destroyhoverpickupRepresentation
     184          pickuptemplatespeed=hugespeedpickup
     185          pickuprepresentationtemplatespeed=hugespeedpickupRepresentation
     186          pickuptemplateshrink=smallshrinkpickup
     187          pickuprepresentationtemplateshrink=smallshrinkpickupRepresentation
     188          groundtemplate=ground
    48189        />
    49         <Model
    50           position="<?lua print(MAZE_SIZE/2)?>,-16,<?lua print(MAZE_SIZE/2)?>"
    51           scale3D="<?lua print(MAZE_SIZE/2)?>,16,<?lua print(MAZE_SIZE/2)?>"
    52           mesh="CubeGround.mesh"
    53         />
     190
    54191      </attached>
    55       <collisionShapes>
    56         <BoxCollisionShape
    57           position="<?lua print(MAZE_SIZE/2)?>,<?lua print(MAZE_CELL_HEIGHT+1)?>,<?lua print(MAZE_SIZE/2)?>"
    58           halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
    59         />
    60         <BoxCollisionShape
    61           position="<?lua print(MAZE_SIZE/2)?>,-1,<?lua print(MAZE_SIZE/2)?>"
    62           halfExtents="<?lua print(MAZE_SIZE/2)?>,1,<?lua print(MAZE_SIZE/2)?>"
    63         />
    64       </collisionShapes>
     192     
    65193    </StaticEntity>
    66194
    … …  
    75203    <SpawnPoint
    76204      team=0
    77       position="50,20,50"
    78       lookat="100,20,100"
     205      position="300,120,300"
     206      lookat="600,120,600"
    79207      spawnclass=HoverShip
    80208      pawndesign=spaceshiphover
    … …  
    83211  </Scene>
    84212</Level>
    85 

  • code/trunk/data/levels/includes/weaponSettingsHover.oxi

    r11052 r11493  
    11<weaponslots>
    2   <WeaponSlot position="-3,2,-3" />
    3   <WeaponSlot position=" 3,2,-3" />
     2  <WeaponSlot position="-10,2,-100" />
     3  <WeaponSlot position=" 10,2,-100" />
    44</weaponslots>
    55<weaponsets>
    … …  
    1414    </links>
    1515    <Weapon>
    16       <IceGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" />
     16      <HsW01 mode=0 munitionpershot=0 delay=0.125 speed=2000.0f damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1, 1,-50 " projectileMesh="LaserBeam2.mesh" />
    1717    </Weapon>
    1818    <Weapon>
    19       <IceGun mode=0 munitionpershot=0 delay=0     damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" />
     19      <HsW01 mode=0 munitionpershot=0 delay=0.125 speed=2000.0f damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.8, 1,-50" projectileMesh="LaserBeam2.mesh" />
    2020    </Weapon>
    2121  </WeaponPack>
    … …  
    2727</weaponpacks> 
    2828<munition>
    29   <IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>
     29  <LaserMunition initialmagazines=2 maxmagazines=2 munitionpermagazine=20/>
    3030</munition>

  • code/trunk/data/levels/templates/spaceshipHover.oxt

    r11052 r11493  
    1818   reloadwaittime      = 0.5
    1919
    20    primaryThrust     = 200
    21    auxilaryThrust    = 30
    22    rotationThrust    = 25
     20   primaryThrust     = 2000
     21   auxilaryThrust    = 1
     22   rotationThrust    = 45
    2323
    24    jumpBoost = 90
     24   jumpBoost = 350
    2525
    2626   lift = 1;
    27    stallSpeed = 220;
     27   stallSpeed = 1400;
    2828
    2929   boostPower            = 10
    … …  
    3333
    3434   collisionType     = "dynamic"
    35    mass              = 100
     35   mass              = 1000000
    3636   linearDamping     = 0.2
    3737   angularDamping    = 0.9999999
    … …  
    4141    </engines>
    4242    <attached>
    43       <Model position="0,0,-20" mesh="hovership_body.mesh" scale="5" yaw=180/> 
    44       <Model position="0,0,-20" mesh="hovership_engine.mesh" scale="5" yaw=180/>       
    45       <Model position="0,0,-20" mesh="hovership_gun.mesh" scale="5" yaw=180/>   
     43      <Model position="0,0,-120" mesh="hovership_body.mesh" scale="30" yaw=180/>       
     44      <Model position="0,0,-120" mesh="hovership_engine.mesh" scale="30" yaw=180/>     
     45      <Model position="0,0,-120" mesh="hovership_gun.mesh" scale="30" yaw=180/>
    4646     
    4747    </attached>
    4848    <collisionShapes>
    49       <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" />
     49      <BoxCollisionShape position="0,-12, 42" halfExtents="49, 24 ,180" />
    5050    </collisionShapes>
    5151    <explosion>
    5252      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_flash2" effect2="orxonox/explosion_flame2" />
    53       <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=2 />
     53      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_shockwave2" effect2="orxonox/explosion_sparks2" scale=12 />
    5454      <ExplosionPart minspeed=0 maxspeed=0 effect1="orxonox/explosion_streak2" effect2="orxonox/explosion_afterglow" />
    5555
    … …  
    6969  <SpaceShip>
    7070    <camerapositions>
    71       <CameraPosition position="0,8, 5" drag=true mouselook=true />
    72       <CameraPosition position="0,8,5" yaw="180" drag=true mouselook=true />
     71      <CameraPosition position="0, 48, 30" drag=true mouselook=true />
     72      <CameraPosition position="0, 48, 30" yaw="180" drag=true mouselook=true />
    7373    </camerapositions>
    7474  </SpaceShip>
    … …  
    7979   boostfactor    = 2
    8080
    81    speedfront     = 90
    82    speedback      =  40
    83    speedleftright =  40
    84    speedupdown    =  40
     81   speedfront     = 1400
     82   speedback      =  800
     83   speedleftright =  700
     84   speedupdown    =  700
    8585
    86    accelerationfront     = 500
    87    accelerationbrake     = 500
    88    accelerationback      =  125
    89    accelerationleftright =  125
     86   accelerationfront     = 1000
     87   accelerationbrake     = 1000
     88   accelerationback      =  250
     89   accelerationleftright =  350
    9090   accelerationupdown    =  125
    9191  >

  • code/trunk/data/overlays/HoverHUD.oxo

    r11052 r11493  
    3939     iconmaterial      = "Orxonox/BarIconHealth"
    4040    >
     41
    4142      <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
    4243      <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
    4344      <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
    4445    </HUDHealthBar>
    45  </OverlayGroup>
     46
     47
     48
     49    <OverlayText
     50     position  = "0.02, 0.08"
     51     pickpoint = "0.0, 0.0"
     52     font      = "ShareTechMono"
     53     textsize  = 0.04
     54     colour    = "1.0, 1.0, 1.0, 1.0"
     55     align     = "left"
     56     caption   = "Total Flags: "
     57    />
     58
     59    <OverlayText
     60     position  = "0.02, 0.12"
     61     pickpoint = "0.0, 0.0"
     62     font      = "ShareTechMono"
     63     textsize  = 0.04
     64     colour    = "1.0, 1.0, 1.0, 1.0"
     65     align     = "left"
     66     caption   = "Lives: "
     67    />
     68
     69    <OverlayText
     70     position  = "0.02, 0.16"
     71     pickpoint = "0.0, 0.0"
     72     font      = "ShareTechMono"
     73     textsize  = 0.04
     74     colour    = "1.0, 1.0, 1.0, 1.0"
     75     align     = "left"
     76     caption   = "Level: "
     77    />
     78
     79    <TFlagsLivesLevelHUD
     80     position  = "0.14, 0.02"
     81     pickpoint = "0.0, 0.0"
     82     font      = "ShareTechMono"
     83     textsize  = 0.04
     84     colour    = "1.0, 1.0, 1.0, 1.0"
     85     align     = "left"
     86     showFlags = true
     87     showLives = false
     88     showLevel = false
     89     levelUpgrade = false
     90
     91     />
     92
     93     <TFlagsLivesLevelHUD
     94     position  = "0.14, 0.04"
     95     pickpoint = "0.0, 0.0"
     96     font      = "ShareTechMono"
     97     textsize  = 0.04
     98     colour    = "1.0, 1.0, 1.0, 1.0"
     99     align     = "left"
     100     showFlags = false
     101     showLives = true
     102     showLevel = false
     103     levelUpgrade = false
     104
     105     />
     106
     107     <TFlagsLivesLevelHUD
     108     position  = "0.14, 0.06"
     109     pickpoint = "0.0, 0.0"
     110     font      = "ShareTechMono"
     111     textsize  = 0.04
     112     colour    = "1.0, 1.0, 1.0, 1.0"
     113     align     = "left"
     114     showFlags = false
     115     showLives = false
     116     showLevel = true
     117     levelUpgrade = false
     118
     119     />
     120
     121     <TFlagsLivesLevelHUD
     122     position  = "0.3, 0.45"
     123     pickpoint = "0.0, 0.0"
     124     font      = "ShareTechMono"
     125     textsize  = 0.04
     126     colour    = "1.0, 1.0, 1.0, 1.0"
     127     align     = "left"
     128     showFlags = false
     129     showLives = false
     130     showLevel = false
     131     levelUpgrade = true
     132
     133     />
     134
     135
     136  </OverlayGroup>
     137
    46138</Template>
     139
     140
     141 
     142
Note: See TracChangeset for help on using the changeset viewer.