Merge branch 'Granite-Mining' of https://github.com/DragonSlayer62/UOX3…

… into Granite-Mining
DragonSlayer62 · Dec 10, 2023 · 0564428 · 0564428
2 parents ddb87ec + 6552e2e
commit 0564428
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/data/js/item/magic_items.js b/data/js/item/magic_items.js
@@ -559,7 +559,7 @@ function CreateMagicWeapon( tierNum, placeHolderItem )
 		// Loop through all the properties for our new magic item and copy them over to the placeholder item
 		for( var itemProp in rndWeapon )
 		{
-			if( itemProp != null && itemProp != "serial" && itemProp != "scripttrigger" && itemProp != "scriptTriggers" )
+			if( itemProp != null && itemProp != "serial" && itemProp != "scripttrigger" && itemProp != "scriptTriggers" && itemProp != "att" )
 			{
 				if( typeof( rndWeapon[itemProp] ) != "undefined" && rndWeapon[itemProp] != null )
 				{

diff --git a/source/Changelog.txt b/source/Changelog.txt
@@ -1,3 +1,6 @@
+3/12/2023 - Dragon Slayer
+	Fixed Magic Weapons setting damage correctly when they are generated.(js Magic_Items)
+
 30/11/2023 - Dragon Slayer
 	Added support for new DFN tag in spawn regions that allows defining one or more exclusion areas per spawn region to prevent spawning of objects within said regions:
    	 EXCLUDEAREA=x1,y1,x2,y2   // Area within defined boundary will be excluded as valid spawn area (Special, Thanks to Xuri)