Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Entferne unbenutztes "Szepter der Tränen". 

Was für eine saublöde Idee.
This commit is contained in:
Enno Rehling 2016-11-13 17:49:16 +01:00
parent 29d072a186
commit 28aa2a56b8
4 changed files with 0 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/core/common/items.xml
View File

@ -135,12 +135,6 @@
</item>
</resource>
<resource name="wand_of_tears">
<item notlost="yes" weight="0">
<function name="use" value="use_wand_of_tears"/>
</item>
</resource>
<resource name="catapultammo">
<item weight="1000">
<construction skill="quarrying" minskill="3">

13
res/core/de/strings.xml
View File

@ -235,11 +235,6 @@
einzige Vorteil ihrer geringen Größe ist, dass sie sich leichter
verstecken kann.</text>
</string>
<string name="wand_of_tears">
<text locale="de">Dieses magische Szepter, ein Geschenk Igjarjuks, sorgt für große
Verwirrung und Gedächtnisverlust. Syntax: BENUTZE "Szepter der
Tränen"</text>
</string>
<string name="speedsail">
<text locale="de">Setzt eine Einheit dieses Segel auf einem Schiff, so erhöht
sich dessen Reichweite permanent um 1 Region.</text>
@ -1614,14 +1609,6 @@
<string name="presspass_p">
<text locale="de">Akkreditionen des Xontormia-Expreß</text>
</string>
<string name="wand_of_tears">
<text locale="de">Szepter der Tränen</text>
<text locale="en">wand of tears</text>
</string>
<string name="wand_of_tears_p">
<text locale="de">Szepter der Tränen</text>
<text locale="en">wands of tears</text>
</string>
<string name="snowball">
<text locale="de">Schneeball</text>
<text locale="en">snowball</text>

15
res/core/messages.xml
View File

@ -1253,14 +1253,6 @@
<text locale="en">"$unit($unit) dies from poison damage taken in $region($region)."</text>
</message>
<message name="wand_of_tears_usage" section="events">
<type>
<arg name="unit" type="unit"/>
</type>
<text locale="de">"$unit($unit) schwenkt sein Szepter und sorgt für Verwirrung und Chaos in der Region."</text>
<text locale="en">"$unit($unit) waves their scepter and causes chaos and confusion in the region."</text>
</message>
<message name="find_manual" section="events">
<type>
<arg name="unit" type="unit"/>
@ -1573,13 +1565,6 @@
<text locale="de">"$unit($mage) konnte $int($amount) $if($eq($amount,1),"Bauer","Bauern") anwerben."</text>
<text locale="en">"$unit($mage) managed to recruit $int($amount) $if($eq($amount,1),"peasant","peasants")."</text>
</message>
<message name="wand_of_tears_effect" section="events">
<type>
<arg name="unit" type="unit"/>
</type>
<text locale="de">"Ein bohrender Schmerz durchzuckt $unit($unit), Verwirrung macht sich breit."</text>
<text locale="en">"Pain pulses through $unit($unit), confusion spreads."</text>
</message>
<message name="cryinpain" section="events">
<type>
<arg name="unit" type="unit"/>

30
src/modules/arena.c
View File

@ -181,35 +181,6 @@ enter_arena(unit * u, const item_type * itype, int amount, order * ord)
return 0;
}
/***
** Szepter der Tränen, Demo-Item
***/
static int
use_wand_of_tears(unit * user, const struct item_type *itype, int amount,
order * ord)
{
int n;
unused_arg(ord);
for (n = 0; n != amount; ++n) {
unit *u;
for (u = user->region->units; u; u = u->next) {
if (u->faction != user->faction) {
int i;
for (i = 0; i != u->skill_size; ++i) {
if (rng_int() % 3)
reduce_skill(u, u->skills + i, 1);
}
ADDMSG(&u->faction->msgs, msg_message("wand_of_tears_effect",
"unit", u));
}
}
}
ADDMSG(&user->region->msgs, msg_message("wand_of_tears_usage", "unit", user));
return 0;
}
/**
* Tempel der Schreie, Demo-Gebäude **/
@ -556,7 +527,6 @@ void create_arena(void)
void register_arena(void)
{
at_register(&at_hurting);
register_item_use(use_wand_of_tears, "use_wand_of_tears");
register_function((pf_generic)enter_arena, "enter_arena");
register_function((pf_generic)leave_arena, "leave_arena");
tt_register(&tt_caldera);