Skip to content

Commit

Permalink
Sorcery A20 Public (v0.985)
Browse files Browse the repository at this point in the history 
Hotfix to v0.984
• Familiar Friendly Retaliation: Attacking your Familiars at Rank 5 may cause you to become "Purified", smiting you down with Holy fury! :holy:
• Familiar Multiplayer Spawning: Spawning sometimes fails for connected Clients. Working with Sphere on a fix for this :arcane:
• Incantation Items: Permanent Items, such as Recall & Summons, would sometimes vanish. 📜
• Added: Sorcerer Desk updated with top Supporters
• Added: Despawn Secondary Ability to Summon Omni Pack
• Changed: Loot Abundance Game Setting fixed to 100% (prevent important item issues)
• Changed: Arcane and Omni Pack Familiars better scaling physical base damage
  • Loading branch information
@Devrixx
Devrixx committed Dec 31, 2021
1 parent e1ba26c commit 1f89e2c
Show file tree
Hide file tree
Showing 26 changed files with 337 additions and 111 deletions.
28 changes: 12 additions & 16 deletions Mods/Sorcery/Config/Localization.txt
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Mods/Sorcery/Config/XUi/windows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@

<!-- UI: Pause Menu Splash -->
<window name="SorceryingameMenu" anchor="CenterCenter" pos="-125,200" width="250" height="200" controller="InGameMenuWindow" cursor_area="true">
<label name="SorceryVersion" pos="783, 285" depth="0" size="250,35" text="Sorcery A20 (v0.984)" font_size="24" effect="outline" color="144,95,255,255" justify="right" upper_case="false" />
<label name="SorceryVersion" pos="783, 285" depth="0" size="250,35" text="Sorcery A20 (v0.985)" font_size="24" effect="outline" color="144,95,255,255" justify="right" upper_case="false" />
<label name="SorceryDifficulty" pos="781, 260" depth="0" size="250,35" font_size="24" effect="outline" justify="right" upper_case="false" style="sorcery.window.ingame.logo.normal.label"/>
<texture name="SorceryingameMenuLogo" depth="0" size="672,446" texture="@modfolder:Textures/SorceryLogoMenu.png" pos="-200,194" />
<!-- <texture name="SorceryingameMenuChestNoble" style="sorcery.window.ingame.support.chest.noble.texture" /> -->
Expand Down
5 changes: 4 additions & 1 deletion Mods/Sorcery/Config/XUi_Menu/windows.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<append xpath="/windows">
<!-- UI: SORCERY VERSION -->
<window name="SorceryVersion" depth="99" pos="0,0" width="200" height="22" anchor="RightTop">
<label name="SorceryVersion" pos="-212,-43" depth="0" text="Sorcery A20 (v0.984)" font_size="26" effect="outline" color="144,95,255,255" justify="right" upper_case="false"/>
<label name="SorceryVersion" pos="-212,-43" depth="0" text="Sorcery A20 (v0.985)" font_size="26" effect="outline" color="144,95,255,255" justify="right" upper_case="false"/>
<label name="SorceryDifficulty" pos="-214,-68" depth="0" font_size="26" effect="outline" justify="right" upper_case="false" style="sorcery.window.mainmenu.logo.normal.label"/>
</window>

Expand All @@ -75,6 +75,9 @@
</window>
</append>

<!-- Force 100% Loot -->
<set xpath="/windows/window[@name='newContinueGame']/rect[@name='tabs']/rect[@name='tabsContents']/rect[@tab_key='xuiGameSettingsAdvanced']/grid/gameoption[@name='LootAbundance']/@values">100</set>

<!-- Enable Max Spawned Zombies -->
<!-- <insertAfter xpath="/windows/window[@name='newContinueGame']/rect[@name='tabs']/rect[@name='tabsContents']/rect[@tab_key='xuiGameSettingsGeneral']/grid/gameoption[@name='ServerMaxPlayerCount']">
<gameoption name="MaxSpawnedZombies" title="goMaxSpawnedZombies" value_wrap="false" value_type="int" values="60, 100, 150, 200" display_names="60,100,150,200" value_localization_prefix="goZombie" />
Expand Down
106 changes: 73 additions & 33 deletions Mods/Sorcery/Config/buffs.xml
View file

Large diffs are not rendered by default.

67 changes: 31 additions & 36 deletions Mods/Sorcery/Config/entityclasses.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -838,43 +838,42 @@
<!-- FAMILIARS ______________________________________-->
<entity_class name="sorceryFamiliarMaster">
<property name="HideInSpawnMenu" value="true"/>
<property name="Tags" value="entity,familiar"/>
<property name="Tags" value="entity,familiar,summon"/>
<property name="Class" value="EntityAnimalStag"/>
<!-- <property name="Class" value="EntityEnemyAnimal"/> -->
<property name="NavObject" value="sorceryFamiliar" />
<property name="Parent" value="Animals"/>
<property name="EntityType" value="Animal"/>
<property name="AvatarController" value="AvatarAnimalController"/>
<property name="ModelType" value="Standard"/>
<property name="Prefab" value="/Entities/Animals/Wolf/animalStandardWolfRagdoll"/>
<property name="ReplaceMaterial0" value="#@modfolder:Resources/mat_familiarArcane.unity3d?mat_familiarArcane"/>
<!-- <property name="ReplaceMaterial1" value="#@modfolder:Resources/mat_awakenedEyeLightning.unity3d?mat_awakenedEyeLightning"/> -->
<property name="SurfaceCategory" value="organic"/>
<property name="ParticleOnDeath" value="blood_death"/>
<property name="HasDeathAnim" value="true"/>
<!-- <property name="HasDeathAnim" value="true"/> -->
<property name="HasDeathAnim" value="false"/>
<property name="RootMotion" value="true"/>
<property name="HasRagdoll" value="true"/>
<property name="PhysicsBody" value="wolf"/>
<property name="HasRagdoll" value="false"/>
<property name="PhysicsBody" value="wolfFamiliar"/>
<property name="Mass" value="95"/>
<property name="Weight" value="300"/>
<!-- <property name="PushFactor" value="100"/> -->
<property name="SizeScale" value=".75"/>
<property name="SizeScale" value=".7"/>
<property name="IsAnimalEntity" value="true"/>
<property name="IsEnemyEntity" value="false"/>
<property name="Faction" value="animals"/>
<property name="LookAtAngle" value="90"/>
<property name="AIGroupCircle" value="1"/>
<property name="AINoiseSeekDist" value="1000"/>
<property name="AINoiseSeekDist" value="100"/>
<property name="AIPathCostScale" value="100, 100"/>
<property name="AIFeralSense" value="5"/>
<property name="AITask-1" value="ApproachAndAttackTarget" data="class=EntityZombie,20,EntityNPC,20,EntityEnemyAnimal,20,EntityAnimalSnake,20"/> <!-- class,maxChaseTime (return home) -->
<property name="AITask-2" value="ApproachSpot" data="class=EntityPlayer,1000"/>

<property name="AITask-2" value="ApproachSpot" data="class=EntityPlayer,100"/>
<property name="AITask-3" value=""/>
<!-- <property name="AITask-3" value="Territorial"/> -->
<!-- <property name="AITask-3" value="Look"/> -->
<!-- <property name="AITask-4" value="Wander"/> -->

<property name="AITarget-1" value="SetNearestEntityAsTarget" data="class=EntityPlayer,1000,1000,EntityNPC,40,40,EntityZombie,40,40,EntityEnemyAnimal,40,40"/> <!-- class, hear dist, see dist (checked left to right, 0 dist uses entity default) -->
<property name="AITarget-1" value="SetNearestEntityAsTarget" data="class=EntityPlayer,100,100,EntityNPC,40,40,EntityZombie,40,40,EntityEnemyAnimal,40,40"/> <!-- class, hear dist, see dist (checked left to right, 0 dist uses entity default) -->
<property name="AITarget-2" value="SetAsTargetIfHurt" data="class=EntityNPC,EntityZombie,EntityEnemyAnimal,EntityAnimalSnake"/>
<!-- <property name="AITarget-3" value="BlockingTargetTask"/> -->
<!-- <property name="AITarget-4" value="SetNearestCorpseAsTarget" data="class=EntityPlayer"/> -->
Expand All @@ -888,7 +887,7 @@
<!-- Stealth settings -->
<property name="MaxViewAngle" value="720"/>
<property name="SightRange" value="1000"/>
<!-- <property name="SightLightThreshold" value="-100,-100"/> --> <!-- how well lit you have to be for entity to see you at min,max range -->
<property name="SightLightThreshold" value="-100,-100"/> <!-- how well lit you have to be for entity to see you at min,max range -->

<property name="SoundRandom" value="wolfroam"/>
<property name="SoundAlert" value="wolfalert"/>
Expand All @@ -900,11 +899,9 @@

<!-- Gameplay -->
<property name="PainResistPerHit" value=".9"/> <!-- no pain -1 -->
<!-- <property name="PainResistPerHit" value="3"/> -->
<property name="MaxTurnSpeed" value="420"/>
<property name="MoveSpeed" value="1"/>
<property name="MoveSpeedAggro" value="4, 4"/>
<!-- <property name="MoveSpeedRand" value="0"/> -->
<property name="MoveSpeedPanic" value="5"/>
<property name="SwimSpeed" value="5"/>
<property name="SwimStrokeRate" value="1.1,1.5"/>
Expand All @@ -917,23 +914,9 @@
<property name="DismemberMultiplierArms" value="0"/>
<property name="DismemberMultiplierLegs" value="0"/>

<!-- <property name="TimeStayAfterDeath" value="3"/> -->
<property name="TimeStayAfterDeath" value="1.5"/>
<!-- <property name="DeadBodyHitPoints" value="1000"/> -->
<property name="DeadBodyHitPoints" value="0"/>

<!-- LOOT DROP -->
<!-- <property name="TimeStayAfterDeath" value="-1"/>
<property name="TimeStayAfterDeath" value="1"/>
<property name="DeadBodyHitPoints" value="0"/>
<property name="PassThroughDamage" value="true"/>
<property name="LootDropProb" value="1"/>
<property name="LootDropEntityClass" value="FamiliarLootContainerArcane"/> -->

<!-- <property name="LootListAlive" value="690"/> -->
<!-- <property name="LootListOnDeath" value="139"/> -->
<!-- <property name="LootDropProb" value="0"/> -->

<!-- <property name="Buffs" value="spellFX_Conjure,buffSorceryImmunity_All,buffSorceryImmunity_Entities"/> -->

<property name="HandItem" value="meleeHandFamiliarArcane"/>
<property name="ExperienceGain" value="0"/>
<effect_group name="Base Effects" tiered="false">
Expand All @@ -949,15 +932,27 @@
</entity_class>
<!-- Familiar: ARCANE -->
<entity_class name="sorceryFamiliarArcane" extends="sorceryFamiliarMaster">
<property name="HideInSpawnMenu" value="true"/>
<property name="Tags" value="entity,familiar,familiarArcane"/>
<property name="ReplaceMaterial0" value="#@modfolder:Resources/mat_familiarArcane.unity3d?mat_familiarArcane"/>
</entity_class>
<!-- Familiar: FIRE -->
<entity_class name="sorceryFamiliarFire" extends="sorceryFamiliarMaster">
<property name="HideInSpawnMenu" value="true"/>
<!-- <property name="LootListAlive" value="139"/> -->
<!-- <property name="LootDropProb" value="1"/>
<property name="LootDropEntityClass" value="FamiliarLootContainerArcane"/>
<property name="TimeStayAfterDeath" value="-1"/>
<property name="DeadBodyHitPoints" value="0"/>
<property name="PassThroughDamage" value="true"/> -->
<property name="Tags" value="entity,familiar,familiarFire"/>
<property name="ReplaceMaterial0" value="#@modfolder:Resources/mat_familiarFire.unity3d?mat_familiarFire"/>
</entity_class>
<!-- Familiar: ICE -->
<entity_class name="sorceryFamiliarIce" extends="sorceryFamiliarMaster">
<property name="HideInSpawnMenu" value="true"/>
<property name="Tags" value="entity,familiar,familiarIce"/>
<property name="ReplaceMaterial0" value="#@modfolder:Resources/mat_familiarIce.unity3d?mat_familiarIce"/>
</entity_class>
<!-- Familiar: LIGHTNING -->
<entity_class name="sorceryFamiliarLightning" extends="sorceryFamiliarMaster">
<property name="HideInSpawnMenu" value="true"/>
<property name="Tags" value="entity,familiar,familiarLightning"/>
<property name="ReplaceMaterial0" value="#@modfolder:Resources/mat_familiarLightning.unity3d?mat_familiarLightning"/>
</entity_class>


Expand Down
13 changes: 11 additions & 2 deletions Mods/Sorcery/Config/entitygroups.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,20 @@
<entity name="sorceryFallenLightning"/>
</entitygroup>

<!-- SUMMON GROUPS -->
<!-- SUMMON GROUPS (Sorcery.dll) -->
<!-- NOTE: Incantations, Summons -->
<entitygroup name="SorceryFamiliarGroup">
<entity name="sorceryFamiliarArcane"/>
</entitygroup>

<entitygroup name="SorceryFamiliarFireGroup">
<entity name="sorceryFamiliarFire"/>
</entitygroup>
<entitygroup name="SorceryFamiliarIceGroup">
<entity name="sorceryFamiliarIce"/>
</entitygroup>
<entitygroup name="SorceryFamiliarLightningGroup">
<entity name="sorceryFamiliarLightning"/>
</entitygroup>
</append>

</Sorcery>
30 changes: 11 additions & 19 deletions Mods/Sorcery/Config/items.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6974,11 +6974,10 @@
<requirement name="NotHasBuff" buff="spellRecall_CD"/>
<requirement name="NotHasBuff" buff="spellRecall"/>
<requirement name="NotHasBuff" buff="spellRecall_Teleport"/>
<property name="Class" value="Eat"/>
<property name="Class" value="Activate"/>
<property name="Delay" value="1"/>
<property name="UseAnimation" value="true"/>
<property name="Use_time" value="1"/>
<property name="Create_item" value="incantation_Recall"/>
<property name="Consume" value="false"/>
<!-- <property name="UseAnimation" value="true"/> -->
</property>
<effect_group tiered="false">
<triggered_effect trigger="onSelfPrimaryActionStart" action="AddBuff" buff="spellRecall_CD,spellRecall"/>
Expand Down Expand Up @@ -8389,24 +8388,19 @@
<property name="Sphere" value="1"/>
<property name="DamageEntity" value="0"/>
<property name="DamageBlock" value="200"/>
<!-- <property name="Buff" value="imprint_IceSorcery,imprint_FireSorcery,spellFire_Burn,spellIce_Chill,spellLightning_Shock"/> -->
</property>
<effect_group name="Base Effects" tiered="false">
<passive_effect name="EntityDamage" operation="base_set" value="0"/>
<passive_effect name="ModSlots" operation="base_set" value="0"/>
<passive_effect name="DamageModifier" operation="perc_add" value="4" tags="earth,wood"/>
<!-- <triggered_effect trigger="onSelfAttackedOther" action="Ragdoll" target="other" duration="0" force="30"/> -->
<passive_effect name="BuffProcChance" operation="base_set" value="100" tags="imprint_IceSorcery,imprint_FireSorcery,spellFX_FireImpactAOE,spellFX_IceImpactAOE,spellFX_LightningImpactAOE,spellFire_Burn,spellIce_Chill,spellLightning_Shock"/>
</effect_group>
</item>
<!-- SUMMON FAMILIAR: ARCANE -->
<item name="sorceryFamiliarArcane">
<property name="Extends" value="sorceryScrollMaster"/>
<property name="Tags" value="familiarArcane"/>
<property name="HoldingItemHidden" value="true"/>
<!-- <property name="Meshfile" value="#Other/Items?Misc/snowballPrefab.prefab"/> -->
<!-- <property name="HandMeshfile" value="#@modfolder:Resources/familiarArcane.unity3d?familiarArcane"/> -->
<!-- <property name="DropMeshfile" value="#Other/Items?Misc/sack_droppedPrefab.prefab"/> -->
<!-- <property name="Material" value="Morganic"/> -->
<property name="Weight" value="0"/>
<property name="Stacknumber" value="1"/>
<property name="SellableToTrader" value="false"/>
Expand All @@ -8415,21 +8409,19 @@
<property class="Action0">
<requirement name="NotHasBuff" buff="summonFamiliarArcane_Cooldown"/>
<requirement name="CVarCompare" cvar="$spiritAmount" operation="GTE" value="30"/>
<property name="Class" value="Eat"/>
<property name="Class" value="Activate"/>
<property name="Delay" value="1"/>
<property name="UseAnimation" value="false"/>
<property name="Use_time" value="1"/>
<property name="Create_item" value="sorceryFamiliarArcane"/>
<property name="Sound_start" value="..."/>
<property name="Consume" value="false"/>
<property name="Sound_start" value=""/>
</property>
<property class="Action1">
<property name="Class" value="Activate"/>
<property name="Delay" value="0"/>
<property name="UsePowerAttackAnimation" value="false"/>
<property name="Delay" value="1"/>
<property name="Consume" value="false"/>
</property>
<effect_group tiered="false" name="SPAWN">
<triggered_effect trigger="onSelfPrimaryActionStart" action="AddBuff" buff="summonFamiliarArcane_Despawn,spell_SummonFamiliar"/>
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="summonFamiliarArcane_Spawn"/>
<triggered_effect trigger="onSelfPrimaryActionEnd" action="AddBuff" buff="summonFamiliarArcane_Cooldown,summonFamiliarArcane_Spawn"/>
</effect_group>
<effect_group tiered="false" name="ABILITY: Despawn">
<requirement name="HasBuff" buff="summonFamiliarArcane_Player"/>
Expand All @@ -8442,7 +8434,7 @@
<requirement name="HasBuff" buff="summonFamiliarArcane_Player"/>
<requirement name="CVarCompare" cvar=".summonFamiliarArcane_CounterDespawn" operation="LTE" value="1"/>
<requirement name="CVarCompare" cvar="$spiritAmount" operation="GTE" value="10"/>
<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" cvar=".spiritSubtract" operation="add" value="10"/> <!-- spirit -->
<triggered_effect trigger="onSelfSecondaryActionEnd" action="ModifyCVar" cvar=".spiritSubtract" operation="add" value="10"/>
<triggered_effect trigger="onSelfSecondaryActionEnd" action="AddBuff" target="selfAOE" range="30" buff="summonFamiliarArcane_AbilityHeal" target_tags="familiar">
<requirement name="CVarCompare" cvar="SummonerID" target="other" operation="Equals" value="@SummonerID"/>
</triggered_effect>
Expand Down
1 change: 1 addition & 0 deletions Mods/Sorcery/Config/nav_objects.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<append xpath="/nav_object_classes">

<nav_object_class name="sorceryFamiliar">
<property name="requirement_type" value="Tracking" />
<map_settings>
<property name="sprite_name" value="ui_familiar_sorcery"/> <!-- ui_game_symbol_enemy_dot -->
<property name="min_distance" value="0"/>
Expand Down
Loading

0 comments on commit 1f89e2c

Please sign in to comment.