[Orxonox-commit 5067] r9731 - in code/branches/levelMichael: . src/libraries/core src/orxonox/controllers src/orxonox/gametypes
jo at orxonox.net
jo at orxonox.net
Fri Nov 1 00:17:14 CET 2013
Author: jo
Date: 2013-11-01 00:17:13 +0100 (Fri, 01 Nov 2013)
New Revision: 9731
Modified:
code/branches/levelMichael/
code/branches/levelMichael/src/libraries/core/CorePrereqs.h
code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc
code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h
code/branches/levelMichael/src/orxonox/gametypes/Mission.cc
code/branches/levelMichael/src/orxonox/gametypes/Mission.h
Log:
Merged trunk into branch levelMichael to add new features.
Property changes on: code/branches/levelMichael
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/Racingbot:9388-9513
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationHS12:9481-9525
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/turret:9380-9501
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
+ /code/branches/Racingbot:9388-9513
/code/branches/ai:6592-7033
/code/branches/ai2:8721-8880
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/core6:9552-9666
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/environment3:8887-8975
/code/branches/formation:8885-8991
/code/branches/formationupdate:9580-9624
/code/branches/fps:6591-7072
/code/branches/gamecontent:8893-8968
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hud:8883-8986
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/largeShip1:9384-9515
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/libs:9668-9674
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/masterserverfix:8933-8936
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/menue:8884-8976
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/newlevel2012:9033-9244
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/output:8739-8857
/code/branches/overlay:2117-2385
/code/branches/pCuts:9023-9284
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup2012:9029-9189
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786,8500-8705
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation2011:8974-9015
/code/branches/presentation2012:9189-9268
/code/branches/presentation2012merge:9266-9347
/code/branches/presentation3:6913-7162
/code/branches/presentationHS12:9481-9525
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/shipSelection:9038-9206
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound2012:9205-9214
/code/branches/sound3:5941-6102
/code/branches/spaceNavigation:9381-9497
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/spaceraceTwo:8881-8996
/code/branches/steering:5949-6091,8140-8595
/code/branches/surfaceRace:9028-9199
/code/branches/testing:9015-9549
/code/branches/tetris:8100-8563
/code/branches/turret:9380-9501
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/unity_build:8440-8716
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
/code/trunk:9696-9730
Modified: code/branches/levelMichael/src/libraries/core/CorePrereqs.h
===================================================================
--- code/branches/levelMichael/src/libraries/core/CorePrereqs.h 2013-10-31 21:25:40 UTC (rev 9730)
+++ code/branches/levelMichael/src/libraries/core/CorePrereqs.h 2013-10-31 23:17:13 UTC (rev 9731)
@@ -275,7 +275,7 @@
typedef basic_path<std::string, path_traits> path;
}
-#elif (BOOST_VERSION < 104800)
+#elif (BOOST_VERSION < 105000)
# if BOOST_FILESYSTEM_VERSION == 2
namespace filesystem2
@@ -303,7 +303,6 @@
#else
- // TODO: Check this once boost 1.48 is released
namespace filesystem
{
class path;
Modified: code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc
===================================================================
--- code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc 2013-10-31 21:25:40 UTC (rev 9730)
+++ code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.cc 2013-10-31 23:17:13 UTC (rev 9731)
@@ -41,7 +41,8 @@
{
RegisterObject(WaypointPatrolController);
- this->alertnessradius_ = 500;
+ this->alertnessradius_ = 500.0f;
+ this->attackradius_ = 1000.0f;
this->patrolTimer_.setTimer(rnd(), true, createExecutor(createFunctor(&WaypointPatrolController::searchEnemy, this)));
}
@@ -51,6 +52,7 @@
SUPER(WaypointPatrolController, XMLPort, xmlelement, mode);
XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
+ XMLPortParam(WaypointPatrolController, "attackradius", setAttackRadius, getAttackRadius, xmlelement, mode).defaultValues(1000.0f);
}
void WaypointPatrolController::tick(float dt)
@@ -58,14 +60,14 @@
if (!this->isActive())
return;
- if (this->target_)
+ if (this->target_) //if there is a target, follow it and shoot it, if it is close enough
{
this->aimAtTarget();
if (this->bHasTargetPosition_)
this->moveToTargetPosition();
- if (this->getControllableEntity() && this->isCloseAtTarget(1000) && this->isLookingAtTarget(math::pi / 20.0f))
+ if (this->getControllableEntity() && this->isCloseAtTarget(this->attackradius_) && this->isLookingAtTarget(math::pi / 20.0f))
this->getControllableEntity()->fire(0);
}
else
Modified: code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h
===================================================================
--- code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h 2013-10-31 21:25:40 UTC (rev 9730)
+++ code/branches/levelMichael/src/orxonox/controllers/WaypointPatrolController.h 2013-10-31 23:17:13 UTC (rev 9731)
@@ -49,11 +49,17 @@
{ this->alertnessradius_ = radius; }
inline float getAlertnessRadius() const
{ return this->alertnessradius_; }
+
+ inline void setAttackRadius(float distance)
+ { this->attackradius_ = distance; }
+ inline float getAttackRadius() const
+ { return this->attackradius_; }
protected:
void searchEnemy();
- float alertnessradius_;
+ float alertnessradius_; //!< Enemies within this radius are being followed and shot.
+ float attackradius_; //!< Enemies only get shot, if they are within the attackradius_.
Timer patrolTimer_;
};
}
Modified: code/branches/levelMichael/src/orxonox/gametypes/Mission.cc
===================================================================
--- code/branches/levelMichael/src/orxonox/gametypes/Mission.cc 2013-10-31 21:25:40 UTC (rev 9730)
+++ code/branches/levelMichael/src/orxonox/gametypes/Mission.cc 2013-10-31 23:17:13 UTC (rev 9731)
@@ -31,11 +31,16 @@
#include "controllers/ArtificialController.h"
#include "core/CoreIncludes.h"
+#include "core/command/ConsoleCommand.h"
+#include "infos/PlayerInfo.h"
#include "network/Host.h"
#include "worldentities/pawns/Pawn.h"
+
namespace orxonox
{
+ SetConsoleCommand("Mission", "endMission", &Mission::endMission);
+ SetConsoleCommand("Mission", "setLives", &Mission::setLivesWrapper);
RegisterUnloadableClass(Mission);
Mission::Mission(Context* context) : TeamGametype(context)
@@ -55,14 +60,18 @@
this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
this->end();
}
+ else if (this->lives_ == 0)
+ {
+ this->missionAccomplished_ = false;
+ this->end();
+ }
}
void Mission::pawnKilled(Pawn* victim, Pawn* killer)
{
- if (victim && victim->getPlayer() && this->lives_ == 1)
+ if (victim && victim->getPlayer() && victim->getPlayer()->isHumanPlayer() )
{
- this->missionAccomplished_ = false;
- this->end();
+ this->lives_--;
}
}
@@ -77,11 +86,10 @@
void Mission::end()
{
Gametype::end();
- /*if (this->missionAccomplished_)
+ if (this->missionAccomplished_)
this->gtinfo_->sendAnnounceMessage("Mission accomplished!");
else
this->gtinfo_->sendAnnounceMessage("Mission failed!");
- */
}
void Mission::setTeams()
@@ -93,7 +101,22 @@
this->setDefaultObjectColour(pawn);
}
}
+ void Mission::endMission(bool accomplished)
+ {
+ for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
+ {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would end ALL missions!
+ it->setMissionAccomplished(accomplished);
+ it->end();
+ }
+ }
+
+ void Mission::setLivesWrapper(unsigned int amount)
+ {
+ for (ObjectList<Mission>::iterator it = ObjectList<Mission>::begin(); it != ObjectList<Mission>::end(); ++it)
+ {//TODO: make sure that only the desired mission is ended !! This is a dirty HACK, that would affect ALL missions!
+ it->setLives(amount);
+ }
+ }
-
}
Modified: code/branches/levelMichael/src/orxonox/gametypes/Mission.h
===================================================================
--- code/branches/levelMichael/src/orxonox/gametypes/Mission.h 2013-10-31 21:25:40 UTC (rev 9730)
+++ code/branches/levelMichael/src/orxonox/gametypes/Mission.h 2013-10-31 23:17:13 UTC (rev 9731)
@@ -51,12 +51,16 @@
{this->lives_ = amount;}
inline unsigned int getLives()
{return this->lives_;}
+ inline void setMissionAccomplished(bool acc)
+ {this->missionAccomplished_ = acc;}
+ static void endMission(bool accomplished);
+ static void setLivesWrapper(unsigned int amount);
protected:
virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
bool missionAccomplished_; //<! indicates if player successfully finsihed the mission;
int lives_; //<! amount of player's lives <-> nr. of retries
-
+ //<! If the lives_ are set negative -> unlimited lives.
};
}
More information about the Orxonox-commit
mailing list