3fde10d9e8
Configurable monster attack chance, default to 40%.
...
E3 chance to attack is only 10%.
2014-08-19 15:24:30 +02:00
59ccf23db6
Repair MAKE, which broke when I changed MAKE TEMP.
...
You can now also write MAKETEMP as one word, and we treat it that way.
Added unit test coverage for MAKE order parsing.
2014-08-17 14:47:39 +02:00
99124f3d6d
Merge branch 'master' of https://github.com/eressea/server
2014-08-17 07:37:50 +02:00
b385bfc4d2
Merge branch 'fixes-891'
...
Conflicts:
src/kernel/faction.c
2014-08-17 07:23:07 +02:00
138a4c10a0
properly create missing monster faction when spawning dragons.
...
remove cached monster faction (static).
Conflicts:
src/kernel/faction.c
2014-08-17 07:14:47 +02:00
cef068fe9b
cut the number of allocations for order-data in half.
...
started writing a test file for orders.
2014-08-16 23:26:31 +02:00
8803a9e9a8
properly create missing monster faction when spawning dragons.
2014-08-16 13:46:34 +02:00
90ec28fed3
fix missing monster factions.
2014-08-16 13:33:47 +02:00
fa52bb4192
pointless assert triggers when new units are created and placed.
...
spawning dragons was causing this to fail.
2014-08-16 13:19:00 +02:00
9587e9f0cd
remove unused variables
2014-08-16 12:02:45 +02:00
2fd085d1e5
Merge branch 'master' of https://github.com/eressea/server
2014-08-16 11:59:20 +02:00
c79dd33bfb
smarter processing of MAKE TEMP.
...
the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state.
2014-08-16 11:41:19 +02:00
41d42fa248
localization of alliance status "ALL".
...
fix for https://bugs.eressea.de/view.php?id=1993
2014-08-16 03:07:37 +02:00
61ebd1d6b7
fix accidental assignment instead of comparison.
2014-08-14 20:08:29 +02:00
fa0c999d3e
Merge branch 'Bug-1525-and-1872' of github.com:CTD1/eressea-server-bugfixing into CTD1-Bug-1525-and-1872
2014-08-14 20:06:14 +02:00
158d4f8d4b
MSVC: compile cleanly with level 4 warnings
2014-08-14 19:39:45 +02:00
7dd86959a9
Bewegung durch Region blockieren
...
Etwas größerer Umbau. Befreundete Wachen erlauben nicht mehr automatisch
die Durchreise. Es werden sowohl die Befreundeten als auch die
Feindlichen Bewacher in der Region gezählt, und die Differenz mit
rules.guard.guard_number_stop_prob multipliziert. Bei 700 Feindlichen
und keinen freundlichen Wachen ist die Chance dann 100%. Bei 100
Feindlichen und 400 freundlichen ist sie 0.
Zusätzlich gibt rules.guard.castle_stop_prob 10% pro Burgenlevel für den
Burgenbesitzer.
rules.guard.region_type_stop_prob gibt 10% für Regionen mit weniger
Begehbaren Pfaden (Berge und Vulkane) und das doppelte für sehr schwer
passierbare Regionen (Sümpfe und Gletscher).
Für Spiele mit Wahrnehmung (E2) sollten die Werte für:
rules.guard.skill_stop_prob
rules.guard.castle_stop_prob
rules.guard.region_type_stop_prob
auf 5% Angepasst werden.
2014-08-14 12:37:59 +02:00
ff73358b9c
Some tiny errors that slipped through Visual Studio's warnings.
2014-08-14 09:59:33 +02:00
dafe71f4b8
micro optimizations.
...
removing a lot of mallocs through strdup by replacing getcommand calls with get_command, which takes a buffer. only one left.
removing mkname calls with a static buffer for keyword-tokens.
commit the schema file I had lying around.
2014-08-14 09:57:05 +02:00
38352ef3bf
add the build number to saves.
...
this should make future debugging sessions easier, telling us what bugs were or were not fixed at the time of an incident.
added a test to make sure data file can be read/written, and at a minimum, sets global data-version.
also clean up test framework a bit, and introduce a helpful macro.
2014-08-14 05:06:36 +02:00
b6f627a5d8
Merge branch 'Feature-1865' of github.com:CTD1/eressea-server-bugfixing into CTD1-Feature-1865
...
Conflicts:
src/economy.c
2014-08-13 19:44:57 +02:00
3c2ae7ca93
preview script and logging cleanup
...
1. all log messages will be terminated with \n, whether the user provided
it or not.
2. remove a bunch of print() calls from scripts to reduce clutter
3. replace printf calls with log_* calls to reduce clutter
4. add the new release preview script
2014-08-11 12:04:12 +02:00
45a16681c4
logic fix for FOLLOW (if we are not following a ship, and cannot see the target unit, then exit).
2014-08-08 18:18:17 +02:00
fe0ff71aa1
E2 fähig gemacht
...
Der Burgenbesitzer sieht nur noch etwas wenn er auch Leuchtturmbesitzer
ist.
Das geht jetzt auch für E2 ohne region_owner rule.
2014-08-08 17:15:12 +02:00
90cf6d845f
replace strstr
...
Neu Funktion check_param die überprüft ob ein übergebener Wert in dem
Wert des entsprechenden Parameters steht.
2014-08-08 13:29:26 +02:00
8dd4b783b1
fix gcc error
2014-08-08 01:26:35 +02:00
3767957caa
indentation + whitespace changes
2014-08-08 01:24:12 +02:00
1918f56990
indentation + whitespace changes
2014-08-08 01:16:35 +02:00
bf4bda36a2
Bug 1610 FOLGE SCHIFF und andere lange Befehle
...
FOLGE SCHIFF ist genau wie FOLGE EINHEIT jetzt ein Halblanger Befehl.
Das ist konsequent und entfernt an einigen Stellen Spezialbehandlungen.
2014-08-08 01:14:58 +02:00
f33de38812
Piraterie repariert
...
Die Piraten sind oftmals einfach in ein falsches (leeres) Ozeanfeld
gesegelt, wenn es irgendwo ein Opfer gab.
2014-08-08 01:14:57 +02:00
0d0aad593a
Abtreiben Unabhänig von Wahrnehmung
...
Der Kapitän sollte den Leuchtturm auch sehen, wenn das Besitzer mangels
genug Wahrnehmung das Schiff nicht sieht. Sprich der Sturmschutz des
Leuchtturm hängt jetzt nicht mehr vom Wahrnehmungstalent der Insassen
sondern nur noch von der Größe des Leuchtturms ab, und davon ob der
Unterhalt bezahlt wurde.
sail() ruft als einzige Funktion check_leuchtturm() ohne Partei auf,
daher der einfach Check ob eine Partei übergeben wurde oder nicht.
2014-08-08 01:14:56 +02:00
549a4fbe5b
Bug 1857 abtreiben trotz leuchtturmüberwachung e2
...
Leuchttürme verhindern nicht das Abtreiben sondern reduzieren nur die
Chance auf 1/3.
Das ist für Automatisierung schlecht, daher Reduzieren Leuchttürme das
Abtreiben jetzt auf 0.
Für E4 oder zukünftige Spiele habe ich das auch gleich konfigurierbar
gemacht.
rules.lighthous.stormchancedevisor gibt den Wert an durch den die
Sturmchance geteilt wird, 0 = kein Abtreiben wenn Leuchtturm in
Reichweite.
2014-08-08 01:14:55 +02:00
13ba2b8362
Merge pull request #24 from CTD1/Bug-1610
...
Bug 1610 FOLGE SCHIFF und andere lange Befehle
2014-08-08 01:11:31 +02:00
1470b56253
Merge pull request #23 from CTD1/Piraterie
...
Piraterie repariert
2014-08-08 01:06:49 +02:00
cad82999d0
Merge pull request #22 from CTD1/Bug-1857
...
Bug 1857 abtreiben trotz leuchtturmüberwachung e2
2014-08-08 01:00:59 +02:00
b3a58c6a43
fix tabs
2014-08-08 00:37:51 +02:00
500e24d71e
Merge pull request #18 from CTD1/Bug-1938
...
Bug 1938 [E3] Magiepatzer kaputt (auraverlust statt kostensteigerung)!
2014-08-08 00:36:36 +02:00
c49c3af1d9
Bug 1610 FOLGE SCHIFF und andere lange Befehle
...
FOLGE SCHIFF ist genau wie FOLGE EINHEIT jetzt ein Halblanger Befehl.
Das ist konsequent und entfernt an einigen Stellen Spezialbehandlungen.
2014-08-07 18:53:29 +02:00
7ac56b3fbf
Piraterie repariert
...
Die Piraten sind oftmals einfach in ein falsches (leeres) Ozeanfeld
gesegelt, wenn es irgendwo ein Opfer gab.
2014-08-07 16:02:47 +02:00
906dd457fc
Abtreiben Unabhänig von Wahrnehmung
...
Der Kapitän sollte den Leuchtturm auch sehen, wenn das Besitzer mangels
genug Wahrnehmung das Schiff nicht sieht. Sprich der Sturmschutz des
Leuchtturm hängt jetzt nicht mehr vom Wahrnehmungstalent der Insassen
sondern nur noch von der Größe des Leuchtturms ab, und davon ob der
Unterhalt bezahlt wurde.
sail() ruft als einzige Funktion check_leuchtturm() ohne Partei auf,
daher der einfach Check ob eine Partei übergeben wurde oder nicht.
2014-08-07 14:37:49 +02:00
37e0226e5b
Bug 1857 abtreiben trotz leuchtturmüberwachung e2
...
Leuchttürme verhindern nicht das Abtreiben sondern reduzieren nur die
Chance auf 1/3.
Das ist für Automatisierung schlecht, daher Reduzieren Leuchttürme das
Abtreiben jetzt auf 0.
Für E4 oder zukünftige Spiele habe ich das auch gleich konfigurierbar
gemacht.
rules.lighthous.stormchancedevisor gibt den Wert an durch den die
Sturmchance geteilt wird, 0 = kein Abtreiben wenn Leuchtturm in
Reichweite.
2014-08-07 14:04:03 +02:00
8b9f344484
Fixing server crash
...
Mit rules.region_owner_pay_building ein kann es vorkommen, das wegen
einem leeren Gebäude die größte Burg in der Region gesucht wird. Wenn es
aber keine Burg in der Region gibt, wird building_owner mit NULL
aufgerufen. Das musste abgefangen werden.
2014-08-07 11:24:55 +02:00
405c63f447
this old race alias stuff has been dead code for years.
2014-08-06 23:44:47 +02:00
afd41286b5
config file reading based on game name and install location.
2014-08-03 20:37:05 +02:00
51356b061c
Feature 1865 leere unterhaltspflichtige Gebäude
...
Gebäude ohne Besitzer werden automatisch vom Regionsbesitzer übernommen
(Die Einheit wird sozusagen der neue Gebäudebesitzer). Betreten dann nur
noch wenn Helfe Bewache vom Regionsbesitzer.
Wichtig:
<param name="rules.region_owners" value="1"/>, ist Voraussetzung, es
geht also nicht in E2.
Es kann für beliebige Gebäude eingeschaltet werden.
Example config :
<param name="rules.region_owner_pay_building" value="market harbour
lighthouse"/>
2014-08-01 16:13:35 +02:00
8aa356df75
Bug 1938 [E3] Magiepatzer kaputt (auraverlust statt kostensteigerung)!
...
Erst Bezahlen, dann Patzer. Sonst werden die Kosten im Falle des
"kleinsten" Patzers noch beim aktuellen Spruch erhöht.
2014-07-28 15:38:39 +02:00
bd2809a975
removing the core directory (moving to res and scripts).
...
it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags.
2014-07-28 14:27:30 +02:00
d994caf7a3
Merge branch 'master' of https://github.com/eressea/server
2014-07-26 22:52:31 +02:00
d9457a2488
rewrite of the Lua module system.
...
At this time, only E2 is working.
Fixing a lot of old code (monster is no longer id 0).
package.paths configured from eressea.ini
install directory configured from eressea.ini
moving building_action into a seaprate module (it's deprecated)
2014-07-26 22:52:25 +02:00
955a57273d
code review changes
2014-07-24 08:04:30 +02:00
10e08ab306
Merge pull request #14 from CTD1/master
...
Bug 1755 Beschworene Skelette mit Ausdauerproblemen
2014-07-24 07:58:50 +02:00
2bec7e2bbe
save game id in the data file, not name of XML file
2014-07-23 11:54:51 +02:00
018d4ca38e
fix quest keys to work again.
...
add a function to walk borders with a callback.
2014-07-22 10:59:47 +02:00
13165f2354
Move quest objects to the module that uses them (museum portals).
2014-07-21 11:34:57 +02:00
e44d4aa9b9
implemented a suggested change to RESERVE.
...
http://bugs.eressea.de/view.php?id=1675#c5240
new setting "rule.reserve.twophase" reserves from self first, before reserving from others.
fix a crash when trying to flush logs and there is no logfile.
2014-07-20 06:19:21 +02:00
4cfa1ec7c3
Bug 1755 Beschworene Skelette mit Ausdauerproblemen
...
Sowohl Beschworenen Untote als auch Monster (Drachen, für Monster-Untote
war es Ok) hatten keine Anpassung ihrer Max-HP nach der Zuweisung von
Skills.
2014-07-18 13:15:18 +02:00
ae238799b4
Merge pull request #12 from CTD1/master
...
Bugfix http://bugs.eressea.de/view.php?id=2009
2014-07-17 15:11:00 +02:00
1500bcac70
REKRUTIERE RASSE funktioniert nicht (Bug 2012)
...
http://bugs.eressea.de/view.php?id=2012
init_locales must not be called before races have been configured.
make jsonconf initialize translations
handle missing strings in translations, log errors.
2014-07-17 14:38:56 +02:00
5e2c5657bd
Falscher Magischer Beutel bei Gewichtsberechnung
...
Bei der Änderung
92f43a7b51
2014-07-17 12:59:47 +02:00
3bd63955a2
Klammern vergessen
2014-07-16 10:28:32 +02:00
700a88fd79
Umlaute in Kommentaren
...
sind doof.
2014-07-15 15:46:02 +02:00
6987c61d97
Bug 0002014: Zwergenausrüstung kann nicht hergestellt werden
...
Nicht auf die Fraction Rasse checken, (die ist normalerweise Halbling, kann aber auch Zwerg sein wenn mit der Starteinheit eigenartige Dinge gemacht wurden) sondern ob der Hersteller eine Zwergen oder Golem ist.
Da Zwergensachen nur von Zwergen benutzt werden können, stellt es keinen Vorteil für andere Völker da wenn sie über Golems Zwergensachen machen können.
2014-07-15 15:34:42 +02:00
38a754844e
BUG 0001980: Gegener hält Burg obwohl alle geflohen sind!
...
http://bugs.eressea.de/view.php?id=1980
Der Test unten erzeugt eine Temp-Einheit welche nach dem Kampf die Burg hält, trotz einer vernichtenden Niederlage innerhalb von 2 Kampfrunden. Der Angreifer darf die Burg zwar betreten, bekommt aber nicht das Kommando.
Grund ist das beim Betreten der Burg via u_set_building() nur dann die betretende Einheit zum Burgenbesitzer wird wenn es keinen Burgenbesitzer gibt.
Die eher aufgerufene Funktion building_owner() versucht zwar nach dem Kampf einen neuen Burgenbesitzer zu finden, da sich zu diesem Zeitpunkt aber nur eine Tote Einheit und einen Temp Einheit, beide mit 0 Personen, in der Bug befinden schlägt dies Fehl. Es wird von der Funktion zwar 0 zurückgegeben, aber b->_owner wird nicht zurückgesetzt (Vermutlich da der Server an anderer Stelle sonst annimmt das noch nie jemand in der Burg war). Daher die Überprüfung bei u_set_building ob der Burgenbesitzer tot ist, und wenn ja wird die betretende Einheit neuer Burgenbesitzer.
local r1 = region.create(1, 2, "plain")
local f1 = faction.create("a@b.de", "human", "de")
local f2 = faction.create("c@d.de", "human", "de")
f1.age=20
f2.age=20
local b1 = building.create(r1, "castle")
b1.size = 100
local u0 = unit.create(f1, r1, 10)
u0.building = b1
u0:add_item("money", u0.number * 100)
u0:clear_orders()
u0:add_order("KÄMPFE")
u0:add_order("MACHE TEMP 1")
u0:add_order("ENDE")
local u1 = unit.create(f1, r1, 100)
u1.building = b1
u1:add_item("money", u1.number * 100)
u1:clear_orders()
u1:add_order("KÄMPFE FLIEHE")
u1:add_order("GIB TEMP 1 ALLES PERSONEN")
u1:add_order("GIB TEMP 1 ALLES")
u1:add_order("GIB TEMP 1 Kommando")
local u2 = unit.create(f2, r1, 101)
u2:add_item("sword", u2.number)
u2:add_item("money", u2.number * 100)
u2:set_skill("melee", 16)
u2:clear_orders()
u2:add_order("KÄMPFE")
u2:add_order("ATTACKIEREN " .. itoa36(u1.id))
u2:add_order("BETRETE BURG " .. itoa36(b1.id))
process_orders()
Das sollte für Schiffe eigentlich das gleiche sein, also da die gleiche Änderung.
2014-07-15 15:24:21 +02:00
b2b35fd9d0
add a test for the E3 reduced give quota.
...
foreign units receive only 50% of silver given to them.
Conflicts:
tests/pool.lua
2014-07-07 03:41:33 +02:00
68d96014b1
a new method for finding out that a unit died in battle.
...
turns out, a unit can have 0 people without dying or being a TEMP (GIVE them all away, then RECRUIT more).
2014-07-06 13:00:14 -07:00
fdae518ef7
also read the extended race::ec_flags from JSON configuration.
2014-07-06 00:53:15 -07:00
88f9d247bd
Revert "use race::flags|RCF_NOGIVE instead of race::ec_flags|GIVEITEM"
...
E3 Tests (GIVE) did not pass.
This reverts commit 5ec3f5b83a
2014-07-06 00:29:52 -07:00
5ec3f5b83a
use race::flags|RCF_NOGIVE instead of race::ec_flags|GIVEITEM
...
None of this has tests, it'd going to be years before a change like this can be made without fear D-:
2014-07-05 23:31:34 -07:00
b21cb8f5c7
Simple test for rules.give (there are many more, can_give deserves a test to itself).
...
The more tests I write, the more I hate the infrastructure for them.
2014-07-05 23:06:51 -07:00
f14264e3bb
test coverage for can_steal.
...
add a default message for when no messages are loaded, so that msg_feedback/msg_message doesn't return NULL when XML has not been laoded.
initialize some core stuff before running tests (there probably needs to be more).
2014-07-05 20:14:11 -07:00
072f927d5b
replace RCF_CANSTEAL with RCF_NOSTEAL for less confusing default behavior.
2014-07-05 19:29:12 -07:00
5b437c5833
Replace RCF_PLAYERRACE with RCF_NPC, it's the less confusing default for tests.
2014-07-05 19:21:06 -07:00
4a8707b06d
fix a fall-through in jsonconf causing an error message.
...
add tests for pool, not working because of missing GIVEITEM on
JSON-configured races (TBD).
2014-07-05 18:21:20 -07:00
d743d32215
bind "blocked" flag for Lua (bug 1922).
...
remove unused region-flags.
2014-07-05 10:46:43 -07:00
d5e9899544
remove battle statistics, the flag is not set anywhere, and I have not used them in ages.
2014-07-05 10:45:03 -07:00
26d6808ea1
read building-maintenance requirements from JSON.
2014-07-04 21:48:17 -07:00
e0ee82e977
Do not default newly created buildings to being maintained and working (do that in the create order instead).
...
This was mucking up one of the new tests.
2014-07-04 16:13:48 -07:00
22c5b4d45c
Merge branch 'master' of github.com:eressea/server
2014-07-02 21:27:53 -07:00
b5439a1279
fix line/column calculation for JSON Errors.
...
+ start building a test for http://bugs.eressea.de/view.php?id=1692
2014-07-02 21:17:31 -07:00
91a776c0ac
begin configuring spells from JSON
2014-07-02 21:15:22 -07:00
ee1d97df19
remov e the old recycling quota, it was always 0.5 everywhere, and a
...
silly feature..
2014-07-01 20:36:31 -07:00
54a3c2e070
recycle quota is always 0.5 in every game, no reason to toch this.
2014-06-30 19:25:08 -07:00
927ada92b6
improve construction data in JSON.
...
test castle naming function
2014-06-30 19:21:42 -07:00
e39336e87a
move declaration to top of block
2014-06-29 20:09:21 -07:00
7a6b237de0
Merge branch 'master' of github.com:TomBraun/server into TomBraun-master
...
Conflicts:
src/kernel/build.c
src/kernel/item.c
2014-06-29 20:05:44 -07:00
9dcf5bbf4c
fix a crash for invalid race enums
2014-06-29 19:15:03 -07:00
12661fc373
new_itemtype has been replaced, delete it.
2014-06-29 19:09:37 -07:00
22f64abaf2
caching get_race() calls
2014-06-29 19:04:30 -07:00
c3dfbdea18
eliminate new_race array in favor of a function (TODO: make it fast)
2014-06-29 18:10:02 -07:00
11a264742b
appearance is something only items have, so move it to item_type
2014-06-29 17:35:37 -07:00
2a00301949
unused variable
2014-06-29 17:31:33 -07:00
062ba71bd7
fix reading items in xmlreader (still has no tests)
2014-06-29 17:29:41 -07:00
5d32896407
rt_register is no longer required, new_resourcetype replaced by rt_get_or_create.
2014-06-29 17:02:45 -07:00
95929a99b5
we are about to remove rt_register, but not quite yet.
2014-06-29 16:46:42 -07:00
773f3767d3
eliminate cb_items
2014-06-29 16:41:03 -07:00
7ee6f0444d
reduce use of cb_items, because we want to remove it.
2014-06-29 16:39:53 -07:00
7249630e3c
Eliminate some Visual Studio warnings, rename itemnames->resourcenames.
2014-06-29 15:41:04 -07:00
6bd2b3be26
add a test for stone golems building castles.
...
fix a bug when stone golems use themselves up.
2014-06-28 23:58:00 -07:00
a48cca5db8
building naming function configured from JSON (this needs work).
...
started writing tests for castles.
2014-06-28 16:55:28 -07:00
612dfea36f
Merge branch 'master' of github.com:eressea/server
2014-06-28 16:39:54 -07:00
89e7a7826f
added some tests for building buildings.
2014-06-28 16:19:46 -07:00
c31c436cc7
change u->number >> 0 to u->number>0
2014-06-28 20:45:17 +02:00
34ce9a0573
JSON configuration can read strings, with test.
2014-06-28 10:37:40 -07:00
b346788e43
Merge remote-tracking branch 'eressea/server'
2014-06-27 07:35:21 +02:00
39f78354b9
Merge branch 'master' of github.com:eressea/server
2014-06-26 22:06:38 -07:00
68aa903130
make tests pass through valgrind
...
introduce more #ifdef LOMEM to bitfield structs.
2014-06-26 21:48:01 -07:00
c5cf8bb3be
add some asserts, chasing a valgrind message
2014-06-26 21:27:50 -07:00
5e835618f3
fix weight calculation, uninitialized value
2014-06-26 21:02:03 -07:00
dba51bf0f7
remove duplicate handling of "speed" attribute in JSON
...
add weight and capacity in this test (still broken)
2014-06-26 19:11:34 -07:00
99da4de9ad
Define "pf_generic cast = 0" and "pf_generic fumble = 0" early
...
Visual Studio 2013 express don't compile without errors if
this definition comes to late.
2014-06-26 07:20:59 +02:00
be4e02cc16
Merge remote-tracking branch 'upstream/master'
2014-06-26 07:37:30 +02:00
d0e2ad542a
tests for basic movement
2014-06-25 14:30:24 -07:00
12e15978b8
read weight, capacity and flags of items
2014-06-25 08:00:09 -07:00
af77a1d8e5
speed up float params, exploiting alphabetic sorting
2014-06-25 07:25:54 -07:00
07d10d9ab0
add tests for get_param functions
2014-06-25 07:22:39 -07:00
d4fdddbc27
Iron golems can now create dwarfen only items
...
(makes irongolems usable for dwarfs)
2014-06-25 13:24:06 +02:00
0400bcafad
Iron and Stone golems now use the corect number of stones / iron.
...
0001946: Eisengolems stellen keine Waren her
http://bugs.eressea.de/view.php?id=1921
2014-06-25 13:22:42 +02:00
84fb776d1c
Fixed a bug that crasehed the server
...
when Stonegolems created a new building
and the whole unite was consumed during this process
(could not enter the new building as no one was left in the unit)
2014-06-25 13:15:37 +02:00
31c0e5c2a4
read items from JSON, with no properties yet
2014-06-24 22:54:10 -07:00
92f43a7b51
eliminate it_find calls, replace it_find with something backed by rt_find
2014-06-24 22:44:05 -07:00
dc8a8cdd71
rt_find -> get_resourcetype optimization
2014-06-24 08:19:11 -07:00
d581737744
optimization: caching resource types in get_resourcetype.
...
eliminate some it_find calls.
eliminate static variables, they make testing hard.
2014-06-24 07:42:45 -07:00
7adb8498aa
Merge branch 'fix_block_movement' of github.com:stm2/server into stm2-fix_block_movement
...
Conflicts:
scripts/tests/eressea.lua
src/kernel/move.c
2014-06-23 20:34:07 -07:00
77ee0b7af7
remote the item_t enum for good
2014-06-23 19:17:13 -07:00
73da14e305
getting rid of the olditemtypes[] array
...
reduce use of statics
reduce use of item_t enum
2014-06-23 07:28:10 -07:00
1444ee58f2
kill XEBALLOON etc, fix some strings
2014-06-22 10:43:05 -07:00
2c831230a0
Added a test for expensive skills.
...
When resetting the game rules, make sure basic resources (money, hp, person) are initialized.
2014-06-22 07:55:14 -07:00
d9972a9da9
call init_skills when not using JSON config
2014-06-21 14:39:56 -07:00
bfadc4914f
add JSON configuration to skills, and tests
2014-06-21 08:53:14 -07:00
46f6628a08
remove obsolete commands (PRAY) and parameters
2014-06-21 07:34:36 -07:00
bff25f3c51
move skill_t into a separate file, give it unit tests.
...
name functions the same as we did for keyword/direction earlier.
to do: json configuration and lua test.
2014-06-20 23:59:04 -07:00
ceabbebc90
switch remaining flags from unsigned to int.
2014-06-18 20:53:06 -07:00
eb567918e5
forgot to init the bindings for game.pkg
...
next problem to solve: skills
2014-06-17 23:50:13 -07:00
3625ba6a95
remove static variables optimizations, they create global state that is bad for testing
2014-06-17 23:10:55 -07:00
8166519d30
add a list of valid coasts to ship definition in JSON.
...
fix endless loop in error-line counting.
2014-06-17 21:33:42 -07:00
b6b790d7e7
add a config.reset function to clear configuration state before tests.
2014-06-17 08:46:22 -07:00
0675c50c7f
keyword lookup macro
2014-06-16 23:05:39 -07:00
5c78a3883e
cleaning up terrains, reading race flags from a JSON array
2014-06-16 22:43:40 -07:00
33928568cf
finally have all the scaffolding to write a test with ships.
...
configure terrain flags from json.
ships are always allowed to enter SEA regions.
2014-06-16 22:19:19 -07:00
b40ddaeaa1
add test for keyword aliases, add keyword to strings for reverse lookup
2014-06-16 20:41:08 -07:00
0af5e96e3a
Renaming keyword tokens to English.
2014-06-16 20:16:06 -07:00
249a4390c4
read keyword translations from JSON configuration.
2014-06-16 11:30:23 -07:00
645a7fcde6
fix keyword translations, they use critbit, not tokens
2014-06-16 10:32:30 -07:00
6a20594fd3
renamedtest files in the rest of the makefiles, too. oops.
2014-06-16 08:07:08 -07:00
125fd519a8
rename test files.
...
add tests for keyword.c, incomplete.
2014-06-16 08:01:59 -07:00
c8dc6be6f2
rename get_keyword, because something else should have that name.
2014-06-16 07:19:22 -07:00
64e0c221ec
directions can now be read from json configuration.
...
rename a couple of functions for more consistency across modules.
2014-06-15 22:17:08 -07:00
acbef7a3a0
fix missing locales initialization
2014-06-15 21:19:47 -07:00
a9f0538d8e
keyword_t and direction_t are moving into their own module.
...
direction parser gets new initialization function, for use in jsonconf later.
add unit tests for directions.
2014-06-15 18:34:39 -07:00
812cb98dff
begin binding locales (need to init_locales in the right place, still).
...
fix indentation in some places.
add some assertions.
2014-06-14 07:52:32 -07:00
24dc006e43
fix json config for terrains, some other stuff.
2014-06-13 17:36:05 -07:00
97c17b1afa
Merge branch 'master' of github.com:eressea/server
2014-06-13 08:29:01 -07:00
6e56c56d39
read ships from config file (only very basic) and create them in a lua test.
2014-06-13 08:28:33 -07:00
5a82350037
fix broken xmlreader after most recent cahnges to
...
race/ship_type/building_type creation functions.
2014-06-12 22:30:13 -07:00
d503937999
working on making json config understand ships and buildings.
...
new tests in progress.
remove giveitem.c attribute, the name clashed with a trigger,
and it was only part of an arena that is gone from the game, I think.
2014-06-12 22:14:07 -07:00
fa98528d72
remove old SQL patch code, we have sqlite now.
...
rearrange the SlickEdit projects.
2014-06-11 22:21:52 -07:00
28726e2bea
update cmake to compile without sqlite3, curses or libxml2 installed.
...
This is not actually recommended, but your system may not have
this,and you should still be able to contribute. also, libxml2 is on
the way out, I am beginning to really hate it.
Moving a couple of files around.
2014-06-11 20:30:34 -07:00
42a86fc910
make sure that the skill bonus for races is signed, even on ARM where
...
that is not necessarily the default.
2014-06-09 21:36:43 -07:00
3dda5d3033
apply USE_LIBXML consistently, so tests can be built without libxml2
2014-06-09 20:51:29 -07:00
a304b981d5
remove archetypes, they are not used by any existing game.
...
make compiling with libxml2 optional (USE_LIBXML2)
disable xml reports
2014-06-09 19:05:17 -07:00
3c4b6b9dd4
rename message.[hc] to messages.[hc] in kernel because of naming conflict with util/
...
begin json config files (WIP)
2014-06-09 09:56:49 -07:00
dceff481d7
json config files, beginning with races
2014-06-07 22:17:48 -07:00
f43d8a3297
remove old gamecode-diabling logic
...
it was old, and not in use.
2014-06-07 10:36:50 -07:00
dc3eea0c70
take best unit and count amulet at most once for guards blocking movement
2014-06-04 11:04:17 +02:00
9940025a96
eliminate multiple warnings about missing default order
...
fix e3 catalog file syntax
2014-06-02 07:31:46 +02:00
e17a3fc8fa
eliminate remaining traces of the wisps spell
2014-06-02 07:22:07 +02:00
08c3d08d7d
fix config.xml for test games
...
update log levels for some common messages.
2014-06-02 05:42:56 +02:00
6f29e4dab5
improve logging information (missing race, log levels)
...
do nothing when thre is no peasant blood
2014-06-01 11:07:22 +02:00
d388a94f36
report missing itemtype before crashing
2014-05-24 20:35:00 -07:00
7038b021de
fix counting of units, making it slower but more correct
2014-05-24 20:25:06 -07:00
649a43a27e
sqlite updater, rewrite
2014-05-16 22:49:28 -07:00
515b582144
Merge branch 'master' of github.com:eressea/server
2014-05-10 11:45:14 -07:00
c2329f7f2b
changing unsigned flags to regular ints
...
the storage library does not understand unsigned at the moment, and using the highest order bit causes trouble
new version of datafile
2014-05-10 18:57:04 +02:00
0d087d6bb1
Merge branch 'master' of github.com:eressea/server
2014-05-05 19:15:32 -07:00
1e7e5877a1
Merge branch 'master' of github.com:eressea/server
2014-05-05 19:14:55 -07:00
86bc4e7aef
reading and writing the NPC flag was broken, because flags were a fully loaded unsigned int. making it an int instead, and adding a test.
...
fixing a bad test in which shadowmasters were deserting to faction null (causing a crash).
2014-05-05 19:11:40 -07:00
465f3f7ce9
Merge branch 'master' of github.com:eressea/server
2014-05-05 00:00:10 -07:00
cb458db9a1
updating eressea.db, not with a fixed game-id
2014-05-04 22:49:06 +02:00
535a9e6e53
fix number of units in the report header
2014-04-26 12:24:51 -07:00
35c2baafbe
do not read turn file for turn 0
2014-04-25 07:47:23 +02:00
0d05ae77a3
remove stupid pragmas
2014-04-22 07:21:29 -07:00
9aeb0f6b86
make build script figure out how many jobs to run
2014-04-11 19:41:17 -07:00
7358c48580
removing some naming conflicts that hapen when trying to re-enable amalgamation builds.
2014-04-11 19:41:17 -07:00
b769be0f60
invalid tests for some architectures (char is not guaranteed to be signed or unsigned)
...
fix tests on ARM
2014-04-11 09:46:03 -07:00
0d8a196491
create report directory before writing reports.txt
2014-03-22 23:14:36 +01:00
b399356971
Revert "remove GM command"
...
there is a saved attribute that needs this
This reverts commit 7e529f2b4c
2014-03-22 21:49:18 +01:00
a986640ef6
json export for planes. untested. old tests broken. WIP
2014-03-22 01:56:00 -07:00
6e3ed568ea
fix lua test for blessed harvest.
2014-03-17 08:21:35 +01:00
7e529f2b4c
remove GM command
...
this was a command from the very early days, when we had player-made
quests. It is no longer in use.
2014-03-16 23:40:51 -07:00
0ae8737062
rename MIN/MAX to _min/_max
2014-03-16 05:03:17 +01:00
70cee3c6e5
remove any dependency on stat.
2014-03-15 20:41:58 -07:00
9fc926864e
Fixes for Visual C++
...
snprintf and strncasecmp are not that.
_access needs to be fixed on gcc, next.
2014-03-15 12:35:20 -07:00
1a7d892a96
use cmake for autoconf, slim down platform.h
2014-03-15 19:29:11 +01:00
e9b9c9783a
export factions, too
...
give this a header and some flags so we can choose in detail what to
export.
2014-03-07 08:03:53 -08:00
03c247c788
I am killing the core/ directory.
...
Lots of files are moving to a new location in src/
Some intersting CMake changes.
2014-02-18 05:45:00 +01:00
Enno Rehling
CTD
TomBraun
Steffen Mecke