Bugfixes to make wizard tower fully playable.

Putnam3145 · Apr 16, 2014 · a309bf3 · a309bf3
1 parent 2c56013
commit a309bf3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/hack/mods/dark wizard tower/darkWizardTower.lua b/hack/mods/dark wizard tower/darkWizardTower.lua
@@ -57,11 +57,12 @@ local function combineBody(unit1,unit2)
 end
 
 local function fuseUnit(unit1,unit2)
+	if unit1.id==unit2.id then return false end
 	unit1.body.blood_count=0
 	unit1.animal.vanish_countdown=2
     combineSoul(unit2,unit1)
     combineBody(unit2,unit1)
-	dfhack.gui,showAnnouncement(dfhack.TranslateName(dfhack.units.getVisibleName(unit2)) .. " absorbed the power and life of " .. dfhack.TranslateName(dfhack.units.getVisibleName(unit1)) .. "!",COLOR_RED,true)
+	dfhack.gui.showAnnouncement(dfhack.TranslateName(dfhack.units.getVisibleName(unit2)) .. " absorbed the power and life of " .. dfhack.TranslateName(dfhack.units.getVisibleName(unit1)) .. "!",COLOR_RED,true)
 end
 
 local function markForLife(unit)
@@ -97,7 +98,7 @@ end
 local checkAnyway=function()
 	local markedUnit=getMarkedUnit()
 	for k,unit in ipairs(df.global.world.units.active) do
-		if dfhack.units.isCitizen(unit) and not unit.id==markedUnit.id then
+		if dfhack.units.isCitizen(unit) then
 			fuseUnit(unit,markedUnit)
 		end
 	end

diff --git a/hack/mods/dark wizard tower/init.lua b/hack/mods/dark wizard tower/init.lua
@@ -5,7 +5,7 @@ loadnum=-100
 name="Wizard Tower"
 author="Putnam"
 raws_list={'entity_wizard_fantastic.txt','creature_wizard_fantastic.txt','language_WIZARD_FANTASTIC.txt','interaction_wizard_fantastic.txt','reaction_wizard_fantastic.txt',
-           'building_wizard_fantastic.txt'}
+           'building_wizard_fantastic.txt','inorganic_wizard_fantastic.txt'}
 
 function findGuards(str,start,patch_guard)
 	local pStart=G.string.find(str,patch_guard[1],start)