[Orxonox-commit 5675] r10335 - in code/branches/towerdefenseFS15: data/levels data/levels/templates src/modules/towerdefense src/orxonox/controllers
erbj at orxonox.net
erbj at orxonox.net
Thu Mar 26 15:26:26 CET 2015
Author: erbj
Date: 2015-03-26 15:26:26 +0100 (Thu, 26 Mar 2015)
New Revision: 10335
Modified:
code/branches/towerdefenseFS15/data/levels/templates/enemytowerdefense.oxt
code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt
code/branches/towerdefenseFS15/data/levels/towerDefense.oxw
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h
code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc
Log:
tower don't shoot at the centerpoint anymore(because we shifted it by 2000,hack) and the tower and model are two different things now
Modified: code/branches/towerdefenseFS15/data/levels/templates/enemytowerdefense.oxt
===================================================================
--- code/branches/towerdefenseFS15/data/levels/templates/enemytowerdefense.oxt 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/data/levels/templates/enemytowerdefense.oxt 2015-03-26 14:26:26 UTC (rev 10335)
@@ -166,7 +166,7 @@
health = 100
maxhealth = 200
initialhealth = 100
-
+
shieldhealth = 30
initialshieldhealth = 30
maxshieldhealth = 50
Modified: code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt
===================================================================
--- code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt 2015-03-26 14:26:26 UTC (rev 10335)
@@ -19,14 +19,13 @@
>
<controller>
- <TurretController/>
+ <TurretController team = 1/>
</controller>
<attached>
- <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
- <Turret
+ <!--Turret
explosionchunks = 6
reloadrate=10
@@ -44,7 +43,7 @@
</controller>
- </Turret>
+ </Turret-->
</attached>
Modified: code/branches/towerdefenseFS15/data/levels/towerDefense.oxw
===================================================================
--- code/branches/towerdefenseFS15/data/levels/towerDefense.oxw 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/data/levels/towerDefense.oxw 2015-03-26 14:26:26 UTC (rev 10335)
@@ -28,7 +28,7 @@
<Template name=centerpointmarkcamera defaults=0>
<Pawn team=1>
<camerapositions>
- <CameraPosition position="0,0,1500"/>
+ <CameraPosition position="-2000,0,1500"/>
</camerapositions>
</Pawn>
</Template>
@@ -58,7 +58,7 @@
<Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
<!-- Spawns the camera, attached to a crate -->
- <SpawnPoint team=1 position="0,0,0" spawnclass=Pawn pawndesign=centerpointmark />
+ <SpawnPoint team=1 position="2000,0,0" pawndesign=centerpointmark />
<!--TeamSpawnPoint team=1 position="-7,7,4" direction="-1,0,0" roll=90 yaw=0 spawnclass=SpaceShip pawndesign=spaceshipassff /-->
<!--SpawnPoint team=1 position="0,0,10" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff /-->
@@ -68,7 +68,7 @@
<!--invisible entity to attach towers to, since playfield is static and towers are dynamic-->
- <StaticEntity team =1 position=0,0,0>
+ <StaticEntity position=0,0,0>
<attached>
<Model position="-50,-50,0" mesh="Playfield_ME.mesh" scale=80 />
@@ -104,7 +104,6 @@
direction="0,0,0"
collisionType=dynamic
mass=100000
- team=1
/>
</Scene>
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-26 14:26:26 UTC (rev 10335)
@@ -153,7 +153,7 @@
//set initial credits, lifes and WaveNumber
this->setCredit(1000);
- this->setLifes(25);
+ this->setLifes(100);
this->setWaveNumber(0);
time=0.0;
@@ -193,6 +193,7 @@
break;
}
+ en1->setTeam(2);
en1->getController();
en1->setPosition(path.at(0)->get3dcoordinate());
TowerDefenseEnemyvector.push_back(en1);
@@ -275,10 +276,19 @@
this->buyTower(towerCost);
towermatrix [x][y]=true;
+ //Create Model
+ Model* newtowermodel = new Model(this->center_->getContext());
+ newtowermodel->setMeshSource("Tower.mesh");
+ newtowermodel->setScale(45);
+ newtowermodel->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 50);
+
+
+
//Creates tower
TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
- towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
+ towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 275);
towernew->setGame(this);
+ towernew->setTeam(1);
}
bool TowerDefense::hasEnoughCreditForTower(int towerCost)
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-26 14:26:26 UTC (rev 10335)
@@ -40,6 +40,7 @@
*/
}
+ /*
void TowerDefenseTower::setOrientation(const Quaternion& orientation)
{
}
@@ -55,6 +56,7 @@
void TowerDefenseTower::rotateRoll(const Vector2& value)
{
}
+ */
bool TowerDefenseTower::upgradeTower()
{
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.h 2015-03-26 14:26:26 UTC (rev 10335)
@@ -37,10 +37,12 @@
*/
// Overriding these to stop TowerDefenseTowers from spasing out
+ /*
void setOrientation(const Quaternion& orientation);
virtual void rotateYaw(const Vector2& value);
virtual void rotatePitch(const Vector2& value);
virtual void rotateRoll(const Vector2& value);
+ */
virtual bool upgradeTower();
Modified: code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc
===================================================================
--- code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc 2015-03-26 12:38:24 UTC (rev 10334)
+++ code/branches/towerdefenseFS15/src/orxonox/controllers/FormationController.cc 2015-03-26 14:26:26 UTC (rev 10335)
@@ -955,6 +955,8 @@
bool FormationController::sameTeam(ControllableEntity* entity1, ControllableEntity* entity2, Gametype* gametype)
{
+
+
if (entity1 == entity2)
return true;
More information about the Orxonox-commit
mailing list