Tweaks concerning item types

This commit is contained in:
2024-12-18 11:39:12 +00:00
parent d0ef2628ce
commit d405747bd5
21 changed files with 98 additions and 69 deletions
+28 -23
View File
@@ -106,7 +106,7 @@ AutoDoorObstacle src/Dodge/Data/PathGraph.hs 51;" C
AutoRecharging src/Dodge/Data/Item/Use/Consumption.hs 27;" C
AutoTrigger src/Dodge/Data/Item/Use.hs 69;" C
AuxAddition src/Shader/AuxAddition.hs 1;" m
Avatar src/Dodge/Data/Creature/Misc.hs 64;" C
Avatar src/Dodge/Data/Creature/Misc.hs 70;" C
Awareness src/Dodge/Data/Creature/Perception.hs 65;" t
Awareness src/Dodge/Creature/Picture/Awareness.hs 1;" m
BANGCONE src/Dodge/Data/Item/Combine.hs 136;" C
@@ -136,8 +136,8 @@ Ball src/Dodge/Tesla/Ball.hs 1;" m
Bark src/Dodge/Data/ActionPlan.hs 40;" C
Barrel src/Dodge/Data/Creature/State.hs 30;" C
BarrelHiss src/Dodge/Data/SoundOrigin.hs 32;" C
BarrelType src/Dodge/Data/Creature/Misc.hs 81;" t
Barreloid src/Dodge/Data/Creature/Misc.hs 76;" C
BarrelType src/Dodge/Data/Creature/Misc.hs 87;" t
Barreloid src/Dodge/Data/Creature/Misc.hs 82;" C
Barreloid src/Dodge/Barreloid.hs 1;" m
Base src/Dodge/Base.hs 6;" m
Base src/Dodge/Zoning/Base.hs 1;" m
@@ -428,7 +428,7 @@ CreaturePart src/Dodge/Data/Wall.hs 53;" C
CreatureState src/Dodge/Data/Creature/State.hs 16;" t
CreatureStatistics src/Dodge/Data/Creature/Misc.hs 20;" t
CreatureTargeting src/Dodge/Data/Creature.hs 84;" t
CreatureType src/Dodge/Data/Creature/Misc.hs 63;" t
CreatureType src/Dodge/Data/Creature/Misc.hs 69;" t
CryostatisSS src/Dodge/Data/Scenario.hs 91;" C
Crystal src/Dodge/Data/Material.hs 11;" C
Cull_more_lights src/Dodge/Data/Config.hs 78;" C
@@ -660,7 +660,7 @@ Explore src/Dodge/Data/Scenario.hs 4;" C
Explosion src/Dodge/Data/SoundOrigin.hs 37;" C
Explosion src/Dodge/WorldEvent/Explosion.hs 4;" m
ExplosionPayload src/Dodge/Data/Payload.hs 11;" C
ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 81;" C
ExplosiveBarrel src/Dodge/Data/Creature/Misc.hs 87;" C
ExternallyGeneratedSounds src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 2;" m
ExtraEffect src/Dodge/Item/Weapon/ExtraEffect.hs 6;" m
Eyes src/Dodge/Data/Creature/Perception.hs 41;" C
@@ -854,7 +854,7 @@ Hotkey9 src/Dodge/Data/Equipment/Misc.hs 40;" C
HotkeyE src/Dodge/Data/Equipment/Misc.hs 31;" C
HotkeyQ src/Dodge/Data/Equipment/Misc.hs 30;" C
Huge src/Shape/Data.hs 28;" C
Humanoid src/Dodge/Data/Creature/Misc.hs 70;" C
Humanoid src/Dodge/Data/Creature/Misc.hs 76;" C
Humanoid src/Dodge/Humanoid.hs 1;" m
HumanoidAI src/Dodge/Data/Creature/Misc.hs 48;" t
ILink src/Dodge/Data/ComposedItem.hs 46;" C
@@ -996,7 +996,7 @@ LabelDoubleTree src/Dodge/Data/DoubleTree.hs 39;" t
LabelDoubleTreeNodeType src/Dodge/Data/DoubleTree.hs 22;" t
Laboratory src/Dodge/Data/Scenario.hs 61;" C
Lamp src/Dodge/Creature/Lamp.hs 1;" m
Lampoid src/Dodge/Data/Creature/Misc.hs 77;" C
Lampoid src/Dodge/Data/Creature/Misc.hs 83;" C
Lampoid src/Dodge/Lampoid.hs 1;" m
Large src/Shape/Data.hs 29;" C
LasBeamCombine src/Dodge/Data/Beam.hs 40;" C
@@ -1271,7 +1271,7 @@ NodeMTree src/Dodge/Data/MetaTree.hs 14;" C
NodeMTree src/Dodge/Tree/Compose/Data.hs 9;" C
NodeTree src/Dodge/Data/MetaTree.hs 13;" C
NodeTree src/Dodge/Tree/Compose/Data.hs 9;" C
NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 78;" C
NonDrawnCreature src/Dodge/Data/Creature/Misc.hs 84;" C
NormalOptions src/Dodge/Data/Universe.hs 68;" C
NormalTimeFlow src/Dodge/Data/World.hs 61;" C
North src/Dodge/Data/CardinalPoint.hs 4;" C
@@ -1380,7 +1380,6 @@ PSNoShiftCont src/Dodge/Data/GenWorld.hs 63;" C
PSPos src/Dodge/Data/GenWorld.hs 64;" C
PSRoomRand src/Dodge/Data/GenWorld.hs 69;" C
PSType src/Dodge/Data/GenWorld.hs 30;" t
PULSECHECKER src/Dodge/Data/Item/Combine.hs 117;" C
PUMP src/Dodge/Data/Item/Combine.hs 40;" C
Padding src/Padding.hs 2;" m
Pair src/FoldlHelp.hs 10;" t
@@ -1428,7 +1427,7 @@ PlacementHelper src/Dodge/LevelGen/PlacementHelper.hs 1;" m
PlacementSpot src/Dodge/Data/GenWorld.hs 61;" t
PlacementSpot src/Dodge/PlacementSpot.hs 2;" m
PlacementUsingPos src/Dodge/Data/GenWorld.hs 83;" C
PlainBarrel src/Dodge/Data/Creature/Misc.hs 81;" C
PlainBarrel src/Dodge/Data/Creature/Misc.hs 87;" C
PlantNurserySS src/Dodge/Data/Scenario.hs 96;" C
PlayStatus src/Sound/Data.hs 24;" t
PlayerFaction src/Dodge/Data/Creature/State.hs 42;" C
@@ -1503,6 +1502,8 @@ PropVerticalLampCover src/Dodge/Data/Prop.hs 49;" C
PropZ src/Dodge/Data/Prop.hs 19;" C
ProximityRequirement src/Dodge/Data/Machine/Sensor.hs 32;" t
ProximitySensor src/Dodge/Data/Machine/Sensor.hs 24;" C
Pulse src/Dodge/Data/Creature/Misc.hs 63;" t
PulseStatus src/Dodge/Data/Creature/Misc.hs 63;" C
PushBackDamage src/Dodge/Data/Damage.hs 28;" C
PushDamage src/Dodge/Data/Damage.hs 22;" C
PushPop src/Dodge/Menu/PushPop.hs 1;" m
@@ -2053,6 +2054,7 @@ WASD src/Dodge/WASD.hs 1;" m
WHITE src/Color/Data.hs 27;" C
WIRE src/Dodge/Data/Item/Combine.hs 64;" C
WRISTARMOUR src/Dodge/Data/Item/Combine.hs 104;" C
WRIST_ECG src/Dodge/Data/Item/Combine.hs 117;" C
WaitThen src/Dodge/Data/ActionPlan.hs 103;" C
WalkCycle src/Dodge/Creature/State/WalkCycle.hs 1;" m
Walking src/Dodge/Data/Creature/Stance.hs 21;" C
@@ -2189,8 +2191,9 @@ _asDir src/Dodge/Data/ArcStep.hs 16;" f
_asObject src/Dodge/Data/ArcStep.hs 17;" f
_asPos src/Dodge/Data/ArcStep.hs 15;" f
_auDist src/Dodge/Data/Creature/Perception.hs 48;" f
_avatarPulse src/Dodge/Data/Creature/Misc.hs 74;" f
_barrelShader src/Data/Preload/Render.hs 23;" f
_barrelType src/Dodge/Data/Creature/Misc.hs 76;" f
_barrelType src/Dodge/Data/Creature/Misc.hs 82;" f
_bdMaxX src/Dodge/Data/Bounds.hs 14;" f
_bdMaxY src/Dodge/Data/Bounds.hs 16;" f
_bdMinX src/Dodge/Data/Bounds.hs 13;" f
@@ -2578,8 +2581,7 @@ _heldTriggerType src/Dodge/Data/Item/Use.hs 42;" f
_heldWorldPos src/Dodge/Data/Input.hs 53;" f
_hud src/Dodge/Data/World.hs 47;" f
_hudElement src/Dodge/Data/HUD.hs 46;" f
_humanoidAI src/Dodge/Data/Creature/Misc.hs 68;" f
_humanoidAI src/Dodge/Data/Creature/Misc.hs 74;" f
_humanoidAI src/Dodge/Data/Creature/Misc.hs 80;" f
_iaLoaded src/Dodge/Data/Item/Use/Consumption.hs 22;" f
_iaMax src/Dodge/Data/Item/Use/Consumption.hs 21;" f
_iatOrient src/Dodge/Data/ComposedItem.hs 48;" f
@@ -2640,9 +2642,9 @@ _lClock src/Dodge/Data/LWorld.hs 141;" f
_lTestInt src/Dodge/Data/LWorld.hs 143;" f
_lTestString src/Dodge/Data/LWorld.hs 142;" f
_lWorld src/Dodge/Data/CWorld.hs 26;" f
_lampColor src/Dodge/Data/Creature/Misc.hs 77;" f
_lampHeight src/Dodge/Data/Creature/Misc.hs 77;" f
_lampLSID src/Dodge/Data/Creature/Misc.hs 77;" f
_lampColor src/Dodge/Data/Creature/Misc.hs 83;" f
_lampHeight src/Dodge/Data/Creature/Misc.hs 83;" f
_lampLSID src/Dodge/Data/Creature/Misc.hs 83;" f
_laserEmmiter src/Dodge/Data/Laser.hs 18;" f
_laserTypeDamage src/Dodge/Data/Laser.hs 17;" f
_lasers src/Dodge/Data/LWorld.hs 115;" f
@@ -2891,6 +2893,8 @@ _psRoomEff src/Dodge/Data/GenWorld.hs 66;" f
_psRoomRandPointNum src/Dodge/Data/GenWorld.hs 70;" f
_psRot src/Dodge/Data/GenWorld.hs 62;" f
_psSelect src/Dodge/Data/GenWorld.hs 65;" f
_pulseProgress src/Dodge/Data/Creature/Misc.hs 65;" f
_pulseRate src/Dodge/Data/Creature/Misc.hs 64;" f
_putBlock src/Dodge/Data/GenWorld.hs 39;" f
_putButton src/Dodge/Data/GenWorld.hs 34;" f
_putEndPoint src/Dodge/Data/GenWorld.hs 47;" f
@@ -3045,12 +3049,12 @@ _skOldPos src/Dodge/Data/Spark.hs 19;" f
_skPos src/Dodge/Data/Spark.hs 18;" f
_skVel src/Dodge/Data/Spark.hs 16;" f
_skWidth src/Dodge/Data/Spark.hs 20;" f
_skinHead src/Dodge/Data/Creature/Misc.hs 65;" f
_skinHead src/Dodge/Data/Creature/Misc.hs 71;" f
_skinLower src/Dodge/Data/Creature/Misc.hs 67;" f
_skinHead src/Dodge/Data/Creature/Misc.hs 77;" f
_skinLower src/Dodge/Data/Creature/Misc.hs 73;" f
_skinUpper src/Dodge/Data/Creature/Misc.hs 66;" f
_skinLower src/Dodge/Data/Creature/Misc.hs 79;" f
_skinUpper src/Dodge/Data/Creature/Misc.hs 72;" f
_skinUpper src/Dodge/Data/Creature/Misc.hs 78;" f
_smoothScrollAmount src/Dodge/Data/Input.hs 49;" f
_soundAngDist src/Sound/Data.hs 53;" f
_soundChannel src/Sound/Data.hs 52;" f
@@ -3416,7 +3420,6 @@ autoDetector src/Dodge/Item/Weapon/Radar.hs 11;" f
autoEffect src/Dodge/Item/Weapon/ExtraEffect.hs 18;" f
autoGunS src/Dodge/SoundLogic/ExternallyGeneratedSounds.hs 514;" f
autoPistol src/Dodge/Item/Held/Stick.hs 46;" f
autoRadarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 39;" f
autoRifle src/Dodge/Item/Held/Cane.hs 65;" f
autoSonarEffect src/Dodge/Item/Weapon/ExtraEffect.hs 43;" f
awakeLevelPerception src/Dodge/Creature/Perception.hs 162;" f
@@ -3946,6 +3949,7 @@ displayControls src/Dodge/Menu.hs 206;" f
displayFrameTicks src/Dodge/Render/Picture.hs 39;" f
displayFreeSlots src/Dodge/DisplayInventory.hs 225;" f
displayIndents src/Dodge/DisplayInventory.hs 123;" f
displayPulse src/Dodge/Item/Display.hs 114;" f
displaySectionsSizes src/Dodge/DisplayInventory.hs 118;" f
displayTerminalLineString src/Dodge/Update.hs 438;" f
dist src/Geometry/Vector.hs 179;" f
@@ -4856,7 +4860,7 @@ maybeExitCombine src/Dodge/Update/Input/InGame.hs 583;" f
maybeOpenTerminal src/Dodge/Update.hs 123;" f
maybeReadFile src/Dodge/LoadSeed.hs 10;" f
maybeTakeOne src/RandomHelp.hs 111;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 122;" f
maybeWarmupStatus src/Dodge/Item/Display.hs 128;" f
mcApplyDamage src/Dodge/Machine/Update.hs 108;" f
mcKillBut src/Dodge/Machine/Destroy.hs 34;" f
mcKillTerm src/Dodge/Machine/Destroy.hs 26;" f
@@ -5670,7 +5674,7 @@ shoulderSP src/Dodge/Creature/HandPos.hs 170;" f
showAttachItem src/Dodge/Item/Display.hs 61;" f
showAutoRechargeProgress src/Dodge/Item/Display.hs 75;" f
showEquipItem src/Dodge/Item/Display.hs 70;" f
showEquipmentNumber src/Dodge/Item/Display.hs 113;" f
showEquipmentNumber src/Dodge/Item/Display.hs 119;" f
showInt src/Dodge/Item/Info.hs 32;" f
showIntsString src/Dodge/Tree/Compose.hs 129;" f
showManObj src/Dodge/TestString.hs 72;" f
@@ -6061,7 +6065,7 @@ updateCloud src/Dodge/Update.hs 721;" f
updateClouds src/Dodge/Update.hs 565;" f
updateCombinePositioning src/Dodge/DisplayInventory.hs 41;" f
updateCombineSections src/Dodge/DisplayInventory.hs 48;" f
updateCreature src/Dodge/Creature/Update.hs 12;" f
updateCreature src/Dodge/Creature/Update.hs 13;" f
updateCreatureGroups src/Dodge/Update.hs 508;" f
updateCreatureSoundPositions src/Dodge/Update.hs 484;" f
updateDebugMessageOffset src/Dodge/Update.hs 92;" f
@@ -6118,6 +6122,7 @@ updatePressedButtonsCarte src/Dodge/Update/Input/InGame.hs 356;" f
updatePressedButtonsCarte' src/Dodge/Update/Input/InGame.hs 359;" f
updateProjectile src/Dodge/Projectile/Update.hs 23;" f
updateProp src/Dodge/Prop/Update.hs 11;" f
updatePulse src/Dodge/Creature/Update.hs 22;" f
updateRBList src/Dodge/Inventory/RBList.hs 16;" f
updateRadarBlip src/Dodge/RadarBlip.hs 8;" f
updateRadarBlips src/Dodge/Update.hs 532;" f