r170 - in trunk: data src/objects
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Sep 12 16:46:25 EDT 2005
Author: jonas
Date: 2005-09-12 16:46:25 -0400 (Mon, 12 Sep 2005)
New Revision: 170
Added:
trunk/data/baleog.inf
trunk/data/olaf.inf
Modified:
trunk/data/map1.cfg
trunk/src/objects/baleog.cpp
trunk/src/objects/olaf.cpp
Log:
added new player description files, corrected a bug in baleogs animation names
Added: trunk/data/baleog.inf
===================================================================
--- trunk/data/baleog.inf 2005-09-12 16:09:21 UTC (rev 169)
+++ trunk/data/baleog.inf 2005-09-12 20:46:25 UTC (rev 170)
@@ -0,0 +1,34 @@
+#BALEOG
+anim_left= name=baleog_idle_left: scale=2: bp_type=rightdown
+anim_right= name=baleog_idle_right: scale=2: bp_type=leftdown
+anim_rock_left= name=baleog_rock_left: scale=2: bp_type=rightdown
+anim_rock_right= name=baleog_rock_right: scale=2: bp_type=leftdown
+anim_walk_left= name=baleog_walk_left: scale=2: bp_type=rightdown
+anim_walk_right= name=baleog_walk_right: scale=2: bp_type=leftdown
+anim_push_left= name=baleog_push_left: scale=2: bp_type=rightdown
+anim_push_right= name=baleog_push_right: scale=2: bp_type=leftdown
+#anim_fall_middle= name=baleog_fall_middle: scale=2
+anim_fall_left= name=baleog_fall_left: scale=2: bp_type=rightdown
+anim_fall_right= name=baleog_fall_right: scale=2: bp_type=leftdown
+anim_fall_fast_left= name=baleog_fall_fast_left: scale=2: bp_type=rightdown
+anim_fall_fast_right= name=baleog_fall_fast_right: scale=2: bp_type=leftdown
+anim_crash_left= name=baleog_crash_left: scale=2: bp_type=rightdown: type=once
+anim_crash_right= name=baleog_crash_right: scale=2: bp_type=leftdown: type=once
+anim_rope_left= name=baleog_rope_left: scale=2: bp_type=rightdown
+anim_rope_right= name=baleog_rope_right: scale=2: bp_type=leftdown
+#anim_teleport_left= name=baleog_teleport_left: scale=2: bp_type=rightdown: type=once
+#anim_teleport_right= name=baleog_teleport_right: scale=2: bp_type=leftdown: type=once
+anim_die_crash_left= name=baleog_die_crash_left: scale=2: bp_type=rightdown: type=once
+anim_die_crash_right= name=baleog_die_crash_right: scale=2: bp_type=leftdown: type=once
+#anim_die_burn_left= name=baleog_die_burn_left: scale=2: bp_type=rightdown: type=once
+#anim_die_burn_right= name=baleog_die_burn_right: scale=2: bp_type=leftdown: type=once
+anim_die_bones_left= name=baleog_die_bones_left: scale=2: bp_type=rightdown: type=once
+anim_die_bones_right= name=baleog_die_bones_right: scale=2: bp_type=leftdown: type=once
+anim_die_elec_left= name=baleog_die_elec_left: scale=2: bp_type=rightdown: type=once
+anim_die_elec_right= name=baleog_die_elec_right: scale=2: bp_type=leftdown: type=once
+#anim_die_spike_left= name=baleog_die_spike_left: scale=2: bp_type=rightdown: type=once
+#anim_die_spike_right= name=baleog_die_spike_right: scale=2: bp_type=leftdown: type=once
+anim_bar= name=bar_baleog: scale=2: type=once
+
+anim_baleog_sword_left= name=baleog_sword_left: scale=2: bp_type=rightdown: type=once
+anim_baleog_sword_right= name=baleog_sword_right: scale=2: bp_type=leftdown: type=once
Modified: trunk/data/map1.cfg
===================================================================
--- trunk/data/map1.cfg 2005-09-12 16:09:21 UTC (rev 169)
+++ trunk/data/map1.cfg 2005-09-12 20:46:25 UTC (rev 170)
@@ -1,23 +1,23 @@
-Background image=background.jpg
+Background image=background.jpg
#ENDHEADER
-Wall 0 200 image=viking1.bmp
-Wall 100 200 image=viking1.bmp
-Wall 450 400 image=viking1.bmp
-Wall 750 500 image=viking1.bmp
-Wall 100 620 image=viking1.bmp
-#Water 624 668 image=water.bmp
-Exit 500 648 image=exit.bmp
-Teleporter 750 400 image=viking1.bmp, exitx=100, exity=0
-Heart 100 400 image=apple.bmp
-Heart 500 200 image=heart.bmp
-#Wind 624 668 image=water.bmp,accel=-3000
+Wall 0 200 image=viking1.bmp
+Wall 100 200 image=viking1.bmp
+Wall 450 400 image=viking1.bmp
+Wall 750 500 image=viking1.bmp
+Wall 100 620 image=viking1.bmp
+#Water 624 668 image=water.bmp
+Exit 500 648 image=exit.bmp
+Teleporter 750 400 image=viking1.bmp, exitx=100, exity=0
+Heart 100 400 image=apple.bmp
+Heart 500 200 image=heart.bmp
+#Wind 624 668 image=water.bmp,accel=-3000
Zombie 300 550
-#Plant 100 0 time_recover=5000
+#Plant 100 0 time_recover=5000
-Erik file=erik.inf
-#Baleog
-Olaf 0 5
-Scorch 0 10
-Fang 30 10
+Erik file=erik.inf
+Baleog file=baleog.inf
+Olaf 0 5 file=olaf.inf
+#Scorch 0 10
+#Fang 30 10
Added: trunk/data/olaf.inf
===================================================================
--- trunk/data/olaf.inf 2005-09-12 16:09:21 UTC (rev 169)
+++ trunk/data/olaf.inf 2005-09-12 20:46:25 UTC (rev 170)
@@ -0,0 +1,37 @@
+#OLAF
+anim_left= name=olaf_idle_left: scale=2: bp_type=rightdown
+anim_right= name=olaf_idle_right: scale=2: bp_type=leftdown
+anim_rock_left= name=olaf_rock_left: scale=2: bp_type=rightdown
+anim_rock_right= name=olaf_rock_right: scale=2: bp_type=leftdown
+anim_walk_left= name=olaf_walk_left: scale=2: bp_type=rightdown
+anim_walk_right= name=olaf_walk_right: scale=2: bp_type=leftdown
+anim_push_left= name=olaf_push_left: scale=2: bp_type=rightdown
+anim_push_right= name=olaf_push_right: scale=2: bp_type=leftdown
+anim_fall_left= name=olaf_fall_left: scale=2: bp_type=rightdown
+anim_fall_right= name=olaf_fall_right: scale=2: bp_type=leftdown
+anim_fall_fast_left= name=olaf_fall_fast_left: scale=2: bp_type=rightdown
+anim_fall_fast_right= name=olaf_fall_fast_right: scale=2: bp_type=leftdown
+anim_crash_left= name=olaf_crash_left: scale=2: bp_type=rightdown: type=once
+anim_crash_right= name=olaf_crash_right: scale=2: bp_type=leftdown: type=once
+anim_rope_left= name=olaf_rope_left: scale=2: bp_type=rightdown
+anim_rope_right= name=olaf_rope_right: scale=2: bp_type=leftdown
+anim_teleport_left= name=olaf_teleport_left: scale=2: bp_type=rightdown: type=once
+anim_teleport_right= name=olaf_teleport_right: scale=2: bp_type=leftdown: type=once
+anim_die_bones_left= name=olaf_die_bones_left: scale=2: bp_type=rightdown: type=once
+anim_die_bones_right= name=olaf_die_bones_right: scale=2: bp_type=leftdown: type=once
+anim_die_elec_left= name=olaf_die_elec_left: scale=2: bp_type=rightdown: type=once
+anim_die_elec_right= name=olaf_die_elec_right: scale=2: bp_type=leftdown: type=once
+anim_die_spike_left= name=olaf_die_spike_left: scale=2: bp_type=rightdown: type=once
+anim_die_spike_right= name=olaf_die_spike_right: scale=2: bp_type=leftdown: type=once
+anim_bar= name=bar_olaf: scale=2: type=once
+
+anim_olaf_small_left= name=olaf_idle_small_left: scale=2: bp_type=rightdown
+anim_olaf_small_right= name=olaf_idle_small_right: scale=2: bp_type=leftdown
+anim_olaf_walk_small_left= name=olaf_walk_small_left: scale=2: bp_type=rightdown
+anim_olaf_walk_small_right= name=olaf_walk_small_right: scale=2: bp_type=leftdown
+anim_olaf_shield_left= name=olaf_idle_shield_left: scale=2: bp_type=rightdown
+anim_olaf_shield_right= name=olaf_idle_shield_right: scale=2: bp_type=leftdown
+anim_olaf_fall_shield_left= name=olaf_fall_shield_left: scale=2: bp_type=rightdown
+anim_olaf_fall_shield_right= name=olaf_fall_shield_right: scale=2: bp_type=leftdown
+anim_olaf_walk_shield_left= name=olaf_walk_shield_left: scale=2: bp_type=rightdown
+anim_olaf_walk_shield_right= name=olaf_walk_shield_right: scale=2: bp_type=leftdown
Modified: trunk/src/objects/baleog.cpp
===================================================================
--- trunk/src/objects/baleog.cpp 2005-09-12 16:09:21 UTC (rev 169)
+++ trunk/src/objects/baleog.cpp 2005-09-12 20:46:25 UTC (rev 170)
@@ -13,16 +13,9 @@
weapon=Weapon(-1,W_STRIKE);
/* Parameters */
- if (!hasParam(parameters,"anim_left")) anim_left=loadAnimation(scenario->imgcache->loadImage(1,"baleog1_left.bmp"));
- if (!hasParam(parameters,"anim_right")) anim_right=loadAnimation(scenario->imgcache->loadImage(1,"baleog1_right.bmp"));
- if (!hasParam(parameters,"anim_walk_left")) anim_walk_left=loadAnimation(scenario->imgcache->loadImage("baleog1-run_left.png"),8);
- if (!hasParam(parameters,"anim_walk_right")) anim_walk_right=loadAnimation(scenario->imgcache->loadImage(8,"baleog1-run_right.png"),8);
- if (!hasParam(parameters,"anim_crash_left")) anim_crash_left=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_land_left.bmp"),1,BP_LD,ATYPE_ONCE,calcFPS(1,T_IRR));
- if (!hasParam(parameters,"anim_crash_right")) anim_crash_right=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_land_right.bmp"),1,BP_RD,ATYPE_ONCE,calcFPS(1,T_IRR));
-
if (hasParam(parameters,"anim_baleog_sword_left")) anim_baleog_sword_left=loadAnimation(getParameters(parameters["anim_baleog_sword_left"],':'));
else anim_baleog_sword_left=loadAnimation(scenario->imgcache->loadImage(8,"BaleogCyborg_Slash_left.png"),8,BP_MD,ATYPE_ONCE);
- if (hasParam(parameters,"anim_baleog_sword_right")) anim_baleog_sword_left=loadAnimation(getParameters(parameters["anim_baleog_sword_right"],':'));
+ if (hasParam(parameters,"anim_baleog_sword_right")) anim_baleog_sword_right=loadAnimation(getParameters(parameters["anim_baleog_sword_right"],':'));
else anim_baleog_sword_right=loadAnimation(scenario->imgcache->loadImage(8,"BaleogCyborg_Slash_right.png"),8,BP_MD,ATYPE_ONCE);
if (hasParam(parameters,"audio_sword")) au_sword=scenario->sndcache->loadWAV(parameters["audio_sword"]);
Modified: trunk/src/objects/olaf.cpp
===================================================================
--- trunk/src/objects/olaf.cpp 2005-09-12 16:09:21 UTC (rev 169)
+++ trunk/src/objects/olaf.cpp 2005-09-12 20:46:25 UTC (rev 170)
@@ -13,14 +13,6 @@
Player(xcord,ycord,parameters),
fart(V_FART) {
/* Parameters */
- if (!hasParam(parameters,"anim_left")) anim_left=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_left.bmp"));
- if (!hasParam(parameters,"anim_right")) anim_right=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_right.bmp"));
- if (!hasParam(parameters,"anim_walk_left")) anim_walk_left=loadAnimation(scenario->imgcache->loadImage(8,"olaf1-run_left.png"),8);
- if (!hasParam(parameters,"anim_walk_right")) anim_walk_right=loadAnimation(scenario->imgcache->loadImage(8,"olaf1-run_right.png"),8);
- if (!hasParam(parameters,"anim_crash_left")) anim_crash_left=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_land_left.bmp"),1,BP_MD,ATYPE_ONCE,calcFPS(1,T_IRR));
- if (!hasParam(parameters,"anim_crash_right")) anim_crash_right=loadAnimation(scenario->imgcache->loadImage(1,"olaf1_land_right.bmp"),1,BP_MD,ATYPE_ONCE,calcFPS(1,T_IRR));
- if (!hasParam(parameters,"anim_die_bones_left")) anim_die_bones_left=loadAnimation(scenario->imgcache->loadImage(60,0,"kuru.bmp"),12,BP_MD,ATYPE_ONCE,25);
-
if (hasParam(parameters,"anim_olaf_small_left")) anim_olaf_small_left=loadAnimation(getParameters(parameters["anim_olaf_small_left"],':'));
else anim_olaf_small_left=loadAnimation(scenario->imgcache->loadImage(7,"Olaf_Small_Walk_left.png"),1);
if (hasParam(parameters,"anim_olaf_small_right")) anim_olaf_small_right=loadAnimation(getParameters(parameters["anim_olaf_small_right"],':'));
More information about the lostpenguins-commits
mailing list