[Orxonox-commit 6904] r11525 - in code/branches/CampaignMap_HS17: data/levels src/modules/objects src/orxonox/infos

[fanconic at orxonox.net]

Author: fanconic
Date: 2017-10-30 16:30:58 +0100 (Mon, 30 Oct 2017)
New Revision: 11525

Modified:
   code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw
   code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc
   code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc
Log:
verschiedene kleine Aenderungen

Modified: code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw
===================================================================
--- code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw	2017-10-30 15:22:22 UTC (rev 11524)
+++ code/branches/CampaignMap_HS17/data/levels/emptyLevel.oxw	2017-10-30 15:30:58 UTC (rev 11525)
@@ -60,6 +60,9 @@
   </attached>
 </StaticEntity>
 
+<MovableEntity>
+    
+
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <SpawnPoint team=0 position="-200,0,0" lookat="0,0,0" spawnclass=SpaceShip pawndesign=spaceshipescort />
 

Modified: code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc	2017-10-30 15:22:22 UTC (rev 11524)
+++ code/branches/CampaignMap_HS17/src/modules/objects/StoryModePlanet.cc	2017-10-30 15:30:58 UTC (rev 11525)
@@ -67,6 +67,25 @@
     //TO DO: implement this function like BOT:: setConfigValues() Eg. List of names of the levels.
     void StoryModePlanet::setConfigValues()
     {
+    	 static const std::string names[] =
+        {
+            "Berkay Berabi",
+            "Louis  Meile"
+            "Muten Roshi",
+            "Abradolf Lincler",
+            "Lionel Messi",
+            "Kamal Khan",
+            "Karl the Llama",
+            "Thomas the Tankengine",
+            "Rick",
+            "send nudes",
+            "Morty",
+            "Charlie the Unicorn",
+            "Kung Fury",
+            "Postman Pat"
+        };
+        static std::vector<std::string> defaultnames(names, names + sizeof(names) / sizeof(std::string));
 
+        SetConfigValue(names_, defaultnames);
     }
 }
\ No newline at end of file

Modified: code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc
===================================================================
--- code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc	2017-10-30 15:22:22 UTC (rev 11524)
+++ code/branches/CampaignMap_HS17/src/orxonox/infos/Bot.cc	2017-10-30 15:30:58 UTC (rev 11525)
@@ -76,6 +76,7 @@
             "Karl the Llama",
             "Thomas the Tankengine",
             "Rick",
+            "send nudes",
             "Morty",
             "Charlie the Unicorn",
             "Kung Fury",