MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whitespace removal 

oh why oh why, my editor does not do this automagically? We are after all in year 2015...
develop
warmist 2015-08-23 15:03:15 +03:00
parent a7e1b15db5
commit 5e38689a62
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/gui/gm-unit.lua
Unescape Escape View File

@ -198,7 +198,7 @@ function civ_name(id,format_name,format_no_name,name_other,name_invalid)
local t={NAME=dfhack.TranslateName(civ.name),ENGLISH=dfhack.TranslateName(civ.name,true),ID=civ.id} --TODO race?, maybe something from raws? local t={NAME=dfhack.TranslateName(civ.name),ENGLISH=dfhack.TranslateName(civ.name,true),ID=civ.id} --TODO race?, maybe something from raws?
if t.NAME=="" then if t.NAME=="" then
return string.gsub(format_no_name or "<unnamed>:$ID", "%$(%w+)", t) return string.gsub(format_no_name or "<unnamed>:$ID", "%$(%w+)", t)
end end
return string.gsub(format_name or "$NAME ($ENGLISH):$ID", "%$(%w+)", t) return string.gsub(format_name or "$NAME ($ENGLISH):$ID", "%$(%w+)", t)
end end
function CivBox:update_choices() function CivBox:update_choices()
@ -231,7 +231,7 @@ function CivBox:update_race_filter(id)
self:update_choices() self:update_choices()
end end
function CivBox:choose_race() function CivBox:choose_race()
showRacePrompt("Choose race","Select new race:",nil,function (id,choice) showRacePrompt("Choose race","Select new race:",nil,function (id,choice)
self:update_race_filter(choice.num) self:update_race_filter(choice.num)
end,nil,nil,true) end,nil,nil,true)
end end
@ -281,7 +281,7 @@ function editor_civ:init( args )
widgets.Label{frame = { t=3,l=1}, text={{text=": set to current civ("..df.global.ui.civ_id..")",key="CUSTOM_C", widgets.Label{frame = { t=3,l=1}, text={{text=": set to current civ("..df.global.ui.civ_id..")",key="CUSTOM_C",
on_activate= function() self.target_unit.civ_id=df.global.ui.civ_id;self:update_curren_civ() end}}}, on_activate= function() self.target_unit.civ_id=df.global.ui.civ_id;self:update_curren_civ() end}}},
widgets.Label{frame = { t=4,l=1}, text={{text=": manually enter",key="CUSTOM_E", widgets.Label{frame = { t=4,l=1}, text={{text=": manually enter",key="CUSTOM_E",
on_activate=function () on_activate=function ()
dialog.showInputPrompt("Civ id","Enter new civ id:",COLOR_WHITE, dialog.showInputPrompt("Civ id","Enter new civ id:",COLOR_WHITE,
tostring(self.target_unit.civ_id),function(new_value) tostring(self.target_unit.civ_id),function(new_value)
self.target_unit.civ_id=new_value self.target_unit.civ_id=new_value
@ -456,8 +456,8 @@ editor_wounds.ATTRS={
--filter --filter
} }
function is_scar( wound_part ) function is_scar( wound_part )
return wound_part.flags1.scar_cut or wound_part.flags1.scar_smashed or return wound_part.flags1.scar_cut or wound_part.flags1.scar_smashed or
wound_part.flags1.scar_edged_shake1 or wound_part.flags1.scar_blunt_shake1 wound_part.flags1.scar_edged_shake1 or wound_part.flags1.scar_blunt_shake1
end end
function format_flag_name( fname ) function format_flag_name( fname )
return fname:sub(1,1):upper()..fname:sub(2):gsub("_"," ") return fname:sub(1,1):upper()..fname:sub(2):gsub("_"," ")