diff options
Diffstat (limited to 'datasrc/content.py')
| -rw-r--r-- | datasrc/content.py | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/datasrc/content.py b/datasrc/content.py index 1dfa7aea..e714e8b8 100644 --- a/datasrc/content.py +++ b/datasrc/content.py @@ -22,7 +22,7 @@ class Image(Struct): self.name = String(name) self.filename = String(filename) self.id = Int(-1) - + class SpriteSet(Struct): def __init__(self, name="", image=None, gridx=0, gridy=0): Struct.__init__(self, "SPRITESET") @@ -78,7 +78,7 @@ class WeaponSpec(Struct): self.sprite_proj = Pointer(Sprite, Sprite()) self.sprite_muzzles = Array(Pointer(Sprite, Sprite())) self.visual_size = Int(96) - + self.firedelay = Int(500) self.maxammo = Int(10) self.ammoregentime = Int(0) @@ -111,7 +111,7 @@ class Weapon_Gun(Struct): self.curvature = Float(1.25) self.speed = Float(2200) self.lifetime = Float(2.0) - + class Weapon_Shotgun(Struct): def __init__(self): Struct.__init__(self, "WEAPONSPEC_SHOTGUN") @@ -119,7 +119,7 @@ class Weapon_Shotgun(Struct): self.curvature = Float(1.25) self.speed = Float(2200) self.speeddiff = Float(0.8) - self.lifetime = Float(0.25) + self.lifetime = Float(0.25) class Weapon_Grenade(Struct): def __init__(self): @@ -137,7 +137,7 @@ class Weapon_Rifle(Struct): self.bounce_delay = Int(150) self.bounce_num = Int(1) self.bounce_cost = Float(0) - + class Weapon_Ninja(Struct): def __init__(self): Struct.__init__(self, "WEAPONSPEC_NINJA") @@ -190,7 +190,7 @@ container.sounds.Add(SoundSet("player_pain_long", FileList("audio/vo_teefault_pa container.sounds.Add(SoundSet("body_land", FileList("audio/foley_land-%02d.wv", 4))) container.sounds.Add(SoundSet("player_airjump", FileList("audio/foley_dbljump-%02d.wv", 3))) -container.sounds.Add(SoundSet("player_jump", FileList("audio/foley_foot_left-%02d.wv", 4) + FileList("audio/foley_foot_right-%02d.wv", 4))) +container.sounds.Add(SoundSet("player_jump", FileList("audio/foley_foot_left-%02d.wv", 4) + FileList("audio/foley_foot_right-%02d.wv", 4))) container.sounds.Add(SoundSet("player_die", FileList("audio/foley_body_splat-%02d.wv", 3))) container.sounds.Add(SoundSet("player_spawn", FileList("audio/vo_teefault_spawn-%02d.wv", 7))) container.sounds.Add(SoundSet("player_skid", FileList("audio/sfx_skid-%02d.wv", 4))) @@ -292,7 +292,7 @@ container.sprites.Add(Sprite("armor_empty", set_game, 23,2,2,2)) container.sprites.Add(Sprite("star1", set_game, 15,0,2,2)) container.sprites.Add(Sprite("star2", set_game, 17,0,2,2)) container.sprites.Add(Sprite("star3", set_game, 19,0,2,2)) - + container.sprites.Add(Sprite("part1", set_game, 6,0,1,1)) container.sprites.Add(Sprite("part2", set_game, 6,1,1,1)) container.sprites.Add(Sprite("part3", set_game, 7,0,1,1)) @@ -425,35 +425,35 @@ anim.body.frames.Add(AnimKeyframe(0.6, 0, 0, 0)) anim.body.frames.Add(AnimKeyframe(0.8, 0,-1, 0)) anim.body.frames.Add(AnimKeyframe(1.0, 0, 0, 0)) -anim.back_foot.frames.Add(AnimKeyframe(0.0, 8, 0, 0)) +anim.back_foot.frames.Add(AnimKeyframe(0.0, 8, 0, 0)) anim.back_foot.frames.Add(AnimKeyframe(0.2, -8, 0, 0)) anim.back_foot.frames.Add(AnimKeyframe(0.4,-10,-4, 0.2)) anim.back_foot.frames.Add(AnimKeyframe(0.6, -8,-8, 0.3)) -anim.back_foot.frames.Add(AnimKeyframe(0.8, 4,-4,-0.2)) -anim.back_foot.frames.Add(AnimKeyframe(1.0, 8, 0, 0)) +anim.back_foot.frames.Add(AnimKeyframe(0.8, 4,-4,-0.2)) +anim.back_foot.frames.Add(AnimKeyframe(1.0, 8, 0, 0)) anim.front_foot.frames.Add(AnimKeyframe(0.0,-10,-4, 0.2)) anim.front_foot.frames.Add(AnimKeyframe(0.2, -8,-8, 0.3)) -anim.front_foot.frames.Add(AnimKeyframe(0.4, 4,-4,-0.2)) -anim.front_foot.frames.Add(AnimKeyframe(0.6, 8, 0, 0)) -anim.front_foot.frames.Add(AnimKeyframe(0.8, 8, 0, 0)) +anim.front_foot.frames.Add(AnimKeyframe(0.4, 4,-4,-0.2)) +anim.front_foot.frames.Add(AnimKeyframe(0.6, 8, 0, 0)) +anim.front_foot.frames.Add(AnimKeyframe(0.8, 8, 0, 0)) anim.front_foot.frames.Add(AnimKeyframe(1.0,-10,-4, 0.2)) container.animations.Add(anim) anim = Animation("hammer_swing") anim.attach.frames.Add(AnimKeyframe(0.0, 0, 0, -0.10)) -anim.attach.frames.Add(AnimKeyframe(0.3, 0, 0, 0.25)) -anim.attach.frames.Add(AnimKeyframe(0.4, 0, 0, 0.30)) -anim.attach.frames.Add(AnimKeyframe(0.5, 0, 0, 0.25)) +anim.attach.frames.Add(AnimKeyframe(0.3, 0, 0, 0.25)) +anim.attach.frames.Add(AnimKeyframe(0.4, 0, 0, 0.30)) +anim.attach.frames.Add(AnimKeyframe(0.5, 0, 0, 0.25)) anim.attach.frames.Add(AnimKeyframe(1.0, 0, 0, -0.10)) container.animations.Add(anim) - + anim = Animation("ninja_swing") anim.attach.frames.Add(AnimKeyframe(0.00, 0, 0, -0.25)) anim.attach.frames.Add(AnimKeyframe(0.10, 0, 0, -0.05)) -anim.attach.frames.Add(AnimKeyframe(0.15, 0, 0, 0.35)) -anim.attach.frames.Add(AnimKeyframe(0.42, 0, 0, 0.40)) -anim.attach.frames.Add(AnimKeyframe(0.50, 0, 0, 0.35)) +anim.attach.frames.Add(AnimKeyframe(0.15, 0, 0, 0.35)) +anim.attach.frames.Add(AnimKeyframe(0.42, 0, 0, 0.40)) +anim.attach.frames.Add(AnimKeyframe(0.50, 0, 0, 0.35)) anim.attach.frames.Add(AnimKeyframe(1.00, 0, 0, -0.25)) container.animations.Add(anim) |