From 0a0818233247c28783fd3cb6ac6ee6887db004f7 Mon Sep 17 00:00:00 2001 From: Mark Lemming Date: Tue, 28 May 2013 21:33:07 -0600 Subject: [PATCH 1/3] Not just starting ISOs will get chose for targetting. --- missions/jandor-trading-the-mortal-coil.mission | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/missions/jandor-trading-the-mortal-coil.mission b/missions/jandor-trading-the-mortal-coil.mission index f1e5fd0..e78d1b8 100644 --- a/missions/jandor-trading-the-mortal-coil.mission +++ b/missions/jandor-trading-the-mortal-coil.mission @@ -12,8 +12,8 @@ "inhabited" : 1, "isolationist" : 1, "size" : [ - 1, - 45 + 30, + 75 ], "type" : "habitable" } @@ -25,8 +25,8 @@ "inhabited" : 1, "isolationist" : 1, "size" : [ - 1, - 45 + 30, + 75 ], "type" : "habitable" } -- 2.51.2 From b965e6733f369a8a5dddfe78621d44642a415900 Mon Sep 17 00:00:00 2001 From: Mark Lemming Date: Sun, 28 Jul 2013 19:10:45 -0600 Subject: [PATCH 2/3] Fixed a lot of blank ship names. --- missions/Cargo-Upgrade-I.mission | 4 ++-- missions/Cargo-Upgrade-II.mission | 2 +- missions/Cargo-Upgrade-III.mission | 2 +- missions/Cargo-Upgrade-IV.mission | 2 +- missions/Clunkers-to-Midsize.mission | 2 +- missions/Compact-to-Cargo.mission | 2 +- missions/Dory-Fleet-Upgrade.mission | 8 ++++---- missions/FREIGHTER.mission | 2 +- missions/Mid-size-to-Bonus.mission | 2 +- missions/Mid-size-to-Fullsize.mission | 2 +- missions/Mid-size-to-Sports.mission | 2 +- missions/Saben-Welcome-Pack-Too.mission | 14 +++++++------- missions/Used-Spaceship-Salesman.mission | 2 +- missions/andecaui-fighter.part5 | 2 +- missions/beach-front-property.mission | 2 +- missions/been-there.mission | 2 +- missions/desperately-seeking-sue-san.mission | 2 +- missions/eloy-misfortune.mission | 2 +- missions/fighters-for-sweepers.mission | 4 ++-- missions/gift_horse.mission | 2 +- missions/helping-the-new-empires.mission | 2 +- missions/hungry-for-more.part2 | 2 +- missions/ice-pirates.mission | 2 +- missions/in-love-with-the-world.mission | 6 +++--- missions/mob-rules.mission | 6 +++--- missions/need-your-blueprints.mission | 6 +++--- missions/radar-rider.mission | 2 +- missions/smugglers-blues.mission | 13 +++++++------ missions/starving-pets.mission | 2 +- missions/stolen-goods-space-port-seeker.mission | 2 +- missions/united_celebration_deal.mission | 4 ++-- missions/united_clear_the_waste.mission | 2 +- missions/we-changed-our-minds.mission | 2 +- t/Missions.t | 8 ++++++++ 34 files changed, 65 insertions(+), 56 deletions(-) diff --git a/missions/Cargo-Upgrade-I.mission b/missions/Cargo-Upgrade-I.mission index f96f182..9a99fa5 100755 --- a/missions/Cargo-Upgrade-I.mission +++ b/missions/Cargo-Upgrade-I.mission @@ -36,7 +36,7 @@ { "combat" : 0, "hold_size" : 170000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 2200, "stealth" : 3000, "type" : "cargo_ship" @@ -44,7 +44,7 @@ { "combat" : 0, "hold_size" : 170000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 2200, "stealth" : 3000, "type" : "cargo_ship" diff --git a/missions/Cargo-Upgrade-II.mission b/missions/Cargo-Upgrade-II.mission index 6090cb0..d21246d 100755 --- a/missions/Cargo-Upgrade-II.mission +++ b/missions/Cargo-Upgrade-II.mission @@ -27,7 +27,7 @@ { "combat" : 0, "hold_size" : 200000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 4000, "stealth" : 3500, "type" : "cargo_ship" diff --git a/missions/Cargo-Upgrade-III.mission b/missions/Cargo-Upgrade-III.mission index e5cbef4..ee8544c 100755 --- a/missions/Cargo-Upgrade-III.mission +++ b/missions/Cargo-Upgrade-III.mission @@ -28,7 +28,7 @@ { "combat" : 0, "hold_size" : 250000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 3200, "stealth" : 4000, "type" : "cargo_ship" diff --git a/missions/Cargo-Upgrade-IV.mission b/missions/Cargo-Upgrade-IV.mission index 2f3e493..78761c7 100755 --- a/missions/Cargo-Upgrade-IV.mission +++ b/missions/Cargo-Upgrade-IV.mission @@ -27,7 +27,7 @@ { "combat" : 0, "hold_size" : 280000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 3400, "stealth" : 4500, "type" : "cargo_ship" diff --git a/missions/Clunkers-to-Midsize.mission b/missions/Clunkers-to-Midsize.mission index 64fd978..49b1b4c 100755 --- a/missions/Clunkers-to-Midsize.mission +++ b/missions/Clunkers-to-Midsize.mission @@ -22,7 +22,7 @@ { "combat" : 0, "hold_size" : 40000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 2500, "stealth" : 7000, "type" : "dory" diff --git a/missions/Compact-to-Cargo.mission b/missions/Compact-to-Cargo.mission index 94cb05c..ffd1b1a 100755 --- a/missions/Compact-to-Cargo.mission +++ b/missions/Compact-to-Cargo.mission @@ -29,7 +29,7 @@ { "combat" : 0, "hold_size" : 50000, - "name" : "Dan's Cargo", + "name" : "Dans Cargo", "speed" : 2250, "stealth" : 7500, "type" : "cargo_ship" diff --git a/missions/Dory-Fleet-Upgrade.mission b/missions/Dory-Fleet-Upgrade.mission index d7d98f0..543933d 100755 --- a/missions/Dory-Fleet-Upgrade.mission +++ b/missions/Dory-Fleet-Upgrade.mission @@ -47,7 +47,7 @@ { "combat" : 0, "hold_size" : 40000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 2400, "stealth" : 7000, "type" : "dory" @@ -55,7 +55,7 @@ { "combat" : 0, "hold_size" : 40000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 2400, "stealth" : 7000, "type" : "dory" @@ -63,7 +63,7 @@ { "combat" : 0, "hold_size" : 40000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 2400, "stealth" : 7000, "type" : "dory" @@ -71,7 +71,7 @@ { "combat" : 0, "hold_size" : 40000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 2400, "stealth" : 7000, "type" : "dory" diff --git a/missions/FREIGHTER.mission b/missions/FREIGHTER.mission index cf7321c..daff420 100755 --- a/missions/FREIGHTER.mission +++ b/missions/FREIGHTER.mission @@ -26,7 +26,7 @@ { "combat" : 0, "hold_size" : 600000, - "name" : "Dan's Freighter", + "name" : "Dans Freighter", "speed" : 3000, "stealth" : 0, "type" : "freighter" diff --git a/missions/Mid-size-to-Bonus.mission b/missions/Mid-size-to-Bonus.mission index 6a48672..91b77e1 100755 --- a/missions/Mid-size-to-Bonus.mission +++ b/missions/Mid-size-to-Bonus.mission @@ -23,7 +23,7 @@ { "combat" : 0, "hold_size" : 55000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 3200, "stealth" : 8500, "type" : "dory" diff --git a/missions/Mid-size-to-Fullsize.mission b/missions/Mid-size-to-Fullsize.mission index 242a2bb..52dd73a 100755 --- a/missions/Mid-size-to-Fullsize.mission +++ b/missions/Mid-size-to-Fullsize.mission @@ -22,7 +22,7 @@ { "combat" : 0, "hold_size" : 80000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 3420, "stealth" : 9500, "type" : "dory" diff --git a/missions/Mid-size-to-Sports.mission b/missions/Mid-size-to-Sports.mission index 853ae8b..d414636 100755 --- a/missions/Mid-size-to-Sports.mission +++ b/missions/Mid-size-to-Sports.mission @@ -22,7 +22,7 @@ { "combat" : 0, "hold_size" : 60000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 9750, "stealth" : 11000, "type" : "dory" diff --git a/missions/Saben-Welcome-Pack-Too.mission b/missions/Saben-Welcome-Pack-Too.mission index c72cf21..7a53279 100644 --- a/missions/Saben-Welcome-Pack-Too.mission +++ b/missions/Saben-Welcome-Pack-Too.mission @@ -10,7 +10,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -18,7 +18,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -26,7 +26,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -34,7 +34,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -42,7 +42,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -50,7 +50,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" @@ -58,7 +58,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "Anti-Saben Snark", + "name" : "AntiSaben Snark", "speed" : 5000, "stealth" : 0, "type" : "snark" diff --git a/missions/Used-Spaceship-Salesman.mission b/missions/Used-Spaceship-Salesman.mission index f699228..b96cd74 100755 --- a/missions/Used-Spaceship-Salesman.mission +++ b/missions/Used-Spaceship-Salesman.mission @@ -22,7 +22,7 @@ { "combat" : 0, "hold_size" : 20000, - "name" : "Dan's Dory", + "name" : "Dans Dory", "speed" : 1500, "stealth" : 5000, "type" : "dory" diff --git a/missions/andecaui-fighter.part5 b/missions/andecaui-fighter.part5 index 888f792..63ddb6f 100755 --- a/missions/andecaui-fighter.part5 +++ b/missions/andecaui-fighter.part5 @@ -58,7 +58,7 @@ { "combat" : 50000, "hold_size" : 0, - "name" : "", + "name" : "Andecaui Sweeper", "speed" : 15000, "stealth" : 8000, "type" : "sweeper" diff --git a/missions/beach-front-property.mission b/missions/beach-front-property.mission index 05b07be..b135e98 100644 --- a/missions/beach-front-property.mission +++ b/missions/beach-front-property.mission @@ -20,7 +20,7 @@ { "combat" : 0, "hold_size" : 0, - "name" : "Pete's Retirement", + "name" : "Petes Retirement", "speed" : 700, "stealth" : 0, "type" : "mining_platform_ship" diff --git a/missions/been-there.mission b/missions/been-there.mission index d94524e..27e95df 100755 --- a/missions/been-there.mission +++ b/missions/been-there.mission @@ -12,7 +12,7 @@ { "combat" : 2000, "hold_size" : 0, - "name" : "Glib's SRCS", + "name" : "Glibs SRCS", "speed" : 4000, "stealth" : 0, "type" : "short_range_colony_ship" diff --git a/missions/desperately-seeking-sue-san.mission b/missions/desperately-seeking-sue-san.mission index 075fb7d..57fdde5 100644 --- a/missions/desperately-seeking-sue-san.mission +++ b/missions/desperately-seeking-sue-san.mission @@ -89,7 +89,7 @@ { "combat" : 0, "hold_size" : 45000, - "name" : "Susan's Search", + "name" : "Susans Search", "speed" : 1200, "stealth" : 3000, "type" : "cargo_ship" diff --git a/missions/eloy-misfortune.mission b/missions/eloy-misfortune.mission index dfe2ee2..a6fb340 100644 --- a/missions/eloy-misfortune.mission +++ b/missions/eloy-misfortune.mission @@ -19,7 +19,7 @@ { "combat" : 0, "hold_size" : 50000, - "name" : "Elroy's Cargo", + "name" : "Elroys Cargo", "speed" : 1200, "stealth" : 3000, "type" : "cargo_ship" diff --git a/missions/fighters-for-sweepers.mission b/missions/fighters-for-sweepers.mission index 0aedfb7..5747065 100644 --- a/missions/fighters-for-sweepers.mission +++ b/missions/fighters-for-sweepers.mission @@ -35,7 +35,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "", + "name" : "Oligarchy Sweeper", "speed" : 5000, "stealth" : 5000, "type" : "sweeper" @@ -43,7 +43,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "", + "name" : "Oligarchy Sweeper", "speed" : 5000, "stealth" : 5000, "type" : "sweeper" diff --git a/missions/gift_horse.mission b/missions/gift_horse.mission index 3328a09..ee77141 100644 --- a/missions/gift_horse.mission +++ b/missions/gift_horse.mission @@ -16,7 +16,7 @@ { "combat" : 5000, "hold_size" : 0, - "name" : "Horse's Gift", + "name" : "Horses Gift", "speed" : 1800, "stealth" : 0, "type" : "short_range_colony_ship" diff --git a/missions/helping-the-new-empires.mission b/missions/helping-the-new-empires.mission index b0cfda0..c38bf6f 100644 --- a/missions/helping-the-new-empires.mission +++ b/missions/helping-the-new-empires.mission @@ -24,7 +24,7 @@ { "combat" : 0, "hold_size" : 0, - "name" : "", + "name" : "Ultraprobe", "speed" : 22550, "stealth" : 0, "type" : "probe" diff --git a/missions/hungry-for-more.part2 b/missions/hungry-for-more.part2 index 5aeaf91..127bc37 100755 --- a/missions/hungry-for-more.part2 +++ b/missions/hungry-for-more.part2 @@ -21,7 +21,7 @@ { "combat" : 1000, "hold_size" : 0, - "name" : "", + "name" : "Alquor Scanner", "speed" : 7500, "stealth" : 0, "type" : "scanner" diff --git a/missions/ice-pirates.mission b/missions/ice-pirates.mission index bb4e2e9..762b5fd 100644 --- a/missions/ice-pirates.mission +++ b/missions/ice-pirates.mission @@ -18,7 +18,7 @@ { "combat" : 0, "hold_size" : 65000, - "name" : "Zagora's Quest", + "name" : "Zagoras Quest", "speed" : 5500, "stealth" : 12000, "type" : "smuggler_ship" diff --git a/missions/in-love-with-the-world.mission b/missions/in-love-with-the-world.mission index 6000566..d80747e 100644 --- a/missions/in-love-with-the-world.mission +++ b/missions/in-love-with-the-world.mission @@ -15,9 +15,9 @@ "ships" : [ { "combat" : 0, - "hold_size" : 15000, - "name" : "", - "speed" : 5000, + "hold_size" : 30000, + "name" : "Ministry", + "speed" : 6000, "stealth" : 0, "type" : "dory" } diff --git a/missions/mob-rules.mission b/missions/mob-rules.mission index 03bdb01..6c992fa 100644 --- a/missions/mob-rules.mission +++ b/missions/mob-rules.mission @@ -30,9 +30,9 @@ "ships" : [ { "combat" : 0, - "hold_size" : 25000, - "name" : "Tarna's Flight", - "speed" : 4500, + "hold_size" : 50000, + "name" : "Tarnas Flight", + "speed" : 8000, "stealth" : 15000, "type" : "smuggler_ship" } diff --git a/missions/need-your-blueprints.mission b/missions/need-your-blueprints.mission index f398135..c89c66b 100755 --- a/missions/need-your-blueprints.mission +++ b/missions/need-your-blueprints.mission @@ -26,7 +26,7 @@ { "combat" : 0, "hold_size" : 10000, - "name" : "Dorset's Luck", + "name" : "Dorsets Luck", "speed" : 3000, "stealth" : 5000, "type" : "dory" @@ -34,7 +34,7 @@ { "combat" : 0, "hold_size" : 10000, - "name" : "Windsor's Luck", + "name" : "Windsors Luck", "speed" : 3000, "stealth" : 5000, "type" : "dory" @@ -42,7 +42,7 @@ { "combat" : 0, "hold_size" : 10000, - "name" : "Norfolk's Luck", + "name" : "Norfolks Luck", "speed" : 3000, "stealth" : 5000, "type" : "dory" diff --git a/missions/radar-rider.mission b/missions/radar-rider.mission index a61a624..3decfd9 100644 --- a/missions/radar-rider.mission +++ b/missions/radar-rider.mission @@ -17,7 +17,7 @@ { "combat" : 0, "hold_size" : 32000, - "name" : "Digger's Folly", + "name" : "Diggers Folly", "speed" : 4000, "stealth" : 1500, "type" : "dory" diff --git a/missions/smugglers-blues.mission b/missions/smugglers-blues.mission index 69b20d3..5943700 100644 --- a/missions/smugglers-blues.mission +++ b/missions/smugglers-blues.mission @@ -4,9 +4,10 @@ "max_university_level" : "30", "mission_objective" : { "resources" : { - "energy" : 100000, - "gold" : 25000, - "milk" : 25000 + "energy" : 1000000, + "gold" : 250000, + "milk" : 250000 + "cider" : 250000 } }, "mission_reward" : { @@ -17,9 +18,9 @@ { "combat" : 0, "hold_size" : 100000, - "name" : "Glen's Ride", - "speed" : 4500, - "stealth" : 12000, + "name" : "Glens Ride", + "speed" : 8500, + "stealth" : 18000, "type" : "smuggler_ship" } ] diff --git a/missions/starving-pets.mission b/missions/starving-pets.mission index a74e540..40bd31d 100755 --- a/missions/starving-pets.mission +++ b/missions/starving-pets.mission @@ -12,7 +12,7 @@ { "combat" : 3000, "hold_size" : 0, - "name" : "Fido's Hope", + "name" : "Fidos Hope", "speed" : 2000, "stealth" : 0, "type" : "short_range_colony_ship" diff --git a/missions/stolen-goods-space-port-seeker.mission b/missions/stolen-goods-space-port-seeker.mission index eb2e75d..5652edb 100644 --- a/missions/stolen-goods-space-port-seeker.mission +++ b/missions/stolen-goods-space-port-seeker.mission @@ -17,7 +17,7 @@ { "combat" : 10000, "hold_size" : 0, - "name" : "%$#! erg", + "name" : "erg", "speed" : 2500, "stealth" : 2500, "type" : "spaceport_seeker" diff --git a/missions/united_celebration_deal.mission b/missions/united_celebration_deal.mission index fee415e..bd5332b 100644 --- a/missions/united_celebration_deal.mission +++ b/missions/united_celebration_deal.mission @@ -1,6 +1,6 @@ # config-file-type: JSON 1 { - "description" : "Thanks God for granting our Queen a speedy recovery on respiratory system infection. To share the whole-empire great news with all you others, we are giving off a breaking deal to the lucky one!", + "description" : "Thanks God for granting our Queen a speedy recovery from her respiratory system infection. To share the whole-empire great news with all you others, we are giving off a breaking deal to the lucky one!", "max_university_level" : "14", "mission_objective" : { "resources" : { @@ -15,7 +15,7 @@ { "combat" : 0, "hold_size" : 300000, - "name" : "The Queen's Gift", + "name" : "The Queens Gift", "speed" : 3000, "stealth" : 0, "type" : "galleon" diff --git a/missions/united_clear_the_waste.mission b/missions/united_clear_the_waste.mission index 8f548c3..3f98d29 100644 --- a/missions/united_clear_the_waste.mission +++ b/missions/united_clear_the_waste.mission @@ -17,7 +17,7 @@ { "combat" : 0, "hold_size" : 50000, - "name" : "The People's Scow", + "name" : "The Peoples Scow", "speed" : 1000, "stealth" : 0, "type" : "scow" diff --git a/missions/we-changed-our-minds.mission b/missions/we-changed-our-minds.mission index 48fabf6..4b9285a 100755 --- a/missions/we-changed-our-minds.mission +++ b/missions/we-changed-our-minds.mission @@ -16,7 +16,7 @@ { "combat" : 5000, "hold_size" : 0, - "name" : "Don't leave home", + "name" : "Do not leave home", "speed" : 1500, "stealth" : 0, "type" : "colony_ship" diff --git a/t/Missions.t b/t/Missions.t index ffedee3..63db5e4 100644 --- a/t/Missions.t +++ b/t/Missions.t @@ -33,6 +33,14 @@ foreach my $filename (@files) { my $class = $plan->{classname}; ok(exists $buildings->{$class}, $filename.' plan class '.$class.' exists'); } + my @ships; + $temp = $config->get('mission_reward')->{ships}; + push @ships, @{$temp} if (ref $temp eq 'ARRAY'); + foreach my $ship (@ships) { + my $name = $ship->{name}; + $name =~ s/[^\w\d\s]//g; + ok( ($name eq $ship->{name} and $name ne ''), $filename.' ship name in reward has puncuation or is zero length.'); + } } done_testing(); -- 2.51.2 From 78a54ba4c3b6dca1e45086cafde8a835f0edfb93 Mon Sep 17 00:00:00 2001 From: Mark Lemming Date: Sun, 28 Jul 2013 21:49:06 -0600 Subject: [PATCH 3/3] Fixed JSON --- missions/smugglers-blues.mission | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/missions/smugglers-blues.mission b/missions/smugglers-blues.mission index 5943700..50e074d 100644 --- a/missions/smugglers-blues.mission +++ b/missions/smugglers-blues.mission @@ -4,10 +4,10 @@ "max_university_level" : "30", "mission_objective" : { "resources" : { + "cider" : 250000, "energy" : 1000000, "gold" : 250000, "milk" : 250000 - "cider" : 250000 } }, "mission_reward" : { -- 2.51.2