conflict resolutions

Assets/Scripts/Core/player.lua

@@ -33,8 +33,8 @@ Player.unitClassMappings = {
 }
 
 Player.landTaskForceData = {
-	{class = UnitClass.MECH, numUnits = 2},
-	{class = UnitClass.TANK, numUnits = 1},
+	{class = UnitClass.MECH, numUnits = 3},
+	{class = UnitClass.TANK, numUnits = 2},
 	{class = UnitClass.ARTILLERY, numUnits = 1}
 }
 
@@ -127,7 +127,7 @@ function Player:landRouteToSpawnpoint_(mapPoint)
 	pf = Pathfinder.getSingleton()
 	cells = map:getCells()
 	heurs = pf:calcHeuristics(cells, dest)
-	path = pf:findPath(cells, heurs, source, dest, nil)
+	path = pf:findPath(cells, heurs, source, dest, -1)
 
 	embarkCellId = nil
 	disembarkCellId = nil

Assets/Scripts/Core/playerInit.lua

@@ -11,7 +11,7 @@ for i = 1, #game.cpuPlayers do
 				func = player.buildTaskForces, 
 				args = {
 					factoryClass = UnitClass.LAND_FACTORY,
-					taskForceData = {{class = UnitClass.CYBORG_ENGINEER, numUnits = 4}}
+					taskForceData = {{class = UnitClass.CYBORG_ENGINEER, numUnits = 5}}
 				}
 			},
 			{

Assets/Scripts/GameObjects/Units/unitData.lua

@@ -178,7 +178,7 @@ units = {
 		maxUnevenness = .5,
 		isVehicle = true,
 		health = 500,
-		buildTime = 1000,
+		buildTime = 600,
 		cost = 500,
 		size = {x = 6, y = 9.22, z = 2.42},
 		hitboxOffset = {x = 0, y = 4.5, z = 0},
@@ -189,7 +189,7 @@ units = {
 		albedoPath = 'mech.jpg',
 		colorNodes = {'WarRobotTemplate.001'},
 		selectionSfx = PATH .. 'Sounds/Units/WarMechs/selection.ogg',
-		speed = .3,
+		speed = .4,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
@@ -346,7 +346,7 @@ units = {
 			{
 				orderType = OrderType.ATTACK,
 				rateOfFire = 1000, 
-				damage = 200, 
+				damage = 900, 
 				maxRange = 50,
 				maxFireAngle = .1,
 				nodes = {{name = 'TankASHead', rotationSpeed = .05, vertical = false}, {name = 'barell', rotationSpeed = .05, angleConstraints = {min = 0, max = .349}, vertical = true}},
@@ -392,7 +392,7 @@ units = {
 		albedoPath = 'tank.jpg',
 		colorNodes = {'TankASHead'},
 		selectionSfx = PATH .. 'Sounds/Units/Tanks/selection.ogg',
-		speed = .4,
+		speed = .5,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
@@ -556,7 +556,7 @@ units = {
 		alignToSurface = true,
 		isVehicle = true,
 		health = 500,
-		buildTime = 1000,
+		buildTime = 1500,
 		cost = 500,
 		size = {x = 9.99, y = 15.4, z = 14.},
 		hitboxOffset = {x = 0, y = 7.69, z = .71},
@@ -567,7 +567,7 @@ units = {
 		albedoPath = 'artillery.jpg',
 		colorNodes = {'Asia_Mech.002'},
 		selectionSfx = PATH .. 'Sounds/Units/Tanks/selection.ogg',
-		speed = .3,
+		speed = .35,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
@@ -766,7 +766,7 @@ units = {
 		colorNodes = {'Engineer_Asia.001'},
 		meshPath = 'acsCyborgEngineer.xml',
 		selectionSfx = PATH .. 'Sounds/Units/Engineers/selection.ogg',
-		speed = .5,
+		speed = 1,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
@@ -840,7 +840,7 @@ units = {
 		cost = 500,
 		size = {x = 3.12, y = 5.31, z = 2.82},
 		hitboxOffset = {x = 0, y = 2.83, z = .4},
-		lineOfSight = 200,
+		lineOfSight = 600,
 		name = 'Engineer',
 		basePath = PATH .. vehiclePrefix .. 'Engineers/',
 		albedoPath = 'engineer.jpg',
@@ -1380,7 +1380,7 @@ units = {
 		meshPath = 'heavyAssaultCruiser.xml',
 		albedoPath = 'cruiser.jpg',
 		selectionSfx = PATH .. 'Sounds/Units/Cruisers/selection.ogg',
-		speed = .1,
+		speed = .4,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,
@@ -1692,7 +1692,7 @@ units = {
 		meshPath = 'acsAntiSubCruiser.xml',
 		albedoPath = 'cruiser.jpg',
 		selectionSfx = PATH .. 'Sounds/Units/Cruisers/selection.ogg',
-		speed = .3,
+		speed = .6,
 		destinationOffset = .1,
 		anglePrecision = .1,
 		maxTurnAngle = .1,

cameraController.cpp

@@ -45,8 +45,7 @@ namespace battleship{
     }
 
 	void CameraController::orientCamera(Vector3 rotAxis, double str){
-		float minStr = .001;
-		Quaternion rotQuat = Quaternion(.5 * (fabs(str) > minStr ? str : 0), rotAxis);
+		Quaternion rotQuat = Quaternion(.025 * str, rotAxis);
 		Camera *cam = Root::getSingleton()->getCamera();
 		Vector3 dir = rotQuat * cam->getDirection(), up = rotQuat * cam->getUp();
 		cam->lookAt(dir, up);

defConfigs.h

@@ -21,7 +21,7 @@ namespace battleship{
 
   		const std::string DEFAULT_TEXTURE = "Textures/defaultTexture.jpg";
   		const double camPanSpeed = .5, CAMERA_DISTANCE = 100, CAMERA_ZOOM_INCREMENT = 1, cellLength = 7, cellWidth = 7, cellDepth = 7, DIST_FROM_RAY = 15;
-		const int maxNumGroups = 10, NUM_MAX_ZOOMS = 75, NUM_SUBDIVS = 100;
+		const int maxNumGroups = 10, NUM_MAX_ZOOMS = 300, NUM_SUBDIVS = 100;
 		const vb01::u32 IMPASS_NODE_VAL = 65535;
 
   		const static int numAppStates = 5;