|
|
@@ -45,6 +45,14 @@ struct guild_expcache {
|
|
|
int guild_id, account_id, char_id, exp;
|
|
|
};
|
|
|
|
|
|
+// timer for auto saving guild data during WoE
|
|
|
+#define GUILD_SAVE_INTERVAL 300000
|
|
|
+int guild_save_timer = -1;
|
|
|
+
|
|
|
+int guild_payexp_timer(int tid,unsigned int tick,int id,int data);
|
|
|
+int guild_gvg_eliminate_timer(int tid,unsigned int tick,int id,int data);
|
|
|
+int guild_save_sub(int tid,unsigned int tick,int id,int data);
|
|
|
+
|
|
|
// ギルドスキルdbのアクセサ（今は直打ちで代用）
|
|
|
int guild_skill_get_inf(int id) { // Modified for new skills [Sara]
|
|
|
if (id==GD_BATTLEORDER) return 4;
|
|
|
@@ -82,11 +90,6 @@ int guild_checkskill(struct guild *g,int id)
|
|
|
return g->skill[idx].lv;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-int guild_payexp_timer(int tid,unsigned int tick,int id,int data);
|
|
|
-int guild_gvg_eliminate_timer(int tid,unsigned int tick,int id,int data);
|
|
|
-
|
|
|
-
|
|
|
static int guild_read_castledb(void)
|
|
|
{
|
|
|
FILE *fp;
|
|
|
@@ -147,6 +150,7 @@ void do_init_guild(void)
|
|
|
|
|
|
add_timer_func_list(guild_gvg_eliminate_timer,"guild_gvg_eliminate_timer");
|
|
|
add_timer_func_list(guild_payexp_timer,"guild_payexp_timer");
|
|
|
+ add_timer_func_list(guild_save_sub, "guild_save_sub");
|
|
|
add_timer_interval(gettick()+GUILD_PAYEXP_INVERVAL,guild_payexp_timer,0,0,GUILD_PAYEXP_INVERVAL);
|
|
|
}
|
|
|
|
|
|
@@ -1514,6 +1518,8 @@ int guild_agit_start(void)
|
|
|
{ // Run All NPC_Event[OnAgitStart]
|
|
|
int c = npc_event_doall("OnAgitStart");
|
|
|
printf("NPC_Event:[OnAgitStart] Run (%d) Events by @AgitStart.\n",c);
|
|
|
+ // Start auto saving
|
|
|
+ guild_save_timer = add_timer_interval (gettick() + GUILD_SAVE_INTERVAL, guild_save_sub, 0, 0, GUILD_SAVE_INTERVAL);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -1521,6 +1527,8 @@ int guild_agit_end(void)
|
|
|
{ // Run All NPC_Event[OnAgitEnd]
|
|
|
int c = npc_event_doall("OnAgitEnd");
|
|
|
printf("NPC_Event:[OnAgitEnd] Run (%d) Events by @AgitEnd.\n",c);
|
|
|
+ // Stop auto saving
|
|
|
+ delete_timer (guild_save_timer, guild_save_sub);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
@@ -1544,6 +1552,60 @@ int guild_gvg_eliminate_timer(int tid,unsigned int tick,int id,int data)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+static int Ghp[MAX_GUILDCASTLE][8]; // so save only if HP are changed // experimental code [Yor]
|
|
|
+static int Gid[MAX_GUILDCASTLE];
|
|
|
+int guild_save_sub(int tid,unsigned int tick,int id,int data)
|
|
|
+{
|
|
|
+ struct guild_castle *gc;
|
|
|
+ int i;
|
|
|
+
|
|
|
+ for(i = 0; i < MAX_GUILDCASTLE; i++) { // [Yor]
|
|
|
+ gc = guild_castle_search(i);
|
|
|
+ if (!gc) continue;
|
|
|
+ if (gc->guild_id != Gid[i]) {
|
|
|
+ // Re-save guild id if its owner guild has changed
|
|
|
+ // This should already be done in gldfunc_ev_agit.txt,
|
|
|
+ // but since people have complained... Well x3
|
|
|
+ guild_castledatasave(gc->castle_id, 1, gc->guild_id);
|
|
|
+ Gid[i] = gc->guild_id;
|
|
|
+ }
|
|
|
+ if (gc->visibleG0 == 1 && Ghp[i][0] != gc->Ghp0) {
|
|
|
+ guild_castledatasave(gc->castle_id, 18, gc->Ghp0);
|
|
|
+ Ghp[i][0] = gc->Ghp0;
|
|
|
+ }
|
|
|
+ if (gc->visibleG1 == 1 && Ghp[i][1] != gc->Ghp1) {
|
|
|
+ guild_castledatasave(gc->castle_id, 19, gc->Ghp1);
|
|
|
+ Ghp[i][1] = gc->Ghp1;
|
|
|
+ }
|
|
|
+ if (gc->visibleG2 == 1 && Ghp[i][2] != gc->Ghp2) {
|
|
|
+ guild_castledatasave(gc->castle_id, 20, gc->Ghp2);
|
|
|
+ Ghp[i][2] = gc->Ghp2;
|
|
|
+ }
|
|
|
+ if (gc->visibleG3 == 1 && Ghp[i][3] != gc->Ghp3) {
|
|
|
+ guild_castledatasave(gc->castle_id, 21, gc->Ghp3);
|
|
|
+ Ghp[i][3] = gc->Ghp3;
|
|
|
+ }
|
|
|
+ if (gc->visibleG4 == 1 && Ghp[i][4] != gc->Ghp4) {
|
|
|
+ guild_castledatasave(gc->castle_id, 22, gc->Ghp4);
|
|
|
+ Ghp[i][4] = gc->Ghp4;
|
|
|
+ }
|
|
|
+ if (gc->visibleG5 == 1 && Ghp[i][5] != gc->Ghp5) {
|
|
|
+ guild_castledatasave(gc->castle_id, 23, gc->Ghp5);
|
|
|
+ Ghp[i][5] = gc->Ghp5;
|
|
|
+ }
|
|
|
+ if (gc->visibleG6 == 1 && Ghp[i][6] != gc->Ghp6) {
|
|
|
+ guild_castledatasave(gc->castle_id, 24, gc->Ghp6);
|
|
|
+ Ghp[i][6] = gc->Ghp6;
|
|
|
+ }
|
|
|
+ if (gc->visibleG7 == 1 && Ghp[i][7] != gc->Ghp7) {
|
|
|
+ guild_castledatasave(gc->castle_id, 25, gc->Ghp7);
|
|
|
+ Ghp[i][7] = gc->Ghp7;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
int guild_agit_break(struct mob_data *md)
|
|
|
{ // Run One NPC_Event[OnAgitBreak]
|
|
|
char *evname;
|
celest