[Orxonox-commit 6541] r11182 - in code/branches/tgidronFS16: data/levels src/modules/hover
tgidron at orxonox.net
tgidron at orxonox.net
Thu May 12 13:45:44 CEST 2016
Author: tgidron
Date: 2016-05-12 13:45:44 +0200 (Thu, 12 May 2016)
New Revision: 11182
Modified:
code/branches/tgidronFS16/data/levels/Hover.oxw
code/branches/tgidronFS16/src/modules/hover/Hover.cc
code/branches/tgidronFS16/src/modules/hover/Hover.h
code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc
code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h
Log:
New Pickup
Modified: code/branches/tgidronFS16/data/levels/Hover.oxw
===================================================================
--- code/branches/tgidronFS16/data/levels/Hover.oxw 2016-05-10 10:29:37 UTC (rev 11181)
+++ code/branches/tgidronFS16/data/levels/Hover.oxw 2016-05-12 11:45:44 UTC (rev 11182)
@@ -50,6 +50,37 @@
/>
</Template> -->
+<!-- Shrink Pickup Representation -->
+
+<Template name=smallshrinkpickupRepresentation>
+ <PickupRepresentation>
+ <spawner-representation>
+ <StaticEntity>
+ <attached>
+ <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Sphere2" scale=0.1>
+ <attached>
+ <Billboard position="0,0,0" colour="1.0,0.55,1.0" material="Shrink" scale=0.35 />
+ </attached>
+ </Billboard>
+ </attached>
+ </StaticEntity>
+ </spawner-representation>
+ </PickupRepresentation>
+</Template>
+
+
+<Template name=smallshrinkpickup baseclass=ShrinkPickup>
+ <ShrinkPickup
+ representation = "smallshrinkpickup"
+ duration = 10.0
+ shrinkFactor = 2.5
+ activaionType = "immediate"
+ durationType = "continuous"
+ />
+</Template>
+
+<!-- Speed Pickup Representation -->
+
<Template name=hugespeedpickupRepresentation>
<PickupRepresentation>
<spawner-representation>
@@ -77,8 +108,8 @@
/>
</Template>
+<!-- Destroy Carrier Pickup Representation -->
-
<Template name=destroyhoverpickupRepresentation>
<PickupRepresentation>
<spawner-representation>
@@ -99,6 +130,8 @@
<MetaPickup representation="destroyhover" metaType="destroyCarrier" />
</Template>
+<!-- Obstacle (crate) Template -->
+
<Template name=obstacle baseclass=Pawn>
<Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box RVName = "Box 4" >
<attached>
@@ -145,6 +178,14 @@
spawnerTemplate = "hugespeedpickupRepresentation"
inventoryRepresentation = "HugeSpeed"
/>
+
+ <PickupRepresentation
+ name = "smallshrinkpickup"
+ pickupName = "Small Shrink"
+ pickupDescription = "Shrinks the ship by a small amount."
+ spawnerTemplate = "smallshrinkpickupRepresentation"
+ inventoryRepresentation = "SmallShrink"
+ />
<!--
<PickupRepresentation
name = "damagehover"
@@ -163,8 +204,10 @@
obstacletemplate=obstacle
pickuptemplate=destroyhoverpickup
pickuprepresentationtemplate=destroyhoverpickupRepresentation
- pickuptemplatedam=hugespeedpickup
- pickuprepresentationtemplatedam=hugespeedpickupRepresentation
+ pickuptemplatespeed=hugespeedpickup
+ pickuprepresentationtemplatespeed=hugespeedpickupRepresentation
+ pickuptemplateshrink=smallshrinkpickup
+ pickuprepresentationtemplateshrink=smallshrinkpickupRepresentation
/>
<Model
position="<?lua print(MAZE_SIZE/2)?>,-16,<?lua print(MAZE_SIZE/2)?>"
Modified: code/branches/tgidronFS16/src/modules/hover/Hover.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/Hover.cc 2016-05-10 10:29:37 UTC (rev 11181)
+++ code/branches/tgidronFS16/src/modules/hover/Hover.cc 2016-05-12 11:45:44 UTC (rev 11182)
@@ -120,55 +120,76 @@
}
- //Generate 5 PickupSpawners randomly (destroy hover pickup)
- for (int i = 0; i<5; i++)
+ //Generate 3 PickupSpawners randomly (destroy hover pickup)
+ for (int i = 0; i<3; i++)
{
PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
pickupSpawner->setPickupTemplateName(origin_->getPickupTemplate());
- pickupSpawner->setMaxSpawnedItems(5);
+ pickupSpawner->setMaxSpawnedItems(3);
pickupSpawner->setRespawnTime(30);
pickupSpawner->setTriggerDistance(5);
// Add pickup spawner to the pickup spawner list
pickupSpawners_.push_back(pickupSpawner);
}
- //Generate 5 PickupSpawners randomly (damage pickup)
- for (int i = 0; i<5; i++)
+ //Generate 3 PickupSpawners randomly (speed pickup)
+ for (int i = 0; i<3; i++)
{
PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
- pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateDam());
- pickupSpawner->setMaxSpawnedItems(5);
+ pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateSpeed());
+ pickupSpawner->setMaxSpawnedItems(3);
pickupSpawner->setRespawnTime(30);
pickupSpawner->setTriggerDistance(5);
// Add pickup spawner to the pickup spawner list
pickupSpawners_.push_back(pickupSpawner);
}
+ //Generate 3 PickupSpawners randomly (shrink pickup)
+ for (int i = 0; i<3; i++)
+ {
+ PickupSpawner* pickupSpawner = new PickupSpawner(origin_->getContext());
+
+ pickupSpawner->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
+ pickupSpawner->setPickupTemplateName(origin_->getPickupTemplateShrink());
+ pickupSpawner->setMaxSpawnedItems(3);
+ pickupSpawner->setRespawnTime(30);
+ pickupSpawner->setTriggerDistance(5);
+ // Add pickup spawner to the pickup spawner list
+ pickupSpawners_.push_back(pickupSpawner);
+ }
+
//*****************************************************************************
+ //Generate a destroyable crate randomly on field
+
Pawn* crate = new Pawn(origin_->getContext());
crate->setPosition(get3dCoordinates(rand()%numCells, rand()%numCells, 10.0f));
- crate->addTemplate(origin_->getObstacleTemplate());
+ crate->addTemplate(origin_->getObstacleTemplate());
+ crate->setInitialHealth(100.0f);
+
-
//If no lives are left, end game
- if(lives <= 0){
+ if(lives <= 0)
+ {
GSLevel::startMainMenu();
}
-
+ // Debug
orxout() << this->origin_->getPickupTemplate() << endl;
orxout() << this->origin_->getPickupRepresentationTemplate() << endl;
- orxout() << this->origin_->getPickupTemplateDam() << endl;
- orxout() << this->origin_->getPickupRepresentationTemplateDam() << endl;
- }
+ orxout() << this->origin_->getPickupTemplateSpeed() << endl;
+ orxout() << this->origin_->getPickupRepresentationTemplateSpeed() << endl;
+
+ orxout() << this->origin_->getObstacleTemplate() << endl;
+ orxout() << crate->getPosition() << endl;
+ }
}
Modified: code/branches/tgidronFS16/src/modules/hover/Hover.h
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/Hover.h 2016-05-10 10:29:37 UTC (rev 11181)
+++ code/branches/tgidronFS16/src/modules/hover/Hover.h 2016-05-12 11:45:44 UTC (rev 11182)
@@ -93,6 +93,7 @@
int totFlags;
std::vector<PickupSpawner*> pickupSpawners_;
+
};
}
Modified: code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc 2016-05-10 10:29:37 UTC (rev 11181)
+++ code/branches/tgidronFS16/src/modules/hover/HoverOrigin.cc 2016-05-12 11:45:44 UTC (rev 11182)
@@ -45,11 +45,17 @@
RegisterObject(HoverOrigin);
checkGametype();
- pickupTemplate_ = "";
+ //not needed
+
+ /*pickupTemplate_ = "";
pickupRepresentationTemplate_ = "";
- pickupTemplateDam_ = "";
- pickupRepresentationTemplateDam_ = "";
+ pickupTemplateSpeed_ = "";
+ pickupRepresentationTemplateSpeed_ = "";
+
+
+ pickupTemplateShrink_ = "";
+ pickupRepresentationTemplateShrink_ = "";*/
}
void HoverOrigin::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -61,9 +67,11 @@
XMLPortParam(HoverOrigin, "cellHeight", setCellHeight, getCellHeight, xmlelement, mode);
XMLPortParam(HoverOrigin, "pickuptemplate", setPickupTemplate, getPickupTemplate, xmlelement, mode);
XMLPortParam(HoverOrigin, "pickuprepresentationtemplate", setPickupRepresentationTemplate, getPickupRepresentationTemplate, xmlelement, mode);
- XMLPortParam(HoverOrigin, "pickuptemplatedam", setPickupTemplateDam, getPickupTemplateDam, xmlelement, mode);
- XMLPortParam(HoverOrigin, "pickuprepresentationtemplatedam", setPickupRepresentationTemplateDam, getPickupRepresentationTemplateDam, xmlelement, mode);
+ XMLPortParam(HoverOrigin, "pickuptemplatespeed", setPickupTemplateSpeed, getPickupTemplateSpeed, xmlelement, mode);
+ XMLPortParam(HoverOrigin, "pickuprepresentationtemplatespeed", setPickupRepresentationTemplateSpeed, getPickupRepresentationTemplateSpeed, xmlelement, mode);
XMLPortParam(HoverOrigin, "obstacletemplate", setObstacleTemplate, getObstacleTemplate, xmlelement, mode);
+ XMLPortParam(HoverOrigin, "pickuptemplateshrink", setPickupTemplateShrink, getPickupTemplateShrink, xmlelement, mode);
+ XMLPortParam(HoverOrigin, "pickuprepresentationtemplateshrink", setPickupRepresentationTemplateShrink, getPickupRepresentationTemplateShrink, xmlelement, mode);
}
Modified: code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h
===================================================================
--- code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h 2016-05-10 10:29:37 UTC (rev 11181)
+++ code/branches/tgidronFS16/src/modules/hover/HoverOrigin.h 2016-05-12 11:45:44 UTC (rev 11182)
@@ -79,16 +79,29 @@
//pickup template get and set for damage hover pickup
- inline void setPickupTemplateDam(std::string pickupTemplateDam)
- { this->pickupTemplateDam_ = pickupTemplateDam; }
- inline std::string getPickupTemplateDam() const
- { return this->pickupTemplateDam_; }
+ inline void setPickupTemplateSpeed(std::string pickupTemplateSpeed)
+ { this->pickupTemplateSpeed_ = pickupTemplateSpeed; }
+ inline std::string getPickupTemplateSpeed() const
+ { return this->pickupTemplateSpeed_; }
- inline void setPickupRepresentationTemplateDam(std::string pickupRepresenationaTemplateDam)
- { this->pickupRepresentationTemplateDam_ = pickupRepresenationaTemplateDam; }
- inline std::string getPickupRepresentationTemplateDam() const
- { return this->pickupRepresentationTemplateDam_; }
+ inline void setPickupRepresentationTemplateSpeed(std::string pickupRepresenationaTemplateSpeed)
+ { this->pickupRepresentationTemplateSpeed_ = pickupRepresenationaTemplateSpeed; }
+ inline std::string getPickupRepresentationTemplateSpeed() const
+ { return this->pickupRepresentationTemplateSpeed_; }
+
+ //pickup template get and set for shrink hover pickup
+
+ inline void setPickupTemplateShrink(std::string pickupTemplateShrink)
+ { this->pickupTemplateShrink_ = pickupTemplateShrink; }
+ inline std::string getPickupTemplateShrink() const
+ { return this->pickupTemplateShrink_; }
+
+ inline void setPickupRepresentationTemplateShrink(std::string pickupRepresenationaTemplateShrink)
+ { this->pickupRepresentationTemplateShrink_ = pickupRepresenationaTemplateShrink; }
+ inline std::string getPickupRepresentationTemplateShrink() const
+ { return this->pickupRepresentationTemplateShrink_; }
+
//get and set for obstacle template
inline void setObstacleTemplate(std::string obstacleTemplate)
@@ -109,9 +122,13 @@
std::string pickupRepresentationTemplate_;
// Tempaltes for the damage hover pickup
- std::string pickupTemplateDam_;
- std::string pickupRepresentationTemplateDam_;
+ std::string pickupTemplateSpeed_;
+ std::string pickupRepresentationTemplateSpeed_;
+ // Tempaltes for the shrink hover pickup
+ std::string pickupTemplateShrink_;
+ std::string pickupRepresentationTemplateShrink_;
+
//Template for crate obstacle
std::string obstacleTemplate_;
};
More information about the Orxonox-commit
mailing list