Changeset 8931

Timestamp:

Nov 10, 2011, 10:52:50 PM (12 years ago)

Author:

jo

Message:

Adding new tags: 'gametype' and 'minigame'.

Location:

code/branches/menue

Files:

• data/gui/scripts/SingleplayerMenu.lua (modified) (1 diff)
• data/levels/asteroids.oxw (modified) (2 diffs)
• data/levels/dynamicMatch.oxw (modified) (1 diff)
• data/levels/lastManStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStanding.oxw (modified) (1 diff)
• data/levels/lastTeamStandingII.oxw (modified) (1 diff)
• data/levels/pong.oxw (modified) (2 diffs)
• data/levels/spaceRace.oxw (modified) (1 diff)
• data/levels/teamBaseMatch.oxw (modified) (2 diffs)
• data/levels/teamDeathMatch.oxw (modified) (2 diffs)
• data/levels/tetris.oxw (modified) (2 diffs)
• data/levels/theTimeMachine.oxw (modified) (1 diff)
• data/levels/underAttack.oxw (modified) (2 diffs)
• src/orxonox/LevelInfo.cc (modified) (1 diff)

code/branches/menue/data/gui/scripts/SingleplayerMenu.lua

@@ -11 +11 @@
     
     -- create tabs with desired tab as argument (nil for all)
+    P.createFilterTab("Gametypes", "gametype")
     P.createFilterTab("Missions", "mission")
-    P.createFilterTab("Tutorials", "tutorial")
+    P.createFilterTab("Minigames", "minigame")
     P.createFilterTab("Showcases", "showcase")
     P.createFilterTab("Presentations", "presentation")

code/branches/menue/data/levels/asteroids.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Asteroids Race"
- description = "Testmap for gametype asteroid race"
- tags = "test"
+ description = "Reach the checkpoints and avoid asteroids."
+ tags = "gametype"
  screenshot = "asteroids.png"
 />
@@ -15 +15 @@
 <Level
  name         = "Asteroids Race"
- description  = "testmap for gametype asteroid race"
+ description  = "Reach the checkpoints and avoid asteroids."
  gametype     =  Asteroids
 >

code/branches/menue/data/levels/dynamicMatch.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Dynamic Match"
- description = "In progress - Level for dynamicmatch"
- tags = "test"
+ description = "Dynamicmatch: Take care of what you're shooting at."
+ tags = "gametype"
  screenshot = "dynamicMatch.png"
 />

code/branches/menue/data/levels/lastManStanding.oxw

@@ -2 +2 @@
  name = "Last Man Standing"
  description = "Be the sole survivor."
- tags = "mission"
+ tags = "gametype"
  screenshot = "lastmanstanding.png"
 />

code/branches/menue/data/levels/lastTeamStanding.oxw

@@ -2 +2 @@
  name = "Last Team Standing"
  description = "Survive as a team."
- tags = "mission"
+ tags = "gametype"
  screenshot = "lastteamstanding.png"
 />

code/branches/menue/data/levels/lastTeamStandingII.oxw

@@ -2 +2 @@
  name = "On the fly"
  description = "Survive as a team."
- tags = "mission"
+ tags = "gametype"
  screenshot = "onthefly.png"
 />

code/branches/menue/data/levels/pong.oxw

@@ -2 +2 @@
  name = "Pong"
  description = "Pong in space!"
- tags = "showcase"
+ tags = "minigame"
  screenshot = "pong.png"
 />
@@ -50 +50 @@
 
 <Level
- name         = "Presentation"
- description  = "A simple testlevel"
+ name         = "Pong"
+ description  = "Pong in space!"
  gametype     = Pong
 >

code/branches/menue/data/levels/spaceRace.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Space Race"
- description = "Test level for the gametype Space Race."
- tags = "test"
+ description = "Have a furious Race in Space: Reach the checkpoints as fast as possible."
+ tags = "gametype"
  screenshot = "spacerace.png"
 />

code/branches/menue/data/levels/teamBaseMatch.oxw

@@ -1 +1 @@
 <LevelInfo
  name = "Teambase Match"
- description = "Fight for the bases."
- tags = "mission"
+ description = "Fight for the bases. Capture bases by shooting at them and defend them against attackers."
+ tags = "gametype"
  screenshot = "teambasematch.png"
 />
@@ -16 +16 @@
 
 <Level
- name         = "Presentation"
- description  = "A simple testlevel"
+ name         = "Teambase Match"
+ description  = "Fight for the bases."
  gametype     = TeamBaseMatch
 >

code/branches/menue/data/levels/teamDeathMatch.oxw

@@ -2 +2 @@
  name = "Team Deathmatch"
  description = "Fight against each other in teams."
- tags = "mission"
+ tags = "gametype"
  screenshot = "teamdeathmatch.png"
 />
@@ -16 +16 @@
 
 <Level
- name         = "Waypoints"
- description  = "Testing waypoings for AI controlled spaceships."
+ name         = "Team Deathmatch"
+ description  = "Fight against each other in teams."
  gametype     = TeamDeathmatch
 >

code/branches/menue/data/levels/tetris.oxw

@@ -2 +2 @@
  name = "Tetris"
  description = "Tetris in space!"
- tags = "showcase"
+ tags = "minigame"
  screenshot = "tetris.png"
 />
@@ -31 +31 @@
 
 <Level
- name         = "Presentation"
- description  = "A simple testlevel"
+ name         = "Tetris"
+ description  = "Tetris in space!"
  gametype     = "Tetris"
 >

code/branches/menue/data/levels/theTimeMachine.oxw

@@ -2 +2 @@
  name = "The Time Machine"
  description = "A simple level. The only goal is to defeat as much enemies as you can."
- tags = "mission"
+ tags = "gametype"
  screenshot = "thetimemachine.png"
 />

code/branches/menue/data/levels/underAttack.oxw

@@ -1 +1 @@
 <LevelInfo
- name = "UnderAttack testing"
- description = "A simple testlevel"
- tags = "test"
+ name = "Under Attack"
+ description = "Fight the transporter."
+ tags = "gametype"
  screenshot = "underattack.png"
 />
@@ -15 +15 @@
 
 <Level
- name         = "UnderAttack testing"
- description  = "A simple testlevel"
+ name         = "Under Attack"
+ description  = "Fight against the transporter."
  gametype     = UnderAttack
 >

code/branches/menue/src/orxonox/LevelInfo.cc

@@ -91 +91 @@
             LevelInfoItem::possibleTags_s.insert("presentation");
             LevelInfoItem::possibleTags_s.insert("mission");
+            LevelInfoItem::possibleTags_s.insert("gametype");
+            LevelInfoItem::possibleTags_s.insert("minigame");
         }
     }