Merge pull request #19 from MindRapist/mr-4

Mr 4
This commit is contained in:
rtw1x1
2025-12-27 08:11:54 +00:00
committed by GitHub
31 changed files with 104 additions and 81 deletions

View File

@@ -126,7 +126,7 @@ Group Particle
}
List TextureFiles
{
"0.jpg"
"0.dds"
}
}
}

View File

@@ -124,7 +124,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\jigam_ring.jpg"
"D:\Ymir Work\pc\shaman\effect\jigam_ring.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\assassin\effect\16-bottom.jpg"
"D:\Ymir Work\pc\assassin\effect\16-bottom.dds"
}
}
}

View File

@@ -123,7 +123,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\shaman\effect\jigam.jpg"
"D:\YMIR WORK\pc\shaman\effect\jigam.dds"
}
}
}

View File

@@ -254,7 +254,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\jigam.jpg"
"D:\Ymir Work\pc\shaman\effect\jigam.dds"
}
}
}
@@ -378,7 +378,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\w_ring.jpg"
"D:\Ymir Work\pc\shaman\effect\w_ring.dds"
}
}
}
@@ -500,7 +500,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\white_sphere.jpg"
"D:\Ymir Work\pc\shaman\effect\white_sphere.dds"
}
}
}
@@ -633,7 +633,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\white_sphere.jpg"
"D:\Ymir Work\pc\shaman\effect\white_sphere.dds"
}
}
}
@@ -756,7 +756,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\wind.jpg"
"D:\Ymir Work\pc\shaman\effect\wind.dds"
}
}
}
@@ -880,7 +880,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\W_star.jpg"
"D:\Ymir Work\pc\shaman\effect\W_star.dds"
}
}
}
@@ -1008,7 +1008,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\jigam_ring.jpg"
"D:\Ymir Work\pc\shaman\effect\jigam_ring.dds"
}
}
}
@@ -1133,7 +1133,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\gyeokgong_triple_loop_2.jpg"
"D:\Ymir Work\pc\shaman\effect\gyeokgong_triple_loop_2.dds"
}
}
}
@@ -1273,7 +1273,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\noe_w_ring.jpg"
"D:\Ymir Work\pc\shaman\effect\noe_w_ring.dds"
}
}
}

View File

@@ -548,7 +548,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\mine_edge.jpg"
"D:\YMIR WORK\pc\warrior\effect\mine_edge.dds"
}
}
}
@@ -675,7 +675,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg"
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
}
}
}
@@ -804,7 +804,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\sa_za_hu_inter_pasthit6.jpg"
"D:\YMIR WORK\pc\warrior\effect\sa_za_hu_inter_pasthit6.dds"
}
}
}
@@ -932,7 +932,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\cure.jpg"
"D:\YMIR WORK\pc\warrior\effect\cure.dds"
}
}
}
@@ -1059,7 +1059,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\gihyeol_spash.jpg"
"D:\YMIR WORK\pc\warrior\effect\gihyeol_spash.dds"
}
}
}
@@ -1181,7 +1181,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\half_ring_rainbow_line.jpg"
"D:\YMIR WORK\pc\warrior\effect\half_ring_rainbow_line.dds"
}
}
}
@@ -1308,7 +1308,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.jpg"
"D:\YMIR WORK\pc\warrior\effect\nwegeomsplash.dds"
}
}
}
@@ -1437,7 +1437,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg"
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
}
}
}
@@ -1563,7 +1563,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg"
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
}
}
}
@@ -1689,7 +1689,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.jpg"
"D:\YMIR WORK\pc\warrior\effect\Rotation of Rsotation of 3.dds"
}
}
}

View File

@@ -135,7 +135,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg"
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
}
}
}

View File

@@ -135,7 +135,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg"
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
}
}
}
@@ -273,7 +273,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg"
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
}
}
}

View File

@@ -135,7 +135,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg"
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
}
}
}

View File

@@ -135,7 +135,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.jpg"
"D:\YMIR WORK\pc\warrior\effect\b_stars_mall.dds"
}
}
}

View File

@@ -264,7 +264,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -264,7 +264,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}
@@ -391,7 +391,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -265,7 +265,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -264,7 +264,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -261,7 +261,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -394,7 +394,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}
@@ -525,7 +525,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -261,7 +261,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -261,7 +261,7 @@ Group Particle
}
List TextureFiles
{
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.jpg"
"D:\YMIR WORK\pc\warrior\effect\orange_cure copy.dds"
}
}
}

View File

@@ -1304,6 +1304,17 @@ class GameWindow(ui.ScriptWindow):
self.stream.popupWindow.Close()
self.stream.popupWindow.Open(localeInfo.EXCHANGE_FAILURE_EQUIP_ITEM, 0, localeInfo.UI_OK)
else:
# MR-3: Auto-deactivate auto potions before moving out (dragging onto character)
if attachedType == player.SLOT_TYPE_INVENTORY:
itemVnum = player.GetItemIndex(attachedInvenType, attachedItemSlotPos)
if constInfo.IS_AUTO_POTION(itemVnum):
metinSocket = [player.GetItemMetinSocket(attachedInvenType, attachedItemSlotPos, j) for j in xrange(player.METIN_SOCKET_MAX_NUM)]
isActivated = (0 != int(metinSocket[0]))
if isActivated:
net.SendItemUsePacket(attachedItemSlotPos)
# MR-3: -- END OF -- Auto-deactivate auto potions before moving out
if chr.IsNPC(dstChrID):
net.SendGiveItemPacket(dstChrID, attachedInvenType, attachedItemSlotPos, attachedItemCount)
else:

View File

@@ -132,6 +132,18 @@ class ExchangeDialog(ui.ScriptWindow):
DstSlotNumber = SlotIndex
itemID = player.GetItemIndex(attachedInvenType, SrcSlotNumber)
# MR-3: Auto-deactivate auto potions before moving out
if attachedSlotType == player.SLOT_TYPE_INVENTORY:
itemVnum = player.GetItemIndex(attachedInvenType, SrcSlotNumber)
if constInfo.IS_AUTO_POTION(itemVnum):
metinSocket = [player.GetItemMetinSocket(attachedInvenType, SrcSlotNumber, j) for j in xrange(player.METIN_SOCKET_MAX_NUM)]
isActivated = (0 != int(metinSocket[0]))
if isActivated:
net.SendItemUsePacket(SrcSlotNumber)
# MR-3: -- END OF -- Auto-deactivate auto potions before moving out
item.SelectItem(itemID)
if item.IsAntiFlag(item.ANTIFLAG_GIVE):

View File

@@ -120,7 +120,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\warrior\effect\inter_pasthit6.jpg"
"D:\Ymir Work\pc\warrior\effect\inter_pasthit6.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg"
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg"
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg"
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.jpg"
"D:\Ymir Work\pc\shaman\effect\go_fragment_3.dds"
}
}
}

View File

@@ -128,7 +128,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -259,7 +259,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -409,7 +409,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -553,7 +553,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -684,7 +684,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -815,7 +815,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -965,7 +965,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1109,7 +1109,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1240,7 +1240,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1371,7 +1371,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1521,7 +1521,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1665,7 +1665,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1796,7 +1796,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -1931,7 +1931,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2084,7 +2084,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2228,7 +2228,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2362,7 +2362,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2493,7 +2493,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2643,7 +2643,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2787,7 +2787,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -2918,7 +2918,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -3049,7 +3049,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -3199,7 +3199,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}
@@ -3343,7 +3343,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.jpg"
"D:\Ymir Work\effect\etc\firecracker\firecracker_w.dds"
}
}
}

View File

@@ -138,7 +138,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\Rotation of Rsotation of 3.jpg"
"D:\Ymir Work\pc\shaman\effect\Rotation of Rsotation of 3.dds"
}
}
}
@@ -264,7 +264,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.jpg"
"D:\Ymir Work\pc\shaman\effect\sa_za_hu_inter_pasthit6.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\warrior\effect\spark copy.jpg"
"D:\Ymir work\pc\warrior\effect\spark copy.dds"
}
}
}
@@ -249,7 +249,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg"
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds"
}
}
}

View File

@@ -129,7 +129,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\effect\monster2\flame.jpg"
"D:\Ymir work\effect\monster2\flame.dds"
}
}
}

View File

@@ -119,7 +119,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\noejeon_light copy.jpg"
"D:\Ymir work\pc\shaman\effect\noejeon_light copy.dds"
}
}
}
@@ -242,7 +242,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\W_star.jpg"
"D:\Ymir work\pc\shaman\effect\W_star.dds"
}
}
}
@@ -374,7 +374,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\shamandust.jpg"
"D:\Ymir work\pc\shaman\effect\shamandust.dds"
}
}
}
@@ -502,7 +502,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\chip.jpg"
"D:\Ymir work\pc\shaman\effect\chip.dds"
}
}
}
@@ -626,7 +626,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\ls1_1 copy.jpg"
"D:\Ymir work\pc\shaman\effect\ls1_1 copy.dds"
}
}
}
@@ -755,7 +755,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\gatein.jpg"
"D:\Ymir work\pc\shaman\effect\gatein.dds"
}
}
}
@@ -884,7 +884,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\shaman\effect\gatein.jpg"
"D:\Ymir work\pc\shaman\effect\gatein.dds"
}
}
}

View File

@@ -122,7 +122,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\warrior\effect\spark copy.jpg"
"D:\Ymir work\pc\warrior\effect\spark copy.dds"
}
}
}
@@ -249,7 +249,7 @@ Group Particle
}
List TextureFiles
{
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.jpg"
"D:\Ymir work\pc\warrior\effect\Rotation of gihyeol_spash.dds"
}
}
}