zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-04-25 04:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Exported episode and skill infos

Browse source
This commit is contained in:
Boondorl 2025-03-13 12:46:49 -04:00 committed by Ricardo Luís Vaz Silva
parent 7e410fd5d8
commit d0e056565b
5 changed files with 125 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/gamedata/g_mapinfo.cpp
View file

@ -2776,3 +2776,10 @@ void G_ParseMapInfo (FString basemapinfo)
}
}
DEFINE_GLOBAL(AllEpisodes)
DEFINE_FIELD_X(EpisodeInfo, FEpisode, mEpisodeName)
DEFINE_FIELD_X(EpisodeInfo, FEpisode, mEpisodeMap)
DEFINE_FIELD_X(EpisodeInfo, FEpisode, mPicName)
DEFINE_FIELD_X(EpisodeInfo, FEpisode, mShortcut)
DEFINE_FIELD_X(EpisodeInfo, FEpisode, mNoSkill)

6
src/gamedata/g_mapinfo.h
View file

@ -41,6 +41,8 @@
#include "screenjob.h"
#include "hwrenderer/postprocessing/hw_postprocess.h"
#include "hw_viewpointuniforms.h"
#include "vm.h"
#include "maps.h"
struct level_info_t;
struct cluster_info_t;
@ -535,9 +537,9 @@ int G_SkillProperty(ESkillProperty prop);
double G_SkillProperty(EFSkillProperty prop);
const char * G_SkillName();
typedef TMap<FName, FString> SkillMenuNames;
typedef ZSMap<FName, FString> SkillMenuNames;
typedef TMap<FName, FName> SkillActorReplacement;
typedef ZSMap<FName, FName> SkillActorReplacement;
struct FSkillInfo
{

52
src/gamedata/g_skill.cpp
View file

@ -647,3 +647,55 @@ FName FSkillInfo::GetReplacedBy(FName b)
if (Replaced.CheckKey(b)) return Replaced[b];
else return NAME_None;
}
DEFINE_GLOBAL(AllSkills)
// Avoid Name type clashing
DEFINE_FIELD_NAMED(FSkillInfo, Name, SkillName)
DEFINE_FIELD(FSkillInfo, AmmoFactor)
DEFINE_FIELD(FSkillInfo, DoubleAmmoFactor)
DEFINE_FIELD(FSkillInfo, DropAmmoFactor)
DEFINE_FIELD(FSkillInfo, DamageFactor)
DEFINE_FIELD(FSkillInfo, ArmorFactor)
DEFINE_FIELD(FSkillInfo, HealthFactor)
DEFINE_FIELD(FSkillInfo, KickbackFactor)
DEFINE_FIELD(FSkillInfo, FastMonsters)
DEFINE_FIELD(FSkillInfo, SlowMonsters)
DEFINE_FIELD(FSkillInfo, DisableCheats)
DEFINE_FIELD(FSkillInfo, AutoUseHealth)
DEFINE_FIELD(FSkillInfo, EasyBossBrain)
DEFINE_FIELD(FSkillInfo, EasyKey)
DEFINE_FIELD(FSkillInfo, NoMenu)
DEFINE_FIELD(FSkillInfo, RespawnCounter)
DEFINE_FIELD(FSkillInfo, RespawnLimit)
DEFINE_FIELD(FSkillInfo, Aggressiveness)
DEFINE_FIELD(FSkillInfo, SpawnFilter)
DEFINE_FIELD(FSkillInfo, SpawnMulti)
DEFINE_FIELD(FSkillInfo, InstantReaction)
DEFINE_FIELD(FSkillInfo, SpawnMultiCoopOnly)
DEFINE_FIELD(FSkillInfo, ACSReturn)
DEFINE_FIELD(FSkillInfo, MenuName)
DEFINE_FIELD(FSkillInfo, PicName)
DEFINE_FIELD(FSkillInfo, MenuNamesForPlayerClass)
DEFINE_FIELD(FSkillInfo, MustConfirm)
DEFINE_FIELD(FSkillInfo, MustConfirmText)
DEFINE_FIELD(FSkillInfo, Shortcut)
DEFINE_FIELD(FSkillInfo, TextColor)
DEFINE_FIELD(FSkillInfo, Replace)
DEFINE_FIELD(FSkillInfo, Replaced)
DEFINE_FIELD(FSkillInfo, MonsterHealth)
DEFINE_FIELD(FSkillInfo, FriendlyHealth)
DEFINE_FIELD(FSkillInfo, NoPain)
DEFINE_FIELD(FSkillInfo, Infighting)
DEFINE_FIELD(FSkillInfo, PlayerRespawn)
static int GetTextColor(FSkillInfo* self)
{
return self->GetTextColor();
}
DEFINE_ACTION_FUNCTION_NATIVE(FSkillInfo, GetTextColor, GetTextColor)
{
PARAM_SELF_STRUCT_PROLOGUE(FSkillInfo);
ACTION_RETURN_INT(self->GetTextColor());
}

8
src/scripting/thingdef_data.cpp
View file

@ -767,6 +767,14 @@ void InitThingdef()
terraindefstruct->Size = sizeof(FTerrainDef);
terraindefstruct->Align = alignof(FTerrainDef);
auto episodestruct = NewStruct("EpisodeInfo", nullptr, true);
episodestruct->Size = sizeof(FEpisode);
episodestruct->Align = alignof(FEpisode);
auto skillstruct = NewStruct("SkillInfo", nullptr, true);
skillstruct->Size = sizeof(FSkillInfo);
skillstruct->Align = alignof(FSkillInfo);
PStruct *pstruct = NewStruct("PlayerInfo", nullptr, true);
pstruct->Size = sizeof(player_t);
pstruct->Align = alignof(player_t);

54
wadsrc/static/zscript/doombase.zs
View file

@ -23,6 +23,60 @@ extend struct _
native readonly bool playeringame[MAXPLAYERS];
native play LevelLocals Level;
native readonly Array<@EpisodeInfo> AllEpisodes;
native readonly Array<@SkillInfo> AllSkills;
}
struct EpisodeInfo native
{
native readonly string mEpisodeName;
native readonly string mEpisodeMap;
native readonly string mPicName;
native readonly int8 mShortcut;
native readonly bool mNoSkill;
}
struct SkillInfo native
{
native readonly Name SkillName;
native readonly double AmmoFactor, DoubleAmmoFactor, DropAmmoFactor;
native readonly double DamageFactor;
native readonly double ArmorFactor;
native readonly double HealthFactor;
native readonly double KickbackFactor;
native readonly bool FastMonsters;
native readonly bool SlowMonsters;
native readonly bool DisableCheats;
native readonly bool AutoUseHealth;
native readonly bool EasyBossBrain;
native readonly bool EasyKey;
native readonly bool NoMenu;
native readonly int RespawnCounter;
native readonly int RespawnLimit;
native readonly double Aggressiveness;
native readonly int SpawnFilter;
native readonly bool SpawnMulti;
native readonly bool InstantReaction;
native readonly bool SpawnMultiCoopOnly;
native readonly int ACSReturn;
native readonly string MenuName;
native readonly string PicName;
native readonly Map<Name, string> MenuNamesForPlayerClass;
native readonly bool MustConfirm;
native readonly string MustConfirmText;
native readonly int8 Shortcut;
native readonly string TextColor;
native readonly Map<Name, Name> Replace;
native readonly Map<Name, Name> Replaced;
native readonly double MonsterHealth;
native readonly double FriendlyHealth;
native readonly bool NoPain;
native readonly int Infighting;
native readonly bool PlayerRespawn;
native int GetTextColor() const;
}
extend struct TexMan