mse / ConfectionerEngine (public) (License: Confectioner Engine license) (since 2021-04-24) (hash sha1)
Farming RPG engine
Clone URLs: https://rocketgit.com/user/mse/ConfectionerEngine ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine git://git.rocketgit.com/user/mse/ConfectionerEngine
master
List of commits:
Subject Hash Author Date (UTC)
Convert Entity and Item to classes 217b7965a75513d94028d7f4399682477f55ae0e mse 2022-10-29 20:45:32
Add vnDrawStats 51ac185dc323ea564d60ef3bb675ab0855a966f7 mse 2022-09-05 09:10:33
Add cave-confec-gl2 targets (WIP) c89db928efc4b68d42d9b66079e444decedc49e2 mse 2022-08-16 04:24:50
Simplify debug target d55157f6ff96ec2103b2d703b96925b767c08ce2 mse 2022-08-16 03:45:00
Bump version to 0.8.0 6f5adaa7a93dff9a24ba03aef36f620d153816f4 mse 2022-08-08 12:16:23
Default saves to ./userdata and replace optional --savehere arg with --saveinos d0cb1ab86c2110cdc0f2aba19fc3843902d6a5ea mse 2022-08-08 11:42:21
Enable Chinese image buttons 3129899ee20ee1821b13db063dcd83477e37c505 mse 2022-08-06 04:44:38
Expand Chinese translations 2baa34f7247c32af12480feb801cb41787022115 mse 2022-08-04 18:34:02
Add VNHACK command 4539d3931617e58e73b295d6ca3679150acdcf78 mse 2022-08-04 06:59:04
Refactor FG3 to allow separate compilation eb1bb8bbc8c60169c2bbd789b38c608b4bb9cbab mse 2022-08-03 22:30:45
Fix menu bugs and bump to v0.7.11 ae193263f4b8461c299f6db66f130beae94724cc mse 2022-07-07 04:52:30
Bump version to 0.7.10 5f70f1aba48d3df67d5e4a70d9595e92aeac4afb mse 2022-05-11 10:54:09
ADV-style text advance 5fbb734d07a2dcf0162245b5afc6b5b4b9021b6f mse 2022-04-12 12:25:24
Switch interaction to mouse-up 345ce8d1ea9755f51365a2676cce0415f9cf68c2 mse 2022-04-10 21:07:15
Use gradient for text backdrop 6ad98cdaf4df37e8b24d9c1e8e2f9b0e904da9aa mse 2022-04-10 13:04:29
Improve vn button highlight 51b2c6c07b0cfb0efdb8cdf5cbeba49ef54d9ccb mse 2022-04-09 06:54:39
Darken the screen when drawing a menu with non-VN text 8f3bcee6d57817ea8c1dd999c68cb129dea1550c mse 2022-04-08 16:01:52
Upgrade the UI 45561487af001c5a790343690a792faeb14945d4 mse 2022-04-06 23:45:31
Progress on getting Emscripten builds working again (almost) e4276b7823027c7ac3a3afe30c3c30241f1c6642 mse 2022-04-01 11:16:56
Bump to version 0.7.9 1c93b011603bd953df0628fa39c586c11eeb7138 mse 2022-03-30 08:31:00
Commit 217b7965a75513d94028d7f4399682477f55ae0e - Convert Entity and Item to classes
Author: mse
Author date (UTC): 2022-10-29 20:45
Committer name: mse
Committer date (UTC): 2022-10-29 20:45
Parent(s): 51ac185dc323ea564d60ef3bb675ab0855a966f7
Signer:
Signing key:
Signing status: N
Tree: 0a22f4c493351ae7fa8e1e7085c6a1f4cebe688a
File Lines added Lines deleted
include/fworld.h 105 87
File include/fworld.h changed (mode: 100755) (index 880c6f8..b4081b5)
... ... typedef mesa<std::string,double> Inventory;
98 98
99 99 typedef std::vector<std::vector<int>> MapLayer; typedef std::vector<std::vector<int>> MapLayer;
100 100
101 struct Entity {
101 class Entity {
102 public:
102 103 fgl::Texture sprite; fgl::Texture sprite;
103 104 fgl::Texture meleeSprite; fgl::Texture meleeSprite;
104 105 fgl::Texture bribeSprite; fgl::Texture bribeSprite;
 
... ... struct Entity {
145 146 #else #else
146 147 std::vector<void*> path; std::vector<void*> path;
147 148 #endif #endif
149 Entity(){
150 inventory = {};
151 bribeItems = {};
152 path = {};
153 }
148 154 }; };
149 155
150 156 // For depth sorting. // For depth sorting.
 
... ... struct EntityIndex {
154 160 Entity *ptr; Entity *ptr;
155 161 }; };
156 162
157 struct Item {
158 std::map<std::string,std::string> names;
159 fgl::Texture icon;
160 int stack;
161 int flavor;
162 int appearance;
163 int sweetness;
164 int lactose;
165 int price;
166 int yield;
167 std::string script;
168 std::map<std::string,int> recipe, byproducts;
169 Entity entity;
163 class Item {
164 public:
165 std::map<std::string,std::string> names;
166 fgl::Texture icon;
167 int stack;
168 int flavor;
169 int appearance;
170 int sweetness;
171 int lactose;
172 int price;
173 int yield;
174 std::string script;
175 std::map<std::string,int> recipe, byproducts;
176 Entity entity;
177 Item(){
178 entity = Entity();
179 }
170 180 }; };
171 181
172 182 #ifdef GRINNINGLIZARD_MICROPATHER_INCLUDED #ifdef GRINNINGLIZARD_MICROPATHER_INCLUDED
 
... ... class World {
265 275 public: public:
266 276 std::string mapFile; std::string mapFile;
267 277 std::vector<Image> images; std::vector<Image> images;
268 fgl::InstanceBuffer instanceBuf;
278 #ifdef FG3_H
279 fgl::InstanceBuffer instanceBuf;
280 #endif
269 281 fgl::Texture tileset; fgl::Texture tileset;
270 282 fgl::Texture tilesetMip; fgl::Texture tilesetMip;
271 283 std::string tilesetDefinition; std::string tilesetDefinition;
 
... ... void World::loadItems( std::string filePath ){
970 982 entity.name = itemName; entity.name = itemName;
971 983 } }
972 984 // Add the item. // Add the item.
973 items[itemName] = {
974 localizedNames,
975 getTexture( dataPath, itemIcon, false ),
976 itemDef.value["stack"] ? itemDef.value["stack"].getInt() : 1,
977 itemDef.value["flavor"].getInt(),
978 itemDef.value["appearance"].getInt(),
979 itemDef.value["sweetness"].getInt(),
980 itemDef.value["lactose"].getInt(),
981 itemDef.value["price"].getInt(),
982 itemDef.value["yield"].getInt(),
983 viewToString( itemDef.value["script"].getString() ),
984 itemRecipe,
985 itemByproducts,
986 entity
987 };
985 Item item = Item();
986 item.names = localizedNames;
987 item.icon = getTexture( dataPath, itemIcon, false );
988 item.stack = itemDef.value["stack"] ? itemDef.value["stack"].getInt() : 1;
989 item.flavor = itemDef.value["flavor"].getInt();
990 item.appearance = itemDef.value["appearance"].getInt();
991 item.sweetness = itemDef.value["sweetness"].getInt();
992 item.lactose = itemDef.value["lactose"].getInt();
993 item.price = itemDef.value["price"].getInt();
994 item.yield = itemDef.value["yield"].getInt();
995 item.script = viewToString( itemDef.value["script"].getString() );
996 item.recipe = itemRecipe;
997 item.byproducts = itemByproducts;
998 item.entity = entity;
999 items[itemName] = item;
988 1000 } }
989 1001
990 1002 jsonFreeDocument( &allocatedDocument ); jsonFreeDocument( &allocatedDocument );
 
... ... Entity World::parseEntity( const JsonValueStruct &o, std::string dataPath ){
1253 1265 double fps = getProp(properties,"fps").getDouble(); double fps = getProp(properties,"fps").getDouble();
1254 1266 int spriteWidth = getProp(properties,"spriteWidth").getInt(); int spriteWidth = getProp(properties,"spriteWidth").getInt();
1255 1267 int spriteHeight = getProp(properties,"spriteHeight").getInt(); int spriteHeight = getProp(properties,"spriteHeight").getInt();
1256 // Return the entity.
1257 return {
1258 getTexture( dataPath, viewToString( getProp(properties,"spriteImage").getString() ), false ),
1259 getTexture( dataPath, viewToString( getProp(properties,"meleeSpriteImage").getString() ), false ),
1260 getTexture( dataPath, viewToString( getProp(properties,"bribeSpriteImage").getString() ), false ),
1261 getTexture( dataPath, viewToString( getProp(properties,"shadowImage").getString() ), true ),
1262 getTexture( dataPath, viewToString( getProp(properties,"sleepImage").getString() ), false ),
1263 viewToString( o["name"].getString() ),
1264 type,
1265 viewToString( getProp(properties,"itemName").getString() ),
1266 dialogueId,
1267 deathDialogueId,
1268 bribeNewDialogueId,
1269 viewToString( getProp(properties,"bribeSuccess").getString() ),
1270 viewToString( getProp(properties,"bribeFail").getString() ),
1271 decodeInventory( viewToString( getProp(properties,"inventory").getString() ) ),
1272 decodeInventory( viewToString( getProp(properties,"bribeItems").getString() ) ),
1273 speed ? speed : 3.0,
1274 1.0,
1275 x,
1276 y,
1277 x,
1278 y,
1279 collisionSize,
1280 fps ? fps : mapFps,
1281 getProp(properties,"meleeRecovery").getDouble(),
1282 getProp(properties,"age").getDouble(),
1283 0.0,
1284 0.0,
1285 0.0,
1286 false,
1287 staticCol,
1288 getProp(properties,"health").getInt(),
1289 getProp(properties,"money").getInt(),
1290 getProp(properties,"karma").getInt(),
1291 getProp(properties,"sweetTooth").getInt(),
1292 getProp(properties,"lactoseTolerance").getInt(),
1293 getProp(properties,"meleeDamage").getInt(),
1294 getProp(properties,"animationMode").getInt(),
1295 type == "corpse" ? TASK_SLEEP : TASK_NONE,
1296 getProp(properties,"direction").getInt(),
1297 spriteWidth ? spriteWidth : o["width"].getInt(),
1298 spriteHeight ? spriteHeight : o["height"].getInt(),
1299 {}
1300 };
1268 // Construct the entity.
1269 Entity ent = Entity();
1270 ent.sprite = getTexture( dataPath, viewToString( getProp(properties,"spriteImage").getString() ), false );
1271 ent.meleeSprite = getTexture( dataPath, viewToString( getProp(properties,"meleeSpriteImage").getString() ), false );
1272 ent.bribeSprite = getTexture( dataPath, viewToString( getProp(properties,"bribeSpriteImage").getString() ), false );
1273 ent.shadow = getTexture( dataPath, viewToString( getProp(properties,"shadowImage").getString() ), true );
1274 ent.sleep = getTexture( dataPath, viewToString( getProp(properties,"sleepImage").getString() ), false );
1275 ent.name = viewToString( o["name"].getString() );
1276 ent.type = type;
1277 ent.itemName = viewToString( getProp(properties,"itemName").getString() );
1278 ent.dialogue = dialogueId;
1279 ent.deathDialogue = deathDialogueId;
1280 ent.bribeNewDialogue = bribeNewDialogueId;
1281 ent.bribeSuccess = viewToString( getProp(properties,"bribeSuccess").getString() );
1282 ent.bribeFail = viewToString( getProp(properties,"bribeFail").getString() );
1283 ent.inventory = decodeInventory( viewToString( getProp(properties,"inventory").getString() ) );
1284 ent.bribeItems = decodeInventory( viewToString( getProp(properties,"bribeItems").getString() ) );
1285 ent.speed = speed ? speed : 3.0;
1286 ent.speedFactor = 1.0;
1287 ent.x = x;
1288 ent.y = y;
1289 ent.last_x = x;
1290 ent.last_y = y;
1291 ent.collisionRadius = collisionSize;
1292 ent.fps = fps ? fps : mapFps;
1293 ent.meleeRecovery = getProp(properties,"meleeRecovery").getDouble();
1294 ent.age = getProp(properties,"age").getDouble();
1295 ent.frame = 0.0;
1296 ent.boredom = 0.0;
1297 ent.stun = 0.0;
1298 ent.walking = false;
1299 ent.staticCollisions = staticCol;
1300 ent.health = getProp(properties,"health").getInt();
1301 ent.money = getProp(properties,"money").getInt();
1302 ent.karma = getProp(properties,"karma").getInt();
1303 ent.money = getProp(properties,"sweetTooth").getInt();
1304 ent.sweetTooth = getProp(properties,"lactoseTolerance").getInt();
1305 ent.lactoseTolerance = getProp(properties,"meleeDamage").getInt();
1306 ent.meleeDamage = getProp(properties,"animationMode").getInt();
1307 ent.task = type == "corpse" ? TASK_SLEEP : TASK_NONE;
1308 ent.direction = getProp(properties,"direction").getInt();
1309 ent.width = spriteWidth ? spriteWidth : o["width"].getInt();
1310 ent.height = spriteHeight ? spriteHeight : o["height"].getInt();
1311 ent.path = {};
1312 return ent;
1301 1313 } }
1302 1314
1303 1315 std::string World::serializeEntity( size_t idx ){ std::string World::serializeEntity( size_t idx ){
 
... ... void World::drawSprite( fgl::Texture &tex, double posX, double posY, double imag
1515 1527 ) ) ) )
1516 1528 ) )
1517 1529 ); );
1530 #ifdef FG3_H
1518 1531 if( bind ){ if( bind ){
1532 #endif
1519 1533 // Draw directly. // Draw directly.
1520 1534 if( !tex.success ) return; if( !tex.success ) return;
1521 1535 fgl::setTexture( tex, 0 ); fgl::setTexture( tex, 0 );
 
... ... void World::drawSprite( fgl::Texture &tex, double posX, double posY, double imag
1528 1542 linalg::perspective_matrix( 68.5 * 0.01745, (double)screenWidth / (double)screenHeight, 0.1, 44.0 ) linalg::perspective_matrix( 68.5 * 0.01745, (double)screenWidth / (double)screenHeight, 0.1, 44.0 )
1529 1543 ); );
1530 1544 fgl::setTextureMatrix( linalg::identity ); fgl::setTextureMatrix( linalg::identity );
1545 #ifdef FG3_H
1531 1546 }else{ }else{
1532 1547 // Draw instanced. // Draw instanced.
1533 1548 instanceBuf.push( fgl::fogColor, m, fgl::getTextureMatrix() ); instanceBuf.push( fgl::fogColor, m, fgl::getTextureMatrix() );
1534 1549 } }
1550 #endif
1535 1551 } }
1536 1552
1537 1553 bool World::cursorOverSprite( double posX, double posY, double spriteScale, double sourceW, double sourceH ){ bool World::cursorOverSprite( double posX, double posY, double spriteScale, double sourceW, double sourceH ){
 
... ... void World::drawMapLayer( size_t pos ){
1708 1724 } }
1709 1725 } }
1710 1726
1711 // Disable fog for the unlit instance pipeline.
1712 fgl::Color old_fog = fgl::fogColor;
1713 fgl::setFog( { 0.0f, 0.0f, 0.0f, 0.0f } );
1727 #ifdef FG3_H
1728 // Disable fog for the unlit instance pipeline.
1729 fgl::Color old_fog = fgl::fogColor;
1730 fgl::setFog( { 0.0f, 0.0f, 0.0f, 0.0f } );
1714 1731
1715 // Draw and clear the instance buffer.
1716 instanceBuf.upload();
1717 auto projMat = linalg::perspective_matrix( 68.5 * 0.01745, (double)screenWidth / (double)screenHeight, 0.1, 44.0 );
1718 instanceBuf.draw( fgl::planeMesh, viewMat, projMat, fgl::getLightMatrix() );
1719 instanceBuf.clear();
1732 // Draw and clear the instance buffer.
1733 instanceBuf.upload();
1734 auto projMat = linalg::perspective_matrix( 68.5 * 0.01745, (double)screenWidth / (double)screenHeight, 0.1, 44.0 );
1735 instanceBuf.draw( fgl::planeMesh, viewMat, projMat, fgl::getLightMatrix() );
1736 instanceBuf.clear();
1720 1737
1721 // Set fog to its old color.
1722 fgl::setFog( old_fog );
1738 // Set fog to its old color.
1739 fgl::setFog( old_fog );
1723 1740
1724 // Switch to the old pipeline.
1725 fgl::setPipeline( old_pipeline );
1741 // Switch to the old pipeline.
1742 fgl::setPipeline( old_pipeline );
1743 #endif
1726 1744 } }
1727 1745
1728 1746 void World::moveEntity( Entity &ent, double moveX, double moveY, double d ){ void World::moveEntity( Entity &ent, double moveX, double moveY, double d ){
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main