Allow spawner and mindcontrol master share XP from their slaves

dnqbob · Feb 23, 2024 · a6b727a · a6b727a
1 parent e71279f
commit a6b727a
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 0 deletions.
diff --git a/mods/rv/rules/aircraft.yaml b/mods/rv/rules/aircraft.yaml
@@ -1362,6 +1362,7 @@ hornet:
 	Inherits: ^Plane
 	Inherits@EXPERIENCE: ^GainsExperience
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -1420,6 +1421,7 @@ hornet:
 	-ActorLostNotification:
 	CarrierSlave:
 		LandingDistance: 8c0
+	HasParent:
 	HitShape:
 	Interactable:
 	RenderVoxels:
@@ -1467,6 +1469,7 @@ asw:
 	Inherits: ^Plane
 	Inherits@EXPERIENCE: ^GainsExperience
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	Valued:
 		Cost: 200
 	Tooltip:
@@ -1525,6 +1528,7 @@ asw:
 	-ActorLostNotification:
 	CarrierSlave:
 		LandingDistance: 8c0
+	HasParent:
 	HitShape:
 	Interactable:
 	RenderVoxels:
@@ -1997,6 +2001,7 @@ bpln:
 		Ammo: 2
 	AirstrikeSlave:
 		LandingDistance: 1c0
+	HasParent:
 	Voiced:
 		VoiceSet: MiGVoice
 	RenderSprites:
@@ -3866,6 +3871,7 @@ repdron:
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@STEALTHGEN: ^AffectedByStealthGenerator
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	Tooltip:
 		Name: actor-repdron.name
 	-Selectable:

diff --git a/mods/rv/rules/allied-naval.yaml b/mods/rv/rules/allied-naval.yaml
@@ -260,6 +260,7 @@ carrier:
 	Inherits@MC: ^MindControllableDisabledWithIC
 	Inherits@RADIATON: ^DamagedByRadiation10Percent
 	Inherits@SQUID: ^SquidGrabbable
+	Inherits@EXPERIENCE: ^GainsExperience
 	Buildable:
 		Queue: Ship.Shared, Ship.Allies
 		BuildPaletteOrder: 90

diff --git a/mods/rv/rules/bakuvian-infantry.yaml b/mods/rv/rules/bakuvian-infantry.yaml
@@ -493,6 +493,7 @@ ssnipe:
 		Radius: 3c0
 	RejectsOrders@SLAVED:
 	MobSpawnerSlave:
+	HasParent:
 	WithInfantryBody:
 		IdleSequences: idle1
 	Selectable:
@@ -584,6 +585,7 @@ amob:
 	Inherits@APBULLETS: ^AffectedByAPBullets
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@LEAFLET: ^AffectedByLeaflets
+	Inherits@EXPERIENCE: ^GainsExperience
 	-AppearsOnRadar:
 	Buildable:
 		Queue: Infantry.Shared, Infantry.Turkmenistan

diff --git a/mods/rv/rules/civilian-naval.yaml b/mods/rv/rules/civilian-naval.yaml
@@ -32,6 +32,7 @@ tug:
 	#	Volume: 0.40
 	HitShape:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	ActorStatValues:
 		Stats: Armor, Sight, Speed
 
@@ -67,6 +68,7 @@ cruise:
 	#	Volume: 0.40
 	HitShape:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	# GrantConditionOnMovement@MoveStart:
 	#	Condition: moving
 	#	ValidMovementTypes: Horizontal, Turn

diff --git a/mods/rv/rules/defaults.yaml b/mods/rv/rules/defaults.yaml
@@ -6,6 +6,7 @@
 	DrawLineToTarget:
 	GivesExperience:
 		PlayerExperienceModifier: 10
+	GivesExperienceToMasterOrTransport:
 	ScriptTriggers:
 	Huntable:
 
@@ -1920,6 +1921,7 @@
 	-GrantConditionOnPrerequisite@SUDDENDEATH:
 	-MustBeDestroyed:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-UpdatesPlayerStatistics:
 	-RepairableBuilding:
 	-WithBuildingRepairDecoration:
@@ -2027,6 +2029,7 @@
 	-GrantConditionOnPrerequisite@SUDDENDEATH:
 	-MustBeDestroyed:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-UpdatesPlayerStatistics:
 	OwnerLostAction:
 		Action: ChangeOwner
@@ -2147,6 +2150,7 @@
 		Action: ChangeOwner
 	FrozenUnderFog:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-CombatDebugOverlay:
 	-DrawLineToTarget:
 	Building:
@@ -2779,6 +2783,7 @@
 		Types: CivilianInfantry
 	ScaredyCat:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-GrantConditionOnPrerequisite@SUDDENDEATH:
 	-MustBeDestroyed:
 	-TakeCover:
@@ -2905,6 +2910,7 @@
 	DeathSounds@virus:
 		Voice: Die
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-TakeCover:
 	WithDeathAnimation@normal:
 		DeathTypes:
@@ -3141,6 +3147,7 @@
 		Bounds: 1544, 2509, 0, -289
 	WithVoxelBody:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	Voiced:
 		VoiceSet: CarVoice
 	MapEditorData:
@@ -3332,6 +3339,7 @@
 	Inherits@1: ^ExistsInWorld
 	Inherits@HANDICAPS: ^PlayerHandicaps
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	Armor:
 		Type: Missile
 	BallisticMissile:

diff --git a/mods/rv/rules/yuri-infantry.yaml b/mods/rv/rules/yuri-infantry.yaml
@@ -201,6 +201,7 @@ init.holo:
 	-Buildable:
 	-DeliversCash:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-Passenger:
 	-Garrisoner:
 	-ChangesHealth@AMBULANCE:
@@ -350,6 +351,7 @@ brute.holo:
 	-Buildable:
 	-DeliversCash:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-Passenger:
 	-Garrisoner:
 	-ChangesHealth@AMBULANCE:
@@ -1040,6 +1042,7 @@ gtrp.holo:
 	-Buildable:
 	-DeliversCash:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-Passenger:
 	-Garrisoner:
 	-ChangesHealth@AMBULANCE:

diff --git a/mods/rv/rules/yuri-vehicles.yaml b/mods/rv/rules/yuri-vehicles.yaml
@@ -288,6 +288,7 @@ ltnk.holo:
 	-Buildable:
 	-DeliversCash:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-Passenger:
 	-Explodes@COMPENSATORS:
 	-GrantConditionOnPrerequisite@COMPENSATORS:
@@ -528,6 +529,7 @@ ytnk.holo:
 	-Buildable:
 	-DeliversCash:
 	-GivesExperience:
+	-GivesExperienceToMasterOrTransport:
 	-Passenger:
 	-Explodes@COMPENSATORS:
 	-GrantConditionOnPrerequisite@COMPENSATORS:
@@ -785,6 +787,7 @@ mind:
 	Inherits@GRINDER: ^AffectedByGrinderTreads
 	Inherits@MASTERYOFMIND: ^AffectedByMasteryOfMind
 	Inherits@RADIATON: ^DamagedByRadiation10Percent
+	Inherits@EXPERIENCE: ^GainsExperience
 	Valued:
 		Cost: 1750
 	DeliversCash: