Set sourceObj when building rumor list - simplifies GetRumor event

kronosaur · Mar 24, 2018 · 15b14fa · 15b14fa
1 parent 9638c61
commit 15b14fa
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 24 deletions.
diff --git a/TransCore/Abbasid.xml b/TransCore/Abbasid.xml
@@ -85,7 +85,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 22
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))
 					}

diff --git a/TransCore/BattleArena.xml b/TransCore/BattleArena.xml
@@ -237,15 +237,13 @@
 					{
 						attributes: 'commonwealthHabitat
 						priority: 100
-						sourceObj: gSource
 						textID: (cat "rumor.commonwealthHabitat.weapon"
 							(seededRandom (objGetDestiny (@ gData 'stationObj)) 1 5)
 							)
 						}
 					{
 						attributes: 'commonwealthHabitat
 						priority: 100
-						sourceObj: gSource
 						textID: (cat "rumor.commonwealthHabitat.shield"
 							(seededRandom (objGetDestiny (@ gData 'stationObj)) 1 3)
 							)

diff --git a/TransCore/BlackMarket.xml b/TransCore/BlackMarket.xml
@@ -437,7 +437,6 @@ PLAYER DATA
 				{
 					attributes: "commonwealthPub"
 					priority: 31
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))
 					}
@@ -774,7 +773,6 @@ PLAYER DATA
 				{
 					attributes: "commonwealthPub"
 					priority: 23
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))
 					}

diff --git a/TransCore/CentauriWarlords.xml b/TransCore/CentauriWarlords.xml
@@ -444,7 +444,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 10
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					data: {station: (objGetName gSource)}
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))

diff --git a/TransCore/CorporateHierarchy.xml b/TransCore/CorporateHierarchy.xml
@@ -1894,7 +1894,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 24
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					data: {station: (objGetName gSource)}
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))

diff --git a/TransCore/DeathDrugsCartel.xml b/TransCore/DeathDrugsCartel.xml
@@ -145,7 +145,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 40
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					}
 			</GetRumors>

diff --git a/TransCore/KorolovShipping.xml b/TransCore/KorolovShipping.xml
@@ -739,7 +739,6 @@
 					{
 						attributes: "commonwealthPub"
 						priority: 21
-						sourceObj: gSource
 						textID: (switch
 							(or (not rank) (= rank 0))	'rumor.commonwealthPub.norank
 							(ls rank 0)					'rumor.commonwealthPub.blacklisted

diff --git a/TransCore/Outlaws.xml b/TransCore/Outlaws.xml
@@ -482,7 +482,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 11
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					}
 			</GetRumors>

diff --git a/TransCore/Penitents.xml b/TransCore/Penitents.xml
@@ -91,7 +91,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 50
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					}
 			</GetRumors>

diff --git a/TransCore/RPGRumors.xml b/TransCore/RPGRumors.xml
@@ -126,7 +126,6 @@
 					{
 						attributes: attrib
 						priority: (or priority 10)
-						sourceObj: gSource
 						textID: (cat "rumor." attrib (if suf ".") suf)
 						data: data
 						onExitRumor: (switch
@@ -175,31 +174,37 @@
 						stationObj:gSource
 						})
 
-					;	Lambda to add sourceType to global rumors
-					(wrapGlobalRumor (lambda (rumors theType)
+					;	Lambda to set rumor defaults
+					(setRumorDefaults (lambda (default rumors)
 						(switch
 							(= (typeOf rumors) 'struct)
-								(set@ rumors { sourceObj:Nil sourceType:theType })
+								(struct default rumors)
 							(= (typeOf rumors) 'list)
 								(map rumors theRumor
-									(set@ theRumor { sourceObj:Nil sourceType:theType })
+									(struct default theRumor)
 									)
 							)
 						))
 
 					;	Build rumor list from: global types, local stations, and missions
 					(allRumors (apply append (append
 						(map (typFind "*") 'excludeNil theType
-							(wrapGlobalRumor
+							(setRumorDefaults
+								{	sourceType: theType	}
 								(typFireEvent theType 'GetGlobalRumors eventData)
-								theType
 								)
 							)
 						(map (sysFindObject Nil "AT") 'excludeNil theObj
-							(objFireEvent theObj 'GetRumors eventData)
+							(setRumorDefaults
+								{	sourceObj: theObj	}
+								(objFireEvent theObj 'GetRumors eventData)
+								)
 							)
 						(map (msnFind "*") 'excludeNil msnObj
-							(msnFireEvent msnObj 'GetRumors eventData)
+							(setRumorDefaults
+								{	sourceObj: msnObj	}
+								(msnFireEvent msnObj 'GetRumors eventData)
+								)
 							)
 						)))
 

diff --git a/TransCore/RaisuStation.xml b/TransCore/RaisuStation.xml
@@ -367,7 +367,6 @@
 							{
 								attributes: 'commonwealthHabitat
 								priority: 10000
-								sourceObj: gSource
 								dialogID: 'descMeetingHallHappy
 								}
 							)

diff --git a/TransCore/Sapiens.xml b/TransCore/Sapiens.xml
@@ -251,7 +251,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 30
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					onExitRumor: (lambda (theRumor) (objSetKnown (@ theRumor 'sourceObj)))
 					}

diff --git a/TransCore/SungSlavers.xml b/TransCore/SungSlavers.xml
@@ -1096,7 +1096,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 41
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					}
 			</GetRumors>

diff --git a/TransCore/Xenophobes.xml b/TransCore/Xenophobes.xml
@@ -576,7 +576,6 @@
 				{
 					attributes: "commonwealthPub"
 					priority: 60
-					sourceObj: gSource
 					textID: 'rumor.commonwealthPub
 					}
 			</GetRumors>