curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-07 20:31:51 +09:00
Code Issues Packages Projects Releases Wiki Activity

moving things around between packages

Browse Source
This commit is contained in:
minjaesong
2021-07-28 10:11:18 +09:00
parent c67a10c9a8
commit 8cb3fc2d33
16 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
assets/mods/basegame/creatures/CreatureHuman.json
View File

@@ -20,6 +20,7 @@
"encumbrance": 1000,
"basedefence": 100,
"basereach": 50,
"toolsize": 15,

4
src/net/torvald/terrarum/FuckingWorldRenderer.kt.unused
View File

@@ -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

3
src/net/torvald/terrarum/TitleScreen.kt
View File

@@ -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
/**

3
src/net/torvald/terrarum/blockproperties/BlockPropUtil.kt
View File

@@ -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.

5
src/net/torvald/terrarum/modulebasegame/console/AVTracker.kt → src/net/torvald/terrarum/console/AVTracker.kt
View File

@@ -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.*

4
src/net/torvald/terrarum/modulebasegame/console/ActorsList.kt → src/net/torvald/terrarum/console/ActorsList.kt
View File

@@ -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.*

3
src/net/torvald/terrarum/console/SetGlobalLightOverride.kt
View File

@@ -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.

6
src/net/torvald/terrarum/gameactors/AVKey.kt
View File

@@ -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)
*/

2
src/net/torvald/terrarum/modulebasegame/BuildingMaker.kt
View File

@@ -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

2
src/net/torvald/terrarum/modulebasegame/IngameRenderer.kt
View File

@@ -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

6
src/net/torvald/terrarum/modulebasegame/TerrarumIngame.kt
View File

@@ -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

1
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
View File

@@ -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"

3
src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderWerebeastTest.kt
View File

@@ -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)

2
src/net/torvald/terrarum/serialise/WriteWorldInfo.kt
View File

@@ -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

2
src/net/torvald/terrarum/modulebasegame/weather/BaseModularWeather.kt → src/net/torvald/terrarum/weather/BaseModularWeather.kt
View File

@@ -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

3
src/net/torvald/terrarum/modulebasegame/weather/WeatherMixer.kt → src/net/torvald/terrarum/weather/WeatherMixer.kt
View File

@@ -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.*