More documentation, but significant problems.

2024-06-14 01:48:39 +01:00 · 2024-06-14 01:48:39 +01:00 · cd5b7e87be
parent 4b8570916b
commit cd5b7e87be
75 changed files with 166 additions and 332 deletions
--- a/docs/codox/3D-formats.html
+++ b/docs/codox/3D-formats.html
--- a/docs/codox/A-generic-planning-algorithm-for-craftworker-npcs.html
+++ b/docs/codox/A-generic-planning-algorithm-for-craftworker-npcs.html
--- a/docs/codox/API_Spec.html
+++ b/docs/codox/API_Spec.html
--- a/docs/codox/Appraisal.html
+++ b/docs/codox/Appraisal.html
--- a/docs/codox/Architecture.html
+++ b/docs/codox/Architecture.html
--- a/docs/codox/Baking-the-world.html
+++ b/docs/codox/Baking-the-world.html
--- a/docs/codox/Building_on_microworld.html
+++ b/docs/codox/Building_on_microworld.html
--- a/docs/codox/Canonical-dictionary.html
+++ b/docs/codox/Canonical-dictionary.html
--- a/docs/codox/Division_of_tasks_between_server_and_client.html
+++ b/docs/codox/Division_of_tasks_between_server_and_client.html
--- a/docs/codox/Draft-algorithm-functional-physics-engine.html
+++ b/docs/codox/Draft-algorithm-functional-physics-engine.html
--- a/docs/codox/Dynamic-consequences.html
+++ b/docs/codox/Dynamic-consequences.html
--- a/docs/codox/Economy.html
+++ b/docs/codox/Economy.html
--- a/docs/codox/Further-reading.html
+++ b/docs/codox/Further-reading.html
--- a/docs/codox/Game_Play.html
+++ b/docs/codox/Game_Play.html
--- a/docs/codox/Genetic-buildings.html
+++ b/docs/codox/Genetic-buildings.html
--- a/docs/codox/Gossip_scripted_plot_and_Johnny_Silverhand.html
+++ b/docs/codox/Gossip_scripted_plot_and_Johnny_Silverhand.html
--- a/docs/codox/MVP-Roadmap.html
+++ b/docs/codox/MVP-Roadmap.html
--- a/docs/codox/Modelling_trading_cost_and_risk.html
+++ b/docs/codox/Modelling_trading_cost_and_risk.html
--- a/docs/codox/Naming-of-characters.html
+++ b/docs/codox/Naming-of-characters.html
--- a/docs/codox/Not_my_problem.html
+++ b/docs/codox/Not_my_problem.html
--- a/docs/codox/On-dying.html
+++ b/docs/codox/On-dying.html
--- a/docs/codox/On-sex-and-sexual-violence.html
+++ b/docs/codox/On-sex-and-sexual-violence.html
--- a/docs/codox/Organic_Quests.html
+++ b/docs/codox/Organic_Quests.html
--- a/docs/codox/Pathmaking.html
+++ b/docs/codox/Pathmaking.html
--- a/docs/codox/Populating-a-game-world.html
+++ b/docs/codox/Populating-a-game-world.html
--- a/docs/codox/Pseudo-object-inheritance.html
+++ b/docs/codox/Pseudo-object-inheritance.html
--- a/docs/codox/Roadmap.html
+++ b/docs/codox/Roadmap.html
--- a/docs/codox/Sandbox.html
+++ b/docs/codox/Sandbox.html
--- a/docs/codox/Selecting_Character.html
+++ b/docs/codox/Selecting_Character.html
--- a/docs/codox/Settling-a-game-world.html
+++ b/docs/codox/Settling-a-game-world.html
--- a/docs/codox/Sexual-dimorphism.html
+++ b/docs/codox/Sexual-dimorphism.html
--- a/docs/codox/Simulated-genetics.html
+++ b/docs/codox/Simulated-genetics.html
--- a/docs/codox/Simulation-layers.html
+++ b/docs/codox/Simulation-layers.html
--- a/docs/codox/The-spread-of-knowledge-in-a-large-game-world.html
+++ b/docs/codox/The-spread-of-knowledge-in-a-large-game-world.html
--- a/docs/codox/Things_Voice_Interaction_Enables.html
+++ b/docs/codox/Things_Voice_Interaction_Enables.html
--- a/docs/codox/Towards-a-procedural-animation-api.html
+++ b/docs/codox/Towards-a-procedural-animation-api.html
--- a/docs/codox/Tree-library-evaluation.html
+++ b/docs/codox/Tree-library-evaluation.html
--- a/docs/codox/Uncanny_dialogue.html
+++ b/docs/codox/Uncanny_dialogue.html
--- a/docs/codox/Useful-software-libraries.html
+++ b/docs/codox/Useful-software-libraries.html
--- a/docs/codox/Voice-acting-considered-harmful.html
+++ b/docs/codox/Voice-acting-considered-harmful.html
--- a/docs/codox/Worlds-and-flats.html
+++ b/docs/codox/Worlds-and-flats.html
--- a/docs/codox/cc.journeyman.the-great-game.agent.agent.html
+++ b/docs/codox/cc.journeyman.the-great-game.agent.agent.html
--- a/docs/codox/cc.journeyman.the-great-game.agent.schedule.html
+++ b/docs/codox/cc.journeyman.the-great-game.agent.schedule.html
--- a/docs/codox/cc.journeyman.the-great-game.buildings.module.html
+++ b/docs/codox/cc.journeyman.the-great-game.buildings.module.html
--- a/docs/codox/cc.journeyman.the-great-game.buildings.rectangular.html
+++ b/docs/codox/cc.journeyman.the-great-game.buildings.rectangular.html
--- a/docs/codox/cc.journeyman.the-great-game.character.sex.html
+++ b/docs/codox/cc.journeyman.the-great-game.character.sex.html
--- a/docs/codox/cc.journeyman.the-great-game.gossip.gossip.html
+++ b/docs/codox/cc.journeyman.the-great-game.gossip.gossip.html
--- a/docs/codox/cc.journeyman.the-great-game.gossip.news-items.html
+++ b/docs/codox/cc.journeyman.the-great-game.gossip.news-items.html
--- a/docs/codox/cc.journeyman.the-great-game.holdings.holding.html
+++ b/docs/codox/cc.journeyman.the-great-game.holdings.holding.html
--- a/docs/codox/cc.journeyman.the-great-game.launcher.html
+++ b/docs/codox/cc.journeyman.the-great-game.launcher.html
--- a/docs/codox/cc.journeyman.the-great-game.location.location.html
+++ b/docs/codox/cc.journeyman.the-great-game.location.location.html
--- a/docs/codox/cc.journeyman.the-great-game.lore.digester.html
+++ b/docs/codox/cc.journeyman.the-great-game.lore.digester.html
--- a/docs/codox/cc.journeyman.the-great-game.merchants.markets.html
+++ b/docs/codox/cc.journeyman.the-great-game.merchants.markets.html
--- a/docs/codox/cc.journeyman.the-great-game.merchants.merchant-utils.html
+++ b/docs/codox/cc.journeyman.the-great-game.merchants.merchant-utils.html
--- a/docs/codox/cc.journeyman.the-great-game.merchants.merchants.html
+++ b/docs/codox/cc.journeyman.the-great-game.merchants.merchants.html
--- a/docs/codox/cc.journeyman.the-great-game.merchants.planning.html
+++ b/docs/codox/cc.journeyman.the-great-game.merchants.planning.html
--- a/docs/codox/cc.journeyman.the-great-game.merchants.strategies.simple.html
+++ b/docs/codox/cc.journeyman.the-great-game.merchants.strategies.simple.html
--- a/docs/codox/cc.journeyman.the-great-game.objects.character.html
+++ b/docs/codox/cc.journeyman.the-great-game.objects.character.html
--- a/docs/codox/cc.journeyman.the-great-game.objects.container.html
+++ b/docs/codox/cc.journeyman.the-great-game.objects.container.html
--- a/docs/codox/cc.journeyman.the-great-game.objects.game-object.html
+++ b/docs/codox/cc.journeyman.the-great-game.objects.game-object.html
--- a/docs/codox/cc.journeyman.the-great-game.playroom.html
+++ b/docs/codox/cc.journeyman.the-great-game.playroom.html
--- a/docs/codox/cc.journeyman.the-great-game.proving.core.html
+++ b/docs/codox/cc.journeyman.the-great-game.proving.core.html
--- a/docs/codox/cc.journeyman.the-great-game.proving.sketches.html
+++ b/docs/codox/cc.journeyman.the-great-game.proving.sketches.html
--- a/docs/codox/cc.journeyman.the-great-game.time.html
+++ b/docs/codox/cc.journeyman.the-great-game.time.html
--- a/docs/codox/cc.journeyman.the-great-game.utils.html
+++ b/docs/codox/cc.journeyman.the-great-game.utils.html
--- a/docs/codox/cc.journeyman.the-great-game.world.heightmap.html
+++ b/docs/codox/cc.journeyman.the-great-game.world.heightmap.html
--- a/docs/codox/cc.journeyman.the-great-game.world.location.html
+++ b/docs/codox/cc.journeyman.the-great-game.world.location.html
--- a/docs/codox/cc.journeyman.the-great-game.world.mw.html
+++ b/docs/codox/cc.journeyman.the-great-game.world.mw.html
--- a/docs/codox/cc.journeyman.the-great-game.world.routes.html
+++ b/docs/codox/cc.journeyman.the-great-game.world.routes.html
--- a/docs/codox/cc.journeyman.the-great-game.world.world.html
+++ b/docs/codox/cc.journeyman.the-great-game.world.world.html
--- a/docs/codox/index.html
+++ b/docs/codox/index.html
--- a/docs/codox/intro.html
+++ b/docs/codox/intro.html
--- a/project.clj
+++ b/project.clj
@ -11,21 +11,14 @@
          :output-path "docs/codox"
          :source-uri "https://github.com/simon-brooke/the-great-game/blob/master/{filepath}#L{line}"}
  :cucumber-feature-paths ["test/features/"]
-  :dependencies [
-  ;; sadly it seems SQL Korma is dead. I'm experimenting with Honey SQL, 
+  :dependencies [;; sadly it seems SQL Korma is dead. I'm experimenting with Honey SQL, 
  ;; but this is not a final decision yet.
                 [com.github.seancorfield/honeysql "2.6.1126"]
                 [com.github.seancorfield/next.jdbc "1.3.925"]
-<<<<<<< HEAD
-                 [com.simsilica/lemur "1.16.1-SNAPSHOT"]
-                 [com.simsilica/sim-arboreal "1.0.1-SNAPSHOT"]
-                 ;; [com.taoensso/timbre "6.5.0"]
-                 [com.taoensso/telemere "1.0.0-beta3"] ;; Peter Taoussanis' new replacement for Timbre
-=======
                 [com.simsilica/lemur "1.16.0"]
-                 ;; [com.simsilica/sim-arboreal "1.0.1-SNAPSHOT"]
-                 [com.taoensso/timbre "6.5.0"]
->>>>>>> develop
+                 [com.simsilica/sim-arboreal "1.0.1-SNAPSHOT"]
+                                  ;; [com.taoensso/timbre "6.5.0"]
+                 [com.taoensso/telemere "1.0.0-beta3"] ;; Peter Taoussanis' new replacement for Timbre 
                 [environ "1.2.0"]
                 [hiccup "2.0.0-RC3"]
                 [jme-clj "0.1.13"]
--- a/src/clj/cc/journeyman/the_great_game/character/character.clj
+++ b/src/clj/cc/journeyman/the_great_game/character/character.clj
@ -5,7 +5,7 @@
   to mean a special character who is part of the news-passing network."
  (:require [cc.journeyman.the-great-game.gossip.gossip :refer [dialogue]]
            [cc.journeyman.the-great-game.agent.agent :refer [ProtoAgent]]
-            [cc.journeyman.the-great-game.character.container :refer [ProtoContainer]]
+            [cc.journeyman.the-great-game.objects.container :refer [ProtoContainer]]
            [clojure.string :as cs :only [join]])
  (:import [clojure.lang IPersistentMap]))

--- a/src/clj/cc/journeyman/the_great_game/merchants/strategies/simple.clj
+++ b/src/clj/cc/journeyman/the_great_game/merchants/strategies/simple.clj
@ -6,7 +6,7 @@
  and sells it there. If there is no commodity locally which can be traded
  profitably, moves towards home with no cargo. If at home and no commodity
  can be traded profitably, does not move."
-  (:require [taoensso.telemere.timbre :as l :refer [info error spy]]
+  (:require [taoensso.telemere.timbre :as l :refer [info error]]
            [cc.journeyman.the-great-game.utils :refer [deep-merge]]
            [cc.journeyman.the-great-game.gossip.gossip :refer [move-gossip]]
            [cc.journeyman.the-great-game.merchants.planning :refer [augment-plan plan-trade select-cargo]]