Skip to content

Commit 74a3dfa

Browse files
JaithWraithJaithWraith
authored
Merge pull request #23 from JaithWraith/21.1-branch
21.1 branch
2 parents 20a9574 + 5a52bba commit 74a3dfa

File tree

4 files changed

+458
-501
lines changed

4 files changed

+458
-501
lines changed

‎entityclasses.xml

Lines changed: 33 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
<triggered_effect trigger="onSelfFirstSpawn" action="AddBuff" target="self" buff="buffEntitySpawnHeal"/>
522522

523523
<passive_effect name="StaminaMax" operation="base_set" value="100"/>
524-
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingTwo"/>
524+
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingTwo,buffRadiationPool"/>
525525

526526
<triggered_effect trigger="onSelfAttackedOther" action="ModifyCVar" target="other" cvar="noTeethNoInfection" operation="set" value="0">
527527
<requirement name="NotHasBuff" buff="buffBrawlerNoTeeth"/></triggered_effect>
@@ -741,7 +741,6 @@
741741
<property name="WalkType" value="5"/>
742742
<property name="RootMotion" value="true"/>
743743
<property name="HasDeathAnim" value="true"/>
744-
<property name="TintMaterial2" value="41,25,25"/>
745744
<property name="DanceType" value="2" />
746745

747746
<property name="DismemberTag_L_HeadGore"
@@ -1187,7 +1186,6 @@
11871186
<property name="WalkType" value="5"/>
11881187
<property name="RootMotion" value="true"/>
11891188
<property name="HasDeathAnim" value="true"/>
1190-
<property name="TintMaterial2" value="79,40,26"/>
11911189

11921190
<property name="DismemberTag_L_HeadGore"
11931191
value="
@@ -1337,7 +1335,6 @@
13371335
<property name="WalkType" value="6"/>
13381336
<property name="Mass" value="160"/>
13391337
<property name="RootMotion" value="true"/>
1340-
<property name="TintMaterial2" value="36,38,45"/>
13411338

13421339
<!-- Must match gore dismemberment tags -->
13431340
<!-- Override parts in the derrived class -->
@@ -1415,7 +1412,6 @@
14151412
<property name="WalkType" value="6"/>
14161413
<property name="Mass" value="160"/>
14171414
<property name="RootMotion" value="true"/>
1418-
<property name="TintMaterial2" value="36,38,45"/>
14191415

14201416
<!-- Must match gore dismemberment tags -->
14211417
<!-- Override parts in the derrived class -->
@@ -1569,7 +1565,6 @@
15691565
<property name="WalkType" value="7"/>
15701566
<property name="Mass" value="160"/>
15711567
<property name="RootMotion" value="true"/>
1572-
<property name="TintMaterial1" value="36,38,45"/>
15731568

15741569
<property name="DismemberTag_L_HeadGore"
15751570
value="
@@ -1699,6 +1694,7 @@
16991694
<!-- Gameplay zombieBusinessManRadiated -->
17001695
<property name="DismemberMultiplierHead" value="0"/><property name="DismemberMultiplierArms" value="0"/><property name="DismemberMultiplierLegs" value="0"/><!-- Radiated -->
17011696
<property name="PainResistPerHit" value=".9"/><!-- Radiated -->
1697+
<property name="ExperienceGain" value="1200"/>
17021698

17031699
<effect_group name="Base Effects">
17041700
<passive_effect name="HealthMax" operation="base_set" value="1000"/>
@@ -1980,7 +1976,6 @@
19801976
<property name="WalkType" value="2"/>
19811977
<property name="RootMotion" value="true"/>
19821978
<property name="HasDeathAnim" value="true"/>
1983-
<property name="ReplaceMaterial1" value="@:Entities/Zombies/Zombies/Materials/Z_eye1.mat"/>
19841979

19851980
<property name="DismemberTag_L_HeadGore"
19861981
value="
@@ -2083,7 +2078,6 @@
20832078
<entity_class name="zombieBoeFeral" extends="zombieBoe">
20842079
<property name="UserSpawnType" value="Menu"/>
20852080
<property name="Tags" value="entity,zombie,walker,feral"/>
2086-
<!--<property name="ReplaceMaterial1" value="@:Entities/Zombies/Zombies/Materials/feral_eye.mat"/>-->
20872081
<property name="Mesh" value="@:Entities/Zombies/Prefabs/ZBoeFeral.prefab"/>
20882082

20892083
<!-- Gameplay zombieBoeFeral -->
@@ -2300,7 +2294,6 @@
23002294
<property name="WalkType" value="5"/>
23012295
<property name="RootMotion" value="true"/>
23022296
<property name="HasDeathAnim" value="true"/>
2303-
<property name="TintMaterial2" value="79,40,26"/>
23042297

23052298
<property name="DismemberTag_L_HeadGore"
23062299
value="
@@ -2459,7 +2452,7 @@
24592452
<property name="PushFactor" value="20"/>
24602453
<property name="RootMotion" value="true"/>
24612454
<property name="HasDeathAnim" value="true"/>
2462-
<property name="TintMaterial2" value="41,38,34"/>
2455+
24632456
<property name="SoundRandom" value="Enemies/Base_Zombie_Male2/zombiemale2roam"/>
24642457
<property name="SoundAlert" value="Enemies/Base_Zombie_Male2/zombiemale2alert"/>
24652458
<property name="SoundSense" value="Enemies/Base_Zombie_Male2/zombiemale2sense"/>
@@ -2773,7 +2766,6 @@
27732766
<property name="WalkType" value="3"/>
27742767
<property name="RootMotion" value="true"/>
27752768
<property name="HasDeathAnim" value="true"/>
2776-
<property name="TintMaterial2" value="32,24,20"/>
27772769
<property name="DanceType" value="2" />
27782770

27792771
<property name="DismemberTag_L_HeadGore"
@@ -2922,7 +2914,6 @@
29222914
<property name="WalkType" value="5"/>
29232915
<property name="RootMotion" value="true"/>
29242916
<property name="HasDeathAnim" value="true"/>
2925-
<property name="TintMaterial3" value="23,17,13"/>
29262917

29272918
<property name="DismemberTag_L_HeadGore"
29282919
value="
@@ -3074,7 +3065,6 @@
30743065
<property name="WalkType" value="6"/>
30753066
<property name="RootMotion" value="true"/>
30763067
<property name="HasDeathAnim" value="true"/>
3077-
<property name="TintMaterial2" value="41,41,41"/>
30783068
<property name="AINoiseSeekDist" value="4"/>
30793069
<property name="AIPathCostScale" value=".9, 1"/>
30803070

@@ -3374,7 +3364,6 @@
33743364
<property name="PhysicsBody" value="zombieFemaleFat"/>
33753365
<property name="RootMotion" value="true"/>
33763366
<property name="HasDeathAnim" value="true"/>
3377-
<property name="TintMaterial2" value="64,63,62"/>
33783367
<property name="DanceType" value="2" />
33793368

33803369
<!-- Stealth -->
@@ -3452,7 +3441,6 @@
34523441
<property name="PhysicsBody" value="zombieFat"/>
34533442
<property name="RootMotion" value="true"/>
34543443
<property name="HasDeathAnim" value="true"/>
3455-
<property name="ReplaceMaterial1" value="@:Entities/Zombies/Zombies/Materials/Z_eye1.mat"/>
34563444

34573445
<!-- Gameplay zombieFatHawaiian -->
34583446
<property name="MoveSpeedAggro" value="0.2, 1.2"/>
@@ -3524,6 +3512,7 @@
35243512

35253513
<property name="AITask" value="
35263514
BreakBlock|
3515+
ApproachDistraction|
35273516
RangedAttackTarget itemType=1;cooldown=4;duration=5|
35283517
ApproachAndAttackTarget class=EntityPlayer,0,EntityBandit,0,EntityEnemyAnimal|
35293518
ApproachSpot|
@@ -3981,7 +3970,6 @@
39813970
<property name="UserSpawnType" value="Menu"/>
39823971
<property name="Tags" value="entity,zombie,walker,feral,radiated"/>
39833972
<property name="Mesh" value="@:Entities/Zombies/Prefabs/ZWightRadiated.prefab"/>
3984-
<property name="ReplaceMaterial1" value="@:Entities/Zombies/Zombies/Materials/rad_eye.mat"/>
39853973
<!--<property name="ParticleOnSpawn" value="ParticleEffects/RadiatedParticlesOnMesh" param1="SetShapeToMesh0"/>-->
39863974

39873975
<property name="LegCrawlerThreshold" value="0"/>
@@ -4101,6 +4089,7 @@
41014089

41024090
<property name="AITask" value="
41034091
BreakBlock|
4092+
ApproachDistraction|
41044093
RangedAttackTarget itemType=1;cooldown=4;duration=3;minRange=1;maxRange=6;unreachableRange=18|
41054094
DestroyArea|
41064095
ApproachAndAttackTarget class=EntityPlayer,0,EntityBandit,0,EntityEnemyAnimal|
@@ -4176,6 +4165,7 @@
41764165
<property name="AITask" value="
41774166
BreakBlock|
41784167
DestroyArea|
4168+
ApproachDistraction|
41794169
ApproachAndAttackTarget class=EntityPlayer,0,EntityBandit,0,EntityEnemyAnimal|
41804170
ApproachSpot|
41814171
Look|
@@ -4228,7 +4218,6 @@
42284218
<property name="WalkType" value="21"/>
42294219
<property name="RotateToGround" value="true"/>
42304220
<property name="RootMotion" value="true"/>
4231-
<property name="TintMaterial2" value="36,38,45"/>
42324221
<property name="SoundRandomTime" value="16.0"/> <!-- It will play the roam every 30/15 seconds -->
42334222
<property name="SoundRandom" value="crawler_roam"/>
42344223
<property name="SoundAlertTime" value="12.0"/> <!-- It will play the alert every 20/10 seconds-->
@@ -4814,7 +4803,7 @@
48144803
<property name="UserSpawnType" value="Menu"/>
48154804
<property name="EntityFlags" value="animal,zombie"/>
48164805
<property name="Tags" value="entity,animal,zombie,hostile,bear"/>
4817-
<property name="ReplaceMaterial0" value="Entities/Animals/Bear/Materials/zBear"/>
4806+
<property name="Prefab" value="/Entities/Animals/Bear/animalZBear"/>
48184807
<property name="ReplaceMaterial1" value="Materials/UMAFur_ZombieBear"/>
48194808

48204809
<property name="AIFeralSense" value="1.2"/>
@@ -4850,6 +4839,7 @@
48504839

48514840
<effect_group name="Base Effects">
48524841
<passive_effect name="HealthMax" operation="base_set" value="2000"/>
4842+
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffRadiationPool"/>
48534843
</effect_group>
48544844
</entity_class>
48554845

@@ -4917,9 +4907,8 @@
49174907
<entity_class name="animalDireWolf" extends="animalWolf">
49184908
<property name="UserSpawnType" value="Menu"/>
49194909
<property name="Mass" value="180"/>
4920-
<property name="Prefab" value="/Entities/Animals/Wolf/animalStandardWolfRagdoll"/>
4910+
<property name="Prefab" value="/Entities/Animals/Wolf/animalDireWolf"/>
49214911
<property name="SizeScale" value="1.4"/>
4922-
<property name="ReplaceMaterial1" value="entities/animals/wolf/materials/wolfEyeFeral"/>
49234912

49244913
<property name="AITask-1" value="BreakBlock"/>
49254914
<property name="AITask-2" value="Territorial"/>
@@ -5169,6 +5158,7 @@
51695158

51705159
<effect_group name="Base Effects">
51715160
<passive_effect name="HealthMax" operation="base_set" value="30"/>
5161+
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffRadiationPool"/>
51725162
</effect_group>
51735163
</entity_class>
51745164

@@ -5199,6 +5189,7 @@
51995189

52005190
<effect_group name="Base Effects">
52015191
<passive_effect name="HealthMax" operation="base_set" value="120"/>
5192+
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffRadiationPool"/>
52025193
<passive_effect name="EntityDamage" operation="perc_add" value=".4"/> <!-- Feral damage -->
52035194
<triggered_effect trigger="onOtherDamagedSelf" action="ModifyCVar" target="self" cvar="RadiatedRegenAmount" operation="set" value="4"/>
52045195
<triggered_effect trigger="onOtherDamagedSelf" action="AddBuff" target="self" buff="buffRadiatedRegen"/>
@@ -5266,6 +5257,7 @@
52665257
<!-- <drop event="Destroy" name="resourceAnimalFat" tag="butcherHarvest" count="2"/> -->
52675258
<effect_group name="Base Effects">
52685259
<passive_effect name="HealthMax" operation="base_set" value="200"/>
5260+
<passive_effect name="BuffResistance" operation="base_set" value="5" tags="buffRadiationPool"/>
52695261
</effect_group>
52705262
</entity_class>
52715263

@@ -5398,11 +5390,9 @@
53985390
<property name="UserSpawnType" value="Menu"/>
53995391
<property name="Tags" value="entity,animal,hostile,boar,perkAT03,boss"/>
54005392
<property name="IsEnemyEntity" value="true"/>
5401-
<property name="ReplaceMaterial0" value="Entities/Animals/Boar/Materials/GRACE"/>
5402-
<property name="ReplaceMaterial1" value="Entities/Animals/Boar/Materials/GRACE"/>
5393+
<property name="Prefab" value="/Entities/Animals/Boar/AnimalBossGrace"/>
54035394
<!--<property name="ParticleOnSpawn" value="ParticleEffects/RadiatedParticlesOnMesh" param1="SetShapeToMesh0"/>-->
54045395
<property name="Mass" value="1200"/>
5405-
<property name="Prefab" value="/Entities/Animals/Boar/AnimalBossGrace"/>
54065396
<property name="SoundRandom" value="Animals/Boar/boarroam"/>
54075397
<property name="SoundAlert" value="Animals/Boar/boaralert"/>
54085398
<property name="SoundHurt" value="Animals/Boar/boarpain"/>
@@ -5701,7 +5691,22 @@ Kinda sorta works but is buggy and we don't have time for that.
57015691
<property name="Faction" value="none"/>
57025692
</entity_class>
57035693

5704-
<!-- *** REGULAR_LOOT_BAG__YELLOW -->
5694+
<!-- *** DROPPED_VEHICLE_CONTAINER_BACKPACK -->
5695+
<!-- used after a vehicle is destroyed -->
5696+
<entity_class name="DroppedVehicleContainer">
5697+
<property name="Class" value="EntityLootContainer"/>
5698+
<property name="UserSpawnType" value="None"/>
5699+
<property name="Mesh" value="@:Entities/LootContainers/backpack_vehicleDroppedPrefab.prefab"/>
5700+
<property name="ModelType" value="Custom"/>
5701+
<property name="Prefab" value="Backpack"/>
5702+
<property name="Parent" value="Backpack"/>
5703+
<property name="TimeStayAfterDeath" value="3600"/>
5704+
<property name="IsEnemyEntity" value="false"/>
5705+
<property name="LootListOnDeath" value="cntDropBag"/> <!-- used to determine container X/Y size -->
5706+
<property name="Faction" value="none"/>
5707+
</entity_class>
5708+
5709+
<!-- *** REGULAR_LOOT_BAG__YELLOW -->
57055710
<entity_class name="EntityLootContainerRegular">
57065711
<property name="Class" value="EntityLootContainer"/>
57075712
<property name="UserSpawnType" value="Console"/>
@@ -5734,7 +5739,6 @@ Kinda sorta works but is buggy and we don't have time for that.
57345739
<property name="Class" value="EntityLootContainer"/>
57355740
<property name="UserSpawnType" value="Console"/>
57365741
<property name="Mesh" value="@:Entities/LootContainers/zpackRedPrefab.prefab"/>
5737-
<property name="TintColor" value="FF0000"/>
57385742
<property name="ModelType" value="Custom"/>
57395743
<property name="Prefab" value="Backpack"/>
57405744
<property name="Parent" value="Backpack"/>
@@ -5788,7 +5792,7 @@ Kinda sorta works but is buggy and we don't have time for that.
57885792
<property name="MoveSpeedPanic" value="1.15"/>
57895793
<property name="CanClimbLadders" value="true"/>
57905794
<property name="IsEnemyEntity" value="true"/>
5791-
<property name="SurfaceCategory" value="earth"/>
5795+
<property name="SurfaceCategory" value="organic"/>
57925796
<property name="WalkType" value="7"/>
57935797
<property name="ParticleOnDeath" value="blood_death"/>
57945798
<property name="SoundRandomTime" value="200.0"/>
@@ -5882,7 +5886,7 @@ Kinda sorta works but is buggy and we don't have time for that.
58825886
<property name="DeadBodyHitPoints" value="251"/>
58835887
<effect_group name="Base Effects">
58845888
<passive_effect name="HealthMax" operation="base_set" value="150"/>
5885-
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked"/>
5889+
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked,buffRadiationPool"/>
58865890
</effect_group>
58875891
</entity_class>
58885892

@@ -6026,7 +6030,7 @@ Kinda sorta works but is buggy and we don't have time for that.
60266030
<passive_effect name="HealthMax" operation="base_set" value="100"/>
60276031
<passive_effect name="StaminaMax" operation="base_set" value="100"/>
60286032
<passive_effect name="WaterMax" operation="base_set" value="100"/>
6029-
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked,buffPerkCharismaticNature"/>
6033+
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked,buffPerkCharismaticNature,buffRadiationPool"/>
60306034
</effect_group>
60316035

60326036
</entity_class>
@@ -6093,7 +6097,7 @@ Kinda sorta works but is buggy and we don't have time for that.
60936097

60946098
<effect_group name="Base Effects">
60956099
<passive_effect name="HealthMax" operation="base_set" value="100000"/>
6096-
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked"/>
6100+
<passive_effect name="BuffResistance" operation="base_set" value="1" tags="buffFatiguedTrigger,buffArmSprainedCHTrigger,buffLegSprainedCHTrigger,buffLaceration,buffInfectionCatch,buffAbrasionCatch,buffInjuryStunned01CHTrigger,buffInjuryBleedingOne,buffInjuryBleedingTwo,buffInjuryBleeding,buffBurningZombie,buffBurningElement,buffBurningEnvironment,buffBurningEnvironmentHack,buffBurningFlamingArrow,buffBurningMolotov,buffIsOnFire,buffShocked,buffRadiationPool"/>
60976101
</effect_group>
60986102
</entity_class>
60996103

0 commit comments

Comments
 (0)