Changeset 12410 for code/branches/Presentation_FS19
- Timestamp:
- May 22, 2019, 2:45:31 PM (6 years ago)
- Location:
- code/branches/Presentation_FS19
- Files:
-
- 12 edited
- 5 copied
Legend:
- Unmodified
- Added
- Removed
-
code/branches/Presentation_FS19
- Property svn:mergeinfo changed
/code/branches/Boxhead_FS19 (added) merged: 12209,12211,12216,12261-12262,12267,12273-12274,12284,12286,12299-12300,12354,12358,12374,12390,12397-12399,12405
- Property svn:mergeinfo changed
-
code/branches/Presentation_FS19/data/levels/Hover.oxw
r11495 r12410 13 13 14 14 <?lua 15 include("templates/spaceshipPirate.oxt")16 15 include("templates/spaceshipHover.oxt") 17 include(" overlays/HoverHUD.oxo")16 include("templates/spaceshipzombie.oxt") 18 17 ?> 18 19 19 20 20 <?lua 21 21 MAZE_NUM_CELLS = 10 22 22 MAZE_CELL_SIZE = 100 23 MAZE_CELL_HEIGHT = 3023 MAZE_CELL_HEIGHT = 400000000 24 24 MAZE_SIZE = MAZE_NUM_CELLS*MAZE_CELL_SIZE 25 25 ?> 26 26 27 <Level 27 <Level 28 28 plugins = hover 29 29 gametype = Hover … … 37 37 ambientlight = "0.8, 0.8, 0.8" 38 38 skybox = "Orxonox/Starbox" 39 gravity = "0, - 200, 0"39 gravity = "0, -80, 0" 40 40 > 41 41 … … 75 75 <SpawnPoint 76 76 team=0 77 position="50 ,20,50"77 position="500,20,50" 78 78 lookat="100,20,100" 79 79 spawnclass=HoverShip 80 80 pawndesign=spaceshiphover 81 81 /> 82 83 <SpaceShip position="500,20,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 84 85 <SpaceShip position="500,2020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 86 87 <SpaceShip position="500,4020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 88 89 <SpaceShip position="500,6020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 90 91 <SpaceShip position="500,8020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 92 93 <SpaceShip position="500,10020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 94 95 <SpaceShip position="500,12020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 96 97 <SpaceShip position="500,14020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 98 99 <SpaceShip position="500,16020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 100 101 <SpaceShip position="500,18020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 102 103 <SpaceShip position="500,20020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 104 105 <SpaceShip position="500,22020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 106 107 <SpaceShip position="500,24020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 108 109 <SpaceShip position="500,26020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 110 111 <SpaceShip position="500,28020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 112 113 <SpaceShip position="500,30020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 114 115 <SpaceShip position="500,32020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 116 117 <SpaceShip position="500,34020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 118 119 <SpaceShip position="500,36020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 120 121 <SpaceShip position="500,38020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 122 123 <SpaceShip position="500,40020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 124 125 <SpaceShip position="500,42020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 126 127 <SpaceShip position="500,44020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 128 129 <SpaceShip position="500,46020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 130 131 <SpaceShip position="500,48020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 132 133 <SpaceShip position="500,50020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 134 135 <SpaceShip position="500,52020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 136 137 <SpaceShip position="500,54020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 138 139 <SpaceShip position="500,56020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 140 141 <SpaceShip position="500,58020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 142 143 <SpaceShip position="500,60020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 144 145 <SpaceShip position="500,62020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 146 147 <SpaceShip position="500,64020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 148 149 <SpaceShip position="500,66020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 150 151 <SpaceShip position="500,68020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 152 153 <SpaceShip position="500,70020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 154 155 <SpaceShip position="500,72020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 156 157 <SpaceShip position="500,74020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 158 159 <SpaceShip position="500,76020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 160 161 <SpaceShip position="500,78020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 162 163 <SpaceShip position="500,80020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 164 165 <SpaceShip position="500,82020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 166 167 <SpaceShip position="500,84020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 168 169 <SpaceShip position="500,86020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 170 171 <SpaceShip position="500,88020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 172 173 <SpaceShip position="500,90020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 174 175 <SpaceShip position="500,92020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 176 177 <SpaceShip position="500,94020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 178 179 <SpaceShip position="500,96020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 180 181 <SpaceShip position="500,98020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 182 183 <SpaceShip position="500,100020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 184 185 <SpaceShip position="500,102020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 186 187 <SpaceShip position="500,104020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 188 189 <SpaceShip position="500,106020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 190 191 <SpaceShip position="500,108020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 192 193 <SpaceShip position="500,110020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 194 195 <SpaceShip position="500,112020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 196 197 <SpaceShip position="500,114020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 198 199 <SpaceShip position="500,116020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 200 201 <SpaceShip position="500,118020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 202 203 <SpaceShip position="500,120020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 204 205 <SpaceShip position="500,122020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 206 207 <SpaceShip position="500,124020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 208 209 <SpaceShip position="500,126020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 210 211 <SpaceShip position="500,128020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 212 213 <SpaceShip position="500,130020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 214 215 <SpaceShip position="500,132020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 216 217 <SpaceShip position="500,134020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 218 219 <SpaceShip position="500,136020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 220 221 <SpaceShip position="500,138020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 222 223 <SpaceShip position="500,140020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 224 225 <SpaceShip position="500,142020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 226 227 <SpaceShip position="500,144020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 228 229 <SpaceShip position="500,146020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 230 231 <SpaceShip position="500,148020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 232 233 <SpaceShip position="500,150020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 234 235 <SpaceShip position="500,152020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 236 237 <SpaceShip position="500,154020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 238 239 <SpaceShip position="500,156020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 240 241 <SpaceShip position="500,158020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 242 243 <SpaceShip position="500,160020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 244 245 <SpaceShip position="500,162020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 246 247 <SpaceShip position="500,164020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 248 249 <SpaceShip position="500,166020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 250 251 <SpaceShip position="500,168020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 252 253 <SpaceShip position="500,170020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 254 255 <SpaceShip position="500,172020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 256 257 <SpaceShip position="500,174020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 258 259 <SpaceShip position="500,176020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 260 261 <SpaceShip position="500,178020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 262 263 <SpaceShip position="500,180020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 264 265 <SpaceShip position="500,182020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 266 267 <SpaceShip position="500,184020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 268 269 <SpaceShip position="500,186020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 270 271 <SpaceShip position="500,188020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 272 273 <SpaceShip position="500,190020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 274 275 <SpaceShip position="500,192020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 276 277 <SpaceShip position="500,194020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 278 279 <SpaceShip position="500,196020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 280 281 <SpaceShip position="500,198020,500" lookat="50,20,50" name="enemy" health="200" maxhealth="200" initialhealth="80" > <templates> <Template link=spaceshipzombie /> </templates> </SpaceShip> 282 283 82 284 83 285 </Scene> 84 286 </Level> 85 -
code/branches/Presentation_FS19/data/levels/includes/weaponSettingsHover.oxi
r12194 r12410 7 7 <WeaponSet firemode=1 /> 8 8 </weaponsets> 9 < !--<weaponpacks>9 <weaponpacks> 10 10 <WeaponPack> 11 11 <links> … … 14 14 </links> 15 15 <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 <HoverGun mode=0 munitionpershot=0 delay=0.125 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" projectileMesh="LaserBeam2.mesh" /> 17 17 </Weapon> 18 18 <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 <HoverGun mode=0 munitionpershot=0 delay=0 damage=9.3 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" projectileMesh="LaserBeam2.mesh" /> 20 20 </Weapon> 21 21 </WeaponPack> … … 25 25 </links> 26 26 </WeaponPack> 27 </weaponpacks> -->27 </weaponpacks> 28 28 <munition> 29 < IceMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/>29 <LaserMunition initialmagazines=1 maxmagazines=1 munitionpermagazine=10/> 30 30 </munition> -
code/branches/Presentation_FS19/data/levels/templates/spaceshipGhost.oxt
r11052 r12410 7 7 explosionchunks = 6 8 8 9 health = 30 10 maxhealth = 50 11 initialhealth = 30 9 health = 100 10 maxhealth = 100 11 initialhealth = 100 12 12 13 13 shieldhealth = 100 14 initialshieldhealth = 100 15 maxshieldhealth = 150 16 shieldabsorption = 0.9 17 shieldrechargerate = 3 18 shieldrechargewaittime = 0.0 19 20 primaryThrust = 600 21 auxilaryThrust = 30 14 primaryThrust = 25 15 auxilaryThrust = 25 22 16 rotationThrust = 25 23 17 24 18 lift = 1; 25 stallSpeed = 220;19 stallSpeed = 100; 26 20 27 boostPower = 30 28 boostPowerRate = 1 29 boostRate = 5 30 boostCooldownDuration = 15 21 31 22 32 23 shakeFrequency = 20 … … 45 36 </attached> 46 37 <collisionShapes> 47 <BoxCollisionShape position="0,0,0" halfExtents="10, 3, 5" /> 48 <BoxCollisionShape position="13,-1.3,0" halfExtents="3, 1, 2" /> 49 <BoxCollisionShape position="-13,-1.3,0" halfExtents="3, 1, 2" /> 50 <BoxCollisionShape position="0,0,7" halfExtents="3, 2, 2" /> 51 <BoxCollisionShape position="0,0.1,-11" halfExtents="2.2, 1.8, 6" /> 52 <BoxCollisionShape position="0,0.1,-19" halfExtents="1.4, 1, 2" /> 38 <BoxCollisionShape position="0,-2 ,7" halfExtents="7, 4 ,30" /> 53 39 </collisionShapes> 54 40 <explosion > … … 63 49 <ExplosionPart mesh="WingDebris2.mesh" effect1="Orxonox/fire4" effect2="Orxonox/smoke6" /> 64 50 </explosion> 65 < ?lua51 <!-- <?lua 66 52 include("../includes/weaponSettingsGhost.oxi") 67 53 ?> 68 </SpaceShip>54 --> </SpaceShip> 69 55 </Template> 70 56 … … 83 69 boostfactor = 2 84 70 85 speedfront = 60071 speedfront = 50 86 72 speedback = 50 87 73 speedleftright = 50 88 speedupdown = 5074 speedupdown = 0 89 75 90 76 accelerationfront = 1000 … … 92 78 accelerationback = 100 93 79 accelerationleftright = 100 94 accelerationupdown = 10080 accelerationupdown = 0 95 81 > 96 82 <EffectContainer condition="normal or boost"> -
code/branches/Presentation_FS19/data/levels/templates/spaceshipHover.oxt
r12292 r12410 1 1 <Template name=spaceshiphover> 2 2 <SpaceShip 3 hudtemplate = spaceshiph overhud3 hudtemplate = spaceshiphud 4 4 camerapositiontemplate = spaceshiphovercameras 5 5 spawnparticlesource = "Orxonox/fairytwirl" … … 20 20 primaryThrust = 200 21 21 auxilaryThrust = 30 22 rotationThrust = 2 522 rotationThrust = 20 23 23 24 24 jumpBoost = 90 … … 27 27 stallSpeed = 220; 28 28 29 boostPower = 1029 boostPower = 30 30 30 boostPowerRate = 1 31 31 boostRate = 5 … … 36 36 linearDamping = 0.2 37 37 angularDamping = 0.9999999 38 collisiondamage = 20 39 enablecollisiondamage = true 40 38 41 > 39 42 <engines> … … 79 82 boostfactor = 2 80 83 81 speedfront = 9082 speedback = 4083 speedleftright = 4084 speedupdown = 4084 speedfront = 90 85 speedback = 90 86 speedleftright = 90 87 speedupdown = 0 85 88 86 accelerationfront = 50087 accelerationbrake = 50088 accelerationback = 12589 accelerationleftright = 12590 accelerationupdown = 12589 accelerationfront = 500 90 accelerationbrake = 500 91 accelerationback = 500 92 accelerationleftright = 500 93 accelerationupdown = 0 91 94 > 92 95 <EffectContainer condition="not idle"> -
code/branches/Presentation_FS19/src/modules/hover/Hover.cc
r12292 r12410 36 36 #include "HoverOrigin.h" 37 37 #include "HoverWall.h" 38 #include "HoverFlag.h" 38 39 39 #include "MazeGenerator.h" 40 40 #include "core/CoreIncludes.h" 41 #include "worldentities/pawns/Pawn.h" 42 #include "worldentities/pawns/ScriptableControllerDrone.h" 43 #include "worldentities/pawns/SpaceShip.h" 44 45 #include "tools/Timer.h" 46 #include "infos/Bot.h" 47 #include "worldentities/pawns/ModularSpaceShip.h" 48 #include "graphics/Model.h" 49 50 51 41 52 42 53 namespace orxonox … … 49 60 50 61 this->origin_ = nullptr; 51 this->numberOfFlags_ = 1;52 62 this->firstTick_ = true; 53 63 54 64 this->setHUDTemplate("HoverHUD"); 55 65 } 66 // void Hover::spawnZombie(std::string id) 67 // { 68 // Identifier *identifier = ClassByString("SpaceShip"); 69 70 // if(!identifier) 71 // { 72 // orxout(user_error) << "Script tried to spawn unknown object" << std::endl; 73 // return; 74 // } 75 76 // if(!identifier->isLoadable()) 77 // { 78 // orxout(user_error) << "Script tried to spawn unloadable object" << std::endl; 79 // return; 80 // } 81 82 83 // WorldEntity *entity; 84 // Identifiable *obj = identifier->fabricate(this->controller_->getWorldEntityByID("Player")->getContext()); 85 86 87 88 // orxout(user_status) << "First hit!" << std::endl; 89 90 // if(obj->isA(ClassIdentifier<WorldEntity>::getIdentifier())) 91 // { 92 // orxout(user_status) << "Is WorldEntity!" << std::endl; 93 // entity = orxonox_cast<WorldEntity*>(obj); 94 // } 95 // else if(obj->isA(ClassIdentifier<PlayerInfo>::getIdentifier())) 96 // { 97 // // TODO This does not work yet because somehow the controllable entity is not set 98 // // yet at this stage. 99 // // entity = orxonox_cast<PlayerInfo*>(obj)->getControllableEntity(); 100 101 // orxout(user_status) << "Is PlayerInfo!" << std::endl; 102 103 // //use TEMPLATES in the map to define objects that are not present on the map yet 104 // return; 105 // } 106 // else 107 // { 108 // orxout(user_warning) << "Script tried to spawn an object that is neither a WorldEntity, nor a PlayerInfo" << std::endl; 109 110 // return; 111 // } 112 113 // if(entity->isA(ClassIdentifier<MobileEntity>::getIdentifier())) { 114 // orxout(user_status) << "Is MobileEntity!" << std::endl; 115 // this->controller_->registerMobileEntity(id, orxonox_cast<MobileEntity*>(entity)); 116 // } 117 118 119 120 // if(entity->isA(ClassIdentifier<Pawn>::getIdentifier())) { 121 // orxout(user_status) << "Is Pawn!" << std::endl; 122 // this->controller_->registerPawn(id, orxonox_cast<Pawn*>(entity)); 123 // } 124 125 // this->controller_->registerWorldEntity(id, orxonox_cast<WorldEntity*>(entity)); 126 127 128 // ///////////////GOLD!!!!!!!!!!!!!!!//////////////////////// 129 // Pawn* pawn = this->controller_->getPawnByID(id); 130 131 // //Attach to pawn 132 // SpaceShip* drone = new SpaceShip(pawn->getContext()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something) 133 134 // drone->addTemplate("spaceshipzombie"); //ScriptableControllerDroneTemplate spaceshipescort 135 136 // Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(500,20,500); 137 // drone->setPosition(spawnPosition); 138 // } 56 139 57 140 void Hover::tick(float dt) … … 82 165 83 166 //Generate inner Walls according to levelcode 84 for(int y=0; y<numCells; y++){ 85 for(int x=0; x<numCells; x++){ 86 switch(levelcode[ y * numCells + x ]){ 87 case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1); 88 break; 89 case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1); 90 case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0); 91 default: break; 92 } 93 } 94 } 167 // for(int y=0; y<numCells; y++){ 168 // for(int x=0; x<numCells; x++){ 169 // switch(levelcode[ y * numCells + x ]){ 170 // case 1: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1); 171 // break; 172 // case 3: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 1); 173 // case 2: (new HoverWall(origin_->getContext()))->init(x+1, numCells-y, cellSize, cellHeight, 0); 174 // default: break; 175 // } 176 // } 177 // } 178 179 180 181 95 182 96 183 //Generate 5 flags randomly 97 for ( int i = 0; i < 5; i++ ) 98 { 99 HoverFlag* flag = new HoverFlag(origin_->getContext()); 100 flag->init(rand()%numCells, rand()%numCells, cellSize); 101 flags_.push_back(flag); 102 } 184 // for ( int i = 0; i < 5; i++ ) 185 // { 186 // HoverFlag* zombieship = new SpaceShip(origin_->getContext()); 187 // flag->init(rand()%numCells, rand()%numCells, cellSize); 188 // flags_.push_back(flag); 189 // } 190 191 103 192 104 193 }//firsttick end 105 194 106 195 // Check if ship collided with one of the flags 107 for ( unsigned int i = 0; i < flags_.size(); i++ ){ 108 if(flags_[i]->getCollided()){ 109 flags_[i]->destroyLater(); 110 flags_.erase (flags_.begin()+i); 111 } 112 } 113 numberOfFlags_ = flags_.size(); 196 // for ( unsigned int i = 0; i < flags_.size(); i++ ){ 197 // if(flags_[i]->getCollided()){ 198 // flags_[i]->destroyLater(); 199 // flags_.erase (flags_.begin()+i); 200 // } 201 // } 202 // numberOfFlags_ = flags_.size(); 203 204 //Spawn Zombies 205 //spawnZombie(z1); 206 207 114 208 } 115 209 } -
code/branches/Presentation_FS19/src/modules/hover/Hover.h
r11495 r12410 45 45 namespace orxonox 46 46 { 47 48 49 50 47 51 class _HoverExport Hover : public Gametype 48 52 { … … 58 62 { return this->numberOfFlags_; } 59 63 64 60 65 private: 61 66 WeakPtr<HoverOrigin> origin_; … … 66 71 } 67 72 73 68 74 #endif /* _Hover_H__ */ -
code/branches/Presentation_FS19/src/modules/hover/HoverShip.cc
r12292 r12410 48 48 } 49 49 50 // //moves slightly right and left, that zombieship approaches 51 // void HoverShip::leftright(const Vector2& value) 52 // { 53 // this->steering_.z += 5; 54 // this->steering_.z -= 5; 55 // } 56 50 57 void HoverShip::moveFrontBack(const Vector2& value) 51 58 { this->steering_.z -= value.x; } 52 59 53 60 void HoverShip::moveRightLeft(const Vector2& value) 54 { this->steering_.x += value.x; } 61 { this->steering_.x += value.x; 62 // value.x += 0.001; 63 // value.x -= 0.001; 64 } 55 65 56 66 void HoverShip::moveUpDown(const Vector2& value) … … 101 111 } 102 112 113 if(otherObject->isA(Class(SpaceShip))) 114 { 115 removeHealth(0.2); 116 } 117 103 118 return false; 104 119 } -
code/branches/Presentation_FS19/src/modules/hover/HoverShip.h
r12292 r12410 53 53 { return this->jumpBoost_; } 54 54 55 /////moves slightly right and left, that zombieship approaches 56 // virtual void leftright(const Vector2& value); 57 55 58 virtual void moveFrontBack(const Vector2& value) override; 56 59 -
code/branches/Presentation_FS19/src/modules/hover/HoverWall.cc
r11099 r12410 1 /*1 /* 2 2 * ORXONOX - the hottest 3D action shooter ever to exist 3 3 * > www.orxonox.net < … … 102 102 103 103 model_ = new Model(this->getContext()); 104 model_->setMeshSource("CuboidBody.mesh");105 model_->setScale3D(Vector3(xSize_*1.0f, cellHeight* 1.0f, zSize_*1.0f));104 // model_->setMeshSource("CuboidBody.mesh"); 105 model_->setScale3D(Vector3(xSize_*1.0f, cellHeight*400000000.0f, zSize_*1.0f)); 106 106 model_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f)); 107 107 … … 109 109 110 110 cs_ = new BoxCollisionShape(this->getContext()); 111 cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight* 1.0f, zSize_*1.0f));111 cs_->setHalfExtents(Vector3(xSize_*1.0f, cellHeight*400000000.0f, zSize_*1.0f)); 112 112 cs_->setPosition(Vector3(xPos_*1.0f, 0.0f, zPos_*1.0f)); 113 113 -
code/branches/Presentation_FS19/src/modules/weapons/projectiles/CMakeLists.txt
r12191 r12410 15 15 MineProjectile.cc 16 16 WagnisProjectile.cc 17 HoverGunProjectile.cc 17 18 ) -
code/branches/Presentation_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt
r12191 r12410 5 5 HsW01.cc 6 6 LightningGun.cc 7 HoverGun.cc 7 8 SplitGun.cc 8 9 IceGun.cc … … 14 15 MineGun.cc 15 16 WagnisGun.cc 17 HoverGun.cc 16 18 )
Note: See TracChangeset
for help on using the changeset viewer.