mirror of
https://github.com/Shadowss/TravianZ.git
synced 2026-07-06 21:04:20 +00:00
fix claim artefacts
This commit is contained in:
+14
-14
@@ -1739,11 +1739,11 @@ private function loyaltyRegeneration() {
|
||||
}
|
||||
}
|
||||
|
||||
if($data['t11'] > 0){
|
||||
if($data['t11'] > 0){
|
||||
if ($isoasis != 0) {
|
||||
if ($database->canConquerOasis($data['from'],$data['to'])) {
|
||||
$database->conquerOasis($data['from'],$data['to']);
|
||||
$info_chief = $hero_pic." Your hero has conquered this oasis and gained ".$heroxp." XP";
|
||||
$info_chief = $hero_pic.",Your hero has conquered this oasis and gained ".$heroxp." XP";
|
||||
} else {
|
||||
$OasisInfo = $database->getOasisInfo($data['to']);
|
||||
if ($OasisInfo['conqured'] != 0) {
|
||||
@@ -1751,26 +1751,26 @@ private function loyaltyRegeneration() {
|
||||
$database->modifyOasisLoyalty($data['to']);
|
||||
$OasisInfo = $database->getOasisInfo($data['to']);
|
||||
$Oloyaltynow = $OasisInfo['loyalty'];
|
||||
$info_chief = $hero_pic." Your hero has reduced oasis loyalty to ".$Oloyaltynow." from ".$Oloyaltybefore." and gained ".$heroxp." XP";
|
||||
$info_chief = $hero_pic.",Your hero has reduced oasis loyalty to ".$Oloyaltynow." from ".$Oloyaltybefore." and gained ".$heroxp." XP";
|
||||
} else {
|
||||
if ($heroxp == 0) {
|
||||
$info_chief = $hero_pic." Your hero had nothing to kill therfore gains no XP at all";
|
||||
$info_chief = $hero_pic.",Your hero had nothing to kill therfore gains no XP at all";
|
||||
} else {
|
||||
$info_chief = $hero_pic." Your hero gained ".$heroxp." XP";
|
||||
$info_chief = $hero_pic.",Your hero gained ".$heroxp." XP";
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
$artifact = $database->getOwnArtefactInfo($data['to']);
|
||||
if ($artifact['vref'] == $data['to']){
|
||||
if($database->canClaimArtifact($artifact['vref'],$artifact['size'])) {
|
||||
$database->claimArtefact($data['to'],$data['to'],$database->getVillageField($data['from'],"owner"));
|
||||
$info_chief = $hero_pic." Your hero is carrying home a artifact, and gained ".$heroxp." XP from the battle";
|
||||
}else{
|
||||
$info_chief = $hero_pic." Your hero could not claim the artifact, and gained ".$heroxp." XP from the battle";
|
||||
$artifact = $database->getOwnArtefactInfo($data['to']);
|
||||
if ($artifact['vref'] == $data['to']) {
|
||||
if ($database->canClaimArtifact($data['from'],$artifact['vref'],$artifact['size'])) {
|
||||
$database->claimArtefact($data['from'],$data['to'],$database->getVillageField($data['from'],"owner"));
|
||||
$info_chief = $hero_pic.",Your hero is carrying home a artefact and gained ".$heroxp." XP from the battle";
|
||||
} else {
|
||||
$info_chief = $hero_pic.",Your hero could not claim the artefact and gained ".$heroxp." XP from the battle";
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -2403,67 +2403,63 @@
|
||||
$result = mysql_query($q, $this->connection);
|
||||
return mysql_fetch_array($result);
|
||||
}
|
||||
function claimArtefact($vref, $ovref, $id) {
|
||||
$time = time();
|
||||
$q = "UPDATE " . TB_PREFIX . "artefacts SET vref = $vref, owner = $id WHERE vref = $ovref";
|
||||
$result = mysql_query($q, $this->connection);
|
||||
return mysql_fetch_array($result);
|
||||
}
|
||||
|
||||
## Hero Claim artifact by advocaite
|
||||
public function canClaimArtifact ($vref,$type) {
|
||||
$DefenderFields = $this->getResourceLevel($vref);
|
||||
for($i=19;$i<=38;$i++) {
|
||||
function claimArtefact($vref, $ovref, $id) {
|
||||
$time = time();
|
||||
$q = "UPDATE " . TB_PREFIX . "artefacts SET vref = $vref, owner = $id, conquered = $time WHERE vref = $ovref";
|
||||
return mysql_query($q, $this->connection);
|
||||
}
|
||||
|
||||
public function canClaimArtifact($from,$vref,$type) {
|
||||
$DefenderFields = $this->getResourceLevel($vref);
|
||||
$defcanclaim = TRUE;
|
||||
for($i=19;$i<=38;$i++) {
|
||||
if($DefenderFields['f'.$i.'t'] == 27) {
|
||||
$defTresuaryLevel = $DefenderFields['f'.$i];
|
||||
if($defTresuaryLevel > 0) {
|
||||
$defcanclaim = FALSE;
|
||||
} else {
|
||||
$defcanclaim = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
$AttackerFields = $this->getResourceLevel($from);
|
||||
for($i=19;$i<=38;$i++) {
|
||||
if($AttackerFields['f'.$i.'t'] == 27) {
|
||||
$defcanclaim = FALSE;
|
||||
$defTresuaryLevel = $AttackerFields['f'.$i];
|
||||
} else
|
||||
{
|
||||
$defcanclaim = TRUE;
|
||||
}
|
||||
$attTresuaryLevel = $AttackerFields['f'.$i];
|
||||
if ($attTresuaryLevel >= 10) {
|
||||
$villageartifact = TRUE;
|
||||
} else {
|
||||
$villageartifact = FALSE;
|
||||
}
|
||||
if ($attTresuaryLevel >= 20){
|
||||
$accountartifact = TRUE;
|
||||
} else {
|
||||
$accountartifact = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
$AttackerFields = $this->getResourceLevel($vref);
|
||||
for($i=19;$i<=38;$i++) {
|
||||
if($AttackerFields['f'.$i.'t'] == 27) {
|
||||
$attTresuaryLevel = $AttackerFields['f'.$i];
|
||||
if ($attTresuaryLevel >= 10){
|
||||
$villageartifact = TRUE;
|
||||
}else{
|
||||
$villageartifact = FALSE;
|
||||
}
|
||||
if ($attTresuaryLevel == 20){
|
||||
$accountartifact = TRUE;
|
||||
}else{
|
||||
$accountartifact = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($type == 1)
|
||||
{
|
||||
if ($defcanclaim == TRUE && $villageartifact == TRUE)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
}else if($type == 2)
|
||||
{
|
||||
if ($defcanclaim == TRUE && $accountartifact == TRUE)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}else if($type == 3)
|
||||
{
|
||||
if ($defcanclaim == TRUE && $accountartifact == TRUE)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}else
|
||||
{
|
||||
return FALSE;
|
||||
if ($type == 1) {
|
||||
if ($defcanclaim == TRUE && $villageartifact == TRUE) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
} else if ($type == 2) {
|
||||
if ($defcanclaim == TRUE && $accountartifact == TRUE) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
} else if ($type == 3) {
|
||||
if ($defcanclaim == TRUE && $accountartifact == TRUE) {
|
||||
return TRUE;
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
} else {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
function getArtefactDetails($id) {
|
||||
|
||||
Reference in New Issue
Block a user