forked from github/server
remove artrewards, they predate my backups
This commit is contained in:
Enno Rehling
parent
2d4b61afa9
commit
25d3aacffa
|
|
@ -1,20 +1,6 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<resource name="instantartsculpture">
|
|
||||||
<function name="change" value="changeitem"/>
|
|
||||||
<item weight="0">
|
|
||||||
<function name="use" value="use_instantartsculpture"/>
|
|
||||||
</item>
|
|
||||||
</resource>
|
|
||||||
|
|
||||||
<resource name="instantartacademy">
|
|
||||||
<function name="change" value="changeitem"/>
|
|
||||||
<item weight="0">
|
|
||||||
<function name="use" value="use_instantartacademy"/>
|
|
||||||
</item>
|
|
||||||
</resource>
|
|
||||||
|
|
||||||
<resource name="aurapotion50">
|
<resource name="aurapotion50">
|
||||||
<function name="change" value="changeitem"/>
|
<function name="change" value="changeitem"/>
|
||||||
<item weight="0">
|
<item weight="0">
|
||||||
|
|
|
||||||
|
|
@ -63,19 +63,6 @@
|
||||||
</item>
|
</item>
|
||||||
</resource>
|
</resource>
|
||||||
|
|
||||||
<!-- art rewards -->
|
|
||||||
<resource name="trappedairelemental">
|
|
||||||
<item weight="0">
|
|
||||||
<function name="use" value="use_trappedairelemental"/>
|
|
||||||
</item>
|
|
||||||
</resource>
|
|
||||||
|
|
||||||
<resource name="hornofdancing">
|
|
||||||
<item weight="0">
|
|
||||||
<function name="use" value="use_hornofdancing"/>
|
|
||||||
</item>
|
|
||||||
</resource>
|
|
||||||
|
|
||||||
<!-- museum items -->
|
<!-- museum items -->
|
||||||
<resource name="questkey1" appearance="key">
|
<resource name="questkey1" appearance="key">
|
||||||
<!-- Key for an old quest. placeholder item -->
|
<!-- Key for an old quest. placeholder item -->
|
||||||
|
|
|
||||||
|
|
@ -356,42 +356,6 @@
|
||||||
<text locale="de">Akademie der Künste</text>
|
<text locale="de">Akademie der Künste</text>
|
||||||
<text locale="en">academy of arts</text>
|
<text locale="en">academy of arts</text>
|
||||||
</string>
|
</string>
|
||||||
<string name="artsculpture">
|
|
||||||
<text locale="de">Skulptur</text>
|
|
||||||
<text locale="en">sculpture</text>
|
|
||||||
</string>
|
|
||||||
<string name="hornofdancing">
|
|
||||||
<text locale="de">Horn des Tanzes</text>
|
|
||||||
<text locale="en">horn of dancing</text>
|
|
||||||
</string>
|
|
||||||
<string name="hornofdancing_p">
|
|
||||||
<text locale="de">Hörner des Tanzes</text>
|
|
||||||
<text locale="en">horns of dancing</text>
|
|
||||||
</string>
|
|
||||||
<string name="instantartacademy">
|
|
||||||
<text locale="de">Miniatur einer Akademie der Künste</text>
|
|
||||||
<text locale="en">academy of arts in a box</text>
|
|
||||||
</string>
|
|
||||||
<string name="instantartacademy_p">
|
|
||||||
<text locale="de">Miniaturen einer Akademie der Künste</text>
|
|
||||||
<text locale="en">academies of arts in a box</text>
|
|
||||||
</string>
|
|
||||||
<string name="instantartsculpture">
|
|
||||||
<text locale="de">Miniatur einer Skulptur</text>
|
|
||||||
<text locale="en">art sculpture in a box</text>
|
|
||||||
</string>
|
|
||||||
<string name="instantartsculpture_p">
|
|
||||||
<text locale="de">Miniaturen einer Skulptur</text>
|
|
||||||
<text locale="en">art sculptures in a box</text>
|
|
||||||
</string>
|
|
||||||
<string name="trappedairelemental">
|
|
||||||
<text locale="de">Gefangener Windgeist</text>
|
|
||||||
<text locale="en">trapped air elemental</text>
|
|
||||||
</string>
|
|
||||||
<string name="trappedairelemental_p">
|
|
||||||
<text locale="de">Gefangene Windgeister</text>
|
|
||||||
<text locale="en">trapped air elementals</text>
|
|
||||||
</string>
|
|
||||||
<string name="aurapotion50">
|
<string name="aurapotion50">
|
||||||
<text locale="de">Auratrank</text>
|
<text locale="de">Auratrank</text>
|
||||||
<text locale="en">aura potion</text>
|
<text locale="en">aura potion</text>
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
<?xml version="1.0" ?>
|
|
||||||
<items>
|
|
||||||
</items>
|
|
||||||
|
|
@ -22,7 +22,6 @@
|
||||||
#include <modules/gmcmd.h>
|
#include <modules/gmcmd.h>
|
||||||
#include <modules/xmas.h>
|
#include <modules/xmas.h>
|
||||||
#include <items/xerewards.h>
|
#include <items/xerewards.h>
|
||||||
#include <items/artrewards.h>
|
|
||||||
#include <items/weapons.h>
|
#include <items/weapons.h>
|
||||||
|
|
||||||
#include <attributes/attributes.h>
|
#include <attributes/attributes.h>
|
||||||
|
|
@ -86,7 +85,6 @@ void game_init(void)
|
||||||
|
|
||||||
register_weapons();
|
register_weapons();
|
||||||
register_xerewards();
|
register_xerewards();
|
||||||
register_artrewards();
|
|
||||||
#ifdef USE_LIBXML2
|
#ifdef USE_LIBXML2
|
||||||
register_xmlreader();
|
register_xmlreader();
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,6 @@ xerewards.test.c
|
||||||
)
|
)
|
||||||
|
|
||||||
SET(_FILES
|
SET(_FILES
|
||||||
artrewards.c
|
|
||||||
demonseye.c
|
demonseye.c
|
||||||
speedsail.c
|
speedsail.c
|
||||||
weapons.c
|
weapons.c
|
||||||
|
|
|
||||||
|
|
@ -1,155 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 1998-2015, Enno Rehling <enno@eressea.de>
|
|
||||||
Katja Zedel <katze@felidae.kn-bremen.de
|
|
||||||
Christian Schlittchen <corwin@amber.kn-bremen.de>
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and/or distribute this software for any
|
|
||||||
purpose with or without fee is hereby granted, provided that the above
|
|
||||||
copyright notice and this permission notice appear in all copies.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
**/
|
|
||||||
|
|
||||||
#include <platform.h>
|
|
||||||
#include "artrewards.h"
|
|
||||||
|
|
||||||
/* kernel includes */
|
|
||||||
#include <kernel/item.h>
|
|
||||||
#include <kernel/pool.h>
|
|
||||||
#include <kernel/region.h>
|
|
||||||
#include <kernel/faction.h>
|
|
||||||
#include <kernel/unit.h>
|
|
||||||
#include <kernel/curse.h>
|
|
||||||
#include <kernel/messages.h>
|
|
||||||
#include <kernel/ship.h>
|
|
||||||
|
|
||||||
/* util includes */
|
|
||||||
#include <util/attrib.h>
|
|
||||||
#include <util/rand.h>
|
|
||||||
|
|
||||||
/* libc includes */
|
|
||||||
#include <assert.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
|
|
||||||
#define HORNRANGE 10
|
|
||||||
#define HORNDURATION 3
|
|
||||||
#define HORNIMMUNITY 30
|
|
||||||
|
|
||||||
static int age_peaceimmune(attrib * a, void *owner)
|
|
||||||
{
|
|
||||||
UNUSED_ARG(owner);
|
|
||||||
return (--a->data.i > 0) ? AT_AGE_KEEP : AT_AGE_REMOVE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static attrib_type at_peaceimmune = {
|
|
||||||
"peaceimmune",
|
|
||||||
NULL, NULL,
|
|
||||||
age_peaceimmune,
|
|
||||||
a_writeint,
|
|
||||||
a_readint
|
|
||||||
};
|
|
||||||
|
|
||||||
static int
|
|
||||||
use_hornofdancing(struct unit *u, const struct item_type *itype,
|
|
||||||
int amount, struct order *ord)
|
|
||||||
{
|
|
||||||
region *r;
|
|
||||||
int regionsPacified = 0;
|
|
||||||
|
|
||||||
for (r = regions; r; r = r->next) {
|
|
||||||
if (distance(u->region, r) < HORNRANGE) {
|
|
||||||
if (a_find(r->attribs, &at_peaceimmune) == NULL) {
|
|
||||||
attrib *a;
|
|
||||||
|
|
||||||
create_curse(u, &r->attribs, ct_find("peacezone"),
|
|
||||||
20, HORNDURATION, 1.0, 0);
|
|
||||||
|
|
||||||
a = a_add(&r->attribs, a_new(&at_peaceimmune));
|
|
||||||
a->data.i = HORNIMMUNITY;
|
|
||||||
|
|
||||||
ADDMSG(&r->msgs, msg_message("hornofpeace_r_success",
|
|
||||||
"unit region", u, u->region));
|
|
||||||
|
|
||||||
regionsPacified++;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ADDMSG(&r->msgs, msg_message("hornofpeace_r_nosuccess",
|
|
||||||
"unit region", u, u->region));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (regionsPacified > 0) {
|
|
||||||
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "hornofpeace_u_success",
|
|
||||||
"pacified", regionsPacified));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
ADDMSG(&u->faction->msgs, msg_feedback(u, ord, "hornofpeace_u_nosuccess",
|
|
||||||
""));
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#define SPEEDUP 2
|
|
||||||
|
|
||||||
static int
|
|
||||||
useonother_trappedairelemental(struct unit *u, int shipId,
|
|
||||||
const struct item_type *itype, int amount, struct order *ord)
|
|
||||||
{
|
|
||||||
curse *c;
|
|
||||||
ship *sh;
|
|
||||||
|
|
||||||
if (shipId <= 0) {
|
|
||||||
cmistake(u, ord, 20, MSG_MOVE);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
sh = findshipr(u->region, shipId);
|
|
||||||
if (!sh) {
|
|
||||||
cmistake(u, ord, 20, MSG_MOVE);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
c =
|
|
||||||
create_curse(u, &sh->attribs, ct_find("shipspeedup"), 20, INT_MAX, SPEEDUP,
|
|
||||||
0);
|
|
||||||
c_setflag(c, CURSE_NOAGE);
|
|
||||||
|
|
||||||
ADDMSG(&u->faction->msgs, msg_message("trappedairelemental_success",
|
|
||||||
"unit region command ship", u, u->region, ord, sh));
|
|
||||||
|
|
||||||
use_pooled(u, itype->rtype, GET_DEFAULT, 1);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int
|
|
||||||
use_trappedairelemental(struct unit *u,
|
|
||||||
const struct item_type *itype, int amount, struct order *ord)
|
|
||||||
{
|
|
||||||
ship *sh = u->ship;
|
|
||||||
|
|
||||||
if (sh == NULL) {
|
|
||||||
cmistake(u, ord, 20, MSG_MOVE);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
return useonother_trappedairelemental(u, sh->no, itype, amount, ord);
|
|
||||||
}
|
|
||||||
|
|
||||||
void register_artrewards(void)
|
|
||||||
{
|
|
||||||
at_register(&at_peaceimmune);
|
|
||||||
register_item_use(use_hornofdancing, "use_hornofdancing");
|
|
||||||
register_item_use(use_trappedairelemental, "use_trappedairelemental");
|
|
||||||
register_item_useonother(useonother_trappedairelemental,
|
|
||||||
"useonother_trappedairelemental");
|
|
||||||
}
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 1998-2015, Enno Rehling <enno@eressea.de>
|
|
||||||
Katja Zedel <katze@felidae.kn-bremen.de
|
|
||||||
Christian Schlittchen <corwin@amber.kn-bremen.de>
|
|
||||||
|
|
||||||
Permission to use, copy, modify, and/or distribute this software for any
|
|
||||||
purpose with or without fee is hereby granted, provided that the above
|
|
||||||
copyright notice and this permission notice appear in all copies.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
||||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
||||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
||||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
||||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
||||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
**/
|
|
||||||
|
|
||||||
#ifndef H_ITM_ARTREWARDS
|
|
||||||
#define H_ITM_ARTREWARDS
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern void register_artrewards(void);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
Loading…
Reference in New Issue