[Orxonox-commit 5665] r10325 - in code/branches/towerdefenseFS15: data/levels data/levels/templates src/modules/towerdefense
erbj at orxonox.net
erbj at orxonox.net
Thu Mar 19 15:59:26 CET 2015
Author: erbj
Date: 2015-03-19 15:59:26 +0100 (Thu, 19 Mar 2015)
New Revision: 10325
Added:
code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt
Removed:
code/branches/towerdefenseFS15/data/levels/templates/tower.oxt
Modified:
code/branches/towerdefenseFS15/data/levels/towerDefense.oxw
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h
code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
Log:
tower templates verwaltet und tower direkt turret, nicht eigenes objekt
Deleted: code/branches/towerdefenseFS15/data/levels/templates/tower.oxt
===================================================================
--- code/branches/towerdefenseFS15/data/levels/templates/tower.oxt 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/data/levels/templates/tower.oxt 2015-03-19 14:59:26 UTC (rev 10325)
@@ -1,128 +0,0 @@
-<Template name=tower>
- <TowerDefenseTower
-
-
- explosionchunks = 6
-
- reloadrate = 3
- reloadwaittime = 1
-
- collisionType = "dynamic"
- team = 2
-
-
- >
- <controller>
- <WaypointPatrolController alertnessradius=1000 team=5>
- <waypoints>
- <Model mesh="cube.mesh" scale=0 position=" 700, 200, 100" />
- </waypoints>
- </WaypointPatrolController>
- </controller>
-
-
-
- <attached>
- <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
-
-
- </attached>
-
- <!--collisionShapes>
-
- </collisionShapes-->
-
-<?lua
- include("../includes/towerWeaponSettings.oxi")
-?>
- </TowerDefenseTower>
-</Template>
-
-
-
-<Template name=towerturret>
- <TowerDefenseTower
-
-
- explosionchunks = 6
-
- reloadrate = 10
- reloadwaittime = 5
-
- collisionType = "dynamic"
- team = 1
-
-
- >
- <attached>
-
- <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
-
- <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30>
-
- <controller>
- <TurretController/>
- </controller>
- <?lua
- include("../includes/weaponSettingsTurret.oxi")
- ?>
- </Turret>
-
- </attached>
-
-
-
-
- <!--collisionShapes>
-
- </collisionShapes-->
-
-<?lua
- include("../includes/towerWeaponSettings.oxi")
-?>
- </TowerDefenseTower>
-</Template>
-
-
-
-<Template name=towerturret1>
- <TowerDefenseTower
-
-
- explosionchunks = 6
-
- reloadrate = 10
- reloadwaittime = 5
-
- collisionType = "dynamic"
- team = 1
-
-
- >
- <attached>
-
-
- <Turret reloadrate=10 reloadwaittime=5 collisionType="dynamic" position="0,0,10" direction="0,0,1" pitch="0" yaw="0" roll="0" angularDamping=0.999999 mass=100 maxPitch=90 maxYaw=90 maxAttackRadius=1000 minAttackRadius=30>
-
- <controller>
- <TurretController/>
- </controller>
- <?lua
- include("../includes/weaponSettingsTurret1.oxi")
- ?>
- </Turret>
-
- </attached>
-
-
-
-
- <!--collisionShapes>
-
- </collisionShapes-->
-
-<?lua
- include("../includes/towerWeaponSettings.oxi")
-?>
- </TowerDefenseTower>
-</Template>
\ No newline at end of file
Added: code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt
===================================================================
--- code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt (rev 0)
+++ code/branches/towerdefenseFS15/data/levels/templates/towerdefensetower.oxt 2015-03-19 14:59:26 UTC (rev 10325)
@@ -0,0 +1,62 @@
+<Template name=towerdefensetower>
+ <TowerDefenseTower
+
+
+ explosionchunks = 6
+ reloadrate=10
+ reloadwaittime=5
+ collisionType="none"
+ pitch="0"
+ yaw="0"
+ roll="0"
+ maxPitch=90
+ maxYaw=90
+ maxAttackRadius=1000
+ minAttackRadius=30
+ team = 1
+
+
+ >
+
+ <controller>
+ <TurretController/>
+ </controller>
+
+
+ <attached>
+
+ <Model position="0,0,0" scale=45 mesh="Tower.mesh" />
+ <Turret
+
+ explosionchunks = 6
+ reloadrate=10
+ reloadwaittime=5
+ collisionType="none"
+ maxPitch=90
+ maxYaw=90
+ maxAttackRadius=1000
+ minAttackRadius=30
+ team = 1
+ >
+
+ <controller>
+ <TurretController/>
+ </controller>
+
+
+ </Turret>
+ </attached>
+
+
+
+
+ <!--collisionShapes>
+
+ </collisionShapes-->
+
+
+ <?lua
+ include("../includes/weaponSettingsTurret.oxi")
+ ?>
+ </TowerDefenseTower>
+</Template>
\ No newline at end of file
Modified: code/branches/towerdefenseFS15/data/levels/towerDefense.oxw
===================================================================
--- code/branches/towerdefenseFS15/data/levels/towerDefense.oxw 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/data/levels/towerDefense.oxw 2015-03-19 14:59:26 UTC (rev 10325)
@@ -19,7 +19,7 @@
<?lua
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipPirate.oxt")
- include("templates/tower.oxt")
+ include("templates/towerdefensetower.oxt")
include("templates/enemytowerdefense.oxt")
include("templates/standardTurret.oxt")
?>
@@ -43,19 +43,6 @@
</Template>
-<!-- Template for a tower EDIT: new towertemplate is included with "templates/tower" -->
-<!--Template name=towertemplate>
- <Tower>
- <attached>
- <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
- </attached>
- </Tower>
-</Template-->
-
-
-
-
-
<Level gametype = "TowerDefense">
<templates>
<Template link=lodtemplate_default />
@@ -113,7 +100,6 @@
width=16
height=16
tileScale=100
- towerTemplate=tower
position="0,0,0"
direction="0,0,0"
collisionType=dynamic
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc 2015-03-19 14:59:26 UTC (rev 10325)
@@ -153,7 +153,7 @@
//set initial credits, lifes and WaveNumber
this->setCredit(1000);
- this->setLifes(50);
+ this->setLifes(25);
this->setWaveNumber(0);
time=0.0;
@@ -277,7 +277,6 @@
//Creates tower
TowerDefenseTower* towernew = new TowerDefenseTower(this->center_->getContext());
- towernew->addTemplate("towerturret");
towernew->setPosition(static_cast<float>((x-8) * tileScale), static_cast<float>((y-8) * tileScale), 75);
towernew->setGame(this);
}
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.cc 2015-03-19 14:59:26 UTC (rev 10325)
@@ -52,7 +52,6 @@
this->width_ = 15;
this->height_ = 15;
- this->towerTemplate_ = "";
//this->setCollisionType(Static);
@@ -71,7 +70,6 @@
XMLPortParam(TowerDefenseCenterpoint, "width", setWidth, getWidth, xmlelement, mode);
XMLPortParam(TowerDefenseCenterpoint, "height", setHeight, getHeight, xmlelement, mode);
XMLPortParam(TowerDefenseCenterpoint, "tileScale", setTileScale, getTileScale, xmlelement, mode);
- XMLPortParam(TowerDefenseCenterpoint, "towerTemplate", setTowerTemplate, getTowerTemplate, xmlelement, mode);
//TODO: add XMLPortObject(TowerDefenseCenterpoint, WorldEntity, "waypoints", addWaypoint, getWaypoint, xmlelement, mode);
// This was copied and shightly modified from WaypointController.cc ; there are no getters and setters and no membervariable yet
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseCenterpoint.h 2015-03-19 14:59:26 UTC (rev 10325)
@@ -78,24 +78,12 @@
unsigned int getTileScale(void) const
{ return this->tileScale_; }
- /**
- @brief Set the template for the towers.
- @param template The template name to be applied to each tower.
- */
- void setTowerTemplate(const std::string& templateName)
- { this->towerTemplate_ = templateName; }
-
- const std::string& getTowerTemplate(void) const
- { return this->towerTemplate_; }
-
private:
void checkGametype();
unsigned int width_;
unsigned int height_;
unsigned int tileScale_;
-
- std::string towerTemplate_;
};
}
Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-19 14:49:23 UTC (rev 10324)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc 2015-03-19 14:59:26 UTC (rev 10325)
@@ -25,12 +25,12 @@
{
RegisterObject(TowerDefenseTower);
game_ =NULL;
- this->setCollisionType(WorldEntity::Dynamic);
+ this->setCollisionType(WorldEntity::None);
upgrade = 0;
+ this->addTemplate("towerdefensetower");
-
//this->removeAllEngines();
/*
@@ -69,7 +69,7 @@
reloadwaittime = 0.5f*reloadwaittime;
setReloadRate(reloadrate);
setReloadWaitTime(reloadwaittime);
- this->addTemplate("towerturret1");
+ //this->addTemplate("towerturret1");
}
else
{
More information about the Orxonox-commit
mailing list