From 1fd2a1a294ecb1e972a92414ca9d737836e7db9d Mon Sep 17 00:00:00 2001 From: Mark Lemming Date: Sun, 29 Mar 2015 07:51:50 -0600 Subject: [PATCH] Adj --- bin/puppet/ship_add.js | 195 ++----------------------------------- bin/puppet/ships_insert.pl | 2 + 2 files changed, 12 insertions(+), 185 deletions(-) diff --git a/bin/puppet/ship_add.js b/bin/puppet/ship_add.js index ad1ccc70..ec6a2353 100644 --- a/bin/puppet/ship_add.js +++ b/bin/puppet/ship_add.js @@ -1,195 +1,20 @@ { - "Alfheim" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" + "Planet One" : [ + { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "30", + "speed" : "4510", "stealth" : "13530", "type" : "snark3" }, { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" + "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "2500", + "speed" : "11902", "stealth" : "15148", "type" : "sweeper" } ], - "Algrim" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" + "Planet Two" : [ + { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "30", + "speed" : "4510", "stealth" : "13530", "type" : "snark3" }, { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Baldur" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Copenhagen" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Donner" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Heimdall" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 1" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 2" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 3" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - }, - { - "combat" : "5000", "hold_size" : "0", "name" : "Bleeder", "number" : "120", - "speed" : "5000", "stealth" : "1000", "type" : "bleeder", "type_human" : "Bleeder" - } - ], - "Fjord 4" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 5" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 6" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Fjord 7" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Hogun" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Muspelheim" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Oslo" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Reykjavik" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Sif" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Thor" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Uppsalir" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" - } - ], - "Vinland" : [ - { "combat" : "23600", "hold_size" : "0", "name" : "Snark III", "number" : "50", - "speed" : "4510", "stealth" : "13530", "type" : "snark3", "type_human" : "Snark III" - }, - { - "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "4000", - "speed" : "11902", "stealth" : "15148", "type" : "sweeper", "type_human" : "Sweeper" + "combat" : "34844", "hold_size" : "0", "name" : "Sweeper", "number" : "2500", + "speed" : "11902", "stealth" : "15148", "type" : "sweeper" } ] } diff --git a/bin/puppet/ships_insert.pl b/bin/puppet/ships_insert.pl index 90729e01..b24f44b2 100644 --- a/bin/puppet/ships_insert.pl +++ b/bin/puppet/ships_insert.pl @@ -43,6 +43,7 @@ use utf8; } printf "Adding %s of %s %s to %s\n", $to_build, $shash->{number}, $shash->{type}, $body_name; for (1..$to_build) { + my $berth_level = $shash->{berth_level} ? $shash->{berth_level} : 1; my $new = $body->ships->new({ type => $shash->{type}, name => $shash->{name}, @@ -51,6 +52,7 @@ use utf8; combat => $shash->{combat}, stealth => $shash->{stealth}, hold_size => $shash->{hold_size}, + berth_level => $berth_level, date_available => DateTime->now, date_started => DateTime->now, body_id => $body->id, -- 2.51.2