diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
index 02ef764ab..d6a63fdbc 100644
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java
@@ -22,6 +22,7 @@ import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
 import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
 import com.gpl.rpg.AndorsTrail.model.item.Loot;
 import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
 import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
 import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
 import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
@@ -124,6 +125,9 @@ public final class ConversationController {
 			case changeMapFilter:
 				changeMapFilter(res, effect.mapName, effect.effectID);
 				break;
+			case mapchange:
+				mapchange(effect.mapName, effect.effectID);
+				break;
 		}
 	}
 
@@ -172,6 +176,13 @@ public final class ConversationController {
 		}
 	}
 
+	private void mapchange(String mapName, String place) {
+		PredefinedMap map = findMapForScriptEffect(mapName);
+//		controllers.mapController.activateMapObjectGroup(map, mapObjectGroupID);
+//		controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, effect.mapName, effect.effectID, 0, 0); //cbcbcb check
+		controllers.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, mapName, place, 0, 0);
+	}
+
 	private void addAlignmentReward(Player player, String faction, int delta) {
 		player.addAlignment(faction, delta);
 		MovementController.refreshMonsterAggressiveness(world.model.currentMaps.map, world.model.player);
diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
index 9357b1dd5..7e1065fe0 100644
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/Requirement.java
@@ -21,6 +21,10 @@ public final class Requirement {
 		,random
 		,factionScoreEquals
 		,wearRemove
+		,date
+		,dateEquals
+		,time
+		,timeEquals
 	}
 
 	public final RequirementType requireType;
@@ -83,6 +87,10 @@ public final class Requirement {
 			case skillLevel:
 				return requireID != null && value >= 0;
 			case spentGold:
+			case date:
+			case dateEquals:
+			case time:
+			case timeEquals:
 				return value >= 0;
 			case random:
 				return chance != null;
diff --git a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
index 1284531ca..ee74a0cc2 100644
--- a/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
+++ b/AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/model/script/ScriptEffect.java
@@ -18,6 +18,7 @@ public final class ScriptEffect {
 		, deactivateMapObjectGroup
 		, removeQuestProgress
 		, changeMapFilter
+		, mapchange
 	}
 
 	public final ScriptEffectType type;