Skip to content

Commit

Permalink
Fixed a missing comma in the #5 mob array for parlaor maps; fixed pag…
Browse files Browse the repository at this point in the history 
…e startup references

git-svn-id: https://subversion.assembla.com/svn/v2engine/trunk@693 a1c503db-2e5a-4881-8658-c54c93b95141
  • Loading branch information
ajacksified committed Feb 28, 2011
1 parent 2d748f9 commit 435cb4d
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Server/Common/Config.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
//Game Configuration
$_CONFIG[CF_GAME] = array();
$_CONFIG[CF_GAME][CF_GAME_DROPS] = array();
$_CONFIG[CF_GAME][CF_GAME_DROPS][CF_GAME_DROPS_GOLD] = 0.1;
$_CONFIG[CF_GAME][CF_GAME_DROPS][CF_GAME_DROPS_GOLD] = 100;
$_CONFIG[CF_GAME][CF_GAME_DROPS][CF_GAME_DROPS_GEM] = 0.16666667;
$_CONFIG[CF_GAME][CF_GAME_DROPS][CF_GAME_DROPS_SHADOW] = 0.0333333;
$_CONFIG[CF_GAME][CF_GAME_DROPS][CF_GAME_DROPS_UNIQUE] = 0.0333333;
Expand Down
9 changes: 5 additions & 4 deletions WebClient/Core/staticInfo/maps.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"2": []
},
Places: []
}
};

Maps["MAP_00000000000000000000002"] = {
Id: "MAP_00000000000000000000002",
Expand All @@ -37,7 +37,7 @@
"2": []
},
Places: []
}
};

Maps["MAP_00000000001296788648248"] = {
Id: "MAP_00000000001296788648248",
Expand All @@ -54,7 +54,7 @@
"0": ["MONS_00000000001297218526153", "MONS_00000000001297218526171", "MONS_00000000001297218526192", "MONS_00000000001297218526208", "MONS_00000000001297218526222", "MONS_00000000001297218526236", "MONS_00000000001297218526250", "MONS_00000000001297218526264", "MONS_00000000001297218526283", "MONS_00000000001297218526297", "MONS_00000000001297218526311", "MONS_00000000001297218526326"],
"3": ["MONS_00000000001297218526341", "MONS_00000000001297218526362", "MONS_00000000001297218526381", "MONS_00000000001297218526401", "MONS_00000000001297218526429", "MONS_00000000001297218526451", "MONS_00000000001297218526466"],
"11": ["MONS_00000000001297218526481", "MONS_00000000001297218526494", "MONS_00000000001297218526507", "MONS_00000000001297218526520", "MONS_00000000001297218526535", "MONS_00000000001297218526548"],
"5": ["MONS_00000000001297218526561", "MONS_00000000001297218526576", "MONS_00000000001297218526600", "MONS_00000000001297218526686", "MONS_00000000001297218526947", "MONS_00000000001297218526709" "MONS_00000000001297218526769", "MONS_00000000001297218526820", "MONS_00000000001297218526834", "MONS_00000000001297218526849"],
"5": ["MONS_00000000001297218526561", "MONS_00000000001297218526576", "MONS_00000000001297218526600", "MONS_00000000001297218526686", "MONS_00000000001297218526947", "MONS_00000000001297218526709", "MONS_00000000001297218526769", "MONS_00000000001297218526820", "MONS_00000000001297218526834", "MONS_00000000001297218526849"],
"9": ["MONS_00000000001297218526863", "MONS_00000000001297218526877", "MONS_00000000001297218526891"],
"7": ["MONS_00000000001297218526947", "MONS_00000000001297218526919", "MONS_00000000001297218526934"],
"6": ["MONS_00000000001297218526947", "MONS_00000000001297218526961", "MONS_00000000001297218526974"],
Expand All @@ -64,6 +64,7 @@
"12": ["MONS_00000000001297218527337", "MONS_00000000001297218527350", "MONS_00000000001297218527367", "MONS_00000000001297218527381", "MONS_00000000001297218527394"]
},
Places: []
}
};

V2Core.Maps = Maps;
})(window);
5 changes: 5 additions & 0 deletions WebClient/about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,18 @@ interface and creates the user experience with his wicked sweet jQuery and html
<script src="./Core/core-MapService.js"></script>
<script src="./Core/core-ItemService.js"></script>
<script src="./Core/core-MonsterService.js"></script>
<script src="./Core/core-APIService.js"></script>

<!-- Libraries -->
<script src="./Core/staticInfo/items.js"></script>
<script src="./Core/staticInfo/maps.js"></script>
<script src="./Core/staticInfo/monsters.js"></script>
<script src="./Core/staticInfo/races.js"></script>

<!-- Page setup -->
<script src="./js/startup.js"></script>
<script src="./js/index-startup.js"></script>

<div id="fb-root"></div>
<script src="http://connect.facebook.net/en_US/all.js"></script>
<script type="text/javascript">
Expand Down
3 changes: 2 additions & 1 deletion WebClient/account.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@
<script src="./Core/core-MapService.js"></script>
<script src="./Core/core-ItemService.js"></script>
<script src="./Core/core-MonsterService.js"></script>
<script src="./Core/core-APIService.js"></script>
<!-- Libraries -->
<script src="./Core/staticInfo/items.js"></script>
Expand All @@ -305,7 +306,7 @@
<!-- Page setup -->
<script src="./js/startup.js"></script>
<script src="./js/game-startup.js"></script>
<script src="./js/account-startup.js"></script>
<div id="fb-root"></div>
<script src="http://connect.facebook.net/en_US/all.js"></script><script type="text/javascript">
Expand Down
5 changes: 5 additions & 0 deletions WebClient/game.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,17 @@
<script src="./Core/core-MapService.js"></script>
<script src="./Core/core-ItemService.js"></script>
<script src="./Core/core-MonsterService.js"></script>
<script src="./Core/core-APIService.js"></script>
<!-- Libraries -->
<script src="./Core/staticInfo/items.js"></script>
<script src="./Core/staticInfo/maps.js"></script>
<script src="./Core/staticInfo/monsters.js"></script>
<script src="./Core/staticInfo/races.js"></script>
<!-- Page setup -->
<script src="./js/startup.js"></script>
<script src="./js/game-startup.js"></script>
<script type="text/javascript">
Expand Down
5 changes: 5 additions & 0 deletions WebClient/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,13 +407,18 @@ function get_facebook_cookie($app_id, $application_secret)
<script src="./Core/core-MapService.js"></script>
<script src="./Core/core-ItemService.js"></script>
<script src="./Core/core-MonsterService.js"></script>
<script src="./Core/core-APIService.js"></script>

<!-- Libraries -->
<script src="./Core/staticInfo/items.js"></script>
<script src="./Core/staticInfo/maps.js"></script>
<script src="./Core/staticInfo/monsters.js"></script>
<script src="./Core/staticInfo/races.js"></script>

<!-- Page setup -->
<script src="./js/startup.js"></script>
<script src="./js/index-startup.js"></script>

<div id="fb-root"></div>
<script src="http://connect.facebook.net/en_US/all.js"></script>
<script type="text/javascript">
Expand Down
5 changes: 5 additions & 0 deletions WebClient/tops.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,13 +318,18 @@ function get_facebook_cookie($app_id, $application_secret)
<script src="./Core/core-MapService.js"></script>
<script src="./Core/core-ItemService.js"></script>
<script src="./Core/core-MonsterService.js"></script>
<script src="./Core/core-APIService.js"></script>

<!-- Libraries -->
<script src="./Core/staticInfo/items.js"></script>
<script src="./Core/staticInfo/maps.js"></script>
<script src="./Core/staticInfo/monsters.js"></script>
<script src="./Core/staticInfo/races.js"></script>

<!-- Page setup -->
<script src="./js/startup.js"></script>
<script src="./js/tops-startup.js"></script>

<div id="fb-root"></div>
<script src="http://connect.facebook.net/en_US/all.js"></script>
<script type="text/javascript">
Expand Down

0 comments on commit 435cb4d

Please sign in to comment.