Permalink
Browse files

2/3/2010 - Xuri

	The duping command (dupe.js) should now be able to dupe spawner-objects properly
	Added missing Tinker Tools and Fletching Tools to jse_objectassociations.scp (Puck)
	Fixed an incorrect name-entry in namelists.dfn (Puck)
  • Loading branch information...
1 parent 2b5e218 commit 6f71f530f58d776424b016ec17699afe70e9794a xuridabur committed Feb 4, 2010
Showing with 43 additions and 3 deletions.
  1. +1 −1 dfns/npc/namelists.dfn
  2. +34 −1 js/commands/targeting/dupe.js
  3. +3 −1 js/jse_objectassociations.scp
  4. +5 −0 source/Changelog.txt
View
@@ -292,7 +292,7 @@ Chander
Chandler
Chane
Chaney
-Channning
+Channing
Chapin
Chapman
Charles
@@ -15,12 +15,45 @@ function command_DUPE( socket, cmdString )
function onCallback0( socket, ourObj )
{
+ var dupeSuccess = false;
if( !socket.GetWord( 1 ) && ourObj && ourObj.isItem )
{
var numToDupe = socket.tempint;
for( var i = 0; i < numToDupe; ++i )
{
- ourObj.Dupe( socket );
+ if( ourObj.isSpawner )
+ {
+ var pUser = socket.currentChar;
+ var newSpawner = CreateBlankItem( socket, pUser, 1, ourObj.name, ourObj.id, ourObj.colour, "SPAWNER", true )
+ if( ValidateObject( newSpawner ) )
+ {
+ newSpawner.spawnsection = ourObj.spawnsection;
+ if( ourObj.sectionalist )
+ newSpawner.sectionalist = true;
+ newSpawner.mininterval = ourObj.mininterval;
+ newSpawner.maxinterval = ourObj.maxinterval;
+ newSpawner.amount = ourObj.amount;
+ newSpawner.visible = ourObj.visible;
+ newSpawner.weight = ourObj.weight;
+ newSpawner.movable = ourObj.movable;
+ newSpawner.more = ourObj.more;
+ newSpawner.morex = ourObj.morex;
+ newSpawner.morey = ourObj.morey;
+ newSpawner.morez = ourObj.morez;
+ newSpawner.decayable = ourObj.decayable;
+ newSpawner.type = ourObj.type;
+ newSpawner.x = ourObj.x + 1;
+ newSpawner.y = ourObj.y + 1;
+ dupeSuccess = true;
+ }
+ else
+ {
+ socket.SysMessage( "Failed to dupe item." );
+ return;
+ }
+ }
+ else
+ ourObj.Dupe( socket );
}
}
socket.SysMessage( numToDupe + " duped items have been placed in your backpack." );
@@ -375,6 +375,7 @@
//Fletching Tool
0x1020=4005
+0x1022=4005
0x1BD1=4005
0x1BD4=4005
@@ -517,8 +518,9 @@
0x10E6=4006
// Tinker Tool
-0x1EBC=4003
+0x1EB8=4003
0x1EB9=4003
+0x1EBC=4003
// Leather Repair Tool
0x0EC1=4002
View
@@ -1,3 +1,8 @@
+2/3/2010 - Xuri
+ The duping command (dupe.js) should now be able to dupe spawner-objects properly
+ Added missing Tinker Tools and Fletching Tools to jse_objectassociations.scp (Puck)
+ Fixed an incorrect name-entry in namelists.dfn (Puck)
+
2/1/2010 - Xuri (0.98-4.0g)
Fixed an issue with open doors in player houses that could cause them to decay if they were open during decay-check
Fixed an issue with locked down items decaying (despite being inside houses)

0 comments on commit 6f71f53

Please sign in to comment.