sigonasr2/hamster
1
0
Fork 0
mirror of https://github.com/sigonasr2/hamster.git synced 2025-04-18 14:39:40 -05:00
Code Issues Projects Releases Wiki Activity

Added a missing comma to hamster color names. Force "PurpleRed" entries to be renamed to Purple on load.

Browse Source
This commit is contained in:
sigonasr2 2024-08-26 14:38:31 -05:00
parent bf63336733
commit 8365864f09
4 changed files with 64 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ vs-build
/cmake_install.cmake /cmake_install.cmake
/hamster.vcxproj.user /hamster.vcxproj.user
PBData PBData
/bin/Hamster Planet - Winx64-post-jam-fix.zip

95
assets/HamsterGame.tiled-session
View File

@ -3,7 +3,7 @@
"height": 4300, "height": 4300,
"width": 2 "width": 2
}, },
"activeFile": "TreeTemplates.tmx", "activeFile": "StageI.tmx",
"expandedProjectPaths": [ "expandedProjectPaths": [
"." "."
], ],
@ -13,30 +13,30 @@
"expandedObjectLayers": [ "expandedObjectLayers": [
12 12
], ],
"scale": 0.75, "scale": 0.125,
"selectedLayer": 1, "selectedLayer": 1,
"viewCenter": { "viewCenter": {
"x": 843.3333333333335, "x": -1024,
"y": 2534 "y": 2756
} }
}, },
"StageII.tmx": { "StageII.tmx": {
"expandedObjectLayers": [ "expandedObjectLayers": [
5 5
], ],
"scale": 0.5, "scale": 0.125,
"selectedLayer": 1, "selectedLayer": 1,
"viewCenter": { "viewCenter": {
"x": 1459, "x": -576,
"y": 2331 "y": 3084
} }
}, },
"StageIII.tmx": { "StageIII.tmx": {
"scale": 1.5, "scale": 0.5,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 1337, "x": 944,
"y": 1724.333333333333 "y": 2501
} }
}, },
"StageIV.tmx": { "StageIV.tmx": {
@ -46,27 +46,30 @@
"scale": 0.25, "scale": 0.25,
"selectedLayer": 3, "selectedLayer": 3,
"viewCenter": { "viewCenter": {
"x": 1098, "x": 1096,
"y": 958 "y": 954
} }
}, },
"StageIX.tmx": { "StageIX.tmx": {
"expandedObjectLayers": [ "expandedObjectLayers": [
5 5
], ],
"scale": 0.5, "scale": 0.125,
"selectedLayer": 1, "selectedLayer": 1,
"viewCenter": { "viewCenter": {
"x": 1298, "x": 1312,
"y": 4551 "y": 3868
} }
}, },
"StageV.tmx": { "StageV.tmx": {
"expandedObjectLayers": [
5
],
"scale": 0.33, "scale": 0.33,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 1118.1818181818182, "x": 1118.1818181818185,
"y": 1783.3333333333333 "y": 2889.393939393939
} }
}, },
"StageVI.tmx": { "StageVI.tmx": {
@ -76,44 +79,47 @@
"scale": 0.5, "scale": 0.5,
"selectedLayer": 2, "selectedLayer": 2,
"viewCenter": { "viewCenter": {
"x": 490, "x": 488,
"y": 1913 "y": 1179
} }
}, },
"StageVII.tmx": { "StageVII.tmx": {
"scale": 2, "expandedObjectLayers": [
3
],
"scale": 0.33,
"selectedLayer": 1, "selectedLayer": 1,
"viewCenter": { "viewCenter": {
"x": 808.75, "x": 1169.69696969697,
"y": 934.75 "y": 1207.5757575757575
} }
}, },
"StageVIII.tmx": { "StageVIII.tmx": {
"expandedObjectLayers": [ "expandedObjectLayers": [
4 4
], ],
"scale": 1.5, "scale": 0.33,
"selectedLayer": 4, "selectedLayer": 4,
"viewCenter": { "viewCenter": {
"x": 568.9999999999999, "x": 1460.606060606061,
"y": 1141 "y": 904.5454545454545
} }
}, },
"StageX.tmx": { "StageX.tmx": {
"expandedObjectLayers": [ "expandedObjectLayers": [
4 4
], ],
"scale": 1, "scale": 0.33,
"selectedLayer": 3, "selectedLayer": 3,
"viewCenter": { "viewCenter": {
"x": 1726, "x": 1651.5151515151515,
"y": 632.5 "y": 1153.030303030303
} }
}, },
"Terrain.tsx": { "Terrain.tsx": {
"dynamicWrapping": false, "dynamicWrapping": false,
"scaleInDock": 1, "scaleInDock": 2,
"scaleInEditor": 2 "scaleInEditor": 3
}, },
"TestLevel.tmx": { "TestLevel.tmx": {
"expandedObjectLayers": [ "expandedObjectLayers": [
@ -122,16 +128,16 @@
"scale": 1, "scale": 1,
"selectedLayer": 2, "selectedLayer": 2,
"viewCenter": { "viewCenter": {
"x": 516, "x": 1600,
"y": 577.5 "y": 1599.5
} }
}, },
"TreeTemplates.tmx": { "TreeTemplates.tmx": {
"scale": 3, "scale": 3,
"selectedLayer": 0, "selectedLayer": 0,
"viewCenter": { "viewCenter": {
"x": 251.83333333333334, "x": 251.66666666666663,
"y": 165.16666666666663 "y": 164.83333333333334
} }
} }
}, },
@ -147,7 +153,17 @@
"openFiles": [ "openFiles": [
"TestLevel.tmx", "TestLevel.tmx",
"Terrain.tsx", "Terrain.tsx",
"TreeTemplates.tmx" "TreeTemplates.tmx",
"StageIV.tmx",
"StageV.tmx",
"StageVI.tmx",
"StageVII.tmx",
"StageVIII.tmx",
"StageIX.tmx",
"StageX.tmx",
"StageI.tmx",
"StageII.tmx",
"StageIII.tmx"
], ],
"project": "HamsterGame.tiled-project", "project": "HamsterGame.tiled-project",
"property.type": "BGM", "property.type": "BGM",
@ -156,9 +172,14 @@
"Terrain.tsx", "Terrain.tsx",
"TreeTemplates.tmx", "TreeTemplates.tmx",
"StageIV.tmx", "StageIV.tmx",
"StageII.tmx", "StageV.tmx",
"StageVI.tmx",
"StageVII.tmx",
"StageVIII.tmx",
"StageIX.tmx",
"StageX.tmx",
"StageIII.tmx", "StageIII.tmx",
"StageI.tmx" "StageII.tmx"
], ],
"tileset.lastUsedFormat": "tsx", "tileset.lastUsedFormat": "tsx",
"tileset.tileSize": { "tileset.tileSize": {

4
src/HamsterGame.cpp
View File

@ -27,7 +27,6 @@ bool HamsterGame::OnUserCreate(){
for(const std::string&map:mapNameList){ for(const std::string&map:mapNameList){
mapPBs[map]=std::numeric_limits<int>::max(); mapPBs[map]=std::numeric_limits<int>::max();
} }
LoadPBs();
audio.SetBackgroundPlay(true); audio.SetBackgroundPlay(true);
olc::GFX3D::ConfigureDisplay(); olc::GFX3D::ConfigureDisplay();
@ -397,6 +396,7 @@ bool HamsterGame::OnUserUpdate(float fElapsedTime){
if(!netInitialized){ if(!netInitialized){
net.InitSession(); net.InitSession();
netInitialized=true; netInitialized=true;
LoadPBs();
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
emscripten_idb_async_load("hamster",Game().bgmVolLabel.c_str(),&Game().bgmVol,[](void*arg,void*data,int length){ emscripten_idb_async_load("hamster",Game().bgmVolLabel.c_str(),&Game().bgmVol,[](void*arg,void*data,int length){
@ -433,6 +433,7 @@ bool HamsterGame::OnUserUpdate(float fElapsedTime){
std::cout<<rawMetadata<<std::endl; std::cout<<rawMetadata<<std::endl;
*((std::string*)(arg))=rawMetadata.substr(0,length); *((std::string*)(arg))=rawMetadata.substr(0,length);
std::cout<<std::format("Success! Loaded Hamster Color {}",*((std::string*)(arg)))<<std::endl; std::cout<<std::format("Success! Loaded Hamster Color {}",*((std::string*)(arg)))<<std::endl;
if(*((std::string*)(arg))=="PurpleRed")*((std::string*)(arg))="Purple";
HamsterGame::Game().net.SetColor(*((std::string*)(arg))); HamsterGame::Game().net.SetColor(*((std::string*)(arg)));
}, },
[](void*arg){ [](void*arg){
@ -731,6 +732,7 @@ void HamsterGame::LoadPBs(){
}break; }break;
case 19:{ case 19:{
file>>Game().hamsterColor; file>>Game().hamsterColor;
if(Game().hamsterColor=="PurpleRed")Game().hamsterColor="Purple";
Game().net.SetColor(Game().hamsterColor); Game().net.SetColor(Game().hamsterColor);
std::cout<<Game().hamsterColor<<std::endl; std::cout<<Game().hamsterColor<<std::endl;
}break; }break;

2
src/HamsterGame.h
View File

@ -89,7 +89,7 @@ private:
"Cyan", "Cyan",
"Black", "Black",
"Green", "Green",
"Purple" "Purple",
"Red", "Red",
"Blue", "Blue",
}; };