From 23606e96aae1b80f0af818b1fcac9cb1fd4ce591 Mon Sep 17 00:00:00 2001 From: Harbinger Date: Sat, 14 May 2011 03:45:56 -0700 Subject: [PATCH] Establish creature repo --- src/org/sevenchan/AdventureController.as | 10 ++++++++-- src/org/sevenchan/dongs/Creature.as | 10 ++++++++++ src/org/sevenchan/dongs/screens/DebugScreen.as | 4 +++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/org/sevenchan/AdventureController.as b/src/org/sevenchan/AdventureController.as index 3c8b530..e43dbe1 100644 --- a/src/org/sevenchan/AdventureController.as +++ b/src/org/sevenchan/AdventureController.as @@ -25,6 +25,7 @@ package org.sevenchan { private var app:Main; private const default_bg_color:uint = 0x333333; + private var currentBGColor:uint = default_bg_color; public var bodyPartsDialog:org.sevenchan.dongs.frmBodyPartsPool = new org.sevenchan.dongs.frmBodyPartsPool; private var bgshape:Sprite; @@ -49,7 +50,7 @@ package org.sevenchan private var statLust:Statistic; private var statMana:Statistic; - private var statHP:Statistic; + public var statHP:Statistic; private var statGold:TextField; public var player:Player; @@ -312,7 +313,8 @@ package org.sevenchan private function initBG():void { bgshape = new Sprite(); - bgshape.graphics.beginFill(default_bg_color); + bgshape.graphics.clear(); + bgshape.graphics.beginFill(currentBGColor); bgshape.graphics.drawRect(0,0,stage.stageWidth, stage.stageHeight); addChildAt(bgshape, 0); stage.addEventListener(Event.RESIZE, resizeBGWithStage); @@ -335,12 +337,16 @@ package org.sevenchan player.notifyEnchantments(new CombatStartEvent(combatant)); combatScreen = new CombatScreen(oldScreen, combatant, playerInitiated); setScreen(combatScreen); + currentBGColor = 0x330000; + initBG(); } public function endCombat(oldScreen:Screen):void { //inCombat = false; combatScreen = null; //setScreen(AdventureController.screenQueue.read()); + currentBGColor = default_bg_color; + initBG(); } public function setTown(t:Town):void { diff --git a/src/org/sevenchan/dongs/Creature.as b/src/org/sevenchan/dongs/Creature.as index bb751a1..88a7a8e 100644 --- a/src/org/sevenchan/dongs/Creature.as +++ b/src/org/sevenchan/dongs/Creature.as @@ -66,6 +66,16 @@ package org.sevenchan.dongs } }; + public static var CreatureRegistry:Object = { + arachnid: new Arachnid(false), + arachnid_pregnant: new Arachnid(true), + harpy: new Harpy(false), + harpy_dark: new Harpy(true), + human: new Human(), + morel: new Morel(), + oldspace: new SandNigger() + }; + // Characteristics public var customized:Boolean = false; public var ownName:String = "Blah Blah"; // Who am I? diff --git a/src/org/sevenchan/dongs/screens/DebugScreen.as b/src/org/sevenchan/dongs/screens/DebugScreen.as index 86788fe..d3db55c 100644 --- a/src/org/sevenchan/dongs/screens/DebugScreen.as +++ b/src/org/sevenchan/dongs/screens/DebugScreen.as @@ -19,9 +19,11 @@ package org.sevenchan.dongs.screens override public function processButtonPress(id:int):Boolean { + clearButtons(); if (act == "main") { setButton(0, "EXIT"); - setButton(1, "dbgStats:" + (dbgStats?"1":"0")); + if(main.statHP!=null) + setButton(1, "dbgStats:" + (dbgStats?"1":"0")); setButton(2, "SuperStore"); setButton(3, "BodyParts"); setButton(4, "ChangeTo"); -- 2.11.4.GIT