Changeset 7163 for code/trunk/data/levels/includes
- Timestamp:
- Aug 11, 2010, 8:55:13 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 8 edited
- 1 copied
-
. (modified) (1 prop)
-
data/levels/includes/CuboidSpaceStation.lua (modified) (1 diff)
-
data/levels/includes/pickups.oxi (modified) (10 diffs, 1 prop)
-
data/levels/includes/weaponsettings3.oxi (modified) (3 diffs)
-
data/levels/includes/weaponsettings_H2.oxi (modified) (2 diffs)
-
data/levels/includes/weaponsettings_HXY.oxi (modified) (1 diff)
-
data/levels/includes/weaponsettings_fps.oxi (copied) (copied from code/branches/presentation3/data/levels/includes/weaponsettings_fps.oxi)
-
data/levels/includes/weaponsettings_ghost.oxi (modified) (1 diff)
-
data/levels/includes/weaponsettings_pirate.oxi (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/data/levels/includes/CuboidSpaceStation.lua
r5781 r7163 329 329 -- Insert the SatelliteDish. 330 330 topPartsIndex[2]=8 331 bodyParts[topPartsIndex[2]][0][0][0][4]=" SatelliteDish.mesh"331 bodyParts[topPartsIndex[2]][0][0][0][4]="satellitedish.mesh" 332 332 bodyParts[topPartsIndex[2]][0][0][0][5]="pitch=-90" 333 333 bodyParts[topPartsIndex[2]][0][0][0][8]="rotationaxis=\"0,1,0\" rotationrate=5" -
code/trunk/data/levels/includes/pickups.oxi
- Property svn:eol-style set to native
r6725 r7163 1 2 <!-- Shield pickups --> 3 4 <PickupRepresentation 5 pickupName = "Small Shield Pickup" 6 pickupDescription = "Gives you a small-sized shield for 30 seconds." 7 inventoryRepresentation = "SmallShield" 8 spawnerTemplate = "smallshieldpickupRepresentation" 9 > 10 <pickup> 11 <ShieldPickup template=smallshieldpickup /> 12 </pickup> 13 </PickupRepresentation> 14 15 <PickupRepresentation 16 pickupName = "Medium Shield Pickup" 17 pickupDescription = "Gives you a medium-sized shield for 30 seconds." 18 inventoryRepresentation = "MediumShield" 19 spawnerTemplate = "mediumshieldpickupRepresentation" 20 > 21 <pickup> 22 <ShieldPickup template=mediumshieldpickup /> 23 </pickup> 24 </PickupRepresentation> 25 26 <PickupRepresentation 27 pickupName = "Huge Shield Pickup" 28 pickupDescription = "Gives you a big shield for 60 seconds." 29 inventoryRepresentation = "HugeShield" 30 spawnerTemplate = "hugeshieldpickupRepresentation" 31 > 32 <pickup> 33 <ShieldPickup template=hugeshieldpickup /> 34 </pickup> 35 </PickupRepresentation> 1 36 2 37 <!-- Health pickups --> … … 73 108 74 109 <PickupRepresentation 75 name = "Small Speed Boost"76 description = "Multiplies Speed of the Ship by a small amount."110 pickupName = "Small Speed Boost" 111 pickupDescription = "Multiplies Speed of the Ship by a small amount." 77 112 spawnerTemplate = "smallspeedpickupRepresentation" 113 inventoryRepresentation = "SmallSpeed" 78 114 > 79 115 <pickup> … … 83 119 84 120 <PickupRepresentation 85 name = "Medium Speed Boost"86 description = "Multiplies Speed of the Ship by a bigger amount."121 pickupName = "Medium Speed Boost" 122 pickupDescription = "Multiplies Speed of the Ship by a bigger amount." 87 123 spawnerTemplate = "mediumspeedpickupRepresentation" 124 inventoryRepresentation = "MediumSpeed" 88 125 > 89 126 <pickup> … … 93 130 94 131 <PickupRepresentation 95 name = "Huge Speed Boost"96 description = "Multiplies Speed of the Ship by a huge amount."132 pickupName = "Huge Speed Boost" 133 pickupDescription = "Multiplies Speed of the Ship by a huge amount." 97 134 spawnerTemplate = "hugespeedpickupRepresentation" 135 inventoryRepresentation = "HugeSpeed" 98 136 > 99 137 <pickup> … … 103 141 104 142 <PickupRepresentation 105 name = "Small Jump Boost"106 description = "Boosts the Ship with a massive amount for a very short time."143 pickupName = "Small Jump Boost" 144 pickupDescription = "Boosts the Ship with a massive amount for a very short time." 107 145 spawnerTemplate = "smalljumppickupRepresentation" 146 inventoryRepresentation = "SmallSpeed" 108 147 > 109 148 <pickup> … … 115 154 116 155 <PickupRepresentation 117 name = "small Invisibility"118 description = "Makes you invisible for 5 seconds."156 pickupName = "Small Invisibility" 157 pickupDescription = "Makes you invisible for 5 seconds." 119 158 spawnerTemplate = "smallinvisiblepickupRepresentation" 159 inventoryRepresentation = "SmallInvisible" 120 160 > 121 161 <pickup> … … 125 165 126 166 <PickupRepresentation 127 name = "medium Invisibility"128 description = "Makes you invisible for 10 seconds."167 pickupName = "Medium Invisibility" 168 pickupDescription = "Makes you invisible for 10 seconds." 129 169 spawnerTemplate = "mediuminvisiblepickupRepresentation" 170 inventoryRepresentation = "MediumInvisible" 130 171 > 131 172 <pickup> … … 135 176 136 177 <PickupRepresentation 137 name = "hunge Invisibility"138 description = "Makes you invisible for 20 seconds."178 pickupName = "Huge Invisibility" 179 pickupDescription = "Makes you invisible for 20 seconds." 139 180 spawnerTemplate = "hugeinvisiblepickupRepresentation" 181 inventoryRepresentation = "HugeInvisible" 140 182 > 141 183 <pickup> … … 147 189 148 190 <PickupRepresentation 149 pickupName = "Tri plePickup"191 pickupName = "Tri Pickup" 150 192 pickupDescription = "Adds health, speed and invisibility." 151 193 spawnerTemplate = "triplehealthspeedinvisibilitypickupRepresentation" … … 156 198 </PickupRepresentation> 157 199 200 <!-- Drone Pickup --> 201 202 <PickupRepresentation 203 pickupName = "Drone Pickup" 204 pickupDescription = "Adds a Drone to the Players Spaceship" 205 spawnerTemplate = "dronepickupRepresentation" 206 > 207 <pickup> 208 <DronePickup template=dronepickup /> 209 </pickup> 210 </PickupRepresentation> 211 -
code/trunk/data/levels/includes/weaponsettings3.oxi
r6417 r7163 8 8 <WeaponSet firemode=1 /> 9 9 <WeaponSet firemode=2 /> 10 <WeaponSet firemode=3 /> 10 11 </weaponsets> 11 12 <weapons> … … 15 16 <DefaultWeaponmodeLink firemode=1 weaponmode=1 /> 16 17 <DefaultWeaponmodeLink firemode=2 weaponmode=2 /> 18 <DefaultWeaponmodeLink firemode=3 weaponmode=3 /> 17 19 </links> 18 20 <Weapon> 19 21 <attached> 20 <Model mesh="LightningGun.mesh" pitch=" 78" roll="90" yaw="90" position="0,-1.3,0" />22 <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" /> 21 23 <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" /> 22 <Model mesh="hs-w01.mesh" roll="195" position="0,1,0" scale=2 /> 23 <Model mesh="hs-w01s.mesh" roll="195" position="0.1,0.5,0" scale=2 /> 24 <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 /> 24 25 </attached> 25 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.7, 1.5,-4" />26 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-0.9, 1.1,-4" />27 <LightningGun mode=1 muzzleoffset="0,0,0" />26 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" /> 27 <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" /> 28 <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 /> 28 29 </Weapon> 29 30 <Weapon> … … 31 32 <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" /> 32 33 <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" /> 33 <Model mesh="hs-w01.mesh" roll="165" position="0,1,0" scale=2 /> 34 <Model mesh="hs-w01s.mesh" roll="165" position="-0.1,0.5,0" scale=2 /> 34 <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 /> 35 35 </attached> 36 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset=" 0.9, 1.1, -4.0" />37 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.7, 1.5, -4.0" />38 <LightningGun mode=1 muzzleoffset="0,0,0" />36 <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" /> 37 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" /> 38 <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 /> 39 39 </Weapon> 40 40 <Weapon> 41 <RocketFire mode=2 muzzleoffset="0,0,0" /> 41 <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=50 /> 42 <RocketFire mode=3 muzzleoffset="0,0,0" damage=100 /> 42 43 </Weapon> 43 44 </WeaponPack> -
code/trunk/data/levels/includes/weaponsettings_H2.oxi
r5781 r7163 18 18 <Model mesh="hs-w01s.mesh" roll="180" position="0.1, 0.0, 0.0" scale=2 /> 19 19 </attached> 20 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" />21 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" />20 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9,-4" /> 21 <HsW01 mode=0 munitionpershot=0 delay=0 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9,-4" /> 22 22 </Weapon> 23 23 <Weapon> … … 26 26 <Model mesh="hs-w01s.mesh" roll="180" position="-0.1, 0.0, 0.0" scale=2 /> 27 27 </attached> 28 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" />29 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" />28 <HsW01 mode=0 munitionpershot=0 delay=0 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.8, 0.9, -4.0" /> 29 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.8, 0.9, -4.0" /> 30 30 </Weapon> 31 31 </WeaponPack> -
code/trunk/data/levels/includes/weaponsettings_HXY.oxi
r6417 r7163 14 14 </links> 15 15 <Weapon> 16 <HsW01 mode=0 munitionpershot=0 d elay=0 material="Flares/point_lensflare" />17 <HsW01 mode=0 munitionpershot=0 d elay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />16 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" /> 17 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" /> 18 18 <LightningGun mode=1 muzzleoffset="0,0,0" /> 19 19 </Weapon> 20 20 <Weapon> 21 <HsW01 mode=0 munitionpershot=0 d elay=0 material="Flares/point_lensflare" />22 <HsW01 mode=0 munitionpershot=0 d elay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />21 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" /> 22 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.1 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" /> 23 23 <LightningGun mode=1 muzzleoffset="0,0,0" /> 24 24 </Weapon> -
code/trunk/data/levels/includes/weaponsettings_ghost.oxi
r6417 r7163 14 14 </links> 15 15 <Weapon> 16 <HsW01 mode=0 munitionpershot=0 d elay=0 material="Flares/point_lensflare" />17 <HsW01 mode=0 munitionpershot=0 d elay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />16 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" /> 17 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" /> 18 18 <LightningGun mode=1 muzzleoffset="0,0,0" /> 19 19 </Weapon> 20 20 <Weapon> 21 <HsW01 mode=0 munitionpershot=0 d elay=0 material="Flares/point_lensflare" />22 <HsW01 mode=0 munitionpershot=0 d elay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />21 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0 material="Flares/point_lensflare" /> 22 <HsW01 mode=0 munitionpershot=0 damage=2.5 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" /> 23 23 <LightningGun mode=1 muzzleoffset="0,0,0" /> 24 24 </Weapon> -
code/trunk/data/levels/includes/weaponsettings_pirate.oxi
r5781 r7163 14 14 </links> 15 15 <Weapon> 16 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />17 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" />16 <HsW01 mode=0 munitionpershot=0 delay=0 damage=2.5 material="Flares/point_lensflare" /> 17 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset=" 0.5,0.6,1.7" /> 18 18 </Weapon> 19 19 <Weapon> 20 <HsW01 mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare" />21 <HsW01 mode=0 munitionpershot=0 delay=0.125 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" />20 <HsW01 mode=0 munitionpershot=0 delay=0 damage=2.5 material="Flares/point_lensflare" /> 21 <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=2.5 material="Flares/point_lensflare" muzzleoffset="-0.5,0.6,1.7" /> 22 22 </Weapon> 23 23 </WeaponPack>
Note: See TracChangeset
for help on using the changeset viewer.
