From 8cb3fc2d337c144bb86644dbca279602d88ad1f8 Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 28 Jul 2021 10:11:18 +0900 Subject: [PATCH] moving things around between packages --- assets/mods/basegame/creatures/CreatureHuman.json | 1 + src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused | 4 ++-- src/net/torvald/terrarum/TitleScreen.kt | 3 +-- src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt | 3 +-- .../terrarum/{modulebasegame => }/console/AVTracker.kt | 5 +---- .../terrarum/{modulebasegame => }/console/ActorsList.kt | 4 +--- src/net/torvald/terrarum/console/SetGlobalLightOverride.kt | 3 +-- src/net/torvald/terrarum/gameactors/AVKey.kt | 6 ++++++ src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt | 2 +- src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt | 2 +- src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt | 6 +++--- .../modulebasegame/gameactors/PlayerBuilderSigrid.kt | 1 + .../modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt | 3 ++- src/net/torvald/terrarum/serialise/WriteWorldInfo.kt | 2 +- .../{modulebasegame => }/weather/BaseModularWeather.kt | 2 +- .../terrarum/{modulebasegame => }/weather/WeatherMixer.kt | 3 +-- 16 files changed, 25 insertions(+), 25 deletions(-) rename src/net/torvald/terrarum/{modulebasegame => }/console/AVTracker.kt (88%) rename src/net/torvald/terrarum/{modulebasegame => }/console/ActorsList.kt (84%) rename src/net/torvald/terrarum/{modulebasegame => }/weather/BaseModularWeather.kt (92%) rename src/net/torvald/terrarum/{modulebasegame => }/weather/WeatherMixer.kt (99%) diff --git a/assets/mods/basegame/creatures/CreatureHuman.json b/assets/mods/basegame/creatures/CreatureHuman.json index c266326f5..e22e73a25 100644 --- a/assets/mods/basegame/creatures/CreatureHuman.json +++ b/assets/mods/basegame/creatures/CreatureHuman.json @@ -20,6 +20,7 @@ "encumbrance": 1000, "basedefence": 100, + "basereach": 50, "toolsize": 15, diff --git a/src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused b/src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused index f844ca00d..833f58be3 100644 --- a/src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused +++ b/src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused @@ -34,8 +34,8 @@ import com.badlogic.gdx.graphics.OrthographicCamera import net.torvald.random.HQRNG import net.torvald.terrarum.* import net.torvald.terrarum.gameworld.fmod -import net.torvald.terrarum.modulebasegame.console.AVTracker -import net.torvald.terrarum.modulebasegame.console.ActorsList +import net.torvald.terrarum.console.AVTracker +import net.torvald.terrarum.console.ActorsList import net.torvald.terrarum.console.Authenticator import net.torvald.terrarum.console.SetGlobalLightOverride import net.torvald.terrarum.itemproperties.ItemCodex diff --git a/src/net/torvald/terrarum/TitleScreen.kt b/src/net/torvald/terrarum/TitleScreen.kt index d39af4cac..900e4bb78 100644 --- a/src/net/torvald/terrarum/TitleScreen.kt +++ b/src/net/torvald/terrarum/TitleScreen.kt @@ -26,9 +26,8 @@ import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension import net.torvald.terrarum.modulebasegame.gameworld.WorldTime import net.torvald.terrarum.modulebasegame.ui.UIRemoCon import net.torvald.terrarum.modulebasegame.ui.UITitleRemoConYaml -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.ui.UICanvas -import net.torvald.terrarum.worlddrawer.CreateTileAtlas import net.torvald.terrarum.worlddrawer.WorldCamera /** diff --git a/src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt b/src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt index c3330baa7..58dff0dfa 100644 --- a/src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt +++ b/src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt @@ -7,8 +7,7 @@ import net.torvald.random.HQRNG import net.torvald.terrarum.Second import net.torvald.terrarum.Terrarum import net.torvald.terrarum.modulebasegame.gameworld.WorldTime -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer -import net.torvald.terrarum.worlddrawer.LightmapRenderer +import net.torvald.terrarum.weather.WeatherMixer /** * Created by minjaesong on 2016-06-16. diff --git a/src/net/torvald/terrarum/modulebasegame/console/AVTracker.kt b/src/net/torvald/terrarum/console/AVTracker.kt similarity index 88% rename from src/net/torvald/terrarum/modulebasegame/console/AVTracker.kt rename to src/net/torvald/terrarum/console/AVTracker.kt index 7fb93cb57..0eafd9893 100644 --- a/src/net/torvald/terrarum/modulebasegame/console/AVTracker.kt +++ b/src/net/torvald/terrarum/console/AVTracker.kt @@ -1,9 +1,6 @@ -package net.torvald.terrarum.modulebasegame.console +package net.torvald.terrarum.console import net.torvald.terrarum.Terrarum -import net.torvald.terrarum.console.ConsoleCommand -import net.torvald.terrarum.console.Echo -import net.torvald.terrarum.console.EchoError import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.debuggerapp.ActorValueTracker import java.util.* diff --git a/src/net/torvald/terrarum/modulebasegame/console/ActorsList.kt b/src/net/torvald/terrarum/console/ActorsList.kt similarity index 84% rename from src/net/torvald/terrarum/modulebasegame/console/ActorsList.kt rename to src/net/torvald/terrarum/console/ActorsList.kt index a00c4c01a..1d7bd3b63 100644 --- a/src/net/torvald/terrarum/modulebasegame/console/ActorsList.kt +++ b/src/net/torvald/terrarum/console/ActorsList.kt @@ -1,8 +1,6 @@ -package net.torvald.terrarum.modulebasegame.console +package net.torvald.terrarum.console import net.torvald.terrarum.Terrarum -import net.torvald.terrarum.console.ConsoleCommand -import net.torvald.terrarum.console.Echo import net.torvald.terrarum.debuggerapp.ActorsLister import net.torvald.terrarum.modulebasegame.TerrarumIngame import java.util.* diff --git a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt index ce722fb8f..26a3a53e6 100644 --- a/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt +++ b/src/net/torvald/terrarum/console/SetGlobalLightOverride.kt @@ -2,8 +2,7 @@ package net.torvald.terrarum.console import net.torvald.gdx.graphics.Cvec import net.torvald.terrarum.Terrarum -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer -import net.torvald.terrarum.worlddrawer.LightmapRenderer +import net.torvald.terrarum.weather.WeatherMixer /** * Created by minjaesong on 2016-02-17. diff --git a/src/net/torvald/terrarum/gameactors/AVKey.kt b/src/net/torvald/terrarum/gameactors/AVKey.kt index 8cbdebd92..ec791be07 100644 --- a/src/net/torvald/terrarum/gameactors/AVKey.kt +++ b/src/net/torvald/terrarum/gameactors/AVKey.kt @@ -86,6 +86,12 @@ object AVKey { * base defence point of the species */ const val BASEDEFENCE = "basedefence" + + /** Pixels + * base hand reach of the species (only affects the gameplay as the player) + */ + const val BASEREACH = "basereach" + /** (unit TBA) * current defence point of worn armour(s) */ diff --git a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt index 67d6dd153..ad080e9c9 100644 --- a/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt +++ b/src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt @@ -19,7 +19,7 @@ import net.torvald.terrarum.modulebasegame.ui.Notification import net.torvald.terrarum.modulebasegame.ui.UIBuildingMakerBlockChooser import net.torvald.terrarum.modulebasegame.ui.UIBuildingMakerPenMenu import net.torvald.terrarum.modulebasegame.ui.UIPaletteSelector -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.ui.UINSMenu import net.torvald.terrarum.worlddrawer.WorldCamera diff --git a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt index 3865c3cc4..9f769e021 100644 --- a/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt +++ b/src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt @@ -18,7 +18,7 @@ import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gameworld.GameWorld import net.torvald.terrarum.gameworld.fmod import net.torvald.terrarum.modulebasegame.gameactors.ParticleBase -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.ui.UICanvas import net.torvald.terrarum.worlddrawer.* import net.torvald.util.CircularArray diff --git a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt index c7e3c7303..ea54a3704 100644 --- a/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt +++ b/src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt @@ -20,14 +20,14 @@ import net.torvald.terrarum.gamecontroller.IngameController import net.torvald.terrarum.gamecontroller.KeyToggler import net.torvald.terrarum.gameitem.GameItem import net.torvald.terrarum.itemproperties.ItemCodex -import net.torvald.terrarum.modulebasegame.console.AVTracker -import net.torvald.terrarum.modulebasegame.console.ActorsList +import net.torvald.terrarum.console.AVTracker +import net.torvald.terrarum.console.ActorsList import net.torvald.terrarum.modulebasegame.gameactors.* import net.torvald.terrarum.modulebasegame.gameactors.physicssolver.CollisionSolver import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension import net.torvald.terrarum.modulebasegame.gameworld.WorldSimulator import net.torvald.terrarum.modulebasegame.ui.* -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser import net.torvald.terrarum.modulebasegame.worldgenerator.Worldgen import net.torvald.terrarum.modulebasegame.worldgenerator.WorldgenParams diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt index 51c504957..615988c5f 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt @@ -42,6 +42,7 @@ object PlayerBuilderSigrid { p.actorValue[AVKey.STRENGTH] = 1414 // this is test character, after all. p.actorValue[AVKey.ENCUMBRANCE] = 1000 p.actorValue[AVKey.BASEHEIGHT] = 46 + p.actorValue[AVKey.BASEREACH] = 50 p.actorValue[AVKey.NAME] = "Sigrid" diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt index ee7559228..d7bceda20 100644 --- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt +++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt @@ -24,6 +24,7 @@ object PlayerBuilderWerebeastTest { p.actorValue[AVKey.ACCEL] = ActorHumanoid.WALK_ACCEL_BASE p.actorValue[AVKey.ACCELBUFF] = 1.0 p.actorValue[AVKey.JUMPPOWER] = 19.0 + p.actorValue[AVKey.BASEREACH] = 114 // 7 tiles + 2 px p.actorValue[AVKey.BASEMASS] = 599.16 p.actorValue[AVKey.SCALEBUFF] = 1.0 // Constant 1.0 for player, meant to be used by random mobs @@ -46,7 +47,7 @@ object PlayerBuilderWerebeastTest { p.sprite = SpriteAnimation(p) p.spriteGlow = SpriteAnimation(p) p.reassembleSprite(p.sprite!!, p.spriteGlow) - p.setHitboxDimension(22, p.actorValue.getAsInt(AVKey.BASEHEIGHT) ?: ActorHumanoid.BASE_HEIGHT, 30, 0) + p.setHitboxDimension(22, p.actorValue.getAsInt(AVKey.BASEHEIGHT)!!, 30, 0) p.setPosition(3.0 * TILE_SIZE, 3.0 * TILE_SIZE) diff --git a/src/net/torvald/terrarum/serialise/WriteWorldInfo.kt b/src/net/torvald/terrarum/serialise/WriteWorldInfo.kt index f3cf8b6fb..d2925c876 100644 --- a/src/net/torvald/terrarum/serialise/WriteWorldInfo.kt +++ b/src/net/torvald/terrarum/serialise/WriteWorldInfo.kt @@ -10,7 +10,7 @@ import com.badlogic.gdx.utils.ScreenUtils import net.torvald.gdx.graphics.PixmapIO2 import net.torvald.terrarum.* import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension -import net.torvald.terrarum.modulebasegame.weather.WeatherMixer +import net.torvald.terrarum.weather.WeatherMixer import net.torvald.terrarum.modulebasegame.worldgenerator.RoguelikeRandomiser import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.ByteArray64 import net.torvald.terrarum.modulecomputers.virtualcomputer.tvd.ByteArray64GrowableOutputStream diff --git a/src/net/torvald/terrarum/modulebasegame/weather/BaseModularWeather.kt b/src/net/torvald/terrarum/weather/BaseModularWeather.kt similarity index 92% rename from src/net/torvald/terrarum/modulebasegame/weather/BaseModularWeather.kt rename to src/net/torvald/terrarum/weather/BaseModularWeather.kt index 0de2ab032..eb9ca09e3 100644 --- a/src/net/torvald/terrarum/modulebasegame/weather/BaseModularWeather.kt +++ b/src/net/torvald/terrarum/weather/BaseModularWeather.kt @@ -1,4 +1,4 @@ -package net.torvald.terrarum.modulebasegame.weather +package net.torvald.terrarum.weather import com.badlogic.gdx.graphics.Texture import net.torvald.terrarum.GdxColorMap diff --git a/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt b/src/net/torvald/terrarum/weather/WeatherMixer.kt similarity index 99% rename from src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt rename to src/net/torvald/terrarum/weather/WeatherMixer.kt index c1aa77028..055e02f07 100644 --- a/src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt +++ b/src/net/torvald/terrarum/weather/WeatherMixer.kt @@ -1,4 +1,4 @@ -package net.torvald.terrarum.modulebasegame.weather +package net.torvald.terrarum.weather import com.badlogic.gdx.Gdx import com.badlogic.gdx.Input @@ -18,7 +18,6 @@ import net.torvald.terrarum.modulebasegame.TerrarumIngame import net.torvald.terrarum.modulebasegame.gameactors.ParticleMegaRain import net.torvald.terrarum.modulebasegame.gameworld.GameWorldExtension import net.torvald.terrarum.utils.JsonFetcher -import net.torvald.terrarum.worlddrawer.CreateTileAtlas import net.torvald.terrarum.worlddrawer.WorldCamera import java.io.File import java.util.*