Skip to content

Commit

Permalink
Merge pull request #21 from JaithWraith/Alpha-20.6
Browse files Browse the repository at this point in the history
Alpha 20.6
  • Loading branch information
JaithWraith authored Aug 17, 2022
2 parents 5de2c30 + 1d27688 commit 0cfed33
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 12,623 deletions.
9,889 changes: 0 additions & 9,889 deletions buffs.xml

This file was deleted.

12 changes: 6 additions & 6 deletions entityclasses.xml
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@
<entity_class name="zombiePartyGirl" extends="zombieArlene">
<property name="SizeScale" value="0.99"/>
<property name="Tags" value="entity,zombie,walker"/>
<!--<property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitress.prefab"/> Commented out to remove party girl mesh -->
<!-- <property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitress.prefab"/> -->

<!-- Gameplay zombiePartyGirl -->
<property name="MoveSpeedAggro" value="0.3, 1.35"/> <!-- slim, regular -->
Expand All @@ -658,7 +658,7 @@

<entity_class name="zombiePartyGirlFeral" extends="zombiePartyGirl">
<property name="Tags" value="entity,zombie,walker,feral"/>
<!--<property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitressFeral.prefab"/> Commented out to remove party girl mesh -->
<!-- <property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitressFeral.prefab"/> -->

<!-- Gameplay zombiePartyGirlFeral -->
<property name="DismemberMultiplierHead" value="0"/><property name="DismemberMultiplierArms" value="0"/><property name="DismemberMultiplierLegs" value="0"/><!-- Feral -->
Expand All @@ -677,7 +677,7 @@

<entity_class name="zombiePartyGirlRadiated" extends="zombiePartyGirlFeral">
<property name="Tags" value="entity,zombie,walker,feral,radiated"/>
<!--<property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitressRadiated.prefab"/> Commented out to remove party girl mesh -->
<!-- <property name="Mesh" value="#Entities/Zombies?Prefabs/ZCocktailWaitressRadiated.prefab"/> -->
<!--<property name="ParticleOnSpawn" value="ParticleEffects/RadiatedParticlesOnMesh" param1="SetShapeToMesh0"/>-->

<!-- Gameplay zombiePartyGirlRadiated -->
Expand Down Expand Up @@ -3894,7 +3894,7 @@ Kinda sorta works but is buggy and we don't have time for that.
<property name="MoveSpeedPanic" value="1.15"/>
<property name="CanClimbLadders" value="true"/>
<property name="IsEnemyEntity" value="true"/>
<property name="SurfaceCategory" value="earth"/>
<property name="SurfaceCategory" value="organic"/>
<property name="WalkType" value="7"/>
<property name="ParticleOnDeath" value="blood_death"/>
<property name="SoundRandomTime" value="200.0"/>
Expand Down Expand Up @@ -3950,7 +3950,7 @@ Kinda sorta works but is buggy and we don't have time for that.
<property name="Weight" value="70"/>
<property name="IsEnemyEntity" value="true"/>
<property name="SurfaceCategory" value="earth"/>
<property name="SurfaceCategory" value="organic"/>
<property name="WalkType" value="7"/>
<property name="ParticleOnDeath" value="blood_death"/>
<property name="SoundRandomTime" value="200.0"/>
Expand Down Expand Up @@ -4209,7 +4209,7 @@ Kinda sorta works but is buggy and we don't have time for that.
<passive_effect name="HealthMax" operation="base_set" value="100"/>
<passive_effect name="StaminaMax" operation="base_set" value="100"/>
<passive_effect name="WaterMax" operation="base_set" value="100"/>
<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,buffBurningWeapon,buffShocked"/>
<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,buffBurningWeapon,buffShocked,buffPerkCharismaticNature"/>
</effect_group>

</entity_class>
Expand Down
Loading

0 comments on commit 0cfed33

Please sign in to comment.