From 948dc08c01f287d874db48a9c69530c89299759b Mon Sep 17 00:00:00 2001 From: cim Date: Sat, 17 Jan 2015 14:36:42 +0000 Subject: [PATCH] Weapon type could now be any string depending on what equipment is present. --- Schemata/shipdataEntrySchema.plist | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/Schemata/shipdataEntrySchema.plist b/Schemata/shipdataEntrySchema.plist index c4a5e454..228d9c35 100644 --- a/Schemata/shipdataEntrySchema.plist +++ b/Schemata/shipdataEntrySchema.plist @@ -17,10 +17,10 @@ accuracy = "float"; max_energy = "positiveFloat"; energy_recharge_rate = "positiveFloat"; - forward_weapon_type = "$weaponType"; - aft_weapon_type = "$weaponType"; - port_weapon_type = "$weaponType"; - starboard_weapon_type = "$weaponType"; + forward_weapon_type = "string"; + aft_weapon_type = "string"; + port_weapon_type = "string"; + starboard_weapon_type = "string"; weapon_facings = "positiveInteger"; weapon_energy = "positiveFloat"; weapon_range = "positiveFloat"; @@ -165,20 +165,6 @@ $definitions = { // "Special" types referred to above. - $weaponType = - { - type = "enumeration"; - values = - ( - "WEAPON_NONE", - "WEAPON_PLASMA_CANNON", - "WEAPON_PULSE_LASER", - "WEAPON_BEAM_LASER", - "WEAPON_MINING_LASER", - "WEAPON_MILITARY_LASER", - "WEAPON_THARGOID_LASER" - ); - }; $materialDict = { type = "dictionary";