[Orxonox-commit 4490] r9161 - in code/branches/newlevel2012: data/levels data/levels/includes data/levels/templates src/modules/towerdefense src/orxonox/controllers
weigeltm at orxonox.net
weigeltm at orxonox.net
Fri May 4 16:19:18 CEST 2012
Author: weigeltm
Date: 2012-05-04 16:19:17 +0200 (Fri, 04 May 2012)
New Revision: 9161
Added:
code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi
code/branches/newlevel2012/data/levels/templates/tower.oxt
Modified:
code/branches/newlevel2012/data/levels/towerDefense.oxw
code/branches/newlevel2012/src/modules/towerdefense/Tower.cc
code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc
Log:
updated tower template and more stuff
Added: code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi
===================================================================
--- code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi (rev 0)
+++ code/branches/newlevel2012/data/levels/includes/towerWeaponSettings.oxi 2012-05-04 14:19:17 UTC (rev 9161)
@@ -0,0 +1,55 @@
+ <weaponslots>
+ <WeaponSlot position="-15.0,-1.5,0" />
+ <!--WeaponSlot position=" 15.0,-1.5,0" /-->
+ <!--WeaponSlot position=" 0, 0,0" /-->
+ </weaponslots>
+ <weaponsets>
+ <WeaponSet firemode=0 />
+ <WeaponSet firemode=1 />
+ <WeaponSet firemode=2 />
+ <WeaponSet firemode=3 />
+ </weaponsets>
+ <weapons>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=0 weaponmode=0 />
+ <DefaultWeaponmodeLink firemode=1 weaponmode=1 />
+ <DefaultWeaponmodeLink firemode=2 weaponmode=2 />
+ <DefaultWeaponmodeLink firemode=3 weaponmode=3 />
+ </links>
+ <Weapon>
+ <attached>
+ <Model mesh="LightningGun.mesh" pitch="100" roll="90" yaw="90" position="0,-1.3,0" />
+ <Model mesh="LightningGun-s.mesh" pitch="78" roll="90" yaw="90" position="0.2,-1.3,0" />
+ <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-76" yaw="-90" position="-1.5,1,0.3" scale=0.6 />
+ </attached>
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 0.1, 1.6,-2" />
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-1.6, 1.3,-2" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" damage=3.14159 shielddamage=20 />
+ </Weapon>
+
+ <!--Weapon>
+ <attached>
+ <Model mesh="LightningGun.mesh" pitch="103" roll="90" yaw="90" position="0,-1.35,0" />
+ <Model mesh="LightningGun-s.mesh" pitch="103" roll="90" yaw="90" position="0.2,-1.35,0" />
+ <Model mesh="hs-w01_reduced.mesh" roll="90" pitch="-104" yaw="-90" position="0,1.3,0.3" scale=0.6 />
+ </attached>
+ <HsW01 mode=0 munitionpershot=0 delay=0 damage=3.14159 material="Flares/point_lensflare" muzzleoffset=" 1.6, 1.3, -2.0" />
+ <HsW01 mode=0 munitionpershot=0 delay=0.125 damage=3.14159 material="Flares/point_lensflare" muzzleoffset="-0.1, 1.6, -2.0" />
+ <LightningGun mode=1 muzzleoffset="0,0,0" damage=23 />
+ </Weapon-->
+ <!--Weapon>
+ <SimpleRocketFire mode=2 muzzleoffset="0,0,0" damage=30 shielddamage=20 />
+ <RocketFire mode=3 muzzleoffset="0,0,0" damage=30 healthdamage=50 shielddamage=20 />
+ </Weapon-->
+
+ </WeaponPack>
+ <WeaponPack>
+ <links>
+ <DefaultWeaponmodeLink firemode=1 weaponmode=0 />
+ </links>
+ <!--Weapon>
+ <EnergyDrink mode=0 munitionpershot=0 delay=0 material="Flares/point_lensflare"muzzleoffset="2,-0.2,-1" />
+ </Weapon-->
+ </WeaponPack>
+ </weapons>
\ No newline at end of file
Added: code/branches/newlevel2012/data/levels/templates/tower.oxt
===================================================================
--- code/branches/newlevel2012/data/levels/templates/tower.oxt (rev 0)
+++ code/branches/newlevel2012/data/levels/templates/tower.oxt 2012-05-04 14:19:17 UTC (rev 9161)
@@ -0,0 +1,48 @@
+<Template name=tower>
+ <SpaceShip
+
+ spawnparticlesource = "Orxonox/fairytwirl"
+ spawnparticleduration = 3
+ explosionchunks = 6
+
+ health = 100
+ maxhealth = 200
+ initialhealth = 100
+
+ shieldhealth = 30
+ initialshieldhealth = 30
+ maxshieldhealth = 50
+ shieldabsorption = 0.8
+ reloadrate = 1
+ reloadwaittime = 1
+
+ lift = 1;
+ stallSpeed = 220;
+
+ collisionType = "dynamic"
+ mass = 100
+ linearDamping = 0.7
+ angularDamping = 0.9999999
+ >
+
+ <controller>
+ <WaypointPatrolController alertnessradius=10000 team=5>
+
+ </WaypointPatrolController>
+ </controller>
+
+
+ <!--attached>
+ <Model position="0,0,0" scale=25 mesh="Tower_ME.mesh" />
+ </attached-->
+
+ <!--collisionShapes>
+
+ </collisionShapes-->
+
+<?lua
+ include("../includes/towerWeaponSettings.oxi")
+?>
+ </SpaceShip>
+</Template>
+
Modified: code/branches/newlevel2012/data/levels/towerDefense.oxw
===================================================================
--- code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-04 14:12:47 UTC (rev 9160)
+++ code/branches/newlevel2012/data/levels/towerDefense.oxw 2012-05-04 14:19:17 UTC (rev 9161)
@@ -18,6 +18,7 @@
<?lua
include("templates/spaceshipAssff.oxt")
include("templates/spaceshipPirate.oxt")
+ include("templates/tower.oxt")
?>
<!-- Specify the position of the camera -->
@@ -40,13 +41,13 @@
<!-- Template for a tower -->
-<Template name=towertemplate>
+<!--Template name=towertemplate>
<Tower>
<attached>
- <Model position="0,0,0" scale=2.5 mesh="Tower_ME.mesh" />
+ <Model position="0,0,0" scale=0.25 mesh="Tower_ME.mesh" />
</attached>
</Tower>
-</Template>
+</Template-->
<Level gametype = "TowerDefense">
<templates>
@@ -86,14 +87,13 @@
</controller>
</SpaceShip>
-
<!-- PlayField -->
<TowerDefenseCenterpoint
name=towerdefensecenter
width=16
height=16
tileScale=100
- towerTemplate=towertemplate
+ towerTemplate=tower
position="0,0,0"
direction="0,0,0"
collistionType=static
Modified: code/branches/newlevel2012/src/modules/towerdefense/Tower.cc
===================================================================
--- code/branches/newlevel2012/src/modules/towerdefense/Tower.cc 2012-05-04 14:12:47 UTC (rev 9160)
+++ code/branches/newlevel2012/src/modules/towerdefense/Tower.cc 2012-05-04 14:19:17 UTC (rev 9161)
@@ -51,7 +51,7 @@
*/
void Tower::moveFrontBack(const Vector2& value)
{
- orxout() << "frontBack.x: " << value.x << endl;
+ //orxout() << "frontBack.x: " << value.x << endl;
}
/**
@@ -62,7 +62,7 @@
*/
void Tower::moveRightLeft(const Vector2& value)
{
- orxout() << "rightLeft.x: " << value.x << endl;
+ //orxout() << "rightLeft.x: " << value.x << endl;
/*
if(!this->delay_)
{
Modified: code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc
===================================================================
--- code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc 2012-05-04 14:12:47 UTC (rev 9160)
+++ code/branches/newlevel2012/src/orxonox/controllers/WaypointController.cc 2012-05-04 14:19:17 UTC (rev 9161)
@@ -64,17 +64,14 @@
if (!this->isActive())
return;
-// orxout() << "(" << this->waypoints_.size() << ") entity: " << this->getControllableEntity() << endl;
if (this->waypoints_.size() == 0 || !this->getControllableEntity())
return;
-// printf("3");
if (this->waypoints_[this->currentWaypoint_]->getWorldPosition().squaredDistance(this->getControllableEntity()->getPosition()) <= this->squaredaccuracy_)
this->currentWaypoint_ = (this->currentWaypoint_ + 1) % this->waypoints_.size();
-// printf("4");
this->moveToPosition(this->waypoints_[this->currentWaypoint_]->getWorldPosition());
}
More information about the Orxonox-commit
mailing list