ZDoom

wildweasel wrote:Yeah that's a concern that remains, for me, WadSmoosh's output identifies as Doom 1/Ultimate, which means it responds to the Doom1 folders where [wiki]Lump filtering[/wiki] is concerned. Granted, the only mod I've played that actually makes noticeable changes using lump filtering is my own Mixed Tape Vol.3 which removes the SSG replacement in Doom 1 mode...

Spoiler: ACS

---

Code: Select all

script "Item_GameDetector" (void)
{
	str maplump = StrParam(n:PRINTNAME_LEVEL);
	
	if (StrCmp(StrLeft(maplump, 2), "E1") == 0 | StrCmp(StrLeft(maplump, 2), "E2") == 0 | StrCmp(StrLeft(maplump, 2), "E3") == 0 | StrCmp(StrLeft(maplump, 2), "E4") == 0)
	{
		if(GetCvar("meta_developer"))
			log(s:"Map Type: Doom 1 Episodic");
		SetResultValue(2);
	}
	else if (StrCmp(StrLeft(maplump, 5), "LEVEL") == 0 | StrCmp(StrLeft(maplump, 3), "NV_") == 0 )
	{
		if(GetCvar("meta_developer"))
			log(s:"Map Type: Doom 2 Episodic");
		SetResultValue(3);
	}
	else
	{
		if(GetCvar("meta_developer"))
			log(s:"Map Type: Doom 2, probably");
		SetResultValue(1);
	}
}

Spoiler: DECORATE

---

Code: Select all

actor ShotgunSpawner replaces Shotgun
{
	States
	{
	Spawn:
		TNT1 A 0
		TNT1 A 0 A_JumpIf(GetCvar(meta_noalts_weapons) == 1, "Shotgun")
		TNT1 A 0 A_JumpIf(GetCvar(meta_contentlocust) == 1, "VarietyPack")
		TNT1 A 0 A_JumpIf(CallACS("Item_Shotgun", 0, 0, 0) == 1, "Shotgun")
		TNT1 A 0 A_JumpIf(CallACS("Item_Shotgun", 0, 0, 0) == 2, "VarietyPack")
		goto Shotgun
	VarietyPack:
		TNT1 A 0 A_JumpIf(CallACS("Item_GameDetector", 0, 0, 0) == 2, "Doom1VarietyPack")
		TNT1 A 0 A_Jump(64,"HolyWaterPistol")
		goto Shotgun
	Doom1VarietyPack:
		TNT1 A 0 A_Jump(64,"HolyWaterPistol", "SSG")
		goto Shotgun
	Shotgun:
		TNT1 A 0 A_SpawnItemEx("MetaShotgunPickup",0,0,0,0,0,0,0,SXF_TRANSFERPOINTERS|SXF_TRANSFERAMBUSHFLAG|SXF_TRANSFERSPECIAL|SXF_NOCHECKPOSITION)
		stop
	SSG:
		TNT1 A 0 A_SpawnItemEx("SuperShotgunSpawner",0,0,0,0,0,0,0,SXF_TRANSFERPOINTERS|SXF_TRANSFERAMBUSHFLAG|SXF_TRANSFERSPECIAL|SXF_NOCHECKPOSITION)
		stop
	HolyWaterPistol:
		TNT1 A 0 A_SpawnItemEx("HolyWaterPistolPickup",0,0,0,0,0,0,0,SXF_TRANSFERPOINTERS|SXF_TRANSFERAMBUSHFLAG|SXF_TRANSFERSPECIAL|SXF_NOCHECKPOSITION)
		stop
	}
}

Vaecrius wrote:That said: Kinsie, maybe include a check for E5+ for stuff like the Lost Episode?

JPL wrote:Last time I checked I'm not sure I can prevent ZDoom from detecting it as Doom1 because it checks for an E1M1 lump before it checks for a MAP01 lump, and WadSmoosh's output pk3 usually has both:
https://github.com/rheit/zdoom/blob/mas ... adinfo.txt

I did add the "smooshed.txt" identifying text lump when someone requested it, so maybe adding it to ZDoom's search data is just a simple pull request? Not sure if that fixes the issue you're talking about though.

Vaecrius wrote:

JPL wrote:Last time I checked I'm not sure I can prevent ZDoom from detecting it as Doom1 because it checks for an E1M1 lump before it checks for a MAP01 lump, and WadSmoosh's output pk3 usually has both:
https://github.com/rheit/zdoom/blob/mas ... adinfo.txt

I did add the "smooshed.txt" identifying text lump when someone requested it, so maybe adding it to ZDoom's search data is just a simple pull request? Not sure if that fixes the issue you're talking about though.

Has anyone submitted a feature request for this? It seems odd that it would check in this order and count as D1 an iwad that has resources for both games and thus typically ought to count as D2 for the main reason why most people would even use wad filtering to begin with (to get around the absent resources in D1).

Kinsie wrote:

Vaecrius wrote:That said: Kinsie, maybe include a check for E5+ for stuff like the Lost Episode?

Pretty easy to do, I'll try and remember to add it.

JPL wrote:

enderandrew wrote:In an ideal world, I want to be able to play Doom 1 and 2 with the two bonus XBox levels properly integrated into the episodes as secrets to find,

Bonus Xbox levels: I knew someone would eventually test my "no subjective decisions" statement. This is actually the first request for this I've gotten. It would definitely be a lot of work for very little benefit. The levels themselves are distributed on classicdoom.com in bugfixed form, but the alt versions of E1M1 and MAP02 that have secret exits that lead to them aren't and would need to be extracted or recreated with special custom logic. Pretty sure the MAPINFO data wouldn't have to change; it could just have "secretnext" values that never get used in the non-Xbox versions. Maybe some custom intermission data needed. All for two maps that weren't produced by the original teams and, most Doomers would probably say, don't meet the minimum quality bar of any of those original releases.

funduke re-regist wrote:Would it be possible to program the data handling directly into the source port executable, so that the exe is just pointed to the original WADs and then does the data structuring on it's own?

Gez wrote:It's not impossible, but there's not much reason to do that when WadSmoosh exists, and it'd bog down the archive manager with a lot of convoluted hacks. It's not a desirable thing, from the port developer's point of view.