diff --git a/Templates/Full/game/art/datablocks/datablockExec.cs b/Templates/Full/game/art/datablocks/datablockExec.cs index bf419e905..7867156c2 100644 --- a/Templates/Full/game/art/datablocks/datablockExec.cs +++ b/Templates/Full/game/art/datablocks/datablockExec.cs @@ -58,5 +58,4 @@ exec("./player.cs"); exec("./aiPlayer.cs"); // Load the vehicle datablocks -exec("./vehicles/defaultCar.cs"); exec("./vehicles/cheetahCar.cs"); \ No newline at end of file diff --git a/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs b/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs index cb702166f..5a3cd4b3d 100644 --- a/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs +++ b/Templates/Full/game/art/datablocks/vehicles/cheetahCar.cs @@ -64,7 +64,7 @@ datablock SFXProfile(CheetahTurretFireSound) datablock ParticleData(CheetahTireParticle) { - textureName = "art/shapes/buggy/dustParticle"; + textureName = "art/particles/dustParticle"; dragCoefficient = "1.99902"; gravityCoefficient = "-0.100122"; inheritedVelFactor = "0.0998043"; diff --git a/Templates/Full/game/art/datablocks/vehicles/defaultCar.cs b/Templates/Full/game/art/datablocks/vehicles/defaultCar.cs deleted file mode 100644 index f4b7641b5..000000000 --- a/Templates/Full/game/art/datablocks/vehicles/defaultCar.cs +++ /dev/null @@ -1,179 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -//----------------------------------------------------------------------------- - -// Information extacted from the shape. -// -// Wheel Sequences -// spring# Wheel spring motion: time 0 = wheel fully extended, -// the hub must be displaced, but not directly animated -// as it will be rotated in code. -// Other Sequences -// steering Wheel steering: time 0 = full right, 0.5 = center -// breakLight Break light, time 0 = off, 1 = breaking -// -// Wheel Nodes -// hub# Wheel hub, the hub must be in it's upper position -// from which the springs are mounted. -// -// The steering and animation sequences are optional. -// The center of the shape acts as the center of mass for the car. - -//----------------------------------------------------------------------------- -/* -datablock SFXProfile(buggyEngineSound) -{ - filename = "art/sound/vehicles/buggy/engine_idle"; - description = AudioClosestLooping3d; - preload = true; -}; -*/ - -datablock ParticleData(TireParticle) -{ - dragCoefficient = "1.99902"; - gravityCoefficient = "-0.100122"; - inheritedVelFactor = "0.0998043"; - lifetimeMS = "1689"; - lifetimeVarianceMS = "400"; - textureName = "art/shapes/buggy/dustParticle"; - animTexName = "art/shapes/buggy/dustParticle"; - colors[0] = "0.456693 0.354331 0.259843 1"; - colors[1] = "0.456693 0.456693 0.354331 0"; - sizes[0] = "3.125"; - sizes[1] = "7.29167"; - sizes[2] = "5.20833"; - sizes[3] = "13.5417"; - -}; - -datablock ParticleEmitterData(TireEmitter) -{ - ejectionPeriodMS = 20; - periodVarianceMS = 10; - ejectionVelocity = "14.58"; - velocityVariance = 1.0; - ejectionOffset = 0.0; - thetaMin = 0; - thetaMax = 60; - phiReferenceVel = 0; - phiVariance = 360; - overrideAdvance = false; - particles = "TireParticle"; - blendStyle = "ADDITIVE"; -}; - - -//---------------------------------------------------------------------------- - -datablock WheeledVehicleTire(DefaultCarTire) -{ - // Tires act as springs and generate lateral and longitudinal - // forces to move the vehicle. These distortion/spring forces - // are what convert wheel angular velocity into forces that - // act on the rigid body. - shapeFile = "art/shapes/buggy/wheel.dts"; - staticFriction = 4.2; - kineticFriction = 3.15; - - // Spring that generates lateral tire forces - lateralForce = 18000; - lateralDamping = 6000; - lateralRelaxation = 1; - - // Spring that generates longitudinal tire forces - longitudinalForce = 18000; - longitudinalDamping = 4000; - longitudinalRelaxation = 1; -}; - -datablock WheeledVehicleSpring(DefaultCarSpring) -{ - // Wheel suspension properties - length = 0.85; // Suspension travel - force = 2800; // Spring force - damping = 3600; // Spring damping - antiSwayForce = 3; // Lateral anti-sway force -}; - -datablock WheeledVehicleData(DefaultCar) -{ - category = "Vehicles"; - shapeFile = "art/shapes/buggy/buggy.dts"; - emap = true; - - mountPose[0] = sitting; - numMountPoints = 1; - - maxSteeringAngle = 0.385; // Maximum steering angle, should match animation - tireEmitter = TireEmitter; // All the tires use the same dust emitter - - // 3rd person camera settings - cameraRoll = true; // Roll the camera with the vehicle - cameraMaxDist = 4.8; // Far distance from vehicle - cameraOffset = 1.5; // Vertical offset from camera mount point - cameraLag = 0.26; // Velocity lag of camera - cameraDecay = 1.25; // Decay per sec. rate of velocity lag - - // Rigid Body - mass = 380; - massCenter = "0 -0.2 0"; // Center of mass for rigid body - massBox = "0 0 0"; // Size of box used for moment of inertia, - // if zero it defaults to object bounding box - drag = 0.6; // Drag coefficient - bodyFriction = 0.6; - bodyRestitution = 0.4; - minImpactSpeed = 5; // Impacts over this invoke the script callback - softImpactSpeed = 5; // Play SoftImpact Sound - hardImpactSpeed = 15; // Play HardImpact Sound - integration = 8; // Physics integration: TickSec/Rate - collisionTol = 0.1; // Collision distance tolerance - contactTol = 0.1; // Contact velocity tolerance - - // Engine - engineTorque = 3300; // Engine power - engineBrake = 600; // Braking when throttle is 0 - brakeTorque = 8000; // When brakes are applied - maxWheelSpeed = 50; // Engine scale by current speed / max speed - - // Energy - maxEnergy = 100; - jetForce = 3000; - minJetEnergy = 30; - jetEnergyDrain = 2; - - // Sounds -// jetSound = ScoutThrustSound; -// engineSound = BuggyEngineSound; -// squealSound = ScoutSquealSound; -// softImpactSound = SoftImpactSound; -// hardImpactSound = HardImpactSound; -// wheelImpactSound = WheelImpactSound; - -// explosion = VehicleExplosion; - - // Dynamic fields accessed via script - nameTag = 'Buggy'; - maxDismountSpeed = 10; - maxMountSpeed = 5; -}; diff --git a/Templates/Full/game/art/shapes/buggy/buggy.dts b/Templates/Full/game/art/shapes/buggy/buggy.dts deleted file mode 100644 index f5fa23d84..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/buggy.dts and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/buggy.png b/Templates/Full/game/art/shapes/buggy/buggy.png deleted file mode 100644 index 477dc7169..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/buggy.png and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/dustParticle.png b/Templates/Full/game/art/shapes/buggy/dustParticle.png deleted file mode 100644 index 911ae3e46..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/dustParticle.png and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/materials.cs b/Templates/Full/game/art/shapes/buggy/materials.cs deleted file mode 100644 index 4a59dc268..000000000 --- a/Templates/Full/game/art/shapes/buggy/materials.cs +++ /dev/null @@ -1,27 +0,0 @@ -//----------------------------------------------------------------------------- -// Copyright (c) 2012 GarageGames, LLC -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to -// deal in the Software without restriction, including without limitation the -// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -// sell copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in -// all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -// IN THE SOFTWARE. -//----------------------------------------------------------------------------- - -new Material(buggy) -{ - diffuseMap[0] = "buggy"; - translucent = false; -}; diff --git a/Templates/Full/game/art/shapes/buggy/mesh.png b/Templates/Full/game/art/shapes/buggy/mesh.png deleted file mode 100644 index 365902e54..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/mesh.png and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/tread.jpg b/Templates/Full/game/art/shapes/buggy/tread.jpg deleted file mode 100644 index d25287e81..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/tread.jpg and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/wheel.dts b/Templates/Full/game/art/shapes/buggy/wheel.dts deleted file mode 100644 index 89f14391d..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/wheel.dts and /dev/null differ diff --git a/Templates/Full/game/art/shapes/buggy/wheel.jpg b/Templates/Full/game/art/shapes/buggy/wheel.jpg deleted file mode 100644 index df47ec078..000000000 Binary files a/Templates/Full/game/art/shapes/buggy/wheel.jpg and /dev/null differ