Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] New damage types: Ion and Radiation.

Browse Source
This commit is contained in:
Allanis 2013-06-23 15:02:05 +01:00
parent a04152315e
commit 1d2b530fdc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/outfit.c
View File

@ -78,7 +78,11 @@ void outfit_calcDamage(double* dshield, double* darmour,
(*dshield) = dmg*0.8; (*dshield) = dmg*0.8;
(*darmour) = dmg*1.2; (*darmour) = dmg*1.2;
break; break;
defualt: case DAMAGE_TYPE_ION:
(*dshield) = 0.;
(*darmour) = dmg;
break;
default:
(*dshield) = (*darmour) = 0.; (*dshield) = (*darmour) = 0.;
break; break;
} }
@ -216,8 +220,10 @@ const char* outfit_getTypeBroad(const Outfit* o) {
/* Return the damage type from a str. */ /* Return the damage type from a str. */
static DamageType outfit_strToDamageType(char* buf) { static DamageType outfit_strToDamageType(char* buf) {
if(strcmp(buf, "energy")==0) return DAMAGE_TYPE_ENERGY; if(strcmp(buf, "energy")==0) return DAMAGE_TYPE_ENERGY;
else if(strcmp(buf, "kinetic")==0) return DAMAGE_TYPE_KINETIC; else if(strcmp(buf, "kinetic")==0) return DAMAGE_TYPE_KINETIC;
else if(strcmp(buf, "ion")==0) return DAMAGE_TYPE_ION;
else if(strcmp(buf, "radiation")==0) return DAMAGE_TYPE_RADIATION;
WARN("Invalid damage type: '%s'", buf); WARN("Invalid damage type: '%s'", buf);
return DAMAGE_TYPE_NULL; return DAMAGE_TYPE_NULL;

8
src/outfit.h
View File

@ -28,9 +28,11 @@ typedef enum OutfitType_ {
} OutfitType; } OutfitType;
typedef enum DamageType_ { typedef enum DamageType_ {
DAMAGE_TYPE_NULL = 0, DAMAGE_TYPE_NULL = 0,
DAMAGE_TYPE_ENERGY = 1, DAMAGE_TYPE_ENERGY = 1,
DAMAGE_TYPE_KINETIC = 2 DAMAGE_TYPE_KINETIC = 2,
DAMAGE_TYPE_ION = 3,
DAMAGE_TYPE_RADIATION = 4
} DamageType; } DamageType;
/* An outfit depends a lot on the type. */ /* An outfit depends a lot on the type. */