Commit graph

89 commits

Author SHA1 Message Date
Al Riddoch
a5549afaaf 2006-07-19 Al Riddoch <alriddoch@zepler.org>
* data/basic.xml: Make coin inherit from stackable.

	* rulesets/Character.cpp, rulesets/Stackable.cpp: Add debug output
	  to new combine op handlers.
2006-07-19 02:44:18 +00:00
Al Riddoch
852bb1d643 2006-06-30 Al Riddoch <alriddoch@zepler.org>
* FIXME, Makefile.am: Add new FIXME file which documents FIXMEs in
	  the code.

	* server/EntityFactory.cpp: Remove the terrain feature classes
	  implemented as hard coded classes.

	* data/basic.xml: Add the terrain feature classes as soft data
	  defined classes.
2006-06-30 15:11:57 +00:00
Al Riddoch
98f4702ca2 2006-06-20 Al Riddoch <alriddoch@zepler.org>
* rulesets/Py_Task.cpp: Allow progress to be set as an integer from
	  a task script.

	* data/mason.xml, rulesets/mason/world/tasks/Slice.py: Add a new
	  slice task for sawing logs into boards.
2006-06-20 18:06:50 +00:00
Al Riddoch
a1117f865e 2006-06-20 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add classes for raw building materials.
2006-06-20 10:27:42 +00:00
Al Riddoch
87c650e793 2006-05-12 Al Riddoch <alriddoch@zepler.org>
* server/server.cpp: Add option to control the increased nice level
	  the server runs at.
2006-05-11 23:33:58 +00:00
Al Riddoch
3710dca2a6 2006-05-10 Al Riddoch <alriddoch@zepler.org>
* server/PersistantThingFactory.h: Improve comments.

	* data/mason.xml: Add maximum and minimum values example for the mass
	  of a pig.

	* common/Type.h: Add empty interface class which will be padded out
	  to be the interface used by instances to query their class.
2006-05-10 00:28:02 +00:00
Al Riddoch
674b6e00ae In order to store class related stuff without having to store it on
the instance, might need to have a type class which each Entity has
a pointer to. Should it also be possible to specifiy different statistics
classes in data/*.xml?
2006-05-09 00:11:48 +00:00
Al Riddoch
1f0a58a423 2006-05-02 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Oak bounding box update.
2006-05-01 23:40:42 +00:00
Al Riddoch
d7a09d3285 2006-04-30 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add the last 3 remaining castle components.
2006-04-30 13:02:03 +00:00
Al Riddoch
fd6ee86dc2 2006-04-30 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Double the bounding box height of the oak to
	  match new client scale factor.
2006-04-30 11:38:01 +00:00
Al Riddoch
e64fb17270 2006-04-27 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add new server rules for some parts of a castle.
2006-04-28 15:12:39 +00:00
Al Riddoch
323c4b30e2 2006-04-27 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Added leaf and loaf. Fixed hat bbox.
2006-04-27 11:17:38 +00:00
Al Riddoch
c6d42f3149 2006-04-26 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add flower, hat, knife, longtable and statue.
2006-04-26 17:13:44 +00:00
Al Riddoch
95127751a1 2006-04-26 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add boots and bowl.
2006-04-26 16:51:05 +00:00
Al Riddoch
d260e9cfd6 2006-04-26 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add a cow to the world.
2006-04-26 16:27:35 +00:00
Al Riddoch
fe4330bedb 2006-04-24 Al Riddoch <alriddoch@zepler.org>
* common/BaseWorld.h, rulesets/Character.cpp,
	  server/EntityFactory.cpp, server/EntityFactory.h,
	  server/TaskFactory.h, server/WorldRouter.cpp,
	  server/WorldRouter.h: Specify the target base type that a given
	  task is valid for, and provide target type when activating a task.

	* data/mason.xml: Add target base types to most task rules.

	* rulesets/mason/world/tasks/Combat.py: Fix the copyright date.

	* rulesets/mason/world/tasks/Sharpen.py: Proof of concept task
	  for turning logs into stakes.
2006-04-24 19:51:54 +00:00
Al Riddoch
dd697d8875 *** empty log message *** 2006-04-24 13:12:04 +00:00
Al Riddoch
a8ac5c6a76 2006-04-24 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add a tool, operation and class for hammering
	  wooden stakes into the ground.

	* rulesets/mason/world/tasks/Ram.py: Add stub task script for
	  hammering things into the ground.
2006-04-24 01:26:54 +00:00
Al Riddoch
13254d28d3 2006-04-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/Python_API.cpp: Improve the quaternion constructor
	  so it can build one from an axis and an angle of rotation.

	* rulesets/Py_Quaternion.cpp: Add support for multiplying quaternions
	  together.

	* data/mason.xml: Add rules for a pole tool, together with
	  operations and tasks associated with the pole.

	* rulesets/mason/world/tasks/Raise.py: Add a task used with the
	  pole to lever items into different orientations. When used on an
	  entity, the entity is oriented away from the users current
	  position, rotating around a horizontal axis.
2006-04-20 15:48:34 +00:00
Al Riddoch
1c8980e0e8 2006-04-02 Al Riddoch <alriddoch@zepler.org>
* common/system.h: Fix name for second argument of hash_password().

	* data/mason.xml: Add example task specification for a logging task.
2006-04-02 17:42:56 +00:00
Al Riddoch
a7ccf9e9fb 2006-01-26 Al Riddoch <alriddoch@zepler.org>
* data/basic.xml: Add "collapse" action op to trigger a defeated
	  animation.

	* rulesets/mason/world/tasks/Combat.py: Prevent characters from
	  attacking characters that are exhausted. Send a sight of
	  collapse operation when combat finishes.
2006-01-27 17:24:05 +00:00
Al Riddoch
39f5093c14 2006-01-04 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Make skeleton playable.

	* server/Connection.cpp: Differentiate in the event logs between
	  account creation and login to an existing account.
2006-01-04 16:36:25 +00:00
Al Riddoch
d0713d4183 2005-12-08 Al Riddoch <alriddoch@zepler.org>
* server/TaskFactory.h, server/TaskFactory.cpp,
	  server/EntityFactory.h, server/EntityFactory.cpp,
	  rulesets/TaskScript.h, rulesets/TaskScript.cpp:
	  Implement task script interface.
2005-12-08 03:04:04 +00:00
Miguel Guzmán
5071ac2e89 2005-12-07 Miguel Guzman
* data/mason.xml: Add dog.

        * rulesets/mason/define_world_aglanor.py: Add some dogs, they patrol the
        outskirt of the town and chase squirrels and chickens.
2005-12-07 14:46:29 +00:00
Al Riddoch
bd153b9f87 2005-12-05 Al Riddoch <alriddoch@zepler.org>
* server/EntityFactory.h, server/EntityFactory.cpp: Add a handler for
	  objects in rules files.

	* rulesets/TaskScript.h, rulesets/TaskScript.cpp: Task class which
	  delegates functionality to a script object. Basically just a
	  stub at this point.

	* server/TaskFactory.h server/TaskFactory.cpp: Factory class for
	  creating instances of Task classes.
2005-12-05 21:23:50 +00:00
Al Riddoch
ba4a73dfe5 2005-11-30 Al Riddoch <alriddoch@zepler.org>
* rulesets/basic/world/objects/Thing.py: Remove self.attributes
	  from the base class for all python scripts.

	* rulesets/mason/world/objects/Weather.py,
	  rulesets/basic/world/objects/plants/Tree.py,
	  rulesets/basic/world/objects/animals/Animal.py,
	  data/basic.xml, data/mason.xml: Don't use set_kw to handle default
	  attributes, and add the to the .xml rules files.

	* rulesets/basic/world/objects/buildings/House.py,
	  rulesets/basic/world/objects/buildings/StoneHouse.py,
	  rulesets/basic/world/objects/tools/Bow.py,
	  rulesets/basic/world/objects/tools/Sword.py,
	  rulesets/mason/world/objects/animals/Deer.py,
	  rulesets/mason/world/objects/animals/Pig.py,
	  rulesets/mason/world/objects/outdoor/Campfire.py,
	  rulesets/mason/world/objects/outdoor/Gravestone.py,
	  rulesets/mason/world/objects/plants/seeds/Acorn.py,
	  rulesets/mason/world/objects/plants/seeds/Apple.py,
	  rulesets/mason/world/objects/plants/seeds/Fircone.py,
	  rulesets/mason/world/objects/plants/seeds/Seed.py,
	  rulesets/mason/world/objects/tools/Cleaver.py,
	  rulesets/mason/world/objects/undead/Skeleton.py,
	  rulesets/werewolf/world/objects/characters/Villager.py,
	  rulesets/werewolf/world/objects/tools/Gallows.py:
	  Don't import set_kw from misc, as its now obsolete and unused.
2005-11-30 22:37:50 +00:00
Al Riddoch
2afd816777 2005-11-23 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Fix height correction calculation inversion.

	* data/mason.xml: Make houses inherit from structure so it is possible
	  to go in and out.
2005-11-24 15:34:44 +00:00
Al Riddoch
0bd41af5f0 2005-09-22 Al Riddoch <alriddoch@zepler.org>
* common/globals.cpp, common/globals.h: Implement reading pvp settings
	  from config file.

	* data/cyphesis.vconf: Disable pvp in the default config.
2005-09-23 11:24:05 +00:00
Al Riddoch
45c16225a6 2005-09-20 Al Riddoch <alriddoch@zepler.org>
* common/system.cpp: Make sure cassert is included before assert
	  macro is used.

	* common/Makefile.am: Add missing header.

	* data/Makefile.am: Install copies of the config files in
	  the documentation directory for reference.
2005-09-20 16:50:30 +00:00
Al Riddoch
c3f98a2ad5 2005-09-16 Al Riddoch <alriddoch@zepler.org>
* common/custom.cpp: Remove some operation types only used in
	  scrypts.

	* data/basic.xml, data/mason.xml: Add the operation definitions
	  into the rule files.
2005-09-16 00:14:18 +00:00
Al Riddoch
b9267b194e 2005-07-01 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add mass and maxmass to all tree types.
2005-07-01 16:50:40 +00:00
Al Riddoch
dd5f4940fe 2005-07-01 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Set mass on oak trees.
2005-06-30 23:24:54 +00:00
Hagen Moebius
91f6c59708 2005-06-28 Hagen Moebius <hagen.moebius@starschiffchen.de>
* data/basic.xml: Added operations "disperse" and "extinguish".
   Set up "disperse" as the default operation for the pile.
 * rulesets/basic/world/objects/Pile.py: The operation "disperse"
   will call the "extinguish" operation on the target. Maybe it is
   advisable to add an assertion if the target is indeed a fire.
2005-06-28 22:51:49 +00:00
Al Riddoch
21556b5982 2005-06-28 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Make house3 not a structure, to eliminate problems
	  with race conditions in collision code.
2005-06-28 18:29:16 +00:00
Al Riddoch
d236dad1ed 2005-06-28 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: ignite and sow ops now inherit from action.
2005-06-28 14:41:53 +00:00
Al Riddoch
21a3d58b84 2005-06-25 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add type for butcher's house.
2005-06-25 09:10:39 +00:00
Al Riddoch
ff6227f0e7 2005-06-22 Al Riddoch <alriddoch@zepler.org>
* server/WorldRouter.cpp: Fix a problem where entities contained by
	  other entities had their height adjusted incorrectly.

	* rulesets/basic/world/objects/elements/Fire.py: Allow fires to be
	  moved.

	* rulesets/Python_API.cpp: Add constructor for BBox.

	* data/mason.xml: Add a torch. Add burn_speed attributes to a
	  bunch more entity classes.

	* rulesets/mason/world/objects/tools/Torch.py: Script for torch.
2005-06-22 14:56:14 +00:00
Al Riddoch
0d32b439b2 2005-06-21 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add some burn speeds.
2005-06-21 00:59:46 +00:00
Al Riddoch
f5f68b94b1 2005-06-19 Al Riddoch <alriddoch@zepler.org>
* rulesets/mason/world/objects/tools/Tinderbox.py: Change strength
	  of initial fire spark to 0.05.

	* common/operations.cpp: Fix nourish op, which got broken when mow
	  was added.

	* data/basic.xml: Add a default bbox for lumber, giving it a more
	  apropriate size.

	* rulesets/Py_World.cpp: Add a compare implementation so that
	` scripts can check entities to see if they are the world.

	* rulesets/basic/world/objects/elements/Fire.py: Tune the
	  changes which occur in fire as it burns.
2005-06-19 16:46:52 +00:00
Erik Hjortsberg
a9eaeb262f 2005-06-19 Erik Hjortsberg <erik@katastrof.nu>
* data/mason.xml: Connected gravestones to Gravestone.py script.

	* rulesets/mason/world/objects/outdoor/Gravestone.py: added response to a dig operation, which will create a random skeleton piece. This will allow the wholesome pastime of grave robbing.
2005-06-19 10:47:41 +00:00
Erik Hjortsberg
2c2aedf2ca 2005-06-18 Erik Hjortsberg <erik@katastrof.nu>
* data/mason.xml: Added three types of grave stones.

	* rulesets/mason/define_world.py: In the test_graveyard function, create some grave stones.
2005-06-18 16:44:34 +00:00
James Turner
1d08b2aecd 2005-06-17 James Turner <james@worldforge.org>
* data/mason.xml: Give the mausoleum a more sensible bbox and mass

	* rulesets/mason/define_world.py: add a test_graveyard function,
	  which adds the mausoleum, a path leading to it, and a lych
	  patrolling nearby. No gravestones yet, alas.
2005-06-17 10:01:58 +00:00
Al Riddoch
059052acdf 2005-06-17 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add definition for sow operation.

	* rulesets/mason/world/objects/plants/seeds/Acorn.py: Add handler
	  for germinate operation.
2005-06-17 01:17:29 +00:00
Al Riddoch
dcb4de5e64 2005-06-15 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Fix stall geometry.

	* rulesets/mason/define_world.py: Add stall, including structural
	  objects to handle collisions.
2005-06-15 21:37:56 +00:00
Al Riddoch
720c33fdde 2005-06-12 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add path rule.

	* rulesets/mason/define_world.py: Some experiments with paths.
	  Correct the layer number of ploughed field.
2005-06-12 16:48:51 +00:00
Al Riddoch
6217853335 2005-06-06 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Make boat float by default, add bottle and bunny,
	  fix wolf's bounding box.

	* rulesets/mason/define_world.py: Put fire in the middle of campfire,
	  not offset.
2005-06-06 20:31:48 +00:00
Al Riddoch
3b4f53b09e 2005-06-05 Al Riddoch <alriddoch@zepler.org>
* modules/Location.cpp, modules/Location.h: Rejig flags on Location
	  so that there is one to indicate contents should be checked for
	  collision, and one to indicate contents is not a collision volume.

	* rulesets/Movement.cpp: Modify collision code to check if an
	  entity is supposed to be checked for collisions.

	* rulesets/Structure.cpp: Tweak the flag set on structures to
	  correctly show that their contents should be checked for collision.

	* data/mason.xml: Make ploughed field into an area, and sort
	  out its bbox to be the right size.
2005-06-05 20:33:56 +00:00
Al Riddoch
638f3417cc 2005-06-05 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add a horse.
2005-06-05 15:00:54 +00:00
Al Riddoch
1d969e06e5 2005-06-05 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add mausoleum rule.

	* TODO: Update TODO.
2005-06-05 13:38:16 +00:00
Al Riddoch
04ffe9e955 2005-06-02 Al Riddoch <alriddoch@zepler.org>
* data/mason.xml: Add carrot and turnip, and a common parent tuber.
2005-06-02 22:46:23 +00:00