BitLucid / ninjawars

deploy/lib/control/ClanController.php

Indentation +62 added lines, -62 removed lines

@@ -23,20 +23,20 @@ 
 	/**
 	 * View information about a clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @note
 	 * If a clan_id is not specified, the clan of the current user will be used
 	 */
 	public function view(Container $p_dependencies) {
-        $clanID = RequestWrapper::getPostOrGet('clan_id', null);
-        $player = $p_dependencies['current_player'];
+		$clanID = RequestWrapper::getPostOrGet('clan_id', null);
+		$player = $p_dependencies['current_player'];
 
-        if ($clanID === null && $player) {
-            $clan = Clan::findByMember($player);
-        } else {
-            $clan = $clanID? Clan::find($clanID) : null;
-        }
+		if ($clanID === null && $player) {
+			$clan = Clan::findByMember($player);
+		} else {
+			$clan = $clanID? Clan::find($clanID) : null;
+		}
 
 		if (isset($clan) && $clan instanceof Clan) {
 			$parts = [
@@ -85,7 +85,7 @@ 
 	/**
 	 * Send an invitation to a character that will ask them to join your clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @throws Exception You cannot use this function if you are not the leader of a clan
 	 */
@@ -127,7 +127,7 @@ 
 	/**
 	 * Removes the active player from the clan they are in
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @throws Exception If you are the only leader of your clan, you cannot leave, you must disband
 	 */
@@ -155,7 +155,7 @@ 
 	/**
 	 * Creates a new clan with the current user as the leader
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @note
 	 * Player must be high enough level to create a clan
@@ -199,7 +199,7 @@ 
 	/**
 	 * Sends a request to a clan leader for the current user to join a clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 */
 	public function join(Container $p_dependencies) {
@@ -225,7 +225,7 @@ 
 	/**
 	 * Deletes a clan and messages all members that it has been disbanded
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @throws \Exception The player disbanding must be the leader of the clan
 	 */
@@ -265,7 +265,7 @@ 
 	/**
 	 * Removes a player from a clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @throws Exception The player must be the leader of the clan to kick a member
 	 */
@@ -295,15 +295,15 @@ 
 	/**
 	 * Edits clan metadata
 	 *
-     * @todo accumulate error messages
-     * @param Container
+	 * @todo accumulate error messages
+	 * @param Container
 	 * @return Response
 	 * @throws Exception Only leaders can update clan details
 	 * @note
 	 * All parameters are options
 	 */
 	public function update(Container $p_dependencies) {
-        $request = RequestWrapper::$request;
+		$request = RequestWrapper::$request;
 		$player  = $p_dependencies['current_player'];
 		$clan    = Clan::findByMember($player);
 
@@ -365,7 +365,7 @@ 
 	/**
 	 * Shows a form for editing clan metadata
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 * @see update()
 	 */
@@ -386,7 +386,7 @@ 
 	/**
 	 * Sends a message to all members of the clan of the current player
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 */
 	public function message(Container $p_dependencies) {
@@ -429,7 +429,7 @@ 
 	/**
 	 * Shows a ranked list of all clans in the game
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 */
 	public function listClans(Container $p_dependencies) {
@@ -457,11 +457,11 @@ 
 	/**
 	 * Review a request to join a clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 */
 	public function review(Container $p_dependencies) {
-        $request = RequestWrapper::$request;
+		$request = RequestWrapper::$request;
 		$ninja   = $p_dependencies['current_player'];
 		$clan    = Clan::findByMember($ninja);
 
@@ -494,14 +494,14 @@ 
 	/**
 	 * Accept a player as a new member of a clan
 	 *
-     * @param Container
+	 * @param Container
 	 * @return Response
 	 *
 	 * @par Preconditions:
 	 * Active player must be leader of a clan
 	 */
 	public function accept(Container $p_dependencies) {
-        $request = RequestWrapper::$request;
+		$request = RequestWrapper::$request;
 		$ninja   = $p_dependencies['current_player'];
 		$clan    = Clan::findByMember($ninja);
 
@@ -545,7 +545,7 @@ 
 	/**
 	 * Generates a Response for rendering pages
 	 *
-     * @todo inject dependencies instead of pulling from the model
+	 * @todo inject dependencies instead of pulling from the model
 	 * @param Array $p_parts Name-Value pairs of values to send to the view
 	 * @return Response
 	 */
@@ -567,12 +567,12 @@ 
 
 		$p_parts['clan_creator_min_level'] = self::CLAN_CREATOR_MIN_LEVEL;
 
-        $options  = [
-            'body_classes' => 'clan',
-            'quickstat'    => true,
-        ];
+		$options  = [
+			'body_classes' => 'clan',
+			'quickstat'    => true,
+		];
 
-        return new StreamedViewResponse($p_parts['title'], 'clan.tpl', $p_parts, $options);
+		return new StreamedViewResponse($p_parts['title'], 'clan.tpl', $p_parts, $options);
 	}
 
 	/**
@@ -594,39 +594,39 @@ 
 		return false;
 	}
 
-    /**
-     * ????
-     *
-     * @todo Simplify this invite system.
-     * @param int $user_id
-     * @param int $clan_id
-     * @return void
-     */
-    private function sendClanJoinRequest($user_id, $clan_id) {
-        DatabaseConnection::getInstance();
-        $clan_obj  = new Clan($clan_id);
-        $leader    = $clan_obj->getLeaderInfo();
-        $leader_id = $leader['player_id'];
-        $user      = Player::find($user_id);
-        $username  = $user->name();
-
-        $confirmStatement = DatabaseConnection::$pdo->prepare('SELECT verification_number FROM players WHERE player_id = :user');
-        $confirmStatement->bindValue(':user', $user_id);
-        $confirmStatement->execute();
-        $confirm = $confirmStatement->fetchColumn();
-
-        // These ampersands get encoded later.
-        $url = "[href:clan/review/?joiner=$user_id&confirmation=$confirm|Confirm Request]";
-
-        $join_request_message = 'CLAN JOIN REQUEST: '.htmlentities($username)." has sent a request to join your clan.
+	/**
+	 * ????
+	 *
+	 * @todo Simplify this invite system.
+	 * @param int $user_id
+	 * @param int $clan_id
+	 * @return void
+	 */
+	private function sendClanJoinRequest($user_id, $clan_id) {
+		DatabaseConnection::getInstance();
+		$clan_obj  = new Clan($clan_id);
+		$leader    = $clan_obj->getLeaderInfo();
+		$leader_id = $leader['player_id'];
+		$user      = Player::find($user_id);
+		$username  = $user->name();
+
+		$confirmStatement = DatabaseConnection::$pdo->prepare('SELECT verification_number FROM players WHERE player_id = :user');
+		$confirmStatement->bindValue(':user', $user_id);
+		$confirmStatement->execute();
+		$confirm = $confirmStatement->fetchColumn();
+
+		// These ampersands get encoded later.
+		$url = "[href:clan/review/?joiner=$user_id&confirmation=$confirm|Confirm Request]";
+
+		$join_request_message = 'CLAN JOIN REQUEST: '.htmlentities($username)." has sent a request to join your clan.
             If you wish to allow this ninja into your clan click the following link:
                 $url";
 
-        Message::create([
-            'send_from' => $user_id,
-            'send_to'   => $leader_id,
-            'message'   => $join_request_message,
-            'type'      => 0,
-        ]);
-    }
+		Message::create([
+			'send_from' => $user_id,
+			'send_to'   => $leader_id,
+			'message'   => $join_request_message,
+			'type'      => 0,
+		]);
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
         if ($clanID === null && $player) {
             $clan = Clan::findByMember($player);
         } else {
-            $clan = $clanID? Clan::find($clanID) : null;
+            $clan = $clanID ? Clan::find($clanID) : null;
         }
 
 		if (isset($clan) && $clan instanceof Clan) {
@@ -169,7 +169,7 @@ 
 			$default_clan_name = 'Clan '.$player->name();
 
 			while (!Clan::isUniqueClanName($default_clan_name)) {
-				$default_clan_name = $default_clan_name.rand(1,999);
+				$default_clan_name = $default_clan_name.rand(1, 999);
 			}
 
 			$clan = Clan::create($player, $default_clan_name);
@@ -203,7 +203,7 @@ 
 	 * @return Response
 	 */
 	public function join(Container $p_dependencies) {
-		$clanID = (int) RequestWrapper::getPostOrGet('clan_id', 0);
+		$clanID = (int)RequestWrapper::getPostOrGet('clan_id', 0);
 		$clan   = Clan::find($clanID);
 
 		$this->sendClanJoinRequest($p_dependencies['session']->get('player_id'), $clanID);
@@ -340,7 +340,7 @@ 
 
 		// Truncate at 500 chars if necessary.
 		$truncated_clan_desc = substr((string)$new_clan_description, 0, 500);
-		if ($truncated_clan_desc != (string) $new_clan_description) {
+		if ($truncated_clan_desc != (string)$new_clan_description) {
 			$new_clan_description = $truncated_clan_desc;
 		}
 
@@ -466,7 +466,7 @@ 
 		$clan    = Clan::findByMember($ninja);
 
 		$joiner = Player::find($request->get('joiner'));
-		$confirmation = (int) $request->get('confirmation');
+		$confirmation = (int)$request->get('confirmation');
 
 		$parts = [
 			'title' => 'Accept a New Clan Member',
@@ -506,7 +506,7 @@ 
 		$clan    = Clan::findByMember($ninja);
 
 		$joiner = Player::find($request->get('joiner'));
-		$confirmation = (int) $request->get('confirmation');
+		$confirmation = (int)$request->get('confirmation');
 
 		$parts = [
 			'title' => 'Accept a New Clan Member',
@@ -567,7 +567,7 @@ 
 
 		$p_parts['clan_creator_min_level'] = self::CLAN_CREATOR_MIN_LEVEL;
 
-        $options  = [
+        $options = [
             'body_classes' => 'clan',
             'quickstat'    => true,
         ];

deploy/lib/control/NpcController.php

Indentation +614 added lines, -614 removed lines

@@ -19,618 +19,618 @@
  * Handles displaying npcs and attacking specific npcs
  */
 class NpcController extends AbstractController {
-    const ALIVE                      = true;
-    const PRIV                       = false;
-    const HIGH_TURNS                 = 50;
-    const ITEM_DECREASES_GOLD_DIVISOR = 1.11;
-    const ONI_DAMAGE_CAP             = 20;
-    const RANDOM_ENCOUNTER_DIVISOR   = 400;
-    const SAMURAI_REWARD_DMG         = 100;
-    const ONI_TURN_LOSS              = 10;
-    const ONI_KILL_LOSS              = 1;
-    const MIN_LEVEL_FOR_BOUNTY       = 5;
-    const MAX_LEVEL_FOR_BOUNTY       = 50;
-
-    public static $STEALTH_REMOVING_NPCS = ['samurai', 'oni'];
-
-    private $randomness = null;
-
-    /**
-     * Inject different seed when non-randomness is needed (for testing)
-     */
-    public function __construct($options=[]) {
-        if (isset($options['randomness']) && is_callable($options['randomness'])) {
-            $this->randomness = $options['randomness'];
-        } else {
-            $this->randomness = function() {
-                return mt_rand() / mt_getrandmax();
-            };
-        }
-    }
-
-    /**
-     * Run the random encounter
-     *
-     * @note
-     * Currently only random enc. is an Oni attack! Yay! They take turns and a
-     * kill and do a little damage.
-     */
-    private function randomEncounter(Player $player) {
-        $oni_health_loss  = rand(1, self::ONI_DAMAGE_CAP);
-        $multiple_rewards = false;
-        $oni_killed       = false;
-        $item             = null;
-
-        $player->changeTurns(-1*self::ONI_TURN_LOSS);
-        $player->harm($oni_health_loss);
-        $player->subtractKills(self::ONI_KILL_LOSS);
-
-        if ($player->health > 0) { // if you survive
-            $inventory = new Inventory($player);
-
-            if ($player->turns > self::HIGH_TURNS) { // And your turns are high/you are energetic, you can kill them.
-                $oni_killed       = true;
-                $item             = Item::findByIdentity('dimmak');
-                $quantity         = 1;
-                $inventory->add($item->identity(), $quantity);
-            } else if ($player->turns > floor(self::HIGH_TURNS/2) && rand()&1) {
-                // If your turns are somewhat high/you have some energy, 50/50 chance you can kill them.
-                $oni_killed       = true;
-                $item             = Item::findByIdentity('ginsengroot');
-                $multiple_rewards = true;
-                $quantity         = 4;
-                $inventory->add($item->identity(), $quantity);
-            }
-        }
-
-        $player->save();
-
-        return [
-            'npc.oni.tpl',
-            [
-                'victory'          => $oni_killed,
-                'item'             => $item,
-                'multiple_rewards' => $multiple_rewards,
-            ],
-        ];
-    }
-
-    /**
-     * Wrapper for session storage of thief attacking
-     *
-     * @param Container
-     * @return int
-     */
-    private function getThiefCounter(Container $p_dependencies) {
-        return $p_dependencies['session']->get('thief_counter', 1);
-    }
-
-    /**
-     * Wrapper for session storage of thief attacking
-     *
-     * @param int $num
-     * @param Container
-     * @return void
-     */
-    private function setThiefCounter($num, Container $p_dependencies) {
-        $p_dependencies['session']->set('thief_counter', $num);
-    }
-
-    /**
-     * The reward for defeating an npc, less if items popped
-     *
-     * @param Npc $npco
-     * @param boolean $reward_item Any items were rewarded.
-     * @return int
-     * @note
-     * If npc gold explicitly set to 0, reward gold will be totally skipped
-     * "rich" npcs will have a higher gold minimum
-     */
-    private function calcReceivedGold(Npc $npco, $reward_item) {
-        if ($npco->gold() === 0) { // These npcs simply don't give gold.
-            return 0;
-        }
-
-        // Hack a little off max gold if items received.
-        $divisor = 1;
-        if ($reward_item) {
-            $divisor = self::ITEM_DECREASES_GOLD_DIVISOR;
-        }
-
-        return rand($npco->minGold(), floor($npco->gold()/$divisor));
-    }
-
-    /**
-     * Handle Standard Abstract Npcs
-     *
-     * @param String $victim
-     * @param Player $player
-     * @param Array $npcs
-     * @return array [$npc_template, $combat_data]
-     */
-    private function attackAbstractNpc($victim, Player $player, $npcs) {
-        $npc_stats        = $npcs[$victim]; // Pull an npcs individual stats with generic fallbacks.
-        $npco             = new Npc($npc_stats); // Construct the npc object.
-        $display_name     = (isset($npc_stats['name']) ? $npc_stats['name'] : ucfirst($victim));
-        $status_effect    = (isset($npc_stats['status']) ? $npc_stats['status'] : null);
-        $reward_item      = (isset($npc_stats['item']) && $npc_stats['item'] ? $npc_stats['item'] : null);
-        $is_quick         = (boolean) ($npco->getSpeed() > $player->getSpeed()); // Beyond basic speed and they see you coming, so show that message.
-        $is_weaker        = ($npco->getStrength() * 3) < $player->getStrength(); // Npc much weaker?
-        $is_stronger      = ($npco->getStrength()) > ($player->getStrength() * 3); // Npc More than twice as strong?
-        $image            = (isset($npc_stats['img']) ? $npc_stats['img'] : null);
-        // Assume defeat...
-        $victory          = false;
-        $received_gold    = null;
-        $received_items   = null;
-        $added_bounty     = '';
-        $is_rewarded      = null; // Gets items or gold.
-        $statuses         = null;
-        $status_classes   = null;
-        $image_path       = null;
-
-        // If the image exists, set the path to it for use on the page.
-        if ($image && file_exists(SERVER_ROOT.'www/images/characters/'.$image)) {
-            $image_path = IMAGE_ROOT.'characters/'.$image;
-        }
-
-        // ******* FIGHT Logic ***********
-        $npc_damage    = $npco->damage();
-        $survive_fight = $player->harm($npc_damage);
-        $kill_npc      = ($npco->getHealth() < $player->damage());
-
-        if ($survive_fight > 0) {
-            // The ninja survived, they get any gold the npc has.
-            $received_gold = $this->calcReceivedGold($npco, (bool) $reward_item);
-            $player->setGold($player->gold + $received_gold);
-            $received_items = array();
-
-            if ($kill_npc) {
-                $victory = true;
-                // Victory occurred, reward the poor sap.
-                if ($npco->inventory()) {
-                    $inventory = new Inventory($player);
-
-                    foreach (array_keys($npco->inventory()) as $l_item) {
-                        $item = Item::findByIdentity($l_item);
-                        $received_items[] = $item->getName();
-                        $inventory->add($item->identity(), 1);
-                    }
-                }
-
-                // Add bounty where applicable for npcs.
-                if ($npco->bountyMod() > 0 &&
-                    $player->level > self::MIN_LEVEL_FOR_BOUNTY &&
-                    $player->level <= self::MAX_LEVEL_FOR_BOUNTY
-                ) {
-                    $added_bounty = Combat::runBountyExchange($player, $npco, $npco->bountyMod());
-                }
-            }
-
-            $is_rewarded = (bool) $received_gold || (bool)count($received_items);
-
-            if (isset($npc_stats['status']) && null !== $npc_stats['status']) {
-                $player->addStatus($npc_stats['status']);
-                // Get the statuses and status classes for display.
-                $statuses = implode(', ', Player::getStatusList());
-                $status_classes = implode(' ', Player::getStatusList());
-            }
-        }
-
-        $player->save();
-
-        return [
-            'npc.abstract.tpl',
-            [
-                'victim'                   => $victim,
-                'display_name'             => $display_name,
-                'attack_damage'            => $npc_damage,
-                'status_effect'            => $status_effect,
-                'display_statuses'         => $statuses,
-                'display_statuses_classes' => $status_classes,
-                'received_gold'            => $received_gold,
-                'received_display_items'   => $received_items,
-                'is_rewarded'              => $is_rewarded,
-                'victory'                  => $victory,
-                'survive_fight'            => $survive_fight,
-                'kill_npc'                 => $kill_npc,
-                'image_path'               => $image_path,
-                'npc_stats'                => $npc_stats,
-                'is_quick'                 => $is_quick,
-                'added_bounty'             => $added_bounty,
-                'is_villager'              => $npco->hasTrait('villager'),
-                'race'                     => $npco->race(),
-                'is_weaker'                => $is_weaker,
-                'is_stronger'              => $is_stronger,
-            ]
-        ];
-    }
-
-    /**
-     * Injectable randomness.
-     *
-     * @return boolean
-     * @note
-     * Used to be rand(1, 400) === 1
-     */
-    private function startRandomEncounter() {
-        $randomness = $this->randomness;
-        return (boolean) (ceil($randomness() * self::RANDOM_ENCOUNTER_DIVISOR) == self::RANDOM_ENCOUNTER_DIVISOR);
-    }
-
-    /**
-     * Attack a specific npc
-     *
-     * @param Container
-     * @return StreamedViewResponse
-     */
-    public function attack(Container $p_dependencies) {
-        $request = RequestWrapper::$request;
-
-        $url_part = $request->getRequestUri();
-
-        if (preg_match('#\/(\w+)(\/)?$#', $url_part, $matches)) {
-            $victim = $matches[1];
-        } else {
-            $victim = null; // No match, victim is null.
-        }
-
-        $turn_cost      = 1;
-        $health         = true;
-        $combat_data    = [];
-        $player         = $p_dependencies['current_player'];
-        $error_template = 'npc.no-one.tpl'; // Error template also used down below.
-        $npc_template   = $error_template; // Error condition by default.
-        $npcs           = NpcFactory::npcsData();
-        $possible_npcs  = array_merge(array_column(NpcFactory::customNpcs(), 'identity'), array_keys($npcs));
-        $victim         = (in_array($victim, $possible_npcs) ? $victim : null); // Filter to only the correct options.
-
-        $standard_npcs  = [
-            'peasant'  => 'attackVillager',
-            'merchant' => 'attackMerchant',
-            'guard'    => 'attackGuard',
-        ];
-
-        $method = null;
-
-        if ($player && $player->turns > 0 && !empty($victim)) {
-            // Strip stealth when attacking special NPCs
-            if ($player->hasStatus('stealth') && in_array(strtolower($victim), self::$STEALTH_REMOVING_NPCS)) {
-                $player->subtractStatus(STEALTH);
-            }
-
-            if ($this->startRandomEncounter()) {
-                $method = 'randomEncounter';
-            } elseif (array_key_exists($victim, $npcs)) {
-                list($npc_template, $combat_data) = $this->attackAbstractNpc($victim, $player, $npcs);
-            } else if (array_key_exists($victim, $standard_npcs)) {
-                $method = $standard_npcs[$victim];
-            } else if ($victim == "samurai") {
-                if ($player->level < 2) {
-                    $turn_cost = 0;
-                    $npc_template = 'npc.samurai-too-weak.tpl';
-                } else if ($player->kills < 1) {
-                    $turn_cost = 0;
-                    $npc_template = 'npc.samurai-too-tired.tpl';
-                } else {
-                    $method = 'attackSamurai';
-                }
-            } else if ($victim == 'thief') {
-                // Check the counter to see whether they've attacked a thief multiple times in a row.
-                $counter = $this->getThiefCounter($p_dependencies);
-
-                $this->setThiefCounter($counter+1, $p_dependencies); // Incremement the current state of the counter.
-
-                if ($counter > 20 && rand(1, 3) == 3) {
-                    // Only after many attacks do you have the chance to be attacked back by the group of thieves.
-                    $this->setThiefCounter(0, $p_dependencies); // Reset the counter to zero.
-                    $method = 'attackGroupOfThieves';
-                } else {
-                    $method = 'attackNormalThief';
-                }
-            }
-
-            if (is_callable([$this, $method], false)) {
-                list($npc_template, $combat_data) = $this->$method($player);
-            }
-
-            if ($player->health <= 0) { // FINAL CHECK FOR DEATH
-                $player->death();
-                $health = false;
-                Event::create((int)"SysMsg", $player->id(), "DEATH: You have been killed by a $victim.");
-            }
-
-            // Subtract the turn cost for attacking an npc
-            // almost always 1 apart from perhaps oni or group-of-thieves
-            $player->changeTurns(-1*$turn_cost);
-
-            $player->save();
-        }
-
-        // Uses a sub-template inside for specific npcs.
-        $parts = [
-            'victim'       => $victim, // merge may override in theory
-            'npc_template' => $npc_template,
-            'attacked'     => 1,
-            'turns'        => $player? $player->turns : null,
-            'health'       => $health,
-        ];
-
-        return new StreamedViewResponse('Battle', 'npc.tpl', $parts + $combat_data, ['quickstat' => 'player']);
-    }
-
-    private function attackGuard(Player $player) {
-        $damage = rand(1, $player->getStrength() + 10);
-        $herb   = false;
-        $gold   = 0;
-        $bounty = 0;
-
-        if ($victory = $player->harm($damage)) {
-            $gold = rand(1, $player->getStrength() + 40);
-            $player->setGold($player->gold + $gold);
-
-            if ($player->level > 15) {
-                $bounty = 10 * floor(($player->level - 10) / 5);
-                $player->setBounty($player->bounty + $bounty);
-            }
-
-            // chance of getting an herb for Kampo
-            if (rand(1, 9) == 9) {
-                $herb = true;
-                $inventory = new Inventory($player);
-                $inventory->add('ginsengroot', 1);
-            }
-        } else {
-            $damage = 0;
-        }
-
-        return [
-            'npc.guard.tpl',
-            [
-                'attack'  => $damage,
-                'gold'    => $gold,
-                'bounty'  => $bounty,
-                'victory' => $victory,
-                'herb'    => $herb,
-            ],
-        ];
-    }
-
-    private function attackVillager(Player $player) {
-        $damage        = rand(0, 10);
-        $just_villager = rand(0, 20);
-        $bounty        = 0;
-        $gold          = 0;
-
-        if ($victory = $player->harm($damage)) {
-            $gold = rand(0, 20);
-            $player->setGold($player->gold + $gold);
-
-            // *** Bounty or no bounty ***
-            if ($player->level > 1 && $player->level <= 20) {
-                $bounty = floor($player->level / 3);
-                $player->setBounty($player->bounty + $bounty);
-            }
-
-            if (!$just_villager) {
-                // Something beyond just a villager, drop a shuriken
-                $inventory = new Inventory($player);
-                $inventory->add('shuriken', 1);
-            }
-        }
-
-        $player->save();
-
-        return [
-            'npc.peasant.tpl',
-            [
-                'just_villager' => $just_villager,
-                'attack'        => $damage,
-                'gold'          => $gold,
-                'level'         => $player->level,
-                'bounty'        => $bounty,
-                'victory'       => $victory,
-            ],
-        ];
-    }
-
-    private function attackSamurai(Player $player) {
-        $gold         = 0;
-        $victory      = false;
-        $drop         = false;
-        $drop_display = null;
-
-        $damage = [
-            rand(1, $player->getStrength()),
-            rand(10, 10 + round($player->getStrength() * 1.2)),
-        ];
-
-        if (rand(0, 1)) {
-            $damage[] = rand(30 + round($player->getStrength() * 0.2), 30 + round($player->getStrength() * 1.7));
-        } else { //Instant death.
-            $damage[] = abs($player->health - $damage[0] - $damage[1]);
-        }
-
-        for ($i = 0; $i < count($damage) && $player->health > 0; ++$i) {
-            $player->harm($damage[$i]);
-        }
-
-        if ($player->health > 0) { // Ninja still has health after all attacks
-            $victory = true;
-
-            $gold = rand(50, 50 + $damage[2] + $damage[1]);
-
-            $player->addKills(1);
-            $player->setGold($player->gold + $gold);
-
-            $inventory = new Inventory($player);
-
-            // If samurai dmg high, but ninja lived, give rewards
-            if ($damage[2] > self::SAMURAI_REWARD_DMG) {
-                $drop = true;
-
-                if (rand(0, 1)) {
-                    $drop_display = 'mushroom powder';
-                    $dropItem = 'amanita';
-                } else {
-                    $drop_display = 'a strange herb';
-                    $dropItem = 'ginsengroot';
-                }
-
-                $inventory->add($dropItem, 1);
-            }
-
-            // If the final damage was the exact max damage
-            if ($damage[2] == $player->getStrength() * 3) {
-                $drop         = true;
-                $drop_display = 'a black scroll';
-                $inventory->add('dimmak', 1);
-            }
-        }
-
-        $player->save();
-
-        return [
-            'npc.samurai.tpl',
-            [
-                'samurai_damage_array' => $damage,
-                'gold'                 => $gold,
-                'victory'              => $victory,
-                'ninja_str'            => $player->getStrength(),
-                'level'                => $player->level,
-                'attacker_kills'       => $player->kills,
-                'drop'                 => $drop,
-                'drop_display'         => $drop_display,
-            ],
-        ];
-    }
-
-    private function attackGroupOfThieves(Player $player) {
-        $damage = rand(50, 150);
-
-        if ($victory = $player->harm($damage)) {
-            // The den of thieves didn't accomplish their goal
-            $gold = rand(100, 300);
-
-            if ($damage > 120) { // Powerful attack gives an additional disadvantage
-                $player->subtractKills(1);
-            }
-
-            $player->setGold($player->gold + $gold);
-
-            $inventory = new Inventory($player);
-            $inventory->add('phosphor', 1);
-        } else {    // If the den of theives killed the attacker.
-            $gold = 0;
-        }
-
-        $player->save();
-
-        return [
-            'npc.thief-group.tpl',
-            [
-                'attack'  => $damage,
-                'gold'    => $gold,
-                'victory' => $victory,
-            ],
-        ];
-    }
-
-    /**
-     * Attack merchant
-     */
-    private function attackMerchant($player) {
-        $damage = rand(15, 35);
-        $bounty = 0;
-
-        // Player killed NPC
-        if ($victory = $player->harm($damage)) {
-            $gold = rand(20, 70);
-            $player->setGold($player->gold + $gold);
-
-            if ($damage > 34) {
-                $inventory = new Inventory($player);
-                $inventory->add('phosphor', 1);
-            }
-
-            if ($player->level > 10) {
-                $bounty = 5 * floor(($player->level - 5) / 3);
-                $player->setBounty($player->bounty + $bounty);
-            }
-        } else { // NPC killed player
-            $damage = $gold = 0;
-        }
-
-        $player->save();
-
-        return [
-            'npc.merchant.tpl',
-            [
-                'attack'  => $damage,
-                'gold'    => $gold,
-                'bounty'  => $bounty,
-                'victory' => $victory,
-            ],
-        ];
-    }
-
-    /**
-     * Normal attack on a single thief.
-     */
-    private function attackNormalThief(Player $player) {
-        $damage = rand(0, 35);  // Damage done
-        $gold   = 0;
-
-        if ($victory = $player->harm($damage)) {
-            $gold = rand(0, 40);  // Gold in question
-
-            if ($damage > 30) { // Steal gold
-                $player->setGold(max(0, $player->gold - $gold));
-            } else if ($damage < 30) { // award gold and item
-                $player->setGold($player->gold + $gold);
-                $inventory = new Inventory($player);
-                $inventory->add('shuriken', 1);
-            }
-        }
-
-        $player->save();
-
-        return [
-            'npc.thief.tpl',
-            [
-                'attack'  => $damage,
-                'gold'    => $gold,
-                'victory' => $victory,
-            ],
-        ];
-    }
-
-    /**
-     * Obtain the npcs data.
-     *
-     * @return Array
-     */
-    private function npcs() {
-        return [
-            'abstract_npcs' => NpcFactory::npcsData(),
-            'custom_npcs'   => NpcFactory::customNpcs(),
-        ];
-    }
-
-    /**
-     * Get the list of npcs in a subtemplate.
-     *
-     * @param Container
-     * @return Response
-     */
-    public function index(Container $p_dependencies) {
-        $all_npcs   = $this->npcs();
-        $other_npcs = $all_npcs['abstract_npcs'];
-        $npcs       = $all_npcs['custom_npcs'];
-        $template   = 'npc.list.tpl';
-        $title      = 'Npcs';
-        $parts      = ['npcs' => $npcs, 'other_npcs' => $other_npcs];
-        $options    = ['quickstats' => 'player'];
-
-        return new StreamedViewResponse($title, $template, $parts, $options);
-    }
+	const ALIVE                      = true;
+	const PRIV                       = false;
+	const HIGH_TURNS                 = 50;
+	const ITEM_DECREASES_GOLD_DIVISOR = 1.11;
+	const ONI_DAMAGE_CAP             = 20;
+	const RANDOM_ENCOUNTER_DIVISOR   = 400;
+	const SAMURAI_REWARD_DMG         = 100;
+	const ONI_TURN_LOSS              = 10;
+	const ONI_KILL_LOSS              = 1;
+	const MIN_LEVEL_FOR_BOUNTY       = 5;
+	const MAX_LEVEL_FOR_BOUNTY       = 50;
+
+	public static $STEALTH_REMOVING_NPCS = ['samurai', 'oni'];
+
+	private $randomness = null;
+
+	/**
+	 * Inject different seed when non-randomness is needed (for testing)
+	 */
+	public function __construct($options=[]) {
+		if (isset($options['randomness']) && is_callable($options['randomness'])) {
+			$this->randomness = $options['randomness'];
+		} else {
+			$this->randomness = function() {
+				return mt_rand() / mt_getrandmax();
+			};
+		}
+	}
+
+	/**
+	 * Run the random encounter
+	 *
+	 * @note
+	 * Currently only random enc. is an Oni attack! Yay! They take turns and a
+	 * kill and do a little damage.
+	 */
+	private function randomEncounter(Player $player) {
+		$oni_health_loss  = rand(1, self::ONI_DAMAGE_CAP);
+		$multiple_rewards = false;
+		$oni_killed       = false;
+		$item             = null;
+
+		$player->changeTurns(-1*self::ONI_TURN_LOSS);
+		$player->harm($oni_health_loss);
+		$player->subtractKills(self::ONI_KILL_LOSS);
+
+		if ($player->health > 0) { // if you survive
+			$inventory = new Inventory($player);
+
+			if ($player->turns > self::HIGH_TURNS) { // And your turns are high/you are energetic, you can kill them.
+				$oni_killed       = true;
+				$item             = Item::findByIdentity('dimmak');
+				$quantity         = 1;
+				$inventory->add($item->identity(), $quantity);
+			} else if ($player->turns > floor(self::HIGH_TURNS/2) && rand()&1) {
+				// If your turns are somewhat high/you have some energy, 50/50 chance you can kill them.
+				$oni_killed       = true;
+				$item             = Item::findByIdentity('ginsengroot');
+				$multiple_rewards = true;
+				$quantity         = 4;
+				$inventory->add($item->identity(), $quantity);
+			}
+		}
+
+		$player->save();
+
+		return [
+			'npc.oni.tpl',
+			[
+				'victory'          => $oni_killed,
+				'item'             => $item,
+				'multiple_rewards' => $multiple_rewards,
+			],
+		];
+	}
+
+	/**
+	 * Wrapper for session storage of thief attacking
+	 *
+	 * @param Container
+	 * @return int
+	 */
+	private function getThiefCounter(Container $p_dependencies) {
+		return $p_dependencies['session']->get('thief_counter', 1);
+	}
+
+	/**
+	 * Wrapper for session storage of thief attacking
+	 *
+	 * @param int $num
+	 * @param Container
+	 * @return void
+	 */
+	private function setThiefCounter($num, Container $p_dependencies) {
+		$p_dependencies['session']->set('thief_counter', $num);
+	}
+
+	/**
+	 * The reward for defeating an npc, less if items popped
+	 *
+	 * @param Npc $npco
+	 * @param boolean $reward_item Any items were rewarded.
+	 * @return int
+	 * @note
+	 * If npc gold explicitly set to 0, reward gold will be totally skipped
+	 * "rich" npcs will have a higher gold minimum
+	 */
+	private function calcReceivedGold(Npc $npco, $reward_item) {
+		if ($npco->gold() === 0) { // These npcs simply don't give gold.
+			return 0;
+		}
+
+		// Hack a little off max gold if items received.
+		$divisor = 1;
+		if ($reward_item) {
+			$divisor = self::ITEM_DECREASES_GOLD_DIVISOR;
+		}
+
+		return rand($npco->minGold(), floor($npco->gold()/$divisor));
+	}
+
+	/**
+	 * Handle Standard Abstract Npcs
+	 *
+	 * @param String $victim
+	 * @param Player $player
+	 * @param Array $npcs
+	 * @return array [$npc_template, $combat_data]
+	 */
+	private function attackAbstractNpc($victim, Player $player, $npcs) {
+		$npc_stats        = $npcs[$victim]; // Pull an npcs individual stats with generic fallbacks.
+		$npco             = new Npc($npc_stats); // Construct the npc object.
+		$display_name     = (isset($npc_stats['name']) ? $npc_stats['name'] : ucfirst($victim));
+		$status_effect    = (isset($npc_stats['status']) ? $npc_stats['status'] : null);
+		$reward_item      = (isset($npc_stats['item']) && $npc_stats['item'] ? $npc_stats['item'] : null);
+		$is_quick         = (boolean) ($npco->getSpeed() > $player->getSpeed()); // Beyond basic speed and they see you coming, so show that message.
+		$is_weaker        = ($npco->getStrength() * 3) < $player->getStrength(); // Npc much weaker?
+		$is_stronger      = ($npco->getStrength()) > ($player->getStrength() * 3); // Npc More than twice as strong?
+		$image            = (isset($npc_stats['img']) ? $npc_stats['img'] : null);
+		// Assume defeat...
+		$victory          = false;
+		$received_gold    = null;
+		$received_items   = null;
+		$added_bounty     = '';
+		$is_rewarded      = null; // Gets items or gold.
+		$statuses         = null;
+		$status_classes   = null;
+		$image_path       = null;
+
+		// If the image exists, set the path to it for use on the page.
+		if ($image && file_exists(SERVER_ROOT.'www/images/characters/'.$image)) {
+			$image_path = IMAGE_ROOT.'characters/'.$image;
+		}
+
+		// ******* FIGHT Logic ***********
+		$npc_damage    = $npco->damage();
+		$survive_fight = $player->harm($npc_damage);
+		$kill_npc      = ($npco->getHealth() < $player->damage());
+
+		if ($survive_fight > 0) {
+			// The ninja survived, they get any gold the npc has.
+			$received_gold = $this->calcReceivedGold($npco, (bool) $reward_item);
+			$player->setGold($player->gold + $received_gold);
+			$received_items = array();
+
+			if ($kill_npc) {
+				$victory = true;
+				// Victory occurred, reward the poor sap.
+				if ($npco->inventory()) {
+					$inventory = new Inventory($player);
+
+					foreach (array_keys($npco->inventory()) as $l_item) {
+						$item = Item::findByIdentity($l_item);
+						$received_items[] = $item->getName();
+						$inventory->add($item->identity(), 1);
+					}
+				}
+
+				// Add bounty where applicable for npcs.
+				if ($npco->bountyMod() > 0 &&
+					$player->level > self::MIN_LEVEL_FOR_BOUNTY &&
+					$player->level <= self::MAX_LEVEL_FOR_BOUNTY
+				) {
+					$added_bounty = Combat::runBountyExchange($player, $npco, $npco->bountyMod());
+				}
+			}
+
+			$is_rewarded = (bool) $received_gold || (bool)count($received_items);
+
+			if (isset($npc_stats['status']) && null !== $npc_stats['status']) {
+				$player->addStatus($npc_stats['status']);
+				// Get the statuses and status classes for display.
+				$statuses = implode(', ', Player::getStatusList());
+				$status_classes = implode(' ', Player::getStatusList());
+			}
+		}
+
+		$player->save();
+
+		return [
+			'npc.abstract.tpl',
+			[
+				'victim'                   => $victim,
+				'display_name'             => $display_name,
+				'attack_damage'            => $npc_damage,
+				'status_effect'            => $status_effect,
+				'display_statuses'         => $statuses,
+				'display_statuses_classes' => $status_classes,
+				'received_gold'            => $received_gold,
+				'received_display_items'   => $received_items,
+				'is_rewarded'              => $is_rewarded,
+				'victory'                  => $victory,
+				'survive_fight'            => $survive_fight,
+				'kill_npc'                 => $kill_npc,
+				'image_path'               => $image_path,
+				'npc_stats'                => $npc_stats,
+				'is_quick'                 => $is_quick,
+				'added_bounty'             => $added_bounty,
+				'is_villager'              => $npco->hasTrait('villager'),
+				'race'                     => $npco->race(),
+				'is_weaker'                => $is_weaker,
+				'is_stronger'              => $is_stronger,
+			]
+		];
+	}
+
+	/**
+	 * Injectable randomness.
+	 *
+	 * @return boolean
+	 * @note
+	 * Used to be rand(1, 400) === 1
+	 */
+	private function startRandomEncounter() {
+		$randomness = $this->randomness;
+		return (boolean) (ceil($randomness() * self::RANDOM_ENCOUNTER_DIVISOR) == self::RANDOM_ENCOUNTER_DIVISOR);
+	}
+
+	/**
+	 * Attack a specific npc
+	 *
+	 * @param Container
+	 * @return StreamedViewResponse
+	 */
+	public function attack(Container $p_dependencies) {
+		$request = RequestWrapper::$request;
+
+		$url_part = $request->getRequestUri();
+
+		if (preg_match('#\/(\w+)(\/)?$#', $url_part, $matches)) {
+			$victim = $matches[1];
+		} else {
+			$victim = null; // No match, victim is null.
+		}
+
+		$turn_cost      = 1;
+		$health         = true;
+		$combat_data    = [];
+		$player         = $p_dependencies['current_player'];
+		$error_template = 'npc.no-one.tpl'; // Error template also used down below.
+		$npc_template   = $error_template; // Error condition by default.
+		$npcs           = NpcFactory::npcsData();
+		$possible_npcs  = array_merge(array_column(NpcFactory::customNpcs(), 'identity'), array_keys($npcs));
+		$victim         = (in_array($victim, $possible_npcs) ? $victim : null); // Filter to only the correct options.
+
+		$standard_npcs  = [
+			'peasant'  => 'attackVillager',
+			'merchant' => 'attackMerchant',
+			'guard'    => 'attackGuard',
+		];
+
+		$method = null;
+
+		if ($player && $player->turns > 0 && !empty($victim)) {
+			// Strip stealth when attacking special NPCs
+			if ($player->hasStatus('stealth') && in_array(strtolower($victim), self::$STEALTH_REMOVING_NPCS)) {
+				$player->subtractStatus(STEALTH);
+			}
+
+			if ($this->startRandomEncounter()) {
+				$method = 'randomEncounter';
+			} elseif (array_key_exists($victim, $npcs)) {
+				list($npc_template, $combat_data) = $this->attackAbstractNpc($victim, $player, $npcs);
+			} else if (array_key_exists($victim, $standard_npcs)) {
+				$method = $standard_npcs[$victim];
+			} else if ($victim == "samurai") {
+				if ($player->level < 2) {
+					$turn_cost = 0;
+					$npc_template = 'npc.samurai-too-weak.tpl';
+				} else if ($player->kills < 1) {
+					$turn_cost = 0;
+					$npc_template = 'npc.samurai-too-tired.tpl';
+				} else {
+					$method = 'attackSamurai';
+				}
+			} else if ($victim == 'thief') {
+				// Check the counter to see whether they've attacked a thief multiple times in a row.
+				$counter = $this->getThiefCounter($p_dependencies);
+
+				$this->setThiefCounter($counter+1, $p_dependencies); // Incremement the current state of the counter.
+
+				if ($counter > 20 && rand(1, 3) == 3) {
+					// Only after many attacks do you have the chance to be attacked back by the group of thieves.
+					$this->setThiefCounter(0, $p_dependencies); // Reset the counter to zero.
+					$method = 'attackGroupOfThieves';
+				} else {
+					$method = 'attackNormalThief';
+				}
+			}
+
+			if (is_callable([$this, $method], false)) {
+				list($npc_template, $combat_data) = $this->$method($player);
+			}
+
+			if ($player->health <= 0) { // FINAL CHECK FOR DEATH
+				$player->death();
+				$health = false;
+				Event::create((int)"SysMsg", $player->id(), "DEATH: You have been killed by a $victim.");
+			}
+
+			// Subtract the turn cost for attacking an npc
+			// almost always 1 apart from perhaps oni or group-of-thieves
+			$player->changeTurns(-1*$turn_cost);
+
+			$player->save();
+		}
+
+		// Uses a sub-template inside for specific npcs.
+		$parts = [
+			'victim'       => $victim, // merge may override in theory
+			'npc_template' => $npc_template,
+			'attacked'     => 1,
+			'turns'        => $player? $player->turns : null,
+			'health'       => $health,
+		];
+
+		return new StreamedViewResponse('Battle', 'npc.tpl', $parts + $combat_data, ['quickstat' => 'player']);
+	}
+
+	private function attackGuard(Player $player) {
+		$damage = rand(1, $player->getStrength() + 10);
+		$herb   = false;
+		$gold   = 0;
+		$bounty = 0;
+
+		if ($victory = $player->harm($damage)) {
+			$gold = rand(1, $player->getStrength() + 40);
+			$player->setGold($player->gold + $gold);
+
+			if ($player->level > 15) {
+				$bounty = 10 * floor(($player->level - 10) / 5);
+				$player->setBounty($player->bounty + $bounty);
+			}
+
+			// chance of getting an herb for Kampo
+			if (rand(1, 9) == 9) {
+				$herb = true;
+				$inventory = new Inventory($player);
+				$inventory->add('ginsengroot', 1);
+			}
+		} else {
+			$damage = 0;
+		}
+
+		return [
+			'npc.guard.tpl',
+			[
+				'attack'  => $damage,
+				'gold'    => $gold,
+				'bounty'  => $bounty,
+				'victory' => $victory,
+				'herb'    => $herb,
+			],
+		];
+	}
+
+	private function attackVillager(Player $player) {
+		$damage        = rand(0, 10);
+		$just_villager = rand(0, 20);
+		$bounty        = 0;
+		$gold          = 0;
+
+		if ($victory = $player->harm($damage)) {
+			$gold = rand(0, 20);
+			$player->setGold($player->gold + $gold);
+
+			// *** Bounty or no bounty ***
+			if ($player->level > 1 && $player->level <= 20) {
+				$bounty = floor($player->level / 3);
+				$player->setBounty($player->bounty + $bounty);
+			}
+
+			if (!$just_villager) {
+				// Something beyond just a villager, drop a shuriken
+				$inventory = new Inventory($player);
+				$inventory->add('shuriken', 1);
+			}
+		}
+
+		$player->save();
+
+		return [
+			'npc.peasant.tpl',
+			[
+				'just_villager' => $just_villager,
+				'attack'        => $damage,
+				'gold'          => $gold,
+				'level'         => $player->level,
+				'bounty'        => $bounty,
+				'victory'       => $victory,
+			],
+		];
+	}
+
+	private function attackSamurai(Player $player) {
+		$gold         = 0;
+		$victory      = false;
+		$drop         = false;
+		$drop_display = null;
+
+		$damage = [
+			rand(1, $player->getStrength()),
+			rand(10, 10 + round($player->getStrength() * 1.2)),
+		];
+
+		if (rand(0, 1)) {
+			$damage[] = rand(30 + round($player->getStrength() * 0.2), 30 + round($player->getStrength() * 1.7));
+		} else { //Instant death.
+			$damage[] = abs($player->health - $damage[0] - $damage[1]);
+		}
+
+		for ($i = 0; $i < count($damage) && $player->health > 0; ++$i) {
+			$player->harm($damage[$i]);
+		}
+
+		if ($player->health > 0) { // Ninja still has health after all attacks
+			$victory = true;
+
+			$gold = rand(50, 50 + $damage[2] + $damage[1]);
+
+			$player->addKills(1);
+			$player->setGold($player->gold + $gold);
+
+			$inventory = new Inventory($player);
+
+			// If samurai dmg high, but ninja lived, give rewards
+			if ($damage[2] > self::SAMURAI_REWARD_DMG) {
+				$drop = true;
+
+				if (rand(0, 1)) {
+					$drop_display = 'mushroom powder';
+					$dropItem = 'amanita';
+				} else {
+					$drop_display = 'a strange herb';
+					$dropItem = 'ginsengroot';
+				}
+
+				$inventory->add($dropItem, 1);
+			}
+
+			// If the final damage was the exact max damage
+			if ($damage[2] == $player->getStrength() * 3) {
+				$drop         = true;
+				$drop_display = 'a black scroll';
+				$inventory->add('dimmak', 1);
+			}
+		}
+
+		$player->save();
+
+		return [
+			'npc.samurai.tpl',
+			[
+				'samurai_damage_array' => $damage,
+				'gold'                 => $gold,
+				'victory'              => $victory,
+				'ninja_str'            => $player->getStrength(),
+				'level'                => $player->level,
+				'attacker_kills'       => $player->kills,
+				'drop'                 => $drop,
+				'drop_display'         => $drop_display,
+			],
+		];
+	}
+
+	private function attackGroupOfThieves(Player $player) {
+		$damage = rand(50, 150);
+
+		if ($victory = $player->harm($damage)) {
+			// The den of thieves didn't accomplish their goal
+			$gold = rand(100, 300);
+
+			if ($damage > 120) { // Powerful attack gives an additional disadvantage
+				$player->subtractKills(1);
+			}
+
+			$player->setGold($player->gold + $gold);
+
+			$inventory = new Inventory($player);
+			$inventory->add('phosphor', 1);
+		} else {    // If the den of theives killed the attacker.
+			$gold = 0;
+		}
+
+		$player->save();
+
+		return [
+			'npc.thief-group.tpl',
+			[
+				'attack'  => $damage,
+				'gold'    => $gold,
+				'victory' => $victory,
+			],
+		];
+	}
+
+	/**
+	 * Attack merchant
+	 */
+	private function attackMerchant($player) {
+		$damage = rand(15, 35);
+		$bounty = 0;
+
+		// Player killed NPC
+		if ($victory = $player->harm($damage)) {
+			$gold = rand(20, 70);
+			$player->setGold($player->gold + $gold);
+
+			if ($damage > 34) {
+				$inventory = new Inventory($player);
+				$inventory->add('phosphor', 1);
+			}
+
+			if ($player->level > 10) {
+				$bounty = 5 * floor(($player->level - 5) / 3);
+				$player->setBounty($player->bounty + $bounty);
+			}
+		} else { // NPC killed player
+			$damage = $gold = 0;
+		}
+
+		$player->save();
+
+		return [
+			'npc.merchant.tpl',
+			[
+				'attack'  => $damage,
+				'gold'    => $gold,
+				'bounty'  => $bounty,
+				'victory' => $victory,
+			],
+		];
+	}
+
+	/**
+	 * Normal attack on a single thief.
+	 */
+	private function attackNormalThief(Player $player) {
+		$damage = rand(0, 35);  // Damage done
+		$gold   = 0;
+
+		if ($victory = $player->harm($damage)) {
+			$gold = rand(0, 40);  // Gold in question
+
+			if ($damage > 30) { // Steal gold
+				$player->setGold(max(0, $player->gold - $gold));
+			} else if ($damage < 30) { // award gold and item
+				$player->setGold($player->gold + $gold);
+				$inventory = new Inventory($player);
+				$inventory->add('shuriken', 1);
+			}
+		}
+
+		$player->save();
+
+		return [
+			'npc.thief.tpl',
+			[
+				'attack'  => $damage,
+				'gold'    => $gold,
+				'victory' => $victory,
+			],
+		];
+	}
+
+	/**
+	 * Obtain the npcs data.
+	 *
+	 * @return Array
+	 */
+	private function npcs() {
+		return [
+			'abstract_npcs' => NpcFactory::npcsData(),
+			'custom_npcs'   => NpcFactory::customNpcs(),
+		];
+	}
+
+	/**
+	 * Get the list of npcs in a subtemplate.
+	 *
+	 * @param Container
+	 * @return Response
+	 */
+	public function index(Container $p_dependencies) {
+		$all_npcs   = $this->npcs();
+		$other_npcs = $all_npcs['abstract_npcs'];
+		$npcs       = $all_npcs['custom_npcs'];
+		$template   = 'npc.list.tpl';
+		$title      = 'Npcs';
+		$parts      = ['npcs' => $npcs, 'other_npcs' => $other_npcs];
+		$options    = ['quickstats' => 'player'];
+
+		return new StreamedViewResponse($title, $template, $parts, $options);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -38,7 +38,7 @@ 
     /**
      * Inject different seed when non-randomness is needed (for testing)
      */
-    public function __construct($options=[]) {
+    public function __construct($options = []) {
         if (isset($options['randomness']) && is_callable($options['randomness'])) {
             $this->randomness = $options['randomness'];
         } else {
@@ -61,7 +61,7 @@ 
         $oni_killed       = false;
         $item             = null;
 
-        $player->changeTurns(-1*self::ONI_TURN_LOSS);
+        $player->changeTurns(-1 * self::ONI_TURN_LOSS);
         $player->harm($oni_health_loss);
         $player->subtractKills(self::ONI_KILL_LOSS);
 
@@ -73,7 +73,7 @@ 
                 $item             = Item::findByIdentity('dimmak');
                 $quantity         = 1;
                 $inventory->add($item->identity(), $quantity);
-            } else if ($player->turns > floor(self::HIGH_TURNS/2) && rand()&1) {
+            } else if ($player->turns > floor(self::HIGH_TURNS / 2) && rand() & 1) {
                 // If your turns are somewhat high/you have some energy, 50/50 chance you can kill them.
                 $oni_killed       = true;
                 $item             = Item::findByIdentity('ginsengroot');
@@ -137,7 +137,7 @@ 
             $divisor = self::ITEM_DECREASES_GOLD_DIVISOR;
         }
 
-        return rand($npco->minGold(), floor($npco->gold()/$divisor));
+        return rand($npco->minGold(), floor($npco->gold() / $divisor));
     }
 
     /**
@@ -154,7 +154,7 @@ 
         $display_name     = (isset($npc_stats['name']) ? $npc_stats['name'] : ucfirst($victim));
         $status_effect    = (isset($npc_stats['status']) ? $npc_stats['status'] : null);
         $reward_item      = (isset($npc_stats['item']) && $npc_stats['item'] ? $npc_stats['item'] : null);
-        $is_quick         = (boolean) ($npco->getSpeed() > $player->getSpeed()); // Beyond basic speed and they see you coming, so show that message.
+        $is_quick         = (boolean)($npco->getSpeed() > $player->getSpeed()); // Beyond basic speed and they see you coming, so show that message.
         $is_weaker        = ($npco->getStrength() * 3) < $player->getStrength(); // Npc much weaker?
         $is_stronger      = ($npco->getStrength()) > ($player->getStrength() * 3); // Npc More than twice as strong?
         $image            = (isset($npc_stats['img']) ? $npc_stats['img'] : null);
@@ -180,7 +180,7 @@ 
 
         if ($survive_fight > 0) {
             // The ninja survived, they get any gold the npc has.
-            $received_gold = $this->calcReceivedGold($npco, (bool) $reward_item);
+            $received_gold = $this->calcReceivedGold($npco, (bool)$reward_item);
             $player->setGold($player->gold + $received_gold);
             $received_items = array();
 
@@ -206,7 +206,7 @@ 
                 }
             }
 
-            $is_rewarded = (bool) $received_gold || (bool)count($received_items);
+            $is_rewarded = (bool)$received_gold || (bool)count($received_items);
 
             if (isset($npc_stats['status']) && null !== $npc_stats['status']) {
                 $player->addStatus($npc_stats['status']);
@@ -254,7 +254,7 @@ 
      */
     private function startRandomEncounter() {
         $randomness = $this->randomness;
-        return (boolean) (ceil($randomness() * self::RANDOM_ENCOUNTER_DIVISOR) == self::RANDOM_ENCOUNTER_DIVISOR);
+        return (boolean)(ceil($randomness() * self::RANDOM_ENCOUNTER_DIVISOR) == self::RANDOM_ENCOUNTER_DIVISOR);
     }
 
     /**
@@ -318,7 +318,7 @@ 
                 // Check the counter to see whether they've attacked a thief multiple times in a row.
                 $counter = $this->getThiefCounter($p_dependencies);
 
-                $this->setThiefCounter($counter+1, $p_dependencies); // Incremement the current state of the counter.
+                $this->setThiefCounter($counter + 1, $p_dependencies); // Incremement the current state of the counter.
 
                 if ($counter > 20 && rand(1, 3) == 3) {
                     // Only after many attacks do you have the chance to be attacked back by the group of thieves.
@@ -341,7 +341,7 @@ 
 
             // Subtract the turn cost for attacking an npc
             // almost always 1 apart from perhaps oni or group-of-thieves
-            $player->changeTurns(-1*$turn_cost);
+            $player->changeTurns(-1 * $turn_cost);
 
             $player->save();
         }
@@ -351,7 +351,7 @@ 
             'victim'       => $victim, // merge may override in theory
             'npc_template' => $npc_template,
             'attacked'     => 1,
-            'turns'        => $player? $player->turns : null,
+            'turns'        => $player ? $player->turns : null,
             'health'       => $health,
         ];
 
@@ -577,11 +577,11 @@ 
      * Normal attack on a single thief.
      */
     private function attackNormalThief(Player $player) {
-        $damage = rand(0, 35);  // Damage done
+        $damage = rand(0, 35); // Damage done
         $gold   = 0;
 
         if ($victory = $player->harm($damage)) {
-            $gold = rand(0, 40);  // Gold in question
+            $gold = rand(0, 40); // Gold in question
 
             if ($damage > 30) { // Steal gold
                 $player->setGold(max(0, $player->gold - $gold));

deploy/lib/data/Player.php

Indentation +611 added lines, -611 removed lines

@@ -45,176 +45,176 @@ 
  * @property int status
  */
 class Player implements Character {
-    const HEALTH_PER_STAMINA = 2;
+	const HEALTH_PER_STAMINA = 2;
 	public $ip;
 	public $avatar_url;
-    private $data;
+	private $data;
 	private $vo;
 
-    /**
-     * Creates a new level 1 player object
-     */
-    public function __construct() {
-        $level = 1;
-
-        $this->vo                  = new PlayerVO();
-        $this->avatar_url          = null;
-        $this->uname               = null;
-        $this->health              = self::maxHealthByLevel($level);
-        $this->strength            = self::baseStrengthByLevel($level);
-        $this->speed               = self::baseSpeedByLevel($level);
-        $this->stamina             = self::baseStaminaByLevel($level);
-        $this->level               = $level;
-        $this->gold                = 100;
-        $this->turns               = 180;
-        $this->kills               = 0;
-        $this->status              = 0;
-        $this->member              = 0;
-        $this->days                = 0;
-        $this->bounty              = 0;
-        $this->energy              = 0;
-        $this->ki                  = 0;
-        $this->karma               = 0;
-        $this->avatar_type         = 1;
-        $this->messages            = '';
-        $this->description         = '';
-        $this->instincts           = '';
-        $this->traits              = '';
-        $this->beliefs             = '';
-        $this->goals               = '';
-        $this->last_started_attack = null;
-    }
-
-    /**
-     * @return string
-     */
-    public function __toString() {
-        return $this->name();
-    }
-
-    /**
-     * Magic method to provide accessors for properties
-     *
-     * @return mixed
-     */
-    public function __get($member_field) {
-        return $this->vo->$member_field;
-    }
-
-    /**
-     * Magic method to provide mutators for properties
-     *
-     * @return mixed
-     */
-    public function __set($member_field, $value) {
-        return $this->vo->$member_field = $value;
-    }
-
-    /**
-     * Magic method to handle isset() and empty() calls against properties
-     *
-     * @return boolean
-     */
-    public function __isset($member_field) {
-        return isset($this->vo->$member_field);
-    }
-
-    /**
-     *
-     */
-    public function __clone() {
-        $this->vo = clone $this->vo;
-    }
-
-    /**
-     * @return string
-     */
-    public function name() {
-        return $this->vo->uname;
-    }
-
-    /**
-     * @return int
-     */
+	/**
+	 * Creates a new level 1 player object
+	 */
+	public function __construct() {
+		$level = 1;
+
+		$this->vo                  = new PlayerVO();
+		$this->avatar_url          = null;
+		$this->uname               = null;
+		$this->health              = self::maxHealthByLevel($level);
+		$this->strength            = self::baseStrengthByLevel($level);
+		$this->speed               = self::baseSpeedByLevel($level);
+		$this->stamina             = self::baseStaminaByLevel($level);
+		$this->level               = $level;
+		$this->gold                = 100;
+		$this->turns               = 180;
+		$this->kills               = 0;
+		$this->status              = 0;
+		$this->member              = 0;
+		$this->days                = 0;
+		$this->bounty              = 0;
+		$this->energy              = 0;
+		$this->ki                  = 0;
+		$this->karma               = 0;
+		$this->avatar_type         = 1;
+		$this->messages            = '';
+		$this->description         = '';
+		$this->instincts           = '';
+		$this->traits              = '';
+		$this->beliefs             = '';
+		$this->goals               = '';
+		$this->last_started_attack = null;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function __toString() {
+		return $this->name();
+	}
+
+	/**
+	 * Magic method to provide accessors for properties
+	 *
+	 * @return mixed
+	 */
+	public function __get($member_field) {
+		return $this->vo->$member_field;
+	}
+
+	/**
+	 * Magic method to provide mutators for properties
+	 *
+	 * @return mixed
+	 */
+	public function __set($member_field, $value) {
+		return $this->vo->$member_field = $value;
+	}
+
+	/**
+	 * Magic method to handle isset() and empty() calls against properties
+	 *
+	 * @return boolean
+	 */
+	public function __isset($member_field) {
+		return isset($this->vo->$member_field);
+	}
+
+	/**
+	 *
+	 */
+	public function __clone() {
+		$this->vo = clone $this->vo;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function name() {
+		return $this->vo->uname;
+	}
+
+	/**
+	 * @return int
+	 */
 	public function id() {
 		return $this->vo->player_id;
 	}
 
-    /**
-     * Adds a defined numeric status constant to the binary string of statuses
-     */
-    public function addStatus($p_status) {
-        $status = self::validStatus($p_status);
+	/**
+	 * Adds a defined numeric status constant to the binary string of statuses
+	 */
+	public function addStatus($p_status) {
+		$status = self::validStatus($p_status);
 
-        if ($status > 0 && !$this->hasStatus($status)) {
-            if (gettype($this->status | $status) !== 'integer') {
-                throw new \InvalidArgumentException('invalid type for status');
-            }
+		if ($status > 0 && !$this->hasStatus($status)) {
+			if (gettype($this->status | $status) !== 'integer') {
+				throw new \InvalidArgumentException('invalid type for status');
+			}
 
-            $this->status = ($this->status | $status);
-        }
-    }
+			$this->status = ($this->status | $status);
+		}
+	}
 
-    /**
-     * Remove a numeric status from the binary string of status toggles.
-     */
-    public function subtractStatus($p_status) {
-        $status = self::validStatus($p_status);
+	/**
+	 * Remove a numeric status from the binary string of status toggles.
+	 */
+	public function subtractStatus($p_status) {
+		$status = self::validStatus($p_status);
 
-        if ($status > 0 && $this->hasStatus($status)) {
-            if (gettype($this->status & ~$status) !== 'integer') {
-                throw new \InvalidArgumentException('invalid type for status');
-            }
+		if ($status > 0 && $this->hasStatus($status)) {
+			if (gettype($this->status & ~$status) !== 'integer') {
+				throw new \InvalidArgumentException('invalid type for status');
+			}
 
-            $this->status = ($this->status & ~$status);
-        }
-    }
+			$this->status = ($this->status & ~$status);
+		}
+	}
 
-    /**
-     * Resets the binary status info to 0/none
-     */
+	/**
+	 * Resets the binary status info to 0/none
+	 */
 	public function resetStatus() {
 		$this->status = 0;
 	}
 
-    /**
-     * Determine whether a pc is effected by a certain status
-     * @return boolean
-     */
+	/**
+	 * Determine whether a pc is effected by a certain status
+	 * @return boolean
+	 */
 	public function hasStatus($p_status) {
-        $status = self::validStatus($p_status);
+		$status = self::validStatus($p_status);
 
-        return ((bool)$status && (bool)($this->status & $status));
+		return ((bool)$status && (bool)($this->status & $status));
 	}
 
-    /**
-     * Standard damage output from 1 to max
-     * @return int
-     */
+	/**
+	 * Standard damage output from 1 to max
+	 * @return int
+	 */
 	public function damage(Character $enemy=null){
 		return rand(1, $this->maxDamage($enemy));
 	}
 
-    /**
-     * Max damage capability of a character
-     *
-     * @return int
-     */
+	/**
+	 * Max damage capability of a character
+	 *
+	 * @return int
+	 */
 	public function maxDamage(Character $enemy=null){
-        return (int) ($this->getStrength() * 5 + $this->getSpeed());
-    }
+		return (int) ($this->getStrength() * 5 + $this->getSpeed());
+	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function getStrength() {
-        $str = NEW_PLAYER_INITIAL_STATS + (($this->level-1) * LEVEL_UP_STAT_RAISE);
-        if($this->hasStatus(STALKING)){
-            $str = (int) max(1, floor($str*1.4));
-        }
-        if ($this->hasStatus(STEALTH)) {
-            $str = (int) max(1, floor($str*0.7));
-        }
+		$str = NEW_PLAYER_INITIAL_STATS + (($this->level-1) * LEVEL_UP_STAT_RAISE);
+		if($this->hasStatus(STALKING)){
+			$str = (int) max(1, floor($str*1.4));
+		}
+		if ($this->hasStatus(STEALTH)) {
+			$str = (int) max(1, floor($str*0.7));
+		}
 		if ($this->hasStatus(WEAKENED)) {
 			return (int) max(1, $str-(ceil($str*.25))); // 75%
 		} elseif ($this->hasStatus(STR_UP2)) {
@@ -233,17 +233,17 @@ 
 		$this->vo->strength = $str;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function getSpeed() {
-        $speed = NEW_PLAYER_INITIAL_STATS + (($this->level -1) * LEVEL_UP_STAT_RAISE);
-        if($this->hasStatus(STALKING)){
-            $speed = (int) max(1, floor($speed*0.7));
-        }
-        if ($this->hasStatus(STEALTH)) {
-            $speed = (int) max(1, ceil($speed*1.3));
-        }
+		$speed = NEW_PLAYER_INITIAL_STATS + (($this->level -1) * LEVEL_UP_STAT_RAISE);
+		if($this->hasStatus(STALKING)){
+			$speed = (int) max(1, floor($speed*0.7));
+		}
+		if ($this->hasStatus(STEALTH)) {
+			$speed = (int) max(1, ceil($speed*1.3));
+		}
 		if ($this->hasStatus(SLOW)) {
 			return (int) ($speed-(ceil($speed*.25)));
 		} else {
@@ -258,17 +258,17 @@ 
 		$this->vo->speed = $speed;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function getStamina() {
 		$stam = NEW_PLAYER_INITIAL_STATS + (($this->level -1) * LEVEL_UP_STAT_RAISE);
-        if($this->hasStatus(STALKING)){
-            $stam = (int) max(1, floor($stam*0.9));
-        }
-        if ($this->hasStatus(STEALTH)) {
-            $stam = (int) max(1, ceil($stam*1.3));
-        }
+		if($this->hasStatus(STALKING)){
+			$stam = (int) max(1, floor($stam*0.9));
+		}
+		if ($this->hasStatus(STEALTH)) {
+			$stam = (int) max(1, ceil($stam*1.3));
+		}
 		if ($this->hasStatus(POISON)) {
 			return (int) ($stam-(ceil($stam*.25)));
 		} else {
@@ -283,9 +283,9 @@ 
 		$this->vo->stamina = $stamina;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function setKi($ki){
 		if($ki < 0){
 			throw new \InvalidArgumentException('Ki cannot be negative.');
@@ -293,9 +293,9 @@ 
 		return $this->vo->ki = $ki;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function setGold($gold) {
 		if ($gold < 0) {
 			throw new \InvalidArgumentException('Gold cannot be made negative.');
@@ -308,9 +308,9 @@ 
 		return $this->vo->gold = $gold;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function setBounty($bounty) {
 		if($bounty < 0){
 			throw new \InvalidArgumentException('Bounty cannot be made negative ['.(string)$bounty.'].');
@@ -323,18 +323,18 @@ 
 
 	/**
 	 * Checks whether the character is still active.
-     *
-     * @return boolean
+	 *
+	 * @return boolean
 	 */
 	public function isActive() {
 		return (bool) $this->vo->active;
 	}
 
-    /**
-     * @return boolean
-     * hardcoded hack at the moment
-     * @note To be replaced by an in-database account toggle eventually
-     */
+	/**
+	 * @return boolean
+	 * hardcoded hack at the moment
+	 * @note To be replaced by an in-database account toggle eventually
+	 */
 	public function isAdmin() {
 		$name = strtolower($this->name());
 		if ($name == 'tchalvak' || $name == 'beagle' || $name == 'suavisimo') {
@@ -344,111 +344,111 @@ 
 		return false;
 	}
 
-    /**
-     * Cleanup player to death state
-     *
-     * @return void
-     * @note
-     * This method writes the player object to the database
-     */
+	/**
+	 * Cleanup player to death state
+	 *
+	 * @return void
+	 * @note
+	 * This method writes the player object to the database
+	 */
 	public function death() {
 		$this->resetStatus();
-        $this->setHealth(0);
-        $this->save();
-	}
-
-    /**
-     * Changes the turns propety of the player object
-     *
-     * @param int $turns
-     * @return int The number of turns the player object now has
-     * @throws InvalidArgumentException $turns cannot be negative
-     */
-    public function setTurns($turns) {
-        if ($turns < 0) {
-            throw new \InvalidArgumentException('Turns cannot be made negative.');
-        }
-
-        return $this->vo->turns = $turns;
-    }
-
-    /**
-     * @deprecated
-     */
-    public function changeTurns($amount) {
-        return $this->setTurns($this->turns + (int) $amount);
-    }
-
-    /**
-     * @return integer
-     */
-    public function getMaxHealth() {
-        return NEW_PLAYER_INITIAL_HEALTH + ($this->getStamina()*static::HEALTH_PER_STAMINA);
-    }
-
-    /**
-     * Manipulates the data from the vo into the $this itself
-     *
-     * @return array
-     */
-    public function data() {
+		$this->setHealth(0);
+		$this->save();
+	}
+
+	/**
+	 * Changes the turns propety of the player object
+	 *
+	 * @param int $turns
+	 * @return int The number of turns the player object now has
+	 * @throws InvalidArgumentException $turns cannot be negative
+	 */
+	public function setTurns($turns) {
+		if ($turns < 0) {
+			throw new \InvalidArgumentException('Turns cannot be made negative.');
+		}
+
+		return $this->vo->turns = $turns;
+	}
+
+	/**
+	 * @deprecated
+	 */
+	public function changeTurns($amount) {
+		return $this->setTurns($this->turns + (int) $amount);
+	}
+
+	/**
+	 * @return integer
+	 */
+	public function getMaxHealth() {
+		return NEW_PLAYER_INITIAL_HEALTH + ($this->getStamina()*static::HEALTH_PER_STAMINA);
+	}
+
+	/**
+	 * Manipulates the data from the vo into the $this itself
+	 *
+	 * @return array
+	 */
+	public function data() {
 		if (!$this->data) {
-            $this->data = (array) $this->vo;
-            $this->data['next_level']    = $this->killsRequiredForNextLevel();
-            $this->data['max_health']    = $this->getMaxHealth();
-            $this->data['hp_percent']    = $this->health_percent();
-            $this->data['strength']      = $this->getStrength();
-            $this->data['speed']         = $this->getSpeed();
-            $this->data['stamina']       = $this->getStamina();
-            $this->data['max_turns']     = 100;
-            $this->data['turns_percent'] = min(100, round($this->data['turns']/$this->data['max_turns']*100));
-            $this->data['exp_percent']   = min(100, round(($this->data['kills']/$this->data['next_level'])*100));
-            $this->data['status_list']   = implode(', ', self::getStatusList($this->id()));
-            $this->data['hash']          = md5(implode($this->data));
-            $this->data['class_name']    = ucfirst($this->data['identity']); // A misnomer, identity is actually the class label
-            $this->data['clan_id']       = ($this->getClan() ? $this->getClan()->id : null);
-
-            unset($this->data['pname']);
-        }
-
-        return $this->data;
-    }
-
-    /**
-     * Return the data that should be publicly readable to javascript or the api while the player is logged in.
-     *
-     * @return array
-     */
-    public function publicData() {
-        $char_info = $this->data();
-        unset($char_info['ip'], $char_info['member'], $char_info['pname'], $char_info['verification_number'], $char_info['confirmed']);
-
-        return $char_info;
-    }
-
-    /**
-     * @return Clan
-     */
-    public function getClan() {
-        return Clan::findByMember($this);
-    }
+			$this->data = (array) $this->vo;
+			$this->data['next_level']    = $this->killsRequiredForNextLevel();
+			$this->data['max_health']    = $this->getMaxHealth();
+			$this->data['hp_percent']    = $this->health_percent();
+			$this->data['strength']      = $this->getStrength();
+			$this->data['speed']         = $this->getSpeed();
+			$this->data['stamina']       = $this->getStamina();
+			$this->data['max_turns']     = 100;
+			$this->data['turns_percent'] = min(100, round($this->data['turns']/$this->data['max_turns']*100));
+			$this->data['exp_percent']   = min(100, round(($this->data['kills']/$this->data['next_level'])*100));
+			$this->data['status_list']   = implode(', ', self::getStatusList($this->id()));
+			$this->data['hash']          = md5(implode($this->data));
+			$this->data['class_name']    = ucfirst($this->data['identity']); // A misnomer, identity is actually the class label
+			$this->data['clan_id']       = ($this->getClan() ? $this->getClan()->id : null);
+
+			unset($this->data['pname']);
+		}
+
+		return $this->data;
+	}
+
+	/**
+	 * Return the data that should be publicly readable to javascript or the api while the player is logged in.
+	 *
+	 * @return array
+	 */
+	public function publicData() {
+		$char_info = $this->data();
+		unset($char_info['ip'], $char_info['member'], $char_info['pname'], $char_info['verification_number'], $char_info['confirmed']);
+
+		return $char_info;
+	}
+
+	/**
+	 * @return Clan
+	 */
+	public function getClan() {
+		return Clan::findByMember($this);
+	}
 
 	/**
 	 * Heal the char with in the limits of their max
-     *
-     * @return int
+	 *
+	 * @return int
 	 */
 	public function heal($amount) {
 		// do not heal above max health
-        $heal = min($this->is_hurt_by(), $amount);
-        return $this->setHealth($this->health + $heal);
+		$heal = min($this->is_hurt_by(), $amount);
+		return $this->setHealth($this->health + $heal);
 	}
 
 	/**
 	 * Do some damage to the character
-     *
-     * @param int $damage
-     * @return int
+	 *
+	 * @param int $damage
+	 * @return int
 	 */
 	public function harm($damage) {
 		// Do not allow negative health
@@ -456,16 +456,16 @@ 
 		return $this->setHealth($this->health - $actual_damage);
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function getHealth() {
-        return $this->health;
+		return $this->health;
 	}
 
-    /**
-     * @return int
-     */
+	/**
+	 * @return int
+	 */
 	public function setHealth($health) {
 		if ($health < 0) {
 			throw new \InvalidArgumentException('Health cannot be made negative.');
@@ -488,65 +488,65 @@ 
 		);
 	}
 
-    /**
-     * Return the current percentage of the maximum health that a character could have.
-     * @return int
-     */
+	/**
+	 * Return the current percentage of the maximum health that a character could have.
+	 * @return int
+	 */
 	public function health_percent() {
-        return min(100, round(($this->health/$this->getMaxHealth())*100));
+		return min(100, round(($this->health/$this->getMaxHealth())*100));
 	}
 
-    /**
-     * @return int difficulty rating
-     */
+	/**
+	 * @return int difficulty rating
+	 */
 	public function difficulty(){
 		return (int) ( 10 + $this->getStrength() * 2 + $this->maxDamage());
 	}
 
-    /**
-     * @return int random private number unique to character
-     */
+	/**
+	 * @return int random private number unique to character
+	 */
 	public function getVerificationNumber(){
 		return $this->vo->verification_number;
 	}
 
-    /**
-     * @return string url for the gravatar of pc
-     */
-    public function avatarUrl() {
-        if (!isset($this->avatar_url) || $this->avatar_url === null) {
-            $this->avatar_url = $this->generateGravatarUrl();
-        }
-
-        return $this->avatar_url;
-    }
-
-    private function generateGravatarUrl() {
-        $account = Account::findByChar($this);
+	/**
+	 * @return string url for the gravatar of pc
+	 */
+	public function avatarUrl() {
+		if (!isset($this->avatar_url) || $this->avatar_url === null) {
+			$this->avatar_url = $this->generateGravatarUrl();
+		}
 
-        if (OFFLINE) {
-            return IMAGE_ROOT.'default_avatar.png';
-        } else if (!$this->vo || !$this->vo->avatar_type || !$account || !$account->email()) {
-            return '';
-        } else {
-            $email       = $account->email();
+		return $this->avatar_url;
+	}
 
-            $def         = 'monsterid'; // Default image or image class.
-            // other options: wavatar (polygonal creature) , monsterid, identicon (random shape)
-            $base        = "http://www.gravatar.com/avatar/";
-            $hash        = md5(trim(strtolower($email)));
-            $no_gravatar = "d=".urlencode($def);
-            $size        = 80;
-            $rating      = "r=x";
-            $res         = $base.$hash."?".implode('&', [$no_gravatar, $size, $rating]);
+	private function generateGravatarUrl() {
+		$account = Account::findByChar($this);
 
-            return $res;
-        }
+		if (OFFLINE) {
+			return IMAGE_ROOT.'default_avatar.png';
+		} else if (!$this->vo || !$this->vo->avatar_type || !$account || !$account->email()) {
+			return '';
+		} else {
+			$email       = $account->email();
+
+			$def         = 'monsterid'; // Default image or image class.
+			// other options: wavatar (polygonal creature) , monsterid, identicon (random shape)
+			$base        = "http://www.gravatar.com/avatar/";
+			$hash        = md5(trim(strtolower($email)));
+			$no_gravatar = "d=".urlencode($def);
+			$size        = 80;
+			$rating      = "r=x";
+			$res         = $base.$hash."?".implode('&', [$no_gravatar, $size, $rating]);
+
+			return $res;
+		}
 	}
 
 	/**
 	 * Persist object to database
-     *
+	 *
 	 * @return Player
 	 */
 	public function save() {
@@ -556,175 +556,175 @@ 
 		return $this;
 	}
 
-     /**
-     * Check whether the player is the leader of their clan.
-     * @return boolean
-     */
-    public function isClanLeader() {
-        return (($clan = Clan::findByMember($this)) && $this->id() == $clan->getLeaderID());
-    }
-
-
-    /**
-     * Get the information for a single class' data, generally the characters
-     * @param string $class_identity
-     * @return array of class data
-     */
-    private function obtainSingleClassData($class_identity){
-            return query_row(
-                'select class_id, identity, class_name, theme, class_note, class_tier, class_desc, class_icon from class where class.identity = :class',
-                [':class' => $class_identity]
-            );
-    }
-
-    /**
-     * Set the character's class, using the identity.
-     * @return string|null error string if fails
-     */
-    public function setClass($new_class) {
-        $class_data = $this->obtainSingleClassData(strtolower($new_class));
-        if($class_data === false || $class_data === null){
-            return "That class was not an option to change into.";
-        } else {
-            // Update the only place in the database where a players class is determined
-            $up = "UPDATE players SET _class_id = :class_id WHERE player_id = :char_id";
-            query($up, [
-                ':class_id' => $class_data['class_id'],
-                ':char_id'  => $this->id(),
-            ]);
-
-            $this->class_name    = $class_data['class_name'];
-            $this->theme         = $class_data['theme'];
-            $this->vo->identity  = $class_data['identity'];
-            $this->vo->_class_id = $class_data['class_id'];
-
-            return null;
-        }
-    }
-
-    /**
-     * Get the ninja's class's name.
-     * @return string
-     */
-    public function getClassName() {
-        return $this->vo->class_name;
-    }
-
-    /**
-     * The number of kills needed to level up to the next level.
-     *
-     * 5 more kills in cost for every level you go up.
-     * @return int
-     */
-    public function killsRequiredForNextLevel() {
-       return $this->level*5;
-    }
-
-    /**
-     * Takes in a Character and adds kills to that character.
-     * @return int
-     */
-    public function addKills($amount) {
-        return $this->changeKills((int)abs($amount));
-    }
-
-    /**
-     * Takes in a Character and removes kills from that character.
-     * @return int
-     */
-    public function subtractKills($amount) {
-        return $this->changeKills(-1*((int)abs($amount)));
-    }
-
-    /**
-     * Change the kills amount of a char, and levels them up when necessary.
-     * @return int
-     */
-    private function changeKills($amount) {
-        $amount = (int)$amount;
-
-        GameLog::updateLevellingLog($this->id(), $amount);
-
-        if ($amount !== 0) { // Ignore changes that amount to zero.
-            if ($amount > 0) { // when adding kills, check if levelling occurs
-                $this->levelUp();
-            }
-
-            query(
-                "UPDATE players SET kills = kills + CASE WHEN kills + :amount1 < 0 THEN kills*(-1) ELSE :amount2 END WHERE player_id = :player_id",
-                [
-                    ':amount1'   => [$amount, PDO::PARAM_INT],
-                    ':amount2'   => [$amount, PDO::PARAM_INT],
-                    ':player_id' => $this->id(),
-                ]
-            );
-        }
-
-        return $this->vo->kills = query_item(
-            "SELECT kills FROM players WHERE player_id = :player_id",
-            [
-                ':player_id' => [$this->id(), PDO::PARAM_INT],
-            ]
-        );
-    }
-
-    /**
-     * Leveling up Function
-     *
-     * @return boolean
-     */
-    public function levelUp() {
-        $health_to_add     = 100;
-        $turns_to_give     = 50;
-        $ki_to_give        = 50;
-        $stat_value_to_add = 5;
-        $karma_to_give     = 1;
-
-        if ($this->isAdmin()) { // If the character is an admin, do not auto-level
-            return false;
-        } else { // For normal characters, do auto-level
-            // Have to be under the max level and have enough kills.
-            $level_up_possible = (
-                ($this->level + 1 <= MAX_PLAYER_LEVEL) &&
-                ($this->kills >= $this->killsRequiredForNextLevel())
-            );
-
-            if ($level_up_possible) { // Perform the level up actions
-                $this->setHealth($this->health + $health_to_add);
-                $this->setTurns($this->turns   + $turns_to_give);
-                $this->setKi($this->ki         + $ki_to_give);
-
-                // Must read from VO for these as accessors return modified values
-                $this->setStamina($this->vo->stamina   + $stat_value_to_add);
-                $this->setStrength($this->vo->strength + $stat_value_to_add);
-                $this->setSpeed($this->vo->speed       + $stat_value_to_add);
-
-                // no mutator for these yet
-                $this->vo->kills = max(0, $this->kills - $this->killsRequiredForNextLevel());
-                $this->vo->karma = ($this->karma + $karma_to_give);
-                $this->vo->level = ($this->level + 1);
-
-                $this->save();
-
-                GameLog::recordLevelUp($this->id());
-
-                $account = Account::findByChar($this);
-                $account->setKarmaTotal($account->getKarmaTotal() + $karma_to_give);
-                $account->save();
-
-                // Send a level-up message, for those times when auto-levelling happens.
-                Event::create($this->id(), $this->id(),
-                    "You levelled up! Your strength raised by $stat_value_to_add, speed by $stat_value_to_add, stamina by $stat_value_to_add, Karma by $karma_to_give, and your Ki raised $ki_to_give! You gained some health and turns, as well! You are now a level {$this->level} ninja! Go kill some stuff.");
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+	 /**
+	  * Check whether the player is the leader of their clan.
+	  * @return boolean
+	  */
+	public function isClanLeader() {
+		return (($clan = Clan::findByMember($this)) && $this->id() == $clan->getLeaderID());
+	}
+
+
+	/**
+	 * Get the information for a single class' data, generally the characters
+	 * @param string $class_identity
+	 * @return array of class data
+	 */
+	private function obtainSingleClassData($class_identity){
+			return query_row(
+				'select class_id, identity, class_name, theme, class_note, class_tier, class_desc, class_icon from class where class.identity = :class',
+				[':class' => $class_identity]
+			);
+	}
+
+	/**
+	 * Set the character's class, using the identity.
+	 * @return string|null error string if fails
+	 */
+	public function setClass($new_class) {
+		$class_data = $this->obtainSingleClassData(strtolower($new_class));
+		if($class_data === false || $class_data === null){
+			return "That class was not an option to change into.";
+		} else {
+			// Update the only place in the database where a players class is determined
+			$up = "UPDATE players SET _class_id = :class_id WHERE player_id = :char_id";
+			query($up, [
+				':class_id' => $class_data['class_id'],
+				':char_id'  => $this->id(),
+			]);
+
+			$this->class_name    = $class_data['class_name'];
+			$this->theme         = $class_data['theme'];
+			$this->vo->identity  = $class_data['identity'];
+			$this->vo->_class_id = $class_data['class_id'];
+
+			return null;
+		}
+	}
+
+	/**
+	 * Get the ninja's class's name.
+	 * @return string
+	 */
+	public function getClassName() {
+		return $this->vo->class_name;
+	}
+
+	/**
+	 * The number of kills needed to level up to the next level.
+	 *
+	 * 5 more kills in cost for every level you go up.
+	 * @return int
+	 */
+	public function killsRequiredForNextLevel() {
+	   return $this->level*5;
+	}
+
+	/**
+	 * Takes in a Character and adds kills to that character.
+	 * @return int
+	 */
+	public function addKills($amount) {
+		return $this->changeKills((int)abs($amount));
+	}
+
+	/**
+	 * Takes in a Character and removes kills from that character.
+	 * @return int
+	 */
+	public function subtractKills($amount) {
+		return $this->changeKills(-1*((int)abs($amount)));
+	}
+
+	/**
+	 * Change the kills amount of a char, and levels them up when necessary.
+	 * @return int
+	 */
+	private function changeKills($amount) {
+		$amount = (int)$amount;
+
+		GameLog::updateLevellingLog($this->id(), $amount);
+
+		if ($amount !== 0) { // Ignore changes that amount to zero.
+			if ($amount > 0) { // when adding kills, check if levelling occurs
+				$this->levelUp();
+			}
+
+			query(
+				"UPDATE players SET kills = kills + CASE WHEN kills + :amount1 < 0 THEN kills*(-1) ELSE :amount2 END WHERE player_id = :player_id",
+				[
+					':amount1'   => [$amount, PDO::PARAM_INT],
+					':amount2'   => [$amount, PDO::PARAM_INT],
+					':player_id' => $this->id(),
+				]
+			);
+		}
+
+		return $this->vo->kills = query_item(
+			"SELECT kills FROM players WHERE player_id = :player_id",
+			[
+				':player_id' => [$this->id(), PDO::PARAM_INT],
+			]
+		);
+	}
+
+	/**
+	 * Leveling up Function
+	 *
+	 * @return boolean
+	 */
+	public function levelUp() {
+		$health_to_add     = 100;
+		$turns_to_give     = 50;
+		$ki_to_give        = 50;
+		$stat_value_to_add = 5;
+		$karma_to_give     = 1;
+
+		if ($this->isAdmin()) { // If the character is an admin, do not auto-level
+			return false;
+		} else { // For normal characters, do auto-level
+			// Have to be under the max level and have enough kills.
+			$level_up_possible = (
+				($this->level + 1 <= MAX_PLAYER_LEVEL) &&
+				($this->kills >= $this->killsRequiredForNextLevel())
+			);
+
+			if ($level_up_possible) { // Perform the level up actions
+				$this->setHealth($this->health + $health_to_add);
+				$this->setTurns($this->turns   + $turns_to_give);
+				$this->setKi($this->ki         + $ki_to_give);
+
+				// Must read from VO for these as accessors return modified values
+				$this->setStamina($this->vo->stamina   + $stat_value_to_add);
+				$this->setStrength($this->vo->strength + $stat_value_to_add);
+				$this->setSpeed($this->vo->speed       + $stat_value_to_add);
+
+				// no mutator for these yet
+				$this->vo->kills = max(0, $this->kills - $this->killsRequiredForNextLevel());
+				$this->vo->karma = ($this->karma + $karma_to_give);
+				$this->vo->level = ($this->level + 1);
+
+				$this->save();
+
+				GameLog::recordLevelUp($this->id());
+
+				$account = Account::findByChar($this);
+				$account->setKarmaTotal($account->getKarmaTotal() + $karma_to_give);
+				$account->save();
+
+				// Send a level-up message, for those times when auto-levelling happens.
+				Event::create($this->id(), $this->id(),
+					"You levelled up! Your strength raised by $stat_value_to_add, speed by $stat_value_to_add, stamina by $stat_value_to_add, Karma by $karma_to_give, and your Ki raised $ki_to_give! You gained some health and turns, as well! You are now a level {$this->level} ninja! Go kill some stuff.");
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
 
 	/**
 	 * Find a player by primary key
-     * @param int|null $id
+	 * @param int|null $id
 	 * @return Player|null
 	 */
 	public static function find($id){
@@ -742,138 +742,138 @@ 
 		return $player;
 	}
 
-    /**
-     * Find a char by playable for account
-     * @param int|null $account_id
-     * @return Player|null
-     */
-    public static function findPlayable($account_id){
-        // Two db calls for now
-        $pid = query_item('select player_id from players p 
+	/**
+	 * Find a char by playable for account
+	 * @param int|null $account_id
+	 * @return Player|null
+	 */
+	public static function findPlayable($account_id){
+		// Two db calls for now
+		$pid = query_item('select player_id from players p 
             join account_players ap on p.player_id = ap._player_id
             join accounts a on a.account_id = ap._account_id
             where account_id = :aid
             order by p.created_date asc, a.last_login desc
             limit 1', [':aid'=>[$account_id, PDO::PARAM_INT]]);
-        return self::find($pid);
-    }
-
-    /**
-     * Find player by name
-     * @return Player|null
-     */
-    public static function findByName($name){
-        $id = query_item('select player_id from players where lower(uname) = lower(:name) limit 1', [':name'=>$name]);
-        return self::find($id);
-    }
-
-    /**
-     * query the recently active players
-     * @return array Array of data not of player objects
-     */
-    public static function findActive($limit=5, $alive_only=true) {
-        $where_cond = ($alive_only ? ' AND health > 0' : '');
-        $sel = "SELECT uname, player_id FROM players WHERE active = 1 $where_cond ORDER BY last_started_attack DESC LIMIT :limit";
-        $active_ninjas = query_array($sel, array(':limit'=>array($limit, PDO::PARAM_INT)));
-        return $active_ninjas;
-    }
-
-    /**
-     * @return integer|null
-     * @note this needs review overall, as nonexistent high int statuses will false positive
-     */
-    public static function validStatus($dirty) {
-        if (is_numeric($dirty) && (int)$dirty == $dirty) {
-            return (int) $dirty;
-        } elseif (is_string($dirty)) {
-            $status = strtoupper($dirty);
-
-            if (defined($status)) {
-                return (int) constant($status);
-            } else {
-                return null;
-            }
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get the different statuses a character is affected by.
-     *
-     * @param int|null $target the target id, username if self targetting.
-     * @return string[]
-     *
-     */
-    public static function getStatusList($target=null) {
-        $states = array();
-        $target = (isset($target) && (int)$target == $target ? $target : SessionFactory::getSession()->get('player_id'));
-
-        // Default to showing own status.
-        $target = self::find($target);
-
-        if (!$target || $target->health < 1) {
-            $states[] = 'Dead';
-        } else { // *** Other statuses only display if not dead.
-            if ($target->health < 80) {
-                $states[] = 'Injured';
-            } else {
-                $states[] = 'Healthy';
-            }
-
-            // The visibly viewable statuses.
-            if ($target->hasStatus(STEALTH)) { $states[] = 'Stealthed'; }
-            if ($target->hasStatus(POISON)) { $states[] = 'Poisoned'; }
-            if ($target->hasStatus(WEAKENED)) { $states[] = 'Weakened'; }
-            if ($target->hasStatus(FROZEN)) { $states[] = 'Frozen'; }
-            if ($target->hasStatus(STR_UP1)) { $states[] = 'Buff'; }
-            if ($target->hasStatus(STR_UP2)) { $states[] = 'Strength+'; }
-
-            // If any of the shield skills are up, show a single status state for any.
-            if ($target->hasStatus(FIRE_RESISTING) || $target->hasStatus(INSULATED) || $target->hasStatus(GROUNDED)
-                || $target->hasStatus(BLESSED) || $target->hasStatus(IMMUNIZED)
-                || $target->hasStatus(ACID_RESISTING)) {
-                $states[] = 'Shielded';
-            }
-        }
-
-        return $states;
-    }
-
-    /**
-     * Calculate a max health by a level, this is actually only the base maximum
-     * since changes in stamina can change the current player's maximum
-     *
-     * @return integer The health points
-     */
-    public static function maxHealthByLevel($level) {
-        return (int) NEW_PLAYER_INITIAL_HEALTH + (int) (self::baseStaminaByLevel($level) * self::HEALTH_PER_STAMINA);
-    }
-
-    /**
-     * Calculate a base str by level
-     *
-     * @return integer strength
-     */
-    public static function baseStrengthByLevel($level) {
-        return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
-    }
-
-    /**
-     * Calculate a base speed by level
-     *
-     * @return integer speed
-     */
-    public static function baseSpeedByLevel($level) {
-        return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
-    }
-
-    /**
-     * Calculate a base stamina by level
-     *
-     * @return integer speed
-     */
-    public static function baseStaminaByLevel($level) {
-        return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
-    }
+		return self::find($pid);
+	}
+
+	/**
+	 * Find player by name
+	 * @return Player|null
+	 */
+	public static function findByName($name){
+		$id = query_item('select player_id from players where lower(uname) = lower(:name) limit 1', [':name'=>$name]);
+		return self::find($id);
+	}
+
+	/**
+	 * query the recently active players
+	 * @return array Array of data not of player objects
+	 */
+	public static function findActive($limit=5, $alive_only=true) {
+		$where_cond = ($alive_only ? ' AND health > 0' : '');
+		$sel = "SELECT uname, player_id FROM players WHERE active = 1 $where_cond ORDER BY last_started_attack DESC LIMIT :limit";
+		$active_ninjas = query_array($sel, array(':limit'=>array($limit, PDO::PARAM_INT)));
+		return $active_ninjas;
+	}
+
+	/**
+	 * @return integer|null
+	 * @note this needs review overall, as nonexistent high int statuses will false positive
+	 */
+	public static function validStatus($dirty) {
+		if (is_numeric($dirty) && (int)$dirty == $dirty) {
+			return (int) $dirty;
+		} elseif (is_string($dirty)) {
+			$status = strtoupper($dirty);
+
+			if (defined($status)) {
+				return (int) constant($status);
+			} else {
+				return null;
+			}
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the different statuses a character is affected by.
+	 *
+	 * @param int|null $target the target id, username if self targetting.
+	 * @return string[]
+	 *
+	 */
+	public static function getStatusList($target=null) {
+		$states = array();
+		$target = (isset($target) && (int)$target == $target ? $target : SessionFactory::getSession()->get('player_id'));
+
+		// Default to showing own status.
+		$target = self::find($target);
+
+		if (!$target || $target->health < 1) {
+			$states[] = 'Dead';
+		} else { // *** Other statuses only display if not dead.
+			if ($target->health < 80) {
+				$states[] = 'Injured';
+			} else {
+				$states[] = 'Healthy';
+			}
+
+			// The visibly viewable statuses.
+			if ($target->hasStatus(STEALTH)) { $states[] = 'Stealthed'; }
+			if ($target->hasStatus(POISON)) { $states[] = 'Poisoned'; }
+			if ($target->hasStatus(WEAKENED)) { $states[] = 'Weakened'; }
+			if ($target->hasStatus(FROZEN)) { $states[] = 'Frozen'; }
+			if ($target->hasStatus(STR_UP1)) { $states[] = 'Buff'; }
+			if ($target->hasStatus(STR_UP2)) { $states[] = 'Strength+'; }
+
+			// If any of the shield skills are up, show a single status state for any.
+			if ($target->hasStatus(FIRE_RESISTING) || $target->hasStatus(INSULATED) || $target->hasStatus(GROUNDED)
+				|| $target->hasStatus(BLESSED) || $target->hasStatus(IMMUNIZED)
+				|| $target->hasStatus(ACID_RESISTING)) {
+				$states[] = 'Shielded';
+			}
+		}
+
+		return $states;
+	}
+
+	/**
+	 * Calculate a max health by a level, this is actually only the base maximum
+	 * since changes in stamina can change the current player's maximum
+	 *
+	 * @return integer The health points
+	 */
+	public static function maxHealthByLevel($level) {
+		return (int) NEW_PLAYER_INITIAL_HEALTH + (int) (self::baseStaminaByLevel($level) * self::HEALTH_PER_STAMINA);
+	}
+
+	/**
+	 * Calculate a base str by level
+	 *
+	 * @return integer strength
+	 */
+	public static function baseStrengthByLevel($level) {
+		return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
+	}
+
+	/**
+	 * Calculate a base speed by level
+	 *
+	 * @return integer speed
+	 */
+	public static function baseSpeedByLevel($level) {
+		return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
+	}
+
+	/**
+	 * Calculate a base stamina by level
+	 *
+	 * @return integer speed
+	 */
+	public static function baseStaminaByLevel($level) {
+		return (int) NEW_PLAYER_INITIAL_STATS + (LEVEL_UP_STAT_RAISE * ($level-1));
+	}
 }