forked from Mirrors/openclonk
Move Amazon and Ogre alt skins from FightForGidl to Decoration.ocd
parent
322b2b97de
commit
b477bf31f3
|
@ -0,0 +1,30 @@
|
||||||
|
material Clonk_Amazon
|
||||||
|
{
|
||||||
|
receive_shadows on
|
||||||
|
technique
|
||||||
|
{
|
||||||
|
pass
|
||||||
|
{
|
||||||
|
ambient 1.000000 1.000000 1.000000 1.000000
|
||||||
|
diffuse 1.000000 1.000000 1.000000 1.000000
|
||||||
|
specular 0.000000 0.000000 0.000000 1.000000 1.000000
|
||||||
|
emissive 0.000000 0.000000 0.000000 1.000000
|
||||||
|
|
||||||
|
texture_unit Clonk
|
||||||
|
{
|
||||||
|
texture Amazon.png
|
||||||
|
tex_address_mode wrap
|
||||||
|
filtering trilinear
|
||||||
|
//colour_op_ex blend_current_alpha src_current src_texture
|
||||||
|
// Don't blend alpha, to make sure we have full intensity at the base/overlay border region
|
||||||
|
//alpha_op_ex add src_current src_texture
|
||||||
|
}
|
||||||
|
texture_unit Light
|
||||||
|
{
|
||||||
|
// apply lighting
|
||||||
|
colour_op_ex modulate src_current src_diffuse
|
||||||
|
alpha_op_ex modulate src_current src_diffuse
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 260 KiB After Width: | Height: | Size: 260 KiB |
|
@ -0,0 +1,32 @@
|
||||||
|
material Clonk_Ogre
|
||||||
|
{
|
||||||
|
receive_shadows on
|
||||||
|
technique
|
||||||
|
{
|
||||||
|
pass
|
||||||
|
{
|
||||||
|
scene_blend alpha_blend
|
||||||
|
|
||||||
|
ambient 1 1 1 1
|
||||||
|
diffuse 1 1 1 1
|
||||||
|
specular 0.000000 0.000000 0.000000 1.000000 1.000000
|
||||||
|
emissive 0.000000 0.000000 0.000000 1.000000
|
||||||
|
|
||||||
|
texture_unit Clonk
|
||||||
|
{
|
||||||
|
texture Ogre.png
|
||||||
|
tex_address_mode wrap
|
||||||
|
filtering trilinear
|
||||||
|
//colour_op_ex blend_current_alpha src_current src_texture
|
||||||
|
// Don't blend alpha, to make sure we have full intensity at the base/overlay border region
|
||||||
|
//alpha_op_ex add src_current src_texture
|
||||||
|
}
|
||||||
|
//texture_unit Light
|
||||||
|
//{
|
||||||
|
// apply lighting
|
||||||
|
// colour_op_ex modulate src_current src_diffuse
|
||||||
|
// alpha_op_ex modulate src_current src_diffuse
|
||||||
|
//}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Before Width: | Height: | Size: 210 KiB After Width: | Height: | Size: 210 KiB |
|
@ -15,11 +15,12 @@
|
||||||
- Sage
|
- Sage
|
||||||
- Youngster
|
- Youngster
|
||||||
|
|
||||||
@author Marky, Maikel
|
@author Marky, Maikel, Sven2
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// This is a list of valid skin names and which base skin of the clonk is used.
|
// This is a list of valid skin names and which base skin of the clonk is used.
|
||||||
local skin_names = [["Beggar", 0, 0x4040ff],
|
local skin_names = [["Amazon", CSKIN_Farmer, 0xd0a000],
|
||||||
|
["Beggar", 0, 0x4040ff],
|
||||||
["Carpenter", 0, 0xefef40],
|
["Carpenter", 0, 0xefef40],
|
||||||
["DarkSkinned", 0, 0x906000],
|
["DarkSkinned", 0, 0x906000],
|
||||||
["Doctor", 2, 0xd0d0d0],
|
["Doctor", 2, 0xd0d0d0],
|
||||||
|
@ -29,6 +30,7 @@ local skin_names = [["Beggar", 0, 0x4040ff],
|
||||||
["MaleBrownHair", 0, 0x2020ff],
|
["MaleBrownHair", 0, 0x2020ff],
|
||||||
["MaleDarkHair", 0, 0x406d99],
|
["MaleDarkHair", 0, 0x406d99],
|
||||||
["Mime", 2, 0xffffff],
|
["Mime", 2, 0xffffff],
|
||||||
|
["Ogre", CSKIN_Alchemist, 0x20ff20],
|
||||||
["Sage", 0, 0x813100],
|
["Sage", 0, 0x813100],
|
||||||
["Youngster", 0, 0xba8e37],
|
["Youngster", 0, 0xba8e37],
|
||||||
["YoungsterBlond", 0, 0x151366]
|
["YoungsterBlond", 0, 0x151366]
|
||||||
|
|
|
@ -1,67 +1,3 @@
|
||||||
material farmerClonkAmazon
|
|
||||||
{
|
|
||||||
receive_shadows on
|
|
||||||
technique
|
|
||||||
{
|
|
||||||
pass
|
|
||||||
{
|
|
||||||
ambient 1.000000 1.000000 1.000000 1.000000
|
|
||||||
diffuse 1.000000 1.000000 1.000000 1.000000
|
|
||||||
specular 0.000000 0.000000 0.000000 1.000000 1.000000
|
|
||||||
emissive 0.000000 0.000000 0.000000 1.000000
|
|
||||||
|
|
||||||
texture_unit Clonk
|
|
||||||
{
|
|
||||||
texture clonkAmazon.png
|
|
||||||
tex_address_mode wrap
|
|
||||||
filtering trilinear
|
|
||||||
//colour_op_ex blend_current_alpha src_current src_texture
|
|
||||||
// Don't blend alpha, to make sure we have full intensity at the base/overlay border region
|
|
||||||
//alpha_op_ex add src_current src_texture
|
|
||||||
}
|
|
||||||
texture_unit Light
|
|
||||||
{
|
|
||||||
// apply lighting
|
|
||||||
colour_op_ex modulate src_current src_diffuse
|
|
||||||
alpha_op_ex modulate src_current src_diffuse
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
material alchemistClonkOgre
|
|
||||||
{
|
|
||||||
receive_shadows on
|
|
||||||
technique
|
|
||||||
{
|
|
||||||
pass
|
|
||||||
{
|
|
||||||
scene_blend alpha_blend
|
|
||||||
|
|
||||||
ambient 1 1 1 1
|
|
||||||
diffuse 1 1 1 1
|
|
||||||
specular 0.000000 0.000000 0.000000 1.000000 1.000000
|
|
||||||
emissive 0.000000 0.000000 0.000000 1.000000
|
|
||||||
|
|
||||||
texture_unit Clonk
|
|
||||||
{
|
|
||||||
texture clonkOgre.png
|
|
||||||
tex_address_mode wrap
|
|
||||||
filtering trilinear
|
|
||||||
//colour_op_ex blend_current_alpha src_current src_texture
|
|
||||||
// Don't blend alpha, to make sure we have full intensity at the base/overlay border region
|
|
||||||
//alpha_op_ex add src_current src_texture
|
|
||||||
}
|
|
||||||
//texture_unit Light
|
|
||||||
//{
|
|
||||||
// apply lighting
|
|
||||||
// colour_op_ex modulate src_current src_diffuse
|
|
||||||
// alpha_op_ex modulate src_current src_diffuse
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
material LaserSword
|
material LaserSword
|
||||||
{
|
{
|
||||||
receive_shadows on
|
receive_shadows on
|
||||||
|
|
|
@ -5,6 +5,10 @@ Version=8,0
|
||||||
Difficulty=20
|
Difficulty=20
|
||||||
MaxPlayerLeague=4
|
MaxPlayerLeague=4
|
||||||
|
|
||||||
|
[Definitions]
|
||||||
|
Definition2=Decoration.ocd\Clonk.ocd\AltSkins.ocd
|
||||||
|
|
||||||
|
|
||||||
[Game]
|
[Game]
|
||||||
Goals=Goal_ProtectTheStatue=1
|
Goals=Goal_ProtectTheStatue=1
|
||||||
Rules=Rule_ObjectFade=1
|
Rules=Rule_ObjectFade=1
|
||||||
|
|
|
@ -458,12 +458,8 @@ public func GiveRandomAttackTarget(object attacker)
|
||||||
//======================================================================
|
//======================================================================
|
||||||
/* Wave and enemy definitions */
|
/* Wave and enemy definitions */
|
||||||
|
|
||||||
static const CSKIN_Default = 0,
|
static const CSKIN_Amazon = [CSKIN_Farmer, "Clonk_Amazon"],
|
||||||
CSKIN_Steampunk = 1,
|
CSKIN_Ogre = [CSKIN_Alchemist, "Clonk_Ogre"];
|
||||||
CSKIN_Alchemist = 2,
|
|
||||||
CSKIN_Farmer = 3,
|
|
||||||
CSKIN_Amazon = [CSKIN_Farmer, "farmerClonkAmazon"],
|
|
||||||
CSKIN_Ogre = [CSKIN_Alchemist, "alchemistClonkOgre"];
|
|
||||||
|
|
||||||
static const WAVE_POS_LEFT = [10, 529];
|
static const WAVE_POS_LEFT = [10, 529];
|
||||||
static const WAVE_POS_RIGHT = [1190, 509];
|
static const WAVE_POS_RIGHT = [1190, 509];
|
||||||
|
@ -505,7 +501,7 @@ func InitWaveData()
|
||||||
// Define composition of waves
|
// Define composition of waves
|
||||||
ENEMY_WAVE_DATA = [nil,
|
ENEMY_WAVE_DATA = [nil,
|
||||||
{ Name = "$WaveNewbies$", Bounty = 10, Enemies = [
|
{ Name = "$WaveNewbies$", Bounty = 10, Enemies = [
|
||||||
new newbie { Num= 1, Interval=10, Side = WAVE_SIDE_LEFT }
|
new ogre { Num= 1, Interval=10, Side = WAVE_SIDE_LEFT }
|
||||||
]}, { Name = "$WaveBows$", Bounty = 15, Enemies = [
|
]}, { Name = "$WaveBows$", Bounty = 15, Enemies = [
|
||||||
new newbie { Num= 2, Interval=10 },
|
new newbie { Num= 2, Interval=10 },
|
||||||
new bowman { Delay= 30, Num= 3, Interval=10, Side = WAVE_SIDE_RIGHT },
|
new bowman { Delay= 30, Num= 3, Interval=10, Side = WAVE_SIDE_RIGHT },
|
||||||
|
|
Loading…
Reference in New Issue