Merge branch 'dev'

This commit is contained in:
2025-04-04 21:40:40 -05:00
3 changed files with 56 additions and 0 deletions

View File

@@ -16803,6 +16803,7 @@
<Item id="83296" level="65" name="Artifact_29_6" icon="Icon_Items.ArtiBlueCustomize14A_Tex" rank="0" combatItemType="CUSTOM" rareGrade="2" requiredLevel="65" equipSound="InterfaceSound.Equip_ItemCUE.Equip_CustomizeStoneCue" gambleItemType="1;2;4" coolTime="0" artisanable="false" boundType="EquipToItem" buyPrice="202050" category="custormaize" changeColorEnable="false" changeLook="false" conversionSmallGroup="61" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="DropItem.SM.Item_Drop_Chest_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ChestBoxCue" enchantEnable="false" extractLook="false" gambleItemGrade="7" guildWarehouseStorable="false" linkCrestId="0" linkCustomizingId="82296" linkEquipmentId="0" linkLookInfoId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="0" masterpieceRate="0" maxStack="1" obtainable="true" requiredEquipmentType="EQUIP_ARMOR_BODY" sellPrice="20205" slotLimit="0" sortingNumber="1" storeSellable="true" tradable="false" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="true" />
<Item id="83297" level="65" name="Artifact_29_7" icon="Icon_Items.ArtiBlueCustomize14A_Tex" rank="0" combatItemType="CUSTOM" rareGrade="2" requiredLevel="65" equipSound="InterfaceSound.Equip_ItemCUE.Equip_CustomizeStoneCue" gambleItemType="1;2;4" coolTime="0" artisanable="false" boundType="EquipToItem" buyPrice="202050" category="custormaize" changeColorEnable="false" changeLook="false" conversionSmallGroup="61" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="DropItem.SM.Item_Drop_Chest_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ChestBoxCue" enchantEnable="false" extractLook="false" gambleItemGrade="7" guildWarehouseStorable="false" linkCrestId="0" linkCustomizingId="82297" linkEquipmentId="0" linkLookInfoId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="0" masterpieceRate="0" maxStack="1" obtainable="true" requiredEquipmentType="EQUIP_ARMOR_BODY" sellPrice="20205" slotLimit="0" sortingNumber="1" storeSellable="true" tradable="false" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="true" />
<Item id="83298" level="60" name="QuestItem" icon="Icon_Skills.guildskill3_5_charm50_Tex" rank="0" combatItemType="NO_COMBAT" rareGrade="0" requiredLevel="65" equipSound="InterfaceSound.Equip_ItemCUE.Equip_RewInsectCue" usedSound="InterfaceSound.UseItem.Use_PotionDrinkCue" coolTime="0" artisanable="false" boundType="None" buyPrice="0" category="etc" changeColorEnable="false" changeLook="false" coolTimeGroup="0" destroyable="true" dismantlable="true" dropSilhouette="Item_Drop.SM.Recipe_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ScrollCue" enchantEnable="false" extractLook="false" guildWarehouseStorable="true" linkCrestId="0" linkCustomizingId="0" linkEquipmentId="0" linkLookInfoId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="0" masterpieceRate="0" maxStack="100" obtainable="true" requiredEquipmentType="NO_COMBAT" sellPrice="0" slotLimit="0" sortingNumber="0" storeSellable="true" tradable="true" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="true" />
<Item id="83299" name="lord_merchant_25" coolTime="300" category="magical" level="1" icon="Icon_Items.Dungeon_Recall_Tex" rank="0" maxStack="10" rareGrade="1" requiredEquipmentType="NO_COMBAT" combatItemType="DISPOSAL" requiredLevel="1" equipSound="InterfaceSound.Equip_ItemCUE.Equip_ScrollCue" usedSound="InterfaceSound.UseItem.UseItemCue" artisanable="false" boundType="None" buyPrice="40000" changeColorEnable="false" changeLook="false" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="Item_Drop.SM.Scroll_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ScrollCue" enchantEnable="false" extractLook="false" guildWarehouseStorable="true" linkCrestId="0" linkCustomizingId="0" linkEquipmentId="0" linkLookInfoId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="60130211" masterpieceRate="0" obtainable="true" sellPrice="4000" slotLimit="0" sortingNumber="4" storeSellable="true" tradable="true" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="true" />
<Item id="90086" level="1" name="achieve_Servant1" icon="Icon_Items.PetSkillbook_Tex" rank="0" combatItemType="SKILLBOOK" rareGrade="1" requiredLevel="1" equipSound="InterfaceSound.Equip_ItemCUE.Equip_BookCue" usedSound="InterfaceSound.UseItem.UseItemCue" coolTime="0" artisanable="false" boundType="None" buyPrice="10000" category="skillbook" changeColorEnable="false" changeLook="false" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="DropItem.SM.Item_Drop_Chest_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ScrollCue" enchantEnable="false" extractLook="false" guildWarehouseStorable="false" linkCrestId="0" linkCustomizingId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="6001000" masterpieceRate="0" maxStack="1" obtainable="true" requiredEquipmentType="NO_COMBAT" sellPrice="1000" slotLimit="0" sortingNumber="9" storeSellable="false" tradable="false" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="false" />
<Item id="90087" level="1" name="achieve_Servant2" icon="Icon_Items.PetSkillbook_Tex" rank="0" combatItemType="SKILLBOOK" rareGrade="1" requiredLevel="1" equipSound="InterfaceSound.Equip_ItemCUE.Equip_BookCue" usedSound="InterfaceSound.UseItem.UseItemCue" coolTime="0" artisanable="false" boundType="None" buyPrice="10000" category="skillbook" changeColorEnable="false" changeLook="false" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="DropItem.SM.Item_Drop_Chest_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ScrollCue" enchantEnable="false" extractLook="false" guildWarehouseStorable="false" linkCrestId="0" linkCustomizingId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="6002000" masterpieceRate="0" maxStack="1" obtainable="true" requiredEquipmentType="NO_COMBAT" sellPrice="1000" slotLimit="0" sortingNumber="9" storeSellable="false" tradable="false" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="false" />
<Item id="90088" level="1" name="achieve_Servant3" icon="Icon_Items.PetSkillbook_Tex" rank="0" combatItemType="SKILLBOOK" rareGrade="1" requiredLevel="1" equipSound="InterfaceSound.Equip_ItemCUE.Equip_BookCue" usedSound="InterfaceSound.UseItem.UseItemCue" coolTime="0" artisanable="false" boundType="None" buyPrice="10000" category="skillbook" changeColorEnable="false" changeLook="false" coolTimeGroup="0" destroyable="true" dismantlable="false" dropSilhouette="DropItem.SM.Item_Drop_Chest_SM" dropSound="InterfaceSound.Drop_ItemCUE.Drop_ScrollCue" enchantEnable="false" extractLook="false" guildWarehouseStorable="false" linkCrestId="0" linkCustomizingId="0" linkPetAdultId="0" linkPetOrbId="0" linkSkillId="6003000" masterpieceRate="0" maxStack="1" obtainable="true" requiredEquipmentType="NO_COMBAT" sellPrice="1000" slotLimit="0" sortingNumber="9" storeSellable="false" tradable="false" unidentifiedItemGrade="0" useOnlyTerritory="false" warehouseStorable="false" />

View File

@@ -11089,6 +11089,60 @@
</Targeting>
</TargetingList>
</Skill>
<Skill id="60130211" name="Item_Teleport_SER_POS_Akeron's_Inferno_Entrance" type="normal" category="0" templateId="9999" nextSkill="0" parentId="60130111" timeRate="1.1" autoUse="false" changeDirToCenter="false" needWeapon="false" pushtarget="pass" returnAnimName="" returnAnimSet="Human_M_ANI.Anim.Human_M_Class01_Anim" totalAtk="0.000000">
<Action>
<CameraShakeList />
<CameraType duration="2000" type="none" startTime="0" weight="2" startStageId="0" />
<Cancel frontCancelEndTime="9999" rearCancelStartTime="-1" />
<MoveInvincible endTime="0" startTime="0" />
<Pending startTime="-1" />
<SpecialEffectList />
<StageList>
<Stage movable="false">
<AnimSeq duration="10000" animSet="Human_M_ANI.Anim.Human_M_Share_Anim" animName="enchant" blendInTime="200" animMotionId="1" animRate="0.25" bAnimLooping="true" loopingRate="1" rootMotionXYRate="1" rootMotionZRate="1" />
<Property />
</Stage>
</StageList>
</Action>
<Bullet shotSkill="0" createTime="0" detachTime="0" flyingDuration="1000" startSkill="-1" />
<Defence rootMotion="false" successAnimName="" />
<Drain backSkillId="0" />
<Precondition coolTime="0" modeChangeMethod="2" modeNo="0">
<Cost hp="0" mp="0" />
<ExclusiveAbnormality />
</Precondition>
<Projectile lifeTime="0" areaBoxSizeX="0" areaBoxSizeY="0" areaBoxSizeZ="0">
<TargetingList>
<Targeting>
<AreaList>
<Area maxCount="10">
<Effect atk="0">
<HpDiff value="0" />
<MpDiff value="0" />
</Effect>
</Area>
</AreaList>
</Targeting>
</TargetingList>
</Projectile>
<Property weaponStatus="in" reactionPendingType="normal" skillPendingType="normal" />
<TargetingList>
<Targeting id="-1" time="10000" method="normal" interval="0" until="0">
<AreaList>
<Area rotateAngle="0" type="me" maxCount="1" maxHeight="0" maxRadius="50" offsetDistance="0" pierceDepth="1" minHeight="0" crosshairRadius="1" minRadius="0" offsetAngle="0" rangeAngle="0">
<Effect atk="0" abnormalityRate="0">
<HpDiff value="0" />
<MpDiff value="0" />
<Teleport type="SER_POS" recallContinent="7014" recallPos="-54569,-40729,4355" />
</Effect>
<HitEffect type="onlyDamage" />
<Reaction basicRate="1.5" miniRate="0" />
</Area>
</AreaList>
<Cost hp="0" mp="0" />
</Targeting>
</TargetingList>
</Skill>
<Skill id="60131100" type="notimeline" templateId="9999" name="Item_인던초기화 문서" category="0" autoUse="false" changeDirToCenter="false" needWeapon="false" nextSkill="0" pushtarget="pass" returnAnimName="" returnAnimSet="" timeRate="1.1" totalAtk="0.000000">
<Action>
<CameraShakeList />

View File

@@ -16806,6 +16806,7 @@
<String id="83296" toolTip="&lt;font color='#00BFFF'&gt;Dyad crystals&lt;/font&gt; are not destroyed upon death." string="Brilliantly Grieving Niveot"/>
<String id="83297" toolTip="&lt;font color='#00BFFF'&gt;Dyad crystals&lt;/font&gt; are not destroyed upon death." string="Swiftly Grieving Niveot"/>
<String id="83298" toolTip="Ticket required for accessing the sixteenth and later challenges of Dreadspire. Each player needs a ticket to use the teleportal, and each use of the teleportal consumes one ticket." string="Dreadspire Top Challenges Ticket"/>
<String id="83299" toolTip="Teleports you to the entrance of Akeron's Inferno in Wyrmgorge of Val Elenium." string="Akeron's Inferno Teleport Scroll" />
<String id="90086" toolTip="Use this manual to learn how to summon a pet cat." string="Care and Feeding of Your Pet Miss Kitty"/>
<String id="90087" toolTip="Use this manual to learn how to summon a pet faerie." string="Care and Feeding of Your Pet Willoe"/>
<String id="90088" toolTip="Use this manual to learn how to summon a pet caiman." string="Care and Feeding of Your Pet Dundee"/>