forked from github/server
Merge pull request #181 from stm2/missing_curse_name
fix crash of Analyze Magic (mantis bug 2099)
This commit is contained in:
Enno Rehling
commit
a4de46dab5
|
|
@ -731,7 +731,7 @@
|
|||
<text locale="en">an unknown building</text>
|
||||
</string>
|
||||
<string name="an_unknown_spell">
|
||||
<text locale="de">ein unbekannter zauber</text>
|
||||
<text locale="de">ein unbekannter Zauber</text>
|
||||
<text locale="en">an unknown spell</text>
|
||||
</string>
|
||||
<string name="an_unknown_ship">
|
||||
|
|
@ -746,6 +746,14 @@
|
|||
<text locale="de">einer unbekannten Einheit</text>
|
||||
<text locale="en">an unknown unit</text>
|
||||
</string>
|
||||
<string name="an_unknown_curse">
|
||||
<text locale="de">ein unbekannter Zauber</text>
|
||||
<text locale="en">an unknown curse</text>
|
||||
</string>
|
||||
<string name="missing_key">
|
||||
<text locale="de">Fehler: Unbekannter Schlüssel</text>
|
||||
<text locale="en">Fehler: Unbekannter Schlüssel</text>
|
||||
</string>
|
||||
|
||||
<!--Meldungssektionen -->
|
||||
<string name="section_events">
|
||||
|
|
@ -3655,11 +3663,11 @@
|
|||
<namespace name="spell">
|
||||
<string name="create_rop">
|
||||
<text locale="de">Erschaffe einen Ring der Macht</text>
|
||||
<text locale="en">Create A Ring Of Power</text>
|
||||
<text locale="en">Create A Ring of Power</text>
|
||||
</string>
|
||||
<string name="fish_shield">
|
||||
<text locale="de">Schild des Fisches</text>
|
||||
<text locale="en">Shield Of The Fish</text>
|
||||
<text locale="en">Shield of the Fish</text>
|
||||
</string>
|
||||
<string name="protective_runes">
|
||||
<text locale="de">Runen des Schutzes</text>
|
||||
|
|
@ -3667,7 +3675,7 @@
|
|||
</string>
|
||||
<string name="fetch_astral">
|
||||
<text locale="de">Ruf der Realität</text>
|
||||
<text locale="en">Call Of Reality</text>
|
||||
<text locale="en">Call of Reality</text>
|
||||
</string>
|
||||
<string name="pull_astral">
|
||||
<text locale="de">Astraler Ruf</text>
|
||||
|
|
@ -3707,7 +3715,7 @@
|
|||
</string>
|
||||
<string name="seduction">
|
||||
<text locale="de">Lied der Verführung</text>
|
||||
<text locale="en">Song Of Seduction</text>
|
||||
<text locale="en">Song of Seduction</text>
|
||||
</string>
|
||||
<string name="sound_out">
|
||||
<text locale="de">Aushorchen</text>
|
||||
|
|
@ -3715,11 +3723,11 @@
|
|||
</string>
|
||||
<string name="bloodthirst">
|
||||
<text locale="de">Kriegsgesang</text>
|
||||
<text locale="en">Song Of War</text>
|
||||
<text locale="en">Song of War</text>
|
||||
</string>
|
||||
<string name="frighten">
|
||||
<text locale="de">Gesang der Angst</text>
|
||||
<text locale="en">Song Of Fear</text>
|
||||
<text locale="en">Song of Fear</text>
|
||||
</string>
|
||||
<string name="analyse_object">
|
||||
<text locale="de">Lied des Ortes analysieren</text>
|
||||
|
|
@ -3735,7 +3743,7 @@
|
|||
</string>
|
||||
<string name="create_chastitybelt">
|
||||
<text locale="de">Erschaffe ein Amulett der Keuschheit</text>
|
||||
<text locale="en">Create An Amulet Of Chastity</text>
|
||||
<text locale="en">Create An Amulet of Chastity</text>
|
||||
</string>
|
||||
<string name="combat_speed">
|
||||
<text locale="de">Beschleunigung</text>
|
||||
|
|
@ -3759,23 +3767,23 @@
|
|||
</string>
|
||||
<string name="song_resist_magic">
|
||||
<text locale="de">Gesang des wachen Geistes</text>
|
||||
<text locale="en">Song Of The Youthful Spirit</text>
|
||||
<text locale="en">Song of the Youthful Spirit</text>
|
||||
</string>
|
||||
<string name="song_suscept_magic">
|
||||
<text locale="de">Gesang des schwachen Geistes</text>
|
||||
<text locale="en">Song Of The Aging Spirit</text>
|
||||
<text locale="en">Song of the Aging Spirit</text>
|
||||
</string>
|
||||
<string name="song_of_peace">
|
||||
<text locale="de">Gesang der Friedfertigkeit</text>
|
||||
<text locale="en">Song Of Peace</text>
|
||||
<text locale="en">Song of Peace</text>
|
||||
</string>
|
||||
<string name="song_of_slavery">
|
||||
<text locale="de">Gesang der Versklavung</text>
|
||||
<text locale="en">Song Of Slavery</text>
|
||||
<text locale="en">Song of Slavery</text>
|
||||
</string>
|
||||
<string name="big_recruit">
|
||||
<text locale="de">Hohe Kunst der Überzeugung</text>
|
||||
<text locale="en">Song Of Slavery</text>
|
||||
<text locale="en">Song of Slavery</text>
|
||||
</string>
|
||||
<string name="double_time">
|
||||
<text locale="de">Zeitdehnung</text>
|
||||
|
|
@ -3823,7 +3831,7 @@
|
|||
</string>
|
||||
<string name="create_ror">
|
||||
<text locale="de">Erschaffe einen Ring der Regeneration</text>
|
||||
<text locale="en">Create A Ring Of Regeneration</text>
|
||||
<text locale="en">Create A Ring of Regeneration</text>
|
||||
</string>
|
||||
<string name="raise_mob">
|
||||
<text locale="de">Mob aufwiegeln</text>
|
||||
|
|
@ -3859,7 +3867,7 @@
|
|||
</string>
|
||||
<string name="create_bagofholding">
|
||||
<text locale="de">Erschaffe einen Beutel des Negativen Gewichts</text>
|
||||
<text locale="en">Create A Bag Of Holding</text>
|
||||
<text locale="en">Create A Bag of Holding</text>
|
||||
</string>
|
||||
<string name="create_focus">
|
||||
<text locale="de">Erschaffe einen Aurafocus</text>
|
||||
|
|
@ -3901,18 +3909,10 @@
|
|||
<text locale="de">Magie analysieren</text>
|
||||
<text locale="en">Analyze Magic</text>
|
||||
</string>
|
||||
<string name="generous">
|
||||
<text locale="de">Hohes Lied der Gaukelei</text>
|
||||
<text locale="en">Song of Generosity</text>
|
||||
</string>
|
||||
<string name="courting">
|
||||
<text locale="de">Gesang des Werbens</text>
|
||||
<text locale="en">Song of Courting</text>
|
||||
</string>
|
||||
<string name="itemcloak">
|
||||
<text locale="de">Schleieraura</text>
|
||||
<text locale="en">Veil</text>
|
||||
</string>
|
||||
<string name="song_of_healing">
|
||||
<text locale="de">Lied der Heilung</text>
|
||||
<text locale="en">Blessed Harvest</text>
|
||||
|
|
@ -3975,11 +3975,11 @@
|
|||
</string>
|
||||
<string name="treegrow">
|
||||
<text locale="de">Hainzauber</text>
|
||||
<text locale="en">Grove Of Oak Trees</text>
|
||||
<text locale="en">Grove of Oak Trees</text>
|
||||
</string>
|
||||
<string name="rustweapon">
|
||||
<text locale="de">Rostregen</text>
|
||||
<text locale="en">Rain Of Rust</text>
|
||||
<text locale="en">Rain of Rust</text>
|
||||
</string>
|
||||
<string name="cold_protection">
|
||||
<text locale="de">Firuns Fell</text>
|
||||
|
|
@ -4011,7 +4011,7 @@
|
|||
</string>
|
||||
<string name="magic_roots">
|
||||
<text locale="de">Wurzeln der Magie</text>
|
||||
<text locale="en">Roots Of Magic</text>
|
||||
<text locale="en">Roots of Magic</text>
|
||||
</string>
|
||||
<string name="maelstrom">
|
||||
<text locale="de">Mahlstrom</text>
|
||||
|
|
@ -4057,12 +4057,12 @@
|
|||
<string name="create_aots">
|
||||
<text locale="de">Erschaffe ein Amulett des wahren
|
||||
Sehens</text>
|
||||
<text locale="en">Create An Amulet Of True Sight</text>
|
||||
<text locale="en">Create An Amulet of True Sight</text>
|
||||
</string>
|
||||
<string name="create_roi">
|
||||
<text locale="de">Erschaffe einen Ring der
|
||||
Unsichtbarkeit</text>
|
||||
<text locale="en">Create A Ring Of Invisibility</text>
|
||||
<text locale="en">Create A Ring of Invisibility</text>
|
||||
</string>
|
||||
<string name="create_roqf">
|
||||
<text locale="de">Miriams flinke Finger</text>
|
||||
|
|
@ -4078,7 +4078,7 @@
|
|||
</string>
|
||||
<string name="versteinern">
|
||||
<text locale="de">Blick des Basilisken</text>
|
||||
<text locale="en">Gaze Of The Basilisk</text>
|
||||
<text locale="en">Gaze of the Basilisk</text>
|
||||
</string>
|
||||
<string name="strongwall">
|
||||
<text locale="de">Starkes Tor und feste Mauer</text>
|
||||
|
|
@ -4098,11 +4098,11 @@
|
|||
</string>
|
||||
<string name="treewalkenter">
|
||||
<text locale="de">Weg der Bäume</text>
|
||||
<text locale="en">Path Of Trees</text>
|
||||
<text locale="en">Path of Trees</text>
|
||||
</string>
|
||||
<string name="treewalkexit">
|
||||
<text locale="de">Sog des Lebens</text>
|
||||
<text locale="en">Ties Of Life</text>
|
||||
<text locale="en">Ties of Life</text>
|
||||
</string>
|
||||
<string name="holyground">
|
||||
<text locale="de">Heiliger Boden</text>
|
||||
|
|
@ -4115,7 +4115,7 @@
|
|||
</string>
|
||||
<string name="summonent">
|
||||
<text locale="de">Erwecke Ents</text>
|
||||
<text locale="en">Awakening Of The Ents</text>
|
||||
<text locale="en">Awakening of the Ents</text>
|
||||
</string>
|
||||
<string name="blessstonecircle">
|
||||
<text locale="de">Segne Steinkreis</text>
|
||||
|
|
@ -4159,7 +4159,7 @@
|
|||
</string>
|
||||
<string name="combatrust">
|
||||
<text locale="de">Rosthauch</text>
|
||||
<text locale="en">Winds Of Rust</text>
|
||||
<text locale="en">Winds of Rust</text>
|
||||
</string>
|
||||
<string name="transferaurachaos">
|
||||
<text locale="de">Machtübertragung</text>
|
||||
|
|
@ -4167,11 +4167,11 @@
|
|||
</string>
|
||||
<string name="firewall">
|
||||
<text locale="de">Feuerwand</text>
|
||||
<text locale="en">Wall Of Fire</text>
|
||||
<text locale="en">Wall of Fire</text>
|
||||
</string>
|
||||
<string name="plague">
|
||||
<text locale="de">Fluch der Pestilenz</text>
|
||||
<text locale="en">Curse Of Pestilence</text>
|
||||
<text locale="en">Curse of Pestilence</text>
|
||||
</string>
|
||||
<string name="chaosrow">
|
||||
<text locale="de">Wahnsinn des Krieges</text>
|
||||
|
|
@ -4192,7 +4192,7 @@
|
|||
<string name="create_trollbelt">
|
||||
<text locale="de">Erschaffe einen Gürtel der
|
||||
Trollstärke</text>
|
||||
<text locale="en">Create A Belt Of Troll
|
||||
<text locale="en">Create A Belt of Troll
|
||||
Strength</text>
|
||||
</string>
|
||||
<string name="auraleak">
|
||||
|
|
@ -4261,11 +4261,11 @@
|
|||
</string>
|
||||
<string name="icastle">
|
||||
<text locale="de">Traumschlößchen</text>
|
||||
<text locale="en">Castle Of Illusion</text>
|
||||
<text locale="en">Castle of Illusion</text>
|
||||
</string>
|
||||
<string name="transferauratraum">
|
||||
<text locale="de">Traum der Magie</text>
|
||||
<text locale="en">Dream Of Magic</text>
|
||||
<text locale="en">Dream of Magic</text>
|
||||
</string>
|
||||
<string name="shapeshift">
|
||||
<text locale="de">Gestaltwandlung</text>
|
||||
|
|
@ -4343,6 +4343,150 @@
|
|||
<text locale="de">Göttliche Macht</text>
|
||||
<text locale="en">Power of the Gods</text>
|
||||
</string>
|
||||
<string name="magicrunes">
|
||||
<text locale="de">Runen des Schutzes</text>
|
||||
<text locale="en">Protective Runes</text>
|
||||
</string>
|
||||
<string name="astralblock">
|
||||
<text locale="de">Störe Astrale Integrität</text>
|
||||
<text locale="en">Astral Disruption</text>
|
||||
</string>
|
||||
<string name="auraboost">
|
||||
<text locale="de">Gabe des Chaos</text>
|
||||
<text locale="en">Chaos Gift</text>
|
||||
</string>
|
||||
<string name="badlearn">
|
||||
<text locale="de">Schlechter Schlaf</text>
|
||||
<text locale="en">Insomnia</text>
|
||||
</string>
|
||||
<string name="badmagicresistancezone">
|
||||
<text locale="de">Gesang des schwachen Geistes</text>
|
||||
<text locale="en">Song of the Aging Spirit</text>
|
||||
</string>
|
||||
<string name="calmmonster">
|
||||
<text locale="de">Monster friedlich stimmen</text>
|
||||
<text locale="en">Calm Monster</text>
|
||||
</string>
|
||||
<string name="depression">
|
||||
<text locale="de">Gesang der Melancholie</text>
|
||||
<text locale="en">Song of Melancholy</text>
|
||||
</string>
|
||||
<string name="drought">
|
||||
<text locale="de">Beschwörung eines Hitzeelementar</text>
|
||||
<text locale="en">Summon Fire Elemental</text>
|
||||
</string>
|
||||
<string name="farvision">
|
||||
<text locale="de">ein unbekannter Zauber</text>
|
||||
<text locale="en">an unknown spell</text>
|
||||
</string>
|
||||
<string name="flyingship">
|
||||
<text locale="de">Luftschiff</text>
|
||||
<text locale="en">Airship</text>
|
||||
</string>
|
||||
<string name="fogtrap">
|
||||
<text locale="de">ein unbekannter Zauber</text>
|
||||
<text locale="en">an unknown spell</text>
|
||||
</string>
|
||||
<string name="fumble">
|
||||
<text locale="de">Chaosfluch</text>
|
||||
<text locale="en">Chaos Curse</text>
|
||||
</string>
|
||||
<string name="gbdream">
|
||||
<text locale="de">Schöne Träume oder Schlechte Träume</text>
|
||||
<text locale="en">Good Dreams or Bad Dreams</text>
|
||||
</string>
|
||||
<string name="generous">
|
||||
<text locale="de">Hohes Lied der Gaukelei</text>
|
||||
<text locale="en">Song of Generosity</text>
|
||||
</string>
|
||||
<string name="godcursezone">
|
||||
<text locale="de">Fluch der Götter</text>
|
||||
<text locale="en">Curse of the Gods</text>
|
||||
</string>
|
||||
<string name="goodmagicresistancezone">
|
||||
<text locale="de">Gesang des wachen Geistes</text>
|
||||
<text locale="en">Song of the Youthful Spirit</text>
|
||||
</string>
|
||||
<string name="insectfur">
|
||||
<text locale="de">Firuns Fell</text>
|
||||
<text locale="en">Firun's Coat</text>
|
||||
</string>
|
||||
<string name="itemcloak">
|
||||
<text locale="de">Schleieraura</text>
|
||||
<text locale="en">Concealing Aura</text>
|
||||
</string>
|
||||
<string name="magicresistance">
|
||||
<text locale="de">Magieresistenz</text>
|
||||
<text locale="en">Magic Resistance</text>
|
||||
</string>
|
||||
<string name="magicwalls">
|
||||
<text locale="de">Heimstein</text>
|
||||
<text locale="en">Homestone</text>
|
||||
</string>
|
||||
<string name="nocostbuilding">
|
||||
<text locale="de">Mauern der Ewigkeit</text>
|
||||
<text locale="en">Eternal Walls</text>
|
||||
</string>
|
||||
<string name="nodrift">
|
||||
<text locale="de">Wasserelementar</text>
|
||||
<text locale="en">Water Elemental</text>
|
||||
</string>
|
||||
<string name="oldrace">
|
||||
<text locale="de">Unbekannter Effekt</text>
|
||||
<text locale="en">Unknown Effect</text>
|
||||
</string>
|
||||
<string name="orcish">
|
||||
<text locale="de">Unbekannter Effekt</text>
|
||||
<text locale="en">Unknown Effect</text>
|
||||
</string>
|
||||
<string name="peacezone">
|
||||
<text locale="de">Gesang der Friedfertigkeit</text>
|
||||
<text locale="en">Song of Peace</text>
|
||||
</string>
|
||||
<string name="riotzone">
|
||||
<text locale="de">Aufruhr</text>
|
||||
<text locale="en">Riot</text>
|
||||
</string>
|
||||
<string name="skillmod">
|
||||
<text locale="de">Unbekannter Effekt</text>
|
||||
<text locale="en">Unknown Effect</text>
|
||||
</string>
|
||||
<string name="slavery">
|
||||
<text locale="de">Gesang der Versklavung</text>
|
||||
<text locale="en">Song of Slavery</text>
|
||||
</string>
|
||||
<string name="sparkle">
|
||||
<text locale="de">Unbekannter Effekt</text>
|
||||
<text locale="en">Unknown Effect</text>
|
||||
</string>
|
||||
<string name="speed">
|
||||
<text locale="de">Zeitdehnung</text>
|
||||
<text locale="en">Double Time</text>
|
||||
</string>
|
||||
<string name="stormwind">
|
||||
<text locale="de">Sturmelementar</text>
|
||||
<text locale="en">Storm Elemental</text>
|
||||
</string>
|
||||
<string name="strength">
|
||||
<text locale="de">Unbekannter Effekt</text>
|
||||
<text locale="en">Unknown Effect</text>
|
||||
</string>
|
||||
<string name="worse">
|
||||
<text locale="de">Alp</text>
|
||||
<text locale="en">Nightmare</text>
|
||||
</string>
|
||||
<string name="Feuerwand">
|
||||
<text locale="de">Feuerwand</text>
|
||||
<text locale="en">Firewall</text>
|
||||
</string>
|
||||
<string name="healingzone">
|
||||
<text locale="de">Zone der Heilung</text>
|
||||
<text locale="en">Zone of Healing</text>
|
||||
</string>
|
||||
<string name="shipspeedup">
|
||||
<text locale="de">Beschleunigung</text>
|
||||
<text locale="en">Acceleration</text>
|
||||
</string>
|
||||
</namespace>
|
||||
<namespace name="spellinfo">
|
||||
<string name="create_ror">
|
||||
|
|
@ -5034,7 +5178,7 @@
|
|||
STRASSE, so werden pro Golem 4 Steine verbaut und der
|
||||
Golem löst sich auf. </text>
|
||||
<text locale="en">'Take a flawless block of crystaline
|
||||
stone and humidify it with a vial of Water Of Life until
|
||||
stone and humidify it with a vial of Water of Life until
|
||||
the potion has been soaked up completely. Then focus
|
||||
your power on the forming aura of life and shape a
|
||||
container for the unbound forces'. The more power a magician
|
||||
|
|
@ -5085,7 +5229,7 @@
|
|||
armor will get rusty. The exact number of
|
||||
items affected by the rain depends on the
|
||||
ammount of power invested by the magician. Up to ten
|
||||
weapons can be destroyed per level - a Ring Of
|
||||
weapons can be destroyed per level - a Ring of
|
||||
Power increases the effect like an additional
|
||||
level.</text>
|
||||
</string>
|
||||
|
|
@ -5102,7 +5246,7 @@
|
|||
cold of a glacier. Under the effect of this
|
||||
spell, insects are able to enter glaciers and
|
||||
act normally there. Ten insects per level can be
|
||||
protected in this way. A Ring Of Power increases
|
||||
protected in this way. A Ring of Power increases
|
||||
the number by additional ten.</text>
|
||||
</string>
|
||||
<string name="hail">
|
||||
|
|
@ -5111,7 +5255,7 @@
|
|||
sich. Sodann kann er ihnen befehlen, den Gegner
|
||||
mit Hagelkörnern und Eisbrocken zuzusetzen.</text>
|
||||
<text locale="en">During a battle the druid calls the
|
||||
Elemental Spirits Of Cold and binds them to
|
||||
Elemental Spirits of Cold and binds them to
|
||||
himself. Then he commands them to attack his
|
||||
foes with hail and ice missiles.</text>
|
||||
</string>
|
||||
|
|
@ -5156,7 +5300,7 @@
|
|||
Windes beschwört plötzliche Windböen, kleine
|
||||
Windhosen und Luftlöcher herauf, die die
|
||||
gegnerischen Schützen behindern werden.</text>
|
||||
<text locale="en">Calling the Elemental Spirits Of Wind
|
||||
<text locale="en">Calling the Elemental Spirits of Wind
|
||||
conjurs up sudden breezes, small whirlwinds and
|
||||
minor turbulences that will hinder enemy
|
||||
archers.</text>
|
||||
|
|
@ -5179,7 +5323,7 @@
|
|||
Winde oder Strömungen beeinträchtigt.</text>
|
||||
<text locale="en">While being aboard a ship, the druid
|
||||
uses this ritual to force the Elemental Spirits
|
||||
Of Water to serve him and commands them to carry
|
||||
of Water to serve him and commands them to carry
|
||||
the ship across the water at a higher speed. In
|
||||
addition, the ship will not be affected by
|
||||
unfavourable winds or currents.</text>
|
||||
|
|
@ -5195,7 +5339,7 @@
|
|||
who can help those who got injured during a
|
||||
battle. Druids are, with the help of a summons
|
||||
of
|
||||
the Elemental Spirits Of Life, able to heal
|
||||
the Elemental Spirits of Life, able to heal
|
||||
wounds, mend broken bones or even regenerate
|
||||
separated limbs as well.</text>
|
||||
</string>
|
||||
|
|
@ -5206,7 +5350,7 @@
|
|||
starke Winde oder gar Stürme und behindern alle
|
||||
Schützen einer Schlacht.</text>
|
||||
<text locale="en">This summons opens a gate to the plane
|
||||
of Elemental Spirits Of Wind. Immediately,
|
||||
of Elemental Spirits of Wind. Immediately,
|
||||
strong winds or even storms will rise near the
|
||||
gate and hinder all archers during a battle.</text>
|
||||
</string>
|
||||
|
|
@ -5217,7 +5361,7 @@
|
|||
das Zaubern für die Dauer des Kampfes deutlich
|
||||
schwerer fallen.</text>
|
||||
<text locale="en">This ritual summons some Elemental
|
||||
Spirits Of Magic and sends them into the ranks
|
||||
Spirits of Magic and sends them into the ranks
|
||||
of the enemy mages. Casting spells will be much
|
||||
harder for them during the battle.</text>
|
||||
</string>
|
||||
|
|
@ -5237,7 +5381,7 @@
|
|||
Erdbeben wird alle Gebäude in der Region
|
||||
beschädigen.</text>
|
||||
<text locale="en">With this ritual the druid summons an
|
||||
Elemental Spirit Of Earth that brings the ground
|
||||
Elemental Spirit of Earth that brings the ground
|
||||
to shake. This earthquake damages all buildings
|
||||
in the target region.</text>
|
||||
</string>
|
||||
|
|
@ -5251,7 +5395,7 @@
|
|||
desto größer ist die Zahl der Elementargeister,
|
||||
die sich bannen lassen. Für jedes Schiff wird
|
||||
ein Elementargeist benötigt.</text>
|
||||
<text locale="en">Calling the Elemental Spirits Of Storm
|
||||
<text locale="en">Calling the Elemental Spirits of Storm
|
||||
is an ancient ritual. The druid binds the
|
||||
elementals to a ship's sails where they can help
|
||||
to carry the vessel across the waves at an
|
||||
|
|
@ -5305,7 +5449,7 @@
|
|||
die sich mit ihrem Tarnungs-Talent verstecken,
|
||||
bleiben weiterhin unentdeckt.</text>
|
||||
<text locale="en">This spell enables the caster to
|
||||
create an Amulet Of True Sight. Wearing such an
|
||||
create an Amulet of True Sight. Wearing such an
|
||||
amulet, a person can discover anyone wearing a
|
||||
Ring of Invisibility. Anyway, units concealed by
|
||||
the use of their stealth skill will remain
|
||||
|
|
@ -5347,11 +5491,11 @@
|
|||
Wahrnehmung auch sein mag. In einer unsichtbaren
|
||||
Einheit muss jede Person einen Ring tragen.</text>
|
||||
<text locale="en">With this spell the caster can create
|
||||
a Ring Of Invisibility. The wearer of this ring
|
||||
a Ring of Invisibility. The wearer of this ring
|
||||
will be invisible to all units of other
|
||||
factions, no matter how good their perception
|
||||
skill may be. In an invisible unit, each person
|
||||
must wear a Ring Of Invisibility.</text>
|
||||
must wear a Ring of Invisibility.</text>
|
||||
</string>
|
||||
<string name="homestone">
|
||||
<text locale="de">Mit dieser Formel bindet der Magier
|
||||
|
|
@ -5391,7 +5535,7 @@
|
|||
betroffenen Personen werden nicht mehr kämpfen,
|
||||
können jedoch auch nicht verwundet werden.</text>
|
||||
<text locale="en">This complicated but effective spell
|
||||
uses the Elemental Spirits Of Stone to turn a
|
||||
uses the Elemental Spirits of Stone to turn a
|
||||
number of enemies to stone for the duration of
|
||||
combat. The affected persons won't be able to
|
||||
fight any more, but they can't be wounded
|
||||
|
|
@ -5405,7 +5549,7 @@
|
|||
besseren Schutz gegen Angriffe mit dem Schwert
|
||||
wie mit Magie.</text>
|
||||
<text locale="en">At the beginning of a battle, the
|
||||
magician binds some Elemental Spirits Of Rock to
|
||||
magician binds some Elemental Spirits of Rock to
|
||||
the walls of the builing in which he currently
|
||||
is. The structure will then provide a better
|
||||
protection against attacks by sword or by magic.</text>
|
||||
|
|
@ -5438,7 +5582,7 @@
|
|||
<text locale="en">A great power lies within those places
|
||||
that are pulsing with life. A druid can focus
|
||||
this power and thereby create a gate into the
|
||||
World Of Spirits. He can then send level*5
|
||||
World of Spirits. He can then send level*5
|
||||
weight units of living or dead matter through
|
||||
the gate.</text>
|
||||
</string>
|
||||
|
|
@ -5448,7 +5592,7 @@
|
|||
Zaubers Stufe*5 Gewichtseinheiten in einen Wald
|
||||
auf der materiellen Welt zurückschicken.</text>
|
||||
<text locale="en">A druid who has traveled to the World
|
||||
Of Spirits can use this spell to send level*5
|
||||
of Spirits can use this spell to send level*5
|
||||
weight units of living or dead matter back to a
|
||||
forest in the material world.</text>
|
||||
</string>
|
||||
|
|
@ -5551,7 +5695,7 @@
|
|||
und so wird die Phase der Macht abgelöst von
|
||||
einer Phase der Schwäche.</text>
|
||||
<text locale="en">The sorcerer opens his mind to the
|
||||
Spheres Of Chaos so that he can access a greater
|
||||
Spheres of Chaos so that he can access a greater
|
||||
ammount of magical power for a while. But the
|
||||
help of the Chaos Lords has its price - and so
|
||||
the period of power will be followed by a period
|
||||
|
|
@ -5681,7 +5825,7 @@
|
|||
Sie sind schwer zu treffen und entziehen ihrem
|
||||
Gegner Kraft.</text>
|
||||
<text locale="en">With the help of dark rituals the
|
||||
sorcerer summons demons from the Sphere Of
|
||||
sorcerer summons demons from the Sphere of
|
||||
Shadows. These fearsome creatures can walk
|
||||
almost unseen among the living, but their dark
|
||||
aura can be sensed by everyone. Shadow demons
|
||||
|
|
@ -5775,7 +5919,7 @@
|
|||
Darkness are at their peak, the sorcerer can use
|
||||
his powers to destroy enchantments. In order to
|
||||
do so, he draws a pentagram on a surface of the
|
||||
enchanted object and begins calling the Lords Of
|
||||
enchanted object and begins calling the Lords of
|
||||
Darkness. The Lords will aid him, but whether he
|
||||
is able to undo the target spell or not depends
|
||||
upon his own power.</text>
|
||||
|
|
@ -5806,7 +5950,7 @@
|
|||
Schaden zufügen.</text>
|
||||
<text locale="en">By performing a gruesome ritual and
|
||||
sacrificing his own blood the Sorcerer conjurs
|
||||
up a spirit from the Elemental Plane Of Poison.
|
||||
up a spirit from the Elemental Plane of Poison.
|
||||
It will take the form of a green cloud of toxic
|
||||
gases that envelops a whole region and that will
|
||||
harm anyone within.</text>
|
||||
|
|
@ -5825,7 +5969,7 @@
|
|||
irresistable scent to dragons. It is not known
|
||||
whether the dragons come from surrounding
|
||||
regions or if they have their origin in the
|
||||
Sphere Of Chaos. The bait will exist for about
|
||||
Sphere of Chaos. The bait will exist for about
|
||||
six weeks, but it must be placed in a tarrain
|
||||
that is suitable for dragons.</text>
|
||||
</string>
|
||||
|
|
@ -5839,7 +5983,7 @@
|
|||
Sie sind schwer zu treffen und entziehen ihrem
|
||||
Gegner Kraft und Leben.</text>
|
||||
<text locale="en">With the help of dark rituals the
|
||||
sorcerer summons demons from the Sphere Of
|
||||
sorcerer summons demons from the Sphere of
|
||||
Shadows. These fearsome creatures can walk
|
||||
almost unseen among the living, but their dark
|
||||
aura can be sensed by everyone. Shadowmasters
|
||||
|
|
@ -5856,7 +6000,7 @@
|
|||
seiner Macht zu beseelen...'</text>
|
||||
<text locale="en">'So take the blood of a fierce warrior
|
||||
and apply it to the steel of the blade. Then
|
||||
start calling the Spheres Of Chaos. If you did
|
||||
start calling the Spheres of Chaos. If you did
|
||||
everything to their pleasure, they will send a
|
||||
minor one of their kind to fulfill the sword
|
||||
with his power.'</text>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,6 @@
|
|||
<message name="mallorn_effect" section="magic">
|
||||
<type>
|
||||
<arg name="mage" type="unit"/>
|
||||
<arg name="mage" type="unit"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) läßt einen Teil seiner selbst in die Erde fliessen. Die Bäume, die Transformation überlebt haben, erscheinen nun viel kräftiger."</text>
|
||||
<text locale="en">"The power of $unit($mage) flows into the ground and the trees which survived the spell appear much stronger now."</text>
|
||||
|
|
@ -2104,8 +2103,8 @@
|
|||
<arg name="curse" type="curse"/>
|
||||
<arg name="months" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $ship($ship) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $ship($ship) is charmed with $curse($curse), which will last for, about $int($months) more weeks."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $ship($ship) der Zauber '$curse($curse)' liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $ship($ship) is charmed with '$curse($curse)', which will last for, about $int($months) more weeks."</text>
|
||||
</message>
|
||||
<message name="analyse_building_age" section="magic">
|
||||
<type>
|
||||
|
|
@ -2114,8 +2113,8 @@
|
|||
<arg name="curse" type="curse"/>
|
||||
<arg name="months" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $building($building) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $building($building) is charmed with $curse($curse), which will last for about $int($months) more weeks."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $building($building) der Zauber '$curse($curse)' liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $building($building) is charmed with '$curse($curse)', which will last for about $int($months) more weeks."</text>
|
||||
</message>
|
||||
<message name="analyse_unit_age" section="magic">
|
||||
<type>
|
||||
|
|
@ -2124,8 +2123,8 @@
|
|||
<arg name="curse" type="curse"/>
|
||||
<arg name="months" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $unit($unit) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $unit($unit) is charmed with $curse($curse) that will last for about $int($months) more weeks."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $unit($unit) der Zauber '$curse($curse)' liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $unit($unit) is charmed with '$curse($curse)' that will last for about $int($months) more weeks."</text>
|
||||
</message>
|
||||
<message name="analyse_region_age" section="magic">
|
||||
<type>
|
||||
|
|
@ -2134,8 +2133,8 @@
|
|||
<arg name="curse" type="curse"/>
|
||||
<arg name="months" type="int"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $region($region) der Zauber $curse($curse) liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $region($region) is charmed with $curse($curse), which will last for about $int($months) more weeks."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $region($region) der Zauber '$curse($curse)' liegt, der noch etwa $int($months) Wochen bestehen bleibt."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $region($region) is charmed with '$curse($curse)', which will last for about $int($months) more weeks."</text>
|
||||
</message>
|
||||
<message name="analyse_ship_noage" section="magic">
|
||||
<type>
|
||||
|
|
@ -2143,8 +2142,8 @@
|
|||
<arg name="ship" type="ship"/>
|
||||
<arg name="curse" type="curse"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $ship($ship) der Zauber $curse($curse) liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $ship($ship) is charmed with $curse($curse), which will last for centuries."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $ship($ship) der Zauber '$curse($curse)' liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $ship($ship) is charmed with '$curse($curse)', which will last for centuries."</text>
|
||||
</message>
|
||||
<message name="analyse_building_noage" section="magic">
|
||||
<type>
|
||||
|
|
@ -2152,8 +2151,8 @@
|
|||
<arg name="building" type="building"/>
|
||||
<arg name="curse" type="curse"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $building($building) der Zauber $curse($curse) liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $building($building) is charmed with $curse($curse), which will last for centuries."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $building($building) der Zauber '$curse($curse)' liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $building($building) is charmed with '$curse($curse)', which will last for centuries."</text>
|
||||
</message>
|
||||
<message name="analyse_unit_noage" section="magic">
|
||||
<type>
|
||||
|
|
@ -2161,8 +2160,8 @@
|
|||
<arg name="unit" type="unit"/>
|
||||
<arg name="curse" type="curse"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $unit($unit) der Zauber $curse($curse) liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $unit($unit) is charmed with $curse($curse), which will last for centuries."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $unit($unit) der Zauber '$curse($curse)' liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $unit($unit) is charmed with '$curse($curse)', which will last for centuries."</text>
|
||||
</message>
|
||||
<message name="analyse_region_noage" section="magic">
|
||||
<type>
|
||||
|
|
@ -2170,8 +2169,8 @@
|
|||
<arg name="region" type="region"/>
|
||||
<arg name="curse" type="curse"/>
|
||||
</type>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $region($region) der Zauber $curse($curse) liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $region($region) is charmed with $curse($curse), which will last for centuries."</text>
|
||||
<text locale="de">"$unit($mage) fand heraus, dass auf $region($region) der Zauber '$curse($curse)' liegt, dessen Kraft ausreicht, um noch Jahrhunderte bestehen zu bleiben."</text>
|
||||
<text locale="en">"$unit($mage) discovers that $region($region) is charmed with '$curse($curse)', which will last for centuries."</text>
|
||||
</message>
|
||||
<message name="analyse_ship_fail" section="magic">
|
||||
<type>
|
||||
|
|
|
|||
|
|
@ -44,3 +44,25 @@ function test_blessedharvest_lasts_n_turn()
|
|||
process_orders()
|
||||
assert_equal(900, r:get_resource("money"))
|
||||
end
|
||||
|
||||
function test_magic()
|
||||
local r = region.create(0, 0, "plain")
|
||||
local f = faction.create("noreply@eressea.de", "halfling", "de")
|
||||
local u = unit.create(f, r)
|
||||
local b = building.create(r, "castle")
|
||||
|
||||
u.race = "dwarf"
|
||||
u.magic = "gwyrrd"
|
||||
u:set_skill("magic", 30)
|
||||
u.aura = 300
|
||||
|
||||
u:add_spell("protective_runes")
|
||||
u:add_spell("analyze_magic")
|
||||
u:clear_orders()
|
||||
u:add_order("ZAUBERE \"Runen des Schutzes\" BURG " .. itoa36(b.id));
|
||||
u.building = b
|
||||
u:add_order("ZAUBERE \"Magie analysieren\" BURG " .. itoa36(b.id));
|
||||
process_orders()
|
||||
-- there used to be a SEGFAULT when writing reports here:
|
||||
-- write_reports()
|
||||
end
|
||||
|
|
|
|||
|
|
@ -223,7 +223,9 @@ int curse_read(attrib * a, void *owner, struct storage *store)
|
|||
return AT_READ_FAIL;
|
||||
}
|
||||
c->flags = flags;
|
||||
c_clearflag(c, CURSE_ISNEW);
|
||||
if (global.data_version < EXPLICIT_CURSE_ISNEW_VERSION) {
|
||||
c_clearflag(c, CURSE_ISNEW);
|
||||
}
|
||||
|
||||
if (c->type->read)
|
||||
c->type->read(store, c, owner);
|
||||
|
|
@ -250,7 +252,9 @@ void curse_write(const attrib * a, const void *owner, struct storage *store)
|
|||
unit *mage = (c->magician && c->magician->number) ? c->magician : NULL;
|
||||
|
||||
/* copied from c_clearflag */
|
||||
flags = (c->flags & ~CURSE_ISNEW) | (c->type->flags & CURSE_ISNEW);
|
||||
if (global.data_version < EXPLICIT_CURSE_ISNEW_VERSION) {
|
||||
flags = (c->flags & ~CURSE_ISNEW) | (c->type->flags & CURSE_ISNEW);
|
||||
}
|
||||
|
||||
WRITE_INT(store, c->no);
|
||||
WRITE_TOK(store, ct->cname);
|
||||
|
|
@ -318,6 +322,20 @@ const curse_type *ct_find(const char *c)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
void ct_checknames() {
|
||||
int i, qi;
|
||||
quicklist *ctl;
|
||||
|
||||
for (i = 0; i < 256; ++i) {
|
||||
ctl = cursetypes[i];
|
||||
for (qi = 0; ctl; ql_advance(&ctl, &qi, 1)) {
|
||||
curse_type *type = (curse_type *)ql_get(ctl, qi);
|
||||
curse_name(type, default_locale);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* ------------------------------------------------------------- */
|
||||
/* get_curse identifiziert eine Verzauberung über die ID und gibt
|
||||
* einen pointer auf die struct zurück.
|
||||
|
|
|
|||
|
|
@ -248,47 +248,46 @@ extern "C" {
|
|||
|
||||
void destroy_curse(curse * c);
|
||||
|
||||
bool is_cursed_internal(struct attrib *ap, const curse_type * ctype);
|
||||
/* ignoriert CURSE_ISNEW */
|
||||
bool is_cursed_internal(struct attrib *ap, const curse_type * ctype);
|
||||
|
||||
/* löscht einen konkreten Spruch auf einem Objekt. */
|
||||
bool remove_curse(struct attrib **ap, const struct curse *c);
|
||||
/* löscht einen konkreten Spruch auf einem Objekt.
|
||||
*/
|
||||
|
||||
int curse_geteffect_int(const struct curse *c);
|
||||
float curse_geteffect(const struct curse *c);
|
||||
/* gibt die Auswirkungen der Verzauberungen zurück. zB bei
|
||||
* Skillmodifiziernden Verzauberungen ist hier der Modifizierer
|
||||
* gespeichert. Wird automatisch beim Anlegen eines neuen curse
|
||||
* gesetzt. Gibt immer den ersten Treffer von ap aus zurück.
|
||||
*/
|
||||
int curse_geteffect_int(const struct curse *c);
|
||||
float curse_geteffect(const struct curse *c);
|
||||
|
||||
float curse_changevigour(struct attrib **ap, curse * c, float i);
|
||||
/* verändert die Stärke der Verzauberung um i */
|
||||
float curse_changevigour(struct attrib **ap, curse * c, float i);
|
||||
|
||||
int get_cursedmen(struct unit *u, const struct curse *c);
|
||||
/* gibt bei Personenbeschränkten Verzauberungen die Anzahl der
|
||||
* betroffenen Personen zurück. Ansonsten wird 0 zurückgegeben. */
|
||||
int get_cursedmen(struct unit *u, const struct curse *c);
|
||||
|
||||
/* setzt/loescht Spezialflag einer Verzauberung (zB 'dauert ewig') */
|
||||
void c_setflag(curse * c, unsigned int flag);
|
||||
void c_clearflag(curse * c, unsigned int flags);
|
||||
/* setzt/loescht Spezialflag einer Verzauberung (zB 'dauert ewig') */
|
||||
|
||||
void transfer_curse(struct unit *u, struct unit *u2, int n);
|
||||
/* sorgt dafür, das bei der Übergabe von Personen die curse-attribute
|
||||
* korrekt gehandhabt werden. Je nach internen Flag kann dies
|
||||
* unterschiedlich gewünscht sein
|
||||
* */
|
||||
void transfer_curse(struct unit *u, struct unit *u2, int n);
|
||||
|
||||
struct curse *get_curse(struct attrib *ap, const curse_type * ctype);
|
||||
/* gibt pointer auf die erste curse-struct zurück, deren Typ ctype ist,
|
||||
* oder einen NULL-pointer
|
||||
* */
|
||||
struct curse *get_curse(struct attrib *ap, const curse_type * ctype);
|
||||
|
||||
int find_cursebyname(const char *c);
|
||||
const curse_type *ct_find(const char *c);
|
||||
void ct_register(const curse_type *);
|
||||
/* Regionszauber */
|
||||
void ct_checknames(void);
|
||||
|
||||
curse *cfindhash(int i);
|
||||
|
||||
|
|
@ -303,8 +302,8 @@ extern "C" {
|
|||
int resolve_curse(variant data, void *address);
|
||||
bool is_cursed_with(const struct attrib *ap, const struct curse *c);
|
||||
|
||||
bool curse_active(const struct curse *c);
|
||||
/* gibt true, wenn der Curse nicht NULL oder inaktiv ist */
|
||||
bool curse_active(const struct curse *c);
|
||||
|
||||
/*** COMPATIBILITY MACROS. DO NOT USE FOR NEW CODE, REPLACE IN OLD CODE: */
|
||||
const char *oldcursename(int id);
|
||||
|
|
|
|||
|
|
@ -29,8 +29,9 @@
|
|||
#define BUILDNO_VERSION 344 /* storing the build number in the save */
|
||||
#define AUTO_RACENAME_VERSION 345 /* NPC units with name==NULL will automatically get their race for a name */
|
||||
#define JSON_REPORT_VERSION 346 /* bit 3 in f->options flags the json report */
|
||||
#define EXPLICIT_CURSE_ISNEW_VERSION 347 /* CURSE_ISNEW is not reset in read/write, but in age() */
|
||||
|
||||
#define RELEASE_VERSION JSON_REPORT_VERSION /* current datafile */
|
||||
#define RELEASE_VERSION EXPLICIT_CURSE_ISNEW_VERSION /* current datafile */
|
||||
#define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */
|
||||
#define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */
|
||||
|
||||
|
|
|
|||
|
|
@ -1841,8 +1841,14 @@ static void write_script(FILE * F, const faction * f)
|
|||
fputc('\n', F);
|
||||
}
|
||||
|
||||
static void check_messages_exist(void) {
|
||||
ct_checknames();
|
||||
}
|
||||
|
||||
int init_reports(void)
|
||||
{
|
||||
check_messages_exist();
|
||||
|
||||
prepare_reports();
|
||||
{
|
||||
if (_access(reportpath(), 0) != 0) {
|
||||
|
|
@ -2058,6 +2064,7 @@ static void eval_spell(struct opstack **stack, const void *userdata)
|
|||
const struct spell *sp = (const struct spell *)opop(stack).v;
|
||||
const char *c =
|
||||
sp ? spell_name(sp, f->locale) : LOC(f->locale, "an_unknown_spell");
|
||||
assert(c || !"spell without description!");
|
||||
size_t len = strlen(c);
|
||||
variant var;
|
||||
|
||||
|
|
@ -2071,6 +2078,7 @@ static void eval_curse(struct opstack **stack, const void *userdata)
|
|||
const struct curse_type *sp = (const struct curse_type *)opop(stack).v;
|
||||
const char *c =
|
||||
sp ? curse_name(sp, f->locale) : LOC(f->locale, "an_unknown_curse");
|
||||
assert(c || !"spell effect without description!");
|
||||
size_t len = strlen(c);
|
||||
variant var;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue