From 8f75361d85193af2f2f2db5f931eee1e2b5a9770 Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Mon, 16 May 2011 09:17:45 +0000 Subject: [PATCH] Non-hostile boss-level creatures will now have their own tactical border git-svn-id: http://svn.net-core.org/repos/t-engine4@3386 51575b47-30f0-44d4-a5cc-537603b46e54 --- .../default/data/gfx/tactical_powerful.png | Bin 0 -> 398 bytes game/engines/default/engine/Map.lua | 1 + game/modules/tome/class/Actor.lua | 5 ++++- .../data/gfx/shockbolt/tactical_powerful.png | Bin 0 -> 6462 bytes 4 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 game/engines/default/data/gfx/tactical_powerful.png create mode 100644 game/modules/tome/data/gfx/shockbolt/tactical_powerful.png diff --git a/game/engines/default/data/gfx/tactical_powerful.png b/game/engines/default/data/gfx/tactical_powerful.png new file mode 100644 index 0000000000000000000000000000000000000000..7bc87f600f7e9261275058e901ce7567db6f901d GIT binary patch literal 398 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Y)RhkE)4%c zaKYZ?lYt_f1s;*b3=G`DAk4@xYmNj^kiEpy*OmP?s{kjz;5pryf<PhJ%#er@=ltB< z)VvZPmw~~#C^fMpHASI3vm`^o-P1Q9MK6^dDE`#b#W5t}@Z0GJd7BM*T;sJ=B$Ref z$lc^r-8AnMSI*>jlN3)Z{o<tJ#cI-^wB*@bfsJ$ZQ@HCFF0Ey3s+@K0l(h84OLh&f z@BB=CTEuYNPVDpMi<=qeIk1a3*s08(%T%*({qxt;8-${6)p6|D9(K*e$vc|)YU-DD z(Vha0;%knU?_;+)8dQ><DzEgQ{YR3Pg1X+%kcMuZ13xu0_+EWmd%4iaY4_ipufm-! zN)!LF9_&cWFK@_PYa+OR3sZ=hA+O<d7Sp?3|BKaq_9eXGJ$+EGw(_v;<%hd#k4e{Y id}wrEe}QYoGrs$V%L057oM-ZYLc-J4&t;ucLK6Vot&~6j literal 0 HcmV?d00001 diff --git a/game/engines/default/engine/Map.lua b/game/engines/default/engine/Map.lua index 27b59dd6f1..e8ef0d89cf 100644 --- a/game/engines/default/engine/Map.lua +++ b/game/engines/default/engine/Map.lua @@ -65,6 +65,7 @@ faction_friend = "tactical_friend.png" faction_neutral = "tactical_neutral.png" faction_enemy = "tactical_enemy.png" faction_danger = "tactical_danger.png" +faction_powerful = "tactical_powerful.png" faction_self = "tactical_self.png" faction_danger_check = function(self, e) return e.unique end diff --git a/game/modules/tome/class/Actor.lua b/game/modules/tome/class/Actor.lua index bafd5a7ca2..57b5cbb1a1 100644 --- a/game/modules/tome/class/Actor.lua +++ b/game/modules/tome/class/Actor.lua @@ -422,6 +422,7 @@ function _M:defineDisplayCallback() local f_self = nil local f_danger = nil + local f_powerful = nil local f_friend = nil local f_enemy = nil local f_neutral = nil @@ -447,6 +448,7 @@ function _M:defineDisplayCallback() if not f_self then f_self = game.level.map.tilesTactic:get(nil, 0,0,0, 0,0,0, map.faction_self) + f_powerful = game.level.map.tilesTactic:get(nil, 0,0,0, 0,0,0, map.faction_powerful) f_danger = game.level.map.tilesTactic:get(nil, 0,0,0, 0,0,0, map.faction_danger) f_friend = game.level.map.tilesTactic:get(nil, 0,0,0, 0,0,0, map.faction_friend) f_enemy = game.level.map.tilesTactic:get(nil, 0,0,0, 0,0,0, map.faction_enemy) @@ -461,7 +463,8 @@ function _M:defineDisplayCallback() if self == map.actor_player then f_self:toScreen(x, y, w, h) elseif map:faction_danger_check(self) then - f_danger:toScreen(x, y, w, h) + if friend >= 0 then f_powerful:toScreen(x, y, w, h) + else f_danger:toScreen(x, y, w, h) end elseif friend > 0 then f_friend:toScreen(x, y, w, h) elseif friend < 0 then diff --git a/game/modules/tome/data/gfx/shockbolt/tactical_powerful.png b/game/modules/tome/data/gfx/shockbolt/tactical_powerful.png new file mode 100644 index 0000000000000000000000000000000000000000..f5bf4ef98d877f76c18c1ed0fae4ae527332638f GIT binary patch literal 6462 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 Y1VKPui4WBX-2eap07*qoM6N<$f?wE09smFU literal 0 HcmV?d00001 -- GitLab