changes to PyVector, UICaption, UIEntity, and UIGrid. They seem minor, but I can't remember what I was working on. They're going to be shipped with 7DRL, so I figured I better get them in branch.

CMakeLists.txt

@@ -46,7 +46,7 @@ endif()
 
 # Add the directory where the linker should look for the libraries
 #link_directories(${CMAKE_SOURCE_DIR}/deps_linux)
-link_directories(${CMAKE_SOURCE_DIR}/__lib)
+link_directories(${CMAKE_SOURCE_DIR}/lib)
 
 # Define the executable target before linking libraries
 add_executable(mcrogueface ${SOURCES})
@@ -67,9 +67,9 @@ add_custom_command(TARGET mcrogueface POST_BUILD
 # Copy Python standard library to build directory
 add_custom_command(TARGET mcrogueface POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy_directory
-    ${CMAKE_SOURCE_DIR}/__lib $<TARGET_FILE_DIR:mcrogueface>/lib)
+    ${CMAKE_SOURCE_DIR}/lib $<TARGET_FILE_DIR:mcrogueface>/lib)
 
 # rpath for including shared libraries
 set_target_properties(mcrogueface PROPERTIES
-                      INSTALL_RPATH "$ORIGIN/./lib")
+                      INSTALL_RPATH "./lib")
 

src/McRFPy_API.cpp

@@ -84,15 +84,9 @@ PyObject* PyInit_mcrfpy()
     auto t = pytypes[i];
     while (t != nullptr)
     {
-        std::cout << "Registering type: " << t->tp_name << std::endl;
-        if (PyType_Ready(t) < 0) {
-            std::cout << "ERROR: PyType_Ready failed for " << t->tp_name << std::endl;
-            return NULL;
-        }
-        std::cout << "  tp_alloc after PyType_Ready: " << (void*)t->tp_alloc << std::endl;
+        /*std::cout << */ PyType_Ready(t); /*<< std::endl; */
         PyModule_AddType(m, t);
-        i++;
-        t = pytypes[i];
+        t = pytypes[i++];
     }
 
     // Add default_font and default_texture to module
@@ -257,7 +251,7 @@ PyObject* McRFPy_API::_registerInputAction(PyObject *self, PyObject *args)
         std::cout << "Unregistering\n";
         success = game->currentScene()->unregisterActionInjected(action_code, std::string(actionstr) + "_py");
     } else {
-        std::cout << "Registering " << actionstr << "_py to " << action_code << "\n";
+        std::cout << "Registering" << actionstr << "_py to " << action_code << "\n";
         success = game->currentScene()->registerActionInjected(action_code, std::string(actionstr) + "_py");
     }
     

src/PyColor.cpp

@@ -1,7 +1,5 @@
 #include "PyColor.h"
 #include "McRFPy_API.h"
-#include "PyObjectUtils.h"
-#include "PyRAII.h"
 
 PyGetSetDef PyColor::getsetters[] = {
     {"r", (getter)PyColor::get_member, (setter)PyColor::set_member, "Red component",   (void*)0},
@@ -16,16 +14,11 @@ PyColor::PyColor(sf::Color target)
 
 PyObject* PyColor::pyObject()
 {
-    PyTypeObject* type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Color");
-    if (!type) return nullptr;
-    
-    PyColorObject* obj = (PyColorObject*)type->tp_alloc(type, 0);
-    Py_DECREF(type);
-    
-    if (obj) {
-        obj->data = data;
-    }
-    return (PyObject*)obj;
+    PyObject* obj = PyType_GenericAlloc(&mcrfpydef::PyColorType, 0);
+    Py_INCREF(obj);
+    PyColorObject* self = (PyColorObject*)obj;
+    self->data = data;
+    return obj;
 }
 
 sf::Color PyColor::fromPy(PyObject* obj)
@@ -145,30 +138,13 @@ int PyColor::set_member(PyObject* obj, PyObject* value, void* closure)
 
 PyColorObject* PyColor::from_arg(PyObject* args)
 {
-    // Use RAII for type reference management
-    PyRAII::PyTypeRef type("Color", McRFPy_API::mcrf_module);
-    if (!type) {
-        return NULL;
-    }
-    
-    // Check if args is already a Color instance
-    if (PyObject_IsInstance(args, (PyObject*)type.get())) {
-        return (PyColorObject*)args;
-    }
-    
-    // Create new Color object using RAII
-    PyRAII::PyObjectRef obj(type->tp_alloc(type.get(), 0), true);
-    if (!obj) {
-        return NULL;
-    }
-    
-    // Initialize the object
-    int err = init((PyColorObject*)obj.get(), args, NULL);
+    auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Color");
+    if (PyObject_IsInstance(args, (PyObject*)type)) return (PyColorObject*)args;
+    auto obj = (PyColorObject*)type->tp_alloc(type, 0);
+    int err = init(obj, args, NULL);
     if (err) {
-        // obj will be automatically cleaned up when it goes out of scope
+        Py_DECREF(obj);
         return NULL;
     }
-    
-    // Release ownership and return
-    return (PyColorObject*)obj.release();
+    return obj;
 }

src/PyColor.h

@@ -34,7 +34,6 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyColorType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
         .tp_name = "mcrfpy.Color",
         .tp_basicsize = sizeof(PyColorObject),
         .tp_itemsize = 0,

src/PyFont.h

@@ -25,7 +25,6 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyFontType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
         .tp_name = "mcrfpy.Font",
         .tp_basicsize = sizeof(PyFontObject),
         .tp_itemsize = 0,

src/PyObjectUtils.h

@@ -1,76 +0,0 @@
-#pragma once
-#include "Common.h"
-#include "Python.h"
-#include "McRFPy_API.h"
-#include "PyRAII.h"
-
-namespace PyObjectUtils {
-    
-    // Template for getting Python type object from module
-    template<typename T>
-    PyTypeObject* getPythonType(const char* typeName) {
-        PyTypeObject* type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, typeName);
-        if (!type) {
-            PyErr_Format(PyExc_RuntimeError, "Could not find %s type in module", typeName);
-        }
-        return type;
-    }
-    
-    // Generic function to create a Python object of given type
-    inline PyObject* createPyObjectGeneric(const char* typeName) {
-        PyTypeObject* type = getPythonType<void>(typeName);
-        if (!type) return nullptr;
-        
-        PyObject* obj = type->tp_alloc(type, 0);
-        Py_DECREF(type);
-        
-        return obj;
-    }
-    
-    // Helper function to allocate and initialize a Python object with data
-    template<typename PyObjType, typename DataType>
-    PyObject* createPyObjectWithData(const char* typeName, DataType data) {
-        PyTypeObject* type = getPythonType<void>(typeName);
-        if (!type) return nullptr;
-        
-        PyObjType* obj = (PyObjType*)type->tp_alloc(type, 0);
-        Py_DECREF(type);
-        
-        if (obj) {
-            obj->data = data;
-        }
-        return (PyObject*)obj;
-    }
-    
-    // Function to convert UIDrawable to appropriate Python object
-    // This is moved to UICollection.cpp to avoid circular dependencies
-    
-    // RAII-based object creation example
-    inline PyObject* createPyObjectGenericRAII(const char* typeName) {
-        PyRAII::PyTypeRef type(typeName, McRFPy_API::mcrf_module);
-        if (!type) {
-            PyErr_Format(PyExc_RuntimeError, "Could not find %s type in module", typeName);
-            return nullptr;
-        }
-        
-        PyObject* obj = type->tp_alloc(type.get(), 0);
-        // Return the new reference (caller owns it)
-        return obj;
-    }
-    
-    // Example of using PyObjectRef for safer reference management
-    template<typename PyObjType, typename DataType>
-    PyObject* createPyObjectWithDataRAII(const char* typeName, DataType data) {
-        PyRAII::PyObjectRef obj = PyRAII::createObject<PyObjType>(typeName, McRFPy_API::mcrf_module);
-        if (!obj) {
-            PyErr_Format(PyExc_RuntimeError, "Could not create %s object", typeName);
-            return nullptr;
-        }
-        
-        // Access the object through the RAII wrapper
-        ((PyObjType*)obj.get())->data = data;
-        
-        // Release ownership to return to Python
-        return obj.release();
-    }
-}

src/PyRAII.h

@@ -1,138 +0,0 @@
-#pragma once
-#include "Python.h"
-#include <utility>
-
-namespace PyRAII {
-    
-    // RAII wrapper for PyObject* that automatically manages reference counting
-    class PyObjectRef {
-    private:
-        PyObject* ptr;
-        
-    public:
-        // Constructors
-        PyObjectRef() : ptr(nullptr) {}
-        
-        explicit PyObjectRef(PyObject* p, bool steal_ref = false) : ptr(p) {
-            if (ptr && !steal_ref) {
-                Py_INCREF(ptr);
-            }
-        }
-        
-        // Copy constructor
-        PyObjectRef(const PyObjectRef& other) : ptr(other.ptr) {
-            if (ptr) {
-                Py_INCREF(ptr);
-            }
-        }
-        
-        // Move constructor  
-        PyObjectRef(PyObjectRef&& other) noexcept : ptr(other.ptr) {
-            other.ptr = nullptr;
-        }
-        
-        // Destructor
-        ~PyObjectRef() {
-            Py_XDECREF(ptr);
-        }
-        
-        // Copy assignment
-        PyObjectRef& operator=(const PyObjectRef& other) {
-            if (this != &other) {
-                Py_XDECREF(ptr);
-                ptr = other.ptr;
-                if (ptr) {
-                    Py_INCREF(ptr);
-                }
-            }
-            return *this;
-        }
-        
-        // Move assignment
-        PyObjectRef& operator=(PyObjectRef&& other) noexcept {
-            if (this != &other) {
-                Py_XDECREF(ptr);
-                ptr = other.ptr;
-                other.ptr = nullptr;
-            }
-            return *this;
-        }
-        
-        // Access operators
-        PyObject* get() const { return ptr; }
-        PyObject* operator->() const { return ptr; }
-        PyObject& operator*() const { return *ptr; }
-        operator bool() const { return ptr != nullptr; }
-        
-        // Release ownership (for returning to Python)
-        PyObject* release() {
-            PyObject* temp = ptr;
-            ptr = nullptr;
-            return temp;
-        }
-        
-        // Reset with new pointer
-        void reset(PyObject* p = nullptr, bool steal_ref = false) {
-            if (p != ptr) {
-                Py_XDECREF(ptr);
-                ptr = p;
-                if (ptr && !steal_ref) {
-                    Py_INCREF(ptr);
-                }
-            }
-        }
-    };
-    
-    // Helper class for managing PyTypeObject* references from module lookups
-    class PyTypeRef {
-    private:
-        PyTypeObject* type;
-        
-    public:
-        PyTypeRef() : type(nullptr) {}
-        
-        explicit PyTypeRef(const char* typeName, PyObject* module) {
-            type = (PyTypeObject*)PyObject_GetAttrString(module, typeName);
-            // GetAttrString returns a new reference, so we own it
-        }
-        
-        ~PyTypeRef() {
-            Py_XDECREF((PyObject*)type);
-        }
-        
-        // Delete copy operations to prevent accidental reference issues
-        PyTypeRef(const PyTypeRef&) = delete;
-        PyTypeRef& operator=(const PyTypeRef&) = delete;
-        
-        // Allow move operations
-        PyTypeRef(PyTypeRef&& other) noexcept : type(other.type) {
-            other.type = nullptr;
-        }
-        
-        PyTypeRef& operator=(PyTypeRef&& other) noexcept {
-            if (this != &other) {
-                Py_XDECREF((PyObject*)type);
-                type = other.type;
-                other.type = nullptr;
-            }
-            return *this;
-        }
-        
-        PyTypeObject* get() const { return type; }
-        PyTypeObject* operator->() const { return type; }
-        operator bool() const { return type != nullptr; }
-    };
-    
-    // Convenience function to create a new object with RAII
-    template<typename PyObjType>
-    PyObjectRef createObject(const char* typeName, PyObject* module) {
-        PyTypeRef type(typeName, module);
-        if (!type) {
-            return PyObjectRef();
-        }
-        
-        PyObject* obj = type->tp_alloc(type.get(), 0);
-        // tp_alloc returns a new reference, so we steal it
-        return PyObjectRef(obj, true);
-    }
-}

src/PyScene.cpp

@@ -11,8 +11,7 @@ PyScene::PyScene(GameEngine* g) : Scene(g)
     registerAction(ActionCode::MOUSEWHEEL + ActionCode::WHEEL_DEL, "wheel_up");
     registerAction(ActionCode::MOUSEWHEEL + ActionCode::WHEEL_NEG + ActionCode::WHEEL_DEL, "wheel_down");
 
-    // console (` / ~ key) - don't hard code.
-    //registerAction(ActionCode::KEY + sf::Keyboard::Grave, "debug_menu");
+    registerAction(ActionCode::KEY + sf::Keyboard::Grave, "debug_menu");
 }
 
 void PyScene::update()

src/PyTexture.cpp

@@ -28,6 +28,7 @@ sf::Sprite PyTexture::sprite(int index, sf::Vector2f pos,  sf::Vector2f s)
 
 PyObject* PyTexture::pyObject()
 {
+    std::cout << "Find type" << std::endl;
     auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Texture");
     PyObject* obj = PyTexture::pynew(type, Py_None, Py_None);
 

src/PyTexture.h

@@ -29,7 +29,6 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyTextureType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
         .tp_name = "mcrfpy.Texture",
         .tp_basicsize = sizeof(PyTextureObject),
         .tp_itemsize = 0,

src/PyVector.cpp

@@ -1,5 +1,4 @@
 #include "PyVector.h"
-#include "PyObjectUtils.h"
 
 PyGetSetDef PyVector::getsetters[] = {
     {"x", (getter)PyVector::get_member, (setter)PyVector::set_member, "X/horizontal component",   (void*)0},
@@ -12,16 +11,11 @@ PyVector::PyVector(sf::Vector2f target)
 
 PyObject* PyVector::pyObject()
 {
-    PyTypeObject* type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Vector");
-    if (!type) return nullptr;
-    
-    PyVectorObject* obj = (PyVectorObject*)type->tp_alloc(type, 0);
-    Py_DECREF(type);
-    
-    if (obj) {
-        obj->data = data;
-    }
-    return (PyObject*)obj;
+    PyObject* obj = PyType_GenericAlloc(&mcrfpydef::PyVectorType, 0);
+    Py_INCREF(obj);
+    PyVectorObject* self = (PyVectorObject*)obj;
+    self->data = data;
+    return obj;
 }
 
 sf::Vector2f PyVector::fromPy(PyObject* obj)

src/PyVector.h

@@ -30,7 +30,6 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyVectorType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
         .tp_name = "mcrfpy.Vector",
         .tp_basicsize = sizeof(PyVectorObject),
         .tp_itemsize = 0,

src/UICaption.cpp

@@ -249,7 +249,7 @@ int UICaption::init(PyUICaptionObject* self, PyObject* args, PyObject* kwds)
     self->data->text.setPosition(pos_result->data);
     // check types for font, fill_color, outline_color
 
-    //std::cout << PyUnicode_AsUTF8(PyObject_Repr(font)) << std::endl;
+    std::cout << PyUnicode_AsUTF8(PyObject_Repr(font)) << std::endl;
     if (font != NULL && !PyObject_IsInstance(font, PyObject_GetAttrString(McRFPy_API::mcrf_module, "Font")/*(PyObject*)&PyFontType)*/)){
         PyErr_SetString(PyExc_TypeError, "font must be a mcrfpy.Font instance");
         return -1;

src/UICaption.h

@@ -27,7 +27,6 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUICaptionType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
         .tp_name = "mcrfpy.Caption",
         .tp_basicsize = sizeof(PyUICaptionObject),
         .tp_itemsize = 0,

src/UICollection.cpp

@@ -5,76 +5,9 @@
 #include "UISprite.h"
 #include "UIGrid.h"
 #include "McRFPy_API.h"
-#include "PyObjectUtils.h"
 
 using namespace mcrfpydef;
 
-// Local helper function to convert UIDrawable to appropriate Python object
-static PyObject* convertDrawableToPython(std::shared_ptr<UIDrawable> drawable) {
-    if (!drawable) {
-        Py_RETURN_NONE;
-    }
-    
-    PyTypeObject* type = nullptr;
-    PyObject* obj = nullptr;
-    
-    switch (drawable->derived_type()) {
-        case PyObjectsEnum::UIFRAME:
-        {
-            type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Frame");
-            if (!type) return nullptr;
-            auto pyObj = (PyUIFrameObject*)type->tp_alloc(type, 0);
-            if (pyObj) {
-                pyObj->data = std::static_pointer_cast<UIFrame>(drawable);
-            }
-            obj = (PyObject*)pyObj;
-            break;
-        }
-        case PyObjectsEnum::UICAPTION:
-        {
-            type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Caption");
-            if (!type) return nullptr;
-            auto pyObj = (PyUICaptionObject*)type->tp_alloc(type, 0);
-            if (pyObj) {
-                pyObj->data = std::static_pointer_cast<UICaption>(drawable);
-                pyObj->font = nullptr;
-            }
-            obj = (PyObject*)pyObj;
-            break;
-        }
-        case PyObjectsEnum::UISPRITE:
-        {
-            type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Sprite");
-            if (!type) return nullptr;
-            auto pyObj = (PyUISpriteObject*)type->tp_alloc(type, 0);
-            if (pyObj) {
-                pyObj->data = std::static_pointer_cast<UISprite>(drawable);
-            }
-            obj = (PyObject*)pyObj;
-            break;
-        }
-        case PyObjectsEnum::UIGRID:
-        {
-            type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Grid");
-            if (!type) return nullptr;
-            auto pyObj = (PyUIGridObject*)type->tp_alloc(type, 0);
-            if (pyObj) {
-                pyObj->data = std::static_pointer_cast<UIGrid>(drawable);
-            }
-            obj = (PyObject*)pyObj;
-            break;
-        }
-        default:
-            PyErr_SetString(PyExc_TypeError, "Unknown UIDrawable derived type");
-            return nullptr;
-    }
-    
-    if (type) {
-        Py_DECREF(type);
-    }
-    return obj;
-}
-
 int UICollectionIter::init(PyUICollectionIterObject* self, PyObject* args, PyObject* kwds)
 {
     PyErr_SetString(PyExc_TypeError, "UICollection cannot be instantiated: a C++ data source is required.");
@@ -83,12 +16,6 @@ int UICollectionIter::init(PyUICollectionIterObject* self, PyObject* args, PyObj
 
 PyObject* UICollectionIter::next(PyUICollectionIterObject* self)
 {
-    // Check if self and self->data are valid
-    if (!self || !self->data) {
-        PyErr_SetString(PyExc_RuntimeError, "Iterator object or data is null");
-        return NULL;
-    }
-    
     if (self->data->size() != self->start_size)
     {
         PyErr_SetString(PyExc_RuntimeError, "collection changed size during iteration");
@@ -108,8 +35,9 @@ PyObject* UICollectionIter::next(PyUICollectionIterObject* self)
         return NULL;
     }
     auto target = (*vec)[self->index-1];
-    // Return the proper Python object for this UIDrawable
-    return convertDrawableToPython(target);
+    // TODO build PyObject* of the correct UIDrawable subclass to return
+    //return py_instance(target);
+    return NULL;
 }
 
 PyObject* UICollectionIter::repr(PyUICollectionIterObject* self)
@@ -143,7 +71,8 @@ PyObject* UICollection::getitem(PyUICollectionObject* self, Py_ssize_t index) {
         return NULL;
     }
     auto target = (*vec)[index];
-    return convertDrawableToPython(target);
+    RET_PY_INSTANCE(target);
+return NULL;
 
 
 }
@@ -260,18 +189,9 @@ int UICollection::init(PyUICollectionObject* self, PyObject* args, PyObject* kwd
 
 PyObject* UICollection::iter(PyUICollectionObject* self)
 {
-    // Get the iterator type from the module to ensure we have the registered version
-    PyTypeObject* iterType = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "UICollectionIter");
-    if (!iterType) {
-        PyErr_SetString(PyExc_RuntimeError, "Could not find UICollectionIter type in module");
-        return NULL;
-    }
-    
-    // Allocate new iterator instance
-    PyUICollectionIterObject* iterObj = (PyUICollectionIterObject*)iterType->tp_alloc(iterType, 0);
-    
+    PyUICollectionIterObject* iterObj;
+    iterObj = (PyUICollectionIterObject*)PyUICollectionIterType.tp_alloc(&PyUICollectionIterType, 0);
     if (iterObj == NULL) {
-        Py_DECREF(iterType);
         return NULL;  // Failed to allocate memory for the iterator object
     }
 
@@ -279,6 +199,5 @@ PyObject* UICollection::iter(PyUICollectionObject* self)
     iterObj->index = 0;
     iterObj->start_size = self->data->size();
 
-    Py_DECREF(iterType);
     return (PyObject*)iterObj;
 }

src/UICollection.h

@@ -30,7 +30,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUICollectionIterType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.UICollectionIter",
         .tp_basicsize = sizeof(PyUICollectionIterObject),
         .tp_itemsize = 0,
@@ -44,11 +44,9 @@ namespace mcrfpydef {
         .tp_repr = (reprfunc)UICollectionIter::repr,
         .tp_flags = Py_TPFLAGS_DEFAULT,
         .tp_doc = PyDoc_STR("Iterator for a collection of UI objects"),
-        .tp_iter = PyObject_SelfIter,
         .tp_iternext = (iternextfunc)UICollectionIter::next,
         //.tp_getset = PyUICollection_getset,
         .tp_init = (initproc)UICollectionIter::init, // just raise an exception
-        .tp_alloc = PyType_GenericAlloc,
         //TODO - as static method, not inline lambda def, please
         .tp_new = [](PyTypeObject* type, PyObject* args, PyObject* kwds) -> PyObject*
         {
@@ -58,7 +56,7 @@ namespace mcrfpydef {
     };
 
 	static PyTypeObject PyUICollectionType = {
-		.ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+		//PyVarObject_/HEAD_INIT(NULL, 0)
 		.tp_name = "mcrfpy.UICollection",
 		.tp_basicsize = sizeof(PyUICollectionObject),
 		.tp_itemsize = 0,

src/UIDrawable.h

@@ -57,9 +57,59 @@ typedef struct {
 } PyUICollectionIterObject;
 
 namespace mcrfpydef {
-    // DEPRECATED: RET_PY_INSTANCE macro has been replaced with template functions in PyObjectUtils.h
-    // The macro was difficult to debug and used static type references that could cause initialization order issues.
-    // Use PyObjectUtils::convertDrawableToPython() or PyObjectUtils::createPyObject<T>() instead.
+    //PyObject* py_instance(std::shared_ptr<UIDrawable> source);
+    // This function segfaults on tp_alloc for an unknown reason, but works inline with mcrfpydef:: methods.
+
+#define RET_PY_INSTANCE(target) {                       \
+switch (target->derived_type())                         \
+{                                                       \
+    case PyObjectsEnum::UIFRAME:                        \
+    {                                                   \
+        PyUIFrameObject* o = (PyUIFrameObject*)((&PyUIFrameType)->tp_alloc(&PyUIFrameType, 0)); \
+        if (o)                                          \
+        {                                               \
+            auto p = std::static_pointer_cast<UIFrame>(target); \
+            o->data = p;                                \
+            auto utarget = o->data;                     \
+        }                                               \
+        return (PyObject*)o;                            \
+    }                                                   \
+    case PyObjectsEnum::UICAPTION:                        \
+    {                                                   \
+        PyUICaptionObject* o = (PyUICaptionObject*)((&PyUICaptionType)->tp_alloc(&PyUICaptionType, 0)); \
+        if (o)                                          \
+        {                                               \
+            auto p = std::static_pointer_cast<UICaption>(target); \
+            o->data = p;                                \
+            auto utarget = o->data;                     \
+        }                                               \
+        return (PyObject*)o;                            \
+    }                                                   \
+    case PyObjectsEnum::UISPRITE:                        \
+    {                                                   \
+        PyUISpriteObject* o = (PyUISpriteObject*)((&PyUISpriteType)->tp_alloc(&PyUISpriteType, 0)); \
+        if (o)                                          \
+        {                                               \
+            auto p = std::static_pointer_cast<UISprite>(target); \
+            o->data = p;                                \
+            auto utarget = o->data;                     \
+        }                                               \
+        return (PyObject*)o;                            \
+    }                                                   \
+    case PyObjectsEnum::UIGRID:                        \
+    {                                                   \
+        PyUIGridObject* o = (PyUIGridObject*)((&PyUIGridType)->tp_alloc(&PyUIGridType, 0)); \
+        if (o)                                          \
+        {                                               \
+            auto p = std::static_pointer_cast<UIGrid>(target); \
+            o->data = p;                                \
+            auto utarget = o->data;                     \
+        }                                               \
+        return (PyObject*)o;                            \
+    }                                                   \
+}                                                       \
+}
+// end macro definition
 
 //TODO: add this method to class scope; move implementation to .cpp file
 /*

src/UIEntity.cpp

@@ -1,7 +1,6 @@
 #include "UIEntity.h"
 #include "UIGrid.h"
 #include "McRFPy_API.h"
-#include "PyObjectUtils.h"
 
 UIEntity::UIEntity() {} // this will not work lol. TODO remove default constructor by finding the shared pointer inits that use it
 
@@ -130,9 +129,7 @@ sf::Vector2i PyObject_to_sfVector2i(PyObject* obj) {
 
 // TODO - deprecate / remove this helper
 PyObject* UIGridPointState_to_PyObject(const UIGridPointState& state) {
-    // This function is incomplete - it creates an empty object without setting state data
-    // Should use PyObjectUtils::createGridPointState() instead
-    return PyObjectUtils::createPyObjectGeneric("GridPointState");
+    return PyObject_New(PyObject, (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "GridPointState"));
 }
 
 PyObject* UIGridPointStateVector_to_PyList(const std::vector<UIGridPointState>& vec) {

src/UIEntity.h

@@ -61,7 +61,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUIEntityType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.Entity",
         .tp_basicsize = sizeof(PyUIEntityObject),
         .tp_itemsize = 0,

src/UIFrame.h

@@ -46,7 +46,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUIFrameType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.Frame",
         .tp_basicsize = sizeof(PyUIFrameObject),
         .tp_itemsize = 0,

src/UIGrid.cpp

@@ -487,17 +487,14 @@ PyObject* UIEntityCollectionIter::next(PyUIEntityCollectionIterObject* self)
         PyErr_SetString(PyExc_RuntimeError, "the collection store returned a null pointer");
         return NULL;
     }
-    // Advance list iterator since Entities are stored in a list, not a vector
-    auto l_begin = (*vec).begin();
-    std::advance(l_begin, self->index-1);
-    auto target = *l_begin;
-    
-    // Create and return a Python Entity object
-    auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "Entity");
-    auto o = (PyUIEntityObject*)type->tp_alloc(type, 0);
-    auto p = std::static_pointer_cast<UIEntity>(target);
-    o->data = p;
-    return (PyObject*)o;
+    // Advance list iterator since Entities are not stored in a vector (if this code even worked)
+    // vectors only: //auto target = (*vec)[self->index-1];
+    //auto l_front = (*vec).begin();
+    //std::advance(l_front, self->index-1);
+
+    // TODO build PyObject* of the correct UIDrawable subclass to return
+    //return py_instance(target);
+    return NULL;
 }
 
 PyObject* UIEntityCollectionIter::repr(PyUIEntityCollectionIterObject* self)
@@ -628,18 +625,11 @@ int UIEntityCollection::init(PyUIEntityCollectionObject* self, PyObject* args, P
 
 PyObject* UIEntityCollection::iter(PyUIEntityCollectionObject* self)
 {
-    // Get the iterator type from the module to ensure we have the registered version
-    PyTypeObject* iterType = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "UIEntityCollectionIter");
-    if (!iterType) {
-        PyErr_SetString(PyExc_RuntimeError, "Could not find UIEntityCollectionIter type in module");
-        return NULL;
-    }
-    
-    // Allocate new iterator instance
-    PyUIEntityCollectionIterObject* iterObj = (PyUIEntityCollectionIterObject*)iterType->tp_alloc(iterType, 0);
-    
+    //PyUIEntityCollectionIterObject* iterObj;
+    //iterObj = (PyUIEntityCollectionIterObject*)PyUIEntityCollectionIterType.tp_alloc(&PyUIEntityCollectionIterType, 0);
+    auto type = (PyTypeObject*)PyObject_GetAttrString(McRFPy_API::mcrf_module, "EntityCollectionIter");
+    auto iterObj = (PyUIEntityCollectionIterObject*)type->tp_alloc(type, 0);
     if (iterObj == NULL) {
-        Py_DECREF(iterType);
         return NULL;  // Failed to allocate memory for the iterator object
     }
 
@@ -647,6 +637,5 @@ PyObject* UIEntityCollection::iter(PyUIEntityCollectionObject* self)
     iterObj->index = 0;
     iterObj->start_size = self->data->size();
 
-    Py_DECREF(iterType);
     return (PyObject*)iterObj;
 }

src/UIGrid.h

@@ -99,7 +99,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUIGridType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.Grid",
         .tp_basicsize = sizeof(PyUIGridObject),
         .tp_itemsize = 0,
@@ -130,8 +130,8 @@ namespace mcrfpydef {
     };
 
     static PyTypeObject PyUIEntityCollectionIterType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
-        .tp_name = "mcrfpy.UIEntityCollectionIter",
+        //PyVarObject_HEAD_INIT(NULL, 0)
+        .tp_name = "mcrfpy.UICollectionIter",
         .tp_basicsize = sizeof(PyUIEntityCollectionIterObject),
         .tp_itemsize = 0,
         .tp_dealloc = (destructor)[](PyObject* self)
@@ -143,11 +143,9 @@ namespace mcrfpydef {
         .tp_repr = (reprfunc)UIEntityCollectionIter::repr,
         .tp_flags = Py_TPFLAGS_DEFAULT,
         .tp_doc = PyDoc_STR("Iterator for a collection of UI objects"),
-        .tp_iter = PyObject_SelfIter,
         .tp_iternext = (iternextfunc)UIEntityCollectionIter::next,
         //.tp_getset = UIEntityCollection::getset,
         .tp_init = (initproc)UIEntityCollectionIter::init, // just raise an exception
-        .tp_alloc = PyType_GenericAlloc,
         .tp_new = [](PyTypeObject* type, PyObject* args, PyObject* kwds) -> PyObject*
         {
             PyErr_SetString(PyExc_TypeError, "UICollection cannot be instantiated: a C++ data source is required.");
@@ -156,7 +154,7 @@ namespace mcrfpydef {
     };
 
     static PyTypeObject PyUIEntityCollectionType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_/HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.EntityCollection",
         .tp_basicsize = sizeof(PyUIEntityCollectionObject),
         .tp_itemsize = 0,

src/UIGridPoint.h

@@ -66,7 +66,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUIGridPointType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.GridPoint",
         .tp_basicsize = sizeof(PyUIGridPointObject),
         .tp_itemsize = 0,
@@ -79,7 +79,7 @@ namespace mcrfpydef {
     };
 
     static PyTypeObject PyUIGridPointStateType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.GridPointState",
         .tp_basicsize = sizeof(PyUIGridPointStateObject),
         .tp_itemsize = 0,

src/UISprite.h

@@ -57,7 +57,7 @@ public:
 
 namespace mcrfpydef {
     static PyTypeObject PyUISpriteType = {
-        .ob_base = {.ob_base = {.ob_refcnt = 1, .ob_type = NULL}, .ob_size = 0},
+        //PyVarObject_HEAD_INIT(NULL, 0)
         .tp_name = "mcrfpy.Sprite",
         .tp_basicsize = sizeof(PyUISpriteObject),
         .tp_itemsize = 0,

src/scripts/cos_entities.py

@@ -1,6 +1,4 @@
 import mcrfpy
-import random
-from cos_itemdata import itemdata
 #t = mcrfpy.Texture("assets/kenney_tinydungeon.png", 16, 16)
 t = mcrfpy.Texture("assets/kenney_TD_MR_IP.png", 16, 16)
 #def iterable_entities(grid):
@@ -39,7 +37,7 @@ class COSEntity():  #mcrfpy.Entity): # Fake mcrfpy.Entity integration; engine bu
         self._entity.sprite_number = value
 
     def __repr__(self):
-        return f"<{self.__class__.__name__} ({self.draw_pos})>"
+        return f"<COSEntity ({self.draw_pos}) on {self.grid}>"
 
     def die(self):
         # ugly workaround! grid.entities isn't really iterable (segfaults)
@@ -71,9 +69,7 @@ class COSEntity():  #mcrfpy.Entity): # Fake mcrfpy.Entity integration; engine bu
         for e in self.game.entities:
             if e is self: continue
             if e.draw_pos == (tx, ty): e.ev_enter(self)
-
-    def act(self):
-        pass
+        
 
     def ev_enter(self, other):
         pass
@@ -110,176 +106,11 @@ class COSEntity():  #mcrfpy.Entity): # Fake mcrfpy.Entity integration; engine bu
         #self.draw_pos = (tx, ty)
         self.do_move(tx, ty)
 
-class Equippable:
-    def __init__(self, hands = 0, hp_healing = 0, damage = 0, defense = 0, zap_damage = 1, zap_cooldown = 10, sprite = 129, boost=None, text="", text_color=(255, 255, 255), value=0):
-        self.hands = hands
-        self.hp_healing = hp_healing
-        self.damage = damage
-        self.defense = defense
-        self.zap_damage = zap_damage
-        self.zap_cooldown = zap_cooldown
-        self.zap_cooldown_remaining = 0
-        self.sprite = sprite
-        self.quality = 0
-        self.text = text
-        self.text_color = text_color
-        self.boost = boost
-        self.value = value
-
-    def tick(self):
-        if self.zap_cooldown_remaining:
-            self.zap_cooldown_remaining -= 1
-            if self.zap_cooldown_remaining < 0: self.zap_cooldown_remaining = 0
-
-    def __repr__(self):
-        cooldown_str = f'({self.zap_cooldown_remaining} rounds until ready)'
-        return f"<Equippable text={self.text}, hands={self.hands}, hp_healing={self.hp_healing}, damage={self.damage}, defense={self.defense}, zap_damage={self.zap_damage}, zap_cooldown={self.zap_cooldown}{cooldown_str if self.zap_cooldown_remaining else ''}, sprite={self.sprite}>"
-
-    def classify(self):
-        categories = []
-        if self.hands==0:
-            categories.append("consumable")
-        elif self.damage > 0:
-            categories.append(f"{self.hands}-handed weapon")
-        elif self.defense > 0:
-            categories.append(f"defense")
-        elif self.zap_damage > 0:
-            categories.append("{self.hands}-handed magic weapon")
-        if len(categories) == 0:
-            return "unclassifiable"
-        elif len(categories) == 1:
-            return categories[0]
-        else:
-            return "Erratic: " + ', '.join(categories)
-
-    def consume(self, consumer):
-        if self.boost == "green_pot":
-            consumer.base_damage += self.value
-        elif self.boost == "blue_pot":
-            b = self.value
-            while b: #split bonus between damage and faster cooldown
-                bonus = random.choice(["damage", "cooldown", "range"])
-                if bonus == "damage":
-                    consumer.base_zap_damage += 1
-                elif bonus == "cooldown":
-                    consumer.base_zap_cooldown += 1
-                else:
-                    consumer.base_zap_range += 1
-                b -= 1
-        elif self.boost == "grey_pot":
-            consumer.base_defense += self.value
-        elif self.boost == "sm_grey_pot":
-            consumer.luck += self.value
-        elif self.hp_healing:
-            consumer.hp += self.hp_healing
-            if consumer.hp > consumer.max_hp: consumer.hp = consumer.max_hp
-
-    def do_zap(self, caster, entities):
-        if self.zap_damage == 0:
-            print("This item can't zap.")
-            return False
-        if self.zap_cooldown_remaining != 0:
-            print("zap is cooling down.")
-            return False
-        fx, fy = caster.draw_pos
-        x, y = int(fx), int (fy)
-        dist = lambda tx, ty: abs(int(tx) - x) + abs(int(ty) - y)
-        targets = []
-        for e in entities:
-            if type(e) != EnemyEntity: continue
-            if dist(*e.draw_pos) > caster.base_zap_range:
-                continue
-            if e.hp <= 0: continue
-            targets.append(e)
-        if not targets:
-            print("No targets found in range.")
-            return False
-        target = random.choice(targets)
-        print(f"Zap! {target}")
-        target.get_zapped(self.zap_damage)
-        self.zap_cooldown_remaining = self.zap_cooldown
-        return True
-
-    #def compare(self, other):
-    #    my_class = self.classify()
-    #    o_class = other.classify()
-    #    if my_class == "unclassifiable" or o_class == "unclassifiable":
-    #        return None
-    #    if my_class == "consumable":
-    #        return other.hp_healing - self.hp_healing
-
-
 class PlayerEntity(COSEntity):
     def __init__(self, *, game):
         #print(f"spawn at origin")
         self.draw_order = 10
         super().__init__(game.grid, 0, 0, sprite_num=84, game=game)
-        self.hp = 10
-        self.max_hp = 10
-        self.base_damage = 1
-        self.base_defense = 0
-        self.luck = 0
-        self.archetype = None
-        self.equipped = []
-        self.inventory = []
-        self.base_zap_damage = 0
-        self.base_zap_cooldown = 0
-        self.base_zap_range = 4
-
-    def tick(self):
-        for i in self.equipped:
-            i.tick()
-
-    def calc_damage(self):
-        dmg = self.base_damage
-        for i in self.equipped:
-            dmg += i.damage
-        return dmg
-
-    def calc_defense(self):
-        defense = self.base_defense
-        for i in self.equipped:
-            defense += i.defense
-        return defense
-
-    def do_zap(self):
-        for i in self.equipped:
-            if i.zap_damage and i.zap_cooldown_remaining == 0:
-                if i.do_zap(self, self.game.entities):
-                    break
-        else:
-            print("Couldn't zap")
-
-    def bump(self, other, dx, dy, test=False):
-        if type(other) == BoulderEntity:
-            print("Boulder hit w/ knockback!")
-            return self.game.pull_boulder_move((-dx, -dy), other)
-        #print(f"oof, ouch, {other} bumped the player - {other.base_damage} damage from {other}")
-        self.hp = max(self.hp - max(other.base_damage - self.calc_defense(), 0), 0)
-
-    def receive(self, equip):
-        print(equip)
-        if (equip.hands == 0):
-            if len([i for i in self.inventory if i is not None]) < 3:
-                if None in self.inventory:
-                    self.inventory[self.inventory.index(None)] = equip
-                else:
-                    self.inventory.append(equip)
-                return
-            else:
-                print("something something, consumable GUI")
-        elif (equip.hands == 1):
-            if len(self.equipped) < 2:
-                self.equipped.append(equip)
-                return
-            else:
-                print("Something something, 1h GUI")
-        else: # equip.hands == 2:
-            if len(self.equipped) == 0:
-                self.equipped.append(equip)
-                return
-            else:
-                print("Something something, 2h GUI")
 
     def respawn(self, avoid=None):
         # find spawn point
@@ -311,8 +142,6 @@ class BoulderEntity(COSEntity):
         if type(other) == BoulderEntity:
             #print("Boulders can't push boulders")
             return False
-        elif type(other) == EnemyEntity:
-            if not other.can_push: return False
         #tx, ty = int(self.e.position[0] + dx), int(self.e.position[1] + dy)
         tx, ty = int(self.draw_pos[0] + dx), int(self.draw_pos[1] + dy)
         # Is the boulder blocked the same direction as the bumper? If not, let's both move
@@ -326,7 +155,7 @@ class BoulderEntity(COSEntity):
 class ButtonEntity(COSEntity):
     def __init__(self, x, y, exit_entity, *, game):
         self.draw_order = 1
-        super().__init__(game.grid, x, y, 250, game=game)
+        super().__init__(game.grid, x, y, 42, game=game)
         self.exit = exit_entity
 
     def ev_enter(self, other):
@@ -342,8 +171,7 @@ class ButtonEntity(COSEntity):
         #    self.exit.unlock()
         # TODO: unlock, and then lock again, when player steps on/off
         if not test:
-            pos = int(self.draw_pos[0]), int(self.draw_pos[1])
-            other.do_move(*pos)
+            other._relative_move(dx, dy)
         return True
 
 class ExitEntity(COSEntity):
@@ -371,169 +199,5 @@ class ExitEntity(COSEntity):
                 other._relative_move(dx, dy)
             #TODO - player go down a level logic
             if type(other) == PlayerEntity:
-                self.game.depth += 1
-                #print(f"welcome to level {self.game.depth}")
-                self.game.create_level(self.game.depth)
+                self.game.create_level(self.game.depth + 1)
                 self.game.swap_level(self.game.level, self.game.spawn_point)
-
-class EnemyEntity(COSEntity):
-    def __init__(self, x, y, hp=2, base_damage=1, base_defense=0, sprite=123, can_push=False, crushable=True, sight=8, move_cooldown=1, *, game):
-        self.draw_order = 7
-        super().__init__(game.grid, x, y, sprite, game=game)
-        self.hp = hp
-        self.base_damage = base_damage
-        self.base_defense = base_defense
-        self.base_sprite = sprite
-        self.can_push = can_push
-        self.crushable = crushable
-        self.sight = sight
-        self.move_cooldown = move_cooldown
-        self.moved_last = 0
-
-    def bump(self, other, dx, dy, test=False):
-        if self.hp == 0:
-            if not test:
-                old_pos = int(self.draw_pos[0]), int(self.draw_pos[1])
-                other.do_move(*old_pos)
-            return True
-        if type(other) == PlayerEntity:
-            # TODO - get damage from player, take damage, decide to die or not
-            d = other.calc_damage()
-            self.hp -= d
-            self.hp = max(self.hp, 0)
-            if self.hp == 0:
-                self._entity.sprite_number = self.base_sprite + 246
-                self.draw_order = 1
-            print(f"Player hit for {d}. HP = {self.hp}")
-            #self.hp = 0
-            return False
-        elif type(other) == BoulderEntity:
-            if not self.crushable and self.hp > 0:
-                print("Uncrushable!")
-                return False
-            if self.hp > 0:
-                print("Ouch, my entire body!!")
-            self._entity.sprite_number = self.base_sprite + 246
-            self.hp = 0
-            old_pos = int(self.draw_pos[0]), int(self.draw_pos[1])
-            if not test:
-                other.do_move(*old_pos)
-            return True
-
-    def act(self):
-        if self.hp > 0:
-            # if player nearby: attack
-            x, y = self.draw_pos
-            px, py = self.game.player.draw_pos
-            for d in ((1, 0), (0, 1), (-1, 0), (1, 0)):
-                if int(x + d[0]) == int(px) and int(y + d[1]) == int(py):
-                    self.try_move(*d)
-                    return
-
-            # slow movement (doesn't affect ability to attack)
-            if self.moved_last > 0:
-                self.moved_last -= 1
-                #print(f"Deducting move cooldown, now {self.moved_last} / {self.move_cooldown}")
-                return
-            else:
-                #print(f"Restaring move cooldown - {self.move_cooldown}")
-                self.moved_last = self.move_cooldown
-
-            # if player is not nearby, wander
-            if abs(x - px) + abs(y - py) > self.sight:
-                d = random.choice(((1, 0), (0, 1), (-1, 0), (1, 0)))
-                self.try_move(*d)
-
-            # if can_push and player in a line: KICK
-            if self.can_push:
-                if int(x) == int(px):# vertical kick
-                    self.try_move(0, 1 if y < py else -1)
-                elif int(y) == int(py):# horizontal kick
-                    self.try_move(1 if x < px else -1, 0)
-
-            # else, nearby pursue
-            towards = []
-            dist = lambda dx, dy: abs(px - (x + dx)) + abs(py - (y + dy))
-            #current_dist = dist(0, 0)
-            #for d in ((1, 0), (0, 1), (-1, 0), (1, 0)):
-            #    if dist(*d) <= current_dist + 0.75: towards.append(d)
-            #print(current_dist, towards)
-            if px >= x:
-                towards.append((1, 0))
-            if px <= x:
-                towards.append((-1, 0))
-            if py >= y:
-                towards.append((0, 1))
-            if py <= y:
-                towards.append((0, -1))
-            towards = [p for p in towards if self.game.grid.at((int(x + p[0]), int(y + p[1]))).walkable]
-            towards.sort(key = lambda p: dist(*p))
-            target_dir = towards[0]
-            self.try_move(*target_dir)
-
-    def get_zapped(self, d):
-        self.hp -= d
-        self.hp = max(self.hp, 0)
-        if self.hp == 0:
-            self._entity.sprite_number = self.base_sprite + 246
-            self.draw_order = 1
-        print(f"Player zapped for {d}. HP = {self.hp}")
-
-
-class TreasureEntity(COSEntity):
-    def __init__(self, x, y, treasure_table=None, *, game):
-        self.draw_order = 6
-        super().__init__(game.grid, x, y, 89, game=game)
-        self.popped = False
-        self.treasure_table = treasure_table
-
-    def generate(self):
-        items = list(self.treasure_table.keys())
-        weights = [self.treasure_table[k] for k in items]
-        item = random.choices(items, weights=weights)[0]
-        bonus_stats_max = (self.game.depth + (self.game.player.luck*2)) * 0.66
-        bonus_stats = random.randint(0, int(bonus_stats_max))
-        bonus_colors = {1: (192, 255, 192), 2: (128, 128, 192), 3: (255, 192, 255),
-                        4: (255, 192, 192), 5: (255, 0, 0)}
-
-        data = itemdata[item]
-        if item in ("sword", "sword2", "sword3", "axe", "axe2", "axe3"):
-            equip = Equippable(hands=data.handedness, sprite=data.sprite, damage=data.base_value+bonus_stats, text=data.base_name)
-        elif item in ("buckler", "shield"):
-            equip = Equippable(hands=data.handedness, sprite=data.sprite, defense=data.base_value+bonus_stats, text=data.base_name)
-        elif item in ("wand", "staff", "staff2"):
-            equip = Equippable(hands=data.handedness, sprite=data.sprite, zap_damage=data.base_value[0], zap_cooldown=data.base_value[1], text=data.base_name)
-            if bonus_stats:
-                b = bonus_stats
-                while b: # split bonus between damage and faster cooldown
-                    if equip.zap_cooldown == 2 or random.random() > 0.66:
-                        equip.zap_damage += 1
-                    else:
-                        equip.zap_cooldown -= 1
-                    b -= 1
-        elif item == "red_pot":
-            equip = Equippable(hands=data.handedness, sprite=data.sprite, hp_healing=data.base_value+bonus_stats, text=data.base_name)
-        elif item in ("blue_pot", "green_pot", "grey_pot", "sm_grey_pot"):
-            print(f"Permanent stat boost ({item})")
-            equip = Equippable(hands=data.handedness, sprite=data.sprite, text=data.base_name, boost=item, value=data.base_value + bonus_stats)
-        else:
-            print(f"Unfound item: {item}")
-            equip = Equippable()
-
-        if bonus_stats:
-            equip.text = equip.text + f" (+{bonus_stats})"
-            equip.text_color = bonus_colors[bonus_stats if bonus_stats <=5 else 5]
-        return equip
-
-    def bump(self, other, dx, dy, test=False):
-        if type(other) != PlayerEntity:
-            return False
-        if self.popped:
-            print("It's already open.")
-            return True
-        print("Take me, I'm yours!")
-        self._entity.sprite_number = 91
-        self.popped = True
-        #print(self.treasure_table)
-        other.receive(self.generate())
-        return False

src/scripts/cos_itemdata.py

@@ -1,62 +0,0 @@
-from dataclasses import dataclass
-
-@dataclass
-class ItemData:
-    min_lv: int
-    max_lv: int
-    base_wt: float
-    sprite: int
-    base_value: int
-    base_name: str
-    affinity: str # player archetype that makes it more common
-    handedness: int
-
-itemdata = {
-    "buckler":     ItemData(min_lv = 1, max_lv = 10, base_wt = 0.25, sprite=101, base_value=1,
-                            base_name="Buckler", affinity="knight", handedness=1),
-
-    "shield":      ItemData(min_lv = 2, max_lv = 99, base_wt = 0.15, sprite=102, base_value=2,
-                            base_name="Shield", affinity="knight", handedness=1),
-
-    "sword":       ItemData(min_lv = 1, max_lv = 10, base_wt = 0.25, sprite=103, base_value=1,
-                            base_name="Shortsword", affinity="knight", handedness=1),
-
-    "sword2":      ItemData(min_lv = 2, max_lv = 16, base_wt = 0.15, sprite=104, base_value=2,
-                            base_name="Longsword", affinity="knight", handedness=1),
-
-    "sword3":      ItemData(min_lv = 5, max_lv = 99, base_wt = 0.08, sprite=105, base_value=5,
-                            base_name="Claymore", affinity="knight", handedness=2),
-
-    "axe":         ItemData(min_lv = 1, max_lv = 10, base_wt = 0.25, sprite=119, base_value=1,
-                            base_name="Hatchet", affinity="viking", handedness=1),
-
-    "axe2":        ItemData(min_lv = 2, max_lv = 16, base_wt = 0.15, sprite=120, base_value=4,
-                            base_name="Broad Axe", affinity="viking", handedness=2),
-
-    "axe3":        ItemData(min_lv = 5, max_lv = 99, base_wt = 0.08, sprite=121, base_value=6,
-                            base_name="Bearded Axe", affinity="viking", handedness=2),
-
-    "wand":        ItemData(min_lv = 1, max_lv = 10, base_wt = 0.25, sprite=132, base_value=(1, 10),
-                            base_name="Wand", affinity="wizard", handedness=1),
-
-    "staff":       ItemData(min_lv = 2, max_lv = 16, base_wt = 0.15, sprite=130, base_value=(2, 8),
-                            base_name="Sceptre", affinity="wizard", handedness=2),
-
-    "staff2":      ItemData(min_lv = 5, max_lv = 99, base_wt = 0.08, sprite=131, base_value=(3, 7),
-                            base_name="Wizard's Staff", affinity="wizard", handedness=2),
-
-    "red_pot":     ItemData(min_lv = 1, max_lv = 99, base_wt = 0.25, sprite=115, base_value=1,
-                            base_name="Health Potion", affinity=None, handedness=0),
-
-    "blue_pot":    ItemData(min_lv = 1, max_lv = 99, base_wt = 0.10, sprite=116, base_value=1,
-                            base_name="Sorcery Potion", affinity="wizard", handedness=0),
-
-    "green_pot":   ItemData(min_lv = 1, max_lv = 99, base_wt = 0.10, sprite=114, base_value=1,
-                            base_name="Strength Potion", affinity="viking", handedness=0),
-
-    "grey_pot":    ItemData(min_lv = 1, max_lv = 99, base_wt = 0.10, sprite=113, base_value=1,
-                            base_name="Defense Potion", affinity="knight", handedness=0),
-
-    "sm_grey_pot": ItemData(min_lv = 1, max_lv = 99, base_wt = 0.05, sprite=125, base_value=1,
-                            base_name="Luck Potion", affinity=None, handedness=0),
-    }

src/scripts/cos_level.py

@@ -25,10 +25,6 @@ class BinaryRoomNode:
     def __repr__(self):
         return f"<RoomNode {self.data}>"
 
-    def center(self):
-        x, y, w, h = self.data
-        return (x + w // 2, y + h // 2)
-
     def split(self):
         new_data = binary_space_partition(*self.data)
         self.left = BinaryRoomNode(new_data[0])
@@ -39,11 +35,6 @@ class BinaryRoomNode:
             return self.left.walk() + self.right.walk()
         return [self]
 
-    def contains(self, pt):
-        x, y, w, h = self.data
-        tx, ty = pt
-        return x <= tx <= x + w and y <= ty <= y + h
-
 class RoomGraph:
     def __init__(self, xywh):
         self.root = BinaryRoomNode(xywh)
@@ -58,7 +49,6 @@ class RoomGraph:
 
 def room_coord(room, margin=0):
     x, y, w, h = room.data
-    #print(x,y,w,h, f'{margin=}', end=';')
     w -= 1
     h -= 1
     margin += 1
@@ -68,46 +58,18 @@ def room_coord(room, margin=0):
     h -= margin
     if w < 0: w = 0
     if h < 0: h = 0
-    #print(x,y,w,h, end=' -> ')
     tx = x if w==0 else random.randint(x, x+w)
     ty = y if h==0 else random.randint(y, y+h)
-    #print((tx, ty))
     return (tx, ty)
 
-def adjacent_rooms(r, rooms):
-    x, y, w, h = r.data
-    adjacents = {}
-
-    for i, other_r in enumerate(rooms):
-        rx, ry, rw, rh = other_r.data
-        if (rx, ry, rw, rh) == r:
-            continue  # Skip self
-
-        # Check vertical adjacency (above or below)
-        if rx < x + w and x < rx + rw:  # Overlapping width
-            if ry + rh == y:  # Above
-                adjacents[i] = (x + w // 2, y - 1)
-            elif y + h == ry:  # Below
-                adjacents[i] = (x + w // 2, y + h + 1)
-
-        # Check horizontal adjacency (left or right)
-        if ry < y + h and y < ry + rh:  # Overlapping height
-            if rx + rw == x:  # Left
-                adjacents[i] = (x - 1, y + h // 2)
-            elif x + w == rx:  # Right
-                adjacents[i] = (x + w + 1, y + h // 2)
-
-    return adjacents
-
 class Level:
     def __init__(self, width, height):
         self.width = width
         self.height = height
         #self.graph = [(0, 0, width, height)]
         self.graph = RoomGraph( (0, 0, width, height) )
-        self.grid = mcrfpy.Grid(width, height, t, (10, 5), (1014, 700))
+        self.grid = mcrfpy.Grid(width, height, t, (10, 10), (1014, 758))
         self.highlighted = -1 #debug view feature
-        self.walled_rooms = [] # for tracking "hallway rooms" vs "walled rooms"
 
     def fill(self, xywh, highlight = False):
         if highlight:
@@ -122,7 +84,7 @@ class Level:
     def highlight(self, delta):
         rooms = self.graph.walk()
         if self.highlighted < len(rooms):
-            #print(f"reset {self.highlighted}")
+            print(f"reset {self.highlighted}")
             self.fill(rooms[self.highlighted].data) # reset
         self.highlighted += delta
         print(f"highlight {self.highlighted}")
@@ -148,7 +110,7 @@ class Level:
 
     def fill_rooms(self, features=None):
         rooms = self.graph.walk()
-        #print(f"rooms: {len(rooms)}")
+        print(f"rooms: {len(rooms)}")
         for i, g in enumerate(rooms):
             X, Y, W, H = g.data
             #c = [random.randint(0, 255) for _ in range(3)]
@@ -158,14 +120,9 @@ class Level:
                     self.grid.at((x, y)).tilesprite = ts
 
     def wall_rooms(self):
-        self.walled_rooms = []
         rooms = self.graph.walk()
-        for i, g in enumerate(rooms):
-            # unwalled / hallways: not selected for small dungeons, first, last, and 65% of all other rooms
-            if len(rooms) > 3 and i > 1 and i < len(rooms) - 2 and random.random() < 0.35:
-                self.walled_rooms.append(False)
-                continue
-            self.walled_rooms.append(True)
+        for g in rooms:
+            #if random.random() > 0.66: continue
             X, Y, W, H = g.data
             for x in range(X, X+W):
                 self.grid.at((x, Y)).walkable = False
@@ -181,45 +138,13 @@ class Level:
         #    self.grid.at((0, y)).walkable = False
             self.grid.at((self.width-1, y)).walkable = False
 
-    def dig_path(self, start:"Tuple[int, int]", end:"Tuple[int, int]", walkable=True, color=None, sprite=None):
-        print(f"Digging: {start} -> {end}")
-        # get x1,y1 and x2,y2 coordinates: top left and bottom right points on the rect formed by two random points, one from each of the 2 rooms
-        x1 = min([start[0], end[0]])
-        x2 = max([start[0], end[0]])
-        dw = x2 - x1
-        y1 = min([start[1], end[1]])
-        y2 = max([start[1], end[1]])
-        dh = y2 - y1
-
-        # random: top left or bottom right as the corner between the paths
-        tx, ty = (x1, y1) if random.random() >= 0.5 else (x2, y2)
-
-        for x in range(x1, x1+dw):
-            try:
-                if walkable:
-                    self.grid.at((x, ty)).walkable = walkable
-                if color:
-                    self.grid.at((x, ty)).color = color
-                if sprite is not None:
-                    self.grid.at((x, ty)).tilesprite = sprite
-            except:
-                pass
-        for y in range(y1, y1+dh):
-            try:
-                if walkable:
-                    self.grid.at((tx, y)).walkable = True
-                if color:
-                    self.grid.at((tx, y)).color = color
-                if sprite is not None:
-                    self.grid.at((tx, y)).tilesprite = sprite
-            except:
-                pass
-
-    def generate(self, level_plan): #target_rooms = 5, features=None):
+    def generate(self, target_rooms = 5, features=None):
+        if features is None:
+            shuffled = ["boulder", "button"]
+            random.shuffle(shuffled) 
+            features = ["spawn"] + shuffled + ["exit", "treasure"]
+        # Binary space partition to reach given # of rooms
         self.reset()
-        target_rooms = len(level_plan)
-        if type(level_plan) is set:
-            level_plan = random.choice(list(level_plan))
         while len(self.graph.walk()) < target_rooms:
             self.split(single=len(self.graph.walk()) > target_rooms * .5)
             
@@ -227,66 +152,44 @@ class Level:
         #self.fill_rooms()
         self.wall_rooms()
         rooms = self.graph.walk()
-        feature_coords = []
+        feature_coords = {}
         prev_room = None
-        print(level_plan)
-        for room_num, room in enumerate(rooms):
-            room_plan = level_plan[room_num]
-            if type(room_plan) == str: room_plan = [room_plan] # single item plans became single-character plans...
-            for f in room_plan:
-                #feature_coords.append((f, room_coord(room, margin=4 if f in ("boulder",) else 1)))
-                # boulders are breaking my brain. If I can't get boulders away from walls with margin, I'm just going to dig them out.
-                #if f == "boulder":
-                #    x, y = room_coord(room, margin=0)
-                #    if x < 2: x += 1
-                #    if y < 2: y += 1
-                #    if x > self.grid.grid_size[0] - 2: x -= 1
-                #    if y > self.grid.grid_size[1] - 2: y -= 1
-                #    for _x in (1, 0, -1):
-                #        for _y in (1, 0, -1):
-                #            self.grid.at((x + _x, y + _y)).walkable = True
-                #    feature_coords.append((f, (x, y)))
-                #else:
-                #    feature_coords.append((f, room_coord(room, margin=0)))
-                fcoord = None
-                while not fcoord:
-                    fc = room_coord(room, margin=0)
-                    if not self.grid.at(fc).walkable: continue
-                    if fc in [_i[1] for _i in feature_coords]: continue
-                    fcoord = fc
-                feature_coords.append((f, fcoord))
-                print(feature_coords[-1])
+        for room in rooms:
+            if not features: break
+            f = features.pop(0)
+            feature_coords[f] = room_coord(room, margin=4 if f in ("boulder",) else 1)
 
             ## Hallway generation
             # plow an inelegant path
             if prev_room:
                 start = room_coord(prev_room, margin=2)
                 end = room_coord(room, margin=2)
-                self.dig_path(start, end, color=(0, 64, 0))
+                # get x1,y1 and x2,y2 coordinates: top left and bottom right points on the rect formed by two random points, one from each of the 2 rooms
+                x1 = min([start[0], end[0]])
+                x2 = max([start[0], end[0]])
+                dw = x2 - x1
+                y1 = min([start[1], end[1]])
+                y2 = max([start[1], end[1]])
+                dh = y2 - y1
+                #print(x1, y1, x2, y2, dw, dh)
+        
+                # random: top left or bottom right as the corner between the paths
+                tx, ty = (x1, y1) if random.random() >= 0.5 else (x2, y2)
+
+                for x in range(x1, x1+dw):
+                    self.grid.at((x, ty)).walkable = True
+                    #self.grid.at((x, ty)).color = (255, 0, 0)
+                    #self.grid.at((x, ty)).tilesprite = -1
+                for y in range(y1, y1+dh):
+                    self.grid.at((tx, y)).walkable = True
+                    #self.grid.at((tx, y)).color = (0, 255, 0)
+                    #self.grid.at((tx, y)).tilesprite = -1
             prev_room = room
 
+
         # Tile painting
         possibilities = None
         while possibilities or possibilities is None:
             possibilities = ct.wfc_pass(self.grid, possibilities)
 
-        ## "hallway room" repainting
-        #for i, hall_room in enumerate(rooms):
-        #    if self.walled_rooms[i]:
-        #        print(f"walled room: {hall_room}")
-        #        continue
-        #    print(f"hall room: {hall_room}")
-        #    x, y, w, h = hall_room.data
-        #    for _x in range(x+1, x+w-1):
-        #        for _y in range(y+1, y+h-1):
-        #            self.grid.at((_x, _y)).walkable = False
-        #            self.grid.at((_x, _y)).tilesprite = -1
-        #            self.grid.at((_x, _y)).color = (0, 0, 0) # pit!
-        #    targets = adjacent_rooms(hall_room, rooms)
-        #    print(targets)
-        #    for k, v in targets.items():
-        #        self.dig_path(hall_room.center(), v, color=(64, 32, 32))
-        #    for _, p in feature_coords:
-        #        if hall_room.contains(p): self.dig_path(hall_room.center(), p, color=(92, 48, 48))
-
         return feature_coords

src/scripts/cos_tiles.py

@@ -129,7 +129,7 @@ def wfc_pass(grid, possibilities=None):
         for v in possibilities.values():
             if len(v) in counts: counts[len(v)] += 1
             else: counts[len(v)] = 1
-        #print(counts)
+        print(counts)
         return possibilities
     elif len(possibilities) == 0:
         print("We're done!")

src/scripts/game.py

@@ -1,9 +1,6 @@
 import mcrfpy
-import code
-
 #t = mcrfpy.Texture("assets/kenney_tinydungeon.png", 16, 16) # 12, 11)
-t = mcrfpy.Texture("assets/kenney_TD_MR_IP.png", 16, 16) # 12, 11)
-btn_tex = mcrfpy.Texture("assets/48px_ui_icons-KenneyNL.png", 48, 48)
+#t = mcrfpy.Texture("assets/kenney_TD_MR_IP.png", 16, 16) # 12, 11)
 font = mcrfpy.Font("assets/JetbrainsMono.ttf")
 
 frame_color = (64, 64, 128)
@@ -11,39 +8,14 @@ frame_color = (64, 64, 128)
 import random
 import cos_entities as ce
 import cos_level as cl
-from cos_itemdata import itemdata
 #import cos_tiles as ct
 
-class Resources:
-    def __init__(self):
-        self.music_enabled = True
-        self.music_volume = 40
-        self.sfx_enabled = True
-        self.sfx_volume = 100
-        self.master_volume = 100
-
-        # load the music/sfx files here
-        self.splats = []
-        for i in range(1, 10):
-            mcrfpy.createSoundBuffer(f"assets/sfx/splat{i}.ogg")
-
-
-    def play_sfx(self, sfx_id):
-        if self.sfx_enabled and self.sfx_volume and self.master_volume:
-            mcrfpy.setSoundVolume(self.master_volume/100 * self.sfx_volume)
-            mcrfpy.playSound(sfx_id)
-
-    def play_music(self, track_id):
-        if self.music_enabled and self.music_volume and self.master_volume:
-            mcrfpy.setMusicVolume(self.master_volume/100 * self.music_volume)
-            mcrfpy.playMusic(...)
-
-resources = Resources()
-
 class Crypt:
     def __init__(self):
         mcrfpy.createScene("play")
         self.ui = mcrfpy.sceneUI("play")
+        mcrfpy.setScene("play")
+        mcrfpy.keypressScene(self.cos_keys)
 
         entity_frame = mcrfpy.Frame(815, 10, 194, 595, fill_color = frame_color)
         inventory_frame = mcrfpy.Frame(10, 610, 800, 143, fill_color = frame_color)
@@ -52,68 +24,9 @@ class Crypt:
         #self.level = cl.Level(30, 23)
         self.entities = []
         self.depth=1
-        self.stuck_btn = SweetButton(self.ui, (810, 700), "Stuck", icon=19, box_width=150, box_height = 60, click=self.stuck)
-
-        self.level_plan = {
-                1: [("spawn", "button", "boulder"), ("exit")],
-                2: [("spawn", "button", "treasure", "treasure", "treasure", "rat", "rat", "boulder"), ("exit")],
-                #2: [("spawn", "button", "boulder"), ("rat"), ("exit")],
-                3: [("spawn", "button", "boulder"), ("rat"), ("exit")],
-                4: [("spawn", "button", "rat"), ("boulder", "rat", "treasure"), ("exit")],
-                5: [("spawn", "button", "rat"), ("boulder", "rat"), ("exit")],
-                6: {(("spawn", "button"), ("boulder", "treasure", "exit")),
-                    (("spawn", "boulder"), ("button", "treasure", "exit"))},
-                7: {(("spawn", "button"), ("boulder", "treasure", "exit")),
-                    (("spawn", "boulder"), ("button", "treasure", "exit"))},
-                8: {(("spawn", "treasure", "button"), ("boulder", "treasure", "exit")),
-                    (("spawn", "treasure", "boulder"), ("button", "treasure", "exit"))}
-                #9: self.lv_planner
-                }
-
-        # empty void for the player to initialize into
-        self.headsup = mcrfpy.Frame(10, 684, 320, 64, fill_color = (0, 0, 0, 0))
-        self.sidebar = mcrfpy.Frame(860, 4, 160, 600, fill_color = (96, 96, 160))
-
-        # Heads Up (health bar, armor bar) config
-        self.health_bar = [mcrfpy.Sprite(32*i, 2, t, 659, 2) for i in range(10)]
-        [self.headsup.children.append(i) for i in self.health_bar]
-        self.armor_bar = [mcrfpy.Sprite(32*i, 42, t, 659, 2) for i in range(10)]
-        [self.headsup.children.append(i) for i in self.armor_bar]
-        # (40, 3), caption, font, fill_color=font_color
-        self.stat_captions = mcrfpy.Caption((325,0), "HP:10\nDef:0(+0)", font, fill_color=(255, 255, 255))
-        self.stat_captions.outline = 3
-        self.stat_captions.outline_color = (0, 0, 0)
-        self.headsup.children.append(self.stat_captions)
-
-        # Side Bar (inventory, level info) config
-        self.level_caption = mcrfpy.Caption((5,5), "Level: 1", font, fill_color=(255, 255, 255))
-        self.level_caption.size = 26 
-        self.level_caption.outline = 3
-        self.level_caption.outline_color = (0, 0, 0)
-        self.sidebar.children.append(self.level_caption)
-        self.inv_sprites = [mcrfpy.Sprite(15, 70 + 95*i, t, 659, 6.0) for i in range(5)]
-        for i in self.inv_sprites:
-            self.sidebar.children.append(i)
-        self.key_captions = [
-                mcrfpy.Sprite(75, 130 + (95*2) + 95 * i, t, 384 + i, 3.0) for i in range(3)
-                ]
-        for i in self.key_captions:
-            self.sidebar.children.append(i)
-        self.inv_captions = [
-                mcrfpy.Caption((25, 130 + 95 * i), "x", font, fill_color=(255, 255, 255)) for i in range(5)
-                ]
-        for i in self.inv_captions:
-            i.size = 16
-            self.sidebar.children.append(i)
-
-        liminal_void = mcrfpy.Grid(1, 1, t, (0, 0), (16, 16))
-        self.grid = liminal_void
-        self.player = ce.PlayerEntity(game=self)
-        self.spawn_point = (0, 0)
-
-        # level creation moves player to the game level at the generated spawn point
         self.create_level(self.depth)
         #self.grid = mcrfpy.Grid(20, 15, t, (10, 10), (1014, 758))
+        self.player = ce.PlayerEntity(game=self)
         self.swap_level(self.level, self.spawn_point)
 
         # Test Entities
@@ -122,130 +35,10 @@ class Crypt:
         #ce.ExitEntity(12, 6, 14, 4, game=self)
         # scene setup
 
-        ## might be done by self.swap_level
-        #[self.ui.append(e) for e in (self.grid, self.stuck_btn.base_frame)] # entity_frame, inventory_frame, stats_frame)]
+
+        [self.ui.append(e) for e in (self.grid,)] # entity_frame, inventory_frame, stats_frame)]
 
         self.possibilities = None # track WFC possibilities between rounds
-        self.enemies = []
-        #mcrfpy.setTimer("enemy_test", self.enemy_movement, 750)
-
-        #mcrfpy.Frame(x, y, box_width+shadow_offset, box_height, fill_color = (0, 0, 0, 255))
-        #Sprite(0, 3, btn_tex, icon, icon_scale)
-
-    #def enemy_movement(self, *args):
-    #    for e in self.enemies: e.act()
-
-    #def spawn_test_rat(self):
-    #    success = False
-    #    while not success:
-    #        x, y = [random.randint(0, i-1) for i in self.grid.grid_size]
-    #        success = self.grid.at((x,y)).walkable
-    #    self.enemies.append(ce.EnemyEntity(x, y, game=self))
-
-    def gui_update(self):
-        self.stat_captions.text = f"HP:{self.player.hp}\nDef:{self.player.calc_defense()}(+{self.player.calc_defense() - self.player.base_defense})"
-        for i, hs in enumerate(self.health_bar):
-            full_hearts = self.player.hp - (i*2)
-            empty_hearts = self.player.max_hp - (i*2)
-            hs.sprite_number = 659
-            if empty_hearts >= 2:
-                hs.sprite_number = 208
-            if full_hearts >= 2:
-                hs.sprite_number = 210
-            elif full_hearts == 1:
-                hs.sprite_number = 209
-        for i, arm_s in enumerate(self.armor_bar):
-            full_hearts = self.player.calc_defense() - (i*2)
-            arm_s.sprite_number = 659
-            if full_hearts >= 2:
-                arm_s.sprite_number = 211
-            elif full_hearts == 1:
-                arm_s.sprite_number = 212
-
-        #items = self.player.equipped[:] + self.player.inventory[:]
-        for i in range(5):
-            if i == 0:
-                item = self.player.equipped[0] if len(self.player.equipped) > 0 else None
-            elif i == 1:
-                item = self.player.equipped[1] if len(self.player.equipped) > 1 else None
-            elif i == 2:
-                item = self.player.inventory[0] if len(self.player.inventory) > 0 else None
-            elif i == 3:
-                item = self.player.inventory[1] if len(self.player.inventory) > 1 else None
-            elif i == 4:
-                item = self.player.inventory[2] if len(self.player.inventory) > 2 else None
-            if item is None:
-                self.inv_sprites[i].sprite_number = 659
-                if i > 1: self.key_captions[i - 2].sprite_number = 659
-                self.inv_captions[i].text = ""
-                continue
-            self.inv_sprites[i].sprite_number = item.sprite
-            if i > 1:
-                self.key_captions[i - 2].sprite_number = 384 + (i - 2)
-            if item.zap_cooldown_remaining:
-                self.inv_captions[i].text = f"[{item.zap_cooldown_remaining}] {item.text})"
-            else:
-                self.inv_captions[i].text = item.text
-            self.inv_captions[i].fill_color = item.text_color
-
-    def lv_planner(self, target_level):
-        """Plan room sequence in levels > 9"""
-        monsters = (target_level - 6) // 2
-        target_rooms = min(int(target_level // 2), 6)
-        target_treasure = min(int(target_level // 3), 4)
-        rooms = []
-        for i in range(target_rooms):
-            rooms.append([])
-        for o in ("spawn", "boulder", "button", "exit"):
-            r = random.randint(0, target_rooms-1)
-            rooms[r].append(o)
-        monster_table = {
-            "rat": int(monsters * 0.8) + 2,
-            "big rat": max(int(monsters * 0.2) - 2, 0),
-            "cyclops": max(int(monsters * 0.1) - 3, 0)
-            }
-        monster_table = {k: v for k, v in monster_table.items() if v > 0}
-        monster_names = list(monster_table.keys())
-        monster_weights = [monster_table[k] for k in monster_names]
-        for m in range(monsters):
-            r = random.randint(0, target_rooms - 1)
-            rooms[r].append(random.choices(monster_names, weights = monster_weights)[0])
-
-        for t in range(target_treasure):
-            r = random.randint(0, target_rooms - 1)
-            rooms[r].append("treasure")
-
-        return rooms
-
-    def treasure_planner(self, treasure_level):
-        """Plan treasure contents at all levels"""
-        
-        # find item name in base_wts key (base weight of the category)
-        #base_weight = lambda s: base_wts[list([t for t in base_wts.keys() if s in t])[0]]
-        #weights = {d[0]: base_weight(d[0]) for d in item_minlv.items() if treasure_level > d[1]}
-        #if self.player.archetype is None:
-        #    prefs = []
-        #elif self.player.archetype == "viking":
-        #    prefs = ["axe2", "axe3", "green_pot"]
-        #elif self.player.archetype == "knight":
-        #    prefs = ["sword2", "shield", "grey_pot"]
-        #elif self.player.archetype == "wizard":
-        #    prefs = ["staff", "staff2", "blue_pot"]
-        #for i in prefs:
-        #    if i in weights: weights[i] *= 3
-        weights = {}
-        for item in itemdata:
-            data = itemdata[item]
-            if data.min_lv > treasure_level or treasure_level > data.max_lv: continue
-            weights[item] = data.base_wt
-            if self.player.archetype is not None and data.affinity == self.player.archetype:
-                weights[item] *= 3
-        return weights
-
-    def start(self):
-        resources.play_sfx(1)
-        mcrfpy.setScene("play")
-        mcrfpy.keypressScene(self.cos_keys)
 
     def add_entity(self, e:ce.COSEntity):
         self.entities.append(e)
@@ -256,422 +49,61 @@ class Crypt:
         for e in self.entities:
             self.grid.entities.append(e._entity)
 
-    def create_level(self, depth, _luck = 0):
+    def create_level(self, depth):
         #if depth < 3:
         #    features = None
-        self.level = cl.Level(20, 20)
+        self.level = cl.Level(30, 23)
         self.grid = self.level.grid
-        if depth in self.level_plan:
-            plan = self.level_plan[depth]
-        else:
-            plan = self.lv_planner(depth)
-        coords = self.level.generate(plan)
+        coords = self.level.generate()
         self.entities = []
-        if self.player:
-            luck = self.player.luck
-        else:
-            luck = 0
-        buttons = []
-        for k, v in sorted(coords, key=lambda i: i[0]): # "button" before "exit"; "button", "button", "door", "exit" -> alphabetical is correct sequence
+        for k, v in coords.items():
             if k == "spawn":
-                if self.player:
-                    self.add_entity(self.player)
-                    #self.player.draw_pos = v
-                    self.spawn_point = v
+                self.spawn_point = v
             elif k == "boulder":
                 ce.BoulderEntity(v[0], v[1], game=self)
-            elif k == "treasure":
-                ce.TreasureEntity(v[0], v[1], treasure_table = self.treasure_planner(depth + luck), game=self)
             elif k == "button":
-                buttons.append(v)
+                pass
             elif k == "exit":
-                btn = buttons.pop(0)
-                ce.ExitEntity(v[0], v[1], btn[0], btn[1], game=self)
-            elif k == "rat":
-                ce.EnemyEntity(*v, game=self)
-            elif k == "big rat":
-                ce.EnemyEntity(*v, game=self, base_damage=2, hp=4, sprite=130)
-            elif k == "cyclops":
-                ce.EnemyEntity(*v, game=self, base_damage=3, hp=8, sprite=109, base_defense=2)
-                
-        #if self.depth > 2:
-            #for i in range(10):
-            #    self.spawn_test_rat()
-
-    def stuck(self, sweet_btn, args):
-        if args[3] == "end": return
-        self.create_level(self.depth)
-        self.swap_level(self.level, self.spawn_point)
+                ce.ExitEntity(v[0], v[1], coords["button"][0], coords["button"][1], game=self)
 
     def cos_keys(self, key, state):
         d = None
         if state == "end": return
-        elif key == "Grave":
-            code.InteractiveConsole(locals=globals()).interact()
-            return
-        elif key == "Z":
-            self.player.do_zap()
-            self.enemy_turn()
-            return
         elif key == "W": d = (0, -1)
         elif key == "A": d = (-1, 0)
         elif key == "S": d = (0, 1)
         elif key == "D": d = (1, 0)
-        elif key == "Num1":
-            if len(self.player.inventory) > 0:
-                self.player.inventory[0].consume(self.player)
-                self.player.inventory[0] = None
-                self.enemy_turn()
-            else:
-                print("No item")
-        elif key == "Num2":
-            if len(self.player.inventory) > 1:
-                self.player.inventory[1].consume(self.player)
-                self.player.inventory[1] = None
-            else:
-                print("No item")
-        elif key == "Num3":
-            if len(self.player.inventory) > 2:
-                self.player.inventory[2].consume(self.player)
-                self.player.inventory[2] = None
-            else:
-                print("No item")
-
-        #elif key == "M": self.level.generate()
-        #elif key == "R":
-        #    self.level.reset()
-        #    self.possibilities = None
-        #elif key == "T":
-        #    self.level.split()
-        #    self.possibilities = None
-        #elif key == "Y": self.level.split(single=True)
-        #elif key == "U": self.level.highlight(+1)
-        #elif key == "I": self.level.highlight(-1)
-        #elif key == "O":
-        #    self.level.wall_rooms()
-        #    self.possibilities = None
+        elif key == "M": self.level.generate()
+        elif key == "R":
+            self.level.reset()
+            self.possibilities = None
+        elif key == "T":
+            self.level.split()
+            self.possibilities = None
+        elif key == "Y": self.level.split(single=True)
+        elif key == "U": self.level.highlight(+1)
+        elif key == "I": self.level.highlight(-1)
+        elif key == "O":
+            self.level.wall_rooms()
+            self.possibilities = None
         #elif key == "P": ct.format_tiles(self.grid)
-        #elif key == "P":
-            #self.possibilities = ct.wfc_pass(self.grid, self.possibilities)
         elif key == "P":
-            self.depth += 1
-            print(f"Descending: lv {self.depth}")
-            self.stuck(None, [1,2,3,4])
-        elif key == "Period":
-            self.enemy_turn()
-        elif key == "X":
-            self.pull_boulder_search()
-        else:
-            print(key)
-        if d:
-            self.entities.sort(key = lambda e: e.draw_order, reverse=False)
-            self.player.try_move(*d)
-            self.enemy_turn()
-
-    def enemy_turn(self):
-        self.entities.sort(key = lambda e: e.draw_order, reverse=False)
-        for e in self.entities:
-            e.act()
-        # end of enemy turn = player turn
-        for i in self.player.equipped:
-            i.tick()
-        self.gui_update()
-
-
-
-    def pull_boulder_search(self):
-        for dx, dy in ( (0, -1), (-1, 0), (1, 0), (0, 1) ):
-            for e in self.entities:
-                if e.draw_pos != (self.player.draw_pos[0] + dx, self.player.draw_pos[1] + dy): continue
-                if type(e) == ce.BoulderEntity:
-                    self.pull_boulder_move((dx, dy), e)
-                    return self.enemy_turn()
-        else:
-            print("No boulder found to pull.")
-
-    def pull_boulder_move(self, p, target_boulder):
-        print(p, target_boulder)
-        self.entities.sort(key = lambda e: e.draw_order, reverse=False)
-        if self.player.try_move(-p[0], -p[1], test=True):
-            old_pos = self.player.draw_pos
-            self.player.try_move(-p[0], -p[1])
-            target_boulder.do_move(*old_pos)
+            self.possibilities = ct.wfc_pass(self.grid, self.possibilities)
+        if d: self.player.try_move(*d)
 
     def swap_level(self, new_level, spawn_point):
         self.level = new_level
         self.grid = self.level.grid
         self.grid.zoom = 2.0
         # TODO, make an entity mover function
-        #self.add_entity(self.player)
+        self.add_entity(self.player)
         self.player.grid = self.grid
         self.player.draw_pos = spawn_point
-        #self.grid.entities.append(self.player._entity)
-
-        # reform UI (workaround to ui collection iterators crashing)
-        while len(self.ui) > 0:
-            try:
-                self.ui.remove(0)
-            except:
-                pass
+        self.grid.entities.append(self.player._entity)
+        try:
+            self.ui.remove(0)
+        except:
+            pass
         self.ui.append(self.grid)
-        self.ui.append(self.stuck_btn.base_frame)
-        self.ui.append(self.headsup)
 
-        self.level_caption.text = f"Level: {self.depth}"
-        self.ui.append(self.sidebar)
-        self.gui_update()
-
-class SweetButton:
-    def __init__(self, ui:mcrfpy.UICollection, 
-                 pos:"Tuple[int, int]",
-                 caption:str, font=font, font_size=24, font_color=(255,255,255), font_outline_color=(0, 0, 0), font_outline_width=2,
-                 shadow_offset = 8, box_width=200, box_height = 80, shadow_color=(64, 64, 86), box_color=(96, 96, 160), 
-                 icon=4, icon_scale=1.75, shadow=True, click=lambda *args: None):
-        self.ui = ui
-        #self.shadow_box = mcrfpy.Frame
-        x, y = pos
-
-        # box w/ drop shadow 
-        self.shadow_offset = shadow_offset
-        self.base_frame = mcrfpy.Frame(x, y, box_width+shadow_offset, box_height, fill_color = (0, 0, 0, 255))
-        self.base_frame.click = self.do_click
-
-        # drop shadow won't need configured, append directly
-        if shadow:
-            self.base_frame.children.append(mcrfpy.Frame(0, 0, box_width, box_height, fill_color = shadow_color))
-
-        # main button is where the content lives
-        self.main_button = mcrfpy.Frame(shadow_offset, shadow_offset, box_width, box_height, fill_color = box_color)
-        self.click = click
-        self.base_frame.children.append(self.main_button)
-
-        # main button icon
-        self.icon = mcrfpy.Sprite(0, 3, btn_tex, icon, icon_scale)
-        self.main_button.children.append(self.icon)
-
-        # main button caption
-        self.caption = mcrfpy.Caption((40, 3), caption, font, fill_color=font_color)
-        self.caption.size = font_size
-        self.caption.outline_color=font_outline_color
-        self.caption.outline=font_outline_width
-        self.main_button.children.append(self.caption)
-
-    def unpress(self):
-        """Helper func for when graphics changes or glitches make the button stuck down"""
-        self.main_button.x, self.main_button.y = (self.shadow_offset, self.shadow_offset)
-
-    def do_click(self, x, y, mousebtn, event):
-        if event == "start":
-            self.main_button.x, self.main_button.y = (0, 0)
-        elif event == "end":
-            self.main_button.x, self.main_button.y = (self.shadow_offset, self.shadow_offset)
-        result = self.click(self, (x, y, mousebtn, event))
-        if result: # return True from event function to instantly un-pop
-            self.main_button.x, self.main_button.y = (self.shadow_offset, self.shadow_offset)
-
-    @property
-    def text(self):
-        return self.caption.text
-
-    @text.setter
-    def text(self, value):
-        self.caption.text = value
-
-    @property
-    def sprite_number(self):
-        return self.icon.sprite_number
-
-    @sprite_number.setter
-    def sprite_number(self, value):
-        self.icon.sprite_number = value
-
-class MainMenu:
-    def __init__(self):
-        mcrfpy.createScene("menu")
-        self.ui = mcrfpy.sceneUI("menu")
-        mcrfpy.setScene("menu")
-        self.crypt = None
-
-        components = []
-        # demo grid
-        self.demo = cl.Level(20, 20)
-        self.grid = self.demo.grid
-        self.grid.zoom = 1.75
-        coords = self.demo.generate(
-                [("boulder", "boulder", "rat", "cyclops", "boulder"), ("spawn"), ("rat", "big rat"), ("button", "boulder", "exit")]
-                )
-        self.entities = []
-        self.add_entity = lambda e: self.entities.append(e)
-        #self.create_level = lambda *args: None
-        buttons = []
-        #self.depth = 20
-        for k, v in sorted(coords, key=lambda i: i[0]): # "button" before "exit"; "button", "button", "door", "exit" -> alphabetical is correct sequence
-            if k == "spawn":
-                self.player = ce.PlayerEntity(game=self)
-                self.player.draw_pos = v
-                #if self.player:
-                #    self.add_entity(self.player)
-                #    #self.player.draw_pos = v
-                #    self.spawn_point = v
-            elif k == "boulder":
-                ce.BoulderEntity(v[0], v[1], game=self)
-            elif k == "treasure":
-                ce.TreasureEntity(v[0], v[1], treasure_table = {}, game=self)
-            elif k == "button":
-                buttons.append(v)
-            elif k == "exit":
-                btn = buttons.pop(0)
-                ce.ExitEntity(v[0], v[1], btn[0], btn[1], game=self)
-            elif k == "rat":
-                ce.EnemyEntity(*v, game=self)
-            elif k == "big rat":
-                ce.EnemyEntity(*v, game=self, base_damage=2, hp=4, sprite=124)
-            elif k == "cyclops":
-                ce.EnemyEntity(*v, game=self, base_damage=3, hp=8, sprite=109, base_defense=2, can_push=True, move_cooldown=0)
-        #self.demo = cl.Level(20, 20)
-        #self.create_level(self.depth)
-        for e in self.entities:
-            self.grid.entities.append(e._entity)
-        def just_wiggle(*args):
-            try:
-                self.player.try_move(*random.choice(((1, 0),(-1, 0),(0, 1),(0, -1))))
-                for e in self.entities:
-                    e.act()
-            except:
-                pass
-        mcrfpy.setTimer("demo_motion", just_wiggle, 100)
-        components.append(
-                self.demo.grid
-                )
-
-
-        # title text
-        drop_shadow = mcrfpy.Caption((150, 10), "Crypt Of Sokoban", font, fill_color=(96, 96, 96), outline_color=(192, 0, 0))
-        drop_shadow.outline = 3
-        drop_shadow.size = 64
-        components.append(
-                drop_shadow
-            )
-
-        title_txt = mcrfpy.Caption((158, 18), "Crypt Of Sokoban", font, fill_color=(255, 255, 255))
-        title_txt.size = 64
-        components.append(
-                title_txt
-            )
-
-        # toast: text over the demo grid that fades out on a timer
-        self.toast = mcrfpy.Caption((150, 400), "", font, fill_color=(0, 0, 0))
-        self.toast.size = 28
-        self.toast.outline = 2
-        self.toast.outline_color = (255, 255, 255)
-        self.toast_event = None
-        components.append(self.toast)
-
-        # button - PLAY
-        #playbtn = mcrfpy.Frame(284, 548, 456, 120, fill_color = 
-        play_btn = SweetButton(self.ui, (20, 248), "PLAY", box_width=200, box_height=110, icon=1, icon_scale=2.0, click=self.play)
-        components.append(play_btn.base_frame)
-
-        # button - config menu pane
-        #self.config = lambda self, sweet_btn, *args: print(f"boop, sweet button {sweet_btn} config {args}")
-        config_btn = SweetButton(self.ui, (10, 678), "Settings", icon=2, click=self.show_config)
-        components.append(config_btn.base_frame)
-
-        # button - insta-1080p scaling
-        scale_btn = SweetButton(self.ui, (10+256, 678), "Scale up\nto 1080p", icon=15, click=self.scale)
-        self.scaled = False
-        components.append(scale_btn.base_frame)
-
-        # button - music toggle
-        music_btn = SweetButton(self.ui, (10+256*2, 678), "Music\nON", icon=12, click=self.music_toggle)
-        resources.music_enabled = True
-        resources.music_volume = 40
-        components.append(music_btn.base_frame)
-
-        # button - sfx toggle
-        sfx_btn = SweetButton(self.ui, (10+256*3, 678), "SFX\nON", icon=0, click=self.sfx_toggle)
-        resources.sfx_enabled = True
-        resources.sfx_volume = 40
-        components.append(sfx_btn.base_frame)
-
-
-        [self.ui.append(e) for e in components]
-
-    def toast_say(self, txt, delay=10):
-        "kick off a toast event"
-        if self.toast_event is not None:
-            mcrfpy.delTimer("toast_timer")
-        self.toast.text = txt
-        self.toast_event = 350
-        self.toast.fill_color = (255, 255, 255, 255)
-        self.toast.outline = 2
-        self.toast.outline_color = (0, 0, 0, 255)
-        mcrfpy.setTimer("toast_timer", self.toast_callback, 100)
-
-    def toast_callback(self, *args):
-        "fade out the toast text"
-        self.toast_event -= 5
-        if self.toast_event < 0:
-            self.toast_event = None
-            mcrfpy.delTimer("toast_timer")
-            mcrfpy.text = ""
-            return
-        a = min(self.toast_event, 255)
-        self.toast.fill_color = (255, 255, 255, a)
-        self.toast.outline_color = (0, 0, 0, a)
-
-    def show_config(self, sweet_btn, args):
-        self.toast_say("Beep, Boop! Configurations will go here.")
-
-    def play(self, sweet_btn, args):
-        #if args[3] == "start": return # DRAMATIC on release action!
-        if args[3] == "end": return
-        self.crypt = Crypt()
-        #mcrfpy.setScene("play")
-        self.crypt.start()
-
-    def scale(self, sweet_btn, args, window_scale=None):
-        if args[3] == "end": return
-        if not window_scale:
-            self.scaled = not self.scaled
-            window_scale = 1.3
-        else:
-            self.scaled = True
-        sweet_btn.unpress()
-        if self.scaled:
-            self.toast_say("Windowed mode only, sorry!\nCheck Settings for for fine-tuned controls.")
-            mcrfpy.setScale(window_scale)
-            sweet_btn.text = "Scale down\n to 1.0x"
-        else:
-            mcrfpy.setScale(1.0)
-            sweet_btn.text = "Scale up\nto 1080p"
-
-    def music_toggle(self, sweet_btn, args):
-        if args[3] == "end": return
-        resources.music_enabled = not resources.music_enabled
-        print(f"music: {resources.music_enabled}")
-        if resources.music_enabled:
-            mcrfpy.setMusicVolume(self.music_volume)
-            sweet_btn.text = "Music is ON"
-            sweet_btn.sprite_number = 12
-        else:
-            self.toast_say("Use your volume keys or\nlook in Settings for a volume meter.")
-            mcrfpy.setMusicVolume(0)
-            sweet_btn.text = "Music is OFF"
-            sweet_btn.sprite_number = 17
-
-    def sfx_toggle(self, sweet_btn, args):
-        if args[3] == "end": return
-        resources.sfx_enabled = not resources.sfx_enabled
-        #print(f"sfx: {resources.sfx_enabled}")
-        if resources.sfx_enabled:
-            mcrfpy.setSoundVolume(self.sfx_volume)
-            sweet_btn.text = "SFX are ON"
-            sweet_btn.sprite_number = 0
-        else:
-            self.toast_say("Use your volume keys or\nlook in Settings for a volume meter.")
-            mcrfpy.setSoundVolume(0)
-            sweet_btn.text = "SFX are OFF"
-            sweet_btn.sprite_number = 17
-
-mainmenu = MainMenu()
+crypt = Crypt()

src/scripts/simple_tiles.txt

@@ -1,144 +0,0 @@
-145# open space
-???
-?_?
-???
-
-184:0.03# open space variant
-???
-?_?
-???
-
-146# lone wall / pillar
-___
-_X_
-___
-
-132# top left corner
-?_?
-_XX
-?X?
-
-133# plain horizontal wall
-???
-XXX
-?_?
-
-182:0.04# plain horizontal wall variant
-???
-XXX
-?_?
-
-183:0.04# plain horizontal wall variant
-???
-XXX
-?_?
-
-157:0.01# plain horizontal wall variant
-???
-XXX
-?_?
-
-135# top right corner
-?_?
-XX_
-?X?
-
-144@N132@s144@n144@n192@s192@S156@n171@s169@n180# Left side wall. Space on both sides rule may make the dungeon less robust (no double-walls allowed)
-?X?
-?X_
-?X?
-
-147@N135@s147@n147@n193@s193@S159@n170@s168@n181# Right side wall
-?X?
-_X?
-?X?
-
-156# bottom left corner
-?X?
-_XX
-?_?
-
-159# bottom right corner
-?X?
-XX_
-?_?
-
-192@n144@s144@s169# vertical T, left wall
-?X?
-?XX
-?X?
-
-193@n147@s147@s168# vertical T, right wall
-?X?
-XX?
-?X?
-
-180@s144@s144@s169# horizontal T, left wall
-???
-XXX
-?X?
-
-181@s147@s147@s168# horizontal T, right wall
-???
-XXX
-?X?
-
-195@W133@W182@W183@W157# wall for edge of a gap
-??_
-XX_
-?__
-
-195
-?__
-XX_
-?__
-
-194@E133@E182@E183@E157# wall for edge of a gap (R)
-_??
-_XX
-__?
-
-194
-__?
-_XX
-__?
-
-195@W133@W182@W183@W157# wall for edge of a gap
-?__
-XX_
-??_
-
-194@E133@E182@E183@E157# wall for edge of a gap (R)
-__?
-_XX
-_??
-
-195@W133@W182@W183@W157# wall for edge of a gap
-??_
-XX_
-?__
-
-194@E133@E182@E183@E157# wall for edge of a gap (R)
-_??
-_XX
-__?
-
-168@n147@n170@n135@n181@n193# right vertical wall, gap below
-?X?
-_X_
-?_?
-
-169@n144@n171@n132@n192@n180# left vertical wall, gap below
-?X?
-_X_
-?_?
-
-170@s147@s168@s133@s182@s183@s157@s193@s181# right vertical wall, gap above
-?_?
-_X_
-?X?
-
-171@s144@s169@s133@s182@s183@s157@s171@s180# left vertical wall, gap above
-?_?
-_X_
-?X?