Tons of Rhost fixes.

Author: volundmush

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## Version 3.6
+
+
 ## Version 3.5
 * (Experimental) Rhost support is in! There's probably a plethora of bugs, but much of the code is working. I'm still hammering out the kinks but feel welcome to try it.
 

MIGRATION-3.5-3.6.md

@@ -0,0 +1,38 @@
+# NOTE: Do not do this while people are playing.
+# AND MAKE A BACKUP FIRST!
+
+# Step 1
+
+The following SQL script should be run to update the schema and migrate data.
+
+```sql
+BEGIN TRANSACTION;
+
+CREATE TABLE IF NOT EXISTS vol_actrole (
+   actrole_id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
+   actor_id INT UNSIGNED NOT NULL,
+   actrole_name VARCHAR(255) NOT NULL,
+   UNIQUE(actor_id,actrole_name),
+   FOREIGN KEY (actor_id) REFERENCES vol_actor(actor_id) ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB;
+
+INSERT INTO vol_actrole (actor_id,actrole_name) SELECT actor_id,character_name FROM volv_actor;
+
+ALTER TABLE vol_action ADD COLUMN actrole_id INT UNSIGNED NULL;
+
+UPDATE vol_action AS a JOIN vol_actrole AS r ON a.actor_id = r.actor_id SET a.actrole_id = r.actrole_id;
+
+ALTER TABLE vol_action DROP FOREIGN KEY vol_action_ibfk_1;
+ALTER TABLE vol_action DROP COLUMN actor_id;
+ALTER TABLE vol_action DROP COLUMN action_type;
+ALTER TABLE vol_action MODIFY actrole_id INT UNSIGNED NOT NULL;
+
+ALTER TABLE vol_action ADD CONSTRAINT fk_vol_action_actrole FOREIGN KEY (actrole_id) REFERENCES vol_actrole(actrole_id) ON UPDATE CASCADE ON DELETE CASCADE;
+
+COMMIT;
+```
+
+Then re-run the contents of `schema.sql` to rebuild views and stored procedures.
+
+# Step 2
+Re-install the `Scene System - SCENE.txt` file and type `@restart [u(cobj,scene)]` to reload the scene system.

Penn/CORE 01 - Core Code Parent - CCP.txt

@@ -13,7 +13,8 @@ think if(isdbref(u(cobj,ccp)),,setq(0,create(Core Code Parent <CCP>))[tel(%q0,co
 &IS_ANCESTOR [u(cobj,ccp)]=cand(hasattr(u(cobj,ccp),COBJ`ANCESTOR_PLAYER),strmatch(num(%0),num(u(cobj,ancestor_player))))
 
 &ATTRIB_SET [u(cobj,ccp)]=if(u(IS_ANCESTOR,%0),,attrib_set(%0/%1,%2))
-&VATTRIB_SET [u(cobj,ccp)]=u(attrib_set,%0,%1,%2)[set(%0/%1,visual)]
+&VATTRIB_SET [u(cobj,ccp)]=u(attrib_set,%0,%1,%2)[iter(lnum(1,words(%1,`)),set(%0/[elements(%1,lnum(1,%i0),`,`)],visual))]
+
 
 &LATTR [u(cobj,ccp)]=lattr(%0,%1)
 &LATTRP [u(cobj,ccp)]=lattrp(%0,%1)
@@ -321,7 +322,7 @@ think if(isdbref(u(cobj,ccp)),,setq(0,create(Core Code Parent <CCP>))[tel(%q0,co
 
 @@ SQL WRAPPER
 
-&RENDER [u(cobj,ccp)]=render(%0,ansi)
+&RENDER [u(cobj,ccp)]=render(%0,ansi html)
 
 &RSEP [u(cobj,ccp)]=chr(176)
 &FSEP [u(cobj,ccp)]=chr(177)

Schema.sql

@@ -1107,6 +1107,14 @@ CREATE OR REPLACE VIEW volv_scene AS
 	FROM vol_scene AS s LEFT JOIN volv_actor AS a ON s.scene_id=a.scene_id AND a.actor_type=2
 	ORDER BY s.scene_id;
 
+CREATE TABLE IF NOT EXISTS vol_actrole (
+   actrole_id INT AUTO_INCREMENT PRIMARY KEY,
+   actor_id INT NOT NULL,
+   actrole_name VARCHAR(255) NOT NULL,
+   UNIQUE(actor_id,actrole_name),
+   FOREIGN KEY (actor_id) REFERENCES vol_actor(actor_id) ON UPDATE CASCADE ON DELETE CASCADE
+) ENGINE=InnoDB;
+
 CREATE TABLE IF NOT EXISTS vol_action_source (
 	source_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
 	scene_id INT UNSIGNED NOT NULL,
@@ -1119,24 +1127,26 @@ CREATE TABLE IF NOT EXISTS vol_action_source (
 	UNIQUE(scene_id, source_objid, source_name, source_vr, source_type)
 	) ENGINE=InnoDB;
 
+CREATE OR REPLACE VIEW volv_actrole AS
+    SELECT a.actrole_id,a.actrole_name,c.* FROM vol_actrole AS a LEFT JOIN volv_actor AS c ON c.actor_id=a.actor_id;
+
 CREATE TABLE IF NOT EXISTS vol_action (
 	action_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
-	actor_id INT UNSIGNED NOT NULL,
+	actrole_id INT UNSIGNED NOT NULL,
 	source_id INT UNSIGNED NOT NULL,
 	action_is_deleted BOOL NOT NULL DEFAULT FALSE,
-	action_type TINYINT UNSIGNED DEFAULT 0,
 	action_date_created DATETIME NOT NULL,
 	action_text TEXT NOT NULL,
 	action_text_render TEXT NULL,
 	PRIMARY KEY(action_id),
-	INDEX(actor_id, action_is_deleted),
-	FOREIGN KEY(actor_id) REFERENCES vol_actor(actor_id) ON UPDATE CASCADE ON DELETE CASCADE,
+	INDEX(actrole_id, action_is_deleted),
+	FOREIGN KEY(actrole_id) REFERENCES vol_actor(actor_id) ON UPDATE CASCADE ON DELETE CASCADE,
 	FOREIGN KEY(source_id) REFERENCES vol_action_source(source_id) ON UPDATE CASCADE ON DELETE CASCADE
 	) ENGINE=InnoDB;
 
 CREATE OR REPLACE VIEW volv_action AS
-	SELECT a.action_id,ac.actor_id,ac.scene_id,ac.character_id,ac.character_name,ac.character_objid,ac.actor_type,a.source_id,sc.source_objid,sc.source_vr,sc.source_name,sc.source_type,a.action_type,a.action_date_created,UNIX_TIMESTAMP(a.action_date_created) AS action_date_created_secs,a.action_is_deleted,a.action_text,a.action_text_render
-	FROM vol_action AS a LEFT JOIN volv_actor AS ac ON a.actor_id=ac.actor_id LEFT JOIN vol_action_source AS sc ON a.source_id=sc.source_id
+	SELECT a.action_id,ac.actor_id,ac.actrole_id,ac.actrole_name,ac.scene_id,ac.character_id,ac.character_name,ac.character_objid,ac.actor_type,a.source_id,sc.source_objid,sc.source_vr,sc.source_name,sc.source_type,a.action_date_created,UNIX_TIMESTAMP(a.action_date_created) AS action_date_created_secs,a.action_is_deleted,a.action_text,a.action_text_render
+	FROM vol_action AS a LEFT JOIN volv_actrole AS ac ON a.actrole_id=ac.actrole_id LEFT JOIN vol_action_source AS sc ON a.source_id=sc.source_id
 	ORDER BY ac.scene_id,a.action_date_created;
 
 CREATE OR REPLACE VIEW volv_action_agg AS