From 89849d8dc63aff7aa46f015e3be025891c7c46ad Mon Sep 17 00:00:00 2001 From: Alex Henry Date: Fri, 29 Apr 2016 13:49:47 -0300 Subject: [PATCH] 1.3 * 6 independent, opposing factions to play against at every game! * City-building, automatic or manual! * Equippable artifacts! * 6 new location types to explore on the world map! * 2 new unique locations: mercenary guild and artificer! * Skill system, featuring 13 different skills! * New units can now be acquired by spending XP * The world map now has to be explored * Dungeon redesign, featuring traps * 137 monsters * 28 items, 33 artifacts * 53 upgrades, 25 spells, 13 skills --- .gitignore | 2 +- avatars/humanfemale.png | Bin 0 -> 1218 bytes avatars/humanmale.png | Bin 0 -> 1434 bytes doc/CHANGELOG.txt | 18 +- doc/OGLv1.0a.rtf | 70 - doc/OGLv1.0a.txt | 39 + doc/artifacts.txt | 21 + doc/items.txt | 10 +- doc/javadoc/allclasses-frame.html | 143 +- doc/javadoc/allclasses-noframe.html | 143 +- doc/javadoc/constant-values.html | 239 +- doc/javadoc/deprecated-list.html | 4 +- doc/javadoc/help-doc.html | 4 +- doc/javadoc/index-all.html | 2915 +++++++++++++---- doc/javadoc/index.html | 2 +- doc/javadoc/javelin/Javelin.html | 160 +- doc/javadoc/javelin/JavelinApp.html | 105 +- .../javelin/controller/BattleSetup.html | 4 +- .../javelin/controller/CountingSet.html | 4 +- doc/javadoc/javelin/controller/Movement.html | 4 +- doc/javadoc/javelin/controller/Point.html | 24 +- .../controller/SpellbookGenerator.html | 4 +- .../javelin/controller/TextReader.html | 4 +- doc/javadoc/javelin/controller/Weather.html | 4 +- .../javelin/controller/action/Action.html | 4 +- .../controller/action/ActionAdapter.html | 4 +- .../controller/action/ActionDescription.html | 6 +- .../controller/action/ActionMapping.html | 4 +- .../javelin/controller/action/Breath.html | 4 +- .../javelin/controller/action/CastSpell.html | 37 +- .../javelin/controller/action/Charge.html | 4 +- .../controller/action/DiagonalMovement.html | 4 +- .../javelin/controller/action/Fire.html | 4 +- .../javelin/controller/action/Help.html | 4 +- .../javelin/controller/action/Movement.html | 4 +- .../javelin/controller/action/PassItem.html | 4 +- .../controller/action/SimpleAction.html | 4 +- .../controller/action/TouchAttack.html | 4 +- .../javelin/controller/action/UseItem.html | 4 +- .../javelin/controller/action/Wait.html | 4 +- .../controller/action/ai/AbstractAttack.html | 4 +- .../controller/action/ai/AiAction.html | 4 +- .../controller/action/ai/AiMovement.html | 4 +- .../controller/action/ai/DamageChance.html | 4 +- .../controller/action/ai/ForceWait.html | 4 +- .../controller/action/ai/MeleeAttack.html | 4 +- .../controller/action/ai/RangedAttack.html | 4 +- .../controller/action/ai/package-frame.html | 4 +- .../controller/action/ai/package-summary.html | 4 +- .../controller/action/ai/package-tree.html | 4 +- .../javelin/controller/action/area/Area.html | 4 +- .../javelin/controller/action/area/Burst.html | 4 +- .../javelin/controller/action/area/Line.html | 4 +- .../controller/action/area/package-frame.html | 4 +- .../action/area/package-summary.html | 4 +- .../controller/action/area/package-tree.html | 4 +- .../action/maneuver/DefensiveAttack.html | 4 +- .../controller/action/maneuver/Feint.html | 4 +- .../controller/action/maneuver/Grapple.html | 4 +- .../controller/action/maneuver/Maneuver.html | 4 +- .../controller/action/maneuver/Trip.html | 4 +- .../action/maneuver/package-frame.html | 4 +- .../action/maneuver/package-summary.html | 4 +- .../action/maneuver/package-tree.html | 4 +- .../controller/action/package-frame.html | 4 +- .../controller/action/package-summary.html | 4 +- .../controller/action/package-tree.html | 4 +- .../controller/action/world/Abandon.html | 14 +- .../controller/action/world/CastSpells.html | 34 +- .../controller/action/world/Dismiss.html | 312 ++ .../controller/action/world/Divide.html | 41 +- .../controller/action/world/Guide.html | 14 +- .../controller/action/world/Rename.html | 19 +- .../controller/action/world/ResetScore.html | 14 +- .../action/world/ShowStatistics.html | 14 +- .../controller/action/world/UseItems.html | 73 +- .../controller/action/world/WorldAction.html | 46 +- .../controller/action/world/WorldHelp.html | 14 +- .../controller/action/world/WorldMove.html | 22 +- .../action/world/package-frame.html | 5 +- .../action/world/package-summary.html | 30 +- .../controller/action/world/package-tree.html | 5 +- .../ai/AbstractAlphaBetaSearch.html | 4 +- .../javelin/controller/ai/ActionProvider.html | 4 +- .../javelin/controller/ai/AiThread.html | 4 +- .../javelin/controller/ai/BattleAi.html | 4 +- .../javelin/controller/ai/ChanceNode.html | 4 +- doc/javadoc/javelin/controller/ai/Entry.html | 4 +- doc/javadoc/javelin/controller/ai/Node.html | 4 +- .../controller/ai/TemperatureManager.html | 4 +- .../javelin/controller/ai/ThreadManager.html | 4 +- .../javelin/controller/ai/cache/AiCache.html | 4 +- .../javelin/controller/ai/cache/Cache.html | 4 +- .../controller/ai/cache/CacheClearThread.html | 4 +- .../controller/ai/cache/package-frame.html | 4 +- .../controller/ai/cache/package-summary.html | 4 +- .../controller/ai/cache/package-tree.html | 4 +- .../javelin/controller/ai/package-frame.html | 4 +- .../controller/ai/package-summary.html | 4 +- .../javelin/controller/ai/package-tree.html | 4 +- .../ai/valueselector/MaxValueSelector.html | 4 +- .../ai/valueselector/MinValueSelector.html | 4 +- .../ai/valueselector/ValueSelector.html | 4 +- .../ai/valueselector/package-frame.html | 4 +- .../ai/valueselector/package-summary.html | 4 +- .../ai/valueselector/package-tree.html | 4 +- .../challenge/ChallengeRatingCalculator.html | 25 +- .../challenge/RewardCalculator.html | 60 +- .../challenge/TouchAttackFactor.html | 4 +- .../challenge/factor/AbilitiesFactor.html | 52 +- .../challenge/factor/ArmorClassFactor.html | 4 +- .../challenge/factor/ClassLevelFactor.html | 4 +- .../controller/challenge/factor/CrFactor.html | 6 +- .../challenge/factor/FeatsFactor.html | 4 +- .../challenge/factor/FullAttackFactor.html | 4 +- .../controller/challenge/factor/HdFactor.html | 4 +- .../challenge/factor/SizeFactor.html | 4 +- .../factor/SizeFactorWithAttModifiers.html | 8 +- .../challenge/factor/SkillsFactor.html | 379 +++ .../challenge/factor/SpeedFactor.html | 8 +- .../challenge/factor/SpellsFactor.html | 9 +- .../challenge/factor/package-frame.html | 5 +- .../challenge/factor/package-summary.html | 12 +- .../challenge/factor/package-tree.html | 5 +- .../factor/quality/BreathFactor.html | 4 +- .../factor/quality/QualitiesFactor.html | 4 +- .../factor/quality/package-frame.html | 4 +- .../factor/quality/package-summary.html | 4 +- .../factor/quality/package-tree.html | 4 +- .../challenge/factor/skill/Acrobatics.html | 347 ++ .../challenge/factor/skill/Concentration.html | 347 ++ .../challenge/factor/skill/Diplomacy.html | 347 ++ .../challenge/factor/skill/DisableDevice.html | 347 ++ .../factor/skill/GatherInformation.html | 347 ++ .../challenge/factor/skill/Hide.html | 347 ++ .../challenge/factor/skill/Knowledge.html | 347 ++ .../challenge/factor/skill/Listen.html | 347 ++ .../challenge/factor/skill/MoveSilently.html | 347 ++ .../challenge/factor/skill/Search.html | 347 ++ .../challenge/factor/skill/SkillUpgrade.html | 387 +++ .../challenge/factor/skill/SkillsFactor.html | 379 +++ .../challenge/factor/skill/Spellcraft.html | 347 ++ .../challenge/factor/skill/Spot.html | 347 ++ .../challenge/factor/skill/Survival.html | 347 ++ .../challenge/factor/skill/package-frame.html | 34 + .../factor/skill/package-summary.html | 226 ++ .../challenge/factor/skill/package-tree.html | 160 + .../controller/challenge/package-frame.html | 4 +- .../controller/challenge/package-summary.html | 4 +- .../controller/challenge/package-tree.html | 4 +- .../javelin/controller/db/EncounterIndex.html | 4 +- .../javelin/controller/db/Properties.html | 4 +- .../javelin/controller/db/StateManager.html | 4 +- .../javelin/controller/db/package-frame.html | 4 +- .../controller/db/package-summary.html | 4 +- .../javelin/controller/db/package-tree.html | 4 +- .../controller/db/reader/ErrorHandler.html | 4 +- .../controller/db/reader/MonsterReader.html | 22 +- .../controller/db/reader/SpecialtiesLog.html | 4 +- .../db/reader/factor/Alignment.html | 311 ++ .../db/reader/factor/ArmorClass.html | 8 +- .../controller/db/reader/factor/Attacks.html | 4 +- .../controller/db/reader/factor/Damage.html | 4 +- .../db/reader/factor/FaceAndReach.html | 4 +- .../controller/db/reader/factor/Feats.html | 4 +- .../db/reader/factor/FieldReader.html | 6 +- .../controller/db/reader/factor/HitDice.html | 4 +- .../db/reader/factor/Initiative.html | 4 +- .../controller/db/reader/factor/Name.html | 4 +- .../db/reader/factor/Organization.html | 33 +- .../db/reader/factor/Paragraph.html | 8 +- .../controller/db/reader/factor/Skills.html | 336 ++ .../db/reader/factor/SpecialAttacks.html | 8 +- .../db/reader/factor/SpecialQualities.html | 4 +- .../controller/db/reader/factor/Speed.html | 4 +- .../db/reader/factor/package-frame.html | 6 +- .../db/reader/factor/package-summary.html | 38 +- .../db/reader/factor/package-tree.html | 6 +- .../controller/db/reader/package-frame.html | 4 +- .../controller/db/reader/package-summary.html | 4 +- .../controller/db/reader/package-tree.html | 4 +- .../controller/encounter/Encounter.html | 4 +- .../encounter/EncounterGenerator.html | 101 +- .../encounter/EncounterPossibilities.html | 4 +- .../controller/encounter/GeneratedFight.html | 8 +- .../encounter/MisalignmentDetector.html | 283 ++ .../controller/encounter/package-frame.html | 5 +- .../controller/encounter/package-summary.html | 10 +- .../controller/encounter/package-tree.html | 5 +- .../controller/exception/GaveUpException.html | 4 +- .../controller/exception/NotPeaceful.html | 4 +- .../exception/RepeatTurnException.html | 4 +- .../controller/exception/StopThinking.html | 4 +- .../exception/UnbalancedTeamsException.html | 4 +- .../exception/battle/BattleEvent.html | 4 +- .../exception/battle/EndBattle.html | 18 +- .../exception/battle/StartBattle.html | 7 +- .../exception/battle/package-frame.html | 4 +- .../exception/battle/package-summary.html | 4 +- .../exception/battle/package-tree.html | 4 +- .../controller/exception/package-frame.html | 4 +- .../controller/exception/package-summary.html | 4 +- .../controller/exception/package-tree.html | 4 +- .../controller/fight/ExhibitionFight.html | 107 +- .../javelin/controller/fight/Fight.html | 106 +- .../controller/fight/IncursionFight.html | 107 +- .../javelin/controller/fight/LairFight.html | 109 +- .../fight/PlanarFight.PlanarFightScreen.html | 6 +- .../javelin/controller/fight/PlanarFight.html | 113 +- .../fight/RandomDungeonEncounter.html | 220 +- .../controller/fight/RandomEncounter.html | 115 +- .../javelin/controller/fight/Siege.html | 481 +++ .../controller/fight/package-frame.html | 5 +- .../controller/fight/package-summary.html | 12 +- .../controller/fight/package-tree.html | 12 +- doc/javadoc/javelin/controller/map/Arena.html | 4 +- .../javelin/controller/map/DndMap.html | 4 +- doc/javadoc/javelin/controller/map/Map.html | 4 +- .../javelin/controller/map/MapGenerator.html | 4 +- .../javelin/controller/map/TyrantMap.html | 4 +- .../javelin/controller/map/desert/Rocky.html | 4 +- .../javelin/controller/map/desert/Sandy.html | 4 +- .../javelin/controller/map/desert/Tundra.html | 4 +- .../controller/map/desert/package-frame.html | 4 +- .../map/desert/package-summary.html | 4 +- .../controller/map/desert/package-tree.html | 4 +- .../controller/map/forest/DenseForest.html | 4 +- .../javelin/controller/map/forest/Forest.html | 4 +- .../controller/map/forest/SparseForest.html | 4 +- .../controller/map/forest/package-frame.html | 4 +- .../map/forest/package-summary.html | 4 +- .../controller/map/forest/package-tree.html | 4 +- .../controller/map/hill/GentleHiill.html | 4 +- .../controller/map/hill/RuggedHill.html | 4 +- .../controller/map/hill/package-frame.html | 4 +- .../controller/map/hill/package-summary.html | 4 +- .../controller/map/hill/package-tree.html | 4 +- .../javelin/controller/map/marsh/Moor.html | 4 +- .../javelin/controller/map/marsh/Swamp.html | 4 +- .../controller/map/marsh/package-frame.html | 4 +- .../controller/map/marsh/package-summary.html | 4 +- .../controller/map/marsh/package-tree.html | 4 +- .../map/mountain/ForbiddingMountain.html | 4 +- .../controller/map/mountain/Meadow.html | 4 +- .../map/mountain/RuggedMountain.html | 4 +- .../map/mountain/package-frame.html | 4 +- .../map/mountain/package-summary.html | 4 +- .../controller/map/mountain/package-tree.html | 4 +- .../javelin/controller/map/package-frame.html | 4 +- .../controller/map/package-summary.html | 4 +- .../javelin/controller/map/package-tree.html | 4 +- .../controller/map/plain/Battlefield.html | 4 +- .../javelin/controller/map/plain/Farm.html | 4 +- .../controller/map/plain/Grasslands.html | 4 +- .../controller/map/plain/package-frame.html | 4 +- .../controller/map/plain/package-summary.html | 4 +- .../controller/map/plain/package-tree.html | 4 +- .../javelin/controller/package-frame.html | 4 +- .../javelin/controller/package-summary.html | 4 +- .../javelin/controller/package-tree.html | 4 +- .../controller/quality/DamageReduction.html | 4 +- .../controller/quality/EnergyImmunity.html | 4 +- .../controller/quality/EnergyResistance.html | 4 +- .../controller/quality/FastHealing.html | 4 +- .../controller/quality/MindImmunity.html | 4 +- .../javelin/controller/quality/Quality.html | 4 +- .../controller/quality/SpecialPerception.html | 4 +- .../controller/quality/SpellImmunity.html | 4 +- .../controller/quality/SpellResistance.html | 4 +- .../controller/quality/package-frame.html | 4 +- .../controller/quality/package-summary.html | 4 +- .../controller/quality/package-tree.html | 4 +- .../controller/tournament/Champion.html | 4 +- .../controller/tournament/CrIterator.html | 4 +- .../controller/tournament/Exhibition.html | 11 +- .../tournament/ExhibitionScreen.html | 6 +- .../javelin/controller/tournament/Horde.html | 4 +- .../javelin/controller/tournament/Match.html | 4 +- .../controller/tournament/MirrorMatch.html | 4 +- .../controller/tournament/package-frame.html | 4 +- .../tournament/package-summary.html | 4 +- .../controller/tournament/package-tree.html | 4 +- .../upgrade/BreathWeaponUpgrade.html | 32 +- .../controller/upgrade/DamageReduction.html | 32 +- .../controller/upgrade/EnergyImmunity.html | 32 +- .../controller/upgrade/EnergyResistance.html | 32 +- .../controller/upgrade/FastHealing.html | 32 +- .../javelin/controller/upgrade/Flying.html | 13 +- .../controller/upgrade/NaturalArmor.html | 32 +- .../javelin/controller/upgrade/Spell.html | 68 +- .../controller/upgrade/SpellImmunity.html | 32 +- .../controller/upgrade/SpellResistance.html | 32 +- .../javelin/controller/upgrade/Swimming.html | 19 +- .../javelin/controller/upgrade/Upgrade.html | 108 +- .../controller/upgrade/UpgradeHandler.html | 196 +- .../javelin/controller/upgrade/Vision.html | 32 +- .../controller/upgrade/WalkingSpeed.html | 32 +- .../upgrade/ability/RaiseAbility.html | 35 +- .../upgrade/ability/RaiseCharisma.html | 13 +- .../upgrade/ability/RaiseConsitution.html | 13 +- .../upgrade/ability/RaiseDexterity.html | 13 +- .../upgrade/ability/RaiseIntelligence.html | 19 +- .../upgrade/ability/RaiseStrength.html | 13 +- .../upgrade/ability/RaiseWisdom.html | 13 +- .../upgrade/ability/package-frame.html | 4 +- .../upgrade/ability/package-summary.html | 7 +- .../upgrade/ability/package-tree.html | 4 +- .../upgrade/classes/Aristocrat.html | 13 +- .../upgrade/classes/ClassAdvancement.html | 32 +- .../controller/upgrade/classes/Commoner.html | 13 +- .../controller/upgrade/classes/Expert.html | 13 +- .../controller/upgrade/classes/Level.html | 4 +- .../controller/upgrade/classes/Warrior.html | 13 +- .../upgrade/classes/package-frame.html | 4 +- .../upgrade/classes/package-summary.html | 4 +- .../upgrade/classes/package-tree.html | 4 +- .../controller/upgrade/damage/Damage.html | 32 +- .../upgrade/damage/MeleeDamage.html | 13 +- .../upgrade/damage/RangedDamage.html | 13 +- .../upgrade/damage/package-frame.html | 4 +- .../upgrade/damage/package-summary.html | 4 +- .../upgrade/damage/package-tree.html | 4 +- .../upgrade/feat/BullRushUpgrade.html | 21 +- .../upgrade/feat/CleaveUpgrade.html | 21 +- .../upgrade/feat/CombatExpertiseUpgrade.html | 27 +- .../controller/upgrade/feat/FeatUpgrade.html | 14 +- .../upgrade/feat/GreatCleaveUpgrade.html | 27 +- .../upgrade/feat/GreatFortitude.html | 13 +- .../upgrade/feat/ImprovedFeintUpgrade.html | 21 +- .../upgrade/feat/ImprovedGrappleUpgrade.html | 27 +- .../upgrade/feat/ImprovedInititative.html | 32 +- .../upgrade/feat/ImprovedPreciseShot.html | 32 +- .../upgrade/feat/ImprovedTripUpgrade.html | 21 +- .../controller/upgrade/feat/IronWill.html | 32 +- .../upgrade/feat/LightningReflexes.html | 13 +- .../controller/upgrade/feat/MeleeFocus.html | 32 +- .../upgrade/feat/PointBlankShot.html | 32 +- .../upgrade/feat/PowerAttackUpgrade.html | 27 +- .../controller/upgrade/feat/PreciseShot.html | 26 +- .../controller/upgrade/feat/RangedFocus.html | 13 +- .../controller/upgrade/feat/RapidShot.html | 32 +- .../controller/upgrade/feat/Toughness.html | 27 +- .../upgrade/feat/package-frame.html | 4 +- .../upgrade/feat/package-summary.html | 8 +- .../controller/upgrade/feat/package-tree.html | 8 +- .../controller/upgrade/package-frame.html | 4 +- .../controller/upgrade/package-summary.html | 4 +- .../controller/upgrade/package-tree.html | 4 +- .../controller/upgrade/skill/Acrobatics.html | 345 ++ .../upgrade/skill/Concentration.html | 345 ++ .../controller/upgrade/skill/Diplomacy.html | 345 ++ .../upgrade/skill/DisableDevice.html | 345 ++ .../upgrade/skill/GatherInformation.html | 345 ++ .../controller/upgrade/skill/Hide.html | 345 ++ .../controller/upgrade/skill/Knowledge.html | 345 ++ .../controller/upgrade/skill/Listen.html | 345 ++ .../upgrade/skill/MoveSilently.html | 345 ++ .../controller/upgrade/skill/Search.html | 345 ++ .../upgrade/skill/SkillUpgrade.html | 385 +++ .../controller/upgrade/skill/Spellcraft.html | 345 ++ .../controller/upgrade/skill/Spot.html | 345 ++ .../controller/upgrade/skill/Survival.html | 345 ++ .../upgrade/skill/package-frame.html | 33 + .../upgrade/skill/package-summary.html | 220 ++ .../upgrade/skill/package-tree.html | 155 + .../javelin/controller/walker/ChargePath.html | 4 +- .../javelin/controller/walker/ClearPath.html | 4 +- .../javelin/controller/walker/NextMove.html | 4 +- .../controller/walker/ObstructedPath.html | 4 +- .../javelin/controller/walker/Step.html | 4 +- .../javelin/controller/walker/Walker.html | 4 +- .../controller/walker/package-frame.html | 4 +- .../controller/walker/package-summary.html | 8 +- .../controller/walker/package-tree.html | 8 +- .../javelin/model/BattleMap.VisionCache.html | 354 ++ doc/javadoc/javelin/model/BattleMap.html | 109 +- doc/javadoc/javelin/model/Cloneable.html | 8 +- doc/javadoc/javelin/model/EquipmentMap.html | 41 +- doc/javadoc/javelin/model/Realm.html | 511 +++ doc/javadoc/javelin/model/TeamContainer.html | 8 +- .../javelin/model/condition/Blinking.html | 4 +- .../javelin/model/condition/Breathless.html | 4 +- doc/javadoc/javelin/model/condition/Buff.html | 4 +- .../javelin/model/condition/Charging.html | 4 +- .../model/condition/Condition.Effect.html | 4 +- .../javelin/model/condition/Condition.html | 4 +- .../javelin/model/condition/Defending.html | 4 +- .../model/condition/DefensiveStance.html | 4 +- .../javelin/model/condition/Dominated.html | 4 +- .../javelin/model/condition/Feigned.html | 4 +- .../javelin/model/condition/Grappling.html | 4 +- .../javelin/model/condition/Heroic.html | 4 +- .../javelin/model/condition/Paralyzed.html | 4 +- .../javelin/model/condition/Prone.html | 4 +- .../javelin/model/condition/Shaken.html | 4 +- .../javelin/model/condition/Vampiric.html | 4 +- .../model/condition/package-frame.html | 4 +- .../model/condition/package-summary.html | 8 +- .../javelin/model/condition/package-tree.html | 8 +- .../javelin/model/dungeon/Feature.html | 4 +- .../javelin/model/dungeon/Fountain.html | 4 +- .../javelin/model/dungeon/StairsUp.html | 4 +- .../javelin/model/dungeon/Treasure.html | 4 +- .../javelin/model/dungeon/package-frame.html | 4 +- .../model/dungeon/package-summary.html | 4 +- .../javelin/model/dungeon/package-tree.html | 4 +- doc/javadoc/javelin/model/feat/BullRush.html | 4 +- doc/javadoc/javelin/model/feat/Cleave.html | 4 +- .../javelin/model/feat/CombatExpertise.html | 4 +- .../model/feat/ExoticWeaponProficiency.html | 4 +- doc/javadoc/javelin/model/feat/Feat.html | 4 +- .../javelin/model/feat/GreatCleave.html | 4 +- .../javelin/model/feat/GreatFortitude.html | 4 +- .../javelin/model/feat/ImprovedFeint.html | 4 +- .../javelin/model/feat/ImprovedGrapple.html | 4 +- .../model/feat/ImprovedInitiative.html | 4 +- .../model/feat/ImprovedPreciseShot.html | 4 +- .../javelin/model/feat/ImprovedTrip.html | 4 +- doc/javadoc/javelin/model/feat/IronWill.html | 4 +- .../javelin/model/feat/LightningReflexes.html | 4 +- .../javelin/model/feat/Multiattack.html | 4 +- .../model/feat/MultiweaponFighting.html | 4 +- .../javelin/model/feat/PointBlankShot.html | 4 +- .../javelin/model/feat/PowerAttack.html | 4 +- .../javelin/model/feat/PreciseShot.html | 4 +- doc/javadoc/javelin/model/feat/RapidShot.html | 4 +- doc/javadoc/javelin/model/feat/Toughness.html | 4 +- .../javelin/model/feat/WeaponFinesse.html | 4 +- .../javelin/model/feat/WeaponFocus.html | 4 +- .../javelin/model/feat/package-frame.html | 4 +- .../javelin/model/feat/package-summary.html | 8 +- .../javelin/model/feat/package-tree.html | 8 +- doc/javadoc/javelin/model/item/Item.html | 244 +- .../javelin/model/item/ItemSelection.html | 58 +- doc/javadoc/javelin/model/item/Key.html | 93 +- .../model/item/artifact/AmuletOfHealth.html | 364 ++ .../javelin/model/item/artifact/Artifact.html | 513 +++ .../item/artifact/BeltOfGiantStrength.html | 364 ++ .../model/item/artifact/CloakOfCharisma.html | 364 ++ .../item/artifact/CloakOfResistance.html | 364 ++ .../item/artifact/GlovesOfDexterity.html | 364 ++ .../model/item/artifact/GogglesOfNight.html | 363 ++ .../item/artifact/HeadbandOfIntellect.html | 364 ++ .../artifact/MantleOfSpellResistance.html | 362 ++ .../model/item/artifact/PeriaptOfWisdom.html | 364 ++ .../item/artifact/RingOfEnergyResistance.html | 364 ++ .../model/item/artifact/RingOfProtection.html | 364 ++ .../javelin/model/item/artifact/Slot.html | 520 +++ .../model/item/artifact/WingsOfFlying.html | 362 ++ .../model/item/artifact/package-frame.html | 33 + .../model/item/artifact/package-summary.html | 225 ++ .../model/item/artifact/package-tree.html | 155 + .../javelin/model/item/package-frame.html | 8 +- .../javelin/model/item/package-summary.html | 23 +- .../javelin/model/item/package-tree.html | 20 +- .../javelin/model/item/potion/Darkvision.html | 23 +- .../javelin/model/item/potion/Fly.html | 23 +- .../javelin/model/item/potion/Heroism.html | 23 +- .../javelin/model/item/potion/Potion.html | 54 +- .../model/item/potion/barkskin/Barkskin.html | 23 +- .../model/item/potion/barkskin/Barkskin2.html | 15 +- .../model/item/potion/barkskin/Barkskin3.html | 15 +- .../model/item/potion/barkskin/Barkskin4.html | 15 +- .../model/item/potion/barkskin/Barkskin5.html | 15 +- .../item/potion/barkskin/package-frame.html | 4 +- .../item/potion/barkskin/package-summary.html | 4 +- .../item/potion/barkskin/package-tree.html | 4 +- .../item/potion/cure/CureCriticalWounds.html | 15 +- .../item/potion/cure/CureLightWounds.html | 15 +- .../item/potion/cure/CureModerateWounds.html | 15 +- .../model/item/potion/cure/CurePotion.html | 23 +- .../item/potion/cure/CureSeriousWounds.html | 15 +- .../model/item/potion/cure/package-frame.html | 4 +- .../item/potion/cure/package-summary.html | 4 +- .../model/item/potion/cure/package-tree.html | 4 +- .../model/item/potion/package-frame.html | 4 +- .../model/item/potion/package-summary.html | 8 +- .../model/item/potion/package-tree.html | 8 +- .../potion/resistenergy/ResistEnergy.html | 23 +- .../potion/resistenergy/ResistEnergy2.html | 15 +- .../potion/resistenergy/ResistEnergy4.html | 15 +- .../potion/resistenergy/ResistEnergy6.html | 15 +- .../potion/resistenergy/package-frame.html | 4 +- .../potion/resistenergy/package-summary.html | 4 +- .../potion/resistenergy/package-tree.html | 4 +- .../item/potion/totem/BearsEndurance.html | 23 +- .../item/potion/totem/BullsStrength.html | 23 +- .../model/item/potion/totem/CatsGrace.html | 23 +- .../item/potion/totem/EaglesSplendor.html | 23 +- .../model/item/potion/totem/FoxsCunning.html | 23 +- .../model/item/potion/totem/OwlsWisdom.html | 23 +- .../item/potion/totem/package-frame.html | 4 +- .../item/potion/totem/package-summary.html | 4 +- .../model/item/potion/totem/package-tree.html | 4 +- .../javelin/model/item/scroll/PryingEyes.html | 336 ++ .../model/item/scroll/RaiseScroll.html | 91 +- .../model/item/scroll/RecallScroll.html | 75 +- .../model/item/scroll/RessurectScroll.html | 30 +- .../javelin/model/item/scroll/Scroll.html | 114 +- .../item/scroll/SecureShelterScroll.html | 79 +- .../javelin/model/item/scroll/Teleport.html | 54 +- .../item/scroll/dungeon/DiscernLocation.html | 25 +- .../item/scroll/dungeon/DungeonScroll.html | 68 +- .../item/scroll/dungeon/LocateObject.html | 33 +- .../item/scroll/dungeon/package-frame.html | 5 +- .../item/scroll/dungeon/package-summary.html | 16 +- .../item/scroll/dungeon/package-tree.html | 5 +- .../model/item/scroll/package-frame.html | 5 +- .../model/item/scroll/package-summary.html | 22 +- .../model/item/scroll/package-tree.html | 7 +- doc/javadoc/javelin/model/package-frame.html | 9 +- .../javelin/model/package-summary.html | 27 +- doc/javadoc/javelin/model/package-tree.html | 17 +- doc/javadoc/javelin/model/spell/Blink.html | 16 +- doc/javadoc/javelin/model/spell/DayLight.html | 16 +- .../javelin/model/spell/DeeperDarkness.html | 16 +- .../javelin/model/spell/DominateMonster.html | 16 +- doc/javadoc/javelin/model/spell/Doom.html | 16 +- doc/javadoc/javelin/model/spell/Heroism.html | 16 +- .../javelin/model/spell/HoldMonster.html | 16 +- doc/javadoc/javelin/model/spell/Ray.html | 17 +- .../javelin/model/spell/ScrollSpell.html | 494 +++ .../javelin/model/spell/SlayLiving.html | 20 +- doc/javadoc/javelin/model/spell/Summon.html | 22 +- .../javelin/model/spell/VampiricRay.html | 16 +- .../javelin/model/spell/package-frame.html | 5 +- .../javelin/model/spell/package-summary.html | 14 +- .../javelin/model/spell/package-tree.html | 5 +- .../model/spell/totem/BearsEndurance.html | 13 +- .../model/spell/totem/BullsStrength.html | 13 +- .../javelin/model/spell/totem/CatsGrace.html | 13 +- .../model/spell/totem/EaglesSplendor.html | 13 +- .../model/spell/totem/FoxsCunning.html | 13 +- .../javelin/model/spell/totem/OwlsWisdom.html | 13 +- .../model/spell/totem/TotemsSpell.html | 16 +- .../model/spell/totem/package-frame.html | 4 +- .../model/spell/totem/package-summary.html | 4 +- .../model/spell/totem/package-tree.html | 4 +- .../spell/wounds/CureCriticalWounds.html | 13 +- .../model/spell/wounds/CureLightWounds.html | 13 +- .../spell/wounds/CureModerateWounds.html | 16 +- .../model/spell/wounds/CureSeriousWounds.html | 13 +- .../spell/wounds/InflictCriticalWounds.html | 13 +- .../spell/wounds/InflictLightWounds.html | 13 +- .../spell/wounds/InflictModerateWounds.html | 16 +- .../spell/wounds/InflictSeriousWounds.html | 13 +- .../model/spell/wounds/package-frame.html | 4 +- .../model/spell/wounds/package-summary.html | 4 +- .../model/spell/wounds/package-tree.html | 4 +- .../model/state/BattleState.Vision.html | 4 +- .../javelin/model/state/BattleState.html | 4 +- doc/javadoc/javelin/model/state/Meld.html | 4 +- doc/javadoc/javelin/model/state/Square.html | 4 +- .../javelin/model/state/package-frame.html | 4 +- .../javelin/model/state/package-summary.html | 4 +- .../javelin/model/state/package-tree.html | 4 +- doc/javadoc/javelin/model/unit/Attack.html | 4 +- .../javelin/model/unit/AttackSequence.html | 4 +- .../javelin/model/unit/CloneableList.html | 4 +- doc/javadoc/javelin/model/unit/Combatant.html | 120 +- .../javelin/model/unit/CurrentAttack.html | 4 +- doc/javadoc/javelin/model/unit/HD.html | 4 +- doc/javadoc/javelin/model/unit/Monster.html | 310 +- doc/javadoc/javelin/model/unit/Skills.html | 550 ++++ .../abilities/BreathWeapon.BreathArea.html | 4 +- .../abilities/BreathWeapon.SavingThrow.html | 4 +- .../model/unit/abilities/BreathWeapon.html | 4 +- .../javelin/model/unit/abilities/Spells.html | 4 +- .../model/unit/abilities/TouchAttack.html | 29 +- .../model/unit/abilities/package-frame.html | 4 +- .../model/unit/abilities/package-summary.html | 4 +- .../model/unit/abilities/package-tree.html | 4 +- .../javelin/model/unit/package-frame.html | 5 +- .../javelin/model/unit/package-summary.html | 10 +- .../javelin/model/unit/package-tree.html | 5 +- .../javelin/model/world/Incursion.html | 355 +- doc/javadoc/javelin/model/world/Merchant.html | 406 +++ .../javelin/model/world/Squad.Transport.html | 9 +- doc/javadoc/javelin/model/world/Squad.html | 526 ++- .../javelin/model/world/World.Region.html | 410 +++ doc/javadoc/javelin/model/world/World.html | 504 +++ .../javelin/model/world/WorldActor.html | 348 +- .../javelin/model/world/WorldMap.Region.html | 14 +- doc/javadoc/javelin/model/world/WorldMap.html | 269 +- .../javelin/model/world/package-frame.html | 23 +- .../javelin/model/world/package-summary.html | 93 +- .../javelin/model/world/package-tree.html | 35 +- .../javelin/model/world/place/Academy.html | 443 +++ .../javelin/model/world/place/Dungeon.html | 666 ++++ .../javelin/model/world/place/Dwelling.html | 479 +++ .../model/world/place/GuardedPlace.html | 495 +++ .../javelin/model/world/place/Guardian.html | 461 +++ .../javelin/model/world/place/Haxor.html | 499 +++ .../javelin/model/world/place/Inn.html | 370 +++ .../javelin/model/world/place/Lair.html | 369 +++ .../javelin/model/world/place/Outpost.html | 483 +++ .../javelin/model/world/place/Portal.html | 484 +++ .../javelin/model/world/place/Shrine.html | 387 +++ .../javelin/model/world/place/WorldPlace.html | 767 +++++ .../model/world/place/dungeon/Crawler.html | 353 ++ .../model/world/place/dungeon/Dungeon.html | 599 ++++ .../model/world/place/dungeon/Feature.html | 390 +++ .../model/world/place/dungeon/Fountain.html | 315 ++ .../model/world/place/dungeon/StairsUp.html | 313 ++ .../model/world/place/dungeon/Trap.html | 461 +++ .../model/world/place/dungeon/Treasure.html | 350 ++ .../world/place/dungeon/package-frame.html | 26 + .../world/place/dungeon/package-summary.html | 180 + .../world/place/dungeon/package-tree.html | 152 + .../model/world/place/guarded/Academy.html | 443 +++ .../model/world/place/guarded/Dwelling.html | 479 +++ .../world/place/guarded/GuardedPlace.html | 556 ++++ .../model/world/place/guarded/Guardian.html | 461 +++ .../model/world/place/guarded/Inn.html | 370 +++ .../model/world/place/guarded/Shrine.html | 387 +++ .../world/place/guarded/package-frame.html | 25 + .../world/place/guarded/package-summary.html | 175 + .../world/place/guarded/package-tree.html | 151 + .../model/world/place/package-frame.html | 23 + .../model/world/place/package-summary.html | 162 + .../model/world/place/package-tree.html | 145 + .../place/town/Accommodations.RestOption.html | 323 ++ .../world/place/town/Accommodations.html | 431 +++ .../place/town/Accomodations.RestOption.html | 323 ++ .../model/world/place/town/Accomodations.html | 431 +++ .../model/world/place/town/CraftingOrder.html | 315 ++ .../javelin/model/world/place/town/Order.html | 358 ++ .../model/world/place/town/OrderQueue.html | 407 +++ .../model/world/place/town/ResearchData.html | 344 ++ .../model/world/place/town/ResearchQueue.html | 353 ++ .../javelin/model/world/place/town/Town.html | 905 +++++ .../model/world/place/town/TrainingOrder.html | 367 +++ .../model/world/place/town/Transport.html | 382 +++ .../place/town/manager/HumanManager.html | 297 ++ .../place/town/manager/MonsterManager.html | 299 ++ .../world/place/town/manager/TownManager.html | 321 ++ .../place/town/manager/package-frame.html | 22 + .../place/town/manager/package-summary.html | 154 + .../place/town/manager/package-tree.html | 140 + .../model/world/place/town/package-frame.html | 31 + .../world/place/town/package-summary.html | 204 ++ .../model/world/place/town/package-tree.html | 182 + .../town/research/AccommodationResearch.html | 355 ++ .../town/research/AccomodationResearch.html | 350 ++ .../world/place/town/research/Discard.html | 346 ++ .../model/world/place/town/research/Grow.html | 351 ++ .../place/town/research/ItemResearch.html | 353 ++ .../place/town/research/LairResearch.html | 351 ++ .../world/place/town/research/Recruit.html | 360 ++ .../world/place/town/research/Redraw.html | 346 ++ .../world/place/town/research/Research.html | 537 +++ .../town/research/SpecialResearchCard.html | 332 ++ .../town/research/TransportResearch.html | 354 ++ .../place/town/research/UpgradeResearch.html | 353 ++ .../place/town/research/package-frame.html | 30 + .../place/town/research/package-summary.html | 206 ++ .../place/town/research/package-tree.html | 155 + .../place/unique/Artificer.Selection.html | 369 +++ .../model/world/place/unique/Artificer.html | 483 +++ .../model/world/place/unique/Haxor.html | 537 +++ .../world/place/unique/MercenariesGuild.html | 471 +++ .../world/place/unique/UniqueLocation.html | 411 +++ .../world/place/unique/package-frame.html | 23 + .../world/place/unique/package-summary.html | 164 + .../world/place/unique/package-tree.html | 170 + doc/javadoc/javelin/package-frame.html | 4 +- doc/javadoc/javelin/package-summary.html | 4 +- doc/javadoc/javelin/package-tree.html | 4 +- doc/javadoc/javelin/view/ImageHandler.html | 8 +- doc/javadoc/javelin/view/Images.html | 570 ++++ doc/javadoc/javelin/view/MapPanel.html | 113 +- doc/javadoc/javelin/view/SquadScreen.html | 4 +- doc/javadoc/javelin/view/StatusPanel.html | 10 +- doc/javadoc/javelin/view/package-frame.html | 6 +- doc/javadoc/javelin/view/package-summary.html | 24 +- doc/javadoc/javelin/view/package-tree.html | 18 +- ...attleScreen.DescendingLevelComparator.html | 8 +- .../javelin/view/screen/BattleScreen.html | 60 +- .../javelin/view/screen/BribingScreen.html | 293 ++ .../javelin/view/screen/DungeonScreen.html | 648 ++++ .../javelin/view/screen/HaxorScreen.html | 57 +- .../javelin/view/screen/InfoScreen.html | 531 +++ .../javelin/view/screen/IntroScreen.html | 28 +- .../javelin/view/screen/LairScreen.html | 12 +- doc/javadoc/javelin/view/screen/Option.html | 386 +++ .../javelin/view/screen/SquadScreen.html | 474 +++ .../javelin/view/screen/StatisticsScreen.html | 32 +- .../javelin/view/screen/WorldScreen.html | 1035 ++++++ .../view/screen/haxor/BorrowMoney.html | 333 ++ .../view/screen/haxor/ChangeAvatar.html | 329 ++ .../javelin/view/screen/haxor/Hax.html | 326 ++ .../view/screen/haxor/HaxorScreen.html | 535 +++ .../view/screen/haxor/Materialize.html | 328 ++ .../javelin/view/screen/haxor/Rebirth.html | 329 ++ .../view/screen/haxor/RemoveAbility.html | 328 ++ .../javelin/view/screen/haxor/Ressurect.html | 326 ++ .../javelin/view/screen/haxor/SummonAlly.html | 333 ++ .../javelin/view/screen/haxor/Win.html | 330 ++ .../view/screen/haxor/package-frame.html | 29 + .../view/screen/haxor/package-summary.html | 197 ++ .../view/screen/haxor/package-tree.html | 179 + .../javelin/view/screen/package-frame.html | 11 +- .../javelin/view/screen/package-summary.html | 43 +- .../javelin/view/screen/package-tree.html | 23 +- .../view/screen/shopping/ArtificerScreen.html | 574 ++++ .../view/screen/shopping/MerchantScreen.html | 488 +++ .../view/screen/shopping/ShoppingScreen.html | 547 ++++ .../view/screen/shopping/TownShopScreen.html | 491 +++ .../view/screen/shopping/package-frame.html | 23 + .../view/screen/shopping/package-summary.html | 160 + .../view/screen/shopping/package-tree.html | 173 + .../view/screen/town/PurchaseOption.html | 301 ++ .../view/screen/town/PurchaseScreen.html | 99 +- .../view/screen/town/RecruitScreen.html | 240 +- .../view/screen/town/ResearchScreen.html | 579 ++++ .../view/screen/town/SelectScreen.html | 180 +- .../town/ShoppingScreen.PurchaseOption.html | 6 +- .../view/screen/town/ShoppingScreen.html | 16 +- .../javelin/view/screen/town/TownScreen.html | 132 +- .../view/screen/town/TransportScreen.html | 127 +- .../view/screen/town/UpgradingScreen.html | 31 +- .../view/screen/town/option/Option.html | 43 +- .../screen/town/option/RecruitOption.html | 26 +- .../town/option/RecruitScreenOption.html | 32 +- .../town/option/ResearchScreenOption.html | 316 ++ .../view/screen/town/option/ScreenOption.html | 56 +- .../screen/town/option/ShopScreenOption.html | 30 +- .../town/option/TournamentScreenOption.html | 31 +- .../town/option/TransportScreenOption.html | 28 +- .../screen/town/option/UpgradeOption.html | 26 +- .../town/option/UpgradingScreenOption.html | 30 +- .../screen/town/option/package-frame.html | 6 +- .../screen/town/option/package-summary.html | 18 +- .../view/screen/town/option/package-tree.html | 11 +- .../view/screen/town/package-frame.html | 8 +- .../view/screen/town/package-summary.html | 36 +- .../view/screen/town/package-tree.html | 17 +- .../view/screen/upgrading/AcademyScreen.html | 559 ++++ .../screen/upgrading/TownUpgradingScreen.html | 498 +++ .../screen/upgrading/UpgradingScreen.html | 649 ++++ .../view/screen/upgrading/package-frame.html | 22 + .../screen/upgrading/package-summary.html | 152 + .../view/screen/upgrading/package-tree.html | 168 + .../view/screen/world/DungeonScreen.html | 63 +- .../view/screen/world/WorldScreen.html | 218 +- .../view/screen/world/package-frame.html | 4 +- .../view/screen/world/package-summary.html | 8 +- .../view/screen/world/package-tree.html | 4 +- doc/javadoc/overview-frame.html | 18 +- doc/javadoc/overview-summary.html | 80 +- doc/javadoc/overview-tree.html | 219 +- doc/javadoc/package-list | 14 +- doc/javadoc/serialized-form.html | 2079 +++++++++--- doc/skills.txt | 38 + doc/upgrades1.txt | 2 + images/academy.png | Bin 0 -> 2531 bytes images/arena.png | Bin 0 -> 2817 bytes images/banner.png | Bin 254 -> 329 bytes images/banner2.png | Bin 0 -> 254 bytes images/crafting.png | Bin 349 -> 421 bytes images/dungeon.png | Bin 0 -> 1408 bytes images/dwelling.png | Bin 0 -> 2112 bytes images/guardian.png | Bin 0 -> 542 bytes images/haxor.png | Bin 0 -> 2388 bytes images/hostile.png | Bin 0 -> 770 bytes images/inn.png | Bin 0 -> 4772 bytes images/lair.png | Bin 0 -> 1121 bytes images/outpost.png | Bin 0 -> 890 bytes images/portal.png | Bin 0 -> 1072 bytes images/shop.png | Bin 0 -> 1174 bytes images/shrine.png | Bin 0 -> 1387 bytes images/town.png | Bin 0 -> 2644 bytes images/town2.png | Bin 0 -> 1680 bytes images/university.png | Bin 0 -> 2560 bytes images/upgrading.png | Bin 380 -> 402 bytes images/upgrading2.png | Bin 0 -> 503 bytes javelin/Javelin.java | 127 +- javelin/JavelinApp.java | 188 +- javelin/controller/BattleSetup.java | 7 +- javelin/controller/Point.java | 10 +- javelin/controller/TextReader.java | 2 +- javelin/controller/action/ActionMapping.java | 6 +- javelin/controller/action/CastSpell.java | 29 +- javelin/controller/action/Fire.java | 2 +- javelin/controller/action/Help.java | 2 +- javelin/controller/action/Movement.java | 3 +- javelin/controller/action/PassItem.java | 2 +- javelin/controller/action/TouchAttack.java | 17 +- javelin/controller/action/UseItem.java | 6 +- javelin/controller/action/world/Abandon.java | 4 +- .../controller/action/world/CastSpells.java | 28 +- javelin/controller/action/world/Dismiss.java | 43 + javelin/controller/action/world/Divide.java | 45 +- javelin/controller/action/world/Guide.java | 2 +- javelin/controller/action/world/Rename.java | 16 +- .../controller/action/world/ResetScore.java | 7 +- .../action/world/ShowStatistics.java | 20 +- javelin/controller/action/world/UseItems.java | 172 +- .../controller/action/world/WorldAction.java | 15 +- .../controller/action/world/WorldHelp.java | 2 +- .../controller/action/world/WorldMove.java | 62 +- .../challenge/ChallengeRatingCalculator.java | 75 +- .../challenge/RewardCalculator.java | 57 +- .../challenge/TouchAttackFactor.java | 2 +- .../challenge/factor/AbilitiesFactor.java | 6 +- .../challenge/factor/ClassLevelFactor.java | 21 +- .../challenge/factor/FeatsFactor.java | 33 +- .../controller/challenge/factor/HdFactor.java | 35 +- .../challenge/factor/SkillsFactor.java | 81 + .../challenge/factor/SpellsFactor.java | 7 +- javelin/controller/db/StateManager.java | 129 +- .../controller/db/reader/MonsterReader.java | 106 +- .../db/reader/factor/Alignment.java | 39 + .../db/reader/factor/Organization.java | 43 +- .../controller/db/reader/factor/Skills.java | 71 + javelin/controller/encounter/Encounter.java | 5 +- .../encounter/EncounterGenerator.java | 37 +- .../encounter/MisalignmentDetector.java | 59 + .../exception/battle/EndBattle.java | 89 +- .../exception/battle/StartBattle.java | 2 + javelin/controller/fight/ExhibitionFight.java | 20 + javelin/controller/fight/Fight.java | 38 +- javelin/controller/fight/IncursionFight.java | 34 +- javelin/controller/fight/LairFight.java | 22 +- javelin/controller/fight/PlanarFight.java | 67 +- .../fight/RandomDungeonEncounter.java | 63 +- javelin/controller/fight/RandomEncounter.java | 28 +- javelin/controller/fight/Siege.java | 109 + javelin/controller/map/MapGenerator.java | 13 +- javelin/controller/tournament/Exhibition.java | 13 +- javelin/controller/tournament/Horde.java | 3 +- javelin/controller/upgrade/FastHealing.java | 5 +- javelin/controller/upgrade/Spell.java | 28 +- javelin/controller/upgrade/Upgrade.java | 53 +- .../controller/upgrade/UpgradeHandler.java | 175 +- .../upgrade/ability/RaiseAbility.java | 3 +- .../upgrade/ability/RaiseCharisma.java | 2 +- .../upgrade/ability/RaiseConsitution.java | 5 +- .../upgrade/ability/RaiseDexterity.java | 1 - .../upgrade/ability/RaiseIntelligence.java | 2 +- .../upgrade/ability/RaiseStrength.java | 3 +- .../upgrade/ability/RaiseWisdom.java | 3 +- .../controller/upgrade/skill/Acrobatics.java | 24 + .../upgrade/skill/Concentration.java | 24 + .../controller/upgrade/skill/Diplomacy.java | 24 + .../upgrade/skill/DisableDevice.java | 24 + .../upgrade/skill/GatherInformation.java | 24 + javelin/controller/upgrade/skill/Hide.java | 24 + .../controller/upgrade/skill/Knowledge.java | 24 + javelin/controller/upgrade/skill/Listen.java | 24 + .../upgrade/skill/MoveSilently.java | 24 + javelin/controller/upgrade/skill/Search.java | 24 + .../upgrade/skill/SkillUpgrade.java | 44 + .../controller/upgrade/skill/Spellcraft.java | 24 + javelin/controller/upgrade/skill/Spot.java | 24 + .../controller/upgrade/skill/Survival.java | 24 + javelin/model/BattleMap.java | 7 +- javelin/model/EquipmentMap.java | 15 +- javelin/model/Realm.java | 98 + javelin/model/condition/Paralyzed.java | 2 - javelin/model/item/Item.java | 225 +- javelin/model/item/ItemSelection.java | 28 +- javelin/model/item/Key.java | 39 +- .../model/item/artifact/AmuletOfHealth.java | 30 + javelin/model/item/artifact/Artifact.java | 141 + .../item/artifact/BeltOfGiantStrength.java | 31 + .../model/item/artifact/CloakOfCharisma.java | 31 + .../item/artifact/CloakOfResistance.java | 35 + .../item/artifact/GlovesOfDexterity.java | 30 + .../model/item/artifact/GogglesOfNight.java | 32 + .../item/artifact/HeadbandOfIntellect.java | 31 + .../artifact/MantleOfSpellResistance.java | 29 + .../model/item/artifact/PeriaptOfWisdom.java | 30 + .../item/artifact/RingOfEnergyResistance.java | 45 + .../model/item/artifact/RingOfProtection.java | 29 + javelin/model/item/artifact/Slot.java | 147 + .../model/item/artifact/WingsOfFlying.java | 29 + javelin/model/item/potion/Potion.java | 4 - .../item/potion/totem/BearsEndurance.java | 6 +- .../item/potion/totem/BullsStrength.java | 6 +- .../model/item/potion/totem/CatsGrace.java | 5 +- .../item/potion/totem/EaglesSplendor.java | 4 +- .../model/item/potion/totem/FoxsCunning.java | 4 +- .../model/item/potion/totem/OwlsWisdom.java | 8 +- javelin/model/item/scroll/PryingEyes.java | 37 + javelin/model/item/scroll/RaiseScroll.java | 17 +- javelin/model/item/scroll/RecallScroll.java | 33 +- .../model/item/scroll/RessurectScroll.java | 5 +- javelin/model/item/scroll/Scroll.java | 33 +- .../item/scroll/SecureShelterScroll.java | 20 +- javelin/model/item/scroll/Teleport.java | 23 +- .../item/scroll/dungeon/DiscernLocation.java | 14 +- .../item/scroll/dungeon/DungeonScroll.java | 15 +- .../item/scroll/dungeon/LocateObject.java | 12 +- .../model/item/scroll/dungeon/PryingEyes.java | 27 - javelin/model/spell/ScrollSpell.java | 62 + javelin/model/spell/totem/BearsEndurance.java | 4 +- javelin/model/spell/totem/BullsStrength.java | 4 +- javelin/model/spell/totem/CatsGrace.java | 1 - javelin/model/spell/totem/OwlsWisdom.java | 4 +- javelin/model/unit/Combatant.java | 43 +- javelin/model/unit/Monster.java | 145 +- javelin/model/unit/Skills.java | 64 + javelin/model/world/Dungeon.java | 225 -- javelin/model/world/Haxor.java | 95 - javelin/model/world/Incursion.java | 303 +- javelin/model/world/Lair.java | 43 - javelin/model/world/Merchant.java | 133 + javelin/model/world/QueueItem.java | 25 - javelin/model/world/Squad.java | 448 ++- javelin/model/world/Town.java | 224 -- javelin/model/world/World.java | 531 +++ javelin/model/world/WorldActor.java | 125 +- javelin/model/world/WorldMap.java | 336 -- javelin/model/world/WorldPlace.java | 78 - javelin/model/world/place/Lair.java | 33 + javelin/model/world/place/Outpost.java | 67 + javelin/model/world/{ => place}/Portal.java | 105 +- javelin/model/world/place/WorldPlace.java | 340 ++ .../model/world/place/dungeon/Crawler.java | 43 + .../model/world/place/dungeon/Dungeon.java | 314 ++ .../{ => world/place}/dungeon/Feature.java | 17 +- .../{ => world/place}/dungeon/Fountain.java | 7 +- .../{ => world/place}/dungeon/StairsUp.java | 6 +- javelin/model/world/place/dungeon/Trap.java | 164 + .../{ => world/place}/dungeon/Treasure.java | 26 +- .../model/world/place/guarded/Academy.java | 79 + .../model/world/place/guarded/Dwelling.java | 140 + .../world/place/guarded/GuardedPlace.java | 165 + .../model/world/place/guarded/Guardian.java | 95 + javelin/model/world/place/guarded/Inn.java | 55 + javelin/model/world/place/guarded/Shrine.java | 161 + .../world/place/town/Accommodations.java | 64 + .../model/world/place/town/CraftingOrder.java | 23 + javelin/model/world/place/town/Order.java | 44 + .../town/OrderQueue.java} | 31 +- .../model/world/place/town/ResearchData.java | 64 + .../model/world/place/town/ResearchQueue.java | 32 + javelin/model/world/place/town/Town.java | 390 +++ .../model/world/place/town/TrainingOrder.java | 39 + javelin/model/world/place/town/Transport.java | 26 + .../place/town/manager/HumanManager.java | 48 + .../place/town/manager/MonsterManager.java | 34 + .../world/place/town/manager/TownManager.java | 72 + .../town/research/AccommodationResearch.java | 34 + .../world/place/town/research/Discard.java | 46 + .../model/world/place/town/research/Grow.java | 26 + .../place/town/research/ItemResearch.java | 42 + .../place/town/research/LairResearch.java | 41 + .../world/place/town/research/Recruit.java | 68 + .../world/place/town/research/Redraw.java | 27 + .../world/place/town/research/Research.java | 238 ++ .../town/research/SpecialResearchCard.java | 24 + .../town/research/TransportResearch.java | 35 + .../place/town/research/UpgradeResearch.java | 36 + .../model/world/place/unique/Artificer.java | 121 + javelin/model/world/place/unique/Haxor.java | 126 + .../world/place/unique/MercenariesGuild.java | 167 + .../world/place/unique/UniqueLocation.java | 39 + javelin/view/Images.java | 80 + javelin/view/MapPanel.java | 149 +- javelin/view/StatusPanel.java | 2 +- javelin/view/screen/BattleScreen.java | 76 +- javelin/view/screen/BribingScreen.java | 88 + .../screen/{world => }/DungeonScreen.java | 45 +- javelin/view/screen/HaxorScreen.java | 376 --- .../view/screen}/InfoScreen.java | 36 +- javelin/view/screen/IntroScreen.java | 1 - javelin/view/screen/LairScreen.java | 5 +- .../view/screen/{town/option => }/Option.java | 10 +- javelin/view/{ => screen}/SquadScreen.java | 43 +- javelin/view/screen/StatisticsScreen.java | 85 +- .../view/screen/{world => }/WorldScreen.java | 260 +- javelin/view/screen/haxor/BorrowMoney.java | 30 + javelin/view/screen/haxor/ChangeAvatar.java | 77 + javelin/view/screen/haxor/Hax.java | 28 + javelin/view/screen/haxor/HaxorScreen.java | 216 ++ javelin/view/screen/haxor/Materialize.java | 60 + javelin/view/screen/haxor/Rebirth.java | 37 + javelin/view/screen/haxor/RemoveAbility.java | 49 + javelin/view/screen/haxor/Ressurect.java | 27 + javelin/view/screen/haxor/SummonAlly.java | 47 + javelin/view/screen/haxor/Win.java | 51 + .../view/screen/shopping/ArtificerScreen.java | 123 + .../view/screen/shopping/MerchantScreen.java | 35 + .../view/screen/shopping/ShoppingScreen.java | 65 + .../view/screen/shopping/TownShopScreen.java | 36 + javelin/view/screen/town/PurchaseOption.java | 19 + javelin/view/screen/town/PurchaseScreen.java | 26 +- javelin/view/screen/town/RecruitScreen.java | 148 +- javelin/view/screen/town/ResearchScreen.java | 86 + javelin/view/screen/town/SelectScreen.java | 71 +- javelin/view/screen/town/ShoppingScreen.java | 75 - javelin/view/screen/town/TownScreen.java | 166 +- javelin/view/screen/town/TransportScreen.java | 46 +- .../screen/town/option/RecruitOption.java | 1 + .../town/option/RecruitScreenOption.java | 6 +- .../town/option/ResearchScreenOption.java | 25 + .../view/screen/town/option/ScreenOption.java | 11 +- .../screen/town/option/ShopScreenOption.java | 12 +- .../town/option/TournamentScreenOption.java | 33 +- .../town/option/TransportScreenOption.java | 6 +- .../screen/town/option/UpgradeOption.java | 5 +- .../town/option/UpgradingScreenOption.java | 10 +- .../view/screen/upgrading/AcademyScreen.java | 69 + .../screen/upgrading/TownUpgradingScreen.java | 43 + .../{town => upgrading}/UpgradingScreen.java | 150 +- monsters.xml | 218 +- package.sh | 2 +- preferences.properties | 3 - tyrant/mikera/engine/Lib.java | 52 +- tyrant/mikera/tyrant/Artifact.java | 958 +++--- tyrant/mikera/tyrant/Game.java | 1 + tyrant/mikera/tyrant/Person.java | 159 +- tyrant/mikera/tyrant/Portal.java | 24 +- tyrant/mikera/tyrant/QuestApp.java | 97 +- tyrant/mikera/tyrant/Town.java | 1946 +++++------ tyrant/mikera/tyrant/Trap.java | 484 +-- 1018 files changed, 87098 insertions(+), 10381 deletions(-) create mode 100644 avatars/humanfemale.png create mode 100644 avatars/humanmale.png delete mode 100644 doc/OGLv1.0a.rtf create mode 100644 doc/OGLv1.0a.txt create mode 100644 doc/artifacts.txt create mode 100644 doc/javadoc/javelin/controller/action/world/Dismiss.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Acrobatics.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Concentration.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Diplomacy.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/DisableDevice.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/GatherInformation.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Hide.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Knowledge.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Listen.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/MoveSilently.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Search.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/SkillUpgrade.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/SkillsFactor.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Spellcraft.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Spot.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/Survival.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/package-frame.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/package-summary.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/skill/package-tree.html create mode 100644 doc/javadoc/javelin/controller/db/reader/factor/Alignment.html create mode 100644 doc/javadoc/javelin/controller/db/reader/factor/Skills.html create mode 100644 doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html create mode 100644 doc/javadoc/javelin/controller/fight/Siege.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Acrobatics.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Concentration.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Diplomacy.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/DisableDevice.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/GatherInformation.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Hide.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Knowledge.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Listen.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/MoveSilently.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Search.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/SkillUpgrade.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Spellcraft.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Spot.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/Survival.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/package-frame.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/package-summary.html create mode 100644 doc/javadoc/javelin/controller/upgrade/skill/package-tree.html create mode 100644 doc/javadoc/javelin/model/BattleMap.VisionCache.html create mode 100644 doc/javadoc/javelin/model/Realm.html create mode 100644 doc/javadoc/javelin/model/item/artifact/AmuletOfHealth.html create mode 100644 doc/javadoc/javelin/model/item/artifact/Artifact.html create mode 100644 doc/javadoc/javelin/model/item/artifact/BeltOfGiantStrength.html create mode 100644 doc/javadoc/javelin/model/item/artifact/CloakOfCharisma.html create mode 100644 doc/javadoc/javelin/model/item/artifact/CloakOfResistance.html create mode 100644 doc/javadoc/javelin/model/item/artifact/GlovesOfDexterity.html create mode 100644 doc/javadoc/javelin/model/item/artifact/GogglesOfNight.html create mode 100644 doc/javadoc/javelin/model/item/artifact/HeadbandOfIntellect.html create mode 100644 doc/javadoc/javelin/model/item/artifact/MantleOfSpellResistance.html create mode 100644 doc/javadoc/javelin/model/item/artifact/PeriaptOfWisdom.html create mode 100644 doc/javadoc/javelin/model/item/artifact/RingOfEnergyResistance.html create mode 100644 doc/javadoc/javelin/model/item/artifact/RingOfProtection.html create mode 100644 doc/javadoc/javelin/model/item/artifact/Slot.html create mode 100644 doc/javadoc/javelin/model/item/artifact/WingsOfFlying.html create mode 100644 doc/javadoc/javelin/model/item/artifact/package-frame.html create mode 100644 doc/javadoc/javelin/model/item/artifact/package-summary.html create mode 100644 doc/javadoc/javelin/model/item/artifact/package-tree.html create mode 100644 doc/javadoc/javelin/model/item/scroll/PryingEyes.html create mode 100644 doc/javadoc/javelin/model/spell/ScrollSpell.html create mode 100644 doc/javadoc/javelin/model/unit/Skills.html create mode 100644 doc/javadoc/javelin/model/world/Merchant.html create mode 100644 doc/javadoc/javelin/model/world/World.Region.html create mode 100644 doc/javadoc/javelin/model/world/World.html create mode 100644 doc/javadoc/javelin/model/world/place/Academy.html create mode 100644 doc/javadoc/javelin/model/world/place/Dungeon.html create mode 100644 doc/javadoc/javelin/model/world/place/Dwelling.html create mode 100644 doc/javadoc/javelin/model/world/place/GuardedPlace.html create mode 100644 doc/javadoc/javelin/model/world/place/Guardian.html create mode 100644 doc/javadoc/javelin/model/world/place/Haxor.html create mode 100644 doc/javadoc/javelin/model/world/place/Inn.html create mode 100644 doc/javadoc/javelin/model/world/place/Lair.html create mode 100644 doc/javadoc/javelin/model/world/place/Outpost.html create mode 100644 doc/javadoc/javelin/model/world/place/Portal.html create mode 100644 doc/javadoc/javelin/model/world/place/Shrine.html create mode 100644 doc/javadoc/javelin/model/world/place/WorldPlace.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Crawler.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Dungeon.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Feature.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Fountain.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/StairsUp.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Trap.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/Treasure.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/dungeon/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/Academy.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/Dwelling.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/GuardedPlace.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/Guardian.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/Inn.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/Shrine.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/guarded/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Accommodations.RestOption.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Accommodations.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Accomodations.RestOption.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Accomodations.html create mode 100644 doc/javadoc/javelin/model/world/place/town/CraftingOrder.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Order.html create mode 100644 doc/javadoc/javelin/model/world/place/town/OrderQueue.html create mode 100644 doc/javadoc/javelin/model/world/place/town/ResearchData.html create mode 100644 doc/javadoc/javelin/model/world/place/town/ResearchQueue.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Town.html create mode 100644 doc/javadoc/javelin/model/world/place/town/TrainingOrder.html create mode 100644 doc/javadoc/javelin/model/world/place/town/Transport.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/HumanManager.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/MonsterManager.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/TownManager.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/town/manager/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/town/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/town/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/town/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/AccommodationResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/AccomodationResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/Discard.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/Grow.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/ItemResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/LairResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/Recruit.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/Redraw.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/Research.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/SpecialResearchCard.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/TransportResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/UpgradeResearch.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/town/research/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/Artificer.Selection.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/Artificer.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/Haxor.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/MercenariesGuild.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/UniqueLocation.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/place/unique/package-tree.html create mode 100644 doc/javadoc/javelin/view/Images.html create mode 100644 doc/javadoc/javelin/view/screen/BribingScreen.html create mode 100644 doc/javadoc/javelin/view/screen/DungeonScreen.html create mode 100644 doc/javadoc/javelin/view/screen/InfoScreen.html create mode 100644 doc/javadoc/javelin/view/screen/Option.html create mode 100644 doc/javadoc/javelin/view/screen/SquadScreen.html create mode 100644 doc/javadoc/javelin/view/screen/WorldScreen.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/BorrowMoney.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/ChangeAvatar.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/Hax.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/HaxorScreen.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/Materialize.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/Rebirth.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/RemoveAbility.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/Ressurect.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/SummonAlly.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/Win.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/package-frame.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/package-summary.html create mode 100644 doc/javadoc/javelin/view/screen/haxor/package-tree.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/ArtificerScreen.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/MerchantScreen.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/ShoppingScreen.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/TownShopScreen.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/package-frame.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/package-summary.html create mode 100644 doc/javadoc/javelin/view/screen/shopping/package-tree.html create mode 100644 doc/javadoc/javelin/view/screen/town/PurchaseOption.html create mode 100644 doc/javadoc/javelin/view/screen/town/ResearchScreen.html create mode 100644 doc/javadoc/javelin/view/screen/town/option/ResearchScreenOption.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/AcademyScreen.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/TownUpgradingScreen.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/UpgradingScreen.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/package-frame.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/package-summary.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/package-tree.html create mode 100644 doc/skills.txt create mode 100644 images/academy.png create mode 100644 images/arena.png create mode 100644 images/banner2.png create mode 100644 images/dungeon.png create mode 100644 images/dwelling.png create mode 100644 images/guardian.png create mode 100644 images/haxor.png create mode 100644 images/hostile.png create mode 100644 images/inn.png create mode 100644 images/lair.png create mode 100644 images/outpost.png create mode 100644 images/portal.png create mode 100644 images/shop.png create mode 100644 images/shrine.png create mode 100644 images/town.png create mode 100644 images/town2.png create mode 100644 images/university.png create mode 100644 images/upgrading2.png create mode 100644 javelin/controller/action/world/Dismiss.java create mode 100644 javelin/controller/challenge/factor/SkillsFactor.java create mode 100644 javelin/controller/db/reader/factor/Alignment.java create mode 100644 javelin/controller/db/reader/factor/Skills.java create mode 100644 javelin/controller/encounter/MisalignmentDetector.java create mode 100644 javelin/controller/fight/Siege.java create mode 100644 javelin/controller/upgrade/skill/Acrobatics.java create mode 100644 javelin/controller/upgrade/skill/Concentration.java create mode 100644 javelin/controller/upgrade/skill/Diplomacy.java create mode 100644 javelin/controller/upgrade/skill/DisableDevice.java create mode 100644 javelin/controller/upgrade/skill/GatherInformation.java create mode 100644 javelin/controller/upgrade/skill/Hide.java create mode 100644 javelin/controller/upgrade/skill/Knowledge.java create mode 100644 javelin/controller/upgrade/skill/Listen.java create mode 100644 javelin/controller/upgrade/skill/MoveSilently.java create mode 100644 javelin/controller/upgrade/skill/Search.java create mode 100644 javelin/controller/upgrade/skill/SkillUpgrade.java create mode 100644 javelin/controller/upgrade/skill/Spellcraft.java create mode 100644 javelin/controller/upgrade/skill/Spot.java create mode 100644 javelin/controller/upgrade/skill/Survival.java create mode 100644 javelin/model/Realm.java create mode 100644 javelin/model/item/artifact/AmuletOfHealth.java create mode 100644 javelin/model/item/artifact/Artifact.java create mode 100644 javelin/model/item/artifact/BeltOfGiantStrength.java create mode 100644 javelin/model/item/artifact/CloakOfCharisma.java create mode 100644 javelin/model/item/artifact/CloakOfResistance.java create mode 100644 javelin/model/item/artifact/GlovesOfDexterity.java create mode 100644 javelin/model/item/artifact/GogglesOfNight.java create mode 100644 javelin/model/item/artifact/HeadbandOfIntellect.java create mode 100644 javelin/model/item/artifact/MantleOfSpellResistance.java create mode 100644 javelin/model/item/artifact/PeriaptOfWisdom.java create mode 100644 javelin/model/item/artifact/RingOfEnergyResistance.java create mode 100644 javelin/model/item/artifact/RingOfProtection.java create mode 100644 javelin/model/item/artifact/Slot.java create mode 100644 javelin/model/item/artifact/WingsOfFlying.java create mode 100644 javelin/model/item/scroll/PryingEyes.java delete mode 100644 javelin/model/item/scroll/dungeon/PryingEyes.java create mode 100644 javelin/model/spell/ScrollSpell.java create mode 100644 javelin/model/unit/Skills.java delete mode 100644 javelin/model/world/Dungeon.java delete mode 100644 javelin/model/world/Haxor.java delete mode 100644 javelin/model/world/Lair.java create mode 100644 javelin/model/world/Merchant.java delete mode 100644 javelin/model/world/QueueItem.java delete mode 100644 javelin/model/world/Town.java create mode 100644 javelin/model/world/World.java delete mode 100644 javelin/model/world/WorldMap.java delete mode 100644 javelin/model/world/WorldPlace.java create mode 100644 javelin/model/world/place/Lair.java create mode 100644 javelin/model/world/place/Outpost.java rename javelin/model/world/{ => place}/Portal.java (68%) create mode 100644 javelin/model/world/place/WorldPlace.java create mode 100644 javelin/model/world/place/dungeon/Crawler.java create mode 100644 javelin/model/world/place/dungeon/Dungeon.java rename javelin/model/{ => world/place}/dungeon/Feature.java (58%) rename javelin/model/{ => world/place}/dungeon/Fountain.java (78%) rename javelin/model/{ => world/place}/dungeon/StairsUp.java (71%) create mode 100644 javelin/model/world/place/dungeon/Trap.java rename javelin/model/{ => world/place}/dungeon/Treasure.java (60%) create mode 100644 javelin/model/world/place/guarded/Academy.java create mode 100644 javelin/model/world/place/guarded/Dwelling.java create mode 100644 javelin/model/world/place/guarded/GuardedPlace.java create mode 100644 javelin/model/world/place/guarded/Guardian.java create mode 100644 javelin/model/world/place/guarded/Inn.java create mode 100644 javelin/model/world/place/guarded/Shrine.java create mode 100644 javelin/model/world/place/town/Accommodations.java create mode 100644 javelin/model/world/place/town/CraftingOrder.java create mode 100644 javelin/model/world/place/town/Order.java rename javelin/model/world/{TownQueue.java => place/town/OrderQueue.java} (57%) create mode 100644 javelin/model/world/place/town/ResearchData.java create mode 100644 javelin/model/world/place/town/ResearchQueue.java create mode 100644 javelin/model/world/place/town/Town.java create mode 100644 javelin/model/world/place/town/TrainingOrder.java create mode 100644 javelin/model/world/place/town/Transport.java create mode 100644 javelin/model/world/place/town/manager/HumanManager.java create mode 100644 javelin/model/world/place/town/manager/MonsterManager.java create mode 100644 javelin/model/world/place/town/manager/TownManager.java create mode 100644 javelin/model/world/place/town/research/AccommodationResearch.java create mode 100644 javelin/model/world/place/town/research/Discard.java create mode 100644 javelin/model/world/place/town/research/Grow.java create mode 100644 javelin/model/world/place/town/research/ItemResearch.java create mode 100644 javelin/model/world/place/town/research/LairResearch.java create mode 100644 javelin/model/world/place/town/research/Recruit.java create mode 100644 javelin/model/world/place/town/research/Redraw.java create mode 100644 javelin/model/world/place/town/research/Research.java create mode 100644 javelin/model/world/place/town/research/SpecialResearchCard.java create mode 100644 javelin/model/world/place/town/research/TransportResearch.java create mode 100644 javelin/model/world/place/town/research/UpgradeResearch.java create mode 100644 javelin/model/world/place/unique/Artificer.java create mode 100644 javelin/model/world/place/unique/Haxor.java create mode 100644 javelin/model/world/place/unique/MercenariesGuild.java create mode 100644 javelin/model/world/place/unique/UniqueLocation.java create mode 100644 javelin/view/Images.java create mode 100644 javelin/view/screen/BribingScreen.java rename javelin/view/screen/{world => }/DungeonScreen.java (69%) delete mode 100644 javelin/view/screen/HaxorScreen.java rename {tyrant/mikera/tyrant => javelin/view/screen}/InfoScreen.java (68%) rename javelin/view/screen/{town/option => }/Option.java (66%) rename javelin/view/{ => screen}/SquadScreen.java (75%) rename javelin/view/screen/{world => }/WorldScreen.java (59%) create mode 100644 javelin/view/screen/haxor/BorrowMoney.java create mode 100644 javelin/view/screen/haxor/ChangeAvatar.java create mode 100644 javelin/view/screen/haxor/Hax.java create mode 100644 javelin/view/screen/haxor/HaxorScreen.java create mode 100644 javelin/view/screen/haxor/Materialize.java create mode 100644 javelin/view/screen/haxor/Rebirth.java create mode 100644 javelin/view/screen/haxor/RemoveAbility.java create mode 100644 javelin/view/screen/haxor/Ressurect.java create mode 100644 javelin/view/screen/haxor/SummonAlly.java create mode 100644 javelin/view/screen/haxor/Win.java create mode 100644 javelin/view/screen/shopping/ArtificerScreen.java create mode 100644 javelin/view/screen/shopping/MerchantScreen.java create mode 100644 javelin/view/screen/shopping/ShoppingScreen.java create mode 100644 javelin/view/screen/shopping/TownShopScreen.java create mode 100644 javelin/view/screen/town/PurchaseOption.java create mode 100644 javelin/view/screen/town/ResearchScreen.java delete mode 100644 javelin/view/screen/town/ShoppingScreen.java create mode 100644 javelin/view/screen/town/option/ResearchScreenOption.java create mode 100644 javelin/view/screen/upgrading/AcademyScreen.java create mode 100644 javelin/view/screen/upgrading/TownUpgradingScreen.java rename javelin/view/screen/{town => upgrading}/UpgradingScreen.java (51%) diff --git a/.gitignore b/.gitignore index ffd2bc3f0..260b24616 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.save* bin TODO -avatars/more +avatarsmore javelin.zip javelin.jar .directory diff --git a/avatars/humanfemale.png b/avatars/humanfemale.png new file mode 100644 index 0000000000000000000000000000000000000000..d01030664015f5322c38ddb0f457d54d510489e2 GIT binary patch literal 1218 zcmV;z1U>tSP)Zn!P)BV%ZjZ4>fb?FzJB-VI|;@}X0TVZUjQa=eiJHnZ6&FnUp z<8FnEFa6EeQv*bWMeY2rjEDeU00!zbhD{Awv*x`Jz1`>ckt#dBO_MSagfLXloZdZ4 zx;0L4K?mg{zFJWRa@q9A!WKAJn}a(cNgBBD@&aW~g8@6D$f-DihS0}aX$dCHhhDZJ zEvddAf&leyh`rfHUp62izS%~f*OU+Y1b4!f>jA4t8r5eJq%^hB5JvC4pZ~!nh{nJ~ z5Fz*jA>P@5aKYT)Y92@8M*>it%H%&uAdFzznzwyo>fBi%(CTMfZ&G&X*DXn9v+QkmU5x zJY=D7ZH}+@@4>i&*N>j!+IUGUn*lu$3jK2^a6u+4!oU!X2)b8C+0+)Je>_J2SOh0t z!$QIgIA;T>2!vWmA85kF8Y~J3XXx^mJGln zPruwepaJW^jwI`{Db5VKM5B^@TWxNYJ&yl4O=%&lUmgHdB93Wph%xJH1}4i`Lb857 zjZ=ft!UGTJ25zi)9sp>FC}I&o&DWG`0W*$Isba_`B>nC7eGje{ zIIcMM-87wrD6c-Bu5TiGxPc7nKdygc(xbZ&gJ=${@6LUgwZN|p&VYZ^{2S5n0 zq#$J*v{zl6Ps=dpN>VYwhK_js04OQRt+LqFqlwDJ63PfVGd_K-HgD`q-{)!N0XRBj zxLD&#(Phe8r26i>7T0Gy28#}k4~Je%lTAvq;#V_EU@{3sH4Jg8;lp(-3^7P4i25+= gKwy@C39kG42h#z=H1uyzH2?qr07*qoM6N<$f&!H=cmMzZ literal 0 HcmV?d00001 diff --git a/avatars/humanmale.png b/avatars/humanmale.png new file mode 100644 index 0000000000000000000000000000000000000000..2ac0235131bcd658752e7b9d9a6929f4927267de GIT binary patch literal 1434 zcmV;L1!ek)P)F zK~z}7)t6aJlvfnTe>2R+00Yhlh=MZ+DpKo~1{G^vicM{d(u&}c+;ic7EOOTvEUKXzQ3UFI@9HOkpj%Tf8^0VkPKEfuv^ zN9LO8+$Rzb6;&X|9~~XZD03|4xETmw_npUPcLx;8KqA1YN-OVXodZ=EsKWTGrjH(% zJU#%II{Wx|YZ}ds)wDEL^WM4zn9T730Z{!%)(=Q-Q5Cad$KV63xG20>cekG6QAR*c zb}YqoIS0Nufzc98Om!(iDg_#~(4G4yQ3<06{^c~|>I*1nPaiTNhXO!;^kgtELXUPr z8Z23WWvr3u$`%yetw>iZQTqO6mwbZ};sQ5{My1ptvUqILUQ@({S|A zaV{QnF|xLlsM=D>j(W)bJr@e09)J_KOT;iaAju-sU;UQCatrAxxtxme(lTWRUxrk3 zJ#hg5hiCez8=pY(h?ArcME+?Dq47EviIAgE$S?{XqH>DFWL%XMt3MT+;~7~m*)qPe zP{WVREc?Y_OOO{moNJ!PMLWc;e1`Np?AI_1z*H(zg zG_gyvbW5U$=%vK@lFZ+KR-#k>kqM^PC2{F$F|@Xc;!3$+5Pmt(qlrYV0k5G6->uxv zdZ$48p8kN^kQB_`13W=n{9YydHo3LtM!KO11?7eBhsRT`r z9i8n5@-o-4Ds2oC+>KbY8k}t&HWbSPeff<*#Iz*b_D*&mXapKrynH>+&R{ZPXdFO4dDadr6SZi= zmGpG>QF!Pe#W@E_4((&2S&7G}r8{&7PG=1zop8LyPH~IJ8z>1CJF~0qD5Gju1&u9} zI93CBM}EV5aTkfEE@n)aj4w8cP8(pa7}&o%r%hrEy>&o*pqEjA zkg+(Gu(1YMCJ#K!Pyt-)|Cl)XIc_w;(OM{}vC?vW&pp3t>zh$j*I&h}0#`54?7pw9 zfEtpbKju);0A=maV{O2BE&INCZFi^%ivX3!i$?w3qiIOCY)BV_PN}HsC}!TN<;*pz z`1%3L)~iS8xqOZ=&1^CfkD!%k_UAYI<-tR{VudnD;kCD-J&;aTe!XAa&-c9rz}jV{ oXq3G;AHmyD0(?sby6^GJzZXI}F&Pe}8~^|S07*qoM6N<$f)KxwMF0Q* literal 0 HcmV?d00001 diff --git a/doc/CHANGELOG.txt b/doc/CHANGELOG.txt index 01f691d4b..53bd3dd71 100644 --- a/doc/CHANGELOG.txt +++ b/doc/CHANGELOG.txt @@ -1,10 +1,24 @@ +Version 1.3 (2016-04-29) + + * 6 independent, opposing factions to play against at every game! + * City-building, automatic or manual! + * Equippable artifacts! + * 6 new location types to explore on the world map! + * 2 new unique locations: mercenary guild and artificer! + * Skill system, featuring 13 different skills! + * New units can now be acquired by spending XP + * The world map now has to be explored + * Dungeon redesign, featuring traps + * 137 monsters + * 28 items, 33 artifacts + * 53 upgrades, 25 spells, 13 skills + Version 1.2 (2016-02-29) * Minor release in response to community feedback on 1.1 * Improved documentation - * Minor bugfixes * Breath area now ignores cover - * AI cache is now disabled by default (can slow-down some systems) + * AI cache is now disabled by default (can slow down some systems) Version 1.1 (2016-02-26) diff --git a/doc/OGLv1.0a.rtf b/doc/OGLv1.0a.rtf deleted file mode 100644 index db4267749..000000000 --- a/doc/OGLv1.0a.rtf +++ /dev/null @@ -1,70 +0,0 @@ -{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f16\froman\fcharset238\fprq2 Times New Roman CE;}{\f17\froman\fcharset204\fprq2 Times New Roman Cyr;} -{\f19\froman\fcharset161\fprq2 Times New Roman Greek;}{\f20\froman\fcharset162\fprq2 Times New Roman Tur;}{\f21\froman\fcharset186\fprq2 Times New Roman Baltic;}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255; -\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0; -\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\widctlpar\adjustright \fs20\cgrid \snext0 Normal;}{\*\cs10 \additive Default Paragraph Font;}}{\info{\title OPEN GAME LICENSE Version 1}{\author Ryan Dancey}{\operator Ryan Dancey} -{\creatim\yr2001\mo4\dy4\hr9\min49}{\revtim\yr2001\mo4\dy4\hr9\min50}{\version1}{\edmins1}{\nofpages2}{\nofwords891}{\nofchars5080}{\*\company Wizards of the Coast}{\nofcharsws6238}{\vern113}}\margl1440\margr1440 -\widowctrl\ftnbj\aenddoc\formshade\viewkind4\viewscale100\pgbrdrhead\pgbrdrfoot \fet0\sectd \linex0\headery1440\footery1440\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang -{\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang -{\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain -\widctlpar\adjustright \fs20\cgrid {OPEN GAME LICENSE Version 1.0a -\par }{ -\par }{The following text is the property of Wizards of the Coast, Inc. and is Copyright 2000 Wizards of the Coast, Inc ("Wizards"). All Rights Reserved. -\par }{ -\par }{1. Definitions: (a)"Contributors" means - the copyright and/or trademark owners who have contributed Open Game Content; (b)"Derivative Material" means copyrighted material including derivative works and translations (including into other computer languages), potation, modification, correction, a -d -dition, extension, upgrade, improvement, compilation, abridgment or other form in which an existing work may be recast, transformed or adapted; (c) "Distribute" means to reproduce, license, rent, lease, sell, broadcast, publicly display, transmit or other -w -ise distribute; (d)"Open Game Content" means the game mechanic and includes the methods, procedures, processes and routines to the extent such content does not embody the Product Identity and is an enhancement over the prior art and any additional content - -clearly identified as Open Game Content by the Contributor, and means any work covered by this License, including translations and derivative works under copyright law, but specifically excludes Product Identity. (e) "Product Identity" means product and p -r -oduct line names, logos and identifying marks including trade dress; artifacts; creatures characters; stories, storylines, plots, thematic elements, dialogue, incidents, language, artwork, symbols, designs, depictions, likenesses, formats, poses, concepts -, - themes and graphic, photographic and other visual or audio representations; names and descriptions of characters, spells, enchantments, personalities, teams, personas, likenesses and special abilities; places, locations, environments, creatures, equipmen -t -, magical or supernatural abilities or effects, logos, symbols, or graphic designs; and any other trademark or registered trademark clearly identified as Product identity by the owner of the Product Identity, and which specifically excludes the Open Game -C -ontent; (f) "Trademark" means the logos, names, mark, sign, motto, designs that are used by a Contributor to identify itself or its products or the associated products contributed to the Open Game License by the Contributor (g) "Use", "Used" or "Using" me -ans to use, Distribute, copy, edit, format, modify, translate and otherwise create Derivative Material of Open Game Content. (h) "You" or "Your" means the licensee in terms of this agreement. -\par }{ -\par }{2. The License: This License applies to any Open Game Content tha -t contains a notice indicating that the Open Game Content may only be Used under and in terms of this License. You must affix such a notice to any Open Game Content that you Use. No terms may be added to or subtracted from this License except as described - by the License itself. No other terms or conditions may be applied to any Open Game Content distributed using this License. -\par }{ -\par }{3.Offer and Acceptance: By Using the Open Game Content You indicate Your acceptance of the terms of this License. -\par }{ -\par }{4. Grant and Consideration: In consideration for agreeing to use this License, the Contributors grant You a perpetual, worldwide, royalty-free, non-exclusive license with the exact terms of this License to Use, the Open Game Content. -\par }{ -\par }{5.Representation of Authority to Contribute: If You are contributing original material as Open Game Content, You represent that Your Contributions are Your original creation and/or You have sufficient rights to grant the rights conveyed by this License. - -\par }{ -\par }{6.Notice of License Copyright: You must up -date the COPYRIGHT NOTICE portion of this License to include the exact text of the COPYRIGHT NOTICE of any Open Game Content You are copying, modifying or distributing, and You must add the title, the copyright date, and the copyright holder's name to the - COPYRIGHT NOTICE of any original Open Game Content you Distribute. -\par }{ -\par }{7. Use of Product Identity: You agree not to Use any Product Identity, including as an indication as to compatibility, except as expressly licensed in another, independent Agreement with th -e owner of each element of that Product Identity. You agree not to indicate compatibility or co-adaptability with any Trademark or Registered Trademark in conjunction with a work containing Open Game Content except as expressly licensed in another, indepe -n -dent Agreement with the owner of such Trademark or Registered Trademark. The use of any Product Identity in Open Game Content does not constitute a challenge to the ownership of that Product Identity. The owner of any Product Identity used in Open Game Co -ntent shall retain all rights, title and interest in and to that Product Identity. -\par }{ -\par }{8. Identification: If you distribute Open Game Content You must clearly indicate which portions of the work that you are distributing are Open Game Content. -\par }{ -\par }{9. Updating the L -icense: Wizards or its designated Agents may publish updated versions of this License. You may use any authorized version of this License to copy, modify and distribute any Open Game Content originally distributed under any version of this License. -\par }{ -\par }{10 Copy of this License: You MUST include a copy of this License with every copy of the Open Game Content You Distribute. -\par }{ -\par }{11. Use of Contributor Credits: You may not market or advertise the Open Game Content using the name of any Contributor unless You have written permission from the Contributor to do so. -\par }{ -\par }{12 Inability to Comply: If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Open Game Content due to statute, judicial order, or governmental regulation - then You may not Use any Open Game Material so affected. -\par }{ -\par }{13 Termination: This License will terminate automatically if You fail to comply with all terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses shall survive the termination of this License. -\par }{ -\par }{14 Reformation: If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. -\par }{ -\par }{15 COPYRIGHT NOTICE\line Open Game License v 1.0 Copyright 2000, Wizards of the Coast, Inc. -\par }{\fs24 -\par }} \ No newline at end of file diff --git a/doc/OGLv1.0a.txt b/doc/OGLv1.0a.txt new file mode 100644 index 000000000..1f0865a89 --- /dev/null +++ b/doc/OGLv1.0a.txt @@ -0,0 +1,39 @@ +OPEN GAME LICENSE Version 1.0a + +The following text is the property of Wizards of the Coast, Inc. and is Copyright 2000 Wizards of the Coast, Inc ("Wizards"). All Rights Reserved. + +1. Definitions: (a)"Contributors" means the copyright and/or trademark owners who have contributed Open Game Content; (b)"Derivative Material" means copyrighted material including derivative works and translations (including into other computer languages), potation, modification, correction, addition, extension, upgrade, improvement, compilation, abridgment or other form in which an existing work may be recast, transformed or adapted; (c) "Distribute" means to reproduce, license, rent, lease, sell, broadcast, publicly display, transmit or otherwise distribute; (d)"Open Game Content" means the game mechanic and includes the methods, procedures, processes and routines to the extent such content does not embody the Product Identity and is an enhancement over the prior art and any additional content clearly identified as Open Game Content by the Contributor, and means any work covered by this License, including translations and derivative works under copyright law, but specifically excludes Product Identity. (e) "Product Identity" means product and product line names, logos and identifying marks including trade dress; artifacts; creatures characters; stories, storylines, plots, thematic elements, dialogue, incidents, language, artwork, symbols, designs, depictions, likenesses, formats, poses, concepts, themes and graphic, photographic and other visual or audio representations; names and descriptions of characters, spells, enchantments, personalities, teams, personas, likenesses and special abilities; places, locations, environments, creatures, equipment, magical or supernatural abilities or effects, logos, symbols, or graphic designs; and any other trademark or registered trademark clearly identified as Product identity by the owner of the Product Identity, and which specifically excludes the Open Game Content; (f) "Trademark" means the logos, names, mark, sign, motto, designs that are used by a Contributor to identify itself or its products or the associated products contributed to the Open Game License by the Contributor (g) "Use", "Used" or "Using" means to use, Distribute, copy, edit, format, modify, translate and otherwise create Derivative Material of Open Game Content. (h) "You" or "Your" means the licensee in terms of this agreement. + +2. The License: This License applies to any Open Game Content that contains a notice indicating that the Open Game Content may only be Used under and in terms of this License. You must affix such a notice to any Open Game Content that you Use. No terms may be added to or subtracted from this License except as described by the License itself. No other terms or conditions may be applied to any Open Game Content distributed using this License. + +3.Offer and Acceptance: By Using the Open Game Content You indicate Your acceptance of the terms of this License. + +4. Grant and Consideration: In consideration for agreeing to use this License, the Contributors grant You a perpetual, worldwide, royalty-free, non-exclusive license with the exact terms of this License to Use, the Open Game Content. + +5.Representation of Authority to Contribute: If You are contributing original material as Open Game Content, You represent that Your Contributions are Your original creation and/or You have sufficient rights to grant the rights conveyed by this License. + +6.Notice of License Copyright: You must update the COPYRIGHT NOTICE portion of this License to include the exact text of the COPYRIGHT NOTICE of any Open Game Content You are copying, modifying or distributing, and You must add the title, the copyright date, and the copyright holder's name to the COPYRIGHT NOTICE of any original Open Game Content you Distribute. + +7. Use of Product Identity: You agree not to Use any Product Identity, including as an indication as to compatibility, except as expressly licensed in another, independent Agreement with the owner of each element of that Product Identity. You agree not to indicate compatibility or co-adaptability with any Trademark or Registered Trademark in conjunction with a work containing Open Game Content except as expressly licensed in another, independent Agreement with the owner of such Trademark or Registered Trademark. The use of any Product Identity in Open Game Content does not constitute a challenge to the ownership of that Product Identity. The owner of any Product Identity used in Open Game Content shall retain all rights, title and interest in and to that Product Identity. + +8. Identification: If you distribute Open Game Content You must clearly indicate which portions of the work that you are distributing are Open Game Content. + +9. Updating the License: Wizards or its designated Agents may publish updated versions of this License. You may use any authorized version of this License to copy, modify and distribute any Open Game Content originally distributed under any version of this License. + +10 Copy of this License: You MUST include a copy of this License with every copy of the Open Game Content You Distribute. + +11. Use of Contributor Credits: You may not market or advertise the Open Game Content using the name of any Contributor unless You have written permission from the Contributor to do so. + +12 Inability to Comply: If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Open Game Content due to statute, judicial order, or governmental regulation then You may not Use any Open Game Material so affected. + +13 Termination: This License will terminate automatically if You fail to comply with all terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses shall survive the termination of this License. + +14 Reformation: If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. + +15 COPYRIGHT NOTICE + +Open Game License v 1.0 Copyright 2000, Wizards of the Coast, Inc. +System Reference Document Copyright 2000-2003, Wizards of the Coast, Inc. +Conversion of System Rules Document monster information to XML format Copyright 2001 John Hanju Kim. +The Hypertext d20 SRD Copyright 2004, Jans W Carton. +Pathfinder OGC (http://www.d20pfsrd.com/), Copyright 2016 John Reyst. \ No newline at end of file diff --git a/doc/artifacts.txt b/doc/artifacts.txt new file mode 100644 index 000000000..f7fed37ef --- /dev/null +++ b/doc/artifacts.txt @@ -0,0 +1,21 @@ +ARTIFACTS GUIDE + +These powerful items can be equipped to enhance a character in some way or +another. + +Each artifact occupies a certain body slot. For example: a character +cannot wear more than one headpiece at the same time. The exception are rings, +which can be worn 2 at a time, one in each hand. + +Amulet of health: raises constitution. +Belt of giant strength: raises strength. +Cloak of charisma: raises charisma. +Cloak of resistance: enhances saving throws. +Gloves of dexterity: raises dexterity. +Goggles of night: provide darkvision. +Headband of intellect: raises intelligence. +Mantle of spell resistance: provides 20 spell resistance. +Periapt of wisdom: raises wisdom. +Ring of energy resistance: provides energy resistance. +Ring of protection: raises armor class. +Wings of flying: provides flying. \ No newline at end of file diff --git a/doc/items.txt b/doc/items.txt index 216384302..f52c4ee02 100644 --- a/doc/items.txt +++ b/doc/items.txt @@ -17,11 +17,11 @@ Potion of flight: gives flight similar to that of a hawk. Potion of heroism: +2 to attack and save rolls. Potion of owl's wisdom: +2 wisdom bonus. Potion of resist energy: reduces a certain amount of damage from most non-physical attacks. -Scroll of discern location: Reveals location of a dungeon's most valuable treasure. +Scroll of discern location: reveals location of a dungeon's most valuable treasure. Scroll of greater teleport: teleports you to any town. -Scroll of locate object: Locates nearest treasure chest in a dungeon. -Scroll of prying eyes: Reveals dungeon map. +Scroll of locate object: locates nearest treasure chest in a dungeon. +Scroll of prying eyes: reveals dungeon or nearby area on world map. Scroll of raise dead & restoration: after battle, ressurects a killed ally. -Scroll of ressurect & restoration: after battle, ressurects a killed ally with full hit points. -Scroll of secure shelter: use it to rest for 8 hours on the world screen. +Scroll of ressurect & restoration: after battle, ressurects a killed ally to full hit points. +Scroll of secure shelter: lets you rest in the wilderness. Scroll of word of recall: returns party to last visited town. diff --git a/doc/javadoc/allclasses-frame.html b/doc/javadoc/allclasses-frame.html index 49e19f11f..1e0278cc3 100644 --- a/doc/javadoc/allclasses-frame.html +++ b/doc/javadoc/allclasses-frame.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -16,6 +16,11 @@

All Classes

  • AbilitiesFactor
  • AbstractAlphaBetaSearch
  • AbstractAttack
    • +
  • Academy
    • +
  • AcademyScreen
    • +
  • AccommodationResearch
    • +
  • Accommodations
    • +
  • Acrobatics
  • Action
  • ActionAdapter
  • ActionDescription
    • @@ -25,11 +30,16 @@

    All Classes

  • AiCache
  • AiMovement
  • AiThread
    • +
  • Alignment
    • +
  • AmuletOfHealth
  • Area
  • Arena
  • Aristocrat
  • ArmorClass
  • ArmorClassFactor
    • +
  • Artifact
    • +
  • Artificer
    • +
  • ArtificerScreen
  • Attack
  • Attacks
  • AttackSequence
    • @@ -42,14 +52,17 @@

    All Classes

  • BattleEvent
  • Battlefield
  • BattleMap
    • +
  • BattleMap.VisionCache
  • BattleScreen
  • BattleSetup
  • BattleState
  • BattleState.Vision
  • BearsEndurance
  • BearsEndurance
    • +
  • BeltOfGiantStrength
  • Blink
  • Blinking
    • +
  • BorrowMoney
  • Breath
  • BreathFactor
  • Breathless
    • @@ -57,6 +70,7 @@

    All Classes

  • BreathWeapon.BreathArea
  • BreathWeapon.SavingThrow
  • BreathWeaponUpgrade
    • +
  • BribingScreen
  • Buff
  • BullRush
  • BullRushUpgrade
    • @@ -72,6 +86,7 @@

    All Classes

  • ChallengeRatingCalculator
  • Champion
  • ChanceNode
    • +
  • ChangeAvatar
  • Charge
  • ChargePath
  • Charging
    • @@ -80,15 +95,20 @@

    All Classes

  • ClearPath
  • Cleave
  • CleaveUpgrade
    • +
  • CloakOfCharisma
    • +
  • CloakOfResistance
  • Cloneable
  • CloneableList
  • Combatant
  • CombatExpertise
  • CombatExpertiseUpgrade
  • Commoner
    • +
  • Concentration
  • Condition
  • Condition.Effect
  • CountingSet
    • +
  • CraftingOrder
    • +
  • Crawler
  • CrFactor
  • CrIterator
  • CureCriticalWounds
    • @@ -114,15 +134,20 @@

    All Classes

  • DefensiveStance
  • DenseForest
  • DiagonalMovement
    • +
  • Diplomacy
    • +
  • DisableDevice
    • +
  • Discard
  • DiscernLocation
    • +
  • Dismiss
  • Divide
  • DndMap
  • Dominated
  • DominateMonster
  • Doom
    • -
  • Dungeon
    • -
  • DungeonScreen
    • +
  • Dungeon
    • +
  • DungeonScreen
  • DungeonScroll
    • +
  • Dwelling
  • EaglesSplendor
  • EaglesSplendor
  • Encounter
    • @@ -150,7 +175,7 @@

    All Classes

  • Feats
  • FeatsFactor
  • FeatUpgrade
    • -
  • Feature
    • +
  • Feature
  • Feigned
  • Feint
  • FieldReader
    • @@ -161,13 +186,16 @@

    All Classes

  • ForbiddingMountain
  • ForceWait
  • Forest
    • -
  • Fountain
    • +
  • Fountain
  • FoxsCunning
  • FoxsCunning
  • FullAttackFactor
    • +
  • GatherInformation
  • GaveUpException
  • GeneratedFight
  • GentleHiill
    • +
  • GlovesOfDexterity
    • +
  • GogglesOfNight
  • Grapple
  • Grappling
  • Grasslands
    • @@ -175,19 +203,27 @@

    All Classes

  • GreatCleaveUpgrade
  • GreatFortitude
  • GreatFortitude
    • +
  • Grow
    • +
  • GuardedPlace
    • +
  • Guardian
  • Guide
    • -
  • Haxor
    • -
  • HaxorScreen
    • +
  • Hax
    • +
  • Haxor
    • +
  • HaxorScreen
  • HD
  • HdFactor
    • +
  • HeadbandOfIntellect
  • Help
  • Heroic
  • Heroism
  • Heroism
    • +
  • Hide
  • HitDice
  • HoldMonster
  • Horde
    • +
  • HumanManager
  • ImageHandler
    • +
  • Images
  • ImprovedFeint
  • ImprovedFeintUpgrade
  • ImprovedGrapple
    • @@ -204,43 +240,56 @@

    All Classes

  • InflictLightWounds
  • InflictModerateWounds
  • InflictSeriousWounds
    • +
  • InfoScreen
  • Initiative
    • +
  • Inn
  • IntroScreen
  • IronWill
  • IronWill
  • Item
    • +
  • ItemResearch
  • ItemSelection
  • Javelin
  • JavelinApp
  • Key
    • -
  • Key.Color
    • -
  • Lair
    • +
  • Knowledge
    • +
  • Lair
  • LairFight
    • +
  • LairResearch
  • LairScreen
  • Level
  • LightningReflexes
  • LightningReflexes
  • Line
    • +
  • Listen
  • LocateObject
  • Maneuver
    • +
  • MantleOfSpellResistance
  • Map
  • MapGenerator
  • MapPanel
  • Match
    • +
  • Materialize
  • MaxValueSelector
  • Meadow
  • Meld
  • MeleeAttack
  • MeleeDamage
  • MeleeFocus
    • +
  • MercenariesGuild
    • +
  • Merchant
    • +
  • MerchantScreen
  • MindImmunity
  • MinValueSelector
  • MirrorMatch
    • +
  • MisalignmentDetector
  • Monster
    • +
  • MonsterManager
  • MonsterReader
  • Moor
  • Movement
  • Movement
    • +
  • MoveSilently
  • Multiattack
  • MultiweaponFighting
  • Name
    • @@ -249,18 +298,22 @@

    All Classes

  • Node
  • NotPeaceful
  • ObstructedPath
    • -
  • Option
    • +
  • Option
    • +
  • Order
    • +
  • OrderQueue
  • Organization
    • +
  • Outpost
  • OwlsWisdom
  • OwlsWisdom
  • Paragraph
  • Paralyzed
  • PassItem
    • +
  • PeriaptOfWisdom
  • PlanarFight
  • Point
  • PointBlankShot
  • PointBlankShot
    • -
  • Portal
    • +
  • Portal
  • Potion
  • PowerAttack
  • PowerAttackUpgrade
    • @@ -268,11 +321,11 @@

    All Classes

  • PreciseShot
  • Prone
  • Properties
    • -
  • PryingEyes
    • +
  • PryingEyes
    • +
  • PurchaseOption
  • PurchaseScreen
  • QualitiesFactor
  • Quality
    • -
  • QueueItem
  • RaiseAbility
  • RaiseCharisma
  • RaiseConsitution
    • @@ -289,55 +342,79 @@

    All Classes

  • RapidShot
  • RapidShot
  • Ray
    • +
  • Realm
    • +
  • Rebirth
  • RecallScroll
    • +
  • Recruit
  • RecruitOption
  • RecruitScreen
  • RecruitScreenOption
    • +
  • Redraw
    • +
  • RemoveAbility
  • Rename
  • RepeatTurnException
    • +
  • Research
    • +
  • ResearchData
    • +
  • ResearchQueue
    • +
  • ResearchScreen
    • +
  • ResearchScreenOption
  • ResetScore
  • ResistEnergy
  • ResistEnergy2
  • ResistEnergy4
  • ResistEnergy6
    • +
  • Ressurect
  • RessurectScroll
  • RewardCalculator
    • +
  • RingOfEnergyResistance
    • +
  • RingOfProtection
  • Rocky
  • RuggedHill
  • RuggedMountain
  • Sandy
  • ScreenOption
  • Scroll
    • +
  • ScrollSpell
    • +
  • Search
  • SecureShelterScroll
  • SelectScreen
  • Shaken
    • -
  • ShoppingScreen
    • +
  • ShoppingScreen
  • ShopScreenOption
  • ShowStatistics
    • +
  • Shrine
    • +
  • Siege
  • SimpleAction
  • SizeFactor
  • SizeFactorWithAttModifiers
    • +
  • Skills
    • +
  • Skills
    • +
  • SkillsFactor
    • +
  • SkillUpgrade
  • SlayLiving
    • +
  • Slot
  • SparseForest
  • SpecialAttacks
  • SpecialPerception
  • SpecialQualities
    • +
  • SpecialResearchCard
  • SpecialtiesLog
  • Speed
  • SpeedFactor
  • Spell
  • SpellbookGenerator
    • +
  • Spellcraft
  • SpellImmunity
  • SpellImmunity
  • SpellResistance
  • SpellResistance
  • Spells
  • SpellsFactor
    • +
  • Spot
  • Squad
    • -
  • Squad.Transport
    • -
  • SquadScreen
    • +
  • SquadScreen
  • Square
    • -
  • StairsUp
    • +
  • StairsUp
  • StartBattle
  • StateManager
  • StatisticsScreen
    • @@ -345,6 +422,8 @@

    All Classes

  • Step
  • StopThinking
  • Summon
    • +
  • SummonAlly
    • +
  • Survival
  • Swamp
  • Swimming
  • TeamContainer
    • @@ -359,20 +438,28 @@

    All Classes

  • Toughness
  • Toughness
  • TournamentScreenOption
    • -
  • Town
    • -
  • TownQueue
    • +
  • Town
    • +
  • TownManager
  • TownScreen
    • +
  • TownShopScreen
    • +
  • TownUpgradingScreen
    • +
  • TrainingOrder
    • +
  • Transport
    • +
  • TransportResearch
  • TransportScreen
  • TransportScreenOption
    • -
  • Treasure
    • +
  • Trap
    • +
  • Treasure
  • Trip
  • Tundra
  • TyrantMap
  • UnbalancedTeamsException
    • +
  • UniqueLocation
  • Upgrade
  • UpgradeHandler
  • UpgradeOption
    • -
  • UpgradingScreen
    • +
  • UpgradeResearch
    • +
  • UpgradingScreen
  • UpgradingScreenOption
  • UseItem
  • UseItems
    • @@ -387,14 +474,16 @@

    All Classes

  • WeaponFinesse
  • WeaponFocus
  • Weather
    • +
  • Win
    • +
  • WingsOfFlying
    • +
  • World
    • +
  • World.Region
  • WorldAction
    • -
  • WorldActor
    • +
  • WorldActor
  • WorldHelp
    • -
  • WorldMap
    • -
  • WorldMap.Region
  • WorldMove
    • -
  • WorldPlace
    • -
  • WorldScreen
    • +
  • WorldPlace
    • +
  • WorldScreen
    • diff --git a/doc/javadoc/allclasses-noframe.html b/doc/javadoc/allclasses-noframe.html index 1ad5d146f..230523880 100644 --- a/doc/javadoc/allclasses-noframe.html +++ b/doc/javadoc/allclasses-noframe.html @@ -2,9 +2,9 @@ - + All Classes - + @@ -16,6 +16,11 @@

    All Classes

  • AbilitiesFactor
  • AbstractAlphaBetaSearch
  • AbstractAttack
    • +
  • Academy
    • +
  • AcademyScreen
    • +
  • AccommodationResearch
    • +
  • Accommodations
    • +
  • Acrobatics
  • Action
  • ActionAdapter
  • ActionDescription
    • @@ -25,11 +30,16 @@

    All Classes

  • AiCache
  • AiMovement
  • AiThread
    • +
  • Alignment
    • +
  • AmuletOfHealth
  • Area
  • Arena
  • Aristocrat
  • ArmorClass
  • ArmorClassFactor
    • +
  • Artifact
    • +
  • Artificer
    • +
  • ArtificerScreen
  • Attack
  • Attacks
  • AttackSequence
    • @@ -42,14 +52,17 @@

    All Classes

  • BattleEvent
  • Battlefield
  • BattleMap
    • +
  • BattleMap.VisionCache
  • BattleScreen
  • BattleSetup
  • BattleState
  • BattleState.Vision
  • BearsEndurance
  • BearsEndurance
    • +
  • BeltOfGiantStrength
  • Blink
  • Blinking
    • +
  • BorrowMoney
  • Breath
  • BreathFactor
  • Breathless
    • @@ -57,6 +70,7 @@

    All Classes

  • BreathWeapon.BreathArea
  • BreathWeapon.SavingThrow
  • BreathWeaponUpgrade
    • +
  • BribingScreen
  • Buff
  • BullRush
  • BullRushUpgrade
    • @@ -72,6 +86,7 @@

    All Classes

  • ChallengeRatingCalculator
  • Champion
  • ChanceNode
    • +
  • ChangeAvatar
  • Charge
  • ChargePath
  • Charging
    • @@ -80,15 +95,20 @@

    All Classes

  • ClearPath
  • Cleave
  • CleaveUpgrade
    • +
  • CloakOfCharisma
    • +
  • CloakOfResistance
  • Cloneable
  • CloneableList
  • Combatant
  • CombatExpertise
  • CombatExpertiseUpgrade
  • Commoner
    • +
  • Concentration
  • Condition
  • Condition.Effect
  • CountingSet
    • +
  • CraftingOrder
    • +
  • Crawler
  • CrFactor
  • CrIterator
  • CureCriticalWounds
    • @@ -114,15 +134,20 @@

    All Classes

  • DefensiveStance
  • DenseForest
  • DiagonalMovement
    • +
  • Diplomacy
    • +
  • DisableDevice
    • +
  • Discard
  • DiscernLocation
    • +
  • Dismiss
  • Divide
  • DndMap
  • Dominated
  • DominateMonster
  • Doom
    • -
  • Dungeon
    • -
  • DungeonScreen
    • +
  • Dungeon
    • +
  • DungeonScreen
  • DungeonScroll
    • +
  • Dwelling
  • EaglesSplendor
  • EaglesSplendor
  • Encounter
    • @@ -150,7 +175,7 @@

    All Classes

  • Feats
  • FeatsFactor
  • FeatUpgrade
    • -
  • Feature
    • +
  • Feature
  • Feigned
  • Feint
  • FieldReader
    • @@ -161,13 +186,16 @@

    All Classes

  • ForbiddingMountain
  • ForceWait
  • Forest
    • -
  • Fountain
    • +
  • Fountain
  • FoxsCunning
  • FoxsCunning
  • FullAttackFactor
    • +
  • GatherInformation
  • GaveUpException
  • GeneratedFight
  • GentleHiill
    • +
  • GlovesOfDexterity
    • +
  • GogglesOfNight
  • Grapple
  • Grappling
  • Grasslands
    • @@ -175,19 +203,27 @@

    All Classes

  • GreatCleaveUpgrade
  • GreatFortitude
  • GreatFortitude
    • +
  • Grow
    • +
  • GuardedPlace
    • +
  • Guardian
  • Guide
    • -
  • Haxor
    • -
  • HaxorScreen
    • +
  • Hax
    • +
  • Haxor
    • +
  • HaxorScreen
  • HD
  • HdFactor
    • +
  • HeadbandOfIntellect
  • Help
  • Heroic
  • Heroism
  • Heroism
    • +
  • Hide
  • HitDice
  • HoldMonster
  • Horde
    • +
  • HumanManager
  • ImageHandler
    • +
  • Images
  • ImprovedFeint
  • ImprovedFeintUpgrade
  • ImprovedGrapple
    • @@ -204,43 +240,56 @@

    All Classes

  • InflictLightWounds
  • InflictModerateWounds
  • InflictSeriousWounds
    • +
  • InfoScreen
  • Initiative
    • +
  • Inn
  • IntroScreen
  • IronWill
  • IronWill
  • Item
    • +
  • ItemResearch
  • ItemSelection
  • Javelin
  • JavelinApp
  • Key
    • -
  • Key.Color
    • -
  • Lair
    • +
  • Knowledge
    • +
  • Lair
  • LairFight
    • +
  • LairResearch
  • LairScreen
  • Level
  • LightningReflexes
  • LightningReflexes
  • Line
    • +
  • Listen
  • LocateObject
  • Maneuver
    • +
  • MantleOfSpellResistance
  • Map
  • MapGenerator
  • MapPanel
  • Match
    • +
  • Materialize
  • MaxValueSelector
  • Meadow
  • Meld
  • MeleeAttack
  • MeleeDamage
  • MeleeFocus
    • +
  • MercenariesGuild
    • +
  • Merchant
    • +
  • MerchantScreen
  • MindImmunity
  • MinValueSelector
  • MirrorMatch
    • +
  • MisalignmentDetector
  • Monster
    • +
  • MonsterManager
  • MonsterReader
  • Moor
  • Movement
  • Movement
    • +
  • MoveSilently
  • Multiattack
  • MultiweaponFighting
  • Name
    • @@ -249,18 +298,22 @@

    All Classes

  • Node
  • NotPeaceful
  • ObstructedPath
    • -
  • Option
    • +
  • Option
    • +
  • Order
    • +
  • OrderQueue
  • Organization
    • +
  • Outpost
  • OwlsWisdom
  • OwlsWisdom
  • Paragraph
  • Paralyzed
  • PassItem
    • +
  • PeriaptOfWisdom
  • PlanarFight
  • Point
  • PointBlankShot
  • PointBlankShot
    • -
  • Portal
    • +
  • Portal
  • Potion
  • PowerAttack
  • PowerAttackUpgrade
    • @@ -268,11 +321,11 @@

    All Classes

  • PreciseShot
  • Prone
  • Properties
    • -
  • PryingEyes
    • +
  • PryingEyes
    • +
  • PurchaseOption
  • PurchaseScreen
  • QualitiesFactor
  • Quality
    • -
  • QueueItem
  • RaiseAbility
  • RaiseCharisma
  • RaiseConsitution
    • @@ -289,55 +342,79 @@

    All Classes

  • RapidShot
  • RapidShot
  • Ray
    • +
  • Realm
    • +
  • Rebirth
  • RecallScroll
    • +
  • Recruit
  • RecruitOption
  • RecruitScreen
  • RecruitScreenOption
    • +
  • Redraw
    • +
  • RemoveAbility
  • Rename
  • RepeatTurnException
    • +
  • Research
    • +
  • ResearchData
    • +
  • ResearchQueue
    • +
  • ResearchScreen
    • +
  • ResearchScreenOption
  • ResetScore
  • ResistEnergy
  • ResistEnergy2
  • ResistEnergy4
  • ResistEnergy6
    • +
  • Ressurect
  • RessurectScroll
  • RewardCalculator
    • +
  • RingOfEnergyResistance
    • +
  • RingOfProtection
  • Rocky
  • RuggedHill
  • RuggedMountain
  • Sandy
  • ScreenOption
  • Scroll
    • +
  • ScrollSpell
    • +
  • Search
  • SecureShelterScroll
  • SelectScreen
  • Shaken
    • -
  • ShoppingScreen
    • +
  • ShoppingScreen
  • ShopScreenOption
  • ShowStatistics
    • +
  • Shrine
    • +
  • Siege
  • SimpleAction
  • SizeFactor
  • SizeFactorWithAttModifiers
    • +
  • Skills
    • +
  • Skills
    • +
  • SkillsFactor
    • +
  • SkillUpgrade
  • SlayLiving
    • +
  • Slot
  • SparseForest
  • SpecialAttacks
  • SpecialPerception
  • SpecialQualities
    • +
  • SpecialResearchCard
  • SpecialtiesLog
  • Speed
  • SpeedFactor
  • Spell
  • SpellbookGenerator
    • +
  • Spellcraft
  • SpellImmunity
  • SpellImmunity
  • SpellResistance
  • SpellResistance
  • Spells
  • SpellsFactor
    • +
  • Spot
  • Squad
    • -
  • Squad.Transport
    • -
  • SquadScreen
    • +
  • SquadScreen
  • Square
    • -
  • StairsUp
    • +
  • StairsUp
  • StartBattle
  • StateManager
  • StatisticsScreen
    • @@ -345,6 +422,8 @@

    All Classes

  • Step
  • StopThinking
  • Summon
    • +
  • SummonAlly
    • +
  • Survival
  • Swamp
  • Swimming
  • TeamContainer
    • @@ -359,20 +438,28 @@

    All Classes

  • Toughness
  • Toughness
  • TournamentScreenOption
    • -
  • Town
    • -
  • TownQueue
    • +
  • Town
    • +
  • TownManager
  • TownScreen
    • +
  • TownShopScreen
    • +
  • TownUpgradingScreen
    • +
  • TrainingOrder
    • +
  • Transport
    • +
  • TransportResearch
  • TransportScreen
  • TransportScreenOption
    • -
  • Treasure
    • +
  • Trap
    • +
  • Treasure
  • Trip
  • Tundra
  • TyrantMap
  • UnbalancedTeamsException
    • +
  • UniqueLocation
  • Upgrade
  • UpgradeHandler
  • UpgradeOption
    • -
  • UpgradingScreen
    • +
  • UpgradeResearch
    • +
  • UpgradingScreen
  • UpgradingScreenOption
  • UseItem
  • UseItems
    • @@ -387,14 +474,16 @@

    All Classes

  • WeaponFinesse
  • WeaponFocus
  • Weather
    • +
  • Win
    • +
  • WingsOfFlying
    • +
  • World
    • +
  • World.Region
  • WorldAction
    • -
  • WorldActor
    • +
  • WorldActor
  • WorldHelp
    • -
  • WorldMap
    • -
  • WorldMap.Region
  • WorldMove
    • -
  • WorldPlace
    • -
  • WorldScreen
    • +
  • WorldPlace
    • +
  • WorldScreen
    • diff --git a/doc/javadoc/constant-values.html b/doc/javadoc/constant-values.html index f7800ff0e..8c4350305 100644 --- a/doc/javadoc/constant-values.html +++ b/doc/javadoc/constant-values.html @@ -2,9 +2,9 @@ - + Constant Field Values - + @@ -184,6 +184,27 @@

    javelin.controller.*

    • + + + + + + + + + + + + + +
      javelin.controller.challenge.factor.AbilitiesFactor 
      Modifier and TypeConstant FieldValue
      + +public static final floatCOST0.10000000149011612f
      +
      • +
    +
      +
    • + @@ -410,7 +431,7 @@

      javelin.model.*

      javelin.controller.map.DndMap 
      Modifier and Type
      - + @@ -418,25 +439,41 @@

      javelin.model.*

      - - - + + - - - +public static final int + + + + + + + + + + + +
      javelin.model.world.Dungeon javelin.model.world.World 
      Modifier and Type Constant Field
      + public static final intSIZE15EASY19
      + -public static final floatWALLRATIO0.3333333432674408fHARD21
      + +public static final intMEDIUM20
      + +public static final intVERYHARD27
      • +
    +
    • - + @@ -444,39 +481,117 @@

      javelin.model.*

      - - - + + - - - - + +
      javelin.model.world.WorldMap javelin.model.world.place.Outpost 
      Modifier and Type Constant Field
      + public static final intEASY19VISIONRANGE3
      - -public static final intHARD21
      +
      • +
    +
      +
    • + + + + + + + - - - + + - - - +public static final float + + + +
      javelin.model.world.place.dungeon.Dungeon 
      Modifier and TypeConstant FieldValue
      + public static final intMEDIUM20SIZE15
      + -public static final intTOWNBUFFER1WALLRATIO0.25f
      +
      • +
    + + + + +
      +
    • +

      DEBUGSTARTINGLABOR

      +
      public static final java.lang.Integer DEBUGSTARTINGLABOR
      +
      • +
    @@ -450,13 +497,13 @@

    DEBUGSTARTINGCR

    public static final java.lang.Float DEBUGSTARTINGCR
    - +
    • -

      DEBUGSTARTINGKEY

      -
      public static final Key.Color DEBUGSTARTINGKEY
      +

      DEBUGSTARTINGITEM

      +
      public static final Item DEBUGSTARTINGITEM
    @@ -750,22 +797,85 @@

    getCombatant

    public static Combatant getCombatant(int id)
    - +
    • -

      getTerrain

      -
      public static java.util.ArrayList<java.lang.String> getTerrain()
      +

      translatetochance

      +
      public static java.lang.String translatetochance(int rolltohit)
    - + + + +
      +
    • +

      terrain

      +
      public static int terrain()
      +
      +
      Returns:
      +
      Current terrain difficulty. For example: World.EASY.
      +
      +
      • +
    + + + +
      +
    • +

      terrain

      +
      public static int terrain(int x,
+                          int y)
      +
      +
      Parameters:
      +
      x - World coordinate.
      +
      y - World coordinate.
      +
      Returns:
      +
      Terrain difficulty. For example: World.EASY.
      +
      +
      • +
    + + + +
      +
    • +

      terrain

      +
      public static java.lang.String terrain(int difficulty)
      +
      +
      Parameters:
      +
      difficulty - Terrain difficulty. For example: World.EASY.
      +
      Returns:
      +
      Name of a d20 terrain.
      +
      +
      • +
    + + + +
      +
    • +

      terrains

      +
      public static java.lang.String[] terrains(int difficulty)
      +
      +
      Parameters:
      +
      difficulty - Terrain difficulty. For example: World.EASY.
      +
      Returns:
      +
      All the names of d20 terrains this difficulty encompasses.
      +
      +
      • +
    +
    • -

      translatetochance

      -
      public static java.lang.String translatetochance(int rolltohit)
      +

      randomdifficulty

      +
      public static java.lang.Integer randomdifficulty()
      +
      2 chances of an easy encounter, 10 chances of a moderate encounter, 4 + chances of a difficult encounter and 1 chance of an overwhelming + encounter
    diff --git a/doc/javadoc/javelin/JavelinApp.html b/doc/javadoc/javelin/JavelinApp.html index 6471448ea..1568d7b9f 100644 --- a/doc/javadoc/javelin/JavelinApp.html +++ b/doc/javadoc/javelin/JavelinApp.html @@ -2,9 +2,9 @@ - + JavelinApp - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9,"i2":10,"i3":9,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":9}; +var methods = {"i0":10,"i1":9,"i2":10,"i3":9,"i4":10,"i5":9,"i6":10,"i7":10,"i8":10,"i9":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -139,7 +139,10 @@

    Class JavelinApp


    public class JavelinApp
 extends tyrant.mikera.tyrant.QuestApp
    -
    Application and game life-cycle.
    +
    Application and game life-cycle. + + TODO refactor a time manager out of this which works with + TimeManager#tick(int time,WorldState world)?
    Author:
    alex
    @@ -201,7 +204,7 @@

    Field Summary

    Field and Description -static WorldScreen +static WorldScreen context  @@ -222,7 +225,7 @@

    Field Summary

    Fields inherited from class tyrant.mikera.tyrant.QuestApp

    -BACKCOLOUR, banner, charsize, crafting, creatures, crystal, dead, DEFAULTTEXTURE, effects, fileEncoding, gameFileFromCommandLine, greytiles, images, INFOSCREENCOLOUR, INFOTEXTCOLOUR, INFOTEXTCOLOUR_GRAY, isapplet, items, keyadapter, keyhandler, mainfont, PANELCOLOUR, PANELHIGHLIGHT, PANELSHADOW, paneltexture, penalized, scenery, TEXTCOLOUR, tiles, title, upgrading +BACKCOLOUR, charsize, creatures, DEFAULTTEXTURE, effects, fileEncoding, gameFileFromCommandLine, greytiles, images, INFOSCREENCOLOUR, INFOTEXTCOLOUR, INFOTEXTCOLOUR_GRAY, isapplet, items, keyadapter, keyhandler, mainfont, PANELCOLOUR, PANELHIGHLIGHT, PANELSHADOW, paneltexture, scenery, TEXTCOLOUR, tiles, title - +

    • generatefight

      -
      public static GeneratedFight generatefight(int el)
      +
      public static GeneratedFight generatefight(int el,
+                                           int terrainp)
    - +

    • chooseopponents

      -
      public static GeneratedFight chooseopponents(int el)
      -
      • -
    - - - -
      -
    • -

      randomdifficulty

      -
      public static java.lang.Integer randomdifficulty()
      -
      2 chances of an easy encounter, 10 chances of a moderate encounter, 4 - chances of a difficult encounter and 1 chance of an overwhelming - encounter
      -
      • -
    - - - -
      -
    • -

      worldtile

      -
      public static int worldtile()
      +
      public static GeneratedFight chooseopponents(int el,
+                                             int terrainp)
    diff --git a/doc/javadoc/javelin/controller/BattleSetup.html b/doc/javadoc/javelin/controller/BattleSetup.html index 6a228b3eb..b4a2ababf 100644 --- a/doc/javadoc/javelin/controller/BattleSetup.html +++ b/doc/javadoc/javelin/controller/BattleSetup.html @@ -2,9 +2,9 @@ - + BattleSetup - + diff --git a/doc/javadoc/javelin/controller/CountingSet.html b/doc/javadoc/javelin/controller/CountingSet.html index f78256a5c..b8dea5a62 100644 --- a/doc/javadoc/javelin/controller/CountingSet.html +++ b/doc/javadoc/javelin/controller/CountingSet.html @@ -2,9 +2,9 @@ - + CountingSet - + diff --git a/doc/javadoc/javelin/controller/Movement.html b/doc/javadoc/javelin/controller/Movement.html index b9f93c51b..520f56821 100644 --- a/doc/javadoc/javelin/controller/Movement.html +++ b/doc/javadoc/javelin/controller/Movement.html @@ -2,9 +2,9 @@ - + Movement - + diff --git a/doc/javadoc/javelin/controller/Point.html b/doc/javadoc/javelin/controller/Point.html index f824173d8..e2ead0b24 100644 --- a/doc/javadoc/javelin/controller/Point.html +++ b/doc/javadoc/javelin/controller/Point.html @@ -2,9 +2,9 @@ - + Point - + @@ -163,8 +163,11 @@

    Constructor Summary

    Constructor and Description -    Point(int i, - int j)  +Point(int x, + int y)  + + +Point(Point p)  @@ -248,11 +251,20 @@

    Constructor Detail

    +
      +
    • +

      Point

      +
      public Point(int x,
+             int y)
      +
      • +
    + + +

    • Point

      -
      public Point(int i,
-             int j)
      +
      public Point(Point p)
    diff --git a/doc/javadoc/javelin/controller/SpellbookGenerator.html b/doc/javadoc/javelin/controller/SpellbookGenerator.html index 331f1edc0..e41734c5e 100644 --- a/doc/javadoc/javelin/controller/SpellbookGenerator.html +++ b/doc/javadoc/javelin/controller/SpellbookGenerator.html @@ -2,9 +2,9 @@ - + SpellbookGenerator - + diff --git a/doc/javadoc/javelin/controller/TextReader.html b/doc/javadoc/javelin/controller/TextReader.html index 2c13cae25..fa9715637 100644 --- a/doc/javadoc/javelin/controller/TextReader.html +++ b/doc/javadoc/javelin/controller/TextReader.html @@ -2,9 +2,9 @@ - + TextReader - + diff --git a/doc/javadoc/javelin/controller/Weather.html b/doc/javadoc/javelin/controller/Weather.html index ddb357dbf..4dcba0529 100644 --- a/doc/javadoc/javelin/controller/Weather.html +++ b/doc/javadoc/javelin/controller/Weather.html @@ -2,9 +2,9 @@ - + Weather - + diff --git a/doc/javadoc/javelin/controller/action/Action.html b/doc/javadoc/javelin/controller/action/Action.html index 0fc009aed..846c5d5cd 100644 --- a/doc/javadoc/javelin/controller/action/Action.html +++ b/doc/javadoc/javelin/controller/action/Action.html @@ -2,9 +2,9 @@ - + Action - + diff --git a/doc/javadoc/javelin/controller/action/ActionAdapter.html b/doc/javadoc/javelin/controller/action/ActionAdapter.html index eacb625b2..fb55ba42a 100644 --- a/doc/javadoc/javelin/controller/action/ActionAdapter.html +++ b/doc/javadoc/javelin/controller/action/ActionAdapter.html @@ -2,9 +2,9 @@ - + ActionAdapter - + diff --git a/doc/javadoc/javelin/controller/action/ActionDescription.html b/doc/javadoc/javelin/controller/action/ActionDescription.html index a1d0cad1a..9663118b2 100644 --- a/doc/javadoc/javelin/controller/action/ActionDescription.html +++ b/doc/javadoc/javelin/controller/action/ActionDescription.html @@ -2,9 +2,9 @@ - + ActionDescription - + @@ -100,7 +100,7 @@

    Interface ActionDescriptio
  • All Known Implementing Classes:
    -
    Abandon, AbstractAttack, Action, ActionAdapter, AiMovement, Breath, CastSpell, CastSpells, Charge, DefensiveAttack, DiagonalMovement, Divide, Feint, Fire, ForceWait, Grapple, Guide, Help, Maneuver, MeleeAttack, Movement, PassItem, RangedAttack, Rename, ResetScore, ShowStatistics, TouchAttack, Trip, UseItem, UseItems, Wait, WorldAction, WorldHelp, WorldMove
    +
    Abandon, AbstractAttack, Action, ActionAdapter, AiMovement, Breath, CastSpell, CastSpells, Charge, DefensiveAttack, DiagonalMovement, Dismiss, Divide, Feint, Fire, ForceWait, Grapple, Guide, Help, Maneuver, MeleeAttack, Movement, PassItem, RangedAttack, Rename, ResetScore, ShowStatistics, TouchAttack, Trip, UseItem, UseItems, Wait, WorldAction, WorldHelp, WorldMove

    diff --git a/doc/javadoc/javelin/controller/action/ActionMapping.html b/doc/javadoc/javelin/controller/action/ActionMapping.html index f5384d141..8c3930072 100644 --- a/doc/javadoc/javelin/controller/action/ActionMapping.html +++ b/doc/javadoc/javelin/controller/action/ActionMapping.html @@ -2,9 +2,9 @@ - + ActionMapping - + diff --git a/doc/javadoc/javelin/controller/action/Breath.html b/doc/javadoc/javelin/controller/action/Breath.html index 4a28e42d3..94a2239a7 100644 --- a/doc/javadoc/javelin/controller/action/Breath.html +++ b/doc/javadoc/javelin/controller/action/Breath.html @@ -2,9 +2,9 @@ - + Breath - + diff --git a/doc/javadoc/javelin/controller/action/CastSpell.html b/doc/javadoc/javelin/controller/action/CastSpell.html index de5d35e61..0354fd332 100644 --- a/doc/javadoc/javelin/controller/action/CastSpell.html +++ b/doc/javadoc/javelin/controller/action/CastSpell.html @@ -2,9 +2,9 @@ - + CastSpell - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":10,"i2":10,"i3":9,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10}; +var methods = {"i0":9,"i1":10,"i2":10,"i3":9,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":9,"i10":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -214,27 +214,32 @@

    Method Summary

    BattleState state)  +void +checkengaged(BattleState state, + Combatant c)  + + protected void checkhero(tyrant.mikera.engine.Thing hero)  - + static float convertsavedctochance(int savedc)  - + protected void filtertargets(Combatant combatant, java.util.List<Combatant> targets, BattleState s)  - + java.util.List<java.util.List<ChanceNode>> getoutcomes(BattleState gameState, Combatant combatant)
    Lists the possible results of an action.
    - + static ChanceNode hit(Combatant active, Combatant target, @@ -244,7 +249,7 @@

    Method Summary

    boolean saved, java.lang.String prefix)      - + boolean perform(Combatant c, BattleMap map, @@ -256,7 +261,7 @@

    Method Summary

    Methods inherited from class javelin.controller.action.Fire

    -checkengaged, prioritize
    • +prioritize

    + + + + diff --git a/doc/javadoc/javelin/controller/action/Charge.html b/doc/javadoc/javelin/controller/action/Charge.html index 91dd07bf3..287dfe2aa 100644 --- a/doc/javadoc/javelin/controller/action/Charge.html +++ b/doc/javadoc/javelin/controller/action/Charge.html @@ -2,9 +2,9 @@ - + Charge - + diff --git a/doc/javadoc/javelin/controller/action/DiagonalMovement.html b/doc/javadoc/javelin/controller/action/DiagonalMovement.html index f16ba0e52..c83f5766b 100644 --- a/doc/javadoc/javelin/controller/action/DiagonalMovement.html +++ b/doc/javadoc/javelin/controller/action/DiagonalMovement.html @@ -2,9 +2,9 @@ - + DiagonalMovement - + diff --git a/doc/javadoc/javelin/controller/action/Fire.html b/doc/javadoc/javelin/controller/action/Fire.html index 39a6cda4d..1855fab1a 100644 --- a/doc/javadoc/javelin/controller/action/Fire.html +++ b/doc/javadoc/javelin/controller/action/Fire.html @@ -2,9 +2,9 @@ - + Fire - + diff --git a/doc/javadoc/javelin/controller/action/Help.html b/doc/javadoc/javelin/controller/action/Help.html index d9514bca5..e581aa60a 100644 --- a/doc/javadoc/javelin/controller/action/Help.html +++ b/doc/javadoc/javelin/controller/action/Help.html @@ -2,9 +2,9 @@ - + Help - + diff --git a/doc/javadoc/javelin/controller/action/Movement.html b/doc/javadoc/javelin/controller/action/Movement.html index eec30bad2..bf1877539 100644 --- a/doc/javadoc/javelin/controller/action/Movement.html +++ b/doc/javadoc/javelin/controller/action/Movement.html @@ -2,9 +2,9 @@ - + Movement - + diff --git a/doc/javadoc/javelin/controller/action/PassItem.html b/doc/javadoc/javelin/controller/action/PassItem.html index 2060678f4..eacbbc9cc 100644 --- a/doc/javadoc/javelin/controller/action/PassItem.html +++ b/doc/javadoc/javelin/controller/action/PassItem.html @@ -2,9 +2,9 @@ - + PassItem - + diff --git a/doc/javadoc/javelin/controller/action/SimpleAction.html b/doc/javadoc/javelin/controller/action/SimpleAction.html index 7039d3fbf..318dbabcb 100644 --- a/doc/javadoc/javelin/controller/action/SimpleAction.html +++ b/doc/javadoc/javelin/controller/action/SimpleAction.html @@ -2,9 +2,9 @@ - + SimpleAction - + diff --git a/doc/javadoc/javelin/controller/action/TouchAttack.html b/doc/javadoc/javelin/controller/action/TouchAttack.html index ac4359341..d0b044d5b 100644 --- a/doc/javadoc/javelin/controller/action/TouchAttack.html +++ b/doc/javadoc/javelin/controller/action/TouchAttack.html @@ -2,9 +2,9 @@ - + TouchAttack - + diff --git a/doc/javadoc/javelin/controller/action/UseItem.html b/doc/javadoc/javelin/controller/action/UseItem.html index 60c5013ad..c5a44e2eb 100644 --- a/doc/javadoc/javelin/controller/action/UseItem.html +++ b/doc/javadoc/javelin/controller/action/UseItem.html @@ -2,9 +2,9 @@ - + UseItem - + diff --git a/doc/javadoc/javelin/controller/action/Wait.html b/doc/javadoc/javelin/controller/action/Wait.html index b4d0b8389..1d6cd449a 100644 --- a/doc/javadoc/javelin/controller/action/Wait.html +++ b/doc/javadoc/javelin/controller/action/Wait.html @@ -2,9 +2,9 @@ - + Wait - + diff --git a/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html b/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html index 2925c64d7..e4229903b 100644 --- a/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html @@ -2,9 +2,9 @@ - + AbstractAttack - + diff --git a/doc/javadoc/javelin/controller/action/ai/AiAction.html b/doc/javadoc/javelin/controller/action/ai/AiAction.html index de02cd1fc..24a406fdd 100644 --- a/doc/javadoc/javelin/controller/action/ai/AiAction.html +++ b/doc/javadoc/javelin/controller/action/ai/AiAction.html @@ -2,9 +2,9 @@ - + AiAction - + diff --git a/doc/javadoc/javelin/controller/action/ai/AiMovement.html b/doc/javadoc/javelin/controller/action/ai/AiMovement.html index f312ff92e..2d93db038 100644 --- a/doc/javadoc/javelin/controller/action/ai/AiMovement.html +++ b/doc/javadoc/javelin/controller/action/ai/AiMovement.html @@ -2,9 +2,9 @@ - + AiMovement - + diff --git a/doc/javadoc/javelin/controller/action/ai/DamageChance.html b/doc/javadoc/javelin/controller/action/ai/DamageChance.html index a3b6242c8..42de9e8f2 100644 --- a/doc/javadoc/javelin/controller/action/ai/DamageChance.html +++ b/doc/javadoc/javelin/controller/action/ai/DamageChance.html @@ -2,9 +2,9 @@ - + DamageChance - + diff --git a/doc/javadoc/javelin/controller/action/ai/ForceWait.html b/doc/javadoc/javelin/controller/action/ai/ForceWait.html index e740e1c58..25dd83469 100644 --- a/doc/javadoc/javelin/controller/action/ai/ForceWait.html +++ b/doc/javadoc/javelin/controller/action/ai/ForceWait.html @@ -2,9 +2,9 @@ - + ForceWait - + diff --git a/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html b/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html index c8a5c8dad..482af9a98 100644 --- a/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html @@ -2,9 +2,9 @@ - + MeleeAttack - + diff --git a/doc/javadoc/javelin/controller/action/ai/RangedAttack.html b/doc/javadoc/javelin/controller/action/ai/RangedAttack.html index ff813ca05..792877601 100644 --- a/doc/javadoc/javelin/controller/action/ai/RangedAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/RangedAttack.html @@ -2,9 +2,9 @@ - + RangedAttack - + diff --git a/doc/javadoc/javelin/controller/action/ai/package-frame.html b/doc/javadoc/javelin/controller/action/ai/package-frame.html index 43be6546e..ed4551037 100644 --- a/doc/javadoc/javelin/controller/action/ai/package-frame.html +++ b/doc/javadoc/javelin/controller/action/ai/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.action.ai - + diff --git a/doc/javadoc/javelin/controller/action/ai/package-summary.html b/doc/javadoc/javelin/controller/action/ai/package-summary.html index aa033aaea..6f5721222 100644 --- a/doc/javadoc/javelin/controller/action/ai/package-summary.html +++ b/doc/javadoc/javelin/controller/action/ai/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.action.ai - + diff --git a/doc/javadoc/javelin/controller/action/ai/package-tree.html b/doc/javadoc/javelin/controller/action/ai/package-tree.html index 4784b5fcd..bde295f81 100644 --- a/doc/javadoc/javelin/controller/action/ai/package-tree.html +++ b/doc/javadoc/javelin/controller/action/ai/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.action.ai Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/action/area/Area.html b/doc/javadoc/javelin/controller/action/area/Area.html index 2a2c31e1d..67ed35cf9 100644 --- a/doc/javadoc/javelin/controller/action/area/Area.html +++ b/doc/javadoc/javelin/controller/action/area/Area.html @@ -2,9 +2,9 @@ - + Area - + diff --git a/doc/javadoc/javelin/controller/action/area/Burst.html b/doc/javadoc/javelin/controller/action/area/Burst.html index 1022bdca3..093c323c4 100644 --- a/doc/javadoc/javelin/controller/action/area/Burst.html +++ b/doc/javadoc/javelin/controller/action/area/Burst.html @@ -2,9 +2,9 @@ - + Burst - + diff --git a/doc/javadoc/javelin/controller/action/area/Line.html b/doc/javadoc/javelin/controller/action/area/Line.html index 7c2185ddf..1d9706bed 100644 --- a/doc/javadoc/javelin/controller/action/area/Line.html +++ b/doc/javadoc/javelin/controller/action/area/Line.html @@ -2,9 +2,9 @@ - + Line - + diff --git a/doc/javadoc/javelin/controller/action/area/package-frame.html b/doc/javadoc/javelin/controller/action/area/package-frame.html index 42e7b9d84..200158cc3 100644 --- a/doc/javadoc/javelin/controller/action/area/package-frame.html +++ b/doc/javadoc/javelin/controller/action/area/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.action.area - + diff --git a/doc/javadoc/javelin/controller/action/area/package-summary.html b/doc/javadoc/javelin/controller/action/area/package-summary.html index a04a8fa7d..497f9273e 100644 --- a/doc/javadoc/javelin/controller/action/area/package-summary.html +++ b/doc/javadoc/javelin/controller/action/area/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.action.area - + diff --git a/doc/javadoc/javelin/controller/action/area/package-tree.html b/doc/javadoc/javelin/controller/action/area/package-tree.html index 95e656c44..7aa0da361 100644 --- a/doc/javadoc/javelin/controller/action/area/package-tree.html +++ b/doc/javadoc/javelin/controller/action/area/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.action.area Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/DefensiveAttack.html b/doc/javadoc/javelin/controller/action/maneuver/DefensiveAttack.html index e82523ab1..0c98598fd 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/DefensiveAttack.html +++ b/doc/javadoc/javelin/controller/action/maneuver/DefensiveAttack.html @@ -2,9 +2,9 @@ - + DefensiveAttack - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/Feint.html b/doc/javadoc/javelin/controller/action/maneuver/Feint.html index 3897955c2..ad8dc5843 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/Feint.html +++ b/doc/javadoc/javelin/controller/action/maneuver/Feint.html @@ -2,9 +2,9 @@ - + Feint - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/Grapple.html b/doc/javadoc/javelin/controller/action/maneuver/Grapple.html index 535e6546d..ebb8f8f06 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/Grapple.html +++ b/doc/javadoc/javelin/controller/action/maneuver/Grapple.html @@ -2,9 +2,9 @@ - + Grapple - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/Maneuver.html b/doc/javadoc/javelin/controller/action/maneuver/Maneuver.html index eb095898d..43a298bca 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/Maneuver.html +++ b/doc/javadoc/javelin/controller/action/maneuver/Maneuver.html @@ -2,9 +2,9 @@ - + Maneuver - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/Trip.html b/doc/javadoc/javelin/controller/action/maneuver/Trip.html index 4ed3c1109..32da23273 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/Trip.html +++ b/doc/javadoc/javelin/controller/action/maneuver/Trip.html @@ -2,9 +2,9 @@ - + Trip - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/package-frame.html b/doc/javadoc/javelin/controller/action/maneuver/package-frame.html index d7c06bd39..2ef36b566 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/package-frame.html +++ b/doc/javadoc/javelin/controller/action/maneuver/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.action.maneuver - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/package-summary.html b/doc/javadoc/javelin/controller/action/maneuver/package-summary.html index d607489d2..335ac0131 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/package-summary.html +++ b/doc/javadoc/javelin/controller/action/maneuver/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.action.maneuver - + diff --git a/doc/javadoc/javelin/controller/action/maneuver/package-tree.html b/doc/javadoc/javelin/controller/action/maneuver/package-tree.html index 153004982..f5e4ee0bd 100644 --- a/doc/javadoc/javelin/controller/action/maneuver/package-tree.html +++ b/doc/javadoc/javelin/controller/action/maneuver/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.action.maneuver Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/action/package-frame.html b/doc/javadoc/javelin/controller/action/package-frame.html index dadec7853..d179bd5a3 100644 --- a/doc/javadoc/javelin/controller/action/package-frame.html +++ b/doc/javadoc/javelin/controller/action/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.action - + diff --git a/doc/javadoc/javelin/controller/action/package-summary.html b/doc/javadoc/javelin/controller/action/package-summary.html index c4d088aac..af8acfb3f 100644 --- a/doc/javadoc/javelin/controller/action/package-summary.html +++ b/doc/javadoc/javelin/controller/action/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.action - + diff --git a/doc/javadoc/javelin/controller/action/package-tree.html b/doc/javadoc/javelin/controller/action/package-tree.html index 68eca8c50..45e105842 100644 --- a/doc/javadoc/javelin/controller/action/package-tree.html +++ b/doc/javadoc/javelin/controller/action/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.action Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/action/world/Abandon.html b/doc/javadoc/javelin/controller/action/world/Abandon.html index 867ef4126..30e74bf63 100644 --- a/doc/javadoc/javelin/controller/action/world/Abandon.html +++ b/doc/javadoc/javelin/controller/action/world/Abandon.html @@ -2,9 +2,9 @@ - + Abandon - + @@ -142,7 +142,7 @@

    Field Summary

    Fields inherited from class javelin.controller.action.world.WorldAction

    -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2 @@ -177,7 +177,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen)  @@ -174,7 +174,9 @@

    Method Summary

    choose(java.lang.String output, java.util.List<?> names, boolean fullscreen, - boolean forceselection)  + boolean forceselection)     +
    Utility function for user-input selection.
    + java.util.ArrayList<Combatant> @@ -186,7 +188,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen)  int @@ -238,16 +240,16 @@

    CastSpells

    Method Detail

    - + @@ -288,6 +290,18 @@

    choose

    java.util.List<?> names, boolean fullscreen, boolean forceselection) +
    Utility function for user-input selection.
    +
    +
    Parameters:
    +
    output - Text to show the user.
    +
    names - Will show each's Object.toString() as an option.
    +
    fullscreen - true to open in a new screen. Otherwise uses the + message panel.
    +
    forceselection - If false will allow the user to abort the + operation.
    +
    Returns:
    +
    The index of the selected element or -1 if aborted.
    +
    @@ -318,7 +332,7 @@

    choose

    • Frames
      • diff --git a/doc/javadoc/javelin/controller/action/world/Dismiss.html b/doc/javadoc/javelin/controller/action/world/Dismiss.html new file mode 100644 index 000000000..24e1064ea --- /dev/null +++ b/doc/javadoc/javelin/controller/action/world/Dismiss.html @@ -0,0 +1,312 @@ + + + + + +Dismiss + + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + +
      +
      javelin.controller.action.world
      +

      Class Dismiss

      +
      +
      + +
      +
        +
      • +
        +
        All Implemented Interfaces:
        +
        ActionDescription
        +
        +
        +
        +
        public class Dismiss
+extends WorldAction
        +
        Allows members to be removed from a Squad at any point.
        +
        +
        Author:
        +
        alex
        +
        +
        • +
      +
      +
      + +
      +
      +
        +
      • + +
          +
        • + + +

          Constructor Detail

          + + + +
            +
          • +

            Dismiss

            +
            public Dismiss()
            +
            Constructor.
            +
            • +
          +
          • +
        + + +
        • +
      +
      +
      + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + + diff --git a/doc/javadoc/javelin/controller/action/world/Divide.html b/doc/javadoc/javelin/controller/action/world/Divide.html index 2215af590..25cebee1f 100644 --- a/doc/javadoc/javelin/controller/action/world/Divide.html +++ b/doc/javadoc/javelin/controller/action/world/Divide.html @@ -2,9 +2,9 @@ - + Divide - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,7 +48,7 @@
    @@ -179,23 +179,19 @@

    Method Summary

    clear()  -Town +WorldActor findtown(int xp, int yp)  -java.lang.Character -input(java.lang.String prompt)  - - void log(java.util.List<Combatant> indexreference, java.util.List<Combatant> oldsquad, java.util.List<java.lang.String> oldcolumn)  - + void -perform(WorldScreen screen)  +perform(WorldScreen screen) 
    @@ -191,7 +191,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen)  @@ -157,7 +157,9 @@

    Constructor Summary

    Constructor and Description -Rename()  +Rename() +
    Constructor.
    + @@ -176,7 +178,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen) 
      @@ -214,6 +216,7 @@

      Constructor Detail

    • Rename

      public Rename()
      +
      Constructor.
    @@ -224,16 +227,16 @@

    Rename

    Method Detail

    - + diff --git a/doc/javadoc/javelin/controller/action/world/ResetScore.html b/doc/javadoc/javelin/controller/action/world/ResetScore.html index b905c4ddb..ce4cfb3c0 100644 --- a/doc/javadoc/javelin/controller/action/world/ResetScore.html +++ b/doc/javadoc/javelin/controller/action/world/ResetScore.html @@ -2,9 +2,9 @@ - + ResetScore - + @@ -141,7 +141,7 @@

    Field Summary

    Fields inherited from class javelin.controller.action.world.WorldAction

    -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2 @@ -180,7 +180,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen) 
      @@ -237,16 +237,16 @@

      name

      public static java.lang.String name()
    - + diff --git a/doc/javadoc/javelin/controller/action/world/ShowStatistics.html b/doc/javadoc/javelin/controller/action/world/ShowStatistics.html index c918cc4c4..da99c2e00 100644 --- a/doc/javadoc/javelin/controller/action/world/ShowStatistics.html +++ b/doc/javadoc/javelin/controller/action/world/ShowStatistics.html @@ -2,9 +2,9 @@ - + ShowStatistics - + @@ -141,7 +141,7 @@

    Field Summary

    Fields inherited from class javelin.controller.action.world.WorldAction

    -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2 @@ -176,7 +176,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen) 
      @@ -224,16 +224,16 @@

      ShowStatistics

      Method Detail

      - + diff --git a/doc/javadoc/javelin/controller/action/world/UseItems.html b/doc/javadoc/javelin/controller/action/world/UseItems.html index e7e46c893..652f07fcf 100644 --- a/doc/javadoc/javelin/controller/action/world/UseItems.html +++ b/doc/javadoc/javelin/controller/action/world/UseItems.html @@ -2,9 +2,9 @@ - + UseItems - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -136,7 +136,7 @@

      Field Summary

      Fields inherited from class javelin.controller.action.world.WorldAction

      -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2
    @@ -171,29 +171,32 @@

    Method Summary

    void -command(java.util.ArrayList<Item> allitems, - java.lang.String list, - tyrant.mikera.tyrant.InfoScreen infoscreen)  +exchange(java.util.ArrayList<Item> allitems, + java.lang.String reequiptext, + InfoScreen infoscreen)  +protected Combatant +findowner(Item selected)  + + Combatant -inputmember(tyrant.mikera.tyrant.InfoScreen infoscreen, +inputmember(InfoScreen infoscreen, java.lang.String message)  - + static java.lang.String listitems(java.util.ArrayList<Item> allitems, boolean showkeys)  - -void -perform(WorldScreen worldscreen)  - void -redistributeinventory(java.util.ArrayList<Item> allitems, - java.lang.String reequiptext, - tyrant.mikera.tyrant.InfoScreen infoscreen)  +perform(WorldScreen worldscreen)  + + +protected Item +select(java.util.ArrayList<Item> allitems, + java.lang.Character input)  + + + +
      +
    • +

      ARTIFACTS

      +
      public static final Guide ARTIFACTS
      +
      • +
    @@ -385,13 +411,13 @@

    WorldAction

    Method Detail

    - +

    • perform

      -
      public abstract void perform(WorldScreen screen)
      +
      public abstract void perform(WorldScreen screen)
    diff --git a/doc/javadoc/javelin/controller/action/world/WorldHelp.html b/doc/javadoc/javelin/controller/action/world/WorldHelp.html index 0de12ed22..db1013db4 100644 --- a/doc/javadoc/javelin/controller/action/world/WorldHelp.html +++ b/doc/javadoc/javelin/controller/action/world/WorldHelp.html @@ -2,9 +2,9 @@ - + WorldHelp - + @@ -141,7 +141,7 @@

    Field Summary

    Fields inherited from class javelin.controller.action.world.WorldAction

    -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2 @@ -176,7 +176,7 @@

    Method Summary

    void -perform(WorldScreen screen)  +perform(WorldScreen screen) 
      @@ -224,16 +224,16 @@

      WorldHelp

      Method Detail

      - + diff --git a/doc/javadoc/javelin/controller/action/world/WorldMove.html b/doc/javadoc/javelin/controller/action/world/WorldMove.html index 2875f3c12..63fc760c8 100644 --- a/doc/javadoc/javelin/controller/action/world/WorldMove.html +++ b/doc/javadoc/javelin/controller/action/world/WorldMove.html @@ -2,9 +2,9 @@ - + WorldMove - + @@ -119,6 +119,14 @@

      Class WorldMove


      public class WorldMove
 extends WorldAction
      +
      Makes a movement on the overworld or Dungeon. + + TODO WorldScreen hierarchy should be refactored into proper Battle / + Dungeon / World screens.
      +
      +
      Author:
      +
      alex
      +
    @@ -151,7 +159,7 @@

    Field Summary

    Fields inherited from class javelin.controller.action.world.WorldAction

    -ACTIONS, COMBAT, HOWTO, ITEMS, keys, morekeys, SPELLS1, SPELLS2, UGRADES1, UGRADES2 +ACTIONS, ARTIFACTS, COMBAT, HOWTO, ITEMS, keys, morekeys, SKILLS, SPELLS1, SPELLS2, UGRADES1, UGRADES2 @@ -193,7 +201,7 @@

    Method Summary

    void -perform(WorldScreen s)  +perform(WorldScreen s)  static boolean @@ -284,16 +292,16 @@

    WorldMove

    Method Detail

    - + diff --git a/doc/javadoc/javelin/controller/action/world/package-frame.html b/doc/javadoc/javelin/controller/action/world/package-frame.html index 44e420d88..e664f1f39 100644 --- a/doc/javadoc/javelin/controller/action/world/package-frame.html +++ b/doc/javadoc/javelin/controller/action/world/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.action.world - + @@ -15,6 +15,7 @@

    Classes

    • Abandon
    • CastSpells
      • +
    • Dismiss
    • Divide
    • Guide
    • Rename
      • diff --git a/doc/javadoc/javelin/controller/action/world/package-summary.html b/doc/javadoc/javelin/controller/action/world/package-summary.html index e484459d4..68f105e2a 100644 --- a/doc/javadoc/javelin/controller/action/world/package-summary.html +++ b/doc/javadoc/javelin/controller/action/world/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.action.world - + @@ -93,54 +93,62 @@

      Package javelin.controller.action.world  +Dismiss + +
      Allows members to be removed from a Squad at any point.
      + + + Divide
      Split squad into two.
      - + Guide
      In-game help.
      - + Rename
      Rename combatant.
      - + ResetScore
      Clear highscore.
      - + ShowStatistics
      Show unit information.
      - + UseItems   - + WorldAction
      An action to be performed by the human player while on the overworld view.
      - + WorldHelp
      In-game help.
      - + WorldMove -  + +
      Makes a movement on the overworld or Dungeon.
      + diff --git a/doc/javadoc/javelin/controller/action/world/package-tree.html b/doc/javadoc/javelin/controller/action/world/package-tree.html index a61e707cb..785a251de 100644 --- a/doc/javadoc/javelin/controller/action/world/package-tree.html +++ b/doc/javadoc/javelin/controller/action/world/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.action.world Class Hierarchy - + @@ -84,6 +84,7 @@

      Class Hierarchy

      • javelin.controller.action.world.Abandon
      • javelin.controller.action.world.CastSpells
        • +
      • javelin.controller.action.world.Dismiss
      • javelin.controller.action.world.Divide
      • javelin.controller.action.world.Guide (implements javelin.controller.action.SimpleAction)
      • javelin.controller.action.world.Rename
        • diff --git a/doc/javadoc/javelin/controller/ai/AbstractAlphaBetaSearch.html b/doc/javadoc/javelin/controller/ai/AbstractAlphaBetaSearch.html index 835293db0..77b27fc38 100644 --- a/doc/javadoc/javelin/controller/ai/AbstractAlphaBetaSearch.html +++ b/doc/javadoc/javelin/controller/ai/AbstractAlphaBetaSearch.html @@ -2,9 +2,9 @@ - + AbstractAlphaBetaSearch - + diff --git a/doc/javadoc/javelin/controller/ai/ActionProvider.html b/doc/javadoc/javelin/controller/ai/ActionProvider.html index 40f861bef..bff255233 100644 --- a/doc/javadoc/javelin/controller/ai/ActionProvider.html +++ b/doc/javadoc/javelin/controller/ai/ActionProvider.html @@ -2,9 +2,9 @@ - + ActionProvider - + diff --git a/doc/javadoc/javelin/controller/ai/AiThread.html b/doc/javadoc/javelin/controller/ai/AiThread.html index c6d452aec..e2867ab40 100644 --- a/doc/javadoc/javelin/controller/ai/AiThread.html +++ b/doc/javadoc/javelin/controller/ai/AiThread.html @@ -2,9 +2,9 @@ - + AiThread - + diff --git a/doc/javadoc/javelin/controller/ai/BattleAi.html b/doc/javadoc/javelin/controller/ai/BattleAi.html index 90747e7e0..7cba06b89 100644 --- a/doc/javadoc/javelin/controller/ai/BattleAi.html +++ b/doc/javadoc/javelin/controller/ai/BattleAi.html @@ -2,9 +2,9 @@ - + BattleAi - + diff --git a/doc/javadoc/javelin/controller/ai/ChanceNode.html b/doc/javadoc/javelin/controller/ai/ChanceNode.html index 9e20886e0..69188625a 100644 --- a/doc/javadoc/javelin/controller/ai/ChanceNode.html +++ b/doc/javadoc/javelin/controller/ai/ChanceNode.html @@ -2,9 +2,9 @@ - + ChanceNode - + diff --git a/doc/javadoc/javelin/controller/ai/Entry.html b/doc/javadoc/javelin/controller/ai/Entry.html index cb0fe4bcd..6fdd314c8 100644 --- a/doc/javadoc/javelin/controller/ai/Entry.html +++ b/doc/javadoc/javelin/controller/ai/Entry.html @@ -2,9 +2,9 @@ - + Entry - + diff --git a/doc/javadoc/javelin/controller/ai/Node.html b/doc/javadoc/javelin/controller/ai/Node.html index 81cdfb1b4..eace9f9f0 100644 --- a/doc/javadoc/javelin/controller/ai/Node.html +++ b/doc/javadoc/javelin/controller/ai/Node.html @@ -2,9 +2,9 @@ - + Node - + diff --git a/doc/javadoc/javelin/controller/ai/TemperatureManager.html b/doc/javadoc/javelin/controller/ai/TemperatureManager.html index 4e94c2456..d64c713b8 100644 --- a/doc/javadoc/javelin/controller/ai/TemperatureManager.html +++ b/doc/javadoc/javelin/controller/ai/TemperatureManager.html @@ -2,9 +2,9 @@ - + TemperatureManager - + diff --git a/doc/javadoc/javelin/controller/ai/ThreadManager.html b/doc/javadoc/javelin/controller/ai/ThreadManager.html index daf148165..53a74056e 100644 --- a/doc/javadoc/javelin/controller/ai/ThreadManager.html +++ b/doc/javadoc/javelin/controller/ai/ThreadManager.html @@ -2,9 +2,9 @@ - + ThreadManager - + diff --git a/doc/javadoc/javelin/controller/ai/cache/AiCache.html b/doc/javadoc/javelin/controller/ai/cache/AiCache.html index 176e4cea0..fbe6fd576 100644 --- a/doc/javadoc/javelin/controller/ai/cache/AiCache.html +++ b/doc/javadoc/javelin/controller/ai/cache/AiCache.html @@ -2,9 +2,9 @@ - + AiCache - + diff --git a/doc/javadoc/javelin/controller/ai/cache/Cache.html b/doc/javadoc/javelin/controller/ai/cache/Cache.html index b29307b0e..35124e4ee 100644 --- a/doc/javadoc/javelin/controller/ai/cache/Cache.html +++ b/doc/javadoc/javelin/controller/ai/cache/Cache.html @@ -2,9 +2,9 @@ - + Cache - + diff --git a/doc/javadoc/javelin/controller/ai/cache/CacheClearThread.html b/doc/javadoc/javelin/controller/ai/cache/CacheClearThread.html index 5b0182da7..2fc17afa0 100644 --- a/doc/javadoc/javelin/controller/ai/cache/CacheClearThread.html +++ b/doc/javadoc/javelin/controller/ai/cache/CacheClearThread.html @@ -2,9 +2,9 @@ - + CacheClearThread - + diff --git a/doc/javadoc/javelin/controller/ai/cache/package-frame.html b/doc/javadoc/javelin/controller/ai/cache/package-frame.html index 1f2da5f8e..178bdb184 100644 --- a/doc/javadoc/javelin/controller/ai/cache/package-frame.html +++ b/doc/javadoc/javelin/controller/ai/cache/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.cache - + diff --git a/doc/javadoc/javelin/controller/ai/cache/package-summary.html b/doc/javadoc/javelin/controller/ai/cache/package-summary.html index 7f9b2d6f4..686408417 100644 --- a/doc/javadoc/javelin/controller/ai/cache/package-summary.html +++ b/doc/javadoc/javelin/controller/ai/cache/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.cache - + diff --git a/doc/javadoc/javelin/controller/ai/cache/package-tree.html b/doc/javadoc/javelin/controller/ai/cache/package-tree.html index b56169c31..cd8d9f07a 100644 --- a/doc/javadoc/javelin/controller/ai/cache/package-tree.html +++ b/doc/javadoc/javelin/controller/ai/cache/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.cache Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/ai/package-frame.html b/doc/javadoc/javelin/controller/ai/package-frame.html index 949cbbb7e..2332e1581 100644 --- a/doc/javadoc/javelin/controller/ai/package-frame.html +++ b/doc/javadoc/javelin/controller/ai/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.ai - + diff --git a/doc/javadoc/javelin/controller/ai/package-summary.html b/doc/javadoc/javelin/controller/ai/package-summary.html index 22a184624..4fcf20e5e 100644 --- a/doc/javadoc/javelin/controller/ai/package-summary.html +++ b/doc/javadoc/javelin/controller/ai/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.ai - + diff --git a/doc/javadoc/javelin/controller/ai/package-tree.html b/doc/javadoc/javelin/controller/ai/package-tree.html index b1e181974..a10d2f7b9 100644 --- a/doc/javadoc/javelin/controller/ai/package-tree.html +++ b/doc/javadoc/javelin/controller/ai/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.ai Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/MaxValueSelector.html b/doc/javadoc/javelin/controller/ai/valueselector/MaxValueSelector.html index cac8017f5..e9a38d5ba 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/MaxValueSelector.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/MaxValueSelector.html @@ -2,9 +2,9 @@ - + MaxValueSelector - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/MinValueSelector.html b/doc/javadoc/javelin/controller/ai/valueselector/MinValueSelector.html index 7e6f4655f..e4790baa4 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/MinValueSelector.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/MinValueSelector.html @@ -2,9 +2,9 @@ - + MinValueSelector - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/ValueSelector.html b/doc/javadoc/javelin/controller/ai/valueselector/ValueSelector.html index b450669c6..401c967a2 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/ValueSelector.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/ValueSelector.html @@ -2,9 +2,9 @@ - + ValueSelector - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html b/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html index d011a48c6..2ad02c458 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.valueselector - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/package-summary.html b/doc/javadoc/javelin/controller/ai/valueselector/package-summary.html index a698c1f40..a8b1a8831 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/package-summary.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.valueselector - + diff --git a/doc/javadoc/javelin/controller/ai/valueselector/package-tree.html b/doc/javadoc/javelin/controller/ai/valueselector/package-tree.html index 2123daad8..3c1adbbb9 100644 --- a/doc/javadoc/javelin/controller/ai/valueselector/package-tree.html +++ b/doc/javadoc/javelin/controller/ai/valueselector/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.ai.valueselector Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html b/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html index bff9e152d..97141cc9f 100644 --- a/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html +++ b/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html @@ -2,9 +2,9 @@ - + ChallengeRatingCalculator - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":9,"i6":9,"i7":9,"i8":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -214,14 +214,18 @@

        Method Summary

        +static java.lang.String +describedifficulty(int delta)  + + static int elFromCr(float cr)  - + static float[] eltocr(int teamel)  - + static int multipleOpponentsElModifier(int teamSize)  @@ -404,12 +408,21 @@

        calculatepositive

        -
          +

          • eltocr

            public static float[] eltocr(int teamel)
          + + + +
            +
          • +

            describedifficulty

            +
            public static java.lang.String describedifficulty(int delta)
            +
            • +
        diff --git a/doc/javadoc/javelin/controller/challenge/RewardCalculator.html b/doc/javadoc/javelin/controller/challenge/RewardCalculator.html index 7a23a35f0..de2f6786a 100644 --- a/doc/javadoc/javelin/controller/challenge/RewardCalculator.html +++ b/doc/javadoc/javelin/controller/challenge/RewardCalculator.html @@ -2,9 +2,9 @@ - + RewardCalculator - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -172,19 +172,27 @@

        Method Summary

        Method and Description -static Treasure +static Treasure createchest(int gold, int x, int y)  +static int +getcr(float gold)  + + +static int +getgold(float cr)  + + static double getpartycr(int eldifference, int nsurvivors)  - + static int -receivegold(java.util.List<Combatant> originalredteam)  +receivegold(java.util.List<Combatant> team) 
          @@ -258,7 +266,43 @@

          getpartycr

          • receivegold

            -
            public static int receivegold(java.util.List<Combatant> originalredteam)
            +
            public static int receivegold(java.util.List<Combatant> team)
            +
            +
            Returns:
            +
            sum of gold this battle should reward.
            +
            See Also:
            +
            getgold(float)
            +
            +
            • +
          + + + +
            +
          • +

            getgold

            +
            public static int getgold(float cr)
            +
            +
            Parameters:
            +
            cr - Given a challenge rating...
            +
            Returns:
            +
            gold treasure reward for such an opponent.
            +
            +
            • +
          + + + +
            +
          • +

            getcr

            +
            public static int getcr(float gold)
            +
            +
            Parameters:
            +
            gold - Given a certain amount of gold...
            +
            Returns:
            +
            the challenge rating that would warrant this treasure.
            +
          @@ -267,7 +311,7 @@

          receivegold

          • createchest

            -
            public static Treasure createchest(int gold,
+
            public static Treasure createchest(int gold,
                                    int x,
                                    int y)
            • diff --git a/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html b/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html index 41a3f4cf2..d320589bd 100644 --- a/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html +++ b/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html @@ -2,9 +2,9 @@ - + TouchAttackFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html b/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html index ec7502b25..6db8fa4a7 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html @@ -2,9 +2,9 @@ - + AbilitiesFactor - + @@ -74,13 +74,13 @@ @@ -132,6 +132,25 @@

            Class AbilitiesFactor

            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                static floatCOST 
                +
                • +
              • @@ -192,6 +211,27 @@

                Methods inherited from class java.lang.Object

                • + +
                  • @@ -294,13 +334,13 @@

                    listupgrades

                     diff --git a/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html b/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html index eb104292f..9c8327522 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html @@ -2,9 +2,9 @@ - + ArmorClassFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html b/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html index a8040940d..d37536b99 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html @@ -2,9 +2,9 @@ - + ClassLevelFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html b/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html index 99690f3f0..c2114f805 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html @@ -2,9 +2,9 @@ - + CrFactor - + @@ -112,7 +112,7 @@

                    Class CrFactor

                    Direct Known Subclasses:
                    -
                    AbilitiesFactor, ArmorClassFactor, BreathFactor, ClassLevelFactor, FeatsFactor, FullAttackFactor, HdFactor, QualitiesFactor, SizeFactor, SizeFactorWithAttModifiers, SpeedFactor, SpellsFactor, TouchAttackFactor
                    +
                    AbilitiesFactor, ArmorClassFactor, BreathFactor, ClassLevelFactor, FeatsFactor, FullAttackFactor, HdFactor, QualitiesFactor, SizeFactor, SizeFactorWithAttModifiers, SkillsFactor, SpeedFactor, SpellsFactor, TouchAttackFactor

                    diff --git a/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html index cc641f338..cf41ba09e 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html @@ -2,9 +2,9 @@ - + FeatsFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/FullAttackFactor.html b/doc/javadoc/javelin/controller/challenge/factor/FullAttackFactor.html index 74937e6d9..223151098 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/FullAttackFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/FullAttackFactor.html @@ -2,9 +2,9 @@ - + FullAttackFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html b/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html index dc7478053..24d2a06d7 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html @@ -2,9 +2,9 @@ - + HdFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html index 882a3ff20..27bc7ebf0 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html @@ -2,9 +2,9 @@ - + SizeFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html b/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html index 5afd0c016..afeea30f2 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html @@ -2,9 +2,9 @@ - + SizeFactorWithAttModifiers - + @@ -49,7 +49,7 @@
                    • Frames
                      • @@ -249,7 +249,7 @@

                      calculate

                      • Frames
                        • diff --git a/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html new file mode 100644 index 000000000..1d0f74e29 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html @@ -0,0 +1,379 @@ + + + + + +SkillsFactor + + + + + + + + +
                        + + +
                        Skip navigation links
                        + + + + +
                        +
                        + + + +
                        + +
                        +
                        + + +
                        + + +
                        + + +
                        +
                        javelin.controller.challenge.factor
                        +

                        Class SkillsFactor

                        +
                        +
                        + +
                        +
                          +
                        • +
                          +
                          All Implemented Interfaces:
                          +
                          java.lang.Comparable<CrFactor>
                          +
                          +
                          +
                          +
                          public class SkillsFactor
+extends CrFactor
                          +
                          Calculates a challenge rating value based on the skills a character has. To + do that we remove skill points from ClassLevelFactor and + HdFactor. Since if a creature acquires a character class it follows + the rules for multi-class characters then we ignore the 4x bonus points of + first level.. + + All skills are being considered class skills.
                          +
                          +
                          Author:
                          +
                          alex
                          +
                          +
                          • +
                        +
                        +
                        + +
                        +
                        +
                          +
                        • + +
                            +
                          • + + +

                            Field Detail

                            + + + +
                              +
                            • +

                              COST

                              +
                              public static float COST
                              +
                              Challenge rating cost per skill rank.
                              +
                              • +
                            +
                            • +
                          + +
                            +
                          • + + +

                            Constructor Detail

                            + + + +
                              +
                            • +

                              SkillsFactor

                              +
                              public SkillsFactor()
                              +
                              • +
                            +
                            • +
                          + +
                            +
                          • + + +

                            Method Detail

                            + + + + + + + + + + + +
                              +
                            • +

                              levelup

                              +
                              public static float levelup(int progression,
+                            Monster m)
                              +
                              +
                              Parameters:
                              +
                              progression - How many skills are gained per class level or monster hit die.
                              +
                              monster - Applies Monster.intelligence to sum
                              +
                              Returns:
                              +
                              the challenge rating value for how much should be gained in + skills each level.
                              +
                              +
                              • +
                            +
                            • +
                          +
                          • +
                        +
                        +
                        + + +
                        + + +
                        Skip navigation links
                        + + + + +
                        +
                        + + + +
                        + +
                        +
                        + + +
                        + + +
                        + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html index 2c3bedbf5..14a71da5c 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html @@ -2,9 +2,9 @@ - + SpeedFactor - + @@ -48,7 +48,7 @@
                        @@ -317,7 +317,7 @@

                        listupgrades

                        diff --git a/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html index e268589ac..be2272dba 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html @@ -2,9 +2,9 @@ - + SpellsFactor - + @@ -144,7 +144,9 @@

                        Field Summary

                        static int -spells  +spells +
                        Number of different spells in-game.
                        + @@ -238,6 +240,7 @@

                        Field Detail

                      • spells

                        public static int spells
                        +
                        Number of different spells in-game.
                      diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-frame.html b/doc/javadoc/javelin/controller/challenge/factor/package-frame.html index 99b8fad4b..e70359211 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/package-frame.html +++ b/doc/javadoc/javelin/controller/challenge/factor/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor - + @@ -22,6 +22,7 @@

                      Classes

                    • HdFactor
                    • SizeFactor
                    • SizeFactorWithAttModifiers
                      • +
                    • SkillsFactor
                    • SpeedFactor
                    • SpellsFactor
                    diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-summary.html b/doc/javadoc/javelin/controller/challenge/factor/package-summary.html index 6a37548e1..83b00ccb2 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/package-summary.html +++ b/doc/javadoc/javelin/controller/challenge/factor/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor - + @@ -130,12 +130,18 @@

                    Package javelin.controller.challenge.fact   +SkillsFactor + +
                    Calculates a challenge rating value based on the skills a character has.
                    + + + SpeedFactor
                    Only walk and fly are supported.
                    - + SpellsFactor
                    TODO Monster.spellcr
                    diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-tree.html b/doc/javadoc/javelin/controller/challenge/factor/package-tree.html index a6e32c544..a96d4b950 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/package-tree.html +++ b/doc/javadoc/javelin/controller/challenge/factor/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor Class Hierarchy - + @@ -90,6 +90,7 @@

                    Class Hierarchy

                  • javelin.controller.challenge.factor.HdFactor
                  • javelin.controller.challenge.factor.SizeFactor
                  • javelin.controller.challenge.factor.SizeFactorWithAttModifiers
                    • +
                  • javelin.controller.challenge.factor.SkillsFactor
                  • javelin.controller.challenge.factor.SpeedFactor
                  • javelin.controller.challenge.factor.SpellsFactor
                  diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html b/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html index 5de10e872..c05f40505 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html @@ -2,9 +2,9 @@ - + BreathFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/QualitiesFactor.html b/doc/javadoc/javelin/controller/challenge/factor/quality/QualitiesFactor.html index 2ac2b5430..c3587df4e 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/quality/QualitiesFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/quality/QualitiesFactor.html @@ -2,9 +2,9 @@ - + QualitiesFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/package-frame.html b/doc/javadoc/javelin/controller/challenge/factor/quality/package-frame.html index 596556bb9..c58a1b35b 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/quality/package-frame.html +++ b/doc/javadoc/javelin/controller/challenge/factor/quality/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor.quality - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/package-summary.html b/doc/javadoc/javelin/controller/challenge/factor/quality/package-summary.html index 64797dcdb..9fc45a600 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/quality/package-summary.html +++ b/doc/javadoc/javelin/controller/challenge/factor/quality/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor.quality - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/package-tree.html b/doc/javadoc/javelin/controller/challenge/factor/quality/package-tree.html index 3699d8a44..13b248b98 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/quality/package-tree.html +++ b/doc/javadoc/javelin/controller/challenge/factor/quality/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge.factor.quality Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Acrobatics.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Acrobatics.html new file mode 100644 index 000000000..fd1b3d455 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Acrobatics.html @@ -0,0 +1,347 @@ + + + + + +Acrobatics + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Acrobatics

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Acrobatics(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Acrobatics

                        +
                        protected Acrobatics(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Concentration.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Concentration.html new file mode 100644 index 000000000..8ea800e67 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Concentration.html @@ -0,0 +1,347 @@ + + + + + +Concentration + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Concentration

                  +
                  +
                  + +
                  + +
                  +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Concentration

                        +
                        protected Concentration(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Diplomacy.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Diplomacy.html new file mode 100644 index 000000000..c1b095ec4 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Diplomacy.html @@ -0,0 +1,347 @@ + + + + + +Diplomacy + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Diplomacy

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Diplomacy(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Diplomacy

                        +
                        protected Diplomacy(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/DisableDevice.html b/doc/javadoc/javelin/controller/challenge/factor/skill/DisableDevice.html new file mode 100644 index 000000000..23e181419 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/DisableDevice.html @@ -0,0 +1,347 @@ + + + + + +DisableDevice + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class DisableDevice

                  +
                  +
                  + +
                  + +
                  +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        DisableDevice

                        +
                        protected DisableDevice(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/GatherInformation.html b/doc/javadoc/javelin/controller/challenge/factor/skill/GatherInformation.html new file mode 100644 index 000000000..376526751 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/GatherInformation.html @@ -0,0 +1,347 @@ + + + + + +GatherInformation + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class GatherInformation

                  +
                  +
                  + +
                  + +
                  +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        GatherInformation

                        +
                        protected GatherInformation(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Hide.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Hide.html new file mode 100644 index 000000000..a963311d8 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Hide.html @@ -0,0 +1,347 @@ + + + + + +Hide + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Hide

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Hide(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Hide

                        +
                        protected Hide(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Knowledge.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Knowledge.html new file mode 100644 index 000000000..eabb188c5 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Knowledge.html @@ -0,0 +1,347 @@ + + + + + +Knowledge + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Knowledge

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Knowledge(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Knowledge

                        +
                        protected Knowledge(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Listen.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Listen.html new file mode 100644 index 000000000..d7971e94d --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Listen.html @@ -0,0 +1,347 @@ + + + + + +Listen + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Listen

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Listen(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Listen

                        +
                        protected Listen(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/MoveSilently.html b/doc/javadoc/javelin/controller/challenge/factor/skill/MoveSilently.html new file mode 100644 index 000000000..1da5439e6 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/MoveSilently.html @@ -0,0 +1,347 @@ + + + + + +MoveSilently + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class MoveSilently

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected MoveSilently(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        MoveSilently

                        +
                        protected MoveSilently(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Search.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Search.html new file mode 100644 index 000000000..0d8e275f5 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Search.html @@ -0,0 +1,347 @@ + + + + + +Search + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Search

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Search(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Search

                        +
                        protected Search(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/SkillUpgrade.html b/doc/javadoc/javelin/controller/challenge/factor/skill/SkillUpgrade.html new file mode 100644 index 000000000..f160bf8af --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/SkillUpgrade.html @@ -0,0 +1,387 @@ + + + + + +SkillUpgrade + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class SkillUpgrade

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected SkillUpgrade(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        SkillUpgrade

                        +
                        protected SkillUpgrade(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        info

                        +
                        public java.lang.String info(Combatant c)
                        +
                        Description copied from class: Upgrade
                        +
                        To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
                        +
                        +
                        Specified by:
                        +
                        info in class Upgrade
                        +
                        Returns:
                        +
                        one line of text.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected abstract int getranks(Skills s)
                        +
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        apply

                        +
                        protected boolean apply(Combatant c)
                        +
                        +
                        Specified by:
                        +
                        apply in class Upgrade
                        +
                        Parameters:
                        +
                        c - Given an unit apply the upgrade on it.
                        +
                        Returns:
                        +
                        false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected abstract void setranks(Skills s,
+                                 int ranks)
                        +
                        +
                        Parameters:
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/SkillsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/skill/SkillsFactor.html new file mode 100644 index 000000000..99e228f5c --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/SkillsFactor.html @@ -0,0 +1,379 @@ + + + + + +SkillsFactor + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class SkillsFactor

                  +
                  +
                  + +
                  +
                    +
                  • +
                    +
                    All Implemented Interfaces:
                    +
                    java.lang.Comparable<CrFactor>
                    +
                    +
                    +
                    +
                    public class SkillsFactor
+extends CrFactor
                    +
                    Calculates a challenge rating value based on the skills a character has. To + do that we remove skill points from ClassLevelFactor and + HdFactor. Since if a creature acquires a character class it follows + the rules for multi-class characters then we ignore the 4x bonus points of + first level.. + + All skills are being considered class skills.
                    +
                    +
                    Author:
                    +
                    alex
                    +
                    +
                    • +
                  +
                  +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Detail

                      + + + +
                        +
                      • +

                        COST

                        +
                        public static float COST
                        +
                        Challenge rating cost per skill rank.
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        SkillsFactor

                        +
                        public SkillsFactor()
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + + + + + + + + + +
                        +
                      • +

                        levelup

                        +
                        public static float levelup(int progression,
+                            Monster m)
                        +
                        +
                        Parameters:
                        +
                        progression - How many skills are gained per class level or monster hit die.
                        +
                        monster - Applies Monster.intelligence to sum
                        +
                        Returns:
                        +
                        the challenge rating value for how much should be gained in + skills each level.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Spellcraft.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Spellcraft.html new file mode 100644 index 000000000..db60d6a68 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Spellcraft.html @@ -0,0 +1,347 @@ + + + + + +Spellcraft + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Spellcraft

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Spellcraft(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Spellcraft

                        +
                        protected Spellcraft(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Spot.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Spot.html new file mode 100644 index 000000000..e5b53c3a4 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Spot.html @@ -0,0 +1,347 @@ + + + + + +Spot + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Spot

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Spot(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Spot

                        +
                        protected Spot(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/Survival.html b/doc/javadoc/javelin/controller/challenge/factor/skill/Survival.html new file mode 100644 index 000000000..1ee7ed61e --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/Survival.html @@ -0,0 +1,347 @@ + + + + + +Survival + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor.skill
                  +

                  Class Survival

                  +
                  +
                  + +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      +
                        +
                      • + + +

                        Fields inherited from class javelin.controller.upgrade.Upgrade

                        +name
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + + + +
                      Constructors 
                      ModifierConstructor and Description
                      protected Survival(java.lang.String name) 
                      +
                      • +
                    + + +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        Survival

                        +
                        protected Survival(java.lang.String name)
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Detail

                      + + + +
                        +
                      • +

                        getranks

                        +
                        protected int getranks(Skills s)
                        +
                        +
                        Specified by:
                        +
                        getranks in class SkillUpgrade
                        +
                        Returns:
                        +
                        the ranks of the skill in question.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        setranks

                        +
                        protected void setranks(Skills s,
+                        int ranks)
                        +
                        +
                        Specified by:
                        +
                        setranks in class SkillUpgrade
                        +
                        ranks - Sets the rank of the skill in question.
                        +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/package-frame.html b/doc/javadoc/javelin/controller/challenge/factor/skill/package-frame.html new file mode 100644 index 000000000..bca66b38e --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/package-frame.html @@ -0,0 +1,34 @@ + + + + + +javelin.controller.challenge.factor.skill + + + + + +

                  javelin.controller.challenge.factor.skill

                  +
                  +

                  Classes

                  + +
                  + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/package-summary.html b/doc/javadoc/javelin/controller/challenge/factor/skill/package-summary.html new file mode 100644 index 000000000..0bddbf7be --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/package-summary.html @@ -0,0 +1,226 @@ + + + + + +javelin.controller.challenge.factor.skill + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  + + +
                  + +
                  +

                  Package javelin.controller.challenge.factor.skill

                  +
                  +
                  + +
                  + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/skill/package-tree.html b/doc/javadoc/javelin/controller/challenge/factor/skill/package-tree.html new file mode 100644 index 000000000..1a2d37ee7 --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/skill/package-tree.html @@ -0,0 +1,160 @@ + + + + + +javelin.controller.challenge.factor.skill Class Hierarchy + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  + + +
                  + +
                  +

                  Hierarchy For Package javelin.controller.challenge.factor.skill

                  +Package Hierarchies: + +
                  +
                  +

                  Class Hierarchy

                  +
                    +
                  • java.lang.Object +
                      +
                    • javelin.controller.challenge.factor.CrFactor (implements java.lang.Comparable<T>) + +
                      • +
                    • javelin.controller.upgrade.Upgrade (implements java.io.Serializable) +
                        +
                      • javelin.controller.challenge.factor.skill.SkillUpgrade +
                          +
                        • javelin.controller.challenge.factor.skill.Acrobatics
                          • +
                        • javelin.controller.challenge.factor.skill.Concentration
                          • +
                        • javelin.controller.challenge.factor.skill.Diplomacy
                          • +
                        • javelin.controller.challenge.factor.skill.DisableDevice
                          • +
                        • javelin.controller.challenge.factor.skill.GatherInformation
                          • +
                        • javelin.controller.challenge.factor.skill.Hide
                          • +
                        • javelin.controller.challenge.factor.skill.Knowledge
                          • +
                        • javelin.controller.challenge.factor.skill.Listen
                          • +
                        • javelin.controller.challenge.factor.skill.MoveSilently
                          • +
                        • javelin.controller.challenge.factor.skill.Search
                          • +
                        • javelin.controller.challenge.factor.skill.Spellcraft
                          • +
                        • javelin.controller.challenge.factor.skill.Spot
                          • +
                        • javelin.controller.challenge.factor.skill.Survival
                          • +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/package-frame.html b/doc/javadoc/javelin/controller/challenge/package-frame.html index 48fcecfa4..2bba1a243 100644 --- a/doc/javadoc/javelin/controller/challenge/package-frame.html +++ b/doc/javadoc/javelin/controller/challenge/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge - + diff --git a/doc/javadoc/javelin/controller/challenge/package-summary.html b/doc/javadoc/javelin/controller/challenge/package-summary.html index 3845a53cd..511efc574 100644 --- a/doc/javadoc/javelin/controller/challenge/package-summary.html +++ b/doc/javadoc/javelin/controller/challenge/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge - + diff --git a/doc/javadoc/javelin/controller/challenge/package-tree.html b/doc/javadoc/javelin/controller/challenge/package-tree.html index 5f6a27956..24641c9b7 100644 --- a/doc/javadoc/javelin/controller/challenge/package-tree.html +++ b/doc/javadoc/javelin/controller/challenge/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.challenge Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/db/EncounterIndex.html b/doc/javadoc/javelin/controller/db/EncounterIndex.html index 0028144d0..352a888ff 100644 --- a/doc/javadoc/javelin/controller/db/EncounterIndex.html +++ b/doc/javadoc/javelin/controller/db/EncounterIndex.html @@ -2,9 +2,9 @@ - + EncounterIndex - + diff --git a/doc/javadoc/javelin/controller/db/Properties.html b/doc/javadoc/javelin/controller/db/Properties.html index 912cd8a99..d3f33a683 100644 --- a/doc/javadoc/javelin/controller/db/Properties.html +++ b/doc/javadoc/javelin/controller/db/Properties.html @@ -2,9 +2,9 @@ - + Properties - + diff --git a/doc/javadoc/javelin/controller/db/StateManager.html b/doc/javadoc/javelin/controller/db/StateManager.html index 98507ec05..9c0c074b0 100644 --- a/doc/javadoc/javelin/controller/db/StateManager.html +++ b/doc/javadoc/javelin/controller/db/StateManager.html @@ -2,9 +2,9 @@ - + StateManager - + diff --git a/doc/javadoc/javelin/controller/db/package-frame.html b/doc/javadoc/javelin/controller/db/package-frame.html index 8ccc4d555..b66ed9ae6 100644 --- a/doc/javadoc/javelin/controller/db/package-frame.html +++ b/doc/javadoc/javelin/controller/db/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.db - + diff --git a/doc/javadoc/javelin/controller/db/package-summary.html b/doc/javadoc/javelin/controller/db/package-summary.html index ccf4bf017..570d4b05a 100644 --- a/doc/javadoc/javelin/controller/db/package-summary.html +++ b/doc/javadoc/javelin/controller/db/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.db - + diff --git a/doc/javadoc/javelin/controller/db/package-tree.html b/doc/javadoc/javelin/controller/db/package-tree.html index 4ae29e343..7e979a2fb 100644 --- a/doc/javadoc/javelin/controller/db/package-tree.html +++ b/doc/javadoc/javelin/controller/db/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.db Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/db/reader/ErrorHandler.html b/doc/javadoc/javelin/controller/db/reader/ErrorHandler.html index e7fd9799e..7e3692552 100644 --- a/doc/javadoc/javelin/controller/db/reader/ErrorHandler.html +++ b/doc/javadoc/javelin/controller/db/reader/ErrorHandler.html @@ -2,9 +2,9 @@ - + ErrorHandler - + diff --git a/doc/javadoc/javelin/controller/db/reader/MonsterReader.html b/doc/javadoc/javelin/controller/db/reader/MonsterReader.html index ec92f0cc3..c76049c3e 100644 --- a/doc/javadoc/javelin/controller/db/reader/MonsterReader.html +++ b/doc/javadoc/javelin/controller/db/reader/MonsterReader.html @@ -2,9 +2,9 @@ - + MonsterReader - + @@ -353,15 +353,6 @@

                  MonsterReader

                  Method Detail

                  - - - -
                    -
                  • -

                    describe

                    -
                    public void describe(java.lang.String value)
                    -
                    • -
                  @@ -383,6 +374,15 @@

                  startElement

                + + + +
                  +
                • +

                  describe

                  +
                  public void describe(java.lang.String value)
                  +
                  • +
                diff --git a/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html b/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html index f67b5328e..c2a6c8ef8 100644 --- a/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html +++ b/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html @@ -2,9 +2,9 @@ - + SpecialtiesLog - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Alignment.html b/doc/javadoc/javelin/controller/db/reader/factor/Alignment.html new file mode 100644 index 000000000..b7ceee636 --- /dev/null +++ b/doc/javadoc/javelin/controller/db/reader/factor/Alignment.html @@ -0,0 +1,311 @@ + + + + + +Alignment + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.controller.db.reader.factor
                +

                Class Alignment

                +
                +
                + +
                +
                  +
                • +
                  +
                  +
                  public class Alignment
+extends FieldReader
                  +
                  TODO + + Alignment is defined in 2 axis: lawful-neutral-chaotic and good-neutral-evil.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Monster.good, +Monster.lawful, +Monster#conflict
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Alignment(MonsterReader reader, + java.lang.String fieldname) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    voidread(java.lang.String value) 
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Alignment

                      +
                      public Alignment(MonsterReader reader,
+                 java.lang.String fieldname)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      read

                      +
                      public void read(java.lang.String value)
+          throws java.lang.NumberFormatException,
+                 java.beans.PropertyVetoException
                      +
                      +
                      Specified by:
                      +
                      read in class FieldReader
                      +
                      Throws:
                      +
                      java.lang.NumberFormatException
                      +
                      java.beans.PropertyVetoException
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html b/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html index 379f48e86..e2504eb15 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html @@ -2,9 +2,9 @@ - + ArmorClass - + @@ -48,7 +48,7 @@
                  @@ -254,7 +254,7 @@

                  read

                  diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html b/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html index 076447bcf..b7206abb8 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html @@ -2,9 +2,9 @@ - + Attacks - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Damage.html b/doc/javadoc/javelin/controller/db/reader/factor/Damage.html index b5a16eff9..de91a7c8d 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Damage.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Damage.html @@ -2,9 +2,9 @@ - + Damage - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/FaceAndReach.html b/doc/javadoc/javelin/controller/db/reader/factor/FaceAndReach.html index e8cc29d89..07dede143 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/FaceAndReach.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/FaceAndReach.html @@ -2,9 +2,9 @@ - + FaceAndReach - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Feats.html b/doc/javadoc/javelin/controller/db/reader/factor/Feats.html index 080df340f..804e5c850 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Feats.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Feats.html @@ -2,9 +2,9 @@ - + Feats - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/FieldReader.html b/doc/javadoc/javelin/controller/db/reader/factor/FieldReader.html index d334da301..b7e360390 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/FieldReader.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/FieldReader.html @@ -2,9 +2,9 @@ - + FieldReader - + @@ -108,7 +108,7 @@

                  Class FieldReader

                • Direct Known Subclasses:
                  -
                  ArmorClass, Attacks, Damage, FaceAndReach, Feats, HitDice, Initiative, Name, Organization, Paragraph, SpecialAttacks, SpecialQualities, Speed
                  +
                  Alignment, ArmorClass, Attacks, Damage, FaceAndReach, Feats, HitDice, Initiative, Name, Organization, Paragraph, Skills, SpecialAttacks, SpecialQualities, Speed

                  diff --git a/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html b/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html index 7a6ebdc26..0bba36595 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html @@ -2,9 +2,9 @@ - + HitDice - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Initiative.html b/doc/javadoc/javelin/controller/db/reader/factor/Initiative.html index cad30ae28..5a1060a75 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Initiative.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Initiative.html @@ -2,9 +2,9 @@ - + Initiative - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Name.html b/doc/javadoc/javelin/controller/db/reader/factor/Name.html index 8a3c89f4b..c404f7b78 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Name.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Name.html @@ -2,9 +2,9 @@ - + Name - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Organization.html b/doc/javadoc/javelin/controller/db/reader/factor/Organization.html index 92487394e..5619305a6 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Organization.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Organization.html @@ -2,9 +2,9 @@ - + Organization - + @@ -139,8 +139,10 @@

                  Field Summary

                  Field and Description -static java.util.HashMap<java.lang.String,java.lang.String[]> -TERRAINDATA  +static java.util.HashMap<java.lang.String,EncounterIndex> +ENCOUNTERS +
                  Possible encounters by terrain type.
                  +
                    @@ -189,7 +191,8 @@

                    Method Summary

                    static java.util.List<Combatant> -makeencounter(int el)  +makeencounter(int el, + int terrainp)  static void @@ -227,13 +230,14 @@

                    Methods inherited from class java.lang.Object

                    Field Detail

                    - +
                    • -

                      TERRAINDATA

                      -
                      public static java.util.HashMap<java.lang.String,java.lang.String[]> TERRAINDATA
                      +

                      ENCOUNTERS

                      +
                      public static final java.util.HashMap<java.lang.String,EncounterIndex> ENCOUNTERS
                      +
                      Possible encounters by terrain type.
                    @@ -309,13 +313,22 @@

                    jointerrains

                    java.util.HashSet<java.lang.String> terrains)
                  - +

                  • makeencounter

                    -
                    public static java.util.List<Combatant> makeencounter(int el)
                    +
                    public static java.util.List<Combatant> makeencounter(int el,
+                                                      int terrainp)
                    +
                    +
                    Parameters:
                    +
                    el - Given an encounter level target...
                    +
                    terrainp -
                    +
                    Returns:
                    +
                    a predefined creature group found on monster.xml from any of the + local terrains.
                    +
                  • diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html b/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html index f3303304d..baead2a43 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html @@ -2,9 +2,9 @@ - + Paragraph - + @@ -49,7 +49,7 @@
                  • Frames
                    • @@ -261,7 +261,7 @@

                    read

                    • Frames
                      • diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Skills.html b/doc/javadoc/javelin/controller/db/reader/factor/Skills.html new file mode 100644 index 000000000..31a2b7c1c --- /dev/null +++ b/doc/javadoc/javelin/controller/db/reader/factor/Skills.html @@ -0,0 +1,336 @@ + + + + + +Skills + + + + + + + + +
                      + + +
                      Skip navigation links
                      + + + + +
                      +
                      + + + +
                      + +
                      +
                      + + +
                      + + +
                      + + +
                      +
                      javelin.controller.db.reader.factor
                      +

                      Class Skills

                      +
                      +
                      + +
                      +
                        +
                      • +
                        +
                        +
                        public class Skills
+extends FieldReader
                        +
                        Input method for Monster.skills. Calculates ranks, not total bonus.
                        +
                        +
                        Author:
                        +
                        alex
                        +
                        +
                        • +
                      +
                      +
                      +
                        +
                      • + +
                          +
                        • + + +

                          Field Summary

                          + + + + + + + + + + +
                          Fields 
                          Modifier and TypeField and Description
                          static java.util.HashSet<java.lang.String>UNKNOWN 
                          + +
                          • +
                        + +
                          +
                        • + + +

                          Constructor Summary

                          + + + + + + + + +
                          Constructors 
                          Constructor and Description
                          Skills(MonsterReader reader, + java.lang.String fieldname) +
                          Constructor.
                          +
                          +
                          • +
                        + +
                          +
                        • + + +

                          Method Summary

                          + + + + + + + + + + +
                          All Methods Instance Methods Concrete Methods 
                          Modifier and TypeMethod and Description
                          voidread(java.lang.String text) 
                          +
                            +
                          • + + +

                            Methods inherited from class java.lang.Object

                            +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                            • +
                          +
                          • +
                        +
                        • +
                      +
                      +
                      +
                        +
                      • + +
                          +
                        • + + +

                          Field Detail

                          + + + +
                            +
                          • +

                            UNKNOWN

                            +
                            public static final java.util.HashSet<java.lang.String> UNKNOWN
                            +
                            • +
                          +
                          • +
                        + +
                          +
                        • + + +

                          Constructor Detail

                          + + + +
                            +
                          • +

                            Skills

                            +
                            public Skills(MonsterReader reader,
+              java.lang.String fieldname)
                            +
                            Constructor.
                            +
                            • +
                          +
                          • +
                        + +
                          +
                        • + + +

                          Method Detail

                          + + + +
                            +
                          • +

                            read

                            +
                            public void read(java.lang.String text)
+          throws java.lang.NumberFormatException,
+                 java.beans.PropertyVetoException
                            +
                            +
                            Specified by:
                            +
                            read in class FieldReader
                            +
                            Throws:
                            +
                            java.lang.NumberFormatException
                            +
                            java.beans.PropertyVetoException
                            +
                            +
                            • +
                          +
                          • +
                        +
                        • +
                      +
                      +
                      + + +
                      + + +
                      Skip navigation links
                      + + + + +
                      +
                      + + + +
                      + +
                      +
                      + + +
                      + + +
                      + + + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html b/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html index 67c362aba..6c4f1afd8 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html @@ -2,9 +2,9 @@ - + SpecialAttacks - + @@ -48,7 +48,7 @@
                      @@ -254,7 +254,7 @@

                      read

                      diff --git a/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html b/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html index 745e97e92..7bf699775 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html @@ -2,9 +2,9 @@ - + SpecialQualities - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Speed.html b/doc/javadoc/javelin/controller/db/reader/factor/Speed.html index d503a1836..a8b7e23ba 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Speed.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Speed.html @@ -2,9 +2,9 @@ - + Speed - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/package-frame.html b/doc/javadoc/javelin/controller/db/reader/factor/package-frame.html index d13572ae0..b53acd310 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/package-frame.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.factor - + @@ -13,6 +13,7 @@

                      Classes

                        +
                      • Alignment
                      • ArmorClass
                      • Attacks
                      • Damage
                        • @@ -24,6 +25,7 @@

                        Classes

                      • Name
                      • Organization
                      • Paragraph
                        • +
                      • Skills
                      • SpecialAttacks
                      • SpecialQualities
                      • Speed
                        • diff --git a/doc/javadoc/javelin/controller/db/reader/factor/package-summary.html b/doc/javadoc/javelin/controller/db/reader/factor/package-summary.html index 3ac1c1f70..178c0ae2a 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/package-summary.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.factor - + @@ -82,53 +82,67 @@

                        Package javelin.controller.db.reader.fact +Alignment + +
                        TODO + + Alignment is defined in 2 axis: lawful-neutral-chaotic and good-neutral-evil.
                        + + + ArmorClass   - + Attacks   - + Damage   - + FaceAndReach   - + Feats   - + FieldReader
                        Reads one of the XML tags inside a MONSTER tag.
                        - + HitDice   - + Initiative   - + Name   - + Organization   - + Paragraph
                        Reads a P tag.
                        + +Skills + +
                        Input method for Monster.skills.
                        + + SpecialAttacks   diff --git a/doc/javadoc/javelin/controller/db/reader/factor/package-tree.html b/doc/javadoc/javelin/controller/db/reader/factor/package-tree.html index f0e8f027b..ee101c718 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/package-tree.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.factor Class Hierarchy - + @@ -82,6 +82,7 @@

                        Class Hierarchy

                        • javelin.controller.db.reader.factor.FieldReader
                            +
                          • javelin.controller.db.reader.factor.Alignment
                          • javelin.controller.db.reader.factor.ArmorClass
                          • javelin.controller.db.reader.factor.Attacks
                          • javelin.controller.db.reader.factor.Damage
                            • @@ -92,6 +93,7 @@

                            Class Hierarchy

                          • javelin.controller.db.reader.factor.Name
                          • javelin.controller.db.reader.factor.Organization
                          • javelin.controller.db.reader.factor.Paragraph
                            • +
                          • javelin.controller.db.reader.factor.Skills
                          • javelin.controller.db.reader.factor.SpecialAttacks
                          • javelin.controller.db.reader.factor.SpecialQualities
                          • javelin.controller.db.reader.factor.Speed
                            • diff --git a/doc/javadoc/javelin/controller/db/reader/package-frame.html b/doc/javadoc/javelin/controller/db/reader/package-frame.html index 2524e87e1..89b825224 100644 --- a/doc/javadoc/javelin/controller/db/reader/package-frame.html +++ b/doc/javadoc/javelin/controller/db/reader/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader - + diff --git a/doc/javadoc/javelin/controller/db/reader/package-summary.html b/doc/javadoc/javelin/controller/db/reader/package-summary.html index 87ac4cbe2..306197a3c 100644 --- a/doc/javadoc/javelin/controller/db/reader/package-summary.html +++ b/doc/javadoc/javelin/controller/db/reader/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader - + diff --git a/doc/javadoc/javelin/controller/db/reader/package-tree.html b/doc/javadoc/javelin/controller/db/reader/package-tree.html index ba638c913..5b4de5056 100644 --- a/doc/javadoc/javelin/controller/db/reader/package-tree.html +++ b/doc/javadoc/javelin/controller/db/reader/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/encounter/Encounter.html b/doc/javadoc/javelin/controller/encounter/Encounter.html index 9b0552095..252401d29 100644 --- a/doc/javadoc/javelin/controller/encounter/Encounter.html +++ b/doc/javadoc/javelin/controller/encounter/Encounter.html @@ -2,9 +2,9 @@ - + Encounter - + diff --git a/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html b/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html index 9c621992f..035464082 100644 --- a/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html +++ b/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html @@ -2,9 +2,9 @@ - + EncounterGenerator - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9}; +var methods = {"i0":9,"i1":9,"i2":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -74,13 +74,13 @@ @@ -110,7 +110,12 @@

                            Class EncounterGenerator


                            public class EncounterGenerator
 extends java.lang.Object
                            -
                            Generates an Encounter.
                            +
                            Generates an Encounter. + + If I'm not mistaken when manually converting Organization data on + monster.xml to a parseable format I only included monster groups up to 16 + strong - anything other than that for generated encounters will need to be + worked upon or done through other means than only this class.
                            Author:
                            alex
                            @@ -121,25 +126,6 @@

                            Class EncounterGenerator

                            • - -
                                -
                              • - - -

                                Field Summary

                                - - - - - - - - - - -
                                Fields 
                                Modifier and TypeField and Description
                                static intMAXGROUPSIZE 
                                -
                                • -
                              • @@ -171,11 +157,20 @@

                                Method Summary

                                static java.util.ArrayList<                                Combatant> -generate(int el)  +generate(int el, + int terrainp)  +static int +getmaxenemynumber() +
                                See EncounterGenerator's main javadoc description for mote info + on enemy group size.
                                + + + static java.util.ArrayList<Combatant> -select(int elp)  +select(int elp, + int terrainp) 
                                  @@ -193,23 +188,6 @@

                                  Methods inherited from class java.lang.Object

                                  • - -
                                      -
                                    • - - -

                                      Field Detail

                                      - - - -
                                        -
                                      • -

                                        MAXGROUPSIZE

                                        -
                                        public static final int MAXGROUPSIZE
                                        -
                                        • -
                                      -
                                      • -
                                    • @@ -233,13 +211,14 @@

                                      EncounterGenerator

                                      Method Detail

                                      - +

                                      • generate

                                        -
                                        public static java.util.ArrayList<Combatant> generate(int el)
+
                                        public static java.util.ArrayList<Combatant> generate(int el,
+                                                      int terrainp)
                                                throws GaveUpException
                                        
 
                                        
 
                                        Throws:
                                        
@@ -247,13 +226,33 @@ 
                                        generate
                                      - + -
                                        +

                                        • select

                                          -
                                          public static java.util.ArrayList<Combatant> select(int elp)
                                          +
                                          public static java.util.ArrayList<Combatant> select(int elp,
+                                                    int terrainp)
                                          +
                                          • +
                                        + + + +
                                          +
                                        • +

                                          getmaxenemynumber

                                          +
                                          public static int getmaxenemynumber()
                                          +
                                          See EncounterGenerator's main javadoc description for mote info + on enemy group size.
                                          +
                                          +
                                          Returns:
                                          +
                                          The recommended number of enemies to face at most in one battle. + Other modules may differ from this but this is a suggestion to + avoid the computer player taking a long time to act while the + human player has to wait (for example: 1 human unit against 20 + enemies).
                                          +
                                        @@ -309,13 +308,13 @@

                                        select

                                        diff --git a/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html b/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html index da444407e..5ab6daba5 100644 --- a/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html +++ b/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html @@ -2,9 +2,9 @@ - + EncounterPossibilities - + diff --git a/doc/javadoc/javelin/controller/encounter/GeneratedFight.html b/doc/javadoc/javelin/controller/encounter/GeneratedFight.html index 67432112f..7d97518e7 100644 --- a/doc/javadoc/javelin/controller/encounter/GeneratedFight.html +++ b/doc/javadoc/javelin/controller/encounter/GeneratedFight.html @@ -2,9 +2,9 @@ - + GeneratedFight - + @@ -43,7 +43,7 @@
                                        • Frames
                                          • @@ -229,7 +229,7 @@

                                          GeneratedFight

                                          • Frames
                                            • diff --git a/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html b/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html new file mode 100644 index 000000000..f910ac453 --- /dev/null +++ b/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html @@ -0,0 +1,283 @@ + + + + + +MisalignmentDetector + + + + + + + + +
                                            + + +
                                            Skip navigation links
                                            + + + + +
                                            +
                                            + + + +
                                            + +
                                            +
                                            +
                                              +
                                            • Summary: 
                                              • +
                                            • Nested | 
                                              • +
                                            • Field | 
                                              • +
                                            • Constr | 
                                              • +
                                            • Method
                                              • +
                                            + +
                                            + + +
                                            + + +
                                            +
                                            javelin.controller.encounter
                                            +

                                            Class MisalignmentDetector

                                            +
                                            +
                                            +
                                              +
                                            • java.lang.Object
                                              • +
                                            • +
                                                +
                                              • javelin.controller.encounter.MisalignmentDetector
                                                • +
                                              +
                                              • +
                                            +
                                            +
                                              +
                                            • +
                                              +
                                              +
                                              public class MisalignmentDetector
+extends java.lang.Object
                                              +
                                              Checks if a group of Combatants is aligned enough to work as a team.
                                              +
                                              +
                                              Author:
                                              +
                                              alex
                                              +
                                              +
                                              • +
                                            +
                                            +
                                            +
                                              +
                                            • + + + +
                                                +
                                              • + + +

                                                Method Summary

                                                + + + + + + + + + + +
                                                All Methods Instance Methods Concrete Methods 
                                                Modifier and TypeMethod and Description
                                                booleancheck() 
                                                +
                                                  +
                                                • + + +

                                                  Methods inherited from class java.lang.Object

                                                  +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                                                  • +
                                                +
                                                • +
                                              +
                                              • +
                                            +
                                            +
                                            +
                                              +
                                            • + +
                                                +
                                              • + + +

                                                Constructor Detail

                                                + + + +
                                                  +
                                                • +

                                                  MisalignmentDetector

                                                  +
                                                  public MisalignmentDetector(java.util.ArrayList<Combatant> foes)
                                                  +
                                                  +
                                                  Parameters:
                                                  +
                                                  foes - All combatants that need to be compatible.
                                                  +
                                                  +
                                                  • +
                                                +
                                                • +
                                              + +
                                                +
                                              • + + +

                                                Method Detail

                                                + + + +
                                                  +
                                                • +

                                                  check

                                                  +
                                                  public boolean check()
                                                  +
                                                  +
                                                  Returns:
                                                  +
                                                  false if there are good and evil (or lawful and + chaotic) creatures coexisting on the given group.
                                                  +
                                                  +
                                                  • +
                                                +
                                                • +
                                              +
                                              • +
                                            +
                                            +
                                            + + +
                                            + + +
                                            Skip navigation links
                                            + + + + +
                                            +
                                            + + + +
                                            + +
                                            +
                                            +
                                              +
                                            • Summary: 
                                              • +
                                            • Nested | 
                                              • +
                                            • Field | 
                                              • +
                                            • Constr | 
                                              • +
                                            • Method
                                              • +
                                            + +
                                            + + +
                                            + + + diff --git a/doc/javadoc/javelin/controller/encounter/package-frame.html b/doc/javadoc/javelin/controller/encounter/package-frame.html index d36c52706..fd050e1d6 100644 --- a/doc/javadoc/javelin/controller/encounter/package-frame.html +++ b/doc/javadoc/javelin/controller/encounter/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.encounter - + @@ -17,6 +17,7 @@

                                            Classes

                                          • EncounterGenerator
                                          • EncounterPossibilities
                                          • GeneratedFight
                                            • +
                                          • MisalignmentDetector
                                          diff --git a/doc/javadoc/javelin/controller/encounter/package-summary.html b/doc/javadoc/javelin/controller/encounter/package-summary.html index f7f730cff..c2e2f95f2 100644 --- a/doc/javadoc/javelin/controller/encounter/package-summary.html +++ b/doc/javadoc/javelin/controller/encounter/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.encounter - + @@ -104,6 +104,12 @@

                                          Package javelin.controller.encounter

                                          are being used for different purposes.
                                        + +MisalignmentDetector + +
                                        Checks if a group of Combatants is aligned enough to work as a team.
                                        + + diff --git a/doc/javadoc/javelin/controller/encounter/package-tree.html b/doc/javadoc/javelin/controller/encounter/package-tree.html index 9ecac57ce..c70455a02 100644 --- a/doc/javadoc/javelin/controller/encounter/package-tree.html +++ b/doc/javadoc/javelin/controller/encounter/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.encounter Class Hierarchy - + @@ -84,6 +84,7 @@

                                        Class Hierarchy

                                      • javelin.controller.encounter.EncounterGenerator
                                      • javelin.controller.encounter.EncounterPossibilities
                                      • javelin.controller.encounter.GeneratedFight
                                        • +
                                      • javelin.controller.encounter.MisalignmentDetector
                                    diff --git a/doc/javadoc/javelin/controller/exception/GaveUpException.html b/doc/javadoc/javelin/controller/exception/GaveUpException.html index 01e355320..5eebeb90c 100644 --- a/doc/javadoc/javelin/controller/exception/GaveUpException.html +++ b/doc/javadoc/javelin/controller/exception/GaveUpException.html @@ -2,9 +2,9 @@ - + GaveUpException - + diff --git a/doc/javadoc/javelin/controller/exception/NotPeaceful.html b/doc/javadoc/javelin/controller/exception/NotPeaceful.html index bff627cbc..047472c76 100644 --- a/doc/javadoc/javelin/controller/exception/NotPeaceful.html +++ b/doc/javadoc/javelin/controller/exception/NotPeaceful.html @@ -2,9 +2,9 @@ - + NotPeaceful - + diff --git a/doc/javadoc/javelin/controller/exception/RepeatTurnException.html b/doc/javadoc/javelin/controller/exception/RepeatTurnException.html index d1737d559..7d01c72d3 100644 --- a/doc/javadoc/javelin/controller/exception/RepeatTurnException.html +++ b/doc/javadoc/javelin/controller/exception/RepeatTurnException.html @@ -2,9 +2,9 @@ - + RepeatTurnException - + diff --git a/doc/javadoc/javelin/controller/exception/StopThinking.html b/doc/javadoc/javelin/controller/exception/StopThinking.html index 04322337c..96a9dc852 100644 --- a/doc/javadoc/javelin/controller/exception/StopThinking.html +++ b/doc/javadoc/javelin/controller/exception/StopThinking.html @@ -2,9 +2,9 @@ - + StopThinking - + diff --git a/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html b/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html index 19a5a745f..b37e1491c 100644 --- a/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html +++ b/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html @@ -2,9 +2,9 @@ - + UnbalancedTeamsException - + diff --git a/doc/javadoc/javelin/controller/exception/battle/BattleEvent.html b/doc/javadoc/javelin/controller/exception/battle/BattleEvent.html index acdbea9d5..53b5ff874 100644 --- a/doc/javadoc/javelin/controller/exception/battle/BattleEvent.html +++ b/doc/javadoc/javelin/controller/exception/battle/BattleEvent.html @@ -2,9 +2,9 @@ - + BattleEvent - + diff --git a/doc/javadoc/javelin/controller/exception/battle/EndBattle.html b/doc/javadoc/javelin/controller/exception/battle/EndBattle.html index da18388bd..d599b8d9c 100644 --- a/doc/javadoc/javelin/controller/exception/battle/EndBattle.html +++ b/doc/javadoc/javelin/controller/exception/battle/EndBattle.html @@ -2,9 +2,9 @@ - + EndBattle - + @@ -205,8 +205,9 @@

                                    Method Summary

                                    Combatant to)  -static boolean -revive(Combatant original)  +static void +end(BattleScreen battleScreen, + java.util.ArrayList<Combatant> originalTeam)  static void @@ -264,7 +265,7 @@

                                    lastkilled

                                    public static Combatant lastkilled
                                    See Also:
                                    -
                                    HaxorScreen.RESSURECT
                                    +
                                    HaxorScreen#RESSURECT
                                  @@ -332,13 +333,14 @@

                                  bury

                                  public static void bury(java.util.List<Combatant> originalteam)
                                - +
                                • -

                                  revive

                                  -
                                  public static boolean revive(Combatant original)
                                  +

                                  end

                                  +
                                  public static void end(BattleScreen battleScreen,
+                       java.util.ArrayList<Combatant> originalTeam)
                                • diff --git a/doc/javadoc/javelin/controller/exception/battle/StartBattle.html b/doc/javadoc/javelin/controller/exception/battle/StartBattle.html index ae89a96d4..b83491847 100644 --- a/doc/javadoc/javelin/controller/exception/battle/StartBattle.html +++ b/doc/javadoc/javelin/controller/exception/battle/StartBattle.html @@ -2,9 +2,9 @@ - + StartBattle - + @@ -133,7 +133,8 @@

                                Class StartBattle

                                Author:
                                alex
                                See Also:
                                -
                                Serialized Form
                                +
                                BattleSetup, +Serialized Form
                          diff --git a/doc/javadoc/javelin/controller/exception/battle/package-frame.html b/doc/javadoc/javelin/controller/exception/battle/package-frame.html index 40aaa18a1..d47dd2b53 100644 --- a/doc/javadoc/javelin/controller/exception/battle/package-frame.html +++ b/doc/javadoc/javelin/controller/exception/battle/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.exception.battle - + diff --git a/doc/javadoc/javelin/controller/exception/battle/package-summary.html b/doc/javadoc/javelin/controller/exception/battle/package-summary.html index a67023550..91d3639f4 100644 --- a/doc/javadoc/javelin/controller/exception/battle/package-summary.html +++ b/doc/javadoc/javelin/controller/exception/battle/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.exception.battle - + diff --git a/doc/javadoc/javelin/controller/exception/battle/package-tree.html b/doc/javadoc/javelin/controller/exception/battle/package-tree.html index 7d0451589..36eec58b3 100644 --- a/doc/javadoc/javelin/controller/exception/battle/package-tree.html +++ b/doc/javadoc/javelin/controller/exception/battle/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.exception.battle Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/exception/package-frame.html b/doc/javadoc/javelin/controller/exception/package-frame.html index 0faee6139..fb50dbc10 100644 --- a/doc/javadoc/javelin/controller/exception/package-frame.html +++ b/doc/javadoc/javelin/controller/exception/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.exception - + diff --git a/doc/javadoc/javelin/controller/exception/package-summary.html b/doc/javadoc/javelin/controller/exception/package-summary.html index 0228840f3..23c5b24d0 100644 --- a/doc/javadoc/javelin/controller/exception/package-summary.html +++ b/doc/javadoc/javelin/controller/exception/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.exception - + diff --git a/doc/javadoc/javelin/controller/exception/package-tree.html b/doc/javadoc/javelin/controller/exception/package-tree.html index ebfef84df..63f240603 100644 --- a/doc/javadoc/javelin/controller/exception/package-tree.html +++ b/doc/javadoc/javelin/controller/exception/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.exception Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/fight/ExhibitionFight.html b/doc/javadoc/javelin/controller/fight/ExhibitionFight.html index e93f15ed3..b95e15a72 100644 --- a/doc/javadoc/javelin/controller/fight/ExhibitionFight.html +++ b/doc/javadoc/javelin/controller/fight/ExhibitionFight.html @@ -2,9 +2,9 @@ - + ExhibitionFight - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -158,23 +158,33 @@

                          Method Summary

                          Method and Description +void +bribe() +
                          Called in case of a succesful bribe.
                          + + + +boolean +canbribe()  + + boolean friendly()  - + int getel(JavelinApp javelinApp, int teamel)  - + Map getmap()  - + java.util.List<Combatant> getmonsters(int teamel)  - + BattleScreen getscreen(JavelinApp javelinApp, BattleMap battlemap) @@ -182,10 +192,18 @@

                          Method Summary

                          to this interface.

                    - + +boolean +hide()  + + boolean meld()  + +boolean +rewardgold()  + @@ -310,13 +330,82 @@

                    getmap

                    -
                      +

                      • friendly

                        public boolean friendly()
                        Specified by:
                        friendly in interface Fight
                        +
                        Returns:
                        +
                        If true will remove opponents at first sign of blood + instead of at negative hit points.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        rewardgold

                        +
                        public boolean rewardgold()
                        +
                        +
                        Specified by:
                        +
                        rewardgold in interface Fight
                        +
                        Returns:
                        +
                        If false will not reward gold after victory.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        hide

                        +
                        public boolean hide()
                        +
                        +
                        Specified by:
                        +
                        hide in interface Fight
                        +
                        Returns:
                        +
                        true if there is a chance for the Squad to + hide and avoid this combat. This doesn't make sense for + Sieges for example since they are actually engaging the + enemy.
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        bribe

                        +
                        public void bribe()
                        +
                        Description copied from interface: Fight
                        +
                        Called in case of a succesful bribe.
                        +
                        +
                        Specified by:
                        +
                        bribe in interface Fight
                        +
                        See Also:
                        +
                        Fight.canbribe()
                        +
                        +
                        • +
                      + + + +
                        +
                      • +

                        canbribe

                        +
                        public boolean canbribe()
                        +
                        +
                        Specified by:
                        +
                        canbribe in interface Fight
                        +
                        Returns:
                        +
                        true if this fight is susceptible to + Skills.diplomacy.
                      diff --git a/doc/javadoc/javelin/controller/fight/Fight.html b/doc/javadoc/javelin/controller/fight/Fight.html index eedc48dbc..4ff682279 100644 --- a/doc/javadoc/javelin/controller/fight/Fight.html +++ b/doc/javadoc/javelin/controller/fight/Fight.html @@ -2,9 +2,9 @@ - + Fight - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6}; +var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6,"i6":6,"i7":6,"i8":6,"i9":6}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -100,14 +100,14 @@

                      Interface Fight

                    • All Known Implementing Classes:
                      -
                      ExhibitionFight, IncursionFight, LairFight, PlanarFight, RandomDungeonEncounter, RandomEncounter
                      +
                      ExhibitionFight, IncursionFight, LairFight, PlanarFight, RandomDungeonEncounter, RandomEncounter, Siege

                      public interface Fight
                      A battle scenario. - TODO turn into class with fields.
                      + TODO turn into class with fields?
                @@ -127,23 +127,33 @@

                Method Summary

                Method and Description +void +bribe() +
                Called in case of a succesful bribe.
                + + + +boolean +canbribe()  + + boolean friendly()  - + int getel(JavelinApp javelinApp, int teamel)  - + Map getmap()  - + java.util.List<Combatant> getmonsters(int teamel)  - + BattleScreen getscreen(JavelinApp javelinApp, BattleMap battlemap) @@ -151,10 +161,18 @@

                Method Summary

                to this interface.
            - + +boolean +hide()  + + boolean meld()  + +boolean +rewardgold()  +
          @@ -221,6 +239,10 @@

          getmonsters

        • meld

          boolean meld()
          +
          +
          Returns:
          +
          true if Meld should be generated.
          +
        @@ -240,10 +262,72 @@

        getmap

         - diff --git a/doc/javadoc/javelin/controller/map/Arena.html b/doc/javadoc/javelin/controller/map/Arena.html index a2a2d084a..ed246c5d5 100644 --- a/doc/javadoc/javelin/controller/map/Arena.html +++ b/doc/javadoc/javelin/controller/map/Arena.html @@ -2,9 +2,9 @@ - + Arena - + diff --git a/doc/javadoc/javelin/controller/map/DndMap.html b/doc/javadoc/javelin/controller/map/DndMap.html index 89730b50d..2e449562b 100644 --- a/doc/javadoc/javelin/controller/map/DndMap.html +++ b/doc/javadoc/javelin/controller/map/DndMap.html @@ -2,9 +2,9 @@ - + DndMap - + diff --git a/doc/javadoc/javelin/controller/map/Map.html b/doc/javadoc/javelin/controller/map/Map.html index 18eb0fa6b..2e4f5d645 100644 --- a/doc/javadoc/javelin/controller/map/Map.html +++ b/doc/javadoc/javelin/controller/map/Map.html @@ -2,9 +2,9 @@ - + Map - + diff --git a/doc/javadoc/javelin/controller/map/MapGenerator.html b/doc/javadoc/javelin/controller/map/MapGenerator.html index ac46eac9f..0238c9c34 100644 --- a/doc/javadoc/javelin/controller/map/MapGenerator.html +++ b/doc/javadoc/javelin/controller/map/MapGenerator.html @@ -2,9 +2,9 @@ - + MapGenerator - + diff --git a/doc/javadoc/javelin/controller/map/TyrantMap.html b/doc/javadoc/javelin/controller/map/TyrantMap.html index 62b96c567..daac71416 100644 --- a/doc/javadoc/javelin/controller/map/TyrantMap.html +++ b/doc/javadoc/javelin/controller/map/TyrantMap.html @@ -2,9 +2,9 @@ - + TyrantMap - + diff --git a/doc/javadoc/javelin/controller/map/desert/Rocky.html b/doc/javadoc/javelin/controller/map/desert/Rocky.html index 85724630e..53d99f499 100644 --- a/doc/javadoc/javelin/controller/map/desert/Rocky.html +++ b/doc/javadoc/javelin/controller/map/desert/Rocky.html @@ -2,9 +2,9 @@ - + Rocky - + diff --git a/doc/javadoc/javelin/controller/map/desert/Sandy.html b/doc/javadoc/javelin/controller/map/desert/Sandy.html index 26cf4f858..08b7d28c2 100644 --- a/doc/javadoc/javelin/controller/map/desert/Sandy.html +++ b/doc/javadoc/javelin/controller/map/desert/Sandy.html @@ -2,9 +2,9 @@ - + Sandy - + diff --git a/doc/javadoc/javelin/controller/map/desert/Tundra.html b/doc/javadoc/javelin/controller/map/desert/Tundra.html index 9b6a5f583..1dde4c8ed 100644 --- a/doc/javadoc/javelin/controller/map/desert/Tundra.html +++ b/doc/javadoc/javelin/controller/map/desert/Tundra.html @@ -2,9 +2,9 @@ - + Tundra - + diff --git a/doc/javadoc/javelin/controller/map/desert/package-frame.html b/doc/javadoc/javelin/controller/map/desert/package-frame.html index a5c220cbc..5731e65cf 100644 --- a/doc/javadoc/javelin/controller/map/desert/package-frame.html +++ b/doc/javadoc/javelin/controller/map/desert/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.desert - + diff --git a/doc/javadoc/javelin/controller/map/desert/package-summary.html b/doc/javadoc/javelin/controller/map/desert/package-summary.html index 7923067a1..a6403c6b9 100644 --- a/doc/javadoc/javelin/controller/map/desert/package-summary.html +++ b/doc/javadoc/javelin/controller/map/desert/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.desert - + diff --git a/doc/javadoc/javelin/controller/map/desert/package-tree.html b/doc/javadoc/javelin/controller/map/desert/package-tree.html index 7ead3dfc0..0a19357cc 100644 --- a/doc/javadoc/javelin/controller/map/desert/package-tree.html +++ b/doc/javadoc/javelin/controller/map/desert/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.desert Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/forest/DenseForest.html b/doc/javadoc/javelin/controller/map/forest/DenseForest.html index 23e80ccb8..7a6f88854 100644 --- a/doc/javadoc/javelin/controller/map/forest/DenseForest.html +++ b/doc/javadoc/javelin/controller/map/forest/DenseForest.html @@ -2,9 +2,9 @@ - + DenseForest - + diff --git a/doc/javadoc/javelin/controller/map/forest/Forest.html b/doc/javadoc/javelin/controller/map/forest/Forest.html index 6416c0a3b..9d5623804 100644 --- a/doc/javadoc/javelin/controller/map/forest/Forest.html +++ b/doc/javadoc/javelin/controller/map/forest/Forest.html @@ -2,9 +2,9 @@ - + Forest - + diff --git a/doc/javadoc/javelin/controller/map/forest/SparseForest.html b/doc/javadoc/javelin/controller/map/forest/SparseForest.html index 5a39eebeb..df4c4d9d5 100644 --- a/doc/javadoc/javelin/controller/map/forest/SparseForest.html +++ b/doc/javadoc/javelin/controller/map/forest/SparseForest.html @@ -2,9 +2,9 @@ - + SparseForest - + diff --git a/doc/javadoc/javelin/controller/map/forest/package-frame.html b/doc/javadoc/javelin/controller/map/forest/package-frame.html index ddb4bf616..858a5959b 100644 --- a/doc/javadoc/javelin/controller/map/forest/package-frame.html +++ b/doc/javadoc/javelin/controller/map/forest/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.forest - + diff --git a/doc/javadoc/javelin/controller/map/forest/package-summary.html b/doc/javadoc/javelin/controller/map/forest/package-summary.html index 1cb43661b..d3bffcef2 100644 --- a/doc/javadoc/javelin/controller/map/forest/package-summary.html +++ b/doc/javadoc/javelin/controller/map/forest/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.forest - + diff --git a/doc/javadoc/javelin/controller/map/forest/package-tree.html b/doc/javadoc/javelin/controller/map/forest/package-tree.html index a2c45c175..426c6bcd7 100644 --- a/doc/javadoc/javelin/controller/map/forest/package-tree.html +++ b/doc/javadoc/javelin/controller/map/forest/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.forest Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/hill/GentleHiill.html b/doc/javadoc/javelin/controller/map/hill/GentleHiill.html index 9b61c7351..620d5a270 100644 --- a/doc/javadoc/javelin/controller/map/hill/GentleHiill.html +++ b/doc/javadoc/javelin/controller/map/hill/GentleHiill.html @@ -2,9 +2,9 @@ - + GentleHiill - + diff --git a/doc/javadoc/javelin/controller/map/hill/RuggedHill.html b/doc/javadoc/javelin/controller/map/hill/RuggedHill.html index e57c52fb4..4010057c0 100644 --- a/doc/javadoc/javelin/controller/map/hill/RuggedHill.html +++ b/doc/javadoc/javelin/controller/map/hill/RuggedHill.html @@ -2,9 +2,9 @@ - + RuggedHill - + diff --git a/doc/javadoc/javelin/controller/map/hill/package-frame.html b/doc/javadoc/javelin/controller/map/hill/package-frame.html index c8ac7edb0..011613f04 100644 --- a/doc/javadoc/javelin/controller/map/hill/package-frame.html +++ b/doc/javadoc/javelin/controller/map/hill/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.hill - + diff --git a/doc/javadoc/javelin/controller/map/hill/package-summary.html b/doc/javadoc/javelin/controller/map/hill/package-summary.html index 1f19e1389..0bbe4894d 100644 --- a/doc/javadoc/javelin/controller/map/hill/package-summary.html +++ b/doc/javadoc/javelin/controller/map/hill/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.hill - + diff --git a/doc/javadoc/javelin/controller/map/hill/package-tree.html b/doc/javadoc/javelin/controller/map/hill/package-tree.html index 4ba2a764d..d9fb3434a 100644 --- a/doc/javadoc/javelin/controller/map/hill/package-tree.html +++ b/doc/javadoc/javelin/controller/map/hill/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.hill Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/marsh/Moor.html b/doc/javadoc/javelin/controller/map/marsh/Moor.html index ee9b4bfb1..8242cf76e 100644 --- a/doc/javadoc/javelin/controller/map/marsh/Moor.html +++ b/doc/javadoc/javelin/controller/map/marsh/Moor.html @@ -2,9 +2,9 @@ - + Moor - + diff --git a/doc/javadoc/javelin/controller/map/marsh/Swamp.html b/doc/javadoc/javelin/controller/map/marsh/Swamp.html index 5d0cdd9bc..e4fa0e747 100644 --- a/doc/javadoc/javelin/controller/map/marsh/Swamp.html +++ b/doc/javadoc/javelin/controller/map/marsh/Swamp.html @@ -2,9 +2,9 @@ - + Swamp - + diff --git a/doc/javadoc/javelin/controller/map/marsh/package-frame.html b/doc/javadoc/javelin/controller/map/marsh/package-frame.html index d6ba2ac68..fb7a2d091 100644 --- a/doc/javadoc/javelin/controller/map/marsh/package-frame.html +++ b/doc/javadoc/javelin/controller/map/marsh/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.marsh - + diff --git a/doc/javadoc/javelin/controller/map/marsh/package-summary.html b/doc/javadoc/javelin/controller/map/marsh/package-summary.html index 81d644c2d..8a75174d1 100644 --- a/doc/javadoc/javelin/controller/map/marsh/package-summary.html +++ b/doc/javadoc/javelin/controller/map/marsh/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.marsh - + diff --git a/doc/javadoc/javelin/controller/map/marsh/package-tree.html b/doc/javadoc/javelin/controller/map/marsh/package-tree.html index 66e0cad0b..a8a3b1561 100644 --- a/doc/javadoc/javelin/controller/map/marsh/package-tree.html +++ b/doc/javadoc/javelin/controller/map/marsh/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.marsh Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/mountain/ForbiddingMountain.html b/doc/javadoc/javelin/controller/map/mountain/ForbiddingMountain.html index 50d431042..33ee7b7ba 100644 --- a/doc/javadoc/javelin/controller/map/mountain/ForbiddingMountain.html +++ b/doc/javadoc/javelin/controller/map/mountain/ForbiddingMountain.html @@ -2,9 +2,9 @@ - + ForbiddingMountain - + diff --git a/doc/javadoc/javelin/controller/map/mountain/Meadow.html b/doc/javadoc/javelin/controller/map/mountain/Meadow.html index 787815cc6..2809f8195 100644 --- a/doc/javadoc/javelin/controller/map/mountain/Meadow.html +++ b/doc/javadoc/javelin/controller/map/mountain/Meadow.html @@ -2,9 +2,9 @@ - + Meadow - + diff --git a/doc/javadoc/javelin/controller/map/mountain/RuggedMountain.html b/doc/javadoc/javelin/controller/map/mountain/RuggedMountain.html index 5b51dfd20..82cbdc14b 100644 --- a/doc/javadoc/javelin/controller/map/mountain/RuggedMountain.html +++ b/doc/javadoc/javelin/controller/map/mountain/RuggedMountain.html @@ -2,9 +2,9 @@ - + RuggedMountain - + diff --git a/doc/javadoc/javelin/controller/map/mountain/package-frame.html b/doc/javadoc/javelin/controller/map/mountain/package-frame.html index 781193f3c..a48eeaf84 100644 --- a/doc/javadoc/javelin/controller/map/mountain/package-frame.html +++ b/doc/javadoc/javelin/controller/map/mountain/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.mountain - + diff --git a/doc/javadoc/javelin/controller/map/mountain/package-summary.html b/doc/javadoc/javelin/controller/map/mountain/package-summary.html index 067e2e575..65ffa1935 100644 --- a/doc/javadoc/javelin/controller/map/mountain/package-summary.html +++ b/doc/javadoc/javelin/controller/map/mountain/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.mountain - + diff --git a/doc/javadoc/javelin/controller/map/mountain/package-tree.html b/doc/javadoc/javelin/controller/map/mountain/package-tree.html index 4bec8eb14..69f50cbb2 100644 --- a/doc/javadoc/javelin/controller/map/mountain/package-tree.html +++ b/doc/javadoc/javelin/controller/map/mountain/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.mountain Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/package-frame.html b/doc/javadoc/javelin/controller/map/package-frame.html index aef0e3e96..fbae56d7a 100644 --- a/doc/javadoc/javelin/controller/map/package-frame.html +++ b/doc/javadoc/javelin/controller/map/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map - + diff --git a/doc/javadoc/javelin/controller/map/package-summary.html b/doc/javadoc/javelin/controller/map/package-summary.html index f38b719ff..27eba8d89 100644 --- a/doc/javadoc/javelin/controller/map/package-summary.html +++ b/doc/javadoc/javelin/controller/map/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map - + diff --git a/doc/javadoc/javelin/controller/map/package-tree.html b/doc/javadoc/javelin/controller/map/package-tree.html index c44eee0da..de7bdd1cc 100644 --- a/doc/javadoc/javelin/controller/map/package-tree.html +++ b/doc/javadoc/javelin/controller/map/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/map/plain/Battlefield.html b/doc/javadoc/javelin/controller/map/plain/Battlefield.html index b6259150d..2afeda165 100644 --- a/doc/javadoc/javelin/controller/map/plain/Battlefield.html +++ b/doc/javadoc/javelin/controller/map/plain/Battlefield.html @@ -2,9 +2,9 @@ - + Battlefield - + diff --git a/doc/javadoc/javelin/controller/map/plain/Farm.html b/doc/javadoc/javelin/controller/map/plain/Farm.html index 04e63f7e0..3224047c4 100644 --- a/doc/javadoc/javelin/controller/map/plain/Farm.html +++ b/doc/javadoc/javelin/controller/map/plain/Farm.html @@ -2,9 +2,9 @@ - + Farm - + diff --git a/doc/javadoc/javelin/controller/map/plain/Grasslands.html b/doc/javadoc/javelin/controller/map/plain/Grasslands.html index 46b40c011..ffa41f762 100644 --- a/doc/javadoc/javelin/controller/map/plain/Grasslands.html +++ b/doc/javadoc/javelin/controller/map/plain/Grasslands.html @@ -2,9 +2,9 @@ - + Grasslands - + diff --git a/doc/javadoc/javelin/controller/map/plain/package-frame.html b/doc/javadoc/javelin/controller/map/plain/package-frame.html index fe113d2fb..1ab3edc41 100644 --- a/doc/javadoc/javelin/controller/map/plain/package-frame.html +++ b/doc/javadoc/javelin/controller/map/plain/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.map.plain - + diff --git a/doc/javadoc/javelin/controller/map/plain/package-summary.html b/doc/javadoc/javelin/controller/map/plain/package-summary.html index a8c219b8b..e92f8108b 100644 --- a/doc/javadoc/javelin/controller/map/plain/package-summary.html +++ b/doc/javadoc/javelin/controller/map/plain/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.map.plain - + diff --git a/doc/javadoc/javelin/controller/map/plain/package-tree.html b/doc/javadoc/javelin/controller/map/plain/package-tree.html index e1f3ad6da..3c0e499db 100644 --- a/doc/javadoc/javelin/controller/map/plain/package-tree.html +++ b/doc/javadoc/javelin/controller/map/plain/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.map.plain Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/package-frame.html b/doc/javadoc/javelin/controller/package-frame.html index bce8d0545..7f36cf01c 100644 --- a/doc/javadoc/javelin/controller/package-frame.html +++ b/doc/javadoc/javelin/controller/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller - + diff --git a/doc/javadoc/javelin/controller/package-summary.html b/doc/javadoc/javelin/controller/package-summary.html index b3d4860fb..750bc7fad 100644 --- a/doc/javadoc/javelin/controller/package-summary.html +++ b/doc/javadoc/javelin/controller/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller - + diff --git a/doc/javadoc/javelin/controller/package-tree.html b/doc/javadoc/javelin/controller/package-tree.html index a44c8d207..ba3c5b796 100644 --- a/doc/javadoc/javelin/controller/package-tree.html +++ b/doc/javadoc/javelin/controller/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/quality/DamageReduction.html b/doc/javadoc/javelin/controller/quality/DamageReduction.html index efbb14816..51f3e9462 100644 --- a/doc/javadoc/javelin/controller/quality/DamageReduction.html +++ b/doc/javadoc/javelin/controller/quality/DamageReduction.html @@ -2,9 +2,9 @@ - + DamageReduction - + diff --git a/doc/javadoc/javelin/controller/quality/EnergyImmunity.html b/doc/javadoc/javelin/controller/quality/EnergyImmunity.html index 45200a1c0..ca3ee734f 100644 --- a/doc/javadoc/javelin/controller/quality/EnergyImmunity.html +++ b/doc/javadoc/javelin/controller/quality/EnergyImmunity.html @@ -2,9 +2,9 @@ - + EnergyImmunity - + diff --git a/doc/javadoc/javelin/controller/quality/EnergyResistance.html b/doc/javadoc/javelin/controller/quality/EnergyResistance.html index a951de0ef..14cd111fc 100644 --- a/doc/javadoc/javelin/controller/quality/EnergyResistance.html +++ b/doc/javadoc/javelin/controller/quality/EnergyResistance.html @@ -2,9 +2,9 @@ - + EnergyResistance - + diff --git a/doc/javadoc/javelin/controller/quality/FastHealing.html b/doc/javadoc/javelin/controller/quality/FastHealing.html index 5eda6efc8..bacfe61ea 100644 --- a/doc/javadoc/javelin/controller/quality/FastHealing.html +++ b/doc/javadoc/javelin/controller/quality/FastHealing.html @@ -2,9 +2,9 @@ - + FastHealing - + diff --git a/doc/javadoc/javelin/controller/quality/MindImmunity.html b/doc/javadoc/javelin/controller/quality/MindImmunity.html index 0bc4cb69c..d0c938a15 100644 --- a/doc/javadoc/javelin/controller/quality/MindImmunity.html +++ b/doc/javadoc/javelin/controller/quality/MindImmunity.html @@ -2,9 +2,9 @@ - + MindImmunity - + diff --git a/doc/javadoc/javelin/controller/quality/Quality.html b/doc/javadoc/javelin/controller/quality/Quality.html index 1cd37bb2f..11033b190 100644 --- a/doc/javadoc/javelin/controller/quality/Quality.html +++ b/doc/javadoc/javelin/controller/quality/Quality.html @@ -2,9 +2,9 @@ - + Quality - + diff --git a/doc/javadoc/javelin/controller/quality/SpecialPerception.html b/doc/javadoc/javelin/controller/quality/SpecialPerception.html index 2c2640cea..4bb06fe25 100644 --- a/doc/javadoc/javelin/controller/quality/SpecialPerception.html +++ b/doc/javadoc/javelin/controller/quality/SpecialPerception.html @@ -2,9 +2,9 @@ - + SpecialPerception - + diff --git a/doc/javadoc/javelin/controller/quality/SpellImmunity.html b/doc/javadoc/javelin/controller/quality/SpellImmunity.html index dca3fa8b9..206e0745b 100644 --- a/doc/javadoc/javelin/controller/quality/SpellImmunity.html +++ b/doc/javadoc/javelin/controller/quality/SpellImmunity.html @@ -2,9 +2,9 @@ - + SpellImmunity - + diff --git a/doc/javadoc/javelin/controller/quality/SpellResistance.html b/doc/javadoc/javelin/controller/quality/SpellResistance.html index fe3f9cd12..1a7d89e96 100644 --- a/doc/javadoc/javelin/controller/quality/SpellResistance.html +++ b/doc/javadoc/javelin/controller/quality/SpellResistance.html @@ -2,9 +2,9 @@ - + SpellResistance - + diff --git a/doc/javadoc/javelin/controller/quality/package-frame.html b/doc/javadoc/javelin/controller/quality/package-frame.html index acffe249f..b7c167b15 100644 --- a/doc/javadoc/javelin/controller/quality/package-frame.html +++ b/doc/javadoc/javelin/controller/quality/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.quality - + diff --git a/doc/javadoc/javelin/controller/quality/package-summary.html b/doc/javadoc/javelin/controller/quality/package-summary.html index 7905d071b..7758fdaff 100644 --- a/doc/javadoc/javelin/controller/quality/package-summary.html +++ b/doc/javadoc/javelin/controller/quality/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.quality - + diff --git a/doc/javadoc/javelin/controller/quality/package-tree.html b/doc/javadoc/javelin/controller/quality/package-tree.html index c67175cd9..2aa611581 100644 --- a/doc/javadoc/javelin/controller/quality/package-tree.html +++ b/doc/javadoc/javelin/controller/quality/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.quality Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/tournament/Champion.html b/doc/javadoc/javelin/controller/tournament/Champion.html index 90399890c..c7844d9cc 100644 --- a/doc/javadoc/javelin/controller/tournament/Champion.html +++ b/doc/javadoc/javelin/controller/tournament/Champion.html @@ -2,9 +2,9 @@ - + Champion - + diff --git a/doc/javadoc/javelin/controller/tournament/CrIterator.html b/doc/javadoc/javelin/controller/tournament/CrIterator.html index bb08f1eae..3c41f225d 100644 --- a/doc/javadoc/javelin/controller/tournament/CrIterator.html +++ b/doc/javadoc/javelin/controller/tournament/CrIterator.html @@ -2,9 +2,9 @@ - + CrIterator - + diff --git a/doc/javadoc/javelin/controller/tournament/Exhibition.html b/doc/javadoc/javelin/controller/tournament/Exhibition.html index 474adfc37..f29ada8c0 100644 --- a/doc/javadoc/javelin/controller/tournament/Exhibition.html +++ b/doc/javadoc/javelin/controller/tournament/Exhibition.html @@ -2,9 +2,9 @@ - + Exhibition - + @@ -119,12 +119,15 @@

        Class Exhibition

        public abstract class Exhibition
 extends java.lang.Object
 implements java.io.Serializable
        -
        One of the events in a tournament.
        +
        One of the events in a tournament. + + The EL of any tournament fight should be roughly equal to that of the active + squad. Fights are not supposed to be fatal though accidents can happen.
        Author:
        alex
        See Also:
        -
        Town.ishosting(), +
        Town.ishosting(), Serialized Form
        diff --git a/doc/javadoc/javelin/controller/tournament/ExhibitionScreen.html b/doc/javadoc/javelin/controller/tournament/ExhibitionScreen.html index d20ade1f3..77fec0d67 100644 --- a/doc/javadoc/javelin/controller/tournament/ExhibitionScreen.html +++ b/doc/javadoc/javelin/controller/tournament/ExhibitionScreen.html @@ -2,9 +2,9 @@ - + ExhibitionScreen - + @@ -286,7 +286,7 @@

        Method Summary

        Methods inherited from class javelin.view.screen.BattleScreen

        -addActionHandler, addminimap, afterend, center, centerscreen, centerscreen, checkblock, checkforenemies, computerfeedback, convertEventToAction, dealreward, describestatus, drawbackground, getGameHandler, getKey, getLevelMap, getMappanel, getTargetLocation, getTargetLocation, getTargetLocation, getUserInput, humanTurn, mainLoop, onEnd, performAction, rejectEvent, removehero, rewardxp, scale, setGameHandler, setMappanel, setposition, singleMessage, spendap, step, terminateconditions, tryTick, updatescreen, updatescreen, view +addActionHandler, addminimap, afterend, center, centerscreen, centerscreen, checkblock, checkforenemies, computerfeedback, convertEventToAction, dealreward, describestatus, drawbackground, getGameHandler, getKey, getLevelMap, getMappanel, getTargetLocation, getTargetLocation, getTargetLocation, getUserInput, humanTurn, initmap, mainLoop, onEnd, performAction, rejectEvent, removehero, rewardxp, scale, setGameHandler, setMappanel, setposition, singleMessage, spendap, step, terminateconditions, tryTick, updatescreen, updatescreen, view
      @@ -247,9 +257,17 @@

      Method Detail

    • info

      public java.lang.String info(Combatant m)
      +
      Description copied from class: Upgrade
      +
      To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
      Specified by:
      info in class Upgrade
      +
      Returns:
      +
      one line of text.
    @@ -263,6 +281,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/DamageReduction.html b/doc/javadoc/javelin/controller/upgrade/DamageReduction.html index 9add1c5a9..050091944 100644 --- a/doc/javadoc/javelin/controller/upgrade/DamageReduction.html +++ b/doc/javadoc/javelin/controller/upgrade/DamageReduction.html @@ -2,9 +2,9 @@ - + DamageReduction - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/EnergyImmunity.html b/doc/javadoc/javelin/controller/upgrade/EnergyImmunity.html index 2c9a827eb..a4e48bc0f 100644 --- a/doc/javadoc/javelin/controller/upgrade/EnergyImmunity.html +++ b/doc/javadoc/javelin/controller/upgrade/EnergyImmunity.html @@ -2,9 +2,9 @@ - + EnergyImmunity - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/EnergyResistance.html b/doc/javadoc/javelin/controller/upgrade/EnergyResistance.html index 93bb48e4e..16e02c486 100644 --- a/doc/javadoc/javelin/controller/upgrade/EnergyResistance.html +++ b/doc/javadoc/javelin/controller/upgrade/EnergyResistance.html @@ -2,9 +2,9 @@ - + EnergyResistance - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/FastHealing.html b/doc/javadoc/javelin/controller/upgrade/FastHealing.html index 079e4d878..43b6f7a70 100644 --- a/doc/javadoc/javelin/controller/upgrade/FastHealing.html +++ b/doc/javadoc/javelin/controller/upgrade/FastHealing.html @@ -2,9 +2,9 @@ - + FastHealing - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/Flying.html b/doc/javadoc/javelin/controller/upgrade/Flying.html index 7d9daccbb..cb68eb185 100644 --- a/doc/javadoc/javelin/controller/upgrade/Flying.html +++ b/doc/javadoc/javelin/controller/upgrade/Flying.html @@ -2,9 +2,9 @@ - + Flying - + @@ -204,11 +204,18 @@

    Methods inherited from class javelin.controller.upgrade.apply, findtypical, increments, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/NaturalArmor.html b/doc/javadoc/javelin/controller/upgrade/NaturalArmor.html index 1a1f516f3..d180aa009 100644 --- a/doc/javadoc/javelin/controller/upgrade/NaturalArmor.html +++ b/doc/javadoc/javelin/controller/upgrade/NaturalArmor.html @@ -2,9 +2,9 @@ - + NaturalArmor - + @@ -181,7 +181,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -192,11 +195,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -237,9 +247,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -253,6 +271,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/Spell.html b/doc/javadoc/javelin/controller/upgrade/Spell.html index 3301c5855..4dc5e31f9 100644 --- a/doc/javadoc/javelin/controller/upgrade/Spell.html +++ b/doc/javadoc/javelin/controller/upgrade/Spell.html @@ -2,9 +2,9 @@ - + Spell - + @@ -117,7 +117,7 @@

    Class Spell

    Direct Known Subclasses:
    -
    Blink, DayLight, DeeperDarkness, Doom, HoldMonster, Ray, Summon
    +
    Blink, DayLight, DeeperDarkness, Doom, HoldMonster, Ray, ScrollSpell, Summon

    @@ -150,33 +150,37 @@

    Field Summary

    Field and Description +boolean +aggressive  + + int casterlevel  - + float cr
    TODO Only ChallengeRatingCalculator and CrFactor system should know about this stuff.
    - + boolean friendly  - + boolean ispeaceful  - + int perday  - + static java.util.HashMap<java.lang.String,Spell> SPELLS  - + int used  @@ -229,7 +233,7 @@

    Method Summary

    boolean -apply(Combatant m)  +apply(Combatant c)  static int @@ -295,7 +299,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -329,6 +336,13 @@

    Method Summary

    +
    • @@ -396,6 +410,15 @@

      ispeaceful

      public final boolean ispeaceful
    + + + +
      +
    • +

      aggressive

      +
      public boolean aggressive
      +
      • +
    @@ -464,9 +487,17 @@

    calculatecasterlevel

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -476,10 +507,16 @@

    info

    • apply

      -
      public boolean apply(Combatant m)
      +
      public boolean apply(Combatant c)
      Specified by:
      apply in class Upgrade
      +
      Parameters:
      +
      c - Given an unit apply the upgrade on it.
      +
      Returns:
      +
      false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    @@ -612,7 +649,7 @@

    toString

    public java.lang.String toString()
    Overrides:
    -
    toString in class java.lang.Object
    +
    toString in class Upgrade
    @@ -654,6 +691,9 @@

    castpeacefully

    Combatant combatant) throws NotPeaceful
    +
    Returns:
    +
    A message to be displayed or null if feedback is + handled internally.
    Throws:
    NotPeaceful - if should not be used out of combat.
    @@ -668,7 +708,7 @@

    equals

    public boolean equals(java.lang.Object obj)
    Overrides:
    -
    equals in class java.lang.Object
    +
    equals in class Upgrade
    diff --git a/doc/javadoc/javelin/controller/upgrade/SpellImmunity.html b/doc/javadoc/javelin/controller/upgrade/SpellImmunity.html index a5b8c1e72..f03531c1e 100644 --- a/doc/javadoc/javelin/controller/upgrade/SpellImmunity.html +++ b/doc/javadoc/javelin/controller/upgrade/SpellImmunity.html @@ -2,9 +2,9 @@ - + SpellImmunity - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/SpellResistance.html b/doc/javadoc/javelin/controller/upgrade/SpellResistance.html index a44e4ccce..1d203e86e 100644 --- a/doc/javadoc/javelin/controller/upgrade/SpellResistance.html +++ b/doc/javadoc/javelin/controller/upgrade/SpellResistance.html @@ -2,9 +2,9 @@ - + SpellResistance - + @@ -180,7 +180,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -191,11 +194,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -235,9 +245,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -251,6 +269,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/Swimming.html b/doc/javadoc/javelin/controller/upgrade/Swimming.html index 654d83e02..2f7dae2a7 100644 --- a/doc/javadoc/javelin/controller/upgrade/Swimming.html +++ b/doc/javadoc/javelin/controller/upgrade/Swimming.html @@ -2,9 +2,9 @@ - + Swimming - + @@ -208,11 +208,18 @@

    Methods inherited from class javelin.controller.upgrade.findtypical, increments, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,6 +263,12 @@

    apply

    Overrides:
    apply in class WalkingSpeed
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/Upgrade.html b/doc/javadoc/javelin/controller/upgrade/Upgrade.html index cfa7d097d..35cb7bceb 100644 --- a/doc/javadoc/javelin/controller/upgrade/Upgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/Upgrade.html @@ -2,9 +2,9 @@ - + Upgrade - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":42}; +var methods = {"i0":6,"i1":10,"i2":6,"i3":42,"i4":10,"i5":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"],32:["t6","Deprecated Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -112,7 +112,7 @@

    Class Upgrade

    Direct Known Subclasses:
    -
    BreathWeaponUpgrade, ClassAdvancement, Damage, DamageReduction, EnergyImmunity, EnergyResistance, FastHealing, FeatUpgrade, NaturalArmor, RaiseAbility, Spell, SpellImmunity, SpellResistance, TouchAttack, Vision, WalkingSpeed
    +
    BreathWeaponUpgrade, ClassAdvancement, Damage, DamageReduction, EnergyImmunity, EnergyResistance, FastHealing, FeatUpgrade, NaturalArmor, RaiseAbility, SkillUpgrade, Spell, SpellImmunity, SpellResistance, TouchAttack, Vision, WalkingSpeed

    @@ -121,7 +121,7 @@

    Class Upgrade

    implements java.io.Serializable
    A improvement to a Combatant's Monster which has to be trained (which has a gold and time cost). Upgrades are distributed among - Towns, like Items.
    + Towns, like Items.
    Author:
    alex
    @@ -148,7 +148,9 @@

    Field Summary

    java.lang.String -name  +name +
    Short description.
    + @@ -165,7 +167,9 @@

    Constructor Summary

    Constructor and Description -Upgrade(java.lang.String name)  +Upgrade(java.lang.String name) +
    Constructor.
    + @@ -183,26 +187,41 @@

    Method Summary

    Method and Description -abstract boolean +protected abstract boolean apply(Combatant c)  -abstract java.lang.String -info(Combatant c)  +boolean +equals(java.lang.Object obj)  +abstract java.lang.String +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + + + boolean isstackable()
    Deprecated. 
    + +java.lang.String +toString()  + + +boolean +upgrade(Combatant c)  +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -225,6 +244,7 @@

    Field Detail

  • name

    public java.lang.String name
    +
    Short description.
    • @@ -242,6 +262,7 @@

    Constructor Detail

  • Upgrade

    public Upgrade(java.lang.String name)
    +
    Constructor.
    • @@ -259,6 +280,15 @@

    Method Detail

  • info

    public abstract java.lang.String info(Combatant c)
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    +
    +
    Returns:
    +
    one line of text.
    +
    • @@ -267,13 +297,21 @@

    info

    • apply

      -
      public abstract boolean apply(Combatant c)
      +
      protected abstract boolean apply(Combatant c)
      +
      +
      Parameters:
      +
      c - Given an unit apply the upgrade on it.
      +
      Returns:
      +
      false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
      +
    -
      +

      • isstackable

        @Deprecated
@@ -283,6 +321,50 @@ 
        isstackable
        
  choice TODO interface overhaul
      + + + +
        +
      • +

        equals

        +
        public boolean equals(java.lang.Object obj)
        +
        +
        Overrides:
        +
        equals in class java.lang.Object
        +
        +
        • +
      + + + +
        +
      • +

        toString

        +
        public java.lang.String toString()
        +
        +
        Overrides:
        +
        toString in class java.lang.Object
        +
        +
        • +
      + + + +
        +
      • +

        upgrade

        +
        public boolean upgrade(Combatant c)
        +
        +
        Parameters:
        +
        c - Removes and reapplies his equipment before and after applying + the upgrade.
        +
        Returns:
        +
        See apply(Combatant).
        +
        See Also:
        +
        Combatant.equipped
        +
        +
        • +
    diff --git a/doc/javadoc/javelin/controller/upgrade/UpgradeHandler.html b/doc/javadoc/javelin/controller/upgrade/UpgradeHandler.html index 52e5010d8..427717527 100644 --- a/doc/javadoc/javelin/controller/upgrade/UpgradeHandler.html +++ b/doc/javadoc/javelin/controller/upgrade/UpgradeHandler.html @@ -2,9 +2,9 @@ - + UpgradeHandler - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -75,13 +75,13 @@
  • Summary: 
  • Nested | 
  • Field | 
    • -
  • Constr | 
    • +
  • Constr | 
  • Method
    • @@ -135,48 +135,69 @@

    Field Summary

    java.util.ArrayList<Upgrade> -earth  +earth +
    Linked to a Town's realm.
    + java.util.ArrayList<Upgrade> -evil  +evil +
    Linked to a Town's realm.
    + java.util.ArrayList<Upgrade> -fire  +expertise +
    Linked to an Academy.
    + java.util.ArrayList<Upgrade> -good  +fire +
    Linked to a Town's realm.
    + java.util.ArrayList<Upgrade> -magic  +good +
    Linked to a Town's realm.
    + java.util.ArrayList<Upgrade> -water  +magic +
    Linked to a Town's realm.
    + java.util.ArrayList<Upgrade> -wind  +power +
    Linked to an Academy.
    + - - - - - @@ -257,6 +303,7 @@

    earth

  • water

    public java.util.ArrayList<Upgrade> water
    +
    Linked to a Town's realm.
    • @@ -266,6 +313,7 @@

    water

  • wind

    public java.util.ArrayList<Upgrade> wind
    +
    Linked to a Town's realm.
    • @@ -275,6 +323,7 @@

    wind

  • good

    public java.util.ArrayList<Upgrade> good
    +
    Linked to a Town's realm.
    • @@ -284,32 +333,47 @@

    good

  • evil

    public java.util.ArrayList<Upgrade> evil
    +
    Linked to a Town's realm.
    • - - +
    • -

      addupgrade

      -
      public void addupgrade(Upgrade u,
-                       Town town)
      +

      getall

      +
      public java.util.HashMap<java.lang.String,java.util.List<Upgrade>> getall()
      +
      +
      Returns:
      +
      all upgrades.
      +
    -
      +

      • count

        public int count()
        +
        Doesn't count skills, see countskills().
        +
        +
        Returns:
        +
        Total number of Upgrades available.
        +
        +
        • +
      + + + +
        +
      • +

        countskills

        +
        public int countskills()
        +
        +
        Returns:
        +
        Total number of Upgrades available.
        +
      @@ -411,13 +513,13 @@

      count

    • Summary: 
    • Nested | 
    • Field | 
      • -
    • Constr | 
      • +
    • Constr | 
    • Method
    diff --git a/doc/javadoc/javelin/controller/upgrade/Vision.html b/doc/javadoc/javelin/controller/upgrade/Vision.html index 7307b2861..fdd2b3478 100644 --- a/doc/javadoc/javelin/controller/upgrade/Vision.html +++ b/doc/javadoc/javelin/controller/upgrade/Vision.html @@ -2,9 +2,9 @@ - + Vision - + @@ -181,7 +181,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -192,11 +195,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -237,9 +247,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -253,6 +271,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/WalkingSpeed.html b/doc/javadoc/javelin/controller/upgrade/WalkingSpeed.html index 0180b0d15..2f1328a2b 100644 --- a/doc/javadoc/javelin/controller/upgrade/WalkingSpeed.html +++ b/doc/javadoc/javelin/controller/upgrade/WalkingSpeed.html @@ -2,9 +2,9 @@ - + WalkingSpeed - + @@ -209,7 +209,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -224,11 +227,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -286,9 +296,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -302,6 +320,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseAbility.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseAbility.html index d7fccdda3..07bb38d45 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseAbility.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseAbility.html @@ -2,9 +2,9 @@ - + RaiseAbility - + @@ -123,7 +123,8 @@

    Class RaiseAbility


    public abstract class RaiseAbility
 extends Upgrade
    -
    Raises one of the six attributes.
    +
    Raises one of the six attributes by +2 score points (equivalent of +1 ability + score modifier bonus).
    Author:
    alex
    @@ -186,7 +187,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -197,11 +201,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -241,9 +252,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -257,6 +276,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseCharisma.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseCharisma.html index 0f41661ac..67b90f7a8 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseCharisma.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseCharisma.html @@ -2,9 +2,9 @@ - + RaiseCharisma - + @@ -175,11 +175,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseConsitution.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseConsitution.html index 2186e663e..a5f97948a 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseConsitution.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseConsitution.html @@ -2,9 +2,9 @@ - + RaiseConsitution - + @@ -175,11 +175,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseDexterity.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseDexterity.html index 6429bbd26..ca907bc48 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseDexterity.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseDexterity.html @@ -2,9 +2,9 @@ - + RaiseDexterity - + @@ -175,11 +175,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseIntelligence.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseIntelligence.html index e47be57b2..e84a181dd 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseIntelligence.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseIntelligence.html @@ -2,9 +2,9 @@ - + RaiseIntelligence - + @@ -192,11 +192,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -239,6 +246,12 @@

    apply

    Overrides:
    apply in class RaiseAbility
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseStrength.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseStrength.html index d15b51d87..31544c2dd 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseStrength.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseStrength.html @@ -2,9 +2,9 @@ - + RaiseStrength - + @@ -175,11 +175,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/RaiseWisdom.html b/doc/javadoc/javelin/controller/upgrade/ability/RaiseWisdom.html index 42992031c..4da0fd593 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/RaiseWisdom.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/RaiseWisdom.html @@ -2,9 +2,9 @@ - + RaiseWisdom - + @@ -175,11 +175,18 @@

    Methods inherited from class javelin.controller.upgrade.ability.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/package-frame.html b/doc/javadoc/javelin/controller/upgrade/ability/package-frame.html index 3b4bcf584..13d91eb42 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/package-frame.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.ability - + diff --git a/doc/javadoc/javelin/controller/upgrade/ability/package-summary.html b/doc/javadoc/javelin/controller/upgrade/ability/package-summary.html index 4a77276ac..7fab9caf6 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/package-summary.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.ability - + @@ -84,7 +84,8 @@

    Package javelin.controller.upgrade.abilit RaiseAbility -
    Raises one of the six attributes.
    +
    Raises one of the six attributes by +2 score points (equivalent of +1 ability + score modifier bonus).
    diff --git a/doc/javadoc/javelin/controller/upgrade/ability/package-tree.html b/doc/javadoc/javelin/controller/upgrade/ability/package-tree.html index 9c1a0e584..8d84b7d54 100644 --- a/doc/javadoc/javelin/controller/upgrade/ability/package-tree.html +++ b/doc/javadoc/javelin/controller/upgrade/ability/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.ability Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/upgrade/classes/Aristocrat.html b/doc/javadoc/javelin/controller/upgrade/classes/Aristocrat.html index c57f0ab3d..44d357789 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/Aristocrat.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/Aristocrat.html @@ -2,9 +2,9 @@ - + Aristocrat - + @@ -212,11 +212,18 @@

    Methods inherited from class javelin.controller.upgrade.classes.advanceattack, apply, checkfornewattack, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/classes/ClassAdvancement.html b/doc/javadoc/javelin/controller/upgrade/classes/ClassAdvancement.html index 4e50ba661..587eb03a8 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/ClassAdvancement.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/ClassAdvancement.html @@ -2,9 +2,9 @@ - + ClassAdvancement - + @@ -239,7 +239,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -250,11 +253,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -356,9 +366,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -390,6 +408,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/classes/Commoner.html b/doc/javadoc/javelin/controller/upgrade/classes/Commoner.html index 7e9d5575a..b8fd8b966 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/Commoner.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/Commoner.html @@ -2,9 +2,9 @@ - + Commoner - + @@ -212,11 +212,18 @@

    Methods inherited from class javelin.controller.upgrade.classes.advanceattack, apply, checkfornewattack, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/classes/Expert.html b/doc/javadoc/javelin/controller/upgrade/classes/Expert.html index 72ef643ad..ba164b890 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/Expert.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/Expert.html @@ -2,9 +2,9 @@ - + Expert - + @@ -212,11 +212,18 @@

    Methods inherited from class javelin.controller.upgrade.classes.advanceattack, apply, checkfornewattack, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/classes/Level.html b/doc/javadoc/javelin/controller/upgrade/classes/Level.html index 09af1016a..80b364821 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/Level.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/Level.html @@ -2,9 +2,9 @@ - + Level - + diff --git a/doc/javadoc/javelin/controller/upgrade/classes/Warrior.html b/doc/javadoc/javelin/controller/upgrade/classes/Warrior.html index 1e4f6ba6b..d88edeae7 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/Warrior.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/Warrior.html @@ -2,9 +2,9 @@ - + Warrior - + @@ -212,11 +212,18 @@

    Methods inherited from class javelin.controller.upgrade.classes.advanceattack, apply, checkfornewattack, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/classes/package-frame.html b/doc/javadoc/javelin/controller/upgrade/classes/package-frame.html index 7ffb97928..e9e00f483 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/package-frame.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.classes - + diff --git a/doc/javadoc/javelin/controller/upgrade/classes/package-summary.html b/doc/javadoc/javelin/controller/upgrade/classes/package-summary.html index 70b077d5d..120e4f24e 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/package-summary.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.classes - + diff --git a/doc/javadoc/javelin/controller/upgrade/classes/package-tree.html b/doc/javadoc/javelin/controller/upgrade/classes/package-tree.html index 31d544f4d..17c9e24e5 100644 --- a/doc/javadoc/javelin/controller/upgrade/classes/package-tree.html +++ b/doc/javadoc/javelin/controller/upgrade/classes/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.classes Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/upgrade/damage/Damage.html b/doc/javadoc/javelin/controller/upgrade/damage/Damage.html index 61f1f6580..89f2ad450 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/Damage.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/Damage.html @@ -2,9 +2,9 @@ - + Damage - + @@ -192,7 +192,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -203,11 +206,18 @@

    Method Summary

    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +266,17 @@

    getattacktype

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +290,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/damage/MeleeDamage.html b/doc/javadoc/javelin/controller/upgrade/damage/MeleeDamage.html index 87c22c9bc..a515eb783 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/MeleeDamage.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/MeleeDamage.html @@ -2,9 +2,9 @@ - + MeleeDamage - + @@ -198,11 +198,18 @@

    Methods inherited from class javelin.controller.upgrade.damage.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/damage/RangedDamage.html b/doc/javadoc/javelin/controller/upgrade/damage/RangedDamage.html index 9bdb16b3d..7971bc0e9 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/RangedDamage.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/RangedDamage.html @@ -2,9 +2,9 @@ - + RangedDamage - + @@ -198,11 +198,18 @@

    Methods inherited from class javelin.controller.upgrade.damage.apply, info, isstackable +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/damage/package-frame.html b/doc/javadoc/javelin/controller/upgrade/damage/package-frame.html index 9f62b40c9..006b17cea 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/package-frame.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.damage - + diff --git a/doc/javadoc/javelin/controller/upgrade/damage/package-summary.html b/doc/javadoc/javelin/controller/upgrade/damage/package-summary.html index f91934756..fff3dbada 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/package-summary.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.damage - + diff --git a/doc/javadoc/javelin/controller/upgrade/damage/package-tree.html b/doc/javadoc/javelin/controller/upgrade/damage/package-tree.html index 904345595..1ade148cd 100644 --- a/doc/javadoc/javelin/controller/upgrade/damage/package-tree.html +++ b/doc/javadoc/javelin/controller/upgrade/damage/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.damage Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/upgrade/feat/BullRushUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/BullRushUpgrade.html index e1902e6b9..ede417c9f 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/BullRushUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/BullRushUpgrade.html @@ -2,9 +2,9 @@ - + BullRushUpgrade - + @@ -192,7 +192,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -259,9 +262,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/CleaveUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/CleaveUpgrade.html index 1fb39a3d3..59a94d88a 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/CleaveUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/CleaveUpgrade.html @@ -2,9 +2,9 @@ - + CleaveUpgrade - + @@ -190,7 +190,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -252,9 +255,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/CombatExpertiseUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/CombatExpertiseUpgrade.html index 6c4e78335..0fd7d7d10 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/CombatExpertiseUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/CombatExpertiseUpgrade.html @@ -2,9 +2,9 @@ - + CombatExpertiseUpgrade - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +259,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +283,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/FeatUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/FeatUpgrade.html index 186268a24..93b31046a 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/FeatUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/FeatUpgrade.html @@ -2,9 +2,9 @@ - + FeatUpgrade - + @@ -206,14 +206,14 @@

    Method Summary

    Methods inherited from class javelin.controller.upgrade.Upgrade

    -info, isstackable +equals, info, isstackable, toString, upgrade

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -273,6 +273,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/GreatCleaveUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/GreatCleaveUpgrade.html index 7d0d922b6..9cd90c970 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/GreatCleaveUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/GreatCleaveUpgrade.html @@ -2,9 +2,9 @@ - + GreatCleaveUpgrade - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +259,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +283,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/GreatFortitude.html b/doc/javadoc/javelin/controller/upgrade/feat/GreatFortitude.html index 9a7f523aa..45193d884 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/GreatFortitude.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/GreatFortitude.html @@ -2,9 +2,9 @@ - + GreatFortitude - + @@ -221,11 +221,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedFeintUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedFeintUpgrade.html index b53be78e2..34660cafd 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedFeintUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedFeintUpgrade.html @@ -2,9 +2,9 @@ - + ImprovedFeintUpgrade - + @@ -190,7 +190,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -252,9 +255,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedGrappleUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedGrappleUpgrade.html index 64795813b..7a49bab14 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedGrappleUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedGrappleUpgrade.html @@ -2,9 +2,9 @@ - + ImprovedGrappleUpgrade - + @@ -195,7 +195,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -257,9 +260,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -273,6 +284,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedInititative.html b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedInititative.html index fca72bc74..94560770e 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedInititative.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedInititative.html @@ -2,9 +2,9 @@ - + ImprovedInititative - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -212,11 +215,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +266,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +290,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedPreciseShot.html b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedPreciseShot.html index 7681addb9..c0569ae84 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedPreciseShot.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedPreciseShot.html @@ -2,9 +2,9 @@ - + ImprovedPreciseShot - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -212,11 +215,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +266,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -288,6 +306,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedTripUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedTripUpgrade.html index a812044b7..c33740bc2 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/ImprovedTripUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/ImprovedTripUpgrade.html @@ -2,9 +2,9 @@ - + ImprovedTripUpgrade - + @@ -190,7 +190,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -252,9 +255,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/IronWill.html b/doc/javadoc/javelin/controller/upgrade/feat/IronWill.html index 4e036d7d5..24c9cb55e 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/IronWill.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/IronWill.html @@ -2,9 +2,9 @@ - + IronWill - + @@ -210,7 +210,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -233,11 +236,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -287,9 +297,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -312,6 +330,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/LightningReflexes.html b/doc/javadoc/javelin/controller/upgrade/feat/LightningReflexes.html index 830af71b0..284c4f873 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/LightningReflexes.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/LightningReflexes.html @@ -2,9 +2,9 @@ - + LightningReflexes - + @@ -222,11 +222,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/MeleeFocus.html b/doc/javadoc/javelin/controller/upgrade/feat/MeleeFocus.html index 6bd78de49..da3bb8c9a 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/MeleeFocus.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/MeleeFocus.html @@ -2,9 +2,9 @@ - + MeleeFocus - + @@ -213,7 +213,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -231,11 +234,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -292,9 +302,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -333,6 +351,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/PointBlankShot.html b/doc/javadoc/javelin/controller/upgrade/feat/PointBlankShot.html index cbf7e0b94..abee7ba47 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/PointBlankShot.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/PointBlankShot.html @@ -2,9 +2,9 @@ - + PointBlankShot - + @@ -193,7 +193,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -211,11 +214,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -255,9 +265,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -287,6 +305,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/PowerAttackUpgrade.html b/doc/javadoc/javelin/controller/upgrade/feat/PowerAttackUpgrade.html index 22cb7eb41..1e6969649 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/PowerAttackUpgrade.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/PowerAttackUpgrade.html @@ -2,9 +2,9 @@ - + PowerAttackUpgrade - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant c)  +info(Combatant c) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +259,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +283,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/PreciseShot.html b/doc/javadoc/javelin/controller/upgrade/feat/PreciseShot.html index d2531a234..34eeb0cca 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/PreciseShot.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/PreciseShot.html @@ -2,9 +2,9 @@ - + PreciseShot - + @@ -190,7 +190,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -208,11 +211,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.apply, check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -252,9 +262,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/RangedFocus.html b/doc/javadoc/javelin/controller/upgrade/feat/RangedFocus.html index b628672f1..ced7ae06d 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/RangedFocus.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/RangedFocus.html @@ -2,9 +2,9 @@ - + RangedFocus - + @@ -220,11 +220,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/RapidShot.html b/doc/javadoc/javelin/controller/upgrade/feat/RapidShot.html index 307f67107..b0bbc964d 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/RapidShot.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/RapidShot.html @@ -2,9 +2,9 @@ - + RapidShot - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    + boolean @@ -216,11 +219,18 @@

    Methods inherited from class javelin.controller.upgrade.feat.check +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -260,9 +270,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -292,6 +310,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/Toughness.html b/doc/javadoc/javelin/controller/upgrade/feat/Toughness.html index 21671cdc5..a5ad48d6e 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/Toughness.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/Toughness.html @@ -2,9 +2,9 @@ - + Toughness - + @@ -194,7 +194,10 @@

    Method Summary

    java.lang.String -info(Combatant m)  +info(Combatant m) +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
    +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -256,9 +259,17 @@

    Method Detail

  • info

    public java.lang.String info(Combatant m)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -272,6 +283,12 @@

    apply

    Overrides:
    apply in class FeatUpgrade
    +
    Parameters:
    +
    m - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    diff --git a/doc/javadoc/javelin/controller/upgrade/feat/package-frame.html b/doc/javadoc/javelin/controller/upgrade/feat/package-frame.html index cdfdeb833..a377b07bb 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/package-frame.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.feat - + diff --git a/doc/javadoc/javelin/controller/upgrade/feat/package-summary.html b/doc/javadoc/javelin/controller/upgrade/feat/package-summary.html index 81867e472..8d52c5cc1 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/package-summary.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.feat - + @@ -43,7 +43,7 @@
    • Frames
      • @@ -191,7 +191,7 @@

      Package javelin.controller.upgrade.feat
      • Frames
        • diff --git a/doc/javadoc/javelin/controller/upgrade/feat/package-tree.html b/doc/javadoc/javelin/controller/upgrade/feat/package-tree.html index 241cf3066..21d17ec5a 100644 --- a/doc/javadoc/javelin/controller/upgrade/feat/package-tree.html +++ b/doc/javadoc/javelin/controller/upgrade/feat/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade.feat Class Hierarchy - + @@ -43,7 +43,7 @@
        • Frames
          • @@ -138,7 +138,7 @@

          Class Hierarchy

          • Frames
            • diff --git a/doc/javadoc/javelin/controller/upgrade/package-frame.html b/doc/javadoc/javelin/controller/upgrade/package-frame.html index 819eedaa0..14c2191b5 100644 --- a/doc/javadoc/javelin/controller/upgrade/package-frame.html +++ b/doc/javadoc/javelin/controller/upgrade/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade - + diff --git a/doc/javadoc/javelin/controller/upgrade/package-summary.html b/doc/javadoc/javelin/controller/upgrade/package-summary.html index 5d3785716..6ff728a14 100644 --- a/doc/javadoc/javelin/controller/upgrade/package-summary.html +++ b/doc/javadoc/javelin/controller/upgrade/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade - + diff --git a/doc/javadoc/javelin/controller/upgrade/package-tree.html b/doc/javadoc/javelin/controller/upgrade/package-tree.html index bc67cdba4..2a49794a5 100644 --- a/doc/javadoc/javelin/controller/upgrade/package-tree.html +++ b/doc/javadoc/javelin/controller/upgrade/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.upgrade Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Acrobatics.html b/doc/javadoc/javelin/controller/upgrade/skill/Acrobatics.html new file mode 100644 index 000000000..be01ca18f --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Acrobatics.html @@ -0,0 +1,345 @@ + + + + + +Acrobatics + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Acrobatics

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Acrobatics

                  +
                  public Acrobatics(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Concentration.html b/doc/javadoc/javelin/controller/upgrade/skill/Concentration.html new file mode 100644 index 000000000..9a60aaf96 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Concentration.html @@ -0,0 +1,345 @@ + + + + + +Concentration + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Concentration

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Concentration

                  +
                  public Concentration(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Diplomacy.html b/doc/javadoc/javelin/controller/upgrade/skill/Diplomacy.html new file mode 100644 index 000000000..9dcbc17d9 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Diplomacy.html @@ -0,0 +1,345 @@ + + + + + +Diplomacy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Diplomacy

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Diplomacy

                  +
                  public Diplomacy(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/DisableDevice.html b/doc/javadoc/javelin/controller/upgrade/skill/DisableDevice.html new file mode 100644 index 000000000..55dcfb7c8 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/DisableDevice.html @@ -0,0 +1,345 @@ + + + + + +DisableDevice + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class DisableDevice

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  DisableDevice

                  +
                  public DisableDevice(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/GatherInformation.html b/doc/javadoc/javelin/controller/upgrade/skill/GatherInformation.html new file mode 100644 index 000000000..9ec7964b6 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/GatherInformation.html @@ -0,0 +1,345 @@ + + + + + +GatherInformation + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class GatherInformation

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  GatherInformation

                  +
                  public GatherInformation(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Hide.html b/doc/javadoc/javelin/controller/upgrade/skill/Hide.html new file mode 100644 index 000000000..b796d8e9f --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Hide.html @@ -0,0 +1,345 @@ + + + + + +Hide + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Hide

            +
            +
            + +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                +
                  +
                • + + +

                  Fields inherited from class javelin.controller.upgrade.Upgrade

                  +name
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Hide(java.lang.String name) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Hide

                  +
                  public Hide(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Knowledge.html b/doc/javadoc/javelin/controller/upgrade/skill/Knowledge.html new file mode 100644 index 000000000..6d5e655a0 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Knowledge.html @@ -0,0 +1,345 @@ + + + + + +Knowledge + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Knowledge

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Knowledge

                  +
                  public Knowledge(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Listen.html b/doc/javadoc/javelin/controller/upgrade/skill/Listen.html new file mode 100644 index 000000000..0b5829259 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Listen.html @@ -0,0 +1,345 @@ + + + + + +Listen + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Listen

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Listen

                  +
                  public Listen(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/MoveSilently.html b/doc/javadoc/javelin/controller/upgrade/skill/MoveSilently.html new file mode 100644 index 000000000..7b9263b0c --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/MoveSilently.html @@ -0,0 +1,345 @@ + + + + + +MoveSilently + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class MoveSilently

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  MoveSilently

                  +
                  public MoveSilently(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Search.html b/doc/javadoc/javelin/controller/upgrade/skill/Search.html new file mode 100644 index 000000000..0b93ce956 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Search.html @@ -0,0 +1,345 @@ + + + + + +Search + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Search

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Search

                  +
                  public Search(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/SkillUpgrade.html b/doc/javadoc/javelin/controller/upgrade/skill/SkillUpgrade.html new file mode 100644 index 000000000..a243691e4 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/SkillUpgrade.html @@ -0,0 +1,385 @@ + + + + + +SkillUpgrade + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class SkillUpgrade

            +
            +
            + +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                +
                  +
                • + + +

                  Fields inherited from class javelin.controller.upgrade.Upgrade

                  +name
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                SkillUpgrade(java.lang.String name) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  SkillUpgrade

                  +
                  public SkillUpgrade(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  info

                  +
                  public java.lang.String info(Combatant c)
                  +
                  Description copied from class: Upgrade
                  +
                  To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
                  +
                  +
                  Specified by:
                  +
                  info in class Upgrade
                  +
                  Returns:
                  +
                  one line of text.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  getranks

                  +
                  protected abstract int getranks(Skills s)
                  +
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  apply

                  +
                  protected boolean apply(Combatant c)
                  +
                  +
                  Specified by:
                  +
                  apply in class Upgrade
                  +
                  Parameters:
                  +
                  c - Given an unit apply the upgrade on it.
                  +
                  Returns:
                  +
                  false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected abstract void setranks(Skills s,
+                                 int ranks)
                  +
                  +
                  Parameters:
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Spellcraft.html b/doc/javadoc/javelin/controller/upgrade/skill/Spellcraft.html new file mode 100644 index 000000000..7e99a2d13 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Spellcraft.html @@ -0,0 +1,345 @@ + + + + + +Spellcraft + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Spellcraft

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Spellcraft

                  +
                  public Spellcraft(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Spot.html b/doc/javadoc/javelin/controller/upgrade/skill/Spot.html new file mode 100644 index 000000000..5151775ef --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Spot.html @@ -0,0 +1,345 @@ + + + + + +Spot + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Spot

            +
            +
            + +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                +
                  +
                • + + +

                  Fields inherited from class javelin.controller.upgrade.Upgrade

                  +name
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Spot(java.lang.String name) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Spot

                  +
                  public Spot(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/Survival.html b/doc/javadoc/javelin/controller/upgrade/skill/Survival.html new file mode 100644 index 000000000..c754a443a --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/Survival.html @@ -0,0 +1,345 @@ + + + + + +Survival + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.upgrade.skill
            +

            Class Survival

            +
            +
            + +
            + +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Survival

                  +
                  public Survival(java.lang.String name)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getranks

                  +
                  protected int getranks(Skills s)
                  +
                  +
                  Specified by:
                  +
                  getranks in class SkillUpgrade
                  +
                  Returns:
                  +
                  the ranks of the skill in question.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setranks

                  +
                  protected void setranks(Skills s,
+                        int ranks)
                  +
                  +
                  Specified by:
                  +
                  setranks in class SkillUpgrade
                  +
                  ranks - Sets the rank of the skill in question.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/package-frame.html b/doc/javadoc/javelin/controller/upgrade/skill/package-frame.html new file mode 100644 index 000000000..b99feeac4 --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/package-frame.html @@ -0,0 +1,33 @@ + + + + + +javelin.controller.upgrade.skill + + + + + +

            javelin.controller.upgrade.skill

            +
            +

            Classes

            + +
            + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/package-summary.html b/doc/javadoc/javelin/controller/upgrade/skill/package-summary.html new file mode 100644 index 000000000..37906deac --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/package-summary.html @@ -0,0 +1,220 @@ + + + + + +javelin.controller.upgrade.skill + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Package javelin.controller.upgrade.skill

            +
            +
            + +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/upgrade/skill/package-tree.html b/doc/javadoc/javelin/controller/upgrade/skill/package-tree.html new file mode 100644 index 000000000..505a53b2a --- /dev/null +++ b/doc/javadoc/javelin/controller/upgrade/skill/package-tree.html @@ -0,0 +1,155 @@ + + + + + +javelin.controller.upgrade.skill Class Hierarchy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Hierarchy For Package javelin.controller.upgrade.skill

            +Package Hierarchies: + +
            +
            +

            Class Hierarchy

            +
              +
            • java.lang.Object +
                +
              • javelin.controller.upgrade.Upgrade (implements java.io.Serializable) + +
                • +
              +
              • +
            +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/walker/ChargePath.html b/doc/javadoc/javelin/controller/walker/ChargePath.html index f0592c5ba..6ac0ff6a1 100644 --- a/doc/javadoc/javelin/controller/walker/ChargePath.html +++ b/doc/javadoc/javelin/controller/walker/ChargePath.html @@ -2,9 +2,9 @@ - + ChargePath - + diff --git a/doc/javadoc/javelin/controller/walker/ClearPath.html b/doc/javadoc/javelin/controller/walker/ClearPath.html index 4fcad4002..dae5222ec 100644 --- a/doc/javadoc/javelin/controller/walker/ClearPath.html +++ b/doc/javadoc/javelin/controller/walker/ClearPath.html @@ -2,9 +2,9 @@ - + ClearPath - + diff --git a/doc/javadoc/javelin/controller/walker/NextMove.html b/doc/javadoc/javelin/controller/walker/NextMove.html index fe38e809a..a24be6374 100644 --- a/doc/javadoc/javelin/controller/walker/NextMove.html +++ b/doc/javadoc/javelin/controller/walker/NextMove.html @@ -2,9 +2,9 @@ - + NextMove - + diff --git a/doc/javadoc/javelin/controller/walker/ObstructedPath.html b/doc/javadoc/javelin/controller/walker/ObstructedPath.html index 52b1e019d..c88113e18 100644 --- a/doc/javadoc/javelin/controller/walker/ObstructedPath.html +++ b/doc/javadoc/javelin/controller/walker/ObstructedPath.html @@ -2,9 +2,9 @@ - + ObstructedPath - + diff --git a/doc/javadoc/javelin/controller/walker/Step.html b/doc/javadoc/javelin/controller/walker/Step.html index 4b0a340c1..bdcaca2c9 100644 --- a/doc/javadoc/javelin/controller/walker/Step.html +++ b/doc/javadoc/javelin/controller/walker/Step.html @@ -2,9 +2,9 @@ - + Step - + diff --git a/doc/javadoc/javelin/controller/walker/Walker.html b/doc/javadoc/javelin/controller/walker/Walker.html index 703359a26..d8f3c792f 100644 --- a/doc/javadoc/javelin/controller/walker/Walker.html +++ b/doc/javadoc/javelin/controller/walker/Walker.html @@ -2,9 +2,9 @@ - + Walker - + diff --git a/doc/javadoc/javelin/controller/walker/package-frame.html b/doc/javadoc/javelin/controller/walker/package-frame.html index dfb8935e9..e0db170e9 100644 --- a/doc/javadoc/javelin/controller/walker/package-frame.html +++ b/doc/javadoc/javelin/controller/walker/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.walker - + diff --git a/doc/javadoc/javelin/controller/walker/package-summary.html b/doc/javadoc/javelin/controller/walker/package-summary.html index 3871c9061..014bf8654 100644 --- a/doc/javadoc/javelin/controller/walker/package-summary.html +++ b/doc/javadoc/javelin/controller/walker/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.walker - + @@ -42,7 +42,7 @@
            @@ -140,7 +140,7 @@

            Package javelin.controller.walker

            diff --git a/doc/javadoc/javelin/controller/walker/package-tree.html b/doc/javadoc/javelin/controller/walker/package-tree.html index f08566aca..464432257 100644 --- a/doc/javadoc/javelin/controller/walker/package-tree.html +++ b/doc/javadoc/javelin/controller/walker/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.walker Class Hierarchy - + @@ -42,7 +42,7 @@
            @@ -128,7 +128,7 @@

            Class Hierarchy

            diff --git a/doc/javadoc/javelin/model/BattleMap.VisionCache.html b/doc/javadoc/javelin/model/BattleMap.VisionCache.html new file mode 100644 index 000000000..563a447da --- /dev/null +++ b/doc/javadoc/javelin/model/BattleMap.VisionCache.html @@ -0,0 +1,354 @@ + + + + + +BattleMap.VisionCache + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.model
            +

            Class BattleMap.VisionCache

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.model.BattleMap.VisionCache
                • +
              +
              • +
            +
            +
              +
            • +
              +
              Enclosing class:
              +
              BattleMap
              +
              +
              +
              +
              public static class BattleMap.VisionCache
+extends java.lang.Object
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + + + + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                java.lang.Stringperiod 
                static java.util.ArrayList<Point>positions 
                java.util.ArrayList<Point>seen 
                intvision 
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                VisionCache(java.lang.String perception, + tyrant.mikera.engine.Thing h) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + +
                All Methods Instance Methods Concrete Methods 
                Modifier and TypeMethod and Description
                booleanequals(java.lang.Object obj) 
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Detail

                + + + +
                  +
                • +

                  positions

                  +
                  public static java.util.ArrayList<Point> positions
                  +
                  • +
                + + + +
                  +
                • +

                  period

                  +
                  public java.lang.String period
                  +
                  • +
                + + + +
                  +
                • +

                  vision

                  +
                  public final int vision
                  +
                  • +
                + + + +
                  +
                • +

                  seen

                  +
                  public java.util.ArrayList<Point> seen
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  VisionCache

                  +
                  public VisionCache(java.lang.String perception,
+                   tyrant.mikera.engine.Thing h)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  equals

                  +
                  public boolean equals(java.lang.Object obj)
                  +
                  +
                  Overrides:
                  +
                  equals in class java.lang.Object
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/model/BattleMap.html b/doc/javadoc/javelin/model/BattleMap.html index 609aa11fb..6a0fcef4f 100644 --- a/doc/javadoc/javelin/model/BattleMap.html +++ b/doc/javadoc/javelin/model/BattleMap.html @@ -2,9 +2,9 @@ - + BattleMap - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i109":10,"i110":10,"i111":10,"i112":10,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10,"i126":10,"i127":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":9,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10,"i44":10,"i45":10,"i46":10,"i47":10,"i48":10,"i49":10,"i50":10,"i51":10,"i52":10,"i53":10,"i54":10,"i55":10,"i56":10,"i57":10,"i58":10,"i59":10,"i60":10,"i61":10,"i62":10,"i63":10,"i64":10,"i65":10,"i66":10,"i67":10,"i68":10,"i69":10,"i70":10,"i71":10,"i72":10,"i73":10,"i74":10,"i75":10,"i76":10,"i77":10,"i78":10,"i79":10,"i80":10,"i81":10,"i82":10,"i83":10,"i84":10,"i85":10,"i86":10,"i87":10,"i88":10,"i89":10,"i90":10,"i91":10,"i92":10,"i93":10,"i94":10,"i95":10,"i96":10,"i97":10,"i98":10,"i99":10,"i100":10,"i101":10,"i102":10,"i103":10,"i104":10,"i105":10,"i106":10,"i107":10,"i108":10,"i109":10,"i110":10,"i111":10,"i112":10,"i113":10,"i114":10,"i115":10,"i116":10,"i117":10,"i118":10,"i119":10,"i120":10,"i121":10,"i122":10,"i123":10,"i124":10,"i125":10,"i126":10,"i127":10,"i128":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -49,7 +49,7 @@
            • Frames
              • @@ -73,7 +73,7 @@
              • Summary: 
                • -
              • Nested | 
                • +
              • Nested | 
              • Field | 
              • Constr | 
              • Method
                • @@ -146,6 +146,25 @@

                Class BattleMap

                • + +
                    +
                  • + + +

                    Nested Class Summary

                    + + + + + + + + + + +
                    Nested Classes 
                    Modifier and TypeClass and Description
                    static class BattleMap.VisionCache 
                    +
                    • +
                  • @@ -243,12 +262,16 @@

                    Field Summary

                    redTeam  -static java.util.TreeMap<java.lang.Integer,javelin.model.BattleMap.VisionCache> +static java.lang.Boolean +victory  + + +static java.util.TreeMap<java.lang.Integer,BattleMap.VisionCache> visioncache
                    Mapping of vision cache data by Combatant.id.
                    - + int width  @@ -1037,55 +1060,60 @@

                    Method Summary

                    void -setAllVisible()  +seeTile(int x, + int y)  void -setAngry(boolean a)  +setAllVisible()  void -setEntrance(tyrant.mikera.engine.Thing entrance)  +setAngry(boolean a)  void -setExit(tyrant.mikera.engine.Thing exit)  +setEntrance(tyrant.mikera.engine.Thing entrance)  void -setLevel(int level)  +setExit(tyrant.mikera.engine.Thing exit)  void -setObjects(tyrant.mikera.engine.Thing[] objects)  +setLevel(int level)  void +setObjects(tyrant.mikera.engine.Thing[] objects)  + + +void setPortal(java.lang.String portalName, tyrant.mikera.engine.Thing portal)  - + void setSize(int w, int h)
                    set size (resets everything to blank)
                    - + void setState(Node node)  - + void setTheme(java.lang.String s)  - + void setTheme(tyrant.mikera.tyrant.Theme t)
                    set the theme for the map
                    - + void setTile(int x, int y, @@ -1093,7 +1121,7 @@

                    Method Summary

                    set tile using default flags
                    - + void setTileFull(int x, int y, @@ -1101,18 +1129,18 @@

                    Method Summary

                    set tile, including tile flags
                    - + void setTiles(int[] tiles)  - + void setVisible(int x, int y)
                    Make a square visible
                    - + tyrant.mikera.engine.Thing sortZ(int x, int y) @@ -1120,7 +1148,7 @@

                    Method Summary

                    value)
                - + void spray(int x1, int y1, @@ -1132,7 +1160,7 @@

                Method Summary

                connectedness.
              - + void spreadTiles(int x1, int y1, @@ -1143,23 +1171,23 @@

              Method Summary

              spread src tiles over dst tiles do this by filling adjacent squares
              - + java.lang.String toString()  - + Point tracePath(int x1, int y1, int x2, int y2)  - + void visitPath(int x, int y)  - + int wall()  @@ -1243,7 +1271,7 @@

              meld

              • visioncache

                -
                public static final java.util.TreeMap<java.lang.Integer,javelin.model.BattleMap.VisionCache> visioncache
                +
                public static final java.util.TreeMap<java.lang.Integer,BattleMap.VisionCache> visioncache
                Mapping of vision cache data by Combatant.id. TODO would be much more interesting to create a new UI with different @@ -1422,6 +1450,15 @@

                dead

                public static java.util.ArrayList<Combatant> dead
              + + + +
                +
              • +

                victory

                +
                public static java.lang.Boolean victory
                +
                • +
              @@ -2265,6 +2302,16 @@

              calcVisible

              calculates all the visible squares for the hero at given position
            + + + +
              +
            • +

              seeTile

              +
              public void seeTile(int x,
+                    int y)
              +
              • +
            @@ -2994,7 +3041,7 @@

            checkformeld

            • Frames
              • @@ -3018,7 +3065,7 @@

              checkformeld

              • Summary: 
                • -
              • Nested | 
                • +
              • Nested | 
              • Field | 
              • Constr | 
              • Method
                • diff --git a/doc/javadoc/javelin/model/Cloneable.html b/doc/javadoc/javelin/model/Cloneable.html index 6d1a33a47..41838f321 100644 --- a/doc/javadoc/javelin/model/Cloneable.html +++ b/doc/javadoc/javelin/model/Cloneable.html @@ -2,9 +2,9 @@ - + Cloneable - + @@ -48,7 +48,7 @@
                @@ -186,7 +186,7 @@

                clone

                diff --git a/doc/javadoc/javelin/model/EquipmentMap.html b/doc/javadoc/javelin/model/EquipmentMap.html index 978728fba..a2dfe3ddc 100644 --- a/doc/javadoc/javelin/model/EquipmentMap.html +++ b/doc/javadoc/javelin/model/EquipmentMap.html @@ -2,9 +2,9 @@ - + EquipmentMap - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":9}; -var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -49,7 +49,7 @@

    - +

    • pop

      -
      public static Item pop(java.lang.Class<? extends Item> type,
-                       Squad s)
      +
      public Item pop(java.lang.Class<? extends Item> type)
      +
      • +
    + + + +
      +
    • +

      contains

      +
      public Item contains(java.lang.Class<? extends Item> type)
    @@ -341,7 +352,7 @@

    add

    • Frames
      • diff --git a/doc/javadoc/javelin/model/Realm.html b/doc/javadoc/javelin/model/Realm.html new file mode 100644 index 000000000..0dd6720db --- /dev/null +++ b/doc/javadoc/javelin/model/Realm.html @@ -0,0 +1,511 @@ + + + + + +Realm + + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + +
      +
      javelin.model
      +

      Enum Realm

      +
      +
      +
        +
      • java.lang.Object
        • +
      • +
          +
        • java.lang.Enum<Realm>
          • +
        • +
            +
          • javelin.model.Realm
            • +
          +
          • +
        +
        • +
      +
      +
        +
      • +
        +
        All Implemented Interfaces:
        +
        java.io.Serializable, java.lang.Comparable<Realm>
        +
        +
        +
        +
        public enum Realm
+extends java.lang.Enum<Realm>
        +
        A realm is an in-game faction, associated with d20 concepts in an arbitrary + manner, following a generic lore of colors (as in Magic: The Gathering) or + factions/races (as featured in many real-time strategy titles).
        +
        +
        Author:
        +
        alex
        +
        +
        • +
      +
      +
      +
        +
      • + + + +
          +
        • + + +

          Field Summary

          + + + + + + + + + + +
          Fields 
          Modifier and TypeField and Description
          static java.util.TreeMap<Realm,java.lang.String>REALMS 
          +
          • +
        + +
          +
        • + + +

          Method Summary

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          All Methods Static Methods Instance Methods Concrete Methods 
          Modifier and TypeMethod and Description
          voidbaptize(Combatant opponent) 
          java.awt.Colorgetawtcolor() 
          static Realmrandom() 
          java.lang.StringtoString() 
          static RealmvalueOf(java.lang.String name) +
          Returns the enum constant of this type with the specified name.
          +
          static Realm[]values() +
          Returns an array containing the constants of this enum type, in +the order they are declared.
          +
          +
            +
          • + + +

            Methods inherited from class java.lang.Enum

            +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, valueOf
            • +
          +
            +
          • + + +

            Methods inherited from class java.lang.Object

            +getClass, notify, notifyAll, wait, wait, wait
            • +
          +
          • +
        +
        • +
      +
      +
      +
        +
      • + +
          +
        • + + +

          Enum Constant Detail

          + + + +
            +
          • +

            WIND

            +
            public static final Realm WIND
            +
            • +
          + + + +
            +
          • +

            FIRE

            +
            public static final Realm FIRE
            +
            • +
          + + + +
            +
          • +

            EARTH

            +
            public static final Realm EARTH
            +
            • +
          + + + +
            +
          • +

            WATER

            +
            public static final Realm WATER
            +
            • +
          + + + +
            +
          • +

            GOOD

            +
            public static final Realm GOOD
            +
            • +
          + + + +
            +
          • +

            EVIL

            +
            public static final Realm EVIL
            +
            • +
          + + + +
            +
          • +

            MAGICAL

            +
            public static final Realm MAGICAL
            +
            • +
          +
          • +
        + +
          +
        • + + +

          Field Detail

          + + + +
            +
          • +

            REALMS

            +
            public static java.util.TreeMap<Realm,java.lang.String> REALMS
            +
            • +
          +
          • +
        + +
          +
        • + + +

          Method Detail

          + + + +
            +
          • +

            values

            +
            public static Realm[] values()
            +
            Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
            +for (Realm c : Realm.values())
+    System.out.println(c);
+
            +
            +
            Returns:
            +
            an array containing the constants of this enum type, in the order they are declared
            +
            +
            • +
          + + + +
            +
          • +

            valueOf

            +
            public static Realm valueOf(java.lang.String name)
            +
            Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
            +
            +
            Parameters:
            +
            name - the name of the enum constant to be returned.
            +
            Returns:
            +
            the enum constant with the specified name
            +
            Throws:
            +
            java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
            +
            java.lang.NullPointerException - if the argument is null
            +
            +
            • +
          + + + +
            +
          • +

            getawtcolor

            +
            public java.awt.Color getawtcolor()
            +
            +
            Returns:
            +
            Equivalent color for the view package or null for + WIND.
            +
            +
            • +
          + + + +
            +
          • +

            toString

            +
            public java.lang.String toString()
            +
            +
            Overrides:
            +
            toString in class java.lang.Enum<Realm>
            +
            +
            • +
          + + + +
            +
          • +

            random

            +
            public static Realm random()
            +
            +
            Returns:
            +
            A randomly-chosen realm.
            +
            +
            • +
          + + + +
            +
          • +

            baptize

            +
            public void baptize(Combatant opponent)
            +
            +
            Parameters:
            +
            opponent - Add's a realm-related keyword as a prefix to this unit's name.
            +
            +
            • +
          +
          • +
        +
        • +
      +
      +
      + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + + diff --git a/doc/javadoc/javelin/model/TeamContainer.html b/doc/javadoc/javelin/model/TeamContainer.html index 5c6dbd3f2..4e17d249c 100644 --- a/doc/javadoc/javelin/model/TeamContainer.html +++ b/doc/javadoc/javelin/model/TeamContainer.html @@ -2,9 +2,9 @@ - + TeamContainer - + @@ -48,7 +48,7 @@
      @@ -245,7 +245,7 @@

      getCombatants

      diff --git a/doc/javadoc/javelin/model/condition/Blinking.html b/doc/javadoc/javelin/model/condition/Blinking.html index 4554aff26..7bb3147c5 100644 --- a/doc/javadoc/javelin/model/condition/Blinking.html +++ b/doc/javadoc/javelin/model/condition/Blinking.html @@ -2,9 +2,9 @@ - + Blinking - + diff --git a/doc/javadoc/javelin/model/condition/Breathless.html b/doc/javadoc/javelin/model/condition/Breathless.html index 825cb48c0..61720eb67 100644 --- a/doc/javadoc/javelin/model/condition/Breathless.html +++ b/doc/javadoc/javelin/model/condition/Breathless.html @@ -2,9 +2,9 @@ - + Breathless - + diff --git a/doc/javadoc/javelin/model/condition/Buff.html b/doc/javadoc/javelin/model/condition/Buff.html index 68004c1a1..ff5a98678 100644 --- a/doc/javadoc/javelin/model/condition/Buff.html +++ b/doc/javadoc/javelin/model/condition/Buff.html @@ -2,9 +2,9 @@ - + Buff - + diff --git a/doc/javadoc/javelin/model/condition/Charging.html b/doc/javadoc/javelin/model/condition/Charging.html index c3c2aecce..82d4bd5af 100644 --- a/doc/javadoc/javelin/model/condition/Charging.html +++ b/doc/javadoc/javelin/model/condition/Charging.html @@ -2,9 +2,9 @@ - + Charging - + diff --git a/doc/javadoc/javelin/model/condition/Condition.Effect.html b/doc/javadoc/javelin/model/condition/Condition.Effect.html index c358e0f27..dc81c8eba 100644 --- a/doc/javadoc/javelin/model/condition/Condition.Effect.html +++ b/doc/javadoc/javelin/model/condition/Condition.Effect.html @@ -2,9 +2,9 @@ - + Condition.Effect - + diff --git a/doc/javadoc/javelin/model/condition/Condition.html b/doc/javadoc/javelin/model/condition/Condition.html index 64c2b0440..5050e236f 100644 --- a/doc/javadoc/javelin/model/condition/Condition.html +++ b/doc/javadoc/javelin/model/condition/Condition.html @@ -2,9 +2,9 @@ - + Condition - + diff --git a/doc/javadoc/javelin/model/condition/Defending.html b/doc/javadoc/javelin/model/condition/Defending.html index 2c89fa104..c4addb979 100644 --- a/doc/javadoc/javelin/model/condition/Defending.html +++ b/doc/javadoc/javelin/model/condition/Defending.html @@ -2,9 +2,9 @@ - + Defending - + diff --git a/doc/javadoc/javelin/model/condition/DefensiveStance.html b/doc/javadoc/javelin/model/condition/DefensiveStance.html index 8053ee75c..55ef486dc 100644 --- a/doc/javadoc/javelin/model/condition/DefensiveStance.html +++ b/doc/javadoc/javelin/model/condition/DefensiveStance.html @@ -2,9 +2,9 @@ - + DefensiveStance - + diff --git a/doc/javadoc/javelin/model/condition/Dominated.html b/doc/javadoc/javelin/model/condition/Dominated.html index 2f9675e29..d824f391a 100644 --- a/doc/javadoc/javelin/model/condition/Dominated.html +++ b/doc/javadoc/javelin/model/condition/Dominated.html @@ -2,9 +2,9 @@ - + Dominated - + diff --git a/doc/javadoc/javelin/model/condition/Feigned.html b/doc/javadoc/javelin/model/condition/Feigned.html index 45355b257..cd3816978 100644 --- a/doc/javadoc/javelin/model/condition/Feigned.html +++ b/doc/javadoc/javelin/model/condition/Feigned.html @@ -2,9 +2,9 @@ - + Feigned - + diff --git a/doc/javadoc/javelin/model/condition/Grappling.html b/doc/javadoc/javelin/model/condition/Grappling.html index caa286e1b..d6a98737e 100644 --- a/doc/javadoc/javelin/model/condition/Grappling.html +++ b/doc/javadoc/javelin/model/condition/Grappling.html @@ -2,9 +2,9 @@ - + Grappling - + diff --git a/doc/javadoc/javelin/model/condition/Heroic.html b/doc/javadoc/javelin/model/condition/Heroic.html index 9e98fe2e8..39356871d 100644 --- a/doc/javadoc/javelin/model/condition/Heroic.html +++ b/doc/javadoc/javelin/model/condition/Heroic.html @@ -2,9 +2,9 @@ - + Heroic - + diff --git a/doc/javadoc/javelin/model/condition/Paralyzed.html b/doc/javadoc/javelin/model/condition/Paralyzed.html index d4dc6709e..397d0331b 100644 --- a/doc/javadoc/javelin/model/condition/Paralyzed.html +++ b/doc/javadoc/javelin/model/condition/Paralyzed.html @@ -2,9 +2,9 @@ - + Paralyzed - + diff --git a/doc/javadoc/javelin/model/condition/Prone.html b/doc/javadoc/javelin/model/condition/Prone.html index 241231898..b94919599 100644 --- a/doc/javadoc/javelin/model/condition/Prone.html +++ b/doc/javadoc/javelin/model/condition/Prone.html @@ -2,9 +2,9 @@ - + Prone - + diff --git a/doc/javadoc/javelin/model/condition/Shaken.html b/doc/javadoc/javelin/model/condition/Shaken.html index a5edad777..654ddbd5f 100644 --- a/doc/javadoc/javelin/model/condition/Shaken.html +++ b/doc/javadoc/javelin/model/condition/Shaken.html @@ -2,9 +2,9 @@ - + Shaken - + diff --git a/doc/javadoc/javelin/model/condition/Vampiric.html b/doc/javadoc/javelin/model/condition/Vampiric.html index 60fbd2cf3..cb7a1cbb0 100644 --- a/doc/javadoc/javelin/model/condition/Vampiric.html +++ b/doc/javadoc/javelin/model/condition/Vampiric.html @@ -2,9 +2,9 @@ - + Vampiric - + diff --git a/doc/javadoc/javelin/model/condition/package-frame.html b/doc/javadoc/javelin/model/condition/package-frame.html index 7d742173f..cfa967e7f 100644 --- a/doc/javadoc/javelin/model/condition/package-frame.html +++ b/doc/javadoc/javelin/model/condition/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.condition - + diff --git a/doc/javadoc/javelin/model/condition/package-summary.html b/doc/javadoc/javelin/model/condition/package-summary.html index 80acc1786..ddaa63b99 100644 --- a/doc/javadoc/javelin/model/condition/package-summary.html +++ b/doc/javadoc/javelin/model/condition/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.condition - + @@ -43,7 +43,7 @@
      • Frames
        • @@ -192,7 +192,7 @@

        Package javelin.model.condition

        • Frames
          • diff --git a/doc/javadoc/javelin/model/condition/package-tree.html b/doc/javadoc/javelin/model/condition/package-tree.html index 4b3db6dde..4926b67d3 100644 --- a/doc/javadoc/javelin/model/condition/package-tree.html +++ b/doc/javadoc/javelin/model/condition/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.condition Class Hierarchy - + @@ -43,7 +43,7 @@
          • Frames
            • @@ -135,7 +135,7 @@

            Enum Hierarchy

            • Frames
              • diff --git a/doc/javadoc/javelin/model/dungeon/Feature.html b/doc/javadoc/javelin/model/dungeon/Feature.html index 4707b0ee5..f8617c19f 100644 --- a/doc/javadoc/javelin/model/dungeon/Feature.html +++ b/doc/javadoc/javelin/model/dungeon/Feature.html @@ -2,9 +2,9 @@ - + Feature - + diff --git a/doc/javadoc/javelin/model/dungeon/Fountain.html b/doc/javadoc/javelin/model/dungeon/Fountain.html index dafbacac2..b8bcf947e 100644 --- a/doc/javadoc/javelin/model/dungeon/Fountain.html +++ b/doc/javadoc/javelin/model/dungeon/Fountain.html @@ -2,9 +2,9 @@ - + Fountain - + diff --git a/doc/javadoc/javelin/model/dungeon/StairsUp.html b/doc/javadoc/javelin/model/dungeon/StairsUp.html index 748eaeb1b..63c8147d1 100644 --- a/doc/javadoc/javelin/model/dungeon/StairsUp.html +++ b/doc/javadoc/javelin/model/dungeon/StairsUp.html @@ -2,9 +2,9 @@ - + StairsUp - + diff --git a/doc/javadoc/javelin/model/dungeon/Treasure.html b/doc/javadoc/javelin/model/dungeon/Treasure.html index 35f2d3aa1..ed366a212 100644 --- a/doc/javadoc/javelin/model/dungeon/Treasure.html +++ b/doc/javadoc/javelin/model/dungeon/Treasure.html @@ -2,9 +2,9 @@ - + Treasure - + diff --git a/doc/javadoc/javelin/model/dungeon/package-frame.html b/doc/javadoc/javelin/model/dungeon/package-frame.html index 3212c6c03..69cfd75b7 100644 --- a/doc/javadoc/javelin/model/dungeon/package-frame.html +++ b/doc/javadoc/javelin/model/dungeon/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.dungeon - + diff --git a/doc/javadoc/javelin/model/dungeon/package-summary.html b/doc/javadoc/javelin/model/dungeon/package-summary.html index 5afe570d2..afa2c3565 100644 --- a/doc/javadoc/javelin/model/dungeon/package-summary.html +++ b/doc/javadoc/javelin/model/dungeon/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.dungeon - + diff --git a/doc/javadoc/javelin/model/dungeon/package-tree.html b/doc/javadoc/javelin/model/dungeon/package-tree.html index e1cf4c9d0..1905894c1 100644 --- a/doc/javadoc/javelin/model/dungeon/package-tree.html +++ b/doc/javadoc/javelin/model/dungeon/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.dungeon Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/feat/BullRush.html b/doc/javadoc/javelin/model/feat/BullRush.html index 9eaafde4d..8d6d2802a 100644 --- a/doc/javadoc/javelin/model/feat/BullRush.html +++ b/doc/javadoc/javelin/model/feat/BullRush.html @@ -2,9 +2,9 @@ - + BullRush - + diff --git a/doc/javadoc/javelin/model/feat/Cleave.html b/doc/javadoc/javelin/model/feat/Cleave.html index c91d050fd..180a8bf89 100644 --- a/doc/javadoc/javelin/model/feat/Cleave.html +++ b/doc/javadoc/javelin/model/feat/Cleave.html @@ -2,9 +2,9 @@ - + Cleave - + diff --git a/doc/javadoc/javelin/model/feat/CombatExpertise.html b/doc/javadoc/javelin/model/feat/CombatExpertise.html index b2e9e5ddf..c522dc460 100644 --- a/doc/javadoc/javelin/model/feat/CombatExpertise.html +++ b/doc/javadoc/javelin/model/feat/CombatExpertise.html @@ -2,9 +2,9 @@ - + CombatExpertise - + diff --git a/doc/javadoc/javelin/model/feat/ExoticWeaponProficiency.html b/doc/javadoc/javelin/model/feat/ExoticWeaponProficiency.html index 1f39134da..5a34ff9dc 100644 --- a/doc/javadoc/javelin/model/feat/ExoticWeaponProficiency.html +++ b/doc/javadoc/javelin/model/feat/ExoticWeaponProficiency.html @@ -2,9 +2,9 @@ - + ExoticWeaponProficiency - + diff --git a/doc/javadoc/javelin/model/feat/Feat.html b/doc/javadoc/javelin/model/feat/Feat.html index ee3244cc5..13dbc1674 100644 --- a/doc/javadoc/javelin/model/feat/Feat.html +++ b/doc/javadoc/javelin/model/feat/Feat.html @@ -2,9 +2,9 @@ - + Feat - + diff --git a/doc/javadoc/javelin/model/feat/GreatCleave.html b/doc/javadoc/javelin/model/feat/GreatCleave.html index 6450efd34..dcb5a938e 100644 --- a/doc/javadoc/javelin/model/feat/GreatCleave.html +++ b/doc/javadoc/javelin/model/feat/GreatCleave.html @@ -2,9 +2,9 @@ - + GreatCleave - + diff --git a/doc/javadoc/javelin/model/feat/GreatFortitude.html b/doc/javadoc/javelin/model/feat/GreatFortitude.html index 6ea8b9a32..f6a7d8734 100644 --- a/doc/javadoc/javelin/model/feat/GreatFortitude.html +++ b/doc/javadoc/javelin/model/feat/GreatFortitude.html @@ -2,9 +2,9 @@ - + GreatFortitude - + diff --git a/doc/javadoc/javelin/model/feat/ImprovedFeint.html b/doc/javadoc/javelin/model/feat/ImprovedFeint.html index 9648f4a56..ba1387244 100644 --- a/doc/javadoc/javelin/model/feat/ImprovedFeint.html +++ b/doc/javadoc/javelin/model/feat/ImprovedFeint.html @@ -2,9 +2,9 @@ - + ImprovedFeint - + diff --git a/doc/javadoc/javelin/model/feat/ImprovedGrapple.html b/doc/javadoc/javelin/model/feat/ImprovedGrapple.html index 995c6ded4..a53d058e6 100644 --- a/doc/javadoc/javelin/model/feat/ImprovedGrapple.html +++ b/doc/javadoc/javelin/model/feat/ImprovedGrapple.html @@ -2,9 +2,9 @@ - + ImprovedGrapple - + diff --git a/doc/javadoc/javelin/model/feat/ImprovedInitiative.html b/doc/javadoc/javelin/model/feat/ImprovedInitiative.html index 80b5b824c..769d45c1e 100644 --- a/doc/javadoc/javelin/model/feat/ImprovedInitiative.html +++ b/doc/javadoc/javelin/model/feat/ImprovedInitiative.html @@ -2,9 +2,9 @@ - + ImprovedInitiative - + diff --git a/doc/javadoc/javelin/model/feat/ImprovedPreciseShot.html b/doc/javadoc/javelin/model/feat/ImprovedPreciseShot.html index c396e7b9e..6ea93a471 100644 --- a/doc/javadoc/javelin/model/feat/ImprovedPreciseShot.html +++ b/doc/javadoc/javelin/model/feat/ImprovedPreciseShot.html @@ -2,9 +2,9 @@ - + ImprovedPreciseShot - + diff --git a/doc/javadoc/javelin/model/feat/ImprovedTrip.html b/doc/javadoc/javelin/model/feat/ImprovedTrip.html index 74d3ad6ec..2f1bfaf3f 100644 --- a/doc/javadoc/javelin/model/feat/ImprovedTrip.html +++ b/doc/javadoc/javelin/model/feat/ImprovedTrip.html @@ -2,9 +2,9 @@ - + ImprovedTrip - + diff --git a/doc/javadoc/javelin/model/feat/IronWill.html b/doc/javadoc/javelin/model/feat/IronWill.html index 71f05a6f1..efec7318a 100644 --- a/doc/javadoc/javelin/model/feat/IronWill.html +++ b/doc/javadoc/javelin/model/feat/IronWill.html @@ -2,9 +2,9 @@ - + IronWill - + diff --git a/doc/javadoc/javelin/model/feat/LightningReflexes.html b/doc/javadoc/javelin/model/feat/LightningReflexes.html index decdd63fe..8babadfac 100644 --- a/doc/javadoc/javelin/model/feat/LightningReflexes.html +++ b/doc/javadoc/javelin/model/feat/LightningReflexes.html @@ -2,9 +2,9 @@ - + LightningReflexes - + diff --git a/doc/javadoc/javelin/model/feat/Multiattack.html b/doc/javadoc/javelin/model/feat/Multiattack.html index 1ecf9c35a..25d74ecc1 100644 --- a/doc/javadoc/javelin/model/feat/Multiattack.html +++ b/doc/javadoc/javelin/model/feat/Multiattack.html @@ -2,9 +2,9 @@ - + Multiattack - + diff --git a/doc/javadoc/javelin/model/feat/MultiweaponFighting.html b/doc/javadoc/javelin/model/feat/MultiweaponFighting.html index 609371aab..511113c86 100644 --- a/doc/javadoc/javelin/model/feat/MultiweaponFighting.html +++ b/doc/javadoc/javelin/model/feat/MultiweaponFighting.html @@ -2,9 +2,9 @@ - + MultiweaponFighting - + diff --git a/doc/javadoc/javelin/model/feat/PointBlankShot.html b/doc/javadoc/javelin/model/feat/PointBlankShot.html index bb7a83817..8949fb60e 100644 --- a/doc/javadoc/javelin/model/feat/PointBlankShot.html +++ b/doc/javadoc/javelin/model/feat/PointBlankShot.html @@ -2,9 +2,9 @@ - + PointBlankShot - + diff --git a/doc/javadoc/javelin/model/feat/PowerAttack.html b/doc/javadoc/javelin/model/feat/PowerAttack.html index 24aea8d67..a6ff473e0 100644 --- a/doc/javadoc/javelin/model/feat/PowerAttack.html +++ b/doc/javadoc/javelin/model/feat/PowerAttack.html @@ -2,9 +2,9 @@ - + PowerAttack - + diff --git a/doc/javadoc/javelin/model/feat/PreciseShot.html b/doc/javadoc/javelin/model/feat/PreciseShot.html index 1e950f790..3f71a6f33 100644 --- a/doc/javadoc/javelin/model/feat/PreciseShot.html +++ b/doc/javadoc/javelin/model/feat/PreciseShot.html @@ -2,9 +2,9 @@ - + PreciseShot - + diff --git a/doc/javadoc/javelin/model/feat/RapidShot.html b/doc/javadoc/javelin/model/feat/RapidShot.html index f2072626d..111682a2a 100644 --- a/doc/javadoc/javelin/model/feat/RapidShot.html +++ b/doc/javadoc/javelin/model/feat/RapidShot.html @@ -2,9 +2,9 @@ - + RapidShot - + diff --git a/doc/javadoc/javelin/model/feat/Toughness.html b/doc/javadoc/javelin/model/feat/Toughness.html index f371c025d..59afa03de 100644 --- a/doc/javadoc/javelin/model/feat/Toughness.html +++ b/doc/javadoc/javelin/model/feat/Toughness.html @@ -2,9 +2,9 @@ - + Toughness - + diff --git a/doc/javadoc/javelin/model/feat/WeaponFinesse.html b/doc/javadoc/javelin/model/feat/WeaponFinesse.html index 73101abe5..92316ff5c 100644 --- a/doc/javadoc/javelin/model/feat/WeaponFinesse.html +++ b/doc/javadoc/javelin/model/feat/WeaponFinesse.html @@ -2,9 +2,9 @@ - + WeaponFinesse - + diff --git a/doc/javadoc/javelin/model/feat/WeaponFocus.html b/doc/javadoc/javelin/model/feat/WeaponFocus.html index e2051c89d..79c891f37 100644 --- a/doc/javadoc/javelin/model/feat/WeaponFocus.html +++ b/doc/javadoc/javelin/model/feat/WeaponFocus.html @@ -2,9 +2,9 @@ - + WeaponFocus - + diff --git a/doc/javadoc/javelin/model/feat/package-frame.html b/doc/javadoc/javelin/model/feat/package-frame.html index 247ccd0a7..ce7e980ce 100644 --- a/doc/javadoc/javelin/model/feat/package-frame.html +++ b/doc/javadoc/javelin/model/feat/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.feat - + diff --git a/doc/javadoc/javelin/model/feat/package-summary.html b/doc/javadoc/javelin/model/feat/package-summary.html index 3bbd57157..d67aedc86 100644 --- a/doc/javadoc/javelin/model/feat/package-summary.html +++ b/doc/javadoc/javelin/model/feat/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.feat - + @@ -42,7 +42,7 @@
              @@ -245,7 +245,7 @@

              Package javelin.model.feat

              diff --git a/doc/javadoc/javelin/model/feat/package-tree.html b/doc/javadoc/javelin/model/feat/package-tree.html index f50bf78c0..5258c3ca9 100644 --- a/doc/javadoc/javelin/model/feat/package-tree.html +++ b/doc/javadoc/javelin/model/feat/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.feat Class Hierarchy - + @@ -42,7 +42,7 @@
              @@ -130,7 +130,7 @@

              Class Hierarchy

              diff --git a/doc/javadoc/javelin/model/item/Item.html b/doc/javadoc/javelin/model/item/Item.html index e195d8703..5849a311e 100644 --- a/doc/javadoc/javelin/model/item/Item.html +++ b/doc/javadoc/javelin/model/item/Item.html @@ -2,9 +2,9 @@ - + Item - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":10,"i6":6,"i7":10,"i8":10,"i9":6,"i10":6}; +var methods = {"i0":10,"i1":10,"i2":9,"i3":10,"i4":10,"i5":9,"i6":9,"i7":9,"i8":9,"i9":10,"i10":6,"i11":6}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -112,7 +112,7 @@

              Class Item

    Direct Known Subclasses:
    -
    Key, Potion, Scroll, SecureShelterScroll
    +
    Artifact, Key, Potion, Scroll

    @@ -120,7 +120,10 @@

    Class Item

    extends java.lang.Object implements java.io.Serializable, java.lang.Cloneable
    Represents an item carried by a Combatant. Most often items are - consumable. Currently only human players use items.
    + consumable. Currently only human players use items. + + When crafting new items, it takes a day per $1000 for the process to + complete. Exceptions are Potions, which always take 1 day.
    Author:
    alex
    @@ -152,9 +155,17 @@

    Field Summary

    +static ItemSelection +ARTIFACT  + + static java.util.TreeMap<java.lang.Integer,ItemSelection> BYPRICE  + +boolean +consumable  + static ItemSelection EARTH  @@ -176,29 +187,21 @@

    Field Summary

    MAGIC  -static ItemSelection -MAJOR  - - -static ItemSelection -MEDIUM  - - -static ItemSelection -MINOR  - - java.lang.String name  - + int price  - + static java.util.Comparator<Item> PRICECOMPARATOR  + +boolean +usedinbattle  + static ItemSelection WATER  @@ -242,55 +245,61 @@

    Method Summary

    Method and Description -boolean -canuseneganged()  - - java.lang.Object clone()  - + java.lang.String describefailure()  - + static void distribute() -
    Fill the Town shops with Item at the start of the +
    Fill the Town shops with Item at the start of the campaign.
    - + boolean equals(java.lang.Object obj)  - + void expend()
    Use this to remove this item from the active Squad's inventory.
    + +static java.util.HashMap<java.lang.String,ItemSelection> +getall()  + -abstract boolean -isusedinbattle()  +static ItemSelection +getselection(Realm r) +
    Each Item is assigned a Realm on creation.
    + -void -produce(Town town) -
    Called when a item has finished crafting.
    - +static void +init()  +static void +mapbyprice()  + + java.lang.String toString()  - + abstract boolean use(Combatant user)  - + abstract boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant c) +
    Uses an item while on the WorldScreen.
    +
      @@ -342,33 +351,6 @@

      BYPRICE

      public static final java.util.TreeMap<java.lang.Integer,ItemSelection> BYPRICE
    - - - - - - - - - - - - @@ -376,6 +358,10 @@

    MAJOR

  • FIRE

    public static final ItemSelection FIRE
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -385,6 +371,10 @@

    FIRE

  • WIND

    public static final ItemSelection WIND
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -394,6 +384,10 @@

    WIND

  • EARTH

    public static final ItemSelection EARTH
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -403,6 +397,10 @@

    EARTH

  • WATER

    public static final ItemSelection WATER
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -412,6 +410,10 @@

    WATER

  • GOOD

    public static final ItemSelection GOOD
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -421,6 +423,10 @@

    GOOD

  • EVIL

    public static final ItemSelection EVIL
    +
    +
    See Also:
    +
    getselection(Realm)
    +
    • @@ -432,6 +438,19 @@

    MAGIC

    public static final ItemSelection MAGIC
    + + + + @@ -444,12 +463,30 @@

    name

    -
      +

      • price

        public int price
      + + + +
        +
      • +

        usedinbattle

        +
        public boolean usedinbattle
        +
        • +
      + + + +
        +
      • +

        consumable

        +
        public boolean consumable
        +
        • +
    @@ -477,6 +514,24 @@

    Item

    Method Detail

    + + + +
      +
    • +

      init

      +
      public static void init()
      +
      • +
    + + + +
      +
    • +

      mapbyprice

      +
      public static void mapbyprice()
      +
      • +
    @@ -503,31 +558,20 @@

    use

    - - - -
      -
    • -

      canuseneganged

      -
      public boolean canuseneganged()
      -
      • -
    - - - -
      -
    • -

      isusedinbattle

      -
      public abstract boolean isusedinbattle()
      -
      • -

    • usepeacefully

      -
      public abstract boolean usepeacefully(Combatant m)
      +
      public abstract boolean usepeacefully(Combatant c)
      +
      Uses an item while on the WorldScreen.
      +
      +
      Parameters:
      +
      m - Unit using the item.
      +
      Returns:
      +
      true if item is to be expended.
      +
    @@ -563,10 +607,29 @@

    clone

  • distribute

    public static void distribute()
    -
    Fill the Town shops with Item at the start of the +
    Fill the Town shops with Item at the start of the campaign.
    • + + + + @@ -586,18 +649,13 @@

    describefailure

    public java.lang.String describefailure()
    - +
    • -

      produce

      -
      public void produce(Town town)
      -
      Called when a item has finished crafting.
      -
      -
      Parameters:
      -
      town - WorldPlace this item is being completed on.
      -
      +

      getall

      +
      public static java.util.HashMap<java.lang.String,ItemSelection> getall()
    diff --git a/doc/javadoc/javelin/model/item/ItemSelection.html b/doc/javadoc/javelin/model/item/ItemSelection.html index 1fa40b576..e79ae84ee 100644 --- a/doc/javadoc/javelin/model/item/ItemSelection.html +++ b/doc/javadoc/javelin/model/item/ItemSelection.html @@ -2,9 +2,9 @@ - + ItemSelection - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10}; +var methods = {"i0":10,"i1":10,"i2":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -125,11 +125,15 @@

    Class ItemSelection

    All Implemented Interfaces:
    java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Item>, java.util.Collection<Item>, java.util.List<Item>, java.util.RandomAccess
    +
    +
    Direct Known Subclasses:
    +
    Artificer.Selection
    +

    public class ItemSelection
 extends java.util.ArrayList<Item>
    -
    Collection for Item. Does not aloow for more than one item of the +
    Collection for Item. Does not allow for more than one item of the same type.
    Author:
    @@ -172,6 +176,9 @@

    Constructor Summary

    ItemSelection()  + +ItemSelection(ItemSelection getselection)  + @@ -191,6 +198,14 @@

    Method Summary

    boolean add(Item element)  + +Item +random()  + + +java.lang.String +toString()  +
    + + + +
      +
    • +

      random

      +
      public Item random()
      +
      • +
    + + + +
      +
    • +

      toString

      +
      public java.lang.String toString()
      +
      +
      Overrides:
      +
      toString in class java.util.AbstractCollection<Item>
      +
      +
      • +
    diff --git a/doc/javadoc/javelin/model/item/Key.html b/doc/javadoc/javelin/model/item/Key.html index afc0b573b..5f639bf10 100644 --- a/doc/javadoc/javelin/model/item/Key.html +++ b/doc/javadoc/javelin/model/item/Key.html @@ -2,9 +2,9 @@ - + Key - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10}; +var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":9,"i5":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -49,7 +49,7 @@
    @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/Heroism.html b/doc/javadoc/javelin/model/item/potion/Heroism.html index 48cf63ed4..b6c98a2d2 100644 --- a/doc/javadoc/javelin/model/item/potion/Heroism.html +++ b/doc/javadoc/javelin/model/item/potion/Heroism.html @@ -2,9 +2,9 @@ - + Heroism - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/Potion.html b/doc/javadoc/javelin/model/item/potion/Potion.html index 3606a84ab..fa924a9b7 100644 --- a/doc/javadoc/javelin/model/item/potion/Potion.html +++ b/doc/javadoc/javelin/model/item/potion/Potion.html @@ -2,9 +2,9 @@ - + Potion - + @@ -18,12 +18,6 @@ catch(err) { } //--> -var methods = {"i0":10}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; -var altColor = "altColor"; -var rowColor = "rowColor"; -var tableTab = "tableTab"; -var activeTableTab = "activeTableTab";
    @@ -148,7 +142,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -177,23 +171,12 @@

    Constructor Summary

    Method Summary

    - - - - - - - - - - -
    All Methods Instance Methods Concrete Methods 
    Modifier and TypeMethod and Description
    booleanisusedinbattle() 
    - -
      -
    • - - -

      Method Detail

      - - - -
        -
      • -

        isusedinbattle

        -
        public boolean isusedinbattle()
        -
        -
        Specified by:
        -
        isusedinbattle in class Item
        -
        -
        • -
      -
      • -
    @@ -303,13 +265,13 @@

    isusedinbattle

  • Nested | 
  • Field | 
  • Constr | 
    • -
  • Method
    • +
  • Method
    • diff --git a/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin.html b/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin.html index 102ab86bc..ad5df7039 100644 --- a/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin.html +++ b/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin.html @@ -2,9 +2,9 @@ - + Barkskin - + @@ -150,7 +150,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -190,22 +190,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin2.html b/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin2.html index 100e66a87..4e1dc79bf 100644 --- a/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin2.html +++ b/doc/javadoc/javelin/model/item/potion/barkskin/Barkskin2.html @@ -2,9 +2,9 @@ - + Barkskin2 - + @@ -145,7 +145,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.barkskin.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.barkskin.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.barkskin.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.barkskin.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.cure.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.cure.use, usepeacefully - @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.cure.use, usepeacefully - @@ -191,22 +191,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/cure/CureSeriousWounds.html b/doc/javadoc/javelin/model/item/potion/cure/CureSeriousWounds.html index f0d36569b..a546c908a 100644 --- a/doc/javadoc/javelin/model/item/potion/cure/CureSeriousWounds.html +++ b/doc/javadoc/javelin/model/item/potion/cure/CureSeriousWounds.html @@ -2,9 +2,9 @@ - + CureSeriousWounds - + @@ -145,7 +145,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -180,18 +180,11 @@

    Methods inherited from class javelin.model.item.potion.cure.use, usepeacefully - @@ -201,22 +201,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/resistenergy/ResistEnergy2.html b/doc/javadoc/javelin/model/item/potion/resistenergy/ResistEnergy2.html index 3fca28278..52e879893 100644 --- a/doc/javadoc/javelin/model/item/potion/resistenergy/ResistEnergy2.html +++ b/doc/javadoc/javelin/model/item/potion/resistenergy/ResistEnergy2.html @@ -2,9 +2,9 @@ - + ResistEnergy2 - + @@ -152,7 +152,7 @@

    Fields inherited from class javelin.model.item.potion.resistenergy.

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -187,18 +187,11 @@

    Methods inherited from class javelin.model.item.potion.resistenergy.use, usepeacefully - @@ -187,18 +187,11 @@

    Methods inherited from class javelin.model.item.potion.resistenergy.use, usepeacefully - @@ -187,18 +187,11 @@

    Methods inherited from class javelin.model.item.potion.resistenergy.use, usepeacefully - @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/BullsStrength.html b/doc/javadoc/javelin/model/item/potion/totem/BullsStrength.html index 787f82629..3b8826a5b 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/BullsStrength.html +++ b/doc/javadoc/javelin/model/item/potion/totem/BullsStrength.html @@ -2,9 +2,9 @@ - + BullsStrength - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/CatsGrace.html b/doc/javadoc/javelin/model/item/potion/totem/CatsGrace.html index 207c46461..d2c4ff21e 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/CatsGrace.html +++ b/doc/javadoc/javelin/model/item/potion/totem/CatsGrace.html @@ -2,9 +2,9 @@ - + CatsGrace - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/EaglesSplendor.html b/doc/javadoc/javelin/model/item/potion/totem/EaglesSplendor.html index 361bd0f32..7160b7684 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/EaglesSplendor.html +++ b/doc/javadoc/javelin/model/item/potion/totem/EaglesSplendor.html @@ -2,9 +2,9 @@ - + EaglesSplendor - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/FoxsCunning.html b/doc/javadoc/javelin/model/item/potion/totem/FoxsCunning.html index 0fb9216af..617fd0c59 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/FoxsCunning.html +++ b/doc/javadoc/javelin/model/item/potion/totem/FoxsCunning.html @@ -2,9 +2,9 @@ - + FoxsCunning - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/OwlsWisdom.html b/doc/javadoc/javelin/model/item/potion/totem/OwlsWisdom.html index 4e635c8d2..cb9f9e6c1 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/OwlsWisdom.html +++ b/doc/javadoc/javelin/model/item/potion/totem/OwlsWisdom.html @@ -2,9 +2,9 @@ - + OwlsWisdom - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.model.item.Item

    -ALL, BYPRICE, EARTH, EVIL, FIRE, GOOD, MAGIC, MAJOR, MEDIUM, MINOR, name, price, PRICECOMPARATOR, WATER, WIND +ALL, ARTIFACT, BYPRICE, consumable, EARTH, EVIL, FIRE, GOOD, MAGIC, name, price, PRICECOMPARATOR, usedinbattle, WATER, WIND @@ -185,22 +185,17 @@

    Method Summary

    boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    + - diff --git a/doc/javadoc/javelin/model/item/potion/totem/package-frame.html b/doc/javadoc/javelin/model/item/potion/totem/package-frame.html index 2e15ff27b..6c5261f36 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/package-frame.html +++ b/doc/javadoc/javelin/model/item/potion/totem/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.item.potion.totem - + diff --git a/doc/javadoc/javelin/model/item/potion/totem/package-summary.html b/doc/javadoc/javelin/model/item/potion/totem/package-summary.html index 8778e3db3..9d386673e 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/package-summary.html +++ b/doc/javadoc/javelin/model/item/potion/totem/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.item.potion.totem - + diff --git a/doc/javadoc/javelin/model/item/potion/totem/package-tree.html b/doc/javadoc/javelin/model/item/potion/totem/package-tree.html index 95cfa7cab..0526be71d 100644 --- a/doc/javadoc/javelin/model/item/potion/totem/package-tree.html +++ b/doc/javadoc/javelin/model/item/potion/totem/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.item.potion.totem Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/item/scroll/PryingEyes.html b/doc/javadoc/javelin/model/item/scroll/PryingEyes.html new file mode 100644 index 000000000..aeedd0fc7 --- /dev/null +++ b/doc/javadoc/javelin/model/item/scroll/PryingEyes.html @@ -0,0 +1,336 @@ + + + + + +PryingEyes + + + + + + + + +
    + + +
    Skip navigation links
    + + + + +
    +
    + + + +
    + +
    +
    + + +
    + + +
    + + +
    +
    javelin.model.item.scroll
    +

    Class PryingEyes

    +
    +
    + +
    +
      +
    • +
      +
      All Implemented Interfaces:
      +
      java.io.Serializable, java.lang.Cloneable
      +
      +
      +
      +
      public class PryingEyes
+extends Scroll
      +
      Reveals Dungeon map or nearby area on the WorldScreen.
      +
      +
      Author:
      +
      alex
      +
      See Also:
      +
      Serialized Form
      +
      +
      • +
    +
    +
    + +
    +
    +
      +
    • + +
        +
      • + + +

        Constructor Detail

        + + + +
          +
        • +

          PryingEyes

          +
          public PryingEyes()
          +
          • +
        +
        • +
      + +
        +
      • + + +

        Method Detail

        + + + +
          +
        • +

          usepeacefully

          +
          public boolean usepeacefully(Combatant m)
          +
          Description copied from class: Item
          +
          Uses an item while on the WorldScreen.
          +
          +
          Specified by:
          +
          usepeacefully in class Item
          +
          Returns:
          +
          true if item is to be expended.
          +
          +
          • +
        +
        • +
      +
      • +
    +
    +
    + + +
    + + +
    Skip navigation links
    + + + + +
    +
    + + + +
    + +
    +
    + + +
    + + +
    + + + diff --git a/doc/javadoc/javelin/model/item/scroll/RaiseScroll.html b/doc/javadoc/javelin/model/item/scroll/RaiseScroll.html index 6cd9e9070..77da083a0 100644 --- a/doc/javadoc/javelin/model/item/scroll/RaiseScroll.html +++ b/doc/javadoc/javelin/model/item/scroll/RaiseScroll.html @@ -2,9 +2,9 @@ - + RaiseScroll - + @@ -48,7 +48,7 @@
    @@ -169,9 +187,11 @@

    Constructor Summary

    RaiseScroll()  -RaiseScroll(java.lang.String string, +RaiseScroll(java.lang.String string, int i, - ItemSelection good)  + ItemSelection good, + int level, + float cost)  @@ -194,11 +214,13 @@

    Method Summary

    boolean -use(Combatant m)  +revive(Combatant m)  boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    +
      @@ -206,14 +228,14 @@

      Method Summary

      Methods inherited from class javelin.model.item.scroll.Scroll

      -isusedinbattle +use
    @@ -169,9 +176,11 @@

    Constructor Summary

    Constructor and Description -DungeonScroll(java.lang.String name, +DungeonScroll(java.lang.String name, int price, - ItemSelection town)  + ItemSelection town, + int level, + float cost)  @@ -193,16 +202,14 @@

    Method Summary

    describefailure()  -boolean -use(Combatant user)  - - protected abstract boolean usepeacefully()  - + boolean -usepeacefully(Combatant m)  +usepeacefully(Combatant m) +
    Uses an item while on the WorldScreen.
    +
      @@ -210,14 +217,14 @@

      Method Summary

      Methods inherited from class javelin.model.item.scroll.Scroll

      -isusedinbattle +use
    @@ -362,7 +360,7 @@

    usepeacefully

    diff --git a/doc/javadoc/javelin/model/item/scroll/dungeon/LocateObject.html b/doc/javadoc/javelin/model/item/scroll/dungeon/LocateObject.html index b3fca12c9..92d9a3758 100644 --- a/doc/javadoc/javelin/model/item/scroll/dungeon/LocateObject.html +++ b/doc/javadoc/javelin/model/item/scroll/dungeon/LocateObject.html @@ -2,9 +2,9 @@ - + LocateObject - + @@ -49,7 +49,7 @@
    @@ -185,7 +192,7 @@

    Method Summary

    Method and Description -static Feature +static Feature findtreasure()  @@ -198,21 +205,21 @@

    Method Summary

    Methods inherited from class javelin.model.item.scroll.dungeon.DungeonScroll

    -describefailure, use, usepeacefully +describefailure, usepeacefully
    • @@ -271,7 +278,7 @@

      usepeacefully
      • @@ -302,7 +309,7 @@

      findtreasure

      • Frames
        • @@ -327,7 +334,7 @@

        findtreasure

        diff --git a/doc/javadoc/javelin/model/item/scroll/dungeon/package-frame.html b/doc/javadoc/javelin/model/item/scroll/dungeon/package-frame.html index 8114bdf88..aa4744aa9 100644 --- a/doc/javadoc/javelin/model/item/scroll/dungeon/package-frame.html +++ b/doc/javadoc/javelin/model/item/scroll/dungeon/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll.dungeon - + @@ -16,7 +16,6 @@

        Classes

      • DiscernLocation
      • DungeonScroll
      • LocateObject
        • -
      • PryingEyes
      diff --git a/doc/javadoc/javelin/model/item/scroll/dungeon/package-summary.html b/doc/javadoc/javelin/model/item/scroll/dungeon/package-summary.html index 3b1810fc3..311f0ac49 100644 --- a/doc/javadoc/javelin/model/item/scroll/dungeon/package-summary.html +++ b/doc/javadoc/javelin/model/item/scroll/dungeon/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll.dungeon - + @@ -84,25 +84,19 @@

      Package javelin.model.item.scroll.dungeon DiscernLocation -
      Reveals a Dungeon's most powerful feature.
      +
      Reveals a Dungeon's most powerful feature.
      DungeonScroll -
      A scroll that can only be actived in a Dungeon.
      +
      A scroll that can only be activated in a Dungeon.
      LocateObject -
      Allows player to find nearest treasure chest in a Dungeon.
      - - - -PryingEyes - -
      Revelas Dungeon map.
      +
      Allows player to find nearest treasure chest in a Dungeon.
      diff --git a/doc/javadoc/javelin/model/item/scroll/dungeon/package-tree.html b/doc/javadoc/javelin/model/item/scroll/dungeon/package-tree.html index e5177d3af..d9fa5ff2b 100644 --- a/doc/javadoc/javelin/model/item/scroll/dungeon/package-tree.html +++ b/doc/javadoc/javelin/model/item/scroll/dungeon/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll.dungeon Class Hierarchy - + @@ -88,7 +88,6 @@

      Class Hierarchy

    diff --git a/doc/javadoc/javelin/model/item/scroll/package-frame.html b/doc/javadoc/javelin/model/item/scroll/package-frame.html index 1827d03da..702fe92fa 100644 --- a/doc/javadoc/javelin/model/item/scroll/package-frame.html +++ b/doc/javadoc/javelin/model/item/scroll/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll - + @@ -13,6 +13,7 @@

    Classes

      +
    • PryingEyes
    • RaiseScroll
    • RecallScroll
    • RessurectScroll
      • diff --git a/doc/javadoc/javelin/model/item/scroll/package-summary.html b/doc/javadoc/javelin/model/item/scroll/package-summary.html index 49baccf7c..a94ffdd86 100644 --- a/doc/javadoc/javelin/model/item/scroll/package-summary.html +++ b/doc/javadoc/javelin/model/item/scroll/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll - + @@ -82,39 +82,45 @@

      Package javelin.model.item.scroll

      +PryingEyes + +
      Reveals Dungeon map or nearby area on the WorldScreen.
      + + + RaiseScroll
      See the d20 SRD for more info.
      - + RecallScroll
      See the d20 SRD for more info.
      - + RessurectScroll
      See the d20 SRD for more info.
      - + Scroll
      Can only be used out-of-combat.
      - + SecureShelterScroll
      See the d20 SRD for more info.
      - + Teleport -
      Teleports Squad.active to any named WorldPlace.
      +
      Teleports Squad.active to any named WorldPlace.
      diff --git a/doc/javadoc/javelin/model/item/scroll/package-tree.html b/doc/javadoc/javelin/model/item/scroll/package-tree.html index 045ab04cf..e414fc08c 100644 --- a/doc/javadoc/javelin/model/item/scroll/package-tree.html +++ b/doc/javadoc/javelin/model/item/scroll/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.item.scroll Class Hierarchy - + @@ -84,16 +84,17 @@

      Class Hierarchy

    diff --git a/doc/javadoc/javelin/model/package-frame.html b/doc/javadoc/javelin/model/package-frame.html index 2845f1956..a2e5d35a5 100644 --- a/doc/javadoc/javelin/model/package-frame.html +++ b/doc/javadoc/javelin/model/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model - + @@ -19,8 +19,13 @@

    Interfaces

    Classes

    +

    Enums

    +
    diff --git a/doc/javadoc/javelin/model/package-summary.html b/doc/javadoc/javelin/model/package-summary.html index 0623b09bd..c4d191b25 100644 --- a/doc/javadoc/javelin/model/package-summary.html +++ b/doc/javadoc/javelin/model/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model - + @@ -126,6 +126,10 @@

    Package javelin.model

    +BattleMap.VisionCache +  + + EquipmentMap
    Map of Combatant.toString() and a list of Items.
    @@ -134,6 +138,25 @@

    Package javelin.model

    +
  • + + + + + + + + + + + + +
    Enum Summary 
    EnumDescription
    Realm +
    A realm is an in-game faction, associated with d20 concepts in an arbitrary + manner, following a generic lore of colors (as in Magic: The Gathering) or + factions/races (as featured in many real-time strategy titles).
    +
    +
    • diff --git a/doc/javadoc/javelin/model/package-tree.html b/doc/javadoc/javelin/model/package-tree.html index 68f4f1014..b88e19ec2 100644 --- a/doc/javadoc/javelin/model/package-tree.html +++ b/doc/javadoc/javelin/model/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model Class Hierarchy - + @@ -94,6 +94,7 @@

    Class Hierarchy

  • javelin.model.BattleMap (implements tyrant.mikera.engine.ThingOwner)
    • +
  • javelin.model.BattleMap.VisionCache
    • @@ -106,6 +107,18 @@

    Interface Hierarchy

  • javelin.model.TeamContainer
    • +

    Enum Hierarchy

    +
      +
    • java.lang.Object +
        +
      • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) + +
        • +
      +
      • +
    diff --git a/doc/javadoc/javelin/model/spell/Blink.html b/doc/javadoc/javelin/model/spell/Blink.html index bc8ef19de..5910d1de4 100644 --- a/doc/javadoc/javelin/model/spell/Blink.html +++ b/doc/javadoc/javelin/model/spell/Blink.html @@ -2,9 +2,9 @@ - + Blink - + @@ -146,7 +146,7 @@

    Field Summary

    Fields inherited from class javelin.controller.upgrade.Spell

    -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +
    • @@ -362,6 +369,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/DayLight.html b/doc/javadoc/javelin/model/spell/DayLight.html index 16cd0a3b9..2b22eca35 100644 --- a/doc/javadoc/javelin/model/spell/DayLight.html +++ b/doc/javadoc/javelin/model/spell/DayLight.html @@ -2,9 +2,9 @@ - + DayLight - + @@ -146,7 +146,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -362,6 +369,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/DeeperDarkness.html b/doc/javadoc/javelin/model/spell/DeeperDarkness.html index 78335e559..0f2d5e377 100644 --- a/doc/javadoc/javelin/model/spell/DeeperDarkness.html +++ b/doc/javadoc/javelin/model/spell/DeeperDarkness.html @@ -2,9 +2,9 @@ - + DeeperDarkness - + @@ -146,7 +146,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -362,6 +369,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/DominateMonster.html b/doc/javadoc/javelin/model/spell/DominateMonster.html index 89a252ca5..8f1c01e47 100644 --- a/doc/javadoc/javelin/model/spell/DominateMonster.html +++ b/doc/javadoc/javelin/model/spell/DominateMonster.html @@ -2,9 +2,9 @@ - + DominateMonster - + @@ -167,7 +167,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -411,6 +418,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/Doom.html b/doc/javadoc/javelin/model/spell/Doom.html index c49052bad..a357fc798 100644 --- a/doc/javadoc/javelin/model/spell/Doom.html +++ b/doc/javadoc/javelin/model/spell/Doom.html @@ -2,9 +2,9 @@ - + Doom - + @@ -146,7 +146,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -356,6 +363,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/Heroism.html b/doc/javadoc/javelin/model/spell/Heroism.html index ba06633b5..8692e5bb3 100644 --- a/doc/javadoc/javelin/model/spell/Heroism.html +++ b/doc/javadoc/javelin/model/spell/Heroism.html @@ -2,9 +2,9 @@ - + Heroism - + @@ -151,7 +151,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -328,6 +335,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/HoldMonster.html b/doc/javadoc/javelin/model/spell/HoldMonster.html index 4ca9f9ba6..90f2be97f 100644 --- a/doc/javadoc/javelin/model/spell/HoldMonster.html +++ b/doc/javadoc/javelin/model/spell/HoldMonster.html @@ -2,9 +2,9 @@ - + HoldMonster - + @@ -146,7 +146,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    + diff --git a/doc/javadoc/javelin/model/spell/totem/BearsEndurance.html b/doc/javadoc/javelin/model/spell/totem/BearsEndurance.html index 0c0e736ef..e02a086b0 100644 --- a/doc/javadoc/javelin/model/spell/totem/BearsEndurance.html +++ b/doc/javadoc/javelin/model/spell/totem/BearsEndurance.html @@ -2,9 +2,9 @@ - + BearsEndurance - + @@ -156,7 +156,7 @@

    Field Summary

    Fields inherited from class javelin.controller.upgrade.Spell

    -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +
    • diff --git a/doc/javadoc/javelin/model/spell/totem/BullsStrength.html b/doc/javadoc/javelin/model/spell/totem/BullsStrength.html index d1e43640b..2bf845187 100644 --- a/doc/javadoc/javelin/model/spell/totem/BullsStrength.html +++ b/doc/javadoc/javelin/model/spell/totem/BullsStrength.html @@ -2,9 +2,9 @@ - + BullsStrength - + @@ -156,7 +156,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    + +
    • diff --git a/doc/javadoc/javelin/model/spell/totem/EaglesSplendor.html b/doc/javadoc/javelin/model/spell/totem/EaglesSplendor.html index 12bc82b72..62e439c3e 100644 --- a/doc/javadoc/javelin/model/spell/totem/EaglesSplendor.html +++ b/doc/javadoc/javelin/model/spell/totem/EaglesSplendor.html @@ -2,9 +2,9 @@ - + EaglesSplendor - + @@ -156,7 +156,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    + + + +
    • @@ -293,6 +300,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/totem/package-frame.html b/doc/javadoc/javelin/model/spell/totem/package-frame.html index 69af9327a..21041a436 100644 --- a/doc/javadoc/javelin/model/spell/totem/package-frame.html +++ b/doc/javadoc/javelin/model/spell/totem/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.spell.totem - + diff --git a/doc/javadoc/javelin/model/spell/totem/package-summary.html b/doc/javadoc/javelin/model/spell/totem/package-summary.html index 4a490e733..646175387 100644 --- a/doc/javadoc/javelin/model/spell/totem/package-summary.html +++ b/doc/javadoc/javelin/model/spell/totem/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.spell.totem - + diff --git a/doc/javadoc/javelin/model/spell/totem/package-tree.html b/doc/javadoc/javelin/model/spell/totem/package-tree.html index df162ad80..9cdc8f589 100644 --- a/doc/javadoc/javelin/model/spell/totem/package-tree.html +++ b/doc/javadoc/javelin/model/spell/totem/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.spell.totem Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/spell/wounds/CureCriticalWounds.html b/doc/javadoc/javelin/model/spell/wounds/CureCriticalWounds.html index c42bb1817..3501fcbdb 100644 --- a/doc/javadoc/javelin/model/spell/wounds/CureCriticalWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/CureCriticalWounds.html @@ -2,9 +2,9 @@ - + CureCriticalWounds - + @@ -150,7 +150,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/CureLightWounds.html b/doc/javadoc/javelin/model/spell/wounds/CureLightWounds.html index b7b9e61fe..a35a79d18 100644 --- a/doc/javadoc/javelin/model/spell/wounds/CureLightWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/CureLightWounds.html @@ -2,9 +2,9 @@ - + CureLightWounds - + @@ -150,7 +150,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/CureModerateWounds.html b/doc/javadoc/javelin/model/spell/wounds/CureModerateWounds.html index b09e523ca..4155e2b96 100644 --- a/doc/javadoc/javelin/model/spell/wounds/CureModerateWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/CureModerateWounds.html @@ -2,9 +2,9 @@ - + CureModerateWounds - + @@ -155,7 +155,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -336,6 +343,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
    diff --git a/doc/javadoc/javelin/model/spell/wounds/CureSeriousWounds.html b/doc/javadoc/javelin/model/spell/wounds/CureSeriousWounds.html index 899a7e0dc..9e0a85066 100644 --- a/doc/javadoc/javelin/model/spell/wounds/CureSeriousWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/CureSeriousWounds.html @@ -2,9 +2,9 @@ - + CureSeriousWounds - + @@ -150,7 +150,7 @@

    Field Summary

    Fields inherited from class javelin.controller.upgrade.Spell

    -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/InflictCriticalWounds.html b/doc/javadoc/javelin/model/spell/wounds/InflictCriticalWounds.html index 38c251c0d..e3124b234 100644 --- a/doc/javadoc/javelin/model/spell/wounds/InflictCriticalWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/InflictCriticalWounds.html @@ -2,9 +2,9 @@ - + InflictCriticalWounds - + @@ -150,7 +150,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/InflictLightWounds.html b/doc/javadoc/javelin/model/spell/wounds/InflictLightWounds.html index d45dce3a1..5508df39e 100644 --- a/doc/javadoc/javelin/model/spell/wounds/InflictLightWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/InflictLightWounds.html @@ -2,9 +2,9 @@ - + InflictLightWounds - + @@ -150,7 +150,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/InflictModerateWounds.html b/doc/javadoc/javelin/model/spell/wounds/InflictModerateWounds.html index 950c7bf73..af1b95bcf 100644 --- a/doc/javadoc/javelin/model/spell/wounds/InflictModerateWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/InflictModerateWounds.html @@ -2,9 +2,9 @@ - + InflictModerateWounds - + @@ -155,7 +155,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • @@ -351,6 +358,9 @@

      castpeacefully

      Specified by:
      castpeacefully in class Spell
      +
      Returns:
      +
      A message to be displayed or null if feedback is + handled internally.
      Throws:
      NotPeaceful - if should not be used out of combat.
      diff --git a/doc/javadoc/javelin/model/spell/wounds/InflictSeriousWounds.html b/doc/javadoc/javelin/model/spell/wounds/InflictSeriousWounds.html index 4010bb150..9b47aae80 100644 --- a/doc/javadoc/javelin/model/spell/wounds/InflictSeriousWounds.html +++ b/doc/javadoc/javelin/model/spell/wounds/InflictSeriousWounds.html @@ -2,9 +2,9 @@ - + InflictSeriousWounds - + @@ -150,7 +150,7 @@

      Field Summary

      Fields inherited from class javelin.controller.upgrade.Spell

      -casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
      • +aggressive, casterlevel, cr, friendly, ispeaceful, perday, SPELLS, used
    +
    • diff --git a/doc/javadoc/javelin/model/spell/wounds/package-frame.html b/doc/javadoc/javelin/model/spell/wounds/package-frame.html index 728c2be05..786283913 100644 --- a/doc/javadoc/javelin/model/spell/wounds/package-frame.html +++ b/doc/javadoc/javelin/model/spell/wounds/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.spell.wounds - + diff --git a/doc/javadoc/javelin/model/spell/wounds/package-summary.html b/doc/javadoc/javelin/model/spell/wounds/package-summary.html index d889f6e4b..0b1efd624 100644 --- a/doc/javadoc/javelin/model/spell/wounds/package-summary.html +++ b/doc/javadoc/javelin/model/spell/wounds/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.spell.wounds - + diff --git a/doc/javadoc/javelin/model/spell/wounds/package-tree.html b/doc/javadoc/javelin/model/spell/wounds/package-tree.html index b19a93cf4..7c95f5b4c 100644 --- a/doc/javadoc/javelin/model/spell/wounds/package-tree.html +++ b/doc/javadoc/javelin/model/spell/wounds/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.spell.wounds Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/state/BattleState.Vision.html b/doc/javadoc/javelin/model/state/BattleState.Vision.html index 7bfc7f5e5..f90e6d2ba 100644 --- a/doc/javadoc/javelin/model/state/BattleState.Vision.html +++ b/doc/javadoc/javelin/model/state/BattleState.Vision.html @@ -2,9 +2,9 @@ - + BattleState.Vision - + diff --git a/doc/javadoc/javelin/model/state/BattleState.html b/doc/javadoc/javelin/model/state/BattleState.html index 53029ed71..0c7d7d9c5 100644 --- a/doc/javadoc/javelin/model/state/BattleState.html +++ b/doc/javadoc/javelin/model/state/BattleState.html @@ -2,9 +2,9 @@ - + BattleState - + diff --git a/doc/javadoc/javelin/model/state/Meld.html b/doc/javadoc/javelin/model/state/Meld.html index 1024c5add..74969e772 100644 --- a/doc/javadoc/javelin/model/state/Meld.html +++ b/doc/javadoc/javelin/model/state/Meld.html @@ -2,9 +2,9 @@ - + Meld - + diff --git a/doc/javadoc/javelin/model/state/Square.html b/doc/javadoc/javelin/model/state/Square.html index db075a181..c58f37a3e 100644 --- a/doc/javadoc/javelin/model/state/Square.html +++ b/doc/javadoc/javelin/model/state/Square.html @@ -2,9 +2,9 @@ - + Square - + diff --git a/doc/javadoc/javelin/model/state/package-frame.html b/doc/javadoc/javelin/model/state/package-frame.html index 3f7245c2a..a64a62770 100644 --- a/doc/javadoc/javelin/model/state/package-frame.html +++ b/doc/javadoc/javelin/model/state/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.state - + diff --git a/doc/javadoc/javelin/model/state/package-summary.html b/doc/javadoc/javelin/model/state/package-summary.html index e1f1e623f..e966ba2cf 100644 --- a/doc/javadoc/javelin/model/state/package-summary.html +++ b/doc/javadoc/javelin/model/state/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.state - + diff --git a/doc/javadoc/javelin/model/state/package-tree.html b/doc/javadoc/javelin/model/state/package-tree.html index 708331ad6..58e101583 100644 --- a/doc/javadoc/javelin/model/state/package-tree.html +++ b/doc/javadoc/javelin/model/state/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.state Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/unit/Attack.html b/doc/javadoc/javelin/model/unit/Attack.html index cce1d1be4..6b168e7c8 100644 --- a/doc/javadoc/javelin/model/unit/Attack.html +++ b/doc/javadoc/javelin/model/unit/Attack.html @@ -2,9 +2,9 @@ - + Attack - + diff --git a/doc/javadoc/javelin/model/unit/AttackSequence.html b/doc/javadoc/javelin/model/unit/AttackSequence.html index c56cf68c0..d05c1a0d4 100644 --- a/doc/javadoc/javelin/model/unit/AttackSequence.html +++ b/doc/javadoc/javelin/model/unit/AttackSequence.html @@ -2,9 +2,9 @@ - + AttackSequence - + diff --git a/doc/javadoc/javelin/model/unit/CloneableList.html b/doc/javadoc/javelin/model/unit/CloneableList.html index 37f3f5b40..8c64fcc08 100644 --- a/doc/javadoc/javelin/model/unit/CloneableList.html +++ b/doc/javadoc/javelin/model/unit/CloneableList.html @@ -2,9 +2,9 @@ - + CloneableList - + diff --git a/doc/javadoc/javelin/model/unit/Combatant.html b/doc/javadoc/javelin/model/unit/Combatant.html index eddbb8ed2..2450c4a14 100644 --- a/doc/javadoc/javelin/model/unit/Combatant.html +++ b/doc/javadoc/javelin/model/unit/Combatant.html @@ -2,9 +2,9 @@ - + Combatant - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -167,33 +167,43 @@

      Field Summary

      static int DEADATHP -
      TODO
      +
      TODO proper dying process + healing phase at the end of combat
      +java.util.ArrayList<Artifact> +equipped  + + int hp  - + int id  - + float initialap  - + float lastrefresh  - + int[] location  - + int maxhp  + +boolean +mercenary +
      See MercenariesGuild
      + + Monster source  @@ -217,7 +227,7 @@

      Field Summary

      java.math.BigDecimal xp -
      TODO should be in Combatant
      +
      XP in CR, you'll want to multiply by 100 and round to show the player.
      @@ -287,7 +297,10 @@

      Method Summary

      Combatant -clonedeeply()  +clonedeeply() +
      Note that this isn't supposed to be used for creating new + Combatants since the id is kept the same.
      + void @@ -357,16 +370,20 @@

      Method Summary

      ispenalized(BattleState s)  +int +listen()  + + java.util.ArrayList<java.lang.String> liststatus(BattleState state)  - + void meld()
      1/5 HD to up one getStatus()
      - + void meleeAttacks(Combatant combatant, Combatant targetCombatant, @@ -374,31 +391,35 @@

      Method Summary

      Rolls for hit and applies damage.
      - + +int +movesilently()  + + void newid()  - + java.lang.String perceive(java.lang.String period)  - + void refresh()  - + void rollinitiative()  - + int surprise()  - + java.lang.String toString()  - + int view(java.lang.String period)  @@ -431,7 +452,7 @@

      Field Detail

    • DEADATHP

      public static final int DEADATHP
      -
      TODO
      +
      TODO proper dying process + healing phase at the end of combat
      See Also:
      Constant Field Values
      @@ -578,18 +599,37 @@

      spells

    • xp

      public java.math.BigDecimal xp
      -
      TODO should be in Combatant
      +
      XP in CR, you'll want to multiply by 100 and round to show the player.
    -
      +

      • summoned

        public boolean summoned
      + + + +
        +
      • +

        equipped

        +
        public java.util.ArrayList<Artifact> equipped
        +
        • +
      + + + +
    @@ -898,6 +938,12 @@

    view

  • clonedeeply

    public Combatant clonedeeply()
    +
    Note that this isn't supposed to be used for creating new + Combatants since the id is kept the same.
    +
    +
    Returns:
    +
    A clone with a cloned source.
    +
    • @@ -970,13 +1016,39 @@

    isbuffed

     - diff --git a/doc/javadoc/javelin/model/unit/CurrentAttack.html b/doc/javadoc/javelin/model/unit/CurrentAttack.html index f706391ce..e4650a646 100644 --- a/doc/javadoc/javelin/model/unit/CurrentAttack.html +++ b/doc/javadoc/javelin/model/unit/CurrentAttack.html @@ -2,9 +2,9 @@ - + CurrentAttack - + diff --git a/doc/javadoc/javelin/model/unit/HD.html b/doc/javadoc/javelin/model/unit/HD.html index c54271ccb..045ba9d28 100644 --- a/doc/javadoc/javelin/model/unit/HD.html +++ b/doc/javadoc/javelin/model/unit/HD.html @@ -2,9 +2,9 @@ - + HD - + diff --git a/doc/javadoc/javelin/model/unit/Monster.html b/doc/javadoc/javelin/model/unit/Monster.html index 004d63c9a..7fccf9ca4 100644 --- a/doc/javadoc/javelin/model/unit/Monster.html +++ b/doc/javadoc/javelin/model/unit/Monster.html @@ -2,9 +2,9 @@ - + Monster - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":9,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":9,"i9":9,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -49,7 +49,7 @@
    @@ -530,6 +584,7 @@

    Field Detail

  • VISION_LOWLIGHT

    public static final int VISION_LOWLIGHT
    +
    TODO make enumeration
    See Also:
    Constant Field Values
    @@ -543,6 +598,7 @@

    VISION_LOWLIGHT

  • VISION_DARK

    public static final int VISION_DARK
    +
    TODO make enumeration
    See Also:
    Constant Field Values
    @@ -764,6 +820,7 @@

    walk

  • fly

    public int fly
    +
    TODO also offer perfect flight
    • @@ -920,13 +977,13 @@

    challengeRating

    public java.lang.Float challengeRating
    • - +
    • -

      monsterType

      -
      public java.lang.String monsterType
      +

      type

      +
      public java.lang.String type
    @@ -946,6 +1003,7 @@

    avatar

  • customName

    public java.lang.String customName
    +
    TODO should probably be a Combatant#name
    •  @@ -1100,12 +1158,70 @@

    sr

     -
      +

      • immunetomindeffects

        public boolean immunetomindeffects
      + + + +
        +
      • +

        terrains

        +
        public java.util.ArrayList<java.lang.String> terrains
        +
        • +
      + + + +
        +
      • +

        lawful

        +
        public java.lang.Boolean lawful
        +
        Alignment. true if lawful, null if neutral, + false if chaotic.
        +
        • +
      + + + +
        +
      • +

        good

        +
        public java.lang.Boolean good
        +
        Alignment. true if good, null if neutral, + false if evil.
        +
        • +
      + + + +
        +
      • +

        humanoid

        +
        public boolean humanoid
        +
        A monster is humanoid if it can use most of it's Slots to wear + Artifacts. Humanoid and monstrous humanoid monster types are + humanoid by default, other types have to manually marked as + Humanoid="yes" in monster.xml to be marked as such. + + Ideally this would be defined in a slot-by-slot and monster-by-monster + basis but for now a creature tagged as humanoid is eligible to use any + and all Slots.
        +
        • +
      + + + +
    @@ -1209,25 +1325,41 @@

    getbaseattackbonus

    • raisedexterity

      -
      public void raisedexterity(int x)
      +
      public void raisedexterity(int bonus)
      +
      +
      Parameters:
      +
      bonus - Raises dexterity bonus by +1 this many times (+1 + bonus = +2 ability score points).
      +
    - +

    • raisestrength

      -
      public boolean raisestrength()
      +
      public void raisestrength(int bonus)
      +
      +
      Parameters:
      +
      bonus - Raises strength bonus by this many steps (+1 bonus = + +2 score points)
      +
    - +

    • raiseconstitution

      -
      public void raiseconstitution(Combatant c)
      +
      public void raiseconstitution(Combatant c,
+                              int bonus)
      +
      +
      Parameters:
      +
      c - Raises constitution by +2...
      +
      bonus - multiplied by this magnitude. Negative values allowed.
      +
    @@ -1270,13 +1402,18 @@

    swim

    public boolean swim()
    • - +

    • raisewisdom

      -
      public void raisewisdom()
      +
      public void raisewisdom(int score)
      +
      +
      Parameters:
      +
      score - Raises wisdom by this many ability score points (+2 + point=+1 bonus modifier).
      +
    @@ -1318,12 +1455,67 @@

    addwill

     -
      +

      • willraw

        public java.lang.Integer willraw()
      + + + +
        +
      • +

        equals

        +
        public boolean equals(java.lang.Object obj)
        +
        +
        Overrides:
        +
        equals in class java.lang.Object
        +
        +
        • +
      + + + +
        +
      • +

        raisecharisma

        +
        public void raisecharisma(int bonus)
        +
        +
        Parameters:
        +
        bonus - Raises charisma by this many points (+2 points = +1 + bonus modifier)
        +
        +
        • +
      + + + +
        +
      • +

        raiseintelligence

        +
        public void raiseintelligence(int points)
        +
        +
        Parameters:
        +
        points - Raises intelligence by this many ability score points + (+2 point = +1 bonus modifier).
        +
        +
        • +
      + + + +
        +
      • +

        eat

        +
        public float eat()
        +
        +
        Returns:
        +
        Each unit hers is equivalent to 5 silver pieces daily upkeep + ($0.5, or half a gold piece).
        +
        +
        • +
    @@ -1352,7 +1544,7 @@

    willraw

    • Frames
      • diff --git a/doc/javadoc/javelin/model/unit/Skills.html b/doc/javadoc/javelin/model/unit/Skills.html new file mode 100644 index 000000000..8050179f6 --- /dev/null +++ b/doc/javadoc/javelin/model/unit/Skills.html @@ -0,0 +1,550 @@ + + + + + +Skills + + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + +
      +
      javelin.model.unit
      +

      Class Skills

      +
      +
      +
        +
      • java.lang.Object
        • +
      • +
          +
        • javelin.model.unit.Skills
          • +
        +
        • +
      +
      +
        +
      • +
        +
        All Implemented Interfaces:
        +
        java.io.Serializable, java.lang.Cloneable
        +
        +
        +
        +
        public class Skills
+extends java.lang.Object
+implements java.io.Serializable, java.lang.Cloneable
        +
        Keeps track of skill ranks of a certain Monster. + + Usually instead of rolling the skills as usual most of the time it's implied + a take 10 is being used, by various reasons, such as prevent scumming (trying + the same action many times until you get a high roll) and having to use the + random number generator inside BattleAi. + + See doc/skills.txt guide for more information. + + Synergy bonuses are not being used for now.
        +
        +
        Author:
        +
        alex
        +
        See Also:
        +
        Serialized Form
        +
        +
        • +
      +
      +
      + +
      +
      + +
      +
      + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + + diff --git a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.BreathArea.html b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.BreathArea.html index d4c20581a..00c344100 100644 --- a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.BreathArea.html +++ b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.BreathArea.html @@ -2,9 +2,9 @@ - + BreathWeapon.BreathArea - + diff --git a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.SavingThrow.html b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.SavingThrow.html index b3dac68cd..14217ae68 100644 --- a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.SavingThrow.html +++ b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.SavingThrow.html @@ -2,9 +2,9 @@ - + BreathWeapon.SavingThrow - + diff --git a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.html b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.html index 7182bbe48..3c109c609 100644 --- a/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.html +++ b/doc/javadoc/javelin/model/unit/abilities/BreathWeapon.html @@ -2,9 +2,9 @@ - + BreathWeapon - + diff --git a/doc/javadoc/javelin/model/unit/abilities/Spells.html b/doc/javadoc/javelin/model/unit/abilities/Spells.html index 265ce78a7..5b390e3ea 100644 --- a/doc/javadoc/javelin/model/unit/abilities/Spells.html +++ b/doc/javadoc/javelin/model/unit/abilities/Spells.html @@ -2,9 +2,9 @@ - + Spells - + diff --git a/doc/javadoc/javelin/model/unit/abilities/TouchAttack.html b/doc/javadoc/javelin/model/unit/abilities/TouchAttack.html index 5450f95bf..c5860778a 100644 --- a/doc/javadoc/javelin/model/unit/abilities/TouchAttack.html +++ b/doc/javadoc/javelin/model/unit/abilities/TouchAttack.html @@ -2,9 +2,9 @@ - + TouchAttack - + @@ -202,7 +202,10 @@

      Method Summary

      java.lang.String -info(Combatant c)  +info(Combatant c) +
      To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not.
      + java.lang.String @@ -214,14 +217,14 @@

      Method Summary

      Methods inherited from class javelin.controller.upgrade.Upgrade

      -isstackable +equals, isstackable, upgrade

    • Methods inherited from class java.lang.Object

      -equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
      • +finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -303,9 +306,17 @@

    clone

  • info

    public java.lang.String info(Combatant c)
    +
    Description copied from class: Upgrade
    +
    To be show before upgrade confirmation, containing relevant information + that might help decide to buy it or not. + + For example, a Spell could show how many times it can already be + cast by the Combatant in question.
    Specified by:
    info in class Upgrade
    +
    Returns:
    +
    one line of text.
    • @@ -319,6 +330,12 @@

    apply

    Specified by:
    apply in class Upgrade
    +
    Parameters:
    +
    c - Given an unit apply the upgrade on it.
    +
    Returns:
    +
    false if this is not a valid update. For example: + already reached the maximum level on a class, cannot learn this + spell level yet.
    @@ -331,7 +348,7 @@

    toString

    public java.lang.String toString()
    Overrides:
    -
    toString in class java.lang.Object
    +
    toString in class Upgrade
    diff --git a/doc/javadoc/javelin/model/unit/abilities/package-frame.html b/doc/javadoc/javelin/model/unit/abilities/package-frame.html index 7f58e92c5..bbc07c9ad 100644 --- a/doc/javadoc/javelin/model/unit/abilities/package-frame.html +++ b/doc/javadoc/javelin/model/unit/abilities/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.unit.abilities - + diff --git a/doc/javadoc/javelin/model/unit/abilities/package-summary.html b/doc/javadoc/javelin/model/unit/abilities/package-summary.html index 7de0dd63c..a35359ae8 100644 --- a/doc/javadoc/javelin/model/unit/abilities/package-summary.html +++ b/doc/javadoc/javelin/model/unit/abilities/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.unit.abilities - + diff --git a/doc/javadoc/javelin/model/unit/abilities/package-tree.html b/doc/javadoc/javelin/model/unit/abilities/package-tree.html index acb2a4487..49ce88917 100644 --- a/doc/javadoc/javelin/model/unit/abilities/package-tree.html +++ b/doc/javadoc/javelin/model/unit/abilities/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.unit.abilities Class Hierarchy - + diff --git a/doc/javadoc/javelin/model/unit/package-frame.html b/doc/javadoc/javelin/model/unit/package-frame.html index 00e956168..a72db11f9 100644 --- a/doc/javadoc/javelin/model/unit/package-frame.html +++ b/doc/javadoc/javelin/model/unit/package-frame.html @@ -2,9 +2,9 @@ - + javelin.model.unit - + @@ -20,6 +20,7 @@

    Classes

  • CurrentAttack
  • HD
  • Monster
    • +
  • Skills
    • diff --git a/doc/javadoc/javelin/model/unit/package-summary.html b/doc/javadoc/javelin/model/unit/package-summary.html index fe6e8900d..d5a19c022 100644 --- a/doc/javadoc/javelin/model/unit/package-summary.html +++ b/doc/javadoc/javelin/model/unit/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.unit - + @@ -127,6 +127,12 @@

    Package javelin.model.unit

    manual.
    + +Skills + +
    Keeps track of skill ranks of a certain Monster.
    + + diff --git a/doc/javadoc/javelin/model/unit/package-tree.html b/doc/javadoc/javelin/model/unit/package-tree.html index 85e8948dc..e1e854253 100644 --- a/doc/javadoc/javelin/model/unit/package-tree.html +++ b/doc/javadoc/javelin/model/unit/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.unit Class Hierarchy - + @@ -99,6 +99,7 @@

    Class Hierarchy

  • javelin.model.unit.CurrentAttack (implements javelin.model.Cloneable, java.io.Serializable)
  • javelin.model.unit.HD (implements javelin.model.Cloneable, java.io.Serializable)
  • javelin.model.unit.Monster (implements javelin.model.Cloneable, java.io.Serializable)
    • +
  • javelin.model.unit.Skills (implements java.lang.Cloneable, java.io.Serializable)
    • diff --git a/doc/javadoc/javelin/model/world/Incursion.html b/doc/javadoc/javelin/model/world/Incursion.html index fea0ca861..b188799f1 100644 --- a/doc/javadoc/javelin/model/world/Incursion.html +++ b/doc/javadoc/javelin/model/world/Incursion.html @@ -2,9 +2,9 @@ - + Incursion - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9,"i2":10,"i3":10,"i4":10,"i5":9,"i6":10,"i7":10,"i8":9,"i9":10,"i10":10,"i11":10,"i12":10,"i13":9,"i14":10}; +var methods = {"i0":9,"i1":10,"i2":9,"i3":10,"i4":10,"i5":9,"i6":10,"i7":9,"i8":10,"i9":10,"i10":10,"i11":9,"i12":9,"i13":10,"i14":10,"i15":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,8 +48,8 @@
    @@ -185,8 +180,10 @@

    Constructor Summary

    Constructor and Description -Incursion(int x, - int y)  +Incursion(int x, + int y, + java.util.ArrayList<Combatant> squadp, + Realm r)  @@ -204,77 +201,104 @@

    Method Summary

    Method and Description -void -attack(WorldActor target)  +static WorldActor +create(int x, + int y, + java.util.ArrayList<Combatant> squadp, + Realm r)  -static Incursion -create(int x, - int y)  +java.lang.Boolean +destroy(Incursion attacker) +
    Called when an incursion reaches this actor's location.
    + -java.lang.String -describe()  +static boolean +fight(int attacker, + int defender) +
    Helper method for destroy(Incursion).
    + -WorldActor -findtarget(WorldScreen s)  +WorldActor +findtarget(WorldScreen s)  -Fight -getfight()  +int +getel()  static java.util.ArrayList<Combatant> getsafeincursion(java.util.List<Combatant> from)  -int -getx()  +java.util.Collection<? extends Combatant> +getsquad()  -int -gety()  +static java.lang.Boolean +ignoreincursion(WorldActor attacker) +
    Helper method for destroy(Incursion)
    + -static boolean -invade(WorldScreen world)  +boolean +interact() +
    Called when a Squad enters the same world square as this actor.
    + void -move(int tox, - int toy)  +move(WorldScreen s)  void -move(WorldScreen s)  +place()  -void -place()  +static void +place(Realm r, + int x, + int y, + java.util.ArrayList<Combatant> squadp)  -void -remove()  - - static boolean spawn()
    A rate of 1 incursion every 18 days means that it will take a year for a level 20 incursion to appear.
    + +java.lang.String +toString()  + void +turn(long time, + WorldScreen world) +
    Called on each instance once per day.
    + + + +static void waitforenter()  +

    • Methods inherited from class java.lang.Object

      -clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
      • +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
    @@ -290,58 +314,26 @@

    Methods inherited from class java.lang.Object

    Field Detail

    - - - -
      -
    • -

      squads

      -
      public static java.util.List<Incursion> squads
      -
      • -
    - - - -
      -
    • -

      x

      -
      public int x
      -
      • -
    - - - -
      -
    • -

      y

      -
      public int y
      -
      • -
    - +
    • -

      el

      -
      public final int el
      +

      currentel

      +
      public static java.lang.Integer currentel
    -
      +

      • squad

        public java.util.List<Combatant> squad
        -
        • -
      - - - -
        -
      • -

        currentel

        -
        public static java.lang.Integer currentel
        +
        +
        See Also:
        +
        getel()
        +
      @@ -352,14 +344,16 @@

      currentel

      Constructor Detail

      - +

      • Incursion

        public Incursion(int x,
-                 int y)
        + int y, + java.util.ArrayList<Combatant> squadp, + Realm r)
      @@ -378,159 +372,198 @@

      Method Detail

      place

      public void place()
      -
      Specified by:
      -
      place in interface WorldActor
      +
      Overrides:
      +
      place in class WorldActor
    - + - + - +
    • -

      findtarget

      -
      public WorldActor findtarget(WorldScreen s)
      +

      waitforenter

      +
      public static void waitforenter()
    - +
    • -

      waitforenter

      -
      public void waitforenter()
      +

      turn

      +
      public void turn(long time,
+                 WorldScreen world)
      +
      Description copied from class: WorldActor
      +
      Called on each instance once per day.
      +
      +
      Overrides:
      +
      turn in class WorldActor
      +
    - +
    • -

      getx

      -
      public int getx()
      -
      -
      Specified by:
      -
      getx in interface WorldActor
      -
      +

      spawn

      +
      public static boolean spawn()
      +
      A rate of 1 incursion every 18 days means that it will take a year for a + level 20 incursion to appear.
    - +
    • -

      gety

      -
      public int gety()
      -
      -
      Specified by:
      -
      gety in interface WorldActor
      -
      +

      place

      +
      public static void place(Realm r,
+                         int x,
+                         int y,
+                         java.util.ArrayList<Combatant> squadp)
    - +
    • -

      remove

      -
      public void remove()
      -
      -
      Specified by:
      -
      remove in interface WorldActor
      -
      +

      create

      +
      public static WorldActor create(int x,
+                                int y,
+                                java.util.ArrayList<Combatant> squadp,
+                                Realm r)
    - +
    • -

      describe

      -
      public java.lang.String describe()
      +

      getsafeincursion

      +
      public static java.util.ArrayList<Combatant> getsafeincursion(java.util.List<Combatant> from)
      +
      • +
    + + + +
      +
    • +

      destroy

      +
      public java.lang.Boolean destroy(Incursion attacker)
      +
      Description copied from class: WorldActor
      +
      Called when an incursion reaches this actor's location.
      Specified by:
      -
      describe in interface WorldActor
      +
      destroy in class WorldActor
      +
      Returns:
      +
      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
      +
      See Also:
      +
      Incursion#ignoreincursion(Incursion), +fight(int, int)
    - +
    • -

      getfight

      -
      public Fight getfight()
      +

      ignoreincursion

      +
      public static java.lang.Boolean ignoreincursion(WorldActor attacker)
      +
      Helper method for destroy(Incursion)
      +
      +
      Returns:
      +
      null.
      +
    - +
    • -

      invade

      -
      public static boolean invade(WorldScreen world)
      +

      getel

      +
      public int getel()
    - +
    • -

      spawn

      -
      public static boolean spawn()
      -
      A rate of 1 incursion every 18 days means that it will take a year for a - level 20 incursion to appear.
      +

      fight

      +
      public static boolean fight(int attacker,
+                            int defender)
      +
      Helper method for destroy(Incursion). Uses a percentage to + decide which combatant wins (adapted from CCR).
      +
      +
      Parameters:
      +
      attacker - Encounter level.
      +
      defender - Encounter level. Integer.MIN_VALUE means an automatic + victory for the attacker.
      +
      Returns:
      +
      true if attacker wins.
      +
    - +
    • -

      create

      -
      public static Incursion create(int x,
-                               int y)
      +

      getsquad

      +
      public java.util.Collection<? extends Combatant> getsquad()
    - +
    • -

      move

      -
      public void move(int tox,
-                 int toy)
      +

      toString

      +
      public java.lang.String toString()
      -
      Specified by:
      -
      move in interface WorldActor
      +
      Overrides:
      +
      toString in class java.lang.Object
    - +
    • -

      getsafeincursion

      -
      public static java.util.ArrayList<Combatant> getsafeincursion(java.util.List<Combatant> from)
      +

      interact

      +
      public boolean interact()
      +
      Description copied from class: WorldActor
      +
      Called when a Squad enters the same world square as this actor.
      +
      +
      Overrides:
      +
      interact in class WorldActor
      +
    @@ -560,8 +593,8 @@

    getsafeincursion

    • Frames
      • diff --git a/doc/javadoc/javelin/model/world/Merchant.html b/doc/javadoc/javelin/model/world/Merchant.html new file mode 100644 index 000000000..03b877831 --- /dev/null +++ b/doc/javadoc/javelin/model/world/Merchant.html @@ -0,0 +1,406 @@ + + + + + +Merchant + + + + + + + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + +
      +
      javelin.model.world
      +

      Class Merchant

      +
      +
      + +
      +
        +
      • +
        +
        All Implemented Interfaces:
        +
        java.io.Serializable
        +
        +
        +
        +
        public class Merchant
+extends WorldActor
        +
        A figure that travels from one city to a human (neutral) city. It can be + visited to buy Items. If it reaches a human Town it grows by + 1 Town.size - this is an incentive for the player to protect + merchants. + + Unlike Town Items, these are not crafted but sold as-is, and + as such are removed after purchase.
        +
        +
        Author:
        +
        alex
        +
        See Also:
        +
        Serialized Form
        +
        +
        • +
      +
      +
      + +
      +
      +
        +
      • + +
          +
        • + + +

          Field Detail

          + + + +
            +
          • +

            inventory

            +
            public ItemSelection inventory
            +
            Selection of Items available for purchase.
            +
            • +
          +
          • +
        + +
          +
        • + + +

          Constructor Detail

          + + + +
            +
          • +

            Merchant

            +
            public Merchant()
            +
            Creates a merchant in the world map but doesn't WorldActor.place() it.
            +
            • +
          +
          • +
        + +
          +
        • + + +

          Method Detail

          + + + +
            +
          • +

            turn

            +
            public void turn(long time,
+                 WorldScreen world)
            +
            Description copied from class: WorldActor
            +
            Called on each instance once per day.
            +
            +
            Overrides:
            +
            turn in class WorldActor
            +
            +
            • +
          + + + +
            +
          • +

            destroy

            +
            public java.lang.Boolean destroy(Incursion attacker)
            +
            Description copied from class: WorldActor
            +
            Called when an incursion reaches this actor's location.
            +
            +
            Specified by:
            +
            destroy in class WorldActor
            +
            Returns:
            +
            true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
            +
            See Also:
            +
            Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
            +
            +
            • +
          + + + +
            +
          • +

            interact

            +
            public boolean interact()
            +
            Description copied from class: WorldActor
            +
            Called when a Squad enters the same world square as this actor.
            +
            +
            Overrides:
            +
            interact in class WorldActor
            +
            +
            • +
          +
          • +
        +
        • +
      +
      +
      + + +
      + + +
      Skip navigation links
      + + + + +
      +
      + + + +
      + +
      +
      + + +
      + + +
      + + + diff --git a/doc/javadoc/javelin/model/world/Squad.Transport.html b/doc/javadoc/javelin/model/world/Squad.Transport.html index dffe0a572..5ffa0a0c3 100644 --- a/doc/javadoc/javelin/model/world/Squad.Transport.html +++ b/doc/javadoc/javelin/model/world/Squad.Transport.html @@ -2,9 +2,9 @@ - + Squad.Transport - + @@ -49,7 +49,7 @@
      • Frames
        • @@ -123,6 +123,7 @@

        Enum Squad.Transport


        public static enum Squad.Transport
 extends java.lang.Enum<Squad.Transport>
        +
        Vehicles improve speed / random encounter chance.
      @@ -311,7 +312,7 @@

      valueOf

      • Frames
        • diff --git a/doc/javadoc/javelin/model/world/Squad.html b/doc/javadoc/javelin/model/world/Squad.html index 9dd0a577c..d4447984b 100644 --- a/doc/javadoc/javelin/model/world/Squad.html +++ b/doc/javadoc/javelin/model/world/Squad.html @@ -2,9 +2,9 @@ - + Squad - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -48,8 +48,8 @@
      - +
      • -

        getx

        -
        public int getx()
        +

        turn

        +
        public void turn(long time,
+                 WorldScreen world)
        +
        Description copied from class: WorldActor
        +
        Called on each instance once per day.
        -
        Specified by:
        -
        getx in interface WorldActor
        +
        Overrides:
        +
        turn in class WorldActor
      - + + + +
        +
      • +

        dismiss

        +
        public void dismiss(Combatant c)
        +
        Removes a squad member and returns it to the MercenariesGuild if + a mercenary.
        +
        • +
      + + + +
        +
      • +

        add

        +
        public void add(Combatant member,
+                java.util.ArrayList<Item> equipmentp)
        +
        • +
      + + + +
        +
      • +

        remove

        +
        public void remove(Combatant c)
        +
        • +
      +
      • -

        gety

        -
        public int gety()
        +

        move

        +
        public void move(int tox,
+                 int toy)
        -
        Specified by:
        -
        gety in interface WorldActor
        +
        Overrides:
        +
        move in class WorldActor
      - +
      • -

        remove

        -
        public void remove()
        +

        toString

        +
        public java.lang.String toString()
        -
        Specified by:
        -
        remove in interface WorldActor
        +
        Overrides:
        +
        toString in class java.lang.Object
      - + + + +
        +
      • +

        receiveitem

        +
        public void receiveitem(Item key)
        +
        • +
      +
      • -

        describe

        -
        public java.lang.String describe()
        +

        destroy

        +
        public java.lang.Boolean destroy(Incursion incursion)
        +
        Description copied from class: WorldActor
        +
        Called when an incursion reaches this actor's location.
        Specified by:
        -
        describe in interface WorldActor
        +
        destroy in class WorldActor
        +
        Returns:
        +
        true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
        +
        See Also:
        +
        Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
      - +
      • -

        displace

        -
        public void displace()
        +

        fly

        +
        public java.lang.Boolean fly()
        +
        +
        Returns:
        +
        true if all the squad can fly, false if + at least one can fly or null otherwise.
        +
      - +
      • -

        eat

        -
        public void eat()
        +

        know

        +
        public int know()
        +
        +
        Returns:
        +
        a Skills.knowledge roll.
        +
      - +
      • -

        add

        -
        public void add(Combatant member,
-                java.util.ArrayList<Item> equipmentp)
        +

        spot

        +
        public int spot()
        +
        +
        Returns:
        +
        a Skills.spot roll.
        +
      - +
      • -

        remove

        -
        public void remove(Combatant c)
        +

        listen

        +
        public int listen()
        +
        +
        Returns:
        +
        a Skills.listen roll.
        +
      - +
      • -

        move

        -
        public void move(int tox,
-                 int toy)
        +

        hide

        +
        public int hide()
        +
        Note that this will use the lowest Hide rating found.
        -
        Specified by:
        -
        move in interface WorldActor
        +
        Returns:
        +
        A Skills.hide roll.
      - +
      • -

        toString

        -
        public java.lang.String toString()
        +

        spot

        +
        public java.lang.String spot(java.util.List<Combatant> opponent)
        -
        Overrides:
        -
        toString in class java.lang.Object
        +
        Returns:
        +
        A list with the name of the given Combatants, replaced + with "?" when failed to spot() properly.
      - + + + +
        +
      • +

        hide

        +
        public boolean hide(java.util.List<Combatant> foes)
        +
        Represents a situation in which a group of hostile Combatant s is + approaching this group. The foes must first be heard successfully and + then a hide() attempt is performed.
        +
        +
        Returns:
        +
        true if hide is successful and player gives input to + stay hidden (confirmation).
        +
        +
        • +
      + + + +
        +
      • +

        bribe

        +
        public boolean bribe(java.util.List<Combatant> foes)
        +
        The squad tries to parley with the enemy Combatants, possibly + bribing or hirimg them to avoid the fight.
        +
        +
        Returns:
        +
        false if the fight is to proceed.
        +
        +
        • +
      + + + +
        +
      • +

        negotiate

        +
        public int negotiate()
        +
        +
        Returns:
        +
        A Skills.diplomacy roll.
        +
        +
        • +
      + + + +
        +
      • +

        search

        +
        public int search()
        +
        +
        Returns:
        +
        roll of Skills.search.
        +
        +
        • +
      + + + + + + + + +
      • -

        receiveitem

        -
        public void receiveitem(Item key)
        +

        survive

        +
        public int survive()
        +
        +
        Returns:
        +
        a roll of Skills.survival.
        +
      @@ -662,8 +846,8 @@

      receiveitem

      • Frames
        • @@ -687,7 +871,7 @@

        receiveitem

        • Summary: 
          • -
        • Nested | 
          • +
        • Nested | 
        • Field | 
        • Constr | 
        • Method
          • diff --git a/doc/javadoc/javelin/model/world/World.Region.html b/doc/javadoc/javelin/model/world/World.Region.html new file mode 100644 index 000000000..f1880f07f --- /dev/null +++ b/doc/javadoc/javelin/model/world/World.Region.html @@ -0,0 +1,410 @@ + + + + + +World.Region + + + + + + + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + +
          +
          javelin.model.world
          +

          Enum World.Region

          +
          +
          +
            +
          • java.lang.Object
            • +
          • +
              +
            • java.lang.Enum<World.Region>
              • +
            • +
                +
              • javelin.model.world.World.Region
                • +
              +
              • +
            +
            • +
          +
          +
            +
          • +
            +
            All Implemented Interfaces:
            +
            java.io.Serializable, java.lang.Comparable<World.Region>
            +
            +
            +
            Enclosing class:
            +
            World
            +
            +
            +
            +
            public static enum World.Region
+extends java.lang.Enum<World.Region>
            +
            A region is a sector of the world with a certain game difficulty + associated to it. Forests are the background. have 2 plain areas (1 is + player start), 3 mountain areas and 1 swamp.
            +
            +
            Author:
            +
            alex
            +
            +
            • +
          +
          +
          +
            +
          • + + + +
              +
            • + + +

              Method Summary

              + + + + + + + + + + + + + + +
              All Methods Static Methods Concrete Methods 
              Modifier and TypeMethod and Description
              static World.RegionvalueOf(java.lang.String name) +
              Returns the enum constant of this type with the specified name.
              +
              static World.Region[]values() +
              Returns an array containing the constants of this enum type, in +the order they are declared.
              +
              +
                +
              • + + +

                Methods inherited from class java.lang.Enum

                +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf
                • +
              +
                +
              • + + +

                Methods inherited from class java.lang.Object

                +getClass, notify, notifyAll, wait, wait, wait
                • +
              +
              • +
            +
            • +
          +
          +
          +
            +
          • + + + +
              +
            • + + +

              Method Detail

              + + + +
                +
              • +

                values

                +
                public static World.Region[] values()
                +
                Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
                +for (World.Region c : World.Region.values())
+    System.out.println(c);
+
                +
                +
                Returns:
                +
                an array containing the constants of this enum type, in the order they are declared
                +
                +
                • +
              + + + +
                +
              • +

                valueOf

                +
                public static World.Region valueOf(java.lang.String name)
                +
                Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
                +
                +
                Parameters:
                +
                name - the name of the enum constant to be returned.
                +
                Returns:
                +
                the enum constant with the specified name
                +
                Throws:
                +
                java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                +
                java.lang.NullPointerException - if the argument is null
                +
                +
                • +
              +
              • +
            +
            • +
          +
          +
          + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + + diff --git a/doc/javadoc/javelin/model/world/World.html b/doc/javadoc/javelin/model/world/World.html new file mode 100644 index 000000000..924dd5485 --- /dev/null +++ b/doc/javadoc/javelin/model/world/World.html @@ -0,0 +1,504 @@ + + + + + +World + + + + + + + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + +
          +
          javelin.model.world
          +

          Class World

          +
          +
          +
            +
          • java.lang.Object
            • +
          • +
              +
            • javelin.model.world.World
              • +
            +
            • +
          +
          +
            +
          • +
            +
            All Implemented Interfaces:
            +
            java.io.Serializable
            +
            +
            +
            +
            public class World
+extends java.lang.Object
+implements java.io.Serializable
            +
            Game world overview. This is focused on generating the initial game state. + + TODO would be nice to have tiles reflect the official d20 terrains (add + desert and hill)
            +
            +
            Author:
            +
            alex
            +
            See Also:
            +
            WorldScreen, +Serialized Form
            +
            +
            • +
          +
          +
          +
            +
          • + +
              +
            • + + +

              Nested Class Summary

              + + + + + + + + + + +
              Nested Classes 
              Modifier and TypeClass and Description
              static class World.Region +
              A region is a sector of the world with a certain game difficulty + associated to it.
              +
              +
              • +
            + +
              +
            • + + +

              Field Summary

              + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              Fields 
              Modifier and TypeField and Description
              static intEASY +
              2/16 Easy (el-5 to el-8) - plains
              +
              static java.util.HashMap<java.lang.Class<? extends WorldActor>,java.lang.Float>FEATURECHANCE +
              The sum total of the values of this map should be 1 (100%).
              +
              static intHARD +
              3/16 Difficult (el-3 to el) - mountains
              +
              static intMAPDIMENSION +
              Map size in squares.
              +
              static intMEDIUM +
              10/16 Moderate (el-4) - forest
              +
              static Worldseed +
              Randomly generated world map.
              +
              static intVERYHARD +
              1/16 Very difficult (el+1) - swamp
              +
              +
              • +
            + +
              +
            • + + +

              Method Summary

              + + + + + + + + + + + + + + + + + + + + + + +
              All Methods Static Methods Concrete Methods 
              Modifier and TypeMethod and Description
              static booleanistown(int x, + int y, + boolean townbufferenabled) 
              static voidmakemap() +
              Create a map at the start of the game.
              +
              static BattleMapmakemap(World seed) 
              static voidspawnfeatures(float chance, + boolean generatingworld) +
              Spawns WorldActors into the game world.
              +
              +
                +
              • + + +

                Methods inherited from class java.lang.Object

                +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                • +
              +
              • +
            +
            • +
          +
          +
          +
            +
          • + +
              +
            • + + +

              Field Detail

              + + + +
                +
              • +

                EASY

                +
                public static final int EASY
                +
                2/16 Easy (el-5 to el-8) - plains
                +
                +
                See Also:
                +
                Constant Field Values
                +
                +
                • +
              + + + +
                +
              • +

                MEDIUM

                +
                public static final int MEDIUM
                +
                10/16 Moderate (el-4) - forest
                +
                +
                See Also:
                +
                Constant Field Values
                +
                +
                • +
              + + + +
                +
              • +

                HARD

                +
                public static final int HARD
                +
                3/16 Difficult (el-3 to el) - mountains
                +
                +
                See Also:
                +
                Constant Field Values
                +
                +
                • +
              + + + +
                +
              • +

                VERYHARD

                +
                public static final int VERYHARD
                +
                1/16 Very difficult (el+1) - swamp
                +
                +
                See Also:
                +
                Constant Field Values
                +
                +
                • +
              + + + +
                +
              • +

                MAPDIMENSION

                +
                public static int MAPDIMENSION
                +
                Map size in squares.
                +
                • +
              + + + +
                +
              • +

                seed

                +
                public static World seed
                +
                Randomly generated world map.
                +
                • +
              + + + +
                +
              • +

                FEATURECHANCE

                +
                public static final java.util.HashMap<java.lang.Class<? extends WorldActor>,java.lang.Float> FEATURECHANCE
                +
                The sum total of the values of this map should be 1 (100%). + + Ideally one feature is spawned per week.
                +
                • +
              +
              • +
            + +
              +
            • + + +

              Method Detail

              + + + +
                +
              • +

                spawnfeatures

                +
                public static void spawnfeatures(float chance,
+                                 boolean generatingworld)
                +
                Spawns WorldActors into the game world.
                +
                +
                Parameters:
                +
                chance - Used to modify the default spawning chances. For example: if + this is called daily but the target is to spawn one feature + per week then one would provide a 1/7f value here. The default + spawning chances are calculated so as to sum up to 100% so + using a vlue of 1 would be likely to spawn 1 random feature in + the world map, but could spawn more or none depending on the + random number generator results.
                +
                generatingworld - If false will limit spawning to only a starting + set of actors. true is supposed to be used while + the game is progressing and support the full set.
                +
                +
                • +
              + + + +
                +
              • +

                makemap

                +
                public static BattleMap makemap(World seed)
                +
                +
                Parameters:
                +
                seed - Given an already generated seed...
                +
                Returns:
                +
                creates a view component that reflects it.
                +
                +
                • +
              + + + +
                +
              • +

                makemap

                +
                public static void makemap()
                +
                Create a map at the start of the game.
                +
                • +
              + + + +
                +
              • +

                istown

                +
                public static boolean istown(int x,
+                             int y,
+                             boolean townbufferenabled)
                +
                +
                Parameters:
                +
                townbufferenabled - If true will also return true if too + close to a Town.
                +
                Returns:
                +
                true if there is a Town in this coordinate + already.
                +
                +
                • +
              +
              • +
            +
            • +
          +
          +
          + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + + diff --git a/doc/javadoc/javelin/model/world/WorldActor.html b/doc/javadoc/javelin/model/world/WorldActor.html index f30258617..b456ae7ae 100644 --- a/doc/javadoc/javelin/model/world/WorldActor.html +++ b/doc/javadoc/javelin/model/world/WorldActor.html @@ -2,9 +2,9 @@ - + WorldActor - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":6,"i2":6,"i3":6,"i4":6,"i5":6}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; +var methods = {"i0":10,"i1":10,"i2":6,"i3":10,"i4":9,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10}; +var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -48,8 +48,8 @@
        @@ -92,31 +92,42 @@
        javelin.model.world
        -

        Interface WorldActor

        +

        Class WorldActor

        +
          +
        • java.lang.Object
          • +
        • +
            +
          • javelin.model.world.WorldActor
            • +
          +
          • +
        Author:
        alex
        +
        See Also:
        +
        Serialized Form
      @@ -124,6 +135,66 @@

      Interface WorldActor

      • + +
          +
        • + + +

          Field Summary

          + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          Fields 
          Modifier and TypeField and Description
          booleanimpermeable +
          If true this actor will be ignored by Incursions.
          +
          static java.util.HashMap<java.lang.Class<? extends WorldActor>,java.util.ArrayList<WorldActor>>INSTANCES 
          Realmrealm +
          Which team this actor belongs to or null if neutral.
          +
          tyrant.mikera.engine.Thingvisual 
          intx 
          inty 
          +
          • +
        + +
          +
        • + + +

          Constructor Summary

          + + + + + + + + +
          Constructors 
          Constructor and Description
          WorldActor() 
          +
          • +
        • @@ -170,28 +275,100 @@

        Method Summary

        • - +
            -
          • +
          • -

            Method Detail

            - +

            Field Detail

            +             + + +
              +
            • +

              INSTANCES

              +
              public static java.util.HashMap<java.lang.Class<? extends WorldActor>,java.util.ArrayList<WorldActor>> INSTANCES
              +
              • +
            + + + +
              +
            • +

              x

              +
              public int x
              +
              • +
            + + + +
              +
            • +

              y

              +
              public int y
              +
              • +
            + + + +
              +
            • +

              realm

              +
              public Realm realm
              +
              Which team this actor belongs to or null if neutral.
              +
              • +
            +
            • -

              getx

              -
              int getx()
              +

              impermeable

              +
              public boolean impermeable
              +
              If true this actor will be ignored by Incursions.
            - + +
              +
            • +

              visual

              +
              public transient tyrant.mikera.engine.Thing visual
              +
              • +
            +
            • +
          +
            +
          • + + +

            Constructor Detail

            + + + +
            • -

              gety

              -
              int gety()
              +

              WorldActor

              +
              public WorldActor()
              +
              • +
            +
            • +
          + +
        diff --git a/doc/javadoc/javelin/model/world/WorldMap.Region.html b/doc/javadoc/javelin/model/world/WorldMap.Region.html index ea6015676..ea7e3a73a 100644 --- a/doc/javadoc/javelin/model/world/WorldMap.Region.html +++ b/doc/javadoc/javelin/model/world/WorldMap.Region.html @@ -2,9 +2,9 @@ - + WorldMap.Region - + @@ -49,7 +49,7 @@
        • Frames
          • @@ -123,6 +123,12 @@

          Enum WorldMap.Region


          public static enum WorldMap.Region
 extends java.lang.Enum<WorldMap.Region>
          +
          A region is a sector of the world with a certain game difficulty + associated to it.
          +
          +
          Author:
          +
          alex
          +
        @@ -359,7 +365,7 @@

        valueOf

        • Frames
          • diff --git a/doc/javadoc/javelin/model/world/WorldMap.html b/doc/javadoc/javelin/model/world/WorldMap.html index 990c70d69..b4b30db50 100644 --- a/doc/javadoc/javelin/model/world/WorldMap.html +++ b/doc/javadoc/javelin/model/world/WorldMap.html @@ -2,9 +2,9 @@ - + WorldMap - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":9,"i5":10,"i6":9,"i7":10}; -var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var methods = {"i0":9,"i1":9,"i2":9}; +var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -48,7 +48,7 @@
        @@ -115,15 +115,7 @@

        Class WorldMap

        public class WorldMap
 extends java.lang.Object
 implements java.io.Serializable
        -
        Overworld view of the game world. - - 2/16 Easy (el-5 to el-8) - plains - - 10/16 Moderate (el-4) - forest - - 3/16 Difficult (el-3 to el) - mountains - - 1/16 Very difficult (el+1) - swamp +
        Game world overview. This is focused on generating the initial game state. forest is the background. have 2 plain areas (1 is player start), 3 mountain areas and 1 swamp. @@ -134,7 +126,8 @@

        Class WorldMap

        Author:
        alex
        See Also:
        -
        Serialized Form
        +
        WorldScreen, +Serialized Form
      @@ -156,7 +149,10 @@

      Nested Class Summary

      static class  -WorldMap.Region  +WorldMap.Region +
      A region is a sector of the world with a certain game difficulty + associated to it.
      + @@ -175,52 +171,43 @@

      Field Summary

      static int -EASY  +EASY +
      2/16 Easy (el-5 to el-8) - plains
      + -static int -HARD  +static java.util.HashMap<java.lang.Class<? extends WorldActor>,java.lang.Float> +FEATURECHANCE  static int -MAPDIMENSION  +HARD +
      3/16 Difficult (el-3 to el) - mountains
      + static int -MEDIUM  +MAPDIMENSION +
      Map size in squares.
      + -static WorldMap -seed  - - static int -TOWNBUFFER  - - -java.util.TreeMap<WorldMap.Region,tyrant.mikera.engine.Point> -towns  +MEDIUM +
      10/16 Moderate (el-4) - forest
      + -static int -VERYHARD  - - - -
    - - - - - -
      -
    • -

      towns

      -
      public java.util.TreeMap<WorldMap.Region,tyrant.mikera.engine.Point> towns
      +
      Map size in squares.
    -
      +

      • seed

        public static WorldMap seed
        +
        Randomly generated world map.
      - -
    - -
      -
    • - - -

      Constructor Detail

      - +
      • -

        WorldMap

        -
        public WorldMap()
        +

        FEATURECHANCE

        +
        public static final java.util.HashMap<java.lang.Class<? extends WorldActor>,java.lang.Float> FEATURECHANCE
      • @@ -416,84 +355,48 @@

      WorldMap

      Method Detail

      - - - -
        -
      • -

        buildregions

        -
        public void buildregions(java.util.TreeMap<WorldMap.Region,java.lang.Integer> regionsizes)
        -
        • -
      - + - - - -
        -
      • -

        updatesize

        -
        public java.lang.Integer updatesize(WorldMap.Region expand,
-                                    int i,
-                                    java.util.TreeMap<WorldMap.Region,java.lang.Integer> regionsizes)
        -
        • -
      - - - -
        -
      • -

        triangledistance

        -
        public static double triangledistance(tyrant.mikera.engine.Point a,
-                                      tyrant.mikera.engine.Point b)
        -
        • -
      - - - -
        -
      • -

        placetowns

        -
        public java.util.TreeMap<WorldMap.Region,tyrant.mikera.engine.Point> placetowns()
        -
        • -
      - - - -
        -
      • -

        main

        -
        public static void main(java.lang.String[] args)
        +

        makemap

        +
        public static BattleMap makemap(WorldMap seed)
        +
        +
        Parameters:
        +
        seed - Given an already generated seed...
        +
        Returns:
        +
        creates a view component that reflects it.
        +
      - +
      • -

        getTile

        -
        public int getTile(int i,
-                   int j)
        +

        makemap

        +
        public static void makemap()
        +
        Create a map at the start of the game.
      - +
      • -

        isoccupied

        -
        public static boolean isoccupied(int x,
-                                 int y,
-                                 boolean townbufferenabled)
        +

        istown

        +
        public static boolean istown(int x,
+                             int y,
+                             boolean townbufferenabled)
        +
        +
        Parameters:
        +
        townbufferenabled - If true will also return true if too + close to a Town.
        +
        Returns:
        +
        true if there is a Town in this coordinate + already.
        +
      @@ -523,7 +426,7 @@

      isoccupied

    diff --git a/doc/javadoc/javelin/model/world/package-frame.html b/doc/javadoc/javelin/model/world/package-frame.html index 992b18f87..a041826a6 100644 --- a/doc/javadoc/javelin/model/world/package-frame.html +++ b/doc/javadoc/javelin/model/world/package-frame.html @@ -2,37 +2,26 @@ - + javelin.model.world - +

    javelin.model.world

    -

    Interfaces

    -

    Classes

    Enums

    diff --git a/doc/javadoc/javelin/model/world/package-summary.html b/doc/javadoc/javelin/model/world/package-summary.html index 4d0830c51..46e6de794 100644 --- a/doc/javadoc/javelin/model/world/package-summary.html +++ b/doc/javadoc/javelin/model/world/package-summary.html @@ -2,9 +2,9 @@ - + javelin.model.world - + @@ -43,7 +43,7 @@
    • Frames
      • @@ -74,23 +74,6 @@

      Package javelin.model.world

      • - - - - - - - - - - - - -
        Interface Summary 
        InterfaceDescription
        WorldActor -
        An independent overworld feature.
        -
        -
        • -
      • @@ -99,43 +82,16 @@

        Package javelin.model.world

        - - - - - - - - - + - - - - - - - - @@ -145,29 +101,15 @@

        Package javelin.model.world

        - + - + - - - - - - - - @@ -182,12 +124,11 @@

        Package javelin.model.world

        - - - - - - + +
        Class Summary 
        Dungeon -
        A dungoen is an underground area of the world where the combats are harder - but have extra treasure laying around.
        -
        Haxor -
        The tower of haxor is a place for players to spend tickets the earn in - PlanarFight.
        -
        Incursion -
        An attacking Squad, trying to destroy a Town or other - WorldActor.
        +
        An attacking Squad, trying to destroy a Town or other + WorldActor.
        LairMerchant -
        A battle in which the final opponent can be captured as a Squad - member.
        -
        Portal -
        Portals usually take a Squad from a place to another.
        -
        QueueItem -
        Represents a training Combatant or a forging Item.
        +
        A figure that travels from one city to a human (neutral) city.
        TownWorld -
        A hub for upgrading units, resting, participating in tournament, renting - transportation, buying items...
        +
        Game world overview.
        TownQueueWorldActor -
        A container of QueueItem for a Town.
        -
        WorldMap -
        Overworld view of the game world.
        -
        WorldPlace -
        A WorldActor that is actually a place that represent a location to be - entered or explored.
        +
        An independent overworld feature.
        Squad.Transport 
        WorldMap.Region World.Region +
        A region is a sector of the world with a certain game difficulty + associated to it.
        +
        @@ -215,7 +156,7 @@

        Package javelin.model.world

        • Frames
          • diff --git a/doc/javadoc/javelin/model/world/package-tree.html b/doc/javadoc/javelin/model/world/package-tree.html index 9d0fd0ab8..8ace4186c 100644 --- a/doc/javadoc/javelin/model/world/package-tree.html +++ b/doc/javadoc/javelin/model/world/package-tree.html @@ -2,9 +2,9 @@ - + javelin.model.world Class Hierarchy - + @@ -43,7 +43,7 @@
          • Frames
            • @@ -80,39 +80,24 @@

            Class Hierarchy

            • java.lang.Object
                -
              • javelin.model.world.Incursion (implements javelin.model.world.WorldActor)
                • -
              • javelin.model.world.QueueItem (implements java.io.Serializable)
                • -
              • javelin.model.world.Squad (implements javelin.model.world.WorldActor)
                • -
              • javelin.model.world.Town (implements javelin.model.world.WorldActor)
                • -
              • javelin.model.world.TownQueue (implements java.io.Serializable)
                • -
              • javelin.model.world.WorldMap (implements java.io.Serializable)
                • -
              • javelin.model.world.WorldPlace (implements javelin.model.world.WorldActor) +
              • javelin.model.world.World (implements java.io.Serializable)
                • +
              • javelin.model.world.WorldActor (implements java.io.Serializable)
            -

            Interface Hierarchy

            -
              -
            • java.io.Serializable - -
              • -

            Enum Hierarchy

            • java.lang.Object @@ -140,7 +125,7 @@

              Enum Hierarchy

              • Frames
                • diff --git a/doc/javadoc/javelin/model/world/place/Academy.html b/doc/javadoc/javelin/model/world/place/Academy.html new file mode 100644 index 000000000..30f26f85b --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Academy.html @@ -0,0 +1,443 @@ + + + + + +Academy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Academy

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Academy
+extends GuardedPlace
                  +
                  Allows a player to learn one upgrade set.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Academy

                      +
                      public Academy(java.util.List<Upgrade> upgrades)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Overrides:
                      +
                      isupgrading in class WorldPlace
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Dungeon.html b/doc/javadoc/javelin/model/world/place/Dungeon.html new file mode 100644 index 000000000..10403bf85 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Dungeon.html @@ -0,0 +1,666 @@ + + + + + +Dungeon + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Dungeon

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Dungeon
+extends WorldPlace
                  +
                  A dungeon is an underground area of the world where the combats are harder + but have extra treasure laying around. + + The in-game logic for dungeons is that they are a hideout of bandits, which + is why they are sacrificeable by Incursions and are removed the game + after a Squad leaves one (in this case it's assumed the bandits + packed their stuff and left).
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + + + + + + + + + +
                      +
                    • +

                      WALKABLEAREA

                      +
                      public static final int WALKABLEAREA
                      +
                      • +
                    + + + +
                      +
                    • +

                      ENCOUNTERRATIO

                      +
                      public static final double ENCOUNTERRATIO
                      +
                      Assumes you will explore all the dungeon, being able to rest at the + fountain mid-way for a total of 8 moderate encounters. This ignores the + returning path towards the exit and getting to and from the dungeon + itself, which means squads are supposed to be well equipped before diving + in.
                      +
                      • +
                    + + + +
                      +
                    • +

                      DELTAS

                      +
                      public static final int[] DELTAS
                      +
                      • +
                    + + + +
                      +
                    • +

                      dungeons

                      +
                      public static java.util.List<WorldPlace> dungeons
                      +
                      • +
                    + + + +
                      +
                    • +

                      active

                      +
                      public static Dungeon active
                      +
                      • +
                    + + + +
                      +
                    • +

                      features

                      +
                      public java.util.List<Feature> features
                      +
                      • +
                    + + + +
                      +
                    • +

                      walls

                      +
                      public java.util.HashSet<Point> walls
                      +
                      • +
                    + + + +
                      +
                    • +

                      visible

                      +
                      public boolean[][] visible
                      +
                      • +
                    + + + +
                      +
                    • +

                      herop

                      +
                      public Point herop
                      +
                      • +
                    + + + +
                      +
                    • +

                      hero

                      +
                      public transient tyrant.mikera.engine.Thing hero
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Dungeon

                      +
                      public Dungeon()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      spawn

                      +
                      public static void spawn(float i)
                      +
                      • +
                    + + + +
                      +
                    • +

                      enter

                      +
                      public boolean enter()
                      +
                      Description copied from class: WorldPlace
                      +
                      Callen when this place is reached with the active.
                      +
                      +
                      Overrides:
                      +
                      enter in class WorldPlace
                      +
                      Returns:
                      +
                      true if the Squad is able to interact with + this place, false if a WorldPlace.garrison defends it.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      activate

                      +
                      public void activate()
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      createchests

                      +
                      public void createchests(java.util.Set<Point> all)
                      +
                      • +
                    + + + + + + + + + + + +
                      +
                    • +

                      leave

                      +
                      public void leave()
                      +
                      • +
                    + + + +
                      +
                    • +

                      regenerate

                      +
                      protected void regenerate()
                      +
                      • +
                    + + + +
                      +
                    • +

                      getel

                      +
                      protected java.lang.Integer getel(int attackel)
                      +
                      +
                      Specified by:
                      +
                      getel in class WorldPlace
                      +
                      Parameters:
                      +
                      attackel - Given an attacking encounter level...
                      +
                      Returns:
                      +
                      the defending encounter level. A null value is + allowed because some places should not be conquered.
                      +
                      See Also:
                      +
                      WorldActor.impermeable, +Incursion.fight(int, int)
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Dwelling.html b/doc/javadoc/javelin/model/world/place/Dwelling.html new file mode 100644 index 000000000..f117578e1 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Dwelling.html @@ -0,0 +1,479 @@ + + + + + +Dwelling + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Dwelling

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Dwelling
+extends GuardedPlace
                  +
                  Allows a player to recruit one type of unit.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      DEBUG

                      +
                      public static final boolean DEBUG
                      +
                      Raise spawning chance and start without a garrison.
                      +
                      +
                      See Also:
                      +
                      Constant Field Values
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      volunteer

                      +
                      public boolean volunteer
                      +
                      A volunteer is willing to join a Squad permanently.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Dwelling

                      +
                      public Dwelling()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      Description copied from class: GuardedPlace
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting GuardedPlace.targetel.
                      +
                      +
                      Overrides:
                      +
                      generategarrison in class GuardedPlace
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      turn

                      +
                      public void turn(long time,
+                 WorldScreen world)
                      +
                      Description copied from class: WorldActor
                      +
                      Called on each instance once per day.
                      +
                      +
                      Overrides:
                      +
                      turn in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Overrides:
                      +
                      isupgrading in class WorldPlace
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/GuardedPlace.html b/doc/javadoc/javelin/model/world/place/GuardedPlace.html new file mode 100644 index 000000000..919568824 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/GuardedPlace.html @@ -0,0 +1,495 @@ + + + + + +GuardedPlace + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class GuardedPlace

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Direct Known Subclasses:
                  +
                  Academy, Dwelling, Guardian, Inn, Shrine, UniqueLocation
                  +
                  +
                  +
                  +
                  public abstract class GuardedPlace
+extends WorldPlace
                  +
                  A guarded place is a world feature that has a garrison army since the + bieggining of the game. This is meant to expand the number of places to be + explored, while also offering non-scaled (fixed difficulty) encounters to + offset the scaled nature of RandomEncounters and most other game + battles.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  WorldPlace.garrison, +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      descriptionknown

                      +
                      protected java.lang.String descriptionknown
                      +
                      To be shown on a successful Skills.knowledge check.
                      +
                      • +
                    + + + +
                      +
                    • +

                      descriptionunknown

                      +
                      protected java.lang.String descriptionunknown
                      +
                      To be shown on a failed Skills.knowledge check.
                      +
                      • +
                    + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      GuardedPlace

                      +
                      public GuardedPlace(java.lang.String descriptionknown,
+                    java.lang.String descriptionunknown,
+                    int minel,
+                    int maxel)
                      +
                      Generates a guarded location based on a difficulty range. The difficulty + here is taken as the level of 4 characters that would be a fair combat to + the current garrison. This enables subclasses to use the classic D&D + tiers, while avoiding absolute predictability: + +
                      + Levels 1-5 (low level) + +
                      + Levels 6-10 (medium level) + +
                      + Levels 11-15 (high level) + +
                      + Levels 16-20 (legendary level) + +
                      + Levels 21+ (epic, not yet implemented)
                      +
                      +
                      Parameters:
                      +
                      minel - Minimum difficulty. Will be converted into a proper Upper + Krust EL.
                      +
                      maxel - Maximum difficulty. Will be converted into a proper Upper + Krust EL.
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting targetel.
                      +
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Guardian.html b/doc/javadoc/javelin/model/world/place/Guardian.html new file mode 100644 index 000000000..d4ad7f790 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Guardian.html @@ -0,0 +1,461 @@ + + + + + +Guardian + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Guardian

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Guardian
+extends GuardedPlace
                  +
                  Single creature that guards an Item.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Guardian

                      +
                      public Guardian()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      Description copied from class: GuardedPlace
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting GuardedPlace.targetel.
                      +
                      +
                      Overrides:
                      +
                      generategarrison in class GuardedPlace
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      findnativemonster

                      +
                      public static Combatant findnativemonster(float cr,
+                                          WorldPlace spot)
                      +
                      +
                      Parameters:
                      +
                      cr - Given a challenge rating target...
                      +
                      spot - and a world location...
                      +
                      Returns:
                      +
                      a monster from that location and that challenge rating or + null if couldn't find one.
                      +
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Haxor.html b/doc/javadoc/javelin/model/world/place/Haxor.html new file mode 100644 index 000000000..7051a9f99 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Haxor.html @@ -0,0 +1,499 @@ + + + + + +Haxor + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Haxor

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Haxor
+extends WorldPlace
                  +
                  The tower of haxor is a place for players to spend tickets the earn in + PlanarFight. It's largely a meta-game feature and a way to offer + interesting non-balance-affecting powers to the player or with minimal + balance implications, largely overshadowed by winning an EL-0 encounter that + the fight represents. + + Only one booster hack can be activated per game - once one is acquired all + other boosters are removed.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      singleton

                      +
                      public static transient Haxor singleton
                      +
                      • +
                    + + + +
                      +
                    • +

                      tickets

                      +
                      public int tickets
                      +
                      Cheating currency.
                      +
                      • +
                    + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Haxor

                      +
                      public Haxor()
                      +
                      Fills options initially.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      remove

                      +
                      public void remove()
                      +
                      +
                      Overrides:
                      +
                      remove in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      spawn

                      +
                      public static void spawn(tyrant.mikera.engine.Point easya)
                      +
                      • +
                    + + + +
                      +
                    • +

                      destroy

                      +
                      public java.lang.Boolean destroy(Incursion attacker)
                      +
                      Description copied from class: WorldActor
                      +
                      Called when an incursion reaches this actor's location.
                      +
                      +
                      Overrides:
                      +
                      destroy in class WorldPlace
                      +
                      Returns:
                      +
                      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
                      +
                      See Also:
                      +
                      Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Inn.html b/doc/javadoc/javelin/model/world/place/Inn.html new file mode 100644 index 000000000..bb38cf225 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Inn.html @@ -0,0 +1,370 @@ + + + + + +Inn + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Inn

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Inn
+extends GuardedPlace
                  +
                  Allows a Squad to rest outside of a Town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Inn

                      +
                      public Inn()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      generate

                      +
                      protected void generate()
                      +
                      +
                      Overrides:
                      +
                      generate in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Lair.html b/doc/javadoc/javelin/model/world/place/Lair.html new file mode 100644 index 000000000..7f9fdb1c6 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Lair.html @@ -0,0 +1,369 @@ + + + + + +Lair + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Lair

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Lair
+extends WorldPlace
                  +
                  A battle in which the final opponent can be captured as a Squad + member. + + TODO Would be interesting being able to spend time on the pub and perhaps + hear about the location of dungeons or incursions
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Lair

                      +
                      public Lair()
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Outpost.html b/doc/javadoc/javelin/model/world/place/Outpost.html new file mode 100644 index 000000000..8f82d6a95 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Outpost.html @@ -0,0 +1,483 @@ + + + + + +Outpost + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Outpost

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Outpost
+extends WorldPlace
                  +
                  An outpost allows for vision of a wide area around it. 10 outputs are created + per game.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  World.makemap(), +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Outpost

                      +
                      public Outpost()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      destroy

                      +
                      public java.lang.Boolean destroy(Incursion attacker)
                      +
                      Description copied from class: WorldActor
                      +
                      Called when an incursion reaches this actor's location.
                      +
                      +
                      Overrides:
                      +
                      destroy in class WorldPlace
                      +
                      Returns:
                      +
                      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
                      +
                      See Also:
                      +
                      Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      build

                      +
                      public static void build()
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      discover

                      +
                      public static void discover(int xp,
+                            int yp,
+                            int range)
                      +
                      Given a coordinate shows a big amount of land around that.
                      +
                      +
                      Parameters:
                      +
                      range - How far squares away will become visible.
                      +
                      See Also:
                      +
                      WorldScreen.discovered
                      +
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      generate

                      +
                      protected void generate()
                      +
                      +
                      Overrides:
                      +
                      generate in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Portal.html b/doc/javadoc/javelin/model/world/place/Portal.html new file mode 100644 index 000000000..eff593edc --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Portal.html @@ -0,0 +1,484 @@ + + + + + +Portal + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Portal

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Portal
+extends WorldPlace
                  +
                  Portals usually take a Squad from a place to another. + + TODO Lots of good ideas here + http://www.campaignmastery.com/blog/portals-to-celest-morph-1/ + + TODO would be cool to have a portal feature that drops you on a wider area
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      invasion

                      +
                      public final boolean invasion
                      +
                      An invasion portal is used by incoming Incursions as an entry + point to the World.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Portal

                      +
                      public Portal(WorldActor fromp,
+              WorldActor top,
+              boolean bidirectional,
+              boolean wanderingp,
+              boolean safep,
+              boolean instantaneousp,
+              java.lang.Long expiresatp,
+              boolean invasionp)
                      +
                      • +
                    + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generate

                      +
                      protected void generate()
                      +
                      +
                      Overrides:
                      +
                      generate in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      open

                      +
                      public static void open(float f)
                      +
                      • +
                    + + + +
                      +
                    • +

                      turn

                      +
                      public void turn(long time,
+                 WorldScreen world)
                      +
                      Description copied from class: WorldActor
                      +
                      Called on each instance once per day.
                      +
                      +
                      Overrides:
                      +
                      turn in class WorldActor
                      +
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/Shrine.html b/doc/javadoc/javelin/model/world/place/Shrine.html new file mode 100644 index 000000000..a0b73db63 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/Shrine.html @@ -0,0 +1,387 @@ + + + + + +Shrine + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class Shrine

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Shrine
+extends GuardedPlace
                  +
                  Once it's garrison is defeated a priest will offer a wish to the heroes in + return - a ScrollSpell (currently only obtainable this way) or map + knowledge.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Shrine

                      +
                      public Shrine()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/WorldPlace.html b/doc/javadoc/javelin/model/world/place/WorldPlace.html new file mode 100644 index 000000000..c3687f7b6 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/WorldPlace.html @@ -0,0 +1,767 @@ + + + + + +WorldPlace + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place
                +

                Class WorldPlace

                +
                +
                + +
                + +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      WorldPlace

                      +
                      public WorldPlace(java.lang.String description)
                      +
                      +
                      Parameters:
                      +
                      descriptionknown - What to show a player on a succesfull Skills.knowledge + check.
                      +
                      descriptionunknown - What to show otherwise.
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generate

                      +
                      protected void generate()
                      +
                      • +
                    + + + +
                      +
                    • +

                      generate

                      +
                      public static void generate(WorldActor p)
                      +
                      Default implementation of generate(), will try random + positioning until it lands on a free space.
                      +
                      +
                      Parameters:
                      +
                      p -
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public static boolean interact(WorldPlace p)
                      +
                      Called when this place is reached with the active Squad.
                      +
                      +
                      Returns:
                      +
                      true if the Squad is able to interact with + this place, false if a garrison defends it.
                      +
                      Throws:
                      +
                      StartBattle
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      destroy

                      +
                      public java.lang.Boolean destroy(Incursion attacker)
                      +
                      Description copied from class: WorldActor
                      +
                      Called when an incursion reaches this actor's location.
                      +
                      +
                      Specified by:
                      +
                      destroy in class WorldActor
                      +
                      Returns:
                      +
                      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
                      +
                      See Also:
                      +
                      Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getel

                      +
                      protected abstract java.lang.Integer getel(int attackerel)
                      +
                      Only called for sacrificeable places when being reached by an + Incursion.
                      +
                      +
                      Parameters:
                      +
                      attackerel - Given an attacking encounter level...
                      +
                      Returns:
                      +
                      the defending encounter level. A null value is + allowed because some places should not be conquered.
                      +
                      See Also:
                      +
                      WorldActor.impermeable, +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      ishostile

                      +
                      public boolean ishostile()
                      +
                      • +
                    + + + +
                      +
                    • +

                      defend

                      +
                      protected boolean defend()
                      +
                      +
                      Returns:
                      +
                      false if this is unguarded, true if it + is guarded but the player aborted combat.
                      +
                      Throws:
                      +
                      StartBattle - If the player chooses to attack a defended location.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      fight

                      +
                      protected Siege fight()
                      +
                      • +
                    + + + +
                      +
                    • +

                      headsup

                      +
                      public static boolean headsup(java.util.List<Combatant> opponents,
+                              java.lang.String description)
                      +
                      Offers information and a chance to back out of the fight.
                      +
                      +
                      Parameters:
                      +
                      opponents - Will be Squad.spot()ted.
                      +
                      description - What to describe this place as.
                      +
                      Returns:
                      +
                      true if player confirms engaging in battle.
                      +
                      Throws:
                      +
                      RepeatTurnException
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class java.lang.Object
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getimage

                      +
                      public java.awt.Image getimage()
                      +
                      • +
                    + + + +
                      +
                    • +

                      generateawayfromtown

                      +
                      protected void generateawayfromtown()
                      +
                      Convenience method for subclasses to use as generate(). Warning: + when using this do not override #generate(WorldPlace)!
                      +
                      • +
                    + + + +
                      +
                    • +

                      iscloseto

                      +
                      public boolean iscloseto(java.lang.Class<? extends WorldPlace> targets)
                      +
                      • +
                    + + + +
                      +
                    • +

                      distance

                      +
                      public double distance(int xp,
+                       int yp)
                      +
                      • +
                    + + + +
                      +
                    • +

                      count

                      +
                      public static int count()
                      +
                      • +
                    + + + +
                      +
                    • +

                      ishosting

                      +
                      public boolean ishosting()
                      +
                      +
                      Returns:
                      +
                      true if a flag icon is to be displayed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      iscrafting

                      +
                      public boolean iscrafting()
                      +
                      +
                      Returns:
                      +
                      true if a item icon is to be displayed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Crawler.html b/doc/javadoc/javelin/model/world/place/dungeon/Crawler.html new file mode 100644 index 000000000..81810b6a0 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Crawler.html @@ -0,0 +1,353 @@ + + + + + +Crawler + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Crawler

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.dungeon.Crawler
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  +
                  public abstract class Crawler
+extends java.lang.Object
                  +
                  Helper class to carve out paths and sections in a Dungeon.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    java.util.ArrayList<Point>result 
                    protected Pointwalker 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Crawler(Point start, + java.util.Set<Point> used) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + +
                    All Methods Instance Methods Abstract Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    voidcrawl(int length) 
                    voidfill(int length, + java.util.Set<Point> free) 
                    abstract voidstep() 
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      walker

                      +
                      protected Point walker
                      +
                      • +
                    + + + +
                      +
                    • +

                      result

                      +
                      public java.util.ArrayList<Point> result
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Crawler

                      +
                      public Crawler(Point start,
+               java.util.Set<Point> used)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      crawl

                      +
                      public void crawl(int length)
                      +
                      • +
                    + + + +
                      +
                    • +

                      step

                      +
                      public abstract void step()
                      +
                      • +
                    + + + +
                      +
                    • +

                      fill

                      +
                      public void fill(int length,
+                 java.util.Set<Point> free)
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Dungeon.html b/doc/javadoc/javelin/model/world/place/dungeon/Dungeon.html new file mode 100644 index 000000000..c6a7fcfbf --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Dungeon.html @@ -0,0 +1,599 @@ + + + + + +Dungeon + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Dungeon

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Dungeon
+extends WorldPlace
                  +
                  A dungeon is an underground area of the world where the combats are harder + but have extra treasure laying around. + + The in-game logic for dungeons is that they are a hideout of bandits, which + is why they are sacrificeable by Incursions and are removed the game + after a Squad leaves one (in this case it's assumed the bandits + packed their stuff and left).
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + + + + + + + + + +
                      +
                    • +

                      WALKABLEAREA

                      +
                      public static final int WALKABLEAREA
                      +
                      • +
                    + + + +
                      +
                    • +

                      ENCOUNTERRATIO

                      +
                      public static final double ENCOUNTERRATIO
                      +
                      Assumes you will explore all the dungeon, being able to rest at the + fountain mid-way for a total of 8 moderate encounters. This ignores the + returning path towards the exit and getting to and from the dungeon + itself, which means squads are supposed to be well equipped before diving + in.
                      +
                      • +
                    + + + +
                      +
                    • +

                      DELTAS

                      +
                      public static final int[] DELTAS
                      +
                      • +
                    + + + +
                      +
                    • +

                      active

                      +
                      public static Dungeon active
                      +
                      • +
                    + + + +
                      +
                    • +

                      features

                      +
                      public java.util.List<Feature> features
                      +
                      • +
                    + + + +
                      +
                    • +

                      walls

                      +
                      public java.util.HashSet<Point> walls
                      +
                      • +
                    + + + +
                      +
                    • +

                      visible

                      +
                      public boolean[][] visible
                      +
                      • +
                    + + + +
                      +
                    • +

                      herop

                      +
                      public Point herop
                      +
                      • +
                    + + + +
                      +
                    • +

                      hero

                      +
                      public transient tyrant.mikera.engine.Thing hero
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Dungeon

                      +
                      public Dungeon()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      activate

                      +
                      public void activate()
                      +
                      • +
                    + + + +
                      +
                    • +

                      createchests

                      +
                      public void createchests(java.util.Set<Point> free,
+                         java.util.Set<Point> used)
                      +
                      • +
                    + + + +
                      +
                    • +

                      leave

                      +
                      public void leave()
                      +
                      • +
                    + + + +
                      +
                    • +

                      regenerate

                      +
                      protected void regenerate()
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Feature.html b/doc/javadoc/javelin/model/world/place/dungeon/Feature.html new file mode 100644 index 000000000..e979a1bd9 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Feature.html @@ -0,0 +1,390 @@ + + + + + +Feature + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Feature

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.dungeon.Feature
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Direct Known Subclasses:
                  +
                  Fountain, StairsUp, Trap, Treasure
                  +
                  +
                  +
                  +
                  public abstract class Feature
+extends java.lang.Object
+implements java.io.Serializable
                  +
                  An interactive dungeon tile.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    tyrant.mikera.engine.Thingvisual 
                    intx 
                    inty 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Feature(java.lang.String thing, + int xp, + int yp) 
                    +
                    • +
                  + + +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      x

                      +
                      public final int x
                      +
                      • +
                    + + + +
                      +
                    • +

                      y

                      +
                      public final int y
                      +
                      • +
                    + + + +
                      +
                    • +

                      visual

                      +
                      public transient tyrant.mikera.engine.Thing visual
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Feature

                      +
                      public Feature(java.lang.String thing,
+               int xp,
+               int yp)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generate

                      +
                      public void generate(BattleMap map)
                      +
                      • +
                    + + + +
                      +
                    • +

                      addvisual

                      +
                      protected void addvisual(BattleMap map)
                      +
                      • +
                    + + + +
                      +
                    • +

                      remove

                      +
                      public void remove()
                      +
                      • +
                    + + + +
                      +
                    • +

                      activate

                      +
                      public abstract boolean activate()
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Fountain.html b/doc/javadoc/javelin/model/world/place/dungeon/Fountain.html new file mode 100644 index 000000000..fb48a0e60 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Fountain.html @@ -0,0 +1,315 @@ + + + + + +Fountain + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Fountain

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Fountain
+extends Feature
                  +
                  Heals hit points and spell uses.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Fountain(java.lang.String thing, + int i, + int j) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    booleanactivate() 
                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Fountain

                      +
                      public Fountain(java.lang.String thing,
+                int i,
+                int j)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      activate

                      +
                      public boolean activate()
                      +
                      +
                      Specified by:
                      +
                      activate in class Feature
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/StairsUp.html b/doc/javadoc/javelin/model/world/place/dungeon/StairsUp.html new file mode 100644 index 000000000..29acb5866 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/StairsUp.html @@ -0,0 +1,313 @@ + + + + + +StairsUp + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class StairsUp

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class StairsUp
+extends Feature
                  +
                  Leaves dungeon.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    StairsUp(java.lang.String thing, + Point p) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    booleanactivate() 
                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      StairsUp

                      +
                      public StairsUp(java.lang.String thing,
+                Point p)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      activate

                      +
                      public boolean activate()
                      +
                      +
                      Specified by:
                      +
                      activate in class Feature
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Trap.html b/doc/javadoc/javelin/model/world/place/dungeon/Trap.html new file mode 100644 index 000000000..f25d4f34c --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Trap.html @@ -0,0 +1,461 @@ + + + + + +Trap + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Trap

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Trap
+extends Feature
                  +
                  A trap is a semi-permanent strategic dungeon feature that deals subdual + (non-lethal) damage to a single character. It is balanced by generating more + Treasure. + + Traps are currently on the average party CR -5 to -8 so as to be easy + encounters. It's no fun to step onto a hard trap you didn't see coming and + possibly lose the game. They are there more as a strategic path consideration + when exploring a dungeon. + + In d20 traps are supposed to award XP as well as gold. This isn't done here + partly because since the traps are permanent (so as to be strategic) it would + be easy to continually step on traps to plunder xp. TODO maybe when disarm + device and search skills are implemented we could move to single-use traps, + which would maybe also allow for more variety + + TODO search + disarm (assuming balance will be even) + + TODO evasion upgrade (half damage/no damage instead of full/half)
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      found

                      +
                      public boolean found
                      +
                      See searchdc.
                      +
                      • +
                    + + + +
                      +
                    • +

                      cr

                      +
                      public final int cr
                      +
                      Challenge rating.
                      +
                      • +
                    + + + +
                      +
                    • +

                      reflexdc

                      +
                      public float reflexdc
                      +
                      Difficulty class to save against.
                      +
                      • +
                    + + + + + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Trap

                      +
                      public Trap(Point p)
                      +
                      +
                      Parameters:
                      +
                      p - Creates a trap at this point.
                      +
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/Treasure.html b/doc/javadoc/javelin/model/world/place/dungeon/Treasure.html new file mode 100644 index 000000000..0340bddcf --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/Treasure.html @@ -0,0 +1,350 @@ + + + + + +Treasure + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.dungeon
                +

                Class Treasure

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Treasure
+extends Feature
                  +
                  Loot!
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    Keykey +
                    null if no key.
                    +
                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Treasure(java.lang.String thing, + int i, + int j, + int goldp, + ItemSelection itemsp) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    booleanactivate() 
                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      key

                      +
                      public Key key
                      +
                      null if no key.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Treasure

                      +
                      public Treasure(java.lang.String thing,
+                int i,
+                int j,
+                int goldp,
+                ItemSelection itemsp)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      activate

                      +
                      public boolean activate()
                      +
                      +
                      Specified by:
                      +
                      activate in class Feature
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/package-frame.html b/doc/javadoc/javelin/model/world/place/dungeon/package-frame.html new file mode 100644 index 000000000..a806e6d2c --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/package-frame.html @@ -0,0 +1,26 @@ + + + + + +javelin.model.world.place.dungeon + + + + + +

                javelin.model.world.place.dungeon

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/package-summary.html b/doc/javadoc/javelin/model/world/place/dungeon/package-summary.html new file mode 100644 index 000000000..fd51259fd --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/package-summary.html @@ -0,0 +1,180 @@ + + + + + +javelin.model.world.place.dungeon + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.dungeon

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  Crawler +
                  Helper class to carve out paths and sections in a Dungeon.
                  +
                  Dungeon +
                  A dungeon is an underground area of the world where the combats are harder + but have extra treasure laying around.
                  +
                  Feature +
                  An interactive dungeon tile.
                  +
                  Fountain +
                  Heals hit points and spell uses.
                  +
                  StairsUp +
                  Leaves dungeon.
                  +
                  Trap +
                  A trap is a semi-permanent strategic dungeon feature that deals subdual + (non-lethal) damage to a single character.
                  +
                  Treasure +
                  Loot!
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/dungeon/package-tree.html b/doc/javadoc/javelin/model/world/place/dungeon/package-tree.html new file mode 100644 index 000000000..cbdfc49f5 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/dungeon/package-tree.html @@ -0,0 +1,152 @@ + + + + + +javelin.model.world.place.dungeon Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.dungeon

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • javelin.model.world.place.dungeon.Crawler
                    • +
                  • javelin.model.world.place.dungeon.Feature (implements java.io.Serializable) +
                      +
                    • javelin.model.world.place.dungeon.Fountain
                      • +
                    • javelin.model.world.place.dungeon.StairsUp
                      • +
                    • javelin.model.world.place.dungeon.Trap
                      • +
                    • javelin.model.world.place.dungeon.Treasure
                      • +
                    +
                    • +
                  • javelin.model.world.WorldActor (implements java.io.Serializable) +
                      +
                    • javelin.model.world.place.WorldPlace +
                        +
                      • javelin.model.world.place.dungeon.Dungeon
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/Academy.html b/doc/javadoc/javelin/model/world/place/guarded/Academy.html new file mode 100644 index 000000000..f4934ddc6 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/Academy.html @@ -0,0 +1,443 @@ + + + + + +Academy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class Academy

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Academy
+extends GuardedPlace
                  +
                  Allows a player to learn one upgrade set.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Academy

                      +
                      public Academy(java.util.List<Upgrade> upgrades)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Overrides:
                      +
                      isupgrading in class WorldPlace
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/Dwelling.html b/doc/javadoc/javelin/model/world/place/guarded/Dwelling.html new file mode 100644 index 000000000..b31704e11 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/Dwelling.html @@ -0,0 +1,479 @@ + + + + + +Dwelling + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class Dwelling

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Dwelling
+extends GuardedPlace
                  +
                  Allows a player to recruit one type of unit.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      DEBUG

                      +
                      public static final boolean DEBUG
                      +
                      Raise spawning chance and start without a garrison.
                      +
                      +
                      See Also:
                      +
                      Constant Field Values
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      volunteer

                      +
                      public boolean volunteer
                      +
                      A volunteer is willing to join a Squad permanently.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Dwelling

                      +
                      public Dwelling()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      Description copied from class: GuardedPlace
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting GuardedPlace.targetel.
                      +
                      +
                      Overrides:
                      +
                      generategarrison in class GuardedPlace
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      turn

                      +
                      public void turn(long time,
+                 WorldScreen world)
                      +
                      Description copied from class: WorldActor
                      +
                      Called on each instance once per day.
                      +
                      +
                      Overrides:
                      +
                      turn in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Overrides:
                      +
                      isupgrading in class WorldPlace
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/GuardedPlace.html b/doc/javadoc/javelin/model/world/place/guarded/GuardedPlace.html new file mode 100644 index 000000000..997ed1c95 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/GuardedPlace.html @@ -0,0 +1,556 @@ + + + + + +GuardedPlace + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class GuardedPlace

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Direct Known Subclasses:
                  +
                  Academy, Dwelling, Guardian, Inn, Shrine, UniqueLocation
                  +
                  +
                  +
                  +
                  public abstract class GuardedPlace
+extends WorldPlace
                  +
                  A guarded place is a world feature that has a garrison army since the + bieggining of the game. This is meant to expand the number of places to be + explored, while also offering non-scaled (fixed difficulty) encounters to + offset the scaled nature of RandomEncounters and most other game + battles.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  WorldPlace.garrison, +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      descriptionknown

                      +
                      protected java.lang.String descriptionknown
                      +
                      To be shown on a successful Skills.knowledge check.
                      +
                      • +
                    + + + +
                      +
                    • +

                      descriptionunknown

                      +
                      protected java.lang.String descriptionunknown
                      +
                      To be shown on a failed Skills.knowledge check.
                      +
                      • +
                    + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      GuardedPlace

                      +
                      public GuardedPlace(java.lang.String descriptionknown,
+                    java.lang.String descriptionunknown,
+                    int minel,
+                    int maxel)
                      +
                      Generates a guarded location based on a difficulty range. The difficulty + here is taken as the level of 4 characters that would be a fair combat to + the current garrison. This enables subclasses to use the classic D&D + tiers, while avoiding absolute predictability: + +
                      + Levels 1-5 (low level) + +
                      + Levels 6-10 (medium level) + +
                      + Levels 11-15 (high level) + +
                      + Levels 16-20 (legendary level) + +
                      + Levels 21+ (epic, not yet implemented)
                      +
                      +
                      Parameters:
                      +
                      minel - Minimum difficulty. Will be converted into a proper Upper + Krust EL.
                      +
                      maxel - Maximum difficulty. Will be converted into a proper Upper + Krust EL.
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting targetel.
                      +
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getspoils

                      +
                      public int getspoils()
                      +
                      +
                      Returns:
                      +
                      The amount of gold that should be given if this in case of a + pillage().
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getspoils

                      +
                      public static int getspoils(java.lang.Integer el)
                      +
                      +
                      Parameters:
                      +
                      el - Will use an encounter level 1 higher than this.
                      +
                      Returns:
                      +
                      See getspoils().
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      pillage

                      +
                      public void pillage()
                      +
                      Destroys this place, adding a certain amount of gold to the active + Squad. This is mostly allowed as to allow a less strategic + gameplay for players who want to just pillage and move on, without using + locations for their strategic value.
                      +
                      +
                      See Also:
                      +
                      getspoils()
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/Guardian.html b/doc/javadoc/javelin/model/world/place/guarded/Guardian.html new file mode 100644 index 000000000..0735ccd5a --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/Guardian.html @@ -0,0 +1,461 @@ + + + + + +Guardian + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class Guardian

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Guardian
+extends GuardedPlace
                  +
                  Single creature that guards an Item.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Guardian

                      +
                      public Guardian()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      Description copied from class: GuardedPlace
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting GuardedPlace.targetel.
                      +
                      +
                      Overrides:
                      +
                      generategarrison in class GuardedPlace
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      findnativemonster

                      +
                      public static Combatant findnativemonster(float cr,
+                                          WorldPlace spot)
                      +
                      +
                      Parameters:
                      +
                      cr - Given a challenge rating target...
                      +
                      spot - and a world location...
                      +
                      Returns:
                      +
                      a monster from that location and that challenge rating or + null if couldn't find one.
                      +
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/Inn.html b/doc/javadoc/javelin/model/world/place/guarded/Inn.html new file mode 100644 index 000000000..268004f31 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/Inn.html @@ -0,0 +1,370 @@ + + + + + +Inn + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class Inn

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Inn
+extends GuardedPlace
                  +
                  Allows a Squad to rest outside of a Town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Inn

                      +
                      public Inn()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      generate

                      +
                      protected void generate()
                      +
                      +
                      Overrides:
                      +
                      generate in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/Shrine.html b/doc/javadoc/javelin/model/world/place/guarded/Shrine.html new file mode 100644 index 000000000..a54e7d05e --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/Shrine.html @@ -0,0 +1,387 @@ + + + + + +Shrine + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.guarded
                +

                Class Shrine

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Shrine
+extends GuardedPlace
                  +
                  Once it's garrison is defeated a priest will offer a wish to the heroes in + return - a ScrollSpell (currently only obtainable this way) or map + knowledge.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Shrine

                      +
                      public Shrine()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/package-frame.html b/doc/javadoc/javelin/model/world/place/guarded/package-frame.html new file mode 100644 index 000000000..72e0f06d2 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/package-frame.html @@ -0,0 +1,25 @@ + + + + + +javelin.model.world.place.guarded + + + + + +

                javelin.model.world.place.guarded

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/package-summary.html b/doc/javadoc/javelin/model/world/place/guarded/package-summary.html new file mode 100644 index 000000000..4c0a42a35 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/package-summary.html @@ -0,0 +1,175 @@ + + + + + +javelin.model.world.place.guarded + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.guarded

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  Academy +
                  Allows a player to learn one upgrade set.
                  +
                  Dwelling +
                  Allows a player to recruit one type of unit.
                  +
                  GuardedPlace +
                  A guarded place is a world feature that has a garrison army since the + bieggining of the game.
                  +
                  Guardian +
                  Single creature that guards an Item.
                  +
                  Inn +
                  Allows a Squad to rest outside of a Town.
                  +
                  Shrine +
                  Once it's garrison is defeated a priest will offer a wish to the heroes in + return - a ScrollSpell (currently only obtainable this way) or map + knowledge.
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/guarded/package-tree.html b/doc/javadoc/javelin/model/world/place/guarded/package-tree.html new file mode 100644 index 000000000..e0b20d44e --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/guarded/package-tree.html @@ -0,0 +1,151 @@ + + + + + +javelin.model.world.place.guarded Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.guarded

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • javelin.model.world.WorldActor (implements java.io.Serializable) +
                      +
                    • javelin.model.world.place.WorldPlace +
                        +
                      • javelin.model.world.place.guarded.GuardedPlace +
                          +
                        • javelin.model.world.place.guarded.Academy
                          • +
                        • javelin.model.world.place.guarded.Dwelling
                          • +
                        • javelin.model.world.place.guarded.Guardian
                          • +
                        • javelin.model.world.place.guarded.Inn
                          • +
                        • javelin.model.world.place.guarded.Shrine
                          • +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/package-frame.html b/doc/javadoc/javelin/model/world/place/package-frame.html new file mode 100644 index 000000000..4fbd1b719 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/package-frame.html @@ -0,0 +1,23 @@ + + + + + +javelin.model.world.place + + + + + +

                javelin.model.world.place

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/package-summary.html b/doc/javadoc/javelin/model/world/place/package-summary.html new file mode 100644 index 000000000..24753c890 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/package-summary.html @@ -0,0 +1,162 @@ + + + + + +javelin.model.world.place + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  Lair +
                  A battle in which the final opponent can be captured as a Squad + member.
                  +
                  Outpost +
                  An outpost allows for vision of a wide area around it.
                  +
                  Portal +
                  Portals usually take a Squad from a place to another.
                  +
                  WorldPlace +
                  A WorldActor that is actually a place that represent a location to be + entered or explored.
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/package-tree.html b/doc/javadoc/javelin/model/world/place/package-tree.html new file mode 100644 index 000000000..b71fad0bd --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/package-tree.html @@ -0,0 +1,145 @@ + + + + + +javelin.model.world.place Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • javelin.model.world.WorldActor (implements java.io.Serializable) +
                      +
                    • javelin.model.world.place.WorldPlace +
                        +
                      • javelin.model.world.place.Lair
                        • +
                      • javelin.model.world.place.Outpost
                        • +
                      • javelin.model.world.place.Portal
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Accommodations.RestOption.html b/doc/javadoc/javelin/model/world/place/town/Accommodations.RestOption.html new file mode 100644 index 000000000..c43fc92f4 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Accommodations.RestOption.html @@ -0,0 +1,323 @@ + + + + + +Accommodations.RestOption + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class Accommodations.RestOption

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Enclosing class:
                  +
                  Accommodations
                  +
                  +
                  +
                  +
                  public class Accommodations.RestOption
+extends Option
                  +
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    inthours 
                    intperiods 
                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    RestOption(java.lang.String name, + double price, + char c, + int hoursp, + int periodsp) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      hours

                      +
                      public final int hours
                      +
                      • +
                    + + + +
                      +
                    • +

                      periods

                      +
                      public int periods
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      RestOption

                      +
                      public RestOption(java.lang.String name,
+                  double price,
+                  char c,
+                  int hoursp,
+                  int periodsp)
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Accommodations.html b/doc/javadoc/javelin/model/world/place/town/Accommodations.html new file mode 100644 index 000000000..6e6f52c44 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Accommodations.html @@ -0,0 +1,431 @@ + + + + + +Accommodations + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Enum Accommodations

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • java.lang.Enum<Accommodations>
                    • +
                  • +
                      +
                    • javelin.model.world.place.town.Accommodations
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable, java.lang.Comparable<Accommodations>
                  +
                  +
                  +
                  +
                  public enum Accommodations
+extends java.lang.Enum<Accommodations>
                  +
                  Defines the level of comfort a Town can provide.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Enum Constant Summary

                    + + + + + + + + + + + + + + +
                    Enum Constants 
                    Enum Constant and Description
                    HOSPITAL 
                    HOTEL 
                    LODGE 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                    All Methods Static Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    doublegetprice() 
                    Optiongetrestoption() 
                    Optiongetweekrestoption() 
                    java.lang.StringtoString() 
                    static AccommodationsvalueOf(java.lang.String name) +
                    Returns the enum constant of this type with the specified name.
                    +
                    static Accommodations[]values() +
                    Returns an array containing the constants of this enum type, in +the order they are declared.
                    +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Enum

                      +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, valueOf
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +getClass, notify, notifyAll, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      values

                      +
                      public static Accommodations[] values()
                      +
                      Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
                      +for (Accommodations c : Accommodations.values())
+    System.out.println(c);
+
                      +
                      +
                      Returns:
                      +
                      an array containing the constants of this enum type, in the order they are declared
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      valueOf

                      +
                      public static Accommodations valueOf(java.lang.String name)
                      +
                      Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
                      +
                      +
                      Parameters:
                      +
                      name - the name of the enum constant to be returned.
                      +
                      Returns:
                      +
                      the enum constant with the specified name
                      +
                      Throws:
                      +
                      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                      +
                      java.lang.NullPointerException - if the argument is null
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getprice

                      +
                      public double getprice()
                      +
                      • +
                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class java.lang.Enum<Accommodations>
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getrestoption

                      +
                      public Option getrestoption()
                      +
                      • +
                    + + + +
                      +
                    • +

                      getweekrestoption

                      +
                      public Option getweekrestoption()
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Accomodations.RestOption.html b/doc/javadoc/javelin/model/world/place/town/Accomodations.RestOption.html new file mode 100644 index 000000000..cdeb983c3 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Accomodations.RestOption.html @@ -0,0 +1,323 @@ + + + + + +Accomodations.RestOption + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class Accomodations.RestOption

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Enclosing class:
                  +
                  Accomodations
                  +
                  +
                  +
                  +
                  public class Accomodations.RestOption
+extends Option
                  +
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    inthours 
                    intperiods 
                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    RestOption(java.lang.String name, + double price, + char c, + int hoursp, + int periodsp) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      hours

                      +
                      public final int hours
                      +
                      • +
                    + + + +
                      +
                    • +

                      periods

                      +
                      public int periods
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      RestOption

                      +
                      public RestOption(java.lang.String name,
+                  double price,
+                  char c,
+                  int hoursp,
+                  int periodsp)
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Accomodations.html b/doc/javadoc/javelin/model/world/place/town/Accomodations.html new file mode 100644 index 000000000..03c9a53cc --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Accomodations.html @@ -0,0 +1,431 @@ + + + + + +Accomodations + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Enum Accomodations

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • java.lang.Enum<Accomodations>
                    • +
                  • +
                      +
                    • javelin.model.world.place.town.Accomodations
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable, java.lang.Comparable<Accomodations>
                  +
                  +
                  +
                  +
                  public enum Accomodations
+extends java.lang.Enum<Accomodations>
                  +
                  Defines the level of comfort a Town can provide.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Nested Class Summary

                    + + + + + + + + + + +
                    Nested Classes 
                    Modifier and TypeClass and Description
                    class Accomodations.RestOption 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Enum Constant Summary

                    + + + + + + + + + + + + + + +
                    Enum Constants 
                    Enum Constant and Description
                    HOSPITAL 
                    HOTEL 
                    LODGE 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                    All Methods Static Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    doublegetprice() 
                    Optiongetrestoption() 
                    Optiongetweekrestoption() 
                    java.lang.StringtoString() 
                    static AccomodationsvalueOf(java.lang.String name) +
                    Returns the enum constant of this type with the specified name.
                    +
                    static Accomodations[]values() +
                    Returns an array containing the constants of this enum type, in +the order they are declared.
                    +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Enum

                      +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, valueOf
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +getClass, notify, notifyAll, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      values

                      +
                      public static Accomodations[] values()
                      +
                      Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
                      +for (Accomodations c : Accomodations.values())
+    System.out.println(c);
+
                      +
                      +
                      Returns:
                      +
                      an array containing the constants of this enum type, in the order they are declared
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      valueOf

                      +
                      public static Accomodations valueOf(java.lang.String name)
                      +
                      Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
                      +
                      +
                      Parameters:
                      +
                      name - the name of the enum constant to be returned.
                      +
                      Returns:
                      +
                      the enum constant with the specified name
                      +
                      Throws:
                      +
                      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                      +
                      java.lang.NullPointerException - if the argument is null
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getprice

                      +
                      public double getprice()
                      +
                      • +
                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class java.lang.Enum<Accomodations>
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getrestoption

                      +
                      public Option getrestoption()
                      +
                      • +
                    + + + +
                      +
                    • +

                      getweekrestoption

                      +
                      public Option getweekrestoption()
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/CraftingOrder.html b/doc/javadoc/javelin/model/world/place/town/CraftingOrder.html new file mode 100644 index 000000000..5533cb4f1 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/CraftingOrder.html @@ -0,0 +1,315 @@ + + + + + +CraftingOrder + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class CraftingOrder

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class CraftingOrder
+extends Order
                  +
                  Item in the process of being completed.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    CraftingOrder(long completionat, + Item item, + java.lang.String namep) +
                    Constructor.
                    +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + + + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      CraftingOrder

                      +
                      public CraftingOrder(long completionat,
+                     Item item,
+                     java.lang.String namep)
                      +
                      Constructor.
                      +
                      +
                      Parameters:
                      +
                      namep -
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Order.html b/doc/javadoc/javelin/model/world/place/town/Order.html new file mode 100644 index 000000000..e92160a39 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Order.html @@ -0,0 +1,358 @@ + + + + + +Order + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class Order

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.town.Order
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Direct Known Subclasses:
                  +
                  CraftingOrder, TrainingOrder
                  +
                  +
                  +
                  +
                  public class Order
+extends java.lang.Object
+implements java.io.Serializable
                  +
                  Represents a training Combatant or a forging Item.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    longcompletionat +
                    The time at which this order will be ready.
                    +
                    java.lang.Stringname +
                    Description.
                    +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Order(long eta, + java.lang.String namep) 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    booleancompleted(long time) 
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      completionat

                      +
                      public long completionat
                      +
                      The time at which this order will be ready.
                      +
                      +
                      See Also:
                      +
                      Squad.hourselapsed
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      name

                      +
                      public java.lang.String name
                      +
                      Description.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Order

                      +
                      public Order(long eta,
+             java.lang.String namep)
                      +
                      +
                      Parameters:
                      +
                      eta - Total amount of time this order will need to be ready, + starting from now.
                      +
                      namep - See name.
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      completed

                      +
                      public boolean completed(long time)
                      +
                      +
                      Parameters:
                      +
                      time - Given the current time...
                      +
                      Returns:
                      +
                      if this order is ready or not.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/OrderQueue.html b/doc/javadoc/javelin/model/world/place/town/OrderQueue.html new file mode 100644 index 000000000..a31a8dcb6 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/OrderQueue.html @@ -0,0 +1,407 @@ + + + + + +OrderQueue + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class OrderQueue

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.town.OrderQueue
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class OrderQueue
+extends java.lang.Object
+implements java.io.Serializable
                  +
                  A container of Order for a Town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    java.util.ArrayList<Order>queue +
                    Items being processed or done yet not reclaimed, from those that are + going to finish first to those that will finish later.
                    +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    OrderQueue() 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    voidadd(Order item) 
                    voidclear() 
                    booleandone() 
                    longgetnextslot() 
                    Orderlast() 
                    java.lang.Longnext() 
                    java.util.List<Order>reclaim(long force) 
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      queue

                      +
                      public java.util.ArrayList<Order> queue
                      +
                      Items being processed or done yet not reclaimed, from those that are + going to finish first to those that will finish later.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      OrderQueue

                      +
                      public OrderQueue()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      done

                      +
                      public boolean done()
                      +
                      • +
                    + + + +
                      +
                    • +

                      last

                      +
                      public Order last()
                      +
                      • +
                    + + + +
                      +
                    • +

                      getnextslot

                      +
                      public long getnextslot()
                      +
                      • +
                    + + + +
                      +
                    • +

                      reclaim

                      +
                      public java.util.List<Order> reclaim(long force)
                      +
                      +
                      Parameters:
                      +
                      force -
                      +
                      Returns:
                      +
                      Item which is in queue and should be removed manually upon + confirmation.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      add

                      +
                      public void add(Order item)
                      +
                      • +
                    + + + +
                      +
                    • +

                      next

                      +
                      public java.lang.Long next()
                      +
                      • +
                    + + + +
                      +
                    • +

                      clear

                      +
                      public void clear()
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/ResearchData.html b/doc/javadoc/javelin/model/world/place/town/ResearchData.html new file mode 100644 index 000000000..2c7269cd1 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/ResearchData.html @@ -0,0 +1,344 @@ + + + + + +ResearchData + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class ResearchData

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.town.ResearchData
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class ResearchData
+extends java.lang.Object
+implements java.io.Serializable
                  +
                  Utility container for a Town to hold a Research hand + and a ResearchQueue.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    Research[]hand +
                    Represents a few Research options that the player or + #automanager can use to advance a town.
                    +
                    ResearchQueuequeue 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    ResearchData() 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      hand

                      +
                      public Research[] hand
                      +
                      Represents a few Research options that the player or + #automanager can use to advance a town. Grow should always be the + first option. + + A value of null means that the hand is initially empty, that + it's card has been spent or that there are no more valid cards of that + type. + + These are the card types by index for non-hostile (human) Towns: + + 0 - Grow + + 1 - Native (from #realm) Upgrade. + + 2 - Foreign Upgrade + + 3 - Native Item. + + 4 - Foreign Item + + 5 - Native Monster lair, see #lairs + + 6 - Special card + + 7 - Accommodations upgrade. + + 8 - Transport upgrade. + + These are the card types by index for hostile (monster) Towns: + + 0 - Grow + + 1 - Native Monster lair, see #lairs + + 2-7 - RecruitOption for it to recruit an unit into + WorldPlace.garrison
                      +
                      +
                      See Also:
                      +
                      Research.draw(Town)
                      +
                      +
                      • +
                    + + + + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      ResearchData

                      +
                      public ResearchData()
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/ResearchQueue.html b/doc/javadoc/javelin/model/world/place/town/ResearchQueue.html new file mode 100644 index 000000000..10ec9e300 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/ResearchQueue.html @@ -0,0 +1,353 @@ + + + + + +ResearchQueue + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class ResearchQueue

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • java.util.AbstractCollection<E>
                    • +
                  • +
                      +
                    • java.util.AbstractList<E>
                      • +
                    • +
                        +
                      • java.util.ArrayList<Research>
                        • +
                      • +
                          +
                        • javelin.model.world.place.town.ResearchQueue
                          • +
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Research>, java.util.Collection<Research>, java.util.List<Research>, java.util.RandomAccess
                  +
                  +
                  +
                  +
                  public class ResearchQueue
+extends java.util.ArrayList<Research>
                  +
                  Queue of Research to be finished as soon as there is enough labor in + town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Research#finish(Town, + javelin.view.screen.town.option.ResearchScreenOption.ResearchScreen), +Town.labor, +Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    +
                      +
                    • + + +

                      Fields inherited from class java.util.AbstractList

                      +modCount
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    ResearchQueue() 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    java.lang.StringtoString() 
                    +
                      +
                    • + + +

                      Methods inherited from class java.util.ArrayList

                      +add, add, addAll, addAll, clear, clone, contains, ensureCapacity, forEach, get, indexOf, isEmpty, iterator, lastIndexOf, listIterator, listIterator, remove, remove, removeAll, removeIf, removeRange, replaceAll, retainAll, set, size, sort, spliterator, subList, toArray, toArray, trimToSize
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.util.AbstractList

                      +equals, hashCode
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.util.AbstractCollection

                      +containsAll
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +finalize, getClass, notify, notifyAll, wait, wait, wait
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from interface java.util.List

                      +containsAll, equals, hashCode
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from interface java.util.Collection

                      +parallelStream, stream
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      ResearchQueue

                      +
                      public ResearchQueue()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class java.util.AbstractCollection<Research>
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Town.html b/doc/javadoc/javelin/model/world/place/town/Town.html new file mode 100644 index 000000000..914d88f06 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Town.html @@ -0,0 +1,905 @@ + + + + + +Town + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class Town

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Town
+extends WorldPlace
                  +
                  A hub for upgrading units, resting, participating in tournament, renting + transportation, buying items... + + Each town has it's own profile which is predetermined.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + + + + + +
                      +
                    • +

                      upgrades

                      +
                      public java.util.List<Upgrade> upgrades
                      +
                      • +
                    + + + + + + + + + + + + + + + +
                      +
                    • +

                      stash

                      +
                      public int stash
                      +
                      gold in bank when all members of a squad are training
                      +
                      • +
                    + + + +
                      +
                    • +

                      events

                      +
                      public java.util.ArrayList<Exhibition> events
                      +
                      • +
                    + + + +
                      +
                    • +

                      size

                      +
                      public int size
                      +
                      Represent 10 working citizens that will produce 1 labor every 10 + days. + + An arbitrary decision is to try to fit the game-span of a normal game + into a 1-year period, which puts a town max size roughly at 10 if it does + nothing but grow TODO link
                      +
                      • +
                    + + + +
                      +
                    • +

                      labor

                      +
                      public float labor
                      +
                      Can be used to improve a town. 1 unit represents 10 days of work by a + 10-men crew.
                      +
                      • +
                    + + + +
                      +
                    • +

                      automanage

                      +
                      public boolean automanage
                      +
                      • +
                    + + + + + + + + + + + +
                      +
                    • +

                      lodging

                      +
                      public Accommodations lodging
                      +
                      Higher levels allow better rest.
                      +
                      • +
                    + + + +
                      +
                    • +

                      transport

                      +
                      public Transport transport
                      +
                      Higher levels allow better travel methods.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Town

                      +
                      public Town(int x,
+            int y,
+            Realm r)
                      +
                      +
                      Parameters:
                      +
                      x - Location.
                      +
                      y - Location.
                      +
                      r - Type of town.
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      possiblerecruits

                      +
                      public java.util.ArrayList<Monster> possiblerecruits(int x,
+                                                     int y)
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      reclaim

                      +
                      public void reclaim()
                      +
                      • +
                    + + + +
                      +
                    • +

                      grab

                      +
                      public static void grab(Item item)
                      +
                      • +
                    + + + +
                      +
                    • +

                      isupgrading

                      +
                      public boolean isupgrading()
                      +
                      +
                      Overrides:
                      +
                      isupgrading in class WorldPlace
                      +
                      Returns:
                      +
                      true if a arrow icon is to be displayed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      iscrafting

                      +
                      public boolean iscrafting()
                      +
                      +
                      Overrides:
                      +
                      iscrafting in class WorldPlace
                      +
                      Returns:
                      +
                      true if a item icon is to be displayed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      rest

                      +
                      public static void rest(int restperiods,
+                        long hours)
                      +
                      +
                      Parameters:
                      +
                      restperiods - Normally 1 rest period equals to 8 hours of rest in normal + conditions.
                      +
                      hours - Number of hours ellapsed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      train

                      +
                      public static java.lang.Long train()
                      +
                      Finish the next training that is in-progress.
                      +
                      +
                      Returns:
                      +
                      Time of completion.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      ishosting

                      +
                      public boolean ishosting()
                      +
                      +
                      Overrides:
                      +
                      ishosting in class WorldPlace
                      +
                      Returns:
                      +
                      true if a flag icon is to be displayed.
                      +
                      See Also:
                      +
                      host()
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      host

                      +
                      public void host()
                      +
                      Possibly starts a tournament in this town.
                      +
                      • +
                    + + + +
                      +
                    • +

                      turn

                      +
                      public void turn(long time,
+                 WorldScreen screen)
                      +
                      Description copied from class: WorldActor
                      +
                      Called on each instance once per day.
                      +
                      +
                      Overrides:
                      +
                      turn in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      capture

                      +
                      public void capture(boolean showsurroundings)
                      +
                      When a player captures a hostile town.
                      +
                      +
                      Parameters:
                      +
                      showsurroundings - if true will show this town's surrounding + squares.
                      +
                      See Also:
                      +
                      WorldPlace.ishostile()
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      destroy

                      +
                      public java.lang.Boolean destroy(Incursion attacker)
                      +
                      Description copied from class: WorldActor
                      +
                      Called when an incursion reaches this actor's location.
                      +
                      +
                      Overrides:
                      +
                      destroy in class WorldPlace
                      +
                      Returns:
                      +
                      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
                      +
                      See Also:
                      +
                      Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      captureforcomputer

                      +
                      public void captureforcomputer(Incursion attacker)
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + + + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/TrainingOrder.html b/doc/javadoc/javelin/model/world/place/town/TrainingOrder.html new file mode 100644 index 000000000..63c6a6777 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/TrainingOrder.html @@ -0,0 +1,367 @@ + + + + + +TrainingOrder + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Class TrainingOrder

                +
                +
                + +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    java.util.ArrayList<Item>equipment +
                    Upgraded unit's equipment.
                    +
                    Combatanttrained +
                    The upgraded unit.
                    +
                    Combatantuntrained +
                    The non-upgraded creature in case this needs to be canceled.
                    +
                    floatxpcost +
                    Cost in challenge rating.
                    +
                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    TrainingOrder(long completionat, + Combatant trained, + java.util.ArrayList<Item> equipment, + java.lang.String namep, + float xpcostp, + Combatant original) +
                    Constructor.
                    +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      trained

                      +
                      public final Combatant trained
                      +
                      The upgraded unit.
                      +
                      • +
                    + + + +
                      +
                    • +

                      xpcost

                      +
                      public final float xpcost
                      +
                      Cost in challenge rating.
                      +
                      • +
                    + + + +
                      +
                    • +

                      equipment

                      +
                      public final java.util.ArrayList<Item> equipment
                      +
                      Upgraded unit's equipment. See Squad.equipment;
                      +
                      • +
                    + + + +
                      +
                    • +

                      untrained

                      +
                      public Combatant untrained
                      +
                      The non-upgraded creature in case this needs to be canceled.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      TrainingOrder

                      +
                      public TrainingOrder(long completionat,
+                     Combatant trained,
+                     java.util.ArrayList<Item> equipment,
+                     java.lang.String namep,
+                     float xpcostp,
+                     Combatant original)
                      +
                      Constructor. See Order.Order(long, String).
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/Transport.html b/doc/javadoc/javelin/model/world/place/town/Transport.html new file mode 100644 index 000000000..e7f5eb6c2 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/Transport.html @@ -0,0 +1,382 @@ + + + + + +Transport + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town
                +

                Enum Transport

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • java.lang.Enum<Transport>
                    • +
                  • +
                      +
                    • javelin.model.world.place.town.Transport
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable, java.lang.Comparable<Transport>
                  +
                  +
                  +
                  +
                  public enum Transport
+extends java.lang.Enum<Transport>
                  +
                  Vehicles improve speed / random encounter chance.
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Enum Constant Summary

                    + + + + + + + + + + + + + + +
                    Enum Constants 
                    Enum Constant and Description
                    AIRSHIP 
                    CARRIAGE 
                    NONE 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + + + + + + + + + + + + + +
                    All Methods Static Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    doublegetprice() 
                    java.lang.StringtoString() 
                    static TransportvalueOf(java.lang.String name) +
                    Returns the enum constant of this type with the specified name.
                    +
                    static Transport[]values() +
                    Returns an array containing the constants of this enum type, in +the order they are declared.
                    +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Enum

                      +clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, valueOf
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +getClass, notify, notifyAll, wait, wait, wait
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Enum Constant Detail

                    + + + +
                      +
                    • +

                      NONE

                      +
                      public static final Transport NONE
                      +
                      • +
                    + + + +
                      +
                    • +

                      CARRIAGE

                      +
                      public static final Transport CARRIAGE
                      +
                      • +
                    + + + +
                      +
                    • +

                      AIRSHIP

                      +
                      public static final Transport AIRSHIP
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      values

                      +
                      public static Transport[] values()
                      +
                      Returns an array containing the constants of this enum type, in +the order they are declared. This method may be used to iterate +over the constants as follows: +
                      +for (Transport c : Transport.values())
+    System.out.println(c);
+
                      +
                      +
                      Returns:
                      +
                      an array containing the constants of this enum type, in the order they are declared
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      valueOf

                      +
                      public static Transport valueOf(java.lang.String name)
                      +
                      Returns the enum constant of this type with the specified name. +The string must match exactly an identifier used to declare an +enum constant in this type. (Extraneous whitespace characters are +not permitted.)
                      +
                      +
                      Parameters:
                      +
                      name - the name of the enum constant to be returned.
                      +
                      Returns:
                      +
                      the enum constant with the specified name
                      +
                      Throws:
                      +
                      java.lang.IllegalArgumentException - if this enum type has no constant with the specified name
                      +
                      java.lang.NullPointerException - if the argument is null
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getprice

                      +
                      public double getprice()
                      +
                      • +
                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class java.lang.Enum<Transport>
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/HumanManager.html b/doc/javadoc/javelin/model/world/place/town/manager/HumanManager.html new file mode 100644 index 000000000..023b4f48a --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/HumanManager.html @@ -0,0 +1,297 @@ + + + + + +HumanManager + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + +
                +
                javelin.model.world.place.town.manager
                +

                Class HumanManager

                +
                +
                + +
                +
                  +
                • +
                  +
                  +
                  public class HumanManager
+extends TownManager
                  +
                  Builds native upgrades then native items. Later selects randomly. Tries to + grow meanwhile.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  TownManager.pickcheap(ArrayList)
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    HumanManager() 
                    +
                    • +
                  + + +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      HumanManager

                      +
                      public HumanManager()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      picknexttask

                      +
                      protected Research picknexttask(Town t)
                      +
                      +
                      Specified by:
                      +
                      picknexttask in class TownManager
                      +
                      Parameters:
                      +
                      t - Given a town...
                      +
                      Returns:
                      +
                      decide what to build next.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/MonsterManager.html b/doc/javadoc/javelin/model/world/place/town/manager/MonsterManager.html new file mode 100644 index 000000000..0bf4821e7 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/MonsterManager.html @@ -0,0 +1,299 @@ + + + + + +MonsterManager + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + +
                +
                javelin.model.world.place.town.manager
                +

                Class MonsterManager

                +
                +
                + +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    MonsterManager() 
                    +
                    • +
                  + + +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      MonsterManager

                      +
                      public MonsterManager()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      picknexttask

                      +
                      protected Research picknexttask(Town t)
                      +
                      +
                      Specified by:
                      +
                      picknexttask in class TownManager
                      +
                      Parameters:
                      +
                      t - Given a town...
                      +
                      Returns:
                      +
                      decide what to build next.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/TownManager.html b/doc/javadoc/javelin/model/world/place/town/manager/TownManager.html new file mode 100644 index 000000000..bf3878915 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/TownManager.html @@ -0,0 +1,321 @@ + + + + + +TownManager + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + +
                +
                javelin.model.world.place.town.manager
                +

                Class TownManager

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • javelin.model.world.place.town.manager.TownManager
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  Direct Known Subclasses:
                  +
                  HumanManager, MonsterManager
                  +
                  +
                  +
                  +
                  public abstract class TownManager
+extends java.lang.Object
                  +
                  Decides how to automatically build a town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Town#work()
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      TownManager

                      +
                      public TownManager()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      manage

                      +
                      public void manage(Town t)
                      +
                      +
                      Parameters:
                      +
                      t - Town for which to plan and execute next buils on.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      picknexttask

                      +
                      protected abstract Research picknexttask(Town t)
                      +
                      +
                      Parameters:
                      +
                      t - Given a town...
                      +
                      Returns:
                      +
                      decide what to build next.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      pickcheap

                      +
                      public static Research pickcheap(java.util.ArrayList<Research> options)
                      +
                      +
                      Returns:
                      +
                      A random research pick whose chance of being selected is larger + when it is cheaper.
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                +
                  +
                • Summary: 
                  • +
                • Nested | 
                  • +
                • Field | 
                  • +
                • Constr | 
                  • +
                • Method
                  • +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/package-frame.html b/doc/javadoc/javelin/model/world/place/town/manager/package-frame.html new file mode 100644 index 000000000..772edbe6f --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/package-frame.html @@ -0,0 +1,22 @@ + + + + + +javelin.model.world.place.town.manager + + + + + +

                javelin.model.world.place.town.manager

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/package-summary.html b/doc/javadoc/javelin/model/world/place/town/manager/package-summary.html new file mode 100644 index 000000000..39ad9b11c --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/package-summary.html @@ -0,0 +1,154 @@ + + + + + +javelin.model.world.place.town.manager + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.town.manager

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  HumanManager +
                  Builds native upgrades then native items.
                  +
                  MonsterManager +
                  Manager for hostile towns.
                  +
                  TownManager +
                  Decides how to automatically build a town.
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/manager/package-tree.html b/doc/javadoc/javelin/model/world/place/town/manager/package-tree.html new file mode 100644 index 000000000..cbaf1ecaf --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/manager/package-tree.html @@ -0,0 +1,140 @@ + + + + + +javelin.model.world.place.town.manager Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.town.manager

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object + +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/package-frame.html b/doc/javadoc/javelin/model/world/place/town/package-frame.html new file mode 100644 index 000000000..6e4457b2d --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/package-frame.html @@ -0,0 +1,31 @@ + + + + + +javelin.model.world.place.town + + + + + +

                javelin.model.world.place.town

                +
                +

                Classes

                + +

                Enums

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/town/package-summary.html b/doc/javadoc/javelin/model/world/place/town/package-summary.html new file mode 100644 index 000000000..c725daf65 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/package-summary.html @@ -0,0 +1,204 @@ + + + + + +javelin.model.world.place.town + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.town

                +
                +
                + +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/package-tree.html b/doc/javadoc/javelin/model/world/place/town/package-tree.html new file mode 100644 index 000000000..32b3111bb --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/package-tree.html @@ -0,0 +1,182 @@ + + + + + +javelin.model.world.place.town Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.town

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • java.util.AbstractCollection<E> (implements java.util.Collection<E>) +
                      +
                    • java.util.AbstractList<E> (implements java.util.List<E>) +
                        +
                      • java.util.ArrayList<E> (implements java.lang.Cloneable, java.util.List<E>, java.util.RandomAccess, java.io.Serializable) + +
                        • +
                      +
                      • +
                    +
                    • +
                  • javelin.view.screen.Option (implements java.io.Serializable) + +
                    • +
                  • javelin.model.world.place.town.Order (implements java.io.Serializable) + +
                    • +
                  • javelin.model.world.place.town.OrderQueue (implements java.io.Serializable)
                    • +
                  • javelin.model.world.place.town.ResearchData (implements java.io.Serializable)
                    • +
                  • javelin.model.world.WorldActor (implements java.io.Serializable) +
                      +
                    • javelin.model.world.place.WorldPlace +
                        +
                      • javelin.model.world.place.town.Town
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +

                Enum Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • java.lang.Enum<E> (implements java.lang.Comparable<T>, java.io.Serializable) + +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/AccommodationResearch.html b/doc/javadoc/javelin/model/world/place/town/research/AccommodationResearch.html new file mode 100644 index 000000000..fb99de3c0 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/AccommodationResearch.html @@ -0,0 +1,355 @@ + + + + + +AccommodationResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class AccommodationResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class AccommodationResearch
+extends Research
                  +
                  Allows a Town to upgrade it's Town.lodging.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      AccommodationResearch

                      +
                      public AccommodationResearch(Accommodations tierp)
                      +
                      +
                      Parameters:
                      +
                      tierp - Accommodations tier to advance to upon research + completion.
                      +
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/AccomodationResearch.html b/doc/javadoc/javelin/model/world/place/town/research/AccomodationResearch.html new file mode 100644 index 000000000..c78301da8 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/AccomodationResearch.html @@ -0,0 +1,350 @@ + + + + + +AccomodationResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class AccomodationResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class AccomodationResearch
+extends Research
                  +
                  Allows a Town to upgrade it's Town.lodging.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      AccomodationResearch

                      +
                      public AccomodationResearch(Accomodations tierp)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/Discard.html b/doc/javadoc/javelin/model/world/place/town/research/Discard.html new file mode 100644 index 000000000..831f00440 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/Discard.html @@ -0,0 +1,346 @@ + + + + + +Discard + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class Discard

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Discard
+extends SpecialResearchCard
                  +
                  For 1 labor allows player to discard one option from + Town#research.researchhand.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Discard

                      +
                      public Discard()
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/Grow.html b/doc/javadoc/javelin/model/world/place/town/research/Grow.html new file mode 100644 index 000000000..d63fde79a --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/Grow.html @@ -0,0 +1,351 @@ + + + + + +Grow + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class Grow

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Grow
+extends Research
                  +
                  Grows Town.size by 1.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Town#work(), +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Grow

                      +
                      public Grow(Town t)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/ItemResearch.html b/doc/javadoc/javelin/model/world/place/town/research/ItemResearch.html new file mode 100644 index 000000000..a46e76393 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/ItemResearch.html @@ -0,0 +1,353 @@ + + + + + +ItemResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class ItemResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class ItemResearch
+extends Research
                  +
                  Allows a new native or foreign (double cost) item to be sold in this + Town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      ItemResearch

                      +
                      public ItemResearch(Item i,
+                    int price)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/LairResearch.html b/doc/javadoc/javelin/model/world/place/town/research/LairResearch.html new file mode 100644 index 000000000..790ebc411 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/LairResearch.html @@ -0,0 +1,351 @@ + + + + + +LairResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class LairResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class LairResearch
+extends Research
                  +
                  Allows a new Monster to be recruited in this town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  RecruitScreen, +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      LairResearch

                      +
                      public LairResearch(Monster m)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/Recruit.html b/doc/javadoc/javelin/model/world/place/town/research/Recruit.html new file mode 100644 index 000000000..00ffb8a19 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/Recruit.html @@ -0,0 +1,360 @@ + + + + + +Recruit + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class Recruit

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Recruit
+extends Research
                  +
                  This is a special research card that allows hostile towns to generate units. + + Is also responsible for generating new Incursions from the town's + garrison.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Recruit

                      +
                      public Recruit(Monster m)
                      +
                      Constructor.
                      +
                      +
                      Parameters:
                      +
                      m - Monster type to be recruited by this card.
                      +
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/Redraw.html b/doc/javadoc/javelin/model/world/place/town/research/Redraw.html new file mode 100644 index 000000000..dc63034f6 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/Redraw.html @@ -0,0 +1,346 @@ + + + + + +Redraw + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class Redraw

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Redraw
+extends SpecialResearchCard
                  +
                  For 2 labor allows player to redraw all options from + Town#research.researchhand.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Redraw

                      +
                      public Redraw()
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/Research.html b/doc/javadoc/javelin/model/world/place/town/research/Research.html new file mode 100644 index 000000000..6c6a6ef7d --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/Research.html @@ -0,0 +1,537 @@ + + + + + +Research + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class Research

                +
                +
                + +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    + + + + + + + + + + + + + + +
                    Fields 
                    Modifier and TypeField and Description
                    booleanaiable +
                    false if the AI (opponent automanager) should not use this + card.
                    +
                    booleanimmediate +
                    true if requires immediate user input, and cannot be queued.
                    +
                    + +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Research(java.lang.String name, + double price) 
                    Research(java.lang.String name, + double d, + java.lang.Character keyp) 
                    +
                    • +
                  + + +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      aiable

                      +
                      public boolean aiable
                      +
                      false if the AI (opponent automanager) should not use this + card.
                      +
                      +
                      See Also:
                      +
                      Town.automanage
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      immediate

                      +
                      public boolean immediate
                      +
                      true if requires immediate user input, and cannot be queued. + Usually these will also not be aiable.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Research

                      +
                      public Research(java.lang.String name,
+                double d,
+                java.lang.Character keyp)
                      +
                      • +
                    + + + +
                      +
                    • +

                      Research

                      +
                      public Research(java.lang.String name,
+                double price)
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      toString

                      +
                      public java.lang.String toString()
                      +
                      +
                      Overrides:
                      +
                      toString in class Option
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      hashCode

                      +
                      public int hashCode()
                      +
                      +
                      Overrides:
                      +
                      hashCode in class java.lang.Object
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      apply

                      +
                      public abstract void apply(Town t,
+                           ResearchScreen s)
                      +
                      Will be called on #finish(Town).
                      +
                      +
                      Parameters:
                      +
                      t - Town to be improved.
                      +
                      s - Could be null if this is not tagged as + immediate.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      draw

                      +
                      public static void draw(Town t)
                      +
                      Draws one card to the played building hand.
                      +
                      +
                      See Also:
                      +
                      Town#research.researchhand
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      humandraw

                      +
                      protected static void humandraw(Town t)
                      +
                      • +
                    + + + +
                      +
                    • +

                      getrealmmonsters

                      +
                      protected static java.util.ArrayList<Monster> getrealmmonsters(WorldActor t)
                      +
                      • +
                    + + + +
                      +
                    • +

                      gatherupgrades

                      +
                      protected static void gatherupgrades(WorldActor t,
+                                     java.util.List<Upgrade> otherupgrades,
+                                     java.util.List<Upgrade> myupgrades,
+                                     java.util.List<Item> myitems,
+                                     java.util.List<Item> otheritems)
                      +
                      • +
                    + + + +
                      +
                    • +

                      equals

                      +
                      public boolean equals(java.lang.Object obj)
                      +
                      +
                      Overrides:
                      +
                      equals in class Option
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      isrepeated

                      +
                      protected abstract boolean isrepeated(Town t)
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/SpecialResearchCard.html b/doc/javadoc/javelin/model/world/place/town/research/SpecialResearchCard.html new file mode 100644 index 000000000..a74022e29 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/SpecialResearchCard.html @@ -0,0 +1,332 @@ + + + + + +SpecialResearchCard + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class SpecialResearchCard

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  Direct Known Subclasses:
                  +
                  Discard, Redraw
                  +
                  +
                  +
                  +
                  public abstract class SpecialResearchCard
+extends Research
                  +
                  These are supposed to be a stack of research cards each with a unique effect. + + They have #aiable as false by default. And sometimes make use of + #immediate as well.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      SpecialResearchCard

                      +
                      public SpecialResearchCard(java.lang.String name,
+                           double price)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/TransportResearch.html b/doc/javadoc/javelin/model/world/place/town/research/TransportResearch.html new file mode 100644 index 000000000..4e5528878 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/TransportResearch.html @@ -0,0 +1,354 @@ + + + + + +TransportResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class TransportResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class TransportResearch
+extends Research
                  +
                  Allows for upgrading Town.transport.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      TransportResearch

                      +
                      public TransportResearch(Transport transport)
                      +
                      +
                      Parameters:
                      +
                      transport - Tech level to upgrade to.
                      +
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/UpgradeResearch.html b/doc/javadoc/javelin/model/world/place/town/research/UpgradeResearch.html new file mode 100644 index 000000000..c9d9527f5 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/UpgradeResearch.html @@ -0,0 +1,353 @@ + + + + + +UpgradeResearch + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.town.research
                +

                Class UpgradeResearch

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class UpgradeResearch
+extends Research
                  +
                  Allows a new native (1 labor) or foreign (2 labor) Upgrade to be + trained in this town.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      UpgradeResearch

                      +
                      public UpgradeResearch(Upgrade u,
+                       int cost)
                      +
                      • +
                    +
                    • +
                  + + +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/package-frame.html b/doc/javadoc/javelin/model/world/place/town/research/package-frame.html new file mode 100644 index 000000000..227d741da --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/package-frame.html @@ -0,0 +1,30 @@ + + + + + +javelin.model.world.place.town.research + + + + + +

                javelin.model.world.place.town.research

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/package-summary.html b/doc/javadoc/javelin/model/world/place/town/research/package-summary.html new file mode 100644 index 000000000..974a51e0f --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/package-summary.html @@ -0,0 +1,206 @@ + + + + + +javelin.model.world.place.town.research + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.town.research

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  AccommodationResearch +
                  Allows a Town to upgrade it's Town.lodging.
                  +
                  Discard +
                  For 1 labor allows player to discard one option from + Town#research.researchhand.
                  +
                  Grow +
                  Grows Town.size by 1.
                  +
                  ItemResearch +
                  Allows a new native or foreign (double cost) item to be sold in this + Town.
                  +
                  LairResearch +
                  Allows a new Monster to be recruited in this town.
                  +
                  Recruit +
                  This is a special research card that allows hostile towns to generate units.
                  +
                  Redraw +
                  For 2 labor allows player to redraw all options from + Town#research.researchhand.
                  +
                  Research +
                  Represents a way in which a Town can be improved.
                  +
                  SpecialResearchCard +
                  These are supposed to be a stack of research cards each with a unique effect.
                  +
                  TransportResearch +
                  Allows for upgrading Town.transport.
                  +
                  UpgradeResearch +
                  Allows a new native (1 labor) or foreign (2 labor) Upgrade to be + trained in this town.
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/town/research/package-tree.html b/doc/javadoc/javelin/model/world/place/town/research/package-tree.html new file mode 100644 index 000000000..166902f66 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/town/research/package-tree.html @@ -0,0 +1,155 @@ + + + + + +javelin.model.world.place.town.research Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.town.research

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • javelin.view.screen.Option (implements java.io.Serializable) + +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/Artificer.Selection.html b/doc/javadoc/javelin/model/world/place/unique/Artificer.Selection.html new file mode 100644 index 000000000..5af0ee4c3 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/Artificer.Selection.html @@ -0,0 +1,369 @@ + + + + + +Artificer.Selection + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.unique
                +

                Class Artificer.Selection

                +
                +
                +
                  +
                • java.lang.Object
                  • +
                • +
                    +
                  • java.util.AbstractCollection<E>
                    • +
                  • + +
                    • +
                  +
                  • +
                +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable, java.lang.Cloneable, java.lang.Iterable<Item>, java.util.Collection<Item>, java.util.List<Item>, java.util.RandomAccess
                  +
                  +
                  +
                  Enclosing class:
                  +
                  Artificer
                  +
                  +
                  +
                  +
                  public class Artificer.Selection
+extends ItemSelection
                  +
                  TODO unify Artifact and Item AbstractList.equals(Object).
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Summary

                    +
                      +
                    • + + +

                      Fields inherited from class java.util.AbstractList

                      +modCount
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Summary

                    + + + + + + + + +
                    Constructors 
                    Constructor and Description
                    Selection() 
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Summary

                    + + + + + + + + + + +
                    All Methods Instance Methods Concrete Methods 
                    Modifier and TypeMethod and Description
                    booleanadd(Item add) 
                    + +
                      +
                    • + + +

                      Methods inherited from class java.util.ArrayList

                      +add, addAll, addAll, clear, clone, contains, ensureCapacity, forEach, get, indexOf, isEmpty, iterator, lastIndexOf, listIterator, listIterator, remove, remove, removeAll, removeIf, removeRange, replaceAll, retainAll, set, size, sort, spliterator, subList, toArray, toArray, trimToSize
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.util.AbstractList

                      +equals, hashCode
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.util.AbstractCollection

                      +containsAll
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from class java.lang.Object

                      +finalize, getClass, notify, notifyAll, wait, wait, wait
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from interface java.util.List

                      +containsAll, equals, hashCode
                      • +
                    +
                      +
                    • + + +

                      Methods inherited from interface java.util.Collection

                      +parallelStream, stream
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Selection

                      +
                      public Selection()
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      add

                      +
                      public boolean add(Item add)
                      +
                      +
                      Specified by:
                      +
                      add in interface java.util.Collection<Item>
                      +
                      Specified by:
                      +
                      add in interface java.util.List<Item>
                      +
                      Overrides:
                      +
                      add in class ItemSelection
                      +
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/Artificer.html b/doc/javadoc/javelin/model/world/place/unique/Artificer.html new file mode 100644 index 000000000..509ec5310 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/Artificer.html @@ -0,0 +1,483 @@ + + + + + +Artificer + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.unique
                +

                Class Artificer

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Artificer
+extends UniqueLocation
                  +
                  Allows a player to forge and sell artifacts.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      selection

                      +
                      public Artificer.Selection selection
                      +
                      Artifacts this artificer can craft. This generically represents + the base components the Artificer has at the moment to create this + selection of magic items. Will randomly replace an item once per month, + representing not only a possible sell but also getting new alchemical + components, old ones spoiling, etc.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Artificer

                      +
                      public Artificer()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      turn

                      +
                      public void turn(long time,
+                 WorldScreen world)
                      +
                      Description copied from class: WorldActor
                      +
                      Called on each instance once per day.
                      +
                      +
                      Overrides:
                      +
                      turn in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      iscrafting

                      +
                      public boolean iscrafting()
                      +
                      +
                      Overrides:
                      +
                      iscrafting in class WorldPlace
                      +
                      Returns:
                      +
                      true if a item icon is to be displayed.
                      +
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/Haxor.html b/doc/javadoc/javelin/model/world/place/unique/Haxor.html new file mode 100644 index 000000000..ee7d1074a --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/Haxor.html @@ -0,0 +1,537 @@ + + + + + +Haxor + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.unique
                +

                Class Haxor

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class Haxor
+extends UniqueLocation
                  +
                  The tower of haxor is a place for players to spend tickets the earn in + PlanarFight. It's largely a meta-game feature and a way to offer + interesting non-balance-affecting powers to the player or with minimal + balance implications, largely overshadowed by winning an EL-0 encounter that + the fight represents. + + Only one booster hack can be activated per game - once one is acquired all + other boosters are removed.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      singleton

                      +
                      public static transient Haxor singleton
                      +
                      • +
                    + + + +
                      +
                    • +

                      tickets

                      +
                      public int tickets
                      +
                      Cheating currency.
                      +
                      • +
                    + + + + + + + +
                      +
                    • +

                      borrowed

                      +
                      public int borrowed
                      +
                      See BorrowMoney.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      Haxor

                      +
                      public Haxor()
                      +
                      Fills options initially.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      borrow

                      +
                      public static int borrow()
                      +
                      See BorrowMoney.
                      +
                      +
                      Returns:
                      +
                      A certain amount of gold to be borrowed.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      generategarrison

                      +
                      protected void generategarrison(int minel,
+                                int maxel)
                      +
                      Description copied from class: GuardedPlace
                      +
                      The default implementation generates a WorldPlace.garrison + according to the location. + + Called during construction and responsible for setting GuardedPlace.targetel.
                      +
                      +
                      Overrides:
                      +
                      generategarrison in class GuardedPlace
                      +
                      Parameters:
                      +
                      minel - Minimum encounter level.
                      +
                      maxel - Maximum encounter level.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      remove

                      +
                      public void remove()
                      +
                      +
                      Overrides:
                      +
                      remove in class WorldActor
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      spawn

                      +
                      public static void spawn(tyrant.mikera.engine.Point easya)
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/MercenariesGuild.html b/doc/javadoc/javelin/model/world/place/unique/MercenariesGuild.html new file mode 100644 index 000000000..cfb467794 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/MercenariesGuild.html @@ -0,0 +1,471 @@ + + + + + +MercenariesGuild + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.unique
                +

                Class MercenariesGuild

                +
                +
                + +
                +
                  +
                • +
                  +
                  All Implemented Interfaces:
                  +
                  java.io.Serializable
                  +
                  +
                  +
                  +
                  public class MercenariesGuild
+extends UniqueLocation
                  +
                  Allows a player to pick up fights, similar to an Exhibition but the + XP is doubled as an in-loco currency to generate an advanced mercenary when + requested.
                  +
                  +
                  Author:
                  +
                  alex
                  +
                  See Also:
                  +
                  Combatant.mercenary, +Serialized Form
                  +
                  +
                  • +
                +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Field Detail

                    + + + +
                      +
                    • +

                      mercenaries

                      +
                      public java.util.ArrayList<Combatant> mercenaries
                      +
                      • +
                    + + + +
                      +
                    • +

                      all

                      +
                      public java.util.ArrayList<Combatant> all
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      MercenariesGuild

                      +
                      public MercenariesGuild()
                      +
                      Constructor.
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      interact

                      +
                      public boolean interact()
                      +
                      Description copied from class: WorldActor
                      +
                      Called when a Squad enters the same world square as this actor.
                      +
                      +
                      Overrides:
                      +
                      interact in class WorldPlace
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      recruit

                      +
                      public static boolean recruit(Combatant combatant,
+                              boolean message)
                      +
                      Pays for the rest of the day and adds to active Squad. If cannot + pay warn the user.
                      +
                      +
                      Parameters:
                      +
                      message - If true and doesn't have enough money will open + up a InfoScreen to let the player know. Use + false to warn in another manner.
                      +
                      Returns:
                      +
                      false if doesn't have enough money to pay in + advance.
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      getfee

                      +
                      public static int getfee(Combatant c)
                      +
                      +
                      Returns:
                      +
                      Daily fee for a mercenary, based on it's CR (single treasure + value).
                      +
                      +
                      • +
                    + + + +
                      +
                    • +

                      receive

                      +
                      public void receive(Combatant c)
                      +
                      • +
                    +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/UniqueLocation.html b/doc/javadoc/javelin/model/world/place/unique/UniqueLocation.html new file mode 100644 index 000000000..31a0c27f3 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/UniqueLocation.html @@ -0,0 +1,411 @@ + + + + + +UniqueLocation + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + +
                +
                javelin.model.world.place.unique
                +

                Class UniqueLocation

                +
                +
                + +
                + +
                +
                + +
                +
                +
                  +
                • + +
                    +
                  • + + +

                    Constructor Detail

                    + + + +
                      +
                    • +

                      UniqueLocation

                      +
                      public UniqueLocation(java.lang.String descriptionknown,
+                      java.lang.String descriptionunknown,
+                      int minel,
+                      int maxel)
                      +
                      Constructor. See WorldPlace.WorldPlace(String).
                      +
                      +
                      Parameters:
                      +
                      minel -
                      +
                      maxel -
                      +
                      +
                      • +
                    +
                    • +
                  + +
                    +
                  • + + +

                    Method Detail

                    + + + +
                      +
                    • +

                      destroy

                      +
                      public java.lang.Boolean destroy(Incursion attacker)
                      +
                      Description copied from class: WorldActor
                      +
                      Called when an incursion reaches this actor's location.
                      +
                      +
                      Overrides:
                      +
                      destroy in class WorldPlace
                      +
                      Returns:
                      +
                      true if this place gets destroyed, + false if the Incursion is destroyed or + null if neither.
                      +
                      See Also:
                      +
                      Incursion#ignoreincursion(Incursion), +Incursion.fight(int, int)
                      +
                      +
                      • +
                    + + + + +
                    • +
                  +
                  • +
                +
                +
                + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                +
                + + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/package-frame.html b/doc/javadoc/javelin/model/world/place/unique/package-frame.html new file mode 100644 index 000000000..a63b2581e --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/package-frame.html @@ -0,0 +1,23 @@ + + + + + +javelin.model.world.place.unique + + + + + +

                javelin.model.world.place.unique

                +
                +

                Classes

                + +
                + + diff --git a/doc/javadoc/javelin/model/world/place/unique/package-summary.html b/doc/javadoc/javelin/model/world/place/unique/package-summary.html new file mode 100644 index 000000000..337ec9da1 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/package-summary.html @@ -0,0 +1,164 @@ + + + + + +javelin.model.world.place.unique + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Package javelin.model.world.place.unique

                +
                +
                +
                  +
                • + + + + + + + + + + + + + + + + + + + + + + + + +
                  Class Summary 
                  ClassDescription
                  Artificer +
                  Allows a player to forge and sell artifacts.
                  +
                  Haxor +
                  The tower of haxor is a place for players to spend tickets the earn in + PlanarFight.
                  +
                  MercenariesGuild +
                  Allows a player to pick up fights, similar to an Exhibition but the + XP is doubled as an in-loco currency to generate an advanced mercenary when + requested.
                  +
                  UniqueLocation +
                  An unique location is a WorldPlace that is only featured in a single + location in the World map during a game.
                  +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/model/world/place/unique/package-tree.html b/doc/javadoc/javelin/model/world/place/unique/package-tree.html new file mode 100644 index 000000000..00f827c20 --- /dev/null +++ b/doc/javadoc/javelin/model/world/place/unique/package-tree.html @@ -0,0 +1,170 @@ + + + + + +javelin.model.world.place.unique Class Hierarchy + + + + + + + + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + +
                +

                Hierarchy For Package javelin.model.world.place.unique

                +Package Hierarchies: + +
                +
                +

                Class Hierarchy

                +
                  +
                • java.lang.Object +
                    +
                  • java.util.AbstractCollection<E> (implements java.util.Collection<E>) +
                      +
                    • java.util.AbstractList<E> (implements java.util.List<E>) +
                        +
                      • java.util.ArrayList<E> (implements java.lang.Cloneable, java.util.List<E>, java.util.RandomAccess, java.io.Serializable) + +
                        • +
                      +
                      • +
                    +
                    • +
                  • javelin.model.world.WorldActor (implements java.io.Serializable) + +
                    • +
                  +
                  • +
                +
                + +
                + + +
                Skip navigation links
                + + + + +
                +
                + + + +
                + +
                + + +
                + + + diff --git a/doc/javadoc/javelin/package-frame.html b/doc/javadoc/javelin/package-frame.html index ea6e58c59..976bc6e4a 100644 --- a/doc/javadoc/javelin/package-frame.html +++ b/doc/javadoc/javelin/package-frame.html @@ -2,9 +2,9 @@ - + javelin - + diff --git a/doc/javadoc/javelin/package-summary.html b/doc/javadoc/javelin/package-summary.html index 4f75c395e..d4bc8eb23 100644 --- a/doc/javadoc/javelin/package-summary.html +++ b/doc/javadoc/javelin/package-summary.html @@ -2,9 +2,9 @@ - + javelin - + diff --git a/doc/javadoc/javelin/package-tree.html b/doc/javadoc/javelin/package-tree.html index ed17139db..70f195ac6 100644 --- a/doc/javadoc/javelin/package-tree.html +++ b/doc/javadoc/javelin/package-tree.html @@ -2,9 +2,9 @@ - + javelin Class Hierarchy - + diff --git a/doc/javadoc/javelin/view/ImageHandler.html b/doc/javadoc/javelin/view/ImageHandler.html index 9ab16cce4..3ee10d635 100644 --- a/doc/javadoc/javelin/view/ImageHandler.html +++ b/doc/javadoc/javelin/view/ImageHandler.html @@ -2,9 +2,9 @@ - + ImageHandler - + @@ -49,7 +49,7 @@
                • Frames
                  • @@ -230,7 +230,7 @@

                  getImage

                  • Frames
                    • diff --git a/doc/javadoc/javelin/view/Images.html b/doc/javadoc/javelin/view/Images.html new file mode 100644 index 000000000..344efac80 --- /dev/null +++ b/doc/javadoc/javelin/view/Images.html @@ -0,0 +1,570 @@ + + + + + +Images + + + + + + + + +
                    + + +
                    Skip navigation links
                    + + + + +
                    +
                    + + + +
                    + +
                    +
                    + + +
                    + + +
                    + + +
                    +
                    javelin.view
                    +

                    Class Images

                    +
                    +
                    +
                      +
                    • java.lang.Object
                      • +
                    • +
                        +
                      • javelin.view.Images
                        • +
                      +
                      • +
                    +
                    +
                      +
                    • +
                      +
                      +
                      public class Images
+extends java.lang.Object
                      +
                      Index of in-memory image objects.
                      +
                      +
                      Author:
                      +
                      alex
                      +
                      +
                      • +
                    +
                    +
                    +
                      +
                    • + +
                        +
                      • + + +

                        Field Summary

                        + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                        Fields 
                        Modifier and TypeField and Description
                        static java.awt.Imageacademy 
                        static java.awt.Imagearena 
                        static java.awt.Imagebanner 
                        static java.awt.Imagecrafting 
                        static java.awt.Imagecrystal 
                        static java.awt.Imagedead 
                        static java.awt.Imagedungeon 
                        static java.awt.Imagedwelling 
                        static java.awt.Imageguardian 
                        static java.awt.Imagehaxor 
                        static java.awt.Imagehostile 
                        static java.awt.Imageinn 
                        static java.awt.Imagelair 
                        static java.awt.Imageoutpost 
                        static java.awt.Imagepenalized 
                        static java.awt.Imageportal 
                        static java.awt.Imageshrine 
                        static java.awt.Imagetown 
                        static java.awt.Imageuniversity 
                        static java.awt.Imageupgrading 
                        +
                        • +
                      + +
                        +
                      • + + +

                        Constructor Summary

                        + + + + + + + + +
                        Constructors 
                        Constructor and Description
                        Images() 
                        +
                        • +
                      + +
                        +
                      • + + +

                        Method Summary

                        + + + + + + + + + + + + + + +
                        All Methods Static Methods Concrete Methods 
                        Modifier and TypeMethod and Description
                        static voidaddimages(java.awt.MediaTracker mediaTracker) 
                        static voidinitimages() 
                        +
                          +
                        • + + +

                          Methods inherited from class java.lang.Object

                          +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                          • +
                        +
                        • +
                      +
                      • +
                    +
                    +
                    +
                      +
                    • + +
                        +
                      • + + +

                        Field Detail

                        + + + +
                          +
                        • +

                          guardian

                          +
                          public static java.awt.Image guardian
                          +
                          • +
                        + + + +
                          +
                        • +

                          penalized

                          +
                          public static java.awt.Image penalized
                          +
                          • +
                        + + + +
                          +
                        • +

                          crafting

                          +
                          public static java.awt.Image crafting
                          +
                          • +
                        + + + +
                          +
                        • +

                          banner

                          +
                          public static java.awt.Image banner
                          +
                          • +
                        + + + +
                          +
                        • +

                          upgrading

                          +
                          public static java.awt.Image upgrading
                          +
                          • +
                        + + + +
                          +
                        • +

                          dead

                          +
                          public static java.awt.Image dead
                          +
                          • +
                        + + + +
                          +
                        • +

                          crystal

                          +
                          public static java.awt.Image crystal
                          +
                          • +
                        + + + +
                          +
                        • +

                          hostile

                          +
                          public static java.awt.Image hostile
                          +
                          • +
                        + + + +
                          +
                        • +

                          town

                          +
                          public static java.awt.Image town
                          +
                          • +
                        + + + +
                          +
                        • +

                          dungeon

                          +
                          public static java.awt.Image dungeon
                          +
                          • +
                        + + + +
                          +
                        • +

                          haxor

                          +
                          public static java.awt.Image haxor
                          +
                          • +
                        + + + +
                          +
                        • +

                          lair

                          +
                          public static java.awt.Image lair
                          +
                          • +
                        + + + +
                          +
                        • +

                          outpost

                          +
                          public static java.awt.Image outpost
                          +
                          • +
                        + + + +
                          +
                        • +

                          portal

                          +
                          public static java.awt.Image portal
                          +
                          • +
                        + + + +
                          +
                        • +

                          inn

                          +
                          public static java.awt.Image inn
                          +
                          • +
                        + + + +
                          +
                        • +

                          shrine

                          +
                          public static java.awt.Image shrine
                          +
                          • +
                        + + + +
                          +
                        • +

                          academy

                          +
                          public static java.awt.Image academy
                          +
                          • +
                        + + + +
                          +
                        • +

                          university

                          +
                          public static java.awt.Image university
                          +
                          • +
                        + + + +
                          +
                        • +

                          dwelling

                          +
                          public static java.awt.Image dwelling
                          +
                          • +
                        + + + +
                          +
                        • +

                          arena

                          +
                          public static java.awt.Image arena
                          +
                          • +
                        +
                        • +
                      + +
                        +
                      • + + +

                        Constructor Detail

                        + + + +
                          +
                        • +

                          Images

                          +
                          public Images()
                          +
                          • +
                        +
                        • +
                      + +
                        +
                      • + + +

                        Method Detail

                        + + + +
                          +
                        • +

                          initimages

                          +
                          public static void initimages()
                          +
                          • +
                        + + + +
                          +
                        • +

                          addimages

                          +
                          public static void addimages(java.awt.MediaTracker mediaTracker)
                          +
                          • +
                        +
                        • +
                      +
                      • +
                    +
                    +
                    + + +
                    + + +
                    Skip navigation links
                    + + + + +
                    +
                    + + + +
                    + +
                    +
                    + + +
                    + + +
                    + + + diff --git a/doc/javadoc/javelin/view/MapPanel.html b/doc/javadoc/javelin/view/MapPanel.html index 6ff5c2f45..ed463e4ad 100644 --- a/doc/javadoc/javelin/view/MapPanel.html +++ b/doc/javadoc/javelin/view/MapPanel.html @@ -2,9 +2,9 @@ - + MapPanel - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":10}; -var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -48,8 +48,8 @@
                  • Frames
                    • @@ -130,10 +130,14 @@

                    Class MapPanel

                    public class MapPanel
 extends java.awt.Panel
                    Panel descendant used to display a Map contains most of graphics redraw logic - also some animation/explosion handling
                    + also some animation/explosion handling + + TODO this redraws the entire screen all the time (besides my background + hack), this needs to be totally redesign into a modern UI like that from + MegaMek.
                  Author:
                  -
                  Tyrant
                  +
                  Tyrant, alex
                  See Also:
                  Serialized Form
                  @@ -297,7 +301,7 @@

                  Constructor Summary

                  Method Summary

                  - + @@ -314,83 +318,58 @@

                  Method Summary

                  - - - - - - - - - + - - - - - + - + - + - + - + - + - + - + - + - + - + - + @@ -131,7 +135,7 @@

                  Package javelin.view

                    diff --git a/doc/javadoc/javelin/view/package-tree.html b/doc/javadoc/javelin/view/package-tree.html index 768da5e5e..6b15a6bcd 100644 --- a/doc/javadoc/javelin/view/package-tree.html +++ b/doc/javadoc/javelin/view/package-tree.html @@ -2,9 +2,9 @@ - + javelin.view Class Hierarchy - + @@ -42,7 +42,7 @@
                    @@ -89,15 +89,6 @@

                    Class Hierarchy

                  • javelin.view.MapPanel
                  • tyrant.mikera.tyrant.TPanel
                      -
                    • tyrant.mikera.tyrant.Screen -
                        -
                      • tyrant.mikera.tyrant.InfoScreen - -
                        • -
                      -
                    • javelin.view.StatusPanel
                    • @@ -108,6 +99,7 @@

                    Class Hierarchy

                • javelin.view.ImageHandler
                  • +
                • javelin.view.Images
                  • @@ -132,7 +124,7 @@

                  Class Hierarchy

                    diff --git a/doc/javadoc/javelin/view/screen/BattleScreen.DescendingLevelComparator.html b/doc/javadoc/javelin/view/screen/BattleScreen.DescendingLevelComparator.html index fd88b9486..0623667a2 100644 --- a/doc/javadoc/javelin/view/screen/BattleScreen.DescendingLevelComparator.html +++ b/doc/javadoc/javelin/view/screen/BattleScreen.DescendingLevelComparator.html @@ -2,9 +2,9 @@ - + BattleScreen.DescendingLevelComparator - + @@ -49,7 +49,7 @@
                    • Frames
                      • @@ -260,7 +260,7 @@

                      sumcrandxp

                      • Frames
                        • diff --git a/doc/javadoc/javelin/view/screen/BattleScreen.html b/doc/javadoc/javelin/view/screen/BattleScreen.html index eebbcfb8c..79256d9b0 100644 --- a/doc/javadoc/javelin/view/screen/BattleScreen.html +++ b/doc/javadoc/javelin/view/screen/BattleScreen.html @@ -2,9 +2,9 @@ - + BattleScreen - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":9,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10,"i10":10,"i11":10,"i12":10,"i13":10,"i14":10,"i15":10,"i16":9,"i17":10,"i18":10,"i19":10,"i20":10,"i21":10,"i22":10,"i23":10,"i24":10,"i25":10,"i26":10,"i27":10,"i28":10,"i29":10,"i30":10,"i31":10,"i32":10,"i33":10,"i34":10,"i35":10,"i36":10,"i37":10,"i38":10,"i39":10,"i40":10,"i41":10,"i42":10,"i43":10}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -137,7 +137,7 @@

                        Class BattleScreen

                        Direct Known Subclasses:
                        -
                        ExhibitionScreen, LairScreen, PlanarFight.PlanarFightScreen, WorldScreen
                        +
                        ExhibitionScreen, LairScreen, PlanarFight.PlanarFightScreen, WorldScreen

                        @@ -429,88 +429,94 @@

                        Method Summary

                  + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -743,6 +749,16 @@

                  getGameHandler

                  public tyrant.mikera.tyrant.GameHandler getGameHandler()
                  + + + +
                    +
                  • +

                    initmap

                    +
                    protected void initmap()
                    +
                    TODO
                    +
                    • +
                  diff --git a/doc/javadoc/javelin/view/screen/BribingScreen.html b/doc/javadoc/javelin/view/screen/BribingScreen.html new file mode 100644 index 000000000..cdb91f317 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/BribingScreen.html @@ -0,0 +1,293 @@ + + + + + +BribingScreen + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  +
                    +
                  • Summary: 
                    • +
                  • Nested | 
                    • +
                  • Field | 
                    • +
                  • Constr | 
                    • +
                  • Method
                    • +
                  + +
                  + + +
                  + + +
                  +
                  javelin.view.screen
                  +

                  Class BribingScreen

                  +
                  +
                  +
                    +
                  • java.lang.Object
                    • +
                  • +
                      +
                    • javelin.view.screen.BribingScreen
                      • +
                    +
                    • +
                  +
                  +
                    +
                  • +
                    +
                    +
                    public class BribingScreen
+extends java.lang.Object
                    +
                    Uses a InfoScreen to deal with succesful Skills.diplomacy + checks.
                    +
                    +
                    Author:
                    +
                    alex
                    +
                    +
                    • +
                  +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Constructor Summary

                      +
                  All Methods Static Methods Instance Methods Concrete Methods All Methods Instance Methods Concrete Methods 
                  Modifier and Type Method and Description
                  voiddrawbackground(int startx, - int starty, - int endx, - int endy) 
                  static voiddrawcoastline(int y, - int x, - int m, - int px, - int py, - java.awt.Graphics gfx, - BattleMap map) 
                  void drawCursor(int x, int y) 
                  void drawMap(java.awt.Graphics g) 
                  booleanenhancetown(int mapx, - int mapy, - int x, - int y, - java.awt.Graphics gfx) 
                  java.awt.Dimension getPreferredSize() 
                  void paint(java.awt.Graphics g)
                  standard paint method.
                  void render() 
                  void scroll(int xDelta, int yDelta) 
                  void setCursor(int x, int y) 
                  void setoverlay(java.util.Set<Point> area) 
                  void setPosition(BattleMap m, int x, int y) 
                  void update(java.awt.Graphics g) 
                  void viewPosition(BattleMap m, int x, int y) 
                  void zoom(int factor, boolean save, @@ -693,46 +672,6 @@

                  getPreferredSize

                  - - - -
                    -
                  • -

                    drawbackground

                    -
                    public void drawbackground(int startx,
-                           int starty,
-                           int endx,
-                           int endy)
                    -
                    • -
                  - - - -
                    -
                  • -

                    drawcoastline

                    -
                    public static void drawcoastline(int y,
-                                 int x,
-                                 int m,
-                                 int px,
-                                 int py,
-                                 java.awt.Graphics gfx,
-                                 BattleMap map)
                    -
                    • -
                  - - - -
                    -
                  • -

                    enhancetown

                    -
                    public boolean enhancetown(int mapx,
-                           int mapy,
-                           int x,
-                           int y,
-                           java.awt.Graphics gfx)
                    -
                    • -
                  @@ -854,8 +793,8 @@

                  autozoom

                  • Frames
                    • diff --git a/doc/javadoc/javelin/view/SquadScreen.html b/doc/javadoc/javelin/view/SquadScreen.html index e89b210c1..6c8de9491 100644 --- a/doc/javadoc/javelin/view/SquadScreen.html +++ b/doc/javadoc/javelin/view/SquadScreen.html @@ -2,9 +2,9 @@ - + SquadScreen - + diff --git a/doc/javadoc/javelin/view/StatusPanel.html b/doc/javadoc/javelin/view/StatusPanel.html index 4993ccdae..7e62de5ef 100644 --- a/doc/javadoc/javelin/view/StatusPanel.html +++ b/doc/javadoc/javelin/view/StatusPanel.html @@ -2,9 +2,9 @@ - + StatusPanel - + @@ -48,7 +48,7 @@
                    @@ -134,7 +134,7 @@

                    Class StatusPanel


                    public class StatusPanel
 extends tyrant.mikera.tyrant.TPanel
                    -
                    Bottom panel for the WorldScreen.
                    +
                    Bottom panel for the WorldScreen.
                    Author:
                    alex
                    @@ -601,7 +601,7 @@

                    paintBox

                    diff --git a/doc/javadoc/javelin/view/package-frame.html b/doc/javadoc/javelin/view/package-frame.html index 138aad230..600dc8371 100644 --- a/doc/javadoc/javelin/view/package-frame.html +++ b/doc/javadoc/javelin/view/package-frame.html @@ -2,9 +2,9 @@ - + javelin.view - + @@ -14,8 +14,8 @@

                    Classes

                  diff --git a/doc/javadoc/javelin/view/package-summary.html b/doc/javadoc/javelin/view/package-summary.html index b0cd3331c..29d4cd941 100644 --- a/doc/javadoc/javelin/view/package-summary.html +++ b/doc/javadoc/javelin/view/package-summary.html @@ -2,9 +2,9 @@ - + javelin.view - + @@ -42,7 +42,7 @@
                    @@ -88,22 +88,26 @@

                    Package javelin.view
                  MapPanelImages -
                  Panel descendant used to display a Map contains most of graphics redraw logic - also some animation/explosion handling
                  +
                  Index of in-memory image objects.
                  SquadScreenMapPanel -
                  Squad selection screen when starting a new game.
                  +
                  Panel descendant used to display a Map contains most of graphics redraw logic + also some animation/explosion handling + + TODO this redraws the entire screen all the time (besides my background + hack), this needs to be totally redesign into a modern UI like that from + MegaMek.
                  StatusPanel -
                  Bottom panel for the WorldScreen.
                  +
                  Bottom panel for the WorldScreen.
                  humanTurn() 
                  protected voidinitmap() +
                  TODO
                  +
                  void mainLoop()
                  this is the main game loop.
                  void onEnd()
                  First thing to happen after an EndBattle
                  void performAction(tyrant.mikera.engine.Thing thing, Action action, boolean isShiftDown) 
                  protected boolean rejectEvent(java.awt.event.KeyEvent keyEvent) 
                  protected void removehero() 
                  java.lang.String rewardxp() 
                  boolean scale() 
                  void setGameHandler(tyrant.mikera.tyrant.GameHandler gameHandler) 
                  void setMappanel(MapPanel mappanel) 
                  void setposition() 
                  protected void singleMessage(java.lang.String s, tyrant.mikera.tyrant.Game.Delay d) 
                  void spendap(Combatant combatant) 
                  void step() 
                  void terminateconditions(BattleState s) 
                  void tryTick(tyrant.mikera.engine.Thing thing, Action action, boolean isShiftDown) 
                  void updatescreen(ChanceNode state, boolean enableoverrun) 
                  protected void updatescreen(tyrant.mikera.engine.Thing h) 
                  void view(tyrant.mikera.engine.Thing h) 
                  protected void withdraw(Combatant combatant) 
                  + + + + + + + +
                  Constructors 
                  Constructor and Description
                  BribingScreen() 
                  + +
                + +
                  +
                • + + +

                  Method Summary

                  + + + + + + + + + + +
                  All Methods Instance Methods Concrete Methods 
                  Modifier and TypeMethod and Description
                  booleanbribe(java.util.List<Combatant> foes, + int dailyfee, + int bribe, + boolean canhire) 
                  +
                    +
                  • + + +

                    Methods inherited from class java.lang.Object

                    +clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait
                    • +
                  +
                  • +
                + +
              +
              +
              +
                +
              • + +
                  +
                • + + +

                  Constructor Detail

                  + + + +
                    +
                  • +

                    BribingScreen

                    +
                    public BribingScreen()
                    +
                    • +
                  +
                  • +
                + +
                  +
                • + + +

                  Method Detail

                  + + + +
                    +
                  • +

                    bribe

                    +
                    public boolean bribe(java.util.List<Combatant> foes,
+                     int dailyfee,
+                     int bribe,
+                     boolean canhire)
                    +
                    +
                    Parameters:
                    +
                    foes - Opponents.
                    +
                    dailyfee - For hiring as mercenary (requires passing the DC by 5 or + more).
                    +
                    bribe - Price for getting rid of foes peacefully.
                    +
                    canhire - If false will not show the option to hire as + mercenary.
                    +
                    Returns:
                    +
                    false in case a battle is started! Doesn't throw + StartBattle.
                    +
                    +
                    • +
                  +
                  • +
                +
                • +
              +
              +
          + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          +
            +
          • Summary: 
            • +
          • Nested | 
            • +
          • Field | 
            • +
          • Constr | 
            • +
          • Method
            • +
          + +
          + + +
          + + + diff --git a/doc/javadoc/javelin/view/screen/DungeonScreen.html b/doc/javadoc/javelin/view/screen/DungeonScreen.html new file mode 100644 index 000000000..37136df05 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/DungeonScreen.html @@ -0,0 +1,648 @@ + + + + + +DungeonScreen + + + + + + + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + +
          +
          javelin.view.screen
          +

          Class DungeonScreen

          +
          +
          + +
          +
            +
          • +
            +
            All Implemented Interfaces:
            +
            java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
            +
            +
            +
            +
            public class DungeonScreen
+extends WorldScreen
            +
            Shows the inside of a Dungeon.
            +
            +
            Author:
            +
            alex
            +
            See Also:
            +
            Serialized Form
            +
            +
            • +
          +
          +
          +
            +
          • + +
              +
            • + + +

              Nested Class Summary

              + +
                +
              • + + +

                Nested classes/interfaces inherited from class java.awt.Panel

                +java.awt.Panel.AccessibleAWTPanel
                • +
              +
                +
              • + + +

                Nested classes/interfaces inherited from class java.awt.Container

                +java.awt.Container.AccessibleAWTContainer
                • +
              +
                +
              • + + +

                Nested classes/interfaces inherited from class java.awt.Component

                +java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
                • +
              +
              • +
            + + + + + +
              +
            • + + +

              Method Summary

              + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              All Methods Static Methods Instance Methods Concrete Methods 
              Modifier and TypeMethod and Description
              booleanallowmove(int x, + int y) 
              voidellapse(int suggested) 
              voidencounter() +
              TODO was .4 which is correct by design but the design was thought of + using wrong math and needs to be rethought.
              +
              static voidmessage(java.lang.String in) 
              booleanreact(WorldActor actor, + int x, + int y) 
              booleanscale() 
              voidturn() +
              Player acts and ends turn, allowing time to pass.
              +
              tyrant.mikera.engine.Thingupdatehero() 
              voidupdatelocation(int x, + int y) 
              voidview(tyrant.mikera.engine.Thing h) 
              + + +
                +
              • + + +

                Methods inherited from class tyrant.mikera.tyrant.Screen

                +getInput, refresh, update
                • +
              +
                +
              • + + +

                Methods inherited from class tyrant.mikera.tyrant.TPanel

                +getTexture, paint, update
                • +
              +
                +
              • + + +

                Methods inherited from class java.awt.Panel

                +addNotify, getAccessibleContext
                • +
              +
                +
              • + + +

                Methods inherited from class java.awt.Container

                +add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getInsets, getLayout, getListeners, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, isValidateRoot, layout, list, list, locate, minimumSize, paintComponents, paramString, preferredSize, print, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, removeNotify, setComponentZOrder, setFocusCycleRoot, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, setLayout, transferFocusDownCycle, validate, validateTree
                • +
              +
                +
              • + + +

                Methods inherited from class java.awt.Component

                +action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, disableEvents, dispatchEvent, enable, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphics, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getToolkit, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, hide, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isOpaque, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, printAll, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processKeyEvent, processMouseEvent, processMouseMotionEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, repaint, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, reshape, resize, resize, revalidate, setBackground, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setLocation, setLocation, setMaximumSize, setMinimumSize, setName, setPreferredSize, setSize, setSize, setVisible, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
                • +
              +
                +
              • + + +

                Methods inherited from class java.lang.Object

                +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                • +
              +
              • +
            +
            • +
          +
          +
          +
            +
          • + +
              +
            • + + +

              Field Detail

              + + + +
                +
              • +

                dontmove

                +
                public static boolean dontmove
                +
                TODO hack
                +
                • +
              +
              • +
            + +
              +
            • + + +

              Constructor Detail

              + + + +
                +
              • +

                DungeonScreen

                +
                public DungeonScreen(BattleMap mapp)
                +
                • +
              +
              • +
            + +
              +
            • + + +

              Method Detail

              + + + + + + + +
                +
              • +

                encounter

                +
                public void encounter()
                +
                Description copied from class: WorldScreen
                +
                TODO was .4 which is correct by design but the design was thought of + using wrong math and needs to be rethought.
                +
                +
                Overrides:
                +
                encounter in class WorldScreen
                +
                +
                • +
              + + + + + + + +
                +
              • +

                ellapse

                +
                public void ellapse(int suggested)
                +
                +
                Overrides:
                +
                ellapse in class WorldScreen
                +
                +
                • +
              + + + +
                +
              • +

                message

                +
                public static void message(java.lang.String in)
                +
                • +
              + + + +
                +
              • +

                allowmove

                +
                public boolean allowmove(int x,
+                         int y)
                +
                +
                Overrides:
                +
                allowmove in class WorldScreen
                +
                +
                • +
              + + + +
                +
              • +

                updatelocation

                +
                public void updatelocation(int x,
+                           int y)
                +
                +
                Overrides:
                +
                updatelocation in class WorldScreen
                +
                +
                • +
              + + + +
                +
              • +

                view

                +
                public void view(tyrant.mikera.engine.Thing h)
                +
                +
                Overrides:
                +
                view in class WorldScreen
                +
                +
                • +
              + + + +
                +
              • +

                updatehero

                +
                public tyrant.mikera.engine.Thing updatehero()
                +
                +
                Overrides:
                +
                updatehero in class WorldScreen
                +
                +
                • +
              + + + +
                +
              • +

                scale

                +
                public boolean scale()
                +
                +
                Overrides:
                +
                scale in class BattleScreen
                +
                +
                • +
              +
              • +
            +
            • +
          +
          +
          + + +
          + + +
          Skip navigation links
          + + + + +
          +
          + + + +
          + +
          +
          + + +
          + + +
          + + + diff --git a/doc/javadoc/javelin/view/screen/HaxorScreen.html b/doc/javadoc/javelin/view/screen/HaxorScreen.html index 12e17d207..046e3dca8 100644 --- a/doc/javadoc/javelin/view/screen/HaxorScreen.html +++ b/doc/javadoc/javelin/view/screen/HaxorScreen.html @@ -2,9 +2,9 @@ - + HaxorScreen - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -49,7 +49,7 @@
          See Also:
          -
          SquadScreen
          +
          SquadScreen
        @@ -419,14 +415,14 @@

        SUMMONALLY

        Constructor Detail

        - +

        • HaxorScreen

          public HaxorScreen(java.lang.String name,
-                   Town t)
          + Town t)
        • @@ -457,15 +453,6 @@

        select

      - - - -
        -
      • -

        print

        -
        public java.lang.Character print()
        -
        • -
      @@ -546,7 +533,7 @@

      printpriceinfo

      • Frames
        • diff --git a/doc/javadoc/javelin/view/screen/InfoScreen.html b/doc/javadoc/javelin/view/screen/InfoScreen.html new file mode 100644 index 000000000..bee5c27a4 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/InfoScreen.html @@ -0,0 +1,531 @@ + + + + + +InfoScreen + + + + + + + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        + + +
        + + +
        + + +
        +
        javelin.view.screen
        +

        Class InfoScreen

        +
        +
        +
          +
        • java.lang.Object
          • +
        • +
            +
          • java.awt.Component
            • +
          • +
              +
            • java.awt.Container
              • +
            • +
                +
              • java.awt.Panel
                • +
              • +
                  +
                • tyrant.mikera.tyrant.TPanel
                  • +
                • +
                    +
                  • tyrant.mikera.tyrant.Screen
                    • +
                  • +
                      +
                    • javelin.view.screen.InfoScreen
                      • +
                    +
                    • +
                  +
                  • +
                +
                • +
              +
              • +
            +
            • +
          +
          • +
        +
        +
          +
        • +
          +
          All Implemented Interfaces:
          +
          java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
          +
          +
          +
          Direct Known Subclasses:
          +
          IntroScreen, SelectScreen, SquadScreen, StatisticsScreen
          +
          +
          +
          +
          public class InfoScreen
+extends tyrant.mikera.tyrant.Screen
          +
          Fullscreen text display. For hiding the current BattleScreen or + WorldScreen and interacting textually with the user. + + TODO modernize UI
          +
          +
          Author:
          +
          Tyrant, alex
          +
          See Also:
          +
          Serialized Form
          +
          +
          • +
        +
        +
        +
          +
        • + +
            +
          • + + +

            Nested Class Summary

            +
              +
            • + + +

              Nested classes/interfaces inherited from class java.awt.Panel

              +java.awt.Panel.AccessibleAWTPanel
              • +
            +
              +
            • + + +

              Nested classes/interfaces inherited from class java.awt.Container

              +java.awt.Container.AccessibleAWTContainer
              • +
            +
              +
            • + + +

              Nested classes/interfaces inherited from class java.awt.Component

              +java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
              • +
            +
            • +
          + +
            +
          • + + +

            Field Summary

            + + + + + + + + + + + + + + +
            Fields 
            Modifier and TypeField and Description
            java.awt.Fontfont 
            java.lang.Stringtext 
            +
              +
            • + + +

              Fields inherited from class tyrant.mikera.tyrant.TPanel

              +buffer, globalKeyListenerHasBeenAdded, questapp
              • +
            +
              +
            • + + +

              Fields inherited from class java.awt.Component

              +accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
              • +
            +
              +
            • + + +

              Fields inherited from interface java.awt.image.ImageObserver

              +ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
              • +
            +
            • +
          + +
            +
          • + + +

            Constructor Summary

            + + + + + + + + + + + +
            Constructors 
            Constructor and Description
            InfoScreen(tyrant.mikera.tyrant.QuestApp q, + java.lang.String textp) 
            InfoScreen(java.lang.String text) 
            +
            • +
          + +
            +
          • + + +

            Method Summary

            + + + + + + + + + + + + + + + + + + + + + + + + + + +
            All Methods Static Methods Instance Methods Concrete Methods 
            Modifier and TypeMethod and Description
            static java.lang.Characterfeedback() 
            static intnumberfeedback() 
            voidpaint(java.awt.Graphics g) 
            voidprint(java.lang.String string) 
            static java.lang.Characterprompt(java.lang.String prompt) +
            Prompts a message in the WorldScreen.
            +
            +
              +
            • + + +

              Methods inherited from class tyrant.mikera.tyrant.Screen

              +getInput, refresh, update
              • +
            +
              +
            • + + +

              Methods inherited from class tyrant.mikera.tyrant.TPanel

              +getTexture, update
              • +
            +
              +
            • + + +

              Methods inherited from class java.awt.Panel

              +addNotify, getAccessibleContext
              • +
            +
              +
            • + + +

              Methods inherited from class java.awt.Container

              +add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getInsets, getLayout, getListeners, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, isValidateRoot, layout, list, list, locate, minimumSize, paintComponents, paramString, preferredSize, print, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, removeNotify, setComponentZOrder, setFocusCycleRoot, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, setLayout, transferFocusDownCycle, validate, validateTree
              • +
            +
              +
            • + + +

              Methods inherited from class java.awt.Component

              +action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, disableEvents, dispatchEvent, enable, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphics, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getToolkit, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, hide, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isOpaque, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, printAll, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processKeyEvent, processMouseEvent, processMouseMotionEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, repaint, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, reshape, resize, resize, revalidate, setBackground, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setLocation, setLocation, setMaximumSize, setMinimumSize, setName, setPreferredSize, setSize, setSize, setVisible, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
              • +
            +
              +
            • + + +

              Methods inherited from class java.lang.Object

              +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
              • +
            +
            • +
          +
          • +
        +
        +
        +
          +
        • + +
            +
          • + + +

            Field Detail

            + + + +
              +
            • +

              text

              +
              public java.lang.String text
              +
              • +
            + + + +
              +
            • +

              font

              +
              public java.awt.Font font
              +
              • +
            +
            • +
          + +
            +
          • + + +

            Constructor Detail

            + + + +
              +
            • +

              InfoScreen

              +
              public InfoScreen(tyrant.mikera.tyrant.QuestApp q,
+                  java.lang.String textp)
              +
              • +
            + + + +
              +
            • +

              InfoScreen

              +
              public InfoScreen(java.lang.String text)
              +
              • +
            +
            • +
          + +
            +
          • + + +

            Method Detail

            + + + +
              +
            • +

              paint

              +
              public void paint(java.awt.Graphics g)
              +
              +
              Overrides:
              +
              paint in class tyrant.mikera.tyrant.TPanel
              +
              +
              • +
            + + + +
              +
            • +

              numberfeedback

              +
              public static int numberfeedback()
              +
              +
              Returns:
              +
              A non-negative integer.
              +
              +
              • +
            + + + +
              +
            • +

              feedback

              +
              public static java.lang.Character feedback()
              +
              • +
            + + + +
              +
            • +

              print

              +
              public void print(java.lang.String string)
              +
              • +
            + + + +
              +
            • +

              prompt

              +
              public static java.lang.Character prompt(java.lang.String prompt)
              +
              Prompts a message in the WorldScreen. + + TODO move to WorldScreen?
              +
              +
              Parameters:
              +
              prompt - Text to show.
              +
              Returns:
              +
              Any feedback().
              +
              +
              • +
            +
            • +
          +
          • +
        +
        +
        + + +
        + + +
        Skip navigation links
        + + + + +
        +
        + + + +
        + +
        +
        + + +
        + + +
        + + + diff --git a/doc/javadoc/javelin/view/screen/IntroScreen.html b/doc/javadoc/javelin/view/screen/IntroScreen.html index e4cbbd2df..80de94850 100644 --- a/doc/javadoc/javelin/view/screen/IntroScreen.html +++ b/doc/javadoc/javelin/view/screen/IntroScreen.html @@ -2,9 +2,9 @@ - + IntroScreen - + @@ -48,7 +48,7 @@
        @@ -398,7 +398,7 @@

        configurescreen

        diff --git a/doc/javadoc/javelin/view/screen/LairScreen.html b/doc/javadoc/javelin/view/screen/LairScreen.html index fd01ac64c..4e1e159d6 100644 --- a/doc/javadoc/javelin/view/screen/LairScreen.html +++ b/doc/javadoc/javelin/view/screen/LairScreen.html @@ -2,9 +2,9 @@ - + LairScreen - + @@ -49,7 +49,7 @@
        • @@ -475,7 +475,7 @@

          onEnd

          • Frames
            • diff --git a/doc/javadoc/javelin/view/screen/Option.html b/doc/javadoc/javelin/view/screen/Option.html new file mode 100644 index 000000000..95f1baede --- /dev/null +++ b/doc/javadoc/javelin/view/screen/Option.html @@ -0,0 +1,386 @@ + + + + + +Option + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen
            +

            Class Option

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.view.screen.Option
                • +
              +
              • +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                java.lang.Characterkey 
                java.lang.Stringname 
                doubleprice 
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + + + + +
                Constructors 
                Constructor and Description
                Option(java.lang.String name, + double price) 
                Option(java.lang.String name, + double d, + java.lang.Character keyp) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + + + + + +
                All Methods Instance Methods Concrete Methods 
                Modifier and TypeMethod and Description
                booleanequals(java.lang.Object obj) 
                java.lang.StringtoString() 
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Detail

                + + + +
                  +
                • +

                  price

                  +
                  public double price
                  +
                  • +
                + + + +
                  +
                • +

                  name

                  +
                  public java.lang.String name
                  +
                  • +
                + + + +
                  +
                • +

                  key

                  +
                  public java.lang.Character key
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Option

                  +
                  public Option(java.lang.String name,
+              double d,
+              java.lang.Character keyp)
                  +
                  • +
                + + + +
                  +
                • +

                  Option

                  +
                  public Option(java.lang.String name,
+              double price)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  toString

                  +
                  public java.lang.String toString()
                  +
                  +
                  Overrides:
                  +
                  toString in class java.lang.Object
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  equals

                  +
                  public boolean equals(java.lang.Object obj)
                  +
                  +
                  Overrides:
                  +
                  equals in class java.lang.Object
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/SquadScreen.html b/doc/javadoc/javelin/view/screen/SquadScreen.html new file mode 100644 index 000000000..663ff7af3 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/SquadScreen.html @@ -0,0 +1,474 @@ + + + + + +SquadScreen + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen
            +

            Class SquadScreen

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • java.awt.Component
                • +
              • +
                  +
                • java.awt.Container
                  • +
                • +
                    +
                  • java.awt.Panel
                    • +
                  • + +
                    • +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
              +
              +
              +
              +
              public class SquadScreen
+extends InfoScreen
              +
              Squad selection screen when starting a new game.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Nested Class Summary

                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Panel

                  +java.awt.Panel.AccessibleAWTPanel
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Container

                  +java.awt.Container.AccessibleAWTContainer
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Component

                  +java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
                  • +
                +
                • +
              + +
                +
              • + + +

                Field Summary

                + +
                  +
                • + + +

                  Fields inherited from class tyrant.mikera.tyrant.TPanel

                  +buffer, globalKeyListenerHasBeenAdded, questapp
                  • +
                +
                  +
                • + + +

                  Fields inherited from class java.awt.Component

                  +accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
                  • +
                +
                  +
                • + + +

                  Fields inherited from interface java.awt.image.ImageObserver

                  +ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                SquadScreen(java.util.ArrayList<Monster> candidates) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + + + + + + + + + + + + + + + + + +
                All Methods Static Methods Instance Methods Concrete Methods 
                Modifier and TypeMethod and Description
                booleancheckifsquadfull() 
                static java.util.ArrayList<Monster>getcandidates() 
                static voidopen() +
                Start first squad in the morning
                +
                intprintpage(int index, + int next) 
                java.util.ArrayList<Combatant>select() 
                + +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.Screen

                  +getInput, refresh, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.TPanel

                  +getTexture, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Panel

                  +addNotify, getAccessibleContext
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Container

                  +add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getInsets, getLayout, getListeners, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, isValidateRoot, layout, list, list, locate, minimumSize, paintComponents, paramString, preferredSize, print, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, removeNotify, setComponentZOrder, setFocusCycleRoot, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, setLayout, transferFocusDownCycle, validate, validateTree
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Component

                  +action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, disableEvents, dispatchEvent, enable, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphics, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getToolkit, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, hide, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isOpaque, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, printAll, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processKeyEvent, processMouseEvent, processMouseMotionEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, repaint, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, reshape, resize, resize, revalidate, setBackground, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setLocation, setLocation, setMaximumSize, setMinimumSize, setName, setPreferredSize, setSize, setSize, setVisible, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  SquadScreen

                  +
                  public SquadScreen(java.util.ArrayList<Monster> candidates)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  select

                  +
                  public java.util.ArrayList<Combatant> select()
                  +
                  • +
                + + + +
                  +
                • +

                  checkifsquadfull

                  +
                  public boolean checkifsquadfull()
                  +
                  • +
                + + + +
                  +
                • +

                  printpage

                  +
                  public int printpage(int index,
+                     int next)
                  +
                  • +
                + + + +
                  +
                • +

                  open

                  +
                  public static void open()
                  +
                  Start first squad in the morning
                  +
                  • +
                + + + +
                  +
                • +

                  getcandidates

                  +
                  public static java.util.ArrayList<Monster> getcandidates()
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/StatisticsScreen.html b/doc/javadoc/javelin/view/screen/StatisticsScreen.html index 53f803caf..24d8473e6 100644 --- a/doc/javadoc/javelin/view/screen/StatisticsScreen.html +++ b/doc/javadoc/javelin/view/screen/StatisticsScreen.html @@ -2,9 +2,9 @@ - + StatisticsScreen - + @@ -48,8 +48,8 @@
          • Frames
            • @@ -426,7 +426,7 @@

            updatescreens

            diff --git a/doc/javadoc/javelin/view/screen/WorldScreen.html b/doc/javadoc/javelin/view/screen/WorldScreen.html new file mode 100644 index 000000000..c068c1cfb --- /dev/null +++ b/doc/javadoc/javelin/view/screen/WorldScreen.html @@ -0,0 +1,1035 @@ + + + + + +WorldScreen + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen
            +

            Class WorldScreen

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • java.awt.Component
                • +
              • +
                  +
                • java.awt.Container
                  • +
                • +
                    +
                  • java.awt.Panel
                    • +
                  • + +
                    • +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
              +
              +
              +
              Direct Known Subclasses:
              +
              DungeonScreen
              +
              +
              +
              +
              public class WorldScreen
+extends BattleScreen
              +
              Shows and helps manage the overworld view.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              World, +JavelinApp.overviewmap, +Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Nested Class Summary

                + +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Panel

                  +java.awt.Panel.AccessibleAWTPanel
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Container

                  +java.awt.Container.AccessibleAWTContainer
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Component

                  +java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
                  • +
                +
                • +
              + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                WorldScreen(BattleMap mapp) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                All Methods Static Methods Instance Methods Concrete Methods 
                Modifier and TypeMethod and Description
                booleanallowmove(int x, + int y) 
                protected booleancenter(int x, + int y) 
                voidcheckEndBattle() 
                ActionconvertEventToAction(java.awt.event.KeyEvent keyEvent) 
                longcurrentday() 
                booleandrawbackground() 
                voidellapse(int suggested) 
                voidencounter() +
                TODO was .4 which is correct by design but the design was thought of + using wrong math and needs to be rethought.
                +
                static voidencounter(double d) 
                static WorldActorgetactor(int x, + int y) 
                static WorldActorgetactor(int x, + int y, + java.lang.Class<? extends WorldActor> class1) 
                static WorldActorgetactor(int x, + int y, + java.util.List<? extends WorldActor> actors) 
                static java.util.ArrayList<WorldActor>getactors() 
                static java.util.ArrayList<WorldActor>getallmapactors() 
                static java.lang.Objectgetmapactor(int x, + int y) 
                protected voidhumanTurn() 
                protected voidinitmap() +
                TODO
                +
                voidperformAction(tyrant.mikera.engine.Thing thing, + Action action, + boolean isShiftDown) 
                booleanreact(WorldActor actor, + int x, + int y) 
                protected booleanrejectEvent(java.awt.event.KeyEvent keyEvent) 
                protected voidremovehero() 
                voidsetposition() 
                static voidsetVisible(int x, + int y) +
                Marks coordinate as permanently visible.
                +
                static java.util.ArrayList<java.lang.String>showstatusinformation() 
                voidstep() 
                voidturn() +
                Player acts and ends turn, allowing time to pass.
                +
                tyrant.mikera.engine.Thingupdatehero() 
                voidupdatelocation(int x, + int y) 
                voidupdateplayerinformation() 
                protected voidupdatescreen(tyrant.mikera.engine.Thing h) 
                voidview(tyrant.mikera.engine.Thing h) 
                + +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.Screen

                  +getInput, refresh, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.TPanel

                  +getTexture, paint, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Panel

                  +addNotify, getAccessibleContext
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Container

                  +add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getInsets, getLayout, getListeners, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, isValidateRoot, layout, list, list, locate, minimumSize, paintComponents, paramString, preferredSize, print, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, removeNotify, setComponentZOrder, setFocusCycleRoot, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, setLayout, transferFocusDownCycle, validate, validateTree
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Component

                  +action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, disableEvents, dispatchEvent, enable, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphics, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getToolkit, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, hide, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isOpaque, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, printAll, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processKeyEvent, processMouseEvent, processMouseMotionEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, repaint, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, reshape, resize, resize, revalidate, setBackground, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setLocation, setLocation, setMaximumSize, setMinimumSize, setName, setPreferredSize, setSize, setSize, setVisible, show, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Detail

                + + + +
                  +
                • +

                  discovered

                  +
                  public static java.util.HashSet<Point> discovered
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  worldmap

                  +
                  public static BattleMap worldmap
                  +
                  • +
                + + + +
                  +
                • +

                  worldhero

                  +
                  public static tyrant.mikera.engine.Thing worldhero
                  +
                  • +
                + + + +
                  +
                • +

                  lastday

                  +
                  public static double lastday
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  period

                  +
                  public static java.lang.String period
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  WorldScreen

                  +
                  public WorldScreen(BattleMap mapp)
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + + + + + +
                  +
                • +

                  rejectEvent

                  +
                  protected boolean rejectEvent(java.awt.event.KeyEvent keyEvent)
                  +
                  +
                  Overrides:
                  +
                  rejectEvent in class BattleScreen
                  +
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  updatehero

                  +
                  public tyrant.mikera.engine.Thing updatehero()
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  performAction

                  +
                  public void performAction(tyrant.mikera.engine.Thing thing,
+                          Action action,
+                          boolean isShiftDown)
                  +
                  +
                  Overrides:
                  +
                  performAction in class BattleScreen
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  updatescreen

                  +
                  protected void updatescreen(tyrant.mikera.engine.Thing h)
                  +
                  +
                  Overrides:
                  +
                  updatescreen in class BattleScreen
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  view

                  +
                  public void view(tyrant.mikera.engine.Thing h)
                  +
                  +
                  Overrides:
                  +
                  view in class BattleScreen
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  setVisible

                  +
                  public static void setVisible(int x,
+                              int y)
                  +
                  Marks coordinate as permanently visible.
                  +
                  • +
                + + + + + + + + + + + +
                  +
                • +

                  step

                  +
                  public void step()
                  +
                  +
                  Overrides:
                  +
                  step in class BattleScreen
                  +
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  updateplayerinformation

                  +
                  public void updateplayerinformation()
                  +
                  • +
                + + + +
                  +
                • +

                  showstatusinformation

                  +
                  public static java.util.ArrayList<java.lang.String> showstatusinformation()
                  +
                  • +
                + + + +
                  +
                • +

                  currentday

                  +
                  public long currentday()
                  +
                  • +
                + + + +
                  +
                • +

                  getmapactor

                  +
                  public static java.lang.Object getmapactor(int x,
+                                           int y)
                  +
                  • +
                + + + +
                  +
                • +

                  getallmapactors

                  +
                  public static java.util.ArrayList<WorldActor> getallmapactors()
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  getactors

                  +
                  public static java.util.ArrayList<WorldActor> getactors()
                  +
                  +
                  Returns:
                  +
                  A new list that is a canonical representation of all existing + WorldActors.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  getactor

                  +
                  public static WorldActor getactor(int x,
+                                  int y,
+                                  java.util.List<? extends WorldActor> actors)
                  +
                  • +
                + + + +
                  +
                • +

                  getactor

                  +
                  public static WorldActor getactor(int x,
+                                  int y)
                  +
                  • +
                + + + +
                  +
                • +

                  encounter

                  +
                  public void encounter()
                  +
                  TODO was .4 which is correct by design but the design was thought of + using wrong math and needs to be rethought.
                  +
                  • +
                + + + +
                  +
                • +

                  encounter

                  +
                  public static void encounter(double d)
                  +
                  • +
                + + + +
                  +
                • +

                  react

                  +
                  public boolean react(WorldActor actor,
+                     int x,
+                     int y)
                  +
                  • +
                + + + +
                  +
                • +

                  ellapse

                  +
                  public void ellapse(int suggested)
                  +
                  • +
                + + + +
                  +
                • +

                  allowmove

                  +
                  public boolean allowmove(int x,
+                         int y)
                  +
                  • +
                + + + +
                  +
                • +

                  updatelocation

                  +
                  public void updatelocation(int x,
+                           int y)
                  +
                  • +
                + + + +
                  +
                • +

                  center

                  +
                  protected boolean center(int x,
+                         int y)
                  +
                  +
                  Overrides:
                  +
                  center in class BattleScreen
                  +
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  getactor

                  +
                  public static WorldActor getactor(int x,
+                                  int y,
+                                  java.lang.Class<? extends WorldActor> class1)
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/BorrowMoney.html b/doc/javadoc/javelin/view/screen/haxor/BorrowMoney.html new file mode 100644 index 000000000..f0f62d0e6 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/BorrowMoney.html @@ -0,0 +1,333 @@ + + + + + +BorrowMoney + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class BorrowMoney

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class BorrowMoney
+extends Hax
              +
              Will lend money to a Squad once but will get it back on a future + visit.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Haxor.borrowed, +Serialized Form
              +
              +
              • +
            +
            +
            + +
            +
            + +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/ChangeAvatar.html b/doc/javadoc/javelin/view/screen/haxor/ChangeAvatar.html new file mode 100644 index 000000000..f6265e547 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/ChangeAvatar.html @@ -0,0 +1,329 @@ + + + + + +ChangeAvatar + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class ChangeAvatar

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public final class ChangeAvatar
+extends Hax
              +
              Changes the image used to represent a Combatant.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Monster.avatarfile, +Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                ChangeAvatar(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  ChangeAvatar

                  +
                  public ChangeAvatar(java.lang.String name,
+                    double price,
+                    boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/Hax.html b/doc/javadoc/javelin/view/screen/haxor/Hax.html new file mode 100644 index 000000000..3966fc944 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/Hax.html @@ -0,0 +1,326 @@ + + + + + +Hax + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class Hax

            +
            +
            + +
            + +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Hax(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Hax

                  +
                  public Hax(java.lang.String name,
+           double price,
+           boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/HaxorScreen.html b/doc/javadoc/javelin/view/screen/haxor/HaxorScreen.html new file mode 100644 index 000000000..3a3f33097 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/HaxorScreen.html @@ -0,0 +1,535 @@ + + + + + +HaxorScreen + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class HaxorScreen

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable, javax.accessibility.Accessible
              +
              +
              +
              +
              public class HaxorScreen
+extends SelectScreen
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Haxor, +Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Nested Class Summary

                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Panel

                  +java.awt.Panel.AccessibleAWTPanel
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Container

                  +java.awt.Container.AccessibleAWTContainer
                  • +
                +
                  +
                • + + +

                  Nested classes/interfaces inherited from class java.awt.Component

                  +java.awt.Component.AccessibleAWTComponent, java.awt.Component.BaselineResizeBehavior, java.awt.Component.BltBufferStrategy, java.awt.Component.FlipBufferStrategy
                  • +
                +
                • +
              + +
                +
              • + + +

                Field Summary

                + + +
                  +
                • + + +

                  Fields inherited from class tyrant.mikera.tyrant.TPanel

                  +buffer, globalKeyListenerHasBeenAdded, questapp
                  • +
                +
                  +
                • + + +

                  Fields inherited from class java.awt.Component

                  +accessibleContext, BOTTOM_ALIGNMENT, CENTER_ALIGNMENT, LEFT_ALIGNMENT, RIGHT_ALIGNMENT, TOP_ALIGNMENT
                  • +
                +
                  +
                • + + +

                  Fields inherited from interface java.awt.image.ImageObserver

                  +ABORT, ALLBITS, ERROR, FRAMEBITS, HEIGHT, PROPERTIES, SOMEBITS, WIDTH
                  • +
                +
                • +
              + + + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
                All Methods Instance Methods Concrete Methods 
                Modifier and TypeMethod and Description
                java.lang.StringgetCurrency() 
                java.util.List<Option>getoptions() 
                java.lang.StringprintInfo() 
                java.lang.Stringprintpriceinfo(Option o) 
                booleanselect(Option o) +
                Called after an Option is selected.
                +
                protected Combatantselectmember() 
                + + +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.Screen

                  +getInput, refresh, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class tyrant.mikera.tyrant.TPanel

                  +getTexture, update
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Panel

                  +addNotify, getAccessibleContext
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Container

                  +add, add, add, add, add, addContainerListener, addImpl, addPropertyChangeListener, addPropertyChangeListener, applyComponentOrientation, areFocusTraversalKeysSet, countComponents, deliverEvent, doLayout, findComponentAt, findComponentAt, getAlignmentX, getAlignmentY, getComponent, getComponentAt, getComponentAt, getComponentCount, getComponents, getComponentZOrder, getContainerListeners, getFocusTraversalKeys, getFocusTraversalPolicy, getInsets, getLayout, getListeners, getMaximumSize, getMinimumSize, getMousePosition, getPreferredSize, insets, invalidate, isAncestorOf, isFocusCycleRoot, isFocusCycleRoot, isFocusTraversalPolicyProvider, isFocusTraversalPolicySet, isValidateRoot, layout, list, list, locate, minimumSize, paintComponents, paramString, preferredSize, print, printComponents, processContainerEvent, processEvent, remove, remove, removeAll, removeContainerListener, removeNotify, setComponentZOrder, setFocusCycleRoot, setFocusTraversalKeys, setFocusTraversalPolicy, setFocusTraversalPolicyProvider, setFont, setLayout, transferFocusDownCycle, validate, validateTree
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.awt.Component

                  +action, add, addComponentListener, addFocusListener, addHierarchyBoundsListener, addHierarchyListener, addInputMethodListener, addKeyListener, addMouseListener, addMouseMotionListener, addMouseWheelListener, bounds, checkImage, checkImage, coalesceEvents, contains, contains, createImage, createImage, createVolatileImage, createVolatileImage, disable, disableEvents, dispatchEvent, enable, enable, enableEvents, enableInputMethods, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, firePropertyChange, getBackground, getBaseline, getBaselineResizeBehavior, getBounds, getBounds, getColorModel, getComponentListeners, getComponentOrientation, getCursor, getDropTarget, getFocusCycleRootAncestor, getFocusListeners, getFocusTraversalKeysEnabled, getFont, getFontMetrics, getForeground, getGraphics, getGraphicsConfiguration, getHeight, getHierarchyBoundsListeners, getHierarchyListeners, getIgnoreRepaint, getInputContext, getInputMethodListeners, getInputMethodRequests, getKeyListeners, getLocale, getLocation, getLocation, getLocationOnScreen, getMouseListeners, getMouseMotionListeners, getMousePosition, getMouseWheelListeners, getName, getParent, getPeer, getPropertyChangeListeners, getPropertyChangeListeners, getSize, getSize, getToolkit, getTreeLock, getWidth, getX, getY, gotFocus, handleEvent, hasFocus, hide, imageUpdate, inside, isBackgroundSet, isCursorSet, isDisplayable, isDoubleBuffered, isEnabled, isFocusable, isFocusOwner, isFocusTraversable, isFontSet, isForegroundSet, isLightweight, isMaximumSizeSet, isMinimumSizeSet, isOpaque, isPreferredSizeSet, isShowing, isValid, isVisible, keyDown, keyUp, list, list, list, location, lostFocus, mouseDown, mouseDrag, mouseEnter, mouseExit, mouseMove, mouseUp, move, nextFocus, paintAll, postEvent, prepareImage, prepareImage, printAll, processComponentEvent, processFocusEvent, processHierarchyBoundsEvent, processHierarchyEvent, processInputMethodEvent, processKeyEvent, processMouseEvent, processMouseMotionEvent, processMouseWheelEvent, remove, removeComponentListener, removeFocusListener, removeHierarchyBoundsListener, removeHierarchyListener, removeInputMethodListener, removeKeyListener, removeMouseListener, removeMouseMotionListener, removeMouseWheelListener, removePropertyChangeListener, removePropertyChangeListener, repaint, repaint, repaint, repaint, requestFocus, requestFocus, requestFocusInWindow, requestFocusInWindow, reshape, resize, resize, revalidate, setBackground, setBounds, setBounds, setComponentOrientation, setCursor, setDropTarget, setEnabled, setFocusable, setFocusTraversalKeysEnabled, setForeground, setIgnoreRepaint, setLocale, setLocation, setLocation, setMaximumSize, setMinimumSize, setName, setPreferredSize, setSize, setSize, setVisible, show, size, toString, transferFocus, transferFocusBackward, transferFocusUpCycle
                  • +
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

                  +clone, equals, finalize, getClass, hashCode, notify, notifyAll, wait, wait, wait
                  • +
                +
                • +
              +
              • +
            +
            +
            + +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/Materialize.html b/doc/javadoc/javelin/view/screen/haxor/Materialize.html new file mode 100644 index 000000000..e8266943d --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/Materialize.html @@ -0,0 +1,328 @@ + + + + + +Materialize + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class Materialize

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class Materialize
+extends Hax
              +
              Generate a WorldActor near Haxor
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Materialize(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Materialize

                  +
                  public Materialize(java.lang.String name,
+                   double price,
+                   boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/Rebirth.html b/doc/javadoc/javelin/view/screen/haxor/Rebirth.html new file mode 100644 index 000000000..def7d9843 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/Rebirth.html @@ -0,0 +1,329 @@ + + + + + +Rebirth + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class Rebirth

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class Rebirth
+extends Hax
              +
              Return an unit to it's original Monster form. Keep all the XP though + so it can be spent again.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Rebirth(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Rebirth

                  +
                  public Rebirth(java.lang.String name,
+               double price,
+               boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/RemoveAbility.html b/doc/javadoc/javelin/view/screen/haxor/RemoveAbility.html new file mode 100644 index 000000000..ccbb3ffe7 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/RemoveAbility.html @@ -0,0 +1,328 @@ + + + + + +RemoveAbility + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class RemoveAbility

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class RemoveAbility
+extends Hax
              +
              Remvoes a single undesired ability from a Combatant.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                RemoveAbility(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  RemoveAbility

                  +
                  public RemoveAbility(java.lang.String name,
+                     double price,
+                     boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/Ressurect.html b/doc/javadoc/javelin/view/screen/haxor/Ressurect.html new file mode 100644 index 000000000..1d72a562e --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/Ressurect.html @@ -0,0 +1,326 @@ + + + + + +Ressurect + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class Ressurect

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class Ressurect
+extends Hax
              +
              One-time offer to ressurect a fallen friendly Combatant.
              +
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Ressurect(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Ressurect

                  +
                  public Ressurect(java.lang.String name,
+                 double price,
+                 boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/SummonAlly.html b/doc/javadoc/javelin/view/screen/haxor/SummonAlly.html new file mode 100644 index 000000000..34c15c71a --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/SummonAlly.html @@ -0,0 +1,333 @@ + + + + + +SummonAlly + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class SummonAlly

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class SummonAlly
+extends Hax
              +
              One-time offer to recruit one extra starting squad member from the starting + character set. + + This is an exception to the rule of not having balance-related features on + Haxor's temple but some players may find the start of the game too slow - + this would enable them to use their starting ticket to speed up the early + game.
              +
              +
              See Also:
              +
              SquadScreen, +Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                SummonAlly(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  SummonAlly

                  +
                  public SummonAlly(java.lang.String name,
+                  double price,
+                  boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/Win.html b/doc/javadoc/javelin/view/screen/haxor/Win.html new file mode 100644 index 000000000..9c0395a8a --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/Win.html @@ -0,0 +1,330 @@ + + + + + +Win + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.view.screen.haxor
            +

            Class Win

            +
            +
            + +
            +
              +
            • +
              +
              All Implemented Interfaces:
              +
              java.io.Serializable
              +
              +
              +
              +
              public class Win
+extends Hax
              +
              If you conquer 7 Keys, unlock their challenges and survive you can + "win the game". It will actually just multiply your scores by 10 and ask if + you want to conclude the game.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              Serialized Form
              +
              +
              • +
            +
            +
            +
              +
            • + + + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                Win(java.lang.String name, + double price, + boolean requirestargetp) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  Win

                  +
                  public Win(java.lang.String name,
+           double price,
+           boolean requirestargetp)
                  +
                  • +
                +
                • +
              + + +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/package-frame.html b/doc/javadoc/javelin/view/screen/haxor/package-frame.html new file mode 100644 index 000000000..60b2a0032 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/package-frame.html @@ -0,0 +1,29 @@ + + + + + +javelin.view.screen.haxor + + + + + +

            javelin.view.screen.haxor

            +
            +

            Classes

            + +
            + + diff --git a/doc/javadoc/javelin/view/screen/haxor/package-summary.html b/doc/javadoc/javelin/view/screen/haxor/package-summary.html new file mode 100644 index 000000000..2572d851c --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/package-summary.html @@ -0,0 +1,197 @@ + + + + + +javelin.view.screen.haxor + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Package javelin.view.screen.haxor

            +
            +
            +
              +
            • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
              Class Summary 
              ClassDescription
              BorrowMoney +
              Will lend money to a Squad once but will get it back on a future + visit.
              +
              ChangeAvatar +
              Changes the image used to represent a Combatant.
              +
              Hax +
              A trick to be done by Haxor.
              +
              HaxorScreen 
              Materialize +
              Generate a WorldActor near Haxor
              +
              Rebirth +
              Return an unit to it's original Monster form.
              +
              RemoveAbility +
              Remvoes a single undesired ability from a Combatant.
              +
              Ressurect +
              One-time offer to ressurect a fallen friendly Combatant.
              +
              SummonAlly +
              One-time offer to recruit one extra starting squad member from the starting + character set.
              +
              Win +
              If you conquer 7 Keys, unlock their challenges and survive you can + "win the game".
              +
              +
              • +
            +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/haxor/package-tree.html b/doc/javadoc/javelin/view/screen/haxor/package-tree.html new file mode 100644 index 000000000..a81d8fd10 --- /dev/null +++ b/doc/javadoc/javelin/view/screen/haxor/package-tree.html @@ -0,0 +1,179 @@ + + + + + +javelin.view.screen.haxor Class Hierarchy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Hierarchy For Package javelin.view.screen.haxor

            +Package Hierarchies: + +
            +
            +

            Class Hierarchy

            +
              +
            • java.lang.Object +
                +
              • java.awt.Component (implements java.awt.image.ImageObserver, java.awt.MenuContainer, java.io.Serializable) +
                  +
                • java.awt.Container +
                    +
                  • java.awt.Panel (implements javax.accessibility.Accessible) +
                      +
                    • tyrant.mikera.tyrant.TPanel + +
                      • +
                    +
                    • +
                  +
                  • +
                +
                • +
              • javelin.view.screen.Option (implements java.io.Serializable) + +
                • +
              +
              • +
            +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/view/screen/package-frame.html b/doc/javadoc/javelin/view/screen/package-frame.html index b0beebe6f..5e3f461fa 100644 --- a/doc/javadoc/javelin/view/screen/package-frame.html +++ b/doc/javadoc/javelin/view/screen/package-frame.html @@ -2,9 +2,9 @@ - + javelin.view.screen - + @@ -14,10 +14,15 @@

            Classes

          diff --git a/doc/javadoc/javelin/view/screen/package-summary.html b/doc/javadoc/javelin/view/screen/package-summary.html index 1518efd54..528241e3b 100644 --- a/doc/javadoc/javelin/view/screen/package-summary.html +++ b/doc/javadoc/javelin/view/screen/package-summary.html @@ -2,9 +2,9 @@ - + javelin.view.screen - + @@ -43,7 +43,7 @@
          +
          • +
        • + + +

          Class javelin.model.unit.Skills extends java.lang.Object implements Serializable

          + @@ -2168,64 +2571,125 @@

          savedc

        • Package javelin.model.world

        -
      • +
      • +

        Package javelin.model.world.place

        +
    -
  • +
  • -

    Class javelin.model.world.QueueItem extends java.lang.Object implements Serializable

    +

    Class javelin.model.world.place.WorldPlace extends WorldActor implements Serializable

    • -
  • + +
    • +
  • +

    Package javelin.model.world.place.dungeon

    +     +
    • +
  • + + +

    Class javelin.model.world.place.dungeon.Fountain extends Feature implements Serializable

    • +
  • + + +

    Class javelin.model.world.place.dungeon.StairsUp extends Feature implements Serializable

    +
    • +
  • + + +

    Class javelin.model.world.place.dungeon.Trap extends Feature implements Serializable

    +
    • -

      crafting

      -
      TownQueue crafting
      +

      Serialized Fields

      +
        +
      • +

        found

        +
        boolean found
        +
        See Trap.searchdc.
      • -

        training

        -
        TownQueue training
        +

        cr

        +
        int cr
        +
        Challenge rating.
      • -

        stash

        -
        int stash
        -
        gold in bank when all members of a squad are training
        +

        reflexdc

        +
        float reflexdc
        +
        Difficulty class to save against.
      • -

        events

        -
        java.util.ArrayList<E> events
        +

        disarmdc

        +
        int disarmdc
        +
        See Skills.disabledevice.
      • -

        name

        -
        java.lang.String name
        +

        searchdc

        +
        int searchdc
        +
        See Skills.search.
      • -

        color

        -
        java.awt.Color color
        +

        damagedie

        +
        int damagedie
        +
        d6
    • -
  • +
  • -

    Class javelin.model.world.TownQueue extends java.lang.Object implements Serializable

    +

    Class javelin.model.world.place.dungeon.Treasure extends Feature implements Serializable

    • Serialized Fields

        +
      • +

        items

        +
        ItemSelection items
        +
        • +
      • +

        gold

        +
        int gold
        +
      • -

        queue

        -
        java.util.ArrayList<E> queue
        -
        Items being processed or done yet not reclaimed, from those that are - going to finish first to those that will finish later.
        +

        key

        +
        Key key
        +
        null if no key.
        +
        • +
    • -
  • +
  • +

    Package javelin.model.world.place.guarded

    +     +
    • +
  • +

    Package javelin.model.world.place.town

    +
      +
    • + + +

      Class javelin.model.world.place.town.Accommodations.RestOption extends Option implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          hours

          +
          int hours
          +
          • +
        • +

          periods

          +
          int periods
          +
          • +
        +
        • +
      +
      • +
    • + + +

      Class javelin.model.world.place.town.CraftingOrder extends Order implements Serializable

      + +
      • +
    • + + +

      Class javelin.model.world.place.town.Order extends java.lang.Object implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          completionat

          +
          long completionat
          +
          The time at which this order will be ready.
          +
          +
          See Also:
          +
          Squad.hourselapsed
          +
          +
          • +
        • +

          name

          +
          java.lang.String name
          +
          Description.
          +
          • +
        +
        • +
      +
      • +
    • + + +

      Class javelin.model.world.place.town.OrderQueue extends java.lang.Object implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          queue

          +
          java.util.ArrayList<E> queue
          +
          Items being processed or done yet not reclaimed, from those that are + going to finish first to those that will finish later.
          +
          • +
        +
        • +
      +
      • +
    • + + +

      Class javelin.model.world.place.town.ResearchData extends java.lang.Object implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          hand

          +
          Research[] hand
          +
          Represents a few Research options that the player or + #automanager can use to advance a town. Grow should always be the + first option. + + A value of null means that the hand is initially empty, that + it's card has been spent or that there are no more valid cards of that + type. + + These are the card types by index for non-hostile (human) Towns: + + 0 - Grow + + 1 - Native (from #realm) Upgrade. + + 2 - Foreign Upgrade + + 3 - Native Item. + + 4 - Foreign Item + + 5 - Native Monster lair, see #lairs + + 6 - Special card + + 7 - Accommodations upgrade. + + 8 - Transport upgrade. + + These are the card types by index for hostile (monster) Towns: + + 0 - Grow + + 1 - Native Monster lair, see #lairs + + 2-7 - RecruitOption for it to recruit an unit into + WorldPlace.garrison
          +
          +
          See Also:
          +
          Research.draw(Town)
          +
          +
          • +
        • +

          queue

          +
          ResearchQueue queue
          +
          +
          See Also:
          +
          ResearchQueue
          +
          +
          • +
        +
        • +
      +
      • +
    • + + +

      Class javelin.model.world.place.town.ResearchQueue extends java.util.ArrayList<Research> implements Serializable

      +
      • +
    • + + +

      Class javelin.model.world.place.town.Town extends WorldPlace implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          lairs

          +
          java.util.List<E> lairs
          +
          • +
        • +

          upgrades

          +
          java.util.List<E> upgrades
          +
          • +
        • +

          items

          +
          ItemSelection items
          +
          • +
        • +

          crafting

          +
          OrderQueue crafting
          +
          • +
        • +

          training

          +
          OrderQueue training
          +
          • +
        • +

          stash

          +
          int stash
          +
          gold in bank when all members of a squad are training
          +
          • +
        • +

          events

          +
          java.util.ArrayList<E> events
          +
          • +
        • +

          size

          +
          int size
          +
          Represent 10 working citizens that will produce 1 Town.labor every 10 + days. + + An arbitrary decision is to try to fit the game-span of a normal game + into a 1-year period, which puts a town max size roughly at 10 if it does + nothing but grow TODO link
          +
          • +
        • +

          labor

          +
          float labor
          +
          Can be used to improve a town. 1 unit represents 10 days of work by a + 10-men crew.
          +
          • +
        • +

          automanage

          +
          boolean automanage
          +
          • +
        • +

          research

          +
          ResearchData research
          +
          Contains Research data structures.
          +
          • +
        • +

          nexttask

          +
          Research nexttask
          +
          Next task for the Town.automanager.
          +
          • +
        • +

          lodging

          +
          Accommodations lodging
          +
          Higher levels allow better rest.
          +
          • +
        • +

          transport

          +
          Transport transport
          +
          Higher levels allow better travel methods.
          +
          • +
        +
        • +
      +
      • +
    • + + +

      Class javelin.model.world.place.town.TrainingOrder extends Order implements Serializable

      +
        +
      • +

        Serialized Fields

        +
          +
        • +

          trained

          +
          Combatant trained
          +
          The upgraded unit.
          +
          • +
        • +

          xpcost

          +
          float xpcost
          +
          Cost in challenge rating.
          +
          • +
        • +

          equipment

          +
          java.util.ArrayList<E> equipment
          +
          Upgraded unit's equipment. See Squad.equipment;
          +
          • +
        • +

          untrained

          +
          Combatant untrained
          +
          The non-upgraded creature in case this needs to be canceled.
          +
          • +
        +
        • +
      +
      • +
    +
    • +
  • +

    Package javelin.model.world.place.town.research

    + +
    • +
  • +

    Package javelin.model.world.place.unique

    +
  • @@ -2586,32 +3686,12 @@

    background

    didn't have to change the MapPanel.viewPosition(BattleMap, int, int)).
  • -

    state

    -
    BattleState state
    -
    • -
  • -

    isworldscreen

    -
    boolean isworldscreen
    -
    • - - - - -
  • - - -

    Class javelin.view.SquadScreen extends tyrant.mikera.tyrant.InfoScreen implements Serializable

    -
      -
    • -

      Serialized Fields

      -
        -
      • -

        candidates

        -
        java.util.ArrayList<E> candidates
        +

        state

        +
        BattleState state
      • -

        squad

        -
        java.util.ArrayList<E> squad
        +

        isworldscreen

        +
        boolean isworldscreen
      • @@ -2723,25 +3803,34 @@

      fleeing

    • -
  • +
  • + + +

    Class javelin.view.screen.DungeonScreen extends WorldScreen implements Serializable

    +
    • +
  • -

    Class javelin.view.screen.HaxorScreen extends SelectScreen implements Serializable

    +

    Class javelin.view.screen.InfoScreen extends tyrant.mikera.tyrant.Screen implements Serializable

    +
    +
    serialVersionUID:
    +
    3256727281736168249L
    +

    • Serialized Fields

        +
      • +

        text

        +
        java.lang.String text
        +
        • +
      • +

        font

        +
        java.awt.Font font
        +
      • -

        WINMESSAGES

        -
        java.lang.String[] WINMESSAGES
        -
        A curiosity: I had no intention of having seven different types of - Keys in the game - they were a late 1.1 idea to give more of a - long-term goal to the game. Fuck, I didn't even plan for Towns to - have any sort of theme at all - they were just supposed to be random - collections of upgrades and items that eventually got to big to be purely - random (or it would be a pain in the ass to keep track of what is where - in each game) - but in the end is there anything more win than Helloween? - So I had to make the best out of this coincidence :)
        +

        border

        +
        int border
      • @@ -2750,86 +3839,219 @@

      WINMESSAGES

    • -

      Class javelin.view.screen.IntroScreen extends tyrant.mikera.tyrant.InfoScreen implements Serializable

      +

      Class javelin.view.screen.IntroScreen extends InfoScreen implements Serializable

    • Class javelin.view.screen.LairScreen extends BattleScreen implements Serializable

      • -
    • +
    • -

      Class javelin.view.screen.StatisticsScreen extends tyrant.mikera.tyrant.InfoScreen implements Serializable

      +

      Class javelin.view.screen.Option extends java.lang.Object implements Serializable

      + +
    • -

      town

      -
      Town town
      +

      Package javelin.view.screen.haxor

      +
    • -

      sortoptions

      -
      boolean sortoptions
      +

      Package javelin.view.screen.shopping

      + +
      • +
    • +

      Package javelin.view.screen.town

      +
      • -
    • -

      Package javelin.view.screen.town.option

      - +
      • +
    • +

      Package javelin.view.screen.town.option

      +
      • -

        Class javelin.view.screen.town.option.RecruitOption extends Option implements Serializable

        +

        Class javelin.view.screen.town.option.RecruitOption extends Option implements Serializable

        • Serialized Fields

          @@ -2937,17 +4181,33 @@

          m

          Class javelin.view.screen.town.option.RecruitScreenOption extends ScreenOption implements Serializable

          • +
        • + + +

          Class javelin.view.screen.town.option.ResearchScreenOption extends ScreenOption implements Serializable

          +
            +
          • +

            Serialized Fields

            + +
            • +
          +
        • -

          Class javelin.view.screen.town.option.ScreenOption extends Option implements Serializable

          +

          Class javelin.view.screen.town.option.ScreenOption extends Option implements Serializable

          • Serialized Fields

            • @@ -2971,7 +4231,7 @@

            Class -

            Class javelin.view.screen.town.option.UpgradeOption extends Option implements Serializable

            +

            Class javelin.view.screen.town.option.UpgradeOption extends Option implements Serializable

            • Serialized Fields

              @@ -2992,17 +4252,52 @@

              Class

            • -

              Package javelin.view.screen.world

              +

              Package javelin.view.screen.upgrading

              +
              • diff --git a/doc/skills.txt b/doc/skills.txt new file mode 100644 index 000000000..ff42ca3e9 --- /dev/null +++ b/doc/skills.txt @@ -0,0 +1,38 @@ +SKILL GUIDE + +When you upgrade a skill it is set to it's current maximum possible rank. +Once you gain a class level it can be upgraded again into a new higher rank. +Unless noted only the highest skill rank in a group is taken into account. +Skill roll: d20 + ranks + ability modifier, passes if equal or higher than DC. +Resistance skills are rolled in opposition, highest wins. + +Acrobatics: allows you to disengage faster. Individual roll. + +Concentration: allows you to cast spells while engaged in combat. DC 15 + spell +level to cast a spell of that level while engaged. Individual roll. + +Diplomacy: DC 10 + encounter level to bribe a group of creatures out of your +way. DC 15 + encounter level to recruit them to your team. + +Disable device: disarms a trap. DC depends on the trap in question. A failure +could result in the trap being activated. + +Gather information: DC 10 + number of squares away to learn about a nearby +location. Rolled each time you enter certain locations. + +Hide: used as a resistance skill to Spot. Individual roll. + +Knowledge: DC 10 + encounter level to reveal contents of a location. + +Listen: shows you the location of hidden creatures in battle. Individual roll. + +Move silently: used as a resistance skill to Listen. Individual roll. + +Search: allows you to find a nearby trap. DC depends on trap in question. + +Spellcraft: DC 10 + necessary spell caster level to learn a spell without +having enough levels to learn it normally. Individual roll. + +Spot: allows opponent army units to be revealed. + +Survival: for each 4 ranks finds daily food to sustain one of your units. \ No newline at end of file diff --git a/doc/upgrades1.txt b/doc/upgrades1.txt index 496173609..de5671efb 100644 --- a/doc/upgrades1.txt +++ b/doc/upgrades1.txt @@ -1,5 +1,6 @@ UPGRADE GUIDE (simple upgrades) +Acid spray: touch attack, deals 8d8 damage (reflex save DC 17 for half). Breath weapon: special area attack, press b during battle to activate. Classes: raises hit dice, base attack bonus and saving throws. Damage reduction: reduces damage from physical attacks. @@ -23,5 +24,6 @@ Ranged damage: raises damage of all ranged attacks. Ranged focus: +1 to all ranged attack bonuses (requires +1 BAB). Spell resistance: the more powerful your resistance, the less likely you'll be affected by harmful spells. Spell immunity: cannot be the target of harmful spells. +Stunning shock: touch attack, deals 2d8 damage (reflex save DC 12 for half) . Swimming: swims over water faster, ignores penalties for being on water. Toughness: +3 hit points. \ No newline at end of file diff --git a/images/academy.png b/images/academy.png new file mode 100644 index 0000000000000000000000000000000000000000..3b8a0e967c451f89df408d83081314a4f689c4a0 GIT binary patch literal 2531 zcmV<92^{u`P)xGnOG=y4eF<%nW?x?RyyWF=zvcP|Z9zx0Bcr3|zdQ52 z=YGz)%Q+YRpY8g}WshE8x$Myo<3sr{lZ$8N-cwZ-zURLRaP+>70^pjmC4KAHEu)}p zI%}#|_5nnH`Gok7ru>&*xJLk7U2;YDvFCm!?Y6D<*EW37{{HRj<&D)>b-!P8p{8Dl zsJ3{K(lOd4Upd&oNAV6nh6D1P7bi zxGWw|{rje6iuy zJLUB&%31s1mX)5i(d-E&8LF(=f$ zxDRpjC95W`Ub)Km^IvTqEniTURg@W|xU$BIkDO5r?=)od31(k$1(wH+TO{adjlxI= zDQ7-CY9~V4>^|8}iN}XaQ3+}eBIzUv+al=@#7E;yM#jm?^jbw8pQ>1rR}M5XySM;v zAUh@i@wvU4J6mlwxaQZx$lQAMkPGb3T_(+)~!W<5q+)BAC!12>P zm;#PWj#1|JGhn1Bc6phwOxjYDOxInw6qPytO!_sGoqHSE`qpa!U_t=gval}iRA+xz zIGoM$WN6Uj@QZsmy0Zzt+dxs=3|j^vmy5^VI*5_uC9foho2q8x z(lp)~9Ol*64zO+SNoHL-i&fXGCN2_`=jU+r`TGIT0Nf58!>|w@4KYKdB9Mp6tr3YP z`QZbRLtfb&XLzn~m>lql^ zMdp+c>(@BQDxbw^pGIh+k3`=HL0b}=B1sO!dE(?Ttg$4zL&M{8;CA_Os|uyzDzeH0 zWV-xh`rPykj{O~g6!;uzgs@2&Dpk|^=$F&D;hIZ0ePl1Utyzt!D7?7i1nq5GsVFSs zD_^SQaBGO~{NO=aPjxUnmLRWW8j~oPDFbOsJh~f)?j&3kL%dVq)u$hs8evt1K zLCuQcQsM|r!!~VHzXrBEUx&31s#I~)fm=x2nn@yMqIz_~fg#Fn@^I{wpS9tex$j%| zf?~3`ZWW747P8|+1dowH*Z66ybPS0^N`Ym9q6;*y`YxRKhaHhb(R7fYD;6!$5D8Pq zk^+H56Bd3w1*sHS(GaPK*f?J1)^R zm8qG&zX4EGRbfv<*WNVFzOj^>ieSHO*ed;Tzf{G$kw^&^Dg~Zl3jF=7UQ$hA&QuC> zD;PRHfMPmu8)GQ8iEY{EcS1@DHaNVFzRr%ey`6(m*8g~mavtE;pFGqn73CXmHvW0h z<4^V$w?sp`T&kf&P4B*Ze^i)KIh!Ma5E9c?a40E?azS*eT1-+j#zh$nIhC~tSay>VV{wR-*#-ujb=tg}bo7UJD#r&L_~#<^|$V@?h2Fln!|tJ9{BX<$ zthV-#ZT!&-Pu~CgUpNRo;`1f%_U7s<^UK6c7il!bCYE+QSz5hp?S}?oEhU|={+;f-L&L8`?7k~Diub+qi+?AjFzz@zJ t9)Dd2c==avJah1st+M`wZIb^b`zv08Fy(!Si&Fpq002ovPDHLkV1h~V*c$)< literal 0 HcmV?d00001 diff --git a/images/arena.png b/images/arena.png new file mode 100644 index 0000000000000000000000000000000000000000..1cf85a15765d74fae38fb58ea86546c231d86bb2 GIT binary patch literal 2817 zcmV+c3;y(pP)}6RpTrgh7iS0~0$=H(uGRAu4KO?psVlWfQ*k8(P}j zLdDt8=^6 zl>iIVi-g{!Px`Xuf_GWIT@e8LezZ$|_QAO$U-eXPOd)RDoSd2O%-g!o@bH>B+SSSq zrLNV_u&<9L3zE6mq%tW|K`#vS_FTss@Y6r&MZwm}IHa%P3df}JzVrG4`?x|%P_PqLr5ZTteH;+}lyYun;b`qNqH?Zl^M-v(+ zLcxhZP_MXMB*zV4N{^=~c`gmtJoMPyJTM~`%>=*t=X&%eg|L1S2*KbDCqH<6CX=S= z`SkT_tf^j3opRGxbq;HEbTEBEvA(zV@_->GHsQc~J9x18*|*duwmf;_T=$6VsjL$- z3kpn~L9b$;8&((G8&7M$R~bhh@g zecKF#K@##wMn>FBUsOQtIR_6sSw?h5y4v=2HHlL)OuaRil=g^3S&*8(K-W@N`(bwc zin1U6?H-Z};?<+C{estacOboP%xZw)zB2IkQ&LhuP0b~wDp;k

              x!W+oK^uE+V3% zF`F$I-EoA+1L!9kXzB4%^Xp~?s?Kt->MV-ENbanBa!XgKsrT4XhTWo}uJ%I#FfTUu z)1Wyzl%13O;O4)2Omdv=v|C%W{hE)uzLNFv49iL$7+(KHrdoZdk9C_;tOh%RT z`xcYDWHIgM&yyC?V^CDmA6P-v`BQsu`RZ^vZf{1G*jUC58rxpjO30`2&I@ldVGHom zZ}-xCrjid{J;7^-UgYnN)DmvIgiv7W@+IWt>e=)CUy-wVDG}4NX#M;I(*{S`UbcgT zNDD`g93&z!@!PxM`tQBK@q-6IN@8M+%**blZ&cywzxV;;10Ko`d`h#|$-dJs^KT#g zjy#)@nXf#Kr&rI{7mrd^J5J$_ZM2*`$#mB^8`f@NYGM>3S|K_uitr%~DdlYhlv~E} zg9j*m^rdv4*T*DNkgz7OiV1QvdYOpyv10p1_PzQe&c5*lot+b8ES^Jb)EI_=L7H5V zg#8};=PTLy*fYe>EM%y+8*8)?qg21?II4Qn-P(=M-A({t@aR7+4s;B1s?JMypNhpI z5L%eY^ssUH{fxK=+4t8g_~DOtbKz&F(T!U1n9Q^uJ4V@q-)GAsTX6LCa`fjvK~q5! z5?z!YZ7fVE7^J1Xnbk|TJpbuOKmV`Wan|fbwY#2vh_xG6^XA{5;ljlrrAsr2ii^M& zRYG=NG?Ua(%*q(E*KXpcJKvzCzJW)!?j$ci0aL1x@u3NHQ?poCT!bmdN@yg+M@PC$t5rc&Z~jZ8 z8YatjgP5GD4BhA;GbNs}0WZpk!t}Hxs#;o!pAyZNpIxEF(aWaqEy5CM0-Y-V@o?nh zz!N2zcFNl-{xbyTNpWTA)9+%st(Ra($L#Dr8ZS%sJXc6sj2UN-n<1wcsW+n%Lh*aZ zUVJxUzaPb@Vu&?hPBCLix1bj~4xTtmTwEj%KfDNO5O^p2gaQFEYr#V9Nh)~$mOl7~ zfG#8dZ}#sg;;U*S=mb6Ek%SZj6B9x1n&x5gngTAK>*LUoVQRZ==nMve6Fv|E{2G=? zCIX%yCk|JUpO(tKC9_DKo5<+EI6{I@1VMiodsYrXgCYI45G=CK!lsT9Kh46G8bQu% zKSc$89PUV*Zh_exr0mfI8aho}t?cDet-`qGMO6gXy89Swa1(2_vS4){ayUfyRVOo+ zWq`aXdwhL9gd!*`&61|WiM!}zcS)xGW)jX%D0pkhrX};|=0-9!W*{lX$4JPEMGYWT zJw2TYGpCQDg(Nm>n7n)o#RW#b{?{8s#HEsv634XIIMQY(qO<5Q#hbvVp$&zwOtm6} zATSspVrm3PDg0wPe65boitdZGIsijt#QvvtJi9YL?ssxj>aiC}EOJZ^cq2q@Lzt!W ze1rlZgv4eD(CUmPBYK2~9$SJw5X7f9FfrsuikmUj!Wx<SR0R_CLwHaL`NQa=^!S~Agevg$_(-tFqaOk3*Q5+fCVD5tlUp|D{-U;F$?=2x zO&9tvzg?1P7q_Y6<8Pl5>;HU(bT@pw`t>)fi^ro(FYn(~L~E}Bmq$-{$j6MlAVSj+ zs^C(+4NIDZv6eCP5qe};qFPlxuT)M4P{*UH@yAtM5bLD^{5|?Vjjh~c_225_7-hW&ODW$wAHCj9g zNDZk4rO<*JLnF@hHNUBjDw;oEuGzKb!|$3q#D8ZRay5QJbnd!a_G`e40IJZq?n}hk z?!(>fdAD+J?an`Ye^t16U9kpm@|Pzm-B$Xin}}VFpZrmn{^g~^uYctF-(dbb7#E%; TOO4H+00000NkvXXu0mjfbL4u* literal 0 HcmV?d00001 diff --git a/images/banner.png b/images/banner.png index c88333e2316f482bf029667f65ed098c025cf9be..7c37ff4ba197dbfa3e6552dc22b8e579bd09313e 100644 GIT binary patch delta 302 zcmeyzc#>&?NYGO%hib8p2Nrr;Er*A-tUMf3Ke66R8 zV@Sl|%0Aat??R=pFCatT-G@yGywn_HEuBg delta 226 zcmV<803H9y0{#JzB!2;OQb$4nuFf3k00009a7bBm000XT000XT0n*)m`~Uy|2XskI zMF-yt0u&e#0pU)^0001xNklMdsU%;>wt6fY39Re(rX!d7V zN|d^d4AD5{C=LPV!}w`JfMN&iwS`!Qi>A2)@L9gsb|i!V%v%xoXqr2K5wkEfb0l#5J)BSN5Lo<1*2dTjDk@x c3WhfT0CE{MJ#nDe5&!@I07*qoM6N<$f|uG;x&QzG diff --git a/images/banner2.png b/images/banner2.png new file mode 100644 index 0000000000000000000000000000000000000000..c88333e2316f482bf029667f65ed098c025cf9be GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}oCO|{#S9GG zLLkg|>2BR0pdfpRr>`sfeQqWZ2|>n(e#e1A6FglULn00*CrBh5@K|?@rR~N4B`e|& zY!F!;>%%O|q%$SsTY7}olwG|%7cHJ@@G(9={3Fw;A&LFX*4Bu&?qxffKSb`kUZ&E* za7OS)#w_awA&03Z4Rbzi+?W|8WMp7quqHj>N5B5*gNqad`fYorv@z(p3nW{H$~3&; vC=u{b{p@~FLxOd2f=EwOpaEB#IRitHq^WJ;f*U}0Gcb6%`njxgN@xNA#Ew00A;dL_t(o!|jx@O2j}AhQH0790U~P ziX2*9q85i-;Tzlw2x6hv2zI`M4{$}wt9%2iG!}wjX`^Bnwa_AI4lM#Eg&}y3g;7KL zjm>_rFtaSo&-^nB27|$1Fc=Jme@6WVO0`791wQ|-R4gJzBLaZce_qdtJa6l2J{K#B z?uWBkJOb`?3TRi8G|gIJc(Vp#6-BWGNMjb19Q%G?C&@-SnQZofBi#bpwfti`JsIb@ zRR9-F3}IbB7RTd0ECc63(;MNyy1=bKC@>UYpu4D5i9Of>R)9s|5WsC>2-Wwr+XB}D zb~%{2z(~PM<&B;WRtONlKHyZgqN`vJ;8N#0{uF!y@!+}Qij)qh1nBCt!G~ReH-XpM y$pj7rIMvw!7dnryy#V!ZzXO~B?*rgLhk!4VRbJwgWsm9r0000IIw~y?~=*hi;_@>FQw$LT8Urv4bGg$>(5(c1T+#LC|~mi>(}alZ%aR#D7}7+MI{c&qeMnhKoaYkvB;>9H09m$w z+tzjCRAp}hMX}s`>lWy9aM9hlv-$_-%@g3NTY{@|U{dvfn}V|*E`U&a61M7qK%$^( zg(_Y#`!1+q^*D7Q7*_Ar1vO5+I~Rhk`qZGl?LunR1=USp1ss99VfhqT11D?mf*Sb= cIs25Js)anxHznFo00000NkvXXu0mh|f=lsz=Kufz diff --git a/images/dungeon.png b/images/dungeon.png new file mode 100644 index 0000000000000000000000000000000000000000..009c905650a993173e577f30d80f7db9547925b5 GIT binary patch literal 1408 zcmV-`1%LX9P)rf$Z{`@(spMDbm4?w?P!Z>pK`RDY;a4ZVEb1W_| zNnX6*VY_9r7PRK}!>c{i3-A><&tg~a8<>%wahOrDCTpvs}&+mdG^_7G4pnjG;Up>Drc`fBEG!02Rj=V_?509!I9TJ6db$Rx7;LWaEgeDo~25 zX&AR#T;DS~N8&wbO_F6qvl(Lu2qCa1v_SqZfUj%fx<)uhnIsg$fGtb3l!(43R28=` zUXXqHCCAweuM}|5ag>BQ&BJ;kEk>S@84au$Df7}p7xUf#^aF?$EfX= zXR{fLAAUf*dPV!k9~kFQ=jY6>uhFv^Sc_DOC{1bd9Mg4--lL@iA@G2d5+TItA(ToH zR~5oqLYfk5&1|_OxxU5@1C%A{IHDe91`r{jv?hvUq!1rU9s)>tIzXHxq)mg%GTPaU z<9dyG`YC9xVx>R`1mL|Vcz-&8mJ(qtVjOW&Vne`H z72|G)n$PiCqtX-+Maaj~?ExtSQ5+-Q2k(8WPVoN&3(_njEecfMBhnP16fZE0S=M$BeJH#c0A zC4Jk{H4Sy&GYP?PIFO|&J&>>0yfTJJ>%YA}!T%2cJTL%fSw`eNO<5wnCtWPiS%w$} z?D0rf6sTb!^gZ1)(d>5EhX=40r8QCrl#~P^p4xI+3(}O3=XBoFUtK|#k@h`to@36= z7%nalQsRmNKaR*GVfXMr^VeU@LO=sf>kpn<;iC>w({K~VG{ZnI1ku$MV^uK@1CiD| ziz3wH)9Y|J(C_yIAqYu=F^0|tRYmAJ)YTPEN+zYS zWyx%sP*Fr(RhZ&{JJzIHBfV#klB%xR@AG$XZA+8qCjmTJaCURWgAfdW3<0s(pvRFY ziV%kaV+?JYF_Z~53oX49so2~8VKNv+28qJN|+t+rG}O0)yMAP6lAS}bZ?q=G04{*clZibZQen<~w9o6U81vpYLGJKx;D`?>f-8(OPKTSSCD zzYd4@JkNX1`@HZT;C;N0|2N$6ty%KM`g1?NcHcdZ&)o4|_{h6Gc-yz9=Hl3YQZmw` z&GNl3JauCI-SE(N5`5s{tFI*NcaqO|{piNPXZu6ix%=H-M0qE{=l|pa06y}KtF{Kd z|7Ac<#-6~yjmfs%bI&gxU-SQ~FYpGUDEb&t#RoNqKrsQupwm8ccfRKmNGadui9P?q zCsB``3fiLYyBv}MnnfEyU)KMVn3R%8x%L)K6#%aLkx7p~7>Y0ccFXu@e=>Vh3F z;O?(qLtpr2O#nc7yLrF6Hh3ghPd@H&{?KcRkv+dF$kJizhaESK3g1?=j~~ zi%)#@l(_s*s3-ZXZ(*l09&fLd<~zdwLwCn&n5)QH#_34x(bPsQDy^>hqun(FNFaog zP>rLPPLpM+^MM5I=qk=uw;HeA^Qp1tw~@nZdk$8fWHR`?3A@sP$|1U9}5Gq*`~(s;iC0XH}DT^x!JyTc{#cfROS<3V9;PzWpnjN<9xfN0>E)n z^XjBmmxj#PwgNBY^n}-hlQl$kt4Xh|j-VtBW?KxR6p*eLQKOb4v)MEho535835Fmw zs*APDicBe4xocBZb%uy@v0mHJcKsbOi=o?!R82w*M^&n0BhJa^F8tkuFa5dPn!2iU zCJOo0f)VgYLK&f$-Cd;n$EV~payW8sNnNowK#c(P^#Hbe9y4?X2}z@Co`OEciOEex zZAd6F0m})wVg`JTQJLsA{udiGw!6y#N2Rq&H{y5@#>`O#l0U;$O zr)-RtIcfBJq&5I9u2A%9fTc>%LWq_g6iiipw0 zvmWWVAq1B)>`B4}-;&PMt+mt9v&t_|U$>8H{IRARW(F*Qky4==1T5wli7AG<468jC z$N^EBVKC4T)iaQZiY4LVT*F0ci6UIjLoMr=+M!~uYQynWSX~Jn2^wyQP7))PF-XBN zh3QB#F=6cb^aEq(l@H&WI|Lf<&Km{Ty@CwgfTS}HYy(JjRXB?|Xbl@!H$YPXtm!rk z3-Fo-=Fhe;=q6wQs@n*zx+Ow3Qb1mFFuq!XxnW?zbzv4&*xE4oVuUKml2R!ni5Ad} z8Y`+i!Sy_lvSN&poHa$F+6i=9F|>&qjA?<5Rv${JgJ(JrK?rk6L%$zl(d#0KIW(yv z^b_>gBk&6uG~yNp*#^)Xg9r_1DG8PkXd5Fa^a~g;2C9Zoatuk#uThhL28O9fuiYU* zx{dVp4jL;xI8sM>S|GbGLeCA*Sq0ilI^32Htpo_A3*7+-p-@8!$!s*v=b-5}tXv<< z)m1ndzzTFUUe++Ib4=`;#6s&by0nh!goS=z^pxFq7N#?KwwG%$nxrQO!!4o=4?tBN zan}U%B$}5fF21gUYdR`B81gd-LRVnpQjEwKP@teXp<;4YM+^hKnguPi5%(!B%@gFU zB5t{{gz9*LLFB?oMPztJ19b8mB|kZ|SSZuIPL_;Hoe_@#=8%O#*+dZqB&#W`^#t_M z1hcy$Y}>A2(28;TxCej0K{(LeNHFjtOw4c;Dgk0H5y}*n8ZnR|*nLA81z}+RFAdBe z?f{UWMVwq&$3x1QBkgv1E<2w|V^4O76cv?2fTCceacwn+ol|Alnaoi0tq@Dp}I}OglR#X7MMTW#9z;?V=d5+_#L-0Hm4IaP@DCWEZyi zcIC;J+G|IS>d$;&yS9*ovZN@{1koe3WFJ2Fp&1O>62)ZMK{`#5FN`8DrXf2LTG~Nu z^^q$HXoUcYIRFA6sY$dpV#Fyx+H|4mM!#A--hb3x_I?kb0U#s*aNV5~kYwWJ9)WbUQt?qdp?VLoTn&)DV>_ z6{OviqPd};V-4fQu$de^eZ0AFcD{KAK=;i<@mr>y`wmsqpFdpYgdCIq*wXI$!c=~A zvo+E4+H+9(T&84BYNlEhBC;gogc6l7&bVY&0EMi_QM?4EE)<9LlbNlV<=1zmnolV& qMsL>1Rc+c{^(6rL{zvD3j=uqoyX+>|at0Cr0000S~wYXblP03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00DwYL_t(o!|hg~ZiGM( zeGmi!apF|dZy-4oK{e-*l=MXZ0e7E(;~#38qY_U}HC2%G8!lBy1cHPbhL+=i-35{+ zWz=S8VcyQXd9%Q3|J@|s54PHUHRR9oi?j#;3jF@DA3SH7F&7YpH8=%+JAMwHrE``U zS1ceT*5Jh{L6o-f+Pkt@laKaP*MMclqnTjJfO2<4lpZ>PRoD30Ll+>6$s){ET?49X zpg1KRA1?@|62#sHnim29UY`$x=N(^fxDuSRc}fta3hdw!0Pyq@cKqd+->k<-Dg>Yb zu`7|+K*oOQ_&S2RB`50ul_5$MIKJN0zOUYnuQPQ3R|bgv#VKjnZzGvRKyD?By-ln2 z0Ce<$=k{C~$nuM{4^YMRtqI7K;FE@t_poj42j^_rVRQ=!fne$PS(WhCED$w$>JO%Z zkVVta`%syM1HTD)J&LIVc!|iR1N1KFlWH17i|7EE=7qiUfOilHm*DzcNNOme1=3t3 g6cM4-R{In74NP9W1#@zRlmGw#07*qoM6N<$f<}_wivR!s literal 0 HcmV?d00001 diff --git a/images/haxor.png b/images/haxor.png new file mode 100644 index 0000000000000000000000000000000000000000..00bb3c105dce040437c4b0eb1f53b2e6ebc7cf13 GIT binary patch literal 2388 zcmV-a39I&rP)~Zj$>vul?wc3)sgLN!HAs zvu4(rwZ8qWwf09ig>^plG~K=8E)4*$ZQ5i<$hb@^c|)mGS{zFz>SwgIA`}XjT-QBP z$mjpi_3^$}zIy$2hX7#x`j_e5f4qmzCw`_+RfBLE_QFf+7RIBsD>>&^8JwG@X==te z2^qj~9IZj{Jda$*Jyb52*4%mL9lye98vnE(o`3PB3qss@$ux|m$wZPjG}KdlLj%QP zG2)yP2t*pBwI(4%%JaOdmM*>*_n&XSbuZwN*!> zQ4kSn{Ry+a@8g3#yY=3WKB7vg1kdvV-w$s7!Kw#;`)L5!se-9k{QmwU109TW%%4AB zB~x)SEl!5XU|Rg-sfpU)hC#(jMHk9t43CbOWBL3;E53bC+ou6A{$JpyPjoIXl}p$4 zbRR^%ke7BO!~r0e8-2Z5kUr99UT+us6k?}Pxv6Ui^s z#^a5d!9ncUxr1$fa~7;n2&08Ogpx1}1BpZmT4{(NfG;Id_4V*vhlmgeA2Xcr;ib|LOdRCmLgaL;LULXSpDOlO!b4HjyW#k@i?12WeTJe*tPS06!Li}1=w~C zf*?R7S_?aDqg*awB$q=^Pd8l0VWwrFdGh4iX)|U_A9oAFb~r3VV0s=wYXvLtAp(I? zp$Nxy;5aUhrPDAB19c6JurqpdXpR45SpOge%Zm!}on0=<0$90_1WzWCjNzr9@p_J!)%X=OU?mW77K zCfzux8Rc@x9m)*m#tq<|xBu#0`o+t-Ip z3&t2)XSd_bvlk(3N8ov`_FUH#LVy_C@}pHNdnf!9Kl=ES>ltU)mx~1y3wg~sC&n0r z5b%8;K@h;;9MfjZLNp$SQ>p0Vng9_58PE5xeB{9gc1&1|7I$>)2eHp`ZZsK&p+yjo z2!bkgh5^g6KtzyIf^id!Gm=8U^E@{{Hun8B53hP{LR#=-=g$cM)~sH&w^A;DCqFiN zXk;YEJkJ9$2F4hO2t)+VIjnFPoHHmX0j&Y(HIF~~$kQj~eBC;lPzyf%xNE6pnm2CS zzWtJ|Ti=_WPN!Lgz5|A4|6YxMe~B=FXYhy!*pF^9IsK(ABjcJ-t0OZEdqn-s_@`sgjp<`rpY;i0W!%!xJZU5X}jz*&|oT~UK zx8RL8UYAWxleW~?HSSL)l6x3qJe$on_x5ymKKILC{ORUfzi~z+Qgc?h>^$=D$_HLa z)zx1igjm)xb=tEH4UNBZ9Cz*7&L@6@Gs?1pm2!B06Y%>4?Vnk^H6s9 z&waf;(*eM7-GUGTk%(OcfJ&t@bJC=yec!wPp8KXuo;mXG`PTjM?>w1oRF^NCr%!7Q zTW2q(aEKHDXsts4uzKY~-5nhrc5B=0n=iTI+Lj|n2Vz6n3<4oq8X8;XHZ(LWJNLZv zk4$c!Apqe01Il{k^=*l#p7}lh+SSYC@L&e7ZQ4bry@uM&B##WM6{U*PUM#w~>~JQw zXV3N<_wVnL&CRVFh^hI7{P0{ml6v>xfv$=S3ZGwc-UZ!LrZ0R)!*nf^8{x2Ro0c`8 zJZJ4!u3kEDIxV2;rFFdvbXrmG28+V5$wlSZAkssl&=fLi;;Cz=Ol^ViE2`{>3wg-K z(Sd_VXL4;dsbX8p^x3fOFbr+|C%}#)4 z)BWi$AKJGcyBHdR?$*C;*tjU-*JekQz{0Ln^JAX%b@`uIqevPtkh} z0B)Q&i(cH?@Wp& zafmb2C6XUpdG=X1-MQh-y#R3cMHdj=Fsp^F?-@`tYaFknI=q=gYzowj4?1qAYx!dAXZgF0zqpHrFHeI6nsB`@B5HaL1_i06qM4C zs;ZWX882rPyQ?^Obl3o(Qj82~TJH(Qjwz7O7$;)HND*gXRnx5M6Jtc+1jeZ9Lu;*- z)>132wNgrRE)ceqQd&tRH2@EQD}+>}l|@SBBIS}<1n@76IA8l@N$D{F0000Y3QgZ+DW<`RDgP2kNP(o_gx3r=I^D z^~ZTJIS!C!kcd&h{NrvSc3}aPKE}yl6K8{N_KQZWd&46j`djg&?9T#&Vg;vlKPQ4d z5efnk7sNI<isrsc}n{WQ{yTUiSXBPr~-c3rth+ z4M@LI425x4t9KcqDI62=1&Zz>Q28}9Vf*t797Qtutm<_0wp~)ePDM}sb9WOM0sMl! z616`HG;=t$jVl8xw=R6?g)CY!%Uny`%kJ1P!8A{QjZD}oma;eO<&6|3i>d5mshvlpyWEo@2J>fE4STv6_p8*?v~ zH$m%4gZB~d;~4LGt+OJ?4X8av+Sc@-O5Ez`nLl5C;I0Gv;&P5kWQeRKnh)@{vOIq4 z@0UY2Y-jw}%7`nJA0}&6b=p57W^1sCBPlPt(l2XWLuoEAGv3(zvjld6xYBi zBzd)(%b5*q|2$e1cEX7-bB-4xCfG>3kLhqFZeu9b!fFYGEal?2JZPW!``DpeTgCs><_va3fe$MQlNdoMSKi9<(Z`IcMq7@n9;U`ssI2007*qoM6N<$fuJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-#n5fwToUHdJO000NCNkl#UFZ zs~-IEjmz)3?q2>!iO)J=+1=NCwWE;!ZD%fVVJTq+QRK|K{MvhueqI1|GUG!lZ?{x) zrMclQ%ss!jp(mSD%d?KYsypjY$|W(xPPO6R3f%F9dSJz`Z(XLs%3X6i^Xcw#mcWld z2s8nHsH5jzs})u~{CMM(1Kj`1tFCCD(fLqLh26bvNo=W&7Pg3E0m31Q8YT!M5t_vE zOTPW9WuFJY`frA9YkzY4jI3HaD`UEQ%L(G3g+>Zv3}z6!AI&%_1%scGhSNp;3H#qFS|o*+_YtSAy_oGna(64v9E6@&pf}L zYrc0a-&oi~92_Myg1-Jijt$4u!ghp}z@m!lxKT1!y7B2Xk6o3|iDOGt|VKXj=?Jy^+Jgh~+x0e-8F5CKtZipkwuXzbZ!vPvVR!f|Zu zL|QbC?J~7}Z_{jqx2;;WdiAtIP%M_s$nbGyo;I8B-~Lk;ZGN4oIxkS;+`CDJu4 zIgTwm=$t#38OnpB4Uu;v+KOrF^%m8s3i;keqLwXlWba-qDcg-PLI`0_3NTR{6UKCl z+SE9yREi5OzLZ9-%I>}c93LK_>5Y+3#FR5>EaTBJqm!>(dKvG%_7Y@rSU{uEL}Ss4 zEyCI)j%%Ye{crNQY;qneUEBog4j-BOOTeF9zZ5lpuMfbNNJHtBsqHY z5K`Kd(w)@2Nzw|8i6Mg7-6dxC6d0fE!>H4dmceV)5F$oNfl>-vYWzT>wV0*{go^Wp zT->Nt7#kfXnMm;V_MMc9B{I_D>`Y7;X^b!^C6QK=LaIumKE`B4ASLK1An-gasc1Ak zyq1UKB&T;2C(~$YX>BJGXbfJ{XWp4-Q7X4FIF(|m>LGw2mG=AW4M~uGC1&5NV6&7Ec3UW>1gq z>YAxt*F^L>uDx0UOdx(PQKUZ_?<0uO(3tNSx8A4b#QYnlMN!So! z6KZ>UA!s&7tx~>_a-9SQ3!z++NtbLgX6vR696E4-V&{D7fs5-XL>wZG1})g$cbqNn z9>!}msnse-rSN=1t=htCd4*zIIrpgmPptl{Uu)L)wmc6%2#Ml=IJPiOmcb7Ox#hMy z`TZYOGukTB@-(*NaCoT3bFU7t{+%Xc)tGv%N)W`fTCoWOjU_CmrYb{~@rlHzmf;I8 ztZ(!mK5_j;OBY^@Z=F}b{*llSM2=C)7Pb_uePKNpE?!KMB=7It$DSbvWS*2;$8lVY zHYi(}Rx=Pm6nVqL!^_wF?b$y9qtp5q^!M#J*59||Nq{TM^PgX!^}29;Jhk-e7wN1r z*1Gi@Fk#GKt%Ds$4}!GGXB|{3PZ))!SS%UK!kU~M*#7vVPksyZp=rN}KCV6e2ZxMh z@5rXqytZIDf&}6bd=&Esv3r5z;A#Ov=WVhDM_)Qb|`tQON#-NAB8x;NYvD z=}Gnpig)eWx$o~UzWh`slNxO=XU~~6r#DwBX92A%Q#GShEOgi+2%}vmhR3$}VX*(j zf4=seH#WcZ3J{;tzah}OV)@VRJa56g>!To0o8R7p?=`)Vk+D^e|LK{P!0?C3t@$Fg ybn(K4tL|I&uUl@qdR?(tI+OpC><`=L*1rLoB%|w~`*!vK00001c8?)uL#sh~tl3^XsrpuaO!ofpV{2DZFBSHO|D(LMyJyu%Q9wW zX4u%+;Q90CynOkR&!0a7m}w6;wE@?4&Dz=;%gf6+j)O4Dp#FHma^09aC-f{NqS*q14v$M05%VngL1VJzrSvk!| z2L}hlaZD6NwA<|?bV4u*<8U~{wrwhv3Tc`WMG;XH0i?f;z?(O37>~!aTCGVSab1^Q zuSdV%$MZa-ln8M|y)giye-S@>52i;Ih9etw=8FJ92^_wx;G+eT}R=XnSr*xTEq z*X!ZBF4bz4g@py?=H}Sl-Tid}SFT(!zV8#qF|S^|qTB6~Bnj1O6=Mu(nqpZNNs`d( z^{ChDtgf!Iu&}^jFkokA2Px&RW#Hk%hvx3xyPQ6Knji=W!;pi60|1OMBuPRX$KTCa zUS8(TojcsRb&J{AS+=*g84icXX5ohfR##We+S(d3Gc!DW`jq$Y-;<^(U%q@nN=czm z$U9+@BzaHBvW)%xeWa8`QG{*VG#U+x#iBCC{4fhYG?1n#K@jlq<44}Ueamn-q+BlJ zc^*nBj4?QlLzYZM`4kY zEX(qHmr|mX!f~7&zw5eat#KTO(P+f(?krM$sla6Ey>j~}0@R4UxRf1hX1 zo?%%QrBVr{6hesn#7e2}Dq+$WwAM76O>W=5&8btTc<|r>dwYAFKYyNnzkgHYu!0|!Y& zK~z}7?Uv1N6Gs?_pV<$`cD`ilHc=CzN{JDbkT|smq+BZXPzd5LX#ayqmFNM^ExlBz zk)ldbZ_q2J#s{vzp`;S!01c$3kTx>JvB62aJG&*4~y`{$R^W0qJ z@3+HhwKil8U}0g2I8In!e-4ar@7^k#o0~Km4es9kiJ2MCZV9C95=9Bd0Ca!^tqmh1 zqf{!#Fue!%0JQGCpi~;c^SnI}2d#I=vb6)V-WPxou=Jx+V6s?srT5~*=BL^OG>3CM~{BQkt4@} zm|{`c1(=(w%wD`Wf3uf`jOpo*DHPs9>l9-IQo42ls@2-98#k^_B#ElG+X5j{*48!% zf)L+_0~(-zA>8-6FhtP+#bTa9VSv_)E^CiB4#R}KHZ#Ns6oM23_^x2I=-CI5Qj(?$ z48&cBG!uBPqEzy6-FNJlV0d^4V+`ldU*c)~4+e`q#(?8EBuRMu%$e!HDnJ;5l)dw~ zE69{U>m04tbDli8jS!CA|AA}QzJE8%vU<{0WPxJkm+P$8AK-gAfQQv;?R~2m$mbyl zB7R)Hf|LQqC?+RPGCqC+DH}k|u85YFzPSmIWhtjW`IJuJ(QXH%X?i#!`r+z#6H2MN z5Q5!KKp1W#L>EE!$|`&P5s(8YqWA?;c5xhs)z#mr*Eg7%sn`byWfP?oLiD~?DMh*b zHiLsj%H^_sfT2N6ni|^ME?NtW(F_j{Q78C1k*^wk$D0{x-mQLxdir6a@c@{cHBG5WIOP=pn2p zF$W9@9$^1@mo6x7RcHLt=Uc|sVUb0@LMbyPH!|N@;n!Ov)k(% z<8wFc!|!ZkKFg3C9b!7ZL}?1>&wghcD@{-5_vGwM%Ws47Sl`@G>zf;@(UfR3B}T~* z^I2vn=Bg0kD!V9(a6bM~Sl{cL8>LO>_WDNHiat#4j5U;IXBEV8j8QT)43+1(pi@?< z99yZ?)*4n@Yq&~NT&1b56sH1|e_~1CPNZdPi$`-A8Iu4hot>74IF3GAB5xp-H@uzMti~ zAzh^@q?C$C2>bNm{(+W^cR4HzCm@|#4W=*TOas~_Xe%JfD!_36i|JgFtHJa&Eytc= zzPC!W)B_8R$0EU{wiTe<+fB{x4|P}R*{(Hed|4R4rZ*O2Jjsj{@ce5NMp1NoEkZ?Mi8*eOSI2;k|EqbSTK6cc0DK24f}c^y`SZ{pXG&s ze54~U(KPiixx;*x>7j&^sJk}e)9rM8X^d#LF=;b?>y45j-m53`?oU&lW}b#x*%Zvj zsBYLt6h*qj(W@Kw(GB}raxTAZJbsYUCnG7P`sn*mjfOq}zt5ASL!BNf+lR@WvCgib zqNo+M%AeDzo?d7}KAKbTCescA4Q#7WnE*Y*QFZV^bUMCtPPasYljRMqEJT$D$fD7m qOYeGkeM|m-dL-xNMvvzBkN67}$!|j-4jW$p0000KhbbgeKmVfs-_DT6%{Qfi1*S(cuxeB8d-y0XpC!+k-`Sk2H>|flfP*Y88H9vfIXNhdjAL|kRD^_NjEroQlysb&e1wE-baY^h zjC7Qge4LzwtgMoxq>NNlNQ8uREG#FKl!Tm|jAUe56ciGqq?D|zoQ#ZrY;0n*w4_8t zKZJyQyu7irw5+VGr^Lj+&(F(rbaFU2H%v@Rl$4YD^8|f-Q)+2OrKEa&d|$S;o9*X} zo}6+`Ogdd$PknrFpqgU6w1aSLRol#ewyJBCjBA{fa?H7OjDuo*b5fj$Qmmwr%$zWN zbYG2wY?X|7%BgH08WP;YnY5&fpOSoygLIyhhi+q6)ol%xNei1~GdVMf_m47X7agfs+RR8FUuk9BNk(o6<^bZ?k61am3~ut5%7Bny>{h}1v? z%s&LaKnk}s1)MAdlq>|PGzf_+2h&6kj5HM#3<=CM1jIB1rz`}~JPed947e%;lq3Yi zH4RM_1)MAlHxUM=G!&OK7|c~PFdG$1IW&!ffW#~Wog@Tp8U-Q?1%4_Rwx60+OG$k+ zCPE+@t`r2uJuaCjBv30VYC}T%1O(9p1ez5Tryd@L;#2d9Y_EG010qNS#tmYE+YT{E+YYWr9XB6000McNliru-~~0{{|MBl^SYxg@(zbFDv<)`ydXbGSBDqj5N?-z1uCiQG>+1R@Rb2_C__0O zhtEe{L9z`=WE_4rk$J^p1E`lbnr07>u0T{2#JMBP|G>=P_lOKI3%J_{=5IshO{Mvd o(@s2riG1+RyH3lE-_4ch8}yh}%kN;+yZ`_I07*qoM6N<$f&xwGT>t<8 literal 0 HcmV?d00001 diff --git a/images/shrine.png b/images/shrine.png new file mode 100644 index 0000000000000000000000000000000000000000..455d1c53a87c307c7612d444ff49fef8d4d2c381 GIT binary patch literal 1387 zcmV-x1(f=UP)VuG#Z^JqFW~i#AlmGy#N;zk2Z*NaS2+v=?e*K*b7cRtu?CtKi zU}tCN7=YKyvV75dFGQq7q^hdStN=8nBspgpjYdvHo?Td2;JU6qymIA=9ZCTap{=d0 z-xJXvLJ08QgNQ&xFq`e2b4J^?XqpC1)1YlzFmtuLyZhqVvuEGB9{_*X&zm=I{#-;} z>JN3!p(qNJWr?CFKs4ib&cS;R?>(3qWmzsPE-t=u`SRt}xdCq6xUm4>0)S&ggp?9g z70iqf0-SS$68-o7TL<&V^78V}<_1vJ2Z(5`3k5_3ZQCN}jGQx6^_%N^`4MA8j1iN` z)m__P113R8=+Pgoq4^jK^aT5t^o%ZNR)NB7UwAn3<`n_OT}-l#hdAmpY;4({H)+sluX(tp<0*5ceo)VA&4VvO%}atCKIe zjlUnd8Lh9cpDWAq&mn|I`*8FLr>YPUR8=+9eo6^#+x}}Znf&_V#f#T|kZ!oXzP=00K?5y)kNf@^XJc>1CS1~Hy>otnKNfTJAVB5KLAM18BNn*e}5l!T@TV% zRRuFk*Db12HrN_+d#GwF8^+*$)WM zts8)2CO9`gz>_O0-hc;lℑTGlQ4`IU{zCIJD``mfMs-%#bcY&FskB08g#1@_#os zA0OoHTrjGFyU`2x45nrV$Bf*~2T(-_;l2RhI+oW>^D;a4n=DdlHvx$V#0(6;W@8Ub z6{0$W%o%NrLr#d<<3|=2ZceM}a}kjP13Yx%#2F@fJLg=Q*-UQd;Jil>0zy$B6a|X1 z946s=Ly(YOEr03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*013EBL_t(o!>yM~Y@FA1 z$A9;GKW2vCJjj{hkQ7Ntq)1UxX8B8vhA+8` z&v)-R@C(MdLgv9IX&ghJ;{O=RCkZ@L1K?UMAAgc|*|XpHe+TFWF~H@#Yc1t1kw$RDZuHo+dh9a9_)43d_aJ&vT(X>p9+Z)_mhr1GuqSIrn=r^77Zt$fd8> zWbPT~cLA33Zsa*87t0gzq+>jFqqCkpHw@ybieu=X79ck|@PB&o#tdsmGpujSVNV*b z0hBYgW2y@8?6v=_ISP5YOIhg}8YRp4-z_?y`yUQ#kA3&Dsl9*Wa|gAu$RdAB!~MF; znmSq>jQ!RAC?ufcruw`$?EcFt9wSMu<}YRxcC0y z7f&3)>0Vj9ynTVM%zc(Wc>7nG9v1N(eq%15K_&@v6E>cqzFvQd3!9z(x8o=wOyok% z)mNV8z{OuX^X6siG#4ipu-~=JN-6i&2>>a+%4Cy!8;%Qi3LY`XSPJ8%8fQ9Muy>EW$^FJ1X>(^H1H&5kETwSGT=`t1K^``;2 z?-*RsE^u}ABBkvToqNHF8o&<%R80j13`56=V-|}!I=Vq(Tco1|pbl_mc50~_4taiV zk{|3GsSj74r{-!fj>L->?6bi?y)8a&4dvte4~Jv4p^Dm9F#;7$C?^3FMUW;bq!K>} z2!uvAU%<3XDwPtgZXbZDg7^CR*%?la`e=nLja0!8Ba%vi!Klr_*1q>-asbOT**k1w znttPD`lUwvrG44hHNK8_a{5_ zw@2K)-C!zInLfQtoF)iE@XH5tEA2*)`Dd?@{8C6VmB@B9lxScWCR0U^``denCvHM@ zLfVe0YmCeYvuiN9W3gbKVkRmRZbTHCDeK)OF5EAoGzErhNcY2(=R}3>-iU5_L`&_H z`$Cc2tCKiRhU2XsUE3ETtCFS(e(2Nf^@;ol`CkBfS*7&(+@*=gSq-(6Y?LEPLv|j1 zjAN*vNpvZ(;)GHAn4@}=quu0AplMlJiF8$3dWSp{d z<0c!w;*)3+f5o8D_y61!f~l-cgC0gz ziin3S&J-DqL)xP;4cVic4zYEUw$>+3#vli{w!|<^>|BmWO7xLI>I>$)l%qj_A4ce^ z0HNU<5xP_vMImvRGWH)mXj*w;;)5?&t`NpCo$QFU)ZyHzBK=W>s;Y!hO3BHQ^)l4y zu#!2&rR5mgl#~it-uR&)AY#KgA}B{}PB!>ld6h;R4%-7pK|m6MIjNw<3Lmz%@%s^$ zWiXL*e@C+>4Q|J~*ceP`9$`NwXX;pnz))2}RMP!`Tx=u9FJ1P;wEKTvNH&8Aod8z*bxWG$+-BCcm4W66*Fo6Lw3reiV? z5pj|dh6#7uT~=q8FhZ3LrNOunAf^1Ho&DxF7UwD`hN_VS32H2eWlAp@vej&Jxl$xf zK%i3V7g#su$rutXfXI(XqJ+WN$8l{EBc+hb@z=SxxZ!LgLWL-dkw*bzV9F^ z5*hjY!~K6no-wE{Eb_>+4sEl!WJ& z=jk>!X-bWpP)VW$QXy4EaZhw%agw5{3IYh@gdm8JQj)|eNh)dg`UnL^enh2^=l1pi zP5Tb6XQK;2Rr8olOJqkDyJnkydyJ|m=&6b!T>5eh0whqK^u+Z$n_oH61Pw<1A8zh8 zske@K@7Ddlxbt9lednNcxi=hNo-P;8wvUG>svwmTslsfdfcZW3J>wr0vbSu4IO2FX zWVh93>);SoQ4xxQln{h5K^PN;j|Qst@c`gfVIuQb3-m z@fzC_=hMBTbN=(2xo7S<18cCB06(hnaD)vo^?wbh^YE4DU-;D_RkEk+{ypFN&`xu- zcX)1i-6T>PedSu^~5xJO{lTu3AbLv>G1@^60U%8X=9n$6F z4>WjskDff)2>rNLgs=z_-PS_hyn$8H@JbKae1_ueJn!50_2A#${QIfSsP9~h&(l;% zU-@sOLWqBF;SL|iUp{-`VaFK)TomnHluQ?2mBsx#A7bdrB9ZDGCK97)U>1sO>w1L2 z*v$K*VLS2hUBLq@=_@NG&S&3U)7AZ{4}aBH+lZ0dPT71Agr7{INJ!D?dU!XfsTA?? z04g35Mv=vAhW`Em4u9uqo;>kO&W;y$uK5^_%#^A>{mDlUW~Q$(IXOZ>t)jMm6I!lF zIqRjS)!^3K30m92C~gV=raDf)_A>c&g3o>VDQtf|nM;58(_k#!bGJFP3db(Kt8*9o zzH|_PRN@9BZ~P7`sZmwaPP5fSTk~dOLk^{Eff>DrM?UgFYSUpH*Q8xkLoriWX@W`s z`I0gJpK};(r#{-w>`az{-b)PiPLZ5QFrBJGYJR@(L>Jmrn5+suU8hEqEY7F$D@~wO z`tu0aDcw$FlGX}5@L(t5&Q{L!pJB_^U3}(iVdgKiAaorgD3Do;fq0tP6zc=1iG<_J z-wmfsOLZ*?ufTF8S*egKrLb~-78h(Lri=JP3b|wn)0;zModD_CiQ51g10jSWF!KhX zV2Nmb6T*?WnnR$<2O*WxqC>i9qf#PQSSP^3>{R^Du~g9@pDu$?2zi2}6LBi6dRCBy`+U&4u-Tg2DcD z+$t?D6%(N7IAE3uc@+YIAfZSDhE<}F^-)Ypw6ef76?}?Iv^5IrO+sBKo}EuDtsaSM zn|Opqz!w6|kI)1P8qHhhNY9rs9LQxX8XE)TU1$9Om#;HznFfw@K)Q&si&sT=(<25w#-t=QpIOu{LcnNQ6TX>$-jxH^auieS4Iabpn= z9x#hY(?$vv#Z*vq8-hLxnfZzU6?Xv0O~l60g@&f6D4Gre65~n2aR*Bi7$pP8vMJgY z#j?eYElV|SJ{fm50)T}~t}KL$Dwc#7rembnT@|78}cK z2tXm7jN8Q$I4+r)c{EER6&0Zi>amG#ZXj6eVn~-@6@)x~W=Hgt=&6&tT#A-XBYeRUe+Q$76R^^0;mx#-)FdqG3c-Zyb` zq~q<8%XD;XBh=c4*B=B`B{mtuHdR`77x2$TIDPe1UOn>{VuNp%&ks(%2XI%cw#z%# z<-OW+tA(2G$M#(O{_&ITp1BD!DTC&=HoV~)(gl~PYYF^H6@NVSEa9E)n4-q|=95p{ zYs2(v^jFoE1AMW2`_HeQ{i`&m=A@m>OE;gFHwP}u#NecS<@p!n>0kHBqdz<@cT}-? zE&7!mfRFC>A9(JWgL3rBn7lq5lQ*X)<=oV`9PNEe9{KiRx#u4Cu19}W*R*>>G<~A0 zuK&d&hvo3tEqT7DPrh{GMY(s2a%cmuft78$%E!L(`MuM>J$g(&wmUS&|I0eVJPTB< aCH9}(`y}fyw$0K20000L0TvZ*%Kj++gXXeghXJ%(-XSd6?`=CJEZHp9J6hY8PkPxg2h)o0qjgkkO(_U(DDvoJq;`~JO8J@CY1fBf-d{X3HY zkN4j#-s~^_8`1pK?V@@44GKW18$;!B?H5+nzOrh^4;Ss#laYA$C3oC$mt3>DhfN#L zM$ho$1?*ta``%zRikXT(%Z8fAvF$;jv<8-pjWS7804&q*7^|Mvc1d5sw0my!yenoPw5gx5_RY zNyJR;VFR}pd}TR7(UiP|nqy;n&#`~cF8X)QGM}}u9S4^dM4%lb6v7OJ@qLBz>$FBo zjE){;p{%jIYpv?(=@G8uIRCCE|CQxRD5X-B^4xv-Tyask_4B0>^j+5$K{HG^8Ya=& z&ESD9?)=R#6H`SBR)lcs{bV{fP%2f(FBDkF9VHW+qb-qRaPI_;-p$HY8wp2ZO4qg0 zDwd@s^Q9m!?#ZEKlBQsgBV*&VwP(NZ!CxN!6Q}le$aQN^r&_Htdgur<(=(t)_{(4W`S6A3v26KzlF0pX*p(HuAcLnK|Btyd^gu^DMbhJ~i*G@=u2@o*!)acNF)V(|xfAk^( zp%nd(zl3Fbtms`yD3avfd+sBbE0SLj?^o=r>SI33MJnwvZ}Zd^}19%fnIXpT-em=_szu!SiI*l$}{Q5L=Q-jPeSd1S}aA=}RYrI4WT){sBRkybxxzjjr@*xNcqL=7z=Ru3YP{?l$G*WR~R}actM8X4QyIyw|1t*Pl<)2V(KG(4>als8K8yh{v0V zM5A2r!E@R0-VH>eVWy{NFbrcU`x{wSp4z!1D36ago}za}f`;QQg}(5TnZ4INFB zCC?iCk3e64w`OY1VZp? z&6;KiDFjjobX_A93Zaxj3J8Y-qHG0za7wu8{zxpzKMv)n2^URx7>3Tw>`{(RkI>Tr z`Q!WOZJm(IT4P7j$V0-SXKR^AG&` zt0%68@kAQesncj!$X7q>x{huH&@_pZ8lLAMq=w_v@I4>hh?oHJ)mKjd7f5|KA6|J)=D;rl*@p(6yi zu8))gZGb#NUALlntprztHA)6r&9D3qvF8`$;g3Cr8pZ@5fX>Km2sfAebXoox4Y08d%L zk>R^;_G=1FD16UG3UC~oVzG=v6Pq@jO{G#{Zb2hEcaRNh6BP2(KLURH??1ft_D9@X zZ-3++A8>SlW5c)fhc)+u4?QvBNmAPRAJ~Lx8Z>Gai;H=xRSVD8ka`@ew2#X#US`Wc zy#Lvu)K}i^*-`_z>f@IVM5VQEWtZv_T8Z65V|Wf67}-y)G>zRT5D1yd@Mp#8E8uvk zdFypwxo7JOFFap(&jsHTa}!Vg*8p$m%_9SMZVaiZn{BUj;mo4P!m%9Hl4qAH&g8l0 zWLC~))r>D?tZniFc?8SkB}}UpR!J(GfQXHV$Sw#8q*Id=`5_zE?6p`lieNWu zGY1AfE(70Th6@&p#bU8oEEY=&6kF0Swxs_r<@u)6gAffuG~bkZf2!rqg;Z)i^f5|K zt%o}2Qc0)1Azn2=uNTDaDcYVUx$2`d#QVG^M#@hmceKmUE2{e*L!`;r6>u_e*_G(* zo^_6O;+W_!Z80tvl;;Q(m`BNc%>`LPxuEXDK*m0Z5rI+2)k#MVfaT5xx&7_r32wW> z(|`$(&1SeU_XXeBL+gl^HWLB=MYucEADxbAfl%S~ZIyp*ifMs)48w(d<@5yu5*l+*<0Q^ZrK~z}7?UO4G z!ax*7?;{f+VFTR<0)fCFslp>!02Ym90Z2Tml^6s9!2-~jiq=8W&xD8Q@F}IJP9bDY z(#)ip=AL&a1q=p*!C){L{u#?5wjAQGh5HQl8P!Wz4)GyD<|&dO9pS6~`+- zX%ny<;zjQfF4a~%rHnUO2`V#u*3C{HUDCBt%buNX9}-kn_@tAsJ(TI%6!~xFyHrAy zRDe6*(ct;TsLcptB>-T#&&}!rKq&&A&Gu^}K>|dPx&peN%UK9rzoIVzsTvR;QnU(i zoDNKNu3jLJfKXQ;o8M?40a{AnoD>HjX%i4fLUh}o2tUgevb<#7^a1F@00000NkvXX Hu0mjfX7__i diff --git a/images/upgrading2.png b/images/upgrading2.png new file mode 100644 index 0000000000000000000000000000000000000000..eb785a4bd9c81344c85a0ca3c541a05fb223c2d5 GIT binary patch literal 503 zcmVXwxDv^dqzi`UGu*7C|oh0JBr1Md3nP z$cVNHgd7TrS=nL=LJ84KDwT+td39#))4~XZS^CbVd*H6_;+%*3aKYp8csw4D$MawC zRM(kRU%RU?ZMU9jVC*uBy}jfQujnmru#OF$D=Nw^Y30DMxos?8)C5nYjs*<9)cqIV zag`Hn+i-WvYA~4&#a`F2^%{0>Lq92K?B5fmB7d&Ck8WAvY7hMv zBB(o%K`w?Lby(ii=Bt}_EwzBD_u9KXWS8Oqq5zT>ggQOW;4p#3k18EUOh)G|?^)GI zwZZ4o4qHi+i=%^#XJg2O@L^Aw*?KNR+;Sw}rp?YhpgU&&-3|{)lqF`oD`$oNF37}C zIe^`-dQ3o^&$FN24*aFBs2iihR_+#r8Thm-zD(O0XOw0@0NEo4C(To5v&|QjZh+9Q t1~d|AIcT~L2Ph getTerrain() { - ArrayList terrains = new ArrayList(); - if (Dungeon.active != null) { - terrains.add("underground"); - return terrains; - } - int tile = JavelinApp.worldtile(); - if (tile == WorldMap.EASY) { - terrains.add(RPG.pick(new String[] { "plains", "plains", "hill" })); - } else if (tile == WorldMap.MEDIUM) { - terrains.add(RPG.pick(new String[] { "forest", "forest", "hill" })); - } else if (tile == WorldMap.HARD) { - terrains.add(RPG.pick(new String[] { "mountains", "desert" })); - } else if (tile == WorldMap.VERYHARD) { - terrains.add("marsh"); - } else { - throw new RuntimeException("Unknown tile difficulty!"); - } - if (Weather.now == 2) { - terrains.add("aquatic"); - } - return terrains; - } - static public String translatetochance(int rolltohit) { if (rolltohit <= 4) { return "effortless"; @@ -321,4 +305,71 @@ static public String translatetochance(int rolltohit) { } return "unlikely"; } + + /** + * @return Current terrain difficulty. For example: {@link World#EASY}. + */ + static public int terrain() { + Thing h = Game.hero(); + return Javelin.terrain(h.x, h.y); + } + + /** + * @param x + * {@link World} coordinate. + * @param y + * {@link World} coordinate. + * @return Terrain difficulty. For example: {@link World#EASY}. + */ + public static int terrain(int x, int y) { + return JavelinApp.overviewmap.getTile(x, y); + } + + /** + * @param difficulty + * Terrain difficulty. For example: {@link World#EASY}. + * @return Name of a d20 terrain. + */ + public static String terrain(int difficulty) { + return RPG.pick(terrains(difficulty)); + } + + /** + * @param difficulty + * Terrain difficulty. For example: {@link World#EASY}. + * @return All the names of d20 terrains this difficulty encompasses. + */ + public static String[] terrains(int difficulty) { + if (difficulty == World.EASY) { + return new String[] { "plains", "plains", "hill" }; + } else if (difficulty == World.MEDIUM) { + return new String[] { "forest", "forest", "hill" }; + } else if (difficulty == World.HARD) { + return new String[] { "mountains", "desert" }; + } else if (difficulty == World.VERYHARD) { + return new String[] { "marsh" }; + } else { + throw new RuntimeException("Unknown tile difficulty!"); + } + } + + /** + * 2 chances of an easy encounter, 10 chances of a moderate encounter, 4 + * chances of a difficult encounter and 1 chance of an overwhelming + * encounter + */ + public static Integer randomdifficulty() { + final LinkedList elchoices = new LinkedList(); + for (int j = 0; j < 2; j++) { + elchoices.add(RPG.r(-5, -8)); + } + for (int j = 0; j < 10; j++) { + elchoices.add(-4); + } + for (int j = -3; j <= 0; j++) { + elchoices.add(j); + } + elchoices.add(1); + return RPG.pick(elchoices); + } } diff --git a/javelin/JavelinApp.java b/javelin/JavelinApp.java index c09c11e59..e14127287 100644 --- a/javelin/JavelinApp.java +++ b/javelin/JavelinApp.java @@ -7,13 +7,12 @@ import java.io.IOException; import java.math.BigDecimal; import java.util.ArrayList; -import java.util.LinkedList; +import java.util.HashMap; import java.util.List; import javelin.controller.BattleSetup; import javelin.controller.TextReader; import javelin.controller.ai.ThreadManager; -import javelin.controller.ai.cache.AiCache; import javelin.controller.challenge.ChallengeRatingCalculator; import javelin.controller.challenge.factor.SpellsFactor; import javelin.controller.db.StateManager; @@ -25,48 +24,50 @@ import javelin.controller.fight.Fight; import javelin.controller.fight.IncursionFight; import javelin.controller.fight.LairFight; +import javelin.controller.upgrade.Upgrade; import javelin.controller.upgrade.UpgradeHandler; import javelin.model.BattleMap; import javelin.model.item.Item; -import javelin.model.item.Key; +import javelin.model.item.ItemSelection; import javelin.model.unit.Combatant; import javelin.model.unit.Monster; -import javelin.model.world.Dungeon; -import javelin.model.world.Haxor; import javelin.model.world.Incursion; import javelin.model.world.Squad; -import javelin.model.world.Town; -import javelin.view.SquadScreen; +import javelin.model.world.World; +import javelin.model.world.WorldActor; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.town.Town; +import javelin.model.world.place.unique.Haxor; import javelin.view.screen.BattleScreen; -import javelin.view.screen.world.WorldScreen; -import tyrant.mikera.engine.RPG; +import javelin.view.screen.SquadScreen; +import javelin.view.screen.WorldScreen; import tyrant.mikera.engine.Thing; -import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.QuestApp; /** * Application and game life-cycle. * + * TODO refactor a time manager out of this which works with + * TimeManager#tick(int time,WorldState world)? + * * @author alex */ public class JavelinApp extends QuestApp { private static final long serialVersionUID = 1L; + public static BattleMap overviewmap; + static public WorldScreen context; + static ArrayList lastenemies = new ArrayList(); + /** * Keeps track of monster status before combat so we can restore any * temporary effects. */ ArrayList originalteam; public ArrayList originalfoes; - private BattleMap battlemap; - public Fight fight; - public static BattleMap overviewmap; - - static public WorldScreen context; - @Override public void run() { initialize(); @@ -131,47 +132,41 @@ public void battle(final StartBattle start) { ChallengeRatingCalculator.calculateElSafe(BattleMap.blueTeam); List foes = start.fight.getmonsters(teamel); if (foes == null) { - foes = JavelinApp - .generatefight(start.fight.getel(this, teamel)).opponents; + int currentterrain = Javelin.terrain(); + foes = JavelinApp.generatefight(start.fight.getel(this, teamel), + currentterrain).opponents; /* TODO enhance Fight hierarchy with these: */ while (foes.size() == 1 && start.fight instanceof LairFight) { - foes = JavelinApp.generatefight( - start.fight.getel(this, teamel)).opponents; + foes = JavelinApp.generatefight(start.fight.getel(this, teamel), + currentterrain).opponents; } if (fight instanceof IncursionFight) { ((IncursionFight) fight).incursion.squad = Incursion.getsafeincursion(foes); } } + if (fight.hide() && Squad.active.hide(foes)) { + return; + } + /* TODO enable in Dungeon as well, debug */ + if (Dungeon.active == null && fight.canbribe() + && Squad.active.bribe(foes)) { + fight.bribe(); + return; + } JavelinApp.preparebattle(new GeneratedFight(foes)); final BattleScreen battleScreen = start.fight.getscreen(this, battlemap); try { battleScreen.mainLoop(); } catch (final EndBattle end) { - int nsquads = Squad.squads.size(); - battleScreen.onEnd(); - BattleMap.combatants.clear(); - AiCache.reset(); - /* TODO probably size comparison is enough */ - if (Squad.active != null && nsquads == Squad.squads.size()) { - while (WorldScreen.getactor(Squad.active.x, Squad.active.y, - Incursion.squads) != null) { - Squad.active.visual.remove(); - Squad.active.displace(); - Squad.active.visual.remove(); - Squad.active.place(); - } - endbattle(); - if (Dungeon.active != null) { - Dungeon.active.activate(); - } - } + EndBattle.end(battleScreen, originalteam); } } public void placesquads() { - for (final Squad s : Squad.squads) { + for (final WorldActor a : Squad.getall(Squad.class)) { + Squad s = (Squad) a; final Thing hero = s.visual; hero.x = s.x; hero.y = s.y; @@ -183,8 +178,8 @@ public void placesquads() { public void startcampaign() { SquadScreen.open(); - WorldScreen.makemap(); - new UpgradeHandler().distribute(); + World.makemap(); + UpgradeHandler.singleton.distribute(); Item.distribute(); if (Javelin.DEBUG) { JavelinApp.debugoptions(); @@ -192,30 +187,39 @@ public void startcampaign() { } static void debugoptions() { - int totalupgrades = 0; - for (Town t : Town.towns) { - System.out.println(); - System.out.println(t); - int noptions = 1; - for (int i = 0; i < t.items.size(); i++, noptions++) { - Item it = t.items.get(i); - System.out.println( - " " + noptions + " - " + it + " $" + it.price); + HashMap> allupgrades = + UpgradeHandler.singleton.getall(); + HashMap allitems = Item.getall(); + for (String realm : allupgrades.keySet()) { + if (realm == "expertise" || realm == "shots" || realm == "power") { + continue; + } + System.out.println(realm); + int count = 1; + List upgrades = allupgrades.get(realm); + for (int i = 0; i < upgrades.size(); i++) { + System.out.println("\t" + count + " - " + upgrades.get(i)); + count += 1; } System.out.println(); - for (int i = 0; i < t.upgrades.size(); i++, noptions++) { - System.out - .println(" " + noptions + " - " + t.upgrades.get(i)); + ItemSelection inventory = allitems.get(realm); + for (int i = 0; i < inventory.size(); i++) { + System.out.println("\t" + count + " - " + inventory.get(i)); + count += 1; } - totalupgrades += t.upgrades.size(); + System.out.println(); } System.out.println(); - System.out.println(Item.ALL.size() + " items"); - System.out.println(totalupgrades + " upgrades (" + SpellsFactor.spells - + " spells)"); + System.out.println(Javelin.ALLMONSTERS.size() + " monsters"); + System.out.println((Item.ALL.size() - Item.ARTIFACT.size()) + " items, " + + Item.ARTIFACT.size() + " artifacts"); + System.out.println( + (UpgradeHandler.singleton.count() - SpellsFactor.spells) + + " upgrades, " + SpellsFactor.spells + " spells, " + + UpgradeHandler.singleton.countskills() + " skills"); } - public void preparedebug() { + void preparedebug() { if (Javelin.DEBUGSTARTINGGOLD != null) { Squad.active.gold = Javelin.DEBUGSTARTINGGOLD; } @@ -227,36 +231,19 @@ public void preparedebug() { if (Javelin.DEBUGSTARTINGHAX != null) { Haxor.singleton.tickets = Javelin.DEBUGSTARTINGHAX; } - // TODO used for debug - if (Javelin.DEBUGSTARTINGKEY != null) { - Squad.active.receiveitem(Key.generate(Javelin.DEBUGSTARTINGKEY)); + if (Javelin.DEBUGSTARTINGITEM != null) { + Squad.active.receiveitem(Javelin.DEBUGSTARTINGITEM); } - } - - private void endbattle() { - for (Combatant c : new ArrayList(BattleMap.combatants)) { - if (c.summoned) { - BattleMap.combatants.remove(c); - BattleMap.blueTeam.remove(c); - BattleMap.redTeam.remove(c); + if (Javelin.DEBUGSTARTINGLABOR != null) { + for (WorldActor p : Town.getall(Town.class)) { + Town t = (Town) p; + if (t.garrison.isEmpty()) { + t.labor = Javelin.DEBUGSTARTINGLABOR; + } } } - EndBattle.updateoriginal(originalteam); - EndBattle.bury(originalteam); - if (Javelin.captured != null) { - originalteam.add(Javelin.captured); - Javelin.captured = null; - } - Squad.active.members = originalteam; - for (Combatant member : Squad.active.members) { - member.currentmelee.sequenceindex = -1; - member.currentranged.sequenceindex = -1; - } - ThreadManager.printbattlerecord(); } - static ArrayList lastenemies = new ArrayList(); - public static void preparebattle(GeneratedFight generated) { BattleMap.redTeam = new ArrayList(); BattleMap.redTeam.addAll(generated.opponents); @@ -277,54 +264,31 @@ private static ArrayList cloneteam(ArrayList team) { return clone; } - public static GeneratedFight generatefight(final int el) { + public static GeneratedFight generatefight(final int el, int terrainp) { int delta = 0; GeneratedFight generated = null; while (generated == null) { - generated = JavelinApp.chooseopponents(el - delta); + generated = JavelinApp.chooseopponents(el - delta, terrainp); if (generated != null) { break; } if (delta != 0) { - generated = JavelinApp.chooseopponents(el + delta); + generated = JavelinApp.chooseopponents(el + delta, terrainp); } delta += 1; } return generated; } - static public GeneratedFight chooseopponents(final int el) { + static public GeneratedFight chooseopponents(final int el, int terrainp) { try { - return new GeneratedFight(EncounterGenerator.generate(el)); + return new GeneratedFight( + EncounterGenerator.generate(el, terrainp)); } catch (final GaveUpException e) { return null; } } - /** - * 2 chances of an easy encounter, 10 chances of a moderate encounter, 4 - * chances of a difficult encounter and 1 chance of an overwhelming - * encounter - */ - public static Integer randomdifficulty() { - final LinkedList elchoices = new LinkedList(); - for (int j = 0; j < 2; j++) { - elchoices.add(RPG.r(-5, -8)); - } - for (int j = 0; j < 10; j++) { - elchoices.add(-4); - } - for (int j = -3; j <= 0; j++) { - elchoices.add(j); - } - elchoices.add(1); - return RPG.pick(elchoices); - } - - static public int worldtile() { - return JavelinApp.overviewmap.getTile(Game.hero().x, Game.hero().y); - } - @Override public void preparebattlemap() { diff --git a/javelin/controller/BattleSetup.java b/javelin/controller/BattleSetup.java index f2a3f2094..62b6c8a62 100644 --- a/javelin/controller/BattleSetup.java +++ b/javelin/controller/BattleSetup.java @@ -4,7 +4,6 @@ import java.util.List; import javelin.Javelin; -import javelin.JavelinApp; import javelin.controller.ai.ActionProvider; import javelin.controller.exception.GaveUpException; import javelin.controller.fight.Fight; @@ -14,8 +13,8 @@ import javelin.model.state.BattleState; import javelin.model.state.BattleState.Vision; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; import javelin.model.world.Squad; +import javelin.model.world.place.dungeon.Dungeon; import tyrant.mikera.engine.Lib; import tyrant.mikera.engine.RPG; import tyrant.mikera.engine.Thing; @@ -33,7 +32,7 @@ public static BattleMap place() { rollinitiative(); Map sourcemap = Javelin.app.fight.getmap(); if (sourcemap == null) { - sourcemap = MapGenerator.generatebattlemap(JavelinApp.worldtile(), + sourcemap = MapGenerator.generatebattlemap(Javelin.terrain(), Dungeon.active != null); } sourcemap.generate(); @@ -129,7 +128,7 @@ public static void placecombatant(final Combatant placing, } Vision path = s.hasLineOfSight(placing, reference); if (path == Vision.CLEAR - || placing.source.fly > 0 && path == Vision.BLOCKED) { + /* || placing.source.fly > 0 && path == Vision.BLOCKED */) { add(m, placing, p, s); break; } diff --git a/javelin/controller/Point.java b/javelin/controller/Point.java index fc49bf40a..56beba6c2 100644 --- a/javelin/controller/Point.java +++ b/javelin/controller/Point.java @@ -14,9 +14,13 @@ public class Point implements Cloneable, Serializable { public int x; public int y; - public Point(final int i, final int j) { - x = i; - y = j; + public Point(final int x, final int y) { + this.x = x; + this.y = y; + } + + public Point(Point p) { + this(p.x, p.y); } @Override diff --git a/javelin/controller/TextReader.java b/javelin/controller/TextReader.java index 4114203b4..5c000e188 100644 --- a/javelin/controller/TextReader.java +++ b/javelin/controller/TextReader.java @@ -7,8 +7,8 @@ import java.io.IOException; import javelin.Javelin; +import javelin.view.screen.InfoScreen; import tyrant.mikera.tyrant.Game; -import tyrant.mikera.tyrant.InfoScreen; /** * Outputs the content of a text file to the screen. diff --git a/javelin/controller/action/ActionMapping.java b/javelin/controller/action/ActionMapping.java index 98ac8eb0e..887c4525b 100644 --- a/javelin/controller/action/ActionMapping.java +++ b/javelin/controller/action/ActionMapping.java @@ -45,8 +45,10 @@ public class ActionMapping { new ActionAdapter(Guide.ITEMS), // F3 new ActionAdapter(Guide.UGRADES1), // F4 new ActionAdapter(Guide.UGRADES2), // F5 - new ActionAdapter(Guide.SPELLS1), // F6 - new ActionAdapter(Guide.SPELLS2), // F7 + new ActionAdapter(Guide.SKILLS), // F6 + new ActionAdapter(Guide.SPELLS1), // F7 + new ActionAdapter(Guide.SPELLS2), // F8 + new ActionAdapter(Guide.ARTIFACTS), // F9 Action.HELP, // h Action.MOVE_N, Action.MOVE_NE, Action.MOVE_E, Action.MOVE_SE, diff --git a/javelin/controller/action/CastSpell.java b/javelin/controller/action/CastSpell.java index a650a6768..4072d6175 100644 --- a/javelin/controller/action/CastSpell.java +++ b/javelin/controller/action/CastSpell.java @@ -12,10 +12,11 @@ import javelin.model.BattleMap; import javelin.model.state.BattleState; import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; +import javelin.view.screen.InfoScreen; import tyrant.mikera.engine.Thing; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Spells with attack rolls are supposed to have critical hits too but for the @@ -35,8 +36,12 @@ public boolean perform(Combatant c, BattleMap map, Thing thing) { Game.messagepanel.clear(); casting = null; ArrayList castable = new ArrayList(); + boolean engagned = map.getState().isEngaged(c); for (Spell s : c.spells) { - if (s.canbecast(c)) { + if (engagned && !concentrate(c, s)) { + continue; + } + if (s.canbecast(c) && s.aggressive) { castable.add(s); } } @@ -159,17 +164,31 @@ protected void filtertargets(Combatant combatant, List targets, casting.filtertargets(combatant, targets, s); } + @Override + public void checkengaged(BattleState state, Combatant c) { + if (!concentrate(c, casting)) { + super.checkengaged(state, c); + } + } + + boolean concentrate(Combatant c, Spell s) { + final int concentration = c.source.skills.concentration + + Monster.getbonus(c.source.constitution); + return concentration >= s.casterlevel; + } + @Override public List> getoutcomes(final BattleState gameState, final Combatant combatant) { final ArrayList> chances = new ArrayList>(); - if (gameState.isEngaged(combatant)) { - return chances; - } + boolean engaged = gameState.isEngaged(combatant); final ArrayList spells = combatant.spells; for (int i = 0; i < spells.size(); i++) { final Spell spell = spells.get(i); + if (engaged && !concentrate(combatant, spell)) { + continue; + } if (!spell.canbecast(combatant)) { continue; } diff --git a/javelin/controller/action/Fire.java b/javelin/controller/action/Fire.java index 08df2ea5c..24853b6f4 100644 --- a/javelin/controller/action/Fire.java +++ b/javelin/controller/action/Fire.java @@ -18,11 +18,11 @@ import javelin.model.unit.Combatant; import javelin.model.unit.CurrentAttack; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import javelin.view.screen.StatisticsScreen; import tyrant.mikera.engine.Thing; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Ranged attack. diff --git a/javelin/controller/action/Help.java b/javelin/controller/action/Help.java index a3056881e..c2bc5004b 100644 --- a/javelin/controller/action/Help.java +++ b/javelin/controller/action/Help.java @@ -4,9 +4,9 @@ import javelin.model.BattleMap; import javelin.model.unit.Combatant; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import tyrant.mikera.engine.Thing; import tyrant.mikera.tyrant.Game; -import tyrant.mikera.tyrant.InfoScreen; /** * Shows keyboard commands. diff --git a/javelin/controller/action/Movement.java b/javelin/controller/action/Movement.java index 6a12fe4a9..fbb70deaa 100644 --- a/javelin/controller/action/Movement.java +++ b/javelin/controller/action/Movement.java @@ -29,7 +29,8 @@ public Movement(final String name, final String[] keys, public float cost(final Combatant c, final BattleState state, int x, int y) { - return isDisengaging(c, state) ? .25f + return isDisengaging(c, state) + ? Math.max(.1f, .25f - (.01f * c.source.skills.acrobatics)) : (.5f / Movement.move(c, state, x, y)); } diff --git a/javelin/controller/action/PassItem.java b/javelin/controller/action/PassItem.java index 35505f865..90fff5942 100644 --- a/javelin/controller/action/PassItem.java +++ b/javelin/controller/action/PassItem.java @@ -8,9 +8,9 @@ import javelin.model.unit.Combatant; import javelin.model.world.Squad; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Hands item over to a friendly unit. diff --git a/javelin/controller/action/TouchAttack.java b/javelin/controller/action/TouchAttack.java index b9daca114..484cc7e4a 100644 --- a/javelin/controller/action/TouchAttack.java +++ b/javelin/controller/action/TouchAttack.java @@ -39,28 +39,29 @@ public List> getoutcomes(BattleState gameState, return outcomes; } - private List attack(Combatant combatant, Combatant target, + private List attack(Combatant active, Combatant target, BattleState gameState) { - javelin.model.unit.abilities.TouchAttack attack = - combatant.source.touch; + javelin.model.unit.abilities.TouchAttack attack = active.source.touch; int damage = attack.damage[0] * attack.damage[1] / 2; List nodes = new ArrayList(); String action = - combatant + " uses " + attack.toString().toLowerCase() + "!\n"; + active + " uses " + attack.toString().toLowerCase() + "!\n"; float savechance = CastSpell - .convertsavedctochance(attack.savedc - combatant.source.ref); + .convertsavedctochance(attack.savedc - active.source.ref); nodes.add(registerdamage(gameState, action + target + " resists, is ", - savechance, target, damage / 2)); + savechance, target, damage / 2, active)); nodes.add(registerdamage(gameState, action + target + " is ", - 1 - savechance, target, damage)); + 1 - savechance, target, damage, active)); return nodes; } ChanceNode registerdamage(BattleState gameState, String action, - float savechance, Combatant target, int damage) { + float savechance, Combatant target, int damage, Combatant active) { gameState = gameState.clone(); target = gameState.clone(target); target.damage(damage, gameState, target.source.resistance); + active = gameState.clone(active); + active.ap += .5f; return new ChanceNode(gameState, savechance, action + target.getStatus() + "!", Delay.BLOCK); } diff --git a/javelin/controller/action/UseItem.java b/javelin/controller/action/UseItem.java index 7ce9edc60..b95a332d4 100644 --- a/javelin/controller/action/UseItem.java +++ b/javelin/controller/action/UseItem.java @@ -10,9 +10,9 @@ import javelin.model.unit.Combatant; import javelin.model.world.Squad; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; public class UseItem extends Action { @@ -51,7 +51,7 @@ public static Item queryforitemselection(final Combatant c) { final List items = (List) Squad.active.equipment.get(c.id).clone(); for (final Item i : new ArrayList(items)) { - if (!i.isusedinbattle()) { + if (!i.usedinbattle) { items.remove(i); } } @@ -71,7 +71,7 @@ public int compare(Item o1, Item o2) { final TreeMap options = new TreeMap(); String prompt = "Which item? (press q to quit)\n"; for (final Item it : items) { - if (threatened && !it.canuseneganged()) { + if (threatened) { continue; } options.put(i, it); diff --git a/javelin/controller/action/world/Abandon.java b/javelin/controller/action/world/Abandon.java index 9d9c9981a..70dee60fa 100644 --- a/javelin/controller/action/world/Abandon.java +++ b/javelin/controller/action/world/Abandon.java @@ -1,10 +1,10 @@ package javelin.controller.action.world; import javelin.controller.db.StateManager; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.InfoScreen; +import javelin.view.screen.WorldScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Quit the current game forever, delete the save game so the player can start a diff --git a/javelin/controller/action/world/CastSpells.java b/javelin/controller/action/world/CastSpells.java index d33728c1b..5a86dc509 100644 --- a/javelin/controller/action/world/CastSpells.java +++ b/javelin/controller/action/world/CastSpells.java @@ -8,10 +8,10 @@ import javelin.controller.upgrade.Spell; import javelin.model.unit.Combatant; import javelin.model.world.Squad; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.InfoScreen; +import javelin.view.screen.WorldScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; public class CastSpells extends WorldAction { public CastSpells() { @@ -43,10 +43,11 @@ public void perform(WorldScreen screen) { return; } try { - Game.message( - s.castpeacefully(caster, - Squad.active.members.get(targetindex)), - null, Delay.BLOCK); + String message = s.castpeacefully(caster, + Squad.active.members.get(targetindex)); + if (message != null) { + Game.message(message, null, Delay.BLOCK); + } } catch (NotPeaceful e) { throw new RuntimeException( "Should have been caught in CastSpells#listspells. See Spell#ispeaceful"); @@ -107,6 +108,21 @@ public ArrayList listspells(List spells) { return spellnames; } + /** + * Utility function for user-input selection. + * + * @param output + * Text to show the user. + * @param names + * Will show each's {@link Object#toString()} as an option. + * @param fullscreen + * true to open in a new screen. Otherwise uses the + * message panel. + * @param forceselection + * If false will allow the user to abort the + * operation. + * @return The index of the selected element or -1 if aborted. + */ static public int choose(String output, List names, boolean fullscreen, boolean forceselection) { if (!forceselection) { diff --git a/javelin/controller/action/world/Dismiss.java b/javelin/controller/action/world/Dismiss.java new file mode 100644 index 000000000..0903dda1c --- /dev/null +++ b/javelin/controller/action/world/Dismiss.java @@ -0,0 +1,43 @@ +package javelin.controller.action.world; + +import java.util.ArrayList; + +import javelin.model.unit.Combatant; +import javelin.model.world.Squad; +import javelin.model.world.place.unique.MercenariesGuild; +import javelin.view.screen.WorldScreen; + +/** + * Allows members to be removed from a {@link Squad} at any point. + * + * @author alex + */ +public class Dismiss extends WorldAction { + /** Constructor. */ + public Dismiss() { + super("Dismiss squad member", new int[] { 'D' }, new String[] { "D" }); + } + + @Override + public void perform(WorldScreen screen) { + int choice = + CastSpells.choose("Which squad member do you want to dismiss?", + Squad.active.members, true, false); + if (choice == -1) { + return; + } + Combatant chosen = Squad.active.members.get(choice); + float dailyupkeep = chosen.source.eat() / 2f; + if (chosen.mercenary) { + dailyupkeep += MercenariesGuild.getfee(chosen); + } + ArrayList confirm = new ArrayList(2); + confirm.add("Yes, I am sure."); + confirm.add("Not really, keep unit."); + if (CastSpells.choose("Are you sure you want to dismiss " + chosen + + ", with a daily cost of $" + Math.round(dailyupkeep) + "?", + confirm, true, true) == 0) { + Squad.active.dismiss(chosen); + } + } +} diff --git a/javelin/controller/action/world/Divide.java b/javelin/controller/action/world/Divide.java index 5390f8043..9a9f00ee6 100644 --- a/javelin/controller/action/world/Divide.java +++ b/javelin/controller/action/world/Divide.java @@ -6,13 +6,12 @@ import javelin.model.item.Item; import javelin.model.unit.Combatant; import javelin.model.world.Squad; -import javelin.model.world.Town; -import javelin.model.world.WorldMap; +import javelin.model.world.World; +import javelin.model.world.WorldActor; +import javelin.model.world.place.town.Town; import javelin.view.screen.BattleScreen; -import javelin.view.screen.world.WorldScreen; -import tyrant.mikera.tyrant.Game; -import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; +import javelin.view.screen.InfoScreen; +import javelin.view.screen.WorldScreen; /** * Split squad into two. @@ -34,7 +33,7 @@ public void perform(final WorldScreen screen) { + "Press c to cancel or ENTER when done.\n" + "The left column is your current squad, the right one is the new squad.\n" + "To join two squads later just place them in the same square.\n"; - input(in); + InfoScreen.prompt(in); char input = ' '; final ArrayList indexreference = new ArrayList(Squad.active.members); @@ -48,8 +47,9 @@ public void perform(final WorldScreen screen) { log(indexreference, oldsquad, oldcolumn); log(indexreference, newsquad, newcolumn); String text = ""; - for (int i = 0; i < Math.max(oldcolumn.size(), - newcolumn.size()); i++) { + int nlines = Math.max(oldcolumn.size(), newcolumn.size()); + nlines = Math.min(6, nlines); + for (int i = 0; i < nlines; i++) { String oldtd = i < oldcolumn.size() ? oldcolumn.get(i) : ""; while (oldtd.length() < WorldScreen.SPACER.length()) { oldtd += " "; @@ -58,7 +58,7 @@ public void perform(final WorldScreen screen) { i < newcolumn.size() ? newcolumn.get(i) : ""; text += oldtd + newtd + "\n"; } - input = input(text); + input = InfoScreen.prompt(text); if (input == 'c') { return; } @@ -92,8 +92,8 @@ public void perform(final WorldScreen screen) { final int increment = Squad.active.gold / 10; while (input != '\n') { clear(); - input = input( - "How much gold do you want to transfer to the new squad? Use the + and - keys to change and ENTER to confirm.\n" + input = InfoScreen + .prompt("How much gold do you want to transfer to the new squad? Use the + and - keys to change and ENTER to confirm.\n" + gold); if (input == '+') { gold += increment; @@ -107,15 +107,16 @@ public void perform(final WorldScreen screen) { } } } - Town nearto = findtown(Squad.active.x, Squad.active.y); + WorldActor nearto = findtown(Squad.active.x, Squad.active.y); int x, y; Squad s = null; placement: for (x = Squad.active.x - 1; x <= Squad.active.x + 1; x++) { for (y = Squad.active.y - 1; y <= Squad.active.y + 1; y++) { - if (!WorldMap.isoccupied(x, y, false) + if (!World.istown(x, y, false) && (nearto == null || findtown(x, y) instanceof Town)) { s = new Squad(x, y, - Squad.active.hourselapsed + WorldMove.TIMECOST); + Squad.active.hourselapsed + WorldMove.TIMECOST, + Squad.active.lasttown); break placement; } } @@ -134,27 +135,17 @@ public void perform(final WorldScreen screen) { Squad.active.updateavatar(); } - public Town findtown(int xp, int yp) { + public WorldActor findtown(int xp, int yp) { for (int x = xp - 1; x <= xp + 1; x++) { for (int y = yp - 1; y <= yp + 1; y++) { - - // if (Javelin.DEBUG && WorldScreen.getactor(x, y) != null) { - // System.out.println(WorldScreen.getactor(x, y)); - // } - if (WorldScreen.getactor(x, y) instanceof Town) { - return (Town) WorldScreen.getactor(x, y); + return WorldScreen.getactor(x, y); } } } return null; } - public Character input(final String prompt) { - Game.message(prompt, null, Delay.NONE); - return InfoScreen.feedback(); - } - public void clear() { BattleScreen.active.messagepanel.clear(); } diff --git a/javelin/controller/action/world/Guide.java b/javelin/controller/action/world/Guide.java index a5fb146e4..20aee09d6 100644 --- a/javelin/controller/action/world/Guide.java +++ b/javelin/controller/action/world/Guide.java @@ -6,7 +6,7 @@ import javelin.controller.TextReader; import javelin.controller.action.SimpleAction; import javelin.view.screen.BattleScreen; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.WorldScreen; /** * In-game help. diff --git a/javelin/controller/action/world/Rename.java b/javelin/controller/action/world/Rename.java index d458c8809..02f0e58b1 100644 --- a/javelin/controller/action/world/Rename.java +++ b/javelin/controller/action/world/Rename.java @@ -1,9 +1,10 @@ package javelin.controller.action.world; +import javelin.controller.exception.RepeatTurnException; import javelin.model.unit.Combatant; import javelin.model.world.Squad; +import javelin.view.screen.WorldScreen; import javelin.view.screen.town.RecruitScreen; -import javelin.view.screen.world.WorldScreen; /** * Rename combatant. @@ -11,18 +12,19 @@ * @author alex */ public class Rename extends WorldAction { + /** Constructor. */ public Rename() { super("Rename squad members", new int[] {}, new String[] { "r" }); } @Override public void perform(WorldScreen screen) { - for (Combatant m : Squad.active.members) { - RecruitScreen.namingscreen(m.source); + int i = CastSpells.choose("Rename which unit?", Squad.active.members, + false, false); + if (i == -1) { + throw new RepeatTurnException(); } - /** - * TODO This way loses Squad#equipment key. better make Combatant - * hashable by id? - */ + Combatant m = Squad.active.members.get(i); + m.source.customName = RecruitScreen.namingscreen(m.source.toString()); } } diff --git a/javelin/controller/action/world/ResetScore.java b/javelin/controller/action/world/ResetScore.java index fe069c727..49bc4d728 100644 --- a/javelin/controller/action/world/ResetScore.java +++ b/javelin/controller/action/world/ResetScore.java @@ -1,10 +1,10 @@ package javelin.controller.action.world; import javelin.Javelin; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.InfoScreen; +import javelin.view.screen.WorldScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Clear highscore. @@ -25,7 +25,8 @@ public static String name() { public void perform(WorldScreen screen) { Game.messagepanel.clear(); Game.message( - "Are you sure you want to reset your highscore? Press y to proceed.\n", + "Are you sure you want to reset your highscore (" + + Javelin.gethighscore() + ")? Press y to proceed.\n", null, Delay.NONE); boolean ok = InfoScreen.feedback() == 'y'; if (ok) { diff --git a/javelin/controller/action/world/ShowStatistics.java b/javelin/controller/action/world/ShowStatistics.java index e5061931a..9b47974e9 100644 --- a/javelin/controller/action/world/ShowStatistics.java +++ b/javelin/controller/action/world/ShowStatistics.java @@ -1,11 +1,8 @@ package javelin.controller.action.world; -import java.util.ArrayList; - -import javelin.model.unit.Combatant; import javelin.model.world.Squad; import javelin.view.screen.StatisticsScreen; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.WorldScreen; /** * Show unit information. @@ -15,17 +12,18 @@ public class ShowStatistics extends WorldAction { public ShowStatistics() { - super("View character sheet", new int[0], new String[] { "v" }); + super("View character sheet / show all squad members", new int[0], + new String[] { "v" }); } @Override public void perform(WorldScreen screen) { - ArrayList names = new ArrayList(); - for (Combatant m : Squad.active.members) { - names.add(m.toString()); - } - int answer = - CastSpells.choose("Choose a character:", names, true, false); + // ArrayList names = new ArrayList(); + // for (Combatant m : Squad.active.members) { + // names.add(m.toString() + " (" + m.getStatus() + ")"); + // } + int answer = CastSpells.choose("Choose a character:", + WorldScreen.showstatusinformation(), true, false); if (answer != -1) { new StatisticsScreen(Squad.active.members.get(answer)); } diff --git a/javelin/controller/action/world/UseItems.java b/javelin/controller/action/world/UseItems.java index 0b48f4a7f..bec98ff08 100644 --- a/javelin/controller/action/world/UseItems.java +++ b/javelin/controller/action/world/UseItems.java @@ -8,12 +8,13 @@ import javelin.Javelin; import javelin.JavelinApp; import javelin.model.item.Item; +import javelin.model.item.artifact.Artifact; import javelin.model.unit.Combatant; import javelin.model.world.Squad; +import javelin.view.screen.InfoScreen; +import javelin.view.screen.WorldScreen; +import javelin.view.screen.shopping.TownShopScreen; import javelin.view.screen.town.SelectScreen; -import javelin.view.screen.town.ShoppingScreen; -import javelin.view.screen.world.WorldScreen; -import tyrant.mikera.tyrant.InfoScreen; public class UseItems extends WorldAction { public UseItems() { @@ -22,73 +23,91 @@ public UseItems() { @Override public void perform(final WorldScreen worldscreen) { - final ArrayList allitems = new ArrayList(); - final String list = listitems(allitems, true); - final InfoScreen infoscreen = new InfoScreen(list); - String actions = "\n"; - actions += "\nPress number to use an item"; - actions += "\nPress d to distribute items"; - actions += "\nPress q to quit the inventory"; - infoscreen.print(list + actions); - command(allitems, list, infoscreen); + while (true) { + final ArrayList allitems = new ArrayList(); + final InfoScreen infoscreen = new InfoScreen(""); + String actions = ""; + actions += "Press number to use an item"; + actions += "\nPress E to exchange an item"; + actions += "\nPress ENTER to quit the inventory"; + actions += "\n"; + final String list = listitems(allitems, true); + infoscreen.print(actions + list); + if (command(allitems, list, infoscreen)) { + break; + } + } + Javelin.app.switchScreen(JavelinApp.context); } - public void command(final ArrayList allitems, final String list, + boolean command(final ArrayList allitems, final String list, final InfoScreen infoscreen) { - while (true) { - Javelin.app.switchScreen(infoscreen); - final Character input = InfoScreen.feedback(); - if (input == 'd') { - redistributeinventory(allitems, list, infoscreen); - } else if (input == 'q') { - // leaves screen - } else { - ShoppingScreen.listactivemembers(); - int index = SelectScreen.convertselectionkey(input); - if (index >= allitems.size() || index == -1) { - continue; - } - final Item selected = allitems.get(index); - if (selected - .usepeacefully(inputmember(infoscreen, infoscreen.text - + "\n\nWhich member will use this item?"))) { - selected.expend(); - } else { - infoscreen.print(infoscreen.text + "\n\n" - + selected.describefailure()); - InfoScreen.feedback(); - } - } - Javelin.app.switchScreen(JavelinApp.context); - break; + Javelin.app.switchScreen(infoscreen); + final Character input = InfoScreen.feedback(); + if (input == '\n') { + return true;// leaves screen + } + if (input == 'E') { + exchange(allitems, list, infoscreen); + return false; + } + Item selected = select(allitems, input); + if (selected == null) { + return false; } + Combatant target = selected instanceof Artifact ? findowner(selected) + : inputmember(infoscreen, infoscreen.text + + "\n\nWhich member will use this item?"); + if (!selected.usepeacefully(target)) { + infoscreen.print( + infoscreen.text + "\n\n" + selected.describefailure()); + InfoScreen.feedback(); + } else if (selected.consumable) { + selected.expend(); + } + return selected.consumable; } - public void redistributeinventory(final ArrayList allitems, + protected Item select(final ArrayList allitems, + final Character input) { + Item selected = null; + int index = SelectScreen.convertnumericselection(input); + if (0 <= index && index < allitems.size()) { + selected = allitems.get(index); + } + return selected; + } + + public void exchange(final ArrayList allitems, final String reequiptext, final InfoScreen infoscreen) { - Squad.active.equipment.clear(); - final String original = infoscreen.text; - Collections.sort(allitems, new Comparator() { - @Override - public int compare(Item o1, Item o2) { - int delta = o2.price - o1.price; - if (delta == 0) { - return o1.name.compareTo(o2.name); + infoscreen.print(infoscreen.text + "\n\nSelect an item."); + Item selected = select(allitems, InfoScreen.feedback()); + if (selected == null) { + return; + } + Combatant owner = findowner(selected); + if (owner.equipped.contains(selected)) { + owner.equipped.remove(selected); + if (selected instanceof Artifact) { + Artifact a = (Artifact) selected; + a.remove(owner); + } + } + Squad.active.equipment.get(owner.id).remove(selected); + Squad.active.equipment.get( + inputmember(infoscreen, "Transfer " + selected + " to who?").id) + .add(selected); + } + + protected Combatant findowner(Item selected) { + searchwho: for (Combatant bag : Squad.active.members) { + for (Item i : Squad.active.equipment.get(bag.id)) { + if (i == selected) { + return bag; } - return delta; } - }); - final int nitems = allitems.size(); - for (int i = 0; i < nitems; i++) { - final Item it = allitems.get(i); - final Combatant member = inputmember(infoscreen, - original + "\n\nWhich squad member will carry the " - + it.name.toLowerCase() + " (" - + count(it, allitems.subList(i, nitems)) + ")?"); - Squad.active.equipment.get(member.id).add(it); - // i += 1; } - infoscreen.print(original); + throw new RuntimeException("Item owner not found #useitems"); } private int count(Item it, List allitems) { @@ -103,7 +122,7 @@ private int count(Item it, List allitems) { public Combatant inputmember(final InfoScreen infoscreen, final String message) { - infoscreen.print(message + "\n\n" + ShoppingScreen.listactivemembers()); + infoscreen.print(message + "\n\n" + TownShopScreen.listactivemembers()); while (true) { try { return Squad.active.members.get( @@ -120,23 +139,42 @@ static public String listitems(final ArrayList allitems, boolean showkeys) { String s = ""; int i = 0; - for (final Combatant c : Squad.active.members) { - String monster = c.toString(); - s += "\n" + monster + ":\n"; + ArrayList members = Squad.active.members; + for (int j = 0; j < members.size(); j++) { + final Combatant c = members.get(j); + String output = ""; + if (!showkeys) { + output += SelectScreen.SELECTIONKEYS[j] + " - "; + } + output = c.toString(); + s += "\n"; + s += output + ":\n"; boolean none = true; - for (final Item it : Squad.active.equipment.get(c.id)) { + ArrayList bag = + new ArrayList(Squad.active.equipment.get(c.id)); + Collections.sort(bag, new Comparator() { + @Override + public int compare(Item o1, Item o2) { + return o1.toString().compareTo(o2.toString()); + } + }); + for (final Item it : bag) { if (allitems != null) { allitems.add(it); } if (showkeys) { s += " [" + SelectScreen.SELECTIONKEYS[i] + "]"; } - s += " " + it.name + "\n"; + s += " " + it.name; + if (c.equipped.contains(it)) { + s += " (equipped)"; + } + s += "\n"; i += 1; none = false; } if (none) { - s += " carrying no items.\n"; + s += " carrying no items.\n"; } } return s; diff --git a/javelin/controller/action/world/WorldAction.java b/javelin/controller/action/world/WorldAction.java index fb6e86b54..b9ca37017 100644 --- a/javelin/controller/action/world/WorldAction.java +++ b/javelin/controller/action/world/WorldAction.java @@ -3,7 +3,7 @@ import java.awt.event.KeyEvent; import javelin.controller.action.ActionDescription; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.WorldScreen; /** * An action to be performed by the human player while on the overworld view. @@ -20,18 +20,23 @@ public abstract class WorldAction implements ActionDescription { new Guide(KeyEvent.VK_F4, "Upgrades 1", "F4"); public static final Guide UGRADES2 = new Guide(KeyEvent.VK_F5, "Upgrades 2", "F5"); + public static final Guide SKILLS = + new Guide(KeyEvent.VK_F6, "Skills", "F6"); public static final Guide SPELLS1 = - new Guide(KeyEvent.VK_F6, "Spells 1", "F6"); + new Guide(KeyEvent.VK_F7, "Spells 1", "F7"); public static final Guide SPELLS2 = - new Guide(KeyEvent.VK_F7, "Spells 2", "F7"); + new Guide(KeyEvent.VK_F8, "Spells 2", "F8"); + public static final Guide ARTIFACTS = + new Guide(KeyEvent.VK_F9, "Artifacts", "F9"); String name; public final int[] keys; public final String[] morekeys; public static final WorldAction[] ACTIONS = new WorldAction[] { new UseItems(), new CastSpells(), new Divide(), new Rename(), - new ResetScore(), new ShowStatistics(), new Abandon(), HOWTO, - COMBAT, ITEMS, UGRADES1, UGRADES2, SPELLS1, SPELLS2, + new ResetScore(), new ShowStatistics(), new Abandon(), + new Dismiss(), HOWTO, COMBAT, ITEMS, UGRADES1, UGRADES2, SKILLS, + SPELLS1, SPELLS2, ARTIFACTS, new WorldMove(new int[] { KeyEvent.VK_NUMPAD7, }, -1, -1, new String[] { "↖ or 7 or U", "U" }), new WorldMove(new int[] { KeyEvent.VK_UP, KeyEvent.VK_NUMPAD8 }, 0, diff --git a/javelin/controller/action/world/WorldHelp.java b/javelin/controller/action/world/WorldHelp.java index 9b74d0033..1385a6f2b 100644 --- a/javelin/controller/action/world/WorldHelp.java +++ b/javelin/controller/action/world/WorldHelp.java @@ -1,7 +1,7 @@ package javelin.controller.action.world; import javelin.controller.action.Help; -import javelin.view.screen.world.WorldScreen; +import javelin.view.screen.WorldScreen; /** * In-game help. diff --git a/javelin/controller/action/world/WorldMove.java b/javelin/controller/action/world/WorldMove.java index e7cbabde9..90c7e05ed 100644 --- a/javelin/controller/action/world/WorldMove.java +++ b/javelin/controller/action/world/WorldMove.java @@ -4,20 +4,33 @@ import java.util.List; import javelin.JavelinApp; +import javelin.controller.exception.battle.StartBattle; import javelin.model.unit.Combatant; import javelin.model.world.Squad; -import javelin.view.screen.world.WorldScreen; +import javelin.model.world.WorldActor; +import javelin.model.world.place.WorldPlace; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.view.screen.DungeonScreen; +import javelin.view.screen.WorldScreen; import tyrant.mikera.engine.Thing; +/** + * Makes a movement on the overworld or {@link Dungeon}. + * + * TODO {@link WorldScreen} hierarchy should be refactored into proper Battle / + * Dungeon / World screens. + * + * @author alex + */ public class WorldMove extends WorldAction { public static final int TIMECOST = 4; - public static boolean isleavingplace = false; + public static boolean isleavingplace = false;// TODO remove private final int deltax; private final int deltay; public WorldMove(final int[] is, final int deltax, final int deltay, final String[] s) { - super("Move, enter towns and dungeons, fight incursions", is, s); + super("Move, enter places of interest, fight incursions", is, s); this.deltax = deltax; this.deltay = deltay; } @@ -26,9 +39,43 @@ public WorldMove(final int[] is, final int deltax, final int deltay, public void perform(final WorldScreen s) { JavelinApp.context.ellapse(TIMECOST); final Thing t = JavelinApp.context.updatehero(); - if (JavelinApp.context.entertown(t, s, t.x + deltax, t.y + deltay) - || !place(t, deltax, deltay) - || JavelinApp.context.react(t, this)) { + int tox = t.x + deltax; + int toy = t.y + deltay; + WorldActor actor = + Dungeon.active == null ? WorldScreen.getactor(tox, toy) : null; + WorldPlace place = + actor instanceof WorldPlace ? (WorldPlace) actor : null; + try { + if (JavelinApp.context.react(actor, tox, toy)) { + if (Dungeon.active != null) { + if (DungeonScreen.dontmove) { + DungeonScreen.dontmove = false; + return; + } + place(t, deltax, deltay); + } else if (place != null) { + if (place.allowentry && place.garrison.isEmpty()) { + place(t, deltax, deltay); + } + if (place instanceof Dungeon) { + ((Dungeon) place).activate(); + } + } + return; + } + if (place != null && !place.allowentry) { + return; + } + } catch (StartBattle e) { + if (place != null && place.allowentry) { + place(t, deltax, deltay); + } + throw e; + } + if (s instanceof DungeonScreen && Dungeon.active == null) { + return;// TODO hack + } + if (!place(t, deltax, deltay)) { return; } if (WorldMove.walk(t)) { @@ -68,7 +115,8 @@ public static void heal() { public static boolean walk(final Thing t) { final List here = new ArrayList(); - for (final Squad s : Squad.squads) { + for (final WorldActor p : Squad.getall(Squad.class)) { + Squad s = (Squad) p; if (s.x == t.x && s.y == t.y) { here.add(s); } diff --git a/javelin/controller/challenge/ChallengeRatingCalculator.java b/javelin/controller/challenge/ChallengeRatingCalculator.java index 2de8103d7..a66a63905 100644 --- a/javelin/controller/challenge/ChallengeRatingCalculator.java +++ b/javelin/controller/challenge/ChallengeRatingCalculator.java @@ -14,6 +14,7 @@ import javelin.controller.challenge.factor.FullAttackFactor; import javelin.controller.challenge.factor.HdFactor; import javelin.controller.challenge.factor.SizeFactor; +import javelin.controller.challenge.factor.SkillsFactor; import javelin.controller.challenge.factor.SpeedFactor; import javelin.controller.challenge.factor.SpellsFactor; import javelin.controller.challenge.factor.quality.BreathFactor; @@ -43,12 +44,12 @@ public class ChallengeRatingCalculator { * TODO reinclude AbilitiesFactor. right now it's making a huge difference * at very low el (game very start) */ - public static final CrFactor[] CR_FACTORS = - new CrFactor[] { new AbilitiesFactor(), new ArmorClassFactor(), - new FeatsFactor(), new FullAttackFactor(), HIT_DICE_FACTOR, - new SizeFactor(), new SpeedFactor(), new SpellsFactor(), - CLASS_LEVEL_FACTOR, new QualitiesFactor(), - new BreathFactor(), new TouchAttackFactor() }; + public static final CrFactor[] CR_FACTORS = new CrFactor[] { + new AbilitiesFactor(), new ArmorClassFactor(), new FeatsFactor(), + new FullAttackFactor(), HIT_DICE_FACTOR, new SizeFactor(), + new SpeedFactor(), new SpellsFactor(), CLASS_LEVEL_FACTOR, + new QualitiesFactor(), new BreathFactor(), new TouchAttackFactor(), + new SkillsFactor() }; private static final FileWriter LOGFILE; static { @@ -236,7 +237,7 @@ public static int multipleOpponentsElModifier(final int teamSize) { return -6; } if (teamSize <= 15) { - return MINIMUM_EL; + return -7; } if (teamSize <= 23) { return -8; @@ -509,11 +510,67 @@ public static float[] eltocr(int teamel) { case 16: return new float[] { 14, 15 }; case 17: - return new float[] { 16, 17, 18, 19 }; + return range(16, 19); case 18: - return new float[] { 20, 21, 22, 23 }; + return range(20, 23); + case 19: + return range(24, 27); + case 20: + return range(28, 31); + case 21: + return range(32, 39); + case 22: + return range(40, 47); + case 23: + return range(48, 55); + case 24: + return range(56, 63); + case 25: + return range(64, 79); + case 26: + return range(80, 95); + case 27: + return range(96, 111); + case 28: + return range(112, 127); + case 29: + return range(128, 159); + case 30: + return range(160, 191); default: throw new RuntimeException("Unknown EL " + teamel); } } + + private static float[] range(int from, int to) { + float[] range = new float[to - from + 1]; + int i = 0; + for (; from <= to; from++) { + range[i] = from; + i += 1; + } + return range; + } + + public static String describedifficulty(int delta) { + if (delta <= -13) { + return "irrelevant"; + } + if (delta <= -9) { + return "very easy"; + } + if (delta <= -5) { + return "easy"; + } + if (delta == -4) { + return "moderate"; + } + if (delta <= 0) { + return "difficult"; + } + if (delta <= +4) { + return "very difficult"; + } + return "impossible"; + } } diff --git a/javelin/controller/challenge/RewardCalculator.java b/javelin/controller/challenge/RewardCalculator.java index a40d0e68f..f57b13e22 100644 --- a/javelin/controller/challenge/RewardCalculator.java +++ b/javelin/controller/challenge/RewardCalculator.java @@ -1,13 +1,13 @@ package javelin.controller.challenge; -import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; -import javelin.model.dungeon.Treasure; import javelin.model.item.Item; +import javelin.model.item.ItemSelection; import javelin.model.unit.Combatant; +import javelin.model.world.place.dungeon.Treasure; import tyrant.mikera.engine.RPG; /** @@ -110,29 +110,50 @@ static public double getpartycr(final int eldifference, * getexperiencepercharacter(eldifference, nsurvivors) / 1000.0; } - public static int receivegold(final List originalredteam) { - float sum = 0; - for (final Combatant m : originalredteam) { - final float cr = ChallengeRatingCalculator.calculateCr(m.source); - sum += cr * cr * cr * 7.5f; + /** + * @return sum of gold this battle should reward. + * @see #getgold(float) + */ + public static int receivegold(final List team) { + int sum = 0; + for (final Combatant m : team) { + sum += getgold(ChallengeRatingCalculator.calculateCr(m.source)); } - return Math.round(sum); + return sum; + } + + /** + * @param cr + * Given a challenge rating... + * @return gold treasure reward for such an opponent. + */ + public static int getgold(final float cr) { + return Math.round(cr * cr * cr * 7.5f); + } + + /** + * @param gold + * Given a certain amount of gold... + * @return the challenge rating that would warrant this treasure. + */ + public static int getcr(final float gold) { + return Math.round(Math.round(Math.cbrt(gold / 7.5f))); } public static Treasure createchest(int gold, int x, int y) { - ArrayList items = new ArrayList(); - if (RPG.r(1, 2) == 1) { - int quantity = RPG.r(1, 2); - for (Integer price : Item.BYPRICE.descendingKeySet()) { - if (price * quantity <= gold) { - for (int j = 0; j < quantity; j++) { - items.add(RPG.pick(Item.BYPRICE.get(price))); - } - gold = 0; + ItemSelection chest = new ItemSelection(); + if (RPG.r(1, 2) == 1) {// 50% are gold and 50% are item + int limit = gold / 10; + for (Integer price : Item.BYPRICE.descendingMap().keySet()) { + if (price <= limit) { break; } + if (gold > price) { + gold -= price; + chest.add(RPG.pick(Item.BYPRICE.get(price))); + } } } - return new Treasure("chest", x, y, gold, items); + return new Treasure("chest", x, y, gold, chest); } } diff --git a/javelin/controller/challenge/TouchAttackFactor.java b/javelin/controller/challenge/TouchAttackFactor.java index b0eba538b..a12b6496c 100644 --- a/javelin/controller/challenge/TouchAttackFactor.java +++ b/javelin/controller/challenge/TouchAttackFactor.java @@ -22,7 +22,7 @@ public float calculate(Monster monster) { @Override public void listupgrades(UpgradeHandler handler) { - handler.earth.add(new TouchAttack("Stunning shock", 2, 8, 12)); + handler.wind.add(new TouchAttack("Stunning shock", 2, 8, 12)); handler.evil.add(new TouchAttack("Acid spray", 8, 8, 17)); } } diff --git a/javelin/controller/challenge/factor/AbilitiesFactor.java b/javelin/controller/challenge/factor/AbilitiesFactor.java index 20b793f9b..faf197f58 100644 --- a/javelin/controller/challenge/factor/AbilitiesFactor.java +++ b/javelin/controller/challenge/factor/AbilitiesFactor.java @@ -20,6 +20,8 @@ * @see CrFactor */ public class AbilitiesFactor extends CrFactor { + public static final float COST = .1f; + @Override public float calculate(final Monster monster) { final int[] abilites = new int[] { monster.strength, monster.dexterity, @@ -31,7 +33,7 @@ public float calculate(final Monster monster) { sum += a - 10.5; } } - sum = sum / 10; + sum = sum * COST; if (monster.intelligence == 0) { /** * Immune to mind-affecting effects. Should be .5 but right now is @@ -49,6 +51,6 @@ public void listupgrades(UpgradeHandler handler) { handler.wind.add(new RaiseDexterity()); handler.water.add(new RaiseWisdom()); handler.good.add(new RaiseIntelligence()); - handler.magic.add(new RaiseCharisma()); + handler.fire.add(new RaiseCharisma()); } } \ No newline at end of file diff --git a/javelin/controller/challenge/factor/ClassLevelFactor.java b/javelin/controller/challenge/factor/ClassLevelFactor.java index 7ab77bc60..64fd50d3f 100644 --- a/javelin/controller/challenge/factor/ClassLevelFactor.java +++ b/javelin/controller/challenge/factor/ClassLevelFactor.java @@ -1,25 +1,32 @@ package javelin.controller.challenge.factor; import javelin.controller.upgrade.UpgradeHandler; -import javelin.controller.upgrade.classes.ClassAdvancement; import javelin.model.unit.Monster; /** * @see CrFactor */ public class ClassLevelFactor extends CrFactor { + /** + * Normally a character gains 1 bonus ability point for every 4 levels it + * has so this value is to be used to counter-weight the challenge rating + * calculation. + */ + private static final float ABILITY = -AbilitiesFactor.COST / 4f; @Override public float calculate(Monster monster) { - return monster.commoner * .3f + monster.expert * .45f - + monster.aristocrat * .5f + monster.warrior * .55f; + int level = monster.commoner + monster.expert + monster.aristocrat + + monster.warrior; + return level * ABILITY + monster.commoner * .45f + - SkillsFactor.levelup(2, monster) + monster.expert * .65f + - SkillsFactor.levelup(6, monster) + monster.aristocrat * .65f + - SkillsFactor.levelup(4, monster) + monster.warrior * .7f + - SkillsFactor.levelup(2, monster); } @Override public void listupgrades(UpgradeHandler handler) { - handler.wind.add(ClassAdvancement.EXPERT); - handler.earth.add(ClassAdvancement.COMMONER); - handler.water.add(ClassAdvancement.ARISTOCRAT); - handler.fire.add(ClassAdvancement.WARRIOR); + // See UpgradeHandler#distribute } } diff --git a/javelin/controller/challenge/factor/FeatsFactor.java b/javelin/controller/challenge/factor/FeatsFactor.java index ece8f45e9..1f851d2f1 100644 --- a/javelin/controller/challenge/factor/FeatsFactor.java +++ b/javelin/controller/challenge/factor/FeatsFactor.java @@ -37,28 +37,29 @@ public float calculate(final Monster monster) { @Override public void listupgrades(UpgradeHandler handler) { handler.earth.add(new Toughness()); - - handler.water.add(new IronWill()); - handler.wind.add(new LightningReflexes()); handler.earth.add(new GreatFortitude()); - handler.wind.add(new PointBlankShot()); - handler.wind.add(new PreciseShot()); - handler.wind.add(new ImprovedPreciseShot()); - handler.wind.add(new RapidShot()); handler.wind.add(new RangedFocus("Ranged focus")); + handler.wind.add(new LightningReflexes()); + handler.wind.add(new ImprovedInititative()); + handler.fire.add(new IronWill()); handler.fire.add(new MeleeFocus("Mêlée focus")); - handler.fire.add(new PowerAttackUpgrade()); - handler.fire.add(new CleaveUpgrade()); - handler.fire.add(new GreatCleaveUpgrade()); - handler.fire.add(new BullRushUpgrade()); - handler.fire.add(new CombatExpertiseUpgrade()); - handler.wind.add(new ImprovedFeintUpgrade()); - handler.earth.add(new ImprovedGrappleUpgrade()); - handler.water.add(new ImprovedTripUpgrade()); + handler.shots.add(new PointBlankShot()); + handler.shots.add(new PreciseShot()); + handler.shots.add(new ImprovedPreciseShot()); + handler.shots.add(new RapidShot()); + + handler.power.add(new PowerAttackUpgrade()); + handler.power.add(new BullRushUpgrade()); + handler.power.add(new CleaveUpgrade()); + handler.power.add(new GreatCleaveUpgrade()); + + handler.expertise.add(new CombatExpertiseUpgrade()); + handler.expertise.add(new ImprovedFeintUpgrade()); + handler.expertise.add(new ImprovedGrappleUpgrade()); + handler.expertise.add(new ImprovedTripUpgrade()); - handler.wind.add(new ImprovedInititative()); } } diff --git a/javelin/controller/challenge/factor/HdFactor.java b/javelin/controller/challenge/factor/HdFactor.java index d7f0dc60d..d51d037d1 100644 --- a/javelin/controller/challenge/factor/HdFactor.java +++ b/javelin/controller/challenge/factor/HdFactor.java @@ -18,38 +18,43 @@ public class HdFactor extends CrFactor { @Override public float calculate(final Monster monster) { - final String type = monster.monsterType.toLowerCase(); - final float crByDie; + final String type = monster.type.toLowerCase(); + float crByDie; if (type.contains("dragon")) { - crByDie = .75f; + crByDie = .75f - SkillsFactor.levelup(6, monster); } else if (type.contains("outsider")) { - crByDie = .7f; + crByDie = .7f - SkillsFactor.levelup(8, monster); } else if (type.contains("magical beast") || type.contains("beast")) { /* beast is a typo */ - crByDie = .65f; + crByDie = .65f - SkillsFactor.levelup(2, monster); } else if (type.contains("mounstrous humanoid")) { - crByDie = .6f; + crByDie = .6f - SkillsFactor.levelup(2, monster); } else if (type.contains("aberration") || type.contains("animal") || type.contains("elemental") || type.contains("giant") - || type.contains("humanoid") || andIntelligent("ooze", monster) - || andIntelligent("plant", monster) + || type.contains("humanoid") || andIntelligent("plant", monster) || andIntelligent("vermin", monster)) { - crByDie = .55f; + crByDie = .55f - SkillsFactor.levelup(2, monster); } else if (type.contains("fey")) { - crByDie = .5f; - } else if (andIntelligent("construct", monster) || type.contains("ooze") - || type.contains("plant") || andIntelligent("undead", monster) + crByDie = .5f - SkillsFactor.levelup(6, monster); + } else if (andIntelligent("construct", monster)) { + crByDie = .35f - SkillsFactor.levelup(2, monster); + } else if (andIntelligent("undead", monster)) { + crByDie = .35f - SkillsFactor.levelup(4, monster); + } else if (type.contains("undead") || type.contains("construct")) { + crByDie = .35f; + } else if (andIntelligent("ooze", monster)) { + crByDie = .55f - SkillsFactor.levelup(2, monster); + } else if (type.contains("ooze") || type.contains("plant") || type.contains("vermin")) { crByDie = .45f; - } else if (type.contains("construct") || type.contains("undead")) { - crByDie = .35f; } else { throw new RuntimeException("Unknown type " + type); } + crByDie -= Monster.getbonus(monster.intelligence) * SkillsFactor.COST; return new Double(monster.originalhd * crByDie).floatValue(); } private boolean andIntelligent(final String type, final Monster monster) { - return monster.monsterType.contains(type) && monster.intelligence != 0; + return monster.type.contains(type) && monster.intelligence != 0; } } \ No newline at end of file diff --git a/javelin/controller/challenge/factor/SkillsFactor.java b/javelin/controller/challenge/factor/SkillsFactor.java new file mode 100644 index 000000000..563c86b2e --- /dev/null +++ b/javelin/controller/challenge/factor/SkillsFactor.java @@ -0,0 +1,81 @@ +package javelin.controller.challenge.factor; + +import javelin.controller.upgrade.UpgradeHandler; +import javelin.controller.upgrade.skill.Acrobatics; +import javelin.controller.upgrade.skill.Concentration; +import javelin.controller.upgrade.skill.Diplomacy; +import javelin.controller.upgrade.skill.DisableDevice; +import javelin.controller.upgrade.skill.GatherInformation; +import javelin.controller.upgrade.skill.Hide; +import javelin.controller.upgrade.skill.Knowledge; +import javelin.controller.upgrade.skill.Listen; +import javelin.controller.upgrade.skill.MoveSilently; +import javelin.controller.upgrade.skill.Search; +import javelin.controller.upgrade.skill.Spellcraft; +import javelin.controller.upgrade.skill.Spot; +import javelin.controller.upgrade.skill.Survival; +import javelin.model.unit.Monster; +import javelin.model.unit.Skills; + +/** + * Calculates a challenge rating value based on the skills a character has. To + * do that we remove skill points from {@link ClassLevelFactor} and + * {@link HdFactor}. Since if a creature acquires a character class it follows + * the rules for multi-class characters then we ignore the 4x bonus points of + * first level.. + * + * All skills are being considered class skills. + * + * @author alex + */ +public class SkillsFactor extends CrFactor { + /** Challenge rating cost per skill rank. */ + public static float COST = .02f; + + @Override + public float calculate(Monster m) { + Skills skills = m.skills; + int ranks = skills.concentration + skills.diplomacy + + skills.disabledevice + skills.gatherinformation + skills.hide + + skills.knowledge + skills.listen + skills.movesilently + + skills.search + skills.spellcraft + skills.spot + + skills.acrobatics + skills.survival; + return ranks * COST; + } + + @Override + public void listupgrades(UpgradeHandler handler) { + handler.evil.add(new Hide("Hide")); + + handler.good.add(new Diplomacy("Diplomacy")); + + handler.water.add(new Knowledge("Knowledge")); + + handler.wind.add(new Spot("Spot")); + handler.wind.add(new Listen("Listen")); + + handler.earth.add(new GatherInformation("Gather information")); + handler.earth.add(new Survival("Survival")); + handler.earth.add(new Concentration("Concentration")); + + handler.wind.add(new MoveSilently("Move silently")); + handler.wind.add(new Search("Search")); + handler.wind.add(new DisableDevice("Disable device")); + handler.wind.add(new Acrobatics("Acrobatics")); + + handler.magic.add(new Spellcraft("Spellcraft")); + } + + /** + * @param progression + * How many skills are gained per class level or monster hit die. + * @param monster + * Applies {@link Monster#intelligence} to sum + * @return the challenge rating value for how much should be gained in + * skills each level. + */ + public static float levelup(int progression, Monster m) { + return Math.max(1, progression + Monster.getbonus(m.intelligence)) + * COST; + } +} diff --git a/javelin/controller/challenge/factor/SpellsFactor.java b/javelin/controller/challenge/factor/SpellsFactor.java index fbd993a0c..bf022c59f 100644 --- a/javelin/controller/challenge/factor/SpellsFactor.java +++ b/javelin/controller/challenge/factor/SpellsFactor.java @@ -35,6 +35,7 @@ */ public class SpellsFactor extends CrFactor { + /** Number of different spells in-game. */ public static int spells; @Override @@ -59,9 +60,9 @@ public void listupgrades(UpgradeHandler handler) { handler.water.add(new CatsGrace()); handler.fire.add(new BullsStrength()); handler.earth.add(new BearsEndurance()); - handler.wind.add(new OwlsWisdom()); - handler.wind.add(new EaglesSplendor()); - handler.magic.add(new FoxsCunning()); + handler.water.add(new OwlsWisdom()); + handler.fire.add(new EaglesSplendor()); + handler.wind.add(new FoxsCunning()); handler.fire.add(new Heroism()); handler.magic.add(new HoldMonster()); diff --git a/javelin/controller/db/StateManager.java b/javelin/controller/db/StateManager.java index cc75b5be2..a9d539d65 100644 --- a/javelin/controller/db/StateManager.java +++ b/javelin/controller/db/StateManager.java @@ -5,26 +5,27 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.io.NotSerializableException; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.util.ArrayList; -import java.util.List; +import java.util.HashMap; +import java.util.HashSet; import javelin.Javelin; import javelin.JavelinApp; +import javelin.controller.Point; import javelin.controller.Weather; import javelin.controller.exception.battle.EndBattle; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; -import javelin.model.world.Haxor; import javelin.model.world.Incursion; -import javelin.model.world.Lair; -import javelin.model.world.Portal; import javelin.model.world.Squad; -import javelin.model.world.Town; -import javelin.model.world.WorldMap; -import javelin.model.world.WorldPlace; -import javelin.view.screen.world.WorldScreen; +import javelin.model.world.World; +import javelin.model.world.WorldActor; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.unique.Haxor; +import javelin.view.screen.BattleScreen; +import javelin.view.screen.WorldScreen; /** * Saves and loads game progress to a file. @@ -35,38 +36,66 @@ public class StateManager { private static final File SAVEFILE = new File(System.getProperty("user.dir"), "javelin.save"); + private static final Thread SAVEONEXIT = new Thread(new Runnable() { + @Override + public void run() { + if (WorldScreen.active == null) { + // quit before stating a game + return; + } + if (BattleScreen.active != null) { + // don't save during battle + return; + } + while (!SAVEFILE.canWrite()) { + System.out.println("Waiting for save to finish..."); + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + // should not happen + } + } + save(); + } + }); public static boolean abandoned = false; + static public boolean nofile = false; + + static { + Runtime.getRuntime().addShutdownHook(SAVEONEXIT); - public static void save() { + } + + public static synchronized void save() { try { - final ObjectOutputStream stream = + ObjectOutputStream writer = new ObjectOutputStream(new FileOutputStream(SAVEFILE)); - stream.writeBoolean(abandoned); - for (final Squad s : Squad.squads) { + writer.writeBoolean(abandoned); + for (final WorldActor a : Squad.getall(Squad.class)) { + Squad s = (Squad) a; s.x = s.visual.x; s.y = s.visual.y; } - stream.writeObject(Squad.squads); - stream.writeObject(WorldMap.seed); - stream.writeObject(Lair.lairs); - stream.writeObject(Dungeon.dungeons); - stream.writeObject(Dungeon.active); - stream.writeObject(Town.towns); - stream.writeObject(Portal.portals); - stream.writeObject(Incursion.squads); - stream.writeObject(Incursion.currentel); - stream.writeObject(Weather.now); - stream.writeObject(Haxor.singleton); - stream.writeObject(EndBattle.lastkilled); - stream.flush(); - stream.close(); + writer.writeObject(WorldActor.INSTANCES); + writer.writeObject(World.seed); + writer.writeObject(Dungeon.active); + writer.writeObject(Incursion.currentel); + writer.writeObject(Weather.now); + writer.writeObject(EndBattle.lastkilled); + writer.writeObject(WorldScreen.discovered); + writer.flush(); + writer.close(); + } catch (final NotSerializableException e) { + if (Javelin.DEBUG) { + /* fail when it's debug */ + throw new RuntimeException(e); + } + /* fail gracefully, hopefully the next invocation will work fine */ } catch (final IOException e) { throw new RuntimeException(e); } } - static public boolean nofile = false; - public static boolean load() { if (!SAVEFILE.exists()) { nofile = true; @@ -81,39 +110,26 @@ public static boolean load() { stream.close(); return false; } - Squad.squads = (ArrayList) stream.readObject(); + WorldActor.INSTANCES = + (HashMap, ArrayList>) stream + .readObject(); Javelin.act(); - WorldMap.seed = (WorldMap) stream.readObject(); - JavelinApp.overviewmap = WorldScreen.makemap(WorldMap.seed); - Lair.lairs = (List) stream.readObject(); - for (final WorldPlace l : Lair.lairs) { - l.place(); + World.seed = (World) stream.readObject(); + JavelinApp.overviewmap = World.makemap(World.seed); + for (ArrayList instances : WorldActor.INSTANCES + .values()) { + for (WorldActor p : instances) { + p.place(); + } } - Dungeon.dungeons = (List) stream.readObject(); + Haxor.singleton = + (Haxor) WorldActor.INSTANCES.get(Haxor.class).get(0); + Haxor.singleton.place(); Dungeon.active = (Dungeon) stream.readObject(); - for (final WorldPlace d : Dungeon.dungeons) { - d.place(); - } - for (final Squad s : Squad.squads) { - s.place(); - } - Town.towns = (ArrayList) stream.readObject(); - for (final Town t : Town.towns) { - t.place(); - } - Portal.portals = (ArrayList) stream.readObject(); - for (final WorldPlace p : Portal.portals) { - p.place(); - } - Incursion.squads = (List) stream.readObject(); - for (final Incursion t : Incursion.squads) { - t.place(); - } Incursion.currentel = (Integer) stream.readObject(); Weather.read((Integer) stream.readObject()); - Haxor.singleton = (Haxor) stream.readObject(); - Haxor.singleton.place(); EndBattle.lastkilled = (Combatant) stream.readObject(); + WorldScreen.discovered = (HashSet) stream.readObject(); stream.close(); return true; } catch (final Throwable e1) { @@ -132,6 +148,7 @@ public static boolean load() { // die gracefully } } + Runtime.getRuntime().removeShutdownHook(StateManager.SAVEONEXIT); System.exit(20140406); return false; } diff --git a/javelin/controller/db/reader/MonsterReader.java b/javelin/controller/db/reader/MonsterReader.java index 43d96b6b9..e3b6ee010 100644 --- a/javelin/controller/db/reader/MonsterReader.java +++ b/javelin/controller/db/reader/MonsterReader.java @@ -20,6 +20,7 @@ import javelin.Javelin; import javelin.controller.CountingSet; import javelin.controller.challenge.ChallengeRatingCalculator; +import javelin.controller.db.reader.factor.Alignment; import javelin.controller.db.reader.factor.ArmorClass; import javelin.controller.db.reader.factor.Attacks; import javelin.controller.db.reader.factor.Damage; @@ -31,6 +32,7 @@ import javelin.controller.db.reader.factor.Name; import javelin.controller.db.reader.factor.Organization; import javelin.controller.db.reader.factor.Paragraph; +import javelin.controller.db.reader.factor.Skills; import javelin.controller.db.reader.factor.SpecialAttacks; import javelin.controller.db.reader.factor.SpecialQualities; import javelin.controller.db.reader.factor.Speed; @@ -54,18 +56,6 @@ */ public class MonsterReader extends DefaultHandler { - public void describe(String value) { - if (monster == null) { - return; - } - final String monstername = monster.name; - String previous = Javelin.DESCRIPTIONS.get(monstername); - if (previous == null) { - previous = ""; - } - Javelin.DESCRIPTIONS.put(monstername, previous + value); - } - public Monster monster; private String section = null; public final ErrorHandler errorhandler = new ErrorHandler(); @@ -74,15 +64,23 @@ public void describe(String value) { public final CountingSet sAtks = new CountingSet(); public final CountingSet debugfeats = new CountingSet(); HashMap spelldata = new HashMap(); + boolean description = false; @Override public void startElement(final String uri, final String localName, final String name, final Attributes attributes) - throws SAXException { - super.startElement(uri, localName, name, attributes); + throws SAXException { + // super.startElement(uri, localName, name, attributes); if (!Javelin.DEBUG && errorhandler.isinvalid()) { return; } + if (description) { + if (localName.equals("p")) { + section = "Paragraph"; + } else { + return; + } + } if (localName.equals("Monster")) { monster = new Monster(); total++; @@ -110,8 +108,10 @@ public void startElement(final String uri, final String localName, section = "Initiative"; } else if (localName.equals("HitDice")) { section = "HitDice"; - } else if (localName.equals("p")) { - section = "Paragraph"; + } else if (localName.equalsIgnoreCase("Organization")) { + section = "Organization"; + } else if (localName.equalsIgnoreCase("Alignment")) { + section = "Alignment"; } else if (localName.equals("Saves")) { monster.fort = getIntAttributeValue(attributes, "Fort"); monster.ref = getIntAttributeValue(attributes, "Ref"); @@ -125,21 +125,34 @@ public void startElement(final String uri, final String localName, monster.charisma = parseability(attributes, "Cha"); } else if (localName.equals("SizeAndType")) { final int size = getSize(attributes.getValue("Size")); - if (size == -1) { errorhandler.setInvalid("Size"); } - monster.size = size; - - monster.monsterType = attributes.getValue("Type").toLowerCase(); + monster.type = attributes.getValue("Type").toLowerCase(); + monster.humanoid = monster.type.contains("humanoid") + || "yes".equals(attributes.getValue("Humanoid")); } else if (localName.equalsIgnoreCase("avatar")) { monster.avatar = attributes.getValue("Name"); monster.avatarfile = attributes.getValue("Image"); - } else if (localName.equalsIgnoreCase("Organization")) { - section = "Organization"; } else if (localName.equalsIgnoreCase("Climateandterrain")) { - terrains = attributes.getValue("Terrain").toLowerCase().split(","); + for (String terrain : attributes.getValue("Terrain").toLowerCase() + .split(",")) { + terrain = terrain.trim(); + if (terrain.isEmpty()) { + continue;// TODO + } + if (terrain.equals("plains") || terrain.equals("hill") + || terrain.equals("forest") || terrain.equals("marsh") + || terrain.equals("mountains") + || terrain.equals("desert") + || terrain.equals("underground") + || terrain.equals("aquatic")) { + monster.terrains.add(terrain); + } else { + throw new RuntimeException("#unknownterrain " + terrain); + } + } } else if (localName.equalsIgnoreCase("Breath")) { /* TODO */ if (attributes.getValue("effect") == null) { @@ -161,12 +174,13 @@ public void startElement(final String uri, final String localName, monster.spellcr = Float.parseFloat(spellcr); SpecialtiesLog.log(" Spell cr: " + monster.spellcr); } + } else if (localName.equalsIgnoreCase("description")) { + description = true; } else if (monster != null && !localName.equals("StatBlock")) { - for (final String tagName : new String[] { "description", "General", - "Terrain", "Treasure", "Alignment", "Advancement", - "specialabilities", "specialability", "p", "combat", - "characters", "li", "ul", "CarryingCapacity", - "ChallengeRating" }) { + for (final String tagName : new String[] { "General", "Terrain", + "Treasure", "Alignment", "Advancement", "specialabilities", + "specialability", "p", "combat", "characters", "li", "ul", + "CarryingCapacity", "ChallengeRating" }) { if (localName.equalsIgnoreCase(tagName)) { return; } @@ -175,6 +189,18 @@ public void startElement(final String uri, final String localName, } } + public void describe(String value) { + if (monster == null) { + return; + } + final String monstername = monster.name; + String previous = Javelin.DESCRIPTIONS.get(monstername); + if (previous == null) { + previous = ""; + } + Javelin.DESCRIPTIONS.put(monstername, previous + value); + } + void registerspells(String known, Monster monster) { ArrayList spelllist = new ArrayList(); HashSet spellset = new HashSet(); @@ -320,7 +346,6 @@ public void endDocument() throws SAXException { String listing = ""; for (final Monster m : value) { listing += m.toString() + " (" + m.group + "), "; - // Javelin.ALLMONSTERS.add(m); } log("CR " + key + " (" + value.size() + "): " + listing); } @@ -400,7 +425,7 @@ public int compare(final Entry o1, { readers.add(new Name(this, "Name")); - // readers.add(new Skills(this, "Skills")); + readers.add(new Skills(this, "Skills")); readers.add(new Feats(this, "Feats")); readers.add(new SpecialQualities(this, "SpecialQualities")); readers.add(new FaceAndReach(this, "FaceAndReach")); @@ -413,6 +438,8 @@ public int compare(final Entry o1, readers.add(new HitDice(this, "HitDice")); readers.add(new Paragraph(this, "Paragraph")); readers.add(new Organization(this, "Organization")); + readers.add(new Alignment(this, "Alignment")); + } @Override @@ -447,6 +474,10 @@ public String cleanArmor(final String speedType) { @Override public void endElement(final String uri, final String localName, final String name) throws SAXException { + if (description && localName.equals("Description")) { + description = false; + return; + } if (localName.equals("Monster")) { if (errorhandler.isinvalid()) { errorhandler.informInvalid(this); @@ -460,8 +491,8 @@ public void endElement(final String uri, final String localName, SpecialtiesLog.log(" Breaths: " + monster.breaths); } SpecialtiesLog.log(); - Organization.TERRAINDATA.put(monster.toString().toLowerCase(), - terrains); + // Organization.TERRAINDATA.put(monster.toString().toLowerCase(), + // terrains); } SpecialtiesLog.clear(); } @@ -484,20 +515,9 @@ public void registermonster() { e); } Javelin.ALLMONSTERS.add(monster); - // final List mapList = Javelin.MONSTERSBYCR.get(cr); - // final List addList; - // if (mapList == null) { - // addList = new ArrayList(); - // Javelin.MONSTERSBYCR.put(cr, addList); - // } else { - // addList = mapList; - // } - // addList.add(monster); - } private static PrintWriter log = null; - private String[] terrains; public static void log(final String string) { if (!Javelin.DEBUG) { diff --git a/javelin/controller/db/reader/factor/Alignment.java b/javelin/controller/db/reader/factor/Alignment.java new file mode 100644 index 000000000..7ca2988f3 --- /dev/null +++ b/javelin/controller/db/reader/factor/Alignment.java @@ -0,0 +1,39 @@ +package javelin.controller.db.reader.factor; + +import java.beans.PropertyVetoException; + +import javelin.controller.db.reader.MonsterReader; +import javelin.model.unit.Monster; + +/** + * TODO + * + * Alignment is defined in 2 axis: lawful-neutral-chaotic and good-neutral-evil. + * + * @see Monster#good + * @see Monster#lawful + * @see Monster#conflict + * @author alex + */ +public class Alignment extends FieldReader { + + public Alignment(MonsterReader reader, String fieldname) { + super(reader, fieldname); + } + + @Override + public void read(String value) + throws NumberFormatException, PropertyVetoException { + value = value.toLowerCase(); + if (value.contains("good")) { + reader.monster.good = true; + } else if (value.contains("evil")) { + reader.monster.good = false; + } + if (value.contains("lawful")) { + reader.monster.lawful = true; + } else if (value.contains("chaotic")) { + reader.monster.lawful = false; + } + } +} diff --git a/javelin/controller/db/reader/factor/Organization.java b/javelin/controller/db/reader/factor/Organization.java index 1d60f6e02..d56f37c6a 100644 --- a/javelin/controller/db/reader/factor/Organization.java +++ b/javelin/controller/db/reader/factor/Organization.java @@ -7,13 +7,14 @@ import java.util.List; import javelin.Javelin; +import javelin.controller.Weather; import javelin.controller.db.EncounterIndex; import javelin.controller.db.reader.MonsterReader; import javelin.controller.encounter.Encounter; -import javelin.controller.encounter.EncounterGenerator; import javelin.controller.encounter.EncounterPossibilities; import javelin.model.unit.Combatant; import javelin.model.unit.Monster; +import javelin.model.world.place.dungeon.Dungeon; import tyrant.mikera.engine.RPG; /** @@ -28,11 +29,9 @@ class EncounterData { /** * Possible encounters by terrain type. */ - final static HashMap ENCOUNTERS = + public final static HashMap ENCOUNTERS = new HashMap(); static ArrayList data = new ArrayList(); - public static HashMap TERRAINDATA = - new HashMap(); public Organization(final MonsterReader reader, final String fieldname) { super(reader, fieldname); @@ -53,6 +52,19 @@ public void read(final String value) } } + static ArrayList terrain(int terrainp) { + ArrayList terrains = new ArrayList(); + if (Dungeon.active != null) { + terrains.add("underground"); + return terrains; + } + terrains.add(Javelin.terrain(terrainp)); + if (Weather.now == 2) { + terrains.add("aquatic"); + } + return terrains; + } + /** * Uses organization data to create {@link Encounter}s. */ @@ -66,9 +78,7 @@ static public void process() { for (final EncounterData group : data) { for (final Encounter e : prepareexpansion(group.queue, monstersbyname)) { - if (e.size() <= EncounterGenerator.MAXGROUPSIZE) { - register(e); - } + register(e); } } if (Javelin.DEBUG) { @@ -106,8 +116,7 @@ public static void register(final Encounter e) { public static void jointerrains(List group, final HashSet terrains) { for (final Combatant c : group) { - for (final String terrain : TERRAINDATA - .get(c.source.toString().toLowerCase())) { + for (final String terrain : c.source.terrains) { terrains.add(terrain); } } @@ -173,17 +182,29 @@ private static void expand(final ArrayList result, } } - static public List makeencounter(final int el) { + /** + * @param el + * Given an encounter level target... + * @param terrainp + * @return a predefined creature group found on monster.xml from any of the + * local terrains. + */ + static public List makeencounter(final int el, int terrainp) { List possibilities = new ArrayList(); - for (String terrain : Javelin.getTerrain()) { + int maxel = Integer.MIN_VALUE; + for (String terrain : Organization.terrain(terrainp)) { EncounterIndex index = ENCOUNTERS.get(terrain); if (index != null) { + maxel = Math.max(maxel, index.lastKey()); List tier = index.get(el); if (tier != null) { possibilities.addAll(tier); } } } + if (el > maxel) { + return makeencounter(maxel, terrainp); + } return possibilities.isEmpty() ? null : RPG.pick(possibilities).generate(); } diff --git a/javelin/controller/db/reader/factor/Skills.java b/javelin/controller/db/reader/factor/Skills.java new file mode 100644 index 000000000..aadfd1139 --- /dev/null +++ b/javelin/controller/db/reader/factor/Skills.java @@ -0,0 +1,71 @@ +package javelin.controller.db.reader.factor; + +import java.beans.PropertyVetoException; +import java.util.HashSet; + +import javelin.Javelin; +import javelin.controller.db.reader.MonsterReader; +import javelin.model.unit.Monster; + +/** + * Input method for {@link Monster#skills}. Calculates ranks, not total bonus. + * + * @author alex + */ +public class Skills extends FieldReader { + + public static final HashSet UNKNOWN = + Javelin.DEBUG ? new HashSet() : null; + + /** Constructor. */ + public Skills(MonsterReader reader, String fieldname) { + super(reader, fieldname); + } + + @Override + public void read(String text) + throws NumberFormatException, PropertyVetoException { + Monster m = reader.monster; + for (String skill : text.split(",")) { + skill = skill.trim().toLowerCase(); + String[] split = skill.split(" "); + int value = + Integer.parseInt(split[split.length - 1].replace("*", "")); + if (skill.contains("tumble")) { + m.skills.acrobatics = value - Monster.getbonus(m.dexterity); + } else if (skill.contains("concentration")) { + m.skills.concentration = + value - Monster.getbonus(m.constitution); + } else if (skill.contains("diplomacy")) { + m.skills.diplomacy = value - Monster.getbonus(m.charisma); + } else if (skill.contains("disable device")) { + m.skills.disabledevice = + value - Monster.getbonus(m.intelligence); + } else if (skill.contains("gather information")) { + m.skills.gatherinformation = + value - Monster.getbonus(m.charisma); + } else if (skill.contains("hide")) { + m.skills.hide = value - Monster.getbonus(m.dexterity); + } else if (skill.contains("knowledge")) { + int knowledge = value - Monster.getbonus(m.intelligence); + if (knowledge > m.skills.knowledge) { + m.skills.knowledge = knowledge; + } + } else if (skill.contains("listen")) { + m.skills.listen = value - Monster.getbonus(m.wisdom); + } else if (skill.contains("move silently")) { + m.skills.movesilently = value - Monster.getbonus(m.dexterity); + } else if (skill.contains("search")) { + m.skills.search = value - Monster.getbonus(m.intelligence); + } else if (skill.contains("spellcraft")) { + m.skills.spellcraft = value - Monster.getbonus(m.intelligence); + } else if (skill.contains("spot")) { + m.skills.spot = value - Monster.getbonus(m.wisdom); + } else if (skill.contains("survival")) { + m.skills.survival = value - Monster.getbonus(m.wisdom); + } else if (Javelin.DEBUG) { + UNKNOWN.add(skill.replace('-', '+').split("\\+")[0].trim()); + } + } + } +} diff --git a/javelin/controller/encounter/Encounter.java b/javelin/controller/encounter/Encounter.java index f0e357778..758d53060 100644 --- a/javelin/controller/encounter/Encounter.java +++ b/javelin/controller/encounter/Encounter.java @@ -21,9 +21,10 @@ public Encounter(List groupp) { } public ArrayList generate() { - final ArrayList encounter = new ArrayList(); + final ArrayList encounter = + new ArrayList(group.size()); for (final Combatant m : group) { - encounter.add(m); + encounter.add(new Combatant(null, m.source.clone(), true)); } return encounter; } diff --git a/javelin/controller/encounter/EncounterGenerator.java b/javelin/controller/encounter/EncounterGenerator.java index ec2b9306a..43c84fe5c 100644 --- a/javelin/controller/encounter/EncounterGenerator.java +++ b/javelin/controller/encounter/EncounterGenerator.java @@ -4,26 +4,30 @@ import java.util.List; import javelin.Javelin; -import javelin.controller.db.Properties; import javelin.controller.db.reader.factor.Organization; import javelin.controller.exception.GaveUpException; import javelin.model.unit.Combatant; +import javelin.model.world.Squad; import tyrant.mikera.engine.RPG; /** * Generates an {@link Encounter}. * + * If I'm not mistaken when manually converting {@link Organization} data on + * monster.xml to a parseable format I only included monster groups up to 16 + * strong - anything other than that for generated encounters will need to be + * worked upon or done through other means than only this class. + * * @author alex */ public class EncounterGenerator { - public static final int MAXGROUPSIZE = - Integer.parseInt(Properties.getString("el.maxfoes")); static final int MAXTRIES = 1000; - public static ArrayList generate(int el) throws GaveUpException { + public static ArrayList generate(int el, int terrainp) + throws GaveUpException { ArrayList encounter = null; for (int i = 0; i < MAXTRIES; i++) { - encounter = select(el); + encounter = select(el, terrainp); if (encounter != null) { return encounter; } @@ -31,7 +35,7 @@ public static ArrayList generate(int el) throws GaveUpException { throw new GaveUpException(); } - public static ArrayList select(int elp) { + public static ArrayList select(int elp, int terrainp) { ArrayList popper = new ArrayList(); popper.add(elp); while (RPG.r(0, 1) == 1) { @@ -43,7 +47,7 @@ public static ArrayList select(int elp) { } final ArrayList foes = new ArrayList(); for (final int el : popper) { - List group = Organization.makeencounter(el); + List group = Organization.makeencounter(el, terrainp); if (group == null) { return null; } @@ -57,10 +61,27 @@ public static ArrayList select(int elp) { foes.add(invitee); } } + if (!new MisalignmentDetector(foes).check()) { + return null; + } if (Javelin.DEBUGMINIMUMFOES != null && foes.size() != Javelin.DEBUGMINIMUMFOES) { return null; } - return foes.size() > MAXGROUPSIZE ? null : foes; + return foes.size() > getmaxenemynumber() ? null : foes; + } + + /** + * See {@link EncounterGenerator}'s main javadoc description for mote info + * on enemy group size. + * + * @return The recommended number of enemies to face at most in one battle. + * Other modules may differ from this but this is a suggestion to + * avoid the computer player taking a long time to act while the + * human player has to wait (for example: 1 human unit against 20 + * enemies). + */ + public static int getmaxenemynumber() { + return Squad.active.members.size() + 5; } } diff --git a/javelin/controller/encounter/MisalignmentDetector.java b/javelin/controller/encounter/MisalignmentDetector.java new file mode 100644 index 000000000..53342d08c --- /dev/null +++ b/javelin/controller/encounter/MisalignmentDetector.java @@ -0,0 +1,59 @@ +package javelin.controller.encounter; + +import java.util.ArrayList; + +import javelin.model.unit.Combatant; + +/** + * Checks if a group of {@link Combatant}s is aligned enough to work as a team. + * + * @author alex + */ +public class MisalignmentDetector { + boolean good = false; + boolean evil = false; + boolean lawful = false; + boolean chaotic = false; + + /** + * @param foes + * All combatants that need to be compatible. + */ + public MisalignmentDetector(ArrayList foes) { + for (Combatant c : foes) { + register(c); + } + } + + void register(Combatant c) { + if (c.source.good != null) { + if (c.source.good) { + good = true; + } else { + evil = true; + } + } + if (c.source.lawful != null) { + if (c.source.lawful) { + lawful = true; + } else { + chaotic = true; + } + } + } + + /** + * @return false if there are good and evil (or lawful and + * chaotic) creatures coexisting on the given group. + */ + public boolean check() { + if (good && evil) { + return false; + } + if (lawful && chaotic) { + return false; + } + return true; + } + +} diff --git a/javelin/controller/exception/battle/EndBattle.java b/javelin/controller/exception/battle/EndBattle.java index c3e31938b..4b215e604 100644 --- a/javelin/controller/exception/battle/EndBattle.java +++ b/javelin/controller/exception/battle/EndBattle.java @@ -3,13 +3,20 @@ import java.util.ArrayList; import java.util.List; +import javelin.Javelin; +import javelin.controller.ai.ThreadManager; +import javelin.controller.ai.cache.AiCache; +import javelin.controller.upgrade.Spell; import javelin.model.BattleMap; -import javelin.model.EquipmentMap; -import javelin.model.item.Item; import javelin.model.item.scroll.RaiseScroll; +import javelin.model.spell.ScrollSpell; import javelin.model.unit.Combatant; +import javelin.model.world.Incursion; import javelin.model.world.Squad; -import javelin.view.screen.HaxorScreen; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.view.screen.BattleScreen; +import javelin.view.screen.WorldScreen; +import javelin.view.screen.haxor.HaxorScreen; /** * A victory or defeat condition has been achieved. @@ -26,7 +33,7 @@ public class EndBattle extends BattleEvent { public static void updateoriginal(List originalteam) { for (final Combatant inbattle : BattleMap.blueTeam) { for (final Combatant original : originalteam) { - if (original.source.customName == inbattle.source.customName) { + if (original.equals(inbattle)) { updatehp(inbattle, original); original.xp = inbattle.xp; copyspells(inbattle, original); @@ -69,7 +76,7 @@ static public void bury(List originalteam) { if (active.toString().equals(original.toString())) { if (Combatant.DEADATHP < active.hp && active.hp <= 0) { original.hp = 1; - } else if (!revive(original)) { + } else if (BattleMap.victory && !revive(original)) { lastkilled = original; originalteam.remove(original); Squad.active.equipment.remove(original.toString()); @@ -81,12 +88,76 @@ static public void bury(List originalteam) { BattleMap.dead.clear(); } - static public boolean revive(Combatant original) { - Item revive = EquipmentMap.pop(RaiseScroll.class, Squad.active); - if (revive != null) { - revive.use(new Combatant(null, original.source, false)); + static boolean revive(Combatant original) { + RaiseScroll scroll = (RaiseScroll) Squad.active.equipment + .contains(RaiseScroll.class); + if (scroll != null + && scroll.revive(new Combatant(null, original.source, false))) { + Squad.active.equipment.pop(RaiseScroll.class); + return true; + } + Spell spell = null; + search: for (Combatant c : Squad.active.members) { + for (Spell s : c.spells) { + ScrollSpell ss = + s instanceof ScrollSpell ? (ScrollSpell) s : null; + if (ss != null && ss.s instanceof RaiseScroll + && !ss.exhausted()) { + spell = s; + break search; + } + } + } + if (spell != null && ((ScrollSpell) spell).s + .use(new Combatant(null, original.source, false))) { + spell.used += 1; return true; } return false; } + + public static void end(BattleScreen battleScreen, + ArrayList originalTeam) { + int nsquads = Squad.getall(Squad.class).size(); + battleScreen.onEnd(); + BattleMap.combatants.clear(); + AiCache.reset(); + /* TODO probably size comparison is enough */ + if (Squad.active != null + && nsquads == Squad.getall(Squad.class).size()) { + while (WorldScreen.getactor(Squad.active.x, Squad.active.y, + Incursion.class) != null) { + Squad.active.visual.remove(); + Squad.active.displace(); + Squad.active.visual.remove(); + Squad.active.place(); + } + end(originalTeam); + if (Dungeon.active != null) { + Dungeon.active.activate(); + } + } + } + + static void end(ArrayList originalteam) { + for (Combatant c : new ArrayList(BattleMap.combatants)) { + if (c.summoned) { + BattleMap.combatants.remove(c); + BattleMap.blueTeam.remove(c); + BattleMap.redTeam.remove(c); + } + } + EndBattle.updateoriginal(originalteam); + EndBattle.bury(originalteam); + if (Javelin.captured != null) { + originalteam.add(Javelin.captured); + Javelin.captured = null; + } + Squad.active.members = originalteam; + for (Combatant member : Squad.active.members) { + member.currentmelee.sequenceindex = -1; + member.currentranged.sequenceindex = -1; + } + ThreadManager.printbattlerecord(); + } } diff --git a/javelin/controller/exception/battle/StartBattle.java b/javelin/controller/exception/battle/StartBattle.java index 104238d1b..63fc31758 100644 --- a/javelin/controller/exception/battle/StartBattle.java +++ b/javelin/controller/exception/battle/StartBattle.java @@ -1,10 +1,12 @@ package javelin.controller.exception.battle; +import javelin.controller.BattleSetup; import javelin.controller.fight.Fight; /** * A {@link Fight} has started. * + * @see BattleSetup * @author alex */ public class StartBattle extends BattleEvent { diff --git a/javelin/controller/fight/ExhibitionFight.java b/javelin/controller/fight/ExhibitionFight.java index a780e7248..69679bff8 100644 --- a/javelin/controller/fight/ExhibitionFight.java +++ b/javelin/controller/fight/ExhibitionFight.java @@ -49,4 +49,24 @@ public Map getmap() { public boolean friendly() { return true; } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return false; + } + + @Override + public void bribe() { + throw new RuntimeException("Cannot bribe an Exhibition! #exhibitionf"); + } + + @Override + public boolean canbribe() { + return false; + } } \ No newline at end of file diff --git a/javelin/controller/fight/Fight.java b/javelin/controller/fight/Fight.java index 028fa43ba..ac0190ae3 100644 --- a/javelin/controller/fight/Fight.java +++ b/javelin/controller/fight/Fight.java @@ -6,13 +6,16 @@ import javelin.controller.challenge.ChallengeRatingCalculator; import javelin.controller.map.Map; import javelin.model.BattleMap; +import javelin.model.state.Meld; import javelin.model.unit.Combatant; +import javelin.model.unit.Skills; +import javelin.model.world.Squad; import javelin.view.screen.BattleScreen; /** * A battle scenario. * - * TODO turn into class with fields. + * TODO turn into class with fields? */ public interface Fight { /** @@ -36,6 +39,9 @@ public interface Fight { */ List getmonsters(int teamel); + /** + * @return true if {@link Meld} should be generated. + */ boolean meld(); /** @@ -44,5 +50,35 @@ public interface Fight { */ Map getmap(); + /** + * @return If true will remove opponents at first sign of blood + * instead of at negative hit points. + */ boolean friendly(); + + /** + * @return If false will not reward gold after victory. + */ + boolean rewardgold(); + + /** + * @return true if there is a chance for the {@link Squad} to + * hide and avoid this combat. This doesn't make sense for + * {@link Siege}s for example since they are actually engaging the + * enemy. + */ + boolean hide(); + + /** + * @return true if this fight is susceptible to + * {@link Skills#diplomacy}. + */ + boolean canbribe(); + + /** + * Called in case of a succesful bribe. + * + * @see #canbribe() + */ + void bribe(); } diff --git a/javelin/controller/fight/IncursionFight.java b/javelin/controller/fight/IncursionFight.java index 8e3e05cbe..b704bc72c 100644 --- a/javelin/controller/fight/IncursionFight.java +++ b/javelin/controller/fight/IncursionFight.java @@ -22,7 +22,6 @@ public class IncursionFight implements Fight { QuestApp.getImage("/images/texture2.png"); private final class IncursionScreen extends BattleScreen { - final private Incursion i; private IncursionScreen(QuestApp q, BattleMap mapp, @@ -32,11 +31,6 @@ private IncursionScreen(QuestApp q, BattleMap mapp, Javelin.settexture(IncursionFight.INCURSIONTEXTURE); } - // @Override - // protected void withdraw(Combatant c) { - // dontflee(this); - // } - @Override public void onEnd() { if (BattleMap.redTeam.isEmpty()) { @@ -67,7 +61,6 @@ public void onEnd() { */ public IncursionFight(final Incursion incursion) { this.incursion = incursion; - // incursion.remove(); } @Override @@ -78,13 +71,13 @@ public BattleScreen getscreen(final JavelinApp javelinApp, @Override public int getel(final JavelinApp javelinApp, final int teamel) { - return incursion.el; + throw new RuntimeException( + "Shouldn't have to generate an incursion fight."); } @Override public List getmonsters(int teamel) { - return incursion.squad == null ? null - : Incursion.getsafeincursion(incursion.squad); + return Incursion.getsafeincursion(incursion.squad); } @Override @@ -101,4 +94,25 @@ public Map getmap() { public boolean friendly() { return false; } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + /* let player flee it he wants to but don't hide */ + return false; + } + + @Override + public boolean canbribe() { + return true; + } + + @Override + public void bribe() { + incursion.remove(); + } } \ No newline at end of file diff --git a/javelin/controller/fight/LairFight.java b/javelin/controller/fight/LairFight.java index dbdb3047c..72ddcc5b8 100644 --- a/javelin/controller/fight/LairFight.java +++ b/javelin/controller/fight/LairFight.java @@ -6,7 +6,7 @@ import javelin.controller.map.Map; import javelin.model.BattleMap; import javelin.model.unit.Combatant; -import javelin.model.world.Lair; +import javelin.model.world.place.Lair; import javelin.view.screen.BattleScreen; import javelin.view.screen.LairScreen; @@ -52,4 +52,24 @@ public Map getmap() { public boolean friendly() { return false; } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return false; + } + + @Override + public boolean canbribe() { + return false; + } + + @Override + public void bribe() { + throw new RuntimeException("Cannot bribe a #lairfight"); + } } \ No newline at end of file diff --git a/javelin/controller/fight/PlanarFight.java b/javelin/controller/fight/PlanarFight.java index 263773036..22b75b3cf 100644 --- a/javelin/controller/fight/PlanarFight.java +++ b/javelin/controller/fight/PlanarFight.java @@ -17,8 +17,8 @@ import javelin.model.item.Key; import javelin.model.unit.Combatant; import javelin.model.unit.Monster; -import javelin.model.world.Haxor; -import javelin.model.world.Town; +import javelin.model.world.place.town.Town; +import javelin.model.world.place.unique.Haxor; import javelin.view.screen.BattleScreen; import tyrant.mikera.engine.RPG; import tyrant.mikera.tyrant.Game; @@ -63,29 +63,28 @@ public String dealreward() { public PlanarFight(Key k) { this.key = k; - UpgradeHandler upgrades = new UpgradeHandler(); - upgrades.gather(); + UpgradeHandler.singleton.gather(); switch (key.color) { - case BLUE: - path = upgrades.water; + case WATER: + path = UpgradeHandler.singleton.water; break; - case BLACK: - path = upgrades.evil; + case EVIL: + path = UpgradeHandler.singleton.evil; break; - case GREEN: - path = upgrades.earth; + case EARTH: + path = UpgradeHandler.singleton.earth; break; - case MAGENTA: - path = upgrades.magic; + case MAGICAL: + path = UpgradeHandler.singleton.magic; break; - case RED: - path = upgrades.fire; + case FIRE: + path = UpgradeHandler.singleton.fire; break; - case TRANSPARENT: - path = upgrades.wind; + case WIND: + path = UpgradeHandler.singleton.wind; break; - case WHITE: - path = upgrades.good; + case GOOD: + path = UpgradeHandler.singleton.good; break; default: throw new RuntimeException("Unknown key type " + key); @@ -117,17 +116,12 @@ public List getmonsters(int teamel) { .add(new Combatant(null, RPG.pick(Javelin.MONSTERSBYCR .get(determinecr(teamel, size))).clone(), - true)); + true)); } // opponents = organizeopponents(opponents); for (int i = 0; i < size; i++) { Combatant opponent = opponents.get(i); - opponent.source.customName = Key.REALMS.get(key.color) + " " - + opponent.source.name.toLowerCase(); - opponent.source.customName = Character - .toUpperCase(opponent.source.customName.charAt(0)) - + opponent.source.customName.substring(1).toLowerCase(); - + key.color.baptize(opponent); } int i = 0; while (ChallengeRatingCalculator.calculateElSafe(opponents) < teamel) { @@ -135,8 +129,8 @@ public List getmonsters(int teamel) { int j = 0; while (true) { Upgrade u = RPG.pick(path); - if (u.apply(weakest.clonedeeply())) { - u.apply(weakest); + if (u.upgrade(weakest.clonedeeply())) { + u.upgrade(weakest); break; } j += 1; @@ -236,4 +230,23 @@ public boolean friendly() { return false; } + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return false; + } + + @Override + public boolean canbribe() { + return false; + } + + @Override + public void bribe() { + throw new RuntimeException("Cannot bribe a #planarfight"); + } } diff --git a/javelin/controller/fight/RandomDungeonEncounter.java b/javelin/controller/fight/RandomDungeonEncounter.java index f67be5ecb..941ee5fad 100644 --- a/javelin/controller/fight/RandomDungeonEncounter.java +++ b/javelin/controller/fight/RandomDungeonEncounter.java @@ -1,16 +1,69 @@ package javelin.controller.fight; +import java.util.List; + +import javelin.Javelin; import javelin.JavelinApp; -import javelin.model.world.Dungeon; +import javelin.controller.Weather; +import javelin.controller.map.Map; +import javelin.controller.map.TyrantMap; +import javelin.model.BattleMap; +import javelin.model.unit.Combatant; +import javelin.view.screen.BattleScreen; /** - * {@link Fight} that happens inside a {@link Dungeon}. + * Generates a harder battle than a {@link RandomEncounter}. * * @author alex */ -public class RandomDungeonEncounter extends RandomEncounter { +public class RandomDungeonEncounter implements Fight { + @Override + public int getel(JavelinApp javelinApp, int teamel) { + return teamel + Javelin.randomdifficulty() + 1; + } + + @Override + public BattleScreen getscreen(JavelinApp javelinApp, BattleMap battlemap) { + return new BattleScreen(javelinApp, battlemap, true); + } + + @Override + public List getmonsters(int teamel) { + return null; + } + + @Override + public boolean meld() { + return true; + } + + @Override + public Map getmap() { + return new TyrantMap("caves", Weather.DRY); + } + + @Override + public boolean friendly() { + return false; + } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return true; + } + + @Override + public boolean canbribe() { + return true; + } + @Override - public int getel(JavelinApp app, int teamel) { - return super.getel(app, teamel - 4); + public void bribe() { + // just avoid the fight } } diff --git a/javelin/controller/fight/RandomEncounter.java b/javelin/controller/fight/RandomEncounter.java index 8690d8f80..99b07309b 100644 --- a/javelin/controller/fight/RandomEncounter.java +++ b/javelin/controller/fight/RandomEncounter.java @@ -7,7 +7,7 @@ import javelin.controller.map.Map; import javelin.model.BattleMap; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; +import javelin.model.world.place.dungeon.Dungeon; import javelin.view.screen.BattleScreen; import tyrant.mikera.tyrant.Tile; @@ -24,9 +24,9 @@ public BattleScreen getscreen(final JavelinApp javelinApp, } @Override - public int getel(final JavelinApp app, final int teamel) { - int difficulty = JavelinApp.randomdifficulty() + Javelin.difficulty(); - return teamel + cap(difficulty, JavelinApp.worldtile()); + public int getel(final JavelinApp app, int teamel) { + int difficulty = Javelin.randomdifficulty() + Javelin.difficulty(); + return teamel + cap(difficulty, Javelin.terrain()); } private int cap(int difficulty, int tile) { @@ -64,4 +64,24 @@ public Map getmap() { public boolean friendly() { return false; } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return true; + } + + @Override + public boolean canbribe() { + return true; + } + + @Override + public void bribe() { + // just avoid the fight + } } \ No newline at end of file diff --git a/javelin/controller/fight/Siege.java b/javelin/controller/fight/Siege.java new file mode 100644 index 000000000..ebbac39f0 --- /dev/null +++ b/javelin/controller/fight/Siege.java @@ -0,0 +1,109 @@ +package javelin.controller.fight; + +import java.util.ArrayList; +import java.util.List; + +import javelin.Javelin; +import javelin.JavelinApp; +import javelin.controller.map.Map; +import javelin.model.BattleMap; +import javelin.model.unit.Combatant; +import javelin.model.world.place.WorldPlace; +import javelin.model.world.place.town.Town; +import javelin.view.screen.BattleScreen; + +/** + * Battle when a player invades a hostile town. + * + * @see Town#ishostile() + * + * @author alex + */ +public class Siege implements Fight { + private WorldPlace place; + + public Siege(WorldPlace town) { + this.place = town; + Javelin.settexture(IncursionFight.INCURSIONTEXTURE); + } + + @Override + public int getel(JavelinApp javelinApp, int teamel) { + throw new RuntimeException("#siege getel"); + } + + @Override + public List getmonsters(int teamel) { + ArrayList clones = new ArrayList(place.garrison); + for (int i = 0; i < clones.size(); i++) { + clones.set(0, clones.get(0).clonedeeply()); + } + return clones; + } + + @Override + public boolean meld() { + return true; + } + + @Override + public Map getmap() { + /* + * TODO would be super cool to have a procedural map generator that + * would produce similar maps for similar Towns + */ + return null; + } + + @Override + public boolean friendly() { + return false; + } + + @Override + public BattleScreen getscreen(JavelinApp javelinApp, BattleMap battlemap) { + return new BattleScreen(javelinApp, battlemap, true) { + @Override + public void onEnd() { + garrison: for (Combatant garrison : new ArrayList( + place.garrison)) { + for (Combatant active : BattleMap.combatants) { + if (garrison.equals(active)) { + continue garrison; // is alive + } + } + place.garrison.remove(garrison); + } + if (place.garrison.isEmpty()) { + place.realm = null; + Town t = place instanceof Town ? (Town) place : null; + if (t != null) { + t.capture(true); + } + } + super.onEnd(); + } + }; + } + + @Override + public boolean rewardgold() { + return true; + } + + @Override + public boolean hide() { + return false; + } + + @Override + public boolean canbribe() { + return true; + } + + @Override + public void bribe() { + place.garrison.clear(); + place.realm = null; + } +} diff --git a/javelin/controller/map/MapGenerator.java b/javelin/controller/map/MapGenerator.java index e19c0268c..7b010b419 100644 --- a/javelin/controller/map/MapGenerator.java +++ b/javelin/controller/map/MapGenerator.java @@ -12,13 +12,12 @@ import javelin.controller.map.hill.RuggedHill; import javelin.controller.map.marsh.Moor; import javelin.controller.map.marsh.Swamp; -import javelin.controller.map.mountain.ForbiddingMountain; import javelin.controller.map.mountain.Meadow; import javelin.controller.map.mountain.RuggedMountain; import javelin.controller.map.plain.Battlefield; import javelin.controller.map.plain.Farm; import javelin.controller.map.plain.Grasslands; -import javelin.model.world.WorldMap; +import javelin.model.world.World; import tyrant.mikera.engine.RPG; /** @@ -36,15 +35,15 @@ static public Map generatebattlemap(int tile, boolean dungeon) { Map[] selection; if (dungeon) { selection = new Map[] { new TyrantMap("caves", Weather.DRY) }; - } else if (tile == WorldMap.EASY) { + } else if (tile == World.EASY) { selection = new Map[] { wanderplain(), wanderplain(), wanderhill(), new TyrantMap("graveyard") }; - } else if (tile == WorldMap.MEDIUM) { + } else if (tile == World.MEDIUM) { selection = new Map[] { wanderforest(), wanderforest(), wanderhill(), new TyrantMap("dark forest") }; - } else if (tile == WorldMap.HARD) { + } else if (tile == World.HARD) { selection = new Map[] { wandermoutain(), wanderdesert() }; - } else if (tile == WorldMap.VERYHARD) { + } else if (tile == World.VERYHARD) { selection = new Map[] { new TyrantMap("goblin village", 1), new TyrantMap("ruin"), wandermarsh(), wandermarsh(), }; } else { @@ -95,7 +94,7 @@ private static Map wandermoutain() { Maps m = new Maps(); m.add(new Meadow()); m.add(new RuggedMountain()); - m.add(new ForbiddingMountain()); + // m.add(new ForbiddingMountain()); //TODO too closed return m.pick(); } } diff --git a/javelin/controller/tournament/Exhibition.java b/javelin/controller/tournament/Exhibition.java index e6fd45db9..5ca97926d 100644 --- a/javelin/controller/tournament/Exhibition.java +++ b/javelin/controller/tournament/Exhibition.java @@ -3,13 +3,16 @@ import java.io.Serializable; import java.util.ArrayList; -import javelin.model.world.Incursion; -import javelin.model.world.Town; +import javelin.model.world.place.WorldPlace; +import javelin.model.world.place.town.Town; import tyrant.mikera.engine.RPG; /** * One of the events in a tournament. * + * The EL of any tournament fight should be roughly equal to that of the active + * squad. Fights are not supposed to be fatal though accidents can happen. + * * @see Town#ishosting() * * @author alex @@ -33,11 +36,9 @@ public Exhibition(String namep) { } public static void opentournament() { - if (!Incursion.squads.isEmpty()) { - return; - } if (RPG.r(1, 7) == 1 || DEBUG) { - RPG.pick(javelin.model.world.Town.towns).host(); + final Town t = (Town) RPG.pick(WorldPlace.getall(Town.class)); + t.host(); } } diff --git a/javelin/controller/tournament/Horde.java b/javelin/controller/tournament/Horde.java index 0b51b7e2f..4423b1760 100644 --- a/javelin/controller/tournament/Horde.java +++ b/javelin/controller/tournament/Horde.java @@ -31,7 +31,8 @@ public List getmonsters(int teamel) { for (Monster m : new CrIterator( Javelin.MONSTERSBYCR.descendingMap())) { List opponents = new ArrayList(); - for (int i = 0; i < EncounterGenerator.MAXGROUPSIZE; i++) { + for (int i = 0; i < EncounterGenerator + .getmaxenemynumber(); i++) { opponents.add(new Combatant(null, m.clone(), true)); } try { diff --git a/javelin/controller/upgrade/FastHealing.java b/javelin/controller/upgrade/FastHealing.java index 3ae1ddbdc..3777d81b3 100644 --- a/javelin/controller/upgrade/FastHealing.java +++ b/javelin/controller/upgrade/FastHealing.java @@ -18,11 +18,12 @@ public String info(final Combatant m) { @Override public boolean apply(final Combatant m) { - if (m.source.fasthealing >= m.source.hd.count()) { + int heal = m.source.hd.count(); + if (m.source.fasthealing >= heal) { // design parameter (fast healing + regeneration) return false; } - m.source.fasthealing += 1; + m.source.fasthealing = heal; return true; } diff --git a/javelin/controller/upgrade/Spell.java b/javelin/controller/upgrade/Spell.java index 74ddb4d69..aeb4fc762 100644 --- a/javelin/controller/upgrade/Spell.java +++ b/javelin/controller/upgrade/Spell.java @@ -30,6 +30,7 @@ import javelin.model.state.BattleState; import javelin.model.unit.Combatant; import javelin.model.unit.Monster; +import javelin.model.unit.Skills; /** * Represents a spell-like ability. @@ -63,6 +64,7 @@ public abstract class Spell extends Upgrade implements javelin.model.Cloneable { */ public float cr; public final boolean ispeaceful; + public boolean aggressive = true; public int casterlevel; public final boolean friendly; @@ -91,24 +93,34 @@ public String info(Combatant m) { } @Override - public boolean apply(Combatant m) { - int hitdice = m.source.hd.count(); - if (casterlevel > hitdice || m.spells.count() >= hitdice) { + public boolean apply(Combatant c) { + int hitdice = c.source.hd.count(); + if (!checkcasterlevel(hitdice, c.source) + || c.spells.count() >= hitdice) { // design parameters return false; } - Spell s = m.spells.has(this); + Spell s = c.spells.has(this); if (s == null) { s = clone(); s.name = s.name.replaceAll("Spell: ", ""); - m.spells.add(s); + c.spells.add(s); } else { s.perday += 1; } - m.source.spellcr += s.cr; + c.source.spellcr += s.cr; return s.perday <= 5; } + private boolean checkcasterlevel(int hitdice, Monster source) { + return hitdice >= casterlevel || Skills.take10(source.skills.spellcraft, + source.intelligence) >= 10 + getspelllevel(); + } + + private int getspelllevel() { + return (casterlevel + 1) / 2; + } + private int count(Combatant source) { Spell s = source.spells.has(this); return s == null ? 0 : s.perday; @@ -207,6 +219,8 @@ public String showleft() { public abstract int calculatesavetarget(Combatant caster, Combatant target); /** + * @return A message to be displayed or null if feedback is + * handled internally. * @throws NotPeaceful * if should not be used out of combat. */ @@ -215,7 +229,7 @@ public abstract String castpeacefully(Combatant caster, Combatant combatant) @Override public boolean equals(Object obj) { - return obj instanceof Spell && ((Spell) obj).name.equals(name); + return obj != null && obj.getClass().equals(getClass()); } static public void targetself(final Combatant combatant, diff --git a/javelin/controller/upgrade/Upgrade.java b/javelin/controller/upgrade/Upgrade.java index 8c9d3723b..2aebab9d2 100644 --- a/javelin/controller/upgrade/Upgrade.java +++ b/javelin/controller/upgrade/Upgrade.java @@ -1,11 +1,13 @@ package javelin.controller.upgrade; import java.io.Serializable; +import java.util.ArrayList; import javelin.model.item.Item; +import javelin.model.item.artifact.Artifact; import javelin.model.unit.Combatant; import javelin.model.unit.Monster; -import javelin.model.world.Town; +import javelin.model.world.place.town.Town; /** * A improvement to a {@link Combatant}'s {@link Monster} which has to be @@ -16,16 +18,34 @@ */ public abstract class Upgrade implements Serializable { + /** Short description. */ public String name; + /** Constructor. */ public Upgrade(final String name) { super(); this.name = name; } + /** + * To be show before upgrade confirmation, containing relevant information + * that might help decide to buy it or not. + * + * For example, a {@link Spell} could show how many times it can already be + * cast by the {@link Combatant} in question. + * + * @return one line of text. + */ public abstract String info(final Combatant c); - abstract public boolean apply(final Combatant c); + /** + * @param c + * Given an unit apply the upgrade on it. + * @return false if this is not a valid update. For example: + * already reached the maximum level on a class, cannot learn this + * spell level yet. + */ + abstract protected boolean apply(final Combatant c); /** * Has a lot of drawbacks currently, namely spending too much xp on a single @@ -35,4 +55,33 @@ public Upgrade(final String name) { public boolean isstackable() { return false; } + + @Override + public boolean equals(Object obj) { + return name.equals(((Upgrade) obj).name); + } + + @Override + public String toString() { + return name; + } + + /** + * @param c + * Removes and reapplies his equipment before and after applying + * the upgrade. + * @return See {@link #apply(Combatant)}. + * @see Combatant#equipped + */ + public boolean upgrade(Combatant c) { + ArrayList equipment = new ArrayList(c.equipped); + for (Artifact a : equipment) { + a.remove(c); + } + boolean applied = apply(c); + for (Artifact a : equipment) { + a.usepeacefully(c); + } + return applied; + } } diff --git a/javelin/controller/upgrade/UpgradeHandler.java b/javelin/controller/upgrade/UpgradeHandler.java index 132ba4a8f..5018c1d5f 100644 --- a/javelin/controller/upgrade/UpgradeHandler.java +++ b/javelin/controller/upgrade/UpgradeHandler.java @@ -1,14 +1,20 @@ package javelin.controller.upgrade; -import java.awt.Color; import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; import javelin.controller.challenge.ChallengeRatingCalculator; import javelin.controller.challenge.factor.CrFactor; -import javelin.model.world.Town; -import javelin.view.screen.town.option.UpgradeOption; +import javelin.controller.upgrade.classes.ClassAdvancement; +import javelin.controller.upgrade.skill.SkillUpgrade; +import javelin.model.Realm; +import javelin.model.world.WorldActor; +import javelin.model.world.place.guarded.Academy; +import javelin.model.world.place.town.Town; +import tyrant.mikera.engine.RPG; /** * Collects and distributes {@link Upgrade}s from different subsystems. @@ -16,55 +22,164 @@ * @author alex */ public class UpgradeHandler { + /** The class can be accessed through here. */ + public final static UpgradeHandler singleton = new UpgradeHandler(); + + private UpgradeHandler() { + // prevents instantiation + } + LinkedList townqueue = new LinkedList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList fire = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList earth = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList water = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList wind = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList good = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList evil = new ArrayList(); + /** Linked to a {@link Town}'s realm. */ public ArrayList magic = new ArrayList(); + /** Linked to an {@link Academy}. */ + public ArrayList expertise = new ArrayList(); + /** Linked to an {@link Academy}. */ + public ArrayList power = new ArrayList(); + /** Linked to an {@link Academy}. */ + public ArrayList shots = new ArrayList(); + + /** + * Gives a starting selection of upgrades to each {@link Town}. + */ public void distribute() { gather(); - for (Town t : Town.towns) { - final List upgrades; - if (t.color == null) { - upgrades = wind; - } else if (t.color == Color.red) { - upgrades = fire; - } else if (t.color == Color.blue) { - upgrades = water; - } else if (t.color == Color.green) { - upgrades = earth; - } else if (t.color == Color.white) { - upgrades = good; - } else if (t.color == Color.black) { - upgrades = evil; - } else if (t.color == Color.magenta) { - upgrades = magic; - } else { - throw new RuntimeException("Uknown town!"); - } - for (Upgrade u : upgrades) { - t.upgrades.add(new UpgradeOption(u)); + for (WorldActor p : Town.getall(Town.class)) { + Town t = (Town) p; + Realm r = t.realm; + t.upgrades.add(getclass(r)); + final List upgrades = getupgrades(r); + Collections.shuffle(upgrades); + int i = 0; + int limit = RPG.r(3, 5); + while (t.upgrades.size() < limit && i < upgrades.size()) { + t.upgrades.add(upgrades.get(i)); + i += 1; } } } + ClassAdvancement getclass(Realm r) { + if (r == javelin.model.Realm.WIND) { + return ClassAdvancement.EXPERT; + } else if (r == Realm.FIRE) { + return ClassAdvancement.WARRIOR; + } else if (r == Realm.WATER) { + return ClassAdvancement.ARISTOCRAT; + } else if (r == Realm.EARTH) { + return ClassAdvancement.COMMONER; + } else if (r == Realm.GOOD) { + return ClassAdvancement.ARISTOCRAT; + } else if (r == Realm.EVIL) { + return ClassAdvancement.COMMONER; + } else if (r == Realm.MAGICAL) { + return ClassAdvancement.ARISTOCRAT; + } else { + throw new RuntimeException("Uknown town!"); + } + } + + /** + * @param r + * Given a realm... + * @return the upgrades that belong to it. + */ + public List getupgrades(Realm r) { + if (r == javelin.model.Realm.WIND) { + return wind; + } else if (r == Realm.FIRE) { + return fire; + } else if (r == Realm.WATER) { + return water; + } else if (r == Realm.EARTH) { + return earth; + } else if (r == Realm.GOOD) { + return good; + } else if (r == Realm.EVIL) { + return evil; + } else if (r == Realm.MAGICAL) { + return magic; + } else { + throw new RuntimeException("Uknown town!"); + } + } + + /** Initializes class, if needed. */ public void gather() { - for (final CrFactor factor : ChallengeRatingCalculator.CR_FACTORS) { - factor.listupgrades(this); + if (fire.isEmpty()) { + for (final CrFactor factor : ChallengeRatingCalculator.CR_FACTORS) { + factor.listupgrades(this); + } } } - public void addupgrade(Upgrade u, Town town) { - town.upgrades.add(new UpgradeOption(u)); + /** + * @return all upgrades. + */ + public HashMap> getall() { + HashMap> all = + new HashMap>(); + addall(fire, all, "fire"); + addall(earth, all, "earth"); + addall(water, all, "water"); + addall(wind, all, "wind"); + + addall(good, all, "good"); + addall(evil, all, "evil"); + addall(magic, all, "magic"); + + addall(power, all, "power"); + addall(expertise, all, "expertise"); + addall(shots, all, "shots"); + + return all; } + private void addall(ArrayList fire2, + HashMap> all, String string) { + all.put(string, fire2); + } + + /** + * Doesn't count skills, see {@link #countskills()}. + * + * @return Total number of {@link Upgrade}s available. + */ public int count() { - return fire.size() + earth.size() + water.size() + wind.size() - + good.size() + evil.size() + magic.size(); + int i = 0; + for (List l : getall().values()) { + i += l.size(); + } + return i - countskills(); } + + /** + * @return Total number of {@link Upgrade}s available. + */ + public int countskills() { + int i = 0; + for (List l : getall().values()) { + for (Upgrade u : l) { + if (u instanceof SkillUpgrade) { + i += 1; + } + } + } + return i; + } + } diff --git a/javelin/controller/upgrade/ability/RaiseAbility.java b/javelin/controller/upgrade/ability/RaiseAbility.java index e58c29c06..5c3911ccd 100644 --- a/javelin/controller/upgrade/ability/RaiseAbility.java +++ b/javelin/controller/upgrade/ability/RaiseAbility.java @@ -7,7 +7,8 @@ import javelin.model.unit.Monster; /** - * Raises one of the six attributes. + * Raises one of the six attributes by +2 score points (equivalent of +1 ability + * score modifier bonus). * * @author alex */ diff --git a/javelin/controller/upgrade/ability/RaiseCharisma.java b/javelin/controller/upgrade/ability/RaiseCharisma.java index b68318393..405e548b9 100644 --- a/javelin/controller/upgrade/ability/RaiseCharisma.java +++ b/javelin/controller/upgrade/ability/RaiseCharisma.java @@ -22,7 +22,7 @@ int getabilityvalue(Monster m) { @Override boolean setattribute(Combatant m, int l) throws PropertyVetoException { - m.source.charisma = l; + m.source.raisecharisma(+1); return true; } diff --git a/javelin/controller/upgrade/ability/RaiseConsitution.java b/javelin/controller/upgrade/ability/RaiseConsitution.java index 79605b18d..12222198e 100644 --- a/javelin/controller/upgrade/ability/RaiseConsitution.java +++ b/javelin/controller/upgrade/ability/RaiseConsitution.java @@ -20,10 +20,9 @@ int getabilityvalue(Monster m) { } @Override - boolean setattribute(Combatant m, int l) + boolean setattribute(Combatant c, int l) throws PropertyVetoException { - m.source.constitution = l; - m.source.raiseconstitution(m); + c.source.raiseconstitution(c, 1); return true; } diff --git a/javelin/controller/upgrade/ability/RaiseDexterity.java b/javelin/controller/upgrade/ability/RaiseDexterity.java index 1d9b05804..902b18fbc 100644 --- a/javelin/controller/upgrade/ability/RaiseDexterity.java +++ b/javelin/controller/upgrade/ability/RaiseDexterity.java @@ -21,7 +21,6 @@ int getabilityvalue(Monster m) { @Override boolean setattribute(Combatant m, int l) throws PropertyVetoException { - m.source.dexterity = l; m.source.raisedexterity(+1); return true; } diff --git a/javelin/controller/upgrade/ability/RaiseIntelligence.java b/javelin/controller/upgrade/ability/RaiseIntelligence.java index 07a3db1a6..79e71b3df 100644 --- a/javelin/controller/upgrade/ability/RaiseIntelligence.java +++ b/javelin/controller/upgrade/ability/RaiseIntelligence.java @@ -21,7 +21,7 @@ int getabilityvalue(Monster m) { @Override boolean setattribute(Combatant m, int l) throws PropertyVetoException { - m.source.intelligence = l; + m.source.raiseintelligence(+2); return true; } diff --git a/javelin/controller/upgrade/ability/RaiseStrength.java b/javelin/controller/upgrade/ability/RaiseStrength.java index a9493df36..7f6a80c84 100644 --- a/javelin/controller/upgrade/ability/RaiseStrength.java +++ b/javelin/controller/upgrade/ability/RaiseStrength.java @@ -25,8 +25,7 @@ boolean setattribute(Combatant m, int i) if (m.source.hasfeat(WeaponFinesse.singleton)) { return false; } - m.source.raisestrength(); - m.source.strength = i; + m.source.raisestrength(+1); return true; } diff --git a/javelin/controller/upgrade/ability/RaiseWisdom.java b/javelin/controller/upgrade/ability/RaiseWisdom.java index 0d7175980..12d33baa9 100644 --- a/javelin/controller/upgrade/ability/RaiseWisdom.java +++ b/javelin/controller/upgrade/ability/RaiseWisdom.java @@ -21,8 +21,7 @@ int getabilityvalue(Monster m) { @Override boolean setattribute(Combatant m, int l) throws PropertyVetoException { - m.source.wisdom = l; - m.source.raisewisdom(); + m.source.raisewisdom(+2); return true; } diff --git a/javelin/controller/upgrade/skill/Acrobatics.java b/javelin/controller/upgrade/skill/Acrobatics.java new file mode 100644 index 000000000..317b7d84e --- /dev/null +++ b/javelin/controller/upgrade/skill/Acrobatics.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#acrobatics}. + * + * @author alex + */ +public class Acrobatics extends SkillUpgrade { + public Acrobatics(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.acrobatics; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.acrobatics = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Concentration.java b/javelin/controller/upgrade/skill/Concentration.java new file mode 100644 index 000000000..f8017210a --- /dev/null +++ b/javelin/controller/upgrade/skill/Concentration.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#concentration}. + * + * @author alex + */ +public class Concentration extends SkillUpgrade { + public Concentration(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.concentration; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.concentration = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Diplomacy.java b/javelin/controller/upgrade/skill/Diplomacy.java new file mode 100644 index 000000000..7aaccb12f --- /dev/null +++ b/javelin/controller/upgrade/skill/Diplomacy.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#diplomacy}. + * + * @author alex + */ +public class Diplomacy extends SkillUpgrade { + public Diplomacy(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.diplomacy; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.diplomacy = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/DisableDevice.java b/javelin/controller/upgrade/skill/DisableDevice.java new file mode 100644 index 000000000..91e55c3e2 --- /dev/null +++ b/javelin/controller/upgrade/skill/DisableDevice.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#disabledevice}. + * + * @author alex + */ +public class DisableDevice extends SkillUpgrade { + public DisableDevice(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.disabledevice; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.disabledevice = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/GatherInformation.java b/javelin/controller/upgrade/skill/GatherInformation.java new file mode 100644 index 000000000..2b6d66e7a --- /dev/null +++ b/javelin/controller/upgrade/skill/GatherInformation.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#gatherinformation}. + * + * @author alex + */ +public class GatherInformation extends SkillUpgrade { + public GatherInformation(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.gatherinformation; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.gatherinformation = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Hide.java b/javelin/controller/upgrade/skill/Hide.java new file mode 100644 index 000000000..9ed9e72ed --- /dev/null +++ b/javelin/controller/upgrade/skill/Hide.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#hide}. + * + * @author alex + */ +public class Hide extends SkillUpgrade { + public Hide(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.hide; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.hide = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Knowledge.java b/javelin/controller/upgrade/skill/Knowledge.java new file mode 100644 index 000000000..77e374c97 --- /dev/null +++ b/javelin/controller/upgrade/skill/Knowledge.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#knowledge}. + * + * @author alex + */ +public class Knowledge extends SkillUpgrade { + public Knowledge(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.knowledge; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.knowledge = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Listen.java b/javelin/controller/upgrade/skill/Listen.java new file mode 100644 index 000000000..07cf6e389 --- /dev/null +++ b/javelin/controller/upgrade/skill/Listen.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#listen}. + * + * @author alex + */ +public class Listen extends SkillUpgrade { + public Listen(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.listen; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.listen = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/MoveSilently.java b/javelin/controller/upgrade/skill/MoveSilently.java new file mode 100644 index 000000000..7d7a7e30d --- /dev/null +++ b/javelin/controller/upgrade/skill/MoveSilently.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#movesilently}. + * + * @author alex + */ +public class MoveSilently extends SkillUpgrade { + public MoveSilently(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.movesilently; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.movesilently = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Search.java b/javelin/controller/upgrade/skill/Search.java new file mode 100644 index 000000000..8d426cce7 --- /dev/null +++ b/javelin/controller/upgrade/skill/Search.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#search}. + * + * @author alex + */ +public class Search extends SkillUpgrade { + public Search(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.search; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.search = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/SkillUpgrade.java b/javelin/controller/upgrade/skill/SkillUpgrade.java new file mode 100644 index 000000000..11dc0f97c --- /dev/null +++ b/javelin/controller/upgrade/skill/SkillUpgrade.java @@ -0,0 +1,44 @@ +package javelin.controller.upgrade.skill; + +import javelin.controller.upgrade.Upgrade; +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; +import javelin.model.unit.Skills; + +/** + * Upgrades one of the {@link Monster#skills}. + * + * @author alex + */ +public abstract class SkillUpgrade extends Upgrade { + public SkillUpgrade(String name) { + super("Skill: " + name.toLowerCase()); + } + + @Override + public String info(Combatant c) { + return "Has " + getranks(c.source.skills) + " ranks in " + + name.toLowerCase(); + } + + /** + * @return the ranks of the skill in question. + */ + protected abstract int getranks(Skills s); + + @Override + protected boolean apply(Combatant c) { + int ranks = c.source.hd.count() + 3; + if (getranks(c.source.skills) >= ranks) { + return false; + } + setranks(c.source.skills, ranks); + return true; + } + + /** + * @param ranks + * Sets the rank of the skill in question. + */ + protected abstract void setranks(Skills s, int ranks); +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Spellcraft.java b/javelin/controller/upgrade/skill/Spellcraft.java new file mode 100644 index 000000000..eb0269f82 --- /dev/null +++ b/javelin/controller/upgrade/skill/Spellcraft.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrade {@link Skills#spellcraft}. + * + * @author alex + */ +public class Spellcraft extends SkillUpgrade { + public Spellcraft(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.spellcraft; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.spellcraft = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Spot.java b/javelin/controller/upgrade/skill/Spot.java new file mode 100644 index 000000000..57828baf4 --- /dev/null +++ b/javelin/controller/upgrade/skill/Spot.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#spot}. + * + * @author alex + */ +public class Spot extends SkillUpgrade { + public Spot(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.spot; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.spot = ranks; + } +} \ No newline at end of file diff --git a/javelin/controller/upgrade/skill/Survival.java b/javelin/controller/upgrade/skill/Survival.java new file mode 100644 index 000000000..42e9bf1e1 --- /dev/null +++ b/javelin/controller/upgrade/skill/Survival.java @@ -0,0 +1,24 @@ +package javelin.controller.upgrade.skill; + +import javelin.model.unit.Skills; + +/** + * Upgrades {@link Skills#survival}. + * + * @author alex + */ +public class Survival extends SkillUpgrade { + public Survival(String name) { + super(name); + } + + @Override + protected int getranks(Skills s) { + return s.survival; + } + + @Override + protected void setranks(Skills s, int ranks) { + s.survival = ranks; + } +} \ No newline at end of file diff --git a/javelin/model/BattleMap.java b/javelin/model/BattleMap.java index cb67219ae..eda97775a 100644 --- a/javelin/model/BattleMap.java +++ b/javelin/model/BattleMap.java @@ -57,7 +57,7 @@ */ public class BattleMap extends BaseObject implements ThingOwner { - static class VisionCache { + public static class VisionCache { public static ArrayList positions = new ArrayList(); public String period; @@ -140,6 +140,7 @@ static boolean valid() { public static ArrayList redTeam = new ArrayList(); public static ArrayList blueTeam = new ArrayList(); public static ArrayList dead = new ArrayList(); + public static Boolean victory = null; public BattleMap(final int w, final int h) { // game=Game.instance(); @@ -1242,6 +1243,7 @@ public final boolean isLOS(final int x1, final int y1, final int x2, /** calculates all the visible squares for the hero at given position */ public void calcVisible(final Thing h) { final int combatantid = h.combatant.id; + final BattleState s = getState(); VisionCache cache = visioncache.get(combatantid); final String perception = h.combatant.perceive(period); if (cache != null) { @@ -1255,7 +1257,6 @@ public void calcVisible(final Thing h) { visioncache.clear(); } } - final BattleState s = getState(); final int range = h.combatant.view(period); final boolean forcevision = perception == Javelin.PERIOD_NOON || perception == Javelin.PERIOD_MORNING; @@ -1275,7 +1276,7 @@ public void calcVisible(final Thing h) { visioncache.put(combatantid, cache); } - void seeTile(int x, int y) { + public void seeTile(int x, int y) { setTileFull(x, y, getTileFull(x, y) | Tile.TF_VISIBLE); } diff --git a/javelin/model/EquipmentMap.java b/javelin/model/EquipmentMap.java index 24fc755ee..70f095c90 100644 --- a/javelin/model/EquipmentMap.java +++ b/javelin/model/EquipmentMap.java @@ -28,8 +28,8 @@ public java.util.ArrayList get(final Object key) { return super.get(key); } - static public Item pop(Class type, Squad s) { - for (final List items : s.equipment.values()) { + public Item pop(Class type) { + for (final List items : values()) { for (final Item i : items) { if (type.isInstance(i)) { items.remove(i); @@ -40,6 +40,17 @@ static public Item pop(Class type, Squad s) { return null; } + public Item contains(Class type) { + for (final List items : values()) { + for (final Item i : items) { + if (type.isInstance(i)) { + return i; + } + } + } + return null; + } + public void fill(Squad active) { for (Combatant c : active.members) { get(c.id); diff --git a/javelin/model/Realm.java b/javelin/model/Realm.java new file mode 100644 index 000000000..d89488e27 --- /dev/null +++ b/javelin/model/Realm.java @@ -0,0 +1,98 @@ +package javelin.model; + +import java.util.TreeMap; + +import javelin.model.unit.Combatant; +import tyrant.mikera.engine.RPG; + +/** + * A realm is an in-game faction, associated with d20 concepts in an arbitrary + * manner, following a generic lore of colors (as in Magic: The Gathering) or + * factions/races (as featured in many real-time strategy titles). + * + * @author alex + */ +public enum Realm { + WIND, FIRE, EARTH, WATER, GOOD, EVIL, MAGICAL; + + public static TreeMap REALMS = new TreeMap(); + + /** + * @return Equivalent color for the view package or null for + * {@link #WIND}. + */ + public java.awt.Color getawtcolor() { + switch (this) { + case WATER: + return java.awt.Color.BLUE; + case MAGICAL: + return java.awt.Color.MAGENTA; + case GOOD: + return java.awt.Color.WHITE; + case FIRE: + return java.awt.Color.RED; + case EARTH: + return java.awt.Color.GREEN; + case EVIL: + return java.awt.Color.BLACK; + case WIND: + return java.awt.Color.GRAY; + default: + throw new RuntimeException("#unknownColor"); + } + } + + @Override + public String toString() { + switch (this) { + case WATER: + return "Blue"; + case MAGICAL: + return "Octarine"; + case GOOD: + return "White"; + case FIRE: + return "Red"; + case EARTH: + return "Green"; + case EVIL: + return "Black"; + case WIND: + return "Translucid"; + default: + throw new RuntimeException("#unknownColor"); + } + } + + /** + * @return A randomly-chosen realm. + */ + public static Realm random() { + Realm[] realms = Realm.values(); + return realms[RPG.r(0, realms.length - 1)]; + } + + /** + * @param opponent + * Add's a realm-related keyword as a prefix to this unit's name. + */ + public void baptize(Combatant opponent) { + String prefix = prefixate(); + opponent.source.customName = + prefix + " " + opponent.source.name.toLowerCase(); + opponent.source.customName = + Character.toUpperCase(opponent.source.customName.charAt(0)) + + opponent.source.customName.substring(1).toLowerCase(); + } + + String prefixate() { + if (equals(GOOD)) { + return "Blessed"; + } + if (equals(EVIL)) { + return "Cursed"; + } + String prefix = name(); + return prefix.charAt(0) + prefix.substring(1).toLowerCase(); + } +} \ No newline at end of file diff --git a/javelin/model/condition/Paralyzed.java b/javelin/model/condition/Paralyzed.java index 9bfbfed23..d459cdff5 100644 --- a/javelin/model/condition/Paralyzed.java +++ b/javelin/model/condition/Paralyzed.java @@ -20,7 +20,6 @@ public Paralyzed(float expireatp, Combatant c) { void start(Combatant c) { c.source = c.source.clone(); dex = c.source.dexterity; - c.source.dexterity -= dex; delta = (int) Math.round(Math.floor(dex / 2f)); c.source.raisedexterity(-delta); c.ap = expireat; @@ -29,7 +28,6 @@ void start(Combatant c) { @Override void end(Combatant c) { c.source = c.source.clone(); - c.source.dexterity += dex; c.source.raisedexterity(+delta); } } diff --git a/javelin/model/item/Item.java b/javelin/model/item/Item.java index f41a56f42..fb3ae46a0 100644 --- a/javelin/model/item/Item.java +++ b/javelin/model/item/Item.java @@ -1,17 +1,20 @@ package javelin.model.item; -import java.awt.Color; import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; +import java.util.HashMap; import java.util.List; import java.util.TreeMap; import javelin.controller.db.StateManager; +import javelin.model.Realm; +import javelin.model.item.artifact.Artifact; import javelin.model.item.potion.Darkvision; import javelin.model.item.potion.Fly; import javelin.model.item.potion.Heroism; +import javelin.model.item.potion.Potion; import javelin.model.item.potion.barkskin.Barkskin2; import javelin.model.item.potion.barkskin.Barkskin3; import javelin.model.item.potion.barkskin.Barkskin4; @@ -25,7 +28,9 @@ import javelin.model.item.potion.resistenergy.ResistEnergy6; import javelin.model.item.potion.totem.BearsEndurance; import javelin.model.item.potion.totem.EaglesSplendor; +import javelin.model.item.potion.totem.FoxsCunning; import javelin.model.item.potion.totem.OwlsWisdom; +import javelin.model.item.scroll.PryingEyes; import javelin.model.item.scroll.RaiseScroll; import javelin.model.item.scroll.RecallScroll; import javelin.model.item.scroll.RessurectScroll; @@ -33,17 +38,21 @@ import javelin.model.item.scroll.Teleport; import javelin.model.item.scroll.dungeon.DiscernLocation; import javelin.model.item.scroll.dungeon.LocateObject; -import javelin.model.item.scroll.dungeon.PryingEyes; import javelin.model.unit.Combatant; import javelin.model.world.Squad; -import javelin.model.world.Town; -import javelin.model.world.WorldPlace; +import javelin.model.world.WorldActor; +import javelin.model.world.place.WorldPlace; +import javelin.model.world.place.town.Town; +import javelin.view.screen.WorldScreen; import tyrant.mikera.engine.RPG; /** * Represents an item carried by a {@link Combatant}. Most often items are * consumable. Currently only human players use items. * + * When crafting new items, it takes a day per $1000 for the process to + * complete. Exceptions are {@link Potion}s, which always take 1 day. + * * @author alex */ public abstract class Item implements Serializable, Cloneable { @@ -60,29 +69,27 @@ public int compare(Item o1, Item o2) { public static final ItemSelection ALL = new ItemSelection(); public static final TreeMap BYPRICE = new TreeMap(); - public static final ItemSelection MINOR = new ItemSelection(); - public static final ItemSelection MEDIUM = new ItemSelection(); - public static final ItemSelection MAJOR = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection FIRE = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection WIND = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection EARTH = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection WATER = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection GOOD = new ItemSelection(); + /** @see Item#getselection(Realm) */ public static final ItemSelection EVIL = new ItemSelection(); public static final ItemSelection MAGIC = new ItemSelection(); + /** @see Artifact */ + public static final ItemSelection ARTIFACT = new ItemSelection(); - public String name; - public int price; - - static { + public static void init() { new CureLightWounds(); new CureModerateWounds(); new CureSeriousWounds(); new CureCriticalWounds(); - new RaiseScroll(); - new RessurectScroll(); - new SecureShelterScroll(); - new RecallScroll(); new Barkskin2(); new Barkskin3(); new Barkskin4(); @@ -91,20 +98,31 @@ public int compare(Item o1, Item o2) { new ResistEnergy4(); new ResistEnergy6(); new Darkvision(); - new Heroism();// new Fly(); + new Heroism();// new BearsEndurance(); new javelin.model.item.potion.totem.BullsStrength(); new javelin.model.item.potion.totem.CatsGrace(); - new OwlsWisdom(); new EaglesSplendor(); + new FoxsCunning(); + new OwlsWisdom(); + + new DiscernLocation(); new LocateObject(); new PryingEyes(); - new DiscernLocation(); + new RaiseScroll(); + new RecallScroll(); + new RessurectScroll(); + new SecureShelterScroll(); new Teleport(); mapbyprice(); } + public String name; + public int price; + public boolean usedinbattle = true; + public boolean consumable = true; + public Item(final String name, final int price, final ItemSelection town) { super(); this.name = name; @@ -115,28 +133,9 @@ public Item(final String name, final int price, final ItemSelection town) { } } - private static void mapbyprice() { + public static void mapbyprice() { Collections.shuffle(ALL); Collections.sort(ALL, PRICECOMPARATOR); - int pertier = ALL.size() / 3; - int i = 0; - for (; i <= pertier; i++) { - MINOR.add(ALL.get(i)); - } - for (; i <= 2 * pertier; i++) { - MEDIUM.add(ALL.get(i)); - } - for (; i < ALL.size(); i++) { - MAJOR.add(ALL.get(i)); - } - for (Item it : Item.ALL) { - ItemSelection l = BYPRICE.get(it.price); - if (l == null) { - l = new ItemSelection(); - BYPRICE.put(it.price, l); - } - l.add(it); - } } @Override @@ -149,21 +148,25 @@ public String toString() { */ public abstract boolean use(Combatant user); - public boolean canuseneganged() { - return false; - } - - public abstract boolean isusedinbattle(); - - public abstract boolean usepeacefully(Combatant m); + /** + * Uses an item while on the {@link WorldScreen}. + * + * @param m + * Unit using the item. + * @return true if item is to be expended. + */ + public abstract boolean usepeacefully(Combatant c); @Override public boolean equals(final Object obj) { - try { - return ((Item) obj).name.equals(name); - } catch (final ClassCastException e) { - return false; - } + /** + * TODO this is probably a bad idea, better to have a #contains(Class) on ItemSelection or something like this. + * + * See the need for Artifact#equals for example and silly classes like + * new Barkskin3() + */ + return getClass().equals(obj.getClass()); } @Override @@ -181,68 +184,51 @@ public Object clone() { */ public static void distribute() { CureLightWounds curelightwounds = new CureLightWounds(); - int maxoptions = 0; - for (Town t : Town.towns) { - final ItemSelection inventory; - if (t.color == null) { - inventory = WIND; - } else if (t.color == Color.red) { - inventory = FIRE; - } else if (t.color == Color.green) { - inventory = EARTH; - } else if (t.color == Color.BLUE) { - inventory = WATER; - } else if (t.color == Color.white) { - inventory = GOOD; - } else if (t.color == Color.BLACK) { - inventory = EVIL; - } else if (t.color == Color.MAGENTA) { - inventory = MAGIC; - } else { - throw new RuntimeException("Unknown town!"); - } - t.items.addAll(inventory); - if (!t.items.contains(curelightwounds)) { - t.items.add(curelightwounds); + for (WorldActor p : WorldPlace.getall(Town.class)) { + Town t = (Town) p; + t.items.add(curelightwounds); + int nitems = RPG.r(3 - 1, 5 - 1); + ItemSelection selection = new ItemSelection(getselection(t.realm)); + selection.remove(curelightwounds); + if (nitems > selection.size()) { + nitems = selection.size(); } - maxoptions = - Math.max(maxoptions, t.items.size() + t.upgrades.size()); - } - for (Town t : Town.towns) { - int minorcount = 0; - int mediumcount = 0; - int majorcount = 0; - for (Item i : t.items) { - if (MINOR.contains(i)) { - minorcount += 1; - } else if (MEDIUM.contains(i)) { - mediumcount += 1; - } else if (MAJOR.contains(i)) { - majorcount += 1; - } else { - throw new RuntimeException("Item not tiered"); - } - } - while (t.items.size() + t.upgrades.size() < maxoptions) { - ItemSelection addfrom = null; - if (minorcount < mediumcount || minorcount < majorcount) { - minorcount += 1; - addfrom = MINOR; - } else if (mediumcount < majorcount) { - mediumcount += 1; - addfrom = MEDIUM; - } else { - majorcount += 1; - addfrom = MAJOR; - } - while (!t.items.add(RPG.pick(addfrom))) { - continue;// already has this item - } + while (t.items.size() - 1 < nitems) { + t.items.add(selection.random()); } Collections.sort(t.items, Item.PRICECOMPARATOR); } } + /** + * Each {@link Item} is assigned a {@link Realm} on creation. This + * determines what type of item each {@link Town} can produce. + * + * @see Item#Item(String, int, ItemSelection) + * @param r + * Given a realm... + * @return all {@link Item}s assigned to that realm. + */ + public static ItemSelection getselection(Realm r) { + if (r == Realm.WIND) { + return WIND; + } else if (r == Realm.FIRE) { + return FIRE; + } else if (r == Realm.EARTH) { + return EARTH; + } else if (r == Realm.WATER) { + return WATER; + } else if (r == Realm.GOOD) { + return GOOD; + } else if (r == Realm.EVIL) { + return EVIL; + } else if (r == Realm.MAGICAL) { + return MAGIC; + } else { + throw new RuntimeException("Unknown town!"); + } + } + /** * Use this to remove this item from the active {@link Squad}'s inventory. */ @@ -266,13 +252,24 @@ public String describefailure() { return "Can only be used in battle."; } - /** - * Called when a item has finished crafting. - * - * @param town - * {@link WorldPlace} this item is being completed on. - */ - public void produce(Town town) { - // your order is ready, m'lord + public static HashMap getall() { + HashMap all = + new HashMap(); + addall(FIRE, all, "fire"); + addall(EARTH, all, "earth"); + addall(WATER, all, "water"); + addall(WIND, all, "wind"); + + addall(GOOD, all, "good"); + addall(EVIL, all, "evil"); + addall(MAGIC, all, "magic"); + + addall(ARTIFACT, all, "artifact"); + return all; + } + + static private void addall(ItemSelection fire2, + HashMap all, String string) { + all.put(string, fire2); } } diff --git a/javelin/model/item/ItemSelection.java b/javelin/model/item/ItemSelection.java index 793c520ec..cbea0e4ff 100644 --- a/javelin/model/item/ItemSelection.java +++ b/javelin/model/item/ItemSelection.java @@ -2,14 +2,24 @@ import java.util.ArrayList; +import tyrant.mikera.engine.RPG; + /** - * Collection for {@link Item}. Does not aloow for more than one item of the + * Collection for {@link Item}. Does not allow for more than one item of the * same type. * * @author alex */ public class ItemSelection extends ArrayList { + public ItemSelection(ItemSelection getselection) { + super(getselection); + } + + public ItemSelection() { + super(); + } + @Override public boolean add(Item element) { if (contains(element)) { @@ -18,4 +28,20 @@ public boolean add(Item element) { return super.add(element); } + public Item random() { + return get(RPG.r(0, size() - 1)); + } + + @Override + public String toString() { + if (isEmpty()) { + return ""; + } + String s = get(0).toString(); + for (int i = 1; i < size(); i++) { + s += ", " + get(i); + } + return s.toLowerCase(); + } + } diff --git a/javelin/model/item/Key.java b/javelin/model/item/Key.java index 1d3701915..0f5185f28 100644 --- a/javelin/model/item/Key.java +++ b/javelin/model/item/Key.java @@ -1,16 +1,16 @@ package javelin.model.item; import java.util.ArrayList; -import java.util.TreeMap; import javelin.controller.fight.PlanarFight; +import javelin.model.Realm; import javelin.model.unit.Combatant; import javelin.model.world.Squad; +import javelin.view.screen.InfoScreen; import javelin.view.screen.IntroScreen; import tyrant.mikera.engine.RPG; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * Keys are found in dungeon treasure chests and allow the player to initiate a @@ -19,31 +19,15 @@ * @author alex */ public class Key extends Item { - public enum Color { - BLUE, MAGENTA, WHITE, RED, GREEN, BLACK, TRANSPARENT - } - - public static TreeMap REALMS = new TreeMap(); - - static { - REALMS.put(Color.MAGENTA, "Magical"); - REALMS.put(Color.BLACK, "Twisted"); - REALMS.put(Color.WHITE, "Holy"); - REALMS.put(Color.RED, "Fire"); - REALMS.put(Color.GREEN, "Earth"); - REALMS.put(Color.TRANSPARENT, "Wind"); - REALMS.put(Color.BLUE, "Water"); - } - - public Color color; + public Realm color; /** * @see #generate() */ - private Key(Color color) { - super(color.name().substring(0, 1).toUpperCase() - + color.name().substring(1).toLowerCase() + " key", 0, null); + private Key(Realm color) { + super(color.toString() + " key", 0, null); this.color = color; + usedinbattle = false; } @Override @@ -51,11 +35,6 @@ public boolean use(Combatant user) { return false; } - @Override - public boolean isusedinbattle() { - return false; - } - @Override public boolean usepeacefully(Combatant m) { new InfoScreen("").print("Enter a portal to activate this key."); @@ -64,12 +43,12 @@ public boolean usepeacefully(Combatant m) { } /** - * @param color + * @param realm * if null generates a key of random color. */ - public static Key generate(Color c) { + public static Key generate(Realm c) { if (c == null) { - Color[] colors = Color.values(); + Realm[] colors = Realm.values(); c = colors[RPG.r(0, colors.length - 1)]; } return new Key(c); diff --git a/javelin/model/item/artifact/AmuletOfHealth.java b/javelin/model/item/artifact/AmuletOfHealth.java new file mode 100644 index 000000000..80e7571ac --- /dev/null +++ b/javelin/model/item/artifact/AmuletOfHealth.java @@ -0,0 +1,30 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Raises {@link Monster#constitution} + * + * @author alex + */ +public class AmuletOfHealth extends Artifact { + int bonus; + + /** Constructor. */ + public AmuletOfHealth(int bonus, int price) { + super("Amulet of health +" + bonus, price, Slot.COLLAR); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.raiseconstitution(c, bonus / 2); + } + + @Override + protected void negate(Combatant c) { + c.source.raiseconstitution(c, -bonus / 2); + } + +} diff --git a/javelin/model/item/artifact/Artifact.java b/javelin/model/item/artifact/Artifact.java new file mode 100644 index 000000000..22638881e --- /dev/null +++ b/javelin/model/item/artifact/Artifact.java @@ -0,0 +1,141 @@ +package javelin.model.item.artifact; + +import javelin.controller.upgrade.Upgrade; +import javelin.model.item.Item; +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; +import javelin.model.world.Merchant; +import javelin.model.world.place.dungeon.Treasure; +import javelin.model.world.place.town.Town; + +/** + * A special kind of item that is equipabble and is not allowed to be crafted on + * {@link Town}s but can be found on other occasions such as in a + * {@link Merchant}s' possession, {@link Treasure} chests and at the Arcane + * University. + * + * The name of this class is a big misnomer from d20 standards. Technically + * there are just non-consumable, passive normal magic items. They're supposed + * to be just a simple way to expand inventory management possibilities in a + * hopefully worthwhile yet simple manner. + * + * Since stacking bonuses is complicated on d20 a few items have been adapted to + * solve this with {@link Slot} types instead. + * + * Equipped artifacts are removed before applying an {@link Upgrade} and then + * re-equipped afterwards. + * + * @see Combatant#equipped + * @author alex + */ +public abstract class Artifact extends Item { + public static void init() { + new AmuletOfHealth(+2, 4000); + new AmuletOfHealth(+4, 16000); + new AmuletOfHealth(+6, 36000); + new BeltOfGiantStrength(+2, 4000); + new BeltOfGiantStrength(+4, 16000); + new BeltOfGiantStrength(+6, 36000); + new CloakOfCharisma(+2, 4000); + new CloakOfCharisma(+4, 16000); + new CloakOfCharisma(+6, 36000); + new CloakOfResistance(+1, 1000); + new CloakOfResistance(+2, 4000); + new CloakOfResistance(+3, 9000); + new CloakOfResistance(+4, 16000); + new GlovesOfDexterity(+2, 4000); + new GlovesOfDexterity(+4, 16000); + new GlovesOfDexterity(+6, 36000); + new GogglesOfNight(12000); + new HeadbandOfIntellect(+2, 4000); + new HeadbandOfIntellect(+4, 16000); + new HeadbandOfIntellect(+6, 36000); + new PeriaptOfWisdom(+2, 4000); + new PeriaptOfWisdom(+4, 16000); + new PeriaptOfWisdom(+6, 36000); + new RingOfEnergyResistance(+2, 18000); + new RingOfEnergyResistance(+4, 28000); + new RingOfEnergyResistance(+6, 44000); + new RingOfProtection(+1, 2000); + new RingOfProtection(+2, 8000); + new RingOfProtection(+3, 18000); + new RingOfProtection(+4, 32000); + new RingOfProtection(+5, 50000); + new MantleOfSpellResistance(90000); + new WingsOfFlying(54000); + } + + public final Slot slot; + + public Artifact(String name, int price, Slot slotp) { + super(name, price, Item.ARTIFACT); + usedinbattle = false; + consumable = false; + slot = slotp; + } + + @Override + public boolean use(Combatant user) { + throw new RuntimeException("Not used in battle"); + } + + @Override + public boolean usepeacefully(Combatant c) { + return equip(c); + } + + /** + * Puts on an equipment piece, registering it at {@link Combatant#equipped} + * and activating it's effects. If this is already equipped will remove it, + * to work as well as a toggle on/off function. + * + * @param c + * Equipping unit. + * @return false if not {@link Monster#humanoid}, in which case + * the operation is aborted. + */ + public boolean equip(Combatant c) { + if (!c.source.humanoid) { + return false; + } + if (c.equipped.contains(this)) {// unequip + remove(c); + return true; + } + slot.clear(c); + c.equipped.add(this); + apply(c); + return true; + } + + public void remove(Combatant c) { + negate(c); + c.equipped.remove(this); + } + + /** + * Apply items bonuses to the... + * + * @param c + * combatant that is wearing this item. + */ + abstract protected void apply(Combatant c); + + /** + * Remove item bonuses from the... + * + * @param c + * combatant that is removing this item. + */ + abstract protected void negate(Combatant c); + + @Override + public boolean equals(Object obj) { + return obj == this; + } + + @Override + public String describefailure() { + return "Only humanoids can equip artifacts!"; + } +} diff --git a/javelin/model/item/artifact/BeltOfGiantStrength.java b/javelin/model/item/artifact/BeltOfGiantStrength.java new file mode 100644 index 000000000..d7935bb4e --- /dev/null +++ b/javelin/model/item/artifact/BeltOfGiantStrength.java @@ -0,0 +1,31 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Raises {@link Monster#strength} by +2. + * + * @author alex + */ +public class BeltOfGiantStrength extends Artifact { + + private int bonus; + + /** Constructor. */ + public BeltOfGiantStrength(int bonus, int price) { + super("Belt of giant strength +" + bonus, price, Slot.WAIST); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.raisestrength(bonus / 2); + } + + @Override + protected void negate(Combatant c) { + c.source.raisestrength(-bonus / 2); + } + +} diff --git a/javelin/model/item/artifact/CloakOfCharisma.java b/javelin/model/item/artifact/CloakOfCharisma.java new file mode 100644 index 000000000..ea35f0c94 --- /dev/null +++ b/javelin/model/item/artifact/CloakOfCharisma.java @@ -0,0 +1,31 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Raises {@link Monster#charisma}. + * + * @author alex + */ +public class CloakOfCharisma extends Artifact { + + private int bonus; + + /** Constructor. */ + public CloakOfCharisma(int bonus, int price) { + super("Cloak of charisma +" + bonus, price, Slot.BACK); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.raisecharisma(bonus); + } + + @Override + protected void negate(Combatant c) { + c.source.raisecharisma(-bonus); + } + +} diff --git a/javelin/model/item/artifact/CloakOfResistance.java b/javelin/model/item/artifact/CloakOfResistance.java new file mode 100644 index 000000000..fdcc7d738 --- /dev/null +++ b/javelin/model/item/artifact/CloakOfResistance.java @@ -0,0 +1,35 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; + +/** + * Adds bonus to saving throws. + * + * @author alex + */ +public class CloakOfResistance extends Artifact { + + private int bonus; + + /** + * Constructor. + */ + public CloakOfResistance(int bonus, int price) { + super("Cloak of resistance +" + bonus, price, Slot.BACK); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.fort += bonus; + c.source.ref += bonus; + c.source.addwill(+bonus); + } + + @Override + protected void negate(Combatant c) { + c.source.fort -= bonus; + c.source.ref -= bonus; + c.source.addwill(-bonus); + } +} diff --git a/javelin/model/item/artifact/GlovesOfDexterity.java b/javelin/model/item/artifact/GlovesOfDexterity.java new file mode 100644 index 000000000..701cd32d2 --- /dev/null +++ b/javelin/model/item/artifact/GlovesOfDexterity.java @@ -0,0 +1,30 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Raise {@link Monster#dexterity} + * + * @author alex + */ +public class GlovesOfDexterity extends Artifact { + private int bonus; + + /** Constructor. */ + public GlovesOfDexterity(int bonus, int price) { + super("Gloves of dexterity +" + bonus, price, Slot.HAND); + this.bonus = bonus / 2; + } + + @Override + protected void apply(Combatant c) { + c.source.raisedexterity(bonus); + } + + @Override + protected void negate(Combatant c) { + c.source.raisedexterity(-bonus); + } + +} diff --git a/javelin/model/item/artifact/GogglesOfNight.java b/javelin/model/item/artifact/GogglesOfNight.java new file mode 100644 index 000000000..2d10de84b --- /dev/null +++ b/javelin/model/item/artifact/GogglesOfNight.java @@ -0,0 +1,32 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Provide darkvision. + * + * @see Monster#vision + * @author alex + */ +public class GogglesOfNight extends Artifact { + + private int originalvision; + + /** Constructor. */ + public GogglesOfNight(int price) { + super("Googles of night", price, Slot.EYES); + } + + @Override + protected void apply(Combatant c) { + originalvision = c.source.vision; + c.source.vision = Monster.VISION_DARK; + } + + @Override + protected void negate(Combatant c) { + c.source.vision = originalvision; + } + +} diff --git a/javelin/model/item/artifact/HeadbandOfIntellect.java b/javelin/model/item/artifact/HeadbandOfIntellect.java new file mode 100644 index 000000000..ce7d1214a --- /dev/null +++ b/javelin/model/item/artifact/HeadbandOfIntellect.java @@ -0,0 +1,31 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Adds {@link Monster#intelligence}. + * + * @author alex + */ +public class HeadbandOfIntellect extends Artifact { + + private int bonus; + + /** Constructor. */ + public HeadbandOfIntellect(int bonus, int price) { + super("Headband of intellect +" + bonus, price, Slot.HEAD); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.raiseintelligence(bonus); + } + + @Override + protected void negate(Combatant c) { + c.source.raiseintelligence(-bonus); + } + +} diff --git a/javelin/model/item/artifact/MantleOfSpellResistance.java b/javelin/model/item/artifact/MantleOfSpellResistance.java new file mode 100644 index 000000000..ad10394d2 --- /dev/null +++ b/javelin/model/item/artifact/MantleOfSpellResistance.java @@ -0,0 +1,29 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Adds to {@link Monster#resistance}. + * + * @author alex + */ +public class MantleOfSpellResistance extends Artifact { + int previous; + + /** Constructor */ + public MantleOfSpellResistance(int price) { + super("Mantle of spell resistance", price, Slot.BACK); + } + + @Override + protected void apply(Combatant c) { + c.source.resistance += 21; + } + + @Override + protected void negate(Combatant c) { + c.source.resistance -= 21; + } + +} diff --git a/javelin/model/item/artifact/PeriaptOfWisdom.java b/javelin/model/item/artifact/PeriaptOfWisdom.java new file mode 100644 index 000000000..746f66360 --- /dev/null +++ b/javelin/model/item/artifact/PeriaptOfWisdom.java @@ -0,0 +1,30 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Raises {@link Monster#wisdom}. + * + * @author alex + */ +public class PeriaptOfWisdom extends Artifact { + private int bonus; + + /** Constructor. */ + public PeriaptOfWisdom(int bonus, int price) { + super("Periapt of wisdom +" + bonus, price, Slot.COLLAR); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.raisewisdom(bonus); + } + + @Override + protected void negate(Combatant c) { + c.source.raisewisdom(-bonus); + } + +} diff --git a/javelin/model/item/artifact/RingOfEnergyResistance.java b/javelin/model/item/artifact/RingOfEnergyResistance.java new file mode 100644 index 000000000..f10ce1ec8 --- /dev/null +++ b/javelin/model/item/artifact/RingOfEnergyResistance.java @@ -0,0 +1,45 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Adds to {@link Monster#resistance}. + * + * @author alex + */ +public class RingOfEnergyResistance extends Artifact { + + private int bonus; + + /** Constructor */ + public RingOfEnergyResistance(int bonus, int price) { + super(getprefix(bonus) + " ring of energy resistance", price, + Slot.FINGER); + this.bonus = bonus; + } + + static String getprefix(int bonus) { + if (bonus == 2) { + return "Minor"; + } + if (bonus == 4) { + return "Major"; + } + if (bonus == 6) { + return "Greater"; + } + throw new RuntimeException("Unknown #ringofresistance"); + } + + @Override + protected void apply(Combatant c) { + c.source.resistance += bonus; + } + + @Override + protected void negate(Combatant c) { + c.source.resistance -= bonus; + } + +} diff --git a/javelin/model/item/artifact/RingOfProtection.java b/javelin/model/item/artifact/RingOfProtection.java new file mode 100644 index 000000000..b36c01715 --- /dev/null +++ b/javelin/model/item/artifact/RingOfProtection.java @@ -0,0 +1,29 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; + +/** + * Adds AC bonus. + * + * @author alex + */ +public class RingOfProtection extends Artifact { + private int bonus; + + /** Constructor. */ + public RingOfProtection(int bonus, int price) { + super("Ring of protection +" + bonus, price, Slot.FINGER); + this.bonus = bonus; + } + + @Override + protected void apply(Combatant c) { + c.source.ac += bonus; + } + + @Override + protected void negate(Combatant c) { + c.source.ac -= bonus; + } + +} diff --git a/javelin/model/item/artifact/Slot.java b/javelin/model/item/artifact/Slot.java new file mode 100644 index 000000000..05c2ba054 --- /dev/null +++ b/javelin/model/item/artifact/Slot.java @@ -0,0 +1,147 @@ +package javelin.model.item.artifact; + +import java.io.Serializable; +import java.util.ArrayList; + +import javelin.model.unit.Combatant; +import javelin.model.unit.Monster; + +/** + * Complete adaptation from + * http://www.d20srd.org/srd/magicItems/creatingMagicItems.htm# + * bodySlotAffinities . + * + * Rings were added here as {@link Slot#FINGER}. + * + * @see Monster#humanoid + * + * @author alex + */ +public class Slot implements Serializable { + /** + * Assumes heads and eyes are independent instead of worrying about complex + * scenarios. + * + * Valid example: a hat and lenses. + * + * Invalid example: A full-head helmet and googles. + */ + public static final Slot HEAD = new Slot(0); + /** @see #HEAD */ + public static final Slot EYES = new Slot(1); + + /** + * Assuming that whatever covers your whole hands will force you to remove + * anything that is on your fingers. It's easy to imagine cloth gloves and + * rings being worn together for example but less so when it comes to full + * battle gloves so to simplify we supposed the "magical hand energies" + * would eliminate each other.. + */ + public static final Slot HAND = new Slot(2) { + @Override + protected boolean conflicts(Slot slot) { + return slot.equals(HAND) || slot.equals(FINGER); + }; + }; + /** + * Only one finger on each hand is allowed at a time. Hand items also need + * to be removed. + */ + public static final Slot FINGER = new Slot(3) { + @Override + protected boolean conflicts(Slot slot) { + return slot.equals(HAND); + } + + @Override + public void clear(Combatant c) { + super.clear(c); + int ringcount = 0; + for (Artifact a : new ArrayList(c.equipped)) { + if (a.slot.equals(FINGER)) { + ringcount += 1; + if (ringcount == 2) { + a.remove(c); + } + } + } + }; + }; + + public static final Slot COLLAR = new Slot(4); + public static final Slot TORSO = new Slot(5); + public static final Slot ARM = new Slot(6); + public static final Slot WAIST = new Slot(7); + public static final Slot FEET = new Slot(8); + public static final Slot BACK = new Slot(9); + + final int id; + + public Slot(int id) { + this.id = id; + } + + /** + * To be called before equipping an {@link Artifact}. + * + * @see Artifact#usepeacefully(javelin.model.unit.Combatant) + * @param c + * Removes all incompatible items from this unit. + */ + public void clear(Combatant c) { + for (Artifact a : new ArrayList(c.equipped)) { + if (conflicts(a.slot)) { + c.equipped.remove(a); + a.remove(c); + } + } + } + + protected boolean conflicts(Slot slot) { + return id == slot.id; + } + + @Override + public boolean equals(Object obj) { + if (!(obj instanceof Slot)) { + return false; + } + Slot s = (Slot) obj; + return id == s.id; + } + + @Override + public String toString() { + if (equals(COLLAR)) { + return "Collar"; + } + if (equals(TORSO)) { + return "Torso"; + } + if (equals(ARM)) { + return "Arm"; + } + if (equals(WAIST)) { + return "Waist"; + } + if (equals(FEET)) { + return "Feet"; + } + if (equals(BACK)) { + return "Back"; + } + if (equals(HAND)) { + return "Hand"; + } + if (equals(FINGER)) { + return "Finger"; + } + if (equals(HEAD)) { + return "Head"; + } + if (equals(EYES)) { + return "Eyes"; + } + throw new RuntimeException("unknown slot #slot"); + } +} \ No newline at end of file diff --git a/javelin/model/item/artifact/WingsOfFlying.java b/javelin/model/item/artifact/WingsOfFlying.java new file mode 100644 index 000000000..0439bd2dc --- /dev/null +++ b/javelin/model/item/artifact/WingsOfFlying.java @@ -0,0 +1,29 @@ +package javelin.model.item.artifact; + +import javelin.model.unit.Combatant; + +/** + * Turn a unit into a flying unit. + * + * @author alex + */ +public class WingsOfFlying extends Artifact { + private int without; + + /** Constructor. */ + public WingsOfFlying(int price) { + super("Wings of flying", price, Slot.BACK); + } + + @Override + protected void apply(Combatant c) { + without = c.source.fly; + c.source.fly = 60; + } + + @Override + protected void negate(Combatant c) { + c.source.fly = without; + } + +} diff --git a/javelin/model/item/potion/Potion.java b/javelin/model/item/potion/Potion.java index 80280b394..a571a9c58 100644 --- a/javelin/model/item/potion/Potion.java +++ b/javelin/model/item/potion/Potion.java @@ -14,8 +14,4 @@ public Potion(final String name, final int price, ItemSelection town) { super(name, price, town); } - @Override - public boolean isusedinbattle() { - return true; - } } diff --git a/javelin/model/item/potion/totem/BearsEndurance.java b/javelin/model/item/potion/totem/BearsEndurance.java index 00b82060d..9b5ea3f8c 100644 --- a/javelin/model/item/potion/totem/BearsEndurance.java +++ b/javelin/model/item/potion/totem/BearsEndurance.java @@ -19,15 +19,13 @@ public BearsEndurance() { @Override public boolean use(Combatant user) { - user.source.raiseconstitution(user); - user.source.raiseconstitution(user); - user.source.constitution += 4; + user.source.raiseconstitution(user, 2); user.conditions.add(new Buff("enduring", user)); Game.message( "Constitution is now " + Monster.getsignedbonus(user.source.constitution), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/potion/totem/BullsStrength.java b/javelin/model/item/potion/totem/BullsStrength.java index 91cc9a1bc..036543013 100644 --- a/javelin/model/item/potion/totem/BullsStrength.java +++ b/javelin/model/item/potion/totem/BullsStrength.java @@ -19,15 +19,13 @@ public BullsStrength() { @Override public boolean use(Combatant user) { - user.source.raisestrength(); - user.source.raisestrength(); - user.source.strength += 4; + user.source.raisestrength(+2); user.conditions.add(new Buff("strong", user)); Game.message( "Strength is now " + Monster.getsignedbonus(user.source.strength), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/potion/totem/CatsGrace.java b/javelin/model/item/potion/totem/CatsGrace.java index 305919937..813a52fa6 100644 --- a/javelin/model/item/potion/totem/CatsGrace.java +++ b/javelin/model/item/potion/totem/CatsGrace.java @@ -19,14 +19,13 @@ public CatsGrace() { @Override public boolean use(Combatant user) { - user.source.raisedexterity(2); - user.source.dexterity += 4; + user.source.raisedexterity(+2); user.conditions.add(new Buff("graceful", user)); Game.message( "Dexterity is now " + Monster.getsignedbonus(user.source.dexterity), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/potion/totem/EaglesSplendor.java b/javelin/model/item/potion/totem/EaglesSplendor.java index cde3337a9..7269a4d4f 100644 --- a/javelin/model/item/potion/totem/EaglesSplendor.java +++ b/javelin/model/item/potion/totem/EaglesSplendor.java @@ -14,7 +14,7 @@ public class EaglesSplendor extends Potion { public EaglesSplendor() { - super("Potion of eagle's splendor", 300, Item.WIND); + super("Potion of eagle's splendor", 300, Item.FIRE); } @Override @@ -25,7 +25,7 @@ public boolean use(Combatant user) { "Charisma is now " + Monster.getsignedbonus(user.source.charisma), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/potion/totem/FoxsCunning.java b/javelin/model/item/potion/totem/FoxsCunning.java index ee26c7df5..5c18bb478 100644 --- a/javelin/model/item/potion/totem/FoxsCunning.java +++ b/javelin/model/item/potion/totem/FoxsCunning.java @@ -14,7 +14,7 @@ public class FoxsCunning extends Potion { public FoxsCunning() { - super("Potion of fox's cunning", 300, Item.MAGIC); + super("Potion of fox's cunning", 300, Item.WIND); } @Override @@ -25,7 +25,7 @@ public boolean use(Combatant user) { "Intelligence is now " + Monster.getsignedbonus(user.source.intelligence), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/potion/totem/OwlsWisdom.java b/javelin/model/item/potion/totem/OwlsWisdom.java index b66f9ed13..fb3108670 100644 --- a/javelin/model/item/potion/totem/OwlsWisdom.java +++ b/javelin/model/item/potion/totem/OwlsWisdom.java @@ -14,19 +14,17 @@ public class OwlsWisdom extends Potion { public OwlsWisdom() { - super("Potion of owl's wisdom", 300, Item.WIND); + super("Potion of owl's wisdom", 300, Item.WATER); } @Override public boolean use(Combatant user) { - user.source.raisewisdom(); - user.source.raisewisdom(); - user.source.wisdom += 4; + user.source.raisewisdom(+4); user.conditions.add(new Buff("wise", user)); Game.message( "Wisdom is now " + Monster.getsignedbonus(user.source.wisdom), null, Delay.BLOCK); - return false; + return true; } @Override diff --git a/javelin/model/item/scroll/PryingEyes.java b/javelin/model/item/scroll/PryingEyes.java new file mode 100644 index 000000000..22be468d1 --- /dev/null +++ b/javelin/model/item/scroll/PryingEyes.java @@ -0,0 +1,37 @@ +package javelin.model.item.scroll; + +import javelin.controller.challenge.factor.SpellsFactor; +import javelin.model.item.Item; +import javelin.model.unit.Combatant; +import javelin.model.world.Squad; +import javelin.model.world.place.Outpost; +import javelin.model.world.place.dungeon.Dungeon; + +/** + * Reveals {@link Dungeon} map or nearby area on the WorldScreen. + * + * @author alex + */ +public class PryingEyes extends Scroll { + + public PryingEyes() { + super("Scroll of prying eyes", 1125, Item.MAGIC, 5, + SpellsFactor.ratespelllikeability(5)); + } + + @Override + public boolean usepeacefully(Combatant m) { + if (Dungeon.active == null) { + Outpost.discover(Squad.active.x, Squad.active.y, + Outpost.VISIONRANGE); + return true; + } + for (int x = 0; x < Dungeon.active.visible.length; x++) { + for (int y = 0; y < Dungeon.active.visible[x].length; y++) { + Dungeon.active.visible[x][y] = true; + } + } + return true; + } + +} diff --git a/javelin/model/item/scroll/RaiseScroll.java b/javelin/model/item/scroll/RaiseScroll.java index 82230c753..1e807b481 100644 --- a/javelin/model/item/scroll/RaiseScroll.java +++ b/javelin/model/item/scroll/RaiseScroll.java @@ -1,27 +1,32 @@ package javelin.model.item.scroll; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; import javelin.model.item.ItemSelection; import javelin.model.unit.Combatant; +import javelin.view.screen.InfoScreen; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; -import tyrant.mikera.tyrant.InfoScreen; /** * See the d20 SRD for more info. */ public class RaiseScroll extends Scroll { + protected static final float RESTORATIONCOST = + SpellsFactor.ratespelllikeability(4); + public RaiseScroll() { - super("Scroll of raise dead & restoration", 7000, Item.GOOD); + super("Scroll of raise dead & restoration", 7000, Item.GOOD, 5, + SpellsFactor.ratespelllikeability(5) + RESTORATIONCOST); } - public RaiseScroll(String string, int i, ItemSelection good) { - super(string, i, good); + public RaiseScroll(String string, int i, ItemSelection good, int level, + float cost) { + super(string, i, good, level, cost); } - @Override - public boolean use(final Combatant m) { + public boolean revive(final Combatant m) { Game.messagepanel.clear(); Game.message("Revive? Press y to confirm or n to let him go.", m, Delay.NONE); diff --git a/javelin/model/item/scroll/RecallScroll.java b/javelin/model/item/scroll/RecallScroll.java index 417d7123d..911b7fa53 100644 --- a/javelin/model/item/scroll/RecallScroll.java +++ b/javelin/model/item/scroll/RecallScroll.java @@ -1,26 +1,19 @@ package javelin.model.item.scroll; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; import javelin.model.world.Squad; -import javelin.model.world.Squad.Transport; -import javelin.model.world.Town; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.town.Transport; /** * See the d20 SRD for more info. */ public class RecallScroll extends Scroll { - - private Town town = null; - public RecallScroll() { - super("Scroll of word of recall", 1650, Item.MAGIC); - } - - @Override - public boolean use(Combatant c) { - return false; + super("Scroll of word of recall", 1650, Item.MAGIC, 6, + SpellsFactor.ratespelllikeability(6)); } @Override @@ -30,22 +23,10 @@ public boolean usepeacefully(Combatant m) { } Squad.active.visual.remove(); Squad.active.transport = Transport.NONE; - Squad.active.x = town.x; - Squad.active.y = town.y; + Squad.active.x = Squad.active.lasttown.x; + Squad.active.y = Squad.active.lasttown.y; Squad.active.displace(); - /* - * Squad.active.visual.x = Squad.active.x; Squad.active.visual.y = - * Squad.active.y; WorldScreen.worldmap.addThing(Squad.active.visual, - * Squad.active.visual.x, Squad.active.visual.y); - * WorldScreen.current.update(); - */ Squad.active.place(); return true; } - - @Override - public void produce(Town town) { - this.town = town; - name += " (" + town.toString() + ")"; - } } diff --git a/javelin/model/item/scroll/RessurectScroll.java b/javelin/model/item/scroll/RessurectScroll.java index 611e7d4bb..c7c1ba13b 100644 --- a/javelin/model/item/scroll/RessurectScroll.java +++ b/javelin/model/item/scroll/RessurectScroll.java @@ -1,5 +1,6 @@ package javelin.model.item.scroll; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; import javelin.model.unit.Combatant; @@ -9,7 +10,9 @@ public class RessurectScroll extends RaiseScroll { public RessurectScroll() { - super("Scroll of ressurect & restoration", 13000, Item.GOOD); + super("Scroll of ressurection & restoration", 13000, Item.GOOD, 7, + SpellsFactor.ratespelllikeability(7) + + RaiseScroll.RESTORATIONCOST); } @Override diff --git a/javelin/model/item/scroll/Scroll.java b/javelin/model/item/scroll/Scroll.java index 47223ef08..2bf19c188 100644 --- a/javelin/model/item/scroll/Scroll.java +++ b/javelin/model/item/scroll/Scroll.java @@ -1,24 +1,47 @@ package javelin.model.item.scroll; +import java.util.HashSet; + +import javelin.controller.upgrade.Spell; import javelin.model.item.Item; import javelin.model.item.ItemSelection; +import javelin.model.unit.Combatant; +import javelin.model.world.Squad; /** - * Can only be used out-of-combat. + * Can only be used out-of-combat. The lore concept is that there is actually a + * non-combatant able spellcaster (or at least spellreader) accompanying each + * {@link Squad}. * * @author alex */ public abstract class Scroll extends Item { + public static final HashSet SCROLLS = new HashSet(); + /** @see Spell#cr */ + final public float incrementcost; + /** + * Spell level. + * + * @see Spell#calculatecasterlevel(int) + */ + final public int level; + /** + * @param levelp + * @param incrementcostp * @see Item#Item(String, int, ItemSelection) */ - public Scroll(final String name, final int price, - final ItemSelection town) { + public Scroll(final String name, final int price, final ItemSelection town, + int levelp, float incrementcostp) { super(name, price, town); + level = levelp; + incrementcost = incrementcostp; + usedinbattle = false; + SCROLLS.add(this); } @Override - public boolean isusedinbattle() { - return false; + final public boolean use(Combatant user) { + throw new RuntimeException("Scrolls are not use in combat."); } } diff --git a/javelin/model/item/scroll/SecureShelterScroll.java b/javelin/model/item/scroll/SecureShelterScroll.java index 7dbcb1ff0..fd812b926 100644 --- a/javelin/model/item/scroll/SecureShelterScroll.java +++ b/javelin/model/item/scroll/SecureShelterScroll.java @@ -1,29 +1,21 @@ package javelin.model.item.scroll; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; -import javelin.model.world.Town; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.town.Town; import tyrant.mikera.tyrant.Game; import tyrant.mikera.tyrant.Game.Delay; /** * See the d20 SRD for more info. */ -public class SecureShelterScroll extends Item { +public class SecureShelterScroll extends Scroll { public SecureShelterScroll() { - super("Scroll of secure shelter", 800, Item.GOOD); - } - - @Override - public boolean use(Combatant c) { - return true; - } - - @Override - public boolean isusedinbattle() { - return false; + super("Scroll of secure shelter", 800, Item.GOOD, 4, + SpellsFactor.ratespelllikeability(4)); } @Override diff --git a/javelin/model/item/scroll/Teleport.java b/javelin/model/item/scroll/Teleport.java index 2a271f9d7..c55b705a9 100644 --- a/javelin/model/item/scroll/Teleport.java +++ b/javelin/model/item/scroll/Teleport.java @@ -3,14 +3,15 @@ import java.util.ArrayList; import javelin.controller.action.world.CastSpells; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; import javelin.model.unit.Combatant; -import javelin.model.world.Haxor; import javelin.model.world.Squad; -import javelin.model.world.Town; import javelin.model.world.WorldActor; -import javelin.model.world.WorldPlace; -import javelin.view.screen.world.WorldScreen; +import javelin.model.world.place.WorldPlace; +import javelin.model.world.place.town.Town; +import javelin.model.world.place.unique.Haxor; +import javelin.view.screen.WorldScreen; /** * Teleports {@link Squad#active} to any named {@link WorldPlace}. @@ -22,12 +23,8 @@ public class Teleport extends Scroll { public Teleport() { - super("Scroll of greater teleport", 2275, Item.MAGIC); - } - - @Override - public boolean use(Combatant user) { - return false; + super("Scroll of greater teleport", 2275, Item.MAGIC, 7, + SpellsFactor.ratespelllikeability(7)); } @Override @@ -37,14 +34,14 @@ public boolean usepeacefully(Combatant m) { for (WorldActor a : WorldScreen.getactors()) { if (a instanceof Town || a instanceof Haxor) { places.add(a); - names.add(a.describe()); + names.add(a.toString()); } } WorldActor to = places.get(CastSpells.choose("Where to?", names, true, true)); Squad.active.visual.remove(); - Squad.active.x = to.getx(); - Squad.active.y = to.gety(); + Squad.active.x = to.x; + Squad.active.y = to.y; while (WorldScreen.getactor(Squad.active.x, Squad.active.y) != Squad.active) { Squad.active.displace(); diff --git a/javelin/model/item/scroll/dungeon/DiscernLocation.java b/javelin/model/item/scroll/dungeon/DiscernLocation.java index 45289e73d..b2c01ff7e 100644 --- a/javelin/model/item/scroll/dungeon/DiscernLocation.java +++ b/javelin/model/item/scroll/dungeon/DiscernLocation.java @@ -1,11 +1,12 @@ package javelin.model.item.scroll.dungeon; -import javelin.model.dungeon.Feature; -import javelin.model.dungeon.Fountain; -import javelin.model.dungeon.Treasure; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.model.item.Item; -import javelin.model.world.Dungeon; -import javelin.view.screen.world.DungeonScreen; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.dungeon.Feature; +import javelin.model.world.place.dungeon.Fountain; +import javelin.model.world.place.dungeon.Treasure; +import javelin.view.screen.DungeonScreen; /** * Reveals a {@link Dungeon}'s most powerful feature. @@ -15,7 +16,8 @@ public class DiscernLocation extends DungeonScroll { public DiscernLocation() { - super("Scroll of discern location", 3000, Item.MAGIC); + super("Scroll of discern location", 3000, Item.MAGIC, 8, + SpellsFactor.ratespelllikeability(8)); } @Override diff --git a/javelin/model/item/scroll/dungeon/DungeonScroll.java b/javelin/model/item/scroll/dungeon/DungeonScroll.java index e0d564728..59c3e0fb7 100644 --- a/javelin/model/item/scroll/dungeon/DungeonScroll.java +++ b/javelin/model/item/scroll/dungeon/DungeonScroll.java @@ -3,24 +3,19 @@ import javelin.model.item.ItemSelection; import javelin.model.item.scroll.Scroll; import javelin.model.unit.Combatant; -import javelin.model.world.Dungeon; +import javelin.model.world.place.dungeon.Dungeon; /** - * A scroll that can only be actived in a {@link Dungeon}. Override + * A scroll that can only be activated in a {@link Dungeon}. Override * #usepeacefully() on subclasses. * * @author alex */ public abstract class DungeonScroll extends Scroll { - public DungeonScroll(String name, int price, ItemSelection town) { - super(name, price, town); - // TODO Auto-generated constructor stub - } - - @Override - public boolean use(Combatant user) { - return false; + public DungeonScroll(String name, int price, ItemSelection town, int level, + float cost) { + super(name, price, town, level, cost); } @Override diff --git a/javelin/model/item/scroll/dungeon/LocateObject.java b/javelin/model/item/scroll/dungeon/LocateObject.java index a2fb3d01b..03df1f50a 100644 --- a/javelin/model/item/scroll/dungeon/LocateObject.java +++ b/javelin/model/item/scroll/dungeon/LocateObject.java @@ -1,18 +1,20 @@ package javelin.model.item.scroll.dungeon; +import javelin.controller.challenge.factor.SpellsFactor; import javelin.controller.walker.Walker; -import javelin.model.dungeon.Feature; -import javelin.model.dungeon.Treasure; import javelin.model.item.Item; -import javelin.model.world.Dungeon; -import javelin.view.screen.world.DungeonScreen; +import javelin.model.world.place.dungeon.Dungeon; +import javelin.model.world.place.dungeon.Feature; +import javelin.model.world.place.dungeon.Treasure; +import javelin.view.screen.DungeonScreen; /** * Allows player to find nearest treasure chest in a {@link Dungeon}. */ public class LocateObject extends DungeonScroll { public LocateObject() { - super("Scroll of locate object", 150, Item.MAGIC); + super("Scroll of locate object", 150, Item.MAGIC, 2, + SpellsFactor.ratespelllikeability(2)); } @Override diff --git a/javelin/model/item/scroll/dungeon/PryingEyes.java b/javelin/model/item/scroll/dungeon/PryingEyes.java deleted file mode 100644 index 0ec97c4be..000000000 --- a/javelin/model/item/scroll/dungeon/PryingEyes.java +++ /dev/null @@ -1,27 +0,0 @@ -package javelin.model.item.scroll.dungeon; - -import javelin.model.item.Item; -import javelin.model.world.Dungeon; - -/** - * Revelas {@link Dungeon} map. - * - * @author alex - */ -public class PryingEyes extends DungeonScroll { - - public PryingEyes() { - super("Scroll of prying eyes", 1125, Item.MAGIC); - } - - @Override - protected boolean usepeacefully() { - for (int x = 0; x < Dungeon.active.visible.length; x++) { - for (int y = 0; y < Dungeon.active.visible[x].length; y++) { - Dungeon.active.visible[x][y] = true; - } - } - return true; - } - -} diff --git a/javelin/model/spell/ScrollSpell.java b/javelin/model/spell/ScrollSpell.java new file mode 100644 index 000000000..c400a50ee --- /dev/null +++ b/javelin/model/spell/ScrollSpell.java @@ -0,0 +1,62 @@ +package javelin.model.spell; + +import javelin.controller.exception.NotPeaceful; +import javelin.controller.upgrade.Spell; +import javelin.model.item.scroll.Scroll; +import javelin.model.state.BattleState; +import javelin.model.unit.Combatant; +import javelin.model.world.WorldActor; + +/** + * Convenience method for enabling {@link Scroll}s to be used as spells. This + * approach can cause problems like {@link #equals(Object)}, so ideally this + * should be handled in a more conceptually correct manner. + * + * @author alex + */ +public class ScrollSpell extends Spell { + + public Scroll s; + + public ScrollSpell(Scroll s, WorldActor here) { + super(s.name.toLowerCase().replace("scroll of ", ""), s.incrementcost, + true, s.level, true); + this.s = s; + } + + @Override + public int calculatetouchdc(Combatant combatant, Combatant targetCombatant, + BattleState s) { + throw new RuntimeException("Cannot be used in combat"); + } + + @Override + public String cast(Combatant caster, Combatant target, BattleState s, + boolean saved) { + throw new RuntimeException("Cannot be used in combat"); + } + + @Override + public int calculatehitdc(Combatant active, Combatant target, + BattleState state) { + throw new RuntimeException("Cannot be used in combat"); + } + + @Override + public int calculatesavetarget(Combatant caster, Combatant target) { + throw new RuntimeException("Cannot be used in combat"); + } + + @Override + public String castpeacefully(Combatant caster, Combatant combatant) + throws NotPeaceful { + s.usepeacefully(combatant); + return null; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof ScrollSpell + && ((ScrollSpell) obj).s.getClass().equals(s.getClass()); + } +} diff --git a/javelin/model/spell/totem/BearsEndurance.java b/javelin/model/spell/totem/BearsEndurance.java index 6ff717dc9..7c0731c01 100644 --- a/javelin/model/spell/totem/BearsEndurance.java +++ b/javelin/model/spell/totem/BearsEndurance.java @@ -17,9 +17,7 @@ public BearsEndurance() { public String cast(final Combatant caster, final Combatant target, final BattleState s, final boolean saved) { target.source = target.source.clone(); - target.source.raiseconstitution(target); - target.source.raiseconstitution(target); - target.source.constitution += 4; + target.source.raiseconstitution(target, 2); return target + "'s constitution is now " + Monster.getsignedbonus(target.source.constitution); } diff --git a/javelin/model/spell/totem/BullsStrength.java b/javelin/model/spell/totem/BullsStrength.java index 49e3ab6b1..07187a72f 100644 --- a/javelin/model/spell/totem/BullsStrength.java +++ b/javelin/model/spell/totem/BullsStrength.java @@ -17,9 +17,7 @@ public BullsStrength() { public String cast(final Combatant caster, final Combatant target, final BattleState s, final boolean saved) { target.source = target.source.clone(); - target.source.raisestrength(); - target.source.raisestrength(); - target.source.strength += 4; + target.source.raisestrength(+2); return target + "'s strength is now " + Monster.getsignedbonus(target.source.strength); } diff --git a/javelin/model/spell/totem/CatsGrace.java b/javelin/model/spell/totem/CatsGrace.java index 7e708d550..4fd102b84 100644 --- a/javelin/model/spell/totem/CatsGrace.java +++ b/javelin/model/spell/totem/CatsGrace.java @@ -18,7 +18,6 @@ public String cast(final Combatant caster, final Combatant target, final BattleState s, final boolean saved) { target.source = target.source.clone(); target.source.raisedexterity(+2); - target.source.dexterity += 4; return target + "'s dexterity is now " + Monster.getsignedbonus(target.source.dexterity); } diff --git a/javelin/model/spell/totem/OwlsWisdom.java b/javelin/model/spell/totem/OwlsWisdom.java index 2f8949978..f5797cb9b 100644 --- a/javelin/model/spell/totem/OwlsWisdom.java +++ b/javelin/model/spell/totem/OwlsWisdom.java @@ -17,9 +17,7 @@ public OwlsWisdom() { public String cast(Combatant caster, Combatant target, BattleState s, boolean saved) { target.source = target.source.clone(); - target.source.raisewisdom(); - target.source.raisewisdom(); - target.source.wisdom += 4; + target.source.raisewisdom(+4); return target + "'s wisdom is now " + Monster.getsignedbonus(target.source.wisdom); } diff --git a/javelin/model/unit/Combatant.java b/javelin/model/unit/Combatant.java index 177d7cb8e..48855472e 100644 --- a/javelin/model/unit/Combatant.java +++ b/javelin/model/unit/Combatant.java @@ -22,10 +22,13 @@ import javelin.model.condition.Defending; import javelin.model.feat.Cleave; import javelin.model.feat.GreatCleave; +import javelin.model.item.artifact.Artifact; import javelin.model.state.BattleState; import javelin.model.state.BattleState.Vision; import javelin.model.unit.abilities.Spells; import javelin.model.world.Squad; +import javelin.model.world.WorldActor; +import javelin.model.world.place.unique.MercenariesGuild; import javelin.view.screen.BattleScreen; import tyrant.mikera.engine.RPG; import tyrant.mikera.engine.Thing; @@ -42,9 +45,7 @@ * @author alex */ public class Combatant implements Serializable, Cloneable { - /** - * TODO - */ + /** TODO proper dying process + healing phase at the end of combat */ public static final int DEADATHP = -8; /** * Should probably be external, like a mapping in {@link BattleScreen}. @@ -71,10 +72,13 @@ public class Combatant implements Serializable, Cloneable { */ public Spells spells = new Spells(); /** - * TODO should be in {@link Combatant} + * XP in CR, you'll want to multiply by 100 and round to show the player. */ public BigDecimal xp = new BigDecimal(0); public boolean summoned = false; + public ArrayList equipped = new ArrayList(0); + /** See {@link MercenariesGuild} */ + public boolean mercenary = false; /** * @param generatespells @@ -112,7 +116,8 @@ public void newid() { } private boolean checkidcollision() { - for (Squad s : Squad.squads) { + for (WorldActor a : Squad.getall(Squad.class)) { + Squad s = (Squad) a; for (Combatant c : s.members) { if (Combatant.ids == c.id) { return true; @@ -132,6 +137,9 @@ public Combatant clone() { c.conditions = conditions.clone(); c.spells = (Spells) spells.clone(); c.xp = c.xp.add(new BigDecimal(0)); + if (c.equipped != null) { + c.equipped = (ArrayList) c.equipped.clone(); + } return c; } catch (CloneNotSupportedException e) { throw new RuntimeException(e); @@ -189,10 +197,7 @@ public List getTeam(final TeamContainer tc) { @Override public String toString() { - // TODO location: - return source.toString() - // + Arrays.toString(location) - ; + return source.toString(); } public boolean hasAttackType(final boolean meleeOnly) { @@ -405,6 +410,12 @@ public int view(String period) { return Integer.MAX_VALUE; } + /** + * Note that this isn't supposed to be used for creating new + * {@link Combatant}s since the {@link #id} is kept the same. + * + * @return A clone with a cloned {@link #source}. + */ public Combatant clonedeeply() { final Combatant c = clone(); c.source = c.source.clone(); @@ -507,4 +518,18 @@ public void meld() { } } } + + /** + * @return a roll of {@link Skills#listen}. + */ + public int listen() { + return Skills.take10(source.skills.listen, source.wisdom); + } + + /** + * @return a roll of {@link Skills#movesilently}. + */ + public int movesilently() { + return Skills.take10(source.skills.movesilently, source.dexterity); + } } diff --git a/javelin/model/unit/Monster.java b/javelin/model/unit/Monster.java index b3b1798ce..099b78a2a 100644 --- a/javelin/model/unit/Monster.java +++ b/javelin/model/unit/Monster.java @@ -18,6 +18,8 @@ import javelin.controller.upgrade.feat.MeleeFocus; import javelin.model.Cloneable; import javelin.model.feat.Feat; +import javelin.model.item.artifact.Artifact; +import javelin.model.item.artifact.Slot; import javelin.model.unit.abilities.BreathWeapon; import javelin.model.unit.abilities.TouchAttack; import tyrant.mikera.engine.RPG; @@ -37,7 +39,9 @@ * @author alex */ public class Monster implements Cloneable, Serializable { + /** TODO make enumeration */ public static final int VISION_LOWLIGHT = 1; + /** TODO make enumeration */ public static final int VISION_DARK = 2; public static final int FINE = 0; @@ -70,6 +74,7 @@ public class Monster implements Cloneable, Serializable { private int will; public int walk = 0; + /** TODO also offer perfect flight */ public int fly = 0; public int swim = 0; @@ -112,11 +117,12 @@ public class Monster implements Cloneable, Serializable { */ public String group; public Float challengeRating = null; - public String monsterType; + public String type; /** * TODO use only {@link #avatarfile} */ public String avatar = null; + /** TODO should probably be a Combatant#name */ public String customName = null; public int meleedamageupgrades = 0; public int fasthealing = 0; @@ -163,6 +169,30 @@ public class Monster implements Cloneable, Serializable { */ public int sr = 0; public boolean immunetomindeffects = false; + public ArrayList terrains = new ArrayList(); + /** + * Alignment. true if lawful, null if neutral, + * false if chaotic. + */ + public Boolean lawful = null; + /** + * Alignment. true if good, null if neutral, + * false if evil. + */ + public Boolean good = null; + /** + * A monster is humanoid if it can use most of it's {@link Slot}s to wear + * {@link Artifact}s. Humanoid and monstrous humanoid monster types are + * humanoid by default, other types have to manually marked as + * Humanoid="yes" in monster.xml to be marked as such. + * + * Ideally this would be defined in a slot-by-slot and monster-by-monster + * basis but for now a creature tagged as humanoid is eligible to use any + * and all {@link Slot}s. + */ + public boolean humanoid = false; + /** See {@link Skills}. */ + public Skills skills = new Skills(); @Override public Monster clone() { @@ -176,6 +206,8 @@ public Monster clone() { if (m.touch != null) { m.touch = touch.clone(); } + terrains = (ArrayList) terrains.clone(); + skills = skills.clone(); return m; } catch (final CloneNotSupportedException e) { throw new RuntimeException(e); @@ -238,40 +270,58 @@ public int getbaseattackbonus() { for (ClassAdvancement classdata : ClassAdvancement.CLASSES) { classesbab += classdata.gettable()[classdata.getlevel(this)].bab; } - return classesbab + new Long( - Math.round(originalhd * MeleeFocus.bab.get(monsterType))) + return classesbab + + new Long(Math.round(originalhd * MeleeFocus.bab.get(type))) .intValue(); } - public void raisedexterity(int x) { - ac += 1 * x; - ref += 1 * x; + /** + * @param bonus + * Raises {@link #dexterity} bonus by +1 this many times (+1 + * bonus = +2 ability score points). + */ + public void raisedexterity(int bonus) { + dexterity += 2 * bonus; + ac += bonus; + ref += bonus; for (List attacks : ranged) { for (Attack a : attacks) { - a.bonus += 1 * x; + a.bonus += bonus; } } - initiative += 1 * x; + initiative += bonus; } - public boolean raisestrength() { + /** + * @param bonus + * Raises {@link #strength} bonus by this many steps (+1 bonus = + * +2 score points) + */ + public void raisestrength(int bonus) { + strength += 2 * bonus; for (AttackSequence sequence : melee) { for (Attack a : sequence) { - a.bonus += 1; - a.damage[2] += 1; + a.bonus += bonus; + a.damage[2] += bonus; } } - return true; } - public void raiseconstitution(Combatant c) { - fort += 1; - int bonushp = hd.count(); + /** + * @param c + * Raises {@link #constitution} by +2... + * @param bonus + * multiplied by this magnitude. Negative values allowed. + */ + public void raiseconstitution(Combatant c, int bonus) { + c.source.constitution += bonus * 2; + fort += bonus; + int bonushp = hd.count() * bonus; hd.extrahp += bonushp; c.hp += bonushp; c.maxhp += bonushp; for (BreathWeapon breath : breaths) { - breath.savedc += 1; + breath.savedc += bonus; } } @@ -293,8 +343,14 @@ public boolean swim() { return swim > 0 || fly > 0; } - public void raisewisdom() { - will += 1; + /** + * @param score + * Raises {@link #wisdom} by this many ability score points (+2 + * point=+1 bonus modifier). + */ + public void raisewisdom(int score) { + wisdom += score; + will += score / 2; } public int will() { @@ -318,4 +374,57 @@ public void addwill(int delta) { public Integer willraw() { return will; } + + @Override + public boolean equals(Object obj) { + Monster m = (Monster) obj; + return name.equals(m.name); + } + + /** + * @param bonus + * Raises {@link #charisma} by this many points (+2 points = +1 + * bonus modifier) + */ + public void raisecharisma(int bonus) { + charisma += bonus * 2; + } + + /** + * @param points + * Raises {@link #intelligence} by this many ability score points + * (+2 point = +1 bonus modifier). + */ + public void raiseintelligence(int points) { + intelligence += points; + } + + /** + * @return Each unit hers is equivalent to 5 silver pieces daily upkeep + * ($0.5, or half a gold piece). + */ + public float eat() { + switch (size) { + case Monster.FINE: + return 1 / 16f; + case Monster.DIMINUTIVE: + return 1 / 8f; + case Monster.TINY: + return 1 / 4f; + case Monster.SMALL: + return 1 / 2f; + case Monster.MEDIUM: + return 1; + case Monster.LARGE: + return 2; + case Monster.HUGE: + return 4; + case Monster.GARGANTUAN: + return 8; + case Monster.COLOSSAL: + return 16; + default: + throw new RuntimeException("Unknown size " + size); + } + } } diff --git a/javelin/model/unit/Skills.java b/javelin/model/unit/Skills.java new file mode 100644 index 000000000..fee828274 --- /dev/null +++ b/javelin/model/unit/Skills.java @@ -0,0 +1,64 @@ +package javelin.model.unit; + +import java.io.Serializable; + +import javelin.controller.ai.BattleAi; + +/** + * Keeps track of skill ranks of a certain {@link Monster}. + * + * Usually instead of rolling the skills as usual most of the time it's implied + * a take 10 is being used, by various reasons, such as prevent scumming (trying + * the same action many times until you get a high roll) and having to use the + * random number generator inside {@link BattleAi}. + * + * See doc/skills.txt guide for more information. + * + * Synergy bonuses are not being used for now. + * + * @author alex + */ +public class Skills implements Serializable, Cloneable { + /** {@link Monster#intelligence}-based. */ + public int knowledge = 0; + /** {@link Monster#wisdom}-based. */ + public int spot = 0; + /** {@link Monster#dexterity}-based. */ + public int hide = 0; + /** {@link Monster#dexterity}-based. */ + public int movesilently = 0; + /** {@link Monster#charisma}-based. */ + public int diplomacy = 0; + /** {@link Monster#intelligence}-based. */ + public int search = 0; + /** {@link Monster#intelligence}-based. */ + public int disabledevice = 0; + /** {@link Monster#charisma}-based. */ + public int gatherinformation = 0; + /** {@link Monster#wisdom}-based. */ + public int survival = 0; + /** {@link Monster#wisdom}-based. */ + public int listen = 0; + /** {@link Monster#constitution}-based. */ + public int concentration = 0; + /** {@link Monster#dexterity}-based. */ + public int acrobatics = 0; + /** {@link Monster#intelligence}-based. */ + public int spellcraft = 0; + + @Override + protected Skills clone() throws CloneNotSupportedException { + return (Skills) super.clone(); + } + + /** + * @param skill + * Given a skill ranking like {@link #concentration}... + * @param attribute + * and it's governing attribute... + * @return the sum of the rank with the attribute bonus. + */ + static public int take10(int skill, int attribute) { + return 10 + skill + Monster.getbonus(attribute); + } +} diff --git a/javelin/model/world/Dungeon.java b/javelin/model/world/Dungeon.java deleted file mode 100644 index e96225ea9..000000000 --- a/javelin/model/world/Dungeon.java +++ /dev/null @@ -1,225 +0,0 @@ -package javelin.model.world; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javelin.JavelinApp; -import javelin.controller.Point; -import javelin.controller.challenge.RewardCalculator; -import javelin.controller.exception.GaveUpException; -import javelin.model.BattleMap; -import javelin.model.dungeon.Feature; -import javelin.model.dungeon.Fountain; -import javelin.model.dungeon.StairsUp; -import javelin.model.dungeon.Treasure; -import javelin.model.item.Item; -import javelin.model.item.Key; -import javelin.view.screen.BattleScreen; -import javelin.view.screen.world.DungeonScreen; -import javelin.view.screen.world.WorldScreen; -import tyrant.mikera.engine.RPG; -import tyrant.mikera.engine.Thing; -import tyrant.mikera.tyrant.Game; -import tyrant.mikera.tyrant.Tile; - -/** - * A dungoen is an underground area of the world where the combats are harder - * but have extra treasure laying around. - * - * @author alex - */ -public class Dungeon extends WorldPlace { - public final static int SIZE = 7 + 1 + 7; - public final static float WALLRATIO = 1 / 3f; - public final static int WALKABLEAREA = - Math.round(SIZE * SIZE * (1 - WALLRATIO)); - /** - * Assumes you will explore all the dungeon, being able to rest at the - * fountain mid-way for a total of 8 moderate encounters. This ignores the - * returning path towards the exit and getting to and from the dungeon - * itself, which means squads are supposed to be well equipped before diving - * in. - */ - public static final double ENCOUNTERRATIO = - WALKABLEAREA / 8.0 / WALKABLEAREA; - - private static final int MAXTRIES = 1000; - public final static int[] DELTAS = { -1, 0, 1 }; - - public static List dungeons = new ArrayList(); - public static Dungeon active = null; - public List features = new ArrayList(); - public HashSet walls = new HashSet(); - public boolean[][] visible; - public Point herop; - - transient private BattleMap map = null; - transient public Thing hero; - transient boolean generated = false; - - public Dungeon() { - super("stairs down", "a dungeon"); - } - - public static void spawn(float i) { - if (RPG.random() < i) { - new Dungeon().place(); - } - } - - @Override - public void enter() { - super.enter(); - activate(); - } - - public void activate() { - while (map == null) { - map = new BattleMap(SIZE, SIZE); - if (features.isEmpty()) { - /* not loading a game */ - try { - map(); - } catch (GaveUpException e) { - map = null; - features.clear(); - walls.clear(); - } - } - } - regenerate(); - Game.instance().setHero(hero); - JavelinApp.context = new DungeonScreen(map); - active = this; - BattleScreen.active = JavelinApp.context; - Squad.active.updateavatar(); - } - - public void map() throws GaveUpException { - final Set all = new HashSet(); - Point root = new Point(RPG.r(1, SIZE - 2), RPG.r(1, SIZE - 2)); - build(new StairsUp("stairs up", root), all); - herop = null; - while (herop == null || herop.x == 0 && herop.y == 0) { - herop = new Point(RPG.pick(DELTAS), RPG.pick(DELTAS)); - } - herop = new Point(root.x + herop.x, root.y + herop.y); - all.add(herop); - placewalls(all); - Point fountain = findspot(all); - build(new Fountain("fountain", fountain.x, fountain.y), all); - createchests(all); - visible = new boolean[SIZE][SIZE]; - for (int x = 0; x < Dungeon.SIZE; x++) { - for (int y = 0; y < Dungeon.SIZE; y++) { - visible[x][y] = false; - } - } - } - - public void createchests(final Set all) { - int chests = RPG.r(3, 5); - int pool = RewardCalculator.receivegold(Squad.active.members); - int traps = RPG.r(0, 7 - chests); - for (int i = 0; i < traps; i++) { - // TODO add 1 chest per trap, improve pool - } - for (int i = chests; i > 0; i--) { - int gold = i == 1 ? pool : pool / RPG.r(2, i); - pool -= gold; - Point p = findspot(all); - Treasure t; - if (i == chests) { - t = new Treasure("chest", p.x, p.y, 0, new ArrayList()); - t.key = Key.generate(null); - } else { - t = RewardCalculator.createchest(gold, p.x, p.y); - } - build(t, all); - } - } - - public void placewalls(final Set all) throws GaveUpException { - int walltarget = - Math.round(SIZE * SIZE * WALLRATIO * RPG.r(90, 110) / 100f); - int tries = 0; - for (int i = 0; i < walltarget; i++) { - Point wall = findspot(all); - int neighborhood = 0; - wallplacement: for (int x = -1; x <= +1; x++) { - for (int y = -1; y <= +1; y++) { - if (x == 0 && y == 0) { - continue; - } - if (walls.contains(new Point(wall.x + x, wall.y + y))) { - neighborhood += 1; - if (neighborhood > 1) { - break wallplacement; - } - } - } - } - if (neighborhood < 2) { - all.add(wall); - walls.add(wall); - } else { - i -= 1; - } - tries += 1; - if (tries > MAXTRIES) { - throw new GaveUpException(); - } - } - } - - void build(Feature feature, Set all) { - features.add(feature); - all.add(new Point(feature.x, feature.y)); - } - - private Point findspot(Set all) { - Point p = null; - while (p == null || all.contains(p)) { - p = new Point(RPG.r(0, SIZE - 1), RPG.r(0, SIZE - 1)); - } - return p; - } - - @Override - List getall() { - return dungeons; - } - - public void leave() { - Dungeon.active = null; - JavelinApp.context = new WorldScreen(JavelinApp.overviewmap); - BattleScreen.active = JavelinApp.context; - hero.remove(); - // if (Squad.squads.isEmpty()) { - // Squad.active.updateavatar(); - // } - } - - protected void regenerate() { - for (int x = 0; x < SIZE; x++) { - for (int y = 0; y < SIZE; y++) { - map.setTile(x, y, Tile.METALFLOOR); - } - } - for (Point wall : walls) { - map.setTile(wall.x, wall.y, Tile.STONEWALL); - } - hero = Squad.active.createThing(); - hero.x = herop.x; - hero.y = herop.y; - map.addThing(hero, hero.x, hero.y); - if (!generated) { - for (Feature f : features) { - f.generate(map); - } - generated = true; - } - } -} diff --git a/javelin/model/world/Haxor.java b/javelin/model/world/Haxor.java deleted file mode 100644 index 4af0f1ae0..000000000 --- a/javelin/model/world/Haxor.java +++ /dev/null @@ -1,95 +0,0 @@ -package javelin.model.world; - -import java.util.ArrayList; -import java.util.List; - -import javelin.controller.fight.PlanarFight; -import javelin.view.screen.HaxorScreen; -import javelin.view.screen.town.option.Option; -import javelin.view.screen.world.WorldScreen; -import tyrant.mikera.engine.Point; -import tyrant.mikera.engine.RPG; - -/** - * The tower of haxor is a place for players to spend tickets the earn in - * {@link PlanarFight}. It's largely a meta-game feature and a way to offer - * interesting non-balance-affecting powers to the player or with minimal - * balance implications, largely overshadowed by winning an EL-0 encounter that - * the fight represents. - * - * TODO - * - * remove upgrades 1 - * - * summon lair 2 - * - * summon dungeon 2 - * - * @author alex - */ -public class Haxor extends WorldPlace { - transient public static Haxor singleton = null; - - /** - * Cheating currency. - */ - public int tickets = 1; - /** - * These are the {@link Option}s that aren't fixed. - * - * @see HaxorScreen#getOptions() - */ - public List

              SR 19 Fort +7, Ref +6, Will +7 Str 19, Dex 13, Con 14, Int 13, Wis 14, Cha 16 - Climb +13, Jump +13, Listen +11, Move Silently +10, SenseMotive +11, Spot +11 + Climb +13, Jump +13, Listen +11, Move Silently +10, Sense Motive +11, Spot +11 Dodge, Mobility Any land and underground 1, 5-8 @@ -275,7 +283,7 @@ sorcerer.

              Undead, incorporeal, +2 turn resistance Fort +1, Ref +2, Will +4 Str -, Dex 12, Con -, Int 11, Wis 11, Cha 18 - Hide +8, Intimidate +11, Intuit Direction +4, Listen +7,Search +7, Spot +7 + Hide +8, Intimidate +11, survival +4, Listen +7,Search +7, Spot +7 Improved Initiative Any land and underground 1 @@ -393,7 +401,7 @@ of anything within 60 feet that is in contact with the ground.

              Alternate form Fort +5, Ref +5, Will +4 Str 11, Dex 15, Con 14, Int 14, Wis 13, Cha 14 - Climb +14, Concentration +8, Craft (weaving) +8, EscapeArtist +8, Jump +6, Listen +3, Spot +3 + Climb +14, Concentration +8, Craft (weaving) +8, Escape Artist +8, Jump +6, Listen +3, Spot +3 Alertness, Improved Initiative, Weapon Finesse (bite) Temperate and warm forest and underground 1, 3-6 @@ -515,7 +523,7 @@ vibration.

              Camouflage (Ex): Since an assassin vine looks like a normal plant when at rest, it takes a successful Spot check (DC 20) to -notice it before it attacks. Anyone with Wilderness Lore or +notice it before it attacks. Anyone with Survival or Knowledge (plants or herbs) can use those skills instead of Spot to notice the plant. Dwarves can use stonecunning to notice the subterranean version.

              @@ -582,7 +590,7 @@ on whoever has dealt them the most damage.

              SR 13, fire subtype Fort +4, Ref +4, Will +4 Str 13, Dex 13, Con 13, Int 12, Wis 12, Cha 9 - Climb +2, Craft (any one) +6, Hide -1, Listen +4, Search+4, Spot +5 + Climb +2, Craft (any one) +6, Hide -1, Listen +4, Search +4, Spot +5 Power Attack Any land and underground 1-2, 4 @@ -1152,7 +1160,7 @@ for 2d6 minutes.

              5 ft. by 10 ft./5 ft. Fort +3, Ref +6, Will +5 Str 18, Dex 14, Con 15, Int 8, Wis 13, Cha 11 - Hide +2 Listen +4, Move Silently +4, Spot +4,Wilderness Lore +5 + Hide +2 Listen +4, Move Silently +4, Spot +4,Survival +5 Weapon Focus (hoof) Temperate forest 1, 5-8 @@ -1740,7 +1748,7 @@ Hide checks.

              Acid immunity, corrosive slime, tremorsense,stone shape Fort +10, Ref +6, Will +11 Str 27, Dex 13, Con 21, Int 14, Wis 14, Cha 12 - Intuit Direction +9, Knowledge (geology) +9, Listen +13,Move Silently +19, Spot +13 + survival +9, Knowledge (geology) +9, Listen +13,Move Silently +19, Spot +13 Alertness, Blind-Fight, Improved Initiative, Power Attack Any underground 1 @@ -1809,7 +1817,7 @@ stone shape cast by a 15th-level druid.

              Blindsight, protection from sonics Fort +5, Ref +3, Will +10 Str 18, Dex 12, Con 16, Int 12, Wis 18, Cha 12 - Hide +7, Intuit Direction +10, Listen +25, MoveSilently +10 + Hide +7, survival +10, Listen +25, Move Silently +10 Dodge, Improved Initiative Any underground 1, 3-5 @@ -1895,7 +1903,7 @@ checks.

              Undead, spell deflection, SR 21 Fort +4, Ref +4, Will +11 Str 21, Dex 10, Con -, Int 16, Wis 16, Cha 17 - Climb +10, Concentration +18, Jump +17, Listen +17, MoveSilently +12, Spot +17 + Climb +10, Concentration +18, Jump +17, Listen +17, Move Silently +12, Spot +17 Alertness, Blind-Fight, Combat Casting, Combat Expertise,Improved Initiative, Weapon Focus (claw) Any land and underground 1 @@ -2200,7 +2208,7 @@ checks.

              Scent, fire immunity Fort +13, Ref +8, Will +9 Str 27, Dex 10, Con 21, Int 12, Wis 13, Cha 12 - Hide +7*, Intimidate +16, Intuit Direction +10,Listen +18, Search +16, Spot +18 + Hide +7*, Intimidate +16, survival +10,Listen +18, Search +16, Spot +18 Alertness, Blind-Fight, Cleave, Power Attack Temperate aquatic 1 @@ -2262,7 +2270,7 @@ checks when submerged.

              SR 14 Fort +5, Ref +4, Will +8 Str 15, Dex 15, Con 16, Int 15, Wis 16, Cha 16 - Climb +14, Concentration +10, Hide +8, Listen +9, MoveSilently +7, Spellcraft +10, Spot +9 + Climb +14, Concentration +10, Hide +8, Listen +9, Move Silently +7, Spellcraft +10, Spot +9 Ambidexterity, Combat Casting, Two-Weapon Fighting Underground 1-2, 1-2 plus 7-12 Medium-size monstrous spiders @@ -2312,7 +2320,7 @@ Silently checks.

              Dryad - Medium-Size Fey + Medium-Size Fey 2d6 (7) +6 (+2 Dex, +4 Improved Initiative) 30 ft. @@ -2325,7 +2333,7 @@ Silently checks.

              Symbiosis Fort +0, Ref +5, Will +5 Str 10, Dex 15, Con 11, Int 14, Wis 15, Cha 18 - Animal Empathy +9, Craft (any one) or Knowledge (any one) +6, Escape Artist +7, Hide +7, Listen +9, Move Silently +7, Sense Motive +7, Spot +9, Wilderness Lore +7 + Animal Empathy +9, Craft (any one) or Knowledge (any one) +6, Escape Artist +7, Hide +7, Listen +9, Move Silently +7, Sense Motive +7, Spot +9, Survival +7 Alertness, Dodge, Improved Initiative Temperate and warm forest 1, 4-7 @@ -2471,7 +2479,7 @@ ethereal jaunt cast by a 15th-level sorcerer.

              Low-light vision Fort +2, Ref +4, Will +6 Str 10, Dex 17, Con 13, Int 6, Wis 15, Cha 8 - Climb +8, Craft (any one) +2, Hide +3*, Listen +10, Spot+10* + Climb +8, Craft (any one) +2, Hide +3*, Listen +10, Spot +10* Multiattack Temperate and warm forests 1-2, 1-2 plus 2-4 Medium-size monstrous spiders @@ -2708,7 +2716,7 @@ when concealed against a background of worked stone.

              Evasion Fort +5, Ref +7, Will +3 Str 18, Dex 17, Con 12, Int 10, Wis 14, Cha 10 - Knowledge (nature) +2, Listen +5, Sense Motive +8,Spot +11*, Wilderness Lore +8 + Knowledge (nature) +2, Listen +5, Sense Motive +8,Spot +11*, Survival +8 Alertness Any forest, hill, mountains, and plains 1-2 @@ -3371,7 +3379,7 @@ captivated creature to attempt a new Will save.

              Scent, fire subtype Fort +5, Ref +5, Will +4 Str 13, Dex 13, Con 13, Int 6, Wis 10, Cha 6 - Hide +11, Listen +5, Move Silently +13, Spot +7*,Wilderness Lore +0* + Hide +11, Listen +5, Move Silently +13, Spot +7*,Survival +0* Improved Initiative, Track Any land and underground 1-2, 5-12 @@ -3407,7 +3415,7 @@ except on a successful save.

              Skills: Hell hounds receive a +5 racial bonus to Hide and Move Silently checks. *They also receive a +8 racial bonus to Spot -checks and Wilderness Lore checks when tracking by scent, due to +checks and Survival checks when tracking by scent, due to their keen sense of smell.

               @@ -3599,7 +3607,7 @@ but they can come from outside sources, such as scrolls.

              Quills, howl Fort +7, Ref +8, Will +7 Str 21, Dex 17, Con 15, Int 6, Wis 14, Cha 8 - Climb +10, Hide +8, Listen +11, Move Silently +8, Search+1, Spot +11 + Climb +10, Hide +8, Listen +11, Move Silently +8, Search +1, Spot +11 Alertness, Improved Initiative Any land and underground 1-4, 6-10 @@ -4117,7 +4125,7 @@ checks during daylight hours.

              Poison immunity, fire resistance 20 Fort +7, Ref +8, Will +8 Str 20, Dex 17, Con 15, Int 14, Wis 16, Cha 18 - Appraise +12, Concentration +12, Knowledge (arcana) +12,Listen +13, Perform +14, Spellcraft +12, Wilderness Lore +17 + Appraise +12, Concentration +12, Knowledge (arcana) +12,Listen +13, Perform +14, Spellcraft +12, Survival +17 Combat Casting, Extend Spell Any land and underground 1-4 @@ -4170,7 +4178,7 @@ nonmagical fire and has magic fire resistance 20.

              Skills: Lillends receive a +4 racial bonus to -Wilderness Lore checks.

              +Survival checks.

               @@ -4502,7 +4510,7 @@ generally far too late.

              Mind Flayer - Medium-Size Aberration + Medium-Size Aberration 8d8+8 (44) +6 (+2 Dex, +4 Improved Initiative) 30 ft. @@ -4644,7 +4652,7 @@ and Listen checks.

              Undead Fort +4, Ref +5, Will +9 Str 21, Dex 13, Con -, Int 11, Wis 10, Cha 10 - Climb +11, Hide +15, Listen +12, Move Silently +15, Spot+12, Swim +10 + Climb +11, Hide +15, Listen +12, Move Silently +15, Spot +12, Swim +10 Alertness, Dodge, Improved Initiative, Mobility Any land and underground 1-4, 2-4 plus 5 zombie @@ -4837,7 +4845,7 @@ uses and does not bestow etherealness.

              Astral projection, etherealness Fort +8, Ref +7, Will +6 Str 18, Dex 15, Con 16, Int 13, Wis 13, Cha 12 - Intuit Direction +10, Listen +12, Move Silently +11,Search +10, Sense Motive +10, Spot +12 + survival +10, Listen +12, Move Silently +11,Search +10, Sense Motive +10, Spot +12 Alertness, Improved Initiative Any land and underground 1 @@ -4890,7 +4898,7 @@ pounds.

              Nymph - Medium-Size Fey + Medium-Size Fey 3d6 (10) +1 (Dex) 30 ft., swim 20 ft. @@ -5087,7 +5095,7 @@ with a claw attack.

              Scent, spell-like abilities Fort +7, Ref +6, Will +4 Str 18, Dex 15, Con 16, Int 10, Wis 13, Cha 13 - Listen +12, Sense Motive +7, Spot +12, Wilderness Lore +3 + Listen +12, Sense Motive +7, Spot +12, Survival +3 Iron Will Temperate and warm forest 1-2, 6-10 @@ -5248,7 +5256,7 @@ secondary damage 2d6 temporary Constitution.

              Amorphous, scent, alternate form, telepathy,tremorsense Fort +11, Ref +11, Will +11 Str 12, Dex 15, Con 15, Int 16, Wis 15, Cha 14 - Bluff +15, Climb +7, Craft (any one) +7, Disguise +7*,Knowledge (any one) +7, Listen +10, Spot +10, Wilderness Lore +6 + Bluff +15, Climb +7, Craft (any one) +7, Disguise +7*,Knowledge (any one) +7, Listen +10, Spot +10, Survival +6 Alertness, Blind-Fight, Combat Reflexes, Dodge, Improved Initiative, Mobility, Skill Focus (Disguise) Any land and underground 1 @@ -5314,7 +5322,7 @@ circumstance bonus to Disguise checks.

              See invisibility, telepathy, immunities, SR 19 Fort +4, Ref +3, Will +4 Str 11, Dex 11, Con 13, Int 10, Wis 12, Cha 10 - Hide +16*, Intuit Direction +3, Listen +5, Search +2,Spot +5 + Hide +16*, survival +3, Listen +5, Search +2,Spot +5 Alertness Temperate and warm forest 1-5 @@ -5427,7 +5435,7 @@ ground.

              Rakshasa - Medium-Size Outsider (Evil, Lawful) + Medium-Size Outsider (Evil, Lawful) 7d8+21 (52) +2 (Dex) 40 ft. @@ -5881,7 +5889,7 @@ unaffected.

              Speak with sharks, underwater sense, lightblindness, amphibious, freshwater sensitivity Fort +4, Ref +1, Will +1 Str 14, Dex 13, Con 12, Int 14, Wis 13, Cha 9 - Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Wilderness Lore +1* + Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Survival +1* Multiattack Warm aquatic 1-2, 5-8 @@ -5949,7 +5957,7 @@ checks. Even on a success, it must repeat the save attempt every

              Skills: Sahuagin receive a +4 racial bonus to Hide, Listen, and Spot checks. *Underwater, the bonus improves to +8. They -receive a +8 bonus to Wilderness Lore and Profession (hunt) +receive a +8 bonus to Survival and Profession (hunt) checks within fifty miles of their homes.

               @@ -5975,7 +5983,7 @@ two of the following domains: Evil, Law, Strength, and War.

              Speak with sharks, underwater sense, light sensitivity, amphibious, freshwater sensitivity Fort +4, Ref +1, Will +1 Str 14, Dex 13, Con 12, Int 14, Wis 13, Cha 9 - Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Wilderness Lore +1* + Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Survival +1* Multiattack Warm aquatic 1-2, 5-8 @@ -6046,7 +6054,7 @@ checks. Even on a success, it must repeat the save attempt every

              Skills: Malenti receive a +4 racial bonus to Hide, Listen, and Spot checks. *Underwater, the bonus improves to +8. They -receive a +8 bonus to Wilderness Lore and Profession (hunt) +receive a +8 bonus to Survival and Profession (hunt) checks within fifty miles of their homes.

               @@ -6072,7 +6080,7 @@ two of the following domains: Evil, Law, Strength, and War.

              Speak with sharks, underwater sense, lightblindness, amphibious, freshwater sensitivity Fort +4, Ref +1, Will +1 Str 14, Dex 13, Con 12, Int 14, Wis 13, Cha 9 - Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Wilderness Lore +1* + Animal Empathy +2, Hide +6*, Listen +7*, Profession(hunt) +2, Spot +7*, Survival +1* Multiattack Warm aquatic 1-2, 5-8, @@ -6141,7 +6149,7 @@ checks. Even on a success, it must repeat the save attempt every

              Skills: Sahuagin receive a +4 racial bonus to Hide, Listen, and Spot checks. *Underwater, the bonus improves to +8. They -receive a +8 bonus to Wilderness Lore and Profession (hunt) +receive a +8 bonus to Survival and Profession (hunt) checks within fifty miles of their homes.

               @@ -6324,7 +6332,7 @@ automatically deals an additional 2d6+6 points of damage.

              Undead, incorporeal, +2 turn resistance Fort +1, Ref +3, Will +4 Str -, Dex 14, Con -, Int 6, Wis 12, Cha 13 - Hide +8, Intuit Direction +5, Listen +7, Spot +7 + Hide +8, survival +5, Listen +7, Spot +7 Any land and underground 1-11 3 @@ -6381,7 +6389,7 @@ armor. Always moves silently.

              Shadow blend, scent Fort +7, Ref +5, Will +5 Str 17, Dex 13, Con 17, Int 4, Wis 12, Cha 13 - Listen +8, Spot +8, Wilderness Lore +7* + Listen +8, Spot +8, Survival +7* Dodge, Improved Initiative, improved trip Any land and underground 1-2, 5-12 @@ -6420,7 +6428,7 @@ daylight spell, however, will.

              Skills: A shadow mastiff receives a +4 racial bonus to -Wilderness Lore checks when tracking by scent.

              +Survival checks when tracking by scent.

               @@ -6720,7 +6728,7 @@ Spot checks underwater.

              Undead, incorporeal, +2 turn resistance,unnatural aura, sunlight powerlessness Fort +2, Ref +5, Will +7 Str -, Dex 16, Con -, Int 14, Wis 14, Cha 15 - Hide +13, Intimidate +12, Intuit Direction +10, Listen+13, Search +10, Spot +13 + Hide +13, Intimidate +12, survival +10, Listen +13, Search +10, Spot +13 Alertness, Blind-Fight, Combat Reflexes, ImprovedInitiative Any land and underground 1-4, 6-11 @@ -7088,7 +7096,7 @@ portion against the mass enables it to reattach instantly.

              Fire subtype, tremorsense Fort +4, Ref +4, Will +2 Str 15, Dex 13, Con 13, Int 6, Wis 12, Cha 10 - Intuit Direction +4, Jump +6, Listen +6, Move Silently +5 + survival +4, Jump +6, Listen +6, Move Silently +5 Any underground 1-2 2 @@ -7147,7 +7155,7 @@ ground.

              Damage reduction 15/+1, SR 25 Fort +18, Ref +13, Will +17 Str 37, Dex 12, Con 23, Int 21, Wis 20, Cha 18 - Bluff +27, Climb +21, Concentration +29, Craft (any one)+27, Jump +36, Knowledge (any one) +28, Knowledge (religion) +28, Listen +30, Perform +27, Sense Motive +28, Spot +30, Swim +36 + Bluff +27, Climb +21, Concentration +29, Craft (any one) +27, Jump +36, Knowledge (any one) +28, Knowledge (religion) +28, Listen +30, Perform +27, Sense Motive +28, Spot +30, Swim +36 Alertness, Blind-Fight, Cleave, Combat Expertise, Great Cleave,Power Attack Any land and underground 1-2 @@ -7197,7 +7205,7 @@ from the Chaos and Good domains.

              Plant, fire vulnerability, half damage frompiercing Fort +10, Ref +1, Will +6 Str 29, Dex 8, Con 21, Int 12, Wis 15, Cha 12 - Hide -9*, Intimidate +8, Knowledge (any one) +8, Listen+9, Sense Motive +9, Spot +9, Wilderness Lore +9 + Hide -9*, Intimidate +8, Knowledge (any one) +8, Listen +9, Sense Motive +9, Spot +9, Survival +9 Iron Will, Power Attack Any forest 1, 4-7 @@ -7472,7 +7480,7 @@ ground.

              Magic circle against evil, spell-likeabilities, immunities Fort +9, Ref +7, Will +6 Str 20, Dex 17, Con 21, Int 10, Wis 21, Cha 24 - Animal Empathy +11, Listen +11, Move Silently +9, Spot+11, Wilderness Lore +9* + Animal Empathy +11, Listen +11, Move Silently +9, Spot +11, Survival +9* Alertness Temperate forest 1-6 @@ -7795,7 +7803,7 @@ invisible as the spell.

              Scent, cold subtype Fort +8, Ref +6, Will +3 Str 18, Dex 13, Con 16, Int 9, Wis 13, Cha 10 - Hide +6*, Listen +9, Move Silently +7, Spot +9,Wilderness Lore +1* + Hide +6*, Listen +9, Move Silently +7, Spot +9,Survival +1* Alertness, Improved Initiative Any cold land and underground 1-5 @@ -7839,7 +7847,7 @@ a successful save.

              Move Silently, and Spot checks, and a +2 racial bonus to Hide checks. *Their natural coloration grants winter wolves a +7 racial bonus to Hide checks in areas of snow and ice. A winter -wolf has a +4 racial bonus to Wilderness Lore checks when +wolf has a +4 racial bonus to Survival checks when tracking by scent.

              @@ -7860,7 +7868,7 @@ tracking by scent.

              Scent Fort +6, Ref +6, Will +3 Str 17, Dex 15, Con 15, Int 6, Wis 14, Cha 10 - Hide +7, Listen +9, Move Silently +7, Spot +9, WildernessLore +2* + Hide +7, Listen +9, Move Silently +7, Spot +9, Survival +2* Alertness,improved trip Any forest, hill, plains, and mountains 1-2, 6-11 @@ -7894,7 +7902,7 @@ opponent cannot react to trip the worg.

              Skills: A worg receives a +1 racial bonus to Listen, Move Silently, and Spot checks, and a +2 racial bonus to Hide checks. -A worg has a +4 racial bonus to Wilderness Lore checks when +A worg has a +4 racial bonus to Survival checks when tracking by scent.

               @@ -7914,7 +7922,7 @@ tracking by scent.

              Undead, incorporeal, +2 turn resistance,unnatural aura, daylight powerlessness Fort +1, Ref +4, Will +6 Str -, Dex 16, Con -, Int 14, Wis 14, Cha 15 - Hide +11, Intimidate +10, Intuit Direction +6, Listen+12, Search +10, Sense Motive +8, Spot +12 + Hide +11, Intimidate +10, survival +6, Listen +12, Search +10, Sense Motive +8, Spot +12 Alertness, Blind-Fight, Combat Reflexes, Improved Initiative Any land and underground 1-11 @@ -8049,7 +8057,7 @@ flying during daylight hours.

              SR 21, planewalk Fort +6, Ref +7, Will +5 Str 15, Dex 16, Con 15, Int 12, Wis 12, Cha 11 - Escape Artist +11, Intuit Direction +6, Listen +9, MoveSilently +11, Spot +9, Tumble +11 + Escape Artist +11, survival +6, Listen +9, Move Silently +11, Spot +9, Tumble +11 Improved Initiative, Multiweapon Fighting,improved grapple, Any land and underground 1-5 @@ -8141,7 +8149,7 @@ Evil, Law, Strength, and Travel.

              Scent, flight, damage reduction 10/silver Fort +5, Ref +5, Will +5 Str 17, Dex 15, Con 15, Int 6, Wis 14, Cha 10 - Listen +8, Spot +8, Wilderness Lore +8* + Listen +8, Spot +8, Survival +8* Improved Initiative,improved trip, Any land and underground 1-2, 6-11 @@ -8740,7 +8748,7 @@ cousins.

              Scent Fort +4, Ref +5, Will +1 Str 13, Dex 17, Con 15, Int 2, Wis 12, Cha 6 - Listen +5, Spot +5, Swim +5, Wilderness Lore +1* + Listen +5, Spot +5, Swim +5, Survival +1* Any land 1 1/3 @@ -8750,7 +8758,7 @@ cousins.

              -

              Skills: *Dogs receive a +8 racial bonus to Wilderness Lore +

              Skills: *Dogs receive a +8 racial bonus to Survival checks when tracking by scent.

                             @@ -8770,7 +8778,7 @@ checks when tracking by scent.

              Scent Fort +5, Ref +5, Will +1 Str 15, Dex 15, Con 15, Int 2, Wis 12, Cha 6 - Listen +5, Spot +5, Swim +5, Wilderness Lore +1* + Listen +5, Spot +5, Swim +5, Survival +1* Any land 1 1 @@ -9982,7 +9990,7 @@ whichever is better.

              Scent Fort +5, Ref +8, Will +2 Str 10, Dex 19, Con 13, Int 1, Wis 12, Cha 2 - Balance, +12, Climb +12, Hide +3, Listen +9, Spot +9 + Balance +12, Climb +12, Hide +3, Listen +9, Spot +9 Weapon Finesse (bite) Temperate and warm land, aquatic, and underground 1 @@ -10357,7 +10365,7 @@ checks. *These bonuses are lost if Blindsight is negated.

              Scent Fort +5, Ref +5, Will +1 Str 13, Dex 15, Con 15, Int 2, Wis 12, Cha 6 - Hide +3, Listen +6, Move Silently +4, Spot +4, Wilderness Lore +1* + Hide +3, Listen +6, Move Silently +4, Spot +4, Survival +1* Weapon Finesse (bite),improved trip, Any forest, hill, plains, and mountains 1-2, 7-16 @@ -10377,7 +10385,7 @@ opponent cannot react to trip the wolf.

               -

              Skills: *Wolves receive a +4 racial bonus to Wilderness Lore +

              Skills: *Wolves receive a +4 racial bonus to Survival checks when tracking by scent.

               @@ -10575,7 +10583,7 @@ piercing damage and 1d4 points of acid damage.

              Vermin Fort +3, Ref +3, Will +2 Str 11, Dex 14, Con 11, Int -, Wis 12, Cha 9 - Intuit Direction +6, Spot +6 + survival +6, Spot +6 Temperate and warm land and underground 1-5, 11-20 1/2 @@ -10780,7 +10788,7 @@ foliage receives an additional +8 racial bonus to Hide checks.

              Vermin Fort +6, Ref +2, Will +2 Str 18, Dex 12, Con 14, Int -, Wis 13, Cha 11 - Intuit Direction +7, Spot +9 + survival +7, Spot +9 Temperate and warm land and underground 1-5, 11-20 3 @@ -12496,7 +12504,7 @@ at half its normal speed.

              Acid electricity and poison immunity, fire and cold resistance 20 Fort +4, Ref +8, Will +4 Str 12, Dex 21, Con 12, Int 10, Wis 13, Cha 13 - Intuit Direction +2, Listen +7, Search +7, Sense Motive +7, Spot +7 + survival +2, Listen +7, Search +7, Sense Motive +7, Spot +7 Weapon Finesse (bite) Any land and underground 1-4 @@ -12538,7 +12546,7 @@ immunity.

              Acid electricity and poison immunity, fire and cold resistance 20 Fort +6, Ref +10, Will +6 Str 14, Dex 21, Con 12, Int 10, Wis 13, Cha 13 - Escape Artist +15, Intuit Direction +7, Listen +11, Search +10, Sense Motive +11, Spot +11 + Escape Artist +15, survival +7, Listen +11, Search +10, Sense Motive +11, Spot +11 Dodge, Weapon Finesse (bite) Any land and underground 1-4 @@ -12580,7 +12588,7 @@ immunity.

              Acid electricity and poison immunity, fire and cold resistance 20 Fort +12, Ref +14, Will +10 Str 22, Dex 21, Con 16, Int 10, Wis 13, Cha 13 - Escape Artist +23, Intuit Direction +16, Knowledge (Plane of Air) +15, Listen +19, Search +18, Sense Motive +19, Spot +19 + Escape Artist +23, survival +16, Knowledge (Plane of Air) +15, Listen +19, Search +18, Sense Motive +19, Spot +19 Blind-Fight, Combat Reflexes, Dodge, Weapon Finesse (bite) Any land and underground 1-4 @@ -12778,7 +12786,7 @@ without trace (as the spell) as a free action.

              Damage reduction 20/+1, electricity and petrification immunity, magic circle against evil, teleport, tongues, poison saves, keen vision Fort +2, Ref +2, Will +2 Str 1, Dex 11, Con 10, Int 6, Wis 11, Cha 10 - - - - - - + Concentration +4, Diplomacy +4, Knowledge (the planes) +2, Listen +4, Sense Motive +4, Spot +4 Improved Initiative Any land and underground 1-5 @@ -12850,7 +12858,7 @@ to Fortitude saves against poison.

              Celestial:Hound Archon - Medium-Size Outsider (Good, Lawful) + Medium-Size Outsider (Good, Lawful) 6d8+6 (33) +4 (Improved Initiative) 40 ft. or 60 ft.* @@ -12863,7 +12871,7 @@ to Fortitude saves against poison.

              Damage reduction 10/+1, SR 16, scent, alternate form, magic circle against evil, electricity and petrification immunity, teleport, tongues, poison saves, keen vision Fort +6, Ref +5, Will +6 Str 15, Dex 10, Con 13, Int 10, Wis 13, Cha 12 - Concentration +8, Hide +7*, Jump +9, Listen +8, Move Silently +7, Sense Motive +8, Spot +7, Wilderness Lore +1* + Concentration +8, Hide +7*, Jump +9, Listen +8, Move Silently +7, Sense Motive +8, Spot +7, Survival +1* Improved Initiative, Track Any land and underground 1-5 @@ -12889,7 +12897,7 @@ evil, and message. These abilities are as the spells cast by a action. This ability is similar to the polymorph self spell but allows only canines. *While in canine form, a hound archon gains the higher of the two listed speeds and a +4 circumstance bonus to -Hide and Wilderness Lore checks.

              +Hide and Survival checks.

              @@ -13139,7 +13147,7 @@ to Fortitude saves against poison.

              Celestial:Trumpet Archon - Medium-Size Outsider (Good, Lawful) + Medium-Size Outsider (Good, Lawful) 12d8+12 (66) +7 (+3 Dex, +4 Improved Initiative) 40 ft., Fly 90 ft. (good) @@ -13609,7 +13617,7 @@ from holy and blessed weapons.

              Demon (Tanar'ri):Succubus - Medium-Size Outsider (Chaotic, Evil) + Medium-Size Outsider (Chaotic, Evil) 6d8+6 (33) +1 (Dex) 30 ft., fly 50 ft. (average) @@ -14049,7 +14057,7 @@ checks.

              Damage reduction 20/+2, SR 21, tanar'ri qualities, detect magic, true seeing, cold fire and acid resistance 20 Fort +11, Ref +7, Will +10 Str 25, Dex 10, Con 19, Int 16, Wis 16, Cha 16 - Bluff +13, Concentration +14, Hide +2, Knowledge (any one)+13, Listen +21, Move Silently +10, Scry +13, Search +13, Sense Motive +13, Spellcraft +13, Spot +21 + Bluff +13, Concentration +14, Hide +2, Knowledge (any one) +13, Listen +21, Move Silently +10, Scry +13, Search +13, Sense Motive +13, Spellcraft +13, Spot +21 Cleave, Multiattack, Power Attack Any land and underground 1, 1 glabrezu plus 1 succubus plus 2-5 vrocks @@ -15289,7 +15297,7 @@ any creature within 100 feet that has a language.

              Scent Fort +7, Ref +6, Will +2 Str 19, Dex 15, Con 17, Int 2, Wis 12, Cha 10 - Hide +7, Jump +13, Listen +11, Spot +11, Wilderness Lore +9 + Hide +7, Jump +13, Listen +11, Spot +11, Survival +9 Warm forest, hill, plains, and marsh 1-6 3 @@ -15301,7 +15309,7 @@ any creature within 100 feet that has a language.

              Skills: A deinonychus receives a +8 racial bonus to Hide, -Jump, Listen, Spot, and Wilderness Lore checks.

              +Jump, Listen, Spot, and Survival checks.

               @@ -15345,7 +15353,7 @@ Jump, Listen, Spot, and Wilderness Lore checks.

              Scent Fort +10, Ref +8, Will +4 Str 21, Dex 15, Con 19, Int 2, Wis 15, Cha 10 - Hide +5, Jump +14, Listen +12, Spot +12, Wilderness Lore +10 + Hide +5, Jump +14, Listen +12, Spot +12, Survival +10 Warm forest, hill, plains, and marsh 1-6 6 @@ -15678,7 +15686,7 @@ creature cannot end its rage voluntarily.

              Scent Fort +8, Ref +7, Will +6 Str 25, Dex 15, Con 17, Int 2, Wis 12, Cha 10 - Hide +5, Listen +6, Move Silently +5, Spot +6, Wilderness Lore +1* + Hide +5, Listen +6, Move Silently +5, Spot +6, Survival +1* Any forest, hill, mountains, plains, and underground 1, 5-8 3 @@ -15699,7 +15707,7 @@ attempt fails, the opponent cannot react to trip the dire wolf.

              Skills: A dire wolf receives a +1 racial bonus to Listen, Move Silently, and Spot checks and a +2 racial bonus to Hide checks. -*It also receives a +4 racial bonus to Wilderness Lore checks +*It also receives a +4 racial bonus to Survival checks when tracking by scent.

               @@ -18921,7 +18929,7 @@ Constitution.

              Genie:Janni - Medium-Size Outsider + Medium-Size Outsider 6d8+6 (33) +6 (+2 Dex, +4 Improved Initiative) 20 ft., fly 10 ft. (perfect) @@ -19237,7 +19245,7 @@ any creature within 100 feet that has a language.

              Undead, +2 turn resistance Fort +0, Ref +2, Will +5 Str 13, Dex 15, Con -, Int 13, Wis 14, Cha 16 - Climb +6, Escape Artist +7, Hide +7, Intuit Direction +3, Jump +6, Listen +7, Move Silently +7, Search +6, Spot +7 + Climb +6, Escape Artist +7, Hide +7, survival +3, Jump +6, Listen +7, Move Silently +7, Search +6, Spot +7 Multiattack, Weapon Finesse (bite) Any land and underground 1-4, 7-12 @@ -19292,7 +19300,7 @@ massive damage.

              Undead, +2 turn resistance Fort +0, Ref +2, Will +5 Str 13, Dex 15, Con -, Int 13, Wis 14, Cha 16 - Climb +6, Escape Artist +7, Hide +7, Intuit Direction +3, Jump +6, Listen +7, Move Silently +7, Search +6, Spot +7 + Climb +6, Escape Artist +7, Hide +7, survival +3, Jump +6, Listen +7, Move Silently +7, Search +6, Spot +7 Multiattack, Weapon Finesse (bite) Any aquatic 1-4, 7-12 @@ -19347,7 +19355,7 @@ massive damage.

              Undead, +2 turn resistance Fort +1, Ref +3, Will +6 Str 13, Dex 15, Con -, Int 13, Wis 14, Cha 16 - Climb +6, Escape Artist +8, Hide +8, Intuit Direction +3, Jump +6, Listen +8, Move Silently +7, Search +6, Spot +8 + Climb +6, Escape Artist +8, Hide +8, survival +3, Jump +6, Listen +8, Move Silently +7, Search +6, Spot +8 Multiattack, Weapon Finesse (bite) Any land and underground 1-4, 2-4 plus 7-12 ghoul @@ -25030,7 +25038,7 @@ domains as arcane spells.

              Undead, nightshade abilities, acid fire and electricity resistance 50, spell immunity, cold immunity Fort +5, Ref +9, Will +15 Str 29, Dex 18, Con -, Int 20, Wis 20, Cha 18 - Concentration +16, Intuit Direction +19, Listen +22, Move Silently +20, Spellcraft +19, Spot +22 + Concentration +16, survival +19, Listen +22, Move Silently +20, Spellcraft +19, Spot +22 Alertness, Blind-Fight, Combat Casting, Combat Reflexes, Dodge, Flyby Attack, Improved Critical (bite), Improved Initiative, Weapon Focus (slam), Power Attack Any land and underground 1-6 @@ -25267,7 +25275,7 @@ effect.

              Undead, nightshade abilities, tremorsense, acid fire and electricity resistance 50, spell immunity, cold immunity Fort +8, Ref +8, Will +21 Str 45, Dex 10, Con -, Int 20, Wis 20, Cha 18 - Concentration +18, Intuit Direction +7, Listen +22, Move Silently +20, Spellcraft +17, Spot +22 + Concentration +18, survival +7, Listen +22, Move Silently +20, Spellcraft +17, Spot +22 Alertness, Blind-Fight, Combat Casting, Improved Critical (bite), Improved Critical (sting), Improved Initiative, Iron Will Power Attack Any land and underground 1-2 @@ -25789,7 +25797,7 @@ the original's hit points (round down). A pudding with only Planetouched:Aasimar - Medium-Size Outsider + Medium-Size Outsider 1d8 (4) +4 (Improved Initiative) 30 ft. @@ -25833,7 +25841,7 @@ checks.

              Planetouched:Tiefling - Medium-Size Outsider + Medium-Size Outsider 1d8 (4) +1 (Dex) 30 ft. @@ -26680,7 +26688,7 @@ aspects and train as rogues to take the assassin class.

              Pounce, rake 2d4+3, roar, spells Fort +12, Ref +8, Will +7 Str 25, Dex 10, Con 19, Int 16, Wis 17, Cha 17 - Intimidate +13, Knowledge (any one) +5, Listen +15, Spot +15, Wilderness Lore +13 + Intimidate +13, Knowledge (any one) +5, Listen +15, Spot +15, Survival +13 Alertness, Cleave, Great Cleave, Flyby Attack, Power Attack, Track Any warm land 1 @@ -26922,7 +26930,7 @@ forest setting.

              Sprite:Nixie - Small Fey + Small Fey 1d6 (3) +7 (+3 Dex, +4 Improved Initiative) 20 ft., swim 30 ft. @@ -26973,7 +26981,7 @@ when in the water.

              Sprite:Pixie - Small Fey + Small Fey 1d6 (3) +4 (Dex) 20 ft., fly 60 ft. (good) @@ -26986,7 +26994,7 @@ when in the water.

              SR 16, natural invisibility Fort +0, Ref +6, Will +4 Str 7, Dex 18, Con 11, Int 16, Wis 15, Cha 16 - Bluff +7, Concentration +4, Craft (any one) +7,Escape Artist +8, Heal +6, Hide +12, Listen +8, Move Silently +8, Ride +8, Search +9, Sense Motive +6, Spot +8 + Bluff +7, Concentration +4, Craft (any one) +7,Escape Artist +8, Heal +6, Hide +12, Listen +8, Move Silently +8, Ride +8, Search +9, Sense Motive +6, Spot +8 Dodge, Point Blank Shot, Rapid Shot, Weapon Finesse (dagger), Weapon Focus (shortbow) Temperate forest 2-4, 6-11, 20-80 @@ -27054,7 +27062,7 @@ and Listen checks.

              Fire and cold immunity, electricity resistance 10, half damage from slashing, all-around vision, tremorsense Fort +5, Ref +3, Will +3 Str 15, Dex 10, Con 15, Int 10, Wis 11, Cha 10 - Hide +10, Intuit Direction +3, Listen +6, Move Silently +3, Search 6, Spot +8 + Hide +10, survival +3, Listen +6, Move Silently +3, Search 6, Spot +8 Multiattack Any land and underground 1-5 @@ -27115,7 +27123,7 @@ with the ground.

              Fire and cold immunity, electricity resistance 10, half damage from slashing, all-around vision, tremorsense Fort +7, Ref +5, Will +5 Str 17, Dex 10, Con 15, Int 10, Wis 11, Cha 10 - Hide +10, Intuit Direction +10, Listen +10, Move Silently +10, Search +10, Spot +14 + Hide +10, survival +10, Listen +10, Move Silently +10, Search +10, Spot +14 Multiattack, Power Attack Any land and underground 1-5 @@ -27176,7 +27184,7 @@ with the ground.

              Fire and cold immunity, electricity resistance 10, half damage from slashing, all-around vision, tremorsense Fort +13, Ref +9, Will +9 Str 25, Dex 10, Con 19, Int 10, Wis 11, Cha 10 - Hide +14, Intuit Direction +18, Knowledge (minerals) +12, Listen +18, Move Silently +18, Search +22, Spot +22 + Hide +14, survival +18, Knowledge (minerals) +12, Listen +18, Move Silently +18, Search +22, Spot +22 Cleave, Great Cleave, Multiattack, Power Attack Any land and underground 1-2, 6-11 @@ -37883,5 +37891,41 @@ member instantly by holding it to the stump.

              + + +Human + + + Medium-size humanoid + 1d8+1 (5) + +0 (Dex) + 30 ft. + 16 (+5 armor, +1 shield) + Longsword +3 melee; Light crossbow +1 ranged + Longsword 1d8+1 (19/x2); Light crossbow 1d8 (19/x2) + 5 ft. by 5 ft./5 ft. + Fort +3, Ref +0, Will -1 + Str 13, Dex 11, Con 12, Int 10, Wis 9, Cha 8 + Listen +3, Spot +3, Intimidate +3 + Weapon Focus (longsword), Alertness + Any aquatic + 5-16 + 1/2 + Standard + Usually neutral + By character class + + + +

              +Most comfortable when aided by buddies - lots of them. +

              +               + +

              Usually, in the first round, shoots crossbow and charges in the +second. After that, will try to flank the enemy with the aid of others.

              +               +               +               diff --git a/package.sh b/package.sh index c43512e35..4dcc08f89 100644 --- a/package.sh +++ b/package.sh @@ -5,7 +5,7 @@ mkdir package/javelin cp javelin.jar package/javelin cp -r doc package/javelin rm package/javelin/doc/.*~ -cp -r avatars package/javelin +cp -r avatars/ package/javelin cp start.bat package/javelin cp monsters.xml package/javelin cp preferences.properties package/javelin diff --git a/preferences.properties b/preferences.properties index 418eda302..89419706f 100644 --- a/preferences.properties +++ b/preferences.properties @@ -15,6 +15,3 @@ ui.messagedelay=1.25 # font color ui.textcolor=white - -# maximum number of enemies per combat (up to 16) -el.maxfoes=9 diff --git a/tyrant/mikera/engine/Lib.java b/tyrant/mikera/engine/Lib.java index 21235da51..65b633709 100644 --- a/tyrant/mikera/engine/Lib.java +++ b/tyrant/mikera/engine/Lib.java @@ -12,7 +12,6 @@ import java.util.Set; import tyrant.mikera.tyrant.Animal; -import tyrant.mikera.tyrant.Artifact; import tyrant.mikera.tyrant.Aura; import tyrant.mikera.tyrant.Being; import tyrant.mikera.tyrant.Chest; @@ -169,8 +168,8 @@ public static Thing create(String name, final int level) { // this is an error, so send warning Game.warn("Lib: Can't create " + name); - return !name.equals("strange rock") ? Lib - .create("strange rock") : null; + return !name.equals("strange rock") ? Lib.create("strange rock") + : null; } t = createThing(aThing); @@ -298,8 +297,8 @@ private BaseObject getThingFromType(final String type, final int level) { } if (things.isEmpty()) { - throw new Error("Can't create type [" + type + "] at level " - + level); + throw new Error( + "Can't create type [" + type + "] at level " + level); } BaseObject aThing = null; for (int i = 0; i < 100; i++) { @@ -497,7 +496,8 @@ public static Thing extend(final String newName, final String baseName) { * @param baseName * @return */ - public static Thing extendCopy(final String newName, final String baseName) { + public static Thing extendCopy(final String newName, + final String baseName) { final BaseObject baseObject = get(baseName); if (baseObject == null) { throw new Error("Can't find base properties [" + baseName + "]"); @@ -507,7 +507,8 @@ public static Thing extendCopy(final String newName, final String baseName) { return newThing; } - public static Thing extendNamed(final String newName, final String baseName) { + public static Thing extendNamed(final String newName, + final String baseName) { final Thing t = Lib.extend("newthing", baseName); // AI.name(t, newName); return t; @@ -613,20 +614,19 @@ public ArrayList getTiles() { // PLEASE keep alphabetical by type!!! // artifacts - public static final Description DESC_IMPERIALCROWN = new Describer( - "The Crown of Daedor", - "", - "The priceless crown of the Daedorian Empire. This artifact is rumoured to bestow remarkable powers on the wearer.", - Description.NAMETYPE_PROPER, Description.GENDER_NEUTER); + public static final Description DESC_IMPERIALCROWN = + new Describer("The Crown of Daedor", "", + "The priceless crown of the Daedorian Empire. This artifact is rumoured to bestow remarkable powers on the wearer.", + Description.NAMETYPE_PROPER, Description.GENDER_NEUTER); // Clothing - public static final Description DESC_HAT = new Describer("hat", - "A hat of fine quality."); + public static final Description DESC_HAT = + new Describer("hat", "A hat of fine quality."); public static final Description DESC_TROUSERS = new Describer("trousers", "pairs of trousers", "A pair of serviceable trousers.", Description.NAMETYPE_QUANTITY, Description.GENDER_NEUTER); - public static final Description DESC_ROBE = new Describer("robe", - "A well-made robe."); + public static final Description DESC_ROBE = + new Describer("robe", "A well-made robe."); public static final Description DESC_MAGICROBE = new Describer("robe", "A robe covered with runes and mystic sigils."); public static final Description DESC_GLOVES = new Describer("gloves", @@ -634,15 +634,15 @@ public ArrayList getTiles() { Description.NAMETYPE_QUANTITY, Description.GENDER_NEUTER); // treasure - public static final Description DESC_TREASURE = new Describer("treasure", - "treasure", "Valuable treasure.", Description.NAMETYPE_QUANTITY, - Description.GENDER_NEUTER); + public static final Description DESC_TREASURE = + new Describer("treasure", "treasure", "Valuable treasure.", + Description.NAMETYPE_QUANTITY, Description.GENDER_NEUTER); // quality descriptions - public static final String[] qualitystrings = { "useless", "pathetic", - "very poor", "poor", "mediocre", "average", "fair", "good", - "very good", "excellent", "superb", "brilliant", "divine", - "perfect" }; + public static final String[] qualitystrings = + { "useless", "pathetic", "very poor", "poor", "mediocre", "average", + "fair", "good", "very good", "excellent", "superb", + "brilliant", "divine", "perfect" }; public static final int[] qualityvalues = { 0, 20, 40, 60, 80, 100, 150, 200, 400, 800, 1800, 5000, 20000, 100000 }; @@ -832,8 +832,8 @@ public static Thing createItem(final int level) { case 12: return Missile.createMissile(level); case 13: - return Coin.createMoney(RPG.d(10 + level * 5) - * RPG.d(3 + level * 5)); + return Coin + .createMoney(RPG.d(10 + level * 5) * RPG.d(3 + level * 5)); case 14: return RangedWeapon.createRangedWeapon(level); case 15: @@ -902,7 +902,7 @@ public static void init() { Animal.init(); Monster.init(); Person.init(); - Artifact.init(); + // Artifact.init(); EndGame.init(); Tutorial.init(); GoblinVillage.init(); diff --git a/tyrant/mikera/tyrant/Artifact.java b/tyrant/mikera/tyrant/Artifact.java index 860e5d185..6dc658afe 100644 --- a/tyrant/mikera/tyrant/Artifact.java +++ b/tyrant/mikera/tyrant/Artifact.java @@ -1,479 +1,479 @@ -package tyrant.mikera.tyrant; - -import tyrant.mikera.engine.Lib; -import tyrant.mikera.engine.Modifier; -import tyrant.mikera.engine.RPG; -import tyrant.mikera.engine.Thing; - -/** - * @author Mike - * - * The artifact class creates and handles unique artifact weapons - * - * Artifacts should be immutable and unchangeable, e.g. - Immune to - * damage - Unaffected by runes - Impossible to change status i.e. - * cursed/blessed - * - * - * This includes random artifacts - */ - -public class Artifact { - public static void init() { - initRings(); - initSwords(); - initAmulets(); - initArmour(); - initShields(); - initEquipment(); - initFootwear(); - initWeapons(); - initMissiles(); - initCrowns(); - initGloves(); - } - - public static void initFootwear() { - Thing t; - - t = Lib.extend("The Seven League Boots", "leather boots"); - t.set("LevelMin", 1); - t.set("Armour", 4); - t.add("WieldedModifiers", Modifier.bonus(RPG.ST_MOVESPEED, 200)); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Nitrozac's Boots", "leather boots"); - t.set("LevelMin", 17); - t.set("Image", 364); - t.set("IsRandomArtifact", 1); - t.set("Armour", 40); - t.add("WieldedModifiers", Modifier.bonus(RPG.ST_MOVESPEED, 50)); - addArtifact(t); - - t = Lib.extend("The Winged Sandals", "leather boots"); - t.set("LevelMin", 27); - t.set("Armour", 5); - t.add("WieldedModifiers", Modifier.bonus("IsFlying", 1)); - t.add("WieldedModifiers", Modifier.bonus("Speed", 20)); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - } - - public static void initGloves() { - Thing t; - - t = Lib.extend("The Firefists", "red steel gauntlets"); - t.multiplyStat("Armour", 2.0); - t.add("WieldedModifiers", Modifier.bonus(Skill.FEROCITY, 1)); - t.set("OnWeaponHit", Scripts.spellEffect("Target", "Fireball", 25)); - t.set("LevelMin", 20); - t.set("IsRandomArtifact", 1); - addArtifact(t); - } - - public static void initShields() { - Thing t; - - t = Lib.extend("Jorgen's Buckler", "krithium buckler"); - t.multiplyStat("Armour", 2.0); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); - t.add("WieldedModifiers", Modifier.bonus(Skill.ALERTNESS, 1)); - t.set("LevelMin", 1); - t.set("IsRandomArtifact", 1); - t.set("Image", 660); - addArtifact(t); - - t = Lib.extend("The Black Buckler", "black steel buckler"); - t.multiplyStat("Armour", 1.7); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 2)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); - t.set("LevelMin", 10); - t.set("IsRandomArtifact", 1); - t.set("Image", 660); - addArtifact(t); - - t = Lib.extend("Gorandil", "parillite large shield"); - t.multiplyStat("Armour", 1.2); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 2)); - t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); - t.set("LevelMin", 35); - t.set("IsRandomArtifact", 1); - t.set("Image", 399); - addArtifact(t); - } - - public static void initArmour() { - Thing t; - - t = Lib.extend("Korvon's Armour", "steel chain mail"); - t.set("UName", "finely crafted chain mail"); - t.multiplyStat("Armour", 5); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); - t.add("WieldedModifiers", Modifier.bonus("RES:fire", 10)); - t.set("LevelMin", 1); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Kabirion", "mithril plate mail"); - t.set("UName", "engraved elven plate mail"); - t.multiplyStat("Armour", 2); - t.add("WieldedModifiers", Modifier.bonus("Luck", 10)); - t.set("LevelMin", 10); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Kethirion", "krithium horned helm"); - t.set("UName", "huge dwarvish horned helm"); - t.multiplyStat("Armour", 3); - t.add("WieldedModifiers", Modifier.bonus("Luck", 10)); - t.set("LevelMin", 15); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("The Tyrant's Armour", "black steel plate armour"); - t.set("UName", "heavy plated armour"); - t.multiplyStat("Armour", 3); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); - t.set("LevelMin", 25); - addArtifact(t); - - t = Lib.extend("The Cloak Of The Night", "light cloak"); - t.set("UName", "flowing dark cloak"); - t.set("Armour", 10); - t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); - t.add("WieldedModifiers", Modifier.bonus(Skill.STEALTH, 2)); - t.set("LevelMin", 5); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("The Helm Of Aramis", "parillite helmet"); - t.set("UName", "brightly shining engraved helmet"); - t.multiplyStat("Armour", 3); - t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); - t.add("WieldedModifiers", Modifier.bonus(Skill.HEALING, RPG.d(6))); - t.set("LevelMin", 35); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - } - - public static void initCrowns() { - Thing t; - - t = Lib.extend("The Crown of Daedor", "base headgear"); - t.add("WieldedModifiers", Modifier.bonus("TG", 20)); - t.add("WieldedModifiers", Modifier.bonus("WP", 20)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 30)); - t.add("WieldedModifiers", Modifier.bonus("RES:disintegrate", 5)); - t.set("Armour", 10); - t.set("Image", 427); - t.set("LevelMin", 30); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("The Crown of Fire", "base headgear"); - t.add("WieldedModifiers", Modifier.bonus("RES:fire", 1000)); - t.add("WieldedModifiers", Modifier.addHandler("OnAction", - Monster.breathAttack("fire", "blazing flames", 4, 50, 1))); - t.set("Armour", 6); - t.set("Image", 428); - t.set("LevelMin", 35); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("The Crown of Ages", "base headgear"); - t.add("WieldedModifiers", Modifier.bonus("IN", 30)); - t.add("WieldedModifiers", Modifier.bonus("Speed", 30)); - t.add("WieldedModifiers", Modifier.bonus("TrueView", 5)); - t.set("Image", 425); - t.set("Armour", 8); - t.set("LevelMin", 40); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - } - - public static void initAmulets() { - Thing t = Lib.extend("The Emerald Of Life", "base necklace"); - t.set("UName", "stunning emerald necklace"); - t.set("Image", 406); - t.set("Armour", 40); - t.add("WieldedModifiers", Modifier.bonus("RES:disintegrate", 30)); - t.add("WieldedModifiers", Modifier.bonus("RES:chill", 30)); - t.add("WieldedModifiers", Modifier.bonus(Skill.HEALING, 3)); - t.set("LevelMin", 40); - addArtifact(t); - } - - public static void initEquipment() { - Thing t; - - t = Lib.extend("The Spade Of Aces", "wooden spade"); - t.set("UName", "well used spade"); - t.set("SlayingStats", "IsGoblin*2"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); - t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); - t.add("WieldedModifiers", Modifier.bonus(Skill.MINING, 2)); - t.set("LevelMin", 25); - t.set("DigCost", 100); - addArtifact(t); - } - - public static void initSwords() { - Thing t; - - t = Lib.extend("Orcslayer", "mithril sword"); - t.set("UName", "glowing elven sword"); - t.set("SlayingStats", "IsOrc*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); - t.set("LevelMin", 1); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Thurgin's Bane", "krithium mace"); - t.set("UName", "heavy orcish mace"); - t.set("SlayingStats", "IsDwarf*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); - t.set("LevelMin", 1); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Herugrim", "steel sword"); - t.set("UName", "horse-engraved sword"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2.0); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2.0); - t.add("WieldedModifiers", Modifier.bonus("MoveSpeed", 40)); - t.set("LevelMin", 5); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Sting", "mithril dagger"); - t.set("UName", "gleaming hobbit's dagger"); - t.set("SlayingStats", "IsGoblinoid*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2.0); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2.0); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.5); - t.set("LevelMin", 10); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Morglay", "black steel short sword"); - t.set("UName", "fearsome black shortsword"); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.7); - t.set("OnTouch", Scripts.addEffect("Target", "strong poison")); - t.set("LevelMin", 5); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Purifier", "blue steel two-handed sword"); - t.set("UName", "brightly shining two-handed sword"); - t.set("SlayingStats", "IsUndead*3,IsDemonic*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); - t.set("IsBlessed", 1); - t.set("LevelMin", 20); - t.set("IsRandomArtifact", 1); - t.set("Image", 173); - addArtifact(t); - - t = Lib.extend("Anduril", "elven steel longsword"); - t.set("UName", "shining elven longsword"); - t.set("SlayingStats", "IsDemonic*2"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); - t.add("WieldedModifiers", Modifier.bonus(Skill.BRAVERY, 2)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); - t.set("IsBlessed", 1); - t.set("LevelMin", 25); - t.set("IsRandomArtifact", 1); - t.set("Image", 173); - addArtifact(t); - - t = Lib.extend("Excalibur", "mithril sword"); - t.set("UName", "shimmering sword"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 3.0); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 3.0); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); - t.set("IsRandomArtifact", 1); - t.set("IsBlessed", 1); - t.set("LevelMin", 30); - t.set("Image", 170); - addArtifact(t); - - t = Lib.extend("Gimbermaal", "black steel two-handed sword"); - t.set("UName", "huge black two-handed sword"); - t.set("SlayingStats", "IsHumanoid*2,IsUndead*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); - t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); - t.set("IsRandomArtifact", 1); - t.set("LevelMin", 35); - t.set("Image", 173); - addArtifact(t); - - t = Lib.extend("Yanthrall's Sword", "parillite longsword"); - t.set("UName", "gleaming engraved longsword"); - t.set("SlayingStats", "IsHumanoid*3,IsDemonic*3"); - t.add("WieldedModifiers", Modifier.bonus(Skill.BRAVERY, 4)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 30)); - t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); - t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.5); - t.set("IsBlessed", 1); - t.set("LevelMin", 40); - t.set("Image", 166); - addArtifact(t); - - } - - public static void initMissiles() { - Thing t; - - t = Lib.extend("Cupid's Arrow", "arrow"); - t.set("Image", 80); - t.set("Number", 1); - t.set("LevelMin", 1); - // t.set("OnWeaponHit",new Script() { - // private static final long serialVersionUID = 1L; - // - // public boolean handle(Thing t, Event e) { - // Thing target=e.getThing("Target"); - // Thing shooter=e.getThing("Shooter"); - // - // if (shooter==null) return true; - // - // AI.setFollower(target,shooter); - // shooter.message(target.getTheName()+" seems deeply enamoured with you"); - // - // return true; - // } - // }); - addArtifact(t); - } - - public static void initWeapons() { - Thing t; - - t = Lib.extend("The Tyrant's Mace", "black steel two-handed mace"); - t.set("UName", "malevolent two-handed mace"); - t.set("SlayingStats", "IsHumanoid*2"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.2); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.2); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); - t.set("LevelMin", 25); - t.set("Image", 164); - t.set("WeaponDamageType", "impact"); - addArtifact(t); - - t = Lib.extend("Death's Scythe", "scythe"); - t.set("UName", "space distorting black sycthe"); - t.set("SlayingStats", "IsLiving*3"); - t.multiplyStat(RPG.ST_ASKMULTIPLIER, 3); - t.multiplyStat(RPG.ST_ASTMULTIPLIER, 3); - t.multiplyStat(RPG.ST_DSKMULTIPLIER, 3); - t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); - t.set("LevelMin", 35); - t.set("Image", 172); - addArtifact(t); - } - - public static void initRings() { - Thing t; - - t = Lib.extend("Fortune", "silver ring"); - t.set("UName", "strangely plain silver ring"); - t.add("WieldedModifiers", Modifier.bonus("AG", 10)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 40)); - t.set("LevelMin", 1); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Narya", "gold ring"); - t.set("UName", "burning gold ring"); - t.add("WieldedModifiers", Modifier.bonus("ST", 20)); - t.add("WieldedModifiers", Modifier.bonus("RES:fire", 1000)); - t.set("LevelMin", 20); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Nenya", "silver ring"); - t.set("UName", "slippery silver ring"); - t.add("WieldedModifiers", Modifier.bonus(Skill.SWIMMING, 10)); - t.add("WieldedModifiers", Modifier.bonus("AG", 20)); - t.add("WieldedModifiers", Modifier.bonus("RES:water", 1000)); - t.set("LevelMin", 25); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Vilya", "silver ring"); - t.set("UName", "sparkling silver ring"); - t.add("WieldedModifiers", Modifier.bonus("IsFlying", 1)); - t.add("WieldedModifiers", Modifier.bonus("IN", 10)); - t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); - t.add("WieldedModifiers", Modifier.bonus("RES:shock", 10)); - t.set("LevelMin", 30); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("The One Ring", "gold ring"); - t.set("IsCursed", 1); - t.set("UName", "strangely plain gold ring"); - t.add("WieldedModifiers", Modifier.bonus("SK", 10)); - t.add("WieldedModifiers", Modifier.bonus("ST", 10)); - t.add("WieldedModifiers", Modifier.bonus("AG", 10)); - t.add("WieldedModifiers", Modifier.bonus("TG", 10)); - t.add("WieldedModifiers", Modifier.bonus("IN", 10)); - t.add("WieldedModifiers", Modifier.bonus("WP", 10)); - t.add("WieldedModifiers", Modifier.bonus("CH", 10)); - t.add("WieldedModifiers", Modifier.bonus("CR", 10)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 40)); - t.set("LevelMin", 35); - addArtifact(t); - - t = Lib.extend("The Xing Ring", "gold ring"); - t.set("UName", "brilliant diamond ring"); - t.set("Image", 207); - t.add("WieldedModifiers", Modifier.linear("IN", 200, 10)); - t.set("LevelMin", 30); - t.set("IsRandomArtifact", 1); - addArtifact(t); - - t = Lib.extend("Destiny", "silver ring"); - t.set("UName", "finely engraved silver ring"); - t.add("WieldedModifiers", Modifier.linear("WP", 150, 0)); - t.add("WieldedModifiers", Modifier.bonus("Luck", 100)); - t.set("LevelMin", 40); - addArtifact(t); - } - - private static void addArtifact(Thing t) { - makeArtifact(t); - Lib.addNewArtifact(t); - - } - - private static void makeArtifact(Thing t) { - t.set("IsUnique", 1); - t.set("IsArtifact", 1); - t.set("IsDestructible", 0); - t.set("IsTheftProof", 1); - t.set("Frequency", 0); - - // override old defaultthings - // e.g. prevent runes from appearing - t.set("DefaultThings", t.getLocal().get("DefaultThings")); - - // very valuable - t.set("ValueBase", 10000); - t.set("LevelMax", t.getStat("LevelMin") + 15); - } -} +// package tyrant.mikera.tyrant; +// +// import tyrant.mikera.engine.Lib; +// import tyrant.mikera.engine.Modifier; +// import tyrant.mikera.engine.RPG; +// import tyrant.mikera.engine.Thing; +// +/// ** +// * @author Mike +// * +// * The artifact class creates and handles unique artifact weapons +// * +// * Artifacts should be immutable and unchangeable, e.g. - Immune to +// * damage - Unaffected by runes - Impossible to change status i.e. +// * cursed/blessed +// * +// * +// * This includes random artifacts +// */ +// +// public class Artifact { +// public static void init() { +// initRings(); +// initSwords(); +// initAmulets(); +// initArmour(); +// initShields(); +// initEquipment(); +// initFootwear(); +// initWeapons(); +// initMissiles(); +// initCrowns(); +// initGloves(); +// } +// +// public static void initFootwear() { +// Thing t; +// +// t = Lib.extend("The Seven League Boots", "leather boots"); +// t.set("LevelMin", 1); +// t.set("Armour", 4); +// t.add("WieldedModifiers", Modifier.bonus(RPG.ST_MOVESPEED, 200)); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Nitrozac's Boots", "leather boots"); +// t.set("LevelMin", 17); +// t.set("Image", 364); +// t.set("IsRandomArtifact", 1); +// t.set("Armour", 40); +// t.add("WieldedModifiers", Modifier.bonus(RPG.ST_MOVESPEED, 50)); +// addArtifact(t); +// +// t = Lib.extend("The Winged Sandals", "leather boots"); +// t.set("LevelMin", 27); +// t.set("Armour", 5); +// t.add("WieldedModifiers", Modifier.bonus("IsFlying", 1)); +// t.add("WieldedModifiers", Modifier.bonus("Speed", 20)); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// } +// +// public static void initGloves() { +// Thing t; +// +// t = Lib.extend("The Firefists", "red steel gauntlets"); +// t.multiplyStat("Armour", 2.0); +// t.add("WieldedModifiers", Modifier.bonus(Skill.FEROCITY, 1)); +// t.set("OnWeaponHit", Scripts.spellEffect("Target", "Fireball", 25)); +// t.set("LevelMin", 20); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// } +// +// public static void initShields() { +// Thing t; +// +// t = Lib.extend("Jorgen's Buckler", "krithium buckler"); +// t.multiplyStat("Armour", 2.0); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); +// t.add("WieldedModifiers", Modifier.bonus(Skill.ALERTNESS, 1)); +// t.set("LevelMin", 1); +// t.set("IsRandomArtifact", 1); +// t.set("Image", 660); +// addArtifact(t); +// +// t = Lib.extend("The Black Buckler", "black steel buckler"); +// t.multiplyStat("Armour", 1.7); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 2)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); +// t.set("LevelMin", 10); +// t.set("IsRandomArtifact", 1); +// t.set("Image", 660); +// addArtifact(t); +// +// t = Lib.extend("Gorandil", "parillite large shield"); +// t.multiplyStat("Armour", 1.2); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 2)); +// t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); +// t.set("LevelMin", 35); +// t.set("IsRandomArtifact", 1); +// t.set("Image", 399); +// addArtifact(t); +// } +// +// public static void initArmour() { +// Thing t; +// +// t = Lib.extend("Korvon's Armour", "steel chain mail"); +// t.set("UName", "finely crafted chain mail"); +// t.multiplyStat("Armour", 5); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); +// t.add("WieldedModifiers", Modifier.bonus("RES:fire", 10)); +// t.set("LevelMin", 1); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Kabirion", "mithril plate mail"); +// t.set("UName", "engraved elven plate mail"); +// t.multiplyStat("Armour", 2); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 10)); +// t.set("LevelMin", 10); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Kethirion", "krithium horned helm"); +// t.set("UName", "huge dwarvish horned helm"); +// t.multiplyStat("Armour", 3); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 10)); +// t.set("LevelMin", 15); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("The Tyrant's Armour", "black steel plate armour"); +// t.set("UName", "heavy plated armour"); +// t.multiplyStat("Armour", 3); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); +// t.set("LevelMin", 25); +// addArtifact(t); +// +// t = Lib.extend("The Cloak Of The Night", "light cloak"); +// t.set("UName", "flowing dark cloak"); +// t.set("Armour", 10); +// t.add("WieldedModifiers", Modifier.bonus(Skill.DEFENCE, 1)); +// t.add("WieldedModifiers", Modifier.bonus(Skill.STEALTH, 2)); +// t.set("LevelMin", 5); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("The Helm Of Aramis", "parillite helmet"); +// t.set("UName", "brightly shining engraved helmet"); +// t.multiplyStat("Armour", 3); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); +// t.add("WieldedModifiers", Modifier.bonus(Skill.HEALING, RPG.d(6))); +// t.set("LevelMin", 35); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// } +// +// public static void initCrowns() { +// Thing t; +// +// t = Lib.extend("The Crown of Daedor", "base headgear"); +// t.add("WieldedModifiers", Modifier.bonus("TG", 20)); +// t.add("WieldedModifiers", Modifier.bonus("WP", 20)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 30)); +// t.add("WieldedModifiers", Modifier.bonus("RES:disintegrate", 5)); +// t.set("Armour", 10); +// t.set("Image", 427); +// t.set("LevelMin", 30); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("The Crown of Fire", "base headgear"); +// t.add("WieldedModifiers", Modifier.bonus("RES:fire", 1000)); +// t.add("WieldedModifiers", Modifier.addHandler("OnAction", +// Monster.breathAttack("fire", "blazing flames", 4, 50, 1))); +// t.set("Armour", 6); +// t.set("Image", 428); +// t.set("LevelMin", 35); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("The Crown of Ages", "base headgear"); +// t.add("WieldedModifiers", Modifier.bonus("IN", 30)); +// t.add("WieldedModifiers", Modifier.bonus("Speed", 30)); +// t.add("WieldedModifiers", Modifier.bonus("TrueView", 5)); +// t.set("Image", 425); +// t.set("Armour", 8); +// t.set("LevelMin", 40); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// } +// +// public static void initAmulets() { +// Thing t = Lib.extend("The Emerald Of Life", "base necklace"); +// t.set("UName", "stunning emerald necklace"); +// t.set("Image", 406); +// t.set("Armour", 40); +// t.add("WieldedModifiers", Modifier.bonus("RES:disintegrate", 30)); +// t.add("WieldedModifiers", Modifier.bonus("RES:chill", 30)); +// t.add("WieldedModifiers", Modifier.bonus(Skill.HEALING, 3)); +// t.set("LevelMin", 40); +// addArtifact(t); +// } +// +// public static void initEquipment() { +// Thing t; +// +// t = Lib.extend("The Spade Of Aces", "wooden spade"); +// t.set("UName", "well used spade"); +// t.set("SlayingStats", "IsGoblin*2"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); +// t.add("WieldedModifiers", Modifier.bonus(Skill.MINING, 2)); +// t.set("LevelMin", 25); +// t.set("DigCost", 100); +// addArtifact(t); +// } +// +// public static void initSwords() { +// Thing t; +// +// t = Lib.extend("Orcslayer", "mithril sword"); +// t.set("UName", "glowing elven sword"); +// t.set("SlayingStats", "IsOrc*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); +// t.set("LevelMin", 1); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Thurgin's Bane", "krithium mace"); +// t.set("UName", "heavy orcish mace"); +// t.set("SlayingStats", "IsDwarf*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); +// t.set("LevelMin", 1); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Herugrim", "steel sword"); +// t.set("UName", "horse-engraved sword"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2.0); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2.0); +// t.add("WieldedModifiers", Modifier.bonus("MoveSpeed", 40)); +// t.set("LevelMin", 5); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Sting", "mithril dagger"); +// t.set("UName", "gleaming hobbit's dagger"); +// t.set("SlayingStats", "IsGoblinoid*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2.0); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2.0); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.5); +// t.set("LevelMin", 10); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Morglay", "black steel short sword"); +// t.set("UName", "fearsome black shortsword"); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.7); +// t.set("OnTouch", Scripts.addEffect("Target", "strong poison")); +// t.set("LevelMin", 5); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Purifier", "blue steel two-handed sword"); +// t.set("UName", "brightly shining two-handed sword"); +// t.set("SlayingStats", "IsUndead*3,IsDemonic*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); +// t.set("IsBlessed", 1); +// t.set("LevelMin", 20); +// t.set("IsRandomArtifact", 1); +// t.set("Image", 173); +// addArtifact(t); +// +// t = Lib.extend("Anduril", "elven steel longsword"); +// t.set("UName", "shining elven longsword"); +// t.set("SlayingStats", "IsDemonic*2"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.5); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.5); +// t.add("WieldedModifiers", Modifier.bonus(Skill.BRAVERY, 2)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 20)); +// t.set("IsBlessed", 1); +// t.set("LevelMin", 25); +// t.set("IsRandomArtifact", 1); +// t.set("Image", 173); +// addArtifact(t); +// +// t = Lib.extend("Excalibur", "mithril sword"); +// t.set("UName", "shimmering sword"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 3.0); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 3.0); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); +// t.set("IsRandomArtifact", 1); +// t.set("IsBlessed", 1); +// t.set("LevelMin", 30); +// t.set("Image", 170); +// addArtifact(t); +// +// t = Lib.extend("Gimbermaal", "black steel two-handed sword"); +// t.set("UName", "huge black two-handed sword"); +// t.set("SlayingStats", "IsHumanoid*2,IsUndead*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); +// t.set("IsRandomArtifact", 1); +// t.set("LevelMin", 35); +// t.set("Image", 173); +// addArtifact(t); +// +// t = Lib.extend("Yanthrall's Sword", "parillite longsword"); +// t.set("UName", "gleaming engraved longsword"); +// t.set("SlayingStats", "IsHumanoid*3,IsDemonic*3"); +// t.add("WieldedModifiers", Modifier.bonus(Skill.BRAVERY, 4)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 30)); +// t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_DSKMULTIPLIER, 2); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.5); +// t.set("IsBlessed", 1); +// t.set("LevelMin", 40); +// t.set("Image", 166); +// addArtifact(t); +// +// } +// +// public static void initMissiles() { +// Thing t; +// +// t = Lib.extend("Cupid's Arrow", "arrow"); +// t.set("Image", 80); +// t.set("Number", 1); +// t.set("LevelMin", 1); +// // t.set("OnWeaponHit",new Script() { +// // private static final long serialVersionUID = 1L; +// // +// // public boolean handle(Thing t, Event e) { +// // Thing target=e.getThing("Target"); +// // Thing shooter=e.getThing("Shooter"); +// // +// // if (shooter==null) return true; +// // +// // AI.setFollower(target,shooter); +// // shooter.message(target.getTheName()+" seems deeply enamoured with you"); +// // +// // return true; +// // } +// // }); +// addArtifact(t); +// } +// +// public static void initWeapons() { +// Thing t; +// +// t = Lib.extend("The Tyrant's Mace", "black steel two-handed mace"); +// t.set("UName", "malevolent two-handed mace"); +// t.set("SlayingStats", "IsHumanoid*2"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 1.2); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 1.2); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); +// t.set("LevelMin", 25); +// t.set("Image", 164); +// t.set("WeaponDamageType", "impact"); +// addArtifact(t); +// +// t = Lib.extend("Death's Scythe", "scythe"); +// t.set("UName", "space distorting black sycthe"); +// t.set("SlayingStats", "IsLiving*3"); +// t.multiplyStat(RPG.ST_ASKMULTIPLIER, 3); +// t.multiplyStat(RPG.ST_ASTMULTIPLIER, 3); +// t.multiplyStat(RPG.ST_DSKMULTIPLIER, 3); +// t.multiplyStat(RPG.ST_ATTACKCOST, 0.8); +// t.set("LevelMin", 35); +// t.set("Image", 172); +// addArtifact(t); +// } +// +// public static void initRings() { +// Thing t; +// +// t = Lib.extend("Fortune", "silver ring"); +// t.set("UName", "strangely plain silver ring"); +// t.add("WieldedModifiers", Modifier.bonus("AG", 10)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 40)); +// t.set("LevelMin", 1); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Narya", "gold ring"); +// t.set("UName", "burning gold ring"); +// t.add("WieldedModifiers", Modifier.bonus("ST", 20)); +// t.add("WieldedModifiers", Modifier.bonus("RES:fire", 1000)); +// t.set("LevelMin", 20); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Nenya", "silver ring"); +// t.set("UName", "slippery silver ring"); +// t.add("WieldedModifiers", Modifier.bonus(Skill.SWIMMING, 10)); +// t.add("WieldedModifiers", Modifier.bonus("AG", 20)); +// t.add("WieldedModifiers", Modifier.bonus("RES:water", 1000)); +// t.set("LevelMin", 25); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Vilya", "silver ring"); +// t.set("UName", "sparkling silver ring"); +// t.add("WieldedModifiers", Modifier.bonus("IsFlying", 1)); +// t.add("WieldedModifiers", Modifier.bonus("IN", 10)); +// t.add("WieldedModifiers", Modifier.bonus("Speed", 10)); +// t.add("WieldedModifiers", Modifier.bonus("RES:shock", 10)); +// t.set("LevelMin", 30); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("The One Ring", "gold ring"); +// t.set("IsCursed", 1); +// t.set("UName", "strangely plain gold ring"); +// t.add("WieldedModifiers", Modifier.bonus("SK", 10)); +// t.add("WieldedModifiers", Modifier.bonus("ST", 10)); +// t.add("WieldedModifiers", Modifier.bonus("AG", 10)); +// t.add("WieldedModifiers", Modifier.bonus("TG", 10)); +// t.add("WieldedModifiers", Modifier.bonus("IN", 10)); +// t.add("WieldedModifiers", Modifier.bonus("WP", 10)); +// t.add("WieldedModifiers", Modifier.bonus("CH", 10)); +// t.add("WieldedModifiers", Modifier.bonus("CR", 10)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 40)); +// t.set("LevelMin", 35); +// addArtifact(t); +// +// t = Lib.extend("The Xing Ring", "gold ring"); +// t.set("UName", "brilliant diamond ring"); +// t.set("Image", 207); +// t.add("WieldedModifiers", Modifier.linear("IN", 200, 10)); +// t.set("LevelMin", 30); +// t.set("IsRandomArtifact", 1); +// addArtifact(t); +// +// t = Lib.extend("Destiny", "silver ring"); +// t.set("UName", "finely engraved silver ring"); +// t.add("WieldedModifiers", Modifier.linear("WP", 150, 0)); +// t.add("WieldedModifiers", Modifier.bonus("Luck", 100)); +// t.set("LevelMin", 40); +// addArtifact(t); +// } +// +// private static void addArtifact(Thing t) { +// makeArtifact(t); +// Lib.addNewArtifact(t); +// +// } +// +// private static void makeArtifact(Thing t) { +// t.set("IsUnique", 1); +// t.set("IsArtifact", 1); +// t.set("IsDestructible", 0); +// t.set("IsTheftProof", 1); +// t.set("Frequency", 0); +// +// // override old defaultthings +// // e.g. prevent runes from appearing +// t.set("DefaultThings", t.getLocal().get("DefaultThings")); +// +// // very valuable +// t.set("ValueBase", 10000); +// t.set("LevelMax", t.getStat("LevelMin") + 15); +// } +// } diff --git a/tyrant/mikera/tyrant/Game.java b/tyrant/mikera/tyrant/Game.java index ce7d219ed..2aab765d0 100644 --- a/tyrant/mikera/tyrant/Game.java +++ b/tyrant/mikera/tyrant/Game.java @@ -28,6 +28,7 @@ import javelin.model.unit.Combatant; import javelin.view.MapPanel; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import tyrant.mikera.engine.BaseObject; import tyrant.mikera.engine.Lib; import tyrant.mikera.engine.Point; diff --git a/tyrant/mikera/tyrant/Person.java b/tyrant/mikera/tyrant/Person.java index 9589164e0..1279214f5 100644 --- a/tyrant/mikera/tyrant/Person.java +++ b/tyrant/mikera/tyrant/Person.java @@ -76,7 +76,8 @@ public boolean handle(Thing t, Event e) { Game.messageTyrant(t.getTheName() + " could teach you the " + sk + " skill for " + Coin.valueString(price) + ""); - Game.messageTyrant("Unfortunately, you do not have enough money to pay for this"); + Game.messageTyrant( + "Unfortunately, you do not have enough money to pay for this"); } else { // can learn skill Game.messageTyrant(t.getTheName() @@ -99,7 +100,8 @@ public boolean handle(Thing t, Event e) { // not enough experience Game.messageTyrant(t.getTheName() + " can teach the " + sk + " skill for " + Coin.valueString(price) + ""); - Game.messageTyrant("However, you must gain more experience first"); + Game.messageTyrant( + "However, you must gain more experience first"); } } @@ -121,9 +123,9 @@ public boolean handle(Thing t, Event e) { } if (!gift.getFlag(getString("WantedFlag"))) { - giver.message(t.getTheName() - + " doesn't want to swap anything for " - + gift.getYourName()); + giver.message( + t.getTheName() + " doesn't want to swap anything for " + + gift.getYourName()); return false; } int value = Item.value(gift); @@ -136,8 +138,8 @@ public boolean handle(Thing t, Event e) { if (getFlag("IdentifyFlag")) { Item.identify(st); } - giver.message(t.getTheName() + " gives you " - + st.getAName() + " in return"); + giver.message(t.getTheName() + " gives you " + st.getAName() + + " in return"); gift.remove(); giver.addThingWithStacking(st); incStat("SwapCount", -1); @@ -169,12 +171,12 @@ private static class ListSellingScript extends Script { public boolean handle(Thing t, Event e) { Thing h = e.getThing("Target"); - for (Thing gift = Game.selectSaleItem("Select an item to sell:", h, - t); // Declaration - // part - // of - // for - // loop + for (Thing gift = + Game.selectSaleItem("Select an item to sell:", h, t); // Declaration + // part + // of + // for + // loop gift != null; // Stop once gift is null gift = Game.selectSaleItem("Select an item to sell:", h, t)) { // Updater // : @@ -185,7 +187,7 @@ public boolean handle(Thing t, Event e) { // part if (gift == null) { return true; - }// Sanity check for elusive bug + } // Sanity check for elusive bug if (gift.getFlag("IsMoney")) { continue; } @@ -195,8 +197,8 @@ public boolean handle(Thing t, Event e) { if (total > 1) { // count = // Game.getNumber("Sell how many (Enter=all)?",total); - count = Game.selectSaleNumber( - "Sell how many (Enter=All)? ", h, t, total); + count = Game.selectSaleNumber("Sell how many (Enter=All)? ", + h, t, total); } int value = Item.shopValue(gift, h, t, count); @@ -204,9 +206,9 @@ public boolean handle(Thing t, Event e) { continue; } - Game.messageTyrant("You sell your " - + gift.getName(Game.hero(), count) + " to " - + t.getTheName()); + Game.messageTyrant( + "You sell your " + gift.getName(Game.hero(), count) + + " to " + t.getTheName()); if (count > 0) { gift.remove(count); } @@ -238,9 +240,9 @@ public boolean handle(Thing t, Event e) { giver.message("Do you accept? (y/n)"); char k = Game.getOption("ynq"); if (k == 'y') { - Game.messageTyrant("You sell your " - + gift.getName(Game.hero()) + " to " - + t.getTheName()); + Game.messageTyrant( + "You sell your " + gift.getName(Game.hero()) + + " to " + t.getTheName()); gift.remove(); Coin.addMoney(giver, value); } @@ -273,14 +275,14 @@ public boolean handle(Thing t, Event e) { Thing giver = e.getThing("Giver"); // maybe I should not trust the isDamaged() // boolean damagedFlag = gift.isDamaged(); - boolean damagedFlag = gift.getStat("HPS") < gift.getStat("HPSMAX") ? true - : false; + boolean damagedFlag = + gift.getStat("HPS") < gift.getStat("HPSMAX") ? true : false; /* * // Debugging System.out.println("Current HPS = "+ * gift.getStat("HPS")); System.out.println("Max HPS = "+ - * gift.getStat("HPSMAX")); if (damagedFlag) { - * System.out.println("True [ppirrip]"); } else { - * System.out.println("False [ppirrip]"); } + * gift.getStat("HPSMAX")); if (damagedFlag) { System.out.println( + * "True [ppirrip]"); } else { System.out.println("False [ppirrip]" + * ); } */ // the item to be fixed has to be damage-able if (gift != null && damagedFlag) { @@ -290,8 +292,8 @@ public boolean handle(Thing t, Event e) { int hskill = giver.getStat("CH") * giver.getStat(Skill.TRADING); int sskill = t.getStat("CH"); // for debugging - value = (int) (0.3 * (value * 0.3 + 0.7 * value - * (hskill / (hskill + sskill)))); + value = (int) (0.3 * (value * 0.3 + + 0.7 * value * (hskill / (hskill + sskill)))); if (value > 0) { giver.message(t.getTheName() + " asks for " @@ -300,10 +302,10 @@ public boolean handle(Thing t, Event e) { giver.message("Do you accept? (y/n)"); char k = Game.getOption("ynq"); if (k == 'y') { - Game.messageTyrant("You gave " - + gift.getName(Game.hero()) + " and " - + Coin.valueString(value) - + " to the smith for repair."); + Game.messageTyrant( + "You gave " + gift.getName(Game.hero()) + + " and " + Coin.valueString(value) + + " to the smith for repair."); Coin.removeMoney(giver, value); @@ -344,7 +346,8 @@ public boolean handle(Thing t, Event e) { if (t.toString().equals("jeweller")) { if (!gift.getFlag("IsRing") && !gift.getFlag("IsNecklace")) { - Game.messageTyrant("I am sorry, I only know about rings and necklaces."); + Game.messageTyrant( + "I am sorry, I only know about rings and necklaces."); return false; } } @@ -360,9 +363,9 @@ public boolean handle(Thing t, Event e) { // value=(int)(0.3*(value*0.3+0.7*value*(hskill/(hskill+sskill)))); value = 200; - giver.message(t.getTheName() + " asks for " - + Coin.valueString(value) + " to identify your " - + gift.getName(Game.hero())); + giver.message( + t.getTheName() + " asks for " + Coin.valueString(value) + + " to identify your " + gift.getName(Game.hero())); giver.message("Do you accept? (y/n)"); char k = Game.getOption("ynq"); if (k == 'y') { @@ -443,21 +446,21 @@ public boolean handle(Thing t, Event e) { } // Oh, the obscenity, the work from String[] to ArrayList - ArrayList sks = new ArrayList(Arrays.asList(Skill - .getTrainableSkills(giver, true))); // Skill.getList(giver); - ArrayList sksr = new ArrayList(Arrays.asList(Skill - .getTrainableSkills(giver, false))); // Skill.getUnmarkedList(giver); + ArrayList sks = new ArrayList( + Arrays.asList(Skill.getTrainableSkills(giver, true))); // Skill.getList(giver); + ArrayList sksr = new ArrayList( + Arrays.asList(Skill.getTrainableSkills(giver, false))); // Skill.getUnmarkedList(giver); // String test[] = Skill.getTrainableSkills( giver , true ); - String s = Game.selectString("Select a skill to improve:", sks, - sksr); + String s = + Game.selectString("Select a skill to improve:", sks, sksr); if (s != null) { Skill.train(giver, s); Coin.removeMoney(giver, cost); } else { - final String laterThen[] = { "Maybe later then!", - "Well, maybe later then.", - "Anyway, you can come back later." }; + final String laterThen[] = + { "Maybe later then!", "Well, maybe later then.", + "Anyway, you can come back later." }; Game.messageTyrant("\"" + RPG.pick(laterThen) + "\""); } return true; @@ -475,17 +478,22 @@ private static class RiddleScript extends Script { private static void setupRiddles() { riddles = new ArrayList(); answers = new ArrayList(); - riddles.add("What walks on four legs in the morning, two in the afternoon and three in the evening?"); + riddles.add( + "What walks on four legs in the morning, two in the afternoon and three in the evening?"); answers.add("man"); - riddles.add("What starts with 'e', ends with 'e' and contains one letter?"); + riddles.add( + "What starts with 'e', ends with 'e' and contains one letter?"); answers.add("envelope"); riddles.add("What has eyes but cannot see?"); answers.add("potato"); - riddles.add("Born at the same time as the world, destined to live as long as the world, and yet never five weeks old. What is it?"); + riddles.add( + "Born at the same time as the world, destined to live as long as the world, and yet never five weeks old. What is it?"); answers.add("moon"); - riddles.add("It wasn't my sister, nor my brother, but still was the child of my father and mother. Who was it?"); + riddles.add( + "It wasn't my sister, nor my brother, but still was the child of my father and mother. Who was it?"); answers.add("you"); - riddles.add("What can be measured, but has no length, width or height?"); + riddles.add( + "What can be measured, but has no length, width or height?"); answers.add("temperature"); riddles.add("What do all living things do at the same time?"); answers.add("age"); @@ -493,7 +501,8 @@ private static void setupRiddles() { answers.add("silence"); riddles.add("What can't you see that is always before you?"); answers.add("future"); - riddles.add("Which room has no door, no windows, no floor and no roof?"); + riddles.add( + "Which room has no door, no windows, no floor and no roof?"); answers.add("mushroom"); riddles.add("What is always coming, but never arrives?"); answers.add("tomorrow"); @@ -503,25 +512,32 @@ private static void setupRiddles() { answers.add("carpeting"); riddles.add("What is full of holes and yet holds water?"); answers.add("sponge"); - riddles.add("What lives on its own substance and dies when it devours itself?"); + riddles.add( + "What lives on its own substance and dies when it devours itself?"); answers.add("candle"); - riddles.add("What 5 letter word can have its last 4 letters removed and still sound the same?"); + riddles.add( + "What 5 letter word can have its last 4 letters removed and still sound the same?"); answers.add("queue"); riddles.add("What gets harder to catch the faster you run?"); answers.add("breath"); riddles.add("What doesn't exist, but has a name?"); answers.add("nothing"); - riddles.add("The more there is of this, the less you see of it. What is it?"); + riddles.add( + "The more there is of this, the less you see of it. What is it?"); answers.add("darkness"); - riddles.add("What is black when you buy it, red as you use it, and grey when you throw it out?"); + riddles.add( + "What is black when you buy it, red as you use it, and grey when you throw it out?"); answers.add("coal"); - riddles.add("The more you take, the more you leave behind. What are they?"); + riddles.add( + "The more you take, the more you leave behind. What are they?"); answers.add("footsteps"); - riddles.add("What occurs once in a minute, twice in a moment, but never in an hour?"); + riddles.add( + "What occurs once in a minute, twice in a moment, but never in an hour?"); answers.add("m"); riddles.add("What grows bigger the more you take from it?"); answers.add("hole"); - riddles.add("What five-letter word becomes shorter when you add two letters to it?"); + riddles.add( + "What five-letter word becomes shorter when you add two letters to it?"); answers.add("short"); riddles.add("What do you lose every time you stand up?"); answers.add("lap"); @@ -535,10 +551,10 @@ private static void setupRiddles() { public boolean handle(Thing t, Event e) { Thing responder = e.getThing("Target"); - String missedStat = Text.camelizeString(t.getName()) - + "RiddleMissed"; - String solvedStat = Text.camelizeString(t.getName()) - + "RiddleSolved"; + String missedStat = + Text.camelizeString(t.getName()) + "RiddleMissed"; + String solvedStat = + Text.camelizeString(t.getName()) + "RiddleSolved"; Game.messageTyrant("Camel: " + solvedStat); int failures = responder.getStat(missedStat); if (failures > 2) { @@ -547,8 +563,8 @@ public boolean handle(Thing t, Event e) { + " is no longer willing to talk with you."); return true; } else if (failures > 0) { - Game.messageTyrant(t.getTheName() - + " has another question for you."); + Game.messageTyrant( + t.getTheName() + " has another question for you."); } else { Game.messageTyrant(t.getTheName() + " has a question for you."); } @@ -565,7 +581,8 @@ public boolean handle(Thing t, Event e) { responder.incStat(solvedStat, 1); return true; } - Game.messageTyrant("\"Thinking must not be your strong suit.\""); + Game.messageTyrant( + "\"Thinking must not be your strong suit.\""); responder.incStat(missedStat, 1); return true; } @@ -776,7 +793,7 @@ public static void initWanderers() { t = Lib.extend("merchant", "human"); Monster.strengthen(t, 8); t.set("IsWanderer", 1); - t.set("Image", 36); + t.set("Image", 54); t.set("LevelMin", 5); t.set("Frequency", 50); Lib.add(t); @@ -958,8 +975,8 @@ public static void initWoodFolk() { t.set("RES:poison", 50); t.set("Introduction", "I'm collecting funds for the wood temple, so I am selling some old scrolls."); - t.set("OnGift", SwapScript.create("IsCoin", RPG.d(2) == 1 ? "IsScroll" - : "IsIdentifyScroll", 6)); + t.set("OnGift", SwapScript.create("IsCoin", + RPG.d(2) == 1 ? "IsScroll" : "IsIdentifyScroll", 6)); Lib.add(t); t = Lib.extend("wood priestess", "wood priest"); @@ -1065,8 +1082,8 @@ public static void initTownies() { Lib.add(t); t = Lib.extend("wizard", "base townie"); - t.setPersonality(new Personality(Personality.CHATTER, - Personality.CHATTER_WISE)); + t.setPersonality( + new Personality(Personality.CHATTER, Personality.CHATTER_WISE)); Monster.strengthen(t, 4); t.set("Image", 121); t.set(Skill.CASTING, 3); diff --git a/tyrant/mikera/tyrant/Portal.java b/tyrant/mikera/tyrant/Portal.java index 032b0b449..77e8b7772 100644 --- a/tyrant/mikera/tyrant/Portal.java +++ b/tyrant/mikera/tyrant/Portal.java @@ -101,8 +101,8 @@ public static void travel(final Thing portal, final Thing thing) { if (curmap != null) { // see if there are any critters going to try to follow - final Thing[] things = curmap.getThings(cx - 10, cy - 10, - cx + 10, cy + 10); + final Thing[] things = + curmap.getThings(cx - 10, cy - 10, cx + 10, cy + 10); // System.out.println(things.length); for (final Thing t : things) { if (t.getFlag("IsHostile")) { @@ -119,8 +119,8 @@ public static void travel(final Thing portal, final Thing thing) { } // reverse direction of critters in transit - for (Thing cr = Portal.getCritter(portal); cr != null; cr = Portal - .getCritter(portal)) { + for (Thing cr = Portal.getCritter(portal); cr != null; cr = + Portal.getCritter(portal)) { thing.addThing(cr); } } @@ -180,8 +180,8 @@ public static void arrive(final Thing portal, final Thing t) { Movement.moveTo(t, map, tx, ty); if (!map.getFlag("IsWorldMap")) { - final Thing[] followers = Game.hero().getFlaggedContents( - "IsBeing"); + final Thing[] followers = + Game.hero().getFlaggedContents("IsBeing"); for (final Thing f : followers) { portal.addThing(f); } @@ -317,7 +317,7 @@ private static BattleMap createMap(final String name, final int dlevel) { if (name.equals("karrain")) { map = WorldMap.createWorld(); } else if (name.equals("town")) { - map = Town.createTown(80, 48); + // map = Town.createTown(80, 48); } else if (name.equals("caves")) { map = Caves.createCaves(65, 65, dlevel); } else if (name.equals("ruin")) { @@ -333,7 +333,7 @@ private static BattleMap createMap(final String name, final int dlevel) { map = new BattleMap(71, 71); Graveyard.makeGraveyard(map); } else if (name.equals("Old Nyck's hut")) { - map = Town.buildNyckMap(); + // map = Town.buildNyckMap(); } else if (name.equals("dark forest")) { map = DeepForest.makeDarkForest(dlevel); @@ -505,8 +505,8 @@ private static void makeLink(final Thing portal, final BattleMap map) { + "] in makeLink"); } /* - * Game.warn("No entrance for map!"); - * Game.warn("Creating temporary stairs"); + * Game.warn("No entrance for map!"); Game.warn( + * "Creating temporary stairs"); * * Thing ent=Lib.create("stairs up"); map.addThing(ent); * map.setEntrance(ent); @@ -527,8 +527,8 @@ private static void makeLink(final Thing portal, final BattleMap map) { * m.addThing(critters, cx, cy); } } } */ - public static void setDestination(final Thing p, final BattleMap m, final int tx, - final int ty) { + public static void setDestination(final Thing p, final BattleMap m, + final int tx, final int ty) { p.set("PortalTargetMap", m); p.set("PortalTargetX", tx); p.set("PortalTargetY", ty); diff --git a/tyrant/mikera/tyrant/QuestApp.java b/tyrant/mikera/tyrant/QuestApp.java index f100e31fa..1514d81a0 100644 --- a/tyrant/mikera/tyrant/QuestApp.java +++ b/tyrant/mikera/tyrant/QuestApp.java @@ -29,7 +29,9 @@ import javelin.controller.fight.IncursionFight; import javelin.model.BattleMap; +import javelin.view.Images; import javelin.view.screen.BattleScreen; +import javelin.view.screen.InfoScreen; import javelin.view.screen.LairScreen; import tyrant.mikera.engine.Lib; import tyrant.mikera.engine.RPG; @@ -54,14 +56,12 @@ public class QuestApp extends Applet implements Runnable { public static Image items; public static Image effects; public static Image title; - public static Image penalized; - public static Image crafting; - public static Image upgrading; - public static Image banner; - public static Image dead; - public static Image crystal; public static Image paneltexture = QuestApp.DEFAULTTEXTURE; + static final GraphicsConfiguration configuration = + GraphicsEnvironment.getLocalGraphicsEnvironment() + .getDefaultScreenDevice().getDefaultConfiguration(); + public static Hashtable images = new Hashtable(); public static Font mainfont = new Font("Monospaced", Font.BOLD, 15); @@ -72,10 +72,6 @@ public class QuestApp extends Applet implements Runnable { public static final Color BACKCOLOUR = new Color(0, 0, 0); - // public static final Color panelcolor = new Color(64, 64, 64); - // public static final Color panelhighlight = new Color(96, 96, 96); - // public static final Color panelshadow = new Color(32, 32, 32); - public static final Color PANELCOLOUR = new Color(64, 64, 64); public static final Color PANELHIGHLIGHT = new Color(120, 80, 20); @@ -137,8 +133,6 @@ public void init(final Runnable runnable) { setLayout(new BorderLayout()); setBackground(Color.black); setFont(QuestApp.mainfont); - - // Game.warn("Focus owned by: // "+KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner()); // set game in action @@ -243,11 +237,6 @@ public Thing createHero(final boolean prompts) { } } Hero.setHeroName(h, name); - - /* - * System.out.println(System.currentTimeMillis() - start + - * "ms to createHero"); - */ return h; } @@ -280,11 +269,6 @@ public void switchScreen(final Component s) { } public String getHeroName(final boolean notNull) { - - // ss.invalidate(); - // ss.validate(); - // ss.repaint(); - // get hero name String hname = null; @@ -380,13 +364,6 @@ public void run() { preparebattlemap(); } else if (c == 'e') { - // // Designer - // Game.messageTyrant(""); - // Game.messageTyrant("Launching Designer..."); - // tyrant.mikera.tyrant.author.Designer - // .main(new String[] { "embedded" }); - // continue; - } else { Game.create(); @@ -414,51 +391,15 @@ public void run() { Game.getInput(); setupScreen(); preparebattlemap(); - - // Debug mode should not start when pressing Enter!! - // Game.create(); - // Game.setDebug(true); - // createHero(false); - // setupScreen(); - // gameStart(); } } } public void setupScreen() { - // if (getScreen() == null) { - // setScreen(new BattleScreen(this)); - // } else { - // // only need to reset the messages, - // // otherwise we will start to - // // leak memory/threads - // Game.messagepanel = getScreen().messagepanel; - // Game.messagepanel.clear(); - // } - // switchScreen(getScreen()); } protected void gameStart(final BattleMap map, final int entranceX, final int entranceY) { - // while (true) { - // Thing hero = Game.hero(); - // Game.enterMap(map, hero.x, hero.y); - // - // // run the game - // try { - // getScreen().mainLoop(); - // } catch (final EndBattleException e) { - // /* - // * TODO not working. might as well kill the game and reload the - // * whole state - // */ - // final WorldScreen s = new WorldScreen(Javelin.app); - // switchScreen(s); - // hero = WorldScreen.worldhero; - // Game.instance().hero = hero; - // hero.place = map; - // } - // } } public void preparebattlemap() { @@ -621,10 +562,6 @@ public void gameOver() { public final KeyAdapter keyadapter = new KeyAdapter() { @Override public void keyPressed(final KeyEvent e) { - // Game.warn("Focus owned by: - // "+KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner()); - // Game.warn(""+e.getKeyChar()); - // call the currently registered keyhandler if (keyhandler != null) { keyhandler.keyPressed(e); @@ -663,10 +600,6 @@ public static Image maketransparent(float alpha, Image image) { return transparent; } - static final GraphicsConfiguration configuration = - GraphicsEnvironment.getLocalGraphicsEnvironment() - .getDefaultScreenDevice().getDefaultConfiguration(); - /** * @param screen * The screen to set. @@ -699,12 +632,7 @@ public static QuestApp getInstance() { QuestApp.items = QuestApp.getImage("/images/items32.png"); QuestApp.effects = QuestApp.getImage("/images/effects32.png"); QuestApp.title = QuestApp.getImage("/images/title.png"); - QuestApp.penalized = QuestApp.getImage("/images/spiralbig.png"); - QuestApp.crafting = QuestApp.getImage("/images/crafting.png"); - QuestApp.upgrading = QuestApp.getImage("/images/upgrading.png"); - QuestApp.banner = QuestApp.getImage("/images/banner.png"); - QuestApp.dead = QuestApp.getImage("/images/dead.png"); - QuestApp.crystal = QuestApp.getImage("/images/meld.png"); + Images.initimages(); // store images in source hashtable QuestApp.images.put("Tiles", QuestApp.tiles); @@ -721,12 +649,7 @@ public static QuestApp getInstance() { mediaTracker.addImage(QuestApp.items, 1); mediaTracker.addImage(QuestApp.effects, 1); mediaTracker.addImage(QuestApp.title, 1); - mediaTracker.addImage(QuestApp.penalized, 1); - mediaTracker.addImage(QuestApp.crafting, 1); - mediaTracker.addImage(QuestApp.upgrading, 1); - mediaTracker.addImage(QuestApp.banner, 1); - mediaTracker.addImage(QuestApp.dead, 1); - mediaTracker.addImage(QuestApp.crystal, 1); + Images.addimages(mediaTracker); mediaTracker.addImage(QuestApp.DEFAULTTEXTURE, 1); mediaTracker.addImage(LairScreen.DUNGEONTEXTURE, 1); mediaTracker.addImage(IncursionFight.INCURSIONTEXTURE, 1); @@ -739,8 +662,8 @@ public static QuestApp getInstance() { // Wait for images to load try { mediaTracker.waitForID(1); - QuestApp.penalized = - QuestApp.maketransparent(2 / 3f, QuestApp.penalized); + Images.penalized = + QuestApp.maketransparent(2 / 3f, Images.penalized); } catch (final Exception e) { System.out.println("Error loading images."); e.printStackTrace(); diff --git a/tyrant/mikera/tyrant/Town.java b/tyrant/mikera/tyrant/Town.java index 44f7bffc7..8ed05bae7 100644 --- a/tyrant/mikera/tyrant/Town.java +++ b/tyrant/mikera/tyrant/Town.java @@ -1,972 +1,974 @@ - -package tyrant.mikera.tyrant; - -import javelin.model.BattleMap; -import tyrant.mikera.engine.Lib; -import tyrant.mikera.engine.Point; -import tyrant.mikera.engine.RPG; -import tyrant.mikera.engine.Thing; - -/***Implements generation routines for Tyrant small towns*e.g.the villages in North Karrain**Towns are constructed out of a collection of 16*16 blocks*using semi-random layouts** - -@author -Mike**/public class Town { - - // out of town aresa (buildarea -1) - public static final int[] OUTER = { 0, 1, 2, 7, 14 }; - - // inner town aresa (buildarea -2) - public static final int[] INNER = { 4, 15, 5, 3, 24 }; - - // build town sector of type t - // -2 = random inner town area - // -1 = random outer town area - // 0 = wooded - // 1 = cleared - // 2 = animals - // 3 = huts - // 4 = block - // 5 = hall - // 6 = square - // 7 = pond - // 8 = N/S river - // 9 = N/S river + bridge - // 10 = E/W river - // 11 = E/W river + bridge - // 12 = N/S street - // 13 = E/W street - // 14 = orchard - // 15 = smithy (north exit) - // 16 = N/W river bend - // 17 = N/E river bend - // 18 = S/E river bend - // 19 = S/W river bend - // 20 = N/W/E river fork - // 21 = N/S/E river fork - // 22 = S/W/E river fork - // 23 = N/S/W river fork - // 24 = water garden - - // uber-cool array of town arrays - public static int[][][] towns = { - { { 11, 22, 16, -2, -1 }, { -2, 9, 6, 13, -2 }, - { -2, 8, -2, 15, -1 } }, - { { 8, -1, -2, -1, 7 }, { 9, 13, 6, -2, -1 }, - { 17, 19, 12, -2, 14 } } - - , { { -1, 17, 19, -2, 13 }, { -1, -2, 9, 6, 13 } } - - , { { -1, 12, -2 }, { 13, 6, 13 }, { -2, 12, -1 } } - - , { { -1, -2, 14 }, { -2, 6, -2 }, { 7, -2, -1 } } }; - - public static BattleMap createTown(int w, int h) { - BattleMap m = new BattleMap(w, h); - - m.set("Level", 3); - m.set("IsHostile", 0); - m.set("WanderingRate", 5); - m.set("EnterMessageFirst", "This seems like a peaceful little village"); - - // select a town layout to use - int[][] layout = towns[RPG.r(towns.length)]; - - // change to correct map size - m.setSize(16 * layout[0].length, 16 * layout.length); - - buildTown(m, layout); - - m.addThing(Lib.createType("IsWanderer", Game.level())); - - return m; - } - - private static void buildTown(BattleMap m, int[][] areas) { - m.setTheme("village"); - m.set("Description", "Small Town"); - m.set("WallTile", RPG.pick( - new int[] { Tile.CAVEWALL, Tile.WOODENWALL, Tile.STONEWALL })); - - m.fillArea(0, 0, m.width - 1, m.height - 1, m.floor()); - - for (int ay = 0; ay < areas.length; ay++) { - for (int ax = 0; ax < areas[ay].length; ax++) { - buildArea(m, ax * 16, ay * 16, areas[ay][ax]); - - } - } - - // buildArea(0,0,8); - // buildArea(0,16,9); - // buildArea(0,32,8); - // buildArea(16,0,RPG.pick(OUTER)); - // buildArea(16,16,13); - // buildArea(16,32,RPG.pick(INNER)); - // buildArea(32,0,(RPG.d(3)==1)?12:RPG.pick(INNER)); - // buildArea(32,16,6); - // buildArea(32,32,(RPG.d(3)==1)?12:RPG.pick(INNER)); - // buildArea(48,0,3); - // buildArea(48,16,4); - // buildArea(48,32,RPG.pick(INNER)); - // buildArea(64,0,RPG.pick(OUTER)); - // buildArea(64,16,RPG.pick(OUTER)); - // buildArea(64,32,RPG.pick(OUTER)); - addTownies(m); - - m.setEntrance(Portal.create()); - Point p = m.findFreeSquare(0, 0, m.width - 1, 0); - m.addThing(m.getEntrance(), p.x, p.y); - - } - - /** - * Build a small temple within the town. - * - * (x,y) gives the top left corner of a 16*16 area chosen for the - * construction of the temple. All construction should take place within - * this area, plus a 1-tile wile border around this area should be left - * unblocked to allow player movement around the temple. - * - * @param m - * The map to build the temple on - * @param x - * Left edge of 16*16 area - * @param y - * Top edge of 16*16 area - * - * @author ppirrip - * @since 05-08-04 - * - * - Added a healer to the temple to see potions. - * @see Person.java - Added a (blank) sign next to the door. - Removed the - * small room on the side. - Added some common constants for code - * maintaince. - */ - public static void buildTemple(BattleMap m, int x, int y) { - // construct the main hall - int left = RPG.d(2, 3); - int right = RPG.d(2, 3); - // common used constants - final int tmpX = x + 8; - final int tmpY1 = y + 3; - final int tmpY2 = y + 12; - - // Add the stone floor. - m.fillArea(tmpX - left, tmpY1, tmpX + right, tmpY2, Tile.STONEFLOOR); - // Make the stone wall border - m.fillBorder(tmpX - left, tmpY1, tmpX + right, tmpY2, Tile.STONEWALL); - // Add some water as decleration. - m.fillBorder(tmpX - left + 1, tmpY1 + 1, tmpX + right - 1, tmpY1 + 1, - Tile.RIVER); - // Add a door and a blank sign - m.fillArea(tmpX, tmpY2, tmpX, tmpY2, Tile.STONEFLOOR); - m.addThing(Lib.create("ornate door"), tmpX, tmpY2); - m.addThing(Lib.create("blank sign"), tmpX + 1, tmpY2 + 1); - /* - * Add the healer The AI of the healer just like the shopkeeper. TODO: - * Might change to teacher script later. - */ - final int tmpY3 = y + 7; - Thing healer = Lib.create("healer"); - AI.setGuard(healer, m, tmpX - 1, tmpY3 - 1, tmpX + 1, tmpY3 + 1); - m.addThing(healer, tmpX, tmpY3, tmpX, tmpY3); - - // Debug Message - // So I know a temple has created - // System.out.println("Set a fire in the temple [ppirrip]"); - - /* - * Fires in the room TODO: Why fire won't display anymore? - */ - // m.addThing(Fire.create(5), tmpX-2, tmpY3-2); - - // TODO: add a random number there to general - // different potions. - for (int xx = tmpX - left + 1; xx <= tmpX + right - 1; xx++) { - m.addThing(stockingPoint(healer, "IsPotion", 10), xx, tmpY1 + 2); - } - - // Add a holy well - m.addThing(Lib.create("well"), tmpX, tmpY3); - - // random rotation of the area - m.rotateArea(x, y, 16, RPG.r(4)); - } - - public static void buildWaterGarden(BattleMap m, int x, int y) { - // Water area, (7,7) is the centre - m.fillArea(x + 1, y + 1, x + 13, y + 13, Tile.RIVER); - - // island - m.fillArea(x + 3, y + 3, x + 11, y + 11, m.floor()); - - // bridges - m.fillArea(x + 1, y + 6, x + 13, y + 8, m.floor()); - m.fillArea(x + 6, y + 1, x + 8, y + 13, m.floor()); - - switch (RPG.d(4)) { - case 1: - String s = RPG.pick(new String[] { "red apple tree", - "potted flower", "potted plant", "plant" }); - for (int rx = 5; rx <= 9; rx += 2) { - for (int ry = 5; ry <= 9; ry += 2) { - m.addThing(s, x + rx, y + ry); - } - } - break; - case 2: - for (int rx = 5; rx <= 9; rx += 2) { - for (int ry = 5; ry <= 9; ry += 2) { - m.setTile(x + rx, y + ry, Tile.RIVER); - } - } - break; - case 3: - addRoom(m, x + 5, y + 5, x + 9, y + 9, 0, -1); - Thing teach = Lib.create("teacher"); - m.addThing(teach, x + 7, y + 7); - AI.setGuard(teach, m, x + 7, y + 7); - break; - case 4: - m.addThing("fountain", x + 7, y + 7); - break; - } - - } - - private static void buildArea(BattleMap m, int x, int y, int t) { - if (t == -1) { - t = RPG.pick(OUTER); - } - if (t == -2) { - t = RPG.pick(INNER); - } - - switch (t) { - - // wooded area - case 0: { - for (int i = 0; i < 20; i++) { - m.addThing(Lib.create("tree"), x, y, x + 15, y + 15); - } - - switch (RPG.d(4)) { - case 1: - m.addThing(Lib.createType("IsWell", m.getLevel()), x, y, x + 15, - y + 15); - break; - case 2: - m.addThing(Lib.createType("IsGravestone", m.getLevel()), x, y, - x + 15, y + 15); - break; - - default: - m.clearArea(x + 5, y + 5, x + 10, y + 9); - m.fillArea(x + 5, y + 5, x + 10, y + 9, Tile.WOODENWALL); - m.fillArea(x + 6, y + 6, x + 9, y + 8, Tile.WOODENFLOOR); - m.setTile(x + 5, y + 7, Tile.WOODENFLOOR); - m.addThing(Door.createDoor(5), x + 5, y + 7); - m.addThing(Lib.createType("IsEquipment", 5), x + 5, y + 7); - } - - m.addThing(Lib.create("ranger"), x, y, x + 15, y + 15); - - break; - } - - // hut - case 3: { - int hw = RPG.r(3) + 3; - int hh = RPG.r(3) + 3; - int hx = x + 1 + RPG.r(14 - hw); - int hy = y + 1 + RPG.r(14 - hh); - int dx = RPG.r(2) * 2 - 1; - int dy = RPG.r(2) * 2 - 1; - if (RPG.d(2) == 1) { - dx = 0; - } else { - dy = 0; - } - addRoom(m, hx, hy, hx + hw, hy + hh, dx, dy); - break; - } - - // block - case 4: { - addRoom(m, x + 8 - RPG.d(2, 3), y + 8 - RPG.d(2, 3), x + 8, y + 8, - 0, -1); - addRoom(m, x + 8 - RPG.d(2, 3), y + 8, x + 8, y + 8 + RPG.d(2, 3), - 0, 1); - addRoom(m, x + 8, y + 8 - RPG.d(2, 3), x + 8 + RPG.d(2, 3), y + 8, - 0, -1); - addRoom(m, x + 8, y + 8, x + 8 + RPG.d(2, 3), y + 8 + RPG.d(2, 3), - 0, 1); - break; - } - - // temple hall - case 5: { - buildTemple(m, x, y); - break; - } - - // central crossroads with shops - case 6: { - addShop(m, x, y, x + RPG.d(3, 2), y + RPG.d(3, 2), 1, 0, 4); - addShop(m, x + 15 - RPG.d(3, 2), y, x + 15, y + RPG.d(3, 2), 0, 1, - 0); - addShop(m, x, y + 15 - RPG.d(3, 2), x + RPG.d(3, 2), y + 15, 0, -1, - 2); - addShop(m, x + 15 - RPG.d(3, 2), y + 15 - RPG.d(3, 2), x + 15, - y + 15, -1, 0, 3); - break; - } - - // pond - case 7: { - m.setTile(x + 8, y + 8, Tile.SEA); - m.fractalize(x + 4, y + 4, x + 11, y + 11, 4); - for (int i = 0; i < 10; i++) { - m.addThing(Lib.create("bush"), x, y, x + 15, y + 15); - } - break; - } - - // river - case 8: - case 9: - case 10: - case 11: { - // N/S river - m.makeRandomPath(x + 8, y, x + 8, y + 15, x, y, x + 15, y + 15, - Tile.RIVER, false); - m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); - if ((t & 1) == 1) { - // add the bridge - m.replaceTiles(x, y + 7, x + 15, y + 7 + RPG.r(3), Tile.RIVER, - Tile.STONEFLOOR); - } - - // rotate for E/W river - if ((t & 2) > 0) { - m.rotateArea(x, y, 16, 1); - } - break; - } - - // NS and EW streets - case 12: - case 13: { - int p1, p2; - p1 = 7 - RPG.d(3); - p2 = 7 + RPG.d(3); - addFeature(m, x, y + RPG.r(2), x + p1, y + 5 + RPG.r(3), 0, 1, 0); - addFeature(m, x + p1, y + RPG.r(2), x + p2, y + 5 + RPG.r(3), 0, 1, - 0); - addFeature(m, x + p2, y + RPG.r(2), x + 14, y + 5 + RPG.r(3), 0, 1, - 0); - - p1 = 8 - RPG.d(4); - p2 = 8 + RPG.d(4); - addFeature(m, x, y + 9 + RPG.r(3), x + p1, y + 14 - RPG.r(2), 0, -1, - 0); - addFeature(m, x + p1, y + 9 + RPG.r(3), x + p2, y + 14 - RPG.r(2), - 0, -1, 0); - addFeature(m, x + p2, y + 9 + RPG.r(3), x + 14, y + 14 - RPG.r(2), - 0, -1, 0); - - // rotate for N/S street - if (t == 12) { - m.rotateArea(x, y, 16, 1); - } - break; - } - - // orchard - case 14: { - boolean mixed = false; - Thing tree = null; - if (RPG.r(3) == 2) { - // the orchard will be of mixed species - mixed = true; - } else { - // pick a single species for the orchard - tree = Lib.createType("IsFruitTree", 1); - } - for (int i = 0; i < 20; i++) { - int px = x + 1 + RPG.r(14); - int py = y + 1 + RPG.r(14); - if (!m.isBlocked(px, py)) { - if (mixed) { - m.addThing(Lib.create("[IsFruitTree]"), px, py); - } else { - m.addThing(tree.cloneType(), px, py); - } - } - } - break; - } - - // smithy - case 15: { - addShop(m, x + 5, y + 5, x + 10, y + 10, 0, -1, 5); - m.rotateArea(x, y, 16, RPG.r(4)); - break; - } - - // river bends - case 16: - case 17: - case 18: - case 19: { - m.makeRandomPath(x + 8, y, x, y + 8, x, y, x + 15, y + 15, - Tile.RIVER, false); - m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); - - // rotate clockwise to correct orientation - // 16 = N/W position etc.. - m.rotateArea(x, y, 16, t - 16); - break; - } - - // river forks - case 20: - case 21: - case 22: - case 23: { - m.makeRandomPath(x + 8, y, x, y + 8, x, y, x + 15, y + 15, - Tile.RIVER, false); - m.makeRandomPath(x + 8, y, x + 15, y + 8, x, y, x + 15, y + 15, - Tile.RIVER, false); - m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); - - // rotate clockwise to correct orientation - // 20 = N/W/E position etc.. - m.rotateArea(x, y, 16, t - 20); - break; - } - case 24: - buildWaterGarden(m, x, y); - break; - - } - } - - // adds a town feature in specified area - public static void addFeature(BattleMap m, int x1, int y1, int x2, int y2, - int dx, int dy, int t) { - // randomize feature - if (t == 0) { - t = RPG.d(10); - } - - switch (t) { - case 1: - addShop(m, x1, y1, x2, y2, dx, dy, 0); - break; - - default: - addRoom(m, x1, y1, x2, y2, dx, dy); - break; - } - - } - - public static void addGraveYard(BattleMap m, int x1, int y1, int x2, - int y2) { - for (int i = 0; i < ((x2 - x1 + 1) * (y2 - y1 + 1)) / 8; i++) { - m.addThing(Lib.createType("IsGraveStone", m.getLevel()), x1, y1, x2, - y2); - } - - for (int i = 0; i < ((x2 - x1 + 1) * (y2 - y1 + 1)) / 18; i++) { - m.addThing(Lib.createType("potted flower", m.getLevel()), x1, y1, - x2, y2); - } - } - - public static void addTownies(BattleMap m) { - for (int i = 0; i <= 10; i++) { - Point ts = m.findFreeSquare(); - m.addThing(Lib.create("farmer"), ts.x, ts.y); - } - for (int i = 0; i <= 6; i++) { - Point ts = m.findFreeSquare(); - m.addThing(Lib.create("village woman"), ts.x, ts.y); - } - for (int i = 0; i <= 4; i++) { - Point ts = m.findFreeSquare(); - m.addThing(Lib.create("village girl"), ts.x, ts.y); - } - for (int i = 0; i <= 8; i++) { - Point ts = m.findFreeSquare(); - m.addThing(Lib.create("guard"), ts.x, ts.y); - } - - Point ts = m.findFreeSquare(); - m.addThing(Lib.create("teacher"), ts.x, ts.y); - } - - public static Thing stockingPoint(Thing sk, String type, int level) { - Thing t = Lib.create("base stocking point"); - t.set("Name", "shop stocking point"); - t.set("StockingType", type); - t.set("StockingLevel", level); - t.set("Shopkeeper", sk); - return t; - } - - // Create standard shops - // - // note that areas are likely to be rotated - // this will mess up GuardAI(x1,y1,x2,y2) objects - // hence use secret markers to mark out the shop area - public static void addShop(BattleMap m, int x1, int y1, int x2, int y2, int - dx, - int dy, int t) { - int doorx, doory; - doorx = (dx == 0) - ? RPG.rspread(x1 + 1, x2 - 1) - : ((dx == -1) ? x1 : x2); - doory = (dy == 0) - ? RPG.rspread(y1 + 1, y2 - 1) - : ((dy == -1) ? y1 : y2); - m.fillArea(x1, y1, x2, y2, Tile.FLOOR); - m.fillBorder(x1, y1, x2, y2, Tile.CAVEWALL); - m.setTile(doorx, doory, Tile.FLOOR); - - Thing door = Lib.create("shop door"); - - if (t == 0) { - t = RPG.d(10); - } - - switch (t) { - // magic type shop - case 1 : { - Thing wiz = Lib.create("wizard"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - - m.addThing(stockingPoint(wiz,"IsMagicItem", RPG.d(15)), x, y); - } - - AI.setGuard(wiz, m, x1, y1, x2, y2); - m.addThing(wiz, (x1 + x2) / 2, (y1 + y2) / 2); - m.addThing(Lib.create("magic shop sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // weapon store - case 2 : { - Thing guard = Lib.create("guard"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(guard,"IsWeapon", RPG.d(2,6)), x, y); - } - - AI.setGuard(guard, m, x1, y1, x2, y2); - m.addThing(guard, (x1 + x2) / 2, (y1 + y2) / 2); - - m.addThing(Lib.create("armoury sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // food store - case 3 : { - Thing shopkeeper = Lib.create("shopkeeper"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(shopkeeper,"IsShopFood", 10), x, y); - } - - AI.setGuard(shopkeeper, m, x1, y1, x2, y2); - m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); - - m.addThing(Lib.create("food shop sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // Smithy - // note that door is assumed to face north - case 5 : { - Thing smith = Lib.create("blacksmith"); - AI.setGuard(smith, m, x1, y1, x2, y2); - - m.addThing(smith, (x1 + x2) / 2, (y1 + y2) / 2); - - - m.addThing(Fire.create(5), x2 - 1, y2 - 1); - m.addThing(Fire.create(5), x2 - 2, y2 - 1); - - m.addThing(Lib.create("smithy sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // Goblin store - case 6 : { - door = Lib.create("goblin door"); - door.set("IsLocked", 0); - - Thing gobbo = Lib.create("goblin shopkeeper"); - AI.setGuard(gobbo, m, x1, y1, x2, y2); - gobbo.set("IsHostile", 0); - //gobbo.setPersonality(new Personality(Personality.CHATTER, - // Personality.CHATTER_GOBLIN)); - m.addThing(gobbo, (x1 + x2) / 2, (y1 + y2) / 2); - - for (int x = x1 + 1; x < x2; x++) { - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(gobbo,"IsMagicItem", 12), x, y); - } - } - break; - } - - // equipment store - // note that door is assumed to face north - case 7 : { - Thing shopkeeper = Lib.create("shopkeeper"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(shopkeeper,"IsEquipment", 10), x, y); - } - - AI.setGuard(shopkeeper, m, x1, y1, x2, y2); - m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); - - m.addThing(Lib.create("armoury sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // armour store - // note that door is assumed to face north - case 8 : { - Thing shopkeeper = Lib.create("blacksmith"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - if (RPG.d(2)==1) { - m.addThing(stockingPoint(shopkeeper,"IsArmour", 10), x, y); - } - } - - AI.setGuard(shopkeeper, m, x1, y1, x2, y2); - m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); - - m.addThing(Lib.create("smithy sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - break; - } - - // Rune store - case 9 : { - door = Lib.create("goblin door"); - door.set("IsLocked", 0); - - Thing sk = Lib.create(RPG.pick(new String[] {"goblin shopkeeper","learned - sage","shopkeeper","wizard"})); - AI.setGuard(sk, m, x1, y1, x2, y2); - m.addThing(sk, (x1 + x2) / 2, (y1 + y2) / 2); - - for (int x = x1 + 1; x < x2; x++) { - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(sk,"IsRunestone", RPG.d(12)), x, y); - } - } - break; - } - - // General store - default : { - Thing shopkeeper = Lib.create("shopkeeper"); - for (int x = x1 + 1; x < x2; x++) - for (int y = y1 + 1; y < y2; y++) { - m.addThing(stockingPoint(shopkeeper,"IsStoreItem", 10), x, y); - } - - AI.setGuard(shopkeeper, m, x1, y1, x2, y2); - m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); - - m.addThing(Lib.create("store sign"), doorx + dx + dy - * (RPG.r(2) * 2 - 1), doory + dy + dx - * (RPG.r(2) * 2 - 1)); - } - - } - - m.addThing(door, doorx, doory); - } - - public static void addBuilding(BattleMap m) { - int w = RPG.d(2, 4) + 3; - int h = RPG.d(2, 4) + 3; - int x1 = RPG.r(m.width - w); - int y1 = RPG.r(m.height - h); - int x2 = x1 + w; - int y2 = y1 + h; - int dx = RPG.r(3) - 1; - int dy = RPG.r(3) - 1; - if (RPG.d(2) == 1) { - dx = 0; - } else { - dy = 0; - } - - if (m.countTiles(x1, y1, x2, y2, m.floor()) != (w + 1) * (h + 1)) { - return; - } - addRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1, dx, dy); - } - - public static void addRoom(BattleMap m, int x1, int y1, int x2, int y2, - int dx, int dy) { - int doorx, doory; - doorx = (dx == 0) ? RPG.rspread(x1 + 1, x2 - 1) - : ((dx == -1) ? x1 : x2); - doory = (dy == 0) ? RPG.rspread(y1 + 1, y2 - 1) - : ((dy == -1) ? y1 : y2); - addStandardRoom(m, x1, y1, x2, y2, doorx, doory); - } - - // add a standard town room - // all kinds of fun stuff inside - public static void addStandardRoom(BattleMap m, int x1, int y1, int x2, - int y2, int doorx, int doory) { - m.fillArea(x1, y1, x2, y2, Tile.FLOOR); - m.fillBorder(x1, y1, x2, y2, m.wall()); - - boolean secret = false; - Thing door = Lib.create("door"); - - switch (RPG.d(15)) { - case 1: { - door.set("IsLocked", 1); - Thing it = Food.createFood(0); - it.set("IsOwned", 1); - m.addThing(it, x1 + 1, y1 + 1, x2 - 1, y2 - 1); - break; - } - case 2: { // alarmed room - door.set("IsLocked", 1); - Thing it = Lib.createItem(8); - it.set("IsOwned", true); - m.addThing(it, x1 + 1, y1 + 1, x2 - 1, y2 - 1); - // addThing(new MapStateTrap(1), doorx, doory); - break; - } - case 3: { // rats! - Thing it = Lib.createItem(3); - m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); - for (int i = RPG.d(8); i > 0; i--) { - m.addThing(Lib.create("sewer rat"), x1 + 1, y1 + 1, x2 - 1, - y2 - 1); - } - break; - } - case 4: { // table - m.addThing(Lib.create("table"), x1 + 1, y1 + 1, x2 - 1, y2 - 1); - break; - } - case 5: { - if (RPG.d(6) == 1) { - Thing it = Lib.createItem(3); - m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); - } - door = null; - break; - } - case 6: - case 7: - case 8: - case 9: - door.set("IsLocked", (RPG.d(3) == 1) ? 1 : 0); - decorateRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1); - break; - case 10: - door = Lib.create("stable door"); - door.set("IsLocked", 1); - m.addThing(Lib.create("[IsAnimal]"), x1, y1, x2, y2); - if (RPG.d(4) == 1) { - m.addThing(Lib.create("[IsAnimal]"), x1, y1, x2, y2); - } - break; - case 11: { - if (RPG.d(4) == 1) { - Thing it = Lib.createItem(10); - m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); - } - decorateRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1); - - secret = true; - break; - } - } - - if (secret) { - m.addThing(Lib.create("secret door"), doorx, doory); - } else { - m.setTile(doorx, doory, Tile.FLOOR); - if (door != null) { - m.addThing(door, doorx, doory); - } - } - } - - // decorate room, given co-ordinates of interior space - public static void decorateRoom(BattleMap m, int x1, int y1, int x2, - int y2) { - int w = x2 - x1 + 1; - int h = y2 - y1 + 1; - - switch (RPG.d(12)) { - case 1: - for (int lx = x1; lx <= x2; lx++) { - for (int ly = y1; ly <= y2; ly++) { - // TODO: something interesting - } - } - break; - case 2: - if (w > 3 && h >= 3) { - Point location = - createPersonAndTable("townswoman", m, x1, y1, x2, y2); - m.addThing(Lib.create("stool"), location.x + 1 - 2 * RPG.r(2), - location.y); - m.addThing(Lib.create("stool"), location.x, - location.y + 1 - 2 * RPG.r(2)); - m.addThing(Food.createFood(0), x1, y1, x2, y2); - m.addThing(Food.createFood(0), x1, y1, x2, y2); - } - break; - - case 3: - if (w > 3 && h >= 3) { - Point location = createPersonAndTable( - RPG.pick(new String[] { "wizard", "priest" }), m, x1, - y1, x2, y2); - m.addThing(Lib.create("stool"), location.x + 1 - 2 * RPG.r(2), - location.y + 1 - 2 * RPG.r(2)); - m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2) - .set("IsOwned", 1); - m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2) - .set("IsOwned", 1); - m.addThing(Scroll.createScroll(6), x1, y1, x2, y2) - .set("IsOwned", 1); - m.addThing(Scroll.createScroll(8), x1, y1, x2, y2) - .set("IsOwned", 1); - } - break; - case 4: - if ((w > 3) && (h >= 3)) { - m.fillArea(x1 + 1, y1 + 1, x2 - 1, y2 - 1, Tile.STREAM); - } - break; - case 5: - m.addThing("potted plant", x1, y1, x2, y2); - m.addThing("chest", x1, y1, x2, y2).set("IsOwned", 1); - break; - case 6: - m.addThing("potted flower", x1, y1, x2, y2); - m.addThing("potted flower", x1, y1, x2, y2); - break; - case 7: - Thing sage = m.addThing("learned sage", x1, y1, x2, y2); - AI.setGuard(sage, m, x1, y1, x2, y2); - m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2).set("IsOwned", - 1); - m.addThing(Scroll.createScroll(6), x1, y1, x2, y2).set("IsOwned", - 1); - m.addThing(Scroll.createScroll(8), x1, y1, x2, y2).set("IsOwned", - 1); - break; - case 8: - m.addThing("pit trap", x1, y1, x2, y2); - break; - case 9: - m.addThing(Lib.createType("IsBook"), x1, y1, x2, y2).set("IsOwned", - 1); - break; - - default: - m.addThing(Lib.createItem(RPG.d(12)), x1, y1, x2, y2).set("IsOwned", - 1); - break; - } - } - - private static Point createPersonAndTable(String toCreate, BattleMap m, - int x1, int y1, int x2, int y2) { - Thing p = Lib.create(toCreate); - AI.setGuard(p, m, x1, y1, x2, y2); - m.addThing(p, x1, y1, x2, y2); - int tx = RPG.rspread(x1 + 1, x2 - 1); - int ty = RPG.rspread(y1 + 1, y2 - 1); - m.addThing(Lib.create("table"), tx, ty); - return new Point(tx, ty); - } - - public static void decorateTown(BattleMap m, int x1, int y1, int x2, - int y2) { - for (int x = x1; x <= x2; x++) { - for (int y = y1; y <= y2; y++) { - if (m.isBlocked(x, y)) { - continue; - } - if (!(m.getTile(x, y) == m.floor())) { - continue; - } - switch (RPG.d(200)) { - case 1: - case 2: - case 3: - m.addThing(Lib.create("plant"), x, y); - break; - case 4: - m.addThing("menhir", x, y); - break; - case 5: - m.addThing("[IsHerb]", x, y); - break; - - } - } - } - } - - public static BattleMap buildNyckMap() { - BattleMap m = new BattleMap(31, 31); - m.set("Description", "A Strange Icy Place"); - m.set("WallTile", Tile.ICEWALL); - m.set("FloorTile", Tile.ICEFLOOR); - - Maze.buildMaze(m, 0, 0, 30, 30); - m.fillArea(11, 21, 19, 29, m.wall()); - int x = RPG.r(15) * 2 + 1; - m.setTile(x, 0, m.floor()); - Thing e = Portal.create("invisible portal"); - m.addThing(e, x, 0); - m.setEntrance(e); - - m.fillArea(11, 21, 19, 29, m.floor()); - - m.fillBorder(13, 23, 17, 27, m.wall()); - m.setTile(15, 23, m.floor()); - m.addThing(Fire.create(5), 15, 25); - Thing nyck = Lib.create("Jolly Old Nyck"); - m.addThing(nyck, 15, 26); - AI.setGuard(nyck, m, 14, 24, 16, 26); - return m; - } - -} \ No newline at end of file +// +// package tyrant.mikera.tyrant; +// +// import javelin.model.BattleMap; +// import tyrant.mikera.engine.Lib; +// import tyrant.mikera.engine.Point; +// import tyrant.mikera.engine.RPG; +// import tyrant.mikera.engine.Thing; +// +/// ***Implements generation routines for Tyrant small towns*e.g.the villages in +// North Karrain**Towns are constructed out of a collection of 16*16 +// blocks*using semi-random layouts** +// +// @author +// Mike**/public class Town { +// +// // out of town aresa (buildarea -1) +// public static final int[] OUTER = { 0, 1, 2, 7, 14 }; +// +// // inner town aresa (buildarea -2) +// public static final int[] INNER = { 4, 15, 5, 3, 24 }; +// +// // build town sector of type t +// // -2 = random inner town area +// // -1 = random outer town area +// // 0 = wooded +// // 1 = cleared +// // 2 = animals +// // 3 = huts +// // 4 = block +// // 5 = hall +// // 6 = square +// // 7 = pond +// // 8 = N/S river +// // 9 = N/S river + bridge +// // 10 = E/W river +// // 11 = E/W river + bridge +// // 12 = N/S street +// // 13 = E/W street +// // 14 = orchard +// // 15 = smithy (north exit) +// // 16 = N/W river bend +// // 17 = N/E river bend +// // 18 = S/E river bend +// // 19 = S/W river bend +// // 20 = N/W/E river fork +// // 21 = N/S/E river fork +// // 22 = S/W/E river fork +// // 23 = N/S/W river fork +// // 24 = water garden +// +// // uber-cool array of town arrays +// public static int[][][] towns = { +// { { 11, 22, 16, -2, -1 }, { -2, 9, 6, 13, -2 }, +// { -2, 8, -2, 15, -1 } }, +// { { 8, -1, -2, -1, 7 }, { 9, 13, 6, -2, -1 }, +// { 17, 19, 12, -2, 14 } } +// +// , { { -1, 17, 19, -2, 13 }, { -1, -2, 9, 6, 13 } } +// +// , { { -1, 12, -2 }, { 13, 6, 13 }, { -2, 12, -1 } } +// +// , { { -1, -2, 14 }, { -2, 6, -2 }, { 7, -2, -1 } } }; +// +// public static BattleMap createTown(int w, int h) { +// BattleMap m = new BattleMap(w, h); +// +// m.set("Level", 3); +// m.set("IsHostile", 0); +// m.set("WanderingRate", 5); +// m.set("EnterMessageFirst", "This seems like a peaceful little village"); +// +// // select a town layout to use +// int[][] layout = towns[RPG.r(towns.length)]; +// +// // change to correct map size +// m.setSize(16 * layout[0].length, 16 * layout.length); +// +// buildTown(m, layout); +// +// m.addThing(Lib.createType("IsWanderer", Game.level())); +// +// return m; +// } +// +// private static void buildTown(BattleMap m, int[][] areas) { +// m.setTheme("village"); +// m.set("Description", "Small Town"); +// m.set("WallTile", RPG.pick( +// new int[] { Tile.CAVEWALL, Tile.WOODENWALL, Tile.STONEWALL })); +// +// m.fillArea(0, 0, m.width - 1, m.height - 1, m.floor()); +// +// for (int ay = 0; ay < areas.length; ay++) { +// for (int ax = 0; ax < areas[ay].length; ax++) { +// buildArea(m, ax * 16, ay * 16, areas[ay][ax]); +// +// } +// } +// +// // buildArea(0,0,8); +// // buildArea(0,16,9); +// // buildArea(0,32,8); +// // buildArea(16,0,RPG.pick(OUTER)); +// // buildArea(16,16,13); +// // buildArea(16,32,RPG.pick(INNER)); +// // buildArea(32,0,(RPG.d(3)==1)?12:RPG.pick(INNER)); +// // buildArea(32,16,6); +// // buildArea(32,32,(RPG.d(3)==1)?12:RPG.pick(INNER)); +// // buildArea(48,0,3); +// // buildArea(48,16,4); +// // buildArea(48,32,RPG.pick(INNER)); +// // buildArea(64,0,RPG.pick(OUTER)); +// // buildArea(64,16,RPG.pick(OUTER)); +// // buildArea(64,32,RPG.pick(OUTER)); +// addTownies(m); +// +// m.setEntrance(Portal.create()); +// Point p = m.findFreeSquare(0, 0, m.width - 1, 0); +// m.addThing(m.getEntrance(), p.x, p.y); +// +// } +// +// /** +// * Build a small temple within the town. +// * +// * (x,y) gives the top left corner of a 16*16 area chosen for the +// * construction of the temple. All construction should take place within +// * this area, plus a 1-tile wile border around this area should be left +// * unblocked to allow player movement around the temple. +// * +// * @param m +// * The map to build the temple on +// * @param x +// * Left edge of 16*16 area +// * @param y +// * Top edge of 16*16 area +// * +// * @author ppirrip +// * @since 05-08-04 +// * +// * - Added a healer to the temple to see potions. +// * @see Person.java - Added a (blank) sign next to the door. - Removed the +// * small room on the side. - Added some common constants for code +// * maintaince. +// */ +// public static void buildTemple(BattleMap m, int x, int y) { +// // construct the main hall +// int left = RPG.d(2, 3); +// int right = RPG.d(2, 3); +// // common used constants +// final int tmpX = x + 8; +// final int tmpY1 = y + 3; +// final int tmpY2 = y + 12; +// +// // Add the stone floor. +// m.fillArea(tmpX - left, tmpY1, tmpX + right, tmpY2, Tile.STONEFLOOR); +// // Make the stone wall border +// m.fillBorder(tmpX - left, tmpY1, tmpX + right, tmpY2, Tile.STONEWALL); +// // Add some water as decleration. +// m.fillBorder(tmpX - left + 1, tmpY1 + 1, tmpX + right - 1, tmpY1 + 1, +// Tile.RIVER); +// // Add a door and a blank sign +// m.fillArea(tmpX, tmpY2, tmpX, tmpY2, Tile.STONEFLOOR); +// m.addThing(Lib.create("ornate door"), tmpX, tmpY2); +// m.addThing(Lib.create("blank sign"), tmpX + 1, tmpY2 + 1); +// /* +// * Add the healer The AI of the healer just like the shopkeeper. TODO: +// * Might change to teacher script later. +// */ +// final int tmpY3 = y + 7; +// Thing healer = Lib.create("healer"); +// AI.setGuard(healer, m, tmpX - 1, tmpY3 - 1, tmpX + 1, tmpY3 + 1); +// m.addThing(healer, tmpX, tmpY3, tmpX, tmpY3); +// +// // Debug Message +// // So I know a temple has created +// // System.out.println("Set a fire in the temple [ppirrip]"); +// +// /* +// * Fires in the room TODO: Why fire won't display anymore? +// */ +// // m.addThing(Fire.create(5), tmpX-2, tmpY3-2); +// +// // TODO: add a random number there to general +// // different potions. +// for (int xx = tmpX - left + 1; xx <= tmpX + right - 1; xx++) { +// m.addThing(stockingPoint(healer, "IsPotion", 10), xx, tmpY1 + 2); +// } +// +// // Add a holy well +// m.addThing(Lib.create("well"), tmpX, tmpY3); +// +// // random rotation of the area +// m.rotateArea(x, y, 16, RPG.r(4)); +// } +// +// public static void buildWaterGarden(BattleMap m, int x, int y) { +// // Water area, (7,7) is the centre +// m.fillArea(x + 1, y + 1, x + 13, y + 13, Tile.RIVER); +// +// // island +// m.fillArea(x + 3, y + 3, x + 11, y + 11, m.floor()); +// +// // bridges +// m.fillArea(x + 1, y + 6, x + 13, y + 8, m.floor()); +// m.fillArea(x + 6, y + 1, x + 8, y + 13, m.floor()); +// +// switch (RPG.d(4)) { +// case 1: +// String s = RPG.pick(new String[] { "red apple tree", +// "potted flower", "potted plant", "plant" }); +// for (int rx = 5; rx <= 9; rx += 2) { +// for (int ry = 5; ry <= 9; ry += 2) { +// m.addThing(s, x + rx, y + ry); +// } +// } +// break; +// case 2: +// for (int rx = 5; rx <= 9; rx += 2) { +// for (int ry = 5; ry <= 9; ry += 2) { +// m.setTile(x + rx, y + ry, Tile.RIVER); +// } +// } +// break; +// case 3: +// addRoom(m, x + 5, y + 5, x + 9, y + 9, 0, -1); +// Thing teach = Lib.create("teacher"); +// m.addThing(teach, x + 7, y + 7); +// AI.setGuard(teach, m, x + 7, y + 7); +// break; +// case 4: +// m.addThing("fountain", x + 7, y + 7); +// break; +// } +// +// } +// +// private static void buildArea(BattleMap m, int x, int y, int t) { +// if (t == -1) { +// t = RPG.pick(OUTER); +// } +// if (t == -2) { +// t = RPG.pick(INNER); +// } +// +// switch (t) { +// +// // wooded area +// case 0: { +// for (int i = 0; i < 20; i++) { +// m.addThing(Lib.create("tree"), x, y, x + 15, y + 15); +// } +// +// switch (RPG.d(4)) { +// case 1: +// m.addThing(Lib.createType("IsWell", m.getLevel()), x, y, x + 15, +// y + 15); +// break; +// case 2: +// m.addThing(Lib.createType("IsGravestone", m.getLevel()), x, y, +// x + 15, y + 15); +// break; +// +// default: +// m.clearArea(x + 5, y + 5, x + 10, y + 9); +// m.fillArea(x + 5, y + 5, x + 10, y + 9, Tile.WOODENWALL); +// m.fillArea(x + 6, y + 6, x + 9, y + 8, Tile.WOODENFLOOR); +// m.setTile(x + 5, y + 7, Tile.WOODENFLOOR); +// m.addThing(Door.createDoor(5), x + 5, y + 7); +// m.addThing(Lib.createType("IsEquipment", 5), x + 5, y + 7); +// } +// +// m.addThing(Lib.create("ranger"), x, y, x + 15, y + 15); +// +// break; +// } +// +// // hut +// case 3: { +// int hw = RPG.r(3) + 3; +// int hh = RPG.r(3) + 3; +// int hx = x + 1 + RPG.r(14 - hw); +// int hy = y + 1 + RPG.r(14 - hh); +// int dx = RPG.r(2) * 2 - 1; +// int dy = RPG.r(2) * 2 - 1; +// if (RPG.d(2) == 1) { +// dx = 0; +// } else { +// dy = 0; +// } +// addRoom(m, hx, hy, hx + hw, hy + hh, dx, dy); +// break; +// } +// +// // block +// case 4: { +// addRoom(m, x + 8 - RPG.d(2, 3), y + 8 - RPG.d(2, 3), x + 8, y + 8, +// 0, -1); +// addRoom(m, x + 8 - RPG.d(2, 3), y + 8, x + 8, y + 8 + RPG.d(2, 3), +// 0, 1); +// addRoom(m, x + 8, y + 8 - RPG.d(2, 3), x + 8 + RPG.d(2, 3), y + 8, +// 0, -1); +// addRoom(m, x + 8, y + 8, x + 8 + RPG.d(2, 3), y + 8 + RPG.d(2, 3), +// 0, 1); +// break; +// } +// +// // temple hall +// case 5: { +// buildTemple(m, x, y); +// break; +// } +// +// // central crossroads with shops +// case 6: { +// addShop(m, x, y, x + RPG.d(3, 2), y + RPG.d(3, 2), 1, 0, 4); +// addShop(m, x + 15 - RPG.d(3, 2), y, x + 15, y + RPG.d(3, 2), 0, 1, +// 0); +// addShop(m, x, y + 15 - RPG.d(3, 2), x + RPG.d(3, 2), y + 15, 0, -1, +// 2); +// addShop(m, x + 15 - RPG.d(3, 2), y + 15 - RPG.d(3, 2), x + 15, +// y + 15, -1, 0, 3); +// break; +// } +// +// // pond +// case 7: { +// m.setTile(x + 8, y + 8, Tile.SEA); +// m.fractalize(x + 4, y + 4, x + 11, y + 11, 4); +// for (int i = 0; i < 10; i++) { +// m.addThing(Lib.create("bush"), x, y, x + 15, y + 15); +// } +// break; +// } +// +// // river +// case 8: +// case 9: +// case 10: +// case 11: { +// // N/S river +// m.makeRandomPath(x + 8, y, x + 8, y + 15, x, y, x + 15, y + 15, +// Tile.RIVER, false); +// m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); +// if ((t & 1) == 1) { +// // add the bridge +// m.replaceTiles(x, y + 7, x + 15, y + 7 + RPG.r(3), Tile.RIVER, +// Tile.STONEFLOOR); +// } +// +// // rotate for E/W river +// if ((t & 2) > 0) { +// m.rotateArea(x, y, 16, 1); +// } +// break; +// } +// +// // NS and EW streets +// case 12: +// case 13: { +// int p1, p2; +// p1 = 7 - RPG.d(3); +// p2 = 7 + RPG.d(3); +// addFeature(m, x, y + RPG.r(2), x + p1, y + 5 + RPG.r(3), 0, 1, 0); +// addFeature(m, x + p1, y + RPG.r(2), x + p2, y + 5 + RPG.r(3), 0, 1, +// 0); +// addFeature(m, x + p2, y + RPG.r(2), x + 14, y + 5 + RPG.r(3), 0, 1, +// 0); +// +// p1 = 8 - RPG.d(4); +// p2 = 8 + RPG.d(4); +// addFeature(m, x, y + 9 + RPG.r(3), x + p1, y + 14 - RPG.r(2), 0, -1, +// 0); +// addFeature(m, x + p1, y + 9 + RPG.r(3), x + p2, y + 14 - RPG.r(2), +// 0, -1, 0); +// addFeature(m, x + p2, y + 9 + RPG.r(3), x + 14, y + 14 - RPG.r(2), +// 0, -1, 0); +// +// // rotate for N/S street +// if (t == 12) { +// m.rotateArea(x, y, 16, 1); +// } +// break; +// } +// +// // orchard +// case 14: { +// boolean mixed = false; +// Thing tree = null; +// if (RPG.r(3) == 2) { +// // the orchard will be of mixed species +// mixed = true; +// } else { +// // pick a single species for the orchard +// tree = Lib.createType("IsFruitTree", 1); +// } +// for (int i = 0; i < 20; i++) { +// int px = x + 1 + RPG.r(14); +// int py = y + 1 + RPG.r(14); +// if (!m.isBlocked(px, py)) { +// if (mixed) { +// m.addThing(Lib.create("[IsFruitTree]"), px, py); +// } else { +// m.addThing(tree.cloneType(), px, py); +// } +// } +// } +// break; +// } +// +// // smithy +// case 15: { +// addShop(m, x + 5, y + 5, x + 10, y + 10, 0, -1, 5); +// m.rotateArea(x, y, 16, RPG.r(4)); +// break; +// } +// +// // river bends +// case 16: +// case 17: +// case 18: +// case 19: { +// m.makeRandomPath(x + 8, y, x, y + 8, x, y, x + 15, y + 15, +// Tile.RIVER, false); +// m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); +// +// // rotate clockwise to correct orientation +// // 16 = N/W position etc.. +// m.rotateArea(x, y, 16, t - 16); +// break; +// } +// +// // river forks +// case 20: +// case 21: +// case 22: +// case 23: { +// m.makeRandomPath(x + 8, y, x, y + 8, x, y, x + 15, y + 15, +// Tile.RIVER, false); +// m.makeRandomPath(x + 8, y, x + 15, y + 8, x, y, x + 15, y + 15, +// Tile.RIVER, false); +// m.spreadTiles(x, y, x + 15, y + 15, Tile.RIVER, m.floor()); +// +// // rotate clockwise to correct orientation +// // 20 = N/W/E position etc.. +// m.rotateArea(x, y, 16, t - 20); +// break; +// } +// case 24: +// buildWaterGarden(m, x, y); +// break; +// +// } +// } +// +// // adds a town feature in specified area +// public static void addFeature(BattleMap m, int x1, int y1, int x2, int y2, +// int dx, int dy, int t) { +// // randomize feature +// if (t == 0) { +// t = RPG.d(10); +// } +// +// switch (t) { +// case 1: +// addShop(m, x1, y1, x2, y2, dx, dy, 0); +// break; +// +// default: +// addRoom(m, x1, y1, x2, y2, dx, dy); +// break; +// } +// +// } +// +// public static void addGraveYard(BattleMap m, int x1, int y1, int x2, +// int y2) { +// for (int i = 0; i < ((x2 - x1 + 1) * (y2 - y1 + 1)) / 8; i++) { +// m.addThing(Lib.createType("IsGraveStone", m.getLevel()), x1, y1, x2, +// y2); +// } +// +// for (int i = 0; i < ((x2 - x1 + 1) * (y2 - y1 + 1)) / 18; i++) { +// m.addThing(Lib.createType("potted flower", m.getLevel()), x1, y1, +// x2, y2); +// } +// } +// +// public static void addTownies(BattleMap m) { +// for (int i = 0; i <= 10; i++) { +// Point ts = m.findFreeSquare(); +// m.addThing(Lib.create("farmer"), ts.x, ts.y); +// } +// for (int i = 0; i <= 6; i++) { +// Point ts = m.findFreeSquare(); +// m.addThing(Lib.create("village woman"), ts.x, ts.y); +// } +// for (int i = 0; i <= 4; i++) { +// Point ts = m.findFreeSquare(); +// m.addThing(Lib.create("village girl"), ts.x, ts.y); +// } +// for (int i = 0; i <= 8; i++) { +// Point ts = m.findFreeSquare(); +// m.addThing(Lib.create("guard"), ts.x, ts.y); +// } +// +// Point ts = m.findFreeSquare(); +// m.addThing(Lib.create("teacher"), ts.x, ts.y); +// } +// +// public static Thing stockingPoint(Thing sk, String type, int level) { +// Thing t = Lib.create("base stocking point"); +// t.set("Name", "shop stocking point"); +// t.set("StockingType", type); +// t.set("StockingLevel", level); +// t.set("Shopkeeper", sk); +// return t; +// } +// +// // Create standard shops +// // +// // note that areas are likely to be rotated +// // this will mess up GuardAI(x1,y1,x2,y2) objects +// // hence use secret markers to mark out the shop area +// public static void addShop(BattleMap m, int x1, int y1, int x2, int y2, int +// dx, +// int dy, int t) { +// int doorx, doory; +// doorx = (dx == 0) +// ? RPG.rspread(x1 + 1, x2 - 1) +// : ((dx == -1) ? x1 : x2); +// doory = (dy == 0) +// ? RPG.rspread(y1 + 1, y2 - 1) +// : ((dy == -1) ? y1 : y2); +// m.fillArea(x1, y1, x2, y2, Tile.FLOOR); +// m.fillBorder(x1, y1, x2, y2, Tile.CAVEWALL); +// m.setTile(doorx, doory, Tile.FLOOR); +// +// Thing door = Lib.create("shop door"); +// +// if (t == 0) { +// t = RPG.d(10); +// } +// +// switch (t) { +// // magic type shop +// case 1 : { +// Thing wiz = Lib.create("wizard"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// +// m.addThing(stockingPoint(wiz,"IsMagicItem", RPG.d(15)), x, y); +// } +// +// AI.setGuard(wiz, m, x1, y1, x2, y2); +// m.addThing(wiz, (x1 + x2) / 2, (y1 + y2) / 2); +// m.addThing(Lib.create("magic shop sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // weapon store +// case 2 : { +// Thing guard = Lib.create("guard"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(guard,"IsWeapon", RPG.d(2,6)), x, y); +// } +// +// AI.setGuard(guard, m, x1, y1, x2, y2); +// m.addThing(guard, (x1 + x2) / 2, (y1 + y2) / 2); +// +// m.addThing(Lib.create("armoury sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // food store +// case 3 : { +// Thing shopkeeper = Lib.create("shopkeeper"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(shopkeeper,"IsShopFood", 10), x, y); +// } +// +// AI.setGuard(shopkeeper, m, x1, y1, x2, y2); +// m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); +// +// m.addThing(Lib.create("food shop sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // Smithy +// // note that door is assumed to face north +// case 5 : { +// Thing smith = Lib.create("blacksmith"); +// AI.setGuard(smith, m, x1, y1, x2, y2); +// +// m.addThing(smith, (x1 + x2) / 2, (y1 + y2) / 2); +// +// +// m.addThing(Fire.create(5), x2 - 1, y2 - 1); +// m.addThing(Fire.create(5), x2 - 2, y2 - 1); +// +// m.addThing(Lib.create("smithy sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // Goblin store +// case 6 : { +// door = Lib.create("goblin door"); +// door.set("IsLocked", 0); +// +// Thing gobbo = Lib.create("goblin shopkeeper"); +// AI.setGuard(gobbo, m, x1, y1, x2, y2); +// gobbo.set("IsHostile", 0); +// //gobbo.setPersonality(new Personality(Personality.CHATTER, +// // Personality.CHATTER_GOBLIN)); +// m.addThing(gobbo, (x1 + x2) / 2, (y1 + y2) / 2); +// +// for (int x = x1 + 1; x < x2; x++) { +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(gobbo,"IsMagicItem", 12), x, y); +// } +// } +// break; +// } +// +// // equipment store +// // note that door is assumed to face north +// case 7 : { +// Thing shopkeeper = Lib.create("shopkeeper"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(shopkeeper,"IsEquipment", 10), x, y); +// } +// +// AI.setGuard(shopkeeper, m, x1, y1, x2, y2); +// m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); +// +// m.addThing(Lib.create("armoury sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // armour store +// // note that door is assumed to face north +// case 8 : { +// Thing shopkeeper = Lib.create("blacksmith"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// if (RPG.d(2)==1) { +// m.addThing(stockingPoint(shopkeeper,"IsArmour", 10), x, y); +// } +// } +// +// AI.setGuard(shopkeeper, m, x1, y1, x2, y2); +// m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); +// +// m.addThing(Lib.create("smithy sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// break; +// } +// +// // Rune store +// case 9 : { +// door = Lib.create("goblin door"); +// door.set("IsLocked", 0); +// +// Thing sk = Lib.create(RPG.pick(new String[] {"goblin shopkeeper","learned +// sage","shopkeeper","wizard"})); +// AI.setGuard(sk, m, x1, y1, x2, y2); +// m.addThing(sk, (x1 + x2) / 2, (y1 + y2) / 2); +// +// for (int x = x1 + 1; x < x2; x++) { +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(sk,"IsRunestone", RPG.d(12)), x, y); +// } +// } +// break; +// } +// +// // General store +// default : { +// Thing shopkeeper = Lib.create("shopkeeper"); +// for (int x = x1 + 1; x < x2; x++) +// for (int y = y1 + 1; y < y2; y++) { +// m.addThing(stockingPoint(shopkeeper,"IsStoreItem", 10), x, y); +// } +// +// AI.setGuard(shopkeeper, m, x1, y1, x2, y2); +// m.addThing(shopkeeper, (x1 + x2) / 2, (y1 + y2) / 2); +// +// m.addThing(Lib.create("store sign"), doorx + dx + dy +// * (RPG.r(2) * 2 - 1), doory + dy + dx +// * (RPG.r(2) * 2 - 1)); +// } +// +// } +// +// m.addThing(door, doorx, doory); +// } +// +// public static void addBuilding(BattleMap m) { +// int w = RPG.d(2, 4) + 3; +// int h = RPG.d(2, 4) + 3; +// int x1 = RPG.r(m.width - w); +// int y1 = RPG.r(m.height - h); +// int x2 = x1 + w; +// int y2 = y1 + h; +// int dx = RPG.r(3) - 1; +// int dy = RPG.r(3) - 1; +// if (RPG.d(2) == 1) { +// dx = 0; +// } else { +// dy = 0; +// } +// +// if (m.countTiles(x1, y1, x2, y2, m.floor()) != (w + 1) * (h + 1)) { +// return; +// } +// addRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1, dx, dy); +// } +// +// public static void addRoom(BattleMap m, int x1, int y1, int x2, int y2, +// int dx, int dy) { +// int doorx, doory; +// doorx = (dx == 0) ? RPG.rspread(x1 + 1, x2 - 1) +// : ((dx == -1) ? x1 : x2); +// doory = (dy == 0) ? RPG.rspread(y1 + 1, y2 - 1) +// : ((dy == -1) ? y1 : y2); +// addStandardRoom(m, x1, y1, x2, y2, doorx, doory); +// } +// +// // add a standard town room +// // all kinds of fun stuff inside +// public static void addStandardRoom(BattleMap m, int x1, int y1, int x2, +// int y2, int doorx, int doory) { +// m.fillArea(x1, y1, x2, y2, Tile.FLOOR); +// m.fillBorder(x1, y1, x2, y2, m.wall()); +// +// boolean secret = false; +// Thing door = Lib.create("door"); +// +// switch (RPG.d(15)) { +// case 1: { +// door.set("IsLocked", 1); +// Thing it = Food.createFood(0); +// it.set("IsOwned", 1); +// m.addThing(it, x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// break; +// } +// case 2: { // alarmed room +// door.set("IsLocked", 1); +// Thing it = Lib.createItem(8); +// it.set("IsOwned", true); +// m.addThing(it, x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// // addThing(new MapStateTrap(1), doorx, doory); +// break; +// } +// case 3: { // rats! +// Thing it = Lib.createItem(3); +// m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// for (int i = RPG.d(8); i > 0; i--) { +// m.addThing(Lib.create("sewer rat"), x1 + 1, y1 + 1, x2 - 1, +// y2 - 1); +// } +// break; +// } +// case 4: { // table +// m.addThing(Lib.create("table"), x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// break; +// } +// case 5: { +// if (RPG.d(6) == 1) { +// Thing it = Lib.createItem(3); +// m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// } +// door = null; +// break; +// } +// case 6: +// case 7: +// case 8: +// case 9: +// door.set("IsLocked", (RPG.d(3) == 1) ? 1 : 0); +// decorateRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// break; +// case 10: +// door = Lib.create("stable door"); +// door.set("IsLocked", 1); +// m.addThing(Lib.create("[IsAnimal]"), x1, y1, x2, y2); +// if (RPG.d(4) == 1) { +// m.addThing(Lib.create("[IsAnimal]"), x1, y1, x2, y2); +// } +// break; +// case 11: { +// if (RPG.d(4) == 1) { +// Thing it = Lib.createItem(10); +// m.addThing(Secret.hide(it), x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// } +// decorateRoom(m, x1 + 1, y1 + 1, x2 - 1, y2 - 1); +// +// secret = true; +// break; +// } +// } +// +// if (secret) { +// m.addThing(Lib.create("secret door"), doorx, doory); +// } else { +// m.setTile(doorx, doory, Tile.FLOOR); +// if (door != null) { +// m.addThing(door, doorx, doory); +// } +// } +// } +// +// // decorate room, given co-ordinates of interior space +// public static void decorateRoom(BattleMap m, int x1, int y1, int x2, +// int y2) { +// int w = x2 - x1 + 1; +// int h = y2 - y1 + 1; +// +// switch (RPG.d(12)) { +// case 1: +// for (int lx = x1; lx <= x2; lx++) { +// for (int ly = y1; ly <= y2; ly++) { +// // TODO: something interesting +// } +// } +// break; +// case 2: +// if (w > 3 && h >= 3) { +// Point location = +// createPersonAndTable("townswoman", m, x1, y1, x2, y2); +// m.addThing(Lib.create("stool"), location.x + 1 - 2 * RPG.r(2), +// location.y); +// m.addThing(Lib.create("stool"), location.x, +// location.y + 1 - 2 * RPG.r(2)); +// m.addThing(Food.createFood(0), x1, y1, x2, y2); +// m.addThing(Food.createFood(0), x1, y1, x2, y2); +// } +// break; +// +// case 3: +// if (w > 3 && h >= 3) { +// Point location = createPersonAndTable( +// RPG.pick(new String[] { "wizard", "priest" }), m, x1, +// y1, x2, y2); +// m.addThing(Lib.create("stool"), location.x + 1 - 2 * RPG.r(2), +// location.y + 1 - 2 * RPG.r(2)); +// m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2) +// .set("IsOwned", 1); +// m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2) +// .set("IsOwned", 1); +// m.addThing(Scroll.createScroll(6), x1, y1, x2, y2) +// .set("IsOwned", 1); +// m.addThing(Scroll.createScroll(8), x1, y1, x2, y2) +// .set("IsOwned", 1); +// } +// break; +// case 4: +// if ((w > 3) && (h >= 3)) { +// m.fillArea(x1 + 1, y1 + 1, x2 - 1, y2 - 1, Tile.STREAM); +// } +// break; +// case 5: +// m.addThing("potted plant", x1, y1, x2, y2); +// m.addThing("chest", x1, y1, x2, y2).set("IsOwned", 1); +// break; +// case 6: +// m.addThing("potted flower", x1, y1, x2, y2); +// m.addThing("potted flower", x1, y1, x2, y2); +// break; +// case 7: +// Thing sage = m.addThing("learned sage", x1, y1, x2, y2); +// AI.setGuard(sage, m, x1, y1, x2, y2); +// m.addThing(Lib.createMagicItem(3), x1, y1, x2, y2).set("IsOwned", +// 1); +// m.addThing(Scroll.createScroll(6), x1, y1, x2, y2).set("IsOwned", +// 1); +// m.addThing(Scroll.createScroll(8), x1, y1, x2, y2).set("IsOwned", +// 1); +// break; +// case 8: +// m.addThing("pit trap", x1, y1, x2, y2); +// break; +// case 9: +// m.addThing(Lib.createType("IsBook"), x1, y1, x2, y2).set("IsOwned", +// 1); +// break; +// +// default: +// m.addThing(Lib.createItem(RPG.d(12)), x1, y1, x2, y2).set("IsOwned", +// 1); +// break; +// } +// } +// +// private static Point createPersonAndTable(String toCreate, BattleMap m, +// int x1, int y1, int x2, int y2) { +// Thing p = Lib.create(toCreate); +// AI.setGuard(p, m, x1, y1, x2, y2); +// m.addThing(p, x1, y1, x2, y2); +// int tx = RPG.rspread(x1 + 1, x2 - 1); +// int ty = RPG.rspread(y1 + 1, y2 - 1); +// m.addThing(Lib.create("table"), tx, ty); +// return new Point(tx, ty); +// } +// +// public static void decorateTown(BattleMap m, int x1, int y1, int x2, +// int y2) { +// for (int x = x1; x <= x2; x++) { +// for (int y = y1; y <= y2; y++) { +// if (m.isBlocked(x, y)) { +// continue; +// } +// if (!(m.getTile(x, y) == m.floor())) { +// continue; +// } +// switch (RPG.d(200)) { +// case 1: +// case 2: +// case 3: +// m.addThing(Lib.create("plant"), x, y); +// break; +// case 4: +// m.addThing("menhir", x, y); +// break; +// case 5: +// m.addThing("[IsHerb]", x, y); +// break; +// +// } +// } +// } +// } +// +// public static BattleMap buildNyckMap() { +// BattleMap m = new BattleMap(31, 31); +// m.set("Description", "A Strange Icy Place"); +// m.set("WallTile", Tile.ICEWALL); +// m.set("FloorTile", Tile.ICEFLOOR); +// +// Maze.buildMaze(m, 0, 0, 30, 30); +// m.fillArea(11, 21, 19, 29, m.wall()); +// int x = RPG.r(15) * 2 + 1; +// m.setTile(x, 0, m.floor()); +// Thing e = Portal.create("invisible portal"); +// m.addThing(e, x, 0); +// m.setEntrance(e); +// +// m.fillArea(11, 21, 19, 29, m.floor()); +// +// m.fillBorder(13, 23, 17, 27, m.wall()); +// m.setTile(15, 23, m.floor()); +// m.addThing(Fire.create(5), 15, 25); +// Thing nyck = Lib.create("Jolly Old Nyck"); +// m.addThing(nyck, 15, 26); +// AI.setGuard(nyck, m, 14, 24, 16, 26); +// return m; +// } +// +// } \ No newline at end of file diff --git a/tyrant/mikera/tyrant/Trap.java b/tyrant/mikera/tyrant/Trap.java index 6ff0e3dfb..43280ab9b 100644 --- a/tyrant/mikera/tyrant/Trap.java +++ b/tyrant/mikera/tyrant/Trap.java @@ -3,136 +3,139 @@ import java.util.ArrayList; import javelin.model.BattleMap; - import tyrant.mikera.engine.Lib; import tyrant.mikera.engine.Point; import tyrant.mikera.engine.RPG; import tyrant.mikera.engine.Script; import tyrant.mikera.engine.Thing; +public class Trap { + public static Thing create() { + return createTrap(Lib.currentLevel()); + } + public static Thing create(int l) { + return createTrap(l); + } + + public static Thing createTrap(int l) { + return Lib.createType("IsTrap", l); + } + + public static void setActivated(Thing t, boolean b) { + t.set("IsActivated", b); + } + + public static boolean isActivated(Thing t) { + return t.getFlag("IsActivated"); + } + + // trigger in specific location + public static void trigger(Thing t) { + if (t.handles("OnEnterTrigger")) { + Event e = new Event("EnterTrigger"); + Thing target = t.getMap().getMobile(t.x, t.y); + e.set("Target", target); + t.visibleMessage(t.getAName() + " is triggered!"); + + if ((target != null) && target.isHero()) { + target.isRunning(false); + } + t.handle(e); + } + } + + public static boolean applyDisarmTraps(Thing b) { + Game.messageTyrant("Disarm trap in which direction?"); + Point p = Game.getDirection(); + + Thing trap = + b.getMap().getFlaggedObject(b.x + p.x, b.y + p.y, "IsTrap"); + if ((trap != null) && trap.isVisible(Game.hero())) { + return tryDisarm(b, trap); + } + Game.messageTyrant("No trap found."); + return false; + } + + public static boolean tryDisarm(Thing b, Thing trap) { + b.incStat("APS", -200); + + int skill = b.getStat(Skill.DISARM) * b.getStat("CR"); + int diff = trap.getStat("Level") * 5; + int r = 0; + if (RPG.test(skill, diff)) { + r++; + } + if (RPG.test(skill, diff)) { + r++; + } + + switch (r) { + case 0: + Game.messageTyrant("You trigger the trap by accident!"); + Trap.trigger(trap); + return true; + case 1: + Game.messageTyrant("You fail to disarm the trap"); + b.incStat("APS", -200); + return true; + case 2: + Game.messageTyrant("You disarm the trap successfully"); + Trap.disarm(trap); + return true; + } + + return true; + } + + public static void disarm(Thing trap) { + trap.die(); + } + + public static void init() { + Thing t; + + t = Lib.extend("base trap", "base secret"); + t.set("IsTrap", 1); + t.set("ImageSource", "Scenery"); + t.set("IsDestructible", 0); + t.set("Image", 164); + t.set("IsWarning", 1); + t.set("IsInvisible", (Game.isDebug()) ? 0 : 1); + t.set("Frequency", 50); + t.set("IsActivated", 1); + t.set("Uses", 1); + t.set("LevelMin", 1); + t.set("Z", Thing.Z_FLOOR); + t.set("ASCII", "^"); + Lib.add(t); + + initSpecialTraps(); + initSpellTraps(); + + RuneTrap.init(); + } -public class Trap { - public static Thing create() { - return createTrap(Lib.currentLevel()); - } - - public static Thing create(int l) { - return createTrap(l); - } - - public static Thing createTrap(int l) { - return Lib.createType("IsTrap",l); - } - - public static void setActivated(Thing t,boolean b) { - t.set("IsActivated",b); - } - - public static boolean isActivated(Thing t) { - return t.getFlag("IsActivated"); - } - - // trigger in specific location - public static void trigger(Thing t) { - if (t.handles("OnEnterTrigger")) { - Event e=new Event("EnterTrigger"); - Thing target=t.getMap().getMobile(t.x,t.y); - e.set("Target",target); - t.visibleMessage(t.getAName()+" is triggered!"); - - if ((target!=null)&&target.isHero()) { - target.isRunning(false); - } - t.handle(e); - } - } - - public static boolean applyDisarmTraps(Thing b) { - Game.messageTyrant("Disarm trap in which direction?"); - Point p=Game.getDirection(); - - Thing trap=b.getMap().getFlaggedObject(b.x+p.x,b.y+p.y,"IsTrap"); - if ((trap!=null)&&trap.isVisible(Game.hero())) { - return tryDisarm(b,trap); - } - Game.messageTyrant("No trap found."); - return false; - } - - public static boolean tryDisarm(Thing b, Thing trap) { - b.incStat("APS",-200); - - int skill=b.getStat(Skill.DISARM)*b.getStat("CR"); - int diff=trap.getStat("Level")*5; - int r=0; - if (RPG.test(skill,diff)) r++; - if (RPG.test(skill,diff)) r++; - - switch (r) { - case 0: - Game.messageTyrant("You trigger the trap by accident!"); - Trap.trigger(trap); - return true; - case 1: - Game.messageTyrant("You fail to disarm the trap"); - b.incStat("APS",-200); - return true; - case 2: - Game.messageTyrant("You disarm the trap successfully"); - Trap.disarm(trap); - return true; - } - - return true; - } - - public static void disarm(Thing trap) { - trap.die(); - } - - public static void init() { - Thing t; - - t=Lib.extend("base trap","base secret"); - t.set("IsTrap",1); - t.set("ImageSource","Scenery"); - t.set("IsDestructible",0); - t.set("Image",47); - t.set("IsWarning",1); - t.set("IsInvisible",(Game.isDebug())?0:1); - t.set("Frequency",50); - t.set("IsActivated",1); - t.set("Uses",1); - t.set("LevelMin",1); - t.set("Z",Thing.Z_FLOOR); - t.set("ASCII","^"); - Lib.add(t); - - initSpecialTraps(); - initSpellTraps(); - - RuneTrap.init(); - } - protected static class SpellTrapTrigger extends Script { private static final long serialVersionUID = 4049353132389774130L; - public boolean handle(Thing rt, Event e) { - BattleMap map=rt.getMap(); - int tx=rt.x; - int ty=rt.y; - + @Override + public boolean handle(Thing rt, Event e) { + BattleMap map = rt.getMap(); + int tx = rt.x; + int ty = rt.y; + rt.remove(); Thing temp = Game.actor; - + if (map != null) { Thing sp = Spell.create(rt.getString("TrapSpell")); - Spell.castAtLocation(sp,null, map, tx, ty); - Thing actor=(Thing)rt.get("Actor"); + Spell.castAtLocation(sp, null, map, tx, ty); + Thing actor = (Thing) rt.get("Actor"); if (actor != null) { actor.message("Your power is drained by the runes"); - actor.incStat("MPS",-sp.getStat("SpellCost")); + actor.incStat("MPS", -sp.getStat("SpellCost")); } } Game.actor = temp; @@ -144,55 +147,59 @@ public boolean handle(Thing rt, Event e) { protected static class PitTrapTrigger extends Script { private static final long serialVersionUID = 3257008748072613943L; - public boolean handle(Thing trap, Event e) { - BattleMap map=trap.getMap(); - - Thing tt=e.getThing("Target"); - - Thing pit=Lib.create("pit"); - pit.set("DestinationLevel",RPG.middle(1,map.getLevel()+RPG.d(3)-RPG.d(3),50)); - + @Override + public boolean handle(Thing trap, Event e) { + BattleMap map = trap.getMap(); + + Thing tt = e.getThing("Target"); + + Thing pit = Lib.create("pit"); + pit.set("DestinationLevel", + RPG.middle(1, map.getLevel() + RPG.d(3) - RPG.d(3), 50)); + // replave the trap object with the pit portal trap.replaceWith(pit); - pit=trap; - - if (tt!=null) { - Portal.travel(pit,tt); - + pit = trap; + + if (tt != null) { + Portal.travel(pit, tt); + // land in random square - BattleMap pitMap=tt.getMap(); - Point p=pitMap.findFreeSquare(); - if (p==null) { + BattleMap pitMap = tt.getMap(); + Point p = pitMap.findFreeSquare(); + if (p == null) { throw new Error("Unable to find a free square in pit"); } - if ((p!=null)&&(tt!=null)) { + if ((p != null) && (tt != null)) { tt.message("You have fallen into a pit!"); - tt.moveTo(pitMap,p.x,p.y); - - } + tt.moveTo(pitMap, p.x, p.y); + + } return true; } - + return false; } } - + protected static class AmbushTrapTrigger extends Script { private static final long serialVersionUID = 3258135751886516790L; - public boolean handle(Thing t, Event e) { - BattleMap map=t.getMap(); - int level=map.getLevel(); - Thing a=Lib.createType("IsMonster",level); - - Thing tt=e.getThing("Target"); - - boolean ambush=false; - for (int i=RPG.d(6); i>0; i--) { - ambush|=map.addBlockingThing(Lib.create(a.name()),t.x-1,t.y-1,t.x+1,t.y+1); + @Override + public boolean handle(Thing t, Event e) { + BattleMap map = t.getMap(); + int level = map.getLevel(); + Thing a = Lib.createType("IsMonster", level); + + Thing tt = e.getThing("Target"); + + boolean ambush = false; + for (int i = RPG.d(6); i > 0; i--) { + ambush |= map.addBlockingThing(Lib.create(a.name()), t.x - 1, + t.y - 1, t.x + 1, t.y + 1); } - if (tt!=null) { + if (tt != null) { if (ambush) { tt.message("You have been ambushed!"); } else { @@ -200,122 +207,125 @@ public boolean handle(Thing t, Event e) { } } t.remove(); - + return false; } } - + protected static class RockfallTrapTrigger extends Script { private static final long serialVersionUID = 4121129234254214969L; - public boolean handle(Thing rt, Event e) { - BattleMap map=rt.getMap(); - int tx=rt.x; - int ty=rt.y; - - Thing tt=e.getThing("Target"); - + @Override + public boolean handle(Thing rt, Event e) { + BattleMap map = rt.getMap(); + int tx = rt.x; + int ty = rt.y; + + Thing tt = e.getThing("Target"); + rt.remove(); Lib.create("pit"); - - if (tt!=null) { + + if (tt != null) { tt.message("You are hit by falling rocks!"); - Damage.inflict(tt,RPG.d(20),"impact"); + Damage.inflict(tt, RPG.d(20), "impact"); } - - map.addThing(Lib.create("rock"),tx,ty); - map.addThing(Lib.create("stone"),tx,ty); - + + map.addThing(Lib.create("rock"), tx, ty); + map.addThing(Lib.create("stone"), tx, ty); + return false; } } - + protected static class AttributeTrapTrigger extends Script { private static final long serialVersionUID = 3256721771276022839L; - public boolean handle(Thing rt, Event e) { - Thing tt=e.getThing("Target"); - + @Override + public boolean handle(Thing rt, Event e) { + Thing tt = e.getThing("Target"); + rt.remove(); - - if (tt!=null) { + + if (tt != null) { tt.message(getString("Message")); tt.addAttribute(Lib.create(getString("Effect"))); } - + return false; } } - public static void initSpellTrap(Thing s) { - if (s.getStat("SpellUsage")==Spell.SPELL_OFFENCE) { - String sn=s.name(); - Thing t=Lib.extend(sn+" trap","base trap"); - t.set("TrapSpell",sn); - t.set("Image",47); - t.set("Level",s.getLevel()); - t.set("LevelMin",s.getLevel()); - t.set("OnEnterTrigger",new SpellTrapTrigger()); - - t.set("DeathDecoration","10% wand of "+sn); - Lib.add(t); - } - } - - public static void initSpellTraps() { - ArrayList spells=Spell.getSpellNames(); - - for(int i=0; i