From: <ave...@us...> - 2009-06-18 22:00:15
|
Revision: 6521 http://gemrb.svn.sourceforge.net/gemrb/?rev=6521&view=rev Author: avenger_teambg Date: 2009-06-18 22:00:12 +0000 (Thu, 18 Jun 2009) Log Message: ----------- implemented falling projectile bits Modified Paths: -------------- gemrb/trunk/gemrb/docs/en/Engine/Projectile.txt gemrb/trunk/gemrb/override/bg2/gemprjtl.ids gemrb/trunk/gemrb/plugins/Core/Projectile.cpp gemrb/trunk/gemrb/plugins/Core/Projectile.h Added Paths: ----------- gemrb/trunk/gemrb/override/bg2/cow.pro gemrb/trunk/gemrb/override/bg2/spbrnhnd.pro gemrb/trunk/gemrb/override/bg2/spconeco.pro Modified: gemrb/trunk/gemrb/docs/en/Engine/Projectile.txt =================================================================== --- gemrb/trunk/gemrb/docs/en/Engine/Projectile.txt 2009-06-18 21:37:03 UTC (rev 6520) +++ gemrb/trunk/gemrb/docs/en/Engine/Projectile.txt 2009-06-18 22:00:12 UTC (rev 6521) @@ -13,3 +13,6 @@ 256 Half transparent travel projectile (not blend, but could be combined with it) 512 Static tinted travel projectile 1024 Create another projectile with an ID one less than the current one (missile iteration) +2048 Tile the whole area of effect with the travel bam +4096 Freefalling trajectory (appears horizontally over the target) +8192 Incoming trajectory (appears diagonally over the target) Added: gemrb/trunk/gemrb/override/bg2/cow.pro =================================================================== (Binary files differ) Property changes on: gemrb/trunk/gemrb/override/bg2/cow.pro ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: gemrb/trunk/gemrb/override/bg2/gemprjtl.ids =================================================================== --- gemrb/trunk/gemrb/override/bg2/gemprjtl.ids 2009-06-18 21:37:03 UTC (rev 6520) +++ gemrb/trunk/gemrb/override/bg2/gemprjtl.ids 2009-06-18 22:00:12 UTC (rev 6521) @@ -1,5 +1,8 @@ IDS V1.0 +21 SPBRNHND 22 SKYBOLT +23 SPCONECO +24 SPCONEFI 44 SPSMKJET 65 HLYMITE 66 FLMSTRK @@ -18,6 +21,8 @@ 96 COLRSPRY 145 FLMSTRK 146 HLYMITE +188 COW +191 SPSCORIC 194 REDHOLY 205 LIGHTB 207 SPFDEATH Added: gemrb/trunk/gemrb/override/bg2/spbrnhnd.pro =================================================================== (Binary files differ) Property changes on: gemrb/trunk/gemrb/override/bg2/spbrnhnd.pro ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: gemrb/trunk/gemrb/override/bg2/spconeco.pro =================================================================== (Binary files differ) Property changes on: gemrb/trunk/gemrb/override/bg2/spconeco.pro ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: gemrb/trunk/gemrb/plugins/Core/Projectile.cpp =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Projectile.cpp 2009-06-18 21:37:03 UTC (rev 6520) +++ gemrb/trunk/gemrb/plugins/Core/Projectile.cpp 2009-06-18 22:00:12 UTC (rev 6521) @@ -265,6 +265,16 @@ tint.b=128; tint.a=255; + if(ExtFlags&(PEF_FALLING|PEF_INCOMING) ) { + if (ExtFlags&PEF_FALLING) { + Pos.x=Destination.x; + } else { + Pos.x=Destination.x-200; + } + Pos.y=Destination.y-200; + NextTarget(Destination); + } + //cone area of effect always disables the travel flag //but also makes the caster immune to the effect if (Extension && (Extension->AFlags&PAF_CONE)) { Modified: gemrb/trunk/gemrb/plugins/Core/Projectile.h =================================================================== --- gemrb/trunk/gemrb/plugins/Core/Projectile.h 2009-06-18 21:37:03 UTC (rev 6520) +++ gemrb/trunk/gemrb/plugins/Core/Projectile.h 2009-06-18 22:00:12 UTC (rev 6521) @@ -85,6 +85,9 @@ #define PEF_HALFTRANS 256 //half-transparency (holy might) #define PEF_TINT 512 //use palette gradient as tint #define PEF_ITERATION 1024 //create another projectile of type-1 (magic missiles) +#define PEF_TILED 2048 //tiled AOE (bg1 cone of cold/fire) +#define PEF_FALLING 4096 //projectile falls down vertically (cow) +#define PEF_INCOMING 8192 //projectile falls in on trajectory (comet) //projectile area flags #define PAF_VISIBLE 1 //the travel projectile is visible until explosion This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |