Changeset 8942 for code/branches/gamecontent

Timestamp:

Nov 18, 2011, 6:52:21 PM (13 years ago)

Author:

jo

Message:

Pawn&SpaceShip Colouring via XML works. Quick&Dirty implementation though. A clean version is going to follow.

Location:

code/branches/gamecontent

Files:

• data/levels/fightInOurBack.oxw (modified) (3 diffs)
• data/levels/missionOne.oxw (modified) (13 diffs)
• data/levels/pirateAttack.oxw (modified) (2 diffs)
• src/orxonox/controllers/ArtificialController.cc (modified) (2 diffs)
• src/orxonox/controllers/HumanController.cc (modified) (2 diffs)
• src/orxonox/gametypes/Mission.cc (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (modified) (4 diffs)
• src/orxonox/gametypes/TeamGametype.h (modified) (1 diff)
• src/orxonox/interfaces/CMakeLists.txt (modified) (1 diff)
• src/orxonox/interfaces/PartyMember.cc (added)
• src/orxonox/interfaces/PartyMember.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (3 diffs)
• src/orxonox/worldentities/pawns/Pawn.h (modified) (4 diffs)

code/branches/gamecontent/data/levels/fightInOurBack.oxw

@@ -110 +110 @@
   name="Fight in our back"
   description="Our fleet is far ahead of us. We need to get rid of all the enemies in its back, because we do not want our enemies to attack from everywhere. So let us clear this Sector!"
-  gametype=TeamDeathmatch
+  gametype=Mission
 >
   <templates>
@@ -214 +214 @@
 <?lua for i=0,0,1 do
 x=800
-health=2050
+health=1500
 ?>
     <!--Transporter 1-->
@@ -239 +239 @@
 
 <?lua for j=0,1,1 do
-health=1600
+health=1300
 x=800
 z=j*300

code/branches/gamecontent/data/levels/missionOne.oxw

@@ -57 +57 @@
         <events>
             <trigger>
-                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff />
+                <TeamSpawnPoint team=0 position="800,700,600" direction="-1,0,0" spawnclass=SpaceShip pawndesign=spaceshipassff>
+                  <EventTrigger invert=true>
+                    <events>
+                      <trigger>
+                        <EventListener event="attack" />
+                      </trigger>
+                    </events>
+                  </EventTrigger>
+                </TeamSpawnPoint>
             </trigger>
         </events>
@@ -163 +171 @@
         </QuestEffectBeacon>
 
+        <QuestEffectBeacon times=1> <!--  alternative quest end  -->
+            <effects>
+                <CompleteQuest questId="missionOne.DuballStation" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event=toHydroFarmer />
+                </execute>
+            </events>
+        </QuestEffectBeacon>
+
 <!--helper trigger to end the getHelp quest -->
     <DistanceTrigger name="getHelpEnd" position="-47000,-1000,1300" distance=1400 target="SpaceShip" stayActive="false" delay=0.1>
@@ -228 +247 @@
             </events>
         </QuestEffectBeacon>
+
+<!-- End the quest after own destruction of spacecruiser -->
+        <QuestEffectBeacon position="-100,0,0" times=1>
+            <effects>
+                <FailQuest questId="missionOne.getHelp" />
+            </effects>
+            <events>
+                <execute>
+                    <EventListener event="failQuest" />
+                </execute>
+            </events>
+            <attached>
+                <DistanceTrigger name="failQuest" position="-47000,-1000,1300" distance=2300 target="SpaceShip">
+                  <EventTrigger>
+                    <events>
+                      <trigger>
+                        <EventListener event="gameEnd" />
+                      </trigger>
+                    </events>
+                  </EventTrigger>
+                </DistanceTrigger>
+            </attached>
+        </QuestEffectBeacon>
+
+
 
 
@@ -335 +379 @@
 
 <!-- Blinking Billboard should be replaced with WAYPOINT -->
-<BlinkingBillboard position="-900,640,600" frequency=0.4 amplitude=2 material="Flares/lensflare" colour="1,1,0">
+<BlinkingBillboard position="-900,640,600" frequency=0.6 amplitude=3 material="Flares/lensflare" colour="1,1,0.05">
           <events>
             <visibility>
@@ -466 +510 @@
 
 <!-- @Objects: 4 boxes (uncontrolled pawns) -->
-                <Pawn health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box >
+                <Pawn team=1 health=30 position="0,0,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box >
                     <events>
                       <visibility>
@@ -480 +524 @@
                 </Pawn>
 
-                <Pawn health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box visible="true">
+                <Pawn team=1 health=30 position="0,100,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box visible="true">
                     <events>
                       <visibility>
@@ -493 +537 @@
                     </collisionShapes>
                 </Pawn>
-                <Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box >
+                <Pawn health=30 position="0,200,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1>
                     <events>
                       <visibility>
@@ -506 +550 @@
                     </collisionShapes>
                 </Pawn>
-                <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box >
+                <Pawn health=30 position="0,300,0" direction="0,-1,0" collisionType=dynamic mass=100000 name=box team=1>
                     <events>
                       <visibility>
@@ -889 +933 @@
 
 <!-------------------------------------- PART FOUR : Get Help --------------------------------------->
-<!-- TODO: cruiserKilled -->
+
     <Trigger name="famer1" mode="and" stayActive="true">
         <DistanceTrigger position="-48200,100,0" target="Pawn" distance=650 stayActive="true" delay=0 />
@@ -932 +976 @@
 <!-- @Objects: HYDROGEN FARMER & DOCKING -->
     <SpaceShip
+        team=0
         position="-48900,100,0"
         roll=90 yaw=0 pitch=20
@@ -1006 +1051 @@
     <SpaceShip
         template            = "spaceshipspacecruiser"
+        team                = "0"
         position            = "-48900,800,0"
         orientation         = "-0.14, 0.68, 0.68, 0.223"
@@ -1150 +1196 @@
 
 <!-------------------------------------- The attack --------------------------------------->
-
 <!-- TODO:
      - update spaceshipTransporter
      - bots do friendly fire (is drone function reusable?)
 -->
+
+<!-- Fallback Spawnpoint: on cruiserdeath caused by pirates. Unfortunately unstable behaviour concerning activity. -->
+    <TeamSpawnPoint team=0 position="2000,1500,-1500" direction="-1,-1,1" spawnclass=SpaceShip pawndesign=spaceshipspacecruiser>
+        <events>
+            <activity>
+                <EventListener event="attack" />
+            </activity>
+        </events>
+    </TeamSpawnPoint>
 
 <!-- @Triggers: toHydroFamer <-> first  portal usage
@@ -1607 +1661 @@
   </Scene>
 </Level>
+
 <!-- TODO:
 - Story & more precise Questmessages; more quest hints; fail-quest;

code/branches/gamecontent/data/levels/pirateAttack.oxw

@@ -28 +28 @@
 name="Dani's Testlevel"
 description="Erste Versuche mit den Quests"
-gametype=TeamDeathmatch
+gametype=Mission
 >
 
@@ -252 +252 @@
                     </events>
                 </QuestEffectBeacon>
-        <!--Stick found-->
+        <!--Stick found-->zz
         <QuestEffectBeacon position="4800,5785,-10725" times=1>
                     <attached>

code/branches/gamecontent/src/orxonox/controllers/ArtificialController.cc

@@ -42 +42 @@
 #include "gametypes/TeamDeathmatch.h"
 #include "gametypes/Dynamicmatch.h"
+#include "gametypes/Mission.h"
 #include "controllers/WaypointPatrolController.h"
 #include "controllers/NewHumanController.h"
@@ -996 +997 @@
             if (entity2->getPlayer())
                 team2 = tdm->getTeam(entity2->getPlayer());
+        }
+
+        Mission* miss = orxonox_cast<Mission*>(gametype);
+        if (miss)
+        {
+            if (entity1->getPlayer())
+                team1 = miss->getTeam(entity1->getPlayer());
+
+            if (entity2->getPlayer())
+                team2 = miss->getTeam(entity2->getPlayer());
         }
 

code/branches/gamecontent/src/orxonox/controllers/HumanController.cc

@@ -195 +195 @@
             this->boosting_ = true;
             this->boostingTimeout_.startTimer();
-            
-            this->controllableEntity_->boost(this->boosting_);
+            if(this->controllableEntity_)
+                this->controllableEntity_->boost(this->boosting_);
 //            orxout() << "Start boosting" << endl;
         }
@@ -209 +209 @@
         this->boosting_ = false;
         this->boostingTimeout_.stopTimer();
-
-        this->controllableEntity_->boost(this->boosting_);
+        if(this->controllableEntity_)
+            this->controllableEntity_->boost(this->boosting_);
 //        orxout() << "Stop boosting" << endl;
     }

code/branches/gamecontent/src/orxonox/gametypes/Mission.cc

@@ -90 +90 @@
 
     void Mission::setTeams()
-    {
+    {//Set pawn-colours
         for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
-            this->setObjectColour(*it);
+        {
+            Pawn* pawn = static_cast<Pawn*>(*it);
+            if(!pawn) continue;
+                this->setDefaultObjectColour(pawn);
+        }
     }
 

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.cc

@@ -35 +35 @@
 #include "worldentities/TeamSpawnPoint.h"
 #include "worldentities/pawns/Pawn.h"
+#include "worldentities/ControllableEntity.h"
 #include "controllers/ArtificialController.h"
 
@@ -117 +118 @@
         {
             if(true)//check if dead player is allowed to enter -> if maximum nr of players is exceeded & player was not in game before: disallow
-                continue;
+                //continue;
             if (it->second.state_ == PlayerState::Dead)
             {
@@ -249 +250 @@
         if (it_player != this->teamnumbers_.end() && it_player->second >= 0 && it_player->second < static_cast<int>(this->teamcolours_.size()))
         {
-            if (pawn)
-            {
-                pawn->setRadarObjectColour(this->teamcolours_[it_player->second]);
-
-                std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
-                for (std::set<WorldEntity*>::iterator it = pawnAttachments.begin(); it != pawnAttachments.end(); ++it)
-                {
-                    if ((*it)->isA(Class(TeamColourable)))
-                    {
-                        TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
-                        tc->setTeamColour(this->teamcolours_[it_player->second]);
-                    }
-                }
-            }
-        }
-    }
-
-    void TeamGametype::setObjectColour(Pawn* pawn)
+            this->colourPawn(pawn, it_player->second);
+        }
+    }
+
+    void TeamGametype::setDefaultObjectColour(Pawn* pawn)
     {
         if(pawn == NULL)
             return;
+        
+        int teamnumber = pawn->getTeam();
+
+        if(teamnumber >= 0)
+        {
+            this->colourPawn(pawn, teamnumber); return;
+        }
         //get Pawn's controller
-        ArtificialController* controller = orxonox_cast<ArtificialController*>(pawn);
-        if(controller == NULL)
+        ControllableEntity* entity = orxonox_cast<ControllableEntity*>(pawn);
+
+        Controller* controller = 0;
+        if (entity->getController())
+            controller = entity->getController();
+        else if (entity->getXMLController())
+            controller = entity->getXMLController();
+        else
             return;
+
+        ArtificialController* artificial =  orxonox_cast<ArtificialController*>(controller);
         //get Teamnumber - get the data
-        int teamnumber= controller->getTeam();
-        if(teamnumber < 0)
+        if(artificial == NULL)
             return;
+        teamnumber= artificial->getTeam();
+
         //set ObjectColour
-        pawn->setRadarObjectColour(this->teamcolours_[teamnumber]);
+        this->colourPawn(pawn, teamnumber);
+    }
+
+    void TeamGametype::colourPawn(Pawn* pawn, int teamNr)
+    {// catch no-colouring-case and wrong input
+        if(teamNr < 0 || pawn == NULL) return; 
+        pawn->setRadarObjectColour(this->teamcolours_[teamNr]);
 
         std::set<WorldEntity*> pawnAttachments = pawn->getAttachedObjects();
@@ -287 +297 @@
             {
                 TeamColourable* tc = orxonox_cast<TeamColourable*>(*it);
-                tc->setTeamColour(this->teamcolours_[teamnumber]);
+                tc->setTeamColour(this->teamcolours_[teamNr]);
             }
          }
     }
 
-
 }

code/branches/gamecontent/src/orxonox/gametypes/TeamGametype.h

@@ -75 +75 @@
             std::map<PlayerInfo*, bool> allowedInGame_; //!< Only those players are allowed to spawn which are listed here as 'true'.
             void setTeamColour(PlayerInfo* player, Pawn* pawn);
-            void setObjectColour(Pawn* pawn);
+            void setDefaultObjectColour(Pawn* pawn);
+            void colourPawn(Pawn* pawn, int teamNr);
     };
 }

code/branches/gamecontent/src/orxonox/interfaces/CMakeLists.txt

@@ -6 +6 @@
   PickupListener.cc
   RadarViewable.cc
+  PartyMember.cc
 )

code/branches/gamecontent/src/orxonox/interfaces/PartyMember.h

@@ -52 +52 @@
         public:
             PartyMember();
-            virtual ~PartyMember() {}
+            virtual ~PartyMember();
 
             /**

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.cc

@@ -60 +60 @@
         this->bReload_ = false;
 
+        this->team_ = -1;
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -110 +111 @@
         SUPER(Pawn, XMLPort, xmlelement, mode);
 
+        XMLPortParam(Pawn, "team", setTeam, getTeam, xmlelement, mode).defaultValues(-1);
+
         XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
@@ -129 +132 @@
         XMLPortParam(Pawn, "reloadrate", setReloadRate, getReloadRate, xmlelement, mode).defaultValues(0);
         XMLPortParam(Pawn, "reloadwaittime", setReloadWaitTime, getReloadWaitTime, xmlelement, mode).defaultValues(1.0f);
+
+
     }
 

code/branches/gamecontent/src/orxonox/worldentities/pawns/Pawn.h

@@ -35 +35 @@
 #include "interfaces/PickupCarrier.h"
 #include "interfaces/RadarViewable.h"
+#include "interfaces/PartyMember.h"
 #include "worldentities/ControllableEntity.h"
 
@@ -40 +41 @@
 { // tolua_export
     class _OrxonoxExport Pawn // tolua_export
-        : public ControllableEntity, public RadarViewable, public PickupCarrier
+        : public ControllableEntity, public RadarViewable, public PickupCarrier//, public PartyMember
     { // tolua_export
         friend class WeaponSystem;
@@ -53 +54 @@
             inline bool isAlive() const
                 { return this->bAlive_; }
+
+            inline void setTeam(int team)
+                { this->team_ = team; }
+            inline float getTeam() const
+                { return this->team_; }
 
             virtual void setHealth(float health);
@@ -194 +200 @@
                 { return NULL; }
 
+            int team_;
+
             float health_;
             float maxHealth_;