import some more assets

Author: lambertjamesd

asset_library/meshes/stone_indoor/block.blend

@@ -0,0 +1,10 @@
+{
+    "tex0": "../../images/stone_indoor/floor_small1.png",
+    "combineMode": [{
+        "color": ["TEX0", "0", "SHADE", "0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/button.blend

@@ -0,0 +1,18 @@
+{
+    "tex0": {
+        "filename": "../../images/stone_indoor/floor_large1.png",
+        "s": {
+            "mirror": true
+        },
+        "t": {
+            "mirror": true
+        }
+    },
+    "combineMode": [{
+        "color": ["TEX0", "0", "SHADE", "0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/floor_large1.blend

@@ -0,0 +1,10 @@
+{
+    "tex0": "../../images/stone_indoor/floor_small1.png",
+    "combineMode": [{
+        "color": ["0", "0", "0", "TEX0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/floor_small1.blend

@@ -0,0 +1,10 @@
+{
+    "tex0": "../../images/stone_indoor/floor_small2.png",
+    "combineMode": [{
+        "color": ["0", "0", "0", "TEX0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/floor_small2.blend

@@ -0,0 +1,10 @@
+{
+    "tex0": "../../images/stone_indoor/floorbutton.png",
+    "combineMode": [{
+        "color": ["0", "0", "0", "TEX0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/wall1.blend

@@ -0,0 +1,18 @@
+{
+    "tex0": {
+        "filename": "../../images/stone_indoor/wall1.png",
+        "s": {
+            "mirror": true
+        },
+        "t": {
+            "mirror": true
+        }
+    },
+    "combineMode": [{
+        "color": ["TEX0", "0", "SHADE", "0"],
+        "alpha": ["0", "0", "0", "1"]
+    }],
+    "blendMode": "OPAQUE",
+    "lighting": false,
+    "zBuffer": true
+}

asset_library/meshes/stone_indoor/wallcorner_inner.blend

@@ -32,7 +32,6 @@
 #define RDPQ_VALIDATE_DETACH_ADDR    0x00800000
 
 struct world* current_world;
-struct crate crate_test;
 struct collectable collectable_test;
 
 struct spell_symbol test_spell_symbols[] = {
@@ -66,8 +65,6 @@ void setup() {
     def.position.z = 0.0f;
     def.rotation = gRight2;
 
-    crate_init(&crate_test, &def);
-
     struct collectable_definition collect_def;
     collect_def.position.x = 4.0f;
     collect_def.position.y = 1.0f;

asset_library/meshes/stone_indoor/wallcorner_outer.blend

@@ -58,7 +58,7 @@ void world_load_entity(struct world* world, struct entity_data* entity_data, FIL
     fread(entity_def_data, definition_size, entity_data->entity_count, file);
 
     for (int entity_index = 0; entity_index < entity_data->entity_count; entity_index += 1) {
-        def->init(entity, entity_def_data);
+        def->init(entity, entity_def);
 
         entity += def->entity_size;
         entity_def += def->definition_size;

assets/images/enemies/enemy1.png

@@ -44,6 +44,8 @@ void recast_update_end_cast(struct recast* recast, struct spell_event_listener*
     recast->output->position = recast->original_source->position;
     recast->output->direction = recast->original_source->direction;
     recast->output->flags = recast->original_source->flags;
+    // recast consumes this flag
+    recast->output->flags.reversed = 0;
     recast->output->flags.cast_state = SPELL_CAST_STATE_ACTIVE;
     recast->output->target = recast->original_source->target;
 

assets/images/spell/symbols.png

@@ -13,7 +13,11 @@ enum spell_symbol_type {
     SPELL_SYMBOL_PROJECTILE,
     SPELL_SYMBOL_PUSH,
     SPELL_SYMBOL_RECAST,
-    SPELL_SYMBOL_STICKY_CAST,
+    SPELL_SYMBOL_SHIELD,
+    SPELL_SYMBOL_REVERSE,
+    SPELL_SYMBOL_TARGET,
+    SPELL_SYMBOL_UP,
+    SPELL_SYMBOL_TIME_DIALATION,
 
     SPELL_SYMBOL_PASS_DOWN,
 

assets/images/stone_indoor/floor_large1.png

@@ -17,6 +17,12 @@ enum spell_cast_state {
 union spell_source_flags {
     struct {
         uint16_t flaming: 1;
+        uint16_t icy: 1;
+        uint16_t fast: 1;
+        uint16_t slow: 1;
+        uint16_t up: 1;
+        uint16_t around: 1;
+        uint16_t reversed: 1;
         uint16_t controlled: 1;
         uint16_t cast_state: 2;
     };

assets/images/stone_indoor/floor_small1.png

@@ -39,11 +39,7 @@ void spell_slot_init(
             break;
         case SPELL_SYMBOL_RECAST:
             slot->type = SPELL_EXEC_SLOT_TYPE_RECAST;
-            recast_init(&slot->data.recast, input, event_options, RECAST_MODE_RECAST);
-            break;
-        case SPELL_SYMBOL_STICKY_CAST:
-            slot->type = SPELL_EXEC_SLOT_TYPE_RECAST;
-            recast_init(&slot->data.recast, input, event_options, REACT_MODE_STICKY);
+            recast_init(&slot->data.recast, input, event_options, input->flags.reversed ? REACT_MODE_STICKY : RECAST_MODE_RECAST);
             break;
         case SPELL_SYMBOL_PUSH:
             slot->type = SPELL_EXEC_SLOT_TYPE_PUSH;

assets/images/stone_indoor/floor_small2.png

@@ -67,7 +67,7 @@ def process_scene():
 
         mesh_source = None
 
-        if mesh.library or 'type' in mesh:
+        if 'type' in mesh:
             process_linked_object(world, obj, mesh, definitions)
         elif len(mesh.materials) > 0:
             world.static.append(StaticEntry(obj, mesh, final_transform))