From c2a09eca5e9ffceb62cc62b39935f8acffbc4aca Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 10 Apr 2012 15:45:16 +0300 Subject: [PATCH] edit trapper + bug fixed: in each resouce places, when you upgrade 2 level with waiting loop, the "production at level ?" must equal to "upgrade to level ?" --- Templates/Build/1.tpl | 35 ++++++++++++++++++-- Templates/Build/10.tpl | 20 +++++++++--- Templates/Build/11.tpl | 18 ++++++++-- Templates/Build/14.tpl | 17 ++++++++-- Templates/Build/15.tpl | 17 ++++++++-- Templates/Build/2.tpl | 35 ++++++++++++++++++-- Templates/Build/23.tpl | 74 ++++++++++++------------------------------ Templates/Build/28.tpl | 17 ++++++++-- Templates/Build/3.tpl | 35 ++++++++++++++++++-- Templates/Build/31.tpl | 18 ++++++++-- Templates/Build/32.tpl | 18 ++++++++-- Templates/Build/33.tpl | 18 ++++++++-- Templates/Build/34.tpl | 17 ++++++++-- Templates/Build/35.tpl | 17 ++++++++-- Templates/Build/36.tpl | 62 ++++++++++++++++++++++------------- Templates/Build/38.tpl | 18 ++++++++-- Templates/Build/39.tpl | 18 ++++++++-- Templates/Build/4.tpl | 39 +++++++++++++++++++--- Templates/Build/5.tpl | 17 ++++++++-- Templates/Build/6.tpl | 17 ++++++++-- Templates/Build/7.tpl | 17 ++++++++-- Templates/Build/8.tpl | 17 ++++++++-- Templates/Build/9.tpl | 17 ++++++++-- 23 files changed, 436 insertions(+), 142 deletions(-) diff --git a/Templates/Build/1.tpl b/Templates/Build/1.tpl index 21aaef67..bea337f0 100644 --- a/Templates/Build/1.tpl +++ b/Templates/Build/1.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -10,13 +14,38 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($village->capital == 1) { + if($next<=20){ ?> - resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['prod']* SPEED; ?> + : + + + : + + + + + : + + + + + : + + + isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,12 +17,20 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Capacity at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?> units + Capacity at level : + units + }else{ + ?> + Capacity at level 20: + units + isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -14,11 +18,19 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Capacity at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?> units + Capacity at level : + units + Capacity at level 20: + units + diff --git a/Templates/Build/14.tpl b/Templates/Build/14.tpl index 8548cdf2..bf625cbb 100644 --- a/Templates/Build/14.tpl +++ b/Templates/Build/14.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Speed bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Speed bonus at level : + Percent + Speed bonus at level 20: + Percent + diff --git a/Templates/Build/15.tpl b/Templates/Build/15.tpl index a3ba3a6d..3823ea62 100644 --- a/Templates/Build/15.tpl +++ b/Templates/Build/15.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Construction time at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']); ?> Percent + Construction time at level : + Percent + Construction time at level 20: + Percent + diff --git a/Templates/Build/2.tpl b/Templates/Build/2.tpl index 1ec5d03d..5e5db5b1 100644 --- a/Templates/Build/2.tpl +++ b/Templates/Build/2.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -11,13 +15,38 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($village->capital == 1) { + if($next<=20){ ?> - resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['prod']* SPEED; ?> + : + + + : + + + + + : + + + + + : + + + diff --git a/Templates/Build/23.tpl b/Templates/Build/23.tpl index a577c8b9..002767f7 100644 --- a/Templates/Build/23.tpl +++ b/Templates/Build/23.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -8,36 +12,12 @@ -tribe == 1) { - ?> - - -tribe == 2) { - ?> - - tribe == 3) { ?> -tribe == 4) { - ?> - - -tribe == 5) { + }else{ ?> isMax($village->resarray['f'.$id.'t'],$id)) { + if($next<=10){ ?> - -tribe == 1) { - ?> - - -tribe == 2) { - ?> - - + tribe == 3) { ?> - + + + + tribe == 4) { + if($session->tribe == 3) { ?> - + -tribe == 5) { - ?> - + - + }}} + ?>
Currently hidden units per resource:resarray['f'.$id]]['attri']; ?> unitsresarray['f'.$id]]['attri']; ?> units resarray['f'.$id]]['attri']*2; ?> units resarray['f'.$id]]['attri']; ?> unitsresarray['f'.$id]]['attri']; ?> units Hidden units per resource at level resarray['f'.$id]+1; ?>:resarray['f'.$id]+1]['attri']; ?> unitsresarray['f'.$id]+1]['attri']; ?> unitsHidden units per resource at level resarray['f'.$id]+1+$loopsame+$doublebuild; ?>: resarray['f'.$id]+1]['attri']*2; ?> unitsresarray['f'.$id]+1+$loopsame+$doublebuild]['attri']*2; ?> units resarray['f'.$id]+1+$loopsame+$doublebuild]['attri']; ?> unitsHidden units per resource at level 20: resarray['f'.$id]+1]['attri']; ?> units units resarray['f'.$id]+1]['attri']; ?> units units
isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Merchant load at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Merchant load at level : + Percent + Merchant load at level 20: + Percent + diff --git a/Templates/Build/3.tpl b/Templates/Build/3.tpl index 713704e8..5c968b18 100644 --- a/Templates/Build/3.tpl +++ b/Templates/Build/3.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,13 +17,38 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($village->capital == 1) { + if($next<=20){ ?> - resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['prod']* SPEED; ?> + : + + + : + + + + + : + + + + + : + + + diff --git a/Templates/Build/31.tpl b/Templates/Build/31.tpl index aa9cf69e..57f8dfab 100644 --- a/Templates/Build/31.tpl +++ b/Templates/Build/31.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>

City Wall Level resarray['f'.$id]; ?>

By building a City Wall you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.

@@ -9,12 +13,20 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Defence Bonus at level resarray['f'.$id]+1; ?>: + Defence Bonus at level : - resarray['f'.$id]+1]['attri']; ?> Percent + Percent + Defence Bonus at level 20: + Percent + isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>

Earth Wall Level resarray['f'.$id]; ?>

By building a Earth Wall you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.

@@ -9,12 +13,20 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Defence Bonus at level resarray['f'.$id]+1; ?>: + Defence Bonus at level : - resarray['f'.$id]+1]['attri']; ?> Percent + Percent + Defence Bonus at level 20: + Percent + isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>

Palisade Level resarray['f'.$id]; ?>

By building a Palisade you can protect your village against the barbarian hordes of your enemies. The higher the wall's level, the higher the bonus given to your forces' defence.

@@ -9,12 +13,20 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Defence Bonus at level resarray['f'.$id]+1; ?>: + Defence Bonus at level : - resarray['f'.$id]+1]['attri']; ?> Percent + Percent + Defence Bonus at level 20: + Percent + isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Stability bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Stability bonus at level : + Percent + Stability bonus at level 20: + Percent + diff --git a/Templates/Build/35.tpl b/Templates/Build/35.tpl index 53c55d22..110fc370 100644 --- a/Templates/Build/35.tpl +++ b/Templates/Build/35.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=10){ ?> - Bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Bonus at level : + Percent + Bonus at level 10: + Percent + diff --git a/Templates/Build/36.tpl b/Templates/Build/36.tpl index dc3a3cd0..cd3b3646 100644 --- a/Templates/Build/36.tpl +++ b/Templates/Build/36.tpl @@ -1,25 +1,43 @@ -

Vallenzetter Niveau 1

+isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?> +

Trapper Level resarray['f'.$id]; ?>

- Met goed verstopte vallen, beschermt de vallenzetter zijn dorp. Onachtzame aanvallers kunnen zo gevangen genomen worden en zijn geen gevaar meer voor het dorp.

+ src="img/x.gif" alt="Trapper" + title="Trapper" /> + The trapper protects your village with well hidden traps. This means that unwary enemies can be imprisoned and won't be able to harm your village anymore.

- + - + - - + isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ + ?> + + + + + +
Actuele maximale aantalCurrect maximum traps to train:10 Vallenresarray['f'.$id]]['attri']; ?> Traps
Maximale aantal bij niveau 222 VallenMaximum traps to train at level : TrapsMaximum traps to train at level 20: Traps
-

Je bezit op het moment 0 vallen, daarvan zijn er 0 bezet.

+

Your currently have 0 traps, 0 of which are occupied.

- Naam - Aantal - max + Name + Quantity + Max @@ -39,25 +57,25 @@
Val Vallen (Aanwezig: 0) + alt="Trap" + title="Trap" /> Trap (Available: 0)
Hout20|Klei30|IJzer10|Graan20|Graanverbruik0|duur0:10:00 + alt="Lumber" title="Lumber" />20|Clay30|Iron10|Crop20|Crop consumption0|Duration0:10:00
(10) + onClick="document.snd.t99.value=resarray['f'.$id]]['attri']; ?>">(resarray['f'.$id]]['attri']; ?>) diff --git a/Templates/Build/38.tpl b/Templates/Build/38.tpl index ec08bde0..03e29f3e 100644 --- a/Templates/Build/38.tpl +++ b/Templates/Build/38.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,19 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Capacity at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?> units + Capacity at level : + units + Capacity at level 20: + units + diff --git a/Templates/Build/39.tpl b/Templates/Build/39.tpl index 0f5bc8d3..ecde8bf6 100644 --- a/Templates/Build/39.tpl +++ b/Templates/Build/39.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -14,11 +18,19 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=20){ ?> - Capacity at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']*STORAGE_MULTIPLIER; ?> units + Capacity at level : + units + Capacity at level 20: + units + diff --git a/Templates/Build/4.tpl b/Templates/Build/4.tpl index 38f38183..0c9c27f5 100644 --- a/Templates/Build/4.tpl +++ b/Templates/Build/4.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -11,14 +15,39 @@ isMax($village->resarray['f'.$id.'t'],$id)) { - ?> + if(!$building->isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($village->capital == 1) { + if($next<=20){ + ?> - resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['prod']* SPEED; ?> + : + + + : + + + + + : + + + + + : + + + diff --git a/Templates/Build/5.tpl b/Templates/Build/5.tpl index edf9737b..471cf7e1 100644 --- a/Templates/Build/5.tpl +++ b/Templates/Build/5.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=5){ ?> - Wood bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Wood bonus at level : + Percent + Wood bonus at level 5: + Percent + diff --git a/Templates/Build/6.tpl b/Templates/Build/6.tpl index 208723f1..0574b2c1 100644 --- a/Templates/Build/6.tpl +++ b/Templates/Build/6.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=5){ ?> - Clay bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Clay bonus at level : + Percent + Clay bonus at level 5: + Percent + diff --git a/Templates/Build/7.tpl b/Templates/Build/7.tpl index c4fac012..47974afc 100644 --- a/Templates/Build/7.tpl +++ b/Templates/Build/7.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=5){ ?> - Iron bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Iron bonus at level : + Percent + Iron bonus at level 5: + Percent + diff --git a/Templates/Build/8.tpl b/Templates/Build/8.tpl index 9f96ea58..9e5e6e1f 100644 --- a/Templates/Build/8.tpl +++ b/Templates/Build/8.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=5){ ?> - Crop bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Crop bonus at level : + Percent + Crop bonus at level 5: + Percent + diff --git a/Templates/Build/9.tpl b/Templates/Build/9.tpl index 53efdc62..f4ff3b2a 100644 --- a/Templates/Build/9.tpl +++ b/Templates/Build/9.tpl @@ -1,3 +1,7 @@ +isCurrent($id) || $building->isLoop($id))?1:0; + $doublebuild = ($building->isCurrent($id) && $building->isLoop($id))?1:0; +?>
@@ -13,11 +17,18 @@ isMax($village->resarray['f'.$id.'t'],$id)) { + $next = $village->resarray['f'.$id]+1+$loopsame+$doublebuild; + if($next<=5){ ?> - Crop bonus at level resarray['f'.$id]+1; ?>: - resarray['f'.$id]+1]['attri']; ?> Percent + Crop bonus at level : + Percent + Crop bonus at level 5: + Percent +