Hecht
/
agng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkin anpassungen der aktuellen runde

Browse Source
main
hecht 8 years ago
parent 650ed00de3
commit 5f0db62c1a
10 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File

4
ag/char_profil.php
Unescape View File

@ -210,7 +210,7 @@ function stelledar($char_id,$user_ida,$name) {
<tr>
<th></th>
<th width="584" height="25" align="center">Normale K&auml;mpfe</th>
<th width="584" height="25" align="center">Clank&auml;mpfe</th>
<th width="584" height="25" align="center">Schatzsuche</th>
</tr>
<?php
//alle informationen zu den erlernten attacken auslesen
@ -399,4 +399,4 @@ if ($_POST['submit']==1) {
} else {
echo 'Leider wurde die Seite nicht korrekt aufgerufen! Rufen Sie die Seite bitte korrekt auf';
}
?>
?>

7
ag/include/attackenset.inc.php
Unescape View File

@ -7,6 +7,8 @@
*/
include_once (ROOT_PATH.'/include/defines.inc.php');
include_once (ROOT_PATH.'/include/sqlwrapper.inc.php');
//Set-Arten
defineIfNotDefined('NORMALKAMPF', 1);
@ -44,8 +46,9 @@ function getAttackSet($char_id, $type) {
if(!is_numeric($char_id) || !is_numeric($type)) {
return false;
}
$qry = mysql_query('SELECT attack_id, round FROM attackenset WHERE char_id = '.$char_id.' AND type = '.$type);
$qry = db_query('SELECT attack_id, round FROM attackenset WHERE char_id = '.$char_id.' AND type = '.$type);
$set = array();
while ($result = mysql_fetch_assoc($qry)) {
$set[$result['round']] = $result['attack_id'];
}
@ -141,4 +144,4 @@ function validateAttackSet($attackSet) {
return NULL;
}
?>
?>

4
ag/include/clan_fights.inc.php
Unescape View File

@ -28,8 +28,8 @@ defineIfNotDefined('DURATION_SURVIVAL_FIGHT', 15);
defineIfNotDefined('MAX_COUNT_PARALLEL_CFS', 1);
defineIfNotDefined('ATTACK_SET_DAVY_BACK_FIGHT', 2);
defineIfNotDefined('ATTACK_SET_SURVIVAL', 2);
defineIfNotDefined('ATTACK_SET_DAVY_BACK_FIGHT', 1);
defineIfNotDefined('ATTACK_SET_SURVIVAL', 1);
defineIfNotDefined('CLAN_EXP_FAKTOR_G', 1);

6
ag/include/kampf_wrapper.inc.php
Unescape View File

@ -7,7 +7,7 @@
*/
include_once (ROOT_PATH . '/include/arena.inc.php');
include_once (ROOT_PATH . '/include/sqlwrapper.inc.php');
/**
*
@ -17,9 +17,13 @@ include_once (ROOT_PATH . '/include/arena.inc.php');
*/
function convertLearnIDToAttackID (array $learnids, $char_id) {
$result = array();
$sql = 'SELECT id, at_id FROM lernen WHERE id IN ('.implode(',', $learnids).') AND besitzer = ' . $char_id;
// echo $sql .'<br>';
$qry = mysql_query($sql);
if (!$qry) {
return array();
}
while($row = mysql_fetch_assoc($qry)) {
for($i=0;$i<count($learnids);$i++) {
if($learnids[$i] == $row['id']) {

3
ag/include/parse.inc.php
Unescape View File

@ -327,7 +327,8 @@ function validateName($name){
function validateURL($url){
$str = validateString($url);
$pos = strpos($str, 'http://');
if($str != 'design/bilder/avatare/noavart.gif' && ($pos === false || $pos != 0)){
$pos_ssl = strpos($str, 'https://');
if($str != 'design/bilder/avatare/noavart.gif' && ($pos === false || $pos != 0) && ($pos_ssl === false || $pos_ssl != 0)){
return '';
} else{
return $str;

11
ag/include/schatz.inc.php
Unescape View File

@ -13,6 +13,8 @@ include_once(ROOT_PATH.'/include/exp.inc.php');
include_once(ROOT_PATH.'/include/sqlwrapper.inc.php');
include_once(ROOT_PATH.'/include/random.inc.php');
defineIfNotDefined('ATTACK_SET_SCHATZSUCHE', 2);
function interruptSchatzSuche($charid){
mysql_query('Delete from quest_rounds where charid ='.$charid);
@ -90,6 +92,9 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){
$char1_buffs = mysql_fetch_assoc(mysql_query('SELECT sum(i.hp) as hp, sum(i.mp) as mp, sum(i.starke) as starke, sum(i.verteidigung) as verteidigung, sum(i.speed) as speed FROM ware w LEFT JOIN item i ON(i.id=w.item_id) WHERE w.id IN (' . $chara_1['kampf_item'] . ')'));
}
// Retrieve the attack set for the treasure hunt!
$chara_1['attacken'] = implode(',', getAttackSet($chara_1['id'], ATTACK_SET_SCHATZSUCHE ));
$in_hp_max = explode(',', $chara_1['hp']);
$in_mp_max = explode(',', $chara_1['mp']);
$k_hp2[1] = $in_hp_max[1];
@ -301,9 +306,9 @@ function monsterfight_neu($chara_1, $fight_monster, $std, $ort){
}
}
// Just wait (so users can not determinate the success of the SS by calculation time)
for(;$i<count($fight_monster);$i++){
usleep(mt_random_wrapper(200000,500000)); // sleep 0.2-0.5 sec/monster
}
#for(;$i<count($fight_monster);$i++){
# usleep(mt_random_wrapper(200000,500000)); // sleep 0.2-0.5 sec/monster
#}
####
}

4
ag/irc.php
Unescape View File

@ -1,9 +1,9 @@
<?php
if($user_ida['nickname'] != NULL) {
echo '<iframe src="http://webchat.quakenet.org/?nick='.preg_replace('#\s#', '_', $user_ida['nickname']).'&channels=animegame&uio=d4" width="647" height="600"></iframe>';
echo '<iframe src="https://webchat.quakenet.org/?nick='.preg_replace('#\s#', '_', $user_ida['nickname']).'&channels=animegame&uio=d4" width="647" height="600"></iframe>';
} else {
echo '<iframe src="http://webchat.quakenet.org/?nick=anon_....&channels=animegame&uio=d4" width="647" height="600"></iframe>';
echo '<iframe src="https://webchat.quakenet.org/?nick=anon_....&channels=animegame&uio=d4" width="647" height="600"></iframe>';
}

5
ag/rss.php
Unescape View File

@ -25,13 +25,14 @@ $nachrichten = mysql_query('SELECT * FROM ff11_news order by id DESC LIMIT 10');
{
$komments = mysql_fetch_assoc(mysql_query('SELECT count(id) as anzahl FROM ff11_komments WHERE news_id='.$row['id']));
$komments = $komments['anzahl'];
$text = htmlspecialchars($row['text']);
$betreff = preg_replace('#&#', 'und', $row['betreff']);
$text = $betreff;//htmlspecialchars($row['text']);
$link = $GLOBALS['server_url_long'].'/index.php?as=news&id='.$row['id'].'';
$link = htmlentities($link);
?>
<item>
<title><?php echo preg_replace('#&#', 'und', $row['betreff']).' - Antworten ('.$komments.')'; ?></title>
<title><?php echo $betreff.' - Antworten ('.$komments.')'; ?></title>
<link><?php echo $link; ?></link>
<description><?php echo $text; ?></description>
<guid>

1
ag/schatz.php
Unescape View File

@ -70,7 +70,6 @@ $coords[0] = $char_ort['x_coord'];
$coords[1] = $char_ort['y_coord'];
if ($charm == 1) {
if (!semaphoreUP($ressource)) { // Blockiere alle Aktionen die der User gleichzeitig ausfuehren will (Ausgaben, Chars etc.) um Problemen vorzubeugen!!
displayErrorMessage(NULL, 'Verarbeitung gerade in Gange, bitte warten...', displayHistoryBackLink());
exit;

2
ag/sets.php
Unescape View File

@ -117,7 +117,7 @@ function displaySets($user_ida) {
<tr>
<td><?php echo $set['item']['name']; ?></td>
<td><?php echo join(',', $deps); ?></td>
<td><button type="button" onclick="create_set(<?php echo $set['id']; ?>, '<?php echo $set['item']['name']; ?>');" <?php echo ($enable?'':'disabled="disabled"') ;?>>Erzeugen</button></td>
<td><button class="input" type="button" onclick="create_set(<?php echo $set['id']; ?>, '<?php echo $set['item']['name']; ?>');" <?php echo ($enable?'':'disabled="disabled"') ;?>>Erzeugen</button></td>
</tr>
<?php
}

Write Preview
Loading…
Cancel
Save