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

[Fix] Oops. Forgot to run that hack on header and text files..

Browse Source
This commit is contained in:
Allanis 2013-02-15 02:22:35 +00:00
parent 2b3852c25b
commit ad006788c5
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/ai/API
View File

@ -53,14 +53,14 @@ minbrakedist()
-- Returns the minimum required braking distance assuming all goes well. -- Returns the minimum required braking distance assuming all goes well.
-- return number distance needed to brake. -- return number distance needed to brake.
armor([number pilot]) armour([number pilot])
-- Returns the total amount of armor left. -- Returns the total amount of armour left.
shield() shield()
-- Returns the total amount of shield left. -- Returns the total amount of shield left.
parmor() parmour()
-- Returns the percentage of armor remaining. -- Returns the percentage of armour remaining.
-- pilot - Optional pilot id, if not the current pilot is used. -- pilot - Optional pilot id, if not the current pilot is used.
pshield() pshield()

4
src/outfit.h
View File

@ -42,7 +42,7 @@ typedef struct {
double speed; // Speed of shot. (not applicable to beam. double speed; // Speed of shot. (not applicable to beam.
double range; double range;
double accuracy; // Desviation accuracy. double accuracy; // Desviation accuracy.
double damage_armor, damage_shield; // Damage. double damage_armour, damage_shield; // Damage.
gl_texture* gfx_space; gl_texture* gfx_space;
}; };
@ -53,7 +53,7 @@ typedef struct {
//double speed; // Max speed. //double speed; // Max speed.
//double turn; // Turn vel. //double turn; // Turn vel.
//double thrust; // Acceleration. //double thrust; // Acceleration.
//double damage_armor, damage_shield; //double damage_armour, damage_shield;
//gl_texture* gfx_space; //gl_texture* gfx_space;
}; };

8
src/pilot.h
View File

@ -10,7 +10,7 @@
// Aproximation for pilot size. // Aproximation for pilot size.
#define PILOT_SIZE_APROX 0.8 #define PILOT_SIZE_APROX 0.8
#define PILOT_DISABLED_ARMOR 0.2 // Based on armor percentage. #define PILOT_DISABLED_ARMOR 0.2 // Based on armour percentage.
// Flags. // Flags.
#define pilot_isFlag(p,f) (p->flags & f) #define pilot_isFlag(p,f) (p->flags & f)
@ -44,8 +44,8 @@ typedef struct Pilot {
Solid* solid; // Associated solid (physics). Solid* solid; // Associated solid (physics).
// Current health. // Current health.
double armor, shield, energy; double armour, shield, energy;
double armor_max, shield_max, energy_max; double armour_max, shield_max, energy_max;
void (*think)(struct Pilot*); // AI thinking for the pilot. void (*think)(struct Pilot*); // AI thinking for the pilot.
void (*update)(struct Pilot*, const double); // Update the pilot. void (*update)(struct Pilot*, const double); // Update the pilot.
@ -91,7 +91,7 @@ Fleet* fleet_get(const char* name);
// MISC. // MISC.
void pilot_shoot(Pilot* p, const int secondary); void pilot_shoot(Pilot* p, const int secondary);
void pilot_hit(Pilot* p, const double damage_shield, const double damage_armor); void pilot_hit(Pilot* p, const double damage_shield, const double damage_armour);
// Creation. // Creation.
void pilot_init(Pilot* dest, Ship* ship, char* name, Faction* faction, AI_Profile* ai, void pilot_init(Pilot* dest, Ship* ship, char* name, Faction* faction, AI_Profile* ai,

2
src/ship.h
View File

@ -42,7 +42,7 @@ typedef struct {
int mass; int mass;
// Health. // Health.
double armor, armor_regen; double armour, armour_regen;
double shield, shield_regen; double shield, shield_regen;
double energy, energy_regen; double energy, energy_regen;