From 064d0557c1cc29afc932666d3baffc1badb59478 Mon Sep 17 00:00:00 2001 From: Alex Henry Date: Fri, 15 Jul 2016 00:55:30 -0300 Subject: [PATCH] 1.6 --- .gitignore | 3 +- avatars/dungeonaltar.png | Bin 0 -> 625 bytes avatars/dungeonbrazier.png | Bin 0 -> 566 bytes avatars/dungeonfloortempleevil.png | Bin 0 -> 1744 bytes avatars/dungeonfloortemplefire.png | Bin 0 -> 1858 bytes avatars/dungeonspirit.png | Bin 0 -> 862 bytes avatars/dungeonstairsdown.png | Bin 0 -> 1396 bytes ...{dungeonstairs.png => dungeonstairsup.png} | Bin avatars/dungeontreefruit.png | Bin 0 -> 2243 bytes avatars/dungeonwalltempleearth.png | Bin 0 -> 2670 bytes avatars/dungeonwalltempleevil.png | Bin 0 -> 2499 bytes avatars/dungeonwalltemplefire.png | Bin 0 -> 1948 bytes avatars/dungeonwalltemplewater.png | Bin 0 -> 2352 bytes avatars/flyingnimbus.png | Bin 0 -> 1150 bytes avatars/locationmartialacademy.png | Bin 2007 -> 2473 bytes avatars/locationmartialacademy3.png | Bin 0 -> 2007 bytes avatars/locationmartialacademy4.png | Bin 0 -> 2555 bytes avatars/locationsummoningcircle.png | Bin 523 -> 366 bytes avatars/locationtempleair.png | Bin 0 -> 3178 bytes avatars/locationtempleearth.png | Bin 0 -> 3050 bytes avatars/locationtempleevil.png | Bin 0 -> 2558 bytes avatars/locationtemplefire.png | Bin 0 -> 2588 bytes avatars/locationtemplegood.png | Bin 0 -> 2418 bytes avatars/locationtemplemagic.png | Bin 0 -> 2861 bytes avatars/locationtemplewater.png | Bin 0 -> 2882 bytes avatars/locationtraininghall.png | Bin 1947 -> 2346 bytes avatars/locationtraininghall2.png | Bin 0 -> 1947 bytes avatars/overlaylabor.png | Bin 0 -> 390 bytes doc/CHANGELOG.txt | 7 +- doc/howtoplay.txt | 3 +- doc/javadoc/allclasses-frame.html | 68 +- doc/javadoc/allclasses-noframe.html | 68 +- doc/javadoc/constant-values.html | 82 +- doc/javadoc/deprecated-list.html | 26 +- doc/javadoc/help-doc.html | 4 +- doc/javadoc/index-all.html | 1976 +++++++++++++---- doc/javadoc/index.html | 2 +- doc/javadoc/javelin/Javelin.html | 191 +- doc/javadoc/javelin/JavelinApp.html | 120 +- .../javelin/controller/BattleSetup.html | 4 +- .../javelin/controller/CountingSet.html | 8 +- .../javelin/controller/DamageEffect.html | 335 +++ .../controller/DescendingLevelComparator.html | 8 +- doc/javadoc/javelin/controller/Movement.html | 4 +- doc/javadoc/javelin/controller/Point.html | 4 +- .../controller/SpellbookGenerator.html | 4 +- .../javelin/controller/TextReader.html | 4 +- doc/javadoc/javelin/controller/Weather.html | 12 +- .../javelin/controller/action/Action.html | 12 +- .../controller/action/ActionAdapter.html | 8 +- .../controller/action/ActionDescription.html | 6 +- .../controller/action/ActionMapping.html | 4 +- .../javelin/controller/action/Breath.html | 31 +- .../javelin/controller/action/CastSpell.html | 128 +- .../javelin/controller/action/Charge.html | 66 +- .../action/ConfigureBattleKeys.html | 8 +- .../javelin/controller/action/Defend.html | 31 +- .../controller/action/DiagonalMovement.html | 4 +- .../javelin/controller/action/Dig.html | 31 +- .../javelin/controller/action/Examine.html | 8 +- .../javelin/controller/action/Fire.html | 179 +- .../javelin/controller/action/Help.html | 8 +- .../javelin/controller/action/Movement.html | 18 +- .../javelin/controller/action/PassItem.html | 8 +- .../controller/action/SimpleAction.html | 10 +- .../javelin/controller/action/Target.html | 539 +++++ .../controller/action/TouchAttack.html | 81 +- .../javelin/controller/action/UseItem.html | 8 +- .../javelin/controller/action/Wait.html | 4 +- .../javelin/controller/action/Withdraw.html | 8 +- .../javelin/controller/action/ZoomIn.html | 8 +- .../javelin/controller/action/ZoomOut.html | 8 +- .../controller/action/ai/AbstractAttack.html | 69 +- .../controller/action/ai/AiAction.html | 186 +- .../controller/action/ai/AiMovement.html | 71 +- .../controller/action/ai/DamageChance.html | 4 +- .../controller/action/ai/ForceWait.html | 67 +- .../controller/action/ai/MeleeAttack.html | 29 +- .../controller/action/ai/RangedAttack.html | 29 +- .../controller/action/ai/package-frame.html | 9 +- .../controller/action/ai/package-summary.html | 37 +- .../controller/action/ai/package-tree.html | 18 +- .../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 | 28 +- .../controller/action/maneuver/Feint.html | 28 +- .../controller/action/maneuver/Grapple.html | 28 +- .../controller/action/maneuver/Maneuver.html | 84 +- .../controller/action/maneuver/Trip.html | 28 +- .../action/maneuver/package-frame.html | 4 +- .../action/maneuver/package-summary.html | 4 +- .../action/maneuver/package-tree.html | 8 +- .../controller/action/package-frame.html | 5 +- .../controller/action/package-summary.html | 18 +- .../controller/action/package-tree.html | 32 +- .../controller/action/world/Abandon.html | 4 +- .../controller/action/world/Automate.html | 8 +- .../javelin/controller/action/world/Camp.html | 312 +++ .../controller/action/world/CastSpells.html | 8 +- .../action/world/ConfigureWorldKeys.html | 4 +- .../controller/action/world/Dismiss.html | 4 +- .../controller/action/world/Divide.html | 4 +- .../controller/action/world/Guide.html | 8 +- .../controller/action/world/Journal.html | 4 +- .../controller/action/world/OpenJournal.html | 392 ++++ .../controller/action/world/Options.html | 4 +- .../javelin/controller/action/world/Park.html | 8 +- .../controller/action/world/Rename.html | 4 +- .../controller/action/world/ResetScore.html | 8 +- .../controller/action/world/ShowOptions.html | 363 +++ .../action/world/ShowStatistics.html | 8 +- .../controller/action/world/UseItems.html | 4 +- .../javelin/controller/action/world/Work.html | 4 +- .../controller/action/world/WorldAction.html | 6 +- .../controller/action/world/WorldHelp.html | 4 +- .../controller/action/world/WorldMove.html | 4 +- .../world/improvement/BuildHighway.html | 25 +- .../action/world/improvement/BuildInn.html | 25 +- .../action/world/improvement/BuildMine.html | 25 +- .../action/world/improvement/BuildRoad.html | 25 +- .../action/world/improvement/BuildTown.html | 25 +- .../action/world/improvement/Deforestate.html | 25 +- .../world/improvement/package-frame.html | 4 +- .../world/improvement/package-summary.html | 4 +- .../world/improvement/package-tree.html | 4 +- .../action/world/package-frame.html | 9 +- .../action/world/package-summary.html | 44 +- .../controller/action/world/package-tree.html | 9 +- .../ai/AbstractAlphaBetaSearch.html | 2 +- .../javelin/controller/ai/ActionProvider.html | 8 +- .../javelin/controller/ai/AiThread.html | 14 +- .../controller/ai/AlphaBetaSearch.html | 514 +++++ .../javelin/controller/ai/BattleAi.html | 67 +- .../javelin/controller/ai/ChanceNode.html | 16 +- 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 | 25 +- .../javelin/controller/ai/cache/AiCache.html | 12 +- .../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 | 6 +- .../controller/ai/package-summary.html | 22 +- .../javelin/controller/ai/package-tree.html | 8 +- .../ai/valueselector/MaxValueSelector.html | 31 +- .../ai/valueselector/MinValueSelector.html | 31 +- .../ai/valueselector/ValueSelector.html | 63 +- .../ai/valueselector/package-frame.html | 4 +- .../ai/valueselector/package-summary.html | 4 +- .../ai/valueselector/package-tree.html | 4 +- .../challenge/ChallengeRatingCalculator.html | 23 +- .../challenge/RewardCalculator.html | 75 +- .../challenge/TouchAttackFactor.html | 4 +- .../challenge/factor/AbilitiesFactor.html | 4 +- .../challenge/factor/ArmorClassFactor.html | 4 +- .../challenge/factor/ClassLevelFactor.html | 10 +- .../controller/challenge/factor/CrFactor.html | 4 +- .../challenge/factor/FeatsFactor.html | 4 +- .../challenge/factor/FullAttackFactor.html | 4 +- .../controller/challenge/factor/HdFactor.html | 29 +- .../challenge/factor/SizeFactor.html | 4 +- .../factor/SizeFactorWithAttModifiers.html | 4 +- .../challenge/factor/SkillsFactor.html | 40 +- .../challenge/factor/SpeedFactor.html | 4 +- .../challenge/factor/SpellsFactor.html | 8 +- .../controller/challenge/factor/TypeData.html | 301 +++ .../challenge/factor/package-frame.html | 5 +- .../challenge/factor/package-summary.html | 8 +- .../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 +- .../controller/challenge/package-frame.html | 4 +- .../controller/challenge/package-summary.html | 4 +- .../controller/challenge/package-tree.html | 4 +- .../javelin/controller/db/EncounterIndex.html | 20 +- .../javelin/controller/db/Preferences.html | 157 +- .../javelin/controller/db/Properties.html | 4 +- .../javelin/controller/db/StateManager.html | 70 +- .../javelin/controller/db/package-frame.html | 4 +- .../controller/db/package-summary.html | 6 +- .../javelin/controller/db/package-tree.html | 4 +- .../controller/db/reader/ErrorHandler.html | 4 +- .../controller/db/reader/MonsterReader.html | 4 +- .../controller/db/reader/SpecialtiesLog.html | 4 +- .../db/reader/factor/Alignment.html | 4 +- .../db/reader/factor/ArmorClass.html | 4 +- .../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 | 4 +- .../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 | 4 +- .../db/reader/factor/Paragraph.html | 4 +- .../controller/db/reader/factor/Skills.html | 4 +- .../db/reader/factor/SpecialAttacks.html | 4 +- .../db/reader/factor/SpecialQualities.html | 4 +- .../controller/db/reader/factor/Speed.html | 4 +- .../db/reader/factor/package-frame.html | 4 +- .../db/reader/factor/package-summary.html | 4 +- .../db/reader/factor/package-tree.html | 4 +- .../db/reader/fields/Alignment.html | 4 +- .../db/reader/fields/ArmorClass.html | 4 +- .../controller/db/reader/fields/Attacks.html | 4 +- .../controller/db/reader/fields/Damage.html | 4 +- .../db/reader/fields/FaceAndReach.html | 4 +- .../controller/db/reader/fields/Feats.html | 4 +- .../db/reader/fields/FieldReader.html | 4 +- .../controller/db/reader/fields/HitDice.html | 4 +- .../db/reader/fields/Initiative.html | 4 +- .../controller/db/reader/fields/Name.html | 4 +- .../db/reader/fields/Organization.html | 37 +- .../db/reader/fields/Paragraph.html | 4 +- .../controller/db/reader/fields/Skills.html | 4 +- .../db/reader/fields/SpecialAttacks.html | 4 +- .../db/reader/fields/SpecialQualities.html | 4 +- .../controller/db/reader/fields/Speed.html | 4 +- .../db/reader/fields/package-frame.html | 4 +- .../db/reader/fields/package-summary.html | 8 +- .../db/reader/fields/package-tree.html | 8 +- .../controller/db/reader/package-frame.html | 4 +- .../controller/db/reader/package-summary.html | 4 +- .../controller/db/reader/package-tree.html | 4 +- .../controller/effect/DamageEffect.html | 4 +- .../controller/effect/package-frame.html | 4 +- .../controller/effect/package-summary.html | 4 +- .../controller/effect/package-tree.html | 4 +- .../controller/encounter/Encounter.html | 4 +- .../encounter/EncounterGenerator.html | 4 +- .../encounter/EncounterPossibilities.html | 4 +- .../controller/encounter/GeneratedFight.html | 4 +- .../encounter/MisalignmentDetector.html | 4 +- .../controller/encounter/package-frame.html | 4 +- .../controller/encounter/package-summary.html | 4 +- .../controller/encounter/package-tree.html | 4 +- .../controller/exception/GaveUpException.html | 4 +- .../controller/exception/NotPeaceful.html | 4 +- .../controller/exception/RepeatTurn.html | 4 +- .../exception/RepeatTurnException.html | 8 +- .../exception/RestartWorldGeneration.html | 4 +- .../controller/exception/StopThinking.html | 4 +- .../controller/exception/UnbalancedTeams.html | 4 +- .../exception/UnbalancedTeamsException.html | 4 +- .../exception/battle/BattleEvent.html | 4 +- .../exception/battle/EndBattle.html | 4 +- .../exception/battle/StartBattle.html | 19 +- .../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 | 8 +- .../controller/exception/package-tree.html | 8 +- .../controller/fight/ExhibitionFight.html | 8 +- .../javelin/controller/fight/Fight.html | 195 +- .../controller/fight/IncursionFight.html | 48 +- .../javelin/controller/fight/LairFight.html | 66 +- .../fight/PlanarFight.PlanarFightScreen.html | 4 +- .../javelin/controller/fight/PlanarFight.html | 2 +- .../fight/RandomDungeonEncounter.html | 16 +- .../controller/fight/RandomEncounter.html | 8 +- .../javelin/controller/fight/Siege.html | 60 +- .../controller/fight/TempleEncounter.html | 428 ++++ .../controller/fight/TrainingSession.html | 23 +- .../controller/fight/package-frame.html | 6 +- .../controller/fight/package-summary.html | 23 +- .../controller/fight/package-tree.html | 11 +- .../controller/fight/tournament/Champion.html | 4 +- .../fight/tournament/CrIterator.html | 4 +- .../fight/tournament/Exhibition.html | 4 +- .../controller/fight/tournament/Horde.html | 4 +- .../controller/fight/tournament/Match.html | 4 +- .../fight/tournament/MirrorMatch.html | 4 +- .../fight/tournament/package-frame.html | 4 +- .../fight/tournament/package-summary.html | 8 +- .../fight/tournament/package-tree.html | 8 +- .../encounter/Encounter.html} | 161 +- .../encounter/EncounterGenerator.html | 321 +++ .../encounter/EncounterPossibilities.html | 348 +++ .../generator/encounter/GeneratedFight.html | 273 +++ .../encounter/MisalignmentDetector.html | 283 +++ .../generator/encounter/package-frame.html | 24 + .../generator/encounter/package-summary.html | 165 ++ .../generator/encounter/package-tree.html | 139 ++ .../generator/feature/FeatureGeneration.html | 480 ++++ .../generator/feature/FeatureGenerator.html | 343 +++ .../generator/feature/package-frame.html | 21 + .../generator/feature/package-summary.html | 150 ++ .../generator/feature/package-tree.html | 136 ++ doc/javadoc/javelin/controller/map/Arena.html | 26 +- .../javelin/controller/map/DndMap.html | 64 +- doc/javadoc/javelin/controller/map/Map.html | 213 +- .../javelin/controller/map/MapGenerator.html | 10 +- .../javelin/controller/map/TyrantMap.html | 40 +- .../javelin/controller/map/desert/Rocky.html | 29 +- .../javelin/controller/map/desert/Sandy.html | 63 +- .../javelin/controller/map/desert/Tundra.html | 29 +- .../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 | 10 +- .../map/forest/package-summary.html | 10 +- .../controller/map/forest/package-tree.html | 10 +- .../controller/map/hill/GentleHiill.html | 4 +- .../controller/map/hill/RuggedHill.html | 4 +- .../controller/map/hill/package-frame.html | 8 +- .../controller/map/hill/package-summary.html | 8 +- .../controller/map/hill/package-tree.html | 8 +- .../javelin/controller/map/marsh/Moor.html | 82 +- .../javelin/controller/map/marsh/Swamp.html | 82 +- .../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 | 58 +- .../map/mountain/RuggedMountain.html | 4 +- .../map/mountain/package-frame.html | 8 +- .../map/mountain/package-summary.html | 12 +- .../controller/map/mountain/package-tree.html | 8 +- .../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 | 82 +- .../javelin/controller/map/plain/Farm.html | 63 +- .../controller/map/plain/Grasslands.html | 63 +- .../controller/map/plain/package-frame.html | 4 +- .../controller/map/plain/package-summary.html | 8 +- .../controller/map/plain/package-tree.html | 8 +- .../javelin/controller/old/Game.Delay.html | 355 +++ doc/javadoc/javelin/controller/old/Game.html | 1538 +++++++++++++ .../TownSiege.html => old/Interface.html} | 132 +- .../javelin/controller/old/package-frame.html | 25 + .../controller/old/package-summary.html | 159 ++ .../javelin/controller/old/package-tree.html | 152 ++ .../javelin/controller/package-frame.html | 5 +- .../javelin/controller/package-summary.html | 20 +- .../javelin/controller/package-tree.html | 5 +- .../controller/quality/DamageReduction.html | 8 +- .../controller/quality/EnergyImmunity.html | 8 +- .../controller/quality/EnergyResistance.html | 8 +- .../controller/quality/FastHealing.html | 4 +- .../controller/quality/FrightfulPresence.html | 4 +- .../controller/quality/ImprovedGrab.html | 4 +- .../controller/quality/MindImmunity.html | 8 +- .../javelin/controller/quality/Poison.html | 4 +- .../javelin/controller/quality/Quality.html | 4 +- .../controller/quality/SpellImmunity.html | 12 +- .../controller/quality/SpellResistance.html | 12 +- .../quality/SunlightVulnerability.html | 4 +- .../controller/quality/package-frame.html | 4 +- .../controller/quality/package-summary.html | 8 +- .../controller/quality/package-tree.html | 8 +- .../quality/perception/Darkvision.html | 4 +- .../quality/perception/LowLightVision.html | 4 +- .../quality/perception/Perception.html | 4 +- .../controller/quality/perception/Vision.html | 4 +- .../quality/perception/package-frame.html | 4 +- .../quality/perception/package-summary.html | 4 +- .../quality/perception/package-tree.html | 4 +- .../quality/resistance/CriticalImmunity.html | 4 +- .../quality/resistance/DamageReduction.html | 4 +- .../quality/resistance/EnergyImmunity.html | 4 +- ...rgyResistance.EnergyResistanceUpgrade.html | 6 +- .../quality/resistance/EnergyResistance.html | 4 +- .../quality/resistance/MindImmunity.html | 4 +- .../quality/resistance/ParalysisImmunity.html | 4 +- .../quality/resistance/PoisonImmunity.html | 4 +- .../quality/resistance/SpellImmunity.html | 4 +- .../quality/resistance/SpellResistance.html | 4 +- .../quality/resistance/package-frame.html | 4 +- .../quality/resistance/package-summary.html | 4 +- .../quality/resistance/package-tree.html | 4 +- .../controller/quality/subtype/Baatezu.html | 4 +- .../controller/quality/subtype/Elemental.html | 4 +- .../controller/quality/subtype/Ooze.html | 4 +- .../controller/quality/subtype/Subtype.html | 4 +- .../controller/quality/subtype/Undead.html | 4 +- .../quality/subtype/package-frame.html | 4 +- .../quality/subtype/package-summary.html | 4 +- .../quality/subtype/package-tree.html | 4 +- .../javelin/controller/terrain/Desert.html | 8 +- .../javelin/controller/terrain/Forest.html | 8 +- .../javelin/controller/terrain/Hill.html | 8 +- .../javelin/controller/terrain/Marsh.html | 8 +- .../javelin/controller/terrain/Mountains.html | 8 +- .../javelin/controller/terrain/Plains.html | 8 +- .../javelin/controller/terrain/Terrain.html | 161 +- .../controller/terrain/Underground.html | 8 +- .../javelin/controller/terrain/Water.html | 8 +- .../controller/terrain/hazard/Break.html | 4 +- .../controller/terrain/hazard/Cold.html | 4 +- .../terrain/hazard/Dehydration.html | 4 +- .../terrain/hazard/FallingTrees.html | 4 +- .../controller/terrain/hazard/Flood.html | 4 +- .../terrain/hazard/GettingLost.html | 4 +- .../controller/terrain/hazard/Hazard.html | 4 +- .../controller/terrain/hazard/Heat.html | 4 +- .../controller/terrain/hazard/Ice.html | 4 +- .../terrain/hazard/PartyHazard.html | 4 +- .../controller/terrain/hazard/Rockslide.html | 4 +- .../controller/terrain/hazard/Storm.html | 4 +- .../terrain/hazard/package-frame.html | 4 +- .../terrain/hazard/package-summary.html | 4 +- .../terrain/hazard/package-tree.html | 4 +- .../javelin/controller/terrain/map/Arena.html | 4 +- .../controller/terrain/map/DndMap.html | 4 +- .../javelin/controller/terrain/map/Map.html | 4 +- .../controller/terrain/map/MapGenerator.html | 4 +- .../javelin/controller/terrain/map/Maps.html | 4 +- .../controller/terrain/map/TyrantMap.html | 4 +- .../javelin/controller/terrain/map/Water.html | 4 +- .../controller/terrain/map/desert/Rocky.html | 4 +- .../controller/terrain/map/desert/Sandy.html | 4 +- .../controller/terrain/map/desert/Tundra.html | 4 +- .../terrain/map/desert/package-frame.html | 4 +- .../terrain/map/desert/package-summary.html | 4 +- .../terrain/map/desert/package-tree.html | 4 +- .../controller/terrain/map/forest/Dense.html | 4 +- .../controller/terrain/map/forest/Medium.html | 4 +- .../controller/terrain/map/forest/Sparse.html | 4 +- .../terrain/map/forest/package-frame.html | 4 +- .../terrain/map/forest/package-summary.html | 4 +- .../terrain/map/forest/package-tree.html | 4 +- .../controller/terrain/map/hill/Gentle.html | 4 +- .../controller/terrain/map/hill/Rugged.html | 4 +- .../terrain/map/hill/package-frame.html | 4 +- .../terrain/map/hill/package-summary.html | 4 +- .../terrain/map/hill/package-tree.html | 4 +- .../controller/terrain/map/marsh/Moor.html | 4 +- .../controller/terrain/map/marsh/Swamp.html | 4 +- .../terrain/map/marsh/package-frame.html | 4 +- .../terrain/map/marsh/package-summary.html | 4 +- .../terrain/map/marsh/package-tree.html | 4 +- .../terrain/map/mountain/Forbidding.html | 4 +- .../terrain/map/mountain/Meadow.html | 4 +- .../terrain/map/mountain/Rugged.html | 4 +- .../terrain/map/mountain/package-frame.html | 4 +- .../terrain/map/mountain/package-summary.html | 4 +- .../terrain/map/mountain/package-tree.html | 4 +- .../controller/terrain/map/package-frame.html | 4 +- .../terrain/map/package-summary.html | 4 +- .../controller/terrain/map/package-tree.html | 4 +- .../terrain/map/plain/Battlefield.html | 4 +- .../controller/terrain/map/plain/Farm.html | 4 +- .../terrain/map/plain/Grasslands.html | 4 +- .../terrain/map/plain/package-frame.html | 4 +- .../terrain/map/plain/package-summary.html | 4 +- .../terrain/map/plain/package-tree.html | 4 +- .../controller/terrain/map/tyrant/Caves.html | 4 +- .../terrain/map/tyrant/DarkForest.html | 4 +- .../terrain/map/tyrant/Graveyard.html | 4 +- .../controller/terrain/map/tyrant/Ruin.html | 4 +- .../terrain/map/tyrant/package-frame.html | 4 +- .../terrain/map/tyrant/package-summary.html | 4 +- .../terrain/map/tyrant/package-tree.html | 4 +- .../controller/terrain/package-frame.html | 4 +- .../controller/terrain/package-summary.html | 4 +- .../controller/terrain/package-tree.html | 4 +- .../controller/tournament/Champion.html | 4 +- .../controller/tournament/CrIterator.html | 4 +- .../controller/tournament/Exhibition.html | 10 +- .../tournament/ExhibitionScreen.html | 4 +- .../javelin/controller/tournament/Horde.html | 8 +- .../javelin/controller/tournament/Match.html | 4 +- .../controller/tournament/MirrorMatch.html | 4 +- .../controller/tournament/package-frame.html | 5 +- .../tournament/package-summary.html | 19 +- .../controller/tournament/package-tree.html | 33 +- .../upgrade/BreathWeaponUpgrade.html | 6 +- .../controller/upgrade/DamageReduction.html | 4 +- .../controller/upgrade/EnergyImmunity.html | 4 +- .../controller/upgrade/EnergyResistance.html | 4 +- .../controller/upgrade/FastHealing.html | 4 +- .../javelin/controller/upgrade/Flying.html | 4 +- .../controller/upgrade/NaturalArmor.html | 6 +- .../javelin/controller/upgrade/Spell.html | 6 +- .../controller/upgrade/SpellImmunity.html | 4 +- .../controller/upgrade/SpellResistance.html | 4 +- .../javelin/controller/upgrade/Swimming.html | 6 +- .../javelin/controller/upgrade/Upgrade.html | 28 +- .../controller/upgrade/UpgradeHandler.html | 30 +- .../javelin/controller/upgrade/Vision.html | 4 +- .../controller/upgrade/WalkingSpeed.html | 4 +- .../upgrade/ability/RaiseAbility.html | 6 +- .../upgrade/ability/RaiseCharisma.html | 6 +- .../upgrade/ability/RaiseConsitution.html | 6 +- .../upgrade/ability/RaiseDexterity.html | 6 +- .../upgrade/ability/RaiseIntelligence.html | 12 +- .../upgrade/ability/RaiseStrength.html | 6 +- .../upgrade/ability/RaiseWisdom.html | 6 +- .../upgrade/ability/package-frame.html | 4 +- .../upgrade/ability/package-summary.html | 4 +- .../upgrade/ability/package-tree.html | 4 +- .../upgrade/classes/Aristocrat.html | 100 +- .../upgrade/classes/ClassAdvancement.html | 156 +- .../controller/upgrade/classes/Commoner.html | 98 +- .../controller/upgrade/classes/Expert.html | 98 +- .../controller/upgrade/classes/Level.html | 13 +- .../controller/upgrade/classes/Warrior.html | 100 +- .../upgrade/classes/package-frame.html | 4 +- .../upgrade/classes/package-summary.html | 4 +- .../upgrade/classes/package-tree.html | 6 +- .../controller/upgrade/damage/Damage.html | 6 +- .../upgrade/damage/EffectUpgrade.html | 6 +- .../upgrade/damage/MeleeDamage.html | 6 +- .../upgrade/damage/RangedDamage.html | 6 +- .../upgrade/damage/package-frame.html | 4 +- .../upgrade/damage/package-summary.html | 4 +- .../upgrade/damage/package-tree.html | 4 +- .../upgrade/feat/BullRushUpgrade.html | 6 +- .../upgrade/feat/CleaveUpgrade.html | 6 +- .../upgrade/feat/CombatExpertiseUpgrade.html | 6 +- .../controller/upgrade/feat/FeatUpgrade.html | 6 +- .../upgrade/feat/GreatCleaveUpgrade.html | 6 +- .../upgrade/feat/GreatFortitude.html | 6 +- .../upgrade/feat/ImprovedFeintUpgrade.html | 6 +- .../upgrade/feat/ImprovedGrappleUpgrade.html | 6 +- .../upgrade/feat/ImprovedInititative.html | 6 +- .../upgrade/feat/ImprovedPreciseShot.html | 6 +- .../upgrade/feat/ImprovedTripUpgrade.html | 6 +- .../controller/upgrade/feat/IronWill.html | 6 +- .../upgrade/feat/LightningReflexes.html | 6 +- .../controller/upgrade/feat/MeleeFocus.html | 6 +- .../upgrade/feat/PointBlankShot.html | 6 +- .../upgrade/feat/PowerAttackUpgrade.html | 6 +- .../controller/upgrade/feat/PreciseShot.html | 6 +- .../controller/upgrade/feat/RangedFocus.html | 6 +- .../controller/upgrade/feat/RapidShot.html | 6 +- .../controller/upgrade/feat/Toughness.html | 6 +- .../upgrade/feat/package-frame.html | 4 +- .../upgrade/feat/package-summary.html | 4 +- .../controller/upgrade/feat/package-tree.html | 4 +- .../controller/upgrade/movement/Burrow.html | 6 +- .../controller/upgrade/movement/Flying.html | 6 +- .../upgrade/movement/WalkingSpeed.html | 6 +- .../upgrade/movement/package-frame.html | 4 +- .../upgrade/movement/package-summary.html | 4 +- .../upgrade/movement/package-tree.html | 4 +- .../controller/upgrade/package-frame.html | 4 +- .../controller/upgrade/package-summary.html | 4 +- .../controller/upgrade/package-tree.html | 4 +- .../controller/upgrade/skill/Acrobatics.html | 106 +- .../upgrade/skill/Concentration.html | 106 +- .../controller/upgrade/skill/Diplomacy.html | 109 +- .../upgrade/skill/DisableDevice.html | 106 +- .../upgrade/skill/GatherInformation.html | 106 +- .../controller/upgrade/skill/Heal.html | 109 +- .../controller/upgrade/skill/Hide.html | 4 +- .../controller/upgrade/skill/Knowledge.html | 106 +- .../controller/upgrade/skill/Listen.html | 4 +- .../upgrade/skill/MoveSilently.html | 4 +- .../controller/upgrade/skill/Perception.html | 109 +- .../controller/upgrade/skill/Search.html | 106 +- .../upgrade/skill/SkillUpgrade.html | 148 +- .../controller/upgrade/skill/Spellcraft.html | 106 +- .../controller/upgrade/skill/Spot.html | 4 +- .../controller/upgrade/skill/Stealth.html | 106 +- .../controller/upgrade/skill/Survival.html | 106 +- .../upgrade/skill/UseMagicDevice.html | 109 +- .../upgrade/skill/package-frame.html | 4 +- .../upgrade/skill/package-summary.html | 4 +- .../upgrade/skill/package-tree.html | 4 +- .../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 | 4 +- .../controller/walker/package-tree.html | 4 +- .../javelin/model/BattleMap.VisionCache.html | 4 +- doc/javadoc/javelin/model/BattleMap.html | 8 +- doc/javadoc/javelin/model/Cloneable.html | 4 +- doc/javadoc/javelin/model/EquipmentMap.html | 47 +- doc/javadoc/javelin/model/Realm.html | 63 +- doc/javadoc/javelin/model/TeamContainer.html | 4 +- .../javelin/model/condition/Barkskin.html | 4 +- .../javelin/model/condition/Blinking.html | 4 +- .../javelin/model/condition/Breathless.html | 4 +- doc/javadoc/javelin/model/condition/Buff.html | 75 +- .../javelin/model/condition/Charging.html | 4 +- .../model/condition/Condition.Effect.html | 4 +- .../javelin/model/condition/Condition.html | 6 +- .../javelin/model/condition/Darkvision.html | 4 +- .../javelin/model/condition/Defending.html | 4 +- .../model/condition/DefensiveStance.html | 4 +- .../javelin/model/condition/Dominated.html | 4 +- .../javelin/model/condition/Exhausted.html | 4 +- .../javelin/model/condition/Fatigued.html | 4 +- .../javelin/model/condition/Feigned.html | 4 +- .../javelin/model/condition/FindingTraps.html | 4 +- .../javelin/model/condition/Flying.html | 4 +- .../javelin/model/condition/Grappling.html | 4 +- .../javelin/model/condition/Heroic.html | 8 +- .../model/condition/Knowledgeable.html | 346 +++ .../javelin/model/condition/Neutralized.html | 8 +- .../javelin/model/condition/Paralyzed.html | 4 +- .../javelin/model/condition/Poisoned.html | 4 +- .../javelin/model/condition/Prone.html | 4 +- .../javelin/model/condition/Resistant.html | 4 +- .../javelin/model/condition/Shaken.html | 4 +- .../javelin/model/condition/Strider.html | 4 +- .../javelin/model/condition/Stunned.html | 4 +- .../javelin/model/condition/Vampiric.html | 4 +- .../model/condition/package-frame.html | 5 +- .../model/condition/package-summary.html | 24 +- .../javelin/model/condition/package-tree.html | 5 +- .../model/condition/totem/Cunning.html | 4 +- .../model/condition/totem/Enduring.html | 4 +- .../model/condition/totem/Graceful.html | 4 +- .../model/condition/totem/Splendid.html | 4 +- .../javelin/model/condition/totem/Strong.html | 4 +- .../javelin/model/condition/totem/Wise.html | 4 +- .../model/condition/totem/package-frame.html | 4 +- .../condition/totem/package-summary.html | 4 +- .../model/condition/totem/package-tree.html | 4 +- doc/javadoc/javelin/model/feat/Alertness.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 | 4 +- .../javelin/model/feat/package-tree.html | 4 +- doc/javadoc/javelin/model/item/Item.html | 42 +- .../javelin/model/item/ItemSelection.html | 4 +- doc/javadoc/javelin/model/item/Key.html | 104 +- doc/javadoc/javelin/model/item/Potion.html | 6 +- doc/javadoc/javelin/model/item/Scroll.html | 6 +- doc/javadoc/javelin/model/item/Wand.html | 42 +- .../model/item/artifact/AmuletOfHealth.html | 6 +- .../javelin/model/item/artifact/Artifact.html | 6 +- .../item/artifact/BeltOfGiantStrength.html | 6 +- .../model/item/artifact/CloakOfCharisma.html | 6 +- .../item/artifact/CloakOfResistance.html | 6 +- .../item/artifact/GlovesOfDexterity.html | 6 +- .../model/item/artifact/GogglesOfNight.html | 6 +- .../item/artifact/HeadbandOfIntellect.html | 6 +- .../artifact/MantleOfSpellResistance.html | 6 +- .../model/item/artifact/PeriaptOfWisdom.html | 6 +- .../item/artifact/RingOfEnergyResistance.html | 6 +- .../model/item/artifact/RingOfProtection.html | 6 +- .../javelin/model/item/artifact/Slot.html | 4 +- .../model/item/artifact/WingsOfFlying.html | 6 +- .../model/item/artifact/package-frame.html | 4 +- .../model/item/artifact/package-summary.html | 8 +- .../model/item/artifact/package-tree.html | 8 +- .../javelin/model/item/package-frame.html | 4 +- .../javelin/model/item/package-summary.html | 7 +- .../javelin/model/item/package-tree.html | 4 +- .../javelin/model/item/potion/Darkvision.html | 4 +- .../javelin/model/item/potion/Fly.html | 4 +- .../javelin/model/item/potion/Heroism.html | 4 +- .../javelin/model/item/potion/Potion.html | 4 +- .../model/item/potion/barkskin/Barkskin.html | 4 +- .../model/item/potion/barkskin/Barkskin2.html | 4 +- .../model/item/potion/barkskin/Barkskin3.html | 4 +- .../model/item/potion/barkskin/Barkskin4.html | 4 +- .../model/item/potion/barkskin/Barkskin5.html | 4 +- .../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 | 4 +- .../item/potion/cure/CureLightWounds.html | 4 +- .../item/potion/cure/CureModerateWounds.html | 4 +- .../model/item/potion/cure/CurePotion.html | 4 +- .../item/potion/cure/CureSeriousWounds.html | 4 +- .../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 | 4 +- .../model/item/potion/package-tree.html | 4 +- .../potion/resistenergy/ResistEnergy.html | 4 +- .../potion/resistenergy/ResistEnergy2.html | 4 +- .../potion/resistenergy/ResistEnergy4.html | 4 +- .../potion/resistenergy/ResistEnergy6.html | 4 +- .../potion/resistenergy/package-frame.html | 4 +- .../potion/resistenergy/package-summary.html | 4 +- .../potion/resistenergy/package-tree.html | 4 +- .../item/potion/totem/BearsEndurance.html | 4 +- .../item/potion/totem/BullsStrength.html | 4 +- .../model/item/potion/totem/CatsGrace.html | 4 +- .../item/potion/totem/EaglesSplendor.html | 4 +- .../model/item/potion/totem/FoxsCunning.html | 4 +- .../model/item/potion/totem/OwlsWisdom.html | 4 +- .../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/relic/Amulet.html | 334 +++ .../javelin/model/item/relic/Ankh.html | 334 +++ .../javelin/model/item/relic/Candle.html | 332 +++ .../javelin/model/item/relic/Crown.html | 334 +++ .../javelin/model/item/relic/Flute.html | 334 +++ doc/javadoc/javelin/model/item/relic/Map.html | 334 +++ .../javelin/model/item/relic/Relic.html | 386 ++++ .../javelin/model/item/relic/Skull.html | 334 +++ .../model/item/relic/package-frame.html | 27 + .../model/item/relic/package-summary.html | 184 ++ .../model/item/relic/package-tree.html | 149 ++ .../javelin/model/item/scroll/PryingEyes.html | 4 +- .../model/item/scroll/RaiseScroll.html | 4 +- .../model/item/scroll/RecallScroll.html | 4 +- .../model/item/scroll/RessurectScroll.html | 4 +- .../javelin/model/item/scroll/Scroll.html | 4 +- .../item/scroll/SecureShelterScroll.html | 4 +- .../javelin/model/item/scroll/Teleport.html | 4 +- .../item/scroll/dungeon/DiscernLocation.html | 4 +- .../item/scroll/dungeon/DungeonScroll.html | 4 +- .../item/scroll/dungeon/LocateObject.html | 4 +- .../item/scroll/dungeon/package-frame.html | 4 +- .../item/scroll/dungeon/package-summary.html | 4 +- .../item/scroll/dungeon/package-tree.html | 4 +- .../model/item/scroll/package-frame.html | 4 +- .../model/item/scroll/package-summary.html | 4 +- .../model/item/scroll/package-tree.html | 4 +- doc/javadoc/javelin/model/package-frame.html | 4 +- .../javelin/model/package-summary.html | 4 +- doc/javadoc/javelin/model/package-tree.html | 4 +- doc/javadoc/javelin/model/spell/Blink.html | 4 +- doc/javadoc/javelin/model/spell/DayLight.html | 4 +- .../javelin/model/spell/DeeperDarkness.html | 4 +- .../javelin/model/spell/DominateMonster.html | 4 +- doc/javadoc/javelin/model/spell/Doom.html | 4 +- doc/javadoc/javelin/model/spell/Heroism.html | 4 +- .../javelin/model/spell/HoldMonster.html | 4 +- doc/javadoc/javelin/model/spell/Ray.html | 6 +- .../javelin/model/spell/ScrollSpell.html | 4 +- .../javelin/model/spell/SlayLiving.html | 4 +- doc/javadoc/javelin/model/spell/Summon.html | 6 +- doc/javadoc/javelin/model/spell/Touch.html | 6 +- .../javelin/model/spell/VampiricRay.html | 4 +- .../model/spell/abjuration/Barkskin.html | 6 +- .../javelin/model/spell/abjuration/Blink.html | 6 +- .../model/spell/abjuration/DispelMagic.html | 6 +- .../model/spell/abjuration/ResistEnergy.html | 6 +- .../model/spell/abjuration/package-frame.html | 4 +- .../spell/abjuration/package-summary.html | 4 +- .../model/spell/abjuration/package-tree.html | 4 +- .../conjuration/healing/NeutralizePoison.html | 6 +- .../spell/conjuration/healing/RaiseDead.html | 6 +- .../spell/conjuration/healing/Ressurect.html | 6 +- .../conjuration/healing/Restoration.html | 6 +- .../conjuration/healing/package-frame.html | 4 +- .../conjuration/healing/package-summary.html | 4 +- .../conjuration/healing/package-tree.html | 4 +- .../healing/wounds/CureCriticalWounds.html | 6 +- .../healing/wounds/CureLightWounds.html | 6 +- .../healing/wounds/CureModerateWounds.html | 6 +- .../healing/wounds/CureSeriousWounds.html | 6 +- .../healing/wounds/package-frame.html | 4 +- .../healing/wounds/package-summary.html | 4 +- .../healing/wounds/package-tree.html | 4 +- .../teleportation/GreaterTeleport.html | 6 +- .../teleportation/SecureShelter.html | 6 +- .../teleportation/WordOfRecall.html | 6 +- .../teleportation/package-frame.html | 4 +- .../teleportation/package-summary.html | 4 +- .../teleportation/package-tree.html | 4 +- .../spell/divination/DiscernLocation.html | 6 +- .../model/spell/divination/FindTraps.html | 6 +- .../model/spell/divination/LocateObject.html | 6 +- .../model/spell/divination/PryingEyes.html | 6 +- .../model/spell/divination/package-frame.html | 4 +- .../spell/divination/package-summary.html | 4 +- .../model/spell/divination/package-tree.html | 4 +- .../compulsion/DominateMonster.html | 6 +- .../spell/enchantment/compulsion/Heroism.html | 6 +- .../enchantment/compulsion/HoldMonster.html | 6 +- .../enchantment/compulsion/package-frame.html | 4 +- .../compulsion/package-summary.html | 4 +- .../enchantment/compulsion/package-tree.html | 4 +- .../model/spell/evocation/DayLight.html | 6 +- .../model/spell/evocation/DeeperDarkness.html | 6 +- .../model/spell/evocation/FlameStrike.html | 6 +- .../model/spell/evocation/MagicMissile.html | 6 +- .../model/spell/evocation/PolarRay.html | 6 +- .../model/spell/evocation/ScorchingRay.html | 6 +- .../model/spell/evocation/SoundBurst.html | 6 +- .../model/spell/evocation/package-frame.html | 4 +- .../spell/evocation/package-summary.html | 4 +- .../model/spell/evocation/package-tree.html | 4 +- .../javelin/model/spell/necromancy/Doom.html | 6 +- .../model/spell/necromancy/Poison.html | 6 +- .../spell/necromancy/RayOfExhaustion.html | 6 +- .../model/spell/necromancy/SlayLiving.html | 6 +- .../model/spell/necromancy/VampiricTouch.html | 6 +- .../model/spell/necromancy/package-frame.html | 4 +- .../spell/necromancy/package-summary.html | 4 +- .../model/spell/necromancy/package-tree.html | 4 +- .../wounds/InflictCriticalWounds.html | 6 +- .../necromancy/wounds/InflictLightWounds.html | 6 +- .../wounds/InflictModerateWounds.html | 6 +- .../wounds/InflictSeriousWounds.html | 6 +- .../necromancy/wounds/package-frame.html | 4 +- .../necromancy/wounds/package-summary.html | 4 +- .../spell/necromancy/wounds/package-tree.html | 4 +- .../javelin/model/spell/package-frame.html | 4 +- .../javelin/model/spell/package-summary.html | 8 +- .../javelin/model/spell/package-tree.html | 8 +- .../model/spell/totem/BearsEndurance.html | 6 +- .../model/spell/totem/BullsStrength.html | 6 +- .../javelin/model/spell/totem/CatsGrace.html | 6 +- .../model/spell/totem/EaglesSplendor.html | 6 +- .../model/spell/totem/FoxsCunning.html | 6 +- .../javelin/model/spell/totem/OwlsWisdom.html | 6 +- .../model/spell/totem/TotemsSpell.html | 6 +- .../model/spell/totem/package-frame.html | 4 +- .../model/spell/totem/package-summary.html | 4 +- .../model/spell/totem/package-tree.html | 4 +- .../spell/transmutation/ControlWeather.html | 6 +- .../model/spell/transmutation/Darkvision.html | 6 +- .../model/spell/transmutation/Fly.html | 6 +- .../spell/transmutation/Longstrider.html | 6 +- .../spell/transmutation/package-frame.html | 4 +- .../spell/transmutation/package-summary.html | 4 +- .../spell/transmutation/package-tree.html | 4 +- .../spell/wounds/CureCriticalWounds.html | 4 +- .../model/spell/wounds/CureLightWounds.html | 4 +- .../spell/wounds/CureModerateWounds.html | 4 +- .../model/spell/wounds/CureSeriousWounds.html | 4 +- .../spell/wounds/InflictCriticalWounds.html | 4 +- .../spell/wounds/InflictLightWounds.html | 4 +- .../spell/wounds/InflictModerateWounds.html | 4 +- .../spell/wounds/InflictSeriousWounds.html | 4 +- .../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 | 18 +- 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 | 57 +- .../javelin/model/unit/CurrentAttack.html | 4 +- doc/javadoc/javelin/model/unit/HD.html | 4 +- doc/javadoc/javelin/model/unit/Monster.html | 214 +- doc/javadoc/javelin/model/unit/Skills.html | 114 +- doc/javadoc/javelin/model/unit/Squad.html | 123 +- .../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 | 6 +- .../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 | 4 +- .../javelin/model/unit/package-summary.html | 4 +- .../javelin/model/unit/package-tree.html | 4 +- .../javelin/model/unit/transport/Airship.html | 15 +- .../model/unit/transport/Carriage.html | 15 +- .../model/unit/transport/FlyingNimbus.html | 341 +++ .../javelin/model/unit/transport/Ship.html | 15 +- .../model/unit/transport/Transport.html | 64 +- .../model/unit/transport/package-frame.html | 5 +- .../model/unit/transport/package-summary.html | 13 +- .../model/unit/transport/package-tree.html | 10 +- doc/javadoc/javelin/model/world/Caravan.html | 37 +- .../javelin/model/world/Improvement.html | 60 +- .../javelin/model/world/Incursion.html | 172 +- doc/javadoc/javelin/model/world/Merchant.html | 4 +- .../javelin/model/world/ParkedVehicle.html | 42 +- doc/javadoc/javelin/model/world/Season.html | 4 +- doc/javadoc/javelin/model/world/Squad.html | 4 +- .../javelin/model/world/World.Region.html | 8 +- doc/javadoc/javelin/model/world/World.html | 75 +- .../javelin/model/world/WorldActor.html | 109 +- .../javelin/model/world/location/Lair.html | 39 +- .../model/world/location/Location.html | 27 +- .../javelin/model/world/location/Outpost.html | 39 +- .../javelin/model/world/location/Portal.html | 60 +- .../javelin/model/world/location/Temple.html | 774 +++++++ .../model/world/location/dungeon/Altar.html | 314 +++ .../model/world/location/dungeon/Chest.html | 65 +- .../model/world/location/dungeon/Crawler.html | 4 +- .../model/world/location/dungeon/Dungeon.html | 359 ++- .../model/world/location/dungeon/Feature.html | 75 +- .../world/location/dungeon/Fountain.html | 20 +- .../world/location/dungeon/StairsDown.html} | 149 +- .../world/location/dungeon/StairsUp.html | 22 +- .../world/location/dungeon/TempleDungeon.html | 504 +++++ .../model/world/location/dungeon/Trap.html | 37 +- .../location/dungeon/crawler/Crawler.html | 365 +++ .../dungeon/crawler/HorizontalCorridor.html | 319 +++ .../world/location/dungeon/crawler/Room.html | 329 +++ .../dungeon/crawler/VerticalCorridor.html | 319 +++ .../dungeon/crawler/package-frame.html | 23 + .../dungeon/crawler/package-summary.html | 160 ++ .../dungeon/crawler/package-tree.html | 141 ++ .../world/location/dungeon/package-frame.html | 5 +- .../location/dungeon/package-summary.html | 24 +- .../world/location/dungeon/package-tree.html | 9 +- .../location/dungeon/temple/AirTemple.html | 389 ++++ .../location/dungeon/temple/EarthTemple.html | 397 ++++ .../location/dungeon/temple/EvilTemple.html | 412 ++++ .../location/dungeon/temple/FireTemple.html | 398 ++++ .../location/dungeon/temple/GoodTemple.html | 420 ++++ .../location/dungeon/temple/MagicTemple.html | 422 ++++ .../world/location/dungeon/temple/Temple.html | 799 +++++++ .../dungeon/temple/TempleDungeon.html | 640 ++++++ .../location/dungeon/temple/WaterTemple.html | 408 ++++ .../dungeon/temple/features/Altar.html | 324 +++ .../dungeon/temple/features/Brazier.html | 323 +++ .../dungeon/temple/features/FruitTree.html | 323 +++ .../dungeon/temple/features/Portal.html | 323 +++ .../dungeon/temple/features/Spirit.html | 323 +++ .../dungeon/temple/features/StairsDown.html | 323 +++ .../temple/features/package-frame.html | 25 + .../temple/features/package-summary.html | 164 ++ .../dungeon/temple/features/package-tree.html | 144 ++ .../dungeon/temple/package-frame.html | 28 + .../dungeon/temple/package-summary.html | 191 ++ .../location/dungeon/temple/package-tree.html | 166 ++ .../world/location/fortification/Academy.html | 97 +- .../location/fortification/Dwelling.html | 43 +- .../location/fortification/Fortification.html | 31 +- .../location/fortification/Guardian.html | 39 +- .../world/location/fortification/Inn.html | 39 +- .../location/fortification/MagesGuild.html | 14 +- .../fortification/MartialAcademy.html | 14 +- .../world/location/fortification/Mine.html | 45 +- .../world/location/fortification/Shrine.html | 39 +- .../world/location/fortification/Trove.html | 43 +- .../location/fortification/package-frame.html | 4 +- .../fortification/package-summary.html | 8 +- .../location/fortification/package-tree.html | 8 +- .../model/world/location/package-frame.html | 4 +- .../model/world/location/package-summary.html | 4 +- .../model/world/location/package-tree.html | 4 +- .../world/location/temple/AirTemple.html | 384 ++++ .../world/location/temple/EarthTemple.html | 384 ++++ .../world/location/temple/EvilTemple.html | 384 ++++ .../world/location/temple/FireTemple.html | 350 +++ .../world/location/temple/GoodTemple.html | 384 ++++ .../world/location/temple/MagicTemple.html | 390 ++++ .../model/world/location/temple/Temple.html | 509 +++++ .../world/location/temple/WaterTemple.html | 384 ++++ .../world/location/temple/package-frame.html | 27 + .../location/temple/package-summary.html | 170 ++ .../world/location/temple/package-tree.html | 161 ++ .../town/Accommodations.RestOption.html | 4 +- .../world/location/town/Accommodations.html | 4 +- .../world/location/town/CraftingOrder.html | 4 +- .../model/world/location/town/Order.html | 4 +- .../model/world/location/town/OrderQueue.html | 4 +- .../world/location/town/ResearchData.html | 4 +- .../world/location/town/ResearchQueue.html | 4 +- .../model/world/location/town/Town.html | 93 +- .../world/location/town/TrainingOrder.html | 4 +- .../location/town/manager/HumanManager.html | 4 +- .../location/town/manager/MonsterManager.html | 4 +- .../location/town/manager/TownManager.html | 4 +- .../location/town/manager/package-frame.html | 4 +- .../town/manager/package-summary.html | 4 +- .../location/town/manager/package-tree.html | 4 +- .../world/location/town/package-frame.html | 4 +- .../world/location/town/package-summary.html | 4 +- .../world/location/town/package-tree.html | 4 +- .../town/research/AccommodationResearch.html | 6 +- .../world/location/town/research/Discard.html | 6 +- .../world/location/town/research/Grow.html | 6 +- .../location/town/research/ItemResearch.html | 6 +- .../location/town/research/LairResearch.html | 6 +- .../world/location/town/research/Recruit.html | 6 +- .../world/location/town/research/Redraw.html | 6 +- .../location/town/research/Research.html | 55 +- .../town/research/SpecialResearchCard.html | 6 +- .../town/research/TransportResearch.html | 6 +- .../town/research/UpgradeResearch.html | 6 +- .../location/town/research/package-frame.html | 4 +- .../town/research/package-summary.html | 4 +- .../location/town/research/package-tree.html | 4 +- .../location/unique/AdventurersGuild.html | 41 +- .../world/location/unique/Artificer.html | 43 +- .../model/world/location/unique/Haxor.html | 67 +- .../location/unique/MercenariesGuild.html | 68 +- .../world/location/unique/PillarOfSkulls.html | 39 +- .../location/unique/SummoningCircle.html | 14 +- .../world/location/unique/TrainingHall.html | 39 +- .../world/location/unique/UniqueLocation.html | 12 +- .../world/location/unique/package-frame.html | 4 +- .../location/unique/package-summary.html | 6 +- .../world/location/unique/package-tree.html | 4 +- .../javelin/model/world/package-frame.html | 4 +- .../javelin/model/world/package-summary.html | 4 +- .../javelin/model/world/package-tree.html | 4 +- .../javelin/model/world/place/Lair.html | 4 +- .../javelin/model/world/place/Outpost.html | 4 +- .../javelin/model/world/place/Portal.html | 4 +- .../javelin/model/world/place/WorldPlace.html | 4 +- .../model/world/place/dungeon/Crawler.html | 4 +- .../model/world/place/dungeon/Dungeon.html | 4 +- .../model/world/place/dungeon/Feature.html | 4 +- .../model/world/place/dungeon/Fountain.html | 4 +- .../model/world/place/dungeon/StairsUp.html | 4 +- .../model/world/place/dungeon/Trap.html | 4 +- .../model/world/place/dungeon/Treasure.html | 4 +- .../world/place/dungeon/package-frame.html | 4 +- .../world/place/dungeon/package-summary.html | 4 +- .../world/place/dungeon/package-tree.html | 4 +- .../model/world/place/guarded/Academy.html | 4 +- .../model/world/place/guarded/Dwelling.html | 4 +- .../world/place/guarded/GuardedPlace.html | 4 +- .../model/world/place/guarded/Guardian.html | 4 +- .../model/world/place/guarded/Inn.html | 4 +- .../model/world/place/guarded/Shrine.html | 4 +- .../world/place/guarded/package-frame.html | 4 +- .../world/place/guarded/package-summary.html | 4 +- .../world/place/guarded/package-tree.html | 4 +- .../model/world/place/package-frame.html | 4 +- .../model/world/place/package-summary.html | 4 +- .../model/world/place/package-tree.html | 4 +- .../place/town/Accommodations.RestOption.html | 4 +- .../world/place/town/Accommodations.html | 4 +- .../model/world/place/town/CraftingOrder.html | 4 +- .../javelin/model/world/place/town/Order.html | 4 +- .../model/world/place/town/OrderQueue.html | 4 +- .../model/world/place/town/ResearchData.html | 38 +- .../model/world/place/town/ResearchQueue.html | 4 +- .../javelin/model/world/place/town/Town.html | 55 +- .../model/world/place/town/TrainingOrder.html | 4 +- .../model/world/place/town/Transport.html | 4 +- .../place/town/manager/HumanManager.html | 4 +- .../place/town/manager/MonsterManager.html | 4 +- .../world/place/town/manager/TownManager.html | 4 +- .../place/town/manager/package-frame.html | 4 +- .../place/town/manager/package-summary.html | 4 +- .../place/town/manager/package-tree.html | 4 +- .../model/world/place/town/package-frame.html | 4 +- .../world/place/town/package-summary.html | 4 +- .../model/world/place/town/package-tree.html | 4 +- .../town/research/AccommodationResearch.html | 8 +- .../world/place/town/research/Discard.html | 14 +- .../model/world/place/town/research/Grow.html | 8 +- .../place/town/research/ItemResearch.html | 8 +- .../place/town/research/LairResearch.html | 8 +- .../world/place/town/research/Recruit.html | 8 +- .../world/place/town/research/Redraw.html | 9 +- .../world/place/town/research/Research.html | 8 +- .../town/research/SpecialResearchCard.html | 38 +- .../town/research/TransportResearch.html | 8 +- .../place/town/research/UpgradeResearch.html | 8 +- .../place/town/research/package-frame.html | 4 +- .../place/town/research/package-summary.html | 10 +- .../place/town/research/package-tree.html | 4 +- .../place/unique/Artificer.Selection.html | 4 +- .../model/world/place/unique/Artificer.html | 4 +- .../model/world/place/unique/Haxor.html | 4 +- .../world/place/unique/MercenariesGuild.html | 4 +- .../world/place/unique/UniqueLocation.html | 4 +- .../world/place/unique/package-frame.html | 4 +- .../world/place/unique/package-summary.html | 4 +- .../world/place/unique/package-tree.html | 4 +- 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 | 4 +- doc/javadoc/javelin/view/Images.html | 21 +- doc/javadoc/javelin/view/KeysScreen.html | 8 +- doc/javadoc/javelin/view/MapPanel.html | 4 +- doc/javadoc/javelin/view/StatusPanel.html | 8 +- doc/javadoc/javelin/view/frame/Frame.html | 4 +- .../view/frame/keys/BattleKeysScreen.html | 4 +- .../view/frame/keys/PreferencesScreen.html | 4 +- .../javelin/view/frame/keys/TextScreen.html | 4 +- .../view/frame/keys/WorldKeysScreen.html | 4 +- .../view/frame/keys/package-frame.html | 4 +- .../view/frame/keys/package-summary.html | 8 +- .../javelin/view/frame/keys/package-tree.html | 8 +- .../javelin/view/frame/package-frame.html | 4 +- .../javelin/view/frame/package-summary.html | 4 +- .../javelin/view/frame/package-tree.html | 4 +- .../javelin/view/mappanel/MapPanel.html | 547 +++++ .../javelin/view/mappanel/MapPanelOld.html | 814 +++++++ .../javelin/view/mappanel/package-frame.html | 21 + .../view/mappanel/package-summary.html | 151 ++ .../javelin/view/mappanel/package-tree.html | 151 ++ doc/javadoc/javelin/view/package-frame.html | 5 +- doc/javadoc/javelin/view/package-summary.html | 15 +- doc/javadoc/javelin/view/package-tree.html | 5 +- ...attleScreen.DescendingLevelComparator.html | 4 +- .../javelin/view/screen/BattleScreen.html | 157 +- .../javelin/view/screen/BribingScreen.html | 4 +- .../javelin/view/screen/DungeonScreen.html | 49 +- .../javelin/view/screen/InfoScreen.html | 4 +- .../javelin/view/screen/IntroScreen.html | 4 +- .../javelin/view/screen/LairScreen.html | 4 +- doc/javadoc/javelin/view/screen/Option.html | 4 +- .../javelin/view/screen/SquadScreen.html | 100 +- .../javelin/view/screen/StatisticsScreen.html | 4 +- .../javelin/view/screen/WorldScreen.html | 169 +- .../view/screen/haxor/BorrowMoney.html | 36 +- .../view/screen/haxor/ChangeAvatar.html | 11 +- .../javelin/view/screen/haxor/Hax.html | 30 +- .../view/screen/haxor/HaxorScreen.html | 6 +- .../view/screen/haxor/Materialize.html | 11 +- .../javelin/view/screen/haxor/Rebirth.html | 11 +- .../view/screen/haxor/RemoveAbility.html | 11 +- .../javelin/view/screen/haxor/Ressurect.html | 11 +- .../javelin/view/screen/haxor/SummonAlly.html | 11 +- .../javelin/view/screen/haxor/Teleport.html | 11 +- .../javelin/view/screen/haxor/Win.html | 28 +- .../view/screen/haxor/package-frame.html | 4 +- .../view/screen/haxor/package-summary.html | 4 +- .../view/screen/haxor/package-tree.html | 4 +- .../javelin/view/screen/package-frame.html | 4 +- .../javelin/view/screen/package-summary.html | 8 +- .../javelin/view/screen/package-tree.html | 8 +- .../view/screen/shopping/ArtificerScreen.html | 6 +- .../view/screen/shopping/MerchantScreen.html | 6 +- .../view/screen/shopping/ShoppingScreen.html | 6 +- .../view/screen/shopping/TownShopScreen.html | 6 +- .../view/screen/shopping/package-frame.html | 4 +- .../view/screen/shopping/package-summary.html | 4 +- .../view/screen/shopping/package-tree.html | 4 +- .../view/screen/town/PurchaseOption.html | 4 +- .../view/screen/town/PurchaseScreen.html | 6 +- .../view/screen/town/RecruitScreen.html | 6 +- .../view/screen/town/ResearchScreen.html | 6 +- .../view/screen/town/SelectScreen.html | 32 +- .../view/screen/town/SettleOption.html | 4 +- .../javelin/view/screen/town/TownScreen.html | 6 +- .../view/screen/town/TransportScreen.html | 32 +- .../screen/town/option/RecruitOption.html | 4 +- .../town/option/RecruitScreenOption.html | 4 +- .../town/option/ResearchScreenOption.html | 4 +- .../view/screen/town/option/ScreenOption.html | 4 +- .../screen/town/option/ShopScreenOption.html | 4 +- .../town/option/TournamentScreenOption.html | 4 +- .../town/option/TransportScreenOption.html | 4 +- .../screen/town/option/UpgradeOption.html | 4 +- .../town/option/UpgradingScreenOption.html | 4 +- .../screen/town/option/package-frame.html | 4 +- .../screen/town/option/package-summary.html | 4 +- .../view/screen/town/option/package-tree.html | 4 +- .../view/screen/town/package-frame.html | 4 +- .../view/screen/town/package-summary.html | 4 +- .../view/screen/town/package-tree.html | 4 +- .../view/screen/upgrading/AcademyScreen.html | 10 +- .../upgrading/SkillSelectionScreen.html | 638 ++++++ .../screen/upgrading/TownUpgradingScreen.html | 10 +- .../screen/upgrading/UpgradingScreen.html | 6 +- .../view/screen/upgrading/package-frame.html | 5 +- .../screen/upgrading/package-summary.html | 13 +- .../view/screen/upgrading/package-tree.html | 5 +- doc/javadoc/overview-frame.html | 14 +- doc/javadoc/overview-summary.html | 112 +- doc/javadoc/overview-tree.html | 149 +- doc/javadoc/package-list | 10 +- doc/javadoc/serialized-form.html | 740 ++++-- doc/spells1.txt | 2 +- javelin/Javelin.java | 94 +- javelin/JavelinApp.java | 119 +- javelin/controller/BattleSetup.java | 2 +- .../controller/{effect => }/DamageEffect.java | 2 +- javelin/controller/Movement.java | 2 +- javelin/controller/Roller.java | 11 - javelin/controller/SpellbookGenerator.java | 2 +- javelin/controller/TextReader.java | 2 +- javelin/controller/Weather.java | 9 +- javelin/controller/action/Action.java | 16 +- javelin/controller/action/ActionMapping.java | 4 + javelin/controller/action/Breath.java | 11 +- javelin/controller/action/CastSpell.java | 50 +- javelin/controller/action/Charge.java | 5 +- javelin/controller/action/Defend.java | 2 +- javelin/controller/action/Dig.java | 6 +- javelin/controller/action/Fire.java | 157 +- javelin/controller/action/Help.java | 71 +- javelin/controller/action/Movement.java | 6 +- javelin/controller/action/PassItem.java | 4 +- javelin/controller/action/Target.java | 202 ++ javelin/controller/action/TouchAttack.java | 5 +- javelin/controller/action/UseItem.java | 4 +- .../controller/action/ai/AbstractAttack.java | 13 +- javelin/controller/action/ai/AiAction.java | 30 +- javelin/controller/action/ai/AiMovement.java | 11 +- javelin/controller/action/ai/ForceWait.java | 10 +- javelin/controller/action/area/Burst.java | 8 - .../action/maneuver/DefensiveAttack.java | 2 +- javelin/controller/action/maneuver/Feint.java | 2 +- .../controller/action/maneuver/Grapple.java | 2 +- .../controller/action/maneuver/Maneuver.java | 11 +- javelin/controller/action/maneuver/Trip.java | 2 +- javelin/controller/action/world/Abandon.java | 6 +- javelin/controller/action/world/Automate.java | 8 +- javelin/controller/action/world/Camp.java | 42 + .../controller/action/world/CastSpells.java | 4 +- javelin/controller/action/world/Dismiss.java | 8 +- javelin/controller/action/world/Divide.java | 8 +- .../world/{Journal.java => OpenJournal.java} | 38 +- javelin/controller/action/world/Options.java | 22 - javelin/controller/action/world/Park.java | 5 +- .../controller/action/world/ResetScore.java | 4 +- .../controller/action/world/ShowOptions.java | 57 + javelin/controller/action/world/UseItems.java | 32 +- javelin/controller/action/world/Work.java | 37 +- .../controller/action/world/WorldAction.java | 7 +- .../controller/action/world/WorldMove.java | 13 +- .../world/improvement/BuildHighway.java | 8 +- .../action/world/improvement/BuildInn.java | 8 +- .../action/world/improvement/BuildMine.java | 8 +- .../action/world/improvement/BuildRoad.java | 8 +- .../action/world/improvement/BuildTown.java | 8 +- .../action/world/improvement/Deforestate.java | 8 +- javelin/controller/ai/ActionProvider.java | 14 +- javelin/controller/ai/AiThread.java | 12 +- ...haBetaSearch.java => AlphaBetaSearch.java} | 18 +- javelin/controller/ai/BattleAi.java | 43 +- javelin/controller/ai/ChanceNode.java | 2 +- javelin/controller/ai/Entry.java | 5 +- javelin/controller/ai/Node.java | 2 +- javelin/controller/ai/TemperatureManager.java | 2 +- javelin/controller/ai/ThreadManager.java | 69 +- javelin/controller/ai/cache/AiCache.java | 4 +- .../ai/valueselector/MaxValueSelector.java | 10 +- .../ai/valueselector/MinValueSelector.java | 10 +- .../ai/valueselector/ValueSelector.java | 37 +- .../challenge/ChallengeRatingCalculator.java | 4 - .../challenge/RewardCalculator.java | 21 +- .../challenge/factor/ClassLevelFactor.java | 18 +- .../challenge/factor/FullAttackFactor.java | 2 +- .../controller/challenge/factor/HdFactor.java | 76 +- .../challenge/factor/SkillsFactor.java | 45 +- .../controller/challenge/factor/TypeData.java | 20 + .../factor/quality/BreathFactor.java | 4 +- javelin/controller/db/EncounterIndex.java | 2 +- javelin/controller/db/Preferences.java | 68 +- javelin/controller/db/StateManager.java | 126 +- .../controller/db/reader/MonsterReader.java | 4 +- .../controller/db/reader/fields/Damage.java | 2 +- .../db/reader/fields/Organization.java | 51 +- .../exception/battle/EndBattle.java | 13 +- .../exception/battle/StartBattle.java | 35 +- javelin/controller/fight/ExhibitionFight.java | 2 +- javelin/controller/fight/Fight.java | 125 +- javelin/controller/fight/IncursionFight.java | 11 + javelin/controller/fight/LairFight.java | 52 +- javelin/controller/fight/PlanarFight.java | 50 +- .../fight/RandomDungeonEncounter.java | 5 +- javelin/controller/fight/RandomEncounter.java | 9 +- javelin/controller/fight/Siege.java | 41 +- javelin/controller/fight/TempleEncounter.java | 61 + javelin/controller/fight/TrainingSession.java | 5 +- .../controller/fight/tournament/Horde.java | 2 +- .../fight/tournament/MirrorMatch.java | 3 +- .../{ => generator}/encounter/Encounter.java | 2 +- .../encounter/EncounterGenerator.java | 50 +- .../encounter/EncounterPossibilities.java | 2 +- .../encounter/GeneratedFight.java | 2 +- .../encounter/MisalignmentDetector.java | 2 +- .../generator/feature/FeatureGeneration.java | 106 + .../generator/feature/FeatureGenerator.java | 286 +++ .../controller/old}/Game.java | 27 +- .../controller/old}/Interface.java | 16 +- .../quality/resistance/SpellResistance.java | 6 +- javelin/controller/terrain/Terrain.java | 63 +- javelin/controller/terrain/Water.java | 11 +- javelin/controller/terrain/map/TyrantMap.java | 2 +- .../controller/terrain/map/tyrant/Caves.java | 11 +- javelin/controller/upgrade/NaturalArmor.java | 2 +- javelin/controller/upgrade/Upgrade.java | 7 + .../controller/upgrade/UpgradeHandler.java | 38 +- .../upgrade/ability/RaiseIntelligence.java | 27 +- .../upgrade/classes/Aristocrat.java | 43 +- .../upgrade/classes/ClassAdvancement.java | 50 +- .../controller/upgrade/classes/Commoner.java | 36 +- .../controller/upgrade/classes/Expert.java | 39 +- javelin/controller/upgrade/classes/Level.java | 4 +- .../controller/upgrade/classes/Warrior.java | 36 +- .../controller/upgrade/feat/MeleeFocus.java | 1 + .../controller/upgrade/movement/Flying.java | 1 + .../controller/upgrade/skill/Acrobatics.java | 14 +- .../upgrade/skill/Concentration.java | 14 +- .../controller/upgrade/skill/Diplomacy.java | 14 +- .../upgrade/skill/DisableDevice.java | 14 +- .../upgrade/skill/GatherInformation.java | 14 +- javelin/controller/upgrade/skill/Heal.java | 16 +- .../controller/upgrade/skill/Knowledge.java | 14 +- .../controller/upgrade/skill/Perception.java | 14 +- javelin/controller/upgrade/skill/Search.java | 14 +- .../upgrade/skill/SkillUpgrade.java | 36 +- .../controller/upgrade/skill/Spellcraft.java | 14 +- javelin/controller/upgrade/skill/Stealth.java | 14 +- .../controller/upgrade/skill/Survival.java | 14 +- .../upgrade/skill/UseMagicDevice.java | 12 +- javelin/controller/walker/ChargePath.java | 6 + javelin/model/BattleMap.java | 3 +- javelin/model/EquipmentMap.java | 28 + javelin/model/Realm.java | 28 +- javelin/model/condition/Knowledgeable.java | 30 + javelin/model/item/Item.java | 44 +- javelin/model/item/Key.java | 111 +- javelin/model/item/Scroll.java | 5 +- javelin/model/item/Wand.java | 9 +- javelin/model/item/relic/Amulet.java | 37 + javelin/model/item/relic/Ankh.java | 30 + javelin/model/item/relic/Candle.java | 42 + javelin/model/item/relic/Crown.java | 28 + javelin/model/item/relic/Flute.java | 41 + javelin/model/item/relic/Map.java | 63 + javelin/model/item/relic/Relic.java | 81 + javelin/model/item/relic/Skull.java | 58 + javelin/model/spell/Summon.java | 2 +- javelin/model/spell/abjuration/Blink.java | 2 +- .../model/spell/abjuration/DispelMagic.java | 2 +- .../spell/conjuration/healing/RaiseDead.java | 4 +- .../healing/wounds/CureModerateWounds.java | 2 +- .../teleportation/GreaterTeleport.java | 2 +- .../teleportation/SecureShelter.java | 2 +- .../teleportation/WordOfRecall.java | 2 +- .../spell/divination/DiscernLocation.java | 8 +- javelin/model/spell/divination/FindTraps.java | 2 +- .../model/spell/divination/LocateObject.java | 2 +- .../model/spell/divination/PryingEyes.java | 2 +- .../enchantment/compulsion/HoldMonster.java | 2 +- javelin/model/spell/evocation/PolarRay.java | 2 +- javelin/model/spell/evocation/SoundBurst.java | 2 +- javelin/model/spell/totem/EaglesSplendor.java | 2 +- .../spell/transmutation/ControlWeather.java | 2 +- javelin/model/spell/transmutation/Fly.java | 2 +- javelin/model/state/BattleState.java | 11 + javelin/model/unit/Combatant.java | 61 +- javelin/model/unit/Monster.java | 60 +- javelin/model/unit/Skills.java | 44 +- javelin/model/unit/Squad.java | 78 +- javelin/model/unit/transport/Airship.java | 1 + javelin/model/unit/transport/Carriage.java | 1 + .../model/unit/transport/FlyingNimbus.java | 48 + javelin/model/unit/transport/Ship.java | 1 + javelin/model/unit/transport/Transport.java | 82 +- javelin/model/world/Caravan.java | 16 +- javelin/model/world/Improvement.java | 14 +- javelin/model/world/Incursion.java | 88 +- javelin/model/world/ParkedVehicle.java | 17 + javelin/model/world/World.java | 239 +- javelin/model/world/WorldActor.java | 26 +- javelin/model/world/location/Lair.java | 8 + javelin/model/world/location/Location.java | 15 +- javelin/model/world/location/Outpost.java | 16 +- javelin/model/world/location/Portal.java | 37 +- .../model/world/location/dungeon/Chest.java | 35 +- .../model/world/location/dungeon/Dungeon.java | 255 ++- .../model/world/location/dungeon/Feature.java | 38 +- .../world/location/dungeon/Fountain.java | 2 +- .../world/location/dungeon/StairsUp.java | 11 +- .../model/world/location/dungeon/Trap.java | 19 +- .../dungeon/{ => crawler}/Crawler.java | 27 +- .../dungeon/crawler/HorizontalCorridor.java | 29 + .../world/location/dungeon/crawler/Room.java | 38 + .../dungeon/crawler/VerticalCorridor.java | 29 + .../location/dungeon/temple/AirTemple.java | 87 + .../location/dungeon/temple/EarthTemple.java | 49 + .../location/dungeon/temple/EvilTemple.java | 78 + .../location/dungeon/temple/FireTemple.java | 50 + .../location/dungeon/temple/GoodTemple.java | 63 + .../location/dungeon/temple/MagicTemple.java | 60 + .../world/location/dungeon/temple/Temple.java | 265 +++ .../dungeon/temple/TempleDungeon.java | 153 ++ .../location/dungeon/temple/WaterTemple.java | 48 + .../dungeon/temple/features/Altar.java | 40 + .../dungeon/temple/features/Brazier.java | 59 + .../dungeon/temple/features/FruitTree.java | 31 + .../dungeon/temple/features/Portal.java | 41 + .../dungeon/temple/features/Spirit.java | 55 + .../dungeon/temple/features/StairsDown.java | 24 + .../world/location/fortification/Academy.java | 65 +- .../location/fortification/Dwelling.java | 17 +- .../location/fortification/Fortification.java | 4 +- .../location/fortification/Guardian.java | 10 +- .../world/location/fortification/Inn.java | 43 +- .../world/location/fortification/Mine.java | 7 + .../world/location/fortification/Shrine.java | 4 + .../world/location/fortification/Trove.java | 14 +- .../model/world/location/town/OrderQueue.java | 3 +- javelin/model/world/location/town/Town.java | 53 +- .../location/town/research/Research.java | 18 +- .../location/unique/AdventurersGuild.java | 50 +- .../world/location/unique/Artificer.java | 12 +- .../model/world/location/unique/Haxor.java | 37 +- .../location/unique/MercenariesGuild.java | 41 +- .../world/location/unique/PillarOfSkulls.java | 10 +- .../world/location/unique/TrainingHall.java | 35 +- javelin/view/Images.java | 1 + javelin/view/StatusPanel.java | 6 +- javelin/view/mappanel/MapPanel.java | 51 + .../MapPanelOld.java} | 226 +- javelin/view/screen/BattleScreen.java | 89 +- javelin/view/screen/DungeonScreen.java | 36 +- javelin/view/screen/InfoScreen.java | 2 +- javelin/view/screen/SquadScreen.java | 66 +- javelin/view/screen/StatisticsScreen.java | 1 + javelin/view/screen/WorldScreen.java | 70 +- javelin/view/screen/haxor/BorrowMoney.java | 15 +- javelin/view/screen/haxor/Hax.java | 8 + javelin/view/screen/haxor/HaxorScreen.java | 42 +- javelin/view/screen/haxor/Win.java | 73 +- .../view/screen/shopping/ArtificerScreen.java | 32 +- .../view/screen/shopping/ShoppingScreen.java | 24 +- javelin/view/screen/town/ResearchScreen.java | 2 +- javelin/view/screen/town/SelectScreen.java | 9 +- javelin/view/screen/town/TransportScreen.java | 20 +- .../town/option/TournamentScreenOption.java | 3 +- .../view/screen/upgrading/AcademyScreen.java | 3 +- .../upgrading/SkillSelectionScreen.java | 213 ++ .../screen/upgrading/TownUpgradingScreen.java | 8 +- .../screen/upgrading/UpgradingScreen.java | 21 +- monsters.xml | 4 +- preferences.properties | 18 +- tyrant/mikera/engine/Lib.java | 2 +- tyrant/mikera/engine/RPG.java | 2 +- tyrant/mikera/engine/Thing.java | 2 +- tyrant/mikera/tyrant/Animation.java | 3 +- tyrant/mikera/tyrant/ArtScreen.java | 1 + tyrant/mikera/tyrant/Being.java | 1 + tyrant/mikera/tyrant/Chest.java | 1 + tyrant/mikera/tyrant/Combat.java | 1 + tyrant/mikera/tyrant/Damage.java | 1 + tyrant/mikera/tyrant/DeepForest.java | 1 + tyrant/mikera/tyrant/DetailedListScreen.java | 3 + tyrant/mikera/tyrant/Door.java | 1 + tyrant/mikera/tyrant/DungeonTyrant.java | 1 + tyrant/mikera/tyrant/EndGame.java | 1 + tyrant/mikera/tyrant/Equipment.java | 1 + tyrant/mikera/tyrant/Event.java | 1 + tyrant/mikera/tyrant/Food.java | 1 + tyrant/mikera/tyrant/GameTile.java | 6 +- tyrant/mikera/tyrant/Gods.java | 1 + tyrant/mikera/tyrant/Hero.java | 1 + tyrant/mikera/tyrant/InputHandler.java | 2 + tyrant/mikera/tyrant/InventoryPanel.java | 15 +- tyrant/mikera/tyrant/Item.java | 1 + tyrant/mikera/tyrant/LevelMap.java | 1 + tyrant/mikera/tyrant/LevelMapPanel.java | 1 + tyrant/mikera/tyrant/ListItem.java | 1 + tyrant/mikera/tyrant/ListScreen.java | 2 + tyrant/mikera/tyrant/MessagePanel.java | 2 + tyrant/mikera/tyrant/Missile.java | 1 + tyrant/mikera/tyrant/Monster.java | 1 + tyrant/mikera/tyrant/Outdoors.java | 1 + tyrant/mikera/tyrant/Person.java | 1 + tyrant/mikera/tyrant/Personality.java | 1 + tyrant/mikera/tyrant/Poison.java | 1 + tyrant/mikera/tyrant/Portal.java | 1 + tyrant/mikera/tyrant/PortalStone.java | 1 + tyrant/mikera/tyrant/Potion.java | 1 + tyrant/mikera/tyrant/Quest.java | 1 + tyrant/mikera/tyrant/QuestApp.java | 2 + tyrant/mikera/tyrant/RangedWeapon.java | 1 + tyrant/mikera/tyrant/Recipe.java | 1 + tyrant/mikera/tyrant/RogueDungeon.java | 1 + tyrant/mikera/tyrant/Rune.java | 1 + tyrant/mikera/tyrant/RuneTrap.java | 1 + tyrant/mikera/tyrant/Scenery.java | 1 + tyrant/mikera/tyrant/Score.java | 1 + tyrant/mikera/tyrant/Scripts.java | 1 + tyrant/mikera/tyrant/Scroll.java | 1 + tyrant/mikera/tyrant/Secret.java | 1 + tyrant/mikera/tyrant/Skill.java | 1 + tyrant/mikera/tyrant/Special.java | 1 + tyrant/mikera/tyrant/Spell.java | 1 + tyrant/mikera/tyrant/SpellBook.java | 1 + tyrant/mikera/tyrant/TPanel.java | 2 + tyrant/mikera/tyrant/Tile.java | 50 +- tyrant/mikera/tyrant/Time.java | 1 + tyrant/mikera/tyrant/Trap.java | 1 + tyrant/mikera/tyrant/Tutorial.java | 1 + tyrant/mikera/tyrant/Weapon.java | 1 + tyrant/mikera/tyrant/Wish.java | 1 + tyrant/mikera/tyrant/WorldMap.java | 1 + tyrant/mikera/tyrant/author/MapMaker.java | 1 + tyrant/mikera/tyrant/author/ThingEditor.java | 3 +- tyrant/mikera/tyrant/author/ThingMaker.java | 2 +- tyrant/mikera/tyrant/perf/KillAllBaddies.java | 2 +- tyrant/mikera/tyrant/perf/MoreKilling.java | 2 +- tyrant/mikera/tyrant/test/Combat_TC.java | 2 +- tyrant/mikera/tyrant/test/Damage_TC.java | 2 +- tyrant/mikera/tyrant/test/Game_TC.java | 3 + tyrant/mikera/tyrant/test/Hero_TC.java | 1 + tyrant/mikera/tyrant/test/Lib_TC.java | 1 + tyrant/mikera/tyrant/test/NullHandler.java | 2 +- tyrant/mikera/tyrant/test/NullHandler_TC.java | 2 +- tyrant/mikera/tyrant/test/Quest_TC.java | 1 + tyrant/mikera/tyrant/test/TyrantTestCase.java | 5 +- tyrant/mikera/tyrant/test/WorldMap_TC.java | 2 +- tyrant/mikera/tyrant/util/PlugInUtility.java | 2 +- 1526 files changed, 45322 insertions(+), 9113 deletions(-) create mode 100644 avatars/dungeonaltar.png create mode 100644 avatars/dungeonbrazier.png create mode 100644 avatars/dungeonfloortempleevil.png create mode 100644 avatars/dungeonfloortemplefire.png create mode 100644 avatars/dungeonspirit.png create mode 100644 avatars/dungeonstairsdown.png rename avatars/{dungeonstairs.png => dungeonstairsup.png} (100%) create mode 100644 avatars/dungeontreefruit.png create mode 100644 avatars/dungeonwalltempleearth.png create mode 100644 avatars/dungeonwalltempleevil.png create mode 100644 avatars/dungeonwalltemplefire.png create mode 100644 avatars/dungeonwalltemplewater.png create mode 100644 avatars/flyingnimbus.png create mode 100644 avatars/locationmartialacademy3.png create mode 100644 avatars/locationmartialacademy4.png create mode 100644 avatars/locationtempleair.png create mode 100644 avatars/locationtempleearth.png create mode 100644 avatars/locationtempleevil.png create mode 100644 avatars/locationtemplefire.png create mode 100644 avatars/locationtemplegood.png create mode 100644 avatars/locationtemplemagic.png create mode 100644 avatars/locationtemplewater.png create mode 100644 avatars/locationtraininghall2.png create mode 100644 avatars/overlaylabor.png create mode 100644 doc/javadoc/javelin/controller/DamageEffect.html create mode 100644 doc/javadoc/javelin/controller/action/Target.html create mode 100644 doc/javadoc/javelin/controller/action/world/Camp.html create mode 100644 doc/javadoc/javelin/controller/action/world/OpenJournal.html create mode 100644 doc/javadoc/javelin/controller/action/world/ShowOptions.html create mode 100644 doc/javadoc/javelin/controller/ai/AlphaBetaSearch.html create mode 100644 doc/javadoc/javelin/controller/challenge/factor/TypeData.html create mode 100644 doc/javadoc/javelin/controller/fight/TempleEncounter.html rename doc/javadoc/javelin/controller/{quality/Tremorsense.html => generator/encounter/Encounter.html} (52%) create mode 100644 doc/javadoc/javelin/controller/generator/encounter/EncounterGenerator.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/EncounterPossibilities.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/GeneratedFight.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/MisalignmentDetector.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/package-frame.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/package-summary.html create mode 100644 doc/javadoc/javelin/controller/generator/encounter/package-tree.html create mode 100644 doc/javadoc/javelin/controller/generator/feature/FeatureGeneration.html create mode 100644 doc/javadoc/javelin/controller/generator/feature/FeatureGenerator.html create mode 100644 doc/javadoc/javelin/controller/generator/feature/package-frame.html create mode 100644 doc/javadoc/javelin/controller/generator/feature/package-summary.html create mode 100644 doc/javadoc/javelin/controller/generator/feature/package-tree.html create mode 100644 doc/javadoc/javelin/controller/old/Game.Delay.html create mode 100644 doc/javadoc/javelin/controller/old/Game.html rename doc/javadoc/javelin/controller/{fight/TownSiege.html => old/Interface.html} (62%) create mode 100644 doc/javadoc/javelin/controller/old/package-frame.html create mode 100644 doc/javadoc/javelin/controller/old/package-summary.html create mode 100644 doc/javadoc/javelin/controller/old/package-tree.html create mode 100644 doc/javadoc/javelin/model/condition/Knowledgeable.html create mode 100644 doc/javadoc/javelin/model/item/relic/Amulet.html create mode 100644 doc/javadoc/javelin/model/item/relic/Ankh.html create mode 100644 doc/javadoc/javelin/model/item/relic/Candle.html create mode 100644 doc/javadoc/javelin/model/item/relic/Crown.html create mode 100644 doc/javadoc/javelin/model/item/relic/Flute.html create mode 100644 doc/javadoc/javelin/model/item/relic/Map.html create mode 100644 doc/javadoc/javelin/model/item/relic/Relic.html create mode 100644 doc/javadoc/javelin/model/item/relic/Skull.html create mode 100644 doc/javadoc/javelin/model/item/relic/package-frame.html create mode 100644 doc/javadoc/javelin/model/item/relic/package-summary.html create mode 100644 doc/javadoc/javelin/model/item/relic/package-tree.html create mode 100644 doc/javadoc/javelin/model/unit/transport/FlyingNimbus.html create mode 100644 doc/javadoc/javelin/model/world/location/Temple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/Altar.html rename doc/javadoc/javelin/{controller/quality/Vision.html => model/world/location/dungeon/StairsDown.html} (52%) create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/TempleDungeon.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/Crawler.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/HorizontalCorridor.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/Room.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/VerticalCorridor.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/crawler/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/AirTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/EarthTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/EvilTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/FireTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/GoodTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/MagicTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/Temple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/TempleDungeon.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/WaterTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/Altar.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/Brazier.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/FruitTree.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/Portal.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/Spirit.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/StairsDown.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/features/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/location/dungeon/temple/package-tree.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/AirTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/EarthTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/EvilTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/FireTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/GoodTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/MagicTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/Temple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/WaterTemple.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/package-frame.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/package-summary.html create mode 100644 doc/javadoc/javelin/model/world/location/temple/package-tree.html create mode 100644 doc/javadoc/javelin/view/mappanel/MapPanel.html create mode 100644 doc/javadoc/javelin/view/mappanel/MapPanelOld.html create mode 100644 doc/javadoc/javelin/view/mappanel/package-frame.html create mode 100644 doc/javadoc/javelin/view/mappanel/package-summary.html create mode 100644 doc/javadoc/javelin/view/mappanel/package-tree.html create mode 100644 doc/javadoc/javelin/view/screen/upgrading/SkillSelectionScreen.html rename javelin/controller/{effect => }/DamageEffect.java (97%) delete mode 100644 javelin/controller/Roller.java create mode 100644 javelin/controller/action/Target.java create mode 100644 javelin/controller/action/world/Camp.java rename javelin/controller/action/world/{Journal.java => OpenJournal.java} (53%) delete mode 100644 javelin/controller/action/world/Options.java create mode 100644 javelin/controller/action/world/ShowOptions.java rename javelin/controller/ai/{AbstractAlphaBetaSearch.java => AlphaBetaSearch.java} (88%) create mode 100644 javelin/controller/challenge/factor/TypeData.java create mode 100644 javelin/controller/fight/TempleEncounter.java rename javelin/controller/{ => generator}/encounter/Encounter.java (95%) rename javelin/controller/{ => generator}/encounter/EncounterGenerator.java (69%) rename javelin/controller/{ => generator}/encounter/EncounterPossibilities.java (92%) rename javelin/controller/{ => generator}/encounter/GeneratedFight.java (87%) rename javelin/controller/{ => generator}/encounter/MisalignmentDetector.java (95%) create mode 100644 javelin/controller/generator/feature/FeatureGeneration.java create mode 100644 javelin/controller/generator/feature/FeatureGenerator.java rename {tyrant/mikera/tyrant => javelin/controller/old}/Game.java (93%) rename {tyrant/mikera/tyrant => javelin/controller/old}/Interface.java (54%) create mode 100644 javelin/model/condition/Knowledgeable.java create mode 100644 javelin/model/item/relic/Amulet.java create mode 100644 javelin/model/item/relic/Ankh.java create mode 100644 javelin/model/item/relic/Candle.java create mode 100644 javelin/model/item/relic/Crown.java create mode 100644 javelin/model/item/relic/Flute.java create mode 100644 javelin/model/item/relic/Map.java create mode 100644 javelin/model/item/relic/Relic.java create mode 100644 javelin/model/item/relic/Skull.java create mode 100644 javelin/model/unit/transport/FlyingNimbus.java rename javelin/model/world/location/dungeon/{ => crawler}/Crawler.java (51%) create mode 100644 javelin/model/world/location/dungeon/crawler/HorizontalCorridor.java create mode 100644 javelin/model/world/location/dungeon/crawler/Room.java create mode 100644 javelin/model/world/location/dungeon/crawler/VerticalCorridor.java create mode 100644 javelin/model/world/location/dungeon/temple/AirTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/EarthTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/EvilTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/FireTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/GoodTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/MagicTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/Temple.java create mode 100644 javelin/model/world/location/dungeon/temple/TempleDungeon.java create mode 100644 javelin/model/world/location/dungeon/temple/WaterTemple.java create mode 100644 javelin/model/world/location/dungeon/temple/features/Altar.java create mode 100644 javelin/model/world/location/dungeon/temple/features/Brazier.java create mode 100644 javelin/model/world/location/dungeon/temple/features/FruitTree.java create mode 100644 javelin/model/world/location/dungeon/temple/features/Portal.java create mode 100644 javelin/model/world/location/dungeon/temple/features/Spirit.java create mode 100644 javelin/model/world/location/dungeon/temple/features/StairsDown.java create mode 100644 javelin/view/mappanel/MapPanel.java rename javelin/view/{MapPanel.java => mappanel/MapPanelOld.java} (71%) create mode 100644 javelin/view/screen/upgrading/SkillSelectionScreen.java diff --git a/.gitignore b/.gitignore index b46fe2d..9a87bc2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ javelin.jar .directory .metadata nohup.out - +backup +error.txt diff --git a/avatars/dungeonaltar.png b/avatars/dungeonaltar.png new file mode 100644 index 0000000000000000000000000000000000000000..9233679880e90060ebe8343d87771d8b91799767 GIT binary patch literal 625 zcmV-%0*?KOP)7Qo<~uE)722+$ZEF1|U@p51>I9-^Kve)~6~j z=Kd0du^EF98|7FG?{vP-PbzoyL6^MnoM+vYx(!W><)&FaD zpJac8fCeCM1^DZPgJU{LDt#m}j`^OG5xsZYY3_^kVY&}bEINJB6`{|o1SB#b8S*;^ z&fQS1l%XK;ECJaT6jp<-+YyPQTK*I#i}#}fJop@q^AKJ2y8G} zvfNtz-rHA?2Y1Al$S`b`c$Z|~2WJ&vNwuhewZJ$+;$iPSEBudH?SiX?iRkdg00002VoOIv0RM-N z%)bBt010qNS#tmY3labT3lag+-G2N4000McNliru;0Fg4DFZUa`au8y0mn&1K~zY` z?bORolTj1};P3zYx7?I+6Qpfah!;dB#EAo)7(${G6DAIP5Ff#rGZPaZz$Y+HObm`C zc!^3J*l4g6s6r)Rx%D_R8PC6y6N527my5*dAyx5`#Bjtw!gQ-W}%1NWHro*Vx-qXtJ$riqF zY-mbKpNe*gAhIp%v?!GfwdBE;d6!J-v138Sx^BC^DB5n##81(aaMhZuRVlF`R`p6* zHEKBrmqSj!SlymqC|R%+9r2`%hKx>$V8`p|A3p290iMi?D=tVi;{X5v07*qoM6N<$ Eg7iuB6951J literal 0 HcmV?d00001 diff --git a/avatars/dungeonfloortempleevil.png b/avatars/dungeonfloortempleevil.png new file mode 100644 index 0000000000000000000000000000000000000000..efd60efbe44348afd7be131133e3d60c9c52106e GIT binary patch literal 1744 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 literal 0 HcmV?d00001 diff --git a/avatars/dungeonspirit.png b/avatars/dungeonspirit.png new file mode 100644 index 0000000000000000000000000000000000000000..67fb66d3b3b30852bb62a6364dcdbad049d51e28 GIT binary patch literal 862 zcmV-k1EKthP)2wM~_%1b4UE(`~PTxl&Tq8Dw77Cko6 z!$r}iq6ZbW2z#wY3+zTlt^cEZN5>Paa zw#8`5OE9hht-v>+zNd#~r<1FtrI;=kj%1SBnHlZ_gFww&4GzX|LFF3--=T2)1J zT^$38f>2e-=X5eyTFSwz`i>FF0DHN(1QY=NOe3%bxSL2ITdinCMF6#4D3jnEa25EDqDYd{iBDB|GBm`4wDxGm zCD+lxxloADeSL^nj9DS7g<*UWe@LarP9ekvAwFnxad&ZAY2=*un4Y3$I ztX4Mu_(96yr~}RdU6|%^;1sefNkEIsC0MnJkw}DF9uKP*yx>9`nwppfCS;lFFJIVD zQi3NM?RnvL6F1Fu>rBRkC&@|pJivyZQ3Md0E0dGx{k3&P8429S?F+oyQv4z9f zMn-72S}91M*+18?mg^^MOXsr$xGl@rEf!7~1|I?eTow!Mz$4%(us7|*(|_5HYXJfQ o`sdAg=UVYnTXL2xS^jT+19PD$j)xwQga7~l07*qoM6N<$f*@pj?*IS* literal 0 HcmV?d00001 diff --git a/avatars/dungeonstairsdown.png b/avatars/dungeonstairsdown.png new file mode 100644 index 0000000000000000000000000000000000000000..4ab5fa1354c130ab181ead9e8d39e6f4883b30bd GIT binary patch literal 1396 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 literal 0 HcmV?d00001 diff --git a/avatars/dungeonwalltempleevil.png b/avatars/dungeonwalltempleevil.png new file mode 100644 index 0000000000000000000000000000000000000000..be5ae30d7371d5a26dc44e7f2d30a59c0b892dcc GIT binary patch literal 2499 zcmV;!2|V_RP)5J5C3z_fsdqrl8T1v*s%bKH!a z6BYnL5~$5F5hQ|)qQwj%s8p#^A_zp3x)>=XGzp=?kN)@!?#&IV4g}^75eSO7@WZ!G z^6E;T_00ni(3B`<)WtA!JRA|oD1_kQsH%WS16?3UG?)|vK)85miD%Cq0Nl8i3aHo{QpTBd8 z3&(@In`0bDRPYFjIoE#knC%B6Ui#iD&z)?sxjQ0ILKKbQ^;ZYH{@O{#TZLoCdqDGd zVMeloig4zI6^KqPx)|Sh`6TC0&M}!Py^dgjD2N+ZudcEE@PIeJ z`!qj%Yn9rZ+MVYwF7bmuIS>27-dc^jbN~J>?oP@=r>p$wJLf?Y!%59}Vzg9*I={X(!unm5;FCuOocwf?D_1VCJWwXHEpkf<+N4;- zhGQmqjm?L+L2yo4WLmKqbyW&nUCu!o^gH3w93EzMFJ4^|t!yT^Q-lx}9>Qb}N zX>(+dICwnd#_bKBKi6lW-{#?iCtSb1#$*;$xy3tgo#yg|b8LRL&cDBZgOAt7j9my( zQqCj-5g`rw`CSBZs;J$_Nw~E!=G=*Mteox;lPUdlfEUAN5Cq4T+T@X8jCk(CDi3Zx z!NU3S@fQ7Fmp5Kt;?%Kue6P=ceR6}3?hKK3LQE$dxRX@^LYU49IR&8L!r%Y& zpKwwB_OHK%&k`s0hTMC&#=~LZ;c!N=MAA03!K3{NQVJ*M=Q-N$vOK@U*1Zw`bN83r zc{E|%YEu9u9%`z=P71ggqh ztIcqGOazQ36OQ#dT)KRcoRx#oh~L~fVCV^eVn(SUi;}gWZ(EhLFyDGtfuzc$7%qaQ zj0eh>ap&B{C1zH*`{_eId$h&IM5$Cs z1Yr&ih9iKeK!7~G(v1#+yE6$zlc4UXG&&FwWK}}oZ~pQU*FV}M%y{;j3#_g0VIGXO z3P)SQxXjoYO?bS!%bmS8LZD%!5JUt*2%Mq`2}2`LuN_sPsxnC-1Gp2#!3xIy|K;hT^b#j6~cq0ii%LI zpehIfKo-GEkTrzjN|wM8vIY@KZAPb+8pjF{QAFXjOFc&0UBG#E(C6{`Bd`hUPbO^5 zG9p6GiU3xOLQ{T~X14%RrkFM0sw4=F$G5VQQ^JZNLbD1;waIWnglA%V1gHNQgXMgjO)N1I<3^875QrLq0}{!GNIt+%x2DLI%YJSk&Z%p zm7tUJn#U?&7f4mf#&dy zwGo}RF&FP3IF3Ar$k5r>zWRk~V+t z0c~j!?mXEav%K0P!r0j#({FWnW~oo9zf#a3R6w<9JOYnEQ*M+s=ffumGG zTTuZIV>WB5qB-&Qi)VTB+sE169rDTcklhd0S!gF(-6M>PaillL%KR?>@!1xZ`)D+s z-b}yR0HDwj!Els>iIG*5+JmHmCM5{m9Z3mKPK0uH@i=e1zQmvd*WTY?e==cdex4;c z#dthrKEdcd;bc`LKqdIA z@BJZvaJkF)t&!HrE&pw;1#ndEpzYEN|BAOoR_U zzfX8DnHE%)$W88;Mo^i9C|V-uv@(7eP;#m$4x?$|slgJjz0#(WjbHxTZ9clUOTX7= zd1XK^L9a7M&Mn6El&#?&dmAIptPD7RVZhm?E++c(Pa9~C}c6aMq_9e(k@_j$Or$A#rNUR>?c&H1-v zSj-5ek?U|M=0rH=!b>Y1T1oin2lv={ujbg14DMVxw}9?Wc>nW{xw$c9YuIIV;V7f& z0UzAkqqYuJ4kGv1D$c*$+~!HCSsk=^<7}6^k28064;q!NDw2anklUKEh=#K%ab~f_ z{F=}@f=Q`}(-Q&ULV;*d^>2+XxX9sW&>S@Dm0o+IeRX1_%%WW#@aBgvd z`j~KMZweyR#n2E4L%xdV#R}&Czj*%5r4}Oa>$S=6jORq4D!(_L{~t}}J&mJ?EmZ&j N002ovPDHLkV1lkn!hrw) literal 0 HcmV?d00001 diff --git a/avatars/dungeonwalltemplefire.png b/avatars/dungeonwalltemplefire.png new file mode 100644 index 0000000000000000000000000000000000000000..b85cae748b3ce0ebbf0cd9ab60351ccb79e17992 GIT binary patch literal 1948 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 A9RL6T literal 0 HcmV?d00001 diff --git a/avatars/locationmartialacademy.png b/avatars/locationmartialacademy.png index f53ce46d436e1f943064421ae9b17e40b16b255f..a8617ba241cdc49e91d93b8881c58aa1d66f59e8 100644 GIT binary patch delta 2430 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 delta 1961 zcmV;a2Uhs06W0%r7YZN<1^@s6b9#F8ks&dE1rii02LeFzVE_OJWJyFpR9M69S8I%2 zRT*9Tao*>i`fG+LuXQ6o*1N{l9kh8QILAVwmB zitf?v8E7||{T6^W&``dee zZQwlq-$DKr((c{Yv5^6NV0NK)kPw{SykX#BlcROdp~uC$&A;XLTUEvx`{@sV()qUx ze0=XmxQOGeju+iluGT;6uCH1FS5fH7Pp4DreYs5P_nEXg^YHhddfUkUeYbTr+~A>n zE;DrTmJPe__`+9K&(>t;Vn8*uV#oD=Cp<6M6~>98#V)w4fGKLOZM(Y!B?FEZ{NnVf zQhbIZ>G}wXg9kPZ_l{InR$6~L`pR=>YtnPuFhLy88)vunW>rUgGE3kjx&YK%8|B?BHYLQTXf>^^r=$$`sulqyQk;N?~7ybl%c|PeK@XuN zFThfzfvzqCj46o22$n8`a0c56z!*b!t_b1OAdwiROp&&9NHl?>n5Z{8C~n*ivv+7O z2Y@>d46s&p%O`&PYyTl>-repJdSKv51f~eWBZktAqZW>guT@TVI;D;DetC#EZ)*=J0O(7GG*jU zj&#aIK9dGx1Ysx;#|m`aLfwvFXfo1ipjvg|wLB=Q1yF)!%LXApt6oF4rwf*4!bs^D z?CV8WZw8I}8kWm7=$Y)348Rpp7<@`mmFpB$w+vlDU*1B-RKd9fL)XEmgq9tmr`U&f z+XXlKp=m>STL1zFOQl7aW(HJI z!4&IB4#41yUSX&z4}t`Y#871&x<(;D07#&OgVF>c?T6iI2IcysO(RL`E26{z1+FEXWECKe!LPQ7{jM#}NXY9)B#?DoC)Yx@S5D~)f*QM9+T zvd;5q1B6T9j6x&{qF6waC6p>QJiCdmYz8SS17fCcdix$&{B4Wwy!*0)akKJOnOnvs zV?$VToRwNYmvmiw?l*^Dxa;DJl(AP{^QX^n4t(x^rV+x~ms>68&PuHbLsO744J1hd znN!#u7oO*1Zh9UASp%M4#Hqm(0cR8)-xsyI`+B9k!j~7y<06iDA=Qs9 zn+l?TUR^r&*Vm?gwp6Zt2SD(S$0%n=FD|aT&yXZsjN;Iuu@st$er?g9?ZKQH{qo*D z?T3GT0suasC&BH65KYxIrf4c8&at?>c654X@rn7#Hz(JtE3-)~PWTbc6mo{%h?{r4 zer)dROV#ECfcT#U5?V~rbk!Ea13BqILy{(cQU;%MTz}K0gZV>0dTD9ws?B|W>F&;$ zj4`A#Sx}K+>hx@>*{nX=aZ#*0k)JjAk%og;w{Pr8j*9tN_f;hCHIRr-AUpw-bw#{b zT92lZIKG23k<>fB-k(=Sy+C}>iG>-55fl;P)bt!Sj`n2!{Ko3@`7AFjuZQ<@F3r_{ zZGX8`Zq}n!yd$!`r#xVLVog9)2^G%=5mAGLYm6p0GKyJ3NOu%Rx~gblv1qm%?e-TZ zXX_6T%52Arms~&c|Kp()AcdhEyF&n~z75GUp$UZTJ00000NkvXXu0mjfp((W& diff --git a/avatars/locationmartialacademy3.png b/avatars/locationmartialacademy3.png new file mode 100644 index 0000000000000000000000000000000000000000..f53ce46d436e1f943064421ae9b17e40b16b255f GIT binary patch literal 2007 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 R(R%;@002ovPDHLkV1fxs;K=|0 literal 0 HcmV?d00001 diff --git a/avatars/locationsummoningcircle.png b/avatars/locationsummoningcircle.png index ff3d0e590210b396d68b7b3195333ae056907fb7..4e672bd6e8c520f659b80ea32f2615555d4627c1 100644 GIT binary patch delta 293 zcmV+=0owkH1nvTmQhx^p0Rt+oI&C5V008?*L_t(o!|hf{62mYEvpW9&m(@$tF_^X6 zrRI=B96%5WJjStO|8D3ya115^@lgOeA>^6+t_lcQV)#B(0AOKY0tAJ`mLsV$2H!IR zGIesi!4Jm=j|Z0=*c?>yj2C8^O@BNAWX%4e1Tj0Zs8q>941d7^-FnstfMWbivYY`~ z!~u7?nZU3pgf?O!*O{?)1w;8BQT4{JFoDmc&7?p5=w&zN1Hyl~@Bq%Rfj3y3@{q;2 zq3*(YFQwo%VyODxAhUBq6KBd#@4wD1dYh(jSE*rRQmvp_1oPIbh?L6t>e(Zg`_eHUmm`Y{OU?}?AWn8e`{+dw6Ep900000NkvXXu0mjf2snuk delta 451 zcmV;!0X+Wh0*eHYQhx>(6fF+?A25Xg00EduL_t(o!|hf$AEEB2N+p%+1ure7r1FC4)?pdGnK|rXMxzDF1V6@&Th9a~i zO5Mr6_Lt8e`_Sh`j2eiZ?F`5=OJH1`1#mM4aJ$H;GL_wgtMRPRA|>##=A4jF#xKM= z7qK7aDFT*yPJiWQ=fDbTp9^7`rYzGlsoN~6RltMY^EA< z=8SR9MX{$R5FN24eAy}60`u#OuG?+MSYBn;*Z=SvNE5Dej+1EGY%HyH%OxA>SrR?? ztJRPQRZFLH=jezeH;z{9Szw~AEMXZ tzj`5k|0MGX)mM+dc;pu`AA9V7+YiCpm}d@eD{BA%002ovPDHLkV1jGB+cy9J diff --git a/avatars/locationtempleair.png b/avatars/locationtempleair.png new file mode 100644 index 0000000000000000000000000000000000000000..3dbadd9fabd79c772bc90b6241f809c1e887849a GIT binary patch literal 3178 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 literal 0 HcmV?d00001 diff --git a/avatars/locationtempleevil.png b/avatars/locationtempleevil.png new file mode 100644 index 0000000000000000000000000000000000000000..f41e99133cdc0df0b1ab26660ac36c749e7689dc GIT binary patch literal 2558 zcmV%ZHZDD6+AZc?TY-wXKnMv~uwW4uVMSO$ zB(j6ZC=x6}7{>{Ti4r9ui47RW4%5@q)34ioUsboNz88z09vNg|mMrpLeNugO&c9Bb z|2cp75q^aKFBtTC?|44P^B?}O_`k;bx#yk}@0Q~n;_VNo^ZEZ8_!mF;!9UCLd@!3% zG0q|o!8?akQfQ^=4+cyoC)2-w`R0p{Kf28ux88hLvikfmozEHcdR^e9G)dkpy4|~z z$z&Bm$bgro^ZDynuRiqr&Ye3ORaK$2CdqO_@U%@s)l{TeN|Hp!z>DX}2fbbf{1Gs^ zcJ11mw{G29D5X;1Ch#r&KL|BKi02;O-hNIi#p&rO&bhzz-U}tfqt;qoE=%%Ghu}SJ z+YmxPYfTi#RAq&+Mqk<*Z{5AOfA4-w>AnAn_dNB~Pvu!gmSr?e^Rf`)8$cmH_3@AK zwkotz%0|F9j}8yNYOMVyK+l)Ue}DSM^+!%lPGjpGt5t<_jwsS-t#RH_uPThS2r1)B zlNa>dxA#@K?sl}F~NC} zBuNhN`M>%Czw`?~|K!fyy+#xMV0>Zy#-QlzIqy$<-QMPxUwP%W2DpCX>5cEd{@SMx zkB;7d{rdH~w*HTM!;Ps@La*xjvjAC|KPi=r-n?~-t&3Y2V_23Y^ZA_3(TLe>%49NO zYilbC!9Ve!tV#0hwe9Vn4#8h@-e2qXz1i9v?_a)r`S-v4$}4A0xW9idu2!oXlate- z){4o=F(E({MYqo5bi3X6R8^&g6d(jjYov7~ae`DDDJ4on2tfzL0|Iqb#ny*W@P4GU z!dXjME;p-knLkiLwOXZd6vt9PmS>b@g;okBTtrfnMHC}H=`9S{Pk^d+DNAcUxcb9B31rjrR# z6a#|Rw8KXq+L9W;Sesd6bMGAc_wLcjbMj8XY(886y-$7e6CQbOzFa&u?Du*4=^ONW zeL8u@+HioB3Lyn~ma(z1MifOzB_IEt-~8kst`CQ|zw{3`KhP-(;w0kU-X5dzm~_a(sBeXuQRs*9Y%Wk)~~1lu{UD zAOzw#rZonoHJvPHwpie-<9Kq6vxd#BF>PbeS`&aYiP;#gea74NcQrtoXKVQ?mvJ0F z2o{tlO=9-#9>>SWOpYgn;K|bLOm+mkcPIe}h4%p|C3RC10BbBsk|32LO*5oWq*;cy z4jpScMQ7w}tn{-teoT7jH>DILNzB2)KBLVs-g}ZH<;ug?$kL46J3H9cqNQM2E-AWQ zJOS?eY%60wH*$0OLJnRgtDCLJCHkBbsu_+WLji)RjPpFdknN2;q;94n)7#7m<#r>s4?B zp>za*(we%i=@uQVwFn_-RyD?$9s((w+Q>y&7SrhrXD!~tY&Ii`V&;oE-h*ik%f*t$ zSXON-Ob|qAA!f^xd09yjr2?s_t)(_r%w~(T8L(Q>HU{S%)>iu!RKw(8huxz&&RQ<6 zcL~8U==ZV4Fc=P~>l)`A5P}p^q-jdq8md)|4ypEJ$tS3ui-a0&`Qxqr_aXOn3!dU|rMZs_|Ac`WQC_-rs z1UgxVuhrlDZC$M@wQB0bJI7=)p=lbF)QCvZ>voBvh$M<=YmbnU#bQYmJjl`6?nx?_~icV1=g=BLyqSx!uGz~&X8q?yvM@q?TK4&8t9OXbi16K&RA6yb<=Qo>lU3(ht2gh z1ZT@i3W>2T&tCn>ncP@g&zy6#bwi{hf)7X`an8~2^;nf9)9DoMe{Bd5LLiMaYn`0; zJ~ZaZOBc{e;$1)?kwTs&KR95#Il>x)a~|j2nF|hq`Fz1(W9<=boinC2f0CxjN!vCu z%`>yLwe`N+cXogIvF%4_nwER}`^Ze7^B5OArm>+3!snyBtl9g>=fk_LbMo z`JJD6;RD?K+{^Dsz)5zLh&~a=u~@aGGm-4+gIM;&UbeCF97kE UV?tJ|ZvX%Q07*qoM6N<$f-X$olmGw# literal 0 HcmV?d00001 diff --git a/avatars/locationtemplefire.png b/avatars/locationtemplefire.png new file mode 100644 index 0000000000000000000000000000000000000000..ebc4ee338bd87a6a99e6c57a66b62fd953ea58eb GIT binary patch literal 2588 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 LNkvXXu0mjfj1gcA literal 0 HcmV?d00001 diff --git a/avatars/locationtemplewater.png b/avatars/locationtemplewater.png new file mode 100644 index 0000000000000000000000000000000000000000..d1e881f20e8b77f0a1ff0a148bfb63688f9b7193 GIT binary patch literal 2882 zcmV-I3%&G-P)%ZHZDD6+AZc?TY-wXUpV@8l1r;Vb-XcHK9)W(g_w6$v_K$F@5tfDDkp!$%u zNz){7Bdbp0%9dd{mVwq)L|0B?N2(-SjwwDANqk9szn0{_?(W_DI{iRL4>&dwcYupK zcjn;y=g!QTGXuX3^?BF%AD;X5{Ech=-*n(@n3PbK;wJe}Y5o1=={PS8#{n2H)@2`l zXN{BsDcARSA5z{|>#KvSs{vkJ{0dJF1_5~J2e2iyu200DW^v_d0JetLb#DMa918OC z!dDn1z{K1K{QGAX-*NBwE)ESE{Q05YoAlp1yPwC7y6k<@<*yFyze)GAY%fo|Y4G@~ zy8!t2D<8lEpRcF$sq>rZXncjTFGRBXz?OXnlK^-!eor#9;}gjRWp{E;xjVhK11aMG z_x#7t>V>NvAdwD{&%V<3tyeemVC#FrXz$9iAN?b{?|%#l{C#NX)GHUKF$|aD?D?MC z#rQuB!Jnas)lWYBsiO}`nve?D!?A=+_#j8m7Yu><_A1g)ylS~h2ymky!gFG zHvuHHlKvN!|K(xx1fLdzM9qwNFYxya!Lh^p5kknHpPT6MG#?{l^9Y>tjv~JVV3o`- zE@pCfN>2)16=HdXx*7r-bcbRtLrElOm4!b|Q z4}c$h=TSL0FwR=h1lOV}md*SP-n#RZP`|A4}@GJVoYX>)69v=Jhe3?f^M`l=DTEcvX<5WQ@E~!KbT) zf_}#4*NBJxEUo5=1pLTgH96OZADiFX*8DG>-5uZFcK3r*zcvJ0w_f+qe?RjN0GvJk z-Oh>e>7#F)A9-YBTqmWMkd}$%dgRL%AzdYvO3>PzqEs^J-O@(9I*L(o$d)S92OWCr z$|U@fb3Y+DH|I^C6`=7C96MhaURqy?v~34nQ>d*9Fu@n5AizCO@LamB*4Ey~(Xx?)LEmW^dQ zIIb&g*D@WxG{>eP z5hoh*GcmhLy{)h*o`eX{9E7HOc=?vyxzyIJ-kCQBXh|pDT?rdDHnAz4;N+!cf`9xJ z$OiCsfOZ$Et`gU(_~rP#bR36J(2rkuAOw0Kfa}=QM#D(yVVD&rXELOM^#}pzzYoQB z^5O2-K4Y6wpKc(%Aq~Lef4Sqj0hVbJk4Kqr+sV8g1!+Sx0{UlZ40ICrAZwVSVpb@X zO*BnI4MpV4ssX+LK20TCC}Wuwaz%p4Ziyz76N09$xsXP&3EFKi|YnFb@KXc zs3H* zr5v{Huz6!62!*C{g|u@TPnvjh3v7?(=?!Ob6u-Q79Y6Xvk49#VrOy={BN$LM6uZn0 zW18N=8Y|@-7xX;8z{Qi`Nsso8^=#{ImBS-fL|1ddUCJ6tA{uaqFOF%S{=|pn$+JVk zbv=*@VAG?`(N@e6)nn*N95qzSRB5?|EhHFXS#hQ7T`-3}bZ%*Mrvz5#=CScJSJauz zshoFaxvDLK6bOX1X+witU0HKdv9NP_W?2`CAZJuGU6EEHoA=sV(o%w>NQKM#B!iV@ zuC6L%>;O^=VipPvXQq2;s%3t@y^O{bQ`F9mhc zkZ)vWk#t?P+LVZinn-|vs*J63GI&&*1mT{Sf<FE%B#G+qEIRpXs^@h zX-N>SigI;knVsFuG{nPncXhCqGuYnKPBNmgF%e}tW6<5!NHU_aRxp`11FUK>Oh@HH zcA9an%%Sn8JkJ_?ZtMwbAzbsfp0t!0v*;79kxHO^D-9^`?9un1-E6Y8#UC-Qzb@O0yWL+_FaB8CM zscrX)?AV4yYay~0%ccmi42edDHj*0o0JS#Z$WfdjJ3c07*qoM6N<$f`#yPg8%>k literal 0 HcmV?d00001 diff --git a/avatars/locationtraininghall.png b/avatars/locationtraininghall.png index 0e17b228949031381e2e7c111cd83cca577a286e..a0ec90e950daf2374e0da10c067d4e8863f2bed5 100644 GIT binary patch delta 2288 zcmVZW(v$E@}$h314`Xd_wL|LBWuUeg-z2fk*ccJj|IpC~J$F2CMXUINAAcxwJzieTes+3S+C6A*`Yr*z2^7lRycl`(gh#&Tv`)iG$%MV7Uxv8le}h8+n;C2)Ix+1{Ppl@ysApE*G|M`$FNM=hGKMH z5N1J##WE?$i!&vRdxOvZylT&P1>7f}UiF;*NmRq<3t9bRY2ma9EYsxlNQ#Og4{j}q zBOF1~3|e~z33)uEG@bIS!jNo{Fb$jzuna-O=6}JhsvI02Cg@ZVrb2^q|j;S-M$z@sVo&f zH-<1t1iU!1@aaU1<6{ZDiie2JiPxbplFrZ*%MwsrOb@vU9g5)AT8?P#JVl;)i(#-)4 zw1C8v0YSjwq1=;ZG$qlKNaB&4Aenen2c9(SZWauEJVx2t3psgZg2y)Qb1S)Ma!A)E zsA@XL(jU1)oa!BA;7`vI9T{Y5nVZdt`?SMf-8j>nSd zL5bnbrHmYo&^&JA;*y_|cjs^nyEtCaO3wjD;&TAQFaUv~C;*s-g`UrGynm|;Z6eP6 zdv8T?JK4M8F4}i@5r3qB*?Uvqv^Y57MfIC_CbD#C6Zorqv|i(2m9d=py$K?|63T09 z(BvG7EF(!0rPT`daC-gc0H4RA_;)aBb~|i+8dj|0bVobMoXOIM?`KI)X2;~C^b{W= z@k$zNjZEjmQR?PS=iqsH>VNbyF6%GBX}L*8^K>8ikjhXHsWbutBni5Eqr^@-9|v|Q z08(L*-5ehLk5E?9X~vdah`-|yr8~E?|E7)Pl4(@g!LAc~_;%n5s#ndTPma>}WIJu? zc4o(A7WdRL5E~VmAE)SztR54Ukjy5#Pl*Y4ARGB&P^VydC4V|9-wD*oOG?GTOr&-=} zH7T2c@#Zc>B!tvhPpGDnNKGZeG_eeW@pzOFbE(;zEa{yWeL)7eH8gpz{=p7m#5Md2 zoA8?k`G34cuDXI(w}0-SyrB-YC_?{C!F(ho@YJ{wq*=O2N1eW zwyKOwUT6RQBZOo(%)IEb}xn>DiO zA%WdxS`G6hyVGf!h9SMXeHXraWbq{*#g|@3&ZakvMstOKSb|drv6Fvgr|7kNiQC-jwz4HRAt#O)luGQS|O;`NC)jt7d%-)c3-YnDr0000< KMNUMnLSTaPpoJ6w delta 1886 zcmV-k2ch_?5}OZ@Qhx;!6&e6SpgINs00$^ZL_t(o!|j)A$li4s$3MTr|9s!~|GuAt z&z?QgZ624pnY9dct`h8kDVAXrBuQXa1SNz-uOfo*O%P}h8ew8&M@%cRz>rFiOmWj^ zGUwbgH}|;beE-kCL+=DZij6^U{Jy`w*B7oY*Y&;NUHqRRPJg%X_SC z-h1e>OU~PO%WdB^Ke_kY^1zD+dsSUm_ulu1?n}2`FYbTfF@Ht{T)X!QwR!XC%T3dK zPbrc0()1an)gx&V|8s49yrb*7bMgMcpa1eNFa9qseL4cBrm~&Jn$Jt6CY*DO%W97j z^1W@-9z}{-A%BGuh(pgj@r(Hfe*N&A>AL2}KYeuZow(GgHoyK8SEgF2uUYFq(;2I* z#~Wj5I~zIAlz>=k6~=KC?mKYcyt1lqZ(EZ+_rfbrpOF#lzWn@4@_g_!A?5D6?uerZ zr6mYY6a)lXAp}HW;Nv95J12~_PsLI6Eh$89thAb}yE55KlJz54^Z zjO#4R?j&8?P}en`b(qGYkf=c6yvJBaXDr&N9M9e;3eZXqWEk!_RRI?OHv&`RjUqRV zxwxNZtbcfkQW~W-&b64Pq7)zljnaximSCO5Igj(+dk{$|MvCB$J8rvqO{MDbx0&#! z>voIzL&x69s5eAWc++q+*qKk{mkZe9tr2ZeB7`806TEZiAV6tN({@zj3IV84V;9%tF5S$`VM-}kFOd1L%tX_kB}PNE5i%e;kN z91@5YsWhR8X^Mt4?-N8JZP(J&6#)G_BZ@VFRt$T6Oj**@6@xs-I`Nyg3Hbh9p9@}D zcymwNx;w%!x>{?s@5IX5;*mF&_H@>43j-~rQgoe1;^`*}XFawxxWpZ#n;HT*^x$2$W7NHLcL z()U6yN~=lI4AVKr8)KqSkS2Y!3^1LgZW>J2(KQ_^khr#`D_fFYpC}Gd(hw&hK8Q%7 z0h1HcL~$Icvu8(QeOxm$k?InCOWkyz@_){uq@XOuEH5vKqB3+&Qji5~{MLq97F>tsvBj)s=#cs$yc)XUps~aTpVhV!F&wlqCm`9H!|?TvJkY4HJ{o z%+1dFO*5M+1?&Jm30#wA>0B@GPk*8naU5WbqbOR^IAD|~3X+keD%uR=EnVn{K zb`!(lfTn3VxwJ-6R)7ZqLMaSTbsfSP(ja8(Ia}Gbbvr9dEB@sJ^GB2rq5@iACLa#Y zP10n_wpwuYuNIOnm}B89SAO2COUO;K^5FpiiUu{75Pt=r1VI#{ zlwx``WNJ9XIpa?(o)Cu)zv^FqS-T@Y^6&AtrTDjZ{ z-O)zrbB>-E54|%?4jayz7-5=*@pyxNKfs3*L|HU0r3obdtKQL|Il8 zRkhaC&GEN3;nW-_dV{PLQh&~P=g$hX*8)RlBuXiUnO(T@;^_H}Moli9Y)9j9O*t;9 zn+j)ILaiW4K}SSUgi@L;iBVGH9Bizwva-5NQ5IEQ*Z-)B@}6c~{`Rdsu(&`sd(ImV zmus7zgYe@@$lcc3^|tkADOzxxi3?+5n3=aM{MT{evmrlyjF z>(&c9@voOyTQ0-B-g{)AP%0qFQnKL?B8{zT0;zoz#X?DFyRP<5?hjP(IMzS;=ECdq z$JSXm-9RF?ZlB#AXMgE;I^(}6q>^Ev8Ri*Vw@eWRilyZZs@f38VJ9WeCUN*!-p~KI z_x)GxyY(yIY|cm`8qJI@%d+h5EKNSDwW8NcnVlJ-C9G|f)J^yAJWn3kG?oAUL+`tG z{};Y`XZPRuPB|0SMSWtB57y#D%qiukbr1we99q+LuQhG^P*@8VSO YAHlSDZz{LqL;wH)07*qoM6N<$f@Dvmq5uE@ diff --git a/avatars/locationtraininghall2.png b/avatars/locationtraininghall2.png new file mode 100644 index 0000000000000000000000000000000000000000..0e17b228949031381e2e7c111cd83cca577a286e GIT binary patch literal 1947 zcmV;M2W0q(P)(|k`Uk@eE_8Ku=DX%hc)ZGF6>>$-FC{=uLB@-Hv` zFD`vL0;Z<2oyMBaOQj~9bBxPsj}r2|ZPOk_idi9r5{N_3Jn@V92Y&tVoawse$3J~^ z@twHTsW!j<6IZ5Msjpe*Z zPoI$y?7sZ`OY(g1Ga=>fy6%Xh2&E+mPZR_MS|J2PVc_E=#ycmBwNJ%S^erhwZmrSI z+9&US@XzIGjUY^trN+1=XADhIW2%l`p3ymjwT?87aL!?^7oD+arBGV#^4{HTz1ZsT zFFX7};N?>hAb}yE55KlJz54^ZjO#4R?j&8?P}en`b(qGYkf=c6yvJBaXDr&N9M9e; z3eZXqWEk!_RRI?OHv&`RjUqRVxwxNZtayo18l^SPwV0-&6d(hQ(uzTrV4cM|kMrJp z5J@OTir|hrZo7F+rRwpwnee9Tc8mE#$KJ`PH$+i*({MD{nNQ@G3)teV5p7W-gdmO+ zymROvKxs|Wc2wgE0jN;py`$|~5rrY43hT{9S35d@N3)35UzPgO(ok!y7 zCkkghwl%oMko5Za&f}#g8}%@a#e0jCo_-cH(T{OmN1XOJ?}8o8^we4RyybyQr&adX zC!hUnJ~jMC7{@yU0Z1{I1k(3HFG{OP(hSo%#v5azP>?2lvc{Dv-Fg zr7K&KUY{rqQPL16AwGymq5+c=(?oF`sk3KCVtrgQGm+{NeM{YRpYqP3q@XOuEH5vK zqB3+&QQ0m4c0`Vq(;1%j`697!!_Sy3A0N zB?pfjrs+ytQ&M#e6O+@-&CdEwGn*;}>;OIqT$5($TrclWq7`u*V2q zOi8M`7ai1`bm>lH{vY5IU zv%EUSYef(Rpaek_qLgBKG-PTx#5v;pv3*FI1>2r>r7!SQOOb#2)niyf4hVgiVem}s66GT};l!Qc41W3H? zSY2IZymXSftwdQ?6jim>)Xnj?HsRD9Cwhad6;jT4=g$hX*8)RlBuXiUnO(T@;^_H} zMoli9Y)9j9O*t;9n+j)ILaiW4K}SSUgi@L;iBVGH9Bizwva-5NQ5IEQ*Z-)B@}6c~ z{`Rdsu(&`sd(ImVmus7zgYe@@$lcc3^|tkAD;Hvf&USjjd_|seKg1LP==5uJ%su z4^;3t)<5~?!t3+L)>$~+Kq9topWPm3>32HgzbK@VVW1i28C$nZ5eAB-;o<3b|cecf}Q;x-;N1g - + All Classes - + @@ -14,7 +14,6 @@ - - - -
    -
  • -

    getLowestAp

    -
    public static Combatant getLowestAp()
    +
    TODO remove on 2.0+
@@ -529,6 +549,11 @@ extends java.lang.Object

  • getDayPeriod

    public static java.lang.String getDayPeriod()
    +
    +
    Returns:
    +
    PERIODEVENING, PERIODMORNING, + PERIODNIGHT or "Noon".
    +
    • @@ -538,6 +563,10 @@ extends java.lang.Object

  • getHour

    public static long getHour()
    +
    +
    Returns:
    +
    Hour of the day, from 0 to 23.
    +
    •  @@ -563,6 +592,12 @@ extends java.lang.Object

  • nexttoact

    public static Squad nexttoact()
    +
    +
    Returns:
    +
    Next squad to act.
    +
    See Also:
    +
    Squad.hourselapsed
    +
    • @@ -572,6 +607,12 @@ extends java.lang.Object

  • sayWelcome

    public static java.lang.String sayWelcome()
    +
    Pure fluff/flavor.
    +
    +
    Returns:
    +
    Welcomes the playet to the game based on the current time of the + day.
    +
    •  @@ -581,6 +622,9 @@ extends java.lang.Object

  • lose

    public static void lose()
    +
    Once the player has no more Squads and Combatants under + his control call this to stop the current game, invalidate the save file, + record the highscore and exit the application.
    • @@ -590,6 +634,11 @@ extends java.lang.Object

  • record

    public static java.lang.String record()
    +
    Sets the highscore and...
    +
    +
    Returns:
    +
    a message with previous and current score.
    +
    •  @@ -599,6 +648,10 @@ extends java.lang.Object

  • sethighscore

    public static void sethighscore(long score)
    +
    +
    Parameters:
    +
    score - Updates the highscore record with this value.
    +
    •  @@ -608,6 +661,10 @@ extends java.lang.Object

  • gethighscore

    public static long gethighscore()
    +
    +
    Returns:
    +
    The current highscore value.
    +
    •  @@ -617,15 +674,15 @@ extends java.lang.Object

  • recruit

    public static Combatant recruit(Monster pick)
    -
    • - - - - - @@ -635,6 +692,10 @@ extends java.lang.Object

  • settexture

    public static void settexture(java.awt.Image file)
    +
    +
    Parameters:
    +
    file - Uses the given image as background.
    +
    •  @@ -644,6 +705,7 @@ extends java.lang.Object

  • getCombatant

    public static Combatant getCombatant(int id)
    +
    TODO remove?
    • @@ -707,7 +769,8 @@ extends java.lang.Object

    message

    public static java.awt.event.KeyEvent message(java.lang.String text,
                                               boolean requireenter)
    -
    Waits for user input for confirmation.
    +
    Main output function for WorldScreen. Waits for user input for + confirmation.
    Parameters:
    text - Prints this message in the status panel.
    @@ -716,6 +779,8 @@ extends java.lang.Object
    Returns:
    the key pressed by the user as confirmation for seeing the message.
    +
    See Also:
    +
    Game.message(String, Combatant, Delay)
    diff --git a/doc/javadoc/javelin/JavelinApp.html b/doc/javadoc/javelin/JavelinApp.html index d3deaec..c2ba29a 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":9,"i1":9,"i2":10,"i3":9,"i4":10,"i5":10,"i6":10,"i7":10,"i8":10,"i9":10}; +var methods = {"i0":9,"i1":10,"i2":10,"i3":10,"i4":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"; @@ -205,19 +205,27 @@ extends tyrant.mikera.tyrant.QuestApp BattleMap -battlemap  +battlemap +
    Active battle map;
    + static WorldScreen -context  +context +
    Controller.
    + Fight -fight  +fight +
    Controller for active battle.
    + java.util.ArrayList<Combatant> -originalfoes  +originalfoes +
    TODO see BattleScreen.originalredteam }
    + java.util.ArrayList<Combatant> @@ -228,7 +236,9 @@ extends tyrant.mikera.tyrant.QuestApp static BattleMap -overviewmap  +overviewmap +
    View for the World.
    + @@ -420,6 +410,7 @@ extends tyrant.mikera.tyrant.QuestApp

  • originalfoes

    public java.util.ArrayList<Combatant> originalfoes
    +
    TODO see BattleScreen.originalredteam }
    • @@ -429,6 +420,7 @@ extends tyrant.mikera.tyrant.QuestApp

  • battlemap

    public BattleMap battlemap
    +
    Active battle map;
    • @@ -438,6 +430,7 @@ extends tyrant.mikera.tyrant.QuestApp

  • fight

    public Fight fight
    +
    Controller for active battle.
    • @@ -480,40 +473,17 @@ extends tyrant.mikera.tyrant.QuestApp - +
    • -

      disclaimer

      -
      public void disclaimer()
      -
      • -
    - - - -
      -
    • -

      placesquads

      -
      public void placesquads()
      -
      • -
    - - - -
      -
    • -

      startcampaign

      -
      public void startcampaign()
      -
      • -
    - - - -
      -
    • -

      countsummon

      -
      public static int countsummon(java.util.Collection<Spell> spells)
      +

      handlefatalexception

      +
      public static void handlefatalexception(java.lang.RuntimeException e)
      +
      +
      Parameters:
      +
      e - Show this error to the user and log it.
      +
    @@ -526,26 +496,6 @@ extends tyrant.mikera.tyrant.QuestApp
    TODO deduplicate originals
    -     - - - - - - - diff --git a/doc/javadoc/javelin/controller/BattleSetup.html b/doc/javadoc/javelin/controller/BattleSetup.html index ed16aa7..00258e6 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 8337402..9e836ae 100644 --- a/doc/javadoc/javelin/controller/CountingSet.html +++ b/doc/javadoc/javelin/controller/CountingSet.html @@ -2,9 +2,9 @@ - + CountingSet - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
    diff --git a/doc/javadoc/javelin/controller/action/ActionDescription.html b/doc/javadoc/javelin/controller/action/ActionDescription.html index f8f1db9..3ecb0f4 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 @@ var activeTableTab = "activeTableTab";
  • All Known Implementing Classes:
    -
    Abandon, AbstractAttack, Action, ActionAdapter, AiAction, AiMovement, Automate, Breath, CastSpell, CastSpells, Charge, ConfigureBattleKeys, ConfigureWorldKeys, Defend, DefensiveAttack, Dig, Dismiss, Divide, Examine, Feint, Fire, ForceWait, Grapple, Guide, Help, Journal, Maneuver, MeleeAttack, Movement, Options, Park, PassItem, RangedAttack, Rename, ResetScore, ShowStatistics, TouchAttack, Trip, UseItem, UseItems, Withdraw, Work, WorldAction, WorldHelp, WorldMove, ZoomIn, ZoomOut
    +
    Abandon, AbstractAttack, Action, ActionAdapter, AiMovement, Automate, Breath, Camp, CastSpell, CastSpells, Charge, ConfigureBattleKeys, ConfigureWorldKeys, Defend, DefensiveAttack, Dig, Dismiss, Divide, Examine, Feint, Fire, ForceWait, Grapple, Guide, Help, Maneuver, MeleeAttack, Movement, OpenJournal, Park, PassItem, RangedAttack, Rename, ResetScore, ShowOptions, ShowStatistics, Target, TouchAttack, Trip, UseItem, UseItems, Withdraw, Work, WorldAction, WorldHelp, WorldMove, ZoomIn, ZoomOut

    diff --git a/doc/javadoc/javelin/controller/action/ActionMapping.html b/doc/javadoc/javelin/controller/action/ActionMapping.html index cb24cc0..b33c75c 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 9d2338f..2a03d2c 100644 --- a/doc/javadoc/javelin/controller/action/Breath.html +++ b/doc/javadoc/javelin/controller/action/Breath.html @@ -2,9 +2,9 @@ - + Breath - + @@ -102,28 +102,24 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
    • - -
    @@ -321,14 +322,16 @@ extends Description copied from class: Action
    Performs an action as the human player.
    -
    Overrides:
    -
    perform in class AiAction
    +
    Specified by:
    +
    perform in class Action
    Parameters:
    hero - Current unit.
    m - Current map.
    thing - Unit's visual representation.
    Returns:
    -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/CastSpell.html b/doc/javadoc/javelin/controller/action/CastSpell.html index 618f463..74725de 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":10,"i4":10,"i5":10,"i6":10,"i7":9,"i8":10,"i9":10,"i10":9,"i11":10,"i12":9}; +var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":9,"i7":10,"i8":10,"i9":9,"i10":10,"i11":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"; @@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
    • - + static float savechance(Combatant active, Combatant target, @@ -284,7 +291,14 @@ extends Fire -prioritize +predictattack + + @@ -389,6 +405,8 @@ extends Combatant targetCombatant, BattleState s, BattleMap m) +
    Description copied from class: Target
    +
    Called once a target is confirmed.
    Overrides:
    attack in class Fire
    @@ -413,20 +431,6 @@ extends - - -
      -
    • -

      affect

      -
      public static float affect(Combatant target,
-                           BattleState state,
-                           Spell spell,
-                           java.util.List<ChanceNode> chances,
-                           java.lang.String prefix,
-                           float hitchance)
      -
      • -
    @@ -458,9 +462,13 @@ extends

    checkhero

    protected void checkhero(tyrant.mikera.engine.Thing hero)
    +
    Description copied from class: Target
    +
    Does nothing by default.
    Overrides:
    checkhero in class Fire
    +
    Parameters:
    +
    hero - Active unit.
    @@ -491,9 +499,13 @@ extends Combatant combatant, java.util.List<Combatant> targets, BattleState s) +
    Description copied from class: Target
    +
    By default only allows targeting enemies that are in line-of-sight.
    Overrides:
    -
    filtertargets in class Fire
    +
    filtertargets in class Target
    +
    targets - Remove invalid targets from this list. Beware of + ConcurrentModificationException.
    @@ -505,9 +517,14 @@ extends BattleState state, Combatant c) +
    Description copied from class: Target
    +
    By default uses BattleState.isengaged(Combatant)
    Overrides:
    -
    checkengaged in class Fire
    +
    checkengaged in class Target
    +
    Returns:
    +
    true if the active unit is currently engaded and + should not be allowed to continue targetting.
    @@ -519,11 +536,16 @@ extends ChanceNode>> getoutcomes(BattleState gameState, Combatant active) -
    Description copied from class: AiAction
    +
    Description copied from interface: AiAction
    Lists the possible results of an action.
    -
    Overrides:
    -
    getoutcomes in class Fire
    +
    Specified by:
    +
    getoutcomes in interface AiAction
    +
    Parameters:
    +
    gameState - Current battle state.
    +
    active - Current unit.
    +
    See Also:
    +
    BattleState.next
    diff --git a/doc/javadoc/javelin/controller/action/Charge.html b/doc/javadoc/javelin/controller/action/Charge.html index f7b5cbd..c885876 100644 --- a/doc/javadoc/javelin/controller/action/Charge.html +++ b/doc/javadoc/javelin/controller/action/Charge.html @@ -2,9 +2,9 @@ - + Charge - + @@ -74,7 +74,7 @@ var activeTableTab = "activeTableTab"; @@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
  • @@ -357,9 +389,13 @@ extends

    checkhero

    protected void checkhero(tyrant.mikera.engine.Thing hero)
    +
    Description copied from class: Target
    +
    Does nothing by default.
    Overrides:
    checkhero in class Fire
    +
    Parameters:
    +
    hero - Active unit.
    • @@ -416,7 +452,7 @@ extends
  • Summary: 
  • Nested | 
    • -
  • Field | 
    • +
  • Field | 
  • Constr | 
  • Method
    • diff --git a/doc/javadoc/javelin/controller/action/ConfigureBattleKeys.html b/doc/javadoc/javelin/controller/action/ConfigureBattleKeys.html index 35f4b15..b3505a2 100644 --- a/doc/javadoc/javelin/controller/action/ConfigureBattleKeys.html +++ b/doc/javadoc/javelin/controller/action/ConfigureBattleKeys.html @@ -2,9 +2,9 @@ - + ConfigureBattleKeys - + @@ -246,7 +246,9 @@ extends Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/Defend.html b/doc/javadoc/javelin/controller/action/Defend.html index 795aa66..fd14dcd 100644 --- a/doc/javadoc/javelin/controller/action/Defend.html +++ b/doc/javadoc/javelin/controller/action/Defend.html @@ -2,9 +2,9 @@ - + Defend - + @@ -102,28 +102,24 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
    • - -
    @@ -298,14 +299,16 @@ extends Description copied from class: Action
    Performs an action as the human player.
    -
    Overrides:
    -
    perform in class AiAction
    +
    Specified by:
    +
    perform in class Action
    Parameters:
    active - Current unit.
    m - Current map.
    thing - Unit's visual representation.
    Returns:
    -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/DiagonalMovement.html b/doc/javadoc/javelin/controller/action/DiagonalMovement.html index e1aae1f..c83f576 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/Dig.html b/doc/javadoc/javelin/controller/action/Dig.html index ea20f31..899ff98 100644 --- a/doc/javadoc/javelin/controller/action/Dig.html +++ b/doc/javadoc/javelin/controller/action/Dig.html @@ -2,9 +2,9 @@ - + Dig - + @@ -102,28 +102,24 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
    • - -
    Performs an action as the human player.
    -
    Overrides:
    -
    perform in class AiAction
    +
    Specified by:
    +
    perform in class Action
    Parameters:
    hero - Current unit.
    m - Current map.
    thing - Unit's visual representation.
    Returns:
    -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    @@ -276,11 +274,16 @@ extends ChanceNode>> getoutcomes(BattleState s, Combatant active) -
    Description copied from class: AiAction
    +
    Description copied from interface: AiAction
    Lists the possible results of an action.
    Specified by:
    -
    getoutcomes in class AiAction
    +
    getoutcomes in interface AiAction
    +
    Parameters:
    +
    s - Current battle state.
    +
    active - Current unit.
    +
    See Also:
    +
    BattleState.next
    diff --git a/doc/javadoc/javelin/controller/action/Examine.html b/doc/javadoc/javelin/controller/action/Examine.html index b31293c..f36296c 100644 --- a/doc/javadoc/javelin/controller/action/Examine.html +++ b/doc/javadoc/javelin/controller/action/Examine.html @@ -2,9 +2,9 @@ - + Examine - + @@ -249,7 +249,9 @@ extends Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/Fire.html b/doc/javadoc/javelin/controller/action/Fire.html index adc3462..2456c1f 100644 --- a/doc/javadoc/javelin/controller/action/Fire.html +++ b/doc/javadoc/javelin/controller/action/Fire.html @@ -2,9 +2,9 @@ - + Fire - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":10,"i3":10,"i4":10,"i5":10,"i6":10,"i7":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"; @@ -74,7 +74,7 @@ var activeTableTab = "activeTableTab";     @@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
  • javelin.controller.action.Action
  • + - + + + + +
    • -

      getoutcomes

      -
      public java.util.List<java.util.List<ChanceNode>> getoutcomes(BattleState s,
-                                                              Combatant active)
      -
      Description copied from class: AiAction
      -
      Lists the possible results of an action.
      +

      checkhero

      +
      protected void checkhero(tyrant.mikera.engine.Thing hero)
      +
      Description copied from class: Target
      +
      Does nothing by default.
      -
      Specified by:
      -
      getoutcomes in class AiAction
      +
      Overrides:
      +
      checkhero in class Target
      +
      Parameters:
      +
      hero - Active unit.
    @@ -470,7 +413,7 @@ extends
  • Summary: 
  • Nested | 
    • -
  • Field | 
    • +
  • Field | 
  • Constr | 
  • Method
    • diff --git a/doc/javadoc/javelin/controller/action/Help.html b/doc/javadoc/javelin/controller/action/Help.html index a2d5b9c..9ad7242 100644 --- a/doc/javadoc/javelin/controller/action/Help.html +++ b/doc/javadoc/javelin/controller/action/Help.html @@ -2,9 +2,9 @@ - + Help - + @@ -253,7 +253,9 @@ extends Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/Movement.html b/doc/javadoc/javelin/controller/action/Movement.html index 37d0543..d839b4e 100644 --- a/doc/javadoc/javelin/controller/action/Movement.html +++ b/doc/javadoc/javelin/controller/action/Movement.html @@ -2,9 +2,9 @@ - + Movement - + @@ -146,11 +146,15 @@ extends     static float -DISENGAGE  +DISENGAGE +
    Cost to disengage.
    + static boolean -lastmovewasattack  +lastmovewasattack +
    TODO hack
    + @@ -387,7 +393,9 @@ extends Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/PassItem.html b/doc/javadoc/javelin/controller/action/PassItem.html index 262feee..9b20509 100644 --- a/doc/javadoc/javelin/controller/action/PassItem.html +++ b/doc/javadoc/javelin/controller/action/PassItem.html @@ -2,9 +2,9 @@ - + PassItem - + @@ -281,7 +281,9 @@ extends     Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/SimpleAction.html b/doc/javadoc/javelin/controller/action/SimpleAction.html index 6ae05df..2ce9625 100644 --- a/doc/javadoc/javelin/controller/action/SimpleAction.html +++ b/doc/javadoc/javelin/controller/action/SimpleAction.html @@ -2,9 +2,9 @@ - + SimpleAction - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
    @@ -394,7 +437,7 @@ extends diff --git a/doc/javadoc/javelin/controller/action/UseItem.html b/doc/javadoc/javelin/controller/action/UseItem.html index 3bf5dad..009a116 100644 --- a/doc/javadoc/javelin/controller/action/UseItem.html +++ b/doc/javadoc/javelin/controller/action/UseItem.html @@ -2,9 +2,9 @@ - + UseItem - + @@ -300,7 +300,9 @@ extends Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/Wait.html b/doc/javadoc/javelin/controller/action/Wait.html index 058185b..1d6cd44 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/Withdraw.html b/doc/javadoc/javelin/controller/action/Withdraw.html index ab3a705..4e9c90f 100644 --- a/doc/javadoc/javelin/controller/action/Withdraw.html +++ b/doc/javadoc/javelin/controller/action/Withdraw.html @@ -2,9 +2,9 @@ - + Withdraw - + @@ -249,7 +249,9 @@ extends     Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/ZoomIn.html b/doc/javadoc/javelin/controller/action/ZoomIn.html index fdec761..e708dd4 100644 --- a/doc/javadoc/javelin/controller/action/ZoomIn.html +++ b/doc/javadoc/javelin/controller/action/ZoomIn.html @@ -2,9 +2,9 @@ - + ZoomIn - + @@ -249,7 +249,9 @@ extends     Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/ZoomOut.html b/doc/javadoc/javelin/controller/action/ZoomOut.html index f3a15e7..24b8205 100644 --- a/doc/javadoc/javelin/controller/action/ZoomOut.html +++ b/doc/javadoc/javelin/controller/action/ZoomOut.html @@ -2,9 +2,9 @@ - + ZoomOut - + @@ -249,7 +249,9 @@ extends     Returns: -
    true if executed an action (successfully or not).
    +
    true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
    diff --git a/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html b/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html index 80003f4..c2e5cff 100644 --- a/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/AbstractAttack.html @@ -2,9 +2,9 @@ - + AbstractAttack - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":10,"i2":6,"i3":10,"i4":6,"i5":10,"i6":9}; +var methods = {"i0":10,"i1":10,"i2":6,"i3":10,"i4":6,"i5":10,"i6":10,"i7":9}; 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"; @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
    - -
    @@ -366,12 +370,37 @@ extends -
      +

      • cleave

        public abstract boolean cleave()
      + + + +
        +
      • +

        perform

        +
        public boolean perform(Combatant active,
+                       BattleMap m,
+                       tyrant.mikera.engine.Thing thing)
        +
        Description copied from class: Action
        +
        Performs an action as the human player.
        +
        +
        Specified by:
        +
        perform in class Action
        +
        Parameters:
        +
        active - Current unit.
        +
        m - Current map.
        +
        thing - Unit's visual representation.
        +
        Returns:
        +
        true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
        +
        +
        • +
    @@ -400,7 +429,7 @@ extends
    • Frames
      • diff --git a/doc/javadoc/javelin/controller/action/ai/AiAction.html b/doc/javadoc/javelin/controller/action/ai/AiAction.html index fbfee0a..87792de 100644 --- a/doc/javadoc/javelin/controller/action/ai/AiAction.html +++ b/doc/javadoc/javelin/controller/action/ai/AiAction.html @@ -2,9 +2,9 @@ - + AiAction - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":6,"i1":10}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"],8:["t4","Concrete Methods"]}; +var methods = {"i0":6}; +var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; var tableTab = "tableTab"; @@ -74,14 +74,14 @@ var activeTableTab = "activeTableTab";
    @@ -92,91 +92,27 @@ var activeTableTab = "activeTableTab";
    javelin.controller.action.ai
    -

    Class AiAction

    +

    Interface AiAction

    -
    diff --git a/doc/javadoc/javelin/controller/action/ai/AiMovement.html b/doc/javadoc/javelin/controller/action/ai/AiMovement.html index 436f12b..b983964 100644 --- a/doc/javadoc/javelin/controller/action/ai/AiMovement.html +++ b/doc/javadoc/javelin/controller/action/ai/AiMovement.html @@ -2,9 +2,9 @@ - + AiMovement - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9}; +var methods = {"i0":10,"i1":10,"i2":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,7 +48,7 @@ var activeTableTab = "activeTableTab";
    - -
    • All Implemented Interfaces:
      -
      java.io.Serializable, ActionDescription
      +
      java.io.Serializable, ActionDescription, AiAction

      public class AiMovement
-extends AiAction
      +extends Action +implements AiAction
      Author:
      alex
      @@ -183,19 +179,20 @@ extends +boolean +perform(Combatant active, + BattleMap m, + tyrant.mikera.engine.Thing thing) +
      Performs an action as the human player.
      + + + static java.util.ArrayList<ChanceNode> wait(BattleState gameState, Combatant active)  - -
        + + + + +
          +
        • +

          perform

          +
          public boolean perform(Combatant active,
+                       BattleMap m,
+                       tyrant.mikera.engine.Thing thing)
          +
          Description copied from class: Action
          +
          Performs an action as the human player.
          +
          +
          Specified by:
          +
          perform in class Action
          +
          Parameters:
          +
          active - Current unit.
          +
          m - Current map.
          +
          thing - Unit's visual representation.
          +
          Returns:
          +
          true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
          +
          +
          • +
      • @@ -293,7 +320,7 @@ extends
        diff --git a/doc/javadoc/javelin/controller/action/ai/DamageChance.html b/doc/javadoc/javelin/controller/action/ai/DamageChance.html index 2e14872..59ff2f2 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 a25c825..420bc4c 100644 --- a/doc/javadoc/javelin/controller/action/ai/ForceWait.html +++ b/doc/javadoc/javelin/controller/action/ai/ForceWait.html @@ -2,9 +2,9 @@ - + ForceWait - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10}; +var methods = {"i0":10,"i1":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -102,28 +102,24 @@ var activeTableTab = "activeTableTab";
      • javelin.controller.action.Action
      - -
    + +boolean +perform(Combatant active, + BattleMap m, + tyrant.mikera.engine.Thing thing) +
    Performs an action as the human player.
    + + -
    • @@ -244,16 +241,46 @@ extends -
        + + + + +
          +
        • +

          perform

          +
          public boolean perform(Combatant active,
+                       BattleMap m,
+                       tyrant.mikera.engine.Thing thing)
          +
          Description copied from class: Action
          +
          Performs an action as the human player.
          +
          +
          Specified by:
          +
          perform in class Action
          +
          Parameters:
          +
          active - Current unit.
          +
          m - Current map.
          +
          thing - Unit's visual representation.
          +
          Returns:
          +
          true if executed an action (successfully or not). + Just return false if the player cannot use this + action (AI-only).
        diff --git a/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html b/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html index 72b52c4..6b86467 100644 --- a/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/MeleeAttack.html @@ -2,9 +2,9 @@ - + MeleeAttack - + @@ -102,9 +102,6 @@ var activeTableTab = "activeTableTab";
      • javelin.controller.action.Action
      • - diff --git a/doc/javadoc/javelin/controller/action/ai/RangedAttack.html b/doc/javadoc/javelin/controller/action/ai/RangedAttack.html index c0d40dc..d55174a 100644 --- a/doc/javadoc/javelin/controller/action/ai/RangedAttack.html +++ b/doc/javadoc/javelin/controller/action/ai/RangedAttack.html @@ -2,9 +2,9 @@ - + RangedAttack - + @@ -102,9 +102,6 @@ var activeTableTab = "activeTableTab";
      • javelin.controller.action.Action
      • - diff --git a/doc/javadoc/javelin/controller/action/ai/package-frame.html b/doc/javadoc/javelin/controller/action/ai/package-frame.html index efe887b..784974d 100644 --- a/doc/javadoc/javelin/controller/action/ai/package-frame.html +++ b/doc/javadoc/javelin/controller/action/ai/package-frame.html @@ -2,19 +2,22 @@ - + javelin.controller.action.ai - +

        javelin.controller.action.ai

        +

        Interfaces

        +

        Classes

        @@ -131,19 +131,23 @@ extends java.lang.Object
        • - +
            -
          • +
          • -

            Constructor Summary

            - - +

            Field Summary

            +
            Constructors 
            + - + + - + +
            Fields 
            Constructor and DescriptionModifier and TypeField and Description
            ValueSelector() floatfailure +
            This is the worst possible utility value for this player.
            +
            • @@ -162,8 +166,8 @@ extends java.lang.Object Entry -getValue(Entry previous, - AbstractAlphaBetaSearch ai, +getValue(Entry previous, + AlphaBetaSearch ai, int depthP, float alpha, float beta, @@ -222,19 +226,22 @@ extends java.lang.Object
            • - +
                -
              • +
              • -

                Constructor Detail

                - +

                Field Detail

                +
                • -

                  ValueSelector

                  -
                  public ValueSelector()
                  +

                  failure

                  +
                  public final float failure
                  +
                  This is the worst possible utility value for this player. Used to seed + Entry.value to force the dummy entry to be replaced with any + valid game state.
                • @@ -245,14 +252,14 @@ extends java.lang.Object

                Method Detail

                - +
            diff --git a/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html b/doc/javadoc/javelin/controller/ai/valueselector/package-frame.html index da50ed2..4d56b07 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 617bddf..4294393 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 69a9094..e5b499e 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 64f8144..9b7188f 100644 --- a/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html +++ b/doc/javadoc/javelin/controller/challenge/ChallengeRatingCalculator.html @@ -2,9 +2,9 @@ - + ChallengeRatingCalculator - + @@ -137,18 +137,14 @@ extends java.lang.Object Field and Description -static boolean -appliedgoldrenrule  - - static CrFactor[] CR_FACTORS  - + static float[] CR_FRACTIONS  - + static HdFactor HIT_DICE_FACTOR  @@ -278,21 +274,12 @@ extends java.lang.Object -
              +

              • CR_FACTORS

                public static final CrFactor[] CR_FACTORS
              - - - -
                -
              • -

                appliedgoldrenrule

                -
                public static boolean appliedgoldrenrule
                -
                • -
            diff --git a/doc/javadoc/javelin/controller/challenge/RewardCalculator.html b/doc/javadoc/javelin/controller/challenge/RewardCalculator.html index c0b7834..a7a5f71 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,"i3":9,"i4":9,"i5":9,"i6":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9,"i4":9,"i5":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 @@ var activeTableTab = "activeTableTab"; @@ -123,25 +123,6 @@ extends java.lang.Object
            • - -
                -
              • - - -

                Field Summary

                - - - - - - - - - - -
                Fields 
                Modifier and TypeField and Description
                static java.util.Map<java.lang.Integer,javelin.controller.challenge.RewardCalculator.TableLine>table 
                -
                • -
              • @@ -191,15 +172,10 @@ extends java.lang.Object getgold(float cr)  -static double -getpartycr(int eldifference, - int nsurvivors)  - - static int receivegold(java.util.List<Combatant> team)  - + static java.lang.String rewardxp(java.util.ArrayList<Combatant> winners, java.util.List<Combatant> originalblue, @@ -225,23 +201,6 @@ extends java.lang.Object
                • - -
                    -
                  • - - -

                    Field Detail

                    - - - -
                      -
                    • -

                      table

                      -
                      public static java.util.Map<java.lang.Integer,javelin.controller.challenge.RewardCalculator.TableLine> table
                      -
                      • -
                    -
                    • -
                  @@ -434,13 +391,13 @@ extends java.lang.Object diff --git a/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html b/doc/javadoc/javelin/controller/challenge/TouchAttackFactor.html index c30a885..09d449f 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 d4270e7..5af34b5 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/AbilitiesFactor.html @@ -2,9 +2,9 @@ - + AbilitiesFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html b/doc/javadoc/javelin/controller/challenge/factor/ArmorClassFactor.html index 57367da..1956fc6 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 a5ac646..db80e8a 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/ClassLevelFactor.html @@ -2,9 +2,9 @@ - + ClassLevelFactor - + @@ -120,10 +120,12 @@ var activeTableTab = "activeTableTab"; 
                  public class ClassLevelFactor
 extends CrFactor
                  Feats (which are not given by class advancemente) are discounted on - FeatsFactor.
                  + FeatsFactor. Note that this removes CR that is more relevant on + SkillsFactor and AbilitiesFactor.
                See Also:
                -
                CrFactor
                +
                CrFactor, +ClassAdvancement
              diff --git a/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html b/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html index 0ce4042..3fe3bda 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/CrFactor.html @@ -2,9 +2,9 @@ - + CrFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/FeatsFactor.html index d9df67a..4fb8081 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 8db8e49..3e21746 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 475dcdc..f4d97fc 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/HdFactor.html @@ -2,9 +2,9 @@ - + HdFactor - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":10}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; +var methods = {"i0":10,"i1":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"; var tableTab = "tableTab"; @@ -157,7 +157,7 @@ extends

              Method Summary

              - + @@ -166,6 +166,10 @@ extends float + + + +
              All Methods Instance Methods Concrete Methods All Methods Static Methods Instance Methods Concrete Methods 
              Modifier and Type Method and Descriptioncalculate(Monster monster) 
              static TypeDatagettypedata(Monster monster) 
              • @@ -215,7 +219,7 @@ extends -
                  +

                  • calculate

                    public float calculate(Monster monster)
                    @@ -225,6 +229,19 @@ extends
                  + + + +
                    +
                  • +

                    gettypedata

                    +
                    public static TypeData gettypedata(Monster monster)
                    +
                    +
                    Returns:
                    +
                    Information about this monster type.
                    +
                    +
                    • +
                • diff --git a/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SizeFactor.html index 3206984..697b62b 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 518e43a..4fc8303 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SizeFactorWithAttModifiers.html @@ -2,9 +2,9 @@ - + SizeFactorWithAttModifiers - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html index 849b96a..c8c017d 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SkillsFactor.html @@ -2,9 +2,9 @@ - + SkillsFactor - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":9,"i2":10}; +var methods = {"i0":10,"i1":9,"i2":9,"i3":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"; @@ -191,11 +191,19 @@ extends calculate(Monster m)  -static float +static int levelup(int progression, - Monster m)  + Monster m)                 +
                Same as levelupcost(int, Monster) but returns skill points + instead of challenge rating.
                + +static float +levelupcost(int progression, + Monster m)  + + void listupgrades(UpgradeHandler handler)  @@ -289,14 +297,14 @@ extends
              - + -
                +
                • -

                  levelup

                  -
                  public static float levelup(int progression,
-                            Monster m)
                  +

                  levelupcost

                  +
                  public static float levelupcost(int progression,
+                                Monster m)
                  Parameters:
                  progression - How many skills are gained per class level or monster hit die.
                  @@ -307,6 +315,18 @@ extends
                + + + +
                  +
                • +

                  levelup

                  +
                  public static int levelup(int progression,
+                          Monster m)
                  +
                  Same as levelupcost(int, Monster) but returns skill points + instead of challenge rating.
                  +
                  • +
              • diff --git a/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html index ade3323..8c01967 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SpeedFactor.html @@ -2,9 +2,9 @@ - + SpeedFactor - + diff --git a/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html b/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html index ca4f277..360dc15 100644 --- a/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html +++ b/doc/javadoc/javelin/controller/challenge/factor/SpellsFactor.html @@ -2,9 +2,9 @@ - + SpellsFactor - + @@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
              • Frames
                • @@ -341,7 +341,7 @@ extends
                • Frames
                  • diff --git a/doc/javadoc/javelin/controller/challenge/factor/TypeData.html b/doc/javadoc/javelin/controller/challenge/factor/TypeData.html new file mode 100644 index 0000000..5d4de7a --- /dev/null +++ b/doc/javadoc/javelin/controller/challenge/factor/TypeData.html @@ -0,0 +1,301 @@ + + + + + +TypeData + + + + + + + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + +
                  +
                  javelin.controller.challenge.factor
                  +

                  Class TypeData

                  +
                  +
                  +
                    +
                  • java.lang.Object
                    • +
                  • +
                      +
                    • javelin.controller.challenge.factor.TypeData
                      • +
                    +
                    • +
                  +
                  + +
                  +
                  +
                    +
                  • + +
                      +
                    • + + +

                      Field Summary

                      + + + + + + + + + + + + + + +
                      Fields 
                      Modifier and TypeField and Description
                      floatcr +
                      Challenge rating per HD.
                      +
                      intskillprogression +
                      How many skill points per HD.
                      +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Summary

                      + + + + + + + + +
                      Constructors 
                      Constructor and Description
                      TypeData(float cr, + int skillprogression) +
                      Constructor.
                      +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Method Summary

                      +
                        +
                      • + + +

                        Methods inherited from class java.lang.Object

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

                      Field Detail

                      + + + +
                        +
                      • +

                        cr

                        +
                        public float cr
                        +
                        Challenge rating per HD.
                        +
                        • +
                      + + + +
                        +
                      • +

                        skillprogression

                        +
                        public int skillprogression
                        +
                        How many skill points per HD.
                        +
                        • +
                      +
                      • +
                    + +
                      +
                    • + + +

                      Constructor Detail

                      + + + +
                        +
                      • +

                        TypeData

                        +
                        public TypeData(float cr,
+                int skillprogression)
                        +
                        Constructor.
                        +
                        • +
                      +
                      • +
                    +
                    • +
                  +
                  +
                  + + +
                  + + +
                  Skip navigation links
                  + + + + +
                  +
                  + + + +
                  + +
                  +
                  + + +
                  + + +
                  + + + diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-frame.html b/doc/javadoc/javelin/controller/challenge/factor/package-frame.html index d8f28e3..770397e 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 - + @@ -25,6 +25,7 @@
                • SkillsFactor
                • SpeedFactor
                • SpellsFactor
                  • +
                • TypeData
              diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-summary.html b/doc/javadoc/javelin/controller/challenge/factor/package-summary.html index 33d0d6d..1ba4182 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 - + @@ -148,6 +148,10 @@
              TODO Monster.spellcr
              + +TypeData +  + diff --git a/doc/javadoc/javelin/controller/challenge/factor/package-tree.html b/doc/javadoc/javelin/controller/challenge/factor/package-tree.html index 40abbbe..d20e413 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 - + @@ -95,6 +95,7 @@
            • javelin.controller.challenge.factor.SpellsFactor
            +
          • javelin.controller.challenge.factor.TypeData
        diff --git a/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html b/doc/javadoc/javelin/controller/challenge/factor/quality/BreathFactor.html index 9e0da61..96b3a40 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 4a062ff..a06a9ce 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 40c8412..4e18696 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 fe6a72e..ff8bf30 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 0af09dc..47076f1 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/package-frame.html b/doc/javadoc/javelin/controller/challenge/package-frame.html index d5362ce..f6fdc09 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 2eaddef..f4b5358 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 b904363..24ab8e6 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 693d3d2..2a680ec 100644 --- a/doc/javadoc/javelin/controller/db/EncounterIndex.html +++ b/doc/javadoc/javelin/controller/db/EncounterIndex.html @@ -2,9 +2,9 @@ - + EncounterIndex - + @@ -102,7 +102,7 @@ var activeTableTab = "activeTableTab";
      • java.util.AbstractMap<K,V>
        • -
        • java.util.TreeMap<java.lang.Integer,java.util.List<Encounter>>
          • +
        • java.util.TreeMap<java.lang.Integer,java.util.List<Encounter>>
          • javelin.controller.db.EncounterIndex
            • @@ -118,13 +118,13 @@ var activeTableTab = "activeTableTab";
          • All Implemented Interfaces:
            -
            java.io.Serializable, java.lang.Cloneable, java.util.Map<java.lang.Integer,java.util.List<Encounter>>, java.util.NavigableMap<java.lang.Integer,java.util.List<Encounter>>, java.util.SortedMap<java.lang.Integer,java.util.List<Encounter>>
            +
            java.io.Serializable, java.lang.Cloneable, java.util.Map<java.lang.Integer,java.util.List<Encounter>>, java.util.NavigableMap<java.lang.Integer,java.util.List<Encounter>>, java.util.SortedMap<java.lang.Integer,java.util.List<Encounter>>

            public class EncounterIndex
-extends java.util.TreeMap<java.lang.Integer,java.util.List<Encounter>>
            -
            Mapping of Encounters by encounter level.
            +extends java.util.TreeMap<java.lang.Integer,java.util.List<Encounter>> +
            Mapping of Encounters by encounter level.
            Author:
            alex
            @@ -183,8 +183,8 @@ extends java.util.TreeMap<java.lang.Integer,java.util.List< void -put(int cr, - Encounter e)  +put(int cr, + Encounter e) 
              @@ -246,14 +246,14 @@ extends java.util.TreeMap<java.lang.Integer,java.util.List< +

              • put

                public void put(int cr,
-                Encounter e)
                + Encounter e)
                Parameters:
                e - Register this with the given challenge rating.
                diff --git a/doc/javadoc/javelin/controller/db/Preferences.html b/doc/javadoc/javelin/controller/db/Preferences.html index 10229f5..4ab9ce2 100644 --- a/doc/javadoc/javelin/controller/db/Preferences.html +++ b/doc/javadoc/javelin/controller/db/Preferences.html @@ -2,9 +2,9 @@ - + Preferences - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":9}; +var methods = {"i0":9,"i1":9,"i2":9,"i3":9}; var tabs = {65535:["t0","All Methods"],1:["t1","Static Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -145,24 +145,24 @@ extends java.lang.Object static boolean -DEBUGCLEARGARRISON  +BACKUP  static boolean +DEBUGCLEARGARRISON  + + +static boolean DEBUGDISABLECOMBAT  - + static boolean DEBUGESHOWMAP  - + static java.lang.String DEBUGFOE  - -static java.lang.Integer -DEBUGHAX  - static java.lang.Integer DEBUGLABOR  @@ -180,28 +180,48 @@ extends java.lang.Object DEBUGPERIOD  +static java.lang.Integer +DEBUGRUBIES  + + static java.lang.String DEBUGSEASON  - + static java.lang.Integer DEBUGSGOLD  - + static Item DEBUGSTARTINGITEM
                TODO make this take a String from the properties file.
                - + static java.lang.Integer DEBUGSXP  + +static boolean +DEBUGUNLOCKTEMPLES  + static java.lang.String DEBUGWEATHER  +static java.lang.String +KEYCHECKPERFORMANCE +
                Configuration file key for MONITORPERFORMANCE.
                + + + +static java.lang.String +KEYMAXTHREADS +
                Configuration file key for MAXTHREADS.
                + + + static int MAXMILISECONDSTHINKING  @@ -218,6 +238,14 @@ extends java.lang.Object MESSAGEWAIT  +static boolean +MONITORPERFORMANCE  + + +static int +SAVEINTERVAL  + + static java.lang.String TEXTCOLOR  @@ -265,7 +293,16 @@ extends java.lang.Object static void -savefile(java.lang.String content)  +savefile(java.lang.String content) +
                TODO would be better to have an option #setpreference(String key,String + value) that would read the file, replace a line with the given key and + save it in the proper order instead of forever appending to the file.
                + + + +static void +write(java.lang.String content, + java.lang.String f) 
                  @@ -289,6 +326,34 @@ extends java.lang.Object

                  Field Detail

                  + + + + + + + + @@ -325,6 +390,15 @@ extends java.lang.Object 
                  public static int MAXTHREADS
                + + + +
                  +
                • +

                  MONITORPERFORMANCE

                  +
                  public static boolean MONITORPERFORMANCE
                  +
                  • +
                @@ -343,6 +417,24 @@ extends java.lang.Object 
                public static java.lang.String TEXTCOLOR
              + + + +
                +
              • +

                BACKUP

                +
                public static boolean BACKUP
                +
                • +
              + + + +
                +
              • +

                SAVEINTERVAL

                +
                public static int SAVEINTERVAL
                +
                • +
              @@ -379,13 +471,13 @@ extends java.lang.Object 
              public static java.lang.Integer DEBUGSGOLD
            - +
            • -

              DEBUGHAX

              -
              public static java.lang.Integer DEBUGHAX
              +

              DEBUGRUBIES

              +
              public static java.lang.Integer DEBUGRUBIES
            @@ -460,6 +552,15 @@ extends java.lang.Object 
            public static java.lang.String DEBUGSEASON
          + + + +
            +
          • +

            DEBUGUNLOCKTEMPLES

            +
            public static boolean DEBUGUNLOCKTEMPLES
            +
            • +
          @@ -515,6 +616,10 @@ extends java.lang.Object

        • savefile

          public static void savefile(java.lang.String content)
          +
          TODO would be better to have an option #setpreference(String key,String + value) that would read the file, replace a line with the given key and + save it in the proper order instead of forever appending to the file. It + could be used in a few places this is being used instead.
          Parameters:
          content - Overwrite the properties file with this content and reloads @@ -522,6 +627,24 @@ extends java.lang.Object
        + + + +
          +
        • +

          write

          +
          public static void write(java.lang.String content,
+                         java.lang.String f)
+                  throws java.io.IOException
          +
          +
          Parameters:
          +
          content - Write content...
          +
          f - to this file.
          +
          Throws:
          +
          java.io.IOException
          +
          +
          • +
        diff --git a/doc/javadoc/javelin/controller/db/Properties.html b/doc/javadoc/javelin/controller/db/Properties.html index 79afa2f..d3f33a6 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 956a083..aae12e1 100644 --- a/doc/javadoc/javelin/controller/db/StateManager.html +++ b/doc/javadoc/javelin/controller/db/StateManager.html @@ -2,9 +2,9 @@ - + StateManager - + @@ -141,6 +141,18 @@ extends java.lang.Object static boolean nofile  + +static java.io.File +SAVEFILE +
        Normal save file.
        + + + +static java.awt.event.WindowAdapter +SAVEONCLOSE +
        Always called on normal exit.
        + +
      @@ -181,11 +193,20 @@ extends java.lang.Object static boolean -load()  +load() +
      Loads SAVEFILE and saves a backup of it.
      + static void -save()  +save(boolean force, + java.io.File to) +
      This should only be called from one place during normal execution of the + game! Saving can be a slow process, especially on late game and very + error-prone if not done carefully! Any error could potentially represent + the loss of dozens of hours of gameplay so don't call this method unless + absolutely necessary!
      +
        @@ -209,6 +230,26 @@ extends java.lang.Object

        Field Detail

        + + + +
          +
        • +

          SAVEFILE

          +
          public static final java.io.File SAVEFILE
          +
          Normal save file.
          +
          • +
        + + + +
          +
        • +

          SAVEONCLOSE

          +
          public static final java.awt.event.WindowAdapter SAVEONCLOSE
          +
          Always called on normal exit.
          +
          • +
        @@ -252,13 +293,25 @@ extends java.lang.Object

        Method Detail

        - +

        • save

          -
          public static void save()
          +
          public static void save(boolean force,
+                        java.io.File to)
          +
          This should only be called from one place during normal execution of the + game! Saving can be a slow process, especially on late game and very + error-prone if not done carefully! Any error could potentially represent + the loss of dozens of hours of gameplay so don't call this method unless + absolutely necessary!
          +
          +
          Parameters:
          +
          force - If false will only save once upon a certain + number of calls.
          +
          to -
          +
        @@ -268,6 +321,11 @@ extends java.lang.Object

      • load

        public static boolean load()
        +
        Loads SAVEFILE and saves a backup of it.
        +
        +
        Returns:
        +
        false if starting a new game (no previous save).
        +
      diff --git a/doc/javadoc/javelin/controller/db/package-frame.html b/doc/javadoc/javelin/controller/db/package-frame.html index 1104f49..fbf48c6 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 801b8b6..dcd8571 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 - + @@ -84,7 +84,7 @@ EncounterIndex -
      Mapping of Encounters by encounter level.
      +
      Mapping of Encounters by encounter level.
      diff --git a/doc/javadoc/javelin/controller/db/package-tree.html b/doc/javadoc/javelin/controller/db/package-tree.html index 4d5a3eb..b0a214f 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 969ac2c..b68638b 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 06f17cc..bb131c3 100644 --- a/doc/javadoc/javelin/controller/db/reader/MonsterReader.html +++ b/doc/javadoc/javelin/controller/db/reader/MonsterReader.html @@ -2,9 +2,9 @@ - + MonsterReader - + diff --git a/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html b/doc/javadoc/javelin/controller/db/reader/SpecialtiesLog.html index e049f77..f9278c8 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 index 5076b40..b7ceee6 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Alignment.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Alignment.html @@ -2,9 +2,9 @@ - + Alignment - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html b/doc/javadoc/javelin/controller/db/reader/factor/ArmorClass.html index f31ad63..e2504eb 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html b/doc/javadoc/javelin/controller/db/reader/factor/Attacks.html index f95f91e..b7206ab 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 fe60530..de91a7c 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 92f49f8..07dede1 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 8803a19..804e5c8 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 be9eb5e..b7e3603 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html b/doc/javadoc/javelin/controller/db/reader/factor/HitDice.html index 948ea01..0bba365 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 bb24d9a..5a1060a 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 3d25182..c404f7b 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 ee4c5f1..5619305 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html b/doc/javadoc/javelin/controller/db/reader/factor/Paragraph.html index 15ef8ad..baead2a 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/Skills.html b/doc/javadoc/javelin/controller/db/reader/factor/Skills.html index 9c61511..31a2b7c 100644 --- a/doc/javadoc/javelin/controller/db/reader/factor/Skills.html +++ b/doc/javadoc/javelin/controller/db/reader/factor/Skills.html @@ -2,9 +2,9 @@ - + Skills - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html b/doc/javadoc/javelin/controller/db/reader/factor/SpecialAttacks.html index 048772c..6c4f1af 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html b/doc/javadoc/javelin/controller/db/reader/factor/SpecialQualities.html index ce661f6..7bf6997 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 59810d4..a8b7e23 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 0455ecf..b53acd3 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 - + 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 fb0ec2b..178c0ae 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 - + 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 1bef1a9..ee101c7 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 - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Alignment.html b/doc/javadoc/javelin/controller/db/reader/fields/Alignment.html index e3a67d0..47e47f0 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Alignment.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Alignment.html @@ -2,9 +2,9 @@ - + Alignment - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/ArmorClass.html b/doc/javadoc/javelin/controller/db/reader/fields/ArmorClass.html index a03bfed..cf316cc 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/ArmorClass.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/ArmorClass.html @@ -2,9 +2,9 @@ - + ArmorClass - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Attacks.html b/doc/javadoc/javelin/controller/db/reader/fields/Attacks.html index fa21729..bf898ab 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Attacks.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Attacks.html @@ -2,9 +2,9 @@ - + Attacks - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Damage.html b/doc/javadoc/javelin/controller/db/reader/fields/Damage.html index fb67b22..255111f 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Damage.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Damage.html @@ -2,9 +2,9 @@ - + Damage - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/FaceAndReach.html b/doc/javadoc/javelin/controller/db/reader/fields/FaceAndReach.html index cb76754..d5bb24d 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/FaceAndReach.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/FaceAndReach.html @@ -2,9 +2,9 @@ - + FaceAndReach - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Feats.html b/doc/javadoc/javelin/controller/db/reader/fields/Feats.html index 3faaccd..2d32dc6 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Feats.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Feats.html @@ -2,9 +2,9 @@ - + Feats - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/FieldReader.html b/doc/javadoc/javelin/controller/db/reader/fields/FieldReader.html index 257330c..c8af976 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/FieldReader.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/FieldReader.html @@ -2,9 +2,9 @@ - + FieldReader - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/HitDice.html b/doc/javadoc/javelin/controller/db/reader/fields/HitDice.html index b857088..dea912e 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/HitDice.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/HitDice.html @@ -2,9 +2,9 @@ - + HitDice - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Initiative.html b/doc/javadoc/javelin/controller/db/reader/fields/Initiative.html index e2a37fa..f65fc86 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Initiative.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Initiative.html @@ -2,9 +2,9 @@ - + Initiative - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Name.html b/doc/javadoc/javelin/controller/db/reader/fields/Name.html index b0b02f3..d2dbe2c 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Name.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Name.html @@ -2,9 +2,9 @@ - + Name - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Organization.html b/doc/javadoc/javelin/controller/db/reader/fields/Organization.html index 7a98848..69b49a7 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Organization.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Organization.html @@ -2,9 +2,9 @@ - + Organization - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":9,"i1":9,"i2":10}; +var methods = {"i0":9,"i1":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"; @@ -197,17 +197,12 @@ extends Method and Description -static java.util.List<Combatant> -makeencounter(int el, - Terrain terrain2)  - - static void process() -
      Uses organization data to create Encounters.
      +
      Uses organization data to create Encounters.
      - + void read(java.lang.String value)  @@ -310,29 +305,11 @@ extends -
        +

        • process

          public static void process()
          -
          Uses organization data to create Encounters.
          -
          • -
        - - - -
          -
        • -

          makeencounter

          -
          public static java.util.List<Combatant> makeencounter(int el,
-                                                      Terrain terrain2)
          -
          -
          Parameters:
          -
          el - Given an encounter level target...
          -
          terrain2 -
          -
          Returns:
          -
          a predefined creature group found on monster.xml from any of the - local terrains.
          -
          +
          Uses organization data to create Encounters.
        diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Paragraph.html b/doc/javadoc/javelin/controller/db/reader/fields/Paragraph.html index 65669c4..6896784 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Paragraph.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Paragraph.html @@ -2,9 +2,9 @@ - + Paragraph - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Skills.html b/doc/javadoc/javelin/controller/db/reader/fields/Skills.html index 24cd142..02f0b1c 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Skills.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Skills.html @@ -2,9 +2,9 @@ - + Skills - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/SpecialAttacks.html b/doc/javadoc/javelin/controller/db/reader/fields/SpecialAttacks.html index e358d17..dc46b3a 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/SpecialAttacks.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/SpecialAttacks.html @@ -2,9 +2,9 @@ - + SpecialAttacks - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/SpecialQualities.html b/doc/javadoc/javelin/controller/db/reader/fields/SpecialQualities.html index 9cee31e..af75953 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/SpecialQualities.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/SpecialQualities.html @@ -2,9 +2,9 @@ - + SpecialQualities - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/Speed.html b/doc/javadoc/javelin/controller/db/reader/fields/Speed.html index 5837a32..c577a5f 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/Speed.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/Speed.html @@ -2,9 +2,9 @@ - + Speed - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/package-frame.html b/doc/javadoc/javelin/controller/db/reader/fields/package-frame.html index eae7b04..c09e882 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/package-frame.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.fields - + diff --git a/doc/javadoc/javelin/controller/db/reader/fields/package-summary.html b/doc/javadoc/javelin/controller/db/reader/fields/package-summary.html index a01cba6..707efd1 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/package-summary.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.fields - + @@ -43,7 +43,7 @@
        • Frames
          • @@ -182,7 +182,7 @@
          • Frames
            • diff --git a/doc/javadoc/javelin/controller/db/reader/fields/package-tree.html b/doc/javadoc/javelin/controller/db/reader/fields/package-tree.html index 4c349a2..c486644 100644 --- a/doc/javadoc/javelin/controller/db/reader/fields/package-tree.html +++ b/doc/javadoc/javelin/controller/db/reader/fields/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.db.reader.fields Class Hierarchy - + @@ -43,7 +43,7 @@
            • Frames
              • @@ -124,7 +124,7 @@
              • Frames
                • diff --git a/doc/javadoc/javelin/controller/db/reader/package-frame.html b/doc/javadoc/javelin/controller/db/reader/package-frame.html index 5fc4780..a0c7980 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 50382f8..5283573 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 e5d2bed..dff7dee 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/effect/DamageEffect.html b/doc/javadoc/javelin/controller/effect/DamageEffect.html index 806055c..dd91391 100644 --- a/doc/javadoc/javelin/controller/effect/DamageEffect.html +++ b/doc/javadoc/javelin/controller/effect/DamageEffect.html @@ -2,9 +2,9 @@ - + DamageEffect - + diff --git a/doc/javadoc/javelin/controller/effect/package-frame.html b/doc/javadoc/javelin/controller/effect/package-frame.html index 4b108bc..1c39f17 100644 --- a/doc/javadoc/javelin/controller/effect/package-frame.html +++ b/doc/javadoc/javelin/controller/effect/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.effect - + diff --git a/doc/javadoc/javelin/controller/effect/package-summary.html b/doc/javadoc/javelin/controller/effect/package-summary.html index cd496e4..7de2f78 100644 --- a/doc/javadoc/javelin/controller/effect/package-summary.html +++ b/doc/javadoc/javelin/controller/effect/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.effect - + diff --git a/doc/javadoc/javelin/controller/effect/package-tree.html b/doc/javadoc/javelin/controller/effect/package-tree.html index 25fa2ad..4c50a02 100644 --- a/doc/javadoc/javelin/controller/effect/package-tree.html +++ b/doc/javadoc/javelin/controller/effect/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.effect Class Hierarchy - + diff --git a/doc/javadoc/javelin/controller/encounter/Encounter.html b/doc/javadoc/javelin/controller/encounter/Encounter.html index 987e94a..b89e25e 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 a1ef20b..4c6fb0e 100644 --- a/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html +++ b/doc/javadoc/javelin/controller/encounter/EncounterGenerator.html @@ -2,9 +2,9 @@ - + EncounterGenerator - + diff --git a/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html b/doc/javadoc/javelin/controller/encounter/EncounterPossibilities.html index 52eca6e..84de35a 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 4329739..e688fcb 100644 --- a/doc/javadoc/javelin/controller/encounter/GeneratedFight.html +++ b/doc/javadoc/javelin/controller/encounter/GeneratedFight.html @@ -2,9 +2,9 @@ - + GeneratedFight - + diff --git a/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html b/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html index b6a2e1d..b3e3d14 100644 --- a/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html +++ b/doc/javadoc/javelin/controller/encounter/MisalignmentDetector.html @@ -2,9 +2,9 @@ - + MisalignmentDetector - + diff --git a/doc/javadoc/javelin/controller/encounter/package-frame.html b/doc/javadoc/javelin/controller/encounter/package-frame.html index 3f35db0..051e5d0 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 - + diff --git a/doc/javadoc/javelin/controller/encounter/package-summary.html b/doc/javadoc/javelin/controller/encounter/package-summary.html index 4f8edb6..f8a49f8 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 - + diff --git a/doc/javadoc/javelin/controller/encounter/package-tree.html b/doc/javadoc/javelin/controller/encounter/package-tree.html index d7034ae..264a10b 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 - + diff --git a/doc/javadoc/javelin/controller/exception/GaveUpException.html b/doc/javadoc/javelin/controller/exception/GaveUpException.html index ea996ee..3b56eeb 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 7b1b265..047472c 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/RepeatTurn.html b/doc/javadoc/javelin/controller/exception/RepeatTurn.html index df0153a..3b9e50a 100644 --- a/doc/javadoc/javelin/controller/exception/RepeatTurn.html +++ b/doc/javadoc/javelin/controller/exception/RepeatTurn.html @@ -2,9 +2,9 @@ - + RepeatTurn - + diff --git a/doc/javadoc/javelin/controller/exception/RepeatTurnException.html b/doc/javadoc/javelin/controller/exception/RepeatTurnException.html index 655c6e5..b5137cb 100644 --- a/doc/javadoc/javelin/controller/exception/RepeatTurnException.html +++ b/doc/javadoc/javelin/controller/exception/RepeatTurnException.html @@ -2,9 +2,9 @@ - + RepeatTurnException - + @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
                @@ -262,7 +262,7 @@ extends java.lang.RuntimeException
                diff --git a/doc/javadoc/javelin/controller/exception/RestartWorldGeneration.html b/doc/javadoc/javelin/controller/exception/RestartWorldGeneration.html index ce0e3ff..cd34d12 100644 --- a/doc/javadoc/javelin/controller/exception/RestartWorldGeneration.html +++ b/doc/javadoc/javelin/controller/exception/RestartWorldGeneration.html @@ -2,9 +2,9 @@ - + RestartWorldGeneration - + diff --git a/doc/javadoc/javelin/controller/exception/StopThinking.html b/doc/javadoc/javelin/controller/exception/StopThinking.html index 28ab061..1f07c7d 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/UnbalancedTeams.html b/doc/javadoc/javelin/controller/exception/UnbalancedTeams.html index 64cb9b2..9a05eef 100644 --- a/doc/javadoc/javelin/controller/exception/UnbalancedTeams.html +++ b/doc/javadoc/javelin/controller/exception/UnbalancedTeams.html @@ -2,9 +2,9 @@ - + UnbalancedTeams - + diff --git a/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html b/doc/javadoc/javelin/controller/exception/UnbalancedTeamsException.html index af1462e..4d31452 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 68ec2ac..6135bb8 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 e5ef9bc..c77876b 100644 --- a/doc/javadoc/javelin/controller/exception/battle/EndBattle.html +++ b/doc/javadoc/javelin/controller/exception/battle/EndBattle.html @@ -2,9 +2,9 @@ - + EndBattle - + diff --git a/doc/javadoc/javelin/controller/exception/battle/StartBattle.html b/doc/javadoc/javelin/controller/exception/battle/StartBattle.html index a4f1a34..ad14a8f 100644 --- a/doc/javadoc/javelin/controller/exception/battle/StartBattle.html +++ b/doc/javadoc/javelin/controller/exception/battle/StartBattle.html @@ -2,9 +2,9 @@ - + StartBattle - + @@ -162,7 +162,9 @@ extends Fight -fight  +fight +
                Controller for the battle.
                + @@ -179,7 +181,9 @@ extends Constructor and Description -StartBattle(Fight d)  +StartBattle(Fight d) +
                Constructor.
                + @@ -198,7 +202,9 @@ extends void -battle()  +battle() +
                Prepares and switches to a BattleScreen.
                + @@ -260,6 +267,7 @@ extends

                StartBattle

                public StartBattle(Fight d)
                +
                Constructor.
              @@ -277,6 +285,7 @@ extends

              battle

              public void battle()
              +
              Prepares and switches to a BattleScreen.
            diff --git a/doc/javadoc/javelin/controller/exception/battle/package-frame.html b/doc/javadoc/javelin/controller/exception/battle/package-frame.html index 20a0988..dfc787d 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 9d1ade1..e33df41 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 3103b8c..cd61bfc 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 2099c99..99f666e 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 7a7cc54..fe3bc2f 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 - + @@ -42,7 +42,7 @@
              @@ -142,7 +142,7 @@
              diff --git a/doc/javadoc/javelin/controller/exception/package-tree.html b/doc/javadoc/javelin/controller/exception/package-tree.html index 1327f93..3ecb94a 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 - + @@ -42,7 +42,7 @@
              @@ -121,7 +121,7 @@
          @@ -195,7 +195,7 @@ extends Fight -avoid, bribe, dealreward, getscreen, onEnd +avoid, bribe, dealreward, dontflee, enhance, generate, getdefaultterrains, getscreen, getterrains, onEnd, validate, win
        @@ -193,14 +197,19 @@ extends +java.util.List<Combatant> +generate(int teamel, + Terrain terrain)  + + int getel(int teamel)  - + java.util.List<Combatant> getmonsters(int teamel)  - + void onEnd(BattleScreen screen, java.util.ArrayList<Combatant> originalTeam, @@ -214,7 +223,7 @@ extends Fight -avoid, checkEndBattle, dealreward, getscreen, withdraw +avoid, checkEndBattle, dealreward, dontflee, enhance, getdefaultterrains, getscreen, getterrains, validate, win, withdraw
      @@ -253,6 +263,7 @@ extends

      incursion

      public final Incursion incursion
      +
      Incursion being fought.
    @@ -337,7 +348,7 @@ extends -
      +

      • onEnd

        public void onEnd(BattleScreen screen,
@@ -355,6 +366,23 @@ extends 
+
+
+
          
+
        • 
+
          generate
          
+
          public java.util.List<Combatant> generate(int teamel,
+                                          Terrain terrain)
          
+
          
+
          Overrides:
          
+
          generate in class Fight
          
+
          terrain - Terrain this fight takes place on.
          
+
          Returns:
          
+
          The resulting opponents.
          
+
          
+
          • 
+
      diff --git a/doc/javadoc/javelin/controller/fight/LairFight.html b/doc/javadoc/javelin/controller/fight/LairFight.html index 65ac4cc..46ae38c 100644 --- a/doc/javadoc/javelin/controller/fight/LairFight.html +++ b/doc/javadoc/javelin/controller/fight/LairFight.html @@ -2,9 +2,9 @@ - + LairFight - + @@ -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,"i4":10,"i5":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 @@ var activeTableTab = "activeTableTab";
    @@ -196,20 +196,21 @@ extends +java.util.List<Combatant> +generate(int teamel, + Terrain terrain)  + + int getel(int teamel)  - + java.util.List<Combatant> getmonsters(int teamel)  - -void -onEnd(BattleScreen screen, - java.util.ArrayList<Combatant> originalTeam, - BattleState s) -
    Called when a battle ends.
    - + +java.lang.Boolean +win(BattleScreen screen) 
    • @@ -339,24 +340,35 @@ extends + + + +
        +
      • +

        generate

        +
        public java.util.List<Combatant> generate(int teamel,
+                                          Terrain terrain)
        +
        +
        Overrides:
        +
        generate in class Fight
        +
        terrain - Terrain this fight takes place on.
        +
        Returns:
        +
        The resulting opponents.
        +
        +
        • +
      +
      • -

        onEnd

        -
        public void onEnd(BattleScreen screen,
-                  java.util.ArrayList<Combatant> originalTeam,
-                  BattleState s)
        -
        Description copied from class: Fight
        -
        Called when a battle ends.
        +

        win

        +
        public java.lang.Boolean win(BattleScreen screen)
        Overrides:
        -
        onEnd in class Fight
        -
        Parameters:
        -
        screen - Currently open screen.
        -
        originalTeam - Team state before the battle started.
        -
        s - Final battle state.
        +
        win in class Fight
        +
        Returns:
        +
        true if battle has been won.
      @@ -388,7 +400,7 @@ extends
      • Frames
        • diff --git a/doc/javadoc/javelin/controller/fight/PlanarFight.PlanarFightScreen.html b/doc/javadoc/javelin/controller/fight/PlanarFight.PlanarFightScreen.html index ef7af4e..1de63f0 100644 --- a/doc/javadoc/javelin/controller/fight/PlanarFight.PlanarFightScreen.html +++ b/doc/javadoc/javelin/controller/fight/PlanarFight.PlanarFightScreen.html @@ -2,9 +2,9 @@ - + PlanarFight.PlanarFightScreen - + diff --git a/doc/javadoc/javelin/controller/fight/PlanarFight.html b/doc/javadoc/javelin/controller/fight/PlanarFight.html index 36b7bf6..5f3aa52 100644 --- a/doc/javadoc/javelin/controller/fight/PlanarFight.html +++ b/doc/javadoc/javelin/controller/fight/PlanarFight.html @@ -2,7 +2,7 @@ - + PlanarFight diff --git a/doc/javadoc/javelin/controller/fight/RandomDungeonEncounter.html b/doc/javadoc/javelin/controller/fight/RandomDungeonEncounter.html index fa5e53f..649d830 100644 --- a/doc/javadoc/javelin/controller/fight/RandomDungeonEncounter.html +++ b/doc/javadoc/javelin/controller/fight/RandomDungeonEncounter.html @@ -2,9 +2,9 @@ - + RandomDungeonEncounter - + @@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
    @@ -196,7 +200,7 @@ extends Fight -avoid, bribe, checkEndBattle, dealreward, getscreen, onEnd, withdraw +avoid, bribe, checkEndBattle, dealreward, dontflee, enhance, generate, getdefaultterrains, getscreen, getterrains, onEnd, validate, win, withdraw @@ -192,7 +192,7 @@ extends Fight -avoid, bribe, checkEndBattle, dealreward, getscreen, onEnd, withdraw +avoid, bribe, checkEndBattle, dealreward, dontflee, enhance, generate, getdefaultterrains, getscreen, getterrains, onEnd, validate, win, withdraw
      @@ -74,7 +74,7 @@ var activeTableTab = "activeTableTab"; @@ -138,11 +138,18 @@ extends +
    • + + +

      Fields inherited from class javelin.controller.fight.Siege

      +cleargarrison
      • +
    + @@ -198,7 +205,7 @@ extends Fight -avoid, checkEndBattle, dealreward, getscreen, withdraw +avoid, checkEndBattle, dealreward, dontflee, enhance, generate, getdefaultterrains, getscreen, getterrains, validate, win, withdraw
    diff --git a/doc/javadoc/javelin/controller/fight/package-summary.html b/doc/javadoc/javelin/controller/fight/package-summary.html index 6c6f6e9..cdbc15d 100644 --- a/doc/javadoc/javelin/controller/fight/package-summary.html +++ b/doc/javadoc/javelin/controller/fight/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.fight - + @@ -105,30 +105,31 @@ -PlanarFight - -
    Ultimate game challenge, in which a player is challenged by a team of their - own encounter level.
    - - - RandomDungeonEncounter
    Generates a harder battle than a RandomEncounter.
    - + RandomEncounter
    Fight that happens on the overworld map.
    - + Siege
    Battle when a player invades a hostile town.
    + +TempleEncounter + +
    Temple fights are different from normal Dungeon encounters + because the creatures are upgraded with Upgrades from the respective + Realm.
    + + TrainingSession diff --git a/doc/javadoc/javelin/controller/fight/package-tree.html b/doc/javadoc/javelin/controller/fight/package-tree.html index 6405fd6..8b73d00 100644 --- a/doc/javadoc/javelin/controller/fight/package-tree.html +++ b/doc/javadoc/javelin/controller/fight/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.fight Class Hierarchy - + @@ -85,10 +85,13 @@
  • javelin.controller.fight.ExhibitionFight
  • javelin.controller.fight.IncursionFight
  • javelin.controller.fight.LairFight
    • -
  • javelin.controller.fight.PlanarFight
  • javelin.controller.fight.RandomEncounter
  • javelin.controller.fight.Siege diff --git a/doc/javadoc/javelin/controller/fight/tournament/Champion.html b/doc/javadoc/javelin/controller/fight/tournament/Champion.html index 95757d1..5d75c8c 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/Champion.html +++ b/doc/javadoc/javelin/controller/fight/tournament/Champion.html @@ -2,9 +2,9 @@ - + Champion - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/CrIterator.html b/doc/javadoc/javelin/controller/fight/tournament/CrIterator.html index 435553a..8c4e2ac 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/CrIterator.html +++ b/doc/javadoc/javelin/controller/fight/tournament/CrIterator.html @@ -2,9 +2,9 @@ - + CrIterator - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/Exhibition.html b/doc/javadoc/javelin/controller/fight/tournament/Exhibition.html index 8272add..58f8a0c 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/Exhibition.html +++ b/doc/javadoc/javelin/controller/fight/tournament/Exhibition.html @@ -2,9 +2,9 @@ - + Exhibition - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/Horde.html b/doc/javadoc/javelin/controller/fight/tournament/Horde.html index 2763a9b..f513aea 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/Horde.html +++ b/doc/javadoc/javelin/controller/fight/tournament/Horde.html @@ -2,9 +2,9 @@ - + Horde - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/Match.html b/doc/javadoc/javelin/controller/fight/tournament/Match.html index 36b8e08..51e975e 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/Match.html +++ b/doc/javadoc/javelin/controller/fight/tournament/Match.html @@ -2,9 +2,9 @@ - + Match - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/MirrorMatch.html b/doc/javadoc/javelin/controller/fight/tournament/MirrorMatch.html index b2093ae..dca5832 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/MirrorMatch.html +++ b/doc/javadoc/javelin/controller/fight/tournament/MirrorMatch.html @@ -2,9 +2,9 @@ - + MirrorMatch - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/package-frame.html b/doc/javadoc/javelin/controller/fight/tournament/package-frame.html index 45a1212..ce02ad5 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/package-frame.html +++ b/doc/javadoc/javelin/controller/fight/tournament/package-frame.html @@ -2,9 +2,9 @@ - + javelin.controller.fight.tournament - + diff --git a/doc/javadoc/javelin/controller/fight/tournament/package-summary.html b/doc/javadoc/javelin/controller/fight/tournament/package-summary.html index e2e7945..aa759fa 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/package-summary.html +++ b/doc/javadoc/javelin/controller/fight/tournament/package-summary.html @@ -2,9 +2,9 @@ - + javelin.controller.fight.tournament - + @@ -43,7 +43,7 @@
    • Frames
      • @@ -144,7 +144,7 @@
      • Frames
        • diff --git a/doc/javadoc/javelin/controller/fight/tournament/package-tree.html b/doc/javadoc/javelin/controller/fight/tournament/package-tree.html index 953fb33..f0ba97a 100644 --- a/doc/javadoc/javelin/controller/fight/tournament/package-tree.html +++ b/doc/javadoc/javelin/controller/fight/tournament/package-tree.html @@ -2,9 +2,9 @@ - + javelin.controller.fight.tournament Class Hierarchy - + @@ -43,7 +43,7 @@
        • Frames
          • @@ -117,7 +117,7 @@
          • Frames
            • diff --git a/doc/javadoc/javelin/controller/quality/Tremorsense.html b/doc/javadoc/javelin/controller/generator/encounter/Encounter.html similarity index 52% rename from doc/javadoc/javelin/controller/quality/Tremorsense.html rename to doc/javadoc/javelin/controller/generator/encounter/Encounter.html index 9bf37e2..9ebaf57 100644 --- a/doc/javadoc/javelin/controller/quality/Tremorsense.html +++ b/doc/javadoc/javelin/controller/generator/encounter/Encounter.html @@ -2,23 +2,23 @@ - -Tremorsense - - - + +Encounter + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            + +
            + + +
            + + +
            +
            javelin.controller.generator.encounter
            +

            Class EncounterGenerator

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.encounter.EncounterGenerator
                • +
              +
              • +
            +
            +
              +
            • +
              +
              +
              public class EncounterGenerator
+extends java.lang.Object
              +
              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
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                EncounterGenerator() 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                + + + + + + + + + + + + + + +
                All Methods Static Methods Concrete Methods 
                Modifier and TypeMethod and Description
                static java.util.ArrayList<Combatant>generate(int el, + Terrain terrain) 
                static intgetmaxenemynumber() +
                See EncounterGenerator's main javadoc description for mote info + on enemy group size.
                +
                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

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

                Constructor Detail

                + + + +
                  +
                • +

                  EncounterGenerator

                  +
                  public EncounterGenerator()
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  generate

                  +
                  public static java.util.ArrayList<Combatant> generate(int el,
+                                                      Terrain terrain)
+                                               throws GaveUpException
                  +
                  +
                  Parameters:
                  +
                  el - Target encounter level - will work around this is cannot + generate exactly what is given.
                  +
                  terrain - Usually Terrain.current() but not necessarily - for + example not when generation a + Location.garrison, which + uses the local terrain instead.
                  +
                  Returns:
                  +
                  Enemy units for an encounter.
                  +
                  Throws:
                  +
                  GaveUpException
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  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).
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/encounter/EncounterPossibilities.html b/doc/javadoc/javelin/controller/generator/encounter/EncounterPossibilities.html new file mode 100644 index 0000000..a0bfe0e --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/EncounterPossibilities.html @@ -0,0 +1,348 @@ + + + + + +EncounterPossibilities + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.generator.encounter
            +

            Class EncounterPossibilities

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.encounter.EncounterPossibilities
                • +
              +
              • +
            +
            +
              +
            • +
              +
              +
              public class EncounterPossibilities
+extends java.lang.Object
              +
              +
              See Also:
              +
              Organization.process()
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + + + + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                Monsterm 
                intmax 
                intmin 
                java.lang.Stringrandom 
                +
                • +
              + + + +
                +
              • + + +

                Method Summary

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

                  Methods inherited from class java.lang.Object

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

                Field Detail

                + + + +
                  +
                • +

                  min

                  +
                  public int min
                  +
                  • +
                + + + +
                  +
                • +

                  max

                  +
                  public int max
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  random

                  +
                  public java.lang.String random
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  EncounterPossibilities

                  +
                  public EncounterPossibilities()
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  getmonster

                  +
                  public Monster getmonster()
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/encounter/GeneratedFight.html b/doc/javadoc/javelin/controller/generator/encounter/GeneratedFight.html new file mode 100644 index 0000000..124f7e8 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/GeneratedFight.html @@ -0,0 +1,273 @@ + + + + + +GeneratedFight + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.generator.encounter
            +

            Class GeneratedFight

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.encounter.GeneratedFight
                • +
              +
              • +
            +
            +
              +
            • +
              +
              +
              public class GeneratedFight
+extends java.lang.Object
              +
              TODO probably can be refactored into an Encounter even though they + are being used for different purposes.
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                java.util.List<Combatant>opponents 
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + +
                Constructors 
                Constructor and Description
                GeneratedFight(java.util.List<Combatant> opponenets) 
                +
                • +
              + +
                +
              • + + +

                Method Summary

                +
                  +
                • + + +

                  Methods inherited from class java.lang.Object

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

                Field Detail

                + + + +
                  +
                • +

                  opponents

                  +
                  public java.util.List<Combatant> opponents
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  GeneratedFight

                  +
                  public GeneratedFight(java.util.List<Combatant> opponenets)
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/encounter/MisalignmentDetector.html b/doc/javadoc/javelin/controller/generator/encounter/MisalignmentDetector.html new file mode 100644 index 0000000..98590ba --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/MisalignmentDetector.html @@ -0,0 +1,283 @@ + + + + + +MisalignmentDetector + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            + +
            + + +
            + + +
            +
            javelin.controller.generator.encounter
            +

            Class MisalignmentDetector

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.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/generator/encounter/package-frame.html b/doc/javadoc/javelin/controller/generator/encounter/package-frame.html new file mode 100644 index 0000000..8145258 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/package-frame.html @@ -0,0 +1,24 @@ + + + + + +javelin.controller.generator.encounter + + + + + +

            javelin.controller.generator.encounter

            +
            +

            Classes

            + +
            + + diff --git a/doc/javadoc/javelin/controller/generator/encounter/package-summary.html b/doc/javadoc/javelin/controller/generator/encounter/package-summary.html new file mode 100644 index 0000000..294eee9 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/package-summary.html @@ -0,0 +1,165 @@ + + + + + +javelin.controller.generator.encounter + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Package javelin.controller.generator.encounter

            +
            +
            + +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/encounter/package-tree.html b/doc/javadoc/javelin/controller/generator/encounter/package-tree.html new file mode 100644 index 0000000..739b7f0 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/encounter/package-tree.html @@ -0,0 +1,139 @@ + + + + + +javelin.controller.generator.encounter Class Hierarchy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Hierarchy For Package javelin.controller.generator.encounter

            +Package Hierarchies: + +
            +
            +

            Class Hierarchy

            + +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/feature/FeatureGeneration.html b/doc/javadoc/javelin/controller/generator/feature/FeatureGeneration.html new file mode 100644 index 0000000..ca49e9c --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/feature/FeatureGeneration.html @@ -0,0 +1,480 @@ + + + + + +FeatureGeneration + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + +
            +
            javelin.controller.generator.feature
            +

            Class FeatureGeneration

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.feature.FeatureGeneration
                • +
              +
              • +
            +
            + +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + + + + + + + + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                booleanabsolute +
                If true then chance won't be altered by + FeatureGenerator.convertchances().
                +
                floatchance +
                When instantiated this is the relative chance of this feature being + spawned.
                +
                java.lang.Integermax +
                If not null won't spawn any more of these feature if there + maximum allowerd number per World has been reached already.
                +
                java.lang.Integerseeds +
                The starting number of instances of this feature to generate on the world + map.
                +
                booleanstarting +
                If true this feature will be eligible for instantiation both + during World generation and during normal gameplay.
                +
                +
                • +
              + +
                +
              • + + +

                Constructor Summary

                + + + + + + + + + + + + + + + + + +
                Constructors 
                Constructor and Description
                FeatureGeneration() +
                Construct with default values.
                +
                FeatureGeneration(float chance) 
                FeatureGeneration(float chancep, + boolean absolutep, + boolean startingp) 
                FeatureGeneration(float chance, + java.lang.Integer max, + java.lang.Integer seeds) 
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Detail

                + + + +
                  +
                • +

                  chance

                  +
                  public float chance
                  +
                  When instantiated this is the relative chance of this feature being + spawned. This is later modified by
                  +
                  • +
                + + + + + + + +
                  +
                • +

                  starting

                  +
                  public boolean starting
                  +
                  If true this feature will be eligible for instantiation both + during World generation and during normal gameplay. If + false will only be spawned during normal gameplay.
                  +
                  • +
                + + + +
                  +
                • +

                  max

                  +
                  public java.lang.Integer max
                  +
                  If not null won't spawn any more of these feature if there + maximum allowerd number per World has been reached already.
                  +
                  • +
                + + + +
                  +
                • +

                  seeds

                  +
                  public java.lang.Integer seeds
                  +
                  The starting number of instances of this feature to generate on the world + map.
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Constructor Detail

                + + + +
                  +
                • +

                  FeatureGeneration

                  +
                  public FeatureGeneration()
                  +
                  Construct with default values.
                  +
                  • +
                + + + +
                  +
                • +

                  FeatureGeneration

                  +
                  public FeatureGeneration(float chance)
                  +
                  +
                  Parameters:
                  +
                  chance - Overrides default chance value.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  FeatureGeneration

                  +
                  public FeatureGeneration(float chancep,
+                         boolean absolutep,
+                         boolean startingp)
                  +
                  +
                  Parameters:
                  +
                  chancep - Overrides chance
                  +
                  absolutep - Overrides absolute.
                  +
                  startingp - Overrides starting.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  FeatureGeneration

                  +
                  public FeatureGeneration(float chance,
+                         java.lang.Integer max,
+                         java.lang.Integer seeds)
                  +
                  +
                  Parameters:
                  +
                  chance - Overrides chance.
                  +
                  max - Overrides max.
                  +
                  seeds - Overrides seeds.
                  +
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + +
                  +
                • +

                  generate

                  +
                  public WorldActor generate(java.lang.Class<? extends WorldActor> feature)
                  +
                  +
                  Returns:
                  +
                  By default a new instance of the given WorldActor clss, + using Class.newInstance().
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  seed

                  +
                  public void seed(java.lang.Class<? extends WorldActor> feature)
                  +
                  By default just calls generate(Class) and places the result.
                  +
                  +
                  Parameters:
                  +
                  feature - Feature type.
                  +
                  See Also:
                  +
                  WorldActor.place()
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            + + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/feature/FeatureGenerator.html b/doc/javadoc/javelin/controller/generator/feature/FeatureGenerator.html new file mode 100644 index 0000000..d1d1bd1 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/feature/FeatureGenerator.html @@ -0,0 +1,343 @@ + + + + + +FeatureGenerator + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            + +
            + + +
            + + +
            +
            javelin.controller.generator.feature
            +

            Class FeatureGenerator

            +
            +
            +
              +
            • java.lang.Object
              • +
            • +
                +
              • javelin.controller.generator.feature.FeatureGenerator
                • +
              +
              • +
            +
            +
              +
            • +
              +
              +
              public class FeatureGenerator
+extends java.lang.Object
              +
              Responsible for generating those WorldActors (mostly Location + s that can be spawned both during World generation and normal + gameplay.
              +
              +
              Author:
              +
              alex
              +
              See Also:
              +
              WorldScreen.turn()
              +
              +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Summary

                + + + + + + + + + + +
                Fields 
                Modifier and TypeField and Description
                static FeatureGeneratorSINGLETON +
                Only access point to this class.
                +
                +
                • +
              + + +
              • +
            +
            +
            +
              +
            • + +
                +
              • + + +

                Field Detail

                + + + +
                  +
                • +

                  SINGLETON

                  +
                  public static final FeatureGenerator SINGLETON
                  +
                  Only access point to this class.
                  +
                  • +
                +
                • +
              + +
                +
              • + + +

                Method Detail

                + + + + + + + +
                  +
                • +

                  spawn

                  +
                  public void spawn(float chance,
+                  boolean generatingworld)
                  +
                  Spawns WorldActors into the game world. Used both during world + generation and during a game's progress.
                  +
                  +
                  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 value 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 to support the full feature set.
                  +
                  +
                  • +
                + + + +
                  +
                • +

                  placestartingfeatures

                  +
                  public Town placestartingfeatures()
                  +
                  +
                  Parameters:
                  +
                  seed - Place all world features in this seed.
                  +
                  Returns:
                  +
                  Starting town for the initial Squad to be placed nearby.
                  +
                  +
                  • +
                +
                • +
              +
              • +
            +
            +
            + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            +
            +
              +
            • Summary: 
              • +
            • Nested | 
              • +
            • Field | 
              • +
            • Constr | 
              • +
            • Method
              • +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/feature/package-frame.html b/doc/javadoc/javelin/controller/generator/feature/package-frame.html new file mode 100644 index 0000000..44e5f24 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/feature/package-frame.html @@ -0,0 +1,21 @@ + + + + + +javelin.controller.generator.feature + + + + + +

            javelin.controller.generator.feature

            +
            +

            Classes

            + +
            + + diff --git a/doc/javadoc/javelin/controller/generator/feature/package-summary.html b/doc/javadoc/javelin/controller/generator/feature/package-summary.html new file mode 100644 index 0000000..6614aa8 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/feature/package-summary.html @@ -0,0 +1,150 @@ + + + + + +javelin.controller.generator.feature + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Package javelin.controller.generator.feature

            +
            +
            + +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/generator/feature/package-tree.html b/doc/javadoc/javelin/controller/generator/feature/package-tree.html new file mode 100644 index 0000000..c230526 --- /dev/null +++ b/doc/javadoc/javelin/controller/generator/feature/package-tree.html @@ -0,0 +1,136 @@ + + + + + +javelin.controller.generator.feature Class Hierarchy + + + + + + + + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + +
            +

            Hierarchy For Package javelin.controller.generator.feature

            +Package Hierarchies: + +
            +
            +

            Class Hierarchy

            + +
            + +
            + + +
            Skip navigation links
            + + + + +
            +
            + + + +
            + +
            + + +
            + + + diff --git a/doc/javadoc/javelin/controller/map/Arena.html b/doc/javadoc/javelin/controller/map/Arena.html index a5c790f..bceb502 100644 --- a/doc/javadoc/javelin/controller/map/Arena.html +++ b/doc/javadoc/javelin/controller/map/Arena.html @@ -2,9 +2,9 @@ - + Arena - + @@ -143,7 +143,7 @@ extends Map -floor, map, maxflooding +battlemap, bush, flooded, floor, map, maxflooding, obstacle, rock, wall, wallfloor
        @@ -159,8 +159,9 @@ extends Constructor and Description -Arena(int width, - int heigth)  +Arena() +
        Constructor.
        + @@ -176,7 +177,14 @@ extends DndMap -generate, putobstacle, putwall, putwater +generate +
      +
    @@ -191,23 +191,15 @@ extends void generate()  - -void -putobstacle(int x, - int y)  - - -void -putwall(int x, - int y)  - - -void -putwater(int x, - int y)  - +
    • @@ -271,7 +263,7 @@ extends -
        +

        • generate

          public void generate()
          @@ -281,36 +273,6 @@ extends - - -
            -
          • -

            putwater

            -
            public void putwater(int x,
-                     int y)
            -
            • -
          - - - -
            -
          • -

            putobstacle

            -
            public void putobstacle(int x,
-                        int y)
            -
            • -
          - - - -
            -
          • -

            putwall

            -
            public void putwall(int x,
-                    int y)
            -
            • -
        diff --git a/doc/javadoc/javelin/controller/map/Map.html b/doc/javadoc/javelin/controller/map/Map.html index c28522c..8f54558 100644 --- a/doc/javadoc/javelin/controller/map/Map.html +++ b/doc/javadoc/javelin/controller/map/Map.html @@ -2,9 +2,9 @@ - + Map - + @@ -18,8 +18,8 @@ catch(err) { } //--> -var methods = {"i0":6}; -var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],4:["t3","Abstract Methods"]}; +var methods = {"i0":9,"i1":6,"i2":10,"i3":10,"i4":10,"i5":10,"i6":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"; @@ -138,17 +138,45 @@ extends java.lang.Object Field and Description -int -floor  +BattleMap +battlemap  -BattleMap -map  +protected static java.awt.Image +bush  +static java.awt.Image +flooded  + + +java.awt.Image +floor  + + +Square[][] +map  + + int maxflooding  + +java.awt.Image +obstacle  + + +protected static java.awt.Image +rock  + + +java.awt.Image +wall  + + +java.awt.Image +wallfloor  +
      @@ -164,7 +192,7 @@ extends java.lang.Object Constructor and Description -Map(BattleMap map)  +Map(BattleMap mapp)  Map(int width, @@ -180,15 +208,46 @@ extends java.lang.Object

      Method Summary

      - + + + + + + + + + + + + + + + + + + + + + + + + +
      All Methods Instance Methods Abstract Methods All Methods Static Methods Instance Methods Abstract Methods Concrete Methods 
      Modifier and Type Method and Description
      static voidaddthing(int x, + int y, + java.awt.Image getobstacle, + BattleMap m) 
      abstract void generate() 
      java.awt.Imagegetblockedtile(int x, + int y) 
      java.awt.Imagegetobstacle() 
      voidputobstacle(int x, + int y) 
      voidputwall(int x, + int y) 
      voidputwater(int x, + int y) 
      • @@ -211,13 +270,40 @@ extends java.lang.Object

        Field Detail

        + + + +
          +
        • +

          bush

          +
          protected static final java.awt.Image bush
          +
          • +
        + + + +
          +
        • +

          rock

          +
          protected static final java.awt.Image rock
          +
          • +
        + + + +
          +
        • +

          battlemap

          +
          public BattleMap battlemap
          +
          • +
        @@ -226,18 +312,54 @@ extends java.lang.Object

        • floor

          -
          public int floor
          +
          public java.awt.Image floor
          +
          • +
        +         + + +
          +
        • +

          wall

          +
          public java.awt.Image wall
          +
          • +
        + + + +
          +
        • +

          wallfloor

          +
          public java.awt.Image wallfloor
          +
          • +
        + + + +
          +
        • +

          obstacle

          +
          public java.awt.Image obstacle
        -
          +

          • maxflooding

            public int maxflooding
          + + + +
            +
          • +

            flooded

            +
            public static final java.awt.Image flooded
            +
            • +
        @@ -252,7 +374,7 @@ extends java.lang.Object @@ -276,12 +398,73 @@ extends java.lang.Object -
          +

          • generate

            public abstract void generate()
          + + + +
            +
          • +

            putwater

            +
            public void putwater(int x,
+                     int y)
            +
            • +
          + + + +
            +
          • +

            putobstacle

            +
            public final void putobstacle(int x,
+                              int y)
            +
            • +
          + + + +
            +
          • +

            addthing

            +
            public static void addthing(int x,
+                            int y,
+                            java.awt.Image getobstacle,
+                            BattleMap m)
            +
            • +
          + + + +
            +
          • +

            getobstacle

            +
            public java.awt.Image getobstacle()
            +
            • +
          + + + +
            +
          • +

            putwall

            +
            public final void putwall(int x,
+                          int y)
            +
            • +
          + + + +
            +
          • +

            getblockedtile

            +
            public java.awt.Image getblockedtile(int x,
+                                     int y)
            +
            • +
        • diff --git a/doc/javadoc/javelin/controller/map/MapGenerator.html b/doc/javadoc/javelin/controller/map/MapGenerator.html index 24e2703..20d5c52 100644 --- a/doc/javadoc/javelin/controller/map/MapGenerator.html +++ b/doc/javadoc/javelin/controller/map/MapGenerator.html @@ -2,9 +2,9 @@ - + MapGenerator - + @@ -152,7 +152,7 @@ extends java.lang.Object static Map -generatebattlemap(int tile, +generatebattlemap(Terrain t, boolean dungeon)
        TODO "dark tower" doesn't work - try to fix it?
        @@ -196,13 +196,13 @@ extends java.lang.Object

        Method Detail

        - +

        • generatebattlemap

          -
          public static Map generatebattlemap(int tile,
+
          public static Map generatebattlemap(Terrain t,
                                     boolean dungeon)
          
 
          TODO "dark tower" doesn't work - try to fix it?
          • diff --git a/doc/javadoc/javelin/controller/map/TyrantMap.html b/doc/javadoc/javelin/controller/map/TyrantMap.html index f189764..8c77fb7 100644 --- a/doc/javadoc/javelin/controller/map/TyrantMap.html +++ b/doc/javadoc/javelin/controller/map/TyrantMap.html @@ -2,9 +2,9 @@ - + TyrantMap - + @@ -18,7 +18,7 @@ catch(err) { } //--> -var methods = {"i0":10}; +var methods = {"i0":10,"i1":10}; var tabs = {65535:["t0","All Methods"],2:["t2","Instance Methods"],8:["t4","Concrete Methods"]}; var altColor = "altColor"; var rowColor = "rowColor"; @@ -111,6 +111,10 @@ var activeTableTab = "activeTableTab";
        @@ -179,8 +183,20 @@ extends void generate()  + +java.awt.Image +getblockedtile(int x, + int y)  + +
        • @@ -231,7 +247,7 @@ extends -
            +

            • generate

              public void generate()
              @@ -241,6 +257,20 @@ extends + + +
                +
              • +

                getblockedtile

                +
                public java.awt.Image getblockedtile(int x,
+                                     int y)
                +
                +
                Overrides:
                +
                getblockedtile in class Map
                +
                +
                • +
            diff --git a/doc/javadoc/javelin/controller/map/desert/Rocky.html b/doc/javadoc/javelin/controller/map/desert/Rocky.html index 7ef0d58..802ddf4 100644 --- a/doc/javadoc/javelin/controller/map/desert/Rocky.html +++ b/doc/javadoc/javelin/controller/map/desert/Rocky.html @@ -2,9 +2,9 @@ - + Rocky - + @@ -148,7 +148,7 @@ extends Map -floor, map, maxflooding +battlemap, bush, flooded, floor, map, maxflooding, obstacle, rock, wall, wallfloor
        @@ -182,9 +182,8 @@ extends Method and Description -void -putobstacle(int x, - int y)  +java.awt.Image +getobstacle()  +
        • @@ -232,17 +238,16 @@ extends +
          • -

            putobstacle

            -
            public void putobstacle(int x,
-                        int y)
            +

            getobstacle

            +
            public java.awt.Image getobstacle()
            Overrides:
            -
            putobstacle in class DndMap
            +
            getobstacle in class Map
          diff --git a/doc/javadoc/javelin/controller/map/desert/Sandy.html b/doc/javadoc/javelin/controller/map/desert/Sandy.html index 5b5a536..cb5c033 100644 --- a/doc/javadoc/javelin/controller/map/desert/Sandy.html +++ b/doc/javadoc/javelin/controller/map/desert/Sandy.html @@ -2,9 +2,9 @@ - + Sandy - + @@ -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 @@ extends Map -floor, map, maxflooding
    • +battlemap, bush, flooded, floor, map, maxflooding, obstacle, rock, wall, wallfloor @@ -175,24 +169,19 @@ extends -All Methods Instance Methods Concrete Methods  - -Modifier and Type -Method and Description - - -void -putobstacle(int x, - int y)  - - +
    @@ -301,13 +268,13 @@ extends Field | 
  • Constr | 
    • -
  • Method
    • +
  • Method
    • diff --git a/doc/javadoc/javelin/controller/map/desert/Tundra.html b/doc/javadoc/javelin/controller/map/desert/Tundra.html index 4ccba99..f685c4c 100644 --- a/doc/javadoc/javelin/controller/map/desert/Tundra.html +++ b/doc/javadoc/javelin/controller/map/desert/Tundra.html @@ -2,9 +2,9 @@ - + Tundra - + @@ -148,7 +148,7 @@ extends Map -floor, map, maxflooding +battlemap, bush, flooded, floor, map, maxflooding, obstacle, rock, wall, wallfloor @@ -182,9 +182,8 @@ extends Method and Description -void -putobstacle(int x, - int y)  +java.awt.Image +getobstacle()  +
    • @@ -232,17 +238,16 @@ extends +
      • -

        putobstacle

        -
        public void putobstacle(int x,
-                        int y)
        +

        getobstacle

        +
        public java.awt.Image getobstacle()
        Overrides:
        -
        putobstacle in class DndMap
        +
        getobstacle in class Map
      diff --git a/doc/javadoc/javelin/controller/map/desert/package-frame.html b/doc/javadoc/javelin/controller/map/desert/package-frame.html index 0f25613..3a5d083 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 3718a71..968474b 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 624011d..c227e37 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 ae0330c..7a6f888 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 c83274a..9d56238 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 5c14a91..df4c4d9 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 e577034..5f75db6 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 - + @@ -13,9 +13,9 @@

      Classes

      diff --git a/doc/javadoc/javelin/controller/map/forest/package-summary.html b/doc/javadoc/javelin/controller/map/forest/package-summary.html index 0df8729..8768a52 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 - + @@ -82,15 +82,15 @@ -DenseForest +Dense   -Forest +Medium   -SparseForest +Sparse   diff --git a/doc/javadoc/javelin/controller/map/forest/package-tree.html b/doc/javadoc/javelin/controller/map/forest/package-tree.html index b098979..128c726 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 - + @@ -84,9 +84,9 @@
      • javelin.controller.map.DndMap
          -
        • javelin.controller.map.forest.DenseForest
          • -
        • javelin.controller.map.forest.Forest
          • -
        • javelin.controller.map.forest.SparseForest
          • +
        • javelin.controller.map.forest.Dense
          • +
        • javelin.controller.map.forest.Medium
          • +
        • javelin.controller.map.forest.Sparse
      diff --git a/doc/javadoc/javelin/controller/map/hill/GentleHiill.html b/doc/javadoc/javelin/controller/map/hill/GentleHiill.html index 07abf92..620d5a2 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 ee83321..4010057 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 69aa311..26fb44b 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 - + @@ -13,8 +13,8 @@

      Classes

      diff --git a/doc/javadoc/javelin/controller/map/hill/package-summary.html b/doc/javadoc/javelin/controller/map/hill/package-summary.html index 1a80dc6..de71b19 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 - + @@ -82,11 +82,11 @@ -GentleHiill +Gentle   -RuggedHill +Rugged   diff --git a/doc/javadoc/javelin/controller/map/hill/package-tree.html b/doc/javadoc/javelin/controller/map/hill/package-tree.html index 9b4ad47..c2df3be 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 - + @@ -84,8 +84,8 @@ diff --git a/doc/javadoc/javelin/controller/map/marsh/Moor.html b/doc/javadoc/javelin/controller/map/marsh/Moor.html index 6297cf8..a84c61f 100644 --- a/doc/javadoc/javelin/controller/map/marsh/Moor.html +++ b/doc/javadoc/javelin/controller/map/marsh/Moor.html @@ -2,9 +2,9 @@ - + Moor - + @@ -18,12 +18,6 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":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 @@ extends Map -floor, map, maxflooding +battlemap, bush, flooded, floor, map, maxflooding, obstacle, rock, wall, wallfloor @@ -175,29 +169,19 @@ extends -All Methods Instance Methods Concrete Methods  - -Modifier and Type -Method and Description - - -void -putobstacle(int x, - int y)  - - -void -putwall(int x, - int y)  - - + @@ -320,13 +268,13 @@ extends Field | 
  • Constr | 
    • -
  • Method
    • +
  • Method
    • diff --git a/doc/javadoc/javelin/controller/map/marsh/Swamp.html b/doc/javadoc/javelin/controller/map/marsh/Swamp.html index f639835..6fe5ba8 100644 --- a/doc/javadoc/javelin/controller/map/marsh/Swamp.html +++ b/doc/javadoc/javelin/controller/map/marsh/Swamp.html @@ -2,9 +2,9 @@ - + Swamp - + @@ -18,12 +18,6 @@ catch(err) { } //--> -var methods = {"i0":10,"i1":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";