Enno Rehling
d065cbfca7
use_item message with amount instead of usepotion without.
2018-02-17 15:30:38 +01:00
Enno Rehling
96062f6f85
rename p2->lifepotion (WdL)
2018-02-17 10:45:56 +01:00
Enno Rehling
4f63cf12b2
firesword, magical damage
2018-02-07 19:35:24 +01:00
Enno Rehling
5a3978566a
adamantium and laen weapons are magical.
2018-02-07 18:46:31 +01:00
Enno Rehling
1ee6f5444a
finish XInclude removal project.
...
reduce number of XML files for E3.
2018-02-06 21:28:55 +01:00
Enno Rehling
df255b886a
verify xml loading, fix remaining files for e2.
2018-02-06 18:46:28 +01:00
Enno Rehling
434b7ae29e
convert all of E2 to new config loading.
2018-02-05 19:35:15 +01:00
Enno Rehling
da02c1b92e
Use custom URI schemes for config files.
...
TODO: XML files need to be rebased, XIncludes replaced.
2018-02-05 17:46:11 +01:00
Enno Rehling
961c6e0130
delete unused XML files
2018-02-05 17:41:35 +01:00
Steffen Mecke
c6a459c918
fixed typo for sound_out
2018-02-01 11:33:11 +01:00
Enno Rehling
1eaa1e6d84
BUG 2405: use mistletoe to create effect, use effect to flee from battle.
2018-01-21 18:07:49 +01:00
Enno Rehling
787abc90cf
provide more missing messages in test setups.
2018-01-14 11:58:22 +01:00
Enno Rehling
4eb4c61d37
BUG 2387 some tweaks to the first draft.
2018-01-02 20:34:42 +01:00
Enno Rehling
0440fcc11c
bug 2400: magicbag preservation
2017-12-31 13:14:44 +01:00
Enno Rehling
0686e6ceba
bug 2399: %% typo.
2017-12-31 11:57:57 +01:00
Enno Rehling
fc570d2ec7
bug 2402: xmas fix
2017-12-31 11:36:47 +01:00
Enno Rehling
cff4e12fbd
celan up tests, rename test_cleanup -> test_teardown.
2017-12-27 19:58:39 +01:00
Enno Rehling
28252fda7b
bug 2197: fix E3 potion text.
2017-12-26 16:09:15 +01:00
Enno Rehling
e9508d6f8e
bug 2218: make maelstrom curseinfo not be a dupe of spelllinfo.
2017-12-25 21:59:01 +01:00
Enno Rehling
cba452786f
BUG 2396: insect recruit messages fixed, and tests added.
2017-12-22 11:15:17 +01:00
Enno Rehling
714e44cd71
BUG 2392: remove minskill attribute from any weapons.
2017-12-17 10:19:07 +01:00
Enno Rehling
63c066dfe3
BUG 2387: Zauberbeutel braucht kein notlost Attribut.
2017-12-16 20:29:07 +01:00
Enno Rehling
77921a94ba
BUG 1986: Jedes Magiegebiet kann Vertraute rufen.
2017-12-11 19:47:57 +01:00
Enno Rehling
9f391039b5
more bsdstring removal, str_replace, unit tests.
2017-12-11 18:20:21 +01:00
Enno Rehling
b337373bc9
shorten some names, too many messages with the same prefix are inefficient.
2017-10-16 20:38:52 +02:00
Enno Rehling
e2f6ada862
limit equipment names to 15 byte plus nul.
2017-09-18 17:46:26 +02:00
Enno Rehling
455e03fa05
try and make coverity understand the equipment trie.
...
shorten names.
2017-09-17 20:42:43 +02:00
Enno Rehling
46b065dd29
BUG 2203: Schattenrichter sind gewichtslos
2017-09-04 20:08:56 +02:00
Enno Rehling
aa27c91a6e
BUG 2289: Beschreibung "Opfere Kraft"
2017-08-27 17:11:07 +02:00
Steffen Mecke
4fe72b5d28
BUG 2350: read studyspeed correctly and fix orcs
2017-08-01 22:09:57 +02:00
Enno Rehling
3445e376e0
allow GIVE PERSON for undead race, too
2017-07-22 12:36:01 +02:00
Enno Rehling
f8de1bf29e
remove default values from XML (capacity=1)
2017-07-17 16:11:00 +02:00
Enno Rehling
5f463fbc4c
btype->cons->maxsize does not matter if it's not a multi-stage building (castle, watch).
2017-07-17 14:06:25 +02:00
Enno Rehling
3c2754071d
this test fails when btype->maxsize isn't used as a limit for building.
2017-07-17 14:01:08 +02:00
Enno Rehling
f934e4d5e3
remove unused ECF_KEEP_ITEM flag.
2017-07-17 12:31:47 +02:00
Enno Rehling
427d32c9d2
Merge pull request #708 from ennorehling/2331-undead-give
...
BUG 2331: allow GIVE for undead.
2017-07-15 12:44:47 +02:00
Enno Rehling
8344f41a70
allow GIVE for juju, ghast, skelord, too.
...
make the tests nicer.
2017-07-15 12:28:26 +02:00
Enno Rehling
a0afa1f225
Merge pull request #707 from ennorehling/develop
...
BUG 2256: kill the FFL_NEWID flag
2017-07-09 15:50:07 +02:00
Enno Rehling
518db87015
eliminate unused message
2017-07-09 15:41:11 +02:00
Enno Rehling
2107a84b0d
also allow GIVE for ghouls and skeletons.
2017-07-09 15:25:33 +02:00
Enno Rehling
60efb12d70
Zombies koennen Personen gebn
2017-07-09 13:37:46 +02:00
Enno Rehling
bcf103f581
fix raindance_effect message in E2
2017-06-11 15:17:04 +02:00
Enno Rehling
7806f4991f
store calendar configuration nin JSON, not XML.
2017-05-07 17:46:51 +02:00
Enno Rehling
80d696d02a
remove the funcpointer from struct spell.
2017-04-30 22:15:18 +02:00
Enno Rehling
976b23be72
refactor E3 to use the same raindance/harvest spells as E2.
...
only indirect effects are different.
2017-04-30 21:39:08 +02:00
Enno Rehling
bd9968c266
set the callback, remove lua_callspell from XML.
...
WIP: some spells cannot find their lua callback.
2017-04-30 21:38:44 +02:00
Enno Rehling
7a289ceb86
simplify building_taxes, eliminate dead lua callbacks.
2017-04-29 19:21:48 +02:00
Enno Rehling
a313e78de5
move building names from function to construction data.
2017-04-26 21:44:24 +02:00
Enno Rehling
b06e93db7a
BUG 2317: wyrms in E2 didn't move
2017-04-17 16:50:15 +02:00
Enno Rehling
7c680481de
iron golems can build dwarf armor in E3.
2017-04-02 15:43:14 +02:00
Enno Rehling
e72155a563
WIP: reimplemented production modifiers.
...
The system itself seems to work, but some Lua tests are still failing.
2017-04-02 14:43:53 +02:00
Enno Rehling
4115b321b3
add tests for additional (race-related) production rules.
2017-03-30 21:00:35 +02:00
Enno Rehling
e50d5a812e
remove unused error message.
2017-03-30 20:41:17 +02:00
Enno Rehling
f2bb51b3ab
Merge branch 'master' into develop
...
Conflicts:
res/adamantium.xml
res/core/resources/laen.xml
scripts/tests/common.lua
scripts/tests/e2/adamantium.lua
scripts/tests/e2/e2features.lua
scripts/tests/e2/items.lua
scripts/tests/items.lua
src/bind_unit.c
src/economy.test.c
src/kernel/resources.c
src/util/attrib.c
2017-03-26 21:01:21 +02:00
Enno Rehling
e114aa2854
also add +1 when producing adamantium in mines
2017-03-26 20:32:09 +02:00
Enno Rehling
39a5b55753
bugfix? mine grants +1 to laen production.
...
not certain that this is actually a bug.
2017-03-26 17:40:13 +02:00
Enno Rehling
27d66adc74
eliminate duplicate keyword warning
2017-03-18 21:33:47 +01:00
Enno Rehling
beb498d70c
remove leftover code/data for artrewards.
2017-03-16 19:40:51 +01:00
Enno Rehling
b3e929891d
Merge branch 'master' into develop
2017-03-11 07:22:49 +01:00
Enno Rehling
8b9f0f0894
BUG 2307: report mallorn trees as Mallorn in the CR.
...
for legacy compatibility, we cannot call them Mallornbaeume.
2017-03-10 23:18:09 +01:00
Enno Rehling
7022ae05bd
Merge branch 'master' into develop
...
Conflicts:
src/kernel/item.c
src/modules/arena.c
2017-03-06 22:20:22 +01:00
Enno Rehling
4d07782e7d
Merge branch 'master' into develop
...
Conflicts:
scripts/tests/e2/init.lua
scripts/tests/e3/init.lua
src/economy.c
src/economy.test.c
2017-03-06 06:27:31 +01:00
Enno Rehling
cdb65dfd36
Turns out: We did not have a singular form of sapling.
2017-03-05 18:57:28 +01:00
Enno Rehling
aa662e65d2
eliminate R_PERSON hack.
2017-03-05 13:58:11 +01:00
Enno Rehling
caa8159428
eliminate duplicate string definition
2017-03-05 09:52:17 +01:00
Enno Rehling
acfb666539
remove rtype->uget funpointer, and lua callbacks.
...
fix a missing lua_pop that trashed the heap.
2017-03-04 20:59:43 +01:00
Enno Rehling
50bdc71c1b
kill lua_canuse_item and itype->canuse
2017-03-04 17:27:13 +01:00
Enno Rehling
d976ee6f67
special cases, not callbacks, for money and horses.
2017-03-03 19:17:20 +01:00
Enno Rehling
591a5b67d3
add missing files
2017-03-03 16:38:28 +01:00
Enno Rehling
6e8e163099
make item allow/deny XML easier to read, fix code
2017-03-03 09:56:27 +01:00
Enno Rehling
e2e602e7ba
fix off-by-one calendar, bug 2288
2017-03-01 08:28:15 +01:00
Enno Rehling
2eb88c472c
have I bollocksed up the deny/allow rules? looks like it
2017-02-28 14:22:59 +01:00
Enno Rehling
9871d6f23f
remove unused files
2017-02-28 04:03:36 +01:00
Enno Rehling
75ce6fd23a
regaura=1 is default
2017-02-28 03:49:47 +01:00
Enno Rehling
49d8a03eca
remote the item_type.use funpointer.
2017-02-27 20:41:05 +01:00
Enno Rehling
9d09574d5e
enable process_orders to be done in steps.
...
by checking before turn_end(), we can sense temporary attributes and curses on a unit before they age away.
2017-02-27 19:35:14 +01:00
Enno Rehling
1b93c14806
Test E2 items in E2 only.
...
Remove eye of demon (broken item).
2017-02-27 18:50:48 +01:00
Enno Rehling
1a0992e37b
remove remainders of the arena.
...
Auge des Drachens haben noch einige Spieler, darf nicht gelöscht werden.
move item tests to tests/items.lua
2017-02-27 18:21:41 +01:00
Enno Rehling
108501e398
tests for more items
2017-02-27 15:14:52 +01:00
Enno Rehling
60c2f1e807
test the birthday amulet
2017-02-27 14:01:41 +01:00
Enno Rehling
604b574d0f
fix potion-use? need more testing
2017-02-27 11:39:55 +01:00
Enno Rehling
44c3838d79
WIP: itype->use elimination.
2017-02-27 04:22:28 +01:00
Enno Rehling
b8ffc20d87
remove item_useonother callbacks (use is fine).
...
add a test for foolpotion.
2017-02-26 19:54:58 +01:00
Enno Rehling
6e27adb892
remove pointless <resourcelimit/> wrapper from XML.
2017-02-26 14:00:20 +01:00
Enno Rehling
c3b0b9e8b3
fix missing limit-flags.
2017-02-26 13:47:22 +01:00
Enno Rehling
84c6a4b7b5
remove last vestiges of the rm_* material names
2017-02-25 21:25:55 +01:00
Enno Rehling
d039ca2b2e
fix display of sapling and mallornsapling.
...
remove mateiral from XML where it's not needed.
2017-02-25 21:07:13 +01:00
Enno Rehling
25d3aacffa
remove artrewards, they predate my backups
2017-02-24 14:38:08 +01:00
Enno Rehling
2d4b61afa9
the artacademy was E2-only
2017-02-24 14:32:18 +01:00
Enno Rehling
794dae11cf
remove artsculpture and genericbuilding.
...
deal with buildings having an unknown type.
2017-02-24 14:29:14 +01:00
Enno Rehling
bd59271b71
Samen-Definition normalisiert (mit XML/Lua).
...
Tests repariert.
MACHE Samen gibt es in E3 nicht.
2017-02-23 22:30:19 +01:00
Enno Rehling
6ce487e485
MACHE Samen geht in E3 nicht. limited ist unnoetig
2017-02-23 22:19:48 +01:00
Enno Rehling
f06d86007c
seed normalization (broken)
2017-02-23 22:08:16 +01:00
Enno Rehling
5e2903258c
kill old <guard/> element from XML
2017-02-23 14:45:19 +01:00
Enno Rehling
3274065004
reduce complexity of building_protection.
2017-02-22 19:38:46 +01:00
Enno Rehling
bfb5a9b692
set age_unit and name_unit funpointers in rc_create.
...
no more <function/> in XML races.
rename juju-zombie => juju.
2017-02-20 22:07:36 +01:00
Enno Rehling
7e4b0ac717
fix XML file
2017-02-20 21:21:05 +01:00
Enno Rehling
a1dc3dc8e4
remove race.age from XML data (set in rc_create)
2017-02-20 21:19:58 +01:00
Enno Rehling
4bd295e3b2
remove the nearly unused illusion race
2017-02-20 20:42:31 +01:00
Enno Rehling
5ba3d76efb
remove race.init_familiar funpointer
2017-02-20 09:32:03 +01:00
Enno Rehling
04154628e6
remove funpointer for spoils
2017-02-20 09:18:04 +01:00
Enno Rehling
59f87edbb1
remove unused race.move_allowed method
2017-02-20 09:00:48 +01:00
Enno Rehling
ba1fdcce59
remove race.describe funpointer
2017-02-20 07:47:36 +01:00
Enno Rehling
5b52451d9d
remove unused ai.aggression atribute
2017-02-18 19:21:54 +01:00
Enno Rehling
7d5586635e
remove shadowcall spell
2017-02-18 18:24:44 +01:00
Enno Rehling
daa7554361
remove race.precombatspell
2017-02-18 18:14:18 +01:00
Enno Rehling
4ce415be50
BUG 2281: fix maxsize of guard towers.
2017-02-14 20:51:03 +01:00
Enno Rehling
0b3d15f4b3
eliminate unused other_cost parameter.
...
cost of other races is defined by their recruitcost.
2017-02-04 23:46:26 +01:00
Enno Rehling
3b3e39a319
optimization: elf-special "regen.forest" is now a config.
...
this is an E3 feature
eliminates rc.parameters for elves
allows use of a local cached static
2017-02-04 23:21:36 +01:00
Enno Rehling
2be1868ff0
Antiemagiekristall Meldung geht an die Region.
...
Nicht nur an die Partei, die es zaubert.
http://bugs.eressea.de/view.php?id=1987
2017-02-03 21:48:03 +01:00
Enno Rehling
7750297dc2
express race.magres as percentage, not probability (double->int)
2017-02-03 10:57:32 +01:00
Enno Rehling
784a934c47
Fix snotling XML (no recruiting).
2017-02-02 19:17:01 +01:00
Enno Rehling
b08b1544f4
snotling is not a player race
2017-02-02 16:55:07 +01:00
Enno Rehling
30665f874a
fix game_name, remove it from rules
2017-01-22 20:32:54 +01:00
Enno Rehling
9ccaab6516
Korrekte Email-Subject und Adresse, auch im NR.
...
Eliminate crufty per-game strings.
2017-01-22 20:19:32 +01:00
Enno Rehling
aa66e5d39f
remove unused equipment sets (from an unrealized feature).
2017-01-22 19:06:37 +01:00
Enno Rehling
2c6ae9baef
remove ERESSEA keyword from "bad password" message.
2017-01-22 12:43:48 +01:00
Enno Rehling
d29fd96f59
no starting equipment.
...
do not let the addplayer function give equipment.
rename equipment for autoseed.
2017-01-22 08:05:19 +01:00
Enno Rehling
9c69963477
change error message categories.
...
also removing some unused messages and code that supports them.
https://bugs.eressea.de/view.php?id=2270
2017-01-20 22:39:38 +01:00
Enno Rehling
3533291711
remove at_hurting, it was only used by the Temple of Pain, which is no longer in the game.
2016-11-13 18:33:47 +01:00
Enno Rehling
28aa2a56b8
Entferne unbenutztes "Szepter der Tränen".
...
Was für eine saublöde Idee.
2016-11-13 17:49:16 +01:00
Enno Rehling
b9f6a3f620
skillpotion appears as a vial to other players.
...
https://bugs.eressea.de/view.php?id=2254
2016-11-05 19:58:18 +01:00
Enno Rehling
fec9945458
Fixing Bugs 2246 & 2251
...
parse error message for bad orders:
https://bugs.eressea.de/view.php?id=2251
report when TEMP-Units cannot recuit:
https://bugs.eressea.de/view.php?id=2246
2016-11-05 18:20:56 +01:00
Enno Rehling
2c0f708d1b
WIP: remove at_guard, GUARD_TREES and GUARD_MINING
...
TODO: fix tests
TODO: write new guard coverage
2016-10-30 09:18:19 +01:00
Enno Rehling
38721e2046
remove all mention of centaurs from the code and configuration
2016-10-07 19:33:50 +02:00
Enno Rehling
d3efc265c3
calculating income for dragons is no longer hard-coded
2016-10-04 09:14:49 +02:00
Enno Rehling
530e47efae
Tippfehler bei Steinkreis-Weihung.
...
https://bugs.eressea.de/view.php?id=2240
2016-10-01 16:59:19 +00:00
Enno Rehling
cbd1e8c457
Fixing https://bugs.eressea.de/view.php?id=2234
...
remove the MTF_VITAL materials flag.
remove remaining BLD_MAINTAINED vs BLD_WORKING code.
2016-10-01 18:34:38 +02:00
Enno Rehling
37a5954c20
NPC races cannot be recruited (and provide no score).
2016-09-22 20:11:14 +02:00
Enno Rehling
5ccb2c3dc8
remove recruitcost from non-player races.
...
make score not call old_race.
fix orcs don't get scored.
https://bugs.eressea.de/view.php?id=2241
delete some unused race-enums.
delete centaurs.
2016-09-22 18:28:37 +02:00
Enno Rehling
ac4f8d6e7b
make monsters scaring peasants a per-race configuration.
...
reduce the number of old_race calls that monster.c makes.
2016-09-22 09:34:23 +02:00
Enno Rehling
ff83d5108a
remove old_race call form heal_factor
2016-09-22 09:08:02 +02:00
Enno Rehling
a7fbe4901b
eliminate old_race. make the catdragon act like a dragon.
2016-09-19 18:42:14 +02:00
Enno Rehling
6ec99af4d6
mark all three major dragon types as RCF_DRAGON.
...
use RCF_DRGON flag to detemine BP_DRAGON speed.
2016-09-19 15:53:31 +02:00
Enno Rehling
402c19d8fc
dn't warn new player about NMR.
...
newbie info text was no longer valid.
2016-09-11 16:35:55 +02:00
Enno Rehling
3a719226a2
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-09-01 21:55:52 +02:00
Enno Rehling
a75b591784
Fix the nocostbuilding curse description.
...
https://bugs.eressea.de/view.php?id=2232
2016-09-01 20:49:05 +01:00
Enno Rehling
ce7eb9663a
remove dead phoenix feature.
2016-08-29 20:56:00 +01:00
Enno Rehling
4bc8817056
remove a TODO that was ill-advised. The reason that "resources" is a list is that it's built incrementally.
2016-08-29 18:15:20 +01:00
Enno Rehling
ef44a4534e
add a test for copying resources message arguments.
...
my plan is to add a new argument type for arrays of resources with fewer allocations.
2016-08-29 17:31:09 +01:00
Enno Rehling
33701ab891
make describe_braineater more generic (describe_race).
2016-08-28 20:44:45 +01:00
Enno Rehling
a42bd9c3bf
remove the BLD_WORKING flag.
...
it's all about BLD_MAINTAINED now.
fix region.blocked (Lua property).
2016-08-21 20:12:28 +02:00
Enno Rehling
43090e1492
remove any reference to old two-stage maintenance.
...
getting rid of a lot of dead code.
2016-08-21 20:02:20 +02:00
Enno Rehling
901cf97cb2
refactoring the "nocostbuilding" curse.
...
- remove C_NOCOST constant and other baggage
- refactor maintenance a bit
2016-08-21 20:02:19 +02:00
Enno Rehling
238a0e22f2
Merge branch 'test-alliance' of https://github.com/ennorehling/eressea into ennorehling-test-alliance
...
Conflicts:
src/util/CMakeLists.txt
2016-08-08 08:46:09 +02:00
Enno Rehling
e2808eeea9
reqsize defaults to 1.
...
remove default values from xml to make it smaller and simpler.
2016-08-06 13:53:07 +02:00
Enno Rehling
db5b90e80b
clarify building_type.maxsize and add error logging for bug 2221.
...
https://bugs.eressea.de/view.php?id=2221
2016-08-06 13:52:29 +02:00
Enno Rehling
3fa34f8238
Merge pull request #494 from stm2/bug_2193
...
fixed a few typos in E3 spells (bug 2193)
2016-07-08 10:31:39 +02:00
Steffen Mecke
afdd20c4dd
healing potion works once per battle with 100%
2016-06-12 23:23:22 +02:00
Steffen Mecke
eaa94086eb
one more fix
2016-06-12 00:05:19 +02:00
Enno Rehling
61acd40424
Merge pull request #512 from stm2/dragon_growl
...
Dragon growl
2016-06-11 23:16:23 +02:00
Steffen Mecke
c5014fd766
integrated Ennos suggestions for dragon growls
...
Dragons now growl 20% more elegantly!
2016-06-11 13:47:38 +02:00
Enno Rehling
7fd1d3d616
remove ocean from coasts, SEA_REGION is enough
2016-06-10 20:50:22 +02:00
Steffen Mecke
ce312afc95
fix dragon growl for regions with an apostrophe
2016-05-31 01:54:06 +02:00
Enno Rehling
a834c486d9
fix a FIXME: setting default order through config, making test better.
...
this feature is not in use, so all this work is really pointless.
2016-04-09 19:05:28 +02:00
Enno Rehling
be89aaeb83
Merge branch 'master' into develop
...
Conflicts:
src/buildno.h
2016-03-26 22:28:14 +01:00
Enno Rehling
bc8c39f4bb
fix message-crash https://bugs.eressea.de/view.php?id=2199
...
release version 3.8.7
2016-03-26 22:09:21 +01:00
Enno Rehling
75f2be75d8
remove code for alp (non-functional)
...
remove code for removecurse trigger (only used by alp)
2016-03-25 21:18:57 +01:00
Steffen Mecke
e143843b2c
fixed a few typos in E3 spells (bug 2193)
2016-02-28 14:29:53 +01:00
Enno Rehling
b646c9e22e
duplicate definition of concealing_aura in E3
2016-01-24 11:44:18 +01:00
Enno Rehling
4f7b274bf6
Merge branch 'master' into develop
...
Conflicts:
res/core/messages.xml
src/buildno.h
2016-01-01 16:38:57 +01:00
Enno Rehling
4952f212b8
snowglobe error messages. todo: testing (how?)
2015-12-31 14:43:38 +01:00
Philipp Dreher
18f2cc1d70
cosmetic changes to iteminfo of skillpotion
2015-12-29 09:43:30 +01:00
Philipp Dreher
7b2aa821d0
Added iteminfo for snowglobe in DE+EN
2015-12-29 09:42:54 +01:00
Enno Rehling
2aafb841a5
Merge branch 'master' into develop
...
Conflicts:
res/core/messages.xml
scripts/eressea/e3/init.lua
scripts/eressea/xmas.lua
scripts/eressea/xmasitems.lua
src/buildno.h
src/laws.c
2015-12-26 14:46:20 +01:00
Enno Rehling
cf90f8cf93
it's beginning to look a lot like christmas
...
Conflicts:
scripts/eressea/xmas.lua
2015-12-22 18:46:57 +01:00
Enno Rehling
3fd4884584
putting all of the pieces together for the snow globe, with final use implementation still TBD
...
Conflicts:
scripts/eressea/xmasitems.lua
src/laws.c
2015-12-22 18:46:42 +01:00
Enno Rehling
810ad094af
suppress misc warnings in the log file by reorganizing E3 strings and tuning down log levels
2015-12-18 15:13:15 +01:00
Enno Rehling
acab4b3199
Merge branch 'develop' of https://github.com/ennorehling/eressea.git
2015-12-17 20:36:39 +01:00
Enno Rehling
30acc38d53
https://bugs.eressea.de/view.php?id=2174
...
fix terrain type in detectocean message.
2015-12-17 20:36:21 +01:00
Enno Rehling
b700cb5a2c
Merge branch 'develop' of github.com:ennorehling/eressea into develop
2015-12-17 20:21:01 +01:00
Enno Rehling
02b2157fe5
move description from shared file to game-specific file
...
https://bugs.eressea.de/view.php?id=2177
2015-12-17 20:20:48 +01:00
Enno Rehling
a02d71bfef
https://bugs.eressea.de/view.php?id=2176
...
generate the reduced production message before writing reports, so it shows in the CR.
2015-12-17 12:40:22 +01:00
Enno Rehling
cc88f56a26
no optioinal argument
...
http://bugs.eressea.de/view.php?id=2175#c6408
2015-12-15 07:59:55 +01:00
Enno Rehling
18bcf83d9b
Merge pull request #432 from ennorehling/braineaters
...
no natural ac for braineaters
2015-12-10 22:12:38 +01:00
Enno Rehling
d26cd57934
no natural ac for braineaters
2015-12-10 21:59:14 +01:00
Enno Rehling
b854213be6
Merge pull request #429 from ennorehling/develop
...
break_curse spell description error message
2015-12-06 16:53:04 +01:00
Enno Rehling
6a20345b53
issue #428 , fix writing spell description for break_curse
2015-12-06 16:45:31 +01:00
Steffen Mecke
864c875316
fix typo: fiery breath was icy
2015-12-05 22:27:03 +01:00
Enno Rehling
b3e7fa63e0
Merge pull request #396 from stm2/spell_parameters
...
fixed treatment of spell parameters (bug 1867)
2015-12-03 11:04:57 +01:00
Steffen Mecke
9c076ba6b9
fix piracy_cmd for swimmers and flyers
2015-12-01 22:13:20 +01:00
Enno Rehling
4b7cb824bd
Merge branch 'massive_overload' of https://github.com/stm2/server into stm2-massive_overload
...
Conflicts:
src/move.c
src/tests.c
2015-11-27 12:40:17 +01:00
Enno Rehling
6ad5db8e22
Merge pull request #397 from stm2/taxing_message
...
taxing without skill does not fail silently any more
2015-11-26 18:43:57 +01:00
Enno Rehling
c85e489f4f
Merge branch 'monster_leftovers' of https://github.com/stm2/server into stm2-monster_leftovers
...
Conflicts:
src/kernel/unit.c
src/laws.test.c
src/monsters.c
2015-11-25 14:25:42 +01:00
Enno Rehling
f7698d92a9
change how migrant quota is configured for a race, eliminate the related rule caching
2015-11-22 15:53:50 +01:00
Steffen Mecke
a6757ecf9d
Merge branch 'develop' into massive_overload
...
Conflicts:
src/move.test.c
2015-11-19 14:54:14 +01:00
Steffen Mecke
742a30cc39
fix seaserpents
...
seaserpents could not do piracy
seaserpents should be able to attack after move
2015-11-17 12:17:28 +01:00
Enno Rehling
d07f359acb
fix a minor warning, get ready for 3.7 release
2015-11-16 14:12:51 +01:00
Philipp Dreher
1562439ca9
Moved the description of skillpotion to another namespace
...
Skillpotion isn't actually defined as a potion (or part of the
alchemy-system), therefore the description needs to be moved to the
namespace "iteminfo" to be found.
2015-11-16 03:22:19 +01:00
Steffen Mecke
3a18384ddb
overfull ships do not drift but take damage
...
http://bugs.eressea.de/view.php?id=2157
removed exploit:
ships more than 2 times over their ship type's capacity do not drift but take 30% to 100% damage
2015-11-15 12:43:05 +01:00
Steffen Mecke
493b45c832
taxing without skill does not fail silently any more
...
http://bugs.eressea.de/view.php?id=2158
added configuration parameter for tax per level
2015-11-14 15:36:14 +01:00
Steffen Mecke
4ab92e3caf
fixed descriptions of spells with parameters (bug #2060+1867)
2015-11-13 00:57:14 +01:00
Enno Rehling
4eb4ff40ac
https://bugs.eressea.de/view.php?id=2155
...
monsters do not attack units inside a castle or watch
dragons do not attack guards
2015-11-11 14:36:56 +01:00
Enno Rehling
5aa5d52022
Merge pull request #362 from TurnerSE/bug/#2104
...
ohne die alle gelesen zu haben, akzeptiere ich das mal. Ist auf jeden Fall besser als keine Beschreibung, da bin ich sicher.
2015-11-04 07:45:00 +01:00
Philipp Dreher
56aeae4fbe
one last, but big, translation...
2015-11-04 00:40:24 +01:00
Philipp Dreher
42d0a1beef
more spells translated
2015-11-03 22:43:26 +01:00
Philipp Dreher
d6bcc8345b
translated some more spells
2015-11-03 16:41:57 +01:00
Philipp Dreher
8d70a07901
added english descriptions for a few spells
2015-11-03 13:22:44 +01:00
Enno Rehling
0b00bfecdf
Merge pull request #342 from TurnerSE/bug/CID22449
...
Bug/cid22449
2015-11-02 15:55:44 +01:00
Philipp Dreher
153db447de
removed obsolete messages
2015-11-02 13:09:45 +01:00