Use new library in pump

planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c

@@ -13,12 +13,11 @@
 #include Library_PowerConsumer
 #include Library_PowerProducer
 #include Library_Tank
+#include Library_ResourceSelection
 
 static const PUMP_Menu_Action_Switch_On = "on";
 static const PUMP_Menu_Action_Switch_Off = "off";
 static const PUMP_Menu_Action_Description = "description";
-static const PUMP_Menu_Action_Material_Enable = "material_on";
-static const PUMP_Menu_Action_Material_Disable = "material_off";
 
 
 local animation; // animation handle
@@ -31,7 +30,6 @@ local power_used; // the amount of power currently consumed or (if negative) pro
 local clog_count; // increased when the pump doesn't find liquid or can't insert it. When it reaches max_clog_count, it will put the pump into temporary idle mode.
 local max_clog_count = 5; // note that even when max_clog_count is reached, the pump will search through offsets (but in idle mode)
 
-local pump_materials; // list of materials which may be pumped.
 local accepted_mat; // currently accepted material.
 
 local stored_material_name; //contained liquid
@@ -50,7 +48,8 @@ public func Construction()
 {
 	// Rotate at a 45 degree angle towards viewer and add a litte bit of Random
 	this.MeshTransformation = Trans_Rotate(50 + RandomX(-10, 10), 0, 1, 0);
-	InitMaterialSelection();
+	// Default selection
+	accepted_mat = nil;
 	return _inherited(...);
 }
 
@@ -553,7 +552,7 @@ public func CheckState()
 	{
 		// Can pump but has no liquid or can't dispense liquid -> wait.
 		var source_mat = GetLiquidSourceMaterial();
-		var source_ok = IsInMaterialSelection(source_mat);
+		var source_ok = IsInResourceSelection(source_mat);
 		var drain_ok = GetLiquidDrainOk(source_mat);
 		if (!source_ok || !drain_ok)
 		{
@@ -696,7 +695,7 @@ private func GetLiquidSourceMaterial()
 	// The source is a liquid container: check which material will be supplied.	
 	if (source_obj->~IsLiquidContainer())
 	{
-		var liquid = source_obj->HasLiquid(pump_materials);
+		var liquid = source_obj->HasLiquid(GetResourceSelection());
 		if (liquid)
 			return liquid->GetLiquidType();
 		return;
@@ -810,114 +809,71 @@ func ToggleOnOff(bool no_menu_refresh)
 
 /*-- Material Selection --*/
 
-private func InitMaterialSelection()
+func IsResourceSelectionParent(id child_resource, id parent_resource)
+{
+	return child_resource->~GetParentLiquidType() == parent_resource;
+}
+
+
+func ShowResourceSelectionMenuEntry(id resource)
+{
+	return resource->~IsLiquid() && resource != Library_Liquid;
+}
+
+
+func InitResourceSelection()
 {
 	// Add all liquids to the list of ones allowed to pump.
-	pump_materials = [];
+	var index = 0, resource;
-	var index = 0, def;
+	while (resource = GetDefinition(index++))
-	while (def = GetDefinition(index++))
+		if (ShowResourceSelectionMenuEntry(resource))
-		if (def->~IsLiquid() && def != Library_Liquid)
+			AddToResourceSelection(resource);
-			PushBack(pump_materials, def);
+	return inherited();
-	// Accepted mat defaults to nil.
-	accepted_mat = nil;		
-	return;	
 }
 
-public func SetMaterialSelection(array mats)
+func IsInResourceSelection(/* any */ mat)
-{
-	pump_materials = mats[:];
-	return;
-}
-
-private func RemoveFromMaterialSelection(id mat)
-{
-	// Remove all child materials (DuroLava for lava) as well
-	var def, index;
-	while (def = GetDefinition(index++))
-	{
-		if (def->~GetParentLiquidType() == mat)
-		{
-			RemoveFromMaterialSelection(def);
-		}
-	}
-	return RemoveArrayValue(pump_materials, mat);
-}
-
-private func AddToMaterialSelection(id mat)
-{
-	// Add all child materials (DuroLava for lava) as well
-	var def, index;
-	while (def = GetDefinition(index++))
-	{
-		if (def->~GetParentLiquidType() == mat)
-		{
-			AddToMaterialSelection(def);
-		}
-	}
-	if (IsValueInArray(pump_materials, mat))
-		return;
-	return PushBack(pump_materials, mat);
-}
-
-private func IsInMaterialSelection(/* any */ mat)
 {
 	if (GetType(mat) == C4V_Def)
-		return IsValueInArray(pump_materials, mat);
+	{
-	for (var def in pump_materials)
+		return inherited(mat);
-		if (def->GetLiquidType() == mat)
+	}
+	for (var resource in GetResourceSelection())
+	{
+		if (resource->GetLiquidType() == mat)
 			return true;		
+	}
 	return false;	
 }
 
 public func GetPumpMaterialsMenuEntries(object clonk)
 {
-	var menu_entries = [];
+	return GetResourceSelectionMenuEntries(clonk);
-	// Add materials to the selection.
-	// Ignore those with parent materials, because they will be added/removed together with the parent
-	var index = 0, def;
-	while (def = GetDefinition(index++))
-	{
-		if (def->~IsLiquid() && def != Library_Liquid && !def->~GetParentLiquidType())
-		{
-			var act = PUMP_Menu_Action_Material_Disable;
-			var status = Icon_Ok;
-			var enabled = IsInMaterialSelection(def);
-			if (!enabled)
-			{
-				act = PUMP_Menu_Action_Material_Enable;
-				status = Icon_Cancel;
-			}
-			PushBack(menu_entries, 
-				{symbol = def, extra_data = act, 
-					custom =
-					{
-						Right = "2em", Bottom = "2em",
-						BackgroundColor = {Std = 0, OnHover = 0x50ff0000},
-						Priority = index,
-						status = {Right = "1em", Top = "1em", Symbol = status},
-						image = {Symbol = def}
-				}}
-			);
-		}
-	}
-	return menu_entries;
 }
 
 public func OnPumpMaterialsHover(id symbol, string action, desc_menu_target, menu_id)
 {
 	var text = "";
-	if (action == PUMP_Menu_Action_Material_Enable) text = Format("$MsgEnableMaterial$", symbol->GetName());
+	if (action == RESOURCE_SELECT_Menu_Action_Resource_Enable)
-	else if (action == PUMP_Menu_Action_Material_Disable) text = Format("$MsgDisableMaterial$", symbol->GetName());
+	{
-	else if (action == PUMP_Menu_Action_Description) text = this.Description;
+		text = Format("$MsgEnableMaterial$", symbol->GetName());
+	}
+	else if (action == RESOURCE_SELECT_Menu_Action_Resource_Disable)
+	{
+		text = Format("$MsgDisableMaterial$", symbol->GetName());
+	}
 	GuiUpdateText(text, menu_id, 1, desc_menu_target);
 }
 
 public func OnPumpMaterials(symbol_or_object, string action, bool alt)
 {
-	if (action == PUMP_Menu_Action_Material_Enable)
+	if (action == RESOURCE_SELECT_Menu_Action_Resource_Enable)
-		AddToMaterialSelection(symbol_or_object);
+	{
-	else if (action == PUMP_Menu_Action_Material_Disable)
+		AddToResourceSelection(symbol_or_object);
-		RemoveFromMaterialSelection(symbol_or_object);
+	}
+	else if (action == RESOURCE_SELECT_Menu_Action_Resource_Disable)
+	{
+		RemoveFromResourceSelection(symbol_or_object);
+	}
 	UpdateInteractionMenus(this.GetPumpMaterialsMenuEntries);	
 }
 

planet/Tests.ocf/CableCars.ocs/Script.c

@@ -477,7 +477,7 @@ global func Test6_OnStart(int plr)
 	
 	var pump = CreateObjectAbove(Pump, 250, 160, plr);
 	CreateObjectAbove(Flagpole, 280, 160, plr);
-	pump->SetMaterialSelection([Concrete]);
+	pump->SetResourceSelection([Concrete]);
 	var source = CreateObjectAbove(Pipe, 168, 292, plr);
 	source->ConnectPipeTo(pump, PIPE_STATE_Source);
 	source->ConnectPipeTo(foundry, PIPE_STATE_Source);

planet/Tests.ocf/LiquidSystem.ocs/Script.c

@@ -212,7 +212,7 @@ global func Test2_OnStart(int plr)
 	drain->ConnectPipeTo(foundry, PIPE_STATE_Drain);
 	
 	var pump = CreateObjectAbove(Pump, 240, 160, plr);
-	pump->SetMaterialSelection([Concrete]);
+	pump->SetResourceSelection([Concrete]);
 	var source = CreateObjectAbove(Pipe, 168, 292, plr);
 	source->ConnectPipeTo(pump, PIPE_STATE_Source);
 	source->ConnectPipeTo(foundry, PIPE_STATE_Source);