lp:~divmod-dev/divmod.org/obtain-2824-6

Branch merges

Merged into lp:divmod.org at revision 2683

Jean-Paul Calderone: Approve on 2011-09-16

Diff: 5589 lines (+3826/-806)

31 files modified

Epsilon/epsilon/remember.py (+39/-0)
Epsilon/epsilon/test/test_remember.py (+90/-0)
Imaginary/COMPATIBILITY.txt (+6/-0)
Imaginary/ExampleGame/examplegame/furniture.py (+139/-0)
Imaginary/ExampleGame/examplegame/glass.py (+72/-0)
Imaginary/ExampleGame/examplegame/mice.py (+1/-1)
Imaginary/ExampleGame/examplegame/squeaky.py (+42/-0)
Imaginary/ExampleGame/examplegame/test/test_furniture.py (+107/-0)
Imaginary/ExampleGame/examplegame/test/test_glass.py (+95/-0)
Imaginary/ExampleGame/examplegame/test/test_squeaky.py (+51/-0)
Imaginary/ExampleGame/examplegame/test/test_tether.py (+96/-0)
Imaginary/ExampleGame/examplegame/tether.py (+121/-0)
Imaginary/TODO.txt (+258/-0)
Imaginary/imaginary/action.py (+261/-130)
Imaginary/imaginary/creation.py (+3/-3)
Imaginary/imaginary/events.py (+16/-11)
Imaginary/imaginary/garments.py (+130/-17)
Imaginary/imaginary/idea.py (+625/-0)
Imaginary/imaginary/iimaginary.py (+313/-87)
Imaginary/imaginary/language.py (+12/-0)
Imaginary/imaginary/objects.py (+742/-248)
Imaginary/imaginary/resources/motd (+1/-1)
Imaginary/imaginary/test/commandutils.py (+11/-0)
Imaginary/imaginary/test/test_actions.py (+43/-0)
Imaginary/imaginary/test/test_container.py (+55/-0)
Imaginary/imaginary/test/test_garments.py (+38/-20)
Imaginary/imaginary/test/test_idea.py (+241/-0)
Imaginary/imaginary/test/test_illumination.py (+159/-7)
Imaginary/imaginary/test/test_objects.py (+43/-240)
Imaginary/imaginary/test/test_player.py (+8/-19)
Imaginary/imaginary/wiring/player.py (+8/-22)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2682. By Jean-Paul Calderone on 2011-09-16

Some minor doc fixes, and a note about Exit.link being confusing.

2681. By Jean-Paul Calderone on 2011-09-16

note about some uncovered code

2680. By Jean-Paul Calderone on 2011-09-16

There is no self

2679. By Jean-Paul Calderone on 2011-09-16

Put the _DisregardYourWearingIt hack back in place. It is required for the tethering features in ExampleGame. This means worn clothing once again has a location of the wearer.

2678. By exarkun on 2010-04-24

Remove the _DisregardYourWearingIt hack; add a different IElectromagneticMedium just so there'll still be one; add more tests for CanSee

Worn garments now have a location of None instead of a location
of their wearer. This prevents them from being described by the
containment system and the garment system (now the containment
system cannot see them and only the garment system describes
them).

This might be a good idea. It seems like less of a hack than
_DisregardYourWearingIt, at least. Plus it's all spelled
right.

2677. By exarkun on 2010-04-24

Add tests covering Reachability.moreObjectionsTo

2676. By exarkun on 2010-04-24

This probably used to do something, but no more. Discard it.

2675. By exarkun on 2010-04-24

Express the intent of this test a little more coherently (ie, at all)

2674. By exarkun on 2010-04-24

Fix trivial whitespace and test naming stuff

2673. By exarkun on 2010-04-24

A test that covers the "if not objections" test in _doObtain