Enno Rehling
|
66d8e3c7ba
|
fix linux build, kill invalid assert
|
2015-08-27 16:23:30 +02:00 |
|
Enno Rehling
|
de808bf146
|
change effskill signature to take a region, change eff_skill to work on a skill * to avoid multiple lookups.
|
2015-08-27 16:16:55 +02:00 |
|
Enno Rehling
|
6889cb0c80
|
remove superfluous argument from herbsearch
use effskill, not eff_skill
|
2015-08-27 14:46:08 +02:00 |
|
Enno Rehling
|
71dea1eca7
|
backfill missing tests for herbsearch (alchemy).
|
2015-08-27 13:19:58 +02:00 |
|
Enno Rehling
|
eb26cc971f
|
Testing bufunit with skills and different viewers.
|
2015-08-26 21:19:14 +02:00 |
|
Enno Rehling
|
bc1c3dd712
|
move NEWATSROI out of item_modification
|
2015-08-26 19:59:11 +02:00 |
|
Enno Rehling
|
f5f24cc7aa
|
Merge pull request #280 from ennorehling/feature/bug-2131-familiar-skillbonus
Bug 2131: familiar skillbonus stopped working
|
2015-08-26 08:50:49 +02:00 |
|
Enno Rehling
|
c5f4d213ce
|
test familiar/mage connection and ageing of same.
|
2015-08-26 08:42:45 +02:00 |
|
Enno Rehling
|
b27f0787a8
|
test familiar skill bonus
|
2015-08-26 08:36:25 +02:00 |
|
Enno Rehling
|
4dee1744a2
|
write some tests around effskill and skillmod.
|
2015-08-26 08:22:51 +02:00 |
|
Enno Rehling
|
5fc1587879
|
age_unit accidentally returned AT_AGE_REMOVE (caused by a recent change to curse_age)
|
2015-08-25 22:50:58 +02:00 |
|
Enno Rehling
|
9586d970e8
|
fix bad castorder creation for combat spell (some unions are the WORST)
|
2015-08-22 18:51:10 +02:00 |
|
Enno Rehling
|
dd667aa752
|
cursed factions get to fight a wolfhowl if they attack (WIP)
|
2015-08-22 17:56:36 +02:00 |
|
Enno Rehling
|
4c32fe19ee
|
eliminate some dead code that was still marked with TODO.
|
2015-08-21 10:54:09 +02:00 |
|
Enno Rehling
|
89bc83c4ab
|
Merge branch 'master' into develop
Conflicts:
src/bind_region.c
src/buildno.h
src/kernel/item.c
|
2015-08-20 16:58:07 +02:00 |
|
Enno Rehling
|
d69bf18e23
|
suspect some submodule shenanigans
|
2015-08-20 16:26:32 +02:00 |
|
Enno Rehling
|
853290413f
|
fix segfault, disable intermittent test
|
2015-08-20 16:18:15 +02:00 |
|
Enno Rehling
|
f12454870f
|
fix segfault, disable intermittent test
|
2015-08-20 16:17:19 +02:00 |
|
Enno Rehling
|
dfb0bcaccf
|
Merge branch 'master' into develop
Conflicts:
src/buildno.h
src/kernel/save.c
src/laws.c
|
2015-08-20 15:49:36 +02:00 |
|
Enno Rehling
|
1641e6ef89
|
remove spellbook repair code, we are done
|
2015-08-20 15:09:38 +02:00 |
|
Enno Rehling
|
ecd023f7ac
|
Merge pull request #279 from ennorehling/hotfix/3-5-5-spellevels-bug-2129
version 3.5.5: fixing the spellbook desaster
|
2015-08-20 13:10:01 +02:00 |
|
Enno Rehling
|
469701a6ff
|
fix linux build
|
2015-08-20 12:56:33 +02:00 |
|
Enno Rehling
|
8716e5fdc5
|
repair spellbooks that broke in E3 and E4 (temporary measure, remember to remove this code).
|
2015-08-20 12:13:09 +02:00 |
|
Enno Rehling
|
ff38d8bf4c
|
I don't think it's good to call update_spells before the turn.
one should only have the spells that are in the previous week's report.
a few comments wouldn't hurt.
|
2015-08-20 12:12:17 +02:00 |
|
Enno Rehling
|
e6eb53c864
|
save the faction.max_spelllevel in the data file, do not recalculate it each time.
when recalculating it, include spellbook to determine max-level (dead mages may have pushed the level up).
|
2015-08-19 19:43:47 +02:00 |
|
Enno Rehling
|
e5ffd50b4f
|
Merge pull request #278 from ennorehling/feature/bug-2128-travelthru-split
Bug 2128: Durchreisemeldugnen im NR sind zu lang
|
2015-08-19 16:16:10 +02:00 |
|
Enno Rehling
|
fc308940b5
|
fix linux build
|
2015-08-19 14:50:24 +02:00 |
|
Enno Rehling
|
a9ecd1f55e
|
replace all at_travelunit code with travelthru_map calls.
welcome to callback hell.
this should stop the buffer for travelthru from running over.
tests for this should be hell, and I still owe writing them.
|
2015-08-19 14:37:51 +02:00 |
|
Enno Rehling
|
ebe365fd6e
|
move travelthru logic to a separate module. todo: split off the report writing from the collection of units.
|
2015-08-18 18:57:04 +02:00 |
|
Enno Rehling
|
1f4c8d5858
|
fix linux build, missing include
|
2015-08-18 17:28:07 +02:00 |
|
Enno Rehling
|
5bc4f7f144
|
add some simple tests for writing travelthru information to the report, fix test that sets errno as a side effect (thanks, Microsoft!)
|
2015-08-18 17:08:02 +02:00 |
|
Enno Rehling
|
a91e4c6e71
|
Merge pull request #277 from ennorehling/feature/bug-2128-travelthru-length
refactoring: wrptr takes an int, not a size_t
|
2015-08-18 10:26:56 +02:00 |
|
Enno Rehling
|
c8cbeea660
|
STRLCPY macro redefinition and fixes for gcc. work for monkeys.
|
2015-08-17 22:48:21 +02:00 |
|
Enno Rehling
|
681697fd47
|
gcc still more picky than clang.
|
2015-08-17 20:32:02 +02:00 |
|
Enno Rehling
|
e621b97465
|
Easy pratfall: Visual Studio includes limits.h through stdlib.h, but gcc/clang do not.
|
2015-08-17 20:22:02 +02:00 |
|
Enno Rehling
|
1042c94fd9
|
quickly fix gcc conversion warnings. lots of DRY.
|
2015-08-17 20:17:02 +02:00 |
|
Enno Rehling
|
b999e3c963
|
replace strlcpy/wrptr pairs with new STRLCPY macro.
|
2015-08-17 19:37:02 +02:00 |
|
Enno Rehling
|
7e64f3177d
|
refactoring: rewrite tests to use test_find_messagetype instead of assert_messages.
tests: add cleanup of message_types to reduce global state.
|
2015-08-17 19:36:28 +02:00 |
|
Enno Rehling
|
1806030baa
|
new all-in-one strlcpy and wrptr function
|
2015-08-17 19:28:05 +02:00 |
|
Enno Rehling
|
dcececf4fa
|
Debug: move errno testing closer to the report-writing, so we know which report caused the error.
Fix: wrptr gets the result from _snprintf, which is int, not size_t.
|
2015-08-17 16:17:08 +02:00 |
|
Enno Rehling
|
df5eaa6ef2
|
eliminate warning (unused variable)
|
2015-08-16 19:55:11 +02:00 |
|
Enno Rehling
|
681e2f8bce
|
increase monster-attack chance in E3 to 10%
|
2015-08-16 16:20:40 +02:00 |
|
Enno Rehling
|
b50c1720cf
|
several monster_attack fixes.
1. do not try to attack other monsters.
2. monsters outside of a building can attack units outside of buildings.
3. dragons can guard without weapons.
|
2015-08-16 16:18:59 +02:00 |
|
Enno Rehling
|
09dc31f986
|
Merge pull request #276 from ennorehling/feature/bug-2007-report-final-battle
Bug 2007: show battles in final report
|
2015-08-16 12:20:42 +02:00 |
|
Enno Rehling
|
3fe0e62105
|
do not remove battles from dead faction before writing the report.
|
2015-08-16 12:06:05 +02:00 |
|
Enno Rehling
|
9dbcbe4e65
|
Merge pull request #275 from ennorehling/feature/bug-2073-duplicate-section
bug 2073: duplicate message sections in the report
|
2015-08-16 11:36:40 +02:00 |
|
Enno Rehling
|
27b5588e8f
|
Merge region messages and individual messages before writing them into the report.
This fixes https://bugs.eressea.de/view.php?id=2073
|
2015-08-16 11:30:44 +02:00 |
|
Enno Rehling
|
711bd81cc7
|
Merge pull request #274 from ennorehling/feature/bug-2116-password-message
Bug 2116: Make sure Magellan can read the password from the first report
|
2015-08-15 20:31:05 +02:00 |
|
Enno Rehling
|
47dccc667b
|
Add a message that contains the password in the first report, so Magellan can pick it up.
Fix a bad type conversion when setting skills.
|
2015-08-15 20:25:36 +02:00 |
|
Enno Rehling
|
16e922c334
|
Merge pull request #273 from ennorehling/feature/fix-bad-spell-tests
managed to commit some broken tests, and travis let them pass.
|
2015-08-07 18:36:34 +02:00 |
|