fixes for itemsyndrome and spawn scripts

http://www.bay12forums.com/smf/index.php?topic=133174.msg4878551#msg4878551
pjf · Jan 2, 2014 · d3329d0 · d3329d0
1 parent ae2899b
commit d3329d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Dwarf Fortress/hack/scripts/itemsyndrome.lua b/Dwarf Fortress/hack/scripts/itemsyndrome.lua
@@ -12,7 +12,7 @@ local function printItemSyndromeHelp()
     print(" ")
     print('    "contaminantson/contaminantsoff": toggles searching for contaminants.')
     print('    Disabling speeds itemsyndrome up greatly.')
-    print('    "transformReEquipOn/TransformReEquipOff": toggles transformation auto-reequip.')
+    print('    "transformReEquipOn/TransformReEquipOff": toggles transformation auto-reequip.')
 end
 
 itemsyndromedebug=false 
@@ -244,6 +244,7 @@ eventful.enableEvent(eventful.eventType.INVENTORY_CHANGE,5)
 
 local function checkAndAddSyndrome(unit_id,new_equip,item_id)
     local item = df.item.find(item_id)
+    if not item then return false end
     local unit = df.unit.find(unit_id)
     if unit.flags1.dead then return false end
     if itemsyndromedebug then print("Checking unit #" .. unit_id) end
@@ -252,7 +253,7 @@ local function checkAndAddSyndrome(unit_id,new_equip,item_id)
     local itemMaterial=getMaterial(item)
     if itemMaterial then
         for k,syndrome in ipairs(itemMaterial.syndrome) do
-		    if itemsyndromedebug then print("item has a syndrome, checking if item is valid for application...") end
+            if itemsyndromedebug then print("item has a syndrome, checking if item is valid for application...") end
             if syndromeIsTransformation(syndrome) then
                 unitInventory = rememberInventory(unit)
                 transformation = true

diff --git a/Dwarf Fortress/hack/scripts/spawn.lua b/Dwarf Fortress/hack/scripts/spawn.lua
@@ -66,10 +66,11 @@ function CreateUnit(race_id,caste_id)
     unit.caste=caste_id
     unit.id=df.global.unit_next_id
     df.global.unit_next_id=df.global.unit_next_id+1
+   unit.relations.old_year=df.global.cur_year-5 -- everybody will be 15 years old
     if caste.misc.maxage_max==-1 then
         unit.relations.old_year=-1
     else
-        unit.relations.old_year=df.global.cur_year-15+math.random(caste.misc.maxage_min,caste.misc.maxage_max)
+        unit.relations.old_year=df.global.cur_year+math.random(caste.misc.maxage_min,caste.misc.maxage_max)
     end
     unit.sex=caste.gender
     local body=unit.body
@@ -251,4 +252,4 @@ if #args>3 then
     argPos.z=args[6]
 end
 
-PlaceUnit(args[1],args[2],args[3],argPos) --Creature (ID), caste (number), name, x,y,z for spawn.
+PlaceUnit(args[1],args[2],args[3],argPos) --Creature (ID), caste (number), name, x,y,z for spawn.