Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
11,123 Commits 10 Branches 0 Tags 41 MiB
Commit Graph

138 Commits

Author SHA1 Message Date
Enno Rehling 46b065dd29 BUG 2203: Schattenrichter sind gewichtslos 2017-09-04 20:08:56 +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 8344f41a70 allow GIVE for juju, ghast, skelord, too. 
make the tests nicer.
 2017-07-15 12:28:26 +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 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 b06e93db7a BUG 2317: wyrms in E2 didn't move 2017-04-17 16:50:15 +02: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 44c3838d79 WIP: itype->use elimination. 2017-02-27 04:22:28 +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 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 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 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 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 38721e2046 remove all mention of centaurs from the code and configuration 2016-10-07 19:33:50 +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 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 33701ab891 make describe_braineater more generic (describe_race). 2016-08-28 20:44:45 +01: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 75f2be75d8 remove code for alp (non-functional) 
remove code for removecurse trigger (only used by alp)
 2016-03-25 21:18:57 +01:00
Enno Rehling b646c9e22e duplicate definition of concealing_aura in E3 2016-01-24 11:44:18 +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 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 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 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 6a20345b53 issue #428, fix writing spell description for break_curse 2015-12-06 16:45:31 +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
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 742a30cc39 fix seaserpents 
seaserpents could not do piracy
seaserpents should be able to attack after move
 2015-11-17 12:17:28 +01:00
Steffen Mecke 4ab92e3caf fixed descriptions of spells with parameters (bug #2060+1867) 2015-11-13 00:57:14 +01:00
Philipp Dreher 56aeae4fbe one last, but big, translation... 2015-11-04 00:40:24 +01:00
Enno Rehling 84a92124bd Merge branch 'feature/bug-2053-attack-monsters' of https://github.com/ennorehling/eressea into ennorehling-feature/bug-2053-attack-monsters 
Conflicts:
	conf/e3/config.xml
 2015-09-19 13:35:53 +02:00
Enno Rehling b4971dd651 replace all of the E2 terrains with JSON data (no more XML!) 2015-09-11 22:11:59 +02:00
Enno Rehling 7bb882b15b add a spell for igjarjuk (WIP) 2015-08-30 10:57:08 +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 b8e17839a7 eliminate some spammy warnings. 2015-07-08 18:27:27 +02:00
Enno Rehling c8ffe8da7a Bug 2115: fix cerrdor -> cerddor spelling errors. 2015-07-07 20:30:34 +02:00
Enno Rehling a4774be652 Convert all XML files to UTF-8, to allow editing with Atom. 2015-05-11 16:55:11 -07:00
Enno Rehling 71d0558403 Bug 2089: remove the giveitem restriction from all races. 
https://bugs.eressea.de/view.php?id=2089
 2015-04-19 09:49:52 +02:00
Enno Rehling 7e92e6501c remove the (broken) summon_alp spell, by request 
https://bugs.eressea.de/view.php?id=2086
 2015-04-04 11:02:56 +02:00
Enno Rehling 4b1ac68446 let the snowman give items to other units. 
this fixes https://bugs.eressea.de/view.php?id=1924
 2014-12-14 20:09:43 +01:00
Enno Rehling dd87907566 bugfix: making clones help with upkeep. 
https://bugs.eressea.de/view.php?id=1560
 2014-12-13 23:37:42 +01:00
Enno Rehling acfe72f24e add a test for get_monsters(). 
I want to make sure I don't break this in the future.
 2014-08-20 07:00:58 +02:00
Enno Rehling 9ca206ec3f remove reference to thieves and spies from this spell for non-E2 games. 
this fixes https://bugs.eressea.de/view.php?id=1548
 2014-08-14 07:05:12 +02:00
Enno Rehling 018d4ca38e fix quest keys to work again. 
add a function to walk borders with a callback.
 2014-07-22 10:59:47 +02:00
Enno Rehling d7803eb318 trying to fix the museum. WIP. 2014-07-21 11:13:16 +02:00
Enno Rehling 115d3a8f86 some specialized equipment 2014-06-03 07:35:45 -07:00
Enno Rehling e17a3fc8fa eliminate remaining traces of the wisps spell 2014-06-02 07:22:07 +02:00
Enno Rehling 41c6b13111 familiars with differnt skills for different games 2014-05-10 13:50:16 -07:00
Enno Rehling a485f65562 new config files 2014-04-24 09:14:29 +02:00
Enno Rehling 9f06268acd gray magic needs to contain all of the spells that any monster could cast, so add all of them for now. 2012-05-26 15:48:02 -07:00
Enno Rehling 1ba2ed200b remove spell-levels from XML file, we no longer read these or need these. 2012-05-26 09:41:32 -07:00
Enno Rehling 6482b748c8 remove leveled resources from fixed-level spells 2012-05-25 23:32:03 -07:00
Enno Rehling c3cd519152 specify levels with magic attacks (step one to removing spell->level) 2012-05-24 01:45:13 -07:00
Enno Rehling 1296e45109 fix spellbook data for E2 and E3 2012-05-23 22:24:00 -07:00
Enno Rehling d4d39b43e9 add xml spellbooks for the magic schools in E2 and E3 
this is being read, but not used by the code yet.
 2012-05-23 21:50:59 -07:00
Enno Rehling 2550f7fee3 eressea-pbem.de no longer exists 2012-05-16 13:06:50 -07:00
Enno Rehling ea7eaf87aa spells that have no function in the xml file get one from an array, cleaning up and simplifying that code. 2012-05-09 23:23:40 -07:00
Enno Rehling e5967dd13d these spells need at least one argument 2010-10-02 12:48:09 -07:00
Enno 0f93601454 undo CRLF crazy 2010-08-08 09:40:42 +02:00
Enno Rehling f8094f77dc use libraries from the external folder, don't depend on any additional installations (VS 2010) 2010-08-07 22:53:41 -07:00
Enno Rehling 8a3d1cd219 http://bugs.eressea.de/view.php?id=1751 
fixing spells that need to look for units that the mage cannot see.
 2010-03-22 21:43:46 -07:00
Enno Rehling 412b7addea remove old orcs 
fix give-person test for new rules
 2010-03-22 19:53:45 -07:00
Enno Rehling be729e8856 new rules for morale 
no more uruks (it's all orcs now)
 2010-03-21 23:45:18 -07:00
Enno Rehling c8d6ef2dd2 http://bugs.eressea.de/view.php?id=1749 
added a missing irongolem/stonegolem flag to those races.
 2010-03-14 16:39:12 -07:00
Enno Rehling dd3f204a69 removing and moving to make a clean eressea-only repo 2010-03-06 14:32:20 -08:00