Auto stash before merge of "develop" and "origin/develop"

This commit is contained in:
Simon Brooke 2024-04-23 00:47:07 +01:00
parent cb28151712
commit 9aa161725b
4 changed files with 66 additions and 10 deletions

View file

View file

@ -4,6 +4,32 @@
(:require [cc.journeyman.the-great-game.objects.game-object :refer [ProtoObject]] (:require [cc.journeyman.the-great-game.objects.game-object :refer [ProtoObject]]
[cc.journeyman.the-great-game.objects.container :refer [ProtoContainer contents is-empty?]])) [cc.journeyman.the-great-game.objects.container :refer [ProtoContainer contents is-empty?]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
;;;; Agents: things with agency.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License
;;;; as published by the Free Software Foundation; either version 2
;;;; of the License, or (at your option) any later version.
;;;;
;;;; This program is distributed in the hope that it will be useful,
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;;; GNU General Public License for more details.
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this program; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
;;;; USA.
;;;;
;;;; SPDX-FileCopyrightText: 2024 Simon Brooke <simon@journeyman.cc>
;;;; SPDX-License-Identifier: GPL-2.0-or-later
;;;;
;;;; Copyright (C) 2024 Simon Brooke
;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; hierarchy of needs probably gets implemented here ;;; hierarchy of needs probably gets implemented here
;;; I'm probably going to want to defprotocol stuff, to define the hierarchy ;;; I'm probably going to want to defprotocol stuff, to define the hierarchy
;;; of things in the gameworld; either that or drop to Java, wich I'd rather not do. ;;; of things in the gameworld; either that or drop to Java, wich I'd rather not do.

View file

@ -2,6 +2,33 @@
"Schedules of plans for actors in the game, in order that they may have "Schedules of plans for actors in the game, in order that they may have
daily and seasonal patterns of behaviour.") daily and seasonal patterns of behaviour.")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
;;;; Schedules: things agents plan to do.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License
;;;; as published by the Free Software Foundation; either version 2
;;;; of the License, or (at your option) any later version.
;;;;
;;;; This program is distributed in the hope that it will be useful,
;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;;;; GNU General Public License for more details.
;;;;
;;;; You should have received a copy of the GNU General Public License
;;;; along with this program; if not, write to the Free Software
;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
;;;; USA.
;;;;
;;;; SPDX-FileCopyrightText: 2024 Simon Brooke <simon@journeyman.cc>
;;;; SPDX-License-Identifier: GPL-2.0-or-later
;;;;
;;;; Copyright (C) 2024 Simon Brooke
;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; TODO: I don't have a good handle yet on when a new scheduled task can ;; TODO: I don't have a good handle yet on when a new scheduled task can
;; interrupt an existing scheduled task. It's highly undesirable that ;; interrupt an existing scheduled task. It's highly undesirable that
;; uncompleted scheduled tasks should be left on the queue. The simplest ;; uncompleted scheduled tasks should be left on the queue. The simplest

View file

@ -1,26 +1,29 @@
{ {
"folders": [ "folders": [
{ {
"path": "../GreatGameTerrain" "path": "../biome"
}, }
{ {
"path": "../walkmap" "path": "../GreatGameTerrain"
}, },
{ {
"path": "../jme-clj" "path": "../jme-clj"
}, },
{
"path": "../MicroWorld/mw-parser"
},
{ {
"path": "../MicroWorld/mw-engine" "path": "../MicroWorld/mw-engine"
}, },
{
"path": "."
},
{
"path": "../test-graphs"
},
{ {
"path": "../speechio" "path": "../speechio"
}, },
{
"path": "." /* the great game itself */
},
{
"path": "../walkmap"
},
{ {
"path": "../wherefore-art-thou" "path": "../wherefore-art-thou"
}, },