Changeset 8904

Timestamp:

Oct 25, 2011, 10:56:31 PM (13 years ago)

Author:

jo

Message:

On the way to a multiplayer gametype basceclass.

Location:

code/branches/gamecontent

Files:

• data/levels/includes/weaponSettingsSpacecruiser.oxi (modified) (1 diff)
• data/levels/missionOne.oxw (modified) (3 diffs)
• data/levels/templates/spaceshipSpacecruiser.oxt (modified) (4 diffs)
• src/modules/pong/Pong.cc (modified) (2 diffs)
• src/orxonox/controllers/WaypointPatrolController.cc (modified) (2 diffs)
• src/orxonox/controllers/WaypointPatrolController.h (modified) (2 diffs)
• src/orxonox/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)
• src/orxonox/gametypes/Mission.cc (added)
• src/orxonox/gametypes/Mission.h (added)
• src/orxonox/gametypes/TeamDeathmatch.h (modified) (1 diff)
• src/orxonox/gametypes/TeamGametype.cc (modified) (2 diffs)
• src/orxonox/gametypes/TeamGametype.h (modified) (1 diff)
• src/orxonox/worldentities/pawns/Pawn.cc (modified) (1 diff)

code/branches/gamecontent/data/levels/includes/weaponSettingsSpacecruiser.oxi

@@ -7 +7 @@
       <WeaponSlot position="-34,-30,-169" />
       <WeaponSlot position=" 34,-30,-169" />
-
     </weaponslots>
     <weaponsets>

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

@@ -22 +22 @@
  name         = "Mission One"
  description  = "How to steer a spaceship."
+ gametype     = "Mission"
 >
   <templates>
@@ -396 +397 @@
                     </templates>
                     <controller>
-                      <WaypointController>
+                      <WaypointController team=1>
                          <waypoints>
                           <Model mesh="cube.mesh" scale=8 position="  0,1700,-200" />
@@ -417 +418 @@
                   </templates>
                   <controller>
-                    <WaypointController>
+                    <WaypointController team=1>
                       <waypoints>
                         <Model mesh="cube.mesh" scale=8 position="  0,2400,1000" />

code/branches/gamecontent/data/levels/templates/spaceshipSpacecruiser.oxt

@@ -11 +11 @@
    initialhealth     = 300
 
-   shieldhealth        = 60
-   initialshieldhealth = 60
-   maxshieldhealth     = 80
-   shieldabsorption    = 0.8
+   shieldhealth        = 75
+   initialshieldhealth = 75
+   maxshieldhealth     = 90
+   shieldabsorption    = 0.9
    reloadrate          = 1
    reloadwaittime      = 1
@@ -57 +57 @@
     </attached>
     <collisionShapes>
-      <BoxCollisionShape position="0,-30,-108"   halfExtents="38,6,62" />
-      <BoxCollisionShape position="0,-20,-108"   halfExtents="20,6,40" />
-      <BoxCollisionShape position="-16,-35,-112"  halfExtents="15,5,57" roll=-14 pitch=3.5/>
-      <BoxCollisionShape position="16,-35,-112"   halfExtents="15,5,57" roll=14 pitch=3.5/>
-      <BoxCollisionShape position="19,-21.5,-108" halfExtents="18,5,52" roll=-21 />
-      <BoxCollisionShape position="-19,-21.5,-108"halfExtents="18,5,52" roll=21 />
-      <BoxCollisionShape position="0,-21,-169"halfExtents="18,1,16" pitch=-30x />
+      <BoxCollisionShape position="0,-30,-108"     halfExtents="38,6,62" />
+      <BoxCollisionShape position="0,-20,-108"     halfExtents="20,6,40" />
+      <BoxCollisionShape position="-16,-35,-112"   halfExtents="15,5,57" roll=-14 pitch=3.5/>
+      <BoxCollisionShape position="16,-35,-112"    halfExtents="15,5,57" roll=14 pitch=3.5/>
+      <BoxCollisionShape position="19,-21.5,-108"  halfExtents="18,5,52" roll=-21 />
+      <BoxCollisionShape position="-19,-21.5,-108" halfExtents="18,5,52" roll=21 />
+      <BoxCollisionShape position="0,-21,-169"     halfExtents="18,1,16" pitch=-30 />
 
     </collisionShapes>
@@ -75 +75 @@
   <SpaceShip>
     <camerapositions>
-      <CameraPosition position="0,10,  40" drag=true mouselook=true />
-      <CameraPosition position="0,20,  80" drag=true mouselook=true />
+      <CameraPosition position="0,15,  60" drag=true mouselook=true />
       <CameraPosition position="0,30, 120" drag=true mouselook=true />
-      <CameraPosition position="0,20,-260" drag=true mouselook=true yaw=180/>
-      <CameraPosition position="0,30,-350" drag=true mouselook=true yaw=180/>
-      <!--CameraPosition position="0,150,-25" pitch=-90 drag=true />
-      <CameraPosition position="0,0,-40" yaw=180 drag=true />
-      <CameraPosition position="0,3,-14" yaw=0 />
-      <CameraPosition position="-50,5,-8" yaw=-90 drag=true />
-      <CameraPosition position="50,5,-8" yaw=90 drag=true /-->
+      <CameraPosition position="0,40, 350" drag=true mouselook=true />
     </camerapositions>
   </SpaceShip>
@@ -93 +86 @@
    boostfactor    = 2
 
-   speedfront     = 150
-   speedback      =  50
-   speedleftright =  50
-   speedupdown    =  50
+   speedfront     = 200
+   speedback      =  70
+   speedleftright =  70
+   speedupdown    =  70
 
    defEngineSndNormal = "sounds/Engine_low.ogg"

code/branches/gamecontent/src/modules/pong/Pong.cc

@@ -293 +293 @@
             std::string message(name1 + " has won!");
             ChatManager::message(message);
-this->tick(0);
             this->end();
         }
@@ -301 +300 @@
              std::string message2(name2 + " has won!");
              ChatManager::message(message2);
-this->tick(0);
              this->end();
         }

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

@@ -42 +42 @@
         RegisterObject(WaypointPatrolController);
 
-        //this->team_ = 0;
         this->alertnessradius_ = 500;
 
@@ -53 +52 @@
 
         XMLPortParam(WaypointPatrolController, "alertnessradius", setAlertnessRadius, getAlertnessRadius, xmlelement, mode).defaultValues(500.0f);
-//        XMLPortParam(WaypointPatrolController, "team", setTeam, getTeam, xmlelement, mode).defaultValues(0);
     }
 

code/branches/gamecontent/src/orxonox/controllers/WaypointPatrolController.h

@@ -46 +46 @@
             virtual void tick(float dt);
 
-           /* inline void setTeam(int team)
-                { this->team_ = team; }
-            inline int getTeam() const
-                { return this->team_; } */
-
             inline void setAlertnessRadius(float radius)
                 { this->alertnessradius_ = radius; }
@@ -59 +54 @@
             void searchEnemy();
 
-            //int team_;
             float alertnessradius_;
             Timer patrolTimer_;

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

@@ -10 +10 @@
   LastTeamStanding.cc
   TeamGametype.cc
+  Mission.cc
 )

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

@@ -123 +123 @@
                 { return this->gtinfo_->getHUDTemplate(); }
 
-            void addBots(unsigned int amount);
+            virtual void addBots(unsigned int amount);
             void killBots(unsigned int amount = 0);
 

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

@@ -56 +56 @@
 
             int getTeam(PlayerInfo* player);
-
             inline const ColourValue& getTeamColour(int teamnr) const
                 { return this->teamcolours_[teamnr]; }

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

@@ -67 +67 @@
     {
         Gametype::playerEntered(player);
-
-        std::vector<unsigned int> playersperteam(this->teams_, 0);
+        this->findAndSetTeam(player);
+    }
+
+    void TeamGametype::findAndSetTeam(PlayerInfo* player)
+    {
+         std::vector<unsigned int> playersperteam(this->teams_, 0);
 
         for (std::map<PlayerInfo*, int>::iterator it = this->teamnumbers_.begin(); it != this->teamnumbers_.end(); ++it)
@@ -86 +90 @@
 
         this->teamnumbers_[player] = minplayersteam;
+
     }
 

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

@@ -47 +47 @@
 
             virtual void playerEntered(PlayerInfo* player);
+            virtual void findAndSetTeam(PlayerInfo* player);
             virtual bool playerLeft(PlayerInfo* player);
 

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

@@ -455 +455 @@
         SUPER(Pawn, changedActivity);
 
-        this->setRadarVisibility(this->isActive());
+        this->setRadarVisibility(this->isVisible());
     }