[Orxonox-commit 7480] r12086 - code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy
sastocke at orxonox.net
sastocke at orxonox.net
Wed Nov 7 11:26:02 CET 2018
Author: sastocke
Date: 2018-11-07 11:26:02 +0100 (Wed, 07 Nov 2018)
New Revision: 12086
Modified:
code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc
code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc
code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h
code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc
Log:
switching towers
Modified: code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc
===================================================================
--- code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc 2018-11-07 09:52:17 UTC (rev 12085)
+++ code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxy.cc 2018-11-07 10:26:02 UTC (rev 12086)
@@ -204,17 +204,17 @@
void TixyTaxyTorxy::upgradeTower(int x, int y)
{
- TixyTaxyTorxyCoordinate* coord = new TixyTaxyTorxyCoordinate(x,y);
- x = coord->GetX();
- y = coord->GetY();
+ // TixyTaxyTorxyCoordinate* coord = new TixyTaxyTorxyCoordinate(x,y);
+ // x = coord->GetX();
+ // y = coord->GetY();
- int cost = center_->getTowerCost(fields_[x][y]->getUpgrade() + 1);
+ // int cost = 100;
- if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
- {
- payCredit(cost);
- fields_[x][y]->upgrade();
- }
+ // if (fields_[x][y]->isFree() == false && fields_[x][y]->canUpgrade() == true && getCredit() >= cost)
+ // {
+ // payCredit(cost);
+ // fields_[x][y]->upgrade();
+ // }
}
void TixyTaxyTorxy::tick(float dt)
@@ -233,14 +233,13 @@
{
selecter->buildTower_ = false;
- if (getField(selecter->selectedPos_)->canUpgrade() == true)
- {
- upgradeTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
- }
- else
- {
- addTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
- }
+ // if (getField(selecter->selectedPos_)->canUpgrade() == true)
+ // {
+ // upgradeTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+ // }
+
+ addTower(selecter->selectedPos_->GetX(), selecter->selectedPos_->GetY());
+
}
Modified: code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc
===================================================================
--- code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc 2018-11-07 09:52:17 UTC (rev 12085)
+++ code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.cc 2018-11-07 10:26:02 UTC (rev 12086)
@@ -41,7 +41,7 @@
namespace orxonox
{
RegisterClass(TixyTaxyTorxyField);
-
+ int counter=0;
/**
@brief
Constructor. Registers and initializes the object and checks whether the gametype is actually TixyTaxyTorxy
@@ -85,51 +85,54 @@
center_ = center;
}
- void TixyTaxyTorxyField::upgrade()
- {
- if (canUpgrade() == true)
- {
- destroyTower();
- createTower(getUpgrade() + 1);
- }
- }
+ // void TixyTaxyTorxyField::upgrade()
+ // {
+ // if (canUpgrade() == true)
+ // {
+ // destroyTower();
+ // createTower(getUpgrade() + 1);
+ // }
+ // }
- int TixyTaxyTorxyField::getUpgrade()
- {
- return upgrade_;
- }
+ // int TixyTaxyTorxyField::getUpgrade()
+ // {
+ // return upgrade_;
+ // }
- TixyTaxyTorxyFieldType TixyTaxyTorxyField::getType()
- {
- return type_;
- }
+ // TixyTaxyTorxyFieldType TixyTaxyTorxyField::getType()
+ // {
+ // return type_;
+ // }
void TixyTaxyTorxyField::setUpgrade(int upgrade)
{
- if (upgrade < 0)
- {
- upgrade_ = 0;
- }
- else if (upgrade > 5)
- {
- upgrade = 5;
+ // upgrade_= counter%2;
+ // if (upgrade < 0)
+ // {
+ // upgrade_ = 0;
+ // }
+ // else if (upgrade > 5)
+ // {
+ // upgrade = 5;
+ // }
+ // else
+ // {
+ // upgrade_ = upgrade;
}
- else
- {
- upgrade_ = upgrade;
- }
- }
- bool TixyTaxyTorxyField::canUpgrade()
- {
- if (tower_ != nullptr && upgrade_ < 5)
- {
- return true;
- }
+
+ // }
- return false;
- }
+ // bool TixyTaxyTorxyField::canUpgrade()
+ // {
+ // if (tower_ != nullptr && upgrade_ < 5)
+ // {
+ // return true;
+ // }
+ // return false;
+ // }
+
void TixyTaxyTorxyField::setAngle(int newAngle)
{
if (modelGround_ != nullptr)
@@ -252,39 +255,51 @@
void TixyTaxyTorxyField::createTower(int upgrade)
{
+ counter++;
if (tower_ == nullptr)
{
- modelGround_->setMeshSource("TD_F1.mesh");
+ if(counter%2==0){
+ modelGround_->setMeshSource("TD_T1.mesh");
tower_ = new TixyTaxyTorxyTower(center_->getContext());
attach(tower_);
- type_ = TixyTaxyTorxyFieldType::TOWER;
- setUpgrade(upgrade);
- if (upgrade_ > 0 && modelObject_ != nullptr)
- {
- switch (upgrade_)
- {
- case 1:
- modelObject_->setMeshSource("TD_T1.mesh");
- tower_->addTemplate(center_->getTower1Template());
- break;
- case 2:
- modelObject_->setMeshSource("TD_T2.mesh");
- tower_->addTemplate(center_->getTower2Template());
- break;
- case 3:
- modelObject_->setMeshSource("TD_T3.mesh");
- tower_->addTemplate(center_->getTower3Template());
- break;
- case 4:
- modelObject_->setMeshSource("TD_T4.mesh");
- tower_->addTemplate(center_->getTower4Template());
- break;
- case 5:
- modelObject_->setMeshSource("TD_T5.mesh");
- tower_->addTemplate(center_->getTower5Template());
- break;
- }
- }
+
+ }else{
+ modelGround_->setMeshSource("TD_T2.mesh");
+ tower_ = new TixyTaxyTorxyTower(center_->getContext());
+ attach(tower_);
+ }
+
+
+ // type_ = TixyTaxyTorxyFieldType::TOWER;
+ // setUpgrade(upgrade);
+ // if (upgrade_ > 0 && modelObject_ != nullptr)
+ // {
+ // modelObject_->setMeshSource("TD_T2.mesh");
+ // tower_->addTemplate(center_->getTower1Template());
+ // switch (counter%2 +1)
+ // {
+ // case 1:
+ // modelObject_->setMeshSource("TD_T1.mesh");
+ // tower_->addTemplate(center_->getTower1Template());
+ // break;
+ // case 2:
+ // modelObject_->setMeshSource("TD_T2.mesh");
+ // tower_->addTemplate(center_->getTower2Template());
+ // break;
+ // case 3:
+ // modelObject_->setMeshSource("TD_T3.mesh");
+ // tower_->addTemplate(center_->getTower3Template());
+ // break;
+ // case 4:
+ // modelObject_->setMeshSource("TD_T4.mesh");
+ // tower_->addTemplate(center_->getTower4Template());
+ // break;
+ // case 5:
+ // modelObject_->setMeshSource("TD_T5.mesh");
+ // tower_->addTemplate(center_->getTower5Template());
+ // break;
+ // }
+ // }
}
}
Modified: code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h
===================================================================
--- code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h 2018-11-07 09:52:17 UTC (rev 12085)
+++ code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyField.h 2018-11-07 10:26:02 UTC (rev 12086)
@@ -67,11 +67,11 @@
{ return type_==TixyTaxyTorxyFieldType::FREE; }
virtual void create(char object, char param);
virtual void setCenterpoint(TixyTaxyTorxyCenterpoint* center);
- virtual void upgrade();
- virtual int getUpgrade();
- virtual TixyTaxyTorxyFieldType getType();
+ // virtual void upgrade();
+ // virtual int getUpgrade();
+ // virtual TixyTaxyTorxyFieldType getType();
virtual void setUpgrade(int upgrade);
- virtual bool canUpgrade();
+ // virtual bool canUpgrade();
virtual void createFree(int orientation);
virtual void createStart(int orientation);
virtual void createEnd(int orientation);
Modified: code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc
===================================================================
--- code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc 2018-11-07 09:52:17 UTC (rev 12085)
+++ code/branches/TixyTaxyTorxy_HS18/src/modules/TixyTaxyTorxy/TixyTaxyTorxyTower.cc 2018-11-07 10:26:02 UTC (rev 12086)
@@ -9,7 +9,6 @@
/* Not implemented fully */
#include "TixyTaxyTorxy.h"
-
#include "core/CoreIncludes.h"
//#include "core/XMLPort.h"
@@ -22,12 +21,13 @@
Constructor. Registers and initializes the object.
*/
TixyTaxyTorxyTower::TixyTaxyTorxyTower(Context* context) : Turret(context)
- {
+ {
RegisterObject(TixyTaxyTorxyTower);
game_ =nullptr;
this->setCollisionType(WorldEntity::CollisionType::None);
upgrade = 1;
-
+
+ }
//this->removeAllEngines();
/*
@@ -35,7 +35,7 @@
this->delay_ = false;
this->delayTimer_.setTimer(0.2f, false, createExecutor(createFunctor(&TetrisStone::enableMovement, this)));
*/
- }
+
/*
void TixyTaxyTorxy
More information about the Orxonox-commit
mailing list