From: Côme BERNIGAUD Date: Wed, 11 May 2011 23:33:44 +0000 (+0200) Subject: Adding the temple campaign so we can test multiple campaigns features. X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;ds=sidebyside;h=200ab5f2ab9164e213f738acbac2b5bbc74bcaf4;p=lugaru.git Adding the temple campaign so we can test multiple campaigns features. --- diff --git a/CONTENT-LICENSE.txt b/CONTENT-LICENSE.txt index cf05b49..e97d5da 100644 --- a/CONTENT-LICENSE.txt +++ b/CONTENT-LICENSE.txt @@ -1,4 +1,49 @@ - The following game assets are under CC-BY-SA 3.0 Unported ( http://creativecommons.org/licenses/by-sa/3.0/ ) : +http://forums.wolfire.com/viewtopic.php?f=7&t=1066&start=270#p109473 +These map are from Temple by Slib under CC-BY-SA : +Data/Maps/sventhrone +Data/Maps/sventemple2 +Data/Maps/sventemple +Data/Maps/svensthwrong +Data/Maps/svenskip +Data/Maps/svenshan +Data/Maps/svenruins +Data/Maps/svenroad +Data/Maps/svenredbwafter +Data/Maps/svenredbw5 +Data/Maps/svenredbw4 +Data/Maps/svenredbw3 +Data/Maps/svenredbw2 +Data/Maps/svenredbw +Data/Maps/svenninjabefore +Data/Maps/svenninja +Data/Maps/svenmeeting +Data/Maps/svenheaven +Data/Maps/svengrotto +Data/Maps/svenfort +Data/Maps/svenforest +Data/Maps/svenfireice +Data/Maps/svenearl +Data/Maps/svendoor +Data/Maps/svendefend +Data/Maps/svendecoy +Data/Maps/svendawn +Data/Maps/svencouncil +Data/Maps/svenclimb +Data/Maps/svenchasm +Data/Maps/svencanyon +Data/Maps/svenalpha + +These textures are from Temple by Slib under CC-BY-SA : +mask.png +GiTop.png +GiTeared.png +GiBottom.png +Desertcl.png + +This campaign is from Temple by Slib under CC-BY-SA : +Data/Campaign/temple.txt + +The following game assets are under CC-BY-SA 3.0 Unported ( http://creativecommons.org/licenses/by-sa/3.0/ ) : Data/Animations/Wolfstop Data/Animations/Wolfslap diff --git a/Data/Campaigns/temple.txt b/Data/Campaigns/temple.txt new file mode 100644 index 0000000..6f21927 --- /dev/null +++ b/Data/Campaigns/temple.txt @@ -0,0 +1 @@ +Campaign Levels: 31 Level 1: Name: svenroad Description: Giant_Ruins_-_start_new_campaign! ChooseNext: 0 NumNext: 1 NextLevel: 2 LocationX: 197 LocationY: 370 Level 2: Name: svenclimb Description: Giant_Ruins ChooseNext: 1 NumNext: 1 Nextlevel: 3 LocationX: 197 LocationY: 370 Level 3: Name: svenheaven Description: Ruins_Top ChooseNext: 1 NumNext: 1 Nextlevel: 4 LocationX: 192 LocationY: 353 Level 4: Name: sventemple Description: Temple_of_the_Wind ChooseNext: 1 NumNext: 1 Nextlevel: 5 LocationX: 135 LocationY: 320 Level 5: Name: svensthwrong Description: West_Pass ChooseNext: 0 NumNext: 1 Nextlevel: 6 LocationX: 80 LocationY: 293 Level 6: Name: svendefend Description: Something_Wrong ChooseNext: 1 NumNext: 1 Nextlevel: 7 LocationX: 80 LocationY: 293 Level 7: Name: svenshan Description: Old_Fort ChooseNext: 0 NumNext: 1 Nextlevel: 8 LocationX: 83 LocationY: 250 Level 8: Name: svenfort Description: Old_Fort ChooseNext: 1 NumNext: 1 Nextlevel: 9 LocationX: 83 LocationY: 250 Level 9: Name: svenforest Description: Heading_for_Clearing ChooseNext: 0 NumNext: 1 Nextlevel: 10 LocationX: 115 LocationY: 240 Level 10: Name: svenearl Description: Clearing ChooseNext: 1 NumNext: 1 Nextlevel: 11 LocationX: 131 LocationY: 252 Level 11: Name: sventemple2 Description: Temple_of_the_Wind ChooseNext: 1 NumNext: 1 Nextlevel: 12 LocationX: 135 LocationY: 320 Level 12: Name: svenmeeting Description: Forest_Pagoda ChooseNext: 1 NumNext: 1 Nextlevel: 13 LocationX: 160 LocationY: 270 Level 13: Name: svenredbw Description: Snowy_Fields ChooseNext: 0 NumNext: 1 Nextlevel: 14 LocationX: 240 LocationY: 213 Level 14: Name: svenredbw2 Description: Snowy_Fields ChooseNext: 1 NumNext: 1 Nextlevel: 15 LocationX: 240 LocationY: 213 Level 15: Name: svendawn Description: Desert_Beacons ChooseNext: 1 NumNext: 1 Nextlevel: 16 LocationX: 277 LocationY: 227 Level 16: Name: svencanyon Description: Canyon ChooseNext: 1 NumNext: 1 Nextlevel: 17 LocationX: 320 LocationY: 215 Level 17: Name: svenredbw3 Description: Snowy_Fields:_Night ChooseNext: 1 NumNext: 1 Nextlevel: 18 LocationX: 240 LocationY: 213 Level 18: Name: svenninjabefore Description: Border ChooseNext: 1 NumNext: 1 Nextlevel: 19 LocationX: 345 LocationY: 213 Level 19: Name: svenninja Description: General_Mansion ChooseNext: 1 NumNext: 1 Nextlevel: 20 LocationX: 405 LocationY: 213 Level 20: Name: svenredbw4 Description: Snowy_Fields:_Dawn ChooseNext: 0 NumNext: 1 Nextlevel: 21 LocationX: 240 LocationY: 213 Level 21: Name: svenredbw5 Description: Snowy_Fields:_Dawn ChooseNext: 1 NumNext: 1 Nextlevel: 22 LocationX: 240 LocationY: 213 Level 22: Name: svenredbwafter Description: Snowy_Plain ChooseNext: 1 NumNext: 1 Nextlevel: 23 LocationX: 243 LocationY: 238 Level 23: Name: svenruins Description: Ruins ChooseNext: 1 NumNext: 1 Nextlevel: 24 LocationX: 135 LocationY: 320 Level 24: Name: svenalpha Description: Wolf_Mountain ChooseNext: 1 NumNext: 1 Nextlevel: 25 LocationX: 315 LocationY: 240 Level 25: Name: svencouncil Description: Council ChooseNext: 1 NumNext: 1 Nextlevel: 26 LocationX: 313 LocationY: 288 Level 26: Name: svendecoy Description: Border_Wall ChooseNext: 1 NumNext: 1 Nextlevel: 27 LocationX: 382 LocationY: 255 Level 27: Name: svenchasm Description: Castle_Bridge ChooseNext: 1 NumNext: 1 Nextlevel: 28 LocationX: 356 LocationY: 241 Level 28: Name: sventhrone Description: Throne_Hall ChooseNext: 1 NumNext: 1 Nextlevel: 29 LocationX: 336 LocationY: 227 Level 29: Name: svendoor Description: Castle_Entrance ChooseNext: 1 NumNext: 1 Nextlevel: 30 LocationX: 356 LocationY: 241 Level 30: Name: svengrotto Description: Snowy_Grotto ChooseNext: 1 NumNext: 1 Nextlevel: 31 LocationX: 343 LocationY: 258 Level 31: Name: svenfireice Description: Ice_Cave_(Last_Level) ChooseNext: 1 NumNext: 0 LocationX: 343 LocationY: 258 \ No newline at end of file diff --git a/Data/Maps/jendraz1 b/Data/Maps/jendraz1 new file mode 100644 index 0000000..f19e4a9 Binary files /dev/null and b/Data/Maps/jendraz1 differ diff --git a/Data/Maps/jendraz10 b/Data/Maps/jendraz10 new file mode 100644 index 0000000..2053d18 Binary files /dev/null and b/Data/Maps/jendraz10 differ diff --git a/Data/Maps/jendraz11 b/Data/Maps/jendraz11 new file mode 100644 index 0000000..41a2439 Binary files /dev/null and b/Data/Maps/jendraz11 differ diff --git a/Data/Maps/jendraz12 b/Data/Maps/jendraz12 new file mode 100644 index 0000000..1b432b1 Binary files /dev/null and b/Data/Maps/jendraz12 differ diff --git a/Data/Maps/jendraz13 b/Data/Maps/jendraz13 new file mode 100644 index 0000000..32a99dc Binary files /dev/null and b/Data/Maps/jendraz13 differ diff --git a/Data/Maps/jendraz14 b/Data/Maps/jendraz14 new file mode 100644 index 0000000..446a5e8 Binary files /dev/null and b/Data/Maps/jendraz14 differ diff --git a/Data/Maps/jendraz15 b/Data/Maps/jendraz15 new file mode 100644 index 0000000..2d633b9 Binary files /dev/null and b/Data/Maps/jendraz15 differ diff --git a/Data/Maps/jendraz16 b/Data/Maps/jendraz16 new file mode 100644 index 0000000..28561e8 Binary files /dev/null and b/Data/Maps/jendraz16 differ diff --git a/Data/Maps/jendraz17 b/Data/Maps/jendraz17 new file mode 100644 index 0000000..ab838f4 Binary files /dev/null and b/Data/Maps/jendraz17 differ diff --git a/Data/Maps/jendraz18 b/Data/Maps/jendraz18 new file mode 100644 index 0000000..a9c9d0a Binary files /dev/null and b/Data/Maps/jendraz18 differ diff --git a/Data/Maps/jendraz19 b/Data/Maps/jendraz19 new file mode 100644 index 0000000..24d9ac6 Binary files /dev/null and b/Data/Maps/jendraz19 differ diff --git a/Data/Maps/jendraz2 b/Data/Maps/jendraz2 new file mode 100644 index 0000000..73a8544 Binary files /dev/null and b/Data/Maps/jendraz2 differ diff --git a/Data/Maps/jendraz20 b/Data/Maps/jendraz20 new file mode 100644 index 0000000..c26b6b5 Binary files /dev/null and b/Data/Maps/jendraz20 differ diff --git a/Data/Maps/jendraz21 b/Data/Maps/jendraz21 new file mode 100644 index 0000000..2e7f8a1 Binary files /dev/null and b/Data/Maps/jendraz21 differ diff --git a/Data/Maps/jendraz22 b/Data/Maps/jendraz22 new file mode 100644 index 0000000..c764663 Binary files /dev/null and b/Data/Maps/jendraz22 differ diff --git a/Data/Maps/jendraz23 b/Data/Maps/jendraz23 new file mode 100644 index 0000000..e0e2f2a Binary files /dev/null and b/Data/Maps/jendraz23 differ diff --git a/Data/Maps/jendraz24 b/Data/Maps/jendraz24 new file mode 100644 index 0000000..5773316 Binary files /dev/null and b/Data/Maps/jendraz24 differ diff --git a/Data/Maps/jendraz25 b/Data/Maps/jendraz25 new file mode 100644 index 0000000..05a9062 Binary files /dev/null and b/Data/Maps/jendraz25 differ diff --git a/Data/Maps/jendraz26 b/Data/Maps/jendraz26 new file mode 100644 index 0000000..9dc6170 Binary files /dev/null and b/Data/Maps/jendraz26 differ diff --git a/Data/Maps/jendraz27 b/Data/Maps/jendraz27 new file mode 100644 index 0000000..e53484d Binary files /dev/null and b/Data/Maps/jendraz27 differ diff --git a/Data/Maps/jendraz28 b/Data/Maps/jendraz28 new file mode 100644 index 0000000..30b57d3 Binary files /dev/null and b/Data/Maps/jendraz28 differ diff --git a/Data/Maps/jendraz29 b/Data/Maps/jendraz29 new file mode 100644 index 0000000..a9b066c Binary files /dev/null and b/Data/Maps/jendraz29 differ diff --git a/Data/Maps/jendraz3 b/Data/Maps/jendraz3 new file mode 100644 index 0000000..e8c9a24 Binary files /dev/null and b/Data/Maps/jendraz3 differ diff --git a/Data/Maps/jendraz30 b/Data/Maps/jendraz30 new file mode 100644 index 0000000..000f221 Binary files /dev/null and b/Data/Maps/jendraz30 differ diff --git a/Data/Maps/jendraz31 b/Data/Maps/jendraz31 new file mode 100644 index 0000000..0e9b789 Binary files /dev/null and b/Data/Maps/jendraz31 differ diff --git a/Data/Maps/jendraz32 b/Data/Maps/jendraz32 new file mode 100644 index 0000000..4da04cc Binary files /dev/null and b/Data/Maps/jendraz32 differ diff --git a/Data/Maps/jendraz33 b/Data/Maps/jendraz33 new file mode 100644 index 0000000..2210158 Binary files /dev/null and b/Data/Maps/jendraz33 differ diff --git a/Data/Maps/jendraz34 b/Data/Maps/jendraz34 new file mode 100644 index 0000000..436d7c3 Binary files /dev/null and b/Data/Maps/jendraz34 differ diff --git a/Data/Maps/jendraz35 b/Data/Maps/jendraz35 new file mode 100644 index 0000000..e494e05 Binary files /dev/null and b/Data/Maps/jendraz35 differ diff --git a/Data/Maps/jendraz36 b/Data/Maps/jendraz36 new file mode 100644 index 0000000..6159ff9 Binary files /dev/null and b/Data/Maps/jendraz36 differ diff --git a/Data/Maps/jendraz37 b/Data/Maps/jendraz37 new file mode 100644 index 0000000..1ff348b Binary files /dev/null and b/Data/Maps/jendraz37 differ diff --git a/Data/Maps/jendraz38 b/Data/Maps/jendraz38 new file mode 100644 index 0000000..adc1cf1 Binary files /dev/null and b/Data/Maps/jendraz38 differ diff --git a/Data/Maps/jendraz39 b/Data/Maps/jendraz39 new file mode 100644 index 0000000..7ec779a Binary files /dev/null and b/Data/Maps/jendraz39 differ diff --git a/Data/Maps/jendraz4 b/Data/Maps/jendraz4 new file mode 100644 index 0000000..149ee81 Binary files /dev/null and b/Data/Maps/jendraz4 differ diff --git a/Data/Maps/jendraz40 b/Data/Maps/jendraz40 new file mode 100644 index 0000000..87561a1 Binary files /dev/null and b/Data/Maps/jendraz40 differ diff --git a/Data/Maps/jendraz41 b/Data/Maps/jendraz41 new file mode 100644 index 0000000..6fc5630 Binary files /dev/null and b/Data/Maps/jendraz41 differ diff --git a/Data/Maps/jendraz5 b/Data/Maps/jendraz5 new file mode 100644 index 0000000..09be574 Binary files /dev/null and b/Data/Maps/jendraz5 differ diff --git a/Data/Maps/jendraz6 b/Data/Maps/jendraz6 new file mode 100644 index 0000000..5f21832 Binary files /dev/null and b/Data/Maps/jendraz6 differ diff --git a/Data/Maps/jendraz7 b/Data/Maps/jendraz7 new file mode 100644 index 0000000..f3bdb59 Binary files /dev/null and b/Data/Maps/jendraz7 differ diff --git a/Data/Maps/jendraz8 b/Data/Maps/jendraz8 new file mode 100644 index 0000000..896158a Binary files /dev/null and b/Data/Maps/jendraz8 differ diff --git a/Data/Maps/jendraz9 b/Data/Maps/jendraz9 new file mode 100644 index 0000000..8f9915c Binary files /dev/null and b/Data/Maps/jendraz9 differ diff --git a/Data/Textures/Desertcl.png b/Data/Textures/Desertcl.png new file mode 100644 index 0000000..b3b6b8e Binary files /dev/null and b/Data/Textures/Desertcl.png differ diff --git a/Data/Textures/GiBottom.png b/Data/Textures/GiBottom.png new file mode 100644 index 0000000..57b9822 Binary files /dev/null and b/Data/Textures/GiBottom.png differ diff --git a/Data/Textures/GiTeared.png b/Data/Textures/GiTeared.png new file mode 100644 index 0000000..00aa33e Binary files /dev/null and b/Data/Textures/GiTeared.png differ diff --git a/Data/Textures/GiTop.png b/Data/Textures/GiTop.png new file mode 100644 index 0000000..1a40f0f Binary files /dev/null and b/Data/Textures/GiTop.png differ diff --git a/Data/Textures/mask.png b/Data/Textures/mask.png new file mode 100644 index 0000000..143bd62 Binary files /dev/null and b/Data/Textures/mask.png differ diff --git a/Source/GameDraw.cpp b/Source/GameDraw.cpp index 6031cf5..e8a9998 100644 --- a/Source/GameDraw.cpp +++ b/Source/GameDraw.cpp @@ -2396,7 +2396,7 @@ void Game::DrawMenu() endy[5]=starty[5]+20; sprintf (menustring[6], "Campaign : %s", accountactive->getCurrentCampaign().c_str()); - startx[6]=100; + startx[6]=200; endx[6]=startx[6]+strlen(menustring[6])*10; starty[6]=420; endy[6]=starty[6]+20; diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp index a0f164a..d6e6633 100644 --- a/Source/GameInitDispose.cpp +++ b/Source/GameInitDispose.cpp @@ -829,9 +829,9 @@ void Game::InitGame() LoadTexture(":Data:Textures:Newgame.png",&Mainmenuitems[1],0,0); LoadTexture(":Data:Textures:Options.png",&Mainmenuitems[2],0,0); LoadTexture(":Data:Textures:Quit.png",&Mainmenuitems[3],0,0); - LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0); LoadTexture(":Data:Textures:Eyelid.png",&Mainmenuitems[4],0,1); //LoadTexture(":Data:Textures:Eye.jpg",&Mainmenuitems[5],0,1); + LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0); texdetail=temptexdetail; FadeLoadingScreen(95); diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp index df85211..58baac8 100644 --- a/Source/GameTick.cpp +++ b/Source/GameTick.cpp @@ -5740,6 +5740,14 @@ void Game::MenuTick(){ accountactive->setCurrentCampaign(*c); } LoadCampaign(); + if(Mainmenuitems[7]) + glDeleteTextures(1,&Mainmenuitems[7]); + ifstream test(ConvertFileName((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str())); + if(test.good()) { + LoadTexture((":Data:Textures:"+accountactive->getCurrentCampaign()+":World.png").c_str(),&Mainmenuitems[7],0,0); + } else { + LoadTexture(":Data:Textures:World.png",&Mainmenuitems[7],0,0); + } break; } break;