From 8714046db0a8d76cc0238ec6c2b26958abc6a6cd Mon Sep 17 00:00:00 2001 From: Olle Rosenquist Date: Mon, 23 Jul 2007 17:50:55 +0000 Subject: [PATCH] Ninja powerup shouldn't spawn directly --- datasrc/client.dts | 3 ++- datasrc/server.dts | 10 +++++++++- datasrc/teewars.ds | 23 +++++++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/datasrc/client.dts b/datasrc/client.dts index 5c1c6b35b..7b2cec995 100644 --- a/datasrc/client.dts +++ b/datasrc/client.dts @@ -119,4 +119,5 @@ const array:int sound = sounds.* const array:int image = images.* const array:int sprite = sprites.*.* const array:int anim = animations.* -const array:int gametype = playerstats.* \ No newline at end of file +const array:int gametype = playerstats.* +const array:int powerup = powerups.* \ No newline at end of file diff --git a/datasrc/server.dts b/datasrc/server.dts index 3631336f9..aba315141 100644 --- a/datasrc/server.dts +++ b/datasrc/server.dts @@ -9,6 +9,12 @@ struct weapon { int velocity = velocity@1 } +struct powerupinf { + int amount = amount@1 + int respawntime = respawntime@1 + int startspawntime = startspawntime@1 +} + struct playerstats { int maxhealth = maxhealth@1 int maxarmor = maxarmor@1 @@ -17,8 +23,10 @@ struct playerstats { struct data_container { array:weapon weapons = weapons.* array:playerstats playerinfo = playerstats.* + array:powerupinf powerupinfo = powerups.* } const array:int sound = sounds.* const array:int weapon = weapons.* -const array:int gametype = playerstats.* \ No newline at end of file +const array:int gametype = playerstats.* +const array:int powerup = powerups.* \ No newline at end of file diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds index bf155ac71..9dc1eb67a 100644 --- a/datasrc/teewars.ds +++ b/datasrc/teewars.ds @@ -207,6 +207,29 @@ particles { } } +powerups { + health { + amount 1 + respawntime 15 + startspawntime 0 + } + armor { + amount 1 + respawntime 15 + startspawntime 0 + } + weapon { + amount 10 + respawntime 15 + startspawntime 0 + } + ninja { + amount 1 + respawntime 90 + startspawntime 90 + } +} + playerstats { dm { maxhealth 10